From 0d7861a4f80756051ba772391658929f49feadf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 29 May 2017 11:59:41 +0200
Subject: [PATCH 001/118] MOBILE-2073 database: Basic module structure

---
 www/addons/mod/data/controllers/index.js      | 155 ++++++++++
 www/addons/mod/data/lang/en.json              |   9 +
 www/addons/mod/data/main.js                   |  42 +++
 www/addons/mod/data/services/data.js          | 280 ++++++++++++++++++
 www/addons/mod/data/services/handlers.js      | 160 ++++++++++
 .../mod/data/services/prefetch_handler.js     | 249 ++++++++++++++++
 www/addons/mod/data/templates/index.html      |  42 +++
 7 files changed, 937 insertions(+)
 create mode 100644 www/addons/mod/data/controllers/index.js
 create mode 100644 www/addons/mod/data/lang/en.json
 create mode 100644 www/addons/mod/data/main.js
 create mode 100644 www/addons/mod/data/services/data.js
 create mode 100644 www/addons/mod/data/services/handlers.js
 create mode 100644 www/addons/mod/data/services/prefetch_handler.js
 create mode 100644 www/addons/mod/data/templates/index.html

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
new file mode 100644
index 00000000000..cd3840b7ce2
--- /dev/null
+++ b/www/addons/mod/data/controllers/index.js
@@ -0,0 +1,155 @@
+// (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_data')
+
+/**
+ * Data index controller.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc controller
+ * @name mmaModDataIndexCtrl
+ */
+.controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
+        $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite) {
+
+    var module = $stateParams.module || {},
+        courseId = $stateParams.courseid,
+        data,
+        onlineObserver;
+
+    $scope.title = module.name;
+    $scope.description = module.description;
+    $scope.moduleUrl = module.url;
+    $scope.moduleName = $mmCourse.translateModuleName('data');
+    $scope.courseId = courseId;
+    $scope.refreshIcon = 'spinner';
+    $scope.syncIcon = 'spinner';
+    $scope.component = mmaModDataComponent;
+    $scope.componentId = module.id;
+    $scope.databaseLoaded = false;
+
+
+    function fetchDatabaseData(refresh, sync, showErrors) {
+        $scope.isOnline = $mmApp.isOnline();
+
+        return $mmaModData.getDatabase(courseId, module.id).then(function(databaseData) {
+            data = databaseData;
+
+            $scope.title = data.name || $scope.title;
+            $scope.description = data.intro || $scope.description;
+
+            $scope.database = data;
+
+            return $mmaModData.getDatabaseAccessInformation(data.id);
+        }).then(function(accessData) {
+            $scope.access = accessData;
+
+            if (!accessData.timeavailable) {
+                var time = $mmUtil.timestamp();
+
+                $scope.timeAvailableFrom = data.timeavailablefrom && time < data.timeavailablefrom ?
+                    parseInt(data.timeavailablefrom, 10) * 1000 : false;
+                $scope.timeAvailableFromReadable = $scope.timeAvailableFrom ?
+                    moment($scope.timeAvailableFrom).format('LLL') : false;
+                $scope.timeAvailableTo = data.timeavailableto && time > data.timeavailableto ?
+                    parseInt(data.timeavailableto, 10) * 1000 : false;
+                $scope.timeAvailableToReadable = $scope.timeAvailableTo ? moment($scope.timeAvailableTo).format('LLL') : false;
+            } else {
+                // TODO: Calculate num entries based on get_entries WS.
+                $scope.numEntries = accessData.numentries;
+                $scope.entriesLeftToView = accessData.entrieslefttoview;
+                $scope.entriesLeftToAdd = accessData.entrieslefttoadd;
+                $scope.canAdd = accessData.canaddentry;
+            }
+        }).then(function() {
+            // All data obtained, now fill the context menu.
+            $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModDataComponent);
+        }).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.databaseLoaded = true;
+        });
+    }
+
+    // Convenience function to refresh all the data.
+    function refreshAllData(sync, showErrors) {
+        var promises = [];
+
+        return $q.all(promises).finally(function() {
+            return fetchDatabaseData(true, sync, showErrors);
+        });
+    }
+
+    fetchDatabaseData(false, true).then(function() {
+        $mmaModData.logView(data.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, mmaModDataComponent, module.id);
+    };
+
+    // Pull to refresh.
+    $scope.refreshDatabase = function(showErrors) {
+        if ($scope.databaseLoaded) {
+            $scope.refreshIcon = 'spinner';
+            $scope.syncIcon = 'spinner';
+            return refreshAllData(true, showErrors).finally(function() {
+                $scope.refreshIcon = 'ion-refresh';
+                $scope.syncIcon = 'ion-loop';
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        }
+    };
+
+    // Opens search.
+    $scope.gotoSearch = function() {
+        $mmUtil.openInApp($mmSite.getURL() + '/mod/data/view.php?mode=asearch&d=' + data.id);
+    };
+
+    // Opens add entries form
+    $scope.gotoAddEntries = function() {
+        $mmUtil.openInApp($mmSite.getURL() + '/mod/data/edit.php?d=' + data.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/data/lang/en.json b/www/addons/mod/data/lang/en.json
new file mode 100644
index 00000000000..5fc410aa1c6
--- /dev/null
+++ b/www/addons/mod/data/lang/en.json
@@ -0,0 +1,9 @@
+{
+    "addentries": "Add entries",
+    "entrieslefttoadd": "You must add {{$a.entriesleft}} more entry/entries in order to complete this activity",
+    "entrieslefttoaddtoview": "You must add {{$a.entrieslefttoview}} more entry/entries before you can view other participants' entries.",
+    "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
+    "norecords": "No entries in database",
+    "notopenyet": "Sorry, this activity is not available until {{$a}}",
+    "search": "Search"
+}
diff --git a/www/addons/mod/data/main.js b/www/addons/mod/data/main.js
new file mode 100644
index 00000000000..eee37ce60f0
--- /dev/null
+++ b/www/addons/mod/data/main.js
@@ -0,0 +1,42 @@
+// (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_data', ['mm.core'])
+
+.constant('mmaModDataComponent', 'mmaModData')
+
+.config(function($stateProvider) {
+
+    $stateProvider
+
+    .state('site.mod_data', {
+        url: '/mod_data',
+        params: {
+            module: null,
+            courseid: null
+        },
+        views: {
+            'site': {
+                controller: 'mmaModDataIndexCtrl',
+                templateUrl: 'addons/mod/data/templates/index.html'
+            }
+        }
+    });
+
+})
+
+.config(function($mmCourseDelegateProvider, $mmContentLinksDelegateProvider) {
+    $mmCourseDelegateProvider.registerContentHandler('mmaModData', 'data', '$mmaModDataHandlers.courseContent');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData', '$mmaModDataHandlers.linksHandler');
+});
\ No newline at end of file
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
new file mode 100644
index 00000000000..4e06dbb4eff
--- /dev/null
+++ b/www/addons/mod/data/services/data.js
@@ -0,0 +1,280 @@
+// (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_data')
+
+/**
+ * Data service.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc controller
+ * @name $mmaModData
+ */
+.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool) {
+    var self = {};
+
+    /**
+     * Get cache key for database data WS calls.
+     *
+     * @param {Number} courseId Course ID.
+     * @return {String}         Cache key.
+     */
+    function getDatabaseDataCacheKey(courseId) {
+        return 'mmaModData:data:' + courseId;
+    }
+
+    /**
+     * Get prefix cache key for all database activity data WS calls.
+     *
+     * @param {Number} dataId   Data ID.
+     * @return {String}         Cache key.
+     */
+    function getDatabaseDataPrefixCacheKey(dataId) {
+        return 'mmaModData:' + dataId;
+    }
+
+    /**
+     * Get cache key for database access information data WS calls.
+     *
+     * @param {Number} dataId   Data ID.
+     * @return {String}         Cache key.
+     */
+    function getDatabaseAccessInformationDataCacheKey(dataId) {
+        return getDatabaseDataPrefixCacheKey(dataId) + ':access';
+    }
+
+    /**
+     * Return whether or not the plugin is enabled in a certain site. Plugin is enabled if the database WS are available.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#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_data_get_databases_by_courses') &&
+                site.wsAvailable('mod_data_get_data_access_information');
+        });
+    };
+
+    /**
+     * Get a database 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 database is retrieved.
+     */
+    function getDatabase(courseId, key, value, siteId, forceCache) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    courseids: [courseId]
+                },
+                preSets = {
+                    cacheKey: getDatabaseDataCacheKey(courseId)
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            }
+
+            return site.read('mod_data_get_databases_by_courses', params, preSets).then(function(response) {
+                if (response && response.databases) {
+                    for (var x in response.databases) {
+                        if (response.databases[x][key] == value) {
+                            return response.databases[x];
+                        }
+                    }
+                }
+                return $q.reject();
+            });
+        });
+    }
+
+    /**
+     * Get a database by course module ID.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#getDatabase
+     * @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 database is retrieved.
+     */
+    self.getDatabase = function(courseId, cmId, siteId, forceCache) {
+        return getDatabase(courseId, 'coursemodule', cmId, siteId, forceCache);
+    };
+
+    /**
+     * Get a database by ID.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#getDatabaseById
+     * @param   {Number}    courseId        Course ID.
+     * @param   {Number}    id              Data 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 database is retrieved.
+     */
+    self.getDatabaseById = function(courseId, id, siteId, forceCache) {
+        return getDatabase(courseId, 'id', id, siteId, forceCache);
+    };
+
+    /**
+     * Invalidates database data.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#invalidateDatabaseData
+     * @param {Number} courseId Course ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the database is invalidated.
+     */
+    self.invalidateDatabaseData = function(courseId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getDatabaseDataCacheKey(courseId));
+        });
+    };
+
+    /**
+     * Invalidates database data except files and module info.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#invalidateDatabaseWSData
+     * @param  {Number} databaseId   Data ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateDatabaseWSData = function(databaseId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getDatabaseDataPrefixCacheKey(databaseId));
+
+        });
+    };
+
+    /**
+     * Get  access information for a given database.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#getDatabaseAccessInformation
+     * @param   {Number}    dataId          Data 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 database is retrieved.
+     */
+    self.getDatabaseAccessInformation = function(dataId, offline, ignoreCache, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    databaseid: dataId
+                },
+                preSets = {
+                    cacheKey: getDatabaseAccessInformationDataCacheKey(dataId)
+                };
+
+            if (offline) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_data_get_data_access_information', params, preSets);
+        });
+    };
+
+    /**
+     * Invalidates database access information data.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#invalidateDatabaseAccessInformationData
+     * @param {Number} dataId       Data ID.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateDatabaseAccessInformationData = function(dataId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getDatabaseAccessInformationDataCacheKey(dataId));
+        });
+    };
+
+    /**
+     * Invalidate the prefetched content except files.
+     * To invalidate files, use $mmaModData#invalidateFiles.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#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.getDatabase(courseId, moduleId, siteId, true).then(function(data) {
+            var ps = [];
+            // Do not invalidate database data before getting database info, we need it!
+            ps.push(self.invalidateDatabaseData(courseId, siteId));
+            ps.push(self.invalidateDatabaseWSData(data.id, siteId));
+
+            return $q.all(ps);
+        });
+    };
+
+    /**
+     * Invalidate the prefetched files.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#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, mmaModDataComponent, moduleId);
+    };
+
+    /**
+     * Report the database as being viewed.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#logView
+     * @param {String}  id       Data 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 = {
+                databaseid: id
+            };
+            return site.write('mod_data_view_database', params);
+        });
+    };
+
+    return self;
+});
diff --git a/www/addons/mod/data/services/handlers.js b/www/addons/mod/data/services/handlers.js
new file mode 100644
index 00000000000..4220d647011
--- /dev/null
+++ b/www/addons/mod/data/services/handlers.js
@@ -0,0 +1,160 @@
+// (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_data')
+
+/**
+ * Mod data handlers.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataHandlers
+ */
+.factory('$mmaModDataHandlers', function($mmCourse, $mmaModData, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite,
+        mmaModDataComponent, $mmaModDataPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded,
+        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate) {
+    var self = {};
+
+    /**
+     * Course content handler.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHandlers#courseContent
+     */
+    self.courseContent = function() {
+
+        var self = {};
+
+        /**
+         * Whether or not the module is enabled for the site.
+         *
+         * @return {Boolean}
+         */
+        self.isEnabled = function() {
+            return $mmaModData.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();
+                            }
+                            $mmaModData.invalidateContent(module.id, courseId).finally(function() {
+                                download();
+                            });
+                        }
+                    };
+
+                $scope.title = module.name;
+                $scope.icon = $mmCourse.getModuleIconSrc('data');
+                $scope.class = 'mma-mod_data-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_data', {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.
+                    $mmaModDataPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
+                        $mmUtil.confirmDownloadSize(size).then(function() {
+                            $mmaModDataPrefetchHandler.prefetch(module, courseId).catch(function(error) {
+                                if (!$scope.$$destroyed) {
+                                    $mmUtil.showErrorModalDefault(error, '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 === mmaModDataComponent) {
+                        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_data
+     * @ngdoc method
+     * @name $mmaModDataHandlers#indexLinksHandler
+     */
+    self.indexLinksHandler = $mmContentLinksHelper.createModuleIndexLinkHandler('mmaModData', 'data', $mmaModData);
+
+
+    return self;
+});
diff --git a/www/addons/mod/data/services/prefetch_handler.js b/www/addons/mod/data/services/prefetch_handler.js
new file mode 100644
index 00000000000..9e3d181ea6c
--- /dev/null
+++ b/www/addons/mod/data/services/prefetch_handler.js
@@ -0,0 +1,249 @@
+// (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_data')
+
+/**
+ * Mod data prefetch handler.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataPrefetchHandler
+ */
+.factory('$mmaModDataPrefetchHandler', function($mmaModData, mmaModDataComponent, $mmFilepool, $q, $mmUtil, $mmPrefetchFactory) {
+
+    var self = $mmPrefetchFactory.createPrefetchHandler(mmaModDataComponent);
+
+    // RegExp to check if a module has updates based on the result of $mmCoursePrefetchDelegate#getCourseUpdates.
+    self.updatesNames = /^configuration$|^.*files$|^entries|^gradeitems$|^outcomes$|^comments$|^ratings/;
+
+    /**
+     * Download the module.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#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) {
+        // Database cannot be downloaded right away, only prefetched.
+        return self.prefetch(module, courseId);
+    };
+
+    /**
+     * Get the list of downloadable files.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#getFiles
+     * @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, siteId) {
+        var files = [];
+        return $mmaModData.getDatabase(courseId, module.id, siteId).then(function(database) {
+            // Get intro files.
+            files = self.getIntroFilesFromInstance(module, database);
+            return files;
+        }).catch(function() {
+            // Any error, return the list we have.
+            return files;
+        });
+    };
+
+    /**
+     * Returns database intro files.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#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 $mmaModData.getDatabase(courseId, module.id).catch(function() {
+            // Not found, return undefined so module description is used.
+        }).then(function(database) {
+            return self.getIntroFilesFromInstance(module, database);
+        });
+    };
+
+    /**
+     * Get revision of a data.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#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) {
+        // Data will always be controlled using the getCourseUpdates.
+        return 0;
+    };
+
+    /**
+     * Get timemodified of a data.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#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();
+
+        return $mmaModData.getDatabase(courseId, module.id, siteId).then(function(database) {
+            var files = self.getIntroFilesFromInstance(module, database);
+
+            return Math.max(database.timemodified || 0, $mmFilepool.getTimemodifiedFromFileList(files));
+        }).catch(function() {
+            return 0;
+        });
+    };
+
+    /**
+     * Invalidate the prefetched content.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#invalidateContent
+     * @param  {Number} moduleId The module ID.
+     * @param  {Number} courseId Course ID of the module.
+     * @return {Promise}
+     */
+    self.invalidateContent = function(moduleId, courseId) {
+        return $mmaModData.invalidateContent(moduleId, courseId);
+    };
+
+    /**
+     * Invalidates WS calls needed to determine module status.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#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 $mmaModData.invalidateDatabaseData(courseId);
+    };
+
+    /**
+     * Check if a database is downloadable.
+     * A database isn't downloadable if it's not open yet.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#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 $mmaModData.getDatabase(courseId, module.id, false, true).then(function(database) {
+            return $mmaModData.getDatabaseAccessInformation(database.id).then(function(accessData) {
+                // Check if database is restricted by time.
+                if (!accessData.timeavailable) {
+                    var time = $mmUtil.timestamp();
+
+                    // It is restricted, checking times.
+                    if (database.timeavailablefrom && time < database.timeavailablefrom) {
+                        return false;
+                    }
+                    if (database.timeavailableto && time > database.timeavailableto) {
+                        return false;
+                    }
+                }
+                return true;
+            });
+        });
+    };
+
+    /**
+     * Whether or not the module is enabled for the site.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#isEnabled
+     * @return {Boolean}
+     */
+    self.isEnabled = function() {
+        return $mmaModData.isPluginEnabled();
+    };
+
+    /**
+     * Prefetch the module.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#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, prefetchDatabase);
+    };
+
+    /**
+     * Prefetch a database.
+     *
+     * @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 prefetchDatabase(module, courseId, single, siteId) {
+        // Prefetch the database data.
+        return $mmaModData.getDatabase(courseId, module.id, siteId).then(function(database) {
+            var promises = [];
+
+            promises.push(self.getFiles(module, courseId, siteId).then(function(files) {
+                return $mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id);
+            }));
+
+            promises.push($mmaModData.getDatabaseAccessInformation(database.id, false, true, siteId));
+
+            return $q.all(promises);
+        }).then(function() {
+            // Get revision and timemodified.
+
+            var promises = [];
+            promises.push(self.getRevision(module, courseId));
+            promises.push(self.getTimemodified(module, courseId));
+
+            // Return revision and timemodified.
+            return $q.all(promises).then(function(list) {
+                return {
+                    revision: list[0],
+                    timemod: list[1]
+                };
+            });
+        });
+    }
+
+    return self;
+});
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
new file mode 100644
index 00000000000..fb4bf06e2ed
--- /dev/null
+++ b/www/addons/mod/data/templates/index.html
@@ -0,0 +1,42 @@
+<ion-view>
+    <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
+    <ion-nav-buttons side="secondary">
+        <button ng-show="numEntries > 0" class="button button-icon ion-ios-search-strong" ng-click="gotoSearch($event)" aria-label="{{ 'mma.mod_data.search' | translate }}"></button>
+        <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="databaseLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshDatabase(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+            <mm-context-menu-item priority="600" ng-if="databaseLoaded && hasOffline && isOnline" content="'mm.settings.synchronizenow' | translate" action="refreshDatabase(true)" icon-action="syncIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
+            <mm-context-menu-item priority="500" ng-if="canAdd" content="'mma.mod_data.addentries' | translate" icon-action="'ion-plus-round'" action="gotoAddEntries($event)"></mm-context-menu-item>
+            <mm-context-menu-item priority="400" ng-if="timemodified" content="timemodified" icon-action="prefetchStatusIcon" action="prefetch()" close-on-click="false"></mm-context-menu-item>
+            <mm-context-menu-item priority="300" 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 padding="true" mm-state-class delegate-handle="mmaModDataIndexScroll">
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="databaseLoaded" on-refresh="refreshDatabase(false)"></ion-refresher>
+        <mm-loading hide-until="databaseLoaded">
+            <div class="card" ng-if="description" ng-click="expandDescription()">
+                <div class="item item-text-wrap">
+                    <mm-format-text max-height="120" fullview-on-click="true" component="{{dataComponent}}" component-id="{{data.cmid}}">{{ description }}</mm-format-text>
+                </div>
+            </div>
+            <div class="mm-info-card-icon" ng-if="timeAvailableFrom">
+                <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.notopenyet' | translate:{$a: timeAvailableFromReadable} }}
+            </div>
+
+            <div class="mm-info-card-icon" ng-if="timeAvailableTo">
+                <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.expired' | translate:{$a: timeAvailableToReadable} }}
+            </div>
+
+            <div class="mm-info-card-icon" ng-if="entriesLeftToView">
+                <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.entrieslefttoaddtoview' | translate:{$a: {entrieslefttoview: entriesLeftToView} } }}
+            </div>
+
+            <div class="mm-info-card-icon" ng-if="entriesLeftToAdd">
+                <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.entrieslefttoadd' | translate:{$a: {entriesleft: entriesLeftToAdd} } }}
+            </div>
+
+            <mm-empty-box ng-if="numEntries === 0" icon="ion-archive" message="{{ 'mma.mod_data.norecords' | translate}}"></mm-empty-box>
+        </mm-loading>
+    </ion-content>
+</ion-view>

From 6ec56ec16bb8885fed0b22dd725c2f5cb24f8821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 29 May 2017 13:07:09 +0200
Subject: [PATCH 002/118] MOBILE-2140 style: Add variables for init screen

---
 scss/app.scss                                | 3 +++
 www/core/components/courses/scss/styles.scss | 2 +-
 www/core/scss/styles.scss                    | 6 +++---
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index 3a670e093c7..cb62756fea2 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -50,6 +50,9 @@ $mm-color:          $orange;
 $mm-color-light:    lighten($mm-color, 10%);
 $mm-color-dark:     darken($mm-color, 10%);
 
+$mm-color-init-screen:      #ff5c00;
+$mm-color-init-screen-alt:  #ff7600;
+
 $mm-buttons-color: $positive;
 
 // Change Ionic default elements colors.
diff --git a/www/core/components/courses/scss/styles.scss b/www/core/components/courses/scss/styles.scss
index b6762dc0036..3387c0bf5cf 100644
--- a/www/core/components/courses/scss/styles.scss
+++ b/www/core/components/courses/scss/styles.scss
@@ -2,7 +2,7 @@ $chart-size: 70px;
 $doughnut-border-size: 15px;
 $doughnut-dasharray: 173;
 $doughnut-empty-colour: $gray-light;
-$doughnut-fill-colour: $orange-light;
+$doughnut-fill-colour: $mm-color-light;
 $doughnut-border-colour:  $gray-dark;
 $doughnut-text-colour: $gray-darker;
 
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index ac1142effc1..01d5313f132 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -52,9 +52,9 @@ $item-input-padding: 16px !default;
  * App Branding
  */
 .mm-bglogo {
-  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-color: $mm-color-init-screen; /* Change this to add a bg image or change color */
+  background: -webkit-radial-gradient($mm-color-init-screen-alt, $mm-color-init-screen);
+  background: radial-gradient($mm-color-init-screen-alt, $mm-color-init-screen);
   background-repeat: no-repeat;
   background-position: center center;
   position: absolute;

From 879c4545c68431fe6796ac33cc13c3ee789564a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 29 May 2017 14:00:09 +0200
Subject: [PATCH 003/118] MOBILE-2140 style: Change logo images name

---
 scss/app.scss                                    |  15 ++++++++++-----
 .../components/login/templates/credentials.html  |   8 ++++----
 www/core/components/login/templates/init.html    |   2 +-
 .../components/login/templates/reconnect.html    |   8 ++++----
 www/core/components/login/templates/site.html    |   2 +-
 www/img/{moodle.png => logo.png}                 | Bin
 www/img/{moodle_white.png => logo_white.png}     | Bin
 7 files changed, 20 insertions(+), 15 deletions(-)
 rename www/img/{moodle.png => logo.png} (100%)
 rename www/img/{moodle_white.png => logo_white.png} (100%)

diff --git a/scss/app.scss b/scss/app.scss
index cb62756fea2..052489c2113 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -60,7 +60,7 @@ $base-color: $black !default;
 $base-background-color: $gray-light !default;
 
 $item-default-text: $black;
-$sheet-options-text-color: $positive;
+$sheet-options-text-color: $mm-buttons-color;
 
 // Header.
 $bar-content-bg: $mm-color !default;
@@ -73,7 +73,7 @@ $item-disabled-color: $gray-dark !default;
 
 $button-light-border: $gray;
 
-$toggle-on-default-bg: $blue;
+$toggle-on-default-bg: $mm-buttons-color;
 
 $tabs-off-opacity:                0.6;
 $tabs-striped-off-opacity:        $tabs-off-opacity;
@@ -85,6 +85,11 @@ $button-default-border: $mm-buttons-color !default;
 $button-default-active-bg: $mm-buttons-color !default;
 $button-default-active-border: $mm-buttons-color !default;
 
+$button-positive-bg:              $mm-buttons-color !default;
+$button-positive-border:          darken($mm-buttons-color, 10%) !default;
+$button-positive-active-bg:       darken($mm-buttons-color, 10%) !default;
+$button-positive-active-border:   darken($mm-buttons-color, 10%) !default;
+
 // The path to the font icons.
 $ionicons-font-path: "../lib/ionic/release/fonts" !default;
 
@@ -95,7 +100,7 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   color: $gray-darker;
 
   &.positive {
-    color: $positive;
+    color: $mm-buttons-color;
   }
   &.assertive {
     color: $assertive;
@@ -115,7 +120,7 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   &.activated,
   &.active .icon,
   &.activated .icon {
-    color: $positive;
+    color: $mm-buttons-color;
 
     &.assertive {
       color: $assertive;
@@ -147,7 +152,7 @@ $ionicons-font-path: "../lib/ionic/release/fonts" !default;
   color: $assertive;
 }
 
-// Setting the default button to button-outline positive.
+// Setting the default button to button-outline $mm-buttons-color.
 .button {
   &.button-light,
   &.button-stable,
diff --git a/www/core/components/login/templates/credentials.html b/www/core/components/login/templates/credentials.html
index 053f7bb9865..74fff04f930 100644
--- a/www/core/components/login/templates/credentials.html
+++ b/www/core/components/login/templates/credentials.html
@@ -5,13 +5,13 @@
                 <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 moodle-logo" role="presentation">
+                    <img ng-if="!logourl" ng-src="img/logo.png" class="avatar-full moodle-logo" role="presentation">
 
                     <!-- If no sitename show big siteurl. -->
-                    <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
+                    <p ng-if="!sitename" class="item-heading padding mm-siteurl">{{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 ng-if="sitename" class="item-heading padding mm-sitename">{{sitename}}</p>
+                    <p ng-if="sitename" class="mm-siteurl">{{siteurl}}</p>
                 </div>
                 <form>
                     <ion-input class="list item item-input" ng-if="siteChecked && !isBrowserSSO">
diff --git a/www/core/components/login/templates/init.html b/www/core/components/login/templates/init.html
index eea30ac01a2..628fa135273 100644
--- a/www/core/components/login/templates/init.html
+++ b/www/core/components/login/templates/init.html
@@ -1,7 +1,7 @@
 <ion-view hide-nav-bar="true">
     <div class="mm-bglogo">
         <div class="mm-logo">
-            <img src="img/moodle_white.png"/>
+            <img src="img/logo_white.png"/>
             <ion-spinner></ion-spinner>
         </div>
     </div>
diff --git a/www/core/components/login/templates/reconnect.html b/www/core/components/login/templates/reconnect.html
index d425a8cf33e..cd887e58af7 100644
--- a/www/core/components/login/templates/reconnect.html
+++ b/www/core/components/login/templates/reconnect.html
@@ -6,13 +6,13 @@
                     <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">
+                    <img ng-if="!site.avatar && !logourl" ng-src="img/logo.png" class="avatar-full moodle-logo" role="presentation">
 
                     <!-- If no sitename show big siteurl. -->
-                    <p ng-if="!sitename" class="item-heading padding">{{siteurl}}</p>
+                    <p ng-if="!sitename" class="item-heading padding mm-siteurl">{{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 ng-if="sitename" class="item-heading padding mm-sitename">{{sitename}}</p>
+                    <p ng-if="sitename" class="mm-siteurl">{{siteurl}}</p>
 
                     <p class="padding-top" ng-if="!isLoggedOut"><i class="icon ion-alert-circled padding"></i> {{ 'mm.login.reconnectdescription' | translate }}</p>
                 </div>
diff --git a/www/core/components/login/templates/site.html b/www/core/components/login/templates/site.html
index cc1310fd9c7..57abe516090 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  moodle-logo" role="presentation">
+          <img ng-src="img/logo.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/img/moodle.png b/www/img/logo.png
similarity index 100%
rename from www/img/moodle.png
rename to www/img/logo.png
diff --git a/www/img/moodle_white.png b/www/img/logo_white.png
similarity index 100%
rename from www/img/moodle_white.png
rename to www/img/logo_white.png

From 3fc3c1bae5c2792125dc2272855a5af260113844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 30 May 2017 12:26:58 +0200
Subject: [PATCH 004/118] MOBILE-2140 style: Add variables for init spinner

---
 scss/app.scss             | 5 +++--
 www/core/scss/styles.scss | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index 052489c2113..08608e214a1 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -50,8 +50,9 @@ $mm-color:          $orange;
 $mm-color-light:    lighten($mm-color, 10%);
 $mm-color-dark:     darken($mm-color, 10%);
 
-$mm-color-init-screen:      #ff5c00;
-$mm-color-init-screen-alt:  #ff7600;
+$mm-color-init-screen:         #ff5c00;
+$mm-color-init-screen-alt:     #ff7600;
+$mm-init-screen-spinner-color: $white;
 
 $mm-buttons-color: $positive;
 
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 01d5313f132..5f8637a1d73 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -81,9 +81,9 @@ $item-input-padding: 16px !default;
   }
 
   .spinner {
-    color: white;
-    stroke: white;
-    fill: white;
+    color: $mm-init-screen-spinner-color;
+    stroke: $mm-init-screen-spinner-color;
+    fill: $mm-init-screen-spinner-color;
   }
 }
 

From 9765ddaaa6a05df744ca169dd4ea5f9ecacfd5ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 6 Jun 2017 12:29:59 +0200
Subject: [PATCH 005/118] MOBILE-2140 style: Add boolean to hide site name and
 url

---
 scss/app.scss                              | 1 +
 www/core/components/login/scss/styles.scss | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/scss/app.scss b/scss/app.scss
index 08608e214a1..d6d477cb47a 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -53,6 +53,7 @@ $mm-color-dark:     darken($mm-color, 10%);
 $mm-color-init-screen:         #ff5c00;
 $mm-color-init-screen-alt:     #ff7600;
 $mm-init-screen-spinner-color: $white;
+$mm-fixed-url: false;
 
 $mm-buttons-color: $positive;
 
diff --git a/www/core/components/login/scss/styles.scss b/www/core/components/login/scss/styles.scss
index 78aa66c1561..18dad1af296 100644
--- a/www/core/components/login/scss/styles.scss
+++ b/www/core/components/login/scss/styles.scss
@@ -61,4 +61,9 @@
     background: $white;
     border: 1px solid $item-default-border;
   }
+
+  .mm-sitename, .mm-siteurl {
+    @if $mm-fixed-url { display: none; }
+  }
 }
+

From 572878ce66d290b467f9e73cac27d199c2095ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 6 Jun 2017 12:30:16 +0200
Subject: [PATCH 006/118] MOBILE-2140 style: Add variables to control init
 screen logo

---
 scss/app.scss             | 11 +++++++----
 www/core/scss/styles.scss |  4 ++--
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index d6d477cb47a..19dd3a630a6 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -50,10 +50,13 @@ $mm-color:          $orange;
 $mm-color-light:    lighten($mm-color, 10%);
 $mm-color-dark:     darken($mm-color, 10%);
 
-$mm-color-init-screen:         #ff5c00;
-$mm-color-init-screen-alt:     #ff7600;
-$mm-init-screen-spinner-color: $white;
-$mm-fixed-url: false;
+$mm-color-init-screen:          #ff5c00;
+$mm-color-init-screen-alt:      #ff7600;
+$mm-init-screen-spinner-color:  $white;
+$mm-init-screen-logo-width:     60%;
+$mm-init-screen-logo-max-width: 300px;
+
+$mm-fixed-url:                  false;
 
 $mm-buttons-color: $positive;
 
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 5f8637a1d73..93a1b6256da 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -73,8 +73,8 @@ $item-input-padding: 16px !default;
   }
 
   img {
-    width: 60%;
-    max-width: 300px;
+    width: $mm-init-screen-logo-width;
+    max-width: $mm-init-screen-logo-max-width;
     display: block;
     margin: 0 auto;
     margin-bottom: 30px;

From d205a55abb2942a18d39c6cc6e333728d94240ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 6 Jun 2017 12:53:34 +0200
Subject: [PATCH 007/118] MOBILE-2140 style: Add variables to control sidemenu

---
 scss/app.scss                                 | 19 +++++++++++----
 www/core/components/sidemenu/scss/styles.scss | 24 +++++++++++++------
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/scss/app.scss b/scss/app.scss
index 19dd3a630a6..5d1afb1a84d 100644
--- a/scss/app.scss
+++ b/scss/app.scss
@@ -67,16 +67,27 @@ $base-background-color: $gray-light !default;
 $item-default-text: $black;
 $sheet-options-text-color: $mm-buttons-color;
 
+$item-default-bg: $white;
+$item-divider-bg: $gray-lighter;
+$item-disabled-color: $gray-dark !default;
+
+$button-light-border: $gray;
+
 // 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;
+$bar-side-menu-height: 80px !default;
+$bar-side-menu-color: $bar-content-bg !default;
+$bar-side-menu-border-color: $bar-content-border !default;
+$bar-side-menu-text-color: $bar-content-text !default;
 
-$button-light-border: $gray;
+$bar-side-menu-item-border-color: $button-light-border;
+$bar-side-menu-item-divider-color: $item-divider-bg;
+$bar-side-menu-item-background-color: $item-default-bg;
+$bar-side-menu-item-text-color: $item-default-text;
+$bar-side-menu-item-icon-color: $gray-darker;
 
 $toggle-on-default-bg: $mm-buttons-color;
 
diff --git a/www/core/components/sidemenu/scss/styles.scss b/www/core/components/sidemenu/scss/styles.scss
index 5c03857bccd..bb3c1b5f97a 100644
--- a/www/core/components/sidemenu/scss/styles.scss
+++ b/www/core/components/sidemenu/scss/styles.scss
@@ -1,9 +1,3 @@
-// Variables.
-$bar-side-menu-height: 80px !default;
-$bar-side-menu-color: $bar-content-bg !default;
-$bar-side-menu-border-color: $bar-content-border !default;
-$bar-side-menu-text-color: $bar-content-text !default;
-
 // Bar styles
 .bar-side-menu {
   @include bar-style($bar-side-menu-color, $bar-side-menu-border-color, $bar-side-menu-text-color);
@@ -15,7 +9,8 @@ $bar-side-menu-text-color: $bar-content-text !default;
   .item-avatar {
     margin-top: 0px !important; // MOBILE-959: Added to fix side menu header in iOS.
     h2,
-    p {
+    p,
+    .icon {
       color: $bar-side-menu-text-color;
     }
   }
@@ -30,3 +25,18 @@ $bar-side-menu-text-color: $bar-content-text !default;
     right: 16px;
   }
 }
+
+ion-side-menu li .item,
+ion-side-menu li.item {
+  border-color: $bar-side-menu-item-border-color;
+  background-color: $bar-side-menu-item-background-color;
+  color: $bar-side-menu-item-text-color;
+
+  .icon {
+    color: $bar-side-menu-item-icon-color;
+  }
+}
+
+ion-side-menu li.item.item-divider {
+  background-color: $bar-side-menu-item-divider-color;
+}
\ No newline at end of file

From 914a3a418a329397460b3e153208377cda73a5f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 30 May 2017 13:38:16 +0200
Subject: [PATCH 008/118] MOBILE-2118 database: View entry list

---
 www/addons/mod/data/controllers/index.js      |  73 +++++-
 www/addons/mod/data/main.js                   |   8 +-
 www/addons/mod/data/scss/styles.scss          |  18 ++
 www/addons/mod/data/services/data.js          | 241 +++++++++++++++++-
 www/addons/mod/data/services/helper.js        |  51 ++++
 .../mod/data/services/prefetch_handler.js     | 135 ++++++++--
 www/addons/mod/data/templates/index.html      |  37 ++-
 www/core/lib/groups.js                        |   3 +-
 www/core/scss/fontawesome.scss                |  44 ++++
 9 files changed, 564 insertions(+), 46 deletions(-)
 create mode 100644 www/addons/mod/data/scss/styles.scss
 create mode 100644 www/addons/mod/data/services/helper.js
 create mode 100644 www/core/scss/fontawesome.scss

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index cd3840b7ce2..442ca61b38b 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
  * @name mmaModDataIndexCtrl
  */
 .controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
-        $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite) {
+        $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -33,13 +33,12 @@ angular.module('mm.addons.mod_data')
     $scope.description = module.description;
     $scope.moduleUrl = module.url;
     $scope.moduleName = $mmCourse.translateModuleName('data');
-    $scope.courseId = courseId;
     $scope.refreshIcon = 'spinner';
     $scope.syncIcon = 'spinner';
     $scope.component = mmaModDataComponent;
     $scope.componentId = module.id;
     $scope.databaseLoaded = false;
-
+    $scope.selectedGroup = $stateParams.group || 0;
 
     function fetchDatabaseData(refresh, sync, showErrors) {
         $scope.isOnline = $mmApp.isOnline();
@@ -49,10 +48,12 @@ angular.module('mm.addons.mod_data')
 
             $scope.title = data.name || $scope.title;
             $scope.description = data.intro || $scope.description;
+            $scope.data = databaseData;
 
             $scope.database = data;
 
             return $mmaModData.getDatabaseAccessInformation(data.id);
+
         }).then(function(accessData) {
             $scope.access = accessData;
 
@@ -66,13 +67,31 @@ angular.module('mm.addons.mod_data')
                 $scope.timeAvailableTo = data.timeavailableto && time > data.timeavailableto ?
                     parseInt(data.timeavailableto, 10) * 1000 : false;
                 $scope.timeAvailableToReadable = $scope.timeAvailableTo ? moment($scope.timeAvailableTo).format('LLL') : false;
-            } else {
-                // TODO: Calculate num entries based on get_entries WS.
-                $scope.numEntries = accessData.numentries;
-                $scope.entriesLeftToView = accessData.entrieslefttoview;
-                $scope.entriesLeftToAdd = accessData.entrieslefttoadd;
-                $scope.canAdd = accessData.canaddentry;
+
+                $scope.isEmpty = true;
+                $scope.groupInfo = false;
+                return false;
             }
+
+            return $mmGroups.getActivityGroupInfo(data.coursemodule, accessData.canmanageentries).then(function(groupInfo) {
+                $scope.groupInfo = groupInfo;
+
+                // Check selected group is accessible.
+                if (groupInfo && groupInfo.groups && groupInfo.groups.length > 0) {
+                    var found = false;
+                    for (var x in groupInfo.groups) {
+                        if (groupInfo.groups[x].id == $scope.selectedGroup) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        $scope.selectedGroup = groupInfo.groups[0].id;
+                    }
+                }
+
+                return fetchEntriesData();
+            });
         }).then(function() {
             // All data obtained, now fill the context menu.
             $mmCourseHelper.fillContextMenu($scope, module, courseId, refresh, mmaModDataComponent);
@@ -89,10 +108,46 @@ angular.module('mm.addons.mod_data')
         });
     }
 
+    function fetchEntriesData() {
+        return $mmaModData.getDatabaseAccessInformation(data.id, $scope.selectedGroup).then(function(accessData) {
+            // Update values for current group.
+            $scope.access.canaddentry = accessData.canaddentry;
+
+            return $mmaModData.getEntries(data.id, $scope.selectedGroup).then(function(entries) {
+                $scope.isEmpty = !entries || entries.entries.length <= 0;
+                $scope.entries = "";
+
+                if (!$scope.isEmpty) {
+                    $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
+                    $scope.entries = entries.listviewcontents;
+                }
+            });
+        });
+    }
+
+
+    // Set group to see the database.
+    $scope.setGroup = function(groupId) {
+        $scope.selectedGroup = groupId;
+        return fetchEntriesData().catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            return $q.reject();
+        });
+    };
+
+
+
     // Convenience function to refresh all the data.
     function refreshAllData(sync, showErrors) {
         var promises = [];
 
+        promises.push($mmaModData.invalidateDatabaseData(courseId));
+        if (data) {
+            promises.push($mmaModData.invalidateDatabaseAccessInformationData(data.id));
+            promises.push($mmGroups.invalidateActivityGroupInfo(data.coursemodule));
+            promises.push($mmaModData.invalidateEntriesData(data.id));
+        }
+
         return $q.all(promises).finally(function() {
             return fetchDatabaseData(true, sync, showErrors);
         });
diff --git a/www/addons/mod/data/main.js b/www/addons/mod/data/main.js
index eee37ce60f0..38a967c9627 100644
--- a/www/addons/mod/data/main.js
+++ b/www/addons/mod/data/main.js
@@ -24,7 +24,8 @@ angular.module('mm.addons.mod_data', ['mm.core'])
         url: '/mod_data',
         params: {
             module: null,
-            courseid: null
+            courseid: null,
+            group: null
         },
         views: {
             'site': {
@@ -36,7 +37,8 @@ angular.module('mm.addons.mod_data', ['mm.core'])
 
 })
 
-.config(function($mmCourseDelegateProvider, $mmContentLinksDelegateProvider) {
+.config(function($mmCourseDelegateProvider, $mmContentLinksDelegateProvider, $mmCoursePrefetchDelegateProvider) {
     $mmCourseDelegateProvider.registerContentHandler('mmaModData', 'data', '$mmaModDataHandlers.courseContent');
-    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData', '$mmaModDataHandlers.linksHandler');
+    $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModData', 'data', '$mmaModDataPrefetchHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:index', '$mmaModDataHandlers.indexLinksHandler');
 });
\ No newline at end of file
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
new file mode 100644
index 00000000000..955e8772526
--- /dev/null
+++ b/www/addons/mod/data/scss/styles.scss
@@ -0,0 +1,18 @@
+
+.mm-site_mod_data {
+  .recordcheckbox {
+    display: none;
+  }
+}
+
+.mm-data-contents {
+  overflow: visible;
+  white-space: normal;
+  word-break: break-all;
+  padding: $item-padding;
+  background-color: white;
+  border-top-width: $item-border-width;
+  border-bottom-width: $item-border-width;
+  border-style: solid;
+  border-color: $item-default-border;
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 4e06dbb4eff..beb2df25881 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc controller
  * @name $mmaModData
  */
-.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool) {
+.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite) {
     var self = {};
 
     /**
@@ -44,14 +44,59 @@ angular.module('mm.addons.mod_data')
         return 'mmaModData:' + dataId;
     }
 
+
+    /**
+     * Get prefix cache key for all database access information data WS calls.
+     *
+     * @param {Number} dataId   Data ID.
+     * @return {String}         Cache key.
+     */
+    function getDatabaseAccessInformationDataPrefixCacheKey(dataId) {
+        return getDatabaseDataPrefixCacheKey(dataId) + ':access:';
+    }
+
     /**
      * Get cache key for database access information data WS calls.
      *
      * @param {Number} dataId   Data ID.
+     * @param {Number} [groupId]  Group ID.
      * @return {String}         Cache key.
      */
-    function getDatabaseAccessInformationDataCacheKey(dataId) {
-        return getDatabaseDataPrefixCacheKey(dataId) + ':access';
+    function getDatabaseAccessInformationDataCacheKey(dataId, groupId) {
+        groupId = groupId || 0;
+        return getDatabaseAccessInformationDataPrefixCacheKey(dataId) + groupId;
+    }
+
+    /**
+     * Get prefix cache key for database all entries data WS calls.
+     *
+     * @param {Number} dataId     Data ID.
+     * @return {String}           Cache key.
+     */
+    function getEntriesPrefixCacheKey(dataId) {
+        return getDatabaseDataPrefixCacheKey(dataId) + ':entries:';
+    }
+
+    /**
+     * Get cache key for database entries data WS calls.
+     *
+     * @param {Number} dataId     Data ID.
+     * @param {Number} [groupId]  Group ID.
+     * @return {String}           Cache key.
+     */
+    function getEntriesCacheKey(dataId, groupId) {
+        groupId = groupId || 0;
+        return getEntriesPrefixCacheKey(dataId) + groupId;
+    }
+
+    /**
+     * Get cache key for database fields data WS calls.
+     *
+     * @param {Number} dataId     Data ID.
+     * @return {String}           Cache key.
+     */
+    function getFieldsCacheKey(dataId) {
+        return getDatabaseDataPrefixCacheKey(dataId) + ':fields';
     }
 
     /**
@@ -178,20 +223,25 @@ angular.module('mm.addons.mod_data')
      * @ngdoc method
      * @name $mmaModData#getDatabaseAccessInformation
      * @param   {Number}    dataId          Data ID.
+     * @param   {Number}    [groupId]       Group 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 database is retrieved.
      */
-    self.getDatabaseAccessInformation = function(dataId, offline, ignoreCache, siteId) {
+    self.getDatabaseAccessInformation = function(dataId, groupId, offline, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     databaseid: dataId
                 },
                 preSets = {
-                    cacheKey: getDatabaseAccessInformationDataCacheKey(dataId)
+                    cacheKey: getDatabaseAccessInformationDataCacheKey(dataId, groupId)
                 };
 
+            if (typeof groupId !== "undefined") {
+                params.groupid = groupId;
+            }
+
             if (offline) {
                 preSets.omitExpires = true;
             } else if (ignoreCache) {
@@ -215,10 +265,189 @@ angular.module('mm.addons.mod_data')
      */
     self.invalidateDatabaseAccessInformationData = function(dataId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.invalidateWsCacheForKey(getDatabaseAccessInformationDataCacheKey(dataId));
+            return site.invalidateWsCacheForKeyStartingWith(getDatabaseAccessInformationDataPrefixCacheKey(dataId));
+        });
+    };
+
+    /**
+     * Get entries for a specific database and group.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#getEntries
+     * @param   {Number}    dataId          Data ID.
+     * @param   {Number}    [groupId]       Group ID.
+     * @param   {Number}    [sort]          Sort the records by this field id, reserved ids are:
+     *                                          0: timeadded
+     *                                          -1: firstname
+     *                                          -2: lastname
+     *                                          -3: approved
+     *                                          -4: timemodified.
+     *                                          Empty for using the default database setting.
+     * @param   {String}    [order]         The direction of the sorting: 'ASC' or 'DESC'.
+     *                                          Empty for using the default database setting.
+     * @param   {Number}    [page]          Page of records to return.
+     * @param   {Number}    [perPage]       Number of records to return per page.
+     * @param   {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
+     * @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 database is retrieved.
+     */
+    self.getEntries = function(dataId, groupId, sort, order, page, perPage, forceCache, ignoreCache, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    databaseid: dataId,
+                    returncontents: 1
+                },
+                preSets = {
+                    cacheKey: getEntriesCacheKey(dataId, groupId)
+                };
+
+            if (typeof sort != "undefined") {
+                params.sort = sort;
+            }
+
+            if (order) {
+                params.order = order;
+            }
+
+            if (page) {
+                params.page = page;
+            }
+
+            if (perPage) {
+                params.perpage = perPage;
+            }
+
+            if (typeof groupId !== "undefined") {
+                params.groupid = groupId;
+            }
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return site.read('mod_data_get_entries', params, preSets);
         });
     };
 
+    /**
+     * Invalidates database entries data.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#invalidateEntriesData
+     * @param {Number} dataId       Data ID.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateEntriesData = function(dataId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKeyStartingWith(getEntriesPrefixCacheKey(dataId));
+        });
+    };
+
+    /**
+     * Get the list of configured fields for the given database.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#getFields
+     * @param   {Number}    dataId          Data ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the database is retrieved.
+     */
+    self.getFields = function(dataId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    databaseid: dataId
+                },
+                preSets = {
+                    cacheKey: getFieldsCacheKey(dataId)
+                };
+
+            return site.read('mod_data_get_fields', params, preSets).then(function(response) {
+                if (response && response.fields) {
+                    return response.fields;
+                }
+                return $q.reject();
+            });
+        });
+    };
+
+    /**
+     * Invalidates database fields data.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#invalidateFieldsData
+     * @param {Number} dataId       Data ID.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}        Promise resolved when the data is invalidated.
+     */
+    self.invalidateFieldsData = function(dataId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getFieldsCacheKey(dataId));
+        });
+    };
+
+    /**
+     * Performs the whole fetch of the entries in the database.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataPrefetchHandler#fetchAllEntries
+     * @param  {Number}    dataId          Data ID.
+     * @param  {Number}    [groupId]       Group ID.
+     * @param  {Number}    [sort]          Sort the records by this field id. See $mmaModData#getEntries for more information.
+     * @param  {String}    [order]         The direction of the sorting.  See $mmaModData#getEntries for more information.
+     * @param  {Number}    [perPage]       Number of records to return per page. Default 10.
+     * @param  {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
+     * @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 done.
+     */
+    self.fetchAllEntries = function(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        if (typeof perPage == 'undefined') {
+            perPage = 10;
+        }
+
+        return fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, [], 0, siteId);
+    };
+
+    /**
+     * Recursive call on fetch all entries.
+     *
+     * @param  {Number}    dataId          Data ID.
+     * @param  {Number}    groupId         Group ID.
+     * @param  {Number}    sort            Sort the records by this field id. See $mmaModData#getEntries for more information.
+     * @param  {String}    order           The direction of the sorting.  See $mmaModData#getEntries for more information.
+     * @param  {Number}    perPage         Number of records to return per page.
+     * @param  {Boolean}   forceCache      True to always get the value from cache, false otherwise. Default false.
+     * @param  {Boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {Array}     entries         Entries already fetch (just to concatenate them).
+     * @param  {Number}    page            Page of records to return.
+     * @param  {String}    siteId          Site ID.
+     * @return {Promise}                   Promise resolved when done.
+     */
+    function fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, entries, page, siteId) {
+        return self.getEntries(dataId, groupId, sort, order, page, perPage, forceCache, ignoreCache, siteId).then(function(result) {
+            entries = entries.concat(result.entries);
+
+            var canLoadMore = ((page + 1) * perPage) < result.totalcount;
+            if (canLoadMore) {
+                return fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, entries,
+                    page + 1, siteId);
+            }
+            return entries;
+        });
+    }
+
     /**
      * Invalidate the prefetched content except files.
      * To invalidate files, use $mmaModData#invalidateFiles.
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
new file mode 100644
index 00000000000..d2647d6c648
--- /dev/null
+++ b/www/addons/mod/data/services/helper.js
@@ -0,0 +1,51 @@
+// (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_data')
+
+/**
+ * Helper to gather some common functions for database.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataHelper
+ */
+.factory('$mmaModDataHelper', function() {
+
+    var self = {};
+
+    /**
+     * Add a prefix to all rules in a CSS string.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#prefixCSS
+     * @param {String} css      CSS code to be prefixed.
+     * @param {String} prefix   Prefix css selector.
+     * @return {String}         Prefixed CSS.
+     */
+    self.prefixCSS = function(css, prefix) {
+        if (!css) {
+            return "";
+        }
+        // Remove comments first.
+        var regExp = /\/\*[\s\S]*?\*\/|([^:]|^)\/\/.*$/gm;
+        css = css.replace(regExp, "");
+        // Add prefix.
+        regExp = /([^]*?)({[^]*?}|,)/g;
+        return css.replace(regExp, prefix + " $1 $2");
+    };
+
+    return self;
+});
\ No newline at end of file
diff --git a/www/addons/mod/data/services/prefetch_handler.js b/www/addons/mod/data/services/prefetch_handler.js
index 9e3d181ea6c..c9b1e05bab1 100644
--- a/www/addons/mod/data/services/prefetch_handler.js
+++ b/www/addons/mod/data/services/prefetch_handler.js
@@ -21,12 +21,13 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataPrefetchHandler
  */
-.factory('$mmaModDataPrefetchHandler', function($mmaModData, mmaModDataComponent, $mmFilepool, $q, $mmUtil, $mmPrefetchFactory) {
+.factory('$mmaModDataPrefetchHandler', function($mmaModData, mmaModDataComponent, $mmFilepool, $q, $mmUtil, $mmPrefetchFactory,
+        $mmSite, $mmGroups) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModDataComponent);
 
     // RegExp to check if a module has updates based on the result of $mmCoursePrefetchDelegate#getCourseUpdates.
-    self.updatesNames = /^configuration$|^.*files$|^entries|^gradeitems$|^outcomes$|^comments$|^ratings/;
+    self.updatesNames = /^configuration$|^.*files$|^entries$|^gradeitems$|^outcomes$|^comments$|^ratings/;
 
     /**
      * Download the module.
@@ -55,17 +56,115 @@ angular.module('mm.addons.mod_data')
      * @return {Promise}          Promise resolved with the list of files.
      */
     self.getFiles = function(module, courseId, siteId) {
-        var files = [];
-        return $mmaModData.getDatabase(courseId, module.id, siteId).then(function(database) {
-            // Get intro files.
-            files = self.getIntroFilesFromInstance(module, database);
-            return files;
-        }).catch(function() {
-            // Any error, return the list we have.
-            return files;
+        siteId = siteId || $mmSite.getId();
+
+        return getDatabaseInfoHelper(module, courseId, true, undefined, undefined, siteId).then(function(info) {
+            return info.files;
         });
     };
 
+    /**
+     * Helper function to get all database info just once.
+     *
+     * @param  {Object}  module         Module to get the files.
+     * @param  {Number}  courseId       Course ID the module belongs to.
+     * @param  {Boolean} [omitFail]     True to always return even if fails. Default false.
+     * @param  {Boolean} [forceCache]   True to always get the value from cache, false otherwise. Default false.
+     * @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}                Promise resolved with the info fetched.
+     */
+    function getDatabaseInfoHelper(module, courseId, omitFail, forceCache, ignoreCache, siteId) {
+        var database,
+            groups = [],
+            entries = [],
+            files = [];
+
+        return $mmaModData.getDatabase(courseId, module.id, siteId, forceCache).then(function(data) {
+            files = self.getIntroFilesFromInstance(module, database);
+
+            database = data;
+            return $mmGroups.getActivityGroupInfo(module.id, false, undefined, siteId).then(function(groupInfo) {
+                if (!groupInfo.groups || groupInfo.groups.length == 0) {
+                    groupInfo.groups = [{id: 0}];
+                }
+                groups = groupInfo.groups;
+
+                return getAllUniqueEntries(database.id, groups, forceCache, ignoreCache, siteId);
+            });
+        }).then(function(uniqueEntries) {
+            entries = uniqueEntries;
+            files = files.concat(getEntriesFiles(entries));
+
+            return {
+                database: database,
+                groups: groups,
+                entries: entries,
+                files: files
+            };
+        }).catch(function(message) {
+            if (omitFail) {
+                // Any error, return the info we have.
+                return {
+                    database: database,
+                    groups: groups,
+                    entries: entries,
+                    files: files
+                };
+            }
+            return $q.reject(message);
+        });
+    }
+
+    /**
+     * Retrieves all the entries for all the groups and then returns only unique entries.
+     *
+     * @param  {Number}  dataId         Database Id.
+     * @param  {Array}   groups         Array of groups in the activity.
+     * @param  {Boolean} [forceCache]   True to always get the value from cache, false otherwise. Default false.
+     * @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}                All unique entries.
+     */
+    function getAllUniqueEntries(dataId, groups, forceCache, ignoreCache, siteId) {
+        var promises = [];
+
+        angular.forEach(groups, function(group) {
+            promises.push($mmaModData.fetchAllEntries(dataId, group.id, undefined, undefined, undefined, forceCache,
+                ignoreCache, siteId));
+        });
+
+        return $q.all(promises).then(function(responses) {
+            var uniqueEntries = {};
+
+            angular.forEach(responses, function(groupEntries) {
+                angular.forEach(groupEntries.entries, function(entry) {
+                    uniqueEntries[entry.id] = entry;
+                });
+            });
+
+            return uniqueEntries;
+        });
+    }
+
+    /**
+     * Returns the file contained in the entries.
+     *
+     * @param  {Array} entries  List of entries to get files from.
+     * @return {Array}          List of files.
+     */
+    function getEntriesFiles(entries) {
+        var files = [];
+
+        angular.forEach(entries, function(entry) {
+            angular.forEach(entry.contents, function(content) {
+                files = files.concat(content.files);
+            });
+        });
+
+        return files;
+    }
+
     /**
      * Returns database intro files.
      *
@@ -217,16 +316,18 @@ angular.module('mm.addons.mod_data')
      * @return {Promise}         Promise resolved with an object with 'revision' and 'timemod'.
      */
     function prefetchDatabase(module, courseId, single, siteId) {
-        // Prefetch the database data.
-        return $mmaModData.getDatabase(courseId, module.id, siteId).then(function(database) {
-            var promises = [];
+        siteId = siteId || $mmSite.getId();
 
-            promises.push(self.getFiles(module, courseId, siteId).then(function(files) {
-                return $mmFilepool.addFilesToQueueByUrl(siteId, files, self.component, module.id);
-            }));
+        // Prefetch the database data.
+        return getDatabaseInfoHelper(module, courseId, false, true, siteId).then(function(info) {
+            var database = info.database,
+                promises = [];
 
-            promises.push($mmaModData.getDatabaseAccessInformation(database.id, false, true, siteId));
+            promises.push($mmFilepool.addFilesToQueueByUrl(siteId, info.files, self.component, module.id));
 
+            angular.forEach(info.groups, function(group) {
+                promises.push($mmaModData.getDatabaseAccessInformation(database.id, group.id, false, true, siteId));
+            });
             return $q.all(promises);
         }).then(function() {
             // Get revision and timemodified.
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
index fb4bf06e2ed..3e4cf439b8a 100644
--- a/www/addons/mod/data/templates/index.html
+++ b/www/addons/mod/data/templates/index.html
@@ -1,18 +1,18 @@
 <ion-view>
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
     <ion-nav-buttons side="secondary">
-        <button ng-show="numEntries > 0" class="button button-icon ion-ios-search-strong" ng-click="gotoSearch($event)" aria-label="{{ 'mma.mod_data.search' | translate }}"></button>
+        <button ng-show="!isEmpty" class="button button-icon ion-ios-search-strong" ng-click="gotoSearch($event)" aria-label="{{ 'mma.mod_data.search' | translate }}"></button>
         <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="databaseLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshDatabase(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
             <mm-context-menu-item priority="600" ng-if="databaseLoaded && hasOffline && isOnline" content="'mm.settings.synchronizenow' | translate" action="refreshDatabase(true)" icon-action="syncIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
-            <mm-context-menu-item priority="500" ng-if="canAdd" content="'mma.mod_data.addentries' | translate" icon-action="'ion-plus-round'" action="gotoAddEntries($event)"></mm-context-menu-item>
+            <mm-context-menu-item priority="500" ng-if="access.canaddentry" content="'mma.mod_data.addentries' | translate" icon-action="'ion-plus-round'" action="gotoAddEntries($event)"></mm-context-menu-item>
             <mm-context-menu-item priority="400" ng-if="timemodified" content="timemodified" icon-action="prefetchStatusIcon" action="prefetch()" close-on-click="false"></mm-context-menu-item>
             <mm-context-menu-item priority="300" 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 padding="true" mm-state-class delegate-handle="mmaModDataIndexScroll">
+    <ion-content mm-state-class delegate-handle="mmaModDataIndexScroll">
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="databaseLoaded" on-refresh="refreshDatabase(false)"></ion-refresher>
         <mm-loading hide-until="databaseLoaded">
             <div class="card" ng-if="description" ng-click="expandDescription()">
@@ -20,23 +20,40 @@
                     <mm-format-text max-height="120" fullview-on-click="true" component="{{dataComponent}}" component-id="{{data.cmid}}">{{ description }}</mm-format-text>
                 </div>
             </div>
-            <div class="mm-info-card-icon" ng-if="timeAvailableFrom">
+
+            <div ng-if="(groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
+                <ion-label id="mma-data-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                <ion-label id="mma-data-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-data-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+                </select>
+            </div>
+            <div class="mm-info-card-icon" ng-if="!access.timeavailable && timeAvailableFrom">
                 <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.notopenyet' | translate:{$a: timeAvailableFromReadable} }}
             </div>
 
-            <div class="mm-info-card-icon" ng-if="timeAvailableTo">
+            <div class="mm-info-card-icon" ng-if="!access.timeavailable && timeAvailableTo">
                 <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.expired' | translate:{$a: timeAvailableToReadable} }}
             </div>
 
-            <div class="mm-info-card-icon" ng-if="entriesLeftToView">
-                <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.entrieslefttoaddtoview' | translate:{$a: {entrieslefttoview: entriesLeftToView} } }}
+            <div class="mm-info-card-icon" ng-if="access.entrieslefttoview">
+                <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.entrieslefttoaddtoview' | translate:{$a: {entrieslefttoview: access.entrieslefttoview} } }}
             </div>
 
-            <div class="mm-info-card-icon" ng-if="entriesLeftToAdd">
-                <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.entrieslefttoadd' | translate:{$a: {entriesleft: entriesLeftToAdd} } }}
+            <div class="mm-info-card-icon" ng-if="access.entrieslefttoadd">
+                <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.entrieslefttoadd' | translate:{$a: {entriesleft: access.entrieslefttoadd} } }}
+            </div>
+
+            <div class="mm-data-contents mma-data-entries-{{data.id}}" ng-if="!isEmpty">
+                <style ng-if="cssTemplate">
+                    {{ cssTemplate }}
+                </style>
+
+                <mm-format-text component="{{dataComponent}}" component-id="{{data.cmid}}" watch="true">
+                    {{ entries }}
+                </mm-format-text>
             </div>
 
-            <mm-empty-box ng-if="numEntries === 0" icon="ion-archive" message="{{ 'mma.mod_data.norecords' | translate}}"></mm-empty-box>
+            <mm-empty-box ng-if="isEmpty" icon="ion-archive" message="{{ 'mma.mod_data.norecords' | translate}}"></mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/core/lib/groups.js b/www/core/lib/groups.js
index 651af503e29..e549a5866dd 100644
--- a/www/core/lib/groups.js
+++ b/www/core/lib/groups.js
@@ -93,6 +93,7 @@ angular.module('mm.core')
      * @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.
+     *                                      Always true for visible groups.
      * @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.
@@ -120,7 +121,7 @@ angular.module('mm.core')
                 groupInfo.separateGroups = false;
                 groupInfo.visibleGroups = false;
             } else {
-                if (addAllParts) {
+                if (addAllParts || groupInfo.visibleGroups) {
                     groupInfo.groups = [
                         {'id': 0, 'name': $translate.instant('mm.core.allparticipants')}
                     ];
diff --git a/www/core/scss/fontawesome.scss b/www/core/scss/fontawesome.scss
new file mode 100644
index 00000000000..ca630e76d74
--- /dev/null
+++ b/www/core/scss/fontawesome.scss
@@ -0,0 +1,44 @@
+/** This file is intended to translate fontawesome to ionicons while the font is not supported */
+
+.fa.icon {
+    @extend .ion;
+}
+
+.fa {
+    font-size: $button-icon-size;
+    width: $button-icon-size;
+    height: $button-icon-size;
+}
+
+/** Fixed width */
+.fa-fw {
+  width: (18em / 14);
+  text-align: center;
+}
+
+/** Uncomment for dev purposes, it will show an asterisk in red where a missing icon is */
+/*.fa:before {
+    color: red !important;
+    content: $ionicon-var-asterisk;
+}*/
+
+/** Icons translation */
+.fa-search-plus:before {
+    content: $ionicon-var-ios-search-strong;
+}
+
+.fa-cog:before {
+    content: $ionicon-var-gear-b;
+}
+
+.fa-trash:before {
+    content: $ionicon-var-trash-a;
+}
+
+.fa-thumbs-up:before {
+    content: $ionicon-var-thumbsup;
+}
+
+.fa-thumbs-down:before {
+    content: $ionicon-var-thumbsdown;
+}
\ No newline at end of file

From 46d6f28278b8578801fb7baf7f049932dd3b9723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 6 Jun 2017 10:42:08 +0200
Subject: [PATCH 009/118] MOBILE-2119 data: Show single view entries

---
 www/addons/mod/data/controllers/entry.js      | 172 ++++++++++++++++++
 www/addons/mod/data/controllers/index.js      |   3 -
 www/addons/mod/data/main.js                   |  21 ++-
 www/addons/mod/data/services/data.js          |  83 ++++++---
 www/addons/mod/data/services/handlers.js      |  61 ++++++-
 www/addons/mod/data/services/helper.js        |  85 ++++++++-
 .../mod/data/services/prefetch_handler.js     |  14 +-
 www/addons/mod/data/templates/entry.html      |  37 ++++
 www/addons/mod/data/templates/index.html      |   4 +-
 9 files changed, 446 insertions(+), 34 deletions(-)
 create mode 100644 www/addons/mod/data/controllers/entry.js
 create mode 100644 www/addons/mod/data/templates/entry.html

diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
new file mode 100644
index 00000000000..644aae9f69d
--- /dev/null
+++ b/www/addons/mod/data/controllers/entry.js
@@ -0,0 +1,172 @@
+// (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_data')
+
+/**
+ * Data entry controller.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc controller
+ * @name mmaModDataEntryCtrl
+ */
+.controller('mmaModDataEntryCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $q,
+        $mmText, $translate, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups, $ionicScrollDelegate) {
+
+    var module = $stateParams.module || {},
+        courseId = $stateParams.courseid,
+        entryId = $stateParams.entryid || false,
+        page = $stateParams.page || false,
+        data,
+        scrollView;
+
+    $scope.title = module.name;
+    $scope.description = module.description;
+    $scope.moduleUrl = module.url;
+    $scope.moduleName = $mmCourse.translateModuleName('data');
+    $scope.component = mmaModDataComponent;
+    $scope.databaseLoaded = false;
+    $scope.selectedGroup = $stateParams.group || 0;
+
+    function fetchEntryData(refresh) {
+        return $mmaModData.getDatabase(courseId, module.id).then(function(databaseData) {
+            data = databaseData;
+
+            $scope.title = data.name || $scope.title;
+            $scope.description = data.intro || $scope.description;
+            $scope.data = databaseData;
+
+            $scope.database = data;
+
+            return setEntryIdFromPage(data.id, page, $scope.selectedGroup).then(function() {
+                return $mmaModData.getDatabaseAccessInformation(data.id);
+            });
+        }).then(function(accessData) {
+            return $mmGroups.getActivityGroupInfo(data.coursemodule, accessData.canmanageentries).then(function(groupInfo) {
+                $scope.groupInfo = groupInfo;
+
+                // Check selected group is accessible.
+                if (groupInfo && groupInfo.groups && groupInfo.groups.length > 0) {
+                    var found = false;
+                    for (var x in groupInfo.groups) {
+                        if (groupInfo.groups[x].id == $scope.selectedGroup) {
+                            found = true;
+                            break;
+                        }
+                    }
+                    if (!found) {
+                        $scope.selectedGroup = groupInfo.groups[0].id;
+                    }
+                }
+
+                return $mmaModData.getEntry(data.id, entryId);
+            });
+        }).then(function(entry) {
+            $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
+            $scope.entryContents = entry.entryviewcontents;
+
+            return $mmaModDataHelper.getPageInfoByEntry(data.id, entryId, $scope.selectedGroup).then(function(result) {
+                $scope.previousId = result.previousId;
+                $scope.nextId = result.nextId;
+            });
+        }).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() {
+            scrollTop();
+            $scope.databaseLoaded = true;
+        });
+    }
+
+    // Set group to see the database.
+    $scope.setGroup = function(groupId) {
+        $scope.selectedGroup = groupId;
+        $scope.databaseLoaded = false;
+
+        return setEntryIdFromPage(data.id, 0, $scope.selectedGroup).then(function() {
+            return fetchEntryData();
+        });
+    };
+
+    // Go to selected entry without changing state.
+    $scope.gotoEntry = function(entry) {
+        entryId = entry;
+        page = false;
+        $scope.databaseLoaded = false;
+        return fetchEntryData();
+
+    };
+
+    // Convenience function to refresh all the data.
+    function refreshAllData() {
+        var promises = [];
+
+        promises.push($mmaModData.invalidateDatabaseData(courseId));
+        if (data) {
+            promises.push($mmaModData.invalidateEntryData(data.id, entryId));
+            promises.push($mmGroups.invalidateActivityGroupInfo(data.coursemodule));
+            promises.push($mmaModData.invalidateEntriesData(data.id));
+        }
+
+        return $q.all(promises).finally(function() {
+            return fetchEntryData(true);
+        });
+    }
+
+    // Convenience function to translate page number to entry identifier.
+    function setEntryIdFromPage(dataId, pageNumber, group) {
+        if (pageNumber !== false) {
+            return $mmaModDataHelper.getPageInfoByPage(dataId, pageNumber, group).then(function(result) {
+                entryId = result.entryId;
+                page = false;
+            });
+        }
+
+        return $q.when();
+    }
+
+    fetchEntryData();
+
+    // Scroll to top.
+    function scrollTop() {
+        if (!scrollView) {
+            scrollView = $ionicScrollDelegate.$getByHandle('mmaModDataEntryScroll');
+        }
+        scrollView && scrollView.scrollTop && scrollView.scrollTop();
+    }
+
+    // Context Menu Description action.
+    $scope.expandDescription = function() {
+        $mmText.expandText($translate.instant('mm.core.description'), $scope.description, false, mmaModDataComponent, module.id);
+    };
+
+    // Pull to refresh.
+    $scope.refreshDatabase = function() {
+        if ($scope.databaseLoaded) {
+            return refreshAllData().finally(function() {
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        }
+    };
+
+    // Opens search.
+    $scope.gotoSearch = function() {
+        $mmUtil.openInApp($mmSite.getURL() + '/mod/data/view.php?mode=asearch&d=' + data.id);
+    };
+});
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 442ca61b38b..35f52d9c5fd 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -36,7 +36,6 @@ angular.module('mm.addons.mod_data')
     $scope.refreshIcon = 'spinner';
     $scope.syncIcon = 'spinner';
     $scope.component = mmaModDataComponent;
-    $scope.componentId = module.id;
     $scope.databaseLoaded = false;
     $scope.selectedGroup = $stateParams.group || 0;
 
@@ -135,8 +134,6 @@ angular.module('mm.addons.mod_data')
         });
     };
 
-
-
     // Convenience function to refresh all the data.
     function refreshAllData(sync, showErrors) {
         var promises = [];
diff --git a/www/addons/mod/data/main.js b/www/addons/mod/data/main.js
index 38a967c9627..01408a1af9a 100644
--- a/www/addons/mod/data/main.js
+++ b/www/addons/mod/data/main.js
@@ -33,6 +33,24 @@ angular.module('mm.addons.mod_data', ['mm.core'])
                 templateUrl: 'addons/mod/data/templates/index.html'
             }
         }
+    })
+
+    .state('site.mod_data-entry', {
+        url: '/mod_data-entry',
+        params: {
+            module: null,
+            moduleid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            courseid: null,
+            entryid: null,
+            page: null,
+            group: null
+        },
+        views: {
+            'site': {
+                controller: 'mmaModDataEntryCtrl',
+                templateUrl: 'addons/mod/data/templates/entry.html'
+            }
+        }
     });
 
 })
@@ -41,4 +59,5 @@ angular.module('mm.addons.mod_data', ['mm.core'])
     $mmCourseDelegateProvider.registerContentHandler('mmaModData', 'data', '$mmaModDataHandlers.courseContent');
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModData', 'data', '$mmaModDataPrefetchHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:index', '$mmaModDataHandlers.indexLinksHandler');
-});
\ No newline at end of file
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:entry', '$mmaModDataHandlers.showEntryLinksHandler');
+});
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index beb2df25881..7c27dd20779 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -89,6 +89,17 @@ angular.module('mm.addons.mod_data')
         return getEntriesPrefixCacheKey(dataId) + groupId;
     }
 
+    /**
+     * Get cache key for database entry data WS calls.
+     *
+     * @param {Number} dataId     Data ID for caching purposes.
+     * @param {Number} entryId    Entry ID.
+     * @return {String}           Cache key.
+     */
+    function getEntryCacheKey(dataId, entryId) {
+        return getDatabaseDataPrefixCacheKey(dataId) + ':entry:' + entryId;
+    }
+
     /**
      * Get cache key for database fields data WS calls.
      *
@@ -297,7 +308,10 @@ angular.module('mm.addons.mod_data')
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     databaseid: dataId,
-                    returncontents: 1
+                    returncontents: 1,
+                    page: page || 0,
+                    perpage: perPage || 0,
+                    groupid: groupId || 0
                 },
                 preSets = {
                     cacheKey: getEntriesCacheKey(dataId, groupId)
@@ -307,22 +321,10 @@ angular.module('mm.addons.mod_data')
                 params.sort = sort;
             }
 
-            if (order) {
+            if (typeof order !== "undefined") {
                 params.order = order;
             }
 
-            if (page) {
-                params.page = page;
-            }
-
-            if (perPage) {
-                params.perpage = perPage;
-            }
-
-            if (typeof groupId !== "undefined") {
-                params.groupid = groupId;
-            }
-
             if (forceCache) {
                 preSets.omitExpires = true;
             } else if (ignoreCache) {
@@ -350,6 +352,48 @@ angular.module('mm.addons.mod_data')
         });
     };
 
+    /**
+     * Get an entry of the database activity.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#getEntry
+     * @param   {Number}    dataId          Data ID for caching purposes.
+     * @param   {Number}    entryId         Entry ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the database entry is retrieved.
+     */
+    self.getEntry = function(dataId, entryId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    entryid: entryId,
+                    returncontents: 1
+                },
+                preSets = {
+                    cacheKey: getEntryCacheKey(dataId, entryId)
+                };
+
+            return site.read('mod_data_get_entry', params, preSets);
+        });
+    };
+
+    /**
+     * Invalidates database entry data.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#invalidateEntryData
+     * @param  {Number}  dataId     Data ID for caching purposes.
+     * @param  {Number}  entryId    Entry ID.
+     * @param  {String}  [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved when the data is invalidated.
+     */
+    self.invalidateEntryData = function(dataId, entryId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.invalidateWsCacheForKey(getEntryCacheKey(dataId, entryId));
+        });
+    };
+
     /**
      * Get the list of configured fields for the given database.
      *
@@ -412,11 +456,6 @@ angular.module('mm.addons.mod_data')
      */
     self.fetchAllEntries = function(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, siteId) {
         siteId = siteId || $mmSite.getId();
-
-        if (typeof perPage == 'undefined') {
-            perPage = 10;
-        }
-
         return fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, [], 0, siteId);
     };
 
@@ -440,9 +479,9 @@ angular.module('mm.addons.mod_data')
             entries = entries.concat(result.entries);
 
             var canLoadMore = ((page + 1) * perPage) < result.totalcount;
-            if (canLoadMore) {
-                return fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, entries,
-                    page + 1, siteId);
+            if (perPage && canLoadMore) {
+                return fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, entries, page + 1,
+                    siteId);
             }
             return entries;
         });
diff --git a/www/addons/mod/data/services/handlers.js b/www/addons/mod/data/services/handlers.js
index 4220d647011..19b727ce4be 100644
--- a/www/addons/mod/data/services/handlers.js
+++ b/www/addons/mod/data/services/handlers.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
  * @name $mmaModDataHandlers
  */
 .factory('$mmaModDataHandlers', function($mmCourse, $mmaModData, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite,
-        mmaModDataComponent, $mmaModDataPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded,
+        mmaModDataComponent, $mmaModDataPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded, $mmContentLinkHandlerFactory,
         mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate) {
     var self = {};
 
@@ -156,5 +156,64 @@ angular.module('mm.addons.mod_data')
     self.indexLinksHandler = $mmContentLinksHelper.createModuleIndexLinkHandler('mmaModData', 'data', $mmaModData);
 
 
+    /**
+     * Content links handler for database show entry.
+     * Match mod/data/view.php?d=6&rid=5 with a valid data id and entryid.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHandlers#showEntryLinksHandler
+     */
+    self.showEntryLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/data\/view\.php.*([\?\&](d|rid|page|group|mode)=\d+)/, '$mmCourseDelegate_mmaModData');
+
+    // Check if the printLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.showEntryLinksHandler.isEnabled = $mmaModData.isPluginEnabled;
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.showEntryLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        if (typeof params.d == 'undefined') {
+            // Id not defined. Cannot treat the URL.
+            return false;
+        }
+
+        if ((!params.mode || params.mode != "single") && typeof params.rid == 'undefined') {
+            return false;
+        }
+
+        return [{
+            action: function(siteId) {
+                var modal = $mmUtil.showModalLoading(),
+                    dataId = parseInt(params.d, 10),
+                    rId = parseInt(params.rid, 10) || false,
+                    group = parseInt(params.group, 10) || false,
+                    page = parseInt(params.page, 10) || false;
+
+                return $mmCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId).then(function(module) {
+                    var stateParams = {
+                        moduleid: module.id,
+                        module: module,
+                        courseid: module.course
+                    };
+
+                    if (group) {
+                        stateParams.group = group;
+                    }
+
+                    if (params.mode && params.mode == "single") {
+                        stateParams.page = page || 1;
+                    } else if (rId) {
+                        stateParams.entryid = rId;
+                    }
+
+
+                    return $mmContentLinksHelper.goInSite('site.mod_data-entry', stateParams, siteId);
+                }).finally(function() {
+                    modal.dismiss();
+                });
+            }
+        }];
+    };
+
     return self;
 });
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index d2647d6c648..d625a691374 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataHelper
  */
-.factory('$mmaModDataHelper', function() {
+.factory('$mmaModDataHelper', function($mmaModData) {
 
     var self = {};
 
@@ -47,5 +47,86 @@ angular.module('mm.addons.mod_data')
         return css.replace(regExp, prefix + " $1 $2");
     };
 
+
+    /**
+     * Get page info related to an entry.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getPageInfoByEntry
+     * @param  {Number}    dataId          Data ID.
+     * @param  {Number}    entryId         Entry ID.
+     * @param  {Number}    groupId         Group ID.
+     * @param  {String}    siteId          Site ID. Current if not defined.
+     * @return {Promise}        Containing page number, if has next and have following page.
+     */
+    self.getPageInfoByEntry = function(dataId, entryId, groupId, siteId) {
+        return self.getAllEntriesIds(dataId, groupId, siteId).then(function(entries) {
+            for (var index in entries) {
+                if (entries[index] == entryId) {
+                    index = parseInt(index, 10);
+                    return {
+                        previousId: entries[index - 1] || false,
+                        nextId: entries[index + 1] || false,
+                        entryId: entryId,
+                        page: index + 1, // Parsed to natural language.
+                        numEntries: entries.length
+                    };
+                }
+            }
+            return false;
+        });
+    };
+
+    /**
+     * Get page info related to an entry by page number.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getPageInfoByPage
+     * @param  {Number}    dataId          Data ID.
+     * @param  {Number}    page            Page number.
+     * @param  {Number}    groupId         Group ID.
+     * @param  {String}    siteId          Site ID. Current if not defined.
+     * @return {Promise}        Containing page number, if has next and have following page.
+     */
+    self.getPageInfoByPage = function(dataId, page, groupId, siteId) {
+        return self.getAllEntriesIds(dataId, groupId, siteId).then(function(entries) {
+            var index = parseInt(page, 10) - 1,
+                entryId = entries[index];
+            if (entryId) {
+                return {
+                    previousId: entries[index - 1] || false,
+                    nextId: entries[index + 1] || false,
+                    entryId: entryId,
+                    page: page, // Parsed to natural language.
+                    numEntries: entries.length
+                };
+            }
+            return false;
+        });
+    };
+
+    /**
+     * Fetch all entries and return it's Id
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getAllEntriesIds
+     * @param  {Number}    dataId          Data ID.
+     * @param  {Number}    groupId         Group ID.
+     * @param  {String}    siteId          Site ID. Current if not defined.
+     * @return {Promise}        Containing and array of EntryId.
+     */
+    self.getAllEntriesIds = function(dataId, groupId, siteId) {
+        return $mmaModData.fetchAllEntries(dataId, groupId, undefined, undefined, undefined, true, undefined, siteId)
+                .then(function(entries) {
+            return entries.map(function(entry) {
+                return entry.id;
+            });
+        });
+    };
+
+
     return self;
-});
\ No newline at end of file
+});
diff --git a/www/addons/mod/data/services/prefetch_handler.js b/www/addons/mod/data/services/prefetch_handler.js
index c9b1e05bab1..7f22770fca7 100644
--- a/www/addons/mod/data/services/prefetch_handler.js
+++ b/www/addons/mod/data/services/prefetch_handler.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
  * @name $mmaModDataPrefetchHandler
  */
 .factory('$mmaModDataPrefetchHandler', function($mmaModData, mmaModDataComponent, $mmFilepool, $q, $mmUtil, $mmPrefetchFactory,
-        $mmSite, $mmGroups) {
+        $mmSite, $mmGroups, $mmCourse) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModDataComponent);
 
@@ -138,7 +138,7 @@ angular.module('mm.addons.mod_data')
             var uniqueEntries = {};
 
             angular.forEach(responses, function(groupEntries) {
-                angular.forEach(groupEntries.entries, function(entry) {
+                angular.forEach(groupEntries, function(entry) {
                     uniqueEntries[entry.id] = entry;
                 });
             });
@@ -326,8 +326,16 @@ angular.module('mm.addons.mod_data')
             promises.push($mmFilepool.addFilesToQueueByUrl(siteId, info.files, self.component, module.id));
 
             angular.forEach(info.groups, function(group) {
-                promises.push($mmaModData.getDatabaseAccessInformation(database.id, group.id, false, true, siteId));
+               promises.push($mmaModData.getDatabaseAccessInformation(database.id, group.id, false, true, siteId));
             });
+
+            angular.forEach(info.entries, function(entry) {
+                promises.push($mmaModData.getEntry(database.id, entry.id, siteId));
+            });
+
+            // Add Basic Info to manage links.
+            promises.push($mmCourse.getModuleBasicInfoByInstance(database.id, 'data', siteId));
+
             return $q.all(promises);
         }).then(function() {
             // Get revision and timemodified.
diff --git a/www/addons/mod/data/templates/entry.html b/www/addons/mod/data/templates/entry.html
new file mode 100644
index 00000000000..759db3c2cc0
--- /dev/null
+++ b/www/addons/mod/data/templates/entry.html
@@ -0,0 +1,37 @@
+<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>
+    </ion-nav-buttons>
+    <ion-content mm-state-class delegate-handle="mmaModDataEntryScroll">
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="databaseLoaded" on-refresh="refreshDatabase(false)"></ion-refresher>
+        <mm-loading hide-until="databaseLoaded">
+            <div ng-if="(groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
+                <ion-label id="mma-data-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                <ion-label id="mma-data-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-data-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+                </select>
+            </div>
+            <div class="mm-data-contents mma-data-entries-{{data.id}}">
+                <style ng-if="cssTemplate">
+                    {{ cssTemplate }}
+                </style>
+
+                <mm-format-text component="{{component}}" component-id="{{data.cmid}}" watch="true">
+                    {{ entryContents }}
+                </mm-format-text>
+            </div>
+            <div ng-if="previousId || nextId" class="item item-text-wrap row-buttons responsive-sm">
+                <button ng-if="previousId" class="button button-block icon-left ion-chevron-left" ng-click="gotoEntry(previousId)">
+                    {{ 'mm.core.previous' | translate }}
+                </button>
+                <button ng-if="nextId" class="button button-block button-positive icon-right ion-chevron-right" ng-click="gotoEntry(nextId)">
+                    {{ 'mm.core.next' | translate }}
+                </button>
+            </div>
+        </mm-loading>
+    </ion-content>
+</ion-view>
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
index 3e4cf439b8a..1c9b7e7623e 100644
--- a/www/addons/mod/data/templates/index.html
+++ b/www/addons/mod/data/templates/index.html
@@ -17,7 +17,7 @@
         <mm-loading hide-until="databaseLoaded">
             <div class="card" ng-if="description" ng-click="expandDescription()">
                 <div class="item item-text-wrap">
-                    <mm-format-text max-height="120" fullview-on-click="true" component="{{dataComponent}}" component-id="{{data.cmid}}">{{ description }}</mm-format-text>
+                    <mm-format-text max-height="120" fullview-on-click="true" component="{{component}}" component-id="{{data.cmid}}">{{ description }}</mm-format-text>
                 </div>
             </div>
 
@@ -48,7 +48,7 @@
                     {{ cssTemplate }}
                 </style>
 
-                <mm-format-text component="{{dataComponent}}" component-id="{{data.cmid}}" watch="true">
+                <mm-format-text component="{{component}}" component-id="{{data.cmid}}" watch="true">
                     {{ entries }}
                 </mm-format-text>
             </div>

From 75ea51da66689b14a6c67011ae07681866d83e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 9 Jun 2017 12:49:33 +0200
Subject: [PATCH 010/118] MOBILE-2123 data: Approve/Disapprove entries

---
 www/addons/mod/data/controllers/entry.js | 17 ++++++-
 www/addons/mod/data/controllers/index.js | 13 +++++-
 www/addons/mod/data/lang/en.json         |  3 ++
 www/addons/mod/data/main.js              |  2 +
 www/addons/mod/data/services/data.js     | 22 +++++++++
 www/addons/mod/data/services/handlers.js | 59 ++++++++++++++++++++++--
 www/core/scss/fontawesome.scss           |  4 ++
 7 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index 644aae9f69d..6951ca54d8d 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -21,14 +21,15 @@ angular.module('mm.addons.mod_data')
  * @ngdoc controller
  * @name mmaModDataEntryCtrl
  */
-.controller('mmaModDataEntryCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $q,
-        $mmText, $translate, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups, $ionicScrollDelegate) {
+.controller('mmaModDataEntryCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $q, $mmEvents,
+        $mmText, $translate, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups, $ionicScrollDelegate, mmaModDataEventEntryChanged) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         entryId = $stateParams.entryid || false,
         page = $stateParams.page || false,
         data,
+        entryChangedObserver,
         scrollView;
 
     $scope.title = module.name;
@@ -169,4 +170,16 @@ angular.module('mm.addons.mod_data')
     $scope.gotoSearch = function() {
         $mmUtil.openInApp($mmSite.getURL() + '/mod/data/view.php?mode=asearch&d=' + data.id);
     };
+
+    // Refresh entry on change.
+    entryChangedObserver = $mmEvents.on(mmaModDataEventEntryChanged, function(eventData) {
+        if (eventData.entryId == entryId && data.id == eventData.dataId && $mmSite.getId() == eventData.siteId) {
+            $scope.databaseLoaded = false;
+            return fetchEntryData(true);
+        }
+    });
+
+    $scope.$on('$destroy', function() {
+        entryChangedObserver && entryChangedObserver.off && entryChangedObserver.off();
+    });
 });
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 35f52d9c5fd..ffe7c433a1a 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -22,11 +22,13 @@ angular.module('mm.addons.mod_data')
  * @name mmaModDataIndexCtrl
  */
 .controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
-        $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups) {
+        $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups,
+        mmaModDataEventEntryChanged) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         data,
+        entryChangedObserver,
         onlineObserver;
 
     $scope.title = module.name;
@@ -201,7 +203,16 @@ angular.module('mm.addons.mod_data')
         $scope.isOnline = online;
     });
 
+    // Refresh entry on change.
+    entryChangedObserver = $mmEvents.on(mmaModDataEventEntryChanged, function(eventData) {
+        if (data.id == eventData.dataId && $mmSite.getId() == eventData.siteId) {
+            $scope.databaseLoaded = false;
+            return fetchDatabaseData(true);
+        }
+    });
+
     $scope.$on('$destroy', function() {
         onlineObserver && onlineObserver.off && onlineObserver.off();
+        entryChangedObserver && entryChangedObserver.off && entryChangedObserver.off();
     });
 });
diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index 5fc410aa1c6..76b50d2082a 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -2,8 +2,11 @@
     "addentries": "Add entries",
     "entrieslefttoadd": "You must add {{$a.entriesleft}} more entry/entries in order to complete this activity",
     "entrieslefttoaddtoview": "You must add {{$a.entrieslefttoview}} more entry/entries before you can view other participants' entries.",
+    "errorapproving": "Error approving or unapproving entry.",
     "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "norecords": "No entries in database",
     "notopenyet": "Sorry, this activity is not available until {{$a}}",
+    "recordapproved": "Entry approved",
+    "recorddisapproved": "Entry unapproved",
     "search": "Search"
 }
diff --git a/www/addons/mod/data/main.js b/www/addons/mod/data/main.js
index 01408a1af9a..05b351dde8c 100644
--- a/www/addons/mod/data/main.js
+++ b/www/addons/mod/data/main.js
@@ -15,6 +15,7 @@
 angular.module('mm.addons.mod_data', ['mm.core'])
 
 .constant('mmaModDataComponent', 'mmaModData')
+.constant('mmaModDataEventEntryChanged', 'mma-mod_data_entry_changed')
 
 .config(function($stateProvider) {
 
@@ -60,4 +61,5 @@ angular.module('mm.addons.mod_data', ['mm.core'])
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModData', 'data', '$mmaModDataPrefetchHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:index', '$mmaModDataHandlers.indexLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:entry', '$mmaModDataHandlers.showEntryLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:approve', '$mmaModDataHandlers.approveEntryLinksHandler');
 });
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 7c27dd20779..28fcdfceab4 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -394,6 +394,28 @@ angular.module('mm.addons.mod_data')
         });
     };
 
+    /**
+     * Approves or unapproves an entry.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#approveEntry
+     * @param   {Number}    entryId         Entry ID.
+     * @param   {Boolean}   approve         Whether to approve (true) or unapprove the entry.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the database entry is retrieved.
+     */
+    self.approveEntry = function(entryId, approve, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    entryid: entryId,
+                    approve: approve ? 1 : 0
+                };
+
+            return site.write('mod_data_approve_entry', params);
+        });
+    };
+
     /**
      * Get the list of configured fields for the given database.
      *
diff --git a/www/addons/mod/data/services/handlers.js b/www/addons/mod/data/services/handlers.js
index 19b727ce4be..b02f707520a 100644
--- a/www/addons/mod/data/services/handlers.js
+++ b/www/addons/mod/data/services/handlers.js
@@ -21,9 +21,9 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataHandlers
  */
-.factory('$mmaModDataHandlers', function($mmCourse, $mmaModData, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite,
+.factory('$mmaModDataHandlers', function($mmCourse, $mmaModData, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite, $q,
         mmaModDataComponent, $mmaModDataPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded, $mmContentLinkHandlerFactory,
-        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate) {
+        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate, mmaModDataEventEntryChanged) {
     var self = {};
 
     /**
@@ -167,7 +167,7 @@ angular.module('mm.addons.mod_data')
     self.showEntryLinksHandler = $mmContentLinkHandlerFactory.createChild(
                 /\/mod\/data\/view\.php.*([\?\&](d|rid|page|group|mode)=\d+)/, '$mmCourseDelegate_mmaModData');
 
-    // Check if the printLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    // Check if the showEntryLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
     self.showEntryLinksHandler.isEnabled = $mmaModData.isPluginEnabled;
 
     // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
@@ -215,5 +215,58 @@ angular.module('mm.addons.mod_data')
         }];
     };
 
+     /**
+     * Content links handler for database approve/disapprove entry.
+     * Match mod/data/view.php?d=6&approve=5 with a valid data id and entryid.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHandlers#approveEntryLinksHandler
+     */
+    self.approveEntryLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/data\/view\.php.*([\?\&](d|approve|disapprove)=\d+)/, '$mmCourseDelegate_mmaModData');
+
+    // Check if the approveEntryLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.approveEntryLinksHandler.isEnabled = $mmaModData.isPluginEnabled;
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.approveEntryLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        if (typeof params.d == 'undefined' || (typeof params.approve == 'undefined' && typeof params.disapprove == 'undefined')) {
+            // Required fields not defined. Cannot treat the URL.
+            return false;
+        }
+
+        return [{
+            action: function(siteId) {
+                var modal = $mmUtil.showModalLoading(),
+                    dataId = parseInt(params.d, 10),
+                    entryId = parseInt(params.approve, 10) || parseInt(params.disapprove, 10),
+                    approve = parseInt(params.approve, 10) ? true : false;
+
+                // Approve/disapprove entry.
+                return $mmaModData.approveEntry(entryId, approve, siteId).catch(function(message) {
+                    modal.dismiss();
+                    $mmUtil.showErrorModal(message, 'mma.mod_data.errorapproving', true);
+
+                    return $q.reject();
+                }).then(function() {
+                    var promises = [];
+                    promises.push($mmaModData.invalidateEntryData(dataId, entryId, siteId));
+                    promises.push($mmaModData.invalidateEntriesData(dataId, siteId));
+
+                    return $q.all(promises);
+                }).then(function() {
+                    $mmEvents.trigger(mmaModDataEventEntryChanged, {dataId: dataId, entryId: entryId, siteId: siteId});
+
+                    modal.dismiss();
+                    $mmUtil.showToast(approve ? 'mma.mod_data.recordapproved' : 'mma.mod_data.recorddisapproved', true, 3000);
+                }).finally(function() {
+                    // Just in case. In fact we need to dismiss the modal before showing a toast or error message.
+                    modal.dismiss();
+                });
+            }
+        }];
+    };
+
     return self;
 });
diff --git a/www/core/scss/fontawesome.scss b/www/core/scss/fontawesome.scss
index ca630e76d74..ced2f2e1e7d 100644
--- a/www/core/scss/fontawesome.scss
+++ b/www/core/scss/fontawesome.scss
@@ -41,4 +41,8 @@
 
 .fa-thumbs-down:before {
     content: $ionicon-var-thumbsdown;
+}
+
+.fa-ban:before {
+    content: $ionicon-var-minus-circled;
 }
\ No newline at end of file

From b4657acc8a686a586699b67a0a04fc7741c77634 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 12 Jun 2017 09:56:28 +0200
Subject: [PATCH 011/118] MOBILE-2125 data: Delete entry

---
 www/addons/mod/data/controllers/entry.js | 12 +++--
 www/addons/mod/data/lang/en.json         |  3 ++
 www/addons/mod/data/main.js              |  1 +
 www/addons/mod/data/services/data.js     | 22 ++++++++-
 www/addons/mod/data/services/handlers.js | 60 +++++++++++++++++++++++-
 5 files changed, 92 insertions(+), 6 deletions(-)

diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index 6951ca54d8d..3f94bd07ad2 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -22,7 +22,8 @@ angular.module('mm.addons.mod_data')
  * @name mmaModDataEntryCtrl
  */
 .controller('mmaModDataEntryCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $q, $mmEvents,
-        $mmText, $translate, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups, $ionicScrollDelegate, mmaModDataEventEntryChanged) {
+        $mmText, $translate, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups, $ionicScrollDelegate, mmaModDataEventEntryChanged,
+        $ionicHistory) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -174,8 +175,13 @@ angular.module('mm.addons.mod_data')
     // Refresh entry on change.
     entryChangedObserver = $mmEvents.on(mmaModDataEventEntryChanged, function(eventData) {
         if (eventData.entryId == entryId && data.id == eventData.dataId && $mmSite.getId() == eventData.siteId) {
-            $scope.databaseLoaded = false;
-            return fetchEntryData(true);
+            if (eventData.deleted) {
+                // If deleted, go back.
+                $ionicHistory.goBack();
+            } else {
+                $scope.databaseLoaded = false;
+                return fetchEntryData(true);
+            }
         }
     });
 
diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index 76b50d2082a..03ac31afac0 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -1,12 +1,15 @@
 {
     "addentries": "Add entries",
+    "confirmdeleterecord": "Are you sure you want to delete this entry?",
     "entrieslefttoadd": "You must add {{$a.entriesleft}} more entry/entries in order to complete this activity",
     "entrieslefttoaddtoview": "You must add {{$a.entrieslefttoview}} more entry/entries before you can view other participants' entries.",
     "errorapproving": "Error approving or unapproving entry.",
+    "errordeleting": "Error deleting the entry.",
     "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "norecords": "No entries in database",
     "notopenyet": "Sorry, this activity is not available until {{$a}}",
     "recordapproved": "Entry approved",
+    "recorddeleted": "Entry deleted",
     "recorddisapproved": "Entry unapproved",
     "search": "Search"
 }
diff --git a/www/addons/mod/data/main.js b/www/addons/mod/data/main.js
index 05b351dde8c..c6bfa192fbe 100644
--- a/www/addons/mod/data/main.js
+++ b/www/addons/mod/data/main.js
@@ -62,4 +62,5 @@ angular.module('mm.addons.mod_data', ['mm.core'])
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:index', '$mmaModDataHandlers.indexLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:entry', '$mmaModDataHandlers.showEntryLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:approve', '$mmaModDataHandlers.approveEntryLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:delete', '$mmaModDataHandlers.deleteEntryLinksHandler');
 });
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 28fcdfceab4..55c3fdf2aa1 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -403,7 +403,7 @@ angular.module('mm.addons.mod_data')
      * @param   {Number}    entryId         Entry ID.
      * @param   {Boolean}   approve         Whether to approve (true) or unapprove the entry.
      * @param   {String}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise}                   Promise resolved when the database entry is retrieved.
+     * @return  {Promise}                   Promise resolved when the action is done.
      */
     self.approveEntry = function(entryId, approve, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -416,6 +416,26 @@ angular.module('mm.addons.mod_data')
         });
     };
 
+    /**
+     * Deletes an entry.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#deleteEntry
+     * @param   {Number}    entryId         Entry ID.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the action is done.
+     */
+    self.deleteEntry = function(entryId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    entryid: entryId
+                };
+
+            return site.write('mod_data_delete_entry', params);
+        });
+    };
+
     /**
      * Get the list of configured fields for the given database.
      *
diff --git a/www/addons/mod/data/services/handlers.js b/www/addons/mod/data/services/handlers.js
index b02f707520a..2c00b4b1f63 100644
--- a/www/addons/mod/data/services/handlers.js
+++ b/www/addons/mod/data/services/handlers.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_data')
  */
 .factory('$mmaModDataHandlers', function($mmCourse, $mmaModData, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite, $q,
         mmaModDataComponent, $mmaModDataPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded, $mmContentLinkHandlerFactory,
-        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate, mmaModDataEventEntryChanged) {
+        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate, mmaModDataEventEntryChanged, $translate) {
     var self = {};
 
     /**
@@ -215,7 +215,7 @@ angular.module('mm.addons.mod_data')
         }];
     };
 
-     /**
+    /**
      * Content links handler for database approve/disapprove entry.
      * Match mod/data/view.php?d=6&approve=5 with a valid data id and entryid.
      *
@@ -268,5 +268,61 @@ angular.module('mm.addons.mod_data')
         }];
     };
 
+    /**
+     * Content links handler for database delete entry.
+     * Match mod/data/view.php?d=6&delete=5 with a valid data id and entryid.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHandlers#deleteEntryLinksHandler
+     */
+    self.deleteEntryLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/data\/view\.php.*([\?\&](d|delete)=\d+)/, '$mmCourseDelegate_mmaModData');
+
+    // Check if the deleteEntryLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.deleteEntryLinksHandler.isEnabled = $mmaModData.isPluginEnabled;
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.deleteEntryLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        if (typeof params.d == 'undefined' || typeof params.delete == 'undefined') {
+            // Required fields not defined. Cannot treat the URL.
+            return false;
+        }
+
+        return [{
+            action: function(siteId) {
+                // Confirm before delete.
+                return $mmUtil.showConfirm($translate.instant('mma.mod_data.confirmdeleterecord')).then(function() {
+                    var modal = $mmUtil.showModalLoading(),
+                        dataId = parseInt(params.d, 10),
+                        entryId = parseInt(params.delete, 10);
+
+                    // Delete entry.
+                    return $mmaModData.deleteEntry(entryId, siteId).catch(function(message) {
+                        modal.dismiss();
+                        $mmUtil.showErrorModal(message, 'mma.mod_data.errordeleting', true);
+
+                        return $q.reject();
+                    }).then(function() {
+                        var promises = [];
+                        promises.push($mmaModData.invalidateEntryData(dataId, entryId, siteId));
+                        promises.push($mmaModData.invalidateEntriesData(dataId, siteId));
+
+                        return $q.all(promises);
+                    }).then(function() {
+                        $mmEvents.trigger(mmaModDataEventEntryChanged, {dataId: dataId, entryId: entryId, siteId: siteId,
+                                deleted: true});
+
+                        modal.dismiss();
+                        $mmUtil.showToast('mma.mod_data.recorddeleted', true, 3000);
+                    }).finally(function() {
+                        // Just in case. In fact we need to dismiss the modal before showing a toast or error message.
+                        modal.dismiss();
+                    });
+                });
+            }
+        }];
+    };
+
     return self;
 });

From 33410f5c506e7b71ac5f470e0d24475577120036 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 29 May 2017 13:30:03 +0200
Subject: [PATCH 012/118] MOBILE-2147 electron: Basic Electron support

---
 package.json                                  |  8 +--
 www/core/components/login/main.js             |  6 ++
 .../components/sidemenu/controllers/menu.js   |  5 ++
 www/electron.js                               | 63 +++++++++++++++++++
 www/index.html                                |  2 +-
 5 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 www/electron.js

diff --git a/package.json b/package.json
index 553a2c9c0d5..fcc4f55f831 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mm2",
-  "version": "1.0.0",
+  "version": "3.3.0",
   "description": "Moodle Mobile 2: The official mobile app for Moodle.",
   "repository": {
     "type": "git",
@@ -13,8 +13,7 @@
       "url": "http://www.apache.org/licenses/LICENSE-2.0"
     }
   ],
-  "dependencies": {
-  },
+  "dependencies": {},
   "devDependencies": {
     "appium": "^1.6.0",
     "bower": "^1.3.3",
@@ -122,5 +121,6 @@
     "serve.e2e": "ionic serve -b -a",
     "serve.dev": "ionic serve",
     "e2e": "protractor e2e/build/protractor.conf.js"
-  }
+  },
+  "main": "www/electron.js"
 }
diff --git a/www/core/components/login/main.js b/www/core/components/login/main.js
index d4cac17104b..d8c5f71e611 100644
--- a/www/core/components/login/main.js
+++ b/www/core/components/login/main.js
@@ -30,6 +30,12 @@ angular.module('mm.core.login', [])
         onEnter: function($ionicHistory) {
             // Ensure that there is no history stack when getting here.
             $ionicHistory.clearHistory();
+        },
+        controller: function($scope) {
+            // Required for Electron app so the title doesn't change.
+            $scope.$on('$ionicView.afterEnter', function(ev) {
+                ev.stopPropagation();
+            });
         }
     })
 
diff --git a/www/core/components/sidemenu/controllers/menu.js b/www/core/components/sidemenu/controllers/menu.js
index 3edc382bd8c..c6cff4db0e0 100644
--- a/www/core/components/sidemenu/controllers/menu.js
+++ b/www/core/components/sidemenu/controllers/menu.js
@@ -67,6 +67,11 @@ angular.module('mm.core.sidemenu')
         }
     });
 
+    // Required for Electron app so the title doesn't change.
+    $scope.$on('$ionicView.afterEnter', function(ev) {
+        ev.stopPropagation();
+    });
+
     $scope.$on('$destroy', function() {
         if (langObserver && langObserver.off) {
             langObserver.off();
diff --git a/www/electron.js b/www/electron.js
new file mode 100644
index 00000000000..aeaddc1b61d
--- /dev/null
+++ b/www/electron.js
@@ -0,0 +1,63 @@
+const {app, BrowserWindow} = require('electron');
+const path = require('path');
+const url = require('url');
+
+// Keep a global reference of the window object, if you don't, the window will
+// be closed automatically when the JavaScript object is garbage collected.
+let win;
+
+function createWindow () {
+    // Create the browser window.
+    var width = 800,
+        height = 600;
+
+    const screen = require('electron').screen;
+    if (screen) {
+        const display = screen.getPrimaryDisplay();
+        if (display && display.workArea) {
+            width = display.workArea.width || width;
+            height = display.workArea.height || height;
+        }
+    }
+
+    win = new BrowserWindow({
+        width: width,
+        height: height,
+        minWidth: 400,
+        minHeight: 400,
+        textAreasAreResizable: false,
+        plugins: true
+    });
+
+    // And load the index.html of the app.
+    win.loadURL(url.format({
+        pathname: path.join(__dirname, 'index.html'),
+        protocol: 'file:',
+        slashes: true
+    }));
+
+    // Emitted when the window is closed.
+    win.on('closed', () => {
+        // Dereference the window object.
+        win = null
+    });
+}
+
+// This method will be called when Electron has finished initialization and is ready to create browser windows.
+// Some APIs can only be used after this event occurs.
+app.on('ready', createWindow);
+
+// Quit when all windows are closed.
+app.on('window-all-closed', () => {
+    app.quit();
+});
+
+app.on('activate', () => {
+    // On macOS it's common to re-create a window in the app when the dock icon is clicked and there are no other windows open.
+    if (win === null) {
+        createWindow();
+    }
+});
+
+// In this file you can include the rest of your app's specific main process code.
+// You can also put them in separate files and require them here.
diff --git a/www/index.html b/www/index.html
index ffd50b38ce0..646aa4240a6 100644
--- a/www/index.html
+++ b/www/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
     <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: gap: https://ssl.gstatic.com; img-src * filesystem: gap: data: cdvfile: file: https://ssl.gstatic.com android-webview-video-poster:; style-src 'self' 'unsafe-inline' filesystem: cdvfile: file:; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:* filesystem: cdvfile: file:">
-    <title></title>
+    <title>Moodle Mobile</title>
     <link href="build/mm.bundle.css" rel="stylesheet">
     <script src="lib/ionic/release/js/ionic.bundle.js"></script>
     <script src="cordova.js"></script>

From 1fa2c0f6efb349ffdd2bd4411fcb47c28b5c184f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 31 May 2017 15:51:49 +0200
Subject: [PATCH 013/118] MOBILE-2147 electron: Emulate Cordova File API

---
 www/core/lib/app.js      |  12 +
 www/core/lib/emulator.js | 482 ++++++++++++++++++++++++++++++++++++++-
 www/core/lib/fs.js       |   9 +-
 3 files changed, 490 insertions(+), 13 deletions(-)

diff --git a/www/core/lib/app.js b/www/core/lib/app.js
index 5a2884c2594..4b40c7d47f3 100644
--- a/www/core/lib/app.js
+++ b/www/core/lib/app.js
@@ -186,6 +186,18 @@ angular.module('mm.core')
             return $ionicPlatform.ready();
         };
 
+        /**
+         * Checks if the app is running in a desktop environment (not browser).
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmApp#isDesktop
+         * @return {Bool} Whether the app is running in a desktop environment (not browser).
+         */
+        self.isDesktop = function() {
+            return !!(window.process && window.process.versions && typeof window.process.versions.electron != 'undefined');
+        };
+
         /**
          * Checks if the app is running in a real device with cordova-plugin-device installed.
          *
diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
index 7e610270a04..773b3d4ea78 100644
--- a/www/core/lib/emulator.js
+++ b/www/core/lib/emulator.js
@@ -21,12 +21,441 @@ angular.module('mm.core')
  * @description
  * This service handles the emulation of Cordova plugins in other environments like browser.
  */
-.factory('$mmEmulatorManager', function($log, $q, $http, $mmFS, $window) {
+.factory('$mmEmulatorManager', function($log, $q, $http, $mmFS, $window, $mmApp, mmCoreConfigConstants) {
 
     $log = $log.getInstance('$mmEmulatorManager');
 
     var self = {};
 
+    /**
+     * Emulate Cordova file plugin using NodeJS functions.
+     *
+     * @return {Void}
+     */
+    function emulateCordovaFile() {
+        var fs = require('fs');
+
+        // Create the Entry object, parent of DirectoryEntry and FileEntry.
+        // It includes fileSystem and nativeURL as the Cordova object, but they aren't used.
+        $window.Entry = function(isFile, isDirectory, name, fullPath, fileSystem, nativeURL) {
+            this.isFile = !!isFile;
+            this.isDirectory = !!isDirectory;
+            this.name = name || '';
+            this.fullPath = fullPath || '';
+            this.filesystem = fileSystem || null;
+            this.nativeURL = nativeURL || null;
+        };
+
+        // Implement Entry functions.
+        $window.Entry.prototype.getMetadata = function(successCallback, errorCallback) {
+            fs.stat(this.fullPath, function(err, stats) {
+                if (err) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    successCallback && successCallback({
+                        size: stats.size,
+                        modificationTime: stats.mtime
+                    });
+                }
+            });
+        };
+
+        $window.Entry.prototype.setMetadata = function(successCallback, errorCallback, metadataObject) {
+            // Not supported.
+            errorCallback('Not supported');
+        };
+
+        $window.Entry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+            newName = newName || this.name;
+
+            var srcPath = this.fullPath,
+                destPath = $mmFS.concatenatePaths(parent.fullPath, newName),
+                that = this;
+
+            fs.rename(srcPath, destPath, function(err) {
+                if (err) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    var constructorFn = that.isDirectory ? DirectoryEntry : FileEntry;
+                    successCallback && successCallback(new constructorFn(newName, destPath));
+                }
+            });
+        };
+
+        $window.Entry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+            newName = newName || this.name;
+
+            // There is no function to copy a file, read the source and write the dest.
+            var srcPath = this.fullPath,
+                destPath = $mmFS.concatenatePaths(parent.fullPath, newName),
+                reader = fs.createReadStream(srcPath),
+                writer = fs.createWriteStream(destPath),
+                deferred = $q.defer(), // Use a promise to make sure only one callback is called.
+                that = this;
+
+            deferred.promise.then(function() {
+                var constructorFn = that.isDirectory ? DirectoryEntry : FileEntry;
+                successCallback && successCallback(new constructorFn(newName, destPath));
+            }).catch(function(error) {
+                errorCallback && errorCallback(error);
+            });
+
+            reader.on('error', deferred.reject);
+
+            writer.on('error', deferred.reject);
+
+            writer.on('close', deferred.resolve);
+
+            reader.pipe(writer);
+        };
+
+        $window.Entry.prototype.toInternalURL = function() {
+            return 'file://' + this.fullPath;
+        };
+
+        $window.Entry.prototype.toURL = function() {
+            return this.fullPath;
+        };
+
+        $window.Entry.prototype.remove = function(successCallback, errorCallback) {
+            var removeFn = this.isDirectory ? fs.rmdir : fs.unlink;
+            removeFn(this.fullPath, function(err) {
+                if (err < 0) {
+                    errorCallback(err);
+                } else {
+                    successCallback();
+                }
+            });
+        };
+
+        $window.Entry.prototype.getParent = function(successCallback, errorCallback) {
+            // Remove last slash if present and get the path of the parent.
+            var fullPath = this.fullPath.slice(-1) == '/' ? this.fullPath.slice(0, -1) : this.fullPath,
+                parentPath = fullPath.substr(0, fullPath.lastIndexOf('/'));
+
+            // Check that parent exists.
+            fs.stat(parentPath, function(err, stats) {
+                if (err || !stats.isDirectory()) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    var fileAndDir = $mmFS.getFileAndDirectoryFromPath(parentPath);
+                    successCallback && successCallback(new DirectoryEntry(fileAndDir.name, parentPath));
+                }
+            });
+        };
+
+        // FileWriter to write data in files. Don't support abort, seek and truncate.
+        $window.FileWriter = function(file) {
+            this.fileName = '';
+            this.length = 0;
+            if (file) {
+                this.localURL = file.localURL || file;
+                this.length = file.size || 0;
+            }
+
+            this.position = 0; // Default is to write at the beginning of the file.
+            this.readyState = 0; // EMPTY
+            this.result = null;
+            this.error = null;
+
+            // Event handlers
+            this.onwritestart = null;   // When writing starts
+            this.onprogress = null;     // While writing the file, and reporting partial file data
+            this.onwrite = null;        // When the write has successfully completed.
+            this.onwriteend = null;     // When the request has completed (either in success or failure).
+            this.onabort = null;        // When the write has been aborted. For instance, by invoking the abort() method.
+            this.onerror = null;        // When the write has failed (see errors).
+        };
+
+        $window.FileWriter.prototype.write = function(data) {
+            var that = this;
+            if (data && data.toString() == '[object Blob]') {
+                // Can't write Blobs, convert it to a Buffer.
+                var reader = new FileReader();
+                reader.onload = function() {
+                    if (reader.readyState == 2) {
+                        write(new Buffer(reader.result));
+                    }
+                };
+                reader.readAsArrayBuffer(data);
+            } else {
+                write(data);
+            }
+
+            function write(data) {
+                fs.writeFile(that.localURL, data, function(err) {
+                    if (err) {
+                        that.onerror && that.onerror(err);
+                    } else {
+                        that.onwrite && that.onwrite();
+                    }
+                    that.onwriteend && that.onwriteend();
+                });
+
+                that.onwritestart && that.onwritestart();
+            }
+        };
+
+        // DirectoryReader to read directory contents.
+        $window.DirectoryReader = function(localURL) {
+            this.localURL = localURL || null;
+        };
+
+        $window.DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
+            var that = this;
+
+            fs.readdir(this.localURL, function(err, files) {
+                if (err) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    // Use try/catch because it includes sync calls.
+                    try {
+                        var entries = [];
+                        for (var i = 0; i < files.length; i++) {
+                            var fileName = files[i],
+                                filePath = $mmFS.concatenatePaths(that.localURL, fileName),
+                                stats = fs.statSync(filePath); // Use sync function to make code simpler.
+
+                            if (stats.isDirectory()) {
+                                entries.push(new DirectoryEntry(fileName, filePath));
+                            } else if (stats.isFile()) {
+                                entries.push(new FileEntry(fileName, filePath));
+                            }
+                        }
+
+                        successCallback(entries);
+                    } catch(ex) {
+                        errorCallback && errorCallback(ex);
+                    }
+                }
+            });
+        };
+
+        // Create FileEntry and its functions, inheriting from Entry.
+        $window.FileEntry = function(name, fullPath, fileSystem, nativeURL) {
+            // Remove trailing slash if it is present.
+            if (fullPath && /\/$/.test(fullPath)) {
+                fullPath = fullPath.substring(0, fullPath.length - 1);
+            }
+            if (nativeURL && /\/$/.test(nativeURL)) {
+                nativeURL = nativeURL.substring(0, nativeURL.length - 1);
+            }
+
+            $window.Entry.call(this, true, false, name, fullPath, fileSystem, nativeURL);
+        };
+
+        $window.FileEntry.prototype = Object.create($window.Entry.prototype); // Inherit Entry prototype.
+
+        $window.FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
+            this.file(function(file) {
+                successCallback && successCallback(new FileWriter(file));
+            }, errorCallback);
+        };
+
+        $window.FileEntry.prototype.file = function(successCallback, errorCallback) {
+            var that = this;
+
+            // Get the metadata to know the time modified.
+            this.getMetadata(function(metadata) {
+                // Read the file.
+                fs.readFile(that.fullPath, function(err, data) {
+                    if (err) {
+                        errorCallback && errorCallback(err);
+                    } else {
+                        // Create a File instance and return it.
+                        data = Uint8Array.from(data).buffer; // Convert the NodeJS Buffer to ArrayBuffer.
+                        var file = new File([data], that.name || '', {
+                            lastModified: metadata.modificationTime || null,
+                            type: $mmFS.getMimeType($mmFS.getFileExtension(that.name)) || null
+                        });
+                        file.localURL = that.fullPath;
+                        file.start = 0;
+                        file.end = file.size;
+
+                        successCallback && successCallback(file);
+                    }
+                });
+            }, errorCallback);
+        };
+
+        // Create DirectoryEntry and its functions, inheriting from Entry.
+        $window.DirectoryEntry = function(name, fullPath, fileSystem, nativeURL) {
+            // Add trailing slash if it is missing.
+            if ((fullPath) && !/\/$/.test(fullPath)) {
+                fullPath += '/';
+            }
+            if (nativeURL && !/\/$/.test(nativeURL)) {
+                nativeURL += '/';
+            }
+
+            $window.Entry.call(this, false, true, name, fullPath, fileSystem, nativeURL);
+        };
+
+        $window.DirectoryEntry.prototype = Object.create($window.Entry.prototype); // Inherit Entry prototype.
+
+        $window.DirectoryEntry.prototype.createReader = function() {
+            return new DirectoryReader(this.fullPath);
+        };
+
+        $window.DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
+            getDirOrFile(this, true, path, options, successCallback, errorCallback);
+        };
+
+        $window.DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
+            // Use a promise to make sure only one callback is called.
+            var deferred = $q.defer();
+
+            deferred.promise.then(function() {
+                successCallback && successCallback();
+            }).catch(function(error) {
+                errorCallback && errorCallback(error);
+            });
+
+            deleteRecursive(this.fullPath, function() {
+                deferred.resolve();
+            });
+
+            // Delete a file or folder recursively.
+            function deleteRecursive(path, success) {
+                // Check if it exists.
+                fs.stat(path, function(err, stats) {
+                    if (err) {
+                        // File not found, reject.
+                        deferred.reject(err);
+                    } else if (stats.isFile()) {
+                        // It's a file, remove it.
+                        fs.unlink(path, function(err) {
+                            if (err) {
+                                // Error removing file, reject.
+                                deferred.reject(err);
+                            } else {
+                                success && success();
+                            }
+                        });
+                    } else {
+                        // It's a directory, read the contents.
+                        fs.readdir(path, function(err, files) {
+                            if (err) {
+                                // Error reading directory contents, reject.
+                                deferred.reject(err);
+                            } else if (!files.length) {
+                                // No files to delete, delete the folder.
+                                deleteEmptyFolder(path, success);
+                            } else {
+                                // Remove all the files and directories.
+                                var removed = 0;
+                                files.forEach(function(filename) {
+                                    deleteRecursive($mmFS.concatenatePaths(path, filename), function() {
+                                        // Success deleting the file/dir.
+                                        removed++;
+                                        if (removed == files.length) {
+                                            // All files deleted, delete the folder.
+                                            deleteEmptyFolder(path, success);
+                                        }
+                                    });
+                                });
+                            }
+                        });
+                    }
+                });
+            }
+
+            // Delete an empty folder.
+            function deleteEmptyFolder(path, success) {
+                fs.rmdir(path, function(err) {
+                    if (err) {
+                        // Error removing directory, reject.
+                        deferred.reject(err);
+                    } else {
+                        success && success();
+                    }
+                });
+            }
+        };
+
+        $window.DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
+            getDirOrFile(this, false, path, options, successCallback, errorCallback);
+        };
+
+        // Helper function for getDirectory and getFile.
+        function getDirOrFile(file, isDir, path, options, successCallback, errorCallback) {
+            var filename = $mmFS.getFileAndDirectoryFromPath(path).name,
+                fileDirPath = $mmFS.concatenatePaths(file.fullPath, path);
+
+            // Check if file/dir exists.
+            fs.stat(fileDirPath, function(err) {
+                if (err) {
+                    if (options.create) {
+                        // File/Dir probably doesn't exist, create it.
+                        create(function(error2) {
+                            if (!error2) {
+                                // File created successfully, return it.
+                                success();
+                            } else if (error2.code === 'EEXIST') {
+                                // File exists, success.
+                                success();
+                            } else if (error2.code === 'ENOENT') {
+                                // Seems like the parent doesn't exist, create it too.
+                                var parent = fileDirPath.substring(0, fileDirPath.lastIndexOf('/'));
+
+                                if (parent) {
+                                    file.getDirectory(parent, options, function() {
+                                        // Parent created, try to create the child again.
+                                        create(function(error3) {
+                                            if (!error3) {
+                                                success();
+                                            } else {
+                                                errorCallback && errorCallback(error3);
+                                            }
+                                        });
+                                    }, errorCallback);
+                                } else {
+                                    errorCallback && errorCallback(error2);
+                                }
+                            } else {
+                                errorCallback && errorCallback(error2);
+                            }
+                        });
+                    } else {
+                        errorCallback && errorCallback(err);
+                    }
+                } else {
+                    success();
+                }
+            });
+
+            // Success, return the DirectoryEntry or FileEntry.
+            function success() {
+                var constructorFn = isDir ? DirectoryEntry : FileEntry;
+                successCallback(new constructorFn(filename, fileDirPath));
+            }
+
+            // Create the file/dir.
+            function create(done) {
+                if (isDir) {
+                    fs.mkdir(fileDirPath, done);
+                } else {
+                    fs.writeFile(fileDirPath, "", done);
+                }
+            }
+        }
+
+        // Implement resolveLocalFileSystemURL.
+        $window.resolveLocalFileSystemURL = function(path, successCallback, errorCallback) {
+            // Check that the file/dir exists.
+            fs.stat(path, function(err, stats) {
+                if (err) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    // The file/dir exists, return an instance.
+                    var constructorFn = stats.isDirectory() ? DirectoryEntry : FileEntry,
+                        fileAndDir = $mmFS.getFileAndDirectoryFromPath(path);
+                    successCallback && successCallback(new constructorFn(fileAndDir.name, path));
+                }
+            });
+        };
+    }
+
     /**
      * Loads HTML API to simulate Cordova APIs. Reserved for core use.
      *
@@ -60,12 +489,20 @@ angular.module('mm.core')
         $window.FileTransfer = function() {};
 
         $window.FileTransfer.prototype.download = function(url, filePath, successCallback, errorCallback) {
-            $http.get(url, {responseType: 'blob'}).then(function(data) {
+            var isDesktop = $mmApp.isDesktop(),
+                responseType = isDesktop ? 'arraybuffer' : 'blob';
+
+            $http.get(url, {responseType: responseType}).then(function(data) {
                 if (!data || !data.data) {
                     errorCallback();
                 } else {
                     filePath = filePath.replace(basePath, ''); // Remove basePath from the filePath.
                     filePath = filePath.replace(/%20/g, ' '); // Replace all %20 with spaces.
+                    if (isDesktop) {
+                        // In desktop we need to convert the arraybuffer into a Buffer.
+                        data.data = Buffer.from(new Uint8Array(data.data));
+                    }
+
                     $mmFS.writeFile(filePath, data.data).then(function(e) {
                         successCallback(e);
                     }).catch(function(error) {
@@ -117,14 +554,41 @@ angular.module('mm.core')
 
         // @todo: Implement FileTransfer.upload.
 
-        // Request 500MB.
-        $window.webkitStorageInfo.requestQuota(PERSISTENT, 500 * 1024 * 1024, function(granted) {
-            $window.requestFileSystem(PERSISTENT, granted, function(entry) {
-                basePath = entry.root.toURL();
-                $mmFS.setHTMLBasePath(basePath);
-                deferred.resolve();
+        if ($mmApp.isDesktop()) {
+            var fs = require('fs'),
+                app = require('electron').remote.app;
+
+            emulateCordovaFile();
+
+            // Initialize File System. Get the path to use.
+            basePath = app.getPath('documents') || app.getPath('home');
+            if (!basePath) {
+                deferred.reject('Cannot calculate base path for file system.');
+                return;
+            }
+
+            basePath = $mmFS.concatenatePaths(basePath.replace(/\\/g, '/'), mmCoreConfigConstants.app_id) + '/';
+
+            // Create the folder if needed.
+            fs.mkdir(basePath, function(e) {
+                if (!e || (e && e.code === 'EEXIST')) {
+                    // Create successful or it already exists. Resolve.
+                    $mmFS.setHTMLBasePath(basePath);
+                    deferred.resolve();
+                } else {
+                    deferred.reject('Error creating base path.');
+                }
+            });
+        } else {
+            // It's browser, request a quota to use. Request 500MB.
+            $window.webkitStorageInfo.requestQuota(PERSISTENT, 500 * 1024 * 1024, function(granted) {
+                $window.requestFileSystem(PERSISTENT, granted, function(entry) {
+                    basePath = entry.root.toURL();
+                    $mmFS.setHTMLBasePath(basePath);
+                    deferred.resolve();
+                }, deferred.reject);
             }, deferred.reject);
-        }, deferred.reject);
+        }
 
         return deferred.promise;
     };
diff --git a/www/core/lib/fs.js b/www/core/lib/fs.js
index 63de16de91c..bc9d61f11b7 100644
--- a/www/core/lib/fs.js
+++ b/www/core/lib/fs.js
@@ -24,7 +24,8 @@ angular.module('mm.core')
  * @description
  * This service handles the interaction with the FileSystem.
  */
-.factory('$mmFS', function($ionicPlatform, $cordovaFile, $log, $q, $http, $cordovaZip, $mmText, mmFsSitesFolder, mmFsTmpFolder) {
+.factory('$mmFS', function($ionicPlatform, $cordovaFile, $log, $q, $http, $cordovaZip, $mmText, mmFsSitesFolder, mmFsTmpFolder,
+        $mmApp) {
 
     $log = $log.getInstance('$mmFS');
 
@@ -591,7 +592,7 @@ angular.module('mm.core')
         return self.init().then(function() {
             // Create file (and parent folders) to prevent errors.
             return self.createFile(path).then(function(fileEntry) {
-                if (isHTMLAPI && typeof data == 'string') {
+                if (isHTMLAPI && !$mmApp.isDesktop() && typeof data == 'string') {
                     // We need to write Blobs.
                     var type = self.getMimeType(self.getFileExtension(path));
                     data = new Blob([data], {type: type || 'text/plain'});
@@ -851,8 +852,8 @@ angular.module('mm.core')
      * @return {String}           Internal URL.
      */
     self.getInternalURL = function(fileEntry) {
-        if (isHTMLAPI) {
-            // HTML API doesn't implement toInternalURL.
+        if (!fileEntry.toInternalURL) {
+            // File doesn't implement toInternalURL, use toURL.
             return fileEntry.toURL();
         }
         return fileEntry.toInternalURL();

From 92ab2568472785a41dd616d176c599932986735e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 31 May 2017 16:19:48 +0200
Subject: [PATCH 014/118] MOBILE-2147 electron: Open files and URLs with the
 right external app

---
 www/core/lib/util.js | 17 +++++++++++++++--
 www/electron.js      |  8 +++++---
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 0edb004b4b3..5a21b276da5 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -292,7 +292,11 @@ angular.module('mm.core')
         self.openFile = function(path) {
             var deferred = $q.defer();
 
-            if (window.plugins) {
+            if ($mmApp.isDesktop()) {
+                // It's a desktop app, send an event so the file is opened. It has to be done with an event
+                // because opening the file from here (renderer process) doesn't focus the opened app.
+                require('electron').ipcRenderer.send('openItem', path);
+            } else if (window.plugins) {
                 var extension = $mmFS.getFileExtension(path),
                     mimetype = $mmFS.getMimeType(extension);
 
@@ -378,7 +382,16 @@ angular.module('mm.core')
          * @return {Void}
          */
         self.openInBrowser = function(url) {
-            window.open(url, '_system');
+            if ($mmApp.isDesktop()) {
+                // It's a desktop app, use Electron shell library to open the browser.
+                var shell = require('electron').shell;
+                if (!shell.openExternal(url)) {
+                    // Open browser failed, open a new window in the app.
+                    window.open(url, '_system');
+                }
+            } else {
+                window.open(url, '_system');
+            }
         };
 
         /**
diff --git a/www/electron.js b/www/electron.js
index aeaddc1b61d..f9343476c5e 100644
--- a/www/electron.js
+++ b/www/electron.js
@@ -1,4 +1,5 @@
-const {app, BrowserWindow} = require('electron');
+
+const {app, BrowserWindow, ipcMain, shell} = require('electron');
 const path = require('path');
 const url = require('url');
 
@@ -59,5 +60,6 @@ app.on('activate', () => {
     }
 });
 
-// In this file you can include the rest of your app's specific main process code.
-// You can also put them in separate files and require them here.
+ipcMain.on('openItem', (event, path) => {
+    shell.openItem(path);
+});

From 8a894c03a9661b24d9d2d6e84f18232f2b194943 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 2 Jun 2017 12:24:13 +0200
Subject: [PATCH 015/118] MOBILE-2147 electron: Allow uploading files with file
 picker

---
 .../components/fileuploader/scss/styles.scss  |   1 +
 .../fileuploader/services/handlers.js         |  10 +-
 .../fileuploader/services/helper.js           |   4 +-
 www/core/lib/emulator.js                      | 294 +++++++++++++++---
 www/core/lib/fs.js                            |   2 +-
 5 files changed, 267 insertions(+), 44 deletions(-)

diff --git a/www/core/components/fileuploader/scss/styles.scss b/www/core/components/fileuploader/scss/styles.scss
index d35c7e95330..f8da47e3e68 100644
--- a/www/core/components/fileuploader/scss/styles.scss
+++ b/www/core/components/fileuploader/scss/styles.scss
@@ -8,5 +8,6 @@
         opacity: 0;
         outline: none;
         z-index: 100;
+        cursor: pointer;
     }
 }
diff --git a/www/core/components/fileuploader/services/handlers.js b/www/core/components/fileuploader/services/handlers.js
index 62226e64440..13106a7b9df 100644
--- a/www/core/components/fileuploader/services/handlers.js
+++ b/www/core/components/fileuploader/services/handlers.js
@@ -42,7 +42,7 @@ angular.module('mm.core.fileuploader')
          * @return {Boolean} True if handler is enabled, false otherwise.
          */
         self.isEnabled = function() {
-            return true;
+            return $mmApp.isDevice();
         };
 
         /**
@@ -87,7 +87,7 @@ angular.module('mm.core.fileuploader')
          * @return {Boolean} True if handler is enabled, false otherwise.
          */
         self.isEnabled = function() {
-            return true;
+            return $mmApp.isDevice();
         };
 
         /**
@@ -132,7 +132,7 @@ angular.module('mm.core.fileuploader')
          * @return {Boolean} True if handler is enabled, false otherwise.
          */
         self.isEnabled = function() {
-            return true;
+            return $mmApp.isDevice();
         };
 
         /**
@@ -177,7 +177,7 @@ angular.module('mm.core.fileuploader')
          * @return {Boolean} True if handler is enabled, false otherwise.
          */
         self.isEnabled = function() {
-            return true;
+            return $mmApp.isDevice();
         };
 
         /**
@@ -223,7 +223,7 @@ angular.module('mm.core.fileuploader')
          * @return {Boolean} True if handler is enabled, false otherwise.
          */
         self.isEnabled = function() {
-            return ionic.Platform.isAndroid();
+            return ionic.Platform.isAndroid() || !$mmApp.isDevice();
         };
 
         /**
diff --git a/www/core/components/fileuploader/services/helper.js b/www/core/components/fileuploader/services/helper.js
index aea9ef476d5..f0f0cd9f9f3 100644
--- a/www/core/components/fileuploader/services/helper.js
+++ b/www/core/components/fileuploader/services/helper.js
@@ -756,9 +756,7 @@ angular.module('mm.core.fileuploader')
             }, function() {
                 // User cancelled. Delete the file if needed.
                 if (deleteAfterUpload) {
-                    angular.forEach(paths, function(path) {
-                        $mmFS.removeExternalFile(path);
-                    });
+                    $mmFS.removeExternalFile(path);
                 }
                 return $q.reject();
             });
diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
index 773b3d4ea78..1e88379a71d 100644
--- a/www/core/lib/emulator.js
+++ b/www/core/lib/emulator.js
@@ -21,14 +21,45 @@ angular.module('mm.core')
  * @description
  * This service handles the emulation of Cordova plugins in other environments like browser.
  */
-.factory('$mmEmulatorManager', function($log, $q, $http, $mmFS, $window, $mmApp, mmCoreConfigConstants) {
+.factory('$mmEmulatorManager', function($log, $q, $mmFS, $window, $mmApp, mmCoreConfigConstants) {
 
     $log = $log.getInstance('$mmEmulatorManager');
 
-    var self = {};
+    var self = {},
+        fileTransferIdCounter = 0,
+        basePath;
 
     /**
-     * Emulate Cordova file plugin using NodeJS functions.
+     * Given a URL, check if it has a credentials in it and, if so, return them in a header object.
+     * This code is extracted from Cordova FileTransfer plugin.
+     *
+     * @param  {String} urlString The URL to get the credentials from.
+     * @return {Object}           The header with the credentials, null if no credentials.
+     */
+    function getBasicAuthHeader(urlString) {
+        var header =  null;
+
+        // This is changed due to MS Windows doesn't support credentials in http uris
+        // so we detect them by regexp and strip off from result url.
+        if (window.btoa) {
+            var credentials = getUrlCredentials(urlString);
+            if (credentials) {
+                var authHeader = "Authorization";
+                var authHeaderValue = "Basic " + window.btoa(credentials);
+
+                header = {
+                    name : authHeader,
+                    value : authHeaderValue
+                };
+            }
+        }
+
+        return header;
+    }
+
+    /**
+     * Emulate Cordova file plugin using NodeJS functions. This should only be used in NodeJS environments,
+     * browser works with the default resolveLocalFileSystemURL.
      *
      * @return {Void}
      */
@@ -178,6 +209,9 @@ angular.module('mm.core')
                     }
                 };
                 reader.readAsArrayBuffer(data);
+            } else if (data && data.toString() == '[object ArrayBuffer]') {
+                // Convert it to a Buffer.
+                write(Buffer.from(new Uint8Array(data)));
             } else {
                 write(data);
             }
@@ -456,6 +490,226 @@ angular.module('mm.core')
         };
     }
 
+    /**
+     * Emulate Cordova FileTransfer plugin for browser or NodeJS.
+     *
+     * @return {Void}
+     */
+    function emulateCordovaFileTransfer() {
+        // Create the FileTransferError object.
+        $window.FileTransferError = function(code, source, target, status, body, exception) {
+            this.code = code || null;
+            this.source = source || null;
+            this.target = target || null;
+            this.http_status = status || null;
+            this.body = body || null;
+            this.exception = exception || null;
+        };
+
+        $window.FileTransferError.FILE_NOT_FOUND_ERR = 1;
+        $window.FileTransferError.INVALID_URL_ERR = 2;
+        $window.FileTransferError.CONNECTION_ERR = 3;
+        $window.FileTransferError.ABORT_ERR = 4;
+        $window.FileTransferError.NOT_MODIFIED_ERR = 5;
+
+        // Create the FileTransfer object and its functions.
+        $window.FileTransfer = function() {
+            this._id = ++fileTransferIdCounter;
+            this.onprogress = null; // Optional callback.
+        };
+
+        $window.FileTransfer.prototype.download = function(source, target, successCallback, errorCallback, trustAllHosts, options) {
+            // Use XMLHttpRequest instead of $http to support onprogress and abort.
+            var basicAuthHeader = getBasicAuthHeader(source),
+                xhr = new XMLHttpRequest(),
+                isDesktop = $mmApp.isDesktop(),
+                deferred = $q.defer(), // Use a promise to make sure only one callback is called.
+                headers = null;
+
+            deferred.promise.then(function(entry) {
+                successCallback && successCallback(entry);
+            }).catch(function(error) {
+                errorCallback && errorCallback(error);
+            });
+
+            this.xhr = xhr;
+            this.deferred = deferred;
+            this.source = source;
+            this.target = target;
+
+            if (basicAuthHeader) {
+                source = source.replace(getUrlCredentials(source) + '@', '');
+
+                options = options || {};
+                options.headers = options.headers || {};
+                options.headers[basicAuthHeader.name] = basicAuthHeader.value;
+            }
+
+            if (options) {
+                headers = options.headers || null;
+            }
+
+            // Prepare the request.
+            xhr.open('GET', source, true);
+            xhr.responseType = isDesktop ? 'arraybuffer' : 'blob';
+            angular.forEach(headers, function(value, name) {
+                xhr.setRequestHeader(name, value);
+            });
+
+            if (this.onprogress) {
+                xhr.onprogress = this.onprogress;
+            }
+
+            xhr.onerror = function() {
+                deferred.reject(new FileTransferError(-1, source, target, xhr.status, xhr.statusText));
+            };
+
+            xhr.onload = function() {
+                // Finished dowloading the file.
+                var response = xhr.response;
+                if (!response) {
+                    deferred.reject();
+                } else {
+                    target = target.replace(basePath, ''); // Remove basePath from the target.
+                    target = target.replace(/%20/g, ' '); // Replace all %20 with spaces.
+                    if (isDesktop) {
+                        // In desktop we need to convert the arraybuffer into a Buffer.
+                        response = Buffer.from(new Uint8Array(response));
+                    }
+
+                    $mmFS.writeFile(target, response).then(deferred.resolve, deferred.reject);
+                }
+            };
+
+            xhr.send();
+        };
+
+        $window.FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, trustAllHosts) {
+            var fileKey = null,
+                fileName = null,
+                mimeType = null,
+                params = null,
+                headers = null,
+                httpMethod = null,
+                deferred = $q.defer(), // Use a promise to make sure only one callback is called.
+                basicAuthHeader = getBasicAuthHeader(server),
+                that = this;
+
+            deferred.promise.then(function(result) {
+                successCallback && successCallback(result);
+            }).catch(function(error) {
+                errorCallback && errorCallback(error);
+            });
+
+            if (basicAuthHeader) {
+                server = server.replace(getUrlCredentials(server) + '@', '');
+
+                options = options || {};
+                options.headers = options.headers || {};
+                options.headers[basicAuthHeader.name] = basicAuthHeader.value;
+            }
+
+            if (options) {
+                fileKey = options.fileKey;
+                fileName = options.fileName;
+                mimeType = options.mimeType;
+                headers = options.headers;
+                httpMethod = options.httpMethod || 'POST';
+
+                if (httpMethod.toUpperCase() == "PUT"){
+                    httpMethod = 'PUT';
+                } else {
+                    httpMethod = 'POST';
+                }
+
+                if (options.params) {
+                    params = options.params;
+                } else {
+                    params = {};
+                }
+            }
+
+            // Add fileKey and fileName to the headers.
+            headers = headers || {};
+            if (!headers['Content-Disposition']) {
+                headers['Content-Disposition'] = 'form-data;' + (fileKey ? ' name="' + fileKey + '";' : '') +
+                    (fileName ? ' filename="' + fileName + '"' : '')
+            }
+
+            // For some reason, adding a Content-Type header with the mimeType makes the request fail (it doesn't detect
+            // the token in the params). Don't include this header, and delete it if it's supplied.
+            delete headers['Content-Type'];
+
+            // Get the file to upload.
+            $mmFS.getFile(filePath).then(function(fileEntry) {
+                return $mmFS.getFileObjectFromFileEntry(fileEntry);
+            }).then(function(file) {
+                // Use XMLHttpRequest instead of $http to support onprogress and abort.
+                var xhr = new XMLHttpRequest();
+                xhr.open(httpMethod || 'POST', server);
+                angular.forEach(headers, function(value, name) {
+                    // Filter "unsafe" headers.
+                    if (name != 'Connection') {
+                        xhr.setRequestHeader(name, value);
+                    }
+                });
+
+                if (that.onprogress) {
+                    xhr.onprogress = that.onprogress;
+                }
+
+                that.xhr = xhr;
+                that.deferred = deferred;
+                this.source = filePath;
+                this.target = server;
+
+                xhr.onerror = function() {
+                    deferred.reject(new FileTransferError(-1, filePath, server, xhr.status, xhr.statusText));
+                };
+
+                xhr.onload = function() {
+                    // Finished uploading the file.
+                    deferred.resolve({
+                        bytesSent: file.size,
+                        responseCode: xhr.status,
+                        response: xhr.response,
+                        objectId: ''
+                    });
+                };
+
+                // Create a form data to send params and the file.
+                var fd = new FormData();
+                angular.forEach(params, function(value, name) {
+                    fd.append(name, value);
+                });
+                fd.append('file', file);
+
+                xhr.send(fd);
+            }).catch(deferred.reject);
+        };
+
+        $window.FileTransfer.prototype.abort = function() {
+            if (this.xhr) {
+                this.xhr.abort();
+                this.deferred.reject(new FileTransferError(FileTransferError.ABORT_ERR, this.source, this.target));
+            }
+        };
+    }
+
+    /**
+     * Get the credentials from a URL.
+     * This code is extracted from Cordova FileTransfer plugin.
+     *
+     * @param  {String} urlString The URL to get the credentials from.
+     * @return {String}           Retrieved credentials.
+     */
+    function getUrlCredentials(urlString) {
+        var credentialsPattern = /^https?\:\/\/(?:(?:(([^:@\/]*)(?::([^@\/]*))?)?@)?([^:\/?#]*)(?::(\d*))?).*$/,
+            credentials = credentialsPattern.exec(urlString);
+
+        return credentials && credentials[1];
+    }
+
     /**
      * Loads HTML API to simulate Cordova APIs. Reserved for core use.
      *
@@ -472,8 +726,7 @@ angular.module('mm.core')
             return $q.when();
         }
 
-        var deferred = $q.defer(),
-            basePath;
+        var deferred = $q.defer();
 
         $log.debug('Loading HTML API.');
 
@@ -485,34 +738,7 @@ angular.module('mm.core')
             PERSISTENT: 1
         };
 
-        // FileTransfer API.
-        $window.FileTransfer = function() {};
-
-        $window.FileTransfer.prototype.download = function(url, filePath, successCallback, errorCallback) {
-            var isDesktop = $mmApp.isDesktop(),
-                responseType = isDesktop ? 'arraybuffer' : 'blob';
-
-            $http.get(url, {responseType: responseType}).then(function(data) {
-                if (!data || !data.data) {
-                    errorCallback();
-                } else {
-                    filePath = filePath.replace(basePath, ''); // Remove basePath from the filePath.
-                    filePath = filePath.replace(/%20/g, ' '); // Replace all %20 with spaces.
-                    if (isDesktop) {
-                        // In desktop we need to convert the arraybuffer into a Buffer.
-                        data.data = Buffer.from(new Uint8Array(data.data));
-                    }
-
-                    $mmFS.writeFile(filePath, data.data).then(function(e) {
-                        successCallback(e);
-                    }).catch(function(error) {
-                        errorCallback(error);
-                    });
-                }
-            }).catch(function(error) {
-                errorCallback(error);
-            });
-        };
+        emulateCordovaFileTransfer();
 
         // Cordova ZIP plugin.
         $window.zip = {
@@ -552,8 +778,6 @@ angular.module('mm.core')
             }
         };
 
-        // @todo: Implement FileTransfer.upload.
-
         if ($mmApp.isDesktop()) {
             var fs = require('fs'),
                 app = require('electron').remote.app;
diff --git a/www/core/lib/fs.js b/www/core/lib/fs.js
index bc9d61f11b7..f6a2a084ce7 100644
--- a/www/core/lib/fs.js
+++ b/www/core/lib/fs.js
@@ -592,7 +592,7 @@ angular.module('mm.core')
         return self.init().then(function() {
             // Create file (and parent folders) to prevent errors.
             return self.createFile(path).then(function(fileEntry) {
-                if (isHTMLAPI && !$mmApp.isDesktop() && typeof data == 'string') {
+                if (isHTMLAPI && !$mmApp.isDesktop() && (typeof data == 'string' || data.toString() == '[object ArrayBuffer]')) {
                     // We need to write Blobs.
                     var type = self.getMimeType(self.getFileExtension(path));
                     data = new Blob([data], {type: type || 'text/plain'});

From 8e393912648b8621876fe6eba7c9426e79e7ef64 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 2 Jun 2017 13:58:36 +0200
Subject: [PATCH 016/118] MOBILE-2147 electron: Basic Globalization support

---
 www/core/lib/emulator.js | 90 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 90 insertions(+)

diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
index 1e88379a71d..5582ff786a6 100644
--- a/www/core/lib/emulator.js
+++ b/www/core/lib/emulator.js
@@ -696,6 +696,95 @@ angular.module('mm.core')
         };
     }
 
+    /**
+     * Emulate Cordova Globalization plugin for browser or NodeJS.
+     * Only support the functions to get locale, the rest of functions won't be supported for now.
+     *
+     * @return {Void}
+     */
+    function emulateCordovaGlobalization() {
+        // Create the GlobalizationError object.
+        $window.GlobalizationError = function(code, message) {
+            this.code = code || null;
+            this.message = message || '';
+        };
+
+        $window.GlobalizationError.UNKNOWN_ERROR = 0;
+        $window.GlobalizationError.FORMATTING_ERROR = 1;
+        $window.GlobalizationError.PARSING_ERROR = 2;
+        $window.GlobalizationError.PATTERN_ERROR = 3;
+
+        // Create the globalization object and its functions.
+        function getLocale() {
+            var navLang = navigator.userLanguage || navigator.language;
+            try {
+                if ($mmApp.isDesktop()) {
+                    var locale = require('electron').remote.app.getLocale();
+                    return locale || navLang;
+                } else {
+                    return navLang;
+                }
+            } catch(ex) {
+                // Something went wrong, return browser language.
+                return navLang;
+            }
+        }
+
+        navigator.globalization = {
+            getLocaleName: function(successCallback, errorCallback) {
+                var locale = getLocale();
+                if (locale) {
+                    successCallback && successCallback({value: locale});
+                } else {
+                    var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Cannot get language');
+                    errorCallback && errorCallback(error);
+                }
+            },
+            numberToString: function(number, successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            isDayLightSavingsTime: function(date, successCallback, errorCallback) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getFirstDayOfWeek: function(successCallback, errorCallback) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getDateNames: function (successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getDatePattern: function(successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getNumberPattern: function(successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getCurrencyPattern: function(currencyCode, successCallback, errorCallback) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            stringToDate: function(dateString, successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            stringToNumber: function(numberString, successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            dateToString: function(date, successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+        };
+
+        navigator.globalization.getPreferredLanguage = navigator.globalization.getLocaleName;
+    }
+
     /**
      * Get the credentials from a URL.
      * This code is extracted from Cordova FileTransfer plugin.
@@ -739,6 +828,7 @@ angular.module('mm.core')
         };
 
         emulateCordovaFileTransfer();
+        emulateCordovaGlobalization();
 
         // Cordova ZIP plugin.
         $window.zip = {

From e5eff55e943ecd3fa9a59793a134c1276d343a72 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 5 Jun 2017 09:58:10 +0200
Subject: [PATCH 017/118] MOBILE-2147 electron: Support unzip, including
 progress

---
 www/addons/mod/scorm/controllers/index.js |  1 +
 www/core/lib/emulator.js                  | 94 ++++++++++++++---------
 2 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/www/addons/mod/scorm/controllers/index.js b/www/addons/mod/scorm/controllers/index.js
index f73a74bf913..7be5e3f2ce2 100644
--- a/www/addons/mod/scorm/controllers/index.js
+++ b/www/addons/mod/scorm/controllers/index.js
@@ -323,6 +323,7 @@ angular.module('mm.addons.mod_scorm')
                 }
             } else if (progress.message) { // Show a message.
                 $scope.progressMessage = progress.message;
+                $scope.percentage = undefined;
             } else if (progress.loaded && progress.total) { // Unzipping package.
                 $scope.percentage = (parseFloat(progress.loaded / progress.total) * 100).toFixed(1);
             } else {
diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
index 5582ff786a6..83e4c7564f6 100644
--- a/www/core/lib/emulator.js
+++ b/www/core/lib/emulator.js
@@ -785,6 +785,61 @@ angular.module('mm.core')
         navigator.globalization.getPreferredLanguage = navigator.globalization.getLocaleName;
     }
 
+    /**
+     * Emulate Cordova ZIP plugin for browser or NodeJS.
+     * Only support the unzip function, the rest of functions won't be supported for now.
+     *
+     * @return {Void}
+     */
+    function emulateCordovaZip() {
+        // Cordova ZIP plugin.
+        $window.zip = {
+            unzip: function(source, destination, callback, progressCallback) {
+                // Remove basePath from the source and destination.
+                source = source.replace(basePath, '');
+                source = source.replace(/%20/g, ' '); // Replace all %20 with spaces.
+                destination = destination.replace(basePath, '');
+                destination = destination.replace(/%20/g, ' '); // Replace all %20 with spaces.
+
+                $mmFS.readFile(source, $mmFS.FORMATARRAYBUFFER).then(function(data) {
+                    var zip = new JSZip(data),
+                        promises = [],
+                        loaded = 0,
+                        total = Object.keys(zip.files).length;
+
+                    angular.forEach(zip.files, function(file, name) {
+                        var filePath = $mmFS.concatenatePaths(destination, name),
+                            type,
+                            promise;
+
+                        if (!file.dir) {
+                            // It's a file. Get the mimetype and write the file.
+                            type = $mmFS.getMimeType($mmFS.getFileExtension(name));
+                            promise = $mmFS.writeFile(filePath, new Blob([file.asArrayBuffer()], {type: type}));
+                        } else {
+                            // It's a folder, create it if it doesn't exist.
+                            promise = $mmFS.createDir(filePath);
+                        }
+
+                        promises.push(promise.then(function() {
+                            // File unzipped, call the progress.
+                            loaded++;
+                            progressCallback && progressCallback({loaded: loaded, total: total});
+                        }));
+                    });
+
+                    return $q.all(promises).then(function() {
+                        // Success.
+                        callback(0);
+                    });
+                }).catch(function() {
+                    // Error.
+                    callback(-1);
+                });
+            }
+        };
+    }
+
     /**
      * Get the credentials from a URL.
      * This code is extracted from Cordova FileTransfer plugin.
@@ -829,44 +884,7 @@ angular.module('mm.core')
 
         emulateCordovaFileTransfer();
         emulateCordovaGlobalization();
-
-        // Cordova ZIP plugin.
-        $window.zip = {
-            unzip: function(source, destination, callback, progressCallback) {
-                // Remove basePath from the source and destination.
-                source = source.replace(basePath, '');
-                source = source.replace(/%20/g, ' '); // Replace all %20 with spaces.
-                destination = destination.replace(basePath, '');
-                destination = destination.replace(/%20/g, ' '); // Replace all %20 with spaces.
-
-                $mmFS.readFile(source, $mmFS.FORMATARRAYBUFFER).then(function(data) {
-                    var zip = new JSZip(data),
-                        promises = [];
-
-                    angular.forEach(zip.files, function(file, name) {
-                        var filepath = $mmFS.concatenatePaths(destination, name),
-                            type;
-
-                        if (!file.dir) {
-                            // It's a file. Get the mimetype and write the file.
-                            type = $mmFS.getMimeType($mmFS.getFileExtension(name));
-                            promises.push($mmFS.writeFile(filepath, new Blob([file.asArrayBuffer()], {type: type})));
-                        } else {
-                            // It's a folder, create it if it doesn't exist.
-                            promises.push($mmFS.createDir(filepath));
-                        }
-                    });
-
-                    return $q.all(promises).then(function() {
-                        // Success.
-                        callback(0);
-                    });
-                }).catch(function() {
-                    // Error.
-                    callback(-1);
-                });
-            }
-        };
+        emulateCordovaZip();
 
         if ($mmApp.isDesktop()) {
             var fs = require('fs'),

From c9e23b29cff7a6da417daf88e284330bb581553b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 5 Jun 2017 10:16:35 +0200
Subject: [PATCH 018/118] MOBILE-2147 electron: Wait for window to be ready
 before show

---
 www/electron.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/electron.js b/www/electron.js
index f9343476c5e..26bc7a31a56 100644
--- a/www/electron.js
+++ b/www/electron.js
@@ -27,7 +27,8 @@ function createWindow () {
         minWidth: 400,
         minHeight: 400,
         textAreasAreResizable: false,
-        plugins: true
+        plugins: true,
+        show: false // Don't show it until it's ready to prevent showing a blank screen.
     });
 
     // And load the index.html of the app.
@@ -37,6 +38,10 @@ function createWindow () {
         slashes: true
     }));
 
+    win.once('ready-to-show', () => {
+        win.show();
+    });
+
     // Emitted when the window is closed.
     win.on('closed', () => {
         // Dereference the window object.

From eb008b16c97ef077c15c273a45e83ab3c0d046e0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 5 Jun 2017 12:14:02 +0200
Subject: [PATCH 019/118] MOBILE-2147 electron: Support copy and paste from
 clipboard

---
 www/core/lib/emulator.js  | 79 ++++++++++++++++++++++++++++++++++++++-
 www/core/scss/styles.scss |  8 +++-
 2 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
index 83e4c7564f6..9baf427a528 100644
--- a/www/core/lib/emulator.js
+++ b/www/core/lib/emulator.js
@@ -21,7 +21,7 @@ angular.module('mm.core')
  * @description
  * This service handles the emulation of Cordova plugins in other environments like browser.
  */
-.factory('$mmEmulatorManager', function($log, $q, $mmFS, $window, $mmApp, mmCoreConfigConstants) {
+.factory('$mmEmulatorManager', function($log, $q, $mmFS, $window, $mmApp, mmCoreConfigConstants, $cordovaClipboard) {
 
     $log = $log.getInstance('$mmEmulatorManager');
 
@@ -57,6 +57,82 @@ angular.module('mm.core')
         return header;
     }
 
+    /**
+     * Emulate Cordova clipboard plugin for browser and NodeJS.
+     *
+     * @return {Void}
+     */
+    function emulateCordovaClipboard() {
+        var isDesktop = $mmApp.isDesktop(),
+            clipboard,
+            copyTextarea;
+
+        if (isDesktop) {
+            clipboard = require('electron').clipboard;
+        } else {
+            // In browser the text must be selected in order to copy it. Create a hidden textarea to put the text in it.
+            copyTextarea = document.createElement('textarea');
+            angular.element(copyTextarea).addClass('mm-browser-copy-area');
+            copyTextarea.setAttribute('aria-hidden', 'true');
+            document.body.append(copyTextarea);
+        }
+
+        // We need to redefine $cordovaClipboard methods instead of the core plugin (window.cordova.plugins.clipboard)
+        // because creating window.cordova breaks the app (it thinks it's a real device).
+        $cordovaClipboard.copy = function(text) {
+            var deferred = $q.defer();
+
+            if (isDesktop) {
+                clipboard.writeText(text);
+                deferred.resolve();
+            } else {
+                // Put the text in the hidden textarea and select it.
+                copyTextarea.innerHTML = text;
+                copyTextarea.select();
+
+                try {
+                    if (document.execCommand('copy')) {
+                        deferred.resolve();
+                    } else {
+                        deferred.reject();
+                    }
+                } catch (err) {
+                    deferred.reject();
+                }
+
+                copyTextarea.innerHTML = '';
+            }
+
+            return deferred.promise;
+        };
+
+        $cordovaClipboard.paste = function() {
+            var deferred = $q.defer();
+
+            if (isDesktop) {
+                deferred.resolve(clipboard.readText());
+            } else {
+                // Paste the text in the hidden textarea and get it.
+                copyTextarea.innerHTML = '';
+                copyTextarea.select();
+
+                try {
+                    if (document.execCommand('paste')) {
+                        deferred.resolve(copyTextarea.innerHTML);
+                    } else {
+                        deferred.reject();
+                    }
+                } catch (err) {
+                    deferred.reject();
+                }
+
+                copyTextarea.innerHTML = '';
+            }
+
+            return deferred.promise;
+        };
+    }
+
     /**
      * Emulate Cordova file plugin using NodeJS functions. This should only be used in NodeJS environments,
      * browser works with the default resolveLocalFileSystemURL.
@@ -885,6 +961,7 @@ angular.module('mm.core')
         emulateCordovaFileTransfer();
         emulateCordovaGlobalization();
         emulateCordovaZip();
+        emulateCordovaClipboard();
 
         if ($mmApp.isDesktop()) {
             var fs = require('fs'),
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index ac1142effc1..125685f726f 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -1632,4 +1632,10 @@ h2.invert {
   &.ng-leave.ng-leave-active {
     opacity: 0;
   }
-}
\ No newline at end of file
+}
+
+// Textarea to copy text in browser or desktop. Don't use display none because otherwise it can't be selected.
+.mm-browser-copy-area {
+  position: absolute;
+  left: -10000px;
+}

From 16af71669c60f72bdc8a98ba578b1abd7629b110 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 6 Jun 2017 15:17:37 +0200
Subject: [PATCH 020/118] MOBILE-2147 electron: Support Custom URL scheme

---
 www/core/components/login/main.js |  5 +++
 www/core/lib/emulator.js          | 23 ++++++++++++-
 www/electron.js                   | 55 +++++++++++++++++++++++++------
 3 files changed, 72 insertions(+), 11 deletions(-)

diff --git a/www/core/components/login/main.js b/www/core/components/login/main.js
index d8c5f71e611..2080760da08 100644
--- a/www/core/components/login/main.js
+++ b/www/core/components/login/main.js
@@ -371,6 +371,11 @@ angular.module('mm.core.login', [])
         // Delete the sso scheme from the URL.
         url = url.replace(ssoScheme, '');
 
+        // Some platforms like Windows add a slash at the end. Remove it.
+        if (url.slice(-1) == '/') {
+            url = url.substring(0, url.length - 1);
+        }
+
         // 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);
diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
index 9baf427a528..a37cb536f34 100644
--- a/www/core/lib/emulator.js
+++ b/www/core/lib/emulator.js
@@ -134,12 +134,16 @@ angular.module('mm.core')
     }
 
     /**
-     * Emulate Cordova file plugin using NodeJS functions. This should only be used in NodeJS environments,
+     * Emulate Cordova file plugin using NodeJS functions. This is only for NodeJS environments,
      * browser works with the default resolveLocalFileSystemURL.
      *
      * @return {Void}
      */
     function emulateCordovaFile() {
+        if (!$mmApp.isDesktop()) {
+            return;
+        }
+
         var fs = require('fs');
 
         // Create the Entry object, parent of DirectoryEntry and FileEntry.
@@ -916,6 +920,22 @@ angular.module('mm.core')
         };
     }
 
+    /**
+     * Emulate Custom URL Schemes for NodeJS.
+     *
+     * @return {Void}
+     */
+    function emulateCustomURLScheme() {
+        if (!$mmApp.isDesktop()) {
+            return;
+        }
+
+        // Listen for app launched events.
+        require('electron').ipcRenderer.on('mmAppLaunched', (event, url) => {
+            window.handleOpenURL && window.handleOpenURL(url);
+        });
+    }
+
     /**
      * Get the credentials from a URL.
      * This code is extracted from Cordova FileTransfer plugin.
@@ -968,6 +988,7 @@ angular.module('mm.core')
                 app = require('electron').remote.app;
 
             emulateCordovaFile();
+            emulateCustomURLScheme();
 
             // Initialize File System. Get the path to use.
             basePath = app.getPath('documents') || app.getPath('home');
diff --git a/www/electron.js b/www/electron.js
index 26bc7a31a56..ff47101b150 100644
--- a/www/electron.js
+++ b/www/electron.js
@@ -5,9 +5,9 @@ const url = require('url');
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
-let win;
+let mainWindow;
 
-function createWindow () {
+function createWindow() {
     // Create the browser window.
     var width = 800,
         height = 600;
@@ -21,7 +21,7 @@ function createWindow () {
         }
     }
 
-    win = new BrowserWindow({
+    mainWindow = new BrowserWindow({
         width: width,
         height: height,
         minWidth: 400,
@@ -32,26 +32,31 @@ function createWindow () {
     });
 
     // And load the index.html of the app.
-    win.loadURL(url.format({
+    mainWindow.loadURL(url.format({
         pathname: path.join(__dirname, 'index.html'),
         protocol: 'file:',
         slashes: true
     }));
 
-    win.once('ready-to-show', () => {
-        win.show();
+    mainWindow.once('ready-to-show', () => {
+        mainWindow.show();
     });
 
     // Emitted when the window is closed.
-    win.on('closed', () => {
+    mainWindow.on('closed', () => {
         // Dereference the window object.
-        win = null
+        mainWindow = null
     });
 }
 
 // This method will be called when Electron has finished initialization and is ready to create browser windows.
 // Some APIs can only be used after this event occurs.
-app.on('ready', createWindow);
+app.on('ready', function() {
+    createWindow();
+
+    // Open the app when a link with "moodlemobile://" is clicked.
+    app.setAsDefaultProtocolClient('moodlemobile');
+});
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
@@ -60,11 +65,41 @@ app.on('window-all-closed', () => {
 
 app.on('activate', () => {
     // On macOS it's common to re-create a window in the app when the dock icon is clicked and there are no other windows open.
-    if (win === null) {
+    if (mainWindow === null) {
         createWindow();
     }
 });
 
+// Make sure that only a single instance of the app is running.
+var shouldQuit = app.makeSingleInstance((argv, workingDirectory) => {
+    // Another instance was launched. If it was launched with a URL, it should be in the second param.
+    if (argv && argv[1]) {
+        appLaunched(argv[1]);
+    }
+});
+
+if (shouldQuit) {
+    // It's not the main instance of the app, kill it.
+    app.quit();
+} else {
+    // Listen for open-url events (Mac OS only).
+    app.on('open-url', (event, url) => {
+        event.preventDefault();
+        appLaunched(url);
+    });
+}
+
+function appLaunched(url) {
+    // App was launched again with a URL. Focus the main window and send an event to treat the URL.
+    if (mainWindow) {
+        if (mainWindow.isMinimized()) {
+            mainWindow.restore();
+        }
+        mainWindow.focus();
+        mainWindow.webContents.send('mmAppLaunched', url); // Send an event to the main window.
+    }
+}
+
 ipcMain.on('openItem', (event, path) => {
     shell.openItem(path);
 });

From be7034c7bb3966e22fb96a414080cb01e59f8923 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 7 Jun 2017 11:25:58 +0200
Subject: [PATCH 021/118] MOBILE-2147 electron: Support InAppBrowser

---
 www/core/components/login/main.js |   4 +
 www/core/lib/emulator.js          | 126 ++++++++++++++++++++++++++++++
 www/core/lib/util.js              |  11 ++-
 www/electron.js                   |  10 +++
 4 files changed, 149 insertions(+), 2 deletions(-)

diff --git a/www/core/components/login/main.js b/www/core/components/login/main.js
index 2080760da08..75880aea5d9 100644
--- a/www/core/components/login/main.js
+++ b/www/core/components/login/main.js
@@ -363,6 +363,10 @@ angular.module('mm.core.login', [])
             // Authentication ongoing, probably duplicated request.
             return true;
         }
+        if ($mmApp.isDesktop()) {
+            // In desktop, make sure InAppBrowser is closed.
+            $mmUtil.closeInAppBrowser(true);
+        }
 
         // App opened using custom URL scheme. Probably an SSO authentication.
         $mmApp.startSSOAuthentication();
diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
index a37cb536f34..0b329d77046 100644
--- a/www/core/lib/emulator.js
+++ b/www/core/lib/emulator.js
@@ -936,6 +936,131 @@ angular.module('mm.core')
         });
     }
 
+    /**
+     * Emulate InAppBrowser for NodeJS.
+     *
+     * @return {Void}
+     */
+    function emulateInAppBrowser() {
+        if (!$mmApp.isDesktop()) {
+            return;
+        }
+
+        var BrowserWindow = require('electron').remote.BrowserWindow,
+            screen = require('electron').screen;
+
+        // Redefine window open to be able to have full control over the new window.
+        $window.open = function(url, frameName, features) {
+            var width = 800,
+                height = 600,
+                display,
+                newWindow,
+                listeners = {};
+
+            if (screen) {
+                display = screen.getPrimaryDisplay();
+                if (display && display.workArea) {
+                    width = display.workArea.width || width;
+                    height = display.workArea.height || height;
+                }
+            }
+
+            newWindow = new BrowserWindow({
+                width: width,
+                height: height
+            });
+            newWindow.loadURL(url);
+
+            // Add the missing functions that InAppBrowser supports but BrowserWindow doesn't.
+            newWindow.addEventListener = function(name, callback) {
+                var that = this;
+
+                switch (name) {
+                    case 'loadstart':
+                        that.webContents.addListener('did-start-loading', received);
+                        break;
+
+                    case 'loadstop':
+                        that.webContents.addListener('did-finish-load', received);
+                        break;
+
+                    case 'loaderror':
+                        that.webContents.addListener('did-fail-load', received);
+                        break;
+
+                    case 'exit':
+                        that.addListener('close', received);
+                        break;
+                }
+
+                // Store the received function instance to be able to remove the listener.
+                listeners[callback] = received;
+
+                function received(event) {
+                    try {
+                        event.url = that.getURL();
+                        callback(event);
+                    } catch(ex) {}
+                }
+            };
+
+            newWindow.removeEventListener = function(name, callback) {
+                var that = this,
+                    listener = listeners[callback];
+
+                switch (name) {
+                    case 'loadstart':
+                        that.webContents.removeListener('did-start-loading', listener);
+                        break;
+
+                    case 'loadstop':
+                        that.webContents.removeListener('did-finish-load', listener);
+                        break;
+
+                    case 'loaderror':
+                        that.webContents.removeListener('did-fail-load', listener);
+                        break;
+
+                    case 'exit':
+                        that.removeListener('close', listener);
+                        break;
+                }
+            };
+
+            newWindow.executeScript = function(details, callback) {
+                var that = this;
+
+                if (details.code) {
+                    that.webContents.executeJavaScript(details.code, false, callback);
+                } else if (details.file) {
+                    $mmFS.readFile(details.file).then(function(code) {
+                        that.webContents.executeJavaScript(code, false, callback);
+                    }).catch(callback);
+                } else {
+                    callback('executeScript requires exactly one of code or file to be specified');
+                }
+            };
+
+            newWindow.insertCSS = function(details, callback) {
+                var that = this;
+
+                if (details.code) {
+                    that.webContents.insertCSS(details.code);
+                    callback();
+                } else if (details.file) {
+                    $mmFS.readFile(details.file).then(function(code) {
+                        that.webContents.insertCSS(code);
+                        callback();
+                    }).catch(callback);
+                } else {
+                    callback('insertCSS requires exactly one of code or file to be specified');
+                }
+            };
+
+            return newWindow;
+        };
+    }
+
     /**
      * Get the credentials from a URL.
      * This code is extracted from Cordova FileTransfer plugin.
@@ -989,6 +1114,7 @@ angular.module('mm.core')
 
             emulateCordovaFile();
             emulateCustomURLScheme();
+            emulateInAppBrowser();
 
             // Initialize File System. Get the path to use.
             basePath = app.getPath('documents') || app.getPath('home');
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 5a21b276da5..1e4f82db24b 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -432,10 +432,17 @@ angular.module('mm.core')
          * @module mm.core
          * @ngdoc method
          * @name $mmUtil#closeInAppBrowser
+         * @param  {Boolean} [closeAll] Desktop only. True to close all secondary windows, false to close only the "current" one.
          * @return {Void}
          */
-        self.closeInAppBrowser = function() {
-            $cordovaInAppBrowser.close();
+        self.closeInAppBrowser = function(closeAll) {
+            // Use try/catch because it will fail if there is no opened InAppBrowser.
+            try {
+                $cordovaInAppBrowser.close();
+                if (closeAll && $mmApp.isDesktop()) {
+                    require('electron').ipcRenderer.send('closeSecondaryWindows');
+                }
+            } catch(ex) {}
         };
 
         /**
diff --git a/www/electron.js b/www/electron.js
index ff47101b150..c95bdfb7566 100644
--- a/www/electron.js
+++ b/www/electron.js
@@ -100,6 +100,16 @@ function appLaunched(url) {
     }
 }
 
+// Listen for events sent by the renderer processes (windows).
 ipcMain.on('openItem', (event, path) => {
     shell.openItem(path);
 });
+
+ipcMain.on('closeSecondaryWindows', () => {
+    var windows = BrowserWindow.getAllWindows();
+    for (var i = 0; i < windows.length; i++) {
+        if (!mainWindow || windows[i].id != mainWindow.id) {
+            windows[i].close();
+        }
+    }
+});

From 862b851bdf46c3c61998442cc8702f879477fe70 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 9 Jun 2017 10:01:12 +0200
Subject: [PATCH 022/118] MOBILE-2147 calendar: Open event in split view when
 notification clicked

---
 www/addons/calendar/controllers/list.js | 38 +++++++++++++++++++------
 www/addons/calendar/templates/list.html |  2 +-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/www/addons/calendar/controllers/list.js b/www/addons/calendar/controllers/list.js
index 5ef1ab47781..30f897430f1 100644
--- a/www/addons/calendar/controllers/list.js
+++ b/www/addons/calendar/controllers/list.js
@@ -21,9 +21,9 @@ angular.module('mm.addons.calendar')
  * @ngdoc controller
  * @name mmaCalendarListCtrl
  */
-.controller('mmaCalendarListCtrl', function($scope, $stateParams, $log, $state, $mmaCalendar, $mmUtil, $ionicHistory, $mmEvents,
+.controller('mmaCalendarListCtrl', function($scope, $stateParams, $log, $state, $mmaCalendar, $mmUtil, $timeout, $mmEvents,
         mmaCalendarDaysInterval, $ionicScrollDelegate, $mmLocalNotifications, $mmCourses, mmaCalendarDefaultNotifTimeChangedEvent,
-        $ionicPopover, $q, $translate) {
+        $ionicPopover, $q, $translate, $ionicPlatform) {
 
     $log = $log.getInstance('mmaCalendarListCtrl');
 
@@ -38,10 +38,10 @@ angular.module('mm.addons.calendar')
         };
 
     $scope.events = [];
+    $scope.eventToLoad = 1;
 
-    if ($stateParams.eventid) {
-        // We arrived here via notification click, let's clear history and redirect to event details.
-        $ionicHistory.clearHistory();
+    if ($stateParams.eventid && !$ionicPlatform.isTablet()) {
+        // There is an event to load and it's a phone device, open the event in a new state.
         $state.go('site.calendar-event', {id: $stateParams.eventid});
     }
 
@@ -69,7 +69,6 @@ angular.module('mm.addons.calendar')
                 emptyEventsTimes++;
                 if (emptyEventsTimes > 5) { // Stop execution if we retrieve empty list 6 consecutive times.
                     $scope.canLoadMore = false;
-                    $scope.eventsLoaded = true;
                     if (refresh) {
                         $scope.events = [];
                     }
@@ -90,7 +89,6 @@ angular.module('mm.addons.calendar')
                     // 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;
 
                 // Schedule notifications for the events retrieved (might have new events).
@@ -101,7 +99,6 @@ angular.module('mm.addons.calendar')
             scrollView.resize();
         }, function(error) {
             $mmUtil.showErrorModalDefault(error, 'mma.calendar.errorloadevents', true);
-            $scope.eventsLoaded = true;
             $scope.canLoadMore = false; // Set to false to prevent infinite calls with infinite-loading.
         });
     }
@@ -121,7 +118,30 @@ angular.module('mm.addons.calendar')
     $scope.notificationsEnabled = $mmLocalNotifications.isAvailable();
 
     // Get first events.
-    fetchData();
+    fetchData().then(function() {
+        if ($stateParams.eventid && $ionicPlatform.isTablet()) {
+            // There is an event to load and it's a tablet device. Search the position of the event in the list and load it.
+            var found = false;
+
+            for (var i = 0; i < $scope.events.length; i++) {
+                if ($scope.events[i].id == $stateParams.eventid) {
+                    $scope.eventToLoad = i + 1;
+                    found = true;
+                    break;
+                }
+            }
+
+            if (!found) {
+                // Event not found in the list, open it in a new state. Use a $timeout to open the state after the
+                // split view is loaded.
+                $timeout(function() {
+                    $state.go('site.calendar-event', {id: $stateParams.eventid});
+                });
+            }
+        }
+    }).finally(function() {
+        $scope.eventsLoaded = true;
+    });
 
     // Init popover.
     $ionicPopover.fromTemplateUrl('addons/calendar/templates/course_picker.html', {
diff --git a/www/addons/calendar/templates/list.html b/www/addons/calendar/templates/list.html
index 7ec4466f335..23f07180988 100644
--- a/www/addons/calendar/templates/list.html
+++ b/www/addons/calendar/templates/list.html
@@ -5,7 +5,7 @@
             <mm-context-menu-item priority="600" ng-show="notificationsEnabled" ui-sref="site.calendar-settings" content="'mm.settings.settings' | translate" action="openSettings()" icon-action="'ion-gear-b'"></mm-context-menu-item>
         </mm-context-menu>
     </ion-nav-buttons>
-    <mm-split-view load-when="eventsLoaded" component="mmaCalendarEventsList" menu-state="site.calendar">
+    <mm-split-view load-when="eventsLoaded" load="{{eventToLoad}}" component="mmaCalendarEventsList" menu-state="site.calendar">
         <ion-content mm-state-class delegate-handle="mmaCalendarEventsListScroll">
             <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="eventsLoaded" on-refresh="refreshEvents()">
             </ion-refresher>

From 53e10880b0a3263dc885fc189fa02cf5c1804a92 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 9 Jun 2017 11:58:27 +0200
Subject: [PATCH 023/118] MOBILE-2147 electron: Support local notifications

---
 .../notifications/controllers/preferences.js  |  23 +-
 .../notifications/templates/preferences.html  |   4 +-
 www/core/lib/emulator.js                      | 471 +++++++++++++++++-
 www/core/lib/localnotif.js                    |   2 +-
 4 files changed, 484 insertions(+), 16 deletions(-)

diff --git a/www/addons/notifications/controllers/preferences.js b/www/addons/notifications/controllers/preferences.js
index 226a12fcaab..efe6168083f 100644
--- a/www/addons/notifications/controllers/preferences.js
+++ b/www/addons/notifications/controllers/preferences.js
@@ -23,23 +23,26 @@ angular.module('mm.addons.notifications')
  */
 .controller('mmaNotificationsPreferencesCtrl', function($scope, $mmaNotifications, $mmUtil, $ionicPlatform, $mmUser, $mmConfig,
             $mmaMessageOutputDelegate, $q, $timeout, $mmSettingsHelper, mmCoreSettingsNotificationSound, $mmLocalNotifications,
-            $mmEvents, mmCoreEventNotificationSoundChanged) {
+            $mmEvents, mmCoreEventNotificationSoundChanged, $mmApp) {
 
     var updateTimeout;
 
     $scope.isTablet = $ionicPlatform.isTablet();
     $scope.notifPrefsEnabled = $mmaNotifications.isNotificationPreferencesEnabled();
+    $scope.canChangeSound = $mmLocalNotifications.isAvailable() && !$mmApp.isDesktop();
 
-    // Notification sound setting.
-    $mmConfig.get(mmCoreSettingsNotificationSound, true).then(function(enabled) {
-        $scope.notificationSound = enabled;
-    });
+    if ($scope.canChangeSound) {
+        // 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();
-    };
+        $scope.notificationSoundChanged = function(enabled) {
+            $mmConfig.set(mmCoreSettingsNotificationSound, enabled);
+            $mmEvents.trigger(mmCoreEventNotificationSoundChanged, enabled);
+            $mmLocalNotifications.rescheduleAll();
+        };
+    }
 
     if (!$scope.notifPrefsEnabled) {
         // Notification preferences aren't enabled, stop.
diff --git a/www/addons/notifications/templates/preferences.html b/www/addons/notifications/templates/preferences.html
index 94ec50727c0..1b35e02a80b 100644
--- a/www/addons/notifications/templates/preferences.html
+++ b/www/addons/notifications/templates/preferences.html
@@ -10,7 +10,7 @@
         </ion-refresher>
         <mm-loading hide-until="preferencesLoaded">
             <!-- If notification preferences aren't enabled, show only the notification sound setting. -->
-            <ion-toggle ng-if="!notifPrefsEnabled" ng-model="notificationSound" ng-change="notificationSoundChanged(notificationSound)">
+            <ion-toggle ng-if="canChangeSound && !notifPrefsEnabled" ng-model="notificationSound" ng-change="notificationSoundChanged(notificationSound)">
                 <p class="item-heading">{{ 'mma.notifications.playsound' | translate }}</p>
             </ion-toggle>
 
@@ -19,7 +19,7 @@
                     <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)">
+                    <ion-toggle ng-if="canChangeSound" ng-model="notificationSound" ng-change="notificationSoundChanged(notificationSound)">
                         <p class="item-heading">{{ 'mma.notifications.playsound' | translate }}</p>
                     </ion-toggle>
                 </div>
diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
index 0b329d77046..7deb5c7f26a 100644
--- a/www/core/lib/emulator.js
+++ b/www/core/lib/emulator.js
@@ -14,6 +14,23 @@
 
 angular.module('mm.core')
 
+.constant('mmDesktopLocalNotificationsStore', 'desktop_local_notifications')
+
+.config(function($mmAppProvider, mmDesktopLocalNotificationsStore) {
+    var stores = [
+        {
+            name: mmDesktopLocalNotificationsStore, // Store to schedule notifications in desktop apps.
+            keyPath: 'id',
+            indexes: [
+                {
+                    name: 'triggered'
+                }
+            ]
+        }
+    ];
+    $mmAppProvider.registerStores(stores);
+})
+
 /**
  * @ngdoc service
  * @name $mmEmulatorManager
@@ -21,7 +38,9 @@ angular.module('mm.core')
  * @description
  * This service handles the emulation of Cordova plugins in other environments like browser.
  */
-.factory('$mmEmulatorManager', function($log, $q, $mmFS, $window, $mmApp, mmCoreConfigConstants, $cordovaClipboard) {
+.factory('$mmEmulatorManager', function($log, $q, $mmFS, $window, $mmApp, $mmUtil, mmCoreConfigConstants, $cordovaClipboard,
+            $cordovaLocalNotification, mmDesktopLocalNotificationsStore, $timeout, $rootScope, $interval,
+            mmCoreSecondsYear, mmCoreSecondsDay, mmCoreSecondsHour, mmCoreSecondsMinute) {
 
     $log = $log.getInstance('$mmEmulatorManager');
 
@@ -1061,6 +1080,427 @@ angular.module('mm.core')
         };
     }
 
+    /**
+     * Emulate local notifications for NodeJS.
+     * Some of the code used in here was extracted from the Cordova Local Notification plugin.
+     *
+     * @return {Promise} Promise resolved when done.
+     */
+    function emulateLocalNotifications() {
+        if (!$mmApp.isDesktop()) {
+            return $q.when();
+        }
+
+        var scheduled = {},
+            triggered = {},
+            defaults = {
+                text:  '',
+                title: '',
+                id:    0,
+                sound: '',
+                data:  undefined,
+                every: undefined,
+                at:    undefined
+            };
+
+        // Redefine $cordovaLocalNotification methods instead of the core plugin (window.cordova.plugins.notification.local)
+        // because creating window.cordova breaks the app (it thinks it's a real device).
+        $cordovaLocalNotification.schedule = function(notifications, scope, isUpdate) {
+            var promises = [];
+
+            notifications = Array.isArray(notifications) ? notifications : [notifications];
+
+            angular.forEach(notifications, function(notification) {
+                mergeWithDefaults(notification);
+                convertProperties(notification);
+
+                // Cancel current notification if exists.
+                $cordovaLocalNotification.cancel(notification.id, null, true);
+
+                // Store the notification in the scheduled list and in the DB.
+                scheduled[notification.id] = {
+                    notification: notification
+                };
+                promises.push(storeLocalNotification(notification, false));
+
+                // Schedule the notification.
+                var toTrigger = notification.at * 1000 - Date.now();
+                scheduled[notification.id].timeout = $timeout(function trigger() {
+                    // Trigger the notification.
+                    var notifInstance = new Notification(notification.title, {
+                        body: notification.text
+                    });
+
+                    // Store the notification as triggered. Don't remove it from scheduled, it's how the plugin works.
+                    triggered[notification.id] = notification;
+                    storeLocalNotification(notification, true);
+
+                    // Launch the trigger event.
+                    $rootScope.$broadcast('$cordovaLocalNotification:trigger', notification, 'foreground');
+
+                    // Listen for click events.
+                    notifInstance.onclick = function() {
+                        $rootScope.$broadcast('$cordovaLocalNotification:click', notification, 'foreground');
+                    };
+
+                    if (notification.every && scheduled[notification.id] && !scheduled[notification.id].interval) {
+                        var interval = parseInterval(notification.every);
+                        if (interval > 0) {
+                            scheduled[notification.id].interval = $interval(trigger, interval);
+                        }
+                    }
+                }, toTrigger);
+
+                // Launch the scheduled/update event.
+                var eventName = isUpdate ? 'update' : 'schedule';
+                $rootScope.$broadcast('$cordovaLocalNotification:' + eventName, notification, 'foreground');
+            });
+
+            return $q.when();
+        };
+
+        $cordovaLocalNotification.update = function(notifications) {
+            // Just schedule them again, since scheduling cancels the existing one.
+            return $cordovaLocalNotification.schedule(notifications, null, true);
+        };
+
+        $cordovaLocalNotification.clear = function(ids, scope, omitEvent) {
+            var promises = [];
+
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+
+            // Clear the notifications.
+            angular.forEach(ids, function(id) {
+                // Cancel only the notifications that aren't repeating.
+                if (scheduled[id] && scheduled[id].notification && !scheduled[id].notification.every) {
+                    promises.push(cancelNotification(id, omitEvent, '$cordovaLocalNotification:clear'));
+                }
+            });
+
+            return $q.all(promises);
+        };
+
+        $cordovaLocalNotification.clearAll = function(scope, omitEvent) {
+            var ids = Object.keys(scheduled);
+            return $cordovaLocalNotification.clear(ids, scope, omitEvent).then(function() {
+                if (!omitEvent) {
+                    $rootScope.$broadcast('$cordovaLocalNotification:clearall', 'foreground');
+                }
+            });
+        };
+
+        $cordovaLocalNotification.cancel = function(ids, scope, omitEvent) {
+            var promises = [];
+
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+
+            // Cancel the notifications.
+            angular.forEach(ids, function(id) {
+                if (scheduled[id]) {
+                    promises.push(cancelNotification(id, omitEvent, '$cordovaLocalNotification:cancel'));
+                }
+            });
+
+            return $q.all(promises);
+        };
+
+        $cordovaLocalNotification.cancelAll = function(scope, omitEvent) {
+            var ids = Object.keys(scheduled);
+            return $cordovaLocalNotification.cancel(ids, scope, omitEvent).then(function() {
+                if (!omitEvent) {
+                    $rootScope.$broadcast('$cordovaLocalNotification:cancelall', 'foreground');
+                }
+            });
+        };
+
+        $cordovaLocalNotification.isPresent = function(id) {
+            return $q.when(!!scheduled[id] || !!triggered[notification.id]);
+        };
+
+        $cordovaLocalNotification.isScheduled = function(id) {
+            return $q.when(!!scheduled[id]);
+        };
+
+        $cordovaLocalNotification.isTriggered = function(id) {
+            return $q.when(!!triggered[notification.id]);
+        };
+
+        $cordovaLocalNotification.hasPermission = function() {
+            return $q.when(true);
+        };
+
+        $cordovaLocalNotification.registerPermission = function() {
+            return $q.when(true);
+        };
+
+        $cordovaLocalNotification.getAllIds = function() {
+            return $q.when($mmUtil.mergeArraysWithoutDuplicates(Object.keys(scheduled), Object.keys(triggered)));
+        };
+        $cordovaLocalNotification.getIds = $cordovaLocalNotification.getAllIds;
+
+        $cordovaLocalNotification.getScheduledIds = function() {
+            return $q.when(Object.keys(scheduled));
+        };
+
+        $cordovaLocalNotification.getTriggeredIds = function() {
+            return $q.when(Object.keys(triggered));
+        };
+
+        $cordovaLocalNotification.get = function(ids) {
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+            return getNotifications(ids, true, true);
+        };
+
+        $cordovaLocalNotification.getAll = function() {
+            return getNotifications(null, true, true);
+        };
+
+        $cordovaLocalNotification.getScheduled = function(ids) {
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+            return getNotifications(ids, true, false);
+        };
+
+        $cordovaLocalNotification.getAllScheduled = function() {
+            return getNotifications(null, true, false);
+        };
+
+        $cordovaLocalNotification.getTriggered = function(ids) {
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+            return getNotifications(ids, false, true);
+        };
+
+        $cordovaLocalNotification.getAllTriggered = function() {
+            return getNotifications(null, false, true);
+        };
+
+        $cordovaLocalNotification.getDefaults = function() {
+            return defaults;
+        };
+
+        $cordovaLocalNotification.setDefaults = function(newDefaults) {
+            for (var key in defaults) {
+                if (newDefaults.hasOwnProperty(key)) {
+                    defaults[key] = newDefaults[key];
+                }
+            }
+        };
+
+        // App is being loaded, re-schedule all the notifications that were scheduled before.
+        return getAllLocalNotifications().catch(function() {
+            return [];
+        }).then(function(notifications) {
+            angular.forEach(notifications, function(notification) {
+                if (notification.triggered) {
+                    // Notification was triggered already, store it in memory but don't schedule it again.
+                    delete notification.triggered;
+                    scheduled[notification.id] = notification;
+                    triggered[notification.id] = notification;
+                } else {
+                    // Schedule the notification again unless it should have been triggered more than an hour ago.
+                    delete notification.triggered;
+                    notification.at = notification.at * 1000;
+                    if (notification.at - Date.now() > - mmCoreSecondsHour * 1000) {
+                        $cordovaLocalNotification.schedule(notification);
+                    }
+                }
+            });
+        });
+
+        // Cancel a notification.
+        function cancelNotification(id, omitEvent, eventName) {
+            var notification = scheduled[id].notification;
+
+            $timeout.cancel(scheduled[id].timeout);
+            $interval.cancel(scheduled[id].interval);
+            delete scheduled[id];
+            delete triggered[id];
+
+            removeLocalNotification(id);
+
+            if (!omitEvent) {
+                $rootScope.$broadcast(eventName, notification, 'foreground');
+            }
+        }
+
+        // Get a set of notifications. If ids isn't specified, return all the notifications.
+        function getNotifications(ids, getScheduled, getTriggered) {
+            var notifications = [];
+
+            if (getScheduled) {
+                angular.forEach(scheduled, function(entry, id) {
+                    if (!ids || ids.indexOf(id) != -1) {
+                        notifications.push(entry.notification);
+                    }
+                });
+            }
+
+            if (getTriggered) {
+                angular.forEach(triggered, function(notification, id) {
+                    if ((!getScheduled || !scheduled[id]) && (!ids || ids.indexOf(id) != -1)) {
+                        notifications.push(notification);
+                    }
+                });
+            }
+
+            return $q.when(notifications);
+        }
+
+        // Merge options with default values.
+        function mergeWithDefaults(options) {
+            options.at   = getValueFor(options, 'at', 'firstAt', 'date');
+            options.text = getValueFor(options, 'text', 'message');
+            options.data = getValueFor(options, 'data', 'json');
+
+            if (defaults.hasOwnProperty('autoClear')) {
+                options.autoClear = getValueFor(options, 'autoClear', 'autoCancel');
+            }
+
+            if (options.autoClear !== true && options.ongoing) {
+                options.autoClear = false;
+            }
+
+            if (options.at === undefined || options.at === null) {
+                options.at = new Date();
+            }
+
+            for (var key in defaults) {
+                if (options[key] === null || options[key] === undefined) {
+                    if (options.hasOwnProperty(key) && ['data','sound'].indexOf(key) > -1) {
+                        options[key] = undefined;
+                    } else {
+                        options[key] = defaults[key];
+                    }
+                }
+            }
+
+            for (key in options) {
+                if (!defaults.hasOwnProperty(key)) {
+                    delete options[key];
+                    console.warn('Unknown property: ' + key);
+                }
+            }
+
+            return options;
+        }
+
+        // First found value for the given keys.
+        function getValueFor(options) {
+            var keys = Array.apply(null, arguments).slice(1);
+
+            for (var i = 0; i < keys.length; i++) {
+                var key = keys[i];
+
+                if (options.hasOwnProperty(key)) {
+                    return options[key];
+                }
+            }
+        }
+
+        // Convert the passed values to their required type.
+        function convertProperties(options) {
+            if (options.id) {
+                if (isNaN(options.id)) {
+                    options.id = defaults.id;
+                    console.warn('Id is not a number: ' + options.id);
+                } else {
+                    options.id = Number(options.id);
+                }
+            }
+
+            if (options.title) {
+                options.title = options.title.toString();
+            }
+
+            if (options.text) {
+                options.text  = options.text.toString();
+            }
+
+            if (options.badge) {
+                if (isNaN(options.badge)) {
+                    options.badge = defaults.badge;
+                    console.warn('Badge number is not a number: ' + options.id);
+                } else {
+                    options.badge = Number(options.badge);
+                }
+            }
+
+            if (options.at) {
+                if (typeof options.at == 'object') {
+                    options.at = options.at.getTime();
+                }
+
+                options.at = Math.round(options.at / 1000);
+            }
+
+            if (typeof options.data == 'object') {
+                options.data = JSON.stringify(options.data);
+            }
+
+            return options;
+        }
+
+        // Convert the IDs to numbers.
+        function convertIds(ids) {
+            var convertedIds = [];
+
+            for (var i = 0; i < ids.length; i++) {
+                convertedIds.push(Number(ids[i]));
+            }
+
+            return convertedIds;
+        }
+
+        // Parse the interval and convert it to a number of milliseconds (0 if not valid).
+        function parseInterval(every) {
+            var interval;
+
+            every = String(every).toLowerCase();
+
+            if (!every || every == 'undefined') {
+                interval = 0;
+            } else if (every == 'second') {
+                interval = 1000;
+            } else if (every == 'minute') {
+                interval = mmCoreSecondsMinute * 1000;
+            } else if (every == 'hour') {
+                interval = mmCoreSecondsHour * 1000;
+            } else if (every == 'day') {
+                interval = mmCoreSecondsDay * 1000;
+            } else if (every == 'week') {
+                interval = mmCoreSecondsDay * 7 * 1000;
+            } else if (every == 'month') {
+                interval = mmCoreSecondsDay * 31 * 1000;
+            } else if (every == 'quarter') {
+                interval = mmCoreSecondsHour * 2190 * 1000;
+            } else if (every == 'year') {
+                interval = mmCoreSecondsYear * 1000;
+            } else {
+                interval = parseInt(every, 10);
+                if (isNaN(interval)) {
+                    interval = 0;
+                } else {
+                    interval *= 60000;
+                }
+            }
+
+            return interval;
+        }
+    }
+
+    /**
+     * Get all the notification stored in local DB.
+     *
+     * @return {Promise} Promise resolved with the notifications.
+     */
+    function getAllLocalNotifications() {
+        return $mmApp.getDB().getAll(mmDesktopLocalNotificationsStore);
+    }
+
     /**
      * Get the credentials from a URL.
      * This code is extracted from Cordova FileTransfer plugin.
@@ -1091,7 +1531,8 @@ angular.module('mm.core')
             return $q.when();
         }
 
-        var deferred = $q.defer();
+        var deferred = $q.defer(),
+            promises = [deferred.promise];
 
         $log.debug('Loading HTML API.');
 
@@ -1115,6 +1556,7 @@ angular.module('mm.core')
             emulateCordovaFile();
             emulateCustomURLScheme();
             emulateInAppBrowser();
+            promises.push(emulateLocalNotifications());
 
             // Initialize File System. Get the path to use.
             basePath = app.getPath('documents') || app.getPath('home');
@@ -1146,9 +1588,32 @@ angular.module('mm.core')
             }, deferred.reject);
         }
 
-        return deferred.promise;
+        return $q.all(promises);
     };
 
+    /**
+     * Remove a notification from local DB.
+     *
+     * @param  {Number} id ID of the notification.
+     * @return {Promise}   Promise resolved when done.
+     */
+    function removeLocalNotification(id) {
+        return $mmApp.getDB().remove(mmDesktopLocalNotificationsStore, id);
+    }
+
+    /**
+     * Store a notification in local DB.
+     *
+     * @param  {Object} notification Notification to store.
+     * @param  {Boolean} triggered   Whether the notification has been triggered.
+     * @return {Promise}             Promise resolved when stored.
+     */
+    function storeLocalNotification(notification, triggered) {
+        notification = angular.copy(notification);
+        notification.triggered = !!triggered;
+        return $mmApp.getDB().insert(mmDesktopLocalNotificationsStore, notification);
+    }
+
     return self;
 })
 
diff --git a/www/core/lib/localnotif.js b/www/core/lib/localnotif.js
index e2300fed332..883e015bec0 100644
--- a/www/core/lib/localnotif.js
+++ b/www/core/lib/localnotif.js
@@ -300,7 +300,7 @@ angular.module('mm.core')
      * @return {Boolean} True when local notifications plugin is installed.
      */
     self.isAvailable = function() {
-        return window.plugin && window.plugin.notification && window.plugin.notification.local ? true: false;
+        return $mmApp.isDesktop() || !!(window.plugin && window.plugin.notification && window.plugin.notification.local);
     };
 
     /**

From 92e3dd4a059a5131b95a45ae29c0ad57f4e8fe6e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 9 Jun 2017 14:43:49 +0200
Subject: [PATCH 024/118] MOBILE-2147 electron: Support app badge

---
 www/core/lib/emulator.js | 80 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
index 7deb5c7f26a..a3b0e1d14f4 100644
--- a/www/core/lib/emulator.js
+++ b/www/core/lib/emulator.js
@@ -1492,6 +1492,85 @@ angular.module('mm.core')
         }
     }
 
+    /**
+     * Emulate some of the features of push notifications.
+     *
+     * @return {Void}
+     */
+    function emulatePushNotifications() {
+        // Create the PushNotification object, but only some of its functions will be supported.
+        var PushNotification = function(options) {};
+
+        PushNotification.prototype.unregister = function(successCallback, errorCallback, options) {
+            errorCallback && errorCallback('Unregister is only supported in mobile devices');
+        };
+
+        PushNotification.prototype.subscribe = function(topic, successCallback, errorCallback) {
+            errorCallback && errorCallback('Suscribe is only supported in mobile devices');
+        };
+
+        PushNotification.prototype.unsubscribe = function(topic, successCallback, errorCallback) {
+            errorCallback && errorCallback('Unsuscribe is only supported in mobile devices');
+        };
+
+        PushNotification.prototype.setApplicationIconBadgeNumber = function(successCallback, errorCallback, badge) {
+            if (!$mmApp.isDesktop()) {
+                errorCallback && errorCallback('setApplicationIconBadgeNumber is not supported in browser');
+                return;
+            }
+
+            try {
+                var app = require('electron').remote.app;
+                if (app.setBadgeCount(badge)) {
+                    successCallback && successCallback();
+                } else {
+                    errorCallback && errorCallback();
+                }
+            } catch(ex) {
+                errorCallback && errorCallback(ex);
+            }
+        };
+
+        PushNotification.prototype.getApplicationIconBadgeNumber = function(successCallback, errorCallback) {
+            if (!$mmApp.isDesktop()) {
+                errorCallback && errorCallback('getApplicationIconBadgeNumber is not supported in browser');
+                return;
+            }
+
+            try {
+                var app = require('electron').remote.app;
+                successCallback && successCallback(app.getBadgeCount());
+            } catch(ex) {
+                errorCallback && errorCallback(ex);
+            }
+        };
+
+        PushNotification.prototype.clearAllNotifications = function(successCallback, errorCallback) {
+            errorCallback && errorCallback('clearAllNotifications is only supported in mobile devices');
+        };
+
+        PushNotification.prototype.on = function(eventName, callback) {};
+        PushNotification.prototype.off = function(eventName, handle) {};
+        PushNotification.prototype.emit = function() {};
+
+        PushNotification.prototype.finish = function(successCallback, errorCallback, id) {
+            errorCallback && errorCallback('finish is only supported in mobile devices');
+        };
+
+        // Create the visible PushNotification object.
+        $window.PushNotification = {
+            init: function(options) {
+                return new PushNotification(options);
+            },
+
+            hasPermission: function(successCallback, errorCallback) {
+                errorCallback && errorCallback('hasPermission is only supported in mobile devices');
+            },
+
+            PushNotification: PushNotification
+        };
+    }
+
     /**
      * Get all the notification stored in local DB.
      *
@@ -1548,6 +1627,7 @@ angular.module('mm.core')
         emulateCordovaGlobalization();
         emulateCordovaZip();
         emulateCordovaClipboard();
+        emulatePushNotifications();
 
         if ($mmApp.isDesktop()) {
             var fs = require('fs'),

From 04d054fa4b96b635e856d2f6a91f43fcbc816d5f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 12 Jun 2017 13:55:10 +0200
Subject: [PATCH 025/118] MOBILE-2147 electron: Move emulator code to a new
 component

---
 www/core/components/emulator/main.js          |   23 +
 .../components/emulator/services/clipboard.js |  112 ++
 .../components/emulator/services/customurl.js |   52 +
 .../components/emulator/services/emulator.js  |   65 +
 www/core/components/emulator/services/file.js |  595 ++++++
 .../emulator/services/filetransfer.js         |  286 +++
 .../emulator/services/globalization.js        |  130 ++
 .../emulator/services/inappbrowser.js         |  161 ++
 .../emulator/services/localnotif.js           |  542 ++++++
 .../emulator/services/pushnotifications.js    |  116 ++
 www/core/components/emulator/services/zip.js  |   89 +
 www/core/lib/emulator.js                      | 1705 -----------------
 www/core/lib/fs.js                            |   18 +
 13 files changed, 2189 insertions(+), 1705 deletions(-)
 create mode 100644 www/core/components/emulator/main.js
 create mode 100644 www/core/components/emulator/services/clipboard.js
 create mode 100644 www/core/components/emulator/services/customurl.js
 create mode 100644 www/core/components/emulator/services/emulator.js
 create mode 100644 www/core/components/emulator/services/file.js
 create mode 100644 www/core/components/emulator/services/filetransfer.js
 create mode 100644 www/core/components/emulator/services/globalization.js
 create mode 100644 www/core/components/emulator/services/inappbrowser.js
 create mode 100644 www/core/components/emulator/services/localnotif.js
 create mode 100644 www/core/components/emulator/services/pushnotifications.js
 create mode 100644 www/core/components/emulator/services/zip.js
 delete mode 100644 www/core/lib/emulator.js

diff --git a/www/core/components/emulator/main.js b/www/core/components/emulator/main.js
new file mode 100644
index 00000000000..ae23d656926
--- /dev/null
+++ b/www/core/components/emulator/main.js
@@ -0,0 +1,23 @@
+// (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.
+
+// Module to support Cordova plugins in desktop and some of them in browser too.
+angular.module('mm.core.emulator', ['mm.core'])
+
+.config(function($mmInitDelegateProvider, mmInitDelegateMaxAddonPriority) {
+    if (!ionic.Platform.isWebView()) {
+        $mmInitDelegateProvider.registerProcess('mmEmulator', '$mmEmulatorManager.loadHTMLAPI',
+                mmInitDelegateMaxAddonPriority + 500, true);
+    }
+});
diff --git a/www/core/components/emulator/services/clipboard.js b/www/core/components/emulator/services/clipboard.js
new file mode 100644
index 00000000000..75bd66d9d09
--- /dev/null
+++ b/www/core/components/emulator/services/clipboard.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.core.emulator')
+
+/**
+ * This service handles the emulation of the clipboard Cordova plugin in desktop apps and in browser.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorClipboard
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorClipboard', function($log, $q, $mmApp, $cordovaClipboard) {
+
+    $log = $log.getInstance('$mmEmulatorClipboard');
+
+    var self = {};
+
+    /**
+     * Load the emulation of the Cordova plugin. It might not work in some browsers.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorClipboard#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        var isDesktop = $mmApp.isDesktop(),
+            clipboard,
+            copyTextarea;
+
+        if (isDesktop) {
+            clipboard = require('electron').clipboard;
+        } else {
+            // In browser the text must be selected in order to copy it. Create a hidden textarea to put the text in it.
+            copyTextarea = document.createElement('textarea');
+            angular.element(copyTextarea).addClass('mm-browser-copy-area');
+            copyTextarea.setAttribute('aria-hidden', 'true');
+            document.body.append(copyTextarea);
+        }
+
+        // We need to redefine $cordovaClipboard methods instead of the core plugin (window.cordova.plugins.clipboard)
+        // because creating window.cordova breaks the app (it thinks it's a real device).
+        $cordovaClipboard.copy = function(text) {
+            var deferred = $q.defer();
+
+            if (isDesktop) {
+                clipboard.writeText(text);
+                deferred.resolve();
+            } else {
+                // Put the text in the hidden textarea and select it.
+                copyTextarea.innerHTML = text;
+                copyTextarea.select();
+
+                try {
+                    if (document.execCommand('copy')) {
+                        deferred.resolve();
+                    } else {
+                        deferred.reject();
+                    }
+                } catch (err) {
+                    deferred.reject();
+                }
+
+                copyTextarea.innerHTML = '';
+            }
+
+            return deferred.promise;
+        };
+
+        $cordovaClipboard.paste = function() {
+            var deferred = $q.defer();
+
+            if (isDesktop) {
+                deferred.resolve(clipboard.readText());
+            } else {
+                // Paste the text in the hidden textarea and get it.
+                copyTextarea.innerHTML = '';
+                copyTextarea.select();
+
+                try {
+                    if (document.execCommand('paste')) {
+                        deferred.resolve(copyTextarea.innerHTML);
+                    } else {
+                        deferred.reject();
+                    }
+                } catch (err) {
+                    deferred.reject();
+                }
+
+                copyTextarea.innerHTML = '';
+            }
+
+            return deferred.promise;
+        };
+
+        return $q.when();
+    };
+
+    return self;
+});
diff --git a/www/core/components/emulator/services/customurl.js b/www/core/components/emulator/services/customurl.js
new file mode 100644
index 00000000000..50fdab480f0
--- /dev/null
+++ b/www/core/components/emulator/services/customurl.js
@@ -0,0 +1,52 @@
+// (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.emulator')
+
+/**
+ * This service handles the emulation of the Cordova Custom URL Scheme plugin in desktop apps.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorCustomURLScheme
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorCustomURLScheme', function($log, $q, $mmApp) {
+
+    $log = $log.getInstance('$mmEmulatorCustomURLScheme');
+
+    var self = {};
+
+    /**
+     * Load the emulation of the Cordova plugin.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorCustomURLScheme#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        if (!$mmApp.isDesktop()) {
+            return $q.when();
+        }
+
+        // Listen for app launched events.
+        require('electron').ipcRenderer.on('mmAppLaunched', function(event, url) {
+            window.handleOpenURL && window.handleOpenURL(url);
+        });
+
+        return $q.when();
+    };
+
+    return self;
+});
diff --git a/www/core/components/emulator/services/emulator.js b/www/core/components/emulator/services/emulator.js
new file mode 100644
index 00000000000..0d370a95ce1
--- /dev/null
+++ b/www/core/components/emulator/services/emulator.js
@@ -0,0 +1,65 @@
+// (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')
+
+/**
+ * @ngdoc service
+ * @name $mmEmulatorManager
+ * @module mm.core
+ * @description
+ * This service handles the emulation of Cordova plugins in other environments like browser.
+ */
+.factory('$mmEmulatorManager', function($log, $q, $mmFS, $mmEmulatorClipboard, $mmEmulatorCustomURLScheme, $mmEmulatorFile,
+            $mmEmulatorFileTransfer, $mmEmulatorGlobalization, $mmEmulatorInAppBrowser, $mmEmulatorLocalNotifications,
+            $mmEmulatorPushNotifications, $mmEmulatorZip, $mmUtil) {
+
+    $log = $log.getInstance('$mmEmulatorManager');
+
+    var self = {};
+
+    /**
+     * Loads HTML API to simulate Cordova APIs. Reserved for core use.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmEmulatorManager#loadHTMLAPI
+     * @return {Promise} Promise resolved when the API is loaded.
+     * @protected
+     */
+    self.loadHTMLAPI = function() {
+        if ($mmFS.isAvailable()) {
+            $log.debug('Stop loading HTML API, it was already loaded or the environment doesn\'t need it.');
+            return $q.when();
+        }
+
+        $log.debug('Loading HTML API.');
+
+        var promises = [];
+
+        promises.push($mmEmulatorClipboard.load());
+        promises.push($mmEmulatorCustomURLScheme.load());
+        promises.push($mmEmulatorFile.load());
+        promises.push($mmEmulatorFileTransfer.load());
+        promises.push($mmEmulatorGlobalization.load());
+        promises.push($mmEmulatorInAppBrowser.load());
+        promises.push($mmEmulatorLocalNotifications.load());
+        promises.push($mmEmulatorPushNotifications.load());
+        promises.push($mmEmulatorZip.load());
+
+        return $mmUtil.allPromises(promises);
+    };
+
+    return self;
+});
diff --git a/www/core/components/emulator/services/file.js b/www/core/components/emulator/services/file.js
new file mode 100644
index 00000000000..4de40822e7e
--- /dev/null
+++ b/www/core/components/emulator/services/file.js
@@ -0,0 +1,595 @@
+// (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.emulator')
+
+/**
+ * This service handles the emulation of the Cordova File plugin in desktop apps and in browser.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorFile
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorFile', function($log, $q, $mmFS, $window, $mmApp, mmCoreConfigConstants) {
+
+    $log = $log.getInstance('$mmEmulatorFile');
+
+    var self = {};
+
+    /**
+     * Delete an empty folder.
+     *
+     * @param  {Object} fs                Node module 'fs'.
+     * @param  {String} path              Path of the folder.
+     * @param  {Function} successCallback Function to call when success.
+     * @param  {Function} errorCallback   Function to call when error.
+     * @return {Void}
+     */
+    function deleteEmptyFolder(fs, path, successCallback, errorCallback) {
+        fs.rmdir(path, function(err) {
+            if (err) {
+                // Error removing directory.
+                errorCallback && errorCallback(err);
+            } else {
+                successCallback && successCallback();
+            }
+        });
+    }
+
+    /**
+     * Delete a file or folder recursively.
+     *
+     * @param  {Object} fs                Node module 'fs'.
+     * @param  {String} path              Path of the folder.
+     * @param  {Function} successCallback Function to call when success.
+     * @param  {Function} errorCallback   Function to call when error.
+     * @return {Void}
+     */
+    function deleteRecursive(fs, path, successCallback, errorCallback) {
+        // Check if it exists.
+        fs.stat(path, function(err, stats) {
+            if (err) {
+                // File not found, reject.
+                errorCallback && errorCallback(err);
+            } else if (stats.isFile()) {
+                // It's a file, remove it.
+                fs.unlink(path, function(err) {
+                    if (err) {
+                        // Error removing file, reject.
+                        errorCallback && errorCallback(err);
+                    } else {
+                        successCallback && successCallback();
+                    }
+                });
+            } else {
+                // It's a directory, read the contents.
+                fs.readdir(path, function(err, files) {
+                    if (err) {
+                        // Error reading directory contents, reject.
+                        errorCallback && errorCallback(err);
+                    } else if (!files.length) {
+                        // No files to delete, delete the folder.
+                        deleteEmptyFolder(fs, path, successCallback, errorCallback);
+                    } else {
+                        // Remove all the files and directories.
+                        var removed = 0;
+                        files.forEach(function(filename) {
+                            deleteRecursive(fs, $mmFS.concatenatePaths(path, filename), function() {
+                                // Success deleting the file/dir.
+                                removed++;
+                                if (removed == files.length) {
+                                    // All files deleted, delete the folder.
+                                    deleteEmptyFolder(fs, path, successCallback, errorCallback);
+                                }
+                            }, errorCallback);
+                        });
+                    }
+                });
+            }
+        });
+    }
+
+    /**
+     * Emulate Cordova file plugin using NodeJS functions. This is only for NodeJS environments,
+     * browser works with the default resolveLocalFileSystemURL.
+     *
+     * @param  {Object} fs Node module 'fs'.
+     * @return {Void}
+     */
+    function emulateCordovaFileForDesktop(fs) {
+        if (!$mmApp.isDesktop()) {
+            return;
+        }
+
+        emulateEntry(fs);
+        emulateFileWriter(fs);
+        emulateDirectoryReader(fs);
+        emulateFileEntry(fs);
+        emulateDirectoryEntry(fs);
+
+        // Implement resolveLocalFileSystemURL.
+        $window.resolveLocalFileSystemURL = function(path, successCallback, errorCallback) {
+            // Check that the file/dir exists.
+            fs.stat(path, function(err, stats) {
+                if (err) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    // The file/dir exists, return an instance.
+                    var constructorFn = stats.isDirectory() ? DirectoryEntry : FileEntry,
+                        fileAndDir = $mmFS.getFileAndDirectoryFromPath(path);
+                    successCallback && successCallback(new constructorFn(fileAndDir.name, path));
+                }
+            });
+        };
+    }
+
+    /**
+     * Emulate DirectoryEntry object of the Cordova file plugin using NodeJS functions.
+     *
+     * @param  {Object} fs Node module 'fs'.
+     * @return {Void}
+     */
+    function emulateDirectoryEntry(fs) {
+        // Create DirectoryEntry and its functions, inheriting from Entry.
+        $window.DirectoryEntry = function(name, fullPath, fileSystem, nativeURL) {
+            // Add trailing slash if it is missing.
+            if ((fullPath) && !/\/$/.test(fullPath)) {
+                fullPath += '/';
+            }
+            if (nativeURL && !/\/$/.test(nativeURL)) {
+                nativeURL += '/';
+            }
+
+            $window.Entry.call(this, false, true, name, fullPath, fileSystem, nativeURL);
+        };
+
+        $window.DirectoryEntry.prototype = Object.create($window.Entry.prototype); // Inherit Entry prototype.
+
+        $window.DirectoryEntry.prototype.createReader = function() {
+            return new DirectoryReader(this.fullPath);
+        };
+
+        $window.DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
+            getDirOrFile(fs, this, true, path, options, successCallback, errorCallback);
+        };
+
+        $window.DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
+            // Use a promise to make sure only one callback is called.
+            var deferred = $q.defer();
+
+            deferred.promise.then(function() {
+                successCallback && successCallback();
+            }).catch(function(error) {
+                errorCallback && errorCallback(error);
+            });
+
+            deleteRecursive(fs, this.fullPath, deferred.resolve, deferred.reject);
+        };
+
+        $window.DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
+            getDirOrFile(fs, this, false, path, options, successCallback, errorCallback);
+        };
+    }
+
+    /**
+     * Emulate DirectoryReader object of the Cordova file plugin using NodeJS functions.
+     *
+     * @param  {Object} fs Node module 'fs'.
+     * @return {Void}
+     */
+    function emulateDirectoryReader(fs) {
+        // DirectoryReader to read directory contents.
+        $window.DirectoryReader = function(localURL) {
+            this.localURL = localURL || null;
+        };
+
+        $window.DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
+            var that = this;
+
+            fs.readdir(this.localURL, function(err, files) {
+                if (err) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    // Use try/catch because it includes sync calls.
+                    try {
+                        var entries = [];
+                        for (var i = 0; i < files.length; i++) {
+                            var fileName = files[i],
+                                filePath = $mmFS.concatenatePaths(that.localURL, fileName),
+                                stats = fs.statSync(filePath); // Use sync function to make code simpler.
+
+                            if (stats.isDirectory()) {
+                                entries.push(new DirectoryEntry(fileName, filePath));
+                            } else if (stats.isFile()) {
+                                entries.push(new FileEntry(fileName, filePath));
+                            }
+                        }
+
+                        successCallback(entries);
+                    } catch(ex) {
+                        errorCallback && errorCallback(ex);
+                    }
+                }
+            });
+        };
+    }
+
+    /**
+     * Emulate Entry object of the Cordova file plugin using NodeJS functions.
+     *
+     * @param  {Object} fs Node module 'fs'.
+     * @return {Void}
+     */
+    function emulateEntry(fs) {
+        // Create the Entry object, parent of DirectoryEntry and FileEntry.
+        // It includes fileSystem and nativeURL as the Cordova plugin does, but they aren't used.
+        $window.Entry = function(isFile, isDirectory, name, fullPath, fileSystem, nativeURL) {
+            this.isFile = !!isFile;
+            this.isDirectory = !!isDirectory;
+            this.name = name || '';
+            this.fullPath = fullPath || '';
+            this.filesystem = fileSystem || null;
+            this.nativeURL = nativeURL || null;
+        };
+
+        // Implement Entry functions.
+        $window.Entry.prototype.getMetadata = function(successCallback, errorCallback) {
+            fs.stat(this.fullPath, function(err, stats) {
+                if (err) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    successCallback && successCallback({
+                        size: stats.size,
+                        modificationTime: stats.mtime
+                    });
+                }
+            });
+        };
+
+        $window.Entry.prototype.setMetadata = function(successCallback, errorCallback, metadataObject) {
+            // Not supported.
+            errorCallback('Not supported');
+        };
+
+        $window.Entry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+            newName = newName || this.name;
+
+            var srcPath = this.fullPath,
+                destPath = $mmFS.concatenatePaths(parent.fullPath, newName),
+                that = this;
+
+            fs.rename(srcPath, destPath, function(err) {
+                if (err) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    var constructorFn = that.isDirectory ? DirectoryEntry : FileEntry;
+                    successCallback && successCallback(new constructorFn(newName, destPath));
+                }
+            });
+        };
+
+        $window.Entry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+            newName = newName || this.name;
+
+            // There is no function to copy a file, read the source and write the dest.
+            var srcPath = this.fullPath,
+                destPath = $mmFS.concatenatePaths(parent.fullPath, newName),
+                reader = fs.createReadStream(srcPath),
+                writer = fs.createWriteStream(destPath),
+                deferred = $q.defer(), // Use a promise to make sure only one callback is called.
+                that = this;
+
+            deferred.promise.then(function() {
+                var constructorFn = that.isDirectory ? DirectoryEntry : FileEntry;
+                successCallback && successCallback(new constructorFn(newName, destPath));
+            }).catch(function(error) {
+                errorCallback && errorCallback(error);
+            });
+
+            reader.on('error', deferred.reject);
+
+            writer.on('error', deferred.reject);
+
+            writer.on('close', deferred.resolve);
+
+            reader.pipe(writer);
+        };
+
+        $window.Entry.prototype.toInternalURL = function() {
+            return 'file://' + this.fullPath;
+        };
+
+        $window.Entry.prototype.toURL = function() {
+            return this.fullPath;
+        };
+
+        $window.Entry.prototype.remove = function(successCallback, errorCallback) {
+            var removeFn = this.isDirectory ? fs.rmdir : fs.unlink;
+            removeFn(this.fullPath, function(err) {
+                if (err < 0) {
+                    errorCallback(err);
+                } else {
+                    successCallback();
+                }
+            });
+        };
+
+        $window.Entry.prototype.getParent = function(successCallback, errorCallback) {
+            // Remove last slash if present and get the path of the parent.
+            var fullPath = this.fullPath.slice(-1) == '/' ? this.fullPath.slice(0, -1) : this.fullPath,
+                parentPath = fullPath.substr(0, fullPath.lastIndexOf('/'));
+
+            // Check that parent exists.
+            fs.stat(parentPath, function(err, stats) {
+                if (err || !stats.isDirectory()) {
+                    errorCallback && errorCallback(err);
+                } else {
+                    var fileAndDir = $mmFS.getFileAndDirectoryFromPath(parentPath);
+                    successCallback && successCallback(new DirectoryEntry(fileAndDir.name, parentPath));
+                }
+            });
+        };
+    }
+
+    /**
+     * Emulate FileEntry object of the Cordova file plugin using NodeJS functions.
+     *
+     * @param  {Object} fs Node module 'fs'.
+     * @return {Void}
+     */
+    function emulateFileEntry(fs) {
+        // Create FileEntry and its functions, inheriting from Entry.
+        $window.FileEntry = function(name, fullPath, fileSystem, nativeURL) {
+            // Remove trailing slash if it is present.
+            if (fullPath && /\/$/.test(fullPath)) {
+                fullPath = fullPath.substring(0, fullPath.length - 1);
+            }
+            if (nativeURL && /\/$/.test(nativeURL)) {
+                nativeURL = nativeURL.substring(0, nativeURL.length - 1);
+            }
+
+            $window.Entry.call(this, true, false, name, fullPath, fileSystem, nativeURL);
+        };
+
+        $window.FileEntry.prototype = Object.create($window.Entry.prototype); // Inherit Entry prototype.
+
+        $window.FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
+            this.file(function(file) {
+                successCallback && successCallback(new FileWriter(file));
+            }, errorCallback);
+        };
+
+        $window.FileEntry.prototype.file = function(successCallback, errorCallback) {
+            var that = this;
+
+            // Get the metadata to know the time modified.
+            this.getMetadata(function(metadata) {
+                // Read the file.
+                fs.readFile(that.fullPath, function(err, data) {
+                    if (err) {
+                        errorCallback && errorCallback(err);
+                    } else {
+                        // Create a File instance and return it.
+                        data = Uint8Array.from(data).buffer; // Convert the NodeJS Buffer to ArrayBuffer.
+                        var file = new File([data], that.name || '', {
+                            lastModified: metadata.modificationTime || null,
+                            type: $mmFS.getMimeType($mmFS.getFileExtension(that.name)) || null
+                        });
+                        file.localURL = that.fullPath;
+                        file.start = 0;
+                        file.end = file.size;
+
+                        successCallback && successCallback(file);
+                    }
+                });
+            }, errorCallback);
+        };
+    }
+
+    /**
+     * Emulate FileWriter object of the Cordova file plugin using NodeJS functions.
+     *
+     * @param  {Object} fs Node module 'fs'.
+     * @return {Void}
+     */
+    function emulateFileWriter(fs) {
+        // FileWriter to write data in files. Don't support abort, seek and truncate.
+        $window.FileWriter = function(file) {
+            this.fileName = '';
+            this.length = 0;
+            if (file) {
+                this.localURL = file.localURL || file;
+                this.length = file.size || 0;
+            }
+
+            this.position = 0; // Default is to write at the beginning of the file.
+            this.readyState = 0; // EMPTY
+            this.result = null;
+            this.error = null;
+
+            // Event handlers
+            this.onwritestart = null;   // When writing starts
+            this.onprogress = null;     // While writing the file, and reporting partial file data
+            this.onwrite = null;        // When the write has successfully completed.
+            this.onwriteend = null;     // When the request has completed (either in success or failure).
+            this.onabort = null;        // When the write has been aborted. For instance, by invoking the abort() method.
+            this.onerror = null;        // When the write has failed (see errors).
+        };
+
+        $window.FileWriter.prototype.write = function(data) {
+            var that = this;
+            if (data && data.toString() == '[object Blob]') {
+                // Can't write Blobs, convert it to a Buffer.
+                var reader = new FileReader();
+                reader.onload = function() {
+                    if (reader.readyState == 2) {
+                        write(new Buffer(reader.result));
+                    }
+                };
+                reader.readAsArrayBuffer(data);
+            } else if (data && data.toString() == '[object ArrayBuffer]') {
+                // Convert it to a Buffer.
+                write(Buffer.from(new Uint8Array(data)));
+            } else {
+                write(data);
+            }
+
+            function write(data) {
+                fs.writeFile(that.localURL, data, function(err) {
+                    if (err) {
+                        that.onerror && that.onerror(err);
+                    } else {
+                        that.onwrite && that.onwrite();
+                    }
+                    that.onwriteend && that.onwriteend();
+                });
+
+                that.onwritestart && that.onwritestart();
+            }
+        };
+    }
+
+    /**
+     * Helper function for getDirectory and getFile in DirectoryEntry.
+     *
+     * @param  {Object} fs                Node module 'fs'.
+     * @param  {Object}  entry            DirectoryEntry to get the file/dir in.
+     * @param  {Boolean} isDir            True if getting a directory, false if getting a file.
+     * @param  {String}  path             Path of the file or dir.
+     * @param  {Object}  options          Options.
+     * @param  {Function} successCallback Function to call in success.
+     * @param  {Function} errorCallback   Function to call in error.
+     * @return {Void}
+     */
+    function getDirOrFile(fs, entry, isDir, path, options, successCallback, errorCallback) {
+        var filename = $mmFS.getFileAndDirectoryFromPath(path).name,
+            fileDirPath = $mmFS.concatenatePaths(entry.fullPath, path);
+
+        // Check if file/dir exists.
+        fs.stat(fileDirPath, function(err) {
+            if (err) {
+                if (options.create) {
+                    // File/Dir probably doesn't exist, create it.
+                    create(function(error2) {
+                        if (!error2) {
+                            // File created successfully, return it.
+                            success();
+                        } else if (error2.code === 'EEXIST') {
+                            // File exists, success.
+                            success();
+                        } else if (error2.code === 'ENOENT') {
+                            // Seems like the parent doesn't exist, create it too.
+                            var parent = fileDirPath.substring(0, fileDirPath.lastIndexOf('/'));
+
+                            if (parent) {
+                                entry.getDirectory(parent, options, function() {
+                                    // Parent created, try to create the child again.
+                                    create(function(error3) {
+                                        if (!error3) {
+                                            success();
+                                        } else {
+                                            errorCallback && errorCallback(error3);
+                                        }
+                                    });
+                                }, errorCallback);
+                            } else {
+                                errorCallback && errorCallback(error2);
+                            }
+                        } else {
+                            errorCallback && errorCallback(error2);
+                        }
+                    });
+                } else {
+                    errorCallback && errorCallback(err);
+                }
+            } else {
+                success();
+            }
+        });
+
+        // Success, return the DirectoryEntry or FileEntry.
+        function success() {
+            var constructorFn = isDir ? DirectoryEntry : FileEntry;
+            successCallback(new constructorFn(filename, fileDirPath));
+        }
+
+        // Create the file/dir.
+        function create(done) {
+            if (isDir) {
+                fs.mkdir(fileDirPath, done);
+            } else {
+                fs.writeFile(fileDirPath, '', done);
+            }
+        }
+    }
+
+    /**
+     * Load the emulation of the Cordova plugin.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorFile#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        var deferred = $q.defer(),
+            basePath;
+
+        $window.requestFileSystem  = $window.requestFileSystem || $window.webkitRequestFileSystem;
+        $window.resolveLocalFileSystemURL = $window.resolveLocalFileSystemURL || $window.webkitResolveLocalFileSystemURL;
+        $window.LocalFileSystem = {
+            PERSISTENT: 1
+        };
+
+        if ($mmApp.isDesktop()) {
+            var fs = require('fs'),
+                app = require('electron').remote.app;
+
+            emulateCordovaFileForDesktop(fs);
+
+            // Initialize File System. Get the path to use.
+            basePath = app.getPath('documents') || app.getPath('home');
+            if (!basePath) {
+                deferred.reject('Cannot calculate base path for file system.');
+                return;
+            }
+
+            basePath = $mmFS.concatenatePaths(basePath.replace(/\\/g, '/'), mmCoreConfigConstants.app_id) + '/';
+
+            // Create the folder if needed.
+            fs.mkdir(basePath, function(e) {
+                if (!e || (e && e.code === 'EEXIST')) {
+                    // Create successful or it already exists. Resolve.
+                    $mmFS.setHTMLBasePath(basePath);
+                    deferred.resolve();
+                } else {
+                    deferred.reject('Error creating base path.');
+                }
+            });
+        } else {
+            // It's browser, request a quota to use. Request 500MB.
+            $window.webkitStorageInfo.requestQuota(PERSISTENT, 500 * 1024 * 1024, function(granted) {
+                $window.requestFileSystem(PERSISTENT, granted, function(entry) {
+                    basePath = entry.root.toURL();
+                    $mmFS.setHTMLBasePath(basePath);
+                    deferred.resolve();
+                }, deferred.reject);
+            }, deferred.reject);
+        }
+
+        return deferred.promise;
+    };
+
+    return self;
+});
diff --git a/www/core/components/emulator/services/filetransfer.js b/www/core/components/emulator/services/filetransfer.js
new file mode 100644
index 00000000000..19101c56007
--- /dev/null
+++ b/www/core/components/emulator/services/filetransfer.js
@@ -0,0 +1,286 @@
+// (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.emulator')
+
+/**
+ * This service handles the emulation of the Cordova FileTransfer plugin in desktop apps and in browser.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorFileTransfer
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorFileTransfer', function($log, $q, $mmFS, $window, $mmApp) {
+
+    $log = $log.getInstance('$mmEmulatorFileTransfer');
+
+    var self = {},
+        fileTransferIdCounter = 0;
+
+    /**
+     * Given a URL, check if it has a credentials in it and, if so, return them in a header object.
+     * This code is extracted from Cordova FileTransfer plugin.
+     *
+     * @param  {String} urlString The URL to get the credentials from.
+     * @return {Object}           The header with the credentials, null if no credentials.
+     */
+    function getBasicAuthHeader(urlString) {
+        var header =  null;
+
+        // This is changed due to MS Windows doesn't support credentials in http uris
+        // so we detect them by regexp and strip off from result url.
+        if (window.btoa) {
+            var credentials = getUrlCredentials(urlString);
+            if (credentials) {
+                var authHeader = 'Authorization';
+                var authHeaderValue = 'Basic ' + window.btoa(credentials);
+
+                header = {
+                    name : authHeader,
+                    value : authHeaderValue
+                };
+            }
+        }
+
+        return header;
+    }
+
+    /**
+     * Get the credentials from a URL.
+     * This code is extracted from Cordova FileTransfer plugin.
+     *
+     * @param  {String} urlString The URL to get the credentials from.
+     * @return {String}           Retrieved credentials.
+     */
+    function getUrlCredentials(urlString) {
+        var credentialsPattern = /^https?\:\/\/(?:(?:(([^:@\/]*)(?::([^@\/]*))?)?@)?([^:\/?#]*)(?::(\d*))?).*$/,
+            credentials = credentialsPattern.exec(urlString);
+
+        return credentials && credentials[1];
+    }
+
+    /**
+     * Load the emulation of the Cordova plugin.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorFileTransfer#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        // Create the FileTransferError object.
+        $window.FileTransferError = function(code, source, target, status, body, exception) {
+            this.code = code || null;
+            this.source = source || null;
+            this.target = target || null;
+            this.http_status = status || null;
+            this.body = body || null;
+            this.exception = exception || null;
+        };
+
+        $window.FileTransferError.FILE_NOT_FOUND_ERR = 1;
+        $window.FileTransferError.INVALID_URL_ERR = 2;
+        $window.FileTransferError.CONNECTION_ERR = 3;
+        $window.FileTransferError.ABORT_ERR = 4;
+        $window.FileTransferError.NOT_MODIFIED_ERR = 5;
+
+        // Create the FileTransfer object and its functions.
+        $window.FileTransfer = function() {
+            this._id = ++fileTransferIdCounter;
+            this.onprogress = null; // Optional callback.
+        };
+
+        $window.FileTransfer.prototype.download = function(source, target, successCallback, errorCallback, trustAllHosts, options) {
+            // Use XMLHttpRequest instead of $http to support onprogress and abort.
+            var basicAuthHeader = getBasicAuthHeader(source),
+                xhr = new XMLHttpRequest(),
+                isDesktop = $mmApp.isDesktop(),
+                deferred = $q.defer(), // Use a promise to make sure only one callback is called.
+                headers = null;
+
+            deferred.promise.then(function(entry) {
+                successCallback && successCallback(entry);
+            }).catch(function(error) {
+                errorCallback && errorCallback(error);
+            });
+
+            this.xhr = xhr;
+            this.deferred = deferred;
+            this.source = source;
+            this.target = target;
+
+            if (basicAuthHeader) {
+                source = source.replace(getUrlCredentials(source) + '@', '');
+
+                options = options || {};
+                options.headers = options.headers || {};
+                options.headers[basicAuthHeader.name] = basicAuthHeader.value;
+            }
+
+            if (options) {
+                headers = options.headers || null;
+            }
+
+            // Prepare the request.
+            xhr.open('GET', source, true);
+            xhr.responseType = isDesktop ? 'arraybuffer' : 'blob';
+            angular.forEach(headers, function(value, name) {
+                xhr.setRequestHeader(name, value);
+            });
+
+            if (this.onprogress) {
+                xhr.onprogress = this.onprogress;
+            }
+
+            xhr.onerror = function() {
+                deferred.reject(new FileTransferError(-1, source, target, xhr.status, xhr.statusText));
+            };
+
+            xhr.onload = function() {
+                // Finished dowloading the file.
+                var response = xhr.response;
+                if (!response) {
+                    deferred.reject();
+                } else {
+                    var basePath = $mmFS.getBasePathInstant();
+                    target = target.replace(basePath, ''); // Remove basePath from the target.
+                    target = target.replace(/%20/g, ' '); // Replace all %20 with spaces.
+                    if (isDesktop) {
+                        // In desktop we need to convert the arraybuffer into a Buffer.
+                        response = Buffer.from(new Uint8Array(response));
+                    }
+
+                    $mmFS.writeFile(target, response).then(deferred.resolve, deferred.reject);
+                }
+            };
+
+            xhr.send();
+        };
+
+        $window.FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, trustAllHosts) {
+            var fileKey = null,
+                fileName = null,
+                mimeType = null,
+                params = null,
+                headers = null,
+                httpMethod = null,
+                deferred = $q.defer(), // Use a promise to make sure only one callback is called.
+                basicAuthHeader = getBasicAuthHeader(server),
+                that = this;
+
+            deferred.promise.then(function(result) {
+                successCallback && successCallback(result);
+            }).catch(function(error) {
+                errorCallback && errorCallback(error);
+            });
+
+            if (basicAuthHeader) {
+                server = server.replace(getUrlCredentials(server) + '@', '');
+
+                options = options || {};
+                options.headers = options.headers || {};
+                options.headers[basicAuthHeader.name] = basicAuthHeader.value;
+            }
+
+            if (options) {
+                fileKey = options.fileKey;
+                fileName = options.fileName;
+                mimeType = options.mimeType;
+                headers = options.headers;
+                httpMethod = options.httpMethod || 'POST';
+
+                if (httpMethod.toUpperCase() == "PUT"){
+                    httpMethod = 'PUT';
+                } else {
+                    httpMethod = 'POST';
+                }
+
+                if (options.params) {
+                    params = options.params;
+                } else {
+                    params = {};
+                }
+            }
+
+            // Add fileKey and fileName to the headers.
+            headers = headers || {};
+            if (!headers['Content-Disposition']) {
+                headers['Content-Disposition'] = 'form-data;' + (fileKey ? ' name="' + fileKey + '";' : '') +
+                    (fileName ? ' filename="' + fileName + '"' : '')
+            }
+
+            // For some reason, adding a Content-Type header with the mimeType makes the request fail (it doesn't detect
+            // the token in the params). Don't include this header, and delete it if it's supplied.
+            delete headers['Content-Type'];
+
+            // Get the file to upload.
+            $mmFS.getFile(filePath).then(function(fileEntry) {
+                return $mmFS.getFileObjectFromFileEntry(fileEntry);
+            }).then(function(file) {
+                // Use XMLHttpRequest instead of $http to support onprogress and abort.
+                var xhr = new XMLHttpRequest();
+                xhr.open(httpMethod || 'POST', server);
+                angular.forEach(headers, function(value, name) {
+                    // Filter "unsafe" headers.
+                    if (name != 'Connection') {
+                        xhr.setRequestHeader(name, value);
+                    }
+                });
+
+                if (that.onprogress) {
+                    xhr.onprogress = that.onprogress;
+                }
+
+                that.xhr = xhr;
+                that.deferred = deferred;
+                this.source = filePath;
+                this.target = server;
+
+                xhr.onerror = function() {
+                    deferred.reject(new FileTransferError(-1, filePath, server, xhr.status, xhr.statusText));
+                };
+
+                xhr.onload = function() {
+                    // Finished uploading the file.
+                    deferred.resolve({
+                        bytesSent: file.size,
+                        responseCode: xhr.status,
+                        response: xhr.response,
+                        objectId: ''
+                    });
+                };
+
+                // Create a form data to send params and the file.
+                var fd = new FormData();
+                angular.forEach(params, function(value, name) {
+                    fd.append(name, value);
+                });
+                fd.append('file', file);
+
+                xhr.send(fd);
+            }).catch(deferred.reject);
+        };
+
+        $window.FileTransfer.prototype.abort = function() {
+            if (this.xhr) {
+                this.xhr.abort();
+                this.deferred.reject(new FileTransferError(FileTransferError.ABORT_ERR, this.source, this.target));
+            }
+        };
+
+        return $q.when();
+    };
+
+    return self;
+});
diff --git a/www/core/components/emulator/services/globalization.js b/www/core/components/emulator/services/globalization.js
new file mode 100644
index 00000000000..3b612bc905a
--- /dev/null
+++ b/www/core/components/emulator/services/globalization.js
@@ -0,0 +1,130 @@
+// (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.emulator')
+
+/**
+ * This service handles the emulation of the Cordova Globalization plugin in desktop apps and in browser.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorGlobalization
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorGlobalization', function($log, $q, $window, $mmApp) {
+
+    $log = $log.getInstance('$mmEmulatorGlobalization');
+
+    var self = {};
+
+    /**
+     * Get the current locale.
+     *
+     * @return {String} Locale.
+     */
+    function getLocale() {
+        var navLang = navigator.userLanguage || navigator.language;
+        try {
+            if ($mmApp.isDesktop()) {
+                var locale = require('electron').remote.app.getLocale();
+                return locale || navLang;
+            } else {
+                return navLang;
+            }
+        } catch(ex) {
+            // Something went wrong, return browser language.
+            return navLang;
+        }
+    }
+
+    /**
+     * Load the emulation of the Cordova plugin.
+     * Only some of the functions are supported.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorGlobalization#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        // Create the GlobalizationError object.
+        $window.GlobalizationError = function(code, message) {
+            this.code = code || null;
+            this.message = message || '';
+        };
+
+        $window.GlobalizationError.UNKNOWN_ERROR = 0;
+        $window.GlobalizationError.FORMATTING_ERROR = 1;
+        $window.GlobalizationError.PARSING_ERROR = 2;
+        $window.GlobalizationError.PATTERN_ERROR = 3;
+
+        // Create the Globalization object.
+        navigator.globalization = {
+            getLocaleName: function(successCallback, errorCallback) {
+                var locale = getLocale();
+                if (locale) {
+                    successCallback && successCallback({value: locale});
+                } else {
+                    var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Cannot get language');
+                    errorCallback && errorCallback(error);
+                }
+            },
+            numberToString: function(number, successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            isDayLightSavingsTime: function(date, successCallback, errorCallback) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getFirstDayOfWeek: function(successCallback, errorCallback) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getDateNames: function (successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getDatePattern: function(successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getNumberPattern: function(successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            getCurrencyPattern: function(currencyCode, successCallback, errorCallback) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            stringToDate: function(dateString, successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            stringToNumber: function(numberString, successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+            dateToString: function(date, successCallback, errorCallback, options) {
+                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
+                errorCallback && errorCallback(error);
+            },
+        };
+
+        navigator.globalization.getPreferredLanguage = navigator.globalization.getLocaleName;
+
+        return $q.when();
+    };
+
+    return self;
+});
diff --git a/www/core/components/emulator/services/inappbrowser.js b/www/core/components/emulator/services/inappbrowser.js
new file mode 100644
index 00000000000..93b40a8690c
--- /dev/null
+++ b/www/core/components/emulator/services/inappbrowser.js
@@ -0,0 +1,161 @@
+// (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.emulator')
+
+/**
+ * This service handles the emulation of the Cordova InAppBrowser plugin in desktop apps.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorInAppBrowser
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorInAppBrowser', function($log, $q, $mmFS, $window, $mmApp) {
+
+    $log = $log.getInstance('$mmEmulatorInAppBrowser');
+
+    var self = {};
+
+    /**
+     * Load the emulation of the Cordova plugin.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorInAppBrowser#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        if (!$mmApp.isDesktop()) {
+            return $q.when();
+        }
+
+        var BrowserWindow = require('electron').remote.BrowserWindow,
+            screen = require('electron').screen;
+
+        // Redefine window open to be able to have full control over the new window.
+        $window.open = function(url, frameName, features) {
+            var width = 800,
+                height = 600,
+                display,
+                newWindow,
+                listeners = {};
+
+            if (screen) {
+                display = screen.getPrimaryDisplay();
+                if (display && display.workArea) {
+                    width = display.workArea.width || width;
+                    height = display.workArea.height || height;
+                }
+            }
+
+            newWindow = new BrowserWindow({
+                width: width,
+                height: height
+            });
+            newWindow.loadURL(url);
+
+            // Add the missing functions that InAppBrowser supports but BrowserWindow doesn't.
+            newWindow.addEventListener = function(name, callback) {
+                var that = this;
+
+                switch (name) {
+                    case 'loadstart':
+                        that.webContents.addListener('did-start-loading', received);
+                        break;
+
+                    case 'loadstop':
+                        that.webContents.addListener('did-finish-load', received);
+                        break;
+
+                    case 'loaderror':
+                        that.webContents.addListener('did-fail-load', received);
+                        break;
+
+                    case 'exit':
+                        that.addListener('close', received);
+                        break;
+                }
+
+                // Store the received function instance to be able to remove the listener.
+                listeners[callback] = received;
+
+                function received(event) {
+                    try {
+                        event.url = that.getURL();
+                        callback(event);
+                    } catch(ex) {}
+                }
+            };
+
+            newWindow.removeEventListener = function(name, callback) {
+                var that = this,
+                    listener = listeners[callback];
+
+                switch (name) {
+                    case 'loadstart':
+                        that.webContents.removeListener('did-start-loading', listener);
+                        break;
+
+                    case 'loadstop':
+                        that.webContents.removeListener('did-finish-load', listener);
+                        break;
+
+                    case 'loaderror':
+                        that.webContents.removeListener('did-fail-load', listener);
+                        break;
+
+                    case 'exit':
+                        that.removeListener('close', listener);
+                        break;
+                }
+            };
+
+            newWindow.executeScript = function(details, callback) {
+                var that = this;
+
+                if (details.code) {
+                    that.webContents.executeJavaScript(details.code, false, callback);
+                } else if (details.file) {
+                    $mmFS.readFile(details.file).then(function(code) {
+                        that.webContents.executeJavaScript(code, false, callback);
+                    }).catch(callback);
+                } else {
+                    callback('executeScript requires exactly one of code or file to be specified');
+                }
+            };
+
+            newWindow.insertCSS = function(details, callback) {
+                var that = this;
+
+                if (details.code) {
+                    that.webContents.insertCSS(details.code);
+                    callback();
+                } else if (details.file) {
+                    $mmFS.readFile(details.file).then(function(code) {
+                        that.webContents.insertCSS(code);
+                        callback();
+                    }).catch(callback);
+                } else {
+                    callback('insertCSS requires exactly one of code or file to be specified');
+                }
+            };
+
+            return newWindow;
+        };
+
+        return $q.when();
+    };
+
+    return self;
+});
diff --git a/www/core/components/emulator/services/localnotif.js b/www/core/components/emulator/services/localnotif.js
new file mode 100644
index 00000000000..1e2c7fc3ede
--- /dev/null
+++ b/www/core/components/emulator/services/localnotif.js
@@ -0,0 +1,542 @@
+// (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.emulator')
+
+.constant('mmCoreDesktopLocalNotificationsStore', 'desktop_local_notifications')
+
+.config(function($mmAppProvider, mmCoreDesktopLocalNotificationsStore) {
+    var stores = [
+        {
+            name: mmCoreDesktopLocalNotificationsStore, // Store to schedule notifications in desktop apps.
+            keyPath: 'id',
+            indexes: [
+                {
+                    name: 'triggered'
+                }
+            ]
+        }
+    ];
+    $mmAppProvider.registerStores(stores);
+})
+
+/**
+ * This service handles the emulation of the local notifications Cordova plugin in desktop apps.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorLocalNotifications
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorLocalNotifications', function($log, $q, $mmApp, $mmUtil, $timeout, $interval, $rootScope,
+            $cordovaLocalNotification, mmCoreDesktopLocalNotificationsStore, mmCoreSecondsYear, mmCoreSecondsDay,
+            mmCoreSecondsHour, mmCoreSecondsMinute) {
+
+    $log = $log.getInstance('$mmEmulatorLocalNotifications');
+
+    var self = {},
+        scheduled = {},
+        triggered = {},
+        defaults = {
+            text:  '',
+            title: '',
+            sound: '',
+            badge: 0,
+            id:    0,
+            data:  undefined,
+            every: undefined,
+            at:    undefined
+        };
+
+    /**
+     * Cancel a local notification.
+     *
+     * @param  {Number} id         Notification ID.
+     * @param  {Boolean} omitEvent If true, the clear/cancel event won't be triggered.
+     * @param  {[type]} eventName  Name of the event to trigger.
+     * @return {Void}
+     */
+    function cancelNotification(id, omitEvent, eventName) {
+        var notification = scheduled[id].notification;
+
+        $timeout.cancel(scheduled[id].timeout);
+        $interval.cancel(scheduled[id].interval);
+        delete scheduled[id];
+        delete triggered[id];
+
+        removeNotification(id);
+
+        if (!omitEvent) {
+            $rootScope.$broadcast(eventName, notification, 'foreground');
+        }
+    }
+
+    /**
+     * Convert a list of IDs to numbers.
+     * Code extracted from the Cordova plugin.
+     *
+     * @param  {Mixed[]} ids List of IDs.
+     * @return {Number[]}    List of IDs as numbers.
+     */
+    function convertIds(ids) {
+        var convertedIds = [];
+
+        for (var i = 0; i < ids.length; i++) {
+            convertedIds.push(Number(ids[i]));
+        }
+
+        return convertedIds;
+    }
+
+    /**
+     * Convert the notification options to their required type.
+     * Code extracted from the Cordova plugin.
+     *
+     * @param  {Object} options Notification options.
+     * @return {Object}         Converted options.
+     */
+    function convertProperties(options) {
+        if (options.id) {
+            if (isNaN(options.id)) {
+                options.id = defaults.id;
+                $log.warn('Id is not a number: ' + options.id);
+            } else {
+                options.id = Number(options.id);
+            }
+        }
+
+        if (options.title) {
+            options.title = options.title.toString();
+        }
+
+        if (options.text) {
+            options.text  = options.text.toString();
+        }
+
+        if (options.badge) {
+            if (isNaN(options.badge)) {
+                options.badge = defaults.badge;
+                $log.warn('Badge number is not a number: ' + options.id);
+            } else {
+                options.badge = Number(options.badge);
+            }
+        }
+
+        if (options.at) {
+            if (typeof options.at == 'object') {
+                options.at = options.at.getTime();
+            }
+
+            options.at = Math.round(options.at / 1000);
+        }
+
+        if (typeof options.data == 'object') {
+            options.data = JSON.stringify(options.data);
+        }
+
+        return options;
+    }
+
+    /**
+     * Get all the notification stored in local DB.
+     *
+     * @return {Promise} Promise resolved with the notifications.
+     */
+    function getAllNotifications() {
+        return $mmApp.getDB().getAll(mmCoreDesktopLocalNotificationsStore);
+    }
+
+    /**
+     * Get a set of notifications. If ids isn't specified, return all the notifications.
+     *
+     * @param  {Number[]} [ids]         Ids of notifications to get. If not specified, get all notifications.
+     * @param  {Boolean} [getScheduled] Get scheduled notifications.
+     * @param  {Boolean} [getTriggered] Get triggered notifications.
+     * @return {Object[]}               List of notifications.
+     */
+    function getNotifications(ids, getScheduled, getTriggered) {
+        var notifications = [];
+
+        if (getScheduled) {
+            angular.forEach(scheduled, function(entry, id) {
+                if (!ids || ids.indexOf(id) != -1) {
+                    notifications.push(entry.notification);
+                }
+            });
+        }
+
+        if (getTriggered) {
+            angular.forEach(triggered, function(notification, id) {
+                if ((!getScheduled || !scheduled[id]) && (!ids || ids.indexOf(id) != -1)) {
+                    notifications.push(notification);
+                }
+            });
+        }
+
+        return notifications;
+    }
+
+    /**
+     * Given an object of options and a list of properties, return the first property that exists.
+     * Code extracted from the Cordova plugin.
+     *
+     * @param  {Object} options Notification options.
+     * @return {Mixed}          First value found.
+     */
+    function getValueFor(options) {
+        var keys = Array.apply(null, arguments).slice(1);
+
+        for (var i = 0; i < keys.length; i++) {
+            var key = keys[i];
+
+            if (options.hasOwnProperty(key)) {
+                return options[key];
+            }
+        }
+    }
+
+    /**
+     * Load the emulation of the Cordova plugin. Only for desktop apps.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorLocalNotifications#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        if (!$mmApp.isDesktop()) {
+            return $q.when();
+        }
+
+        // Redefine $cordovaLocalNotification methods instead of the core plugin (window.cordova.plugins.notification.local)
+        // because creating window.cordova breaks the app (it thinks it's a real device).
+        $cordovaLocalNotification.schedule = function(notifications, scope, isUpdate) {
+            var promises = [];
+
+            notifications = Array.isArray(notifications) ? notifications : [notifications];
+
+            angular.forEach(notifications, function(notification) {
+                mergeWithDefaults(notification);
+                convertProperties(notification);
+
+                // Cancel current notification if exists.
+                $cordovaLocalNotification.cancel(notification.id, null, true);
+
+                // Store the notification in the scheduled list and in the DB.
+                scheduled[notification.id] = {
+                    notification: notification
+                };
+                promises.push(storeNotification(notification, false));
+
+                // Schedule the notification.
+                var toTrigger = notification.at * 1000 - Date.now();
+                scheduled[notification.id].timeout = $timeout(function trigger() {
+                    // Trigger the notification.
+                    var notifInstance = new Notification(notification.title, {
+                        body: notification.text
+                    });
+
+                    // Store the notification as triggered. Don't remove it from scheduled, it's how the plugin works.
+                    triggered[notification.id] = notification;
+                    storeNotification(notification, true);
+
+                    // Launch the trigger event.
+                    $rootScope.$broadcast('$cordovaLocalNotification:trigger', notification, 'foreground');
+
+                    // Listen for click events.
+                    notifInstance.onclick = function() {
+                        $rootScope.$broadcast('$cordovaLocalNotification:click', notification, 'foreground');
+                    };
+
+                    if (notification.every && scheduled[notification.id] && !scheduled[notification.id].interval) {
+                        var interval = parseInterval(notification.every);
+                        if (interval > 0) {
+                            scheduled[notification.id].interval = $interval(trigger, interval);
+                        }
+                    }
+                }, toTrigger);
+
+                // Launch the scheduled/update event.
+                var eventName = isUpdate ? 'update' : 'schedule';
+                $rootScope.$broadcast('$cordovaLocalNotification:' + eventName, notification, 'foreground');
+            });
+
+            return $q.when();
+        };
+
+        $cordovaLocalNotification.update = function(notifications) {
+            // Just schedule them again, since scheduling cancels the existing one.
+            return $cordovaLocalNotification.schedule(notifications, null, true);
+        };
+
+        $cordovaLocalNotification.clear = function(ids, scope, omitEvent) {
+            var promises = [];
+
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+
+            // Clear the notifications.
+            angular.forEach(ids, function(id) {
+                // Cancel only the notifications that aren't repeating.
+                if (scheduled[id] && scheduled[id].notification && !scheduled[id].notification.every) {
+                    promises.push(cancelNotification(id, omitEvent, '$cordovaLocalNotification:clear'));
+                }
+            });
+
+            return $q.all(promises);
+        };
+
+        $cordovaLocalNotification.clearAll = function(scope, omitEvent) {
+            var ids = Object.keys(scheduled);
+            return $cordovaLocalNotification.clear(ids, scope, omitEvent).then(function() {
+                if (!omitEvent) {
+                    $rootScope.$broadcast('$cordovaLocalNotification:clearall', 'foreground');
+                }
+            });
+        };
+
+        $cordovaLocalNotification.cancel = function(ids, scope, omitEvent) {
+            var promises = [];
+
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+
+            // Cancel the notifications.
+            angular.forEach(ids, function(id) {
+                if (scheduled[id]) {
+                    promises.push(cancelNotification(id, omitEvent, '$cordovaLocalNotification:cancel'));
+                }
+            });
+
+            return $q.all(promises);
+        };
+
+        $cordovaLocalNotification.cancelAll = function(scope, omitEvent) {
+            var ids = Object.keys(scheduled);
+            return $cordovaLocalNotification.cancel(ids, scope, omitEvent).then(function() {
+                if (!omitEvent) {
+                    $rootScope.$broadcast('$cordovaLocalNotification:cancelall', 'foreground');
+                }
+            });
+        };
+
+        $cordovaLocalNotification.isPresent = function(id) {
+            return $q.when(!!scheduled[id] || !!triggered[notification.id]);
+        };
+
+        $cordovaLocalNotification.isScheduled = function(id) {
+            return $q.when(!!scheduled[id]);
+        };
+
+        $cordovaLocalNotification.isTriggered = function(id) {
+            return $q.when(!!triggered[notification.id]);
+        };
+
+        $cordovaLocalNotification.hasPermission = function() {
+            return $q.when(true);
+        };
+
+        $cordovaLocalNotification.registerPermission = function() {
+            return $q.when(true);
+        };
+
+        $cordovaLocalNotification.getAllIds = function() {
+            return $q.when($mmUtil.mergeArraysWithoutDuplicates(Object.keys(scheduled), Object.keys(triggered)));
+        };
+        $cordovaLocalNotification.getIds = $cordovaLocalNotification.getAllIds;
+
+        $cordovaLocalNotification.getScheduledIds = function() {
+            return $q.when(Object.keys(scheduled));
+        };
+
+        $cordovaLocalNotification.getTriggeredIds = function() {
+            return $q.when(Object.keys(triggered));
+        };
+
+        $cordovaLocalNotification.get = function(ids) {
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+            return $q.when(getNotifications(ids, true, true));
+        };
+
+        $cordovaLocalNotification.getAll = function() {
+            return $q.when(getNotifications(null, true, true));
+        };
+
+        $cordovaLocalNotification.getScheduled = function(ids) {
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+            return $q.when(getNotifications(ids, true, false));
+        };
+
+        $cordovaLocalNotification.getAllScheduled = function() {
+            return $q.when(getNotifications(null, true, false));
+        };
+
+        $cordovaLocalNotification.getTriggered = function(ids) {
+            ids = Array.isArray(ids) ? ids : [ids];
+            ids = convertIds(ids);
+            return $q.when(getNotifications(ids, false, true));
+        };
+
+        $cordovaLocalNotification.getAllTriggered = function() {
+            return $q.when(getNotifications(null, false, true));
+        };
+
+        $cordovaLocalNotification.getDefaults = function() {
+            return defaults;
+        };
+
+        $cordovaLocalNotification.setDefaults = function(newDefaults) {
+            for (var key in defaults) {
+                if (newDefaults.hasOwnProperty(key)) {
+                    defaults[key] = newDefaults[key];
+                }
+            }
+        };
+
+        // App is being loaded, re-schedule all the notifications that were scheduled before.
+        return getAllNotifications().catch(function() {
+            return [];
+        }).then(function(notifications) {
+            angular.forEach(notifications, function(notification) {
+                if (notification.triggered) {
+                    // Notification was triggered already, store it in memory but don't schedule it again.
+                    delete notification.triggered;
+                    scheduled[notification.id] = {
+                        notification: notification
+                    };
+                    triggered[notification.id] = notification;
+                } else {
+                    // Schedule the notification again unless it should have been triggered more than an hour ago.
+                    delete notification.triggered;
+                    notification.at = notification.at * 1000;
+                    if (notification.at - Date.now() > - mmCoreSecondsHour * 1000) {
+                        $cordovaLocalNotification.schedule(notification);
+                    }
+                }
+            });
+        });
+    };
+
+    /**
+     * Merge notification options with default values.
+     * Code extracted from the Cordova plugin.
+     *
+     * @param  {Object} options Notification options.
+     * @return {Object}         Merged options.
+     */
+    function mergeWithDefaults(options) {
+        options.at   = getValueFor(options, 'at', 'firstAt', 'date');
+        options.text = getValueFor(options, 'text', 'message');
+        options.data = getValueFor(options, 'data', 'json');
+
+        if (defaults.hasOwnProperty('autoClear')) {
+            options.autoClear = getValueFor(options, 'autoClear', 'autoCancel');
+        }
+
+        if (options.autoClear !== true && options.ongoing) {
+            options.autoClear = false;
+        }
+
+        if (options.at === undefined || options.at === null) {
+            options.at = new Date();
+        }
+
+        for (var key in defaults) {
+            if (options[key] === null || options[key] === undefined) {
+                if (options.hasOwnProperty(key) && ['data','sound'].indexOf(key) > -1) {
+                    options[key] = undefined;
+                } else {
+                    options[key] = defaults[key];
+                }
+            }
+        }
+
+        for (key in options) {
+            if (!defaults.hasOwnProperty(key)) {
+                delete options[key];
+                $log.warn('Unknown property: ' + key);
+            }
+        }
+
+        return options;
+    }
+
+    /**
+     * Parse a interval and convert it to a number of milliseconds (0 if not valid).
+     * Code extracted from the Cordova plugin.
+     *
+     * @param  {String} every Interval to convert.
+     * @return {Number}       Number of milliseconds of the interval-
+     */
+    function parseInterval(every) {
+        var interval;
+
+        every = String(every).toLowerCase();
+
+        if (!every || every == 'undefined') {
+            interval = 0;
+        } else if (every == 'second') {
+            interval = 1000;
+        } else if (every == 'minute') {
+            interval = mmCoreSecondsMinute * 1000;
+        } else if (every == 'hour') {
+            interval = mmCoreSecondsHour * 1000;
+        } else if (every == 'day') {
+            interval = mmCoreSecondsDay * 1000;
+        } else if (every == 'week') {
+            interval = mmCoreSecondsDay * 7 * 1000;
+        } else if (every == 'month') {
+            interval = mmCoreSecondsDay * 31 * 1000;
+        } else if (every == 'quarter') {
+            interval = mmCoreSecondsHour * 2190 * 1000;
+        } else if (every == 'year') {
+            interval = mmCoreSecondsYear * 1000;
+        } else {
+            interval = parseInt(every, 10);
+            if (isNaN(interval)) {
+                interval = 0;
+            } else {
+                interval *= 60000;
+            }
+        }
+
+        return interval;
+    }
+
+    /**
+     * Remove a notification from local DB.
+     *
+     * @param  {Number} id ID of the notification.
+     * @return {Promise}   Promise resolved when done.
+     */
+    function removeNotification(id) {
+        return $mmApp.getDB().remove(mmCoreDesktopLocalNotificationsStore, id);
+    }
+
+    /**
+     * Store a notification in local DB.
+     *
+     * @param  {Object} notification Notification to store.
+     * @param  {Boolean} triggered   Whether the notification has been triggered.
+     * @return {Promise}             Promise resolved when stored.
+     */
+    function storeNotification(notification, triggered) {
+        notification = angular.copy(notification);
+        notification.triggered = !!triggered;
+        return $mmApp.getDB().insert(mmCoreDesktopLocalNotificationsStore, notification);
+    }
+
+    return self;
+});
diff --git a/www/core/components/emulator/services/pushnotifications.js b/www/core/components/emulator/services/pushnotifications.js
new file mode 100644
index 00000000000..81942971df6
--- /dev/null
+++ b/www/core/components/emulator/services/pushnotifications.js
@@ -0,0 +1,116 @@
+// (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.emulator')
+
+/**
+ * This service handles the emulation of the Cordova PushNotifications plugin.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorPushNotifications
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorPushNotifications', function($log, $q, $window, $mmApp) {
+
+    $log = $log.getInstance('$mmEmulatorPushNotifications');
+
+    var self = {};
+
+    /**
+     * Load the emulation of the Cordova plugin.
+     * Only some functions are supported.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorPushNotifications#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        // Create the PushNotification object.
+        var PushNotification = function(options) {};
+
+        PushNotification.prototype.unregister = function(successCallback, errorCallback, options) {
+            errorCallback && errorCallback('Unregister is only supported in mobile devices');
+        };
+
+        PushNotification.prototype.subscribe = function(topic, successCallback, errorCallback) {
+            errorCallback && errorCallback('Suscribe is only supported in mobile devices');
+        };
+
+        PushNotification.prototype.unsubscribe = function(topic, successCallback, errorCallback) {
+            errorCallback && errorCallback('Unsuscribe is only supported in mobile devices');
+        };
+
+        PushNotification.prototype.setApplicationIconBadgeNumber = function(successCallback, errorCallback, badge) {
+            if (!$mmApp.isDesktop()) {
+                errorCallback && errorCallback('setApplicationIconBadgeNumber is not supported in browser');
+                return;
+            }
+
+            try {
+                var app = require('electron').remote.app;
+                if (app.setBadgeCount(badge)) {
+                    successCallback && successCallback();
+                } else {
+                    errorCallback && errorCallback();
+                }
+            } catch(ex) {
+                errorCallback && errorCallback(ex);
+            }
+        };
+
+        PushNotification.prototype.getApplicationIconBadgeNumber = function(successCallback, errorCallback) {
+            if (!$mmApp.isDesktop()) {
+                errorCallback && errorCallback('getApplicationIconBadgeNumber is not supported in browser');
+                return;
+            }
+
+            try {
+                var app = require('electron').remote.app;
+                successCallback && successCallback(app.getBadgeCount());
+            } catch(ex) {
+                errorCallback && errorCallback(ex);
+            }
+        };
+
+        PushNotification.prototype.clearAllNotifications = function(successCallback, errorCallback) {
+            errorCallback && errorCallback('clearAllNotifications is only supported in mobile devices');
+        };
+
+        PushNotification.prototype.on = function(eventName, callback) {};
+        PushNotification.prototype.off = function(eventName, handle) {};
+        PushNotification.prototype.emit = function() {};
+
+        PushNotification.prototype.finish = function(successCallback, errorCallback, id) {
+            errorCallback && errorCallback('finish is only supported in mobile devices');
+        };
+
+        // Create the visible PushNotification object.
+        $window.PushNotification = {
+            init: function(options) {
+                return new PushNotification(options);
+            },
+
+            hasPermission: function(successCallback, errorCallback) {
+                errorCallback && errorCallback('hasPermission is only supported in mobile devices');
+            },
+
+            PushNotification: PushNotification
+        };
+
+        return $q.when();
+    };
+
+    return self;
+});
diff --git a/www/core/components/emulator/services/zip.js b/www/core/components/emulator/services/zip.js
new file mode 100644
index 00000000000..1e736beced8
--- /dev/null
+++ b/www/core/components/emulator/services/zip.js
@@ -0,0 +1,89 @@
+// (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.emulator')
+
+/**
+ * This service handles the emulation of the Cordova Zip plugin in desktop apps and in browser.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorZip
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorZip', function($log, $q, $mmFS, $window) {
+
+    $log = $log.getInstance('$mmEmulatorZip');
+
+    var self = {};
+
+    /**
+     * Load the emulation of the Cordova plugin.
+     * Only support the unzip function, the rest of functions won't be supported for now.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorZip#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        $window.zip = {
+            unzip: function(source, destination, callback, progressCallback) {
+                // Remove basePath from the source and destination. Also, replace all %20 with spaces.
+                var basePath = $mmFS.getBasePathInstant();
+                source = source.replace(basePath, '').replace(/%20/g, ' ');
+                destination = destination.replace(basePath, '').replace(/%20/g, ' ');
+
+                $mmFS.readFile(source, $mmFS.FORMATARRAYBUFFER).then(function(data) {
+                    var zip = new JSZip(data),
+                        promises = [],
+                        loaded = 0,
+                        total = Object.keys(zip.files).length;
+
+                    angular.forEach(zip.files, function(file, name) {
+                        var filePath = $mmFS.concatenatePaths(destination, name),
+                            type,
+                            promise;
+
+                        if (!file.dir) {
+                            // It's a file. Get the mimetype and write the file.
+                            type = $mmFS.getMimeType($mmFS.getFileExtension(name));
+                            promise = $mmFS.writeFile(filePath, new Blob([file.asArrayBuffer()], {type: type}));
+                        } else {
+                            // It's a folder, create it if it doesn't exist.
+                            promise = $mmFS.createDir(filePath);
+                        }
+
+                        promises.push(promise.then(function() {
+                            // File unzipped, call the progress.
+                            loaded++;
+                            progressCallback && progressCallback({loaded: loaded, total: total});
+                        }));
+                    });
+
+                    return $q.all(promises).then(function() {
+                        // Success.
+                        callback(0);
+                    });
+                }).catch(function() {
+                    // Error.
+                    callback(-1);
+                });
+            }
+        };
+
+        return $q.when();
+    };
+
+    return self;
+});
diff --git a/www/core/lib/emulator.js b/www/core/lib/emulator.js
deleted file mode 100644
index a3b0e1d14f4..00000000000
--- a/www/core/lib/emulator.js
+++ /dev/null
@@ -1,1705 +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.core')
-
-.constant('mmDesktopLocalNotificationsStore', 'desktop_local_notifications')
-
-.config(function($mmAppProvider, mmDesktopLocalNotificationsStore) {
-    var stores = [
-        {
-            name: mmDesktopLocalNotificationsStore, // Store to schedule notifications in desktop apps.
-            keyPath: 'id',
-            indexes: [
-                {
-                    name: 'triggered'
-                }
-            ]
-        }
-    ];
-    $mmAppProvider.registerStores(stores);
-})
-
-/**
- * @ngdoc service
- * @name $mmEmulatorManager
- * @module mm.core
- * @description
- * This service handles the emulation of Cordova plugins in other environments like browser.
- */
-.factory('$mmEmulatorManager', function($log, $q, $mmFS, $window, $mmApp, $mmUtil, mmCoreConfigConstants, $cordovaClipboard,
-            $cordovaLocalNotification, mmDesktopLocalNotificationsStore, $timeout, $rootScope, $interval,
-            mmCoreSecondsYear, mmCoreSecondsDay, mmCoreSecondsHour, mmCoreSecondsMinute) {
-
-    $log = $log.getInstance('$mmEmulatorManager');
-
-    var self = {},
-        fileTransferIdCounter = 0,
-        basePath;
-
-    /**
-     * Given a URL, check if it has a credentials in it and, if so, return them in a header object.
-     * This code is extracted from Cordova FileTransfer plugin.
-     *
-     * @param  {String} urlString The URL to get the credentials from.
-     * @return {Object}           The header with the credentials, null if no credentials.
-     */
-    function getBasicAuthHeader(urlString) {
-        var header =  null;
-
-        // This is changed due to MS Windows doesn't support credentials in http uris
-        // so we detect them by regexp and strip off from result url.
-        if (window.btoa) {
-            var credentials = getUrlCredentials(urlString);
-            if (credentials) {
-                var authHeader = "Authorization";
-                var authHeaderValue = "Basic " + window.btoa(credentials);
-
-                header = {
-                    name : authHeader,
-                    value : authHeaderValue
-                };
-            }
-        }
-
-        return header;
-    }
-
-    /**
-     * Emulate Cordova clipboard plugin for browser and NodeJS.
-     *
-     * @return {Void}
-     */
-    function emulateCordovaClipboard() {
-        var isDesktop = $mmApp.isDesktop(),
-            clipboard,
-            copyTextarea;
-
-        if (isDesktop) {
-            clipboard = require('electron').clipboard;
-        } else {
-            // In browser the text must be selected in order to copy it. Create a hidden textarea to put the text in it.
-            copyTextarea = document.createElement('textarea');
-            angular.element(copyTextarea).addClass('mm-browser-copy-area');
-            copyTextarea.setAttribute('aria-hidden', 'true');
-            document.body.append(copyTextarea);
-        }
-
-        // We need to redefine $cordovaClipboard methods instead of the core plugin (window.cordova.plugins.clipboard)
-        // because creating window.cordova breaks the app (it thinks it's a real device).
-        $cordovaClipboard.copy = function(text) {
-            var deferred = $q.defer();
-
-            if (isDesktop) {
-                clipboard.writeText(text);
-                deferred.resolve();
-            } else {
-                // Put the text in the hidden textarea and select it.
-                copyTextarea.innerHTML = text;
-                copyTextarea.select();
-
-                try {
-                    if (document.execCommand('copy')) {
-                        deferred.resolve();
-                    } else {
-                        deferred.reject();
-                    }
-                } catch (err) {
-                    deferred.reject();
-                }
-
-                copyTextarea.innerHTML = '';
-            }
-
-            return deferred.promise;
-        };
-
-        $cordovaClipboard.paste = function() {
-            var deferred = $q.defer();
-
-            if (isDesktop) {
-                deferred.resolve(clipboard.readText());
-            } else {
-                // Paste the text in the hidden textarea and get it.
-                copyTextarea.innerHTML = '';
-                copyTextarea.select();
-
-                try {
-                    if (document.execCommand('paste')) {
-                        deferred.resolve(copyTextarea.innerHTML);
-                    } else {
-                        deferred.reject();
-                    }
-                } catch (err) {
-                    deferred.reject();
-                }
-
-                copyTextarea.innerHTML = '';
-            }
-
-            return deferred.promise;
-        };
-    }
-
-    /**
-     * Emulate Cordova file plugin using NodeJS functions. This is only for NodeJS environments,
-     * browser works with the default resolveLocalFileSystemURL.
-     *
-     * @return {Void}
-     */
-    function emulateCordovaFile() {
-        if (!$mmApp.isDesktop()) {
-            return;
-        }
-
-        var fs = require('fs');
-
-        // Create the Entry object, parent of DirectoryEntry and FileEntry.
-        // It includes fileSystem and nativeURL as the Cordova object, but they aren't used.
-        $window.Entry = function(isFile, isDirectory, name, fullPath, fileSystem, nativeURL) {
-            this.isFile = !!isFile;
-            this.isDirectory = !!isDirectory;
-            this.name = name || '';
-            this.fullPath = fullPath || '';
-            this.filesystem = fileSystem || null;
-            this.nativeURL = nativeURL || null;
-        };
-
-        // Implement Entry functions.
-        $window.Entry.prototype.getMetadata = function(successCallback, errorCallback) {
-            fs.stat(this.fullPath, function(err, stats) {
-                if (err) {
-                    errorCallback && errorCallback(err);
-                } else {
-                    successCallback && successCallback({
-                        size: stats.size,
-                        modificationTime: stats.mtime
-                    });
-                }
-            });
-        };
-
-        $window.Entry.prototype.setMetadata = function(successCallback, errorCallback, metadataObject) {
-            // Not supported.
-            errorCallback('Not supported');
-        };
-
-        $window.Entry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-            newName = newName || this.name;
-
-            var srcPath = this.fullPath,
-                destPath = $mmFS.concatenatePaths(parent.fullPath, newName),
-                that = this;
-
-            fs.rename(srcPath, destPath, function(err) {
-                if (err) {
-                    errorCallback && errorCallback(err);
-                } else {
-                    var constructorFn = that.isDirectory ? DirectoryEntry : FileEntry;
-                    successCallback && successCallback(new constructorFn(newName, destPath));
-                }
-            });
-        };
-
-        $window.Entry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-            newName = newName || this.name;
-
-            // There is no function to copy a file, read the source and write the dest.
-            var srcPath = this.fullPath,
-                destPath = $mmFS.concatenatePaths(parent.fullPath, newName),
-                reader = fs.createReadStream(srcPath),
-                writer = fs.createWriteStream(destPath),
-                deferred = $q.defer(), // Use a promise to make sure only one callback is called.
-                that = this;
-
-            deferred.promise.then(function() {
-                var constructorFn = that.isDirectory ? DirectoryEntry : FileEntry;
-                successCallback && successCallback(new constructorFn(newName, destPath));
-            }).catch(function(error) {
-                errorCallback && errorCallback(error);
-            });
-
-            reader.on('error', deferred.reject);
-
-            writer.on('error', deferred.reject);
-
-            writer.on('close', deferred.resolve);
-
-            reader.pipe(writer);
-        };
-
-        $window.Entry.prototype.toInternalURL = function() {
-            return 'file://' + this.fullPath;
-        };
-
-        $window.Entry.prototype.toURL = function() {
-            return this.fullPath;
-        };
-
-        $window.Entry.prototype.remove = function(successCallback, errorCallback) {
-            var removeFn = this.isDirectory ? fs.rmdir : fs.unlink;
-            removeFn(this.fullPath, function(err) {
-                if (err < 0) {
-                    errorCallback(err);
-                } else {
-                    successCallback();
-                }
-            });
-        };
-
-        $window.Entry.prototype.getParent = function(successCallback, errorCallback) {
-            // Remove last slash if present and get the path of the parent.
-            var fullPath = this.fullPath.slice(-1) == '/' ? this.fullPath.slice(0, -1) : this.fullPath,
-                parentPath = fullPath.substr(0, fullPath.lastIndexOf('/'));
-
-            // Check that parent exists.
-            fs.stat(parentPath, function(err, stats) {
-                if (err || !stats.isDirectory()) {
-                    errorCallback && errorCallback(err);
-                } else {
-                    var fileAndDir = $mmFS.getFileAndDirectoryFromPath(parentPath);
-                    successCallback && successCallback(new DirectoryEntry(fileAndDir.name, parentPath));
-                }
-            });
-        };
-
-        // FileWriter to write data in files. Don't support abort, seek and truncate.
-        $window.FileWriter = function(file) {
-            this.fileName = '';
-            this.length = 0;
-            if (file) {
-                this.localURL = file.localURL || file;
-                this.length = file.size || 0;
-            }
-
-            this.position = 0; // Default is to write at the beginning of the file.
-            this.readyState = 0; // EMPTY
-            this.result = null;
-            this.error = null;
-
-            // Event handlers
-            this.onwritestart = null;   // When writing starts
-            this.onprogress = null;     // While writing the file, and reporting partial file data
-            this.onwrite = null;        // When the write has successfully completed.
-            this.onwriteend = null;     // When the request has completed (either in success or failure).
-            this.onabort = null;        // When the write has been aborted. For instance, by invoking the abort() method.
-            this.onerror = null;        // When the write has failed (see errors).
-        };
-
-        $window.FileWriter.prototype.write = function(data) {
-            var that = this;
-            if (data && data.toString() == '[object Blob]') {
-                // Can't write Blobs, convert it to a Buffer.
-                var reader = new FileReader();
-                reader.onload = function() {
-                    if (reader.readyState == 2) {
-                        write(new Buffer(reader.result));
-                    }
-                };
-                reader.readAsArrayBuffer(data);
-            } else if (data && data.toString() == '[object ArrayBuffer]') {
-                // Convert it to a Buffer.
-                write(Buffer.from(new Uint8Array(data)));
-            } else {
-                write(data);
-            }
-
-            function write(data) {
-                fs.writeFile(that.localURL, data, function(err) {
-                    if (err) {
-                        that.onerror && that.onerror(err);
-                    } else {
-                        that.onwrite && that.onwrite();
-                    }
-                    that.onwriteend && that.onwriteend();
-                });
-
-                that.onwritestart && that.onwritestart();
-            }
-        };
-
-        // DirectoryReader to read directory contents.
-        $window.DirectoryReader = function(localURL) {
-            this.localURL = localURL || null;
-        };
-
-        $window.DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
-            var that = this;
-
-            fs.readdir(this.localURL, function(err, files) {
-                if (err) {
-                    errorCallback && errorCallback(err);
-                } else {
-                    // Use try/catch because it includes sync calls.
-                    try {
-                        var entries = [];
-                        for (var i = 0; i < files.length; i++) {
-                            var fileName = files[i],
-                                filePath = $mmFS.concatenatePaths(that.localURL, fileName),
-                                stats = fs.statSync(filePath); // Use sync function to make code simpler.
-
-                            if (stats.isDirectory()) {
-                                entries.push(new DirectoryEntry(fileName, filePath));
-                            } else if (stats.isFile()) {
-                                entries.push(new FileEntry(fileName, filePath));
-                            }
-                        }
-
-                        successCallback(entries);
-                    } catch(ex) {
-                        errorCallback && errorCallback(ex);
-                    }
-                }
-            });
-        };
-
-        // Create FileEntry and its functions, inheriting from Entry.
-        $window.FileEntry = function(name, fullPath, fileSystem, nativeURL) {
-            // Remove trailing slash if it is present.
-            if (fullPath && /\/$/.test(fullPath)) {
-                fullPath = fullPath.substring(0, fullPath.length - 1);
-            }
-            if (nativeURL && /\/$/.test(nativeURL)) {
-                nativeURL = nativeURL.substring(0, nativeURL.length - 1);
-            }
-
-            $window.Entry.call(this, true, false, name, fullPath, fileSystem, nativeURL);
-        };
-
-        $window.FileEntry.prototype = Object.create($window.Entry.prototype); // Inherit Entry prototype.
-
-        $window.FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
-            this.file(function(file) {
-                successCallback && successCallback(new FileWriter(file));
-            }, errorCallback);
-        };
-
-        $window.FileEntry.prototype.file = function(successCallback, errorCallback) {
-            var that = this;
-
-            // Get the metadata to know the time modified.
-            this.getMetadata(function(metadata) {
-                // Read the file.
-                fs.readFile(that.fullPath, function(err, data) {
-                    if (err) {
-                        errorCallback && errorCallback(err);
-                    } else {
-                        // Create a File instance and return it.
-                        data = Uint8Array.from(data).buffer; // Convert the NodeJS Buffer to ArrayBuffer.
-                        var file = new File([data], that.name || '', {
-                            lastModified: metadata.modificationTime || null,
-                            type: $mmFS.getMimeType($mmFS.getFileExtension(that.name)) || null
-                        });
-                        file.localURL = that.fullPath;
-                        file.start = 0;
-                        file.end = file.size;
-
-                        successCallback && successCallback(file);
-                    }
-                });
-            }, errorCallback);
-        };
-
-        // Create DirectoryEntry and its functions, inheriting from Entry.
-        $window.DirectoryEntry = function(name, fullPath, fileSystem, nativeURL) {
-            // Add trailing slash if it is missing.
-            if ((fullPath) && !/\/$/.test(fullPath)) {
-                fullPath += '/';
-            }
-            if (nativeURL && !/\/$/.test(nativeURL)) {
-                nativeURL += '/';
-            }
-
-            $window.Entry.call(this, false, true, name, fullPath, fileSystem, nativeURL);
-        };
-
-        $window.DirectoryEntry.prototype = Object.create($window.Entry.prototype); // Inherit Entry prototype.
-
-        $window.DirectoryEntry.prototype.createReader = function() {
-            return new DirectoryReader(this.fullPath);
-        };
-
-        $window.DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
-            getDirOrFile(this, true, path, options, successCallback, errorCallback);
-        };
-
-        $window.DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
-            // Use a promise to make sure only one callback is called.
-            var deferred = $q.defer();
-
-            deferred.promise.then(function() {
-                successCallback && successCallback();
-            }).catch(function(error) {
-                errorCallback && errorCallback(error);
-            });
-
-            deleteRecursive(this.fullPath, function() {
-                deferred.resolve();
-            });
-
-            // Delete a file or folder recursively.
-            function deleteRecursive(path, success) {
-                // Check if it exists.
-                fs.stat(path, function(err, stats) {
-                    if (err) {
-                        // File not found, reject.
-                        deferred.reject(err);
-                    } else if (stats.isFile()) {
-                        // It's a file, remove it.
-                        fs.unlink(path, function(err) {
-                            if (err) {
-                                // Error removing file, reject.
-                                deferred.reject(err);
-                            } else {
-                                success && success();
-                            }
-                        });
-                    } else {
-                        // It's a directory, read the contents.
-                        fs.readdir(path, function(err, files) {
-                            if (err) {
-                                // Error reading directory contents, reject.
-                                deferred.reject(err);
-                            } else if (!files.length) {
-                                // No files to delete, delete the folder.
-                                deleteEmptyFolder(path, success);
-                            } else {
-                                // Remove all the files and directories.
-                                var removed = 0;
-                                files.forEach(function(filename) {
-                                    deleteRecursive($mmFS.concatenatePaths(path, filename), function() {
-                                        // Success deleting the file/dir.
-                                        removed++;
-                                        if (removed == files.length) {
-                                            // All files deleted, delete the folder.
-                                            deleteEmptyFolder(path, success);
-                                        }
-                                    });
-                                });
-                            }
-                        });
-                    }
-                });
-            }
-
-            // Delete an empty folder.
-            function deleteEmptyFolder(path, success) {
-                fs.rmdir(path, function(err) {
-                    if (err) {
-                        // Error removing directory, reject.
-                        deferred.reject(err);
-                    } else {
-                        success && success();
-                    }
-                });
-            }
-        };
-
-        $window.DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
-            getDirOrFile(this, false, path, options, successCallback, errorCallback);
-        };
-
-        // Helper function for getDirectory and getFile.
-        function getDirOrFile(file, isDir, path, options, successCallback, errorCallback) {
-            var filename = $mmFS.getFileAndDirectoryFromPath(path).name,
-                fileDirPath = $mmFS.concatenatePaths(file.fullPath, path);
-
-            // Check if file/dir exists.
-            fs.stat(fileDirPath, function(err) {
-                if (err) {
-                    if (options.create) {
-                        // File/Dir probably doesn't exist, create it.
-                        create(function(error2) {
-                            if (!error2) {
-                                // File created successfully, return it.
-                                success();
-                            } else if (error2.code === 'EEXIST') {
-                                // File exists, success.
-                                success();
-                            } else if (error2.code === 'ENOENT') {
-                                // Seems like the parent doesn't exist, create it too.
-                                var parent = fileDirPath.substring(0, fileDirPath.lastIndexOf('/'));
-
-                                if (parent) {
-                                    file.getDirectory(parent, options, function() {
-                                        // Parent created, try to create the child again.
-                                        create(function(error3) {
-                                            if (!error3) {
-                                                success();
-                                            } else {
-                                                errorCallback && errorCallback(error3);
-                                            }
-                                        });
-                                    }, errorCallback);
-                                } else {
-                                    errorCallback && errorCallback(error2);
-                                }
-                            } else {
-                                errorCallback && errorCallback(error2);
-                            }
-                        });
-                    } else {
-                        errorCallback && errorCallback(err);
-                    }
-                } else {
-                    success();
-                }
-            });
-
-            // Success, return the DirectoryEntry or FileEntry.
-            function success() {
-                var constructorFn = isDir ? DirectoryEntry : FileEntry;
-                successCallback(new constructorFn(filename, fileDirPath));
-            }
-
-            // Create the file/dir.
-            function create(done) {
-                if (isDir) {
-                    fs.mkdir(fileDirPath, done);
-                } else {
-                    fs.writeFile(fileDirPath, "", done);
-                }
-            }
-        }
-
-        // Implement resolveLocalFileSystemURL.
-        $window.resolveLocalFileSystemURL = function(path, successCallback, errorCallback) {
-            // Check that the file/dir exists.
-            fs.stat(path, function(err, stats) {
-                if (err) {
-                    errorCallback && errorCallback(err);
-                } else {
-                    // The file/dir exists, return an instance.
-                    var constructorFn = stats.isDirectory() ? DirectoryEntry : FileEntry,
-                        fileAndDir = $mmFS.getFileAndDirectoryFromPath(path);
-                    successCallback && successCallback(new constructorFn(fileAndDir.name, path));
-                }
-            });
-        };
-    }
-
-    /**
-     * Emulate Cordova FileTransfer plugin for browser or NodeJS.
-     *
-     * @return {Void}
-     */
-    function emulateCordovaFileTransfer() {
-        // Create the FileTransferError object.
-        $window.FileTransferError = function(code, source, target, status, body, exception) {
-            this.code = code || null;
-            this.source = source || null;
-            this.target = target || null;
-            this.http_status = status || null;
-            this.body = body || null;
-            this.exception = exception || null;
-        };
-
-        $window.FileTransferError.FILE_NOT_FOUND_ERR = 1;
-        $window.FileTransferError.INVALID_URL_ERR = 2;
-        $window.FileTransferError.CONNECTION_ERR = 3;
-        $window.FileTransferError.ABORT_ERR = 4;
-        $window.FileTransferError.NOT_MODIFIED_ERR = 5;
-
-        // Create the FileTransfer object and its functions.
-        $window.FileTransfer = function() {
-            this._id = ++fileTransferIdCounter;
-            this.onprogress = null; // Optional callback.
-        };
-
-        $window.FileTransfer.prototype.download = function(source, target, successCallback, errorCallback, trustAllHosts, options) {
-            // Use XMLHttpRequest instead of $http to support onprogress and abort.
-            var basicAuthHeader = getBasicAuthHeader(source),
-                xhr = new XMLHttpRequest(),
-                isDesktop = $mmApp.isDesktop(),
-                deferred = $q.defer(), // Use a promise to make sure only one callback is called.
-                headers = null;
-
-            deferred.promise.then(function(entry) {
-                successCallback && successCallback(entry);
-            }).catch(function(error) {
-                errorCallback && errorCallback(error);
-            });
-
-            this.xhr = xhr;
-            this.deferred = deferred;
-            this.source = source;
-            this.target = target;
-
-            if (basicAuthHeader) {
-                source = source.replace(getUrlCredentials(source) + '@', '');
-
-                options = options || {};
-                options.headers = options.headers || {};
-                options.headers[basicAuthHeader.name] = basicAuthHeader.value;
-            }
-
-            if (options) {
-                headers = options.headers || null;
-            }
-
-            // Prepare the request.
-            xhr.open('GET', source, true);
-            xhr.responseType = isDesktop ? 'arraybuffer' : 'blob';
-            angular.forEach(headers, function(value, name) {
-                xhr.setRequestHeader(name, value);
-            });
-
-            if (this.onprogress) {
-                xhr.onprogress = this.onprogress;
-            }
-
-            xhr.onerror = function() {
-                deferred.reject(new FileTransferError(-1, source, target, xhr.status, xhr.statusText));
-            };
-
-            xhr.onload = function() {
-                // Finished dowloading the file.
-                var response = xhr.response;
-                if (!response) {
-                    deferred.reject();
-                } else {
-                    target = target.replace(basePath, ''); // Remove basePath from the target.
-                    target = target.replace(/%20/g, ' '); // Replace all %20 with spaces.
-                    if (isDesktop) {
-                        // In desktop we need to convert the arraybuffer into a Buffer.
-                        response = Buffer.from(new Uint8Array(response));
-                    }
-
-                    $mmFS.writeFile(target, response).then(deferred.resolve, deferred.reject);
-                }
-            };
-
-            xhr.send();
-        };
-
-        $window.FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, trustAllHosts) {
-            var fileKey = null,
-                fileName = null,
-                mimeType = null,
-                params = null,
-                headers = null,
-                httpMethod = null,
-                deferred = $q.defer(), // Use a promise to make sure only one callback is called.
-                basicAuthHeader = getBasicAuthHeader(server),
-                that = this;
-
-            deferred.promise.then(function(result) {
-                successCallback && successCallback(result);
-            }).catch(function(error) {
-                errorCallback && errorCallback(error);
-            });
-
-            if (basicAuthHeader) {
-                server = server.replace(getUrlCredentials(server) + '@', '');
-
-                options = options || {};
-                options.headers = options.headers || {};
-                options.headers[basicAuthHeader.name] = basicAuthHeader.value;
-            }
-
-            if (options) {
-                fileKey = options.fileKey;
-                fileName = options.fileName;
-                mimeType = options.mimeType;
-                headers = options.headers;
-                httpMethod = options.httpMethod || 'POST';
-
-                if (httpMethod.toUpperCase() == "PUT"){
-                    httpMethod = 'PUT';
-                } else {
-                    httpMethod = 'POST';
-                }
-
-                if (options.params) {
-                    params = options.params;
-                } else {
-                    params = {};
-                }
-            }
-
-            // Add fileKey and fileName to the headers.
-            headers = headers || {};
-            if (!headers['Content-Disposition']) {
-                headers['Content-Disposition'] = 'form-data;' + (fileKey ? ' name="' + fileKey + '";' : '') +
-                    (fileName ? ' filename="' + fileName + '"' : '')
-            }
-
-            // For some reason, adding a Content-Type header with the mimeType makes the request fail (it doesn't detect
-            // the token in the params). Don't include this header, and delete it if it's supplied.
-            delete headers['Content-Type'];
-
-            // Get the file to upload.
-            $mmFS.getFile(filePath).then(function(fileEntry) {
-                return $mmFS.getFileObjectFromFileEntry(fileEntry);
-            }).then(function(file) {
-                // Use XMLHttpRequest instead of $http to support onprogress and abort.
-                var xhr = new XMLHttpRequest();
-                xhr.open(httpMethod || 'POST', server);
-                angular.forEach(headers, function(value, name) {
-                    // Filter "unsafe" headers.
-                    if (name != 'Connection') {
-                        xhr.setRequestHeader(name, value);
-                    }
-                });
-
-                if (that.onprogress) {
-                    xhr.onprogress = that.onprogress;
-                }
-
-                that.xhr = xhr;
-                that.deferred = deferred;
-                this.source = filePath;
-                this.target = server;
-
-                xhr.onerror = function() {
-                    deferred.reject(new FileTransferError(-1, filePath, server, xhr.status, xhr.statusText));
-                };
-
-                xhr.onload = function() {
-                    // Finished uploading the file.
-                    deferred.resolve({
-                        bytesSent: file.size,
-                        responseCode: xhr.status,
-                        response: xhr.response,
-                        objectId: ''
-                    });
-                };
-
-                // Create a form data to send params and the file.
-                var fd = new FormData();
-                angular.forEach(params, function(value, name) {
-                    fd.append(name, value);
-                });
-                fd.append('file', file);
-
-                xhr.send(fd);
-            }).catch(deferred.reject);
-        };
-
-        $window.FileTransfer.prototype.abort = function() {
-            if (this.xhr) {
-                this.xhr.abort();
-                this.deferred.reject(new FileTransferError(FileTransferError.ABORT_ERR, this.source, this.target));
-            }
-        };
-    }
-
-    /**
-     * Emulate Cordova Globalization plugin for browser or NodeJS.
-     * Only support the functions to get locale, the rest of functions won't be supported for now.
-     *
-     * @return {Void}
-     */
-    function emulateCordovaGlobalization() {
-        // Create the GlobalizationError object.
-        $window.GlobalizationError = function(code, message) {
-            this.code = code || null;
-            this.message = message || '';
-        };
-
-        $window.GlobalizationError.UNKNOWN_ERROR = 0;
-        $window.GlobalizationError.FORMATTING_ERROR = 1;
-        $window.GlobalizationError.PARSING_ERROR = 2;
-        $window.GlobalizationError.PATTERN_ERROR = 3;
-
-        // Create the globalization object and its functions.
-        function getLocale() {
-            var navLang = navigator.userLanguage || navigator.language;
-            try {
-                if ($mmApp.isDesktop()) {
-                    var locale = require('electron').remote.app.getLocale();
-                    return locale || navLang;
-                } else {
-                    return navLang;
-                }
-            } catch(ex) {
-                // Something went wrong, return browser language.
-                return navLang;
-            }
-        }
-
-        navigator.globalization = {
-            getLocaleName: function(successCallback, errorCallback) {
-                var locale = getLocale();
-                if (locale) {
-                    successCallback && successCallback({value: locale});
-                } else {
-                    var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Cannot get language');
-                    errorCallback && errorCallback(error);
-                }
-            },
-            numberToString: function(number, successCallback, errorCallback, options) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-            isDayLightSavingsTime: function(date, successCallback, errorCallback) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-            getFirstDayOfWeek: function(successCallback, errorCallback) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-            getDateNames: function (successCallback, errorCallback, options) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-            getDatePattern: function(successCallback, errorCallback, options) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-            getNumberPattern: function(successCallback, errorCallback, options) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-            getCurrencyPattern: function(currencyCode, successCallback, errorCallback) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-            stringToDate: function(dateString, successCallback, errorCallback, options) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-            stringToNumber: function(numberString, successCallback, errorCallback, options) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-            dateToString: function(date, successCallback, errorCallback, options) {
-                var error = new GlobalizationError(GlobalizationError.UNKNOWN_ERROR, 'Not supported.');
-                errorCallback && errorCallback(error);
-            },
-        };
-
-        navigator.globalization.getPreferredLanguage = navigator.globalization.getLocaleName;
-    }
-
-    /**
-     * Emulate Cordova ZIP plugin for browser or NodeJS.
-     * Only support the unzip function, the rest of functions won't be supported for now.
-     *
-     * @return {Void}
-     */
-    function emulateCordovaZip() {
-        // Cordova ZIP plugin.
-        $window.zip = {
-            unzip: function(source, destination, callback, progressCallback) {
-                // Remove basePath from the source and destination.
-                source = source.replace(basePath, '');
-                source = source.replace(/%20/g, ' '); // Replace all %20 with spaces.
-                destination = destination.replace(basePath, '');
-                destination = destination.replace(/%20/g, ' '); // Replace all %20 with spaces.
-
-                $mmFS.readFile(source, $mmFS.FORMATARRAYBUFFER).then(function(data) {
-                    var zip = new JSZip(data),
-                        promises = [],
-                        loaded = 0,
-                        total = Object.keys(zip.files).length;
-
-                    angular.forEach(zip.files, function(file, name) {
-                        var filePath = $mmFS.concatenatePaths(destination, name),
-                            type,
-                            promise;
-
-                        if (!file.dir) {
-                            // It's a file. Get the mimetype and write the file.
-                            type = $mmFS.getMimeType($mmFS.getFileExtension(name));
-                            promise = $mmFS.writeFile(filePath, new Blob([file.asArrayBuffer()], {type: type}));
-                        } else {
-                            // It's a folder, create it if it doesn't exist.
-                            promise = $mmFS.createDir(filePath);
-                        }
-
-                        promises.push(promise.then(function() {
-                            // File unzipped, call the progress.
-                            loaded++;
-                            progressCallback && progressCallback({loaded: loaded, total: total});
-                        }));
-                    });
-
-                    return $q.all(promises).then(function() {
-                        // Success.
-                        callback(0);
-                    });
-                }).catch(function() {
-                    // Error.
-                    callback(-1);
-                });
-            }
-        };
-    }
-
-    /**
-     * Emulate Custom URL Schemes for NodeJS.
-     *
-     * @return {Void}
-     */
-    function emulateCustomURLScheme() {
-        if (!$mmApp.isDesktop()) {
-            return;
-        }
-
-        // Listen for app launched events.
-        require('electron').ipcRenderer.on('mmAppLaunched', (event, url) => {
-            window.handleOpenURL && window.handleOpenURL(url);
-        });
-    }
-
-    /**
-     * Emulate InAppBrowser for NodeJS.
-     *
-     * @return {Void}
-     */
-    function emulateInAppBrowser() {
-        if (!$mmApp.isDesktop()) {
-            return;
-        }
-
-        var BrowserWindow = require('electron').remote.BrowserWindow,
-            screen = require('electron').screen;
-
-        // Redefine window open to be able to have full control over the new window.
-        $window.open = function(url, frameName, features) {
-            var width = 800,
-                height = 600,
-                display,
-                newWindow,
-                listeners = {};
-
-            if (screen) {
-                display = screen.getPrimaryDisplay();
-                if (display && display.workArea) {
-                    width = display.workArea.width || width;
-                    height = display.workArea.height || height;
-                }
-            }
-
-            newWindow = new BrowserWindow({
-                width: width,
-                height: height
-            });
-            newWindow.loadURL(url);
-
-            // Add the missing functions that InAppBrowser supports but BrowserWindow doesn't.
-            newWindow.addEventListener = function(name, callback) {
-                var that = this;
-
-                switch (name) {
-                    case 'loadstart':
-                        that.webContents.addListener('did-start-loading', received);
-                        break;
-
-                    case 'loadstop':
-                        that.webContents.addListener('did-finish-load', received);
-                        break;
-
-                    case 'loaderror':
-                        that.webContents.addListener('did-fail-load', received);
-                        break;
-
-                    case 'exit':
-                        that.addListener('close', received);
-                        break;
-                }
-
-                // Store the received function instance to be able to remove the listener.
-                listeners[callback] = received;
-
-                function received(event) {
-                    try {
-                        event.url = that.getURL();
-                        callback(event);
-                    } catch(ex) {}
-                }
-            };
-
-            newWindow.removeEventListener = function(name, callback) {
-                var that = this,
-                    listener = listeners[callback];
-
-                switch (name) {
-                    case 'loadstart':
-                        that.webContents.removeListener('did-start-loading', listener);
-                        break;
-
-                    case 'loadstop':
-                        that.webContents.removeListener('did-finish-load', listener);
-                        break;
-
-                    case 'loaderror':
-                        that.webContents.removeListener('did-fail-load', listener);
-                        break;
-
-                    case 'exit':
-                        that.removeListener('close', listener);
-                        break;
-                }
-            };
-
-            newWindow.executeScript = function(details, callback) {
-                var that = this;
-
-                if (details.code) {
-                    that.webContents.executeJavaScript(details.code, false, callback);
-                } else if (details.file) {
-                    $mmFS.readFile(details.file).then(function(code) {
-                        that.webContents.executeJavaScript(code, false, callback);
-                    }).catch(callback);
-                } else {
-                    callback('executeScript requires exactly one of code or file to be specified');
-                }
-            };
-
-            newWindow.insertCSS = function(details, callback) {
-                var that = this;
-
-                if (details.code) {
-                    that.webContents.insertCSS(details.code);
-                    callback();
-                } else if (details.file) {
-                    $mmFS.readFile(details.file).then(function(code) {
-                        that.webContents.insertCSS(code);
-                        callback();
-                    }).catch(callback);
-                } else {
-                    callback('insertCSS requires exactly one of code or file to be specified');
-                }
-            };
-
-            return newWindow;
-        };
-    }
-
-    /**
-     * Emulate local notifications for NodeJS.
-     * Some of the code used in here was extracted from the Cordova Local Notification plugin.
-     *
-     * @return {Promise} Promise resolved when done.
-     */
-    function emulateLocalNotifications() {
-        if (!$mmApp.isDesktop()) {
-            return $q.when();
-        }
-
-        var scheduled = {},
-            triggered = {},
-            defaults = {
-                text:  '',
-                title: '',
-                id:    0,
-                sound: '',
-                data:  undefined,
-                every: undefined,
-                at:    undefined
-            };
-
-        // Redefine $cordovaLocalNotification methods instead of the core plugin (window.cordova.plugins.notification.local)
-        // because creating window.cordova breaks the app (it thinks it's a real device).
-        $cordovaLocalNotification.schedule = function(notifications, scope, isUpdate) {
-            var promises = [];
-
-            notifications = Array.isArray(notifications) ? notifications : [notifications];
-
-            angular.forEach(notifications, function(notification) {
-                mergeWithDefaults(notification);
-                convertProperties(notification);
-
-                // Cancel current notification if exists.
-                $cordovaLocalNotification.cancel(notification.id, null, true);
-
-                // Store the notification in the scheduled list and in the DB.
-                scheduled[notification.id] = {
-                    notification: notification
-                };
-                promises.push(storeLocalNotification(notification, false));
-
-                // Schedule the notification.
-                var toTrigger = notification.at * 1000 - Date.now();
-                scheduled[notification.id].timeout = $timeout(function trigger() {
-                    // Trigger the notification.
-                    var notifInstance = new Notification(notification.title, {
-                        body: notification.text
-                    });
-
-                    // Store the notification as triggered. Don't remove it from scheduled, it's how the plugin works.
-                    triggered[notification.id] = notification;
-                    storeLocalNotification(notification, true);
-
-                    // Launch the trigger event.
-                    $rootScope.$broadcast('$cordovaLocalNotification:trigger', notification, 'foreground');
-
-                    // Listen for click events.
-                    notifInstance.onclick = function() {
-                        $rootScope.$broadcast('$cordovaLocalNotification:click', notification, 'foreground');
-                    };
-
-                    if (notification.every && scheduled[notification.id] && !scheduled[notification.id].interval) {
-                        var interval = parseInterval(notification.every);
-                        if (interval > 0) {
-                            scheduled[notification.id].interval = $interval(trigger, interval);
-                        }
-                    }
-                }, toTrigger);
-
-                // Launch the scheduled/update event.
-                var eventName = isUpdate ? 'update' : 'schedule';
-                $rootScope.$broadcast('$cordovaLocalNotification:' + eventName, notification, 'foreground');
-            });
-
-            return $q.when();
-        };
-
-        $cordovaLocalNotification.update = function(notifications) {
-            // Just schedule them again, since scheduling cancels the existing one.
-            return $cordovaLocalNotification.schedule(notifications, null, true);
-        };
-
-        $cordovaLocalNotification.clear = function(ids, scope, omitEvent) {
-            var promises = [];
-
-            ids = Array.isArray(ids) ? ids : [ids];
-            ids = convertIds(ids);
-
-            // Clear the notifications.
-            angular.forEach(ids, function(id) {
-                // Cancel only the notifications that aren't repeating.
-                if (scheduled[id] && scheduled[id].notification && !scheduled[id].notification.every) {
-                    promises.push(cancelNotification(id, omitEvent, '$cordovaLocalNotification:clear'));
-                }
-            });
-
-            return $q.all(promises);
-        };
-
-        $cordovaLocalNotification.clearAll = function(scope, omitEvent) {
-            var ids = Object.keys(scheduled);
-            return $cordovaLocalNotification.clear(ids, scope, omitEvent).then(function() {
-                if (!omitEvent) {
-                    $rootScope.$broadcast('$cordovaLocalNotification:clearall', 'foreground');
-                }
-            });
-        };
-
-        $cordovaLocalNotification.cancel = function(ids, scope, omitEvent) {
-            var promises = [];
-
-            ids = Array.isArray(ids) ? ids : [ids];
-            ids = convertIds(ids);
-
-            // Cancel the notifications.
-            angular.forEach(ids, function(id) {
-                if (scheduled[id]) {
-                    promises.push(cancelNotification(id, omitEvent, '$cordovaLocalNotification:cancel'));
-                }
-            });
-
-            return $q.all(promises);
-        };
-
-        $cordovaLocalNotification.cancelAll = function(scope, omitEvent) {
-            var ids = Object.keys(scheduled);
-            return $cordovaLocalNotification.cancel(ids, scope, omitEvent).then(function() {
-                if (!omitEvent) {
-                    $rootScope.$broadcast('$cordovaLocalNotification:cancelall', 'foreground');
-                }
-            });
-        };
-
-        $cordovaLocalNotification.isPresent = function(id) {
-            return $q.when(!!scheduled[id] || !!triggered[notification.id]);
-        };
-
-        $cordovaLocalNotification.isScheduled = function(id) {
-            return $q.when(!!scheduled[id]);
-        };
-
-        $cordovaLocalNotification.isTriggered = function(id) {
-            return $q.when(!!triggered[notification.id]);
-        };
-
-        $cordovaLocalNotification.hasPermission = function() {
-            return $q.when(true);
-        };
-
-        $cordovaLocalNotification.registerPermission = function() {
-            return $q.when(true);
-        };
-
-        $cordovaLocalNotification.getAllIds = function() {
-            return $q.when($mmUtil.mergeArraysWithoutDuplicates(Object.keys(scheduled), Object.keys(triggered)));
-        };
-        $cordovaLocalNotification.getIds = $cordovaLocalNotification.getAllIds;
-
-        $cordovaLocalNotification.getScheduledIds = function() {
-            return $q.when(Object.keys(scheduled));
-        };
-
-        $cordovaLocalNotification.getTriggeredIds = function() {
-            return $q.when(Object.keys(triggered));
-        };
-
-        $cordovaLocalNotification.get = function(ids) {
-            ids = Array.isArray(ids) ? ids : [ids];
-            ids = convertIds(ids);
-            return getNotifications(ids, true, true);
-        };
-
-        $cordovaLocalNotification.getAll = function() {
-            return getNotifications(null, true, true);
-        };
-
-        $cordovaLocalNotification.getScheduled = function(ids) {
-            ids = Array.isArray(ids) ? ids : [ids];
-            ids = convertIds(ids);
-            return getNotifications(ids, true, false);
-        };
-
-        $cordovaLocalNotification.getAllScheduled = function() {
-            return getNotifications(null, true, false);
-        };
-
-        $cordovaLocalNotification.getTriggered = function(ids) {
-            ids = Array.isArray(ids) ? ids : [ids];
-            ids = convertIds(ids);
-            return getNotifications(ids, false, true);
-        };
-
-        $cordovaLocalNotification.getAllTriggered = function() {
-            return getNotifications(null, false, true);
-        };
-
-        $cordovaLocalNotification.getDefaults = function() {
-            return defaults;
-        };
-
-        $cordovaLocalNotification.setDefaults = function(newDefaults) {
-            for (var key in defaults) {
-                if (newDefaults.hasOwnProperty(key)) {
-                    defaults[key] = newDefaults[key];
-                }
-            }
-        };
-
-        // App is being loaded, re-schedule all the notifications that were scheduled before.
-        return getAllLocalNotifications().catch(function() {
-            return [];
-        }).then(function(notifications) {
-            angular.forEach(notifications, function(notification) {
-                if (notification.triggered) {
-                    // Notification was triggered already, store it in memory but don't schedule it again.
-                    delete notification.triggered;
-                    scheduled[notification.id] = notification;
-                    triggered[notification.id] = notification;
-                } else {
-                    // Schedule the notification again unless it should have been triggered more than an hour ago.
-                    delete notification.triggered;
-                    notification.at = notification.at * 1000;
-                    if (notification.at - Date.now() > - mmCoreSecondsHour * 1000) {
-                        $cordovaLocalNotification.schedule(notification);
-                    }
-                }
-            });
-        });
-
-        // Cancel a notification.
-        function cancelNotification(id, omitEvent, eventName) {
-            var notification = scheduled[id].notification;
-
-            $timeout.cancel(scheduled[id].timeout);
-            $interval.cancel(scheduled[id].interval);
-            delete scheduled[id];
-            delete triggered[id];
-
-            removeLocalNotification(id);
-
-            if (!omitEvent) {
-                $rootScope.$broadcast(eventName, notification, 'foreground');
-            }
-        }
-
-        // Get a set of notifications. If ids isn't specified, return all the notifications.
-        function getNotifications(ids, getScheduled, getTriggered) {
-            var notifications = [];
-
-            if (getScheduled) {
-                angular.forEach(scheduled, function(entry, id) {
-                    if (!ids || ids.indexOf(id) != -1) {
-                        notifications.push(entry.notification);
-                    }
-                });
-            }
-
-            if (getTriggered) {
-                angular.forEach(triggered, function(notification, id) {
-                    if ((!getScheduled || !scheduled[id]) && (!ids || ids.indexOf(id) != -1)) {
-                        notifications.push(notification);
-                    }
-                });
-            }
-
-            return $q.when(notifications);
-        }
-
-        // Merge options with default values.
-        function mergeWithDefaults(options) {
-            options.at   = getValueFor(options, 'at', 'firstAt', 'date');
-            options.text = getValueFor(options, 'text', 'message');
-            options.data = getValueFor(options, 'data', 'json');
-
-            if (defaults.hasOwnProperty('autoClear')) {
-                options.autoClear = getValueFor(options, 'autoClear', 'autoCancel');
-            }
-
-            if (options.autoClear !== true && options.ongoing) {
-                options.autoClear = false;
-            }
-
-            if (options.at === undefined || options.at === null) {
-                options.at = new Date();
-            }
-
-            for (var key in defaults) {
-                if (options[key] === null || options[key] === undefined) {
-                    if (options.hasOwnProperty(key) && ['data','sound'].indexOf(key) > -1) {
-                        options[key] = undefined;
-                    } else {
-                        options[key] = defaults[key];
-                    }
-                }
-            }
-
-            for (key in options) {
-                if (!defaults.hasOwnProperty(key)) {
-                    delete options[key];
-                    console.warn('Unknown property: ' + key);
-                }
-            }
-
-            return options;
-        }
-
-        // First found value for the given keys.
-        function getValueFor(options) {
-            var keys = Array.apply(null, arguments).slice(1);
-
-            for (var i = 0; i < keys.length; i++) {
-                var key = keys[i];
-
-                if (options.hasOwnProperty(key)) {
-                    return options[key];
-                }
-            }
-        }
-
-        // Convert the passed values to their required type.
-        function convertProperties(options) {
-            if (options.id) {
-                if (isNaN(options.id)) {
-                    options.id = defaults.id;
-                    console.warn('Id is not a number: ' + options.id);
-                } else {
-                    options.id = Number(options.id);
-                }
-            }
-
-            if (options.title) {
-                options.title = options.title.toString();
-            }
-
-            if (options.text) {
-                options.text  = options.text.toString();
-            }
-
-            if (options.badge) {
-                if (isNaN(options.badge)) {
-                    options.badge = defaults.badge;
-                    console.warn('Badge number is not a number: ' + options.id);
-                } else {
-                    options.badge = Number(options.badge);
-                }
-            }
-
-            if (options.at) {
-                if (typeof options.at == 'object') {
-                    options.at = options.at.getTime();
-                }
-
-                options.at = Math.round(options.at / 1000);
-            }
-
-            if (typeof options.data == 'object') {
-                options.data = JSON.stringify(options.data);
-            }
-
-            return options;
-        }
-
-        // Convert the IDs to numbers.
-        function convertIds(ids) {
-            var convertedIds = [];
-
-            for (var i = 0; i < ids.length; i++) {
-                convertedIds.push(Number(ids[i]));
-            }
-
-            return convertedIds;
-        }
-
-        // Parse the interval and convert it to a number of milliseconds (0 if not valid).
-        function parseInterval(every) {
-            var interval;
-
-            every = String(every).toLowerCase();
-
-            if (!every || every == 'undefined') {
-                interval = 0;
-            } else if (every == 'second') {
-                interval = 1000;
-            } else if (every == 'minute') {
-                interval = mmCoreSecondsMinute * 1000;
-            } else if (every == 'hour') {
-                interval = mmCoreSecondsHour * 1000;
-            } else if (every == 'day') {
-                interval = mmCoreSecondsDay * 1000;
-            } else if (every == 'week') {
-                interval = mmCoreSecondsDay * 7 * 1000;
-            } else if (every == 'month') {
-                interval = mmCoreSecondsDay * 31 * 1000;
-            } else if (every == 'quarter') {
-                interval = mmCoreSecondsHour * 2190 * 1000;
-            } else if (every == 'year') {
-                interval = mmCoreSecondsYear * 1000;
-            } else {
-                interval = parseInt(every, 10);
-                if (isNaN(interval)) {
-                    interval = 0;
-                } else {
-                    interval *= 60000;
-                }
-            }
-
-            return interval;
-        }
-    }
-
-    /**
-     * Emulate some of the features of push notifications.
-     *
-     * @return {Void}
-     */
-    function emulatePushNotifications() {
-        // Create the PushNotification object, but only some of its functions will be supported.
-        var PushNotification = function(options) {};
-
-        PushNotification.prototype.unregister = function(successCallback, errorCallback, options) {
-            errorCallback && errorCallback('Unregister is only supported in mobile devices');
-        };
-
-        PushNotification.prototype.subscribe = function(topic, successCallback, errorCallback) {
-            errorCallback && errorCallback('Suscribe is only supported in mobile devices');
-        };
-
-        PushNotification.prototype.unsubscribe = function(topic, successCallback, errorCallback) {
-            errorCallback && errorCallback('Unsuscribe is only supported in mobile devices');
-        };
-
-        PushNotification.prototype.setApplicationIconBadgeNumber = function(successCallback, errorCallback, badge) {
-            if (!$mmApp.isDesktop()) {
-                errorCallback && errorCallback('setApplicationIconBadgeNumber is not supported in browser');
-                return;
-            }
-
-            try {
-                var app = require('electron').remote.app;
-                if (app.setBadgeCount(badge)) {
-                    successCallback && successCallback();
-                } else {
-                    errorCallback && errorCallback();
-                }
-            } catch(ex) {
-                errorCallback && errorCallback(ex);
-            }
-        };
-
-        PushNotification.prototype.getApplicationIconBadgeNumber = function(successCallback, errorCallback) {
-            if (!$mmApp.isDesktop()) {
-                errorCallback && errorCallback('getApplicationIconBadgeNumber is not supported in browser');
-                return;
-            }
-
-            try {
-                var app = require('electron').remote.app;
-                successCallback && successCallback(app.getBadgeCount());
-            } catch(ex) {
-                errorCallback && errorCallback(ex);
-            }
-        };
-
-        PushNotification.prototype.clearAllNotifications = function(successCallback, errorCallback) {
-            errorCallback && errorCallback('clearAllNotifications is only supported in mobile devices');
-        };
-
-        PushNotification.prototype.on = function(eventName, callback) {};
-        PushNotification.prototype.off = function(eventName, handle) {};
-        PushNotification.prototype.emit = function() {};
-
-        PushNotification.prototype.finish = function(successCallback, errorCallback, id) {
-            errorCallback && errorCallback('finish is only supported in mobile devices');
-        };
-
-        // Create the visible PushNotification object.
-        $window.PushNotification = {
-            init: function(options) {
-                return new PushNotification(options);
-            },
-
-            hasPermission: function(successCallback, errorCallback) {
-                errorCallback && errorCallback('hasPermission is only supported in mobile devices');
-            },
-
-            PushNotification: PushNotification
-        };
-    }
-
-    /**
-     * Get all the notification stored in local DB.
-     *
-     * @return {Promise} Promise resolved with the notifications.
-     */
-    function getAllLocalNotifications() {
-        return $mmApp.getDB().getAll(mmDesktopLocalNotificationsStore);
-    }
-
-    /**
-     * Get the credentials from a URL.
-     * This code is extracted from Cordova FileTransfer plugin.
-     *
-     * @param  {String} urlString The URL to get the credentials from.
-     * @return {String}           Retrieved credentials.
-     */
-    function getUrlCredentials(urlString) {
-        var credentialsPattern = /^https?\:\/\/(?:(?:(([^:@\/]*)(?::([^@\/]*))?)?@)?([^:\/?#]*)(?::(\d*))?).*$/,
-            credentials = credentialsPattern.exec(urlString);
-
-        return credentials && credentials[1];
-    }
-
-    /**
-     * Loads HTML API to simulate Cordova APIs. Reserved for core use.
-     *
-     * @module mm.core
-     * @ngdoc method
-     * @name $mmEmulatorManager#loadHTMLAPI
-     * @return {Promise} Promise resolved when the API is loaded.
-     * @protected
-     */
-    self.loadHTMLAPI = function() {
-
-        if ($mmFS.isAvailable()) {
-            $log.debug('Stop loading HTML API, it was already loaded or the environment doesn\'t need it.');
-            return $q.when();
-        }
-
-        var deferred = $q.defer(),
-            promises = [deferred.promise];
-
-        $log.debug('Loading HTML API.');
-
-        // File API.
-        $window.requestFileSystem  = $window.requestFileSystem || $window.webkitRequestFileSystem;
-        $window.resolveLocalFileSystemURL = $window.resolveLocalFileSystemURL || $window.webkitResolveLocalFileSystemURL;
-
-        $window.LocalFileSystem = {
-            PERSISTENT: 1
-        };
-
-        emulateCordovaFileTransfer();
-        emulateCordovaGlobalization();
-        emulateCordovaZip();
-        emulateCordovaClipboard();
-        emulatePushNotifications();
-
-        if ($mmApp.isDesktop()) {
-            var fs = require('fs'),
-                app = require('electron').remote.app;
-
-            emulateCordovaFile();
-            emulateCustomURLScheme();
-            emulateInAppBrowser();
-            promises.push(emulateLocalNotifications());
-
-            // Initialize File System. Get the path to use.
-            basePath = app.getPath('documents') || app.getPath('home');
-            if (!basePath) {
-                deferred.reject('Cannot calculate base path for file system.');
-                return;
-            }
-
-            basePath = $mmFS.concatenatePaths(basePath.replace(/\\/g, '/'), mmCoreConfigConstants.app_id) + '/';
-
-            // Create the folder if needed.
-            fs.mkdir(basePath, function(e) {
-                if (!e || (e && e.code === 'EEXIST')) {
-                    // Create successful or it already exists. Resolve.
-                    $mmFS.setHTMLBasePath(basePath);
-                    deferred.resolve();
-                } else {
-                    deferred.reject('Error creating base path.');
-                }
-            });
-        } else {
-            // It's browser, request a quota to use. Request 500MB.
-            $window.webkitStorageInfo.requestQuota(PERSISTENT, 500 * 1024 * 1024, function(granted) {
-                $window.requestFileSystem(PERSISTENT, granted, function(entry) {
-                    basePath = entry.root.toURL();
-                    $mmFS.setHTMLBasePath(basePath);
-                    deferred.resolve();
-                }, deferred.reject);
-            }, deferred.reject);
-        }
-
-        return $q.all(promises);
-    };
-
-    /**
-     * Remove a notification from local DB.
-     *
-     * @param  {Number} id ID of the notification.
-     * @return {Promise}   Promise resolved when done.
-     */
-    function removeLocalNotification(id) {
-        return $mmApp.getDB().remove(mmDesktopLocalNotificationsStore, id);
-    }
-
-    /**
-     * Store a notification in local DB.
-     *
-     * @param  {Object} notification Notification to store.
-     * @param  {Boolean} triggered   Whether the notification has been triggered.
-     * @return {Promise}             Promise resolved when stored.
-     */
-    function storeLocalNotification(notification, triggered) {
-        notification = angular.copy(notification);
-        notification.triggered = !!triggered;
-        return $mmApp.getDB().insert(mmDesktopLocalNotificationsStore, notification);
-    }
-
-    return self;
-})
-
-.config(function($mmInitDelegateProvider, mmInitDelegateMaxAddonPriority) {
-    if (!ionic.Platform.isWebView()) {
-        $mmInitDelegateProvider.registerProcess('mmEmulator', '$mmEmulatorManager.loadHTMLAPI',
-                mmInitDelegateMaxAddonPriority + 500, true);
-    }
-});
diff --git a/www/core/lib/fs.js b/www/core/lib/fs.js
index f6a2a084ce7..fbd69d7f431 100644
--- a/www/core/lib/fs.js
+++ b/www/core/lib/fs.js
@@ -675,6 +675,24 @@ angular.module('mm.core')
         });
     };
 
+    /**
+     * Get the base path where the application files are stored. Returns the value instantly, without waiting for it to be ready.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFS#getBasePathInstant
+     * @return {String} Base path. If the service hasn't been initialized it will return an invalid value.
+     */
+    self.getBasePathInstant = function() {
+        if (!basePath) {
+            return basePath;
+        } else if (basePath.slice(-1) == '/') {
+            return basePath;
+        } else {
+            return basePath + '/';
+        }
+    };
+
     /**
      * Get temporary directory path.
      *

From bcfdd1a4537b137b8fff0f34cae38357fc9ba528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 13 Jun 2017 10:32:57 +0200
Subject: [PATCH 026/118] MOBILE-2120 data: Support basic search

---
 www/addons/mod/data/controllers/entry.js      |  5 --
 www/addons/mod/data/controllers/index.js      | 82 +++++++++++++++----
 www/addons/mod/data/lang/en.json              | 16 +++-
 www/addons/mod/data/main.js                   |  2 +-
 www/addons/mod/data/services/data.js          | 73 ++++++++++++++---
 www/addons/mod/data/templates/index.html      | 23 +++++-
 .../mod/data/templates/search-modal.html      | 37 +++++++++
 www/core/lang/en.json                         |  1 +
 8 files changed, 203 insertions(+), 36 deletions(-)
 create mode 100644 www/addons/mod/data/templates/search-modal.html

diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index 3f94bd07ad2..1288a632512 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -167,11 +167,6 @@ angular.module('mm.addons.mod_data')
         }
     };
 
-    // Opens search.
-    $scope.gotoSearch = function() {
-        $mmUtil.openInApp($mmSite.getURL() + '/mod/data/view.php?mode=asearch&d=' + data.id);
-    };
-
     // Refresh entry on change.
     entryChangedObserver = $mmEvents.on(mmaModDataEventEntryChanged, function(eventData) {
         if (eventData.entryId == entryId && data.id == eventData.dataId && $mmSite.getId() == eventData.siteId) {
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index ffe7c433a1a..98bc308accb 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
         $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups,
-        mmaModDataEventEntryChanged) {
+        mmaModDataEventEntryChanged, $ionicModal) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -41,6 +41,13 @@ angular.module('mm.addons.mod_data')
     $scope.databaseLoaded = false;
     $scope.selectedGroup = $stateParams.group || 0;
 
+    $scope.search = {
+        sortBy: "0",
+        sortDirection: "ASC",
+        page: 0,
+        text: ""
+    };
+
     function fetchDatabaseData(refresh, sync, showErrors) {
         $scope.isOnline = $mmApp.isOnline();
 
@@ -91,7 +98,13 @@ angular.module('mm.addons.mod_data')
                     }
                 }
 
-                return fetchEntriesData();
+                var promises = [
+                    fetchEntriesData(),
+                    $mmaModData.getFields(data.id).then(function(fields) {
+                        $scope.fields = fields;
+                    })
+                ];
+                return $q.all(promises);
             });
         }).then(function() {
             // All data obtained, now fill the context menu.
@@ -114,15 +127,24 @@ angular.module('mm.addons.mod_data')
             // Update values for current group.
             $scope.access.canaddentry = accessData.canaddentry;
 
-            return $mmaModData.getEntries(data.id, $scope.selectedGroup).then(function(entries) {
-                $scope.isEmpty = !entries || entries.entries.length <= 0;
-                $scope.entries = "";
-
-                if (!$scope.isEmpty) {
-                    $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
-                    $scope.entries = entries.listviewcontents;
-                }
-            });
+            // TODO: Advanced search.
+            if ($scope.search.text) {
+                return $mmaModData.searchEntries(data.id, $scope.selectedGroup, $scope.search.text, undefined, $scope.search.sortBy,
+                    $scope.search.sortDirection, $scope.search.page);
+            } else {
+                return $mmaModData.getEntries(data.id, $scope.selectedGroup, $scope.search.sortBy, $scope.search.sortDirection,
+                    $scope.search.page);
+            }
+        }).then(function(entries) {
+            $scope.numEntries = entries && entries.totalcount;
+            $scope.isEmpty = $scope.numEntries <= 0;
+            $scope.hasNextPage = (($scope.search.page + 1) * $mmaModData.perPage) < $scope.numEntries;
+            $scope.entries = "";
+
+            if (!$scope.isEmpty) {
+                $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
+                $scope.entries = entries.listviewcontents;
+            }
         });
     }
 
@@ -188,9 +210,41 @@ angular.module('mm.addons.mod_data')
         }
     };
 
-    // Opens search.
-    $scope.gotoSearch = function() {
-        $mmUtil.openInApp($mmSite.getURL() + '/mod/data/view.php?mode=asearch&d=' + data.id);
+    // Setup search modal.
+    $ionicModal.fromTemplateUrl('addons/mod/data/templates/search-modal.html', {
+        scope: $scope,
+        animation: 'slide-in-up'
+    }).then(function(searchModal) {
+        $scope.showSearch = function() {
+            searchModal.show();
+        };
+        $scope.closeSearch = function() {
+            searchModal.hide();
+        };
+        $scope.$on('$destroy', function() {
+            searchModal.remove();
+        });
+    });
+
+    // Performs the search and closes the modal.
+    $scope.searchEntries = function(page) {
+        $scope.closeSearch();
+        $scope.databaseLoaded = false;
+        $scope.search.page = page;
+        return fetchEntriesData().catch(function(message) {
+            $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
+            return $q.reject();
+        }).finally(function(){
+            $scope.databaseLoaded = true;
+        });
+    };
+
+    // Reset all search filters and closes the modal.
+    $scope.searchReset = function() {
+        $scope.search.sortBy = "0";
+        $scope.search.sortDirection = "ASC";
+        $scope.search.text = "";
+        $scope.searchEntries(0);
     };
 
     // Opens add entries form
diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index 03ac31afac0..c0f609c82a3 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -1,15 +1,27 @@
 {
     "addentries": "Add entries",
+    "approved": "Approved",
+    "ascending": "Ascending",
+    "authorfirstname": "Author first name",
+    "authorlastname": "Author surname",
     "confirmdeleterecord": "Are you sure you want to delete this entry?",
+    "descending": "Descending",
     "entrieslefttoadd": "You must add {{$a.entriesleft}} more entry/entries in order to complete this activity",
     "entrieslefttoaddtoview": "You must add {{$a.entrieslefttoview}} more entry/entries before you can view other participants' entries.",
     "errorapproving": "Error approving or unapproving entry.",
     "errordeleting": "Error deleting the entry.",
     "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
+    "fields": "Fields",
+    "nomatch": "No matching entries found!",
     "norecords": "No entries in database",
     "notopenyet": "Sorry, this activity is not available until {{$a}}",
+    "numrecords": "{{$a}} entries",
+    "other": "Other",
     "recordapproved": "Entry approved",
     "recorddeleted": "Entry deleted",
     "recorddisapproved": "Entry unapproved",
-    "search": "Search"
-}
+    "resetsettings": "Reset filters",
+    "search": "Search",
+    "timeadded": "Time added",
+    "timemodified": "Time modified"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/main.js b/www/addons/mod/data/main.js
index c6bfa192fbe..04e33fc8b9f 100644
--- a/www/addons/mod/data/main.js
+++ b/www/addons/mod/data/main.js
@@ -16,6 +16,7 @@ angular.module('mm.addons.mod_data', ['mm.core'])
 
 .constant('mmaModDataComponent', 'mmaModData')
 .constant('mmaModDataEventEntryChanged', 'mma-mod_data_entry_changed')
+.constant('mmaModDataPerPage', 25)
 
 .config(function($stateProvider) {
 
@@ -53,7 +54,6 @@ angular.module('mm.addons.mod_data', ['mm.core'])
             }
         }
     });
-
 })
 
 .config(function($mmCourseDelegateProvider, $mmContentLinksDelegateProvider, $mmCoursePrefetchDelegateProvider) {
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 55c3fdf2aa1..3383aef0241 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc controller
  * @name $mmaModData
  */
-.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite) {
+.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage) {
     var self = {};
 
     /**
@@ -298,7 +298,7 @@ angular.module('mm.addons.mod_data')
      * @param   {String}    [order]         The direction of the sorting: 'ASC' or 'DESC'.
      *                                          Empty for using the default database setting.
      * @param   {Number}    [page]          Page of records to return.
-     * @param   {Number}    [perPage]       Number of records to return per page.
+     * @param   {Number}    [perPage]       Records per page to return. Default on mmaModDataPerPage.
      * @param   {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
      * @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.
@@ -310,7 +310,7 @@ angular.module('mm.addons.mod_data')
                     databaseid: dataId,
                     returncontents: 1,
                     page: page || 0,
-                    perpage: perPage || 0,
+                    perpage: perPage || mmaModDataPerPage,
                     groupid: groupId || 0
                 },
                 preSets = {
@@ -436,6 +436,56 @@ angular.module('mm.addons.mod_data')
         });
     };
 
+    /**
+     * Performs search over a database.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#searchEntries
+     * @param {Number} databaseId      The data instance id.
+     * @param {Number} [groupId]       Group id, 0 means that the function will determine the user group.
+     * @param {String} [search]        Search text. It will be used if advSearch is not defined.
+     * @param {Array}  [advSearch]     Advanced search data.
+     * @param {String} [sort]          Sort by this field.
+     * @param {Number} [order]         The direction of the sorting.
+     * @param {Number} [page]          Page of records to return.
+     * @param {Number} [perPage]       Records per page to return. Default on mmaModDataPerPage.
+     * @param {String} [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}              Promise resolved when the action is done.
+     */
+    self.searchEntries = function(databaseId, groupId, search, advSearch, sort, order, page, perPage, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    databaseid: databaseId,
+                    groupid: groupId || 0,
+                    returncontents: 1,
+                    page: page || 0,
+                    perpage: perPage || mmaModDataPerPage
+                },
+                preSets = {
+                    getCache: 0,
+                    saveCache: 1,
+                    emergencyCache: 1
+                };
+
+            if (typeof sort != "undefined") {
+                params.sort = sort;
+            }
+
+            if (typeof order !== "undefined") {
+                params.order = order;
+            }
+
+            if (typeof advSearch !== "undefined") {
+                params.advsearch = advSearch;
+            } else {
+                params.search = search;
+            }
+
+            return site.read('mod_data_search_entries', params);
+        });
+    };
+
     /**
      * Get the list of configured fields for the given database.
      *
@@ -490,15 +540,14 @@ angular.module('mm.addons.mod_data')
      * @param  {Number}    [groupId]       Group ID.
      * @param  {Number}    [sort]          Sort the records by this field id. See $mmaModData#getEntries for more information.
      * @param  {String}    [order]         The direction of the sorting.  See $mmaModData#getEntries for more information.
-     * @param  {Number}    [perPage]       Number of records to return per page. Default 10.
      * @param  {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
      * @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 done.
      */
-    self.fetchAllEntries = function(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, siteId) {
+    self.fetchAllEntries = function(dataId, groupId, sort, order, forceCache, ignoreCache, siteId) {
         siteId = siteId || $mmSite.getId();
-        return fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, [], 0, siteId);
+        return fetchEntriesRecursive(dataId, groupId, sort, order, forceCache, ignoreCache, [], 0, siteId);
     };
 
     /**
@@ -508,7 +557,6 @@ angular.module('mm.addons.mod_data')
      * @param  {Number}    groupId         Group ID.
      * @param  {Number}    sort            Sort the records by this field id. See $mmaModData#getEntries for more information.
      * @param  {String}    order           The direction of the sorting.  See $mmaModData#getEntries for more information.
-     * @param  {Number}    perPage         Number of records to return per page.
      * @param  {Boolean}   forceCache      True to always get the value from cache, false otherwise. Default false.
      * @param  {Boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
      * @param  {Array}     entries         Entries already fetch (just to concatenate them).
@@ -516,13 +564,14 @@ angular.module('mm.addons.mod_data')
      * @param  {String}    siteId          Site ID.
      * @return {Promise}                   Promise resolved when done.
      */
-    function fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, entries, page, siteId) {
-        return self.getEntries(dataId, groupId, sort, order, page, perPage, forceCache, ignoreCache, siteId).then(function(result) {
+    function fetchEntriesRecursive(dataId, groupId, sort, order, forceCache, ignoreCache, entries, page, siteId) {
+        return self.getEntries(dataId, groupId, sort, order, page, mmaModDataPerPage, forceCache, ignoreCache, siteId)
+                .then(function(result) {
             entries = entries.concat(result.entries);
 
-            var canLoadMore = ((page + 1) * perPage) < result.totalcount;
-            if (perPage && canLoadMore) {
-                return fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, entries, page + 1,
+            var canLoadMore = ((page + 1) * mmaModDataPerPage) < result.totalcount;
+            if (canLoadMore) {
+                return fetchEntriesRecursive(dataId, groupId, sort, order, forceCache, ignoreCache, entries, page + 1,
                     siteId);
             }
             return entries;
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
index 1c9b7e7623e..556a075ad01 100644
--- a/www/addons/mod/data/templates/index.html
+++ b/www/addons/mod/data/templates/index.html
@@ -1,7 +1,7 @@
 <ion-view>
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
     <ion-nav-buttons side="secondary">
-        <button ng-show="!isEmpty" class="button button-icon ion-ios-search-strong" ng-click="gotoSearch($event)" aria-label="{{ 'mma.mod_data.search' | translate }}"></button>
+        <button class="button button-icon ion-ios-search-strong" ng-click="showSearch($event)" aria-label="{{ 'mma.mod_data.search' | translate }}"></button>
         <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>
@@ -43,6 +43,11 @@
                 <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.entrieslefttoadd' | translate:{$a: {entriesleft: access.entrieslefttoadd} } }}
             </div>
 
+            <div class="item" ng-if="search.text">
+                <h2>{{ 'mma.mod_data.numrecords' | translate: {$a: numEntries } }}</h2>
+                <a ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate}}</a>
+            </div>
+
             <div class="mm-data-contents mma-data-entries-{{data.id}}" ng-if="!isEmpty">
                 <style ng-if="cssTemplate">
                     {{ cssTemplate }}
@@ -53,7 +58,21 @@
                 </mm-format-text>
             </div>
 
-            <mm-empty-box ng-if="isEmpty" icon="ion-archive" message="{{ 'mma.mod_data.norecords' | translate}}"></mm-empty-box>
+            <div ng-if="search.page > 0 || hasNextPage" class="item item-text-wrap row-buttons responsive-sm">
+                <button ng-if="search.page > 0" class="button button-block icon-left ion-chevron-left" ng-click="searchEntries(search.page - 1)">
+                    {{ 'mm.core.previous' | translate }}
+                </button>
+                <button ng-if="hasNextPage" class="button button-block button-positive icon-right ion-chevron-right" ng-click="searchEntries(search.page + 1)">
+                    {{ 'mm.core.next' | translate }}
+                </button>
+            </div>
+
+            <mm-empty-box ng-if="isEmpty && !search.text" icon="ion-archive" message="{{ 'mma.mod_data.norecords' | translate}}">
+            </mm-empty-box>
+
+            <mm-empty-box ng-if="isEmpty && search.text" icon="ion-archive" message="{{ 'mma.mod_data.nomatch' | translate}}">
+                <a ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate}}</a>
+            </mm-empty-box>
         </mm-loading>
     </ion-content>
 </ion-view>
diff --git a/www/addons/mod/data/templates/search-modal.html b/www/addons/mod/data/templates/search-modal.html
new file mode 100644
index 00000000000..c18e7b8cf45
--- /dev/null
+++ b/www/addons/mod/data/templates/search-modal.html
@@ -0,0 +1,37 @@
+<ion-modal-view class="mma-mod_data-search-modal">
+    <ion-header-bar class="bar bar-header">
+        <h1 class="title">{{ 'mma.mod_data.search' | translate}}</h1>
+        <button class="button button-icon ion-close-round" ng-click="closeSearch()" aria-label="{{ 'mm.core.close' | translate }}"></button>
+    </ion-header-bar>
+    <ion-content>
+        <div class="list">
+            <label class="item item-input">
+                <input type="text" placeholder="{{ 'mma.mod_data.search' | translate}}" ng-model="search.text">
+            </label>
+            <div class="item item-text-wrap item-input item-select">
+                <ion-label id="mma-data-sortby">{{ 'mm.core.sortby' | translate }}</ion-label>
+                <select ng-model="search.sortBy" aria-labelledby="mma-data-sortby" mm-ios-select-fix>
+                    <optgroup ng-if="fields.length" label="{{ 'mma.mod_data.fields' | translate }}">
+                        <option ng-repeat="field in fields | orderBy:'name'" value="{{field.id}}">{{field.name}}</option>
+                    </optgroup>
+                    <optgroup label="{{ 'mma.mod_data.other' | translate }}">
+                        <option value="0">{{ 'mma.mod_data.timeadded' | translate }}</option>
+                        <option value="-4">{{ 'mma.mod_data.timemodified' | translate }}</option>
+                        <option value="-1">{{ 'mma.mod_data.authorfirstname' | translate }}</option>
+                        <option value="-2">{{ 'mma.mod_data.authorlastname' | translate }}</option>
+                        <option value="-3" ng-if="data.approval">{{ 'mma.mod_data.approved' | translate }}</option>
+                    </optgroup>
+                </select>
+            </div>
+            <ion-list id="mma-data-sortdir">
+                <ion-radio ng-model="search.sortDirection" value="ASC">{{ 'mma.mod_data.ascending' | translate }}</ion-radio>
+                <ion-radio ng-model="search.sortDirection" value="DESC">{{ 'mma.mod_data.descending' | translate }}</ion-radio>
+            </ion-list>
+
+            <div class="item">
+                <button class="button button-block button-positive icon-left ion-search" ng-click="searchEntries(0)">{{ 'mma.mod_data.search' | translate }}</button>
+                <button class="button button-block icon-left ion-reset" ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate }}</button>
+            </div>
+        </div>
+    </ion-content>
+</ion-modal-view>
\ No newline at end of file
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 3870dcb79dd..1c6ea0de416 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -179,6 +179,7 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Sorry...",
+    "sortby": "Sort by",
     "start": "Start",
     "submit": "Submit",
     "success": "Success",

From 7761cf1e2ef7c5556a683d43f29e6a85b89802ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 13 Jun 2017 10:32:44 +0200
Subject: [PATCH 027/118] MOBILE-2120 data: Support field plugins

---
 www/addons/mod/data/controllers/index.js      |  31 ++-
 www/addons/mod/data/directives/field.js       |  55 ++++
 .../mod/data/fields/checkbox/directive.js     |  33 +++
 .../mod/data/fields/checkbox/handler.js       |  74 ++++++
 .../mod/data/fields/checkbox/template.html    |   4 +
 www/addons/mod/data/fields/date/directive.js  |  34 +++
 www/addons/mod/data/fields/date/handler.js    |  76 ++++++
 www/addons/mod/data/fields/date/template.html |   2 +
 www/addons/mod/data/fields/file/directive.js  |  30 +++
 www/addons/mod/data/fields/file/handler.js    |  56 ++++
 www/addons/mod/data/fields/file/template.html |   1 +
 .../mod/data/fields/latlong/directive.js      |  30 +++
 www/addons/mod/data/fields/latlong/handler.js |  56 ++++
 .../mod/data/fields/latlong/template.html     |   1 +
 www/addons/mod/data/fields/menu/directive.js  |  33 +++
 www/addons/mod/data/fields/menu/handler.js    |  56 ++++
 www/addons/mod/data/fields/menu/template.html |   6 +
 .../mod/data/fields/multimenu/directive.js    |  35 +++
 .../mod/data/fields/multimenu/handler.js      |  71 +++++
 .../mod/data/fields/multimenu/template.html   |   2 +
 .../mod/data/fields/number/directive.js       |  30 +++
 www/addons/mod/data/fields/number/handler.js  |  58 +++++
 .../mod/data/fields/number/template.html      |   1 +
 .../mod/data/fields/picture/directive.js      |  30 +++
 www/addons/mod/data/fields/picture/handler.js |  56 ++++
 .../mod/data/fields/picture/template.html     |   1 +
 .../mod/data/fields/radiobutton/directive.js  |  33 +++
 .../mod/data/fields/radiobutton/handler.js    |  56 ++++
 .../mod/data/fields/radiobutton/template.html |   6 +
 www/addons/mod/data/fields/text/directive.js  |  30 +++
 www/addons/mod/data/fields/text/handler.js    |  56 ++++
 www/addons/mod/data/fields/text/template.html |   1 +
 .../mod/data/fields/textarea/directive.js     |  30 +++
 .../mod/data/fields/textarea/handler.js       |  56 ++++
 .../mod/data/fields/textarea/template.html    |   1 +
 www/addons/mod/data/fields/url/directive.js   |  30 +++
 www/addons/mod/data/fields/url/handler.js     |  56 ++++
 www/addons/mod/data/fields/url/template.html  |   1 +
 www/addons/mod/data/lang/en.json              |   6 +-
 www/addons/mod/data/scss/styles.scss          |  40 +++
 www/addons/mod/data/services/data.js          |  10 +-
 .../mod/data/services/fieldsdelegate.js       | 243 ++++++++++++++++++
 www/addons/mod/data/services/helper.js        |  86 ++++++-
 www/addons/mod/data/templates/field.html      |   5 +
 www/addons/mod/data/templates/index.html      |   6 +-
 .../mod/data/templates/search-modal.html      |  16 +-
 www/core/directives/multipleselect.js         |  18 +-
 www/core/templates/multipleselect.html        |   1 +
 48 files changed, 1628 insertions(+), 21 deletions(-)
 create mode 100644 www/addons/mod/data/directives/field.js
 create mode 100644 www/addons/mod/data/fields/checkbox/directive.js
 create mode 100644 www/addons/mod/data/fields/checkbox/handler.js
 create mode 100644 www/addons/mod/data/fields/checkbox/template.html
 create mode 100644 www/addons/mod/data/fields/date/directive.js
 create mode 100644 www/addons/mod/data/fields/date/handler.js
 create mode 100644 www/addons/mod/data/fields/date/template.html
 create mode 100644 www/addons/mod/data/fields/file/directive.js
 create mode 100644 www/addons/mod/data/fields/file/handler.js
 create mode 100644 www/addons/mod/data/fields/file/template.html
 create mode 100644 www/addons/mod/data/fields/latlong/directive.js
 create mode 100644 www/addons/mod/data/fields/latlong/handler.js
 create mode 100644 www/addons/mod/data/fields/latlong/template.html
 create mode 100644 www/addons/mod/data/fields/menu/directive.js
 create mode 100644 www/addons/mod/data/fields/menu/handler.js
 create mode 100644 www/addons/mod/data/fields/menu/template.html
 create mode 100644 www/addons/mod/data/fields/multimenu/directive.js
 create mode 100644 www/addons/mod/data/fields/multimenu/handler.js
 create mode 100644 www/addons/mod/data/fields/multimenu/template.html
 create mode 100644 www/addons/mod/data/fields/number/directive.js
 create mode 100644 www/addons/mod/data/fields/number/handler.js
 create mode 100644 www/addons/mod/data/fields/number/template.html
 create mode 100644 www/addons/mod/data/fields/picture/directive.js
 create mode 100644 www/addons/mod/data/fields/picture/handler.js
 create mode 100644 www/addons/mod/data/fields/picture/template.html
 create mode 100644 www/addons/mod/data/fields/radiobutton/directive.js
 create mode 100644 www/addons/mod/data/fields/radiobutton/handler.js
 create mode 100644 www/addons/mod/data/fields/radiobutton/template.html
 create mode 100644 www/addons/mod/data/fields/text/directive.js
 create mode 100644 www/addons/mod/data/fields/text/handler.js
 create mode 100644 www/addons/mod/data/fields/text/template.html
 create mode 100644 www/addons/mod/data/fields/textarea/directive.js
 create mode 100644 www/addons/mod/data/fields/textarea/handler.js
 create mode 100644 www/addons/mod/data/fields/textarea/template.html
 create mode 100644 www/addons/mod/data/fields/url/directive.js
 create mode 100644 www/addons/mod/data/fields/url/handler.js
 create mode 100644 www/addons/mod/data/fields/url/template.html
 create mode 100644 www/addons/mod/data/services/fieldsdelegate.js
 create mode 100644 www/addons/mod/data/templates/field.html

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 98bc308accb..894ece26936 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -45,7 +45,10 @@ angular.module('mm.addons.mod_data')
         sortBy: "0",
         sortDirection: "ASC",
         page: 0,
-        text: ""
+        text: "",
+        searching: false,
+        searchingAdvanced: false,
+        advanced: {}
     };
 
     function fetchDatabaseData(refresh, sync, showErrors) {
@@ -101,7 +104,13 @@ angular.module('mm.addons.mod_data')
                 var promises = [
                     fetchEntriesData(),
                     $mmaModData.getFields(data.id).then(function(fields) {
-                        $scope.fields = fields;
+                        $scope.search.advanced = {};
+
+                        $scope.fields = {};
+                        angular.forEach(fields, function(field) {
+                            $scope.fields[field.id] = field;
+                        });
+                        $scope.advancedSearch = $mmaModDataHelper.displayAdvancedSearchFields(data.asearchtemplate, $scope.fields);
                     })
                 ];
                 return $q.all(promises);
@@ -127,9 +136,10 @@ angular.module('mm.addons.mod_data')
             // Update values for current group.
             $scope.access.canaddentry = accessData.canaddentry;
 
-            // TODO: Advanced search.
-            if ($scope.search.text) {
-                return $mmaModData.searchEntries(data.id, $scope.selectedGroup, $scope.search.text, undefined, $scope.search.sortBy,
+            if ($scope.search.searching) {
+                var text = $scope.search.searchingAdvanced ? undefined : $scope.search.text;
+                    advanced = $scope.search.searchingAdvanced ? $scope.search.advanced : undefined;
+                return $mmaModData.searchEntries(data.id, $scope.selectedGroup, text, advanced, $scope.search.sortBy,
                     $scope.search.sortDirection, $scope.search.page);
             } else {
                 return $mmaModData.getEntries(data.id, $scope.selectedGroup, $scope.search.sortBy, $scope.search.sortDirection,
@@ -231,6 +241,14 @@ angular.module('mm.addons.mod_data')
         $scope.closeSearch();
         $scope.databaseLoaded = false;
         $scope.search.page = page;
+
+        if ($scope.search.searchingAdvanced) {
+            $scope.search.advanced = $mmaModDataHelper.getSearchDataFromForm(document.forms['mma-mod_data-advanced-search-form'],
+                $scope.fields);
+            $scope.search.searching = $scope.search.advanced.length > 0;
+        } else {
+            $scope.search.searching = $scope.search.text.length > 0;
+        }
         return fetchEntriesData().catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
@@ -244,6 +262,9 @@ angular.module('mm.addons.mod_data')
         $scope.search.sortBy = "0";
         $scope.search.sortDirection = "ASC";
         $scope.search.text = "";
+        $scope.search.advanced = {};
+        $scope.search.searchingAdvanced = false;
+        $scope.search.searching = false;
         $scope.searchEntries(0);
     };
 
diff --git a/www/addons/mod/data/directives/field.js b/www/addons/mod/data/directives/field.js
new file mode 100644
index 00000000000..7078f669972
--- /dev/null
+++ b/www/addons/mod/data/directives/field.js
@@ -0,0 +1,55 @@
+// (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_data')
+
+/**
+ * Directive to render data field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataField
+ */
+.directive('mmaModDataField', function($mmaModDataFieldsDelegate, $compile) {
+    return {
+        restrict: 'E',
+        priority: 100,
+        scope: {
+            field: '=',
+            mode: '='
+        },
+        templateUrl: 'addons/mod/data/templates/field.html',
+        link: function(scope, element) {
+            var field = scope.field,
+                container = element[0].querySelector('.mma-mod-data-field-container'),
+                directive;
+
+            if (!field || !container) {
+                return;
+            }
+
+            // Check if the plugin has defined its own directive to render itself.
+            directive = $mmaModDataFieldsDelegate.getDirectiveForPlugin(field);
+
+            if (directive) {
+                // Add the directive to the element.
+                container.setAttribute(directive, '');
+                // Compile the new directive.
+                $compile(container)(scope);
+            } else {
+                scope.fieldLoaded = true;
+            }
+        }
+    };
+});
diff --git a/www/addons/mod/data/fields/checkbox/directive.js b/www/addons/mod/data/fields/checkbox/directive.js
new file mode 100644
index 00000000000..9a625df1751
--- /dev/null
+++ b/www/addons/mod/data/fields/checkbox/directive.js
@@ -0,0 +1,33 @@
+// (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_data')
+
+/**
+ * Directive to render data checkbox field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldCheckbox
+ */
+.directive('mmaModDataFieldCheckbox', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/checkbox/template.html',
+        link: function(scope) {
+            scope.options = scope.field.param1.split("\n");
+        }
+    };
+});
diff --git a/www/addons/mod/data/fields/checkbox/handler.js b/www/addons/mod/data/fields/checkbox/handler.js
new file mode 100644
index 00000000000..907c5af9b74
--- /dev/null
+++ b/www/addons/mod/data/fields/checkbox/handler.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_data')
+
+/**
+ * Handler for checkbox data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldCheckboxHandler
+ */
+.factory('$mmaModDataFieldCheckboxHandler', function($translate) {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id,
+            reqName = 'f_' + field.id + '_allreq';
+
+        var checkboxes = [],
+            values = [];
+        angular.forEach(inputData[fieldName], function(value, option) {
+            if (value) {
+                checkboxes.push(option);
+            }
+        });
+        if (checkboxes.length > 0) {
+            values.push({
+                name: fieldName,
+                value: checkboxes
+            });
+
+            if (inputData[reqName]['1']) {
+                values.push({
+                    name: reqName,
+                    value: true
+                });
+            }
+            return values;
+        }
+
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldCheckbox', 'checkbox', '$mmaModDataFieldCheckboxHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/checkbox/template.html b/www/addons/mod/data/fields/checkbox/template.html
new file mode 100644
index 00000000000..d5fb6bfab3b
--- /dev/null
+++ b/www/addons/mod/data/fields/checkbox/template.html
@@ -0,0 +1,4 @@
+<ion-list>
+    <ion-checkbox ng-repeat="option in options" name="f_{{field.id}}" ng-value="option">{{ option }}</ion-checkbox>
+    <ion-checkbox name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
+</ion-list>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/date/directive.js b/www/addons/mod/data/fields/date/directive.js
new file mode 100644
index 00000000000..6ddbacc5ca0
--- /dev/null
+++ b/www/addons/mod/data/fields/date/directive.js
@@ -0,0 +1,34 @@
+// (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_data')
+
+/**
+ * Directive to render data date field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldDate
+ */
+.directive('mmaModDataFieldDate', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/date/template.html',
+        link: function(scope) {
+            scope.value = new Date().toISOString().substr(0, 10);
+            scope.enable = false;
+        }
+    };
+});
diff --git a/www/addons/mod/data/fields/date/handler.js b/www/addons/mod/data/fields/date/handler.js
new file mode 100644
index 00000000000..5fdaee494ec
--- /dev/null
+++ b/www/addons/mod/data/fields/date/handler.js
@@ -0,0 +1,76 @@
+// (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_data')
+
+/**
+ * Handler for date data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldDateHandler
+ */
+.factory('$mmaModDataFieldDateHandler', function($translate) {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id,
+            enabledName = fieldName + '_z';
+
+        if (inputData[enabledName]['1']) {
+            var values = [],
+                date = inputData[fieldName].split('-'),
+                year = date[0],
+                month = date[1],
+                day = date[2];
+            values.push({
+                name: fieldName + '_y',
+                value: year
+            });
+            values.push({
+                name: fieldName + '_m',
+                value: month
+            });
+            values.push({
+                name: fieldName + '_d',
+                value: day
+            });
+            values.push({
+                name: enabledName,
+                value: 1
+            });
+            return values;
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldDate', 'date', '$mmaModDataFieldDateHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/date/template.html b/www/addons/mod/data/fields/date/template.html
new file mode 100644
index 00000000000..910b0d8b7c8
--- /dev/null
+++ b/www/addons/mod/data/fields/date/template.html
@@ -0,0 +1,2 @@
+<input type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable" ng-value="value">
+<ion-checkbox name="f_{{field.id}}_z" ng-model="enable" ng-value="1">{{ 'mma.mod_data.usedate' | translate }}</ion-checkbox>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/file/directive.js b/www/addons/mod/data/fields/file/directive.js
new file mode 100644
index 00000000000..af66262b89f
--- /dev/null
+++ b/www/addons/mod/data/fields/file/directive.js
@@ -0,0 +1,30 @@
+// (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_data')
+
+/**
+ * Directive to render data file field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldFile
+ */
+.directive('mmaModDataFieldFile', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/file/template.html'
+    };
+});
diff --git a/www/addons/mod/data/fields/file/handler.js b/www/addons/mod/data/fields/file/handler.js
new file mode 100644
index 00000000000..6f6dcdd2374
--- /dev/null
+++ b/www/addons/mod/data/fields/file/handler.js
@@ -0,0 +1,56 @@
+// (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_data')
+
+/**
+ * Handler for file data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldFileHandler
+ */
+.factory('$mmaModDataFieldFileHandler', function() {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                name: fieldName,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldFile', 'file', '$mmaModDataFieldFileHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/file/template.html b/www/addons/mod/data/fields/file/template.html
new file mode 100644
index 00000000000..968da84f85e
--- /dev/null
+++ b/www/addons/mod/data/fields/file/template.html
@@ -0,0 +1 @@
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/latlong/directive.js b/www/addons/mod/data/fields/latlong/directive.js
new file mode 100644
index 00000000000..0df21dfa5e5
--- /dev/null
+++ b/www/addons/mod/data/fields/latlong/directive.js
@@ -0,0 +1,30 @@
+// (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_data')
+
+/**
+ * Directive to render data latlong field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldLatlong
+ */
+.directive('mmaModDataFieldLatlong', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/latlong/template.html'
+    };
+});
diff --git a/www/addons/mod/data/fields/latlong/handler.js b/www/addons/mod/data/fields/latlong/handler.js
new file mode 100644
index 00000000000..71c6db3f03f
--- /dev/null
+++ b/www/addons/mod/data/fields/latlong/handler.js
@@ -0,0 +1,56 @@
+// (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_data')
+
+/**
+ * Handler for latlong data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldLatlongHandler
+ */
+.factory('$mmaModDataFieldLatlongHandler', function() {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                name: fieldName,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldLatlong', 'latlong', '$mmaModDataFieldLatlongHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/latlong/template.html b/www/addons/mod/data/fields/latlong/template.html
new file mode 100644
index 00000000000..968da84f85e
--- /dev/null
+++ b/www/addons/mod/data/fields/latlong/template.html
@@ -0,0 +1 @@
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/menu/directive.js b/www/addons/mod/data/fields/menu/directive.js
new file mode 100644
index 00000000000..aa3f830c20c
--- /dev/null
+++ b/www/addons/mod/data/fields/menu/directive.js
@@ -0,0 +1,33 @@
+// (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_data')
+
+/**
+ * Directive to render data menu field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldMenu
+ */
+.directive('mmaModDataFieldMenu', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/menu/template.html',
+        link: function(scope) {
+            scope.options = scope.field.param1.split("\n");
+        }
+    };
+});
diff --git a/www/addons/mod/data/fields/menu/handler.js b/www/addons/mod/data/fields/menu/handler.js
new file mode 100644
index 00000000000..b30736782e5
--- /dev/null
+++ b/www/addons/mod/data/fields/menu/handler.js
@@ -0,0 +1,56 @@
+// (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_data')
+
+/**
+ * Handler for menu data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldMenuHandler
+ */
+.factory('$mmaModDataFieldMenuHandler', function() {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                name: fieldName,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldMenu', 'menu', '$mmaModDataFieldMenuHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/menu/template.html b/www/addons/mod/data/fields/menu/template.html
new file mode 100644
index 00000000000..0d88b6646f9
--- /dev/null
+++ b/www/addons/mod/data/fields/menu/template.html
@@ -0,0 +1,6 @@
+<div class="item item-input item-select">
+    <select name="f_{{field.id}}">
+        <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
+        <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
+    </select>
+</div>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/multimenu/directive.js b/www/addons/mod/data/fields/multimenu/directive.js
new file mode 100644
index 00000000000..9d5d301ff55
--- /dev/null
+++ b/www/addons/mod/data/fields/multimenu/directive.js
@@ -0,0 +1,35 @@
+// (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_data')
+
+/**
+ * Directive to render data multimenu field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldMultimenu
+ */
+.directive('mmaModDataFieldMultimenu', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/multimenu/template.html',
+        link: function(scope) {
+            scope.options = scope.field.param1.split("\n").map(function(option) {
+                return {key: option, value: option};
+            });
+        }
+    };
+});
diff --git a/www/addons/mod/data/fields/multimenu/handler.js b/www/addons/mod/data/fields/multimenu/handler.js
new file mode 100644
index 00000000000..1fe28f266ec
--- /dev/null
+++ b/www/addons/mod/data/fields/multimenu/handler.js
@@ -0,0 +1,71 @@
+// (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_data')
+
+/**
+ * Handler for multimenu data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldMultimenuHandler
+ */
+.factory('$mmaModDataFieldMultimenuHandler', function() {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id,
+            reqName = 'f_' + field.id + '_allreq';
+
+        if (inputData[fieldName].length > 0) {
+            var options = inputData[fieldName].split('###');
+                values = [];
+            if (options.length > 0) {
+                values.push({
+                    name: fieldName,
+                    value: options
+                });
+
+                if (inputData[reqName]['1']) {
+                    values.push({
+                        name: reqName,
+                        value: true
+                    });
+                }
+                return values;
+            }
+        }
+
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldMultimenu', 'multimenu', '$mmaModDataFieldMultimenuHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/multimenu/template.html b/www/addons/mod/data/fields/multimenu/template.html
new file mode 100644
index 00000000000..c5958ce9cc2
--- /dev/null
+++ b/www/addons/mod/data/fields/multimenu/template.html
@@ -0,0 +1,2 @@
+<mm-multiple-select title="{{field.name}}" name="f_{{field.id}}" options="options"></mm-multiple-select>
+<ion-checkbox name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/number/directive.js b/www/addons/mod/data/fields/number/directive.js
new file mode 100644
index 00000000000..25fc64a5655
--- /dev/null
+++ b/www/addons/mod/data/fields/number/directive.js
@@ -0,0 +1,30 @@
+// (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_data')
+
+/**
+ * Directive to render data number field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldNumber
+ */
+.directive('mmaModDataFieldNumber', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/number/template.html'
+    };
+});
diff --git a/www/addons/mod/data/fields/number/handler.js b/www/addons/mod/data/fields/number/handler.js
new file mode 100644
index 00000000000..1ef6faf0e52
--- /dev/null
+++ b/www/addons/mod/data/fields/number/handler.js
@@ -0,0 +1,58 @@
+// (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
+//ame: fieldName,
+                value: inputData[fieldName]
+            }];
+// 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_data')
+
+/**
+ * Handler for number data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldNumberHandler
+ */
+.factory('$mmaModDataFieldNumberHandler', function() {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                name: fieldName,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldNumber', 'number', '$mmaModDataFieldNumberHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/number/template.html b/www/addons/mod/data/fields/number/template.html
new file mode 100644
index 00000000000..e843b626dc2
--- /dev/null
+++ b/www/addons/mod/data/fields/number/template.html
@@ -0,0 +1 @@
+<input type="number" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/picture/directive.js b/www/addons/mod/data/fields/picture/directive.js
new file mode 100644
index 00000000000..1ba245b55fd
--- /dev/null
+++ b/www/addons/mod/data/fields/picture/directive.js
@@ -0,0 +1,30 @@
+// (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_data')
+
+/**
+ * Directive to render data picture field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldPicture
+ */
+.directive('mmaModDataFieldPicture', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/picture/template.html'
+    };
+});
diff --git a/www/addons/mod/data/fields/picture/handler.js b/www/addons/mod/data/fields/picture/handler.js
new file mode 100644
index 00000000000..eb216897eeb
--- /dev/null
+++ b/www/addons/mod/data/fields/picture/handler.js
@@ -0,0 +1,56 @@
+// (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_data')
+
+/**
+ * Handler for picture data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldPictureHandler
+ */
+.factory('$mmaModDataFieldPictureHandler', function($translate) {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                name: fieldName,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldPicture', 'picture', '$mmaModDataFieldPictureHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/picture/template.html b/www/addons/mod/data/fields/picture/template.html
new file mode 100644
index 00000000000..968da84f85e
--- /dev/null
+++ b/www/addons/mod/data/fields/picture/template.html
@@ -0,0 +1 @@
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/radiobutton/directive.js b/www/addons/mod/data/fields/radiobutton/directive.js
new file mode 100644
index 00000000000..0c07ec4f5af
--- /dev/null
+++ b/www/addons/mod/data/fields/radiobutton/directive.js
@@ -0,0 +1,33 @@
+// (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_data')
+
+/**
+ * Directive to render data radiobutton field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldRadiobutton
+ */
+.directive('mmaModDataFieldRadiobutton', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/radiobutton/template.html',
+        link: function(scope) {
+            scope.options = scope.field.param1.split("\n");
+        }
+    };
+});
diff --git a/www/addons/mod/data/fields/radiobutton/handler.js b/www/addons/mod/data/fields/radiobutton/handler.js
new file mode 100644
index 00000000000..0546748ff53
--- /dev/null
+++ b/www/addons/mod/data/fields/radiobutton/handler.js
@@ -0,0 +1,56 @@
+// (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_data')
+
+/**
+ * Handler for radiobutton data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldRadiobuttonHandler
+ */
+.factory('$mmaModDataFieldRadiobuttonHandler', function() {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                name: fieldName,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldRadiobutton', 'radiobutton', '$mmaModDataFieldRadiobuttonHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/radiobutton/template.html b/www/addons/mod/data/fields/radiobutton/template.html
new file mode 100644
index 00000000000..0d88b6646f9
--- /dev/null
+++ b/www/addons/mod/data/fields/radiobutton/template.html
@@ -0,0 +1,6 @@
+<div class="item item-input item-select">
+    <select name="f_{{field.id}}">
+        <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
+        <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
+    </select>
+</div>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/text/directive.js b/www/addons/mod/data/fields/text/directive.js
new file mode 100644
index 00000000000..1394ac5846c
--- /dev/null
+++ b/www/addons/mod/data/fields/text/directive.js
@@ -0,0 +1,30 @@
+// (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_data')
+
+/**
+ * Directive to render data text field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldText
+ */
+.directive('mmaModDataFieldText', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/text/template.html'
+    };
+});
diff --git a/www/addons/mod/data/fields/text/handler.js b/www/addons/mod/data/fields/text/handler.js
new file mode 100644
index 00000000000..c33a29cbd97
--- /dev/null
+++ b/www/addons/mod/data/fields/text/handler.js
@@ -0,0 +1,56 @@
+// (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_data')
+
+/**
+ * Handler for text data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldTextHandler
+ */
+.factory('$mmaModDataFieldTextHandler', function() {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                name: fieldName,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldText', 'text', '$mmaModDataFieldTextHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/text/template.html b/www/addons/mod/data/fields/text/template.html
new file mode 100644
index 00000000000..968da84f85e
--- /dev/null
+++ b/www/addons/mod/data/fields/text/template.html
@@ -0,0 +1 @@
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/textarea/directive.js b/www/addons/mod/data/fields/textarea/directive.js
new file mode 100644
index 00000000000..2655d0370dc
--- /dev/null
+++ b/www/addons/mod/data/fields/textarea/directive.js
@@ -0,0 +1,30 @@
+// (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_data')
+
+/**
+ * Directive to render data textarea field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldTextarea
+ */
+.directive('mmaModDataFieldTextarea', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/textarea/template.html'
+    };
+});
diff --git a/www/addons/mod/data/fields/textarea/handler.js b/www/addons/mod/data/fields/textarea/handler.js
new file mode 100644
index 00000000000..ab45cc61272
--- /dev/null
+++ b/www/addons/mod/data/fields/textarea/handler.js
@@ -0,0 +1,56 @@
+// (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_data')
+
+/**
+ * Handler for textarea data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldTextareaHandler
+ */
+.factory('$mmaModDataFieldTextareaHandler', function() {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                name: fieldName,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldTextarea', 'textarea', '$mmaModDataFieldTextareaHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/textarea/template.html b/www/addons/mod/data/fields/textarea/template.html
new file mode 100644
index 00000000000..968da84f85e
--- /dev/null
+++ b/www/addons/mod/data/fields/textarea/template.html
@@ -0,0 +1 @@
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/url/directive.js b/www/addons/mod/data/fields/url/directive.js
new file mode 100644
index 00000000000..b4ed5849567
--- /dev/null
+++ b/www/addons/mod/data/fields/url/directive.js
@@ -0,0 +1,30 @@
+// (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_data')
+
+/**
+ * Directive to render data url field.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataFieldUrl
+ */
+.directive('mmaModDataFieldUrl', function() {
+    return {
+        restrict: 'A',
+        priority: 100,
+        templateUrl: 'addons/mod/data/fields/url/template.html'
+    };
+});
diff --git a/www/addons/mod/data/fields/url/handler.js b/www/addons/mod/data/fields/url/handler.js
new file mode 100644
index 00000000000..822d8d937ae
--- /dev/null
+++ b/www/addons/mod/data/fields/url/handler.js
@@ -0,0 +1,56 @@
+// (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_data')
+
+/**
+ * Handler for url data field plugin.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldUrlHandler
+ */
+.factory('$mmaModDataFieldUrlHandler', function() {
+
+    var self = {};
+
+    /**
+     * Get field search data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                name: fieldName,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+    return self;
+})
+
+.run(function($mmAddonManager) {
+    // Use addon manager to inject $mmaModDataFieldsDelegate. This is to provide an example for remote addons,
+    // since they cannot assume that the data addon will be packaged in custom apps.
+    var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+    if ($mmaModDataFieldsDelegate) {
+        $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldUrl', 'url', '$mmaModDataFieldUrlHandler');
+    }
+});
diff --git a/www/addons/mod/data/fields/url/template.html b/www/addons/mod/data/fields/url/template.html
new file mode 100644
index 00000000000..968da84f85e
--- /dev/null
+++ b/www/addons/mod/data/fields/url/template.html
@@ -0,0 +1 @@
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index c0f609c82a3..7830ed422fe 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -1,5 +1,6 @@
 {
     "addentries": "Add entries",
+    "advancedsearch": "Advanced search",
     "approved": "Approved",
     "ascending": "Ascending",
     "authorfirstname": "Author first name",
@@ -12,6 +13,7 @@
     "errordeleting": "Error deleting the entry.",
     "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "fields": "Fields",
+    "menuchoose": "Choose...",
     "nomatch": "No matching entries found!",
     "norecords": "No entries in database",
     "notopenyet": "Sorry, this activity is not available until {{$a}}",
@@ -22,6 +24,8 @@
     "recorddisapproved": "Entry unapproved",
     "resetsettings": "Reset filters",
     "search": "Search",
+    "selectedrequired": "All selected required",
     "timeadded": "Time added",
-    "timemodified": "Time modified"
+    "timemodified": "Time modified",
+    "usedate": "Include in search."
 }
\ No newline at end of file
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index 955e8772526..ea8e46b02c2 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -15,4 +15,44 @@
   border-bottom-width: $item-border-width;
   border-style: solid;
   border-color: $item-default-border;
+}
+
+#mma-mod_data-advanced-search-form {
+  table {
+    width: 100%;
+  }
+
+  textarea,
+  input[type="text"],
+  input[type="password"],
+  input[type="datetime"],
+  input[type="datetime-local"],
+  input[type="date"],
+  input[type="month"],
+  input[type="time"],
+  input[type="week"],
+  input[type="number"],
+  input[type="email"],
+  input[type="url"],
+  input[type="search"],
+  input[type="tel"],
+  input[type="color"],
+  .item-select,
+  mm-multiple-select .item {
+    width: 100%;
+    margin: -1px;
+    border: 1px solid $gray;
+    padding: 16px 0 16px 16px;
+    height: 56px;
+  }
+
+  .item-checkbox {
+    margin-right: 1px;
+  }
+
+  .item-select select {
+      width: 100%;
+      left: 0;
+      max-width: none;
+  }
 }
\ No newline at end of file
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 3383aef0241..be4a66d0270 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc controller
  * @name $mmaModData
  */
-.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage) {
+.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage, $mmUtil) {
     var self = {};
 
     /**
@@ -476,13 +476,15 @@ angular.module('mm.addons.mod_data')
                 params.order = order;
             }
 
+            if (typeof search !== "undefined") {
+                params.search = search;
+            }
+
             if (typeof advSearch !== "undefined") {
                 params.advsearch = advSearch;
-            } else {
-                params.search = search;
             }
 
-            return site.read('mod_data_search_entries', params);
+            return site.read('mod_data_search_entries', params, preSets);
         });
     };
 
diff --git a/www/addons/mod/data/services/fieldsdelegate.js b/www/addons/mod/data/services/fieldsdelegate.js
new file mode 100644
index 00000000000..176e6a168ec
--- /dev/null
+++ b/www/addons/mod/data/services/fieldsdelegate.js
@@ -0,0 +1,243 @@
+// (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_data')
+
+/**
+ * Delegate to register database fields handlers.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataFieldsDelegate
+ * @description
+ *
+ * Delegate to register database fields handlers.
+ * You can use this service to register your own fields handlers to be used in a database.
+ *
+ * To register a handler:
+ *
+ * $mmaModDataFieldsDelegate.registerHandler('mmaYourAddon', 'pluginType', 'handlerName');
+ *
+ * Please take into account that this delegate belongs to an addon so it might not be available in custom apps.
+ * We recommend using $mmAddonManager to inject this delegate to avoid errors.
+ *
+ * Example:
+ *
+ * .run(function($mmAddonManager) {
+ *     var $mmaModDataFieldsDelegate = $mmAddonManager.get('$mmaModDataFieldsDelegate');
+ *     if ($mmaModDataFieldsDelegate) {
+ *         $mmaModDataFieldsDelegate.registerHandler('mmaModDataFieldText', 'text', '$mmaModDataFieldTextHandler');
+ *     }
+ * });
+ *
+ * @see $mmaModDataFieldsDelegate#registerHandler to see the methods your handle needs to implement.
+ */
+.factory('$mmaModDataFieldsDelegate', function($log, $mmSite, $mmUtil, $q) {
+    $log = $log.getInstance('$mmaModDataFieldsDelegate');
+
+    var handlers = {},
+        enabledHandlers = {},
+        self = {},
+        lastUpdateHandlersStart;
+
+    /**
+     * Get the handler for a certain field plugin.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#getPluginHandler
+     * @param  {String} pluginType Type of the plugin.
+     * @return {Object}            Handler. Undefined if no handler found for the plugin.
+     */
+    self.getPluginHandler = function(pluginType) {
+        if (typeof enabledHandlers[pluginType] != 'undefined') {
+            return enabledHandlers[pluginType];
+        }
+    };
+
+    /**
+     * Get database data in the input data to search.
+     *
+     * @module mm.addons.mod_assign
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#getFieldSearchData
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             Name and data field.
+     */
+    self.getFieldSearchData = function(field, inputData) {
+        var handler = self.getPluginHandler(field.type);
+        if (handler && handler.getFieldSearchData) {
+            return handler.getFieldSearchData(field, inputData);
+        }
+        return false;
+    };
+
+    /**
+     * Get the directive to use for a certain feedback plugin.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#getDirectiveForPlugin
+     * @param  {Object} field  Defines the field to be rendered.
+     * @return {String}        Directive name. Undefined if no directive found.
+     */
+    self.getDirectiveForPlugin = function(field) {
+        var handler = self.getPluginHandler(field.type);
+        if (handler) {
+            if (handler.getDirectiveName) {
+                return handler.getDirectiveName(field);
+            }
+
+            // Fallback.
+            return 'mma-mod-data-field-' + field.type;
+        }
+    };
+
+    /**
+     * Check if a field plugin is supported.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#isPluginSupported
+     * @param  {String} pluginType Type of the plugin.
+     * @return {Boolean}           True if supported, false otherwise.
+     */
+    self.isPluginSupported = function(pluginType) {
+        return typeof enabledHandlers[pluginType] != 'undefined';
+    };
+
+
+    /**
+     * Register a field plugin handler.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#registerHandler
+     * @param {String} addon                   Handler's name.
+     * @param {String} pluginType              Type of the plugin the handler supports.
+     * @param {String|Object|Function} handler Must be resolved to an object defining the following properties. Or to a function
+     *                           returning an object defining these properties. See {@link $mmUtil#resolveObject}.
+     *                             - getFieldSearchData(field, inputData) Optional.
+     *                                                           Should return name and data entered to the field.
+     */
+    self.registerHandler = function(addon, pluginType, handler) {
+        if (typeof handlers[pluginType] !== 'undefined') {
+            $log.debug("Addon '" + addon + "' already registered as handler for '" + pluginType + "'");
+            return false;
+        }
+        $log.debug("Registered handler '" + addon + "' for field plugin '" + pluginType + "'");
+        handlers[pluginType] = {
+            addon: addon,
+            instance: undefined,
+            handler: handler
+        };
+
+        // Handlers are registered in the "run" phase, it can happen that a handler is registered after updateHandlers
+        // has been executed. If the user is logged in we'll run updateHandler to be sure it has been executed for this site.
+        if ($mmSite.isLoggedIn()) {
+            self.updateHandler(pluginType, handlers[pluginType]);
+        }
+    };
+
+    /**
+     * Check if a time belongs to the last update handlers call.
+     * This is to handle the cases where updateHandlers don't finish in the same order as they're called.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#isLastUpdateCall
+     * @param  {Number}  time Time to check.
+     * @return {Boolean}      True if equal, false otherwise.
+     */
+    self.isLastUpdateCall = function(time) {
+        if (!lastUpdateHandlersStart) {
+            return true;
+        }
+        return time == lastUpdateHandlersStart;
+    };
+
+
+    /**
+     * Check if a handler is enabled for a certain site and add/remove it to enabledHandlers.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#updateHandler
+     * @param {String} pluginType   The type of the plugin this handler handles.
+     * @param {Object} handlerInfo  The handler details.
+     * @param  {Number} time        Time this update process started.
+     * @return {Promise}            Resolved when done.
+     * @protected
+     */
+    self.updateHandler = function(pluginType, handlerInfo, time) {
+        var siteId = $mmSite.getId();
+
+
+        if (typeof handlerInfo.instance === 'undefined') {
+            handlerInfo.instance = $mmUtil.resolveObject(handlerInfo.handler, true);
+        }
+
+        // Checks if site is enabled.
+        var enabled = $mmSite.isLoggedIn();
+
+        // Verify that this call is the last one that was started.
+        // Check that site hasn't changed since the check started.
+        if (self.isLastUpdateCall(time) && $mmSite.isLoggedIn() && $mmSite.getId() === siteId) {
+            if (enabled) {
+                enabledHandlers[pluginType] = handlerInfo.instance;
+            } else {
+                delete enabledHandlers[pluginType];
+            }
+        }
+    };
+
+    /**
+     * Update the enabled handlers for the current site.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#updateHandlers
+     * @return {Promise} Resolved when done.
+     * @protected
+     */
+    self.updateHandlers = function() {
+        var promises = [],
+            now = new Date().getTime();
+
+        $log.debug('Updating handlers for current site.');
+
+        lastUpdateHandlersStart = now;
+
+        // Loop over all the handlers.
+        angular.forEach(handlers, function(handlerInfo, pluginType) {
+            promises.push(self.updateHandler(pluginType, handlerInfo, now));
+        });
+
+        return $q.all(promises).then(function() {
+            return true;
+        }, function() {
+            // Never reject.
+            return true;
+        });
+    };
+
+    return self;
+})
+
+.run(function($mmEvents, mmCoreEventLogin, mmCoreEventSiteUpdated, $mmaModDataFieldsDelegate, mmCoreEventRemoteAddonsLoaded) {
+    $mmEvents.on(mmCoreEventLogin, $mmaModDataFieldsDelegate.updateHandlers);
+    $mmEvents.on(mmCoreEventSiteUpdated, $mmaModDataFieldsDelegate.updateHandlers);
+    $mmEvents.on(mmCoreEventRemoteAddonsLoaded, $mmaModDataFieldsDelegate.updateHandlers);
+});
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index d625a691374..d4738023f23 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -21,10 +21,94 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataHelper
  */
-.factory('$mmaModDataHelper', function($mmaModData) {
+.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q) {
 
     var self = {};
 
+    /**
+     * Displays Advanced Search Fields.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#displayAdvancedSearchFields
+     * @param {String} template Template HMTL.
+     * @param {Array}  fields   Fields that defines every content in the entry.
+     * @return {String}         Generated HTML.
+     */
+    self.displayAdvancedSearchFields = function(template, fields) {
+        // Replace the fields found on template.
+        angular.forEach(fields, function(field) {
+            var replace = "[[" + field.name + "]]";
+                pos = template.search(replace);
+            replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            replace = new RegExp(replace);
+
+            // Replace field by a generic directive.
+            var render = '<mma-mod-data-field mode="search" field="fields['+ field.id + ']"></mma-mod-data-field-text>';
+            template = template.replace(replace, render);
+        });
+        return template;
+    };
+
+    /**
+     * Retrieve the entered data in search in a form.
+     * We don't use ng-model because it doesn't detect changes done by JavaScript.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getSearchDataFromForm
+     * @param  {Object} form     Form (DOM element).
+     * @param  {Array}  fields   Fields that defines every content in the entry.
+     * @return {Object}          Object with the answers.
+     */
+    self.getSearchDataFromForm = function(form, fields) {
+        if (!form || !form.elements) {
+            return {};
+        }
+
+        var searchedData = {},
+            promises =  [];
+
+        angular.forEach(form.elements, function(element) {
+            var name = element.name || '';
+            // Ignore submit inputs.
+            if (!name || element.type == 'submit' || element.tagName == 'BUTTON') {
+                return;
+            }
+
+            // Get the value.
+            if (element.type == 'checkbox') {
+                if (typeof searchedData[name] == "undefined") {
+                    searchedData[name] = {};
+                }
+                searchedData[name][element.value] = !!element.checked;
+            } else if (element.type == 'radio') {
+                if (element.checked) {
+                    searchedData[name] = element.value;
+                }
+            } else {
+                searchedData[name] = element.value;
+            }
+        });
+
+        // Filter and translate fields to each field plugin.
+        var advancedSearch = [];
+        angular.forEach(fields, function(field) {
+            var fieldData = $mmaModDataFieldsDelegate.getFieldSearchData(field, searchedData);
+            if (fieldData) {
+                angular.forEach(fieldData, function(data, index) {
+                    // WS wants values in Json format.
+                    advancedSearch.push({
+                        name: data.name,
+                        value: JSON.stringify(data.value)
+                    });
+                });
+            }
+        });
+
+        return advancedSearch;
+    };
+
     /**
      * Add a prefix to all rules in a CSS string.
      *
diff --git a/www/addons/mod/data/templates/field.html b/www/addons/mod/data/templates/field.html
new file mode 100644
index 00000000000..e0e75996ba2
--- /dev/null
+++ b/www/addons/mod/data/templates/field.html
@@ -0,0 +1,5 @@
+<!-- Field container. We'll inject the directive here. -->
+<span class="mma-mod-data-field-container">
+    <mm-loading hide-until="fieldLoaded">
+    </mm-loading>
+</span>
\ No newline at end of file
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
index 556a075ad01..aaeccfa2339 100644
--- a/www/addons/mod/data/templates/index.html
+++ b/www/addons/mod/data/templates/index.html
@@ -43,7 +43,7 @@
                 <i class="icon ion-information-circled padding"></i> {{ 'mma.mod_data.entrieslefttoadd' | translate:{$a: {entriesleft: access.entrieslefttoadd} } }}
             </div>
 
-            <div class="item" ng-if="search.text">
+            <div class="item" ng-if="search.searching && !isEmpty">
                 <h2>{{ 'mma.mod_data.numrecords' | translate: {$a: numEntries } }}</h2>
                 <a ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate}}</a>
             </div>
@@ -67,10 +67,10 @@ <h2>{{ 'mma.mod_data.numrecords' | translate: {$a: numEntries } }}</h2>
                 </button>
             </div>
 
-            <mm-empty-box ng-if="isEmpty && !search.text" icon="ion-archive" message="{{ 'mma.mod_data.norecords' | translate}}">
+            <mm-empty-box ng-if="isEmpty && !search.searching" icon="ion-archive" message="{{ 'mma.mod_data.norecords' | translate}}">
             </mm-empty-box>
 
-            <mm-empty-box ng-if="isEmpty && search.text" icon="ion-archive" message="{{ 'mma.mod_data.nomatch' | translate}}">
+            <mm-empty-box ng-if="isEmpty && search.searching" icon="ion-archive" message="{{ 'mma.mod_data.nomatch' | translate}}">
                 <a ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate}}</a>
             </mm-empty-box>
         </mm-loading>
diff --git a/www/addons/mod/data/templates/search-modal.html b/www/addons/mod/data/templates/search-modal.html
index c18e7b8cf45..88468aac721 100644
--- a/www/addons/mod/data/templates/search-modal.html
+++ b/www/addons/mod/data/templates/search-modal.html
@@ -1,11 +1,12 @@
 <ion-modal-view class="mma-mod_data-search-modal">
     <ion-header-bar class="bar bar-header">
-        <h1 class="title">{{ 'mma.mod_data.search' | translate}}</h1>
         <button class="button button-icon ion-close-round" ng-click="closeSearch()" aria-label="{{ 'mm.core.close' | translate }}"></button>
+        <h1 class="title">{{ 'mma.mod_data.search' | translate}}</h1>
+        <button class="button button-icon ion-search" ng-click="searchEntries(0)"></button>
     </ion-header-bar>
     <ion-content>
         <div class="list">
-            <label class="item item-input">
+            <label class="item item-input" ng-if="!search.searchingAdvanced">
                 <input type="text" placeholder="{{ 'mma.mod_data.search' | translate}}" ng-model="search.text">
             </label>
             <div class="item item-text-wrap item-input item-select">
@@ -27,11 +28,14 @@ <h1 class="title">{{ 'mma.mod_data.search' | translate}}</h1>
                 <ion-radio ng-model="search.sortDirection" value="ASC">{{ 'mma.mod_data.ascending' | translate }}</ion-radio>
                 <ion-radio ng-model="search.sortDirection" value="DESC">{{ 'mma.mod_data.descending' | translate }}</ion-radio>
             </ion-list>
-
-            <div class="item">
-                <button class="button button-block button-positive icon-left ion-search" ng-click="searchEntries(0)">{{ 'mma.mod_data.search' | translate }}</button>
-                <button class="button button-block icon-left ion-reset" ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate }}</button>
+            <div ng-if="advancedSearch" class="item item-text-wrap">
+                <ion-toggle ng-model="search.searchingAdvanced" class="item-borderless">{{ 'mma.mod_data.advancedsearch' | translate }}</ion-toggle>
             </div>
+            <form id="mma-mod_data-advanced-search-form" class="padding" ng-if="advancedSearch && search.searchingAdvanced">
+                <mm-format-text component="{{component}}" component-id="{{data.cmid}}" watch="true">
+                    {{ advancedSearch }}
+                </mm-format-text>
+            </form>
         </div>
     </ion-content>
 </ion-modal-view>
\ No newline at end of file
diff --git a/www/core/directives/multipleselect.js b/www/core/directives/multipleselect.js
index bd66d80f93e..0fff7861e06 100644
--- a/www/core/directives/multipleselect.js
+++ b/www/core/directives/multipleselect.js
@@ -32,6 +32,7 @@ angular.module('mm.core')
  * @param {String} title                            Title and label of the selector.
  * @param {Array}  options                          Options to be used in the selector. Each option must have a key and a value
  *                                                      property. Additionally selected property can be defined.
+ * @param {String} [name]                           Name for the input field if needed.
  * @param {String} [keyProperty="key"]              Name of the key property of the option to be sent to the server.
  * @param {String} [valueProperty="value"]          Name of the value property of the option to be shown, human readable.
  * @param {String} [selectedProperty="selected"]    Name of the selected property that indicates if the option is selected.
@@ -42,7 +43,8 @@ angular.module('mm.core')
         priority: 100,
         scope: {
             title: '@',
-            options: '='
+            options: '=',
+            name: '@?'
         },
         templateUrl: 'core/templates/multipleselect.html',
         link: function(scope, element, attrs) {
@@ -91,6 +93,9 @@ angular.module('mm.core')
                     }
                 });
                 scope.selectedOptions = getSelectedOptionsText();
+                if (scope.name) {
+                    scope.selectedValues = getSelectedOptionsValues();
+                }
 
                 scope.closeModal();
             };
@@ -106,6 +111,17 @@ angular.module('mm.core')
                 return selected.join(strSeparator);
             }
 
+            // Get string for selected options to be sent.
+            function getSelectedOptionsValues() {
+                var selected = scope.options.filter(function(option) {
+                    return !!option[selectedProperty];
+                }).map(function(option) {
+                    return option[keyProperty];
+                });
+
+                return selected.join('###');
+            }
+
             scope.closeModal = function(){
                 scope.modal.hide();
             };
diff --git a/www/core/templates/multipleselect.html b/www/core/templates/multipleselect.html
index 95bc57a20c6..485ae0be922 100644
--- a/www/core/templates/multipleselect.html
+++ b/www/core/templates/multipleselect.html
@@ -1,5 +1,6 @@
 <div class="item item-input item-stacked-label item-icon-right">
     <ion-label>{{ title }}</ion-label>
     <p class="item-text-wrap">{{ selectedOptions }}</p>
+    <input ng-if="name" type="hidden" value="{{ selectedValues }}" name="{{name}}">
     <i class="icon ion-android-arrow-dropdown"></i>
 </div>
\ No newline at end of file

From 252c41039d981cbe4e90f0053239632c75516a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 19 Jun 2017 09:51:53 +0200
Subject: [PATCH 028/118] MOBILE-2120 data: Support other fields search

---
 www/addons/mod/data/controllers/index.js      | 15 ++++++-
 .../mod/data/fields/checkbox/handler.js       |  2 +-
 www/addons/mod/data/fields/date/handler.js    |  2 +-
 www/addons/mod/data/fields/number/handler.js  |  5 +--
 www/addons/mod/data/fields/picture/handler.js |  2 +-
 www/addons/mod/data/lang/en.json              |  2 +
 www/addons/mod/data/services/data.js          | 18 +++++---
 www/addons/mod/data/services/helper.js        | 43 +++++++++++++++----
 .../mod/data/services/prefetch_handler.js     |  2 +-
 www/addons/mod/data/templates/index.html      |  4 +-
 10 files changed, 68 insertions(+), 27 deletions(-)

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 894ece26936..3a517be15fb 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
         $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups,
-        mmaModDataEventEntryChanged, $ionicModal) {
+        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -80,10 +80,15 @@ angular.module('mm.addons.mod_data')
                 $scope.timeAvailableToReadable = $scope.timeAvailableTo ? moment($scope.timeAvailableTo).format('LLL') : false;
 
                 $scope.isEmpty = true;
+                $scope.canSearch = false;
+                $scope.canAdd = false;
                 $scope.groupInfo = false;
                 return false;
             }
 
+            $scope.canSearch = true;
+            $scope.canAdd = accessData.canaddentry;
+
             return $mmGroups.getActivityGroupInfo(data.coursemodule, accessData.canmanageentries).then(function(groupInfo) {
                 $scope.groupInfo = groupInfo;
 
@@ -104,6 +109,10 @@ angular.module('mm.addons.mod_data')
                 var promises = [
                     fetchEntriesData(),
                     $mmaModData.getFields(data.id).then(function(fields) {
+                        if (fields.length == 0) {
+                            $scope.canSearch = false;
+                            $scope.canAdd = false;
+                        }
                         $scope.search.advanced = {};
 
                         $scope.fields = {};
@@ -148,12 +157,14 @@ angular.module('mm.addons.mod_data')
         }).then(function(entries) {
             $scope.numEntries = entries && entries.totalcount;
             $scope.isEmpty = $scope.numEntries <= 0;
-            $scope.hasNextPage = (($scope.search.page + 1) * $mmaModData.perPage) < $scope.numEntries;
+            $scope.hasNextPage = (($scope.search.page + 1) * mmaModDataPerPage) < $scope.numEntries;
             $scope.entries = "";
 
             if (!$scope.isEmpty) {
                 $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
                 $scope.entries = entries.listviewcontents;
+            } else if (!$scope.search.searching) {
+                $scope.canSearch = false;
             }
         });
     }
diff --git a/www/addons/mod/data/fields/checkbox/handler.js b/www/addons/mod/data/fields/checkbox/handler.js
index 907c5af9b74..5d6ee85e301 100644
--- a/www/addons/mod/data/fields/checkbox/handler.js
+++ b/www/addons/mod/data/fields/checkbox/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldCheckboxHandler
  */
-.factory('$mmaModDataFieldCheckboxHandler', function($translate) {
+.factory('$mmaModDataFieldCheckboxHandler', function() {
 
     var self = {};
 
diff --git a/www/addons/mod/data/fields/date/handler.js b/www/addons/mod/data/fields/date/handler.js
index 5fdaee494ec..9d4e5927977 100644
--- a/www/addons/mod/data/fields/date/handler.js
+++ b/www/addons/mod/data/fields/date/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldDateHandler
  */
-.factory('$mmaModDataFieldDateHandler', function($translate) {
+.factory('$mmaModDataFieldDateHandler', function() {
 
     var self = {};
 
diff --git a/www/addons/mod/data/fields/number/handler.js b/www/addons/mod/data/fields/number/handler.js
index 1ef6faf0e52..50110ebbead 100644
--- a/www/addons/mod/data/fields/number/handler.js
+++ b/www/addons/mod/data/fields/number/handler.js
@@ -5,15 +5,14 @@
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
-//ame: fieldName,
-                value: inputData[fieldName]
-            }];
+//
 // 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_data')
 
 /**
diff --git a/www/addons/mod/data/fields/picture/handler.js b/www/addons/mod/data/fields/picture/handler.js
index eb216897eeb..8d464a8d8b8 100644
--- a/www/addons/mod/data/fields/picture/handler.js
+++ b/www/addons/mod/data/fields/picture/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldPictureHandler
  */
-.factory('$mmaModDataFieldPictureHandler', function($translate) {
+.factory('$mmaModDataFieldPictureHandler', function() {
 
     var self = {};
 
diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index 7830ed422fe..4c464b12bfb 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -2,6 +2,8 @@
     "addentries": "Add entries",
     "advancedsearch": "Advanced search",
     "approved": "Approved",
+    "authorfirstname": "Author first name",
+    "authorlastname": "Author surname",
     "ascending": "Ascending",
     "authorfirstname": "Author first name",
     "authorlastname": "Author surname",
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index be4a66d0270..ca91d6279db 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc controller
  * @name $mmaModData
  */
-.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage, $mmUtil) {
+.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage) {
     var self = {};
 
     /**
@@ -542,14 +542,17 @@ angular.module('mm.addons.mod_data')
      * @param  {Number}    [groupId]       Group ID.
      * @param  {Number}    [sort]          Sort the records by this field id. See $mmaModData#getEntries for more information.
      * @param  {String}    [order]         The direction of the sorting.  See $mmaModData#getEntries for more information.
+     * @param  {Number}    [perPage]       Records per page to fetch. It has to match with the prefetch.
+     *                                     Default on mmaModDataPerPage.
      * @param  {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
      * @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 done.
      */
-    self.fetchAllEntries = function(dataId, groupId, sort, order, forceCache, ignoreCache, siteId) {
+    self.fetchAllEntries = function(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, siteId) {
         siteId = siteId || $mmSite.getId();
-        return fetchEntriesRecursive(dataId, groupId, sort, order, forceCache, ignoreCache, [], 0, siteId);
+        perPage = perPage || mmaModDataPerPage;
+        return fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, [], 0, siteId);
     };
 
     /**
@@ -559,6 +562,7 @@ angular.module('mm.addons.mod_data')
      * @param  {Number}    groupId         Group ID.
      * @param  {Number}    sort            Sort the records by this field id. See $mmaModData#getEntries for more information.
      * @param  {String}    order           The direction of the sorting.  See $mmaModData#getEntries for more information.
+     * @param  {Number}    perPage         Records per page to fetch. It has to match with the prefetch.
      * @param  {Boolean}   forceCache      True to always get the value from cache, false otherwise. Default false.
      * @param  {Boolean}   ignoreCache     True if it should ignore cached data (it will always fail in offline or server down).
      * @param  {Array}     entries         Entries already fetch (just to concatenate them).
@@ -566,14 +570,14 @@ angular.module('mm.addons.mod_data')
      * @param  {String}    siteId          Site ID.
      * @return {Promise}                   Promise resolved when done.
      */
-    function fetchEntriesRecursive(dataId, groupId, sort, order, forceCache, ignoreCache, entries, page, siteId) {
-        return self.getEntries(dataId, groupId, sort, order, page, mmaModDataPerPage, forceCache, ignoreCache, siteId)
+    function fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, entries, page, siteId) {
+        return self.getEntries(dataId, groupId, sort, order, page, perPage, forceCache, ignoreCache, siteId)
                 .then(function(result) {
             entries = entries.concat(result.entries);
 
-            var canLoadMore = ((page + 1) * mmaModDataPerPage) < result.totalcount;
+            var canLoadMore = ((page + 1) * perPage) < result.totalcount;
             if (canLoadMore) {
-                return fetchEntriesRecursive(dataId, groupId, sort, order, forceCache, ignoreCache, entries, page + 1,
+                return fetchEntriesRecursive(dataId, groupId, sort, order, perPage, forceCache, ignoreCache, entries, page + 1,
                     siteId);
             }
             return entries;
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index d4738023f23..21d0dd233ef 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -21,9 +21,14 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataHelper
  */
-.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q) {
+.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate) {
 
-    var self = {};
+    var self = {
+            searchOther: {
+                'fn': 'firstname',
+                'ln': 'lastname'
+            }
+        };
 
     /**
      * Displays Advanced Search Fields.
@@ -36,15 +41,25 @@ angular.module('mm.addons.mod_data')
      * @return {String}         Generated HTML.
      */
     self.displayAdvancedSearchFields = function(template, fields) {
+        var replace;
+
         // Replace the fields found on template.
         angular.forEach(fields, function(field) {
-            var replace = "[[" + field.name + "]]";
-                pos = template.search(replace);
+            replace = "[[" + field.name + "]]";
             replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
             replace = new RegExp(replace);
 
             // Replace field by a generic directive.
-            var render = '<mma-mod-data-field mode="search" field="fields['+ field.id + ']"></mma-mod-data-field-text>';
+            var render = '<mma-mod-data-field mode="search" field="fields['+ field.id + ']"></mma-mod-data-field>';
+            template = template.replace(replace, render);
+        });
+
+        // Not pluginable other search elements.
+        angular.forEach(self.searchOther, function(field, name) {
+            replace = new RegExp("##" + field + "##");
+
+            // Replace field by the text input.
+            var render = '<input type="text" name="' + name + '" placeholder="{{ \'mma.mod_data.author' + field + '\' | translate }}">';
             template = template.replace(replace, render);
         });
         return template;
@@ -66,8 +81,7 @@ angular.module('mm.addons.mod_data')
             return {};
         }
 
-        var searchedData = {},
-            promises =  [];
+        var searchedData = {};
 
         angular.forEach(form.elements, function(element) {
             var name = element.name || '';
@@ -96,7 +110,7 @@ angular.module('mm.addons.mod_data')
         angular.forEach(fields, function(field) {
             var fieldData = $mmaModDataFieldsDelegate.getFieldSearchData(field, searchedData);
             if (fieldData) {
-                angular.forEach(fieldData, function(data, index) {
+                angular.forEach(fieldData, function(data) {
                     // WS wants values in Json format.
                     advancedSearch.push({
                         name: data.name,
@@ -106,6 +120,17 @@ angular.module('mm.addons.mod_data')
             }
         });
 
+        // Not pluginable other search elements.
+        angular.forEach(self.searchOther, function(field, name) {
+            if (searchedData[name]) {
+                // WS wants values in Json format.
+                advancedSearch.push({
+                    name: name,
+                    value: JSON.stringify(searchedData[name])
+                });
+            }
+        });
+
         return advancedSearch;
     };
 
@@ -203,7 +228,7 @@ angular.module('mm.addons.mod_data')
      * @return {Promise}        Containing and array of EntryId.
      */
     self.getAllEntriesIds = function(dataId, groupId, siteId) {
-        return $mmaModData.fetchAllEntries(dataId, groupId, undefined, undefined, undefined, true, undefined, siteId)
+        return $mmaModData.fetchAllEntries(dataId, groupId, undefined, undefined, undefined, undefined, true, undefined, siteId)
                 .then(function(entries) {
             return entries.map(function(entry) {
                 return entry.id;
diff --git a/www/addons/mod/data/services/prefetch_handler.js b/www/addons/mod/data/services/prefetch_handler.js
index 7f22770fca7..078a30e2a2b 100644
--- a/www/addons/mod/data/services/prefetch_handler.js
+++ b/www/addons/mod/data/services/prefetch_handler.js
@@ -130,7 +130,7 @@ angular.module('mm.addons.mod_data')
         var promises = [];
 
         angular.forEach(groups, function(group) {
-            promises.push($mmaModData.fetchAllEntries(dataId, group.id, undefined, undefined, undefined, forceCache,
+            promises.push($mmaModData.fetchAllEntries(dataId, group.id, undefined, undefined, undefined, undefined, forceCache,
                 ignoreCache, siteId));
         });
 
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
index aaeccfa2339..d6e9d29c44e 100644
--- a/www/addons/mod/data/templates/index.html
+++ b/www/addons/mod/data/templates/index.html
@@ -1,13 +1,13 @@
 <ion-view>
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
     <ion-nav-buttons side="secondary">
-        <button class="button button-icon ion-ios-search-strong" ng-click="showSearch($event)" aria-label="{{ 'mma.mod_data.search' | translate }}"></button>
+        <button ng-show="canSearch" class="button button-icon ion-ios-search-strong" ng-click="showSearch($event)" aria-label="{{ 'mma.mod_data.search' | translate }}"></button>
         <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="databaseLoaded && !hasOffline && isOnline" content="'mm.core.refresh' | translate" action="refreshDatabase(false)" icon-action="refreshIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
             <mm-context-menu-item priority="600" ng-if="databaseLoaded && hasOffline && isOnline" content="'mm.settings.synchronizenow' | translate" action="refreshDatabase(true)" icon-action="syncIcon" close-on-click="false" close-when-done="true"></mm-context-menu-item>
-            <mm-context-menu-item priority="500" ng-if="access.canaddentry" content="'mma.mod_data.addentries' | translate" icon-action="'ion-plus-round'" action="gotoAddEntries($event)"></mm-context-menu-item>
+            <mm-context-menu-item priority="500" ng-show="canAdd" content="'mma.mod_data.addentries' | translate" icon-action="'ion-plus-round'" action="gotoAddEntries($event)"></mm-context-menu-item>
             <mm-context-menu-item priority="400" ng-if="timemodified" content="timemodified" icon-action="prefetchStatusIcon" action="prefetch()" close-on-click="false"></mm-context-menu-item>
             <mm-context-menu-item priority="300" ng-if="size" content="size" icon-description="'ion-cube'" icon-action="'ion-trash-a'" action="removeFiles()"></mm-context-menu-item>
         </mm-context-menu>

From 1be7ef70a2039fb5f9db9fc5c4d7db375b56268c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 21 Jun 2017 12:28:30 +0200
Subject: [PATCH 029/118] MOBILE-2121 core: Add a generic file session manager

---
 .../mod/assign/submission/file/directive.js   |   4 +-
 .../mod/assign/submission/file/handlers.js    |  12 +-
 .../mod/assign/submission/file/session.js     | 150 ---------------
 www/core/lib/filesession.js                   | 173 ++++++++++++++++++
 4 files changed, 181 insertions(+), 158 deletions(-)
 delete mode 100644 www/addons/mod/assign/submission/file/session.js
 create mode 100644 www/core/lib/filesession.js

diff --git a/www/addons/mod/assign/submission/file/directive.js b/www/addons/mod/assign/submission/file/directive.js
index 5345298b55b..96ffcf8ade2 100644
--- a/www/addons/mod/assign/submission/file/directive.js
+++ b/www/addons/mod/assign/submission/file/directive.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_assign')
  * @ngdoc directive
  * @name mmaModAssignSubmissionFile
  */
-.directive('mmaModAssignSubmissionFile', function($mmaModAssign, $mmaModAssignSubmissionFileSession, $mmaModAssignHelper,
+.directive('mmaModAssignSubmissionFile', function($mmaModAssign, $mmFileSession, mmaModAssignComponent, $mmaModAssignHelper,
             $mmaModAssignOffline, mmaModAssignSubmissionFileName, $mmFileUploaderHelper, $q) {
     return {
         restrict: 'A',
@@ -55,7 +55,7 @@ angular.module('mm.addons.mod_assign')
                     scope.files = $mmaModAssign.getSubmissionPluginAttachments(scope.plugin);
                 }
             }).finally(function() {
-                $mmaModAssignSubmissionFileSession.setFiles(scope.assign.id, scope.files);
+                $mmFileSession.setFiles(mmaModAssignComponent, scope.assign.id, scope.files);
             });
         }
     };
diff --git a/www/addons/mod/assign/submission/file/handlers.js b/www/addons/mod/assign/submission/file/handlers.js
index a0eee0b82b9..3ef411ea46c 100644
--- a/www/addons/mod/assign/submission/file/handlers.js
+++ b/www/addons/mod/assign/submission/file/handlers.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_assign')
  * @ngdoc service
  * @name $mmaModAssignSubmissionFileHandler
  */
-.factory('$mmaModAssignSubmissionFileHandler', function($mmaModAssignSubmissionFileSession, $mmaModAssign, $mmSite, $q,
+.factory('$mmaModAssignSubmissionFileHandler', function($mmFileSession, mmaModAssignComponent, $mmaModAssign, $mmSite, $q,
             $mmaModAssignHelper, $mmWS, $mmFS, $mmFilepool, $mmUtil, $mmaModAssignOffline, mmaModAssignSubmissionFileName,
             $mmFileUploaderHelper) {
 
@@ -60,10 +60,10 @@ angular.module('mm.addons.mod_assign')
      * @return {Void}
      */
     self.clearTmpData = function(assign, submission, plugin, inputData) {
-        var files = $mmaModAssignSubmissionFileSession.getFiles(assign.id);
+        var files = $mmFileSession.getFiles(mmaModAssignComponent, assign.id);
 
         // Clear the files in session for this assign.
-        $mmaModAssignSubmissionFileSession.clearFiles(assign.id);
+        $mmFileSession.clearFiles(mmaModAssignComponent, assign.id);
         // Now delete the local files from the tmp folder.
         $mmFileUploaderHelper.clearTmpFiles(files);
     };
@@ -156,7 +156,7 @@ angular.module('mm.addons.mod_assign')
 
         // Check if there's any change.
         if (self.hasDataChanged(assign, submission, plugin, inputData)) {
-            var files = $mmaModAssignSubmissionFileSession.getFiles(assign.id),
+            var files = $mmFileSession.getFiles(mmaModAssignComponent, assign.id),
                 totalSize = 0,
                 promises = [];
 
@@ -278,7 +278,7 @@ angular.module('mm.addons.mod_assign')
             var pluginFiles = $mmaModAssign.getSubmissionPluginAttachments(plugin);
             return pluginFiles && pluginFiles.length;
         }).then(function(numFiles) {
-            var currentFiles = $mmaModAssignSubmissionFileSession.getFiles(assign.id);
+            var currentFiles = $mmFileSession.getFiles(mmaModAssignComponent, assign.id);
 
             if (currentFiles.length != numFiles) {
                 // Number of files has changed.
@@ -320,7 +320,7 @@ angular.module('mm.addons.mod_assign')
 
         if (self.hasDataChanged(assign, submission, plugin, inputData)) {
             // Data has changed, we need to upload new files and re-upload all the existing files.
-            var currentFiles = $mmaModAssignSubmissionFileSession.getFiles(assign.id),
+            var currentFiles = $mmFileSession.getFiles(mmaModAssignComponent, assign.id),
                 error = $mmUtil.hasRepeatedFilenames(currentFiles);
 
             if (error) {
diff --git a/www/addons/mod/assign/submission/file/session.js b/www/addons/mod/assign/submission/file/session.js
deleted file mode 100644
index cc29a18343a..00000000000
--- a/www/addons/mod/assign/submission/file/session.js
+++ /dev/null
@@ -1,150 +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_assign')
-
-/**
- * Helper to store some temporary data for submission file.
- *
- * @module mm.addons.mod_assign
- * @ngdoc service
- * @name $mmaModAssignSubmissionFileSession
- */
-.factory('$mmaModAssignSubmissionFileSession', function($mmSite) {
-
-    var self = {},
-        files = {};
-
-    /**
-     * Add a file to the session.
-     *
-     * @module mm.addons.mod_assign
-     * @ngdoc method
-     * @name $mmaModAssignSubmissionFileSession#addFile
-     * @param  {Number} assignmentId Assignment ID.
-     * @param  {Object} file         File to add.
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Void}
-     */
-    self.addFile = function(assignmentId, file, siteId) {
-        siteId = siteId || $mmSite.getId();
-
-        if (!files[siteId]) {
-            files[siteId] = {};
-        }
-
-        if (!files[siteId][assignmentId]) {
-            files[siteId][assignmentId] = [];
-        }
-
-        files[siteId][assignmentId].push(file);
-    };
-
-    /**
-     * Clear files stored in session.
-     *
-     * @module mm.addons.mod_assign
-     * @ngdoc method
-     * @name $mmaModAssignSubmissionFileSession#clearFiles
-     * @param  {Number} assignmentId Assignment ID.
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Void}
-     */
-    self.clearFiles = function(assignmentId, siteId) {
-        siteId = siteId || $mmSite.getId();
-        if (files[siteId] && files[siteId][assignmentId]) {
-            files[siteId][assignmentId] = [];
-        }
-    };
-
-    /**
-     * Get files stored in session.
-     *
-     * @module mm.addons.mod_assign
-     * @ngdoc method
-     * @name $mmaModAssignSubmissionFileSession#getFiles
-     * @param  {Number} assignmentId Assignment ID.
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Object[]}            Files in session.
-     */
-    self.getFiles = function(assignmentId, siteId) {
-        siteId = siteId || $mmSite.getId();
-        if (files[siteId] && files[siteId][assignmentId]) {
-            return files[siteId][assignmentId];
-        }
-        return [];
-    };
-
-    /**
-     * Remove a file stored in session.
-     *
-     * @module mm.addons.mod_assign
-     * @ngdoc method
-     * @name $mmaModAssignSubmissionFileSession#removeFile
-     * @param  {Number} assignmentId Assignment ID.
-     * @param  {Object} file         File to remove. The instance should be exactly the same as the one stored in session.
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Void}
-     */
-    self.removeFile = function(assignmentId, file, siteId) {
-        siteId = siteId || $mmSite.getId();
-        if (files[siteId] && files[siteId][assignmentId]) {
-            var position = files[siteId][assignmentId].indexOf(file);
-            if (position != -1) {
-                files[siteId][assignmentId].splice(position, 1);
-            }
-        }
-    };
-
-    /**
-     * Remove a file stored in session.
-     *
-     * @module mm.addons.mod_assign
-     * @ngdoc method
-     * @name $mmaModAssignSubmissionFileSession#removeFileByIndex
-     * @param  {Number} assignmentId Assignment ID.
-     * @param  {Number} index        Position of the file to remove.
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Void}
-     */
-    self.removeFileByIndex = function(assignmentId, index, siteId) {
-        siteId = siteId || $mmSite.getId();
-        if (files[siteId] && files[siteId][assignmentId] && index >= 0 && index < files[siteId][assignmentId].length) {
-            files[siteId][assignmentId].splice(index, 1);
-        }
-    };
-
-    /**
-     * Set a group of files in the session.
-     *
-     * @module mm.addons.mod_assign
-     * @ngdoc method
-     * @name $mmaModAssignSubmissionFileSession#setFiles
-     * @param  {Number} assignmentId Assignment ID.
-     * @param  {Object[]} newFiles   Files to set.
-     * @param  {String} [siteId]     Site ID. If not defined, current site.
-     * @return {Void}
-     */
-    self.setFiles = function(assignmentId, newFiles, siteId) {
-        siteId = siteId || $mmSite.getId();
-
-        if (!files[siteId]) {
-            files[siteId] = {};
-        }
-
-        files[siteId][assignmentId] = newFiles;
-    };
-
-    return self;
-});
diff --git a/www/core/lib/filesession.js b/www/core/lib/filesession.js
new file mode 100644
index 00000000000..5d7d51b36d7
--- /dev/null
+++ b/www/core/lib/filesession.js
@@ -0,0 +1,173 @@
+// (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')
+
+/**
+ * Helper to store some temporary data for file submission.
+ *
+ * It uses siteId and component name to index the files.
+ * Every component can provide a File area identifier to indentify every file list on the session.
+ * This value can be the activity id or a mix of name and numbers.
+ *
+ * @module mm.core
+ * @ngdoc service
+ * @name $mmFileSession
+ */
+.factory('$mmFileSession', function($mmSite) {
+
+    var self = {},
+        files = {};
+
+    /**
+     * Initializes the filearea to store the file.
+     *
+     * @param  {String}        component    Component Name.
+     * @param  {String|Number} id           File area identifier.
+     * @param  {String}        [siteId]     Site ID. If not defined, current site.
+     */
+    function initFileArea(component, id, siteId) {
+        if (!files[siteId]) {
+            files[siteId] = {};
+        }
+
+        if (!files[siteId][component]) {
+            files[siteId][component] = {};
+        }
+
+        if (!files[siteId][component][id]) {
+            files[siteId][component][id] = [];
+        }
+    }
+
+    /**
+     * Add a file to the session.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFileSession#addFile
+     * @param  {String}        component    Component Name.
+     * @param  {String|Number} id           File area identifier.
+     * @param  {Object}        file         File to add.
+     * @param  {String}        [siteId]     Site ID. If not defined, current site.
+     * @return {Void}
+     */
+    self.addFile = function(component, id, file, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        initFileArea(component, id, siteId);
+
+        files[siteId][component][id].push(file);
+    };
+
+    /**
+     * Clear files stored in session.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFileSession#clearFiles
+     * @param  {String}         component    Component Name.
+     * @param  {String|Number}  id           File area identifier.
+     * @param  {String}         [siteId]     Site ID. If not defined, current site.
+     * @return {Void}
+     */
+    self.clearFiles = function(component, id, siteId) {
+        siteId = siteId || $mmSite.getId();
+        if (files[siteId] && files[siteId][component] && files[siteId][component][id]) {
+            files[siteId][component][id] = [];
+        }
+    };
+
+    /**
+     * Get files stored in session.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFileSession#getFiles
+     * @param  {String}         component    Component Name.
+     * @param  {String|Number}  id           File area identifier.
+     * @param  {String}         [siteId]     Site ID. If not defined, current site.
+     */
+    self.getFiles = function(component, id, siteId) {
+        siteId = siteId || $mmSite.getId();
+        if (files[siteId] && files[siteId][component] && files[siteId][component][id]) {
+            return files[siteId][component][id];
+        }
+        return [];
+    };
+
+    /**
+     * Remove a file stored in session.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFileSession#removeFile
+     * @param  {String}         component    Component Name.
+     * @param  {String|Number}  id           File area identifier.
+     * @param  {Object}         file         File to remove. The instance should be exactly the same as the one stored in session.
+     * @param  {String}         [siteId]     Site ID. If not defined, current site.
+     * @return {Void}
+     */
+    self.removeFile = function(component, id, file, siteId) {
+        siteId = siteId || $mmSite.getId();
+        if (files[siteId] && files[siteId][component] && files[siteId][component][id]) {
+            var position = files[siteId][component][id].indexOf(file);
+            if (position != -1) {
+                files[siteId][component][id].splice(position, 1);
+            }
+        }
+    };
+
+    /**
+     * Remove a file stored in session.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFileSession#removeFileByIndex
+     * @param  {String}         component    Component Name.
+     * @param  {String|Number}  id           File area identifier.
+     * @param  {Number}         index        Position of the file to remove.
+     * @param  {String}         [siteId]     Site ID. If not defined, current site.
+     * @return {Void}
+     */
+    self.removeFileByIndex = function(component, id, index, siteId) {
+        siteId = siteId || $mmSite.getId();
+        if (files[siteId] && files[siteId][component] && files[siteId][component][id] && index >= 0 &&
+                index < files[siteId][component][id].length) {
+            files[siteId][component][id].splice(index, 1);
+        }
+    };
+
+    /**
+     * Set a group of files in the session.
+     *
+     * @module mm.core
+     * @ngdoc method
+     * @name $mmFileSession#setFiles
+     * @param  {String}         component    Component Name.
+     * @param  {String|Number}  id           File area identifier.
+     * @param  {Object[]}       newFiles   Files to set.
+     * @param  {String}         [siteId]     Site ID. If not defined, current site.
+     * @return {Void}
+     */
+    self.setFiles = function(component, id, newFiles, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        initFileArea(component, id, siteId);
+
+        files[siteId][component][id] = newFiles;
+    };
+
+    return self;
+});

From 25ab54c3c12dc5fd91f61c03e34d98d0bed756d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 19 Jun 2017 12:04:46 +0200
Subject: [PATCH 030/118] MOBILE-2121 data: Add and edit form structure

---
 www/addons/mod/data/controllers/edit.js  | 140 +++++++++++++++++++++++
 www/addons/mod/data/controllers/index.js |  12 +-
 www/addons/mod/data/directives/field.js  |   4 +-
 www/addons/mod/data/main.js              |  18 +++
 www/addons/mod/data/scss/styles.scss     |   3 +-
 www/addons/mod/data/services/handlers.js |  46 ++++++++
 www/addons/mod/data/services/helper.js   |  35 ++++++
 www/addons/mod/data/templates/edit.html  |  25 ++++
 8 files changed, 277 insertions(+), 6 deletions(-)
 create mode 100644 www/addons/mod/data/controllers/edit.js
 create mode 100644 www/addons/mod/data/templates/edit.html

diff --git a/www/addons/mod/data/controllers/edit.js b/www/addons/mod/data/controllers/edit.js
new file mode 100644
index 00000000000..5275f31a64c
--- /dev/null
+++ b/www/addons/mod/data/controllers/edit.js
@@ -0,0 +1,140 @@
+// (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_data')
+
+/**
+ * Data add and edit controller.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc controller
+ * @name mmaModDataEditCtrl
+ */
+.controller('mmaModDataEditCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $q, $mmUtil, $mmaModDataHelper,
+        $mmGroups) {
+
+    var module = $stateParams.module || {},
+        courseId = $stateParams.courseid,
+        data,
+        entry = {
+            id: $stateParams.entryid || false
+        };
+
+    $scope.title = module.name;
+    $scope.component = mmaModDataComponent;
+    $scope.databaseLoaded = false;
+    $scope.selectedGroup = $stateParams.group || 0;
+    $scope.entryContents = {};
+
+    function fetchEntryData(refresh) {
+
+        return $mmaModData.getDatabase(courseId, module.id).then(function(databaseData) {
+            data = databaseData;
+
+            $scope.title = data.name || $scope.title;
+            $scope.data = databaseData;
+
+            $scope.database = data;
+
+            return $mmaModData.getDatabaseAccessInformation(data.id);
+        }).then(function(accessData) {
+            $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
+
+            if (entry.id) {
+                // Editing, group is set.
+                return $mmaModData.getEntry(data.id, entry.id).then(function(entryData) {
+                    $scope.entryContents = {};
+                    angular.forEach(entryData.entry.contents, function(field) {
+                        $scope.entryContents[field.fieldid] = field;
+                    });
+                });
+            } else {
+                // Adding, get groups.
+                return $mmGroups.getActivityGroupInfo(data.coursemodule, accessData.canmanageentries).then(function(groupInfo) {
+                    $scope.groupInfo = groupInfo;
+
+                    // Check selected group is accessible.
+                    if (groupInfo && groupInfo.groups && groupInfo.groups.length > 0) {
+                        var found = false;
+                        for (var x in groupInfo.groups) {
+                            if (groupInfo.groups[x].id == $scope.selectedGroup) {
+                                found = true;
+                                break;
+                            }
+                        }
+                        if (!found) {
+                            $scope.selectedGroup = groupInfo.groups[0].id;
+                        }
+                    }
+                });
+            }
+        }).then(function() {
+            return $mmaModData.getFields(data.id);
+        }).then(function(fields) {
+            $scope.fields = {};
+            angular.forEach(fields, function(field) {
+                $scope.fields[field.id] = field;
+            });
+
+            $scope.editForm = $mmaModDataHelper.displayEditFields(data.addtemplate, $scope.fields, $scope.entryContents);
+        }).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.databaseLoaded = true;
+        });
+    }
+
+    // Set group to see the database.
+    $scope.setGroup = function(groupId) {
+        $scope.selectedGroup = groupId;
+        $scope.databaseLoaded = false;
+
+        return fetchEntryData();
+    };
+
+    // Convenience function to refresh all the data.
+    function refreshAllData() {
+        var promises = [];
+
+        promises.push($mmaModData.invalidateDatabaseData(courseId));
+        if (data) {
+            if (entry.id) {
+                promises.push($mmaModData.invalidateEntryData(data.id, entry.id));
+            }
+            promises.push($mmGroups.invalidateActivityGroupInfo(data.coursemodule));
+            promises.push($mmaModData.invalidateEntriesData(data.id));
+        }
+
+        return $q.all(promises).finally(function() {
+            return fetchEntryData(true);
+        });
+    }
+
+    fetchEntryData();
+
+    // Pull to refresh.
+    $scope.refreshDatabase = function() {
+        if ($scope.databaseLoaded) {
+            return refreshAllData().finally(function() {
+                $scope.$broadcast('scroll.refreshComplete');
+            });
+        }
+    };
+});
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 3a517be15fb..b802b565374 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
         $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups,
-        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage) {
+        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage, $state) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -80,8 +80,6 @@ angular.module('mm.addons.mod_data')
                 $scope.timeAvailableToReadable = $scope.timeAvailableTo ? moment($scope.timeAvailableTo).format('LLL') : false;
 
                 $scope.isEmpty = true;
-                $scope.canSearch = false;
-                $scope.canAdd = false;
                 $scope.groupInfo = false;
                 return false;
             }
@@ -281,7 +279,13 @@ angular.module('mm.addons.mod_data')
 
     // Opens add entries form
     $scope.gotoAddEntries = function() {
-        $mmUtil.openInApp($mmSite.getURL() + '/mod/data/edit.php?d=' + data.id);
+        var stateParams = {
+            moduleid: module.id,
+            module: module,
+            courseid: courseId,
+            group: $scope.selectedGroup
+        };
+        $state.go('site.mod_data-edit', stateParams);
     };
 
     // Refresh online status when changes.
diff --git a/www/addons/mod/data/directives/field.js b/www/addons/mod/data/directives/field.js
index 7078f669972..60c79eb329a 100644
--- a/www/addons/mod/data/directives/field.js
+++ b/www/addons/mod/data/directives/field.js
@@ -27,7 +27,9 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         scope: {
             field: '=',
-            mode: '='
+            value: '=?',
+            database: '=?',
+            mode: '@'
         },
         templateUrl: 'addons/mod/data/templates/field.html',
         link: function(scope, element) {
diff --git a/www/addons/mod/data/main.js b/www/addons/mod/data/main.js
index 04e33fc8b9f..105f0cd808c 100644
--- a/www/addons/mod/data/main.js
+++ b/www/addons/mod/data/main.js
@@ -53,6 +53,23 @@ angular.module('mm.addons.mod_data', ['mm.core'])
                 templateUrl: 'addons/mod/data/templates/entry.html'
             }
         }
+    })
+
+    .state('site.mod_data-edit', {
+        url: '/mod_data-edit',
+        params: {
+            module: null,
+            moduleid: null, // Redundant parameter to fix a problem passing object as parameters. To be fixed in MOBILE-1370.
+            courseid: null,
+            entryid: null,
+            group: null
+        },
+        views: {
+            'site': {
+                controller: 'mmaModDataEditCtrl',
+                templateUrl: 'addons/mod/data/templates/edit.html'
+            }
+        }
     });
 })
 
@@ -63,4 +80,5 @@ angular.module('mm.addons.mod_data', ['mm.core'])
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:entry', '$mmaModDataHandlers.showEntryLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:approve', '$mmaModDataHandlers.approveEntryLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:delete', '$mmaModDataHandlers.deleteEntryLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:edit', '$mmaModDataHandlers.editEntryLinksHandler');
 });
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index ea8e46b02c2..d9df4b7d8d4 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -17,7 +17,8 @@
   border-color: $item-default-border;
 }
 
-#mma-mod_data-advanced-search-form {
+#mma-mod_data-advanced-search-form,
+#mma-mod_data-edit-form  {
   table {
     width: 100%;
   }
diff --git a/www/addons/mod/data/services/handlers.js b/www/addons/mod/data/services/handlers.js
index 2c00b4b1f63..dfd2b0f34fc 100644
--- a/www/addons/mod/data/services/handlers.js
+++ b/www/addons/mod/data/services/handlers.js
@@ -324,5 +324,51 @@ angular.module('mm.addons.mod_data')
         }];
     };
 
+    /**
+     * Content links handler for database add or edit entry.
+     * Match mod/data/edit.php?d=6&rid=6 with a valid data and optional record id.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHandlers#editEntryLinksHandler
+     */
+    self.editEntryLinksHandler = $mmContentLinkHandlerFactory.createChild(
+                /\/mod\/data\/edit\.php.*([\?\&](d|rid)=\d+)/, '$mmCourseDelegate_mmaModData');
+
+    // Check if the showEntryLinksHandler is enabled for a certain site. See $mmContentLinkHandlerFactory#isEnabled.
+    self.editEntryLinksHandler.isEnabled = $mmaModData.isPluginEnabled;
+
+    // Get actions to perform with the link. See $mmContentLinkHandlerFactory#getActions.
+    self.editEntryLinksHandler.getActions = function(siteIds, url, params, courseId) {
+        if (typeof params.d == 'undefined') {
+            // Id not defined. Cannot treat the URL.
+            return false;
+        }
+
+        return [{
+            action: function(siteId) {
+                var modal = $mmUtil.showModalLoading(),
+                    dataId = parseInt(params.d, 10),
+                    rId = parseInt(params.rid, 10) || false;
+
+                return $mmCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId).then(function(module) {
+                    var stateParams = {
+                        moduleid: module.id,
+                        module: module,
+                        courseid: module.course
+                    };
+
+                    if (rId) {
+                        stateParams.entryid = rId;
+                    }
+
+                    return $mmContentLinksHelper.goInSite('site.mod_data-edit', stateParams, siteId);
+                }).finally(function() {
+                    modal.dismiss();
+                });
+            }
+        }];
+    };
+
     return self;
 });
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 21d0dd233ef..89edbb53ece 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -134,6 +134,41 @@ angular.module('mm.addons.mod_data')
         return advancedSearch;
     };
 
+    /**
+     * Displays Edit Search Fields.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#displayEditFields
+     * @param {String} template   Template HMTL.
+     * @param {Array}  fields     Fields that defines every content in the entry.
+     * @param {Array}  [contents] Contents for the editing entry (if editing).
+     * @return {String}         Generated HTML.
+     */
+    self.displayEditFields = function(template, fields, contents) {
+        var replace;
+
+        // Replace the fields found on template.
+        angular.forEach(fields, function(field) {
+            replace = "[[" + field.name + "]]";
+            replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            replace = new RegExp(replace);
+
+            // Replace field by a generic directive.
+            var render = '<mma-mod-data-field mode="edit" field="fields['+ field.id + ']" value="entryContents['+ field.id + ']" database="database"></mma-mod-data-field>';
+            template = template.replace(replace, render);
+
+            // Replace the field id tag.
+            replace = "[[" + field.name + "#id]]";
+            replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            replace = new RegExp(replace);
+
+            template = template.replace(replace, 'field_'+ field.id);
+        });
+
+        return template;
+    };
+
     /**
      * Add a prefix to all rules in a CSS string.
      *
diff --git a/www/addons/mod/data/templates/edit.html b/www/addons/mod/data/templates/edit.html
new file mode 100644
index 00000000000..8521cd0400c
--- /dev/null
+++ b/www/addons/mod/data/templates/edit.html
@@ -0,0 +1,25 @@
+<ion-view>
+    <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
+    <ion-content mm-state-class delegate-handle="mmaModDataEntryScroll">
+        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="databaseLoaded" on-refresh="refreshDatabase(false)"></ion-refresher>
+        <mm-loading hide-until="databaseLoaded">
+            <div ng-if="(groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
+                <ion-label id="mma-data-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
+                <ion-label id="mma-data-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
+                <select ng-model="selectedGroup" ng-change="setGroup(selectedGroup)" aria-labelledby="mma-data-groupslabel" ng-options="group.id as group.name for group in groupInfo.groups" mm-ios-select-fix>
+                </select>
+            </div>
+            <div class="mm-data-contents mma-data-entries-{{data.id}}">
+                <style ng-if="cssTemplate">
+                    {{ cssTemplate }}
+                </style>
+
+                <form id="mma-mod_data-edit-form">
+                    <mm-format-text component="{{component}}" component-id="{{data.cmid}}" watch="true">
+                        {{ editForm }}
+                    </mm-format-text>
+                </form>
+            </div>
+        </mm-loading>
+    </ion-content>
+</ion-view>

From 0f160d5dfcbd24f05d35dd5aeb0385e724fb695e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 20 Jun 2017 10:57:59 +0200
Subject: [PATCH 031/118] MOBILE-2121 data: Render fields to add and edit

---
 .../mod/data/fields/checkbox/directive.js     |  8 +++++
 .../mod/data/fields/checkbox/template.html    |  5 +--
 www/addons/mod/data/fields/date/directive.js  |  9 +++--
 www/addons/mod/data/fields/date/template.html |  5 +--
 www/addons/mod/data/fields/file/directive.js  | 11 ++++--
 www/addons/mod/data/fields/file/template.html |  4 ++-
 .../mod/data/fields/latlong/directive.js      |  8 ++++-
 .../mod/data/fields/latlong/template.html     | 11 +++++-
 www/addons/mod/data/fields/menu/directive.js  |  4 +++
 www/addons/mod/data/fields/menu/template.html |  3 +-
 .../mod/data/fields/multimenu/directive.js    | 11 ++++++
 .../mod/data/fields/multimenu/template.html   |  3 +-
 .../mod/data/fields/number/directive.js       |  7 +++-
 .../mod/data/fields/number/template.html      |  3 +-
 .../mod/data/fields/picture/directive.js      | 11 ++++--
 .../mod/data/fields/picture/template.html     |  4 ++-
 .../mod/data/fields/radiobutton/directive.js  |  4 +++
 .../mod/data/fields/radiobutton/template.html |  3 +-
 www/addons/mod/data/fields/text/directive.js  |  7 +++-
 www/addons/mod/data/fields/text/template.html |  3 +-
 .../mod/data/fields/textarea/directive.js     | 17 ++++++++--
 .../mod/data/fields/textarea/template.html    |  6 +++-
 www/addons/mod/data/fields/url/directive.js   |  7 +++-
 www/addons/mod/data/fields/url/template.html  |  3 +-
 www/addons/mod/data/scss/styles.scss          | 34 ++++++++++++++++++-
 www/core/directives/attachments.js            |  4 +++
 26 files changed, 168 insertions(+), 27 deletions(-)

diff --git a/www/addons/mod/data/fields/checkbox/directive.js b/www/addons/mod/data/fields/checkbox/directive.js
index 9a625df1751..aa40f0bf19c 100644
--- a/www/addons/mod/data/fields/checkbox/directive.js
+++ b/www/addons/mod/data/fields/checkbox/directive.js
@@ -28,6 +28,14 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/checkbox/template.html',
         link: function(scope) {
             scope.options = scope.field.param1.split("\n");
+
+            if (scope.mode == 'edit' && scope.value) {
+                scope.values = {};
+
+                angular.forEach(scope.value.content.split("##"), function(value) {
+                    scope.values[value] = true;
+                });
+            }
         }
     };
 });
diff --git a/www/addons/mod/data/fields/checkbox/template.html b/www/addons/mod/data/fields/checkbox/template.html
index d5fb6bfab3b..b2304beb661 100644
--- a/www/addons/mod/data/fields/checkbox/template.html
+++ b/www/addons/mod/data/fields/checkbox/template.html
@@ -1,4 +1,5 @@
 <ion-list>
-    <ion-checkbox ng-repeat="option in options" name="f_{{field.id}}" ng-value="option">{{ option }}</ion-checkbox>
-    <ion-checkbox name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
+    <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+    <ion-checkbox ng-repeat="option in options" name="f_{{field.id}}" ng-value="option" ng-model="values[option]">{{ option }}</ion-checkbox>
+    <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
 </ion-list>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/date/directive.js b/www/addons/mod/data/fields/date/directive.js
index 6ddbacc5ca0..a50a3f49615 100644
--- a/www/addons/mod/data/fields/date/directive.js
+++ b/www/addons/mod/data/fields/date/directive.js
@@ -27,8 +27,13 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/date/template.html',
         link: function(scope) {
-            scope.value = new Date().toISOString().substr(0, 10);
-            scope.enable = false;
+            if (scope.mode == 'edit' && scope.value) {
+                scope.value = new Date(scope.value.content * 1000).toISOString().substr(0, 10);
+                scope.enable = true;
+            } else {
+                scope.value = new Date().toISOString().substr(0, 10);
+                scope.enable = false;
+            }
         }
     };
 });
diff --git a/www/addons/mod/data/fields/date/template.html b/www/addons/mod/data/fields/date/template.html
index 910b0d8b7c8..bd54b7a2e99 100644
--- a/www/addons/mod/data/fields/date/template.html
+++ b/www/addons/mod/data/fields/date/template.html
@@ -1,2 +1,3 @@
-<input type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable" ng-value="value">
-<ion-checkbox name="f_{{field.id}}_z" ng-model="enable" ng-value="1">{{ 'mma.mod_data.usedate' | translate }}</ion-checkbox>
\ No newline at end of file
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<input type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable && mode == 'search'" ng-value="value">
+<ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_z" ng-model="enable" ng-value="1">{{ 'mma.mod_data.usedate' | translate }}</ion-checkbox>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/file/directive.js b/www/addons/mod/data/fields/file/directive.js
index af66262b89f..a84d2c1cd3a 100644
--- a/www/addons/mod/data/fields/file/directive.js
+++ b/www/addons/mod/data/fields/file/directive.js
@@ -21,10 +21,17 @@ angular.module('mm.addons.mod_data')
  * @ngdoc directive
  * @name mmaModDataFieldFile
  */
-.directive('mmaModDataFieldFile', function() {
+.directive('mmaModDataFieldFile', function(mmaModDataComponent) {
     return {
         restrict: 'A',
         priority: 100,
-        templateUrl: 'addons/mod/data/fields/file/template.html'
+        templateUrl: 'addons/mod/data/fields/file/template.html',
+        link: function(scope) {
+            if (scope.mode == 'edit') {
+                scope.component = mmaModDataComponent;
+                scope.componentId = scope.database.coursemodule;
+                scope.maxSizeBytes = parseInt(scope.field.param3, 10);
+            }
+        }
     };
 });
diff --git a/www/addons/mod/data/fields/file/template.html b/www/addons/mod/data/fields/file/template.html
index 968da84f85e..d3ea0fa63d2 100644
--- a/www/addons/mod/data/fields/file/template.html
+++ b/www/addons/mod/data/fields/file/template.html
@@ -1 +1,3 @@
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
+<mm-attachments ng-if="mode == 'edit'" files="value.files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/latlong/directive.js b/www/addons/mod/data/fields/latlong/directive.js
index 0df21dfa5e5..ce46f8dae9b 100644
--- a/www/addons/mod/data/fields/latlong/directive.js
+++ b/www/addons/mod/data/fields/latlong/directive.js
@@ -25,6 +25,12 @@ angular.module('mm.addons.mod_data')
     return {
         restrict: 'A',
         priority: 100,
-        templateUrl: 'addons/mod/data/fields/latlong/template.html'
+        templateUrl: 'addons/mod/data/fields/latlong/template.html',
+        link: function(scope) {
+            if (scope.value) {
+                scope.north = parseFloat(scope.value.content);
+                scope.east = parseFloat(scope.value.content1);
+            }
+        }
     };
 });
diff --git a/www/addons/mod/data/fields/latlong/template.html b/www/addons/mod/data/fields/latlong/template.html
index 968da84f85e..1745e268c0a 100644
--- a/www/addons/mod/data/fields/latlong/template.html
+++ b/www/addons/mod/data/fields/latlong/template.html
@@ -1 +1,10 @@
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
+<input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<label ng-if="mode == 'edit'" class="item item-input mm-latlong">
+    <input type="text" name="f_{{field.id}}_0" ng-model="north" size="10"/>
+    <span class="placeholder-icon">°N</span>
+</label>
+<label ng-if="mode == 'edit'" class="item item-input mm-latlong">
+    <input type="text" name="f_{{field.id}}_1" ng-model="east" size="10"/>
+    <span class="placeholder-icon">°E</span>
+</label>
diff --git a/www/addons/mod/data/fields/menu/directive.js b/www/addons/mod/data/fields/menu/directive.js
index aa3f830c20c..7eb41e54c48 100644
--- a/www/addons/mod/data/fields/menu/directive.js
+++ b/www/addons/mod/data/fields/menu/directive.js
@@ -28,6 +28,10 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/menu/template.html',
         link: function(scope) {
             scope.options = scope.field.param1.split("\n");
+
+            if (scope.mode == 'edit' && scope.value) {
+                scope.value = scope.value.content;
+            }
         }
     };
 });
diff --git a/www/addons/mod/data/fields/menu/template.html b/www/addons/mod/data/fields/menu/template.html
index 0d88b6646f9..6d99d81b8f1 100644
--- a/www/addons/mod/data/fields/menu/template.html
+++ b/www/addons/mod/data/fields/menu/template.html
@@ -1,5 +1,6 @@
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
 <div class="item item-input item-select">
-    <select name="f_{{field.id}}">
+    <select name="f_{{field.id}}" ng-model="value">
         <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
         <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
     </select>
diff --git a/www/addons/mod/data/fields/multimenu/directive.js b/www/addons/mod/data/fields/multimenu/directive.js
index 9d5d301ff55..515494d842c 100644
--- a/www/addons/mod/data/fields/multimenu/directive.js
+++ b/www/addons/mod/data/fields/multimenu/directive.js
@@ -30,6 +30,17 @@ angular.module('mm.addons.mod_data')
             scope.options = scope.field.param1.split("\n").map(function(option) {
                 return {key: option, value: option};
             });
+
+            if (scope.mode == 'edit' && scope.value) {
+                angular.forEach(scope.value.content.split("##"), function(value) {
+                    for (var x in scope.options) {
+                        if (value == scope.options[x].key) {
+                            scope.options[x].selected = true;
+                            break;
+                        }
+                    }
+                });
+            }
         }
     };
 });
diff --git a/www/addons/mod/data/fields/multimenu/template.html b/www/addons/mod/data/fields/multimenu/template.html
index c5958ce9cc2..7e47d843905 100644
--- a/www/addons/mod/data/fields/multimenu/template.html
+++ b/www/addons/mod/data/fields/multimenu/template.html
@@ -1,2 +1,3 @@
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
 <mm-multiple-select title="{{field.name}}" name="f_{{field.id}}" options="options"></mm-multiple-select>
-<ion-checkbox name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
\ No newline at end of file
+<ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/number/directive.js b/www/addons/mod/data/fields/number/directive.js
index 25fc64a5655..448f00855db 100644
--- a/www/addons/mod/data/fields/number/directive.js
+++ b/www/addons/mod/data/fields/number/directive.js
@@ -25,6 +25,11 @@ angular.module('mm.addons.mod_data')
     return {
         restrict: 'A',
         priority: 100,
-        templateUrl: 'addons/mod/data/fields/number/template.html'
+        templateUrl: 'addons/mod/data/fields/number/template.html',
+        link: function(scope) {
+            if (scope.mode == 'edit' && scope.value) {
+                scope.value = parseFloat(scope.value.content);
+            }
+        }
     };
 });
diff --git a/www/addons/mod/data/fields/number/template.html b/www/addons/mod/data/fields/number/template.html
index e843b626dc2..246b94e3dfb 100644
--- a/www/addons/mod/data/fields/number/template.html
+++ b/www/addons/mod/data/fields/number/template.html
@@ -1 +1,2 @@
-<input type="number" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<input type="number" placeholder="{{field.name}}" name="f_{{field.id}}"  ng-model="value">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/picture/directive.js b/www/addons/mod/data/fields/picture/directive.js
index 1ba245b55fd..ee9d61efc24 100644
--- a/www/addons/mod/data/fields/picture/directive.js
+++ b/www/addons/mod/data/fields/picture/directive.js
@@ -21,10 +21,17 @@ angular.module('mm.addons.mod_data')
  * @ngdoc directive
  * @name mmaModDataFieldPicture
  */
-.directive('mmaModDataFieldPicture', function() {
+.directive('mmaModDataFieldPicture', function(mmaModDataComponent) {
     return {
         restrict: 'A',
         priority: 100,
-        templateUrl: 'addons/mod/data/fields/picture/template.html'
+        templateUrl: 'addons/mod/data/fields/picture/template.html',
+        link: function(scope) {
+            if (scope.mode == 'edit') {
+                scope.component = mmaModDataComponent;
+                scope.componentId = scope.database.coursemodule;
+                scope.maxSizeBytes = parseInt(scope.field.param3, 10);
+            }
+        }
     };
 });
diff --git a/www/addons/mod/data/fields/picture/template.html b/www/addons/mod/data/fields/picture/template.html
index 968da84f85e..d3ea0fa63d2 100644
--- a/www/addons/mod/data/fields/picture/template.html
+++ b/www/addons/mod/data/fields/picture/template.html
@@ -1 +1,3 @@
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
+<mm-attachments ng-if="mode == 'edit'" files="value.files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/radiobutton/directive.js b/www/addons/mod/data/fields/radiobutton/directive.js
index 0c07ec4f5af..6d152555648 100644
--- a/www/addons/mod/data/fields/radiobutton/directive.js
+++ b/www/addons/mod/data/fields/radiobutton/directive.js
@@ -28,6 +28,10 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/radiobutton/template.html',
         link: function(scope) {
             scope.options = scope.field.param1.split("\n");
+
+            if (scope.mode == 'edit' && scope.value) {
+                scope.value = scope.value.content;
+            }
         }
     };
 });
diff --git a/www/addons/mod/data/fields/radiobutton/template.html b/www/addons/mod/data/fields/radiobutton/template.html
index 0d88b6646f9..6d99d81b8f1 100644
--- a/www/addons/mod/data/fields/radiobutton/template.html
+++ b/www/addons/mod/data/fields/radiobutton/template.html
@@ -1,5 +1,6 @@
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
 <div class="item item-input item-select">
-    <select name="f_{{field.id}}">
+    <select name="f_{{field.id}}" ng-model="value">
         <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
         <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
     </select>
diff --git a/www/addons/mod/data/fields/text/directive.js b/www/addons/mod/data/fields/text/directive.js
index 1394ac5846c..9fcb4f4d3f8 100644
--- a/www/addons/mod/data/fields/text/directive.js
+++ b/www/addons/mod/data/fields/text/directive.js
@@ -25,6 +25,11 @@ angular.module('mm.addons.mod_data')
     return {
         restrict: 'A',
         priority: 100,
-        templateUrl: 'addons/mod/data/fields/text/template.html'
+        templateUrl: 'addons/mod/data/fields/text/template.html',
+        link: function(scope) {
+            if (scope.mode == 'edit' && scope.value) {
+                scope.value = scope.value.content;
+            }
+        }
     };
 });
diff --git a/www/addons/mod/data/fields/text/template.html b/www/addons/mod/data/fields/text/template.html
index 968da84f85e..189f72e0ffe 100644
--- a/www/addons/mod/data/fields/text/template.html
+++ b/www/addons/mod/data/fields/text/template.html
@@ -1 +1,2 @@
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}"  ng-model="value">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/textarea/directive.js b/www/addons/mod/data/fields/textarea/directive.js
index 2655d0370dc..c6d8ecb8094 100644
--- a/www/addons/mod/data/fields/textarea/directive.js
+++ b/www/addons/mod/data/fields/textarea/directive.js
@@ -21,10 +21,23 @@ angular.module('mm.addons.mod_data')
  * @ngdoc directive
  * @name mmaModDataFieldTextarea
  */
-.directive('mmaModDataFieldTextarea', function() {
+.directive('mmaModDataFieldTextarea', function($mmUtil, $mmText) {
     return {
         restrict: 'A',
         priority: 100,
-        templateUrl: 'addons/mod/data/fields/textarea/template.html'
+        templateUrl: 'addons/mod/data/fields/textarea/template.html',
+        link: function(scope) {
+            // Check if rich text editor is enabled.
+            if (scope.mode == 'edit') {
+                $mmUtil.isRichTextEditorEnabled().then(function(enabled) {
+                    var text = scope.value ? $mmText.replacePluginfileUrls(scope.value.content, scope.value.files) : "";
+
+                    // Get the text.
+                    scope.model = {
+                        text: text
+                    };
+                });
+            }
+        }
     };
 });
diff --git a/www/addons/mod/data/fields/textarea/template.html b/www/addons/mod/data/fields/textarea/template.html
index 968da84f85e..7759a113d91 100644
--- a/www/addons/mod/data/fields/textarea/template.html
+++ b/www/addons/mod/data/fields/textarea/template.html
@@ -1 +1,5 @@
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
+<div ng-if="mode == 'edit'" class="item item-text-wrap mm-item-has-rich-text-editor">
+    <mm-rich-text-editor model="model" placeholder="{{ field.name }}" name="f_{{field.id}}" component="{{component}}" component-id="{{componentId}}"></mm-rich-text-editor>
+</div>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/url/directive.js b/www/addons/mod/data/fields/url/directive.js
index b4ed5849567..dd641ac988d 100644
--- a/www/addons/mod/data/fields/url/directive.js
+++ b/www/addons/mod/data/fields/url/directive.js
@@ -25,6 +25,11 @@ angular.module('mm.addons.mod_data')
     return {
         restrict: 'A',
         priority: 100,
-        templateUrl: 'addons/mod/data/fields/url/template.html'
+        templateUrl: 'addons/mod/data/fields/url/template.html',
+        link: function(scope) {
+            if (scope.mode == 'edit' && scope.value) {
+                scope.value = scope.value.content;
+            }
+        }
     };
 });
diff --git a/www/addons/mod/data/fields/url/template.html b/www/addons/mod/data/fields/url/template.html
index 968da84f85e..78f2af414af 100644
--- a/www/addons/mod/data/fields/url/template.html
+++ b/www/addons/mod/data/fields/url/template.html
@@ -1 +1,2 @@
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
\ No newline at end of file
+<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="value">
\ No newline at end of file
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index d9df4b7d8d4..61002f7dacb 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -39,7 +39,7 @@
   input[type="tel"],
   input[type="color"],
   .item-select,
-  mm-multiple-select .item {
+  mm-attachments>.item-border {
     width: 100%;
     margin: -1px;
     border: 1px solid $gray;
@@ -47,6 +47,26 @@
     height: 56px;
   }
 
+  mm-attachments .item-media {
+    width: 100%;
+    margin: -1px;
+    border: 1px solid $gray;
+    height: 56px;
+  }
+
+  mm-multiple-select .item {
+    width: 100%;
+    margin: -1px;
+    border: 1px solid $gray;
+    padding: 16px 0 16px 16px;
+  }
+
+  mm-attachments .item {
+    width: 100%;
+    margin: -1px;
+    border: 1px solid $gray;
+  }
+
   .item-checkbox {
     margin-right: 1px;
   }
@@ -56,4 +76,16 @@
       left: 0;
       max-width: none;
   }
+
+  .item-input.mm-latlong {
+    width: 100%;
+    margin: -1px;
+    padding-top: 0;
+    padding-bottom: 0;
+    padding-left: 0;
+
+    input {
+      border: 0;
+    }
+  }
 }
\ No newline at end of file
diff --git a/www/core/directives/attachments.js b/www/core/directives/attachments.js
index 075c1f3af1a..1e01808baab 100644
--- a/www/core/directives/attachments.js
+++ b/www/core/directives/attachments.js
@@ -73,6 +73,10 @@ angular.module('mm.core')
                 scope.unlimitedFiles = true;
             }
 
+            if (typeof scope.files == 'undefined') {
+                scope.files = [];
+            }
+
             scope.add = function() {
                 if (!allowOffline && !$mmApp.isOnline()) {
                     $mmUtil.showErrorModal('mm.fileuploader.errormustbeonlinetoupload', true);

From a44fed8189713108c851dd04337eacfd274f5e2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 20 Jun 2017 13:57:44 +0200
Subject: [PATCH 032/118] MOBILE-2121 data: Send data to the server

---
 www/addons/mod/data/controllers/edit.js       | 19 ++++
 .../mod/data/fields/checkbox/handler.js       | 26 +++++
 www/addons/mod/data/fields/date/handler.js    | 33 +++++++
 www/addons/mod/data/fields/latlong/handler.js | 29 ++++++
 www/addons/mod/data/fields/menu/handler.js    | 20 ++++
 .../mod/data/fields/multimenu/directive.js    |  2 +-
 .../mod/data/fields/multimenu/handler.js      | 23 +++++
 www/addons/mod/data/fields/number/handler.js  | 18 ++++
 .../mod/data/fields/radiobutton/handler.js    | 19 ++++
 www/addons/mod/data/fields/text/handler.js    | 18 ++++
 .../mod/data/fields/textarea/handler.js       | 43 +++++++-
 www/addons/mod/data/fields/url/handler.js     | 18 ++++
 www/addons/mod/data/services/data.js          | 50 ++++++++++
 .../mod/data/services/fieldsdelegate.js       | 41 ++++++++
 www/addons/mod/data/services/helper.js        | 99 ++++++++++++++-----
 www/addons/mod/data/templates/edit.html       |  3 +
 16 files changed, 434 insertions(+), 27 deletions(-)

diff --git a/www/addons/mod/data/controllers/edit.js b/www/addons/mod/data/controllers/edit.js
index 5275f31a64c..9deabef28c8 100644
--- a/www/addons/mod/data/controllers/edit.js
+++ b/www/addons/mod/data/controllers/edit.js
@@ -109,6 +109,25 @@ angular.module('mm.addons.mod_data')
         return fetchEntryData();
     };
 
+    // Saves data.
+    $scope.save = function(page) {
+        return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields)
+                .then(function(editData) {
+            if (editData.length > 0) {
+                var promise;
+
+                if (entry.id) {
+                    promise = $mmaModData.editEntry(entry.id, editData);
+                } else {
+                    promise = $mmaModData.addEntry(data.id, editData, $scope.selectedGroup);
+                }
+
+                // TODO: Treat result.
+                return promise;
+            }
+        });
+    };
+
     // Convenience function to refresh all the data.
     function refreshAllData() {
         var promises = [];
diff --git a/www/addons/mod/data/fields/checkbox/handler.js b/www/addons/mod/data/fields/checkbox/handler.js
index 5d6ee85e301..b3ee51cd76e 100644
--- a/www/addons/mod/data/fields/checkbox/handler.js
+++ b/www/addons/mod/data/fields/checkbox/handler.js
@@ -61,6 +61,32 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the edit form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+
+        var checkboxes = [];
+        angular.forEach(inputData[fieldName], function(value, option) {
+            if (value) {
+                checkboxes.push(option);
+            }
+        });
+        if (checkboxes.length > 0) {
+            return [{
+                fieldid: field.id,
+                value: checkboxes
+            }];
+        }
+
+        return false;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/date/handler.js b/www/addons/mod/data/fields/date/handler.js
index 9d4e5927977..2c981eb43f6 100644
--- a/www/addons/mod/data/fields/date/handler.js
+++ b/www/addons/mod/data/fields/date/handler.js
@@ -63,6 +63,39 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+
+        var values = [],
+            date = inputData[fieldName].split('-'),
+            year = date[0],
+            month = date[1],
+            day = date[2];
+        values.push({
+            fieldid: field.id,
+            subfield: 'year',
+            value: year
+        });
+        values.push({
+            fieldid: field.id,
+            subfield: 'month',
+            value: month
+        });
+        values.push({
+            fieldid: field.id,
+            subfield: 'day',
+            value: day
+        });
+        return values;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/latlong/handler.js b/www/addons/mod/data/fields/latlong/handler.js
index 71c6db3f03f..f99ddb3e7a6 100644
--- a/www/addons/mod/data/fields/latlong/handler.js
+++ b/www/addons/mod/data/fields/latlong/handler.js
@@ -43,6 +43,35 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+
+        var values = [];
+
+        if (inputData[fieldName + '_0']) {
+            values.push({
+                fieldid: field.id,
+                subfield: '0',
+                value: inputData[fieldName + '_0']
+            });
+        }
+        if (inputData[fieldName + '_1']) {
+            values.push({
+                fieldid: field.id,
+                subfield: '1',
+                value: inputData[fieldName + '_1']
+            });
+        }
+        return values;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/menu/handler.js b/www/addons/mod/data/fields/menu/handler.js
index b30736782e5..6ff0dcc2139 100644
--- a/www/addons/mod/data/fields/menu/handler.js
+++ b/www/addons/mod/data/fields/menu/handler.js
@@ -43,6 +43,26 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+
+        if (inputData[fieldName]) {
+            return [{
+                fieldid: field.id,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/multimenu/directive.js b/www/addons/mod/data/fields/multimenu/directive.js
index 515494d842c..0979d997763 100644
--- a/www/addons/mod/data/fields/multimenu/directive.js
+++ b/www/addons/mod/data/fields/multimenu/directive.js
@@ -31,7 +31,7 @@ angular.module('mm.addons.mod_data')
                 return {key: option, value: option};
             });
 
-            if (scope.mode == 'edit' && scope.value) {
+            if (scope.mode == 'edit' && scope.value && scope.value.content) {
                 angular.forEach(scope.value.content.split("##"), function(value) {
                     for (var x in scope.options) {
                         if (value == scope.options[x].key) {
diff --git a/www/addons/mod/data/fields/multimenu/handler.js b/www/addons/mod/data/fields/multimenu/handler.js
index 1fe28f266ec..8fa7078568c 100644
--- a/www/addons/mod/data/fields/multimenu/handler.js
+++ b/www/addons/mod/data/fields/multimenu/handler.js
@@ -58,6 +58,29 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+
+        if (inputData[fieldName].length > 0) {
+            var options = inputData[fieldName].split('###');
+            if (options.length > 0) {
+                return [{
+                    fieldid: field.id,
+                    value: options
+                }];
+            }
+        }
+
+        return false;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/number/handler.js b/www/addons/mod/data/fields/number/handler.js
index 50110ebbead..46fd202ba44 100644
--- a/www/addons/mod/data/fields/number/handler.js
+++ b/www/addons/mod/data/fields/number/handler.js
@@ -44,6 +44,24 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the edit form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                fieldid: field.id,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/radiobutton/handler.js b/www/addons/mod/data/fields/radiobutton/handler.js
index 0546748ff53..a599e6af342 100644
--- a/www/addons/mod/data/fields/radiobutton/handler.js
+++ b/www/addons/mod/data/fields/radiobutton/handler.js
@@ -43,6 +43,25 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+
+        if (inputData[fieldName]) {
+            return [{
+                fieldid: field.id,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/text/handler.js b/www/addons/mod/data/fields/text/handler.js
index c33a29cbd97..755f5768fe2 100644
--- a/www/addons/mod/data/fields/text/handler.js
+++ b/www/addons/mod/data/fields/text/handler.js
@@ -43,6 +43,24 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the edit form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                fieldid: field.id,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/textarea/handler.js b/www/addons/mod/data/fields/textarea/handler.js
index ab45cc61272..be9fce8766b 100644
--- a/www/addons/mod/data/fields/textarea/handler.js
+++ b/www/addons/mod/data/fields/textarea/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldTextareaHandler
  */
-.factory('$mmaModDataFieldTextareaHandler', function() {
+.factory('$mmaModDataFieldTextareaHandler', function($mmText, $mmUtil) {
 
     var self = {};
 
@@ -43,6 +43,47 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get the text to submit.
+     *
+     * @param  {Object} field     Field.
+     * @param  {Object} inputData Data entered in the edit form.
+     * @return {String}           Text to submit.
+     */
+    function getTextToSubmit(plugin, text) {
+
+
+        return
+    }
+
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the edit form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return $mmUtil.isRichTextEditorEnabled().then(function(enabled) {
+                var files = field.files ? field.files : [],
+                    text = $mmText.restorePluginfileUrls(inputData[fieldName], files);
+
+                if (!enabled) {
+                    // Rich text editor not enabled, add some HTML to the text if needed.
+                    text = $mmText.formatHtmlLines(text);
+                }
+
+                return [{
+                    fieldid: field.id,
+                    value: text
+                }];
+            });
+        }
+        return false;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/url/handler.js b/www/addons/mod/data/fields/url/handler.js
index 822d8d937ae..bc71b7fb7db 100644
--- a/www/addons/mod/data/fields/url/handler.js
+++ b/www/addons/mod/data/fields/url/handler.js
@@ -43,6 +43,24 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+        /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the edit form.
+     * @return {Array}             With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var fieldName = 'f_' + field.id;
+        if (inputData[fieldName]) {
+            return [{
+                fieldid: field.id,
+                value: inputData[fieldName]
+            }];
+        }
+        return false;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index ca91d6279db..3b629da7c32 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -436,6 +436,56 @@ angular.module('mm.addons.mod_data')
         });
     };
 
+    /**
+     * Adds a new entry to a database.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#addEntry
+     * @param   {Number}    dataId          Data instance ID.
+     * @param   {Object}    data            The fields data to be created.
+     * @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.
+     * @return  {Promise}                   Promise resolved when the action is done.
+     */
+    self.addEntry = function(dataId, data, groupId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    databaseid: dataId,
+                    data: data
+                };
+
+            if (typeof groupId !== "undefined") {
+                params.groupid = groupId;
+            }
+
+            return site.write('mod_data_add_entry', params);
+        });
+    };
+
+    /**
+     * Updates an existing entry.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#addEntry
+     * @param   {Number}    entryId         Entry ID.
+     * @param   {Object}    data            The fields data to be updated.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @return  {Promise}                   Promise resolved when the action is done.
+     */
+    self.editEntry = function(entryId, data, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    entryid: entryId,
+                    data: data
+                };
+
+            return site.write('mod_data_update_entry', params);
+        });
+    };
+
+
     /**
      * Performs search over a database.
      *
diff --git a/www/addons/mod/data/services/fieldsdelegate.js b/www/addons/mod/data/services/fieldsdelegate.js
index 176e6a168ec..96e528cbb3f 100644
--- a/www/addons/mod/data/services/fieldsdelegate.js
+++ b/www/addons/mod/data/services/fieldsdelegate.js
@@ -84,6 +84,43 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get database data in the input data to add or update entry.
+     *
+     * @module mm.addons.mod_assign
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#getFieldEditData
+     * @param  {Object} field      Defines the field to be rendered.
+     * @param  {Object} inputData  Data entered in the search form.
+     * @return {Array}             Name and data field.
+     */
+    self.getFieldEditData = function(field, inputData) {
+        var handler = self.getPluginHandler(field.type);
+        if (handler && handler.getFieldEditData) {
+            return handler.getFieldEditData(field, inputData);
+        }
+        return false;
+    };
+
+    /**
+     * Get files used by this plugin.
+     * The files returned by this function will be prefetched when the user prefetches the database.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#getPluginFiles
+     * @param  {Object} field      Defines the field.
+     * @param  {Object} content    Defines the content that contains the files.
+     * @return {Array}             List of files.
+     */
+    self.getPluginFiles = function(field, content) {
+        var handler = self.getPluginHandler(field.type);
+        if (handler && handler.getPluginFiles) {
+            return handler.getPluginFiles(field, content);
+        }
+        return content.files;
+    };
+
     /**
      * Get the directive to use for a certain feedback plugin.
      *
@@ -131,6 +168,10 @@ angular.module('mm.addons.mod_data')
      *                           returning an object defining these properties. See {@link $mmUtil#resolveObject}.
      *                             - getFieldSearchData(field, inputData) Optional.
      *                                                           Should return name and data entered to the field.
+     *                             - getFieldEditData(field, inputData) Optional.
+     *                                                           Should return name and data entered to the field.
+     *                             - getPluginFiles(plugin, inputData) Optional.
+     *                                                           Should return file list of the field.
      */
     self.registerHandler = function(addon, pluginType, handler) {
         if (typeof handlers[pluginType] !== 'undefined') {
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 89edbb53ece..baba019d798 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataHelper
  */
-.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate) {
+.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q) {
 
     var self = {
             searchOther: {
@@ -66,22 +66,13 @@ angular.module('mm.addons.mod_data')
     };
 
     /**
-     * Retrieve the entered data in search in a form.
-     * We don't use ng-model because it doesn't detect changes done by JavaScript.
+     * Return the form data.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataHelper#getSearchDataFromForm
-     * @param  {Object} form     Form (DOM element).
-     * @param  {Array}  fields   Fields that defines every content in the entry.
-     * @return {Object}          Object with the answers.
+     * @param  {Object} form Form (DOM element).
+     * @return {Object}      Data retrieved from form.
      */
-    self.getSearchDataFromForm = function(form, fields) {
-        if (!form || !form.elements) {
-            return {};
-        }
-
-        var searchedData = {};
+    function getFormData(form) {
+        var formData = {};
 
         angular.forEach(form.elements, function(element) {
             var name = element.name || '';
@@ -92,30 +83,49 @@ angular.module('mm.addons.mod_data')
 
             // Get the value.
             if (element.type == 'checkbox') {
-                if (typeof searchedData[name] == "undefined") {
-                    searchedData[name] = {};
+                if (typeof formData[name] == "undefined") {
+                    formData[name] = {};
                 }
-                searchedData[name][element.value] = !!element.checked;
+                formData[name][element.value] = !!element.checked;
             } else if (element.type == 'radio') {
                 if (element.checked) {
-                    searchedData[name] = element.value;
+                    formData[name] = element.value;
                 }
             } else {
-                searchedData[name] = element.value;
+                formData[name] = element.value;
             }
         });
 
+        return formData;
+    }
+
+    /**
+     * Retrieve the entered data in search in a form.
+     * We don't use ng-model because it doesn't detect changes done by JavaScript.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getSearchDataFromForm
+     * @param  {Object} form     Form (DOM element).
+     * @param  {Array}  fields   Fields that defines every content in the entry.
+     * @return {Object}          Object with the answers.
+     */
+    self.getSearchDataFromForm = function(form, fields) {
+        if (!form || !form.elements) {
+            return {};
+        }
+
+        var searchedData = getFormData(form);
+
         // Filter and translate fields to each field plugin.
         var advancedSearch = [];
         angular.forEach(fields, function(field) {
             var fieldData = $mmaModDataFieldsDelegate.getFieldSearchData(field, searchedData);
             if (fieldData) {
                 angular.forEach(fieldData, function(data) {
+                    data.value = JSON.stringify(data.value);
                     // WS wants values in Json format.
-                    advancedSearch.push({
-                        name: data.name,
-                        value: JSON.stringify(data.value)
-                    });
+                    advancedSearch.push(data);
                 });
             }
         });
@@ -145,7 +155,7 @@ angular.module('mm.addons.mod_data')
      * @param {Array}  [contents] Contents for the editing entry (if editing).
      * @return {String}         Generated HTML.
      */
-    self.displayEditFields = function(template, fields, contents) {
+    self.displayEditFields = function(template, fields) {
         var replace;
 
         // Replace the fields found on template.
@@ -169,6 +179,45 @@ angular.module('mm.addons.mod_data')
         return template;
     };
 
+    /**
+     * Retrieve the entered data in the edit form.
+     * We don't use ng-model because it doesn't detect changes done by JavaScript.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getEditDataFromForm
+     * @param  {Object} form     Form (DOM element).
+     * @param  {Array}  fields   Fields that defines every content in the entry.
+     * @return {Object}          Object with the answers.
+     */
+    self.getEditDataFromForm = function(form, fields) {
+        if (!form || !form.elements) {
+            return {};
+        }
+
+        var formData = getFormData(form);
+
+        // Filter and translate fields to each field plugin.
+        var edit = [],
+            promises = [];
+        angular.forEach(fields, function(field) {
+            promises.push($q.when($mmaModDataFieldsDelegate.getFieldEditData(field, formData)).then(function (fieldData) {
+                if (fieldData) {
+                    angular.forEach(fieldData, function(data) {
+                        data.value = JSON.stringify(data.value);
+                        // WS wants values in Json format.
+                        edit.push(data);
+                    });
+                }
+            }));
+        });
+
+        return $q.all(promises).then(function() {
+            console.error(formData, edit);
+            return edit;
+        });
+    };
+
     /**
      * Add a prefix to all rules in a CSS string.
      *
diff --git a/www/addons/mod/data/templates/edit.html b/www/addons/mod/data/templates/edit.html
index 8521cd0400c..9bd0062315b 100644
--- a/www/addons/mod/data/templates/edit.html
+++ b/www/addons/mod/data/templates/edit.html
@@ -1,5 +1,8 @@
 <ion-view>
     <ion-nav-title><mm-format-text watch="true">{{ title }}</mm-format-text></ion-nav-title>
+    <ion-nav-buttons side="secondary">
+        <a class="button button-clear" ng-click="save()" aria-label="{{ 'mm.core.save' | translate }}"> {{ 'mm.core.save' | translate }}</a>
+    </ion-nav-buttons>
     <ion-content mm-state-class delegate-handle="mmaModDataEntryScroll">
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="databaseLoaded" on-refresh="refreshDatabase(false)"></ion-refresher>
         <mm-loading hide-until="databaseLoaded">

From e815b35de47a2e6f8eaac23e4a011843a877dba1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 21 Jun 2017 15:50:14 +0200
Subject: [PATCH 033/118] MOBILE-2146 core: Implement mmChrono directive

---
 www/core/directives/chrono.js    | 178 +++++++++++++++++++++++++++++++
 www/core/filters/secondstohms.js |   3 +
 2 files changed, 181 insertions(+)
 create mode 100644 www/core/directives/chrono.js

diff --git a/www/core/directives/chrono.js b/www/core/directives/chrono.js
new file mode 100644
index 00000000000..12cedd17a31
--- /dev/null
+++ b/www/core/directives/chrono.js
@@ -0,0 +1,178 @@
+// (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 chronometer in format HH:MM:SS.
+ *
+ * @module mm.core
+ * @ngdoc directive
+ * @name mmChrono
+ * @description
+ * This directive shows a chronometer in format HH:MM:SS.
+ *
+ * If no startTime is provided, it will start at 00:00:00. If the startTime changes, the chrono
+ * will be resetted to the startTime (and it will keep running if it was already running).
+ * If an endTime is provided, the chrono will stop and call the onEnd function when that number of seconds is reached.
+ * E.g. if startTime=60000 and endTime=120000, the chrono will start at 00:01:00 and end when it reaches 00:02:00.
+ *
+ * This directive listens for scope events to start and stop the timer. All events accept an object as a parameter.
+ * If the chrono has an id, the events must pass an id in the param object.
+ *
+ * mm-chrono-start To start the chrono.
+ * mm-chrono-stop To stop the chrono, leaving the current value.
+ * mm-chrono-reset To stop and reset the chrono. If the chrono should play after reset, pass play=true.
+ *
+ * Example usage:
+ * <mm-chrono id="'mychrono'" start-time="chronoStart" end-time="chronoEnd" auto-play="true" on-end="chronoEnd()"></mm-chrono>
+ *
+ * Then the controller can send events like this:
+ *
+ * $scope.$broadcast('mm-chrono-reset', {id: 'mychrono', play: true});
+ *
+ * @param {Number} [id]        ID to identify the chrono. It's used when sending events to the chrono.
+ * @param {Number} [startTime] Number of milliseconds to put in the chrono before starting. Defaults to 0.
+ * @param {Number} [endTime]   Number of milliseconds to stop the chrono. By default, never stop it.
+ * @param {Boolean} [autoPlay] True to start the chrono automatically right after creating it.
+ * @param {Function} [onEnd]   Function called when the endTime is reached.
+ */
+.directive('mmChrono', function($interval) {
+
+    /**
+     * Check if an event received belongs to the current chrono.
+     *
+     * @param  {Object} scope Chrono's scope.
+     * @param  {Object} data  Data received by the event.
+     * @return {Boolean}      True if this chrono, false otherwise.
+     */
+    function isCurrentChrono(scope, data) {
+        if (!scope.id && (!data || !data.id)) {
+            // Neither the chrono or the event has ID, consider it's this chrono.
+            return true;
+        } else if (scope.id && data && data.id == scope.id) {
+            // IDs match, it's this chrono.
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Reset the chrono, stopping it and setting it to startTime.
+     *
+     * @param  {Object} scope Chrono's scope.
+     * @return {Void}
+     */
+    function reset(scope) {
+        stop(scope);
+        scope.time = scope.startTime || 0;
+    }
+
+    /**
+     * Start the chrono if it isn't running.
+     *
+     * @param  {Object} scope Chrono's scope.
+     * @return {Void}
+     */
+    function start(scope) {
+        if (scope.isRunning) {
+            // Already running.
+            return;
+        }
+
+        var lastExecTime = Date.now();
+        scope.isRunning = true;
+
+        scope.interval = $interval(function() {
+            // Increase the chrono.
+            scope.time += Date.now() - lastExecTime;
+            lastExecTime = Date.now();
+
+            if (typeof scope.endTime != 'undefined' && scope.time > scope.endTime) {
+                // End time reached, stop the timer and call the end function.
+                stop(scope);
+                if (scope.onEnd) {
+                    scope.onEnd();
+                }
+            }
+        }, 200);
+    }
+
+    /**
+     * Stop the chrono, leaving the same time it has.
+     *
+     * @param  {Object} scope Chrono's scope.
+     * @return {Void}
+     */
+    function stop(scope) {
+        scope.isRunning = false;
+        $interval.cancel(scope.interval);
+    }
+
+    return {
+        restrict: 'E',
+        scope: {
+            id: '=?',
+            startTime: '=?',
+            endTime: '=?',
+            autoPlay: '=?',
+            onEnd: '&?'
+        },
+        template: '<span>{{ time / 1000 | mmSecondsToHMS }}</span>',
+        link: function(scope) {
+            scope.time = scope.startTime || 0;
+
+            // Listen for events to start, stop and reset.
+            scope.$on('mm-chrono-start', function (e, data) {
+                if (isCurrentChrono(scope, data)) {
+                    start(scope);
+                }
+            });
+
+            scope.$on('mm-chrono-stop', function (e, data) {
+                if (isCurrentChrono(scope, data)) {
+                    stop(scope);
+                }
+            });
+
+            scope.$on('mm-chrono-reset', function (e, data) {
+                if (isCurrentChrono(scope, data)) {
+                    reset(scope);
+                    if (data && data.play) {
+                        start(scope);
+                    }
+                }
+            });
+
+            // If start time changes, reset the chrono.
+            scope.$watch('startTime', function() {
+                var wasRunning = scope.isRunning;
+                reset(scope);
+                if (wasRunning) {
+                    start(scope);
+                }
+            });
+
+            if (scope.autoPlay && scope.autoPlay !== 'false') {
+                // auto-play is true, start the chrono now.
+                start(scope);
+            }
+
+            scope.$on('$destroy', function() {
+                stop(scope);
+            });
+        }
+    };
+});
diff --git a/www/core/filters/secondstohms.js b/www/core/filters/secondstohms.js
index 2649bdab51d..87bbecdf729 100644
--- a/www/core/filters/secondstohms.js
+++ b/www/core/filters/secondstohms.js
@@ -32,6 +32,9 @@ angular.module('mm.core')
 
         if (typeof seconds == 'undefined' || seconds < 0) {
             seconds = 0;
+        } else {
+            // Don't allow decimals.
+            seconds = Math.floor(seconds);
         }
 
         hours = Math.floor(seconds / mmCoreSecondsHour);

From 91c836b002af97c2c72102719bb8ca28f0ee3aae Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 21 Jun 2017 15:57:04 +0200
Subject: [PATCH 034/118] MOBILE-2146 media: Allow recording video

---
 www/core/components/emulator/scss/styles.scss |  37 +++
 .../components/emulator/services/emulator.js  |   3 +-
 .../emulator/services/mediacapture.js         | 257 ++++++++++++++++++
 .../emulator/templates/capturemediamodal.html |  25 ++
 .../fileuploader/services/handlers.js         |   2 +-
 .../fileuploader/services/helper.js           |   3 +-
 www/core/lang/en.json                         |   1 +
 www/core/lib/app.js                           |  24 ++
 www/core/scss/styles.scss                     |  16 ++
 www/index.html                                |   2 +-
 10 files changed, 366 insertions(+), 4 deletions(-)
 create mode 100644 www/core/components/emulator/scss/styles.scss
 create mode 100644 www/core/components/emulator/services/mediacapture.js
 create mode 100644 www/core/components/emulator/templates/capturemediamodal.html

diff --git a/www/core/components/emulator/scss/styles.scss b/www/core/components/emulator/scss/styles.scss
new file mode 100644
index 00000000000..b6c3f5e369f
--- /dev/null
+++ b/www/core/components/emulator/scss/styles.scss
@@ -0,0 +1,37 @@
+.mm-capture-media-modal {
+    background-color: $gray-light;
+
+    .bar-header {
+        @include bar-style($bar-content-bg, $bar-content-border, $bar-content-text);
+
+        .button {
+            color: $bar-content-text;
+            font-weight: normal;
+        }
+    }
+
+    video {
+        width: 100%;
+        height: 100%;
+
+        &.mm-webcam-stream {
+            -webkit-transform: scaleX(-1);
+            transform: scaleX(-1);
+        }
+    }
+
+    .bar-footer {
+        background-color: $gray;
+        border-top-color: $gray-dark;
+
+        .col {
+            padding: 0;
+            line-height: $bar-height - $bar-padding-portrait * 2;
+            color: $positive;
+
+            .ion-record {
+                color: red;
+            }
+        }
+    }
+}
diff --git a/www/core/components/emulator/services/emulator.js b/www/core/components/emulator/services/emulator.js
index 0d370a95ce1..1f1216e7f24 100644
--- a/www/core/components/emulator/services/emulator.js
+++ b/www/core/components/emulator/services/emulator.js
@@ -23,7 +23,7 @@ angular.module('mm.core')
  */
 .factory('$mmEmulatorManager', function($log, $q, $mmFS, $mmEmulatorClipboard, $mmEmulatorCustomURLScheme, $mmEmulatorFile,
             $mmEmulatorFileTransfer, $mmEmulatorGlobalization, $mmEmulatorInAppBrowser, $mmEmulatorLocalNotifications,
-            $mmEmulatorPushNotifications, $mmEmulatorZip, $mmUtil) {
+            $mmEmulatorPushNotifications, $mmEmulatorZip, $mmUtil, $mmEmulatorMediaCapture) {
 
     $log = $log.getInstance('$mmEmulatorManager');
 
@@ -55,6 +55,7 @@ angular.module('mm.core')
         promises.push($mmEmulatorGlobalization.load());
         promises.push($mmEmulatorInAppBrowser.load());
         promises.push($mmEmulatorLocalNotifications.load());
+        promises.push($mmEmulatorMediaCapture.load());
         promises.push($mmEmulatorPushNotifications.load());
         promises.push($mmEmulatorZip.load());
 
diff --git a/www/core/components/emulator/services/mediacapture.js b/www/core/components/emulator/services/mediacapture.js
new file mode 100644
index 00000000000..46183df830d
--- /dev/null
+++ b/www/core/components/emulator/services/mediacapture.js
@@ -0,0 +1,257 @@
+// (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.emulator')
+
+/**
+ * This service handles the emulation of the Cordova Media Capture plugin in desktop apps and in browser.
+ *
+ * @ngdoc service
+ * @name $mmEmulatorMediaCapture
+ * @module mm.core.emulator
+ */
+.factory('$mmEmulatorMediaCapture', function($log, $q, $ionicModal, $rootScope, $window, $mmUtil, $mmFS, $timeout) {
+
+    $log = $log.getInstance('$mmEmulatorMediaCapture');
+
+    var self = {},
+        possibleVideoMimeTypes = {
+            'video/webm;codecs=vp9': 'webm',
+            'video/webm;codecs=vp8': 'webm',
+            'video/ogg': 'ogv'
+        },
+        videoMimeType;
+
+    /**
+     * Init the getUserMedia function, using a deprecated function as fallback if the new one doesn't exist.
+     *
+     * @return {Boolean} Whether the function is supported.
+     */
+    function initGetUserMedia() {
+        // Check if there is a function to get user media.
+        navigator.mediaDevices = navigator.mediaDevices || {};
+
+        if (!navigator.mediaDevices.getUserMedia) {
+            // New function doesn't exist, check if the deprecated function is supported.
+            navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia ||
+                            navigator.mozGetUserMedia || navigator.msGetUserMedia;
+
+            if (navigator.getUserMedia) {
+                // Deprecated function exists, support the new function using the deprecated one.
+                navigator.mediaDevices.getUserMedia = function(constraints) {
+                    var deferred = $q.defer();
+                    navigator.getUserMedia(constraints, deferred.resolve, deferred.reject);
+                    return deferred.promise;
+                };
+            } else {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Initialize the mimetypes to use when capturing.
+     *
+     * @return {Void}
+     */
+    function initMimeTypes() {
+        // Determine video mimetype.
+        for (var mimeType in possibleVideoMimeTypes) {
+            if (MediaRecorder.isTypeSupported(mimeType)) {
+                videoMimeType = mimeType;
+                break;
+            }
+        }
+    }
+
+    /**
+     * Initialize the modal to capture media.
+     *
+     * @param  {Object} scope Scope to use in the modal.
+     * @return {Promise}      Promise resolved when the modal is initialized.
+     */
+    function initModal(scope) {
+        // Chat users modal.
+        return $ionicModal.fromTemplateUrl('core/components/emulator/templates/capturemediamodal.html', {
+            scope: scope,
+            animation: 'slide-in-up'
+        }).then(function(modal) {
+            scope.modal = modal;
+
+            return modal;
+        });
+    }
+
+    /**
+     * Load the emulation of the Cordova plugin.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorMediaCapture#load
+     * @return {Promise} Promise resolved when done.
+     */
+    self.load = function() {
+        if (typeof window.MediaRecorder == 'undefined') {
+            // Cannot record.
+            return $q.when();
+        }
+
+        if (!initGetUserMedia()) {
+            // Function not supported, stop.
+            return $q.when();
+        }
+
+        initMimeTypes();
+
+        navigator.device = navigator.device || {};
+        navigator.device.capture = navigator.device.capture || {};
+
+        navigator.device.capture.captureVideo = function(successCallback, errorCallback, options) {
+            try {
+                var scope = $rootScope.$new(),
+                    loadingModal = $mmUtil.showModalLoading();
+
+                if (options && options.duration) {
+                    scope.chronoEndTime = options.duration * 1000;
+                }
+
+                initModal(scope).then(function(modal) {
+                    navigator.mediaDevices.getUserMedia({video: true, audio: true}).then(function(localMediaStream) {
+                        var streamVideo = modal.modalEl.querySelector('video.mm-webcam-stream'),
+                            viewVideo = modal.modalEl.querySelector('video.mm-webcam-video-captured'),
+                            mediaRecorder = new MediaRecorder(localMediaStream, {mimeType: videoMimeType}),
+                            chunks = [],
+                            mediaBlob;
+
+                        // Set the stream as the source of the video.
+                        streamVideo.src = $window.URL.createObjectURL(localMediaStream);
+
+                        // When data is captured, add it to the list of chunks.
+                        mediaRecorder.ondataavailable = function(e) {
+                            if (e.data.size > 0) {
+                                chunks.push(e.data);
+                            }
+                        };
+
+                        // When capturing stops, create a Blob element with the recording and set it to the video.
+                        mediaRecorder.onstop = function() {
+                            mediaBlob = new Blob(chunks);
+                            chunks = [];
+
+                            viewVideo.src = $window.URL.createObjectURL(mediaBlob);
+                        };
+
+                        // Stream ready, show modal.
+                        streamVideo.onloadedmetadata = function() {
+                            loadingModal.dismiss();
+                            modal.show();
+                            scope.readyToCapture = true;
+                            streamVideo.onloadedmetadata = null;
+                        };
+
+                        // Capture or stop capturing (for video and audio).
+                        scope.actionClicked = function() {
+                            if (scope.isCapturing) {
+                                // It's capturing, stop.
+                                scope.stopCapturing();
+                            } else {
+                                // Start the capture.
+                                mediaRecorder.start();
+                                scope.isCapturing = true;
+                                scope.$broadcast('mm-chrono-start');
+                            }
+                        };
+
+                        // Stop capturing.
+                        scope.stopCapturing = function() {
+                            streamVideo.pause();
+                            mediaRecorder.stop();
+                            scope.isCapturing = false;
+                            scope.hasCaptured = true;
+                            scope.$broadcast('mm-chrono-stop');
+                        };
+
+                        // Discard the captured media.
+                        scope.discard = function() {
+                            viewVideo.pause();
+                            streamVideo.play();
+
+                            scope.hasCaptured = false;
+                            scope.isCapturing = false;
+                            scope.$broadcast('mm-chrono-reset');
+                            delete mediaBlob;
+                        };
+
+                        // Done capturing, write the file.
+                        scope.done = function() {
+                            if (!mediaBlob) {
+                                // Shouldn't happen.
+                                $mmUtil.showErrorModal('Please capture the media first.');
+                                return;
+                            }
+
+                            // Create the file and return it.
+                            var fileName = 'video_' + $mmUtil.readableTimestamp() + '.' + possibleVideoMimeTypes[videoMimeType],
+                                path = $mmFS.concatenatePaths($mmFS.getTmpFolder(), 'media/' + fileName);
+
+                            loadingModal = $mmUtil.showModalLoading();
+
+                            $mmFS.writeFile(path, mediaBlob).then(function(fileEntry) {
+                                scope.modal.hide();
+
+                                // Wait for the modal to close before calling the callback to prevent Ionic bug with modals.
+                                $timeout(function() {
+                                    successCallback && successCallback([fileEntry]);
+                                }, 400);
+                            }).catch(function(err) {
+                                $mmUtil.showErrorModal(err);
+                            }).finally(function() {
+                                loadingModal.dismiss();
+                            });
+                        };
+
+                        // Capture cancelled.
+                        scope.cancel = function() {
+                            scope.modal.hide();
+                            errorCallback && errorCallback({code: 3, message: "Canceled."});
+                        };
+
+                        scope.$on('modal.hidden', function() {
+                            // Modal hidden, stop video and stream and destroy the scope.
+                            var tracks = localMediaStream.getTracks();
+                            angular.forEach(tracks, function(track) {
+                                track.stop();
+                            });
+                            streamVideo.pause();
+                            viewVideo.pause();
+                            scope.$destroy();
+                        });
+
+                        scope.$on('$destroy', function() {
+                            scope.modal.remove();
+                        });
+                      }).catch(errorCallback);
+                }, errorCallback);
+            } catch(ex) {
+                errorCallback(ex.toString());
+            }
+        };
+
+        return $q.when();
+    };
+
+    return self;
+});
diff --git a/www/core/components/emulator/templates/capturemediamodal.html b/www/core/components/emulator/templates/capturemediamodal.html
new file mode 100644
index 00000000000..e3680c156b1
--- /dev/null
+++ b/www/core/components/emulator/templates/capturemediamodal.html
@@ -0,0 +1,25 @@
+<ion-modal-view class="mm-fullscreen-modal mm-capture-media-modal">
+    <ion-header-bar class="bar-header">
+        <button class="button button-clear" ng-click="cancel()">{{ 'mm.core.cancel' | translate }}</button>
+        <h1 class="title">{{ 'mm.core.capturemedia' | translate }}</h1>
+        <button class="button button-clear" ng-if="hasCaptured" ng-click="done()">{{ 'mm.core.done' | translate }}</button>
+    </ion-header-bar>
+
+    <ion-content>
+        <!-- For video recording, use 2 videos and show/hide them because a CSS rule caused problems with the controls. -->
+        <video ng-show="!hasCaptured" class="mm-webcam-stream" autoplay></video>
+        <video ng-show="hasCaptured" class="mm-webcam-video-captured" controls></video>
+    </ion-content>
+
+    <ion-footer-bar class="row">
+        <div class="col">
+            <button ng-if="hasCaptured" class="button button-clear" ng-click="discard()">{{ 'mm.core.discard' | translate }}</button>
+        </div>
+        <div class="col text-center">
+            <button ng-if="!hasCaptured" class="button button-clear button-icon" ng-class="{'ion-record': readyToCapture && !isCapturing, 'ion-stop': isCapturing}" ng-click="actionClicked()"></button>
+        </div>
+        <div class="col text-right">
+            <mm-chrono ng-show="!hasCaptured" end-time="chronoEndTime" on-end="stopCapturing()"></mm-chrono>
+        </div>
+    </ion-footer-bar>
+</ion-modal-view>
\ No newline at end of file
diff --git a/www/core/components/fileuploader/services/handlers.js b/www/core/components/fileuploader/services/handlers.js
index 13106a7b9df..edb5f56c9cc 100644
--- a/www/core/components/fileuploader/services/handlers.js
+++ b/www/core/components/fileuploader/services/handlers.js
@@ -177,7 +177,7 @@ angular.module('mm.core.fileuploader')
          * @return {Boolean} True if handler is enabled, false otherwise.
          */
         self.isEnabled = function() {
-            return $mmApp.isDevice();
+            return $mmApp.isDevice() || ($mmApp.canGetUserMedia() && $mmApp.canRecordMedia());
         };
 
         /**
diff --git a/www/core/components/fileuploader/services/helper.js b/www/core/components/fileuploader/services/helper.js
index f0f0cd9f9f3..ac06e7d6d48 100644
--- a/www/core/components/fileuploader/services/helper.js
+++ b/www/core/components/fileuploader/services/helper.js
@@ -431,7 +431,8 @@ angular.module('mm.core.fileuploader')
         return fn({limit: 1}).then(function(medias) {
             // We used limit 1, we only want 1 media.
             var media = medias[0],
-                path = media.localURL;
+                path = media.localURL || media.toURL();
+
             if (upload) {
                 return uploadFile(true, path, maxSize, true, $mmFileUploader.uploadMedia, media);
             } else {
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 3870dcb79dd..027f92f4322 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -7,6 +7,7 @@
     "cancel": "Cancel",
     "cannotconnect": "Cannot connect: Verify that you have typed correctly the URL and that your site uses Moodle 2.4 or later.",
     "cannotdownloadfiles": "File downloading is disabled in your Mobile service. Please, contact your site administrator.",
+    "capturemedia": "Capture media",
     "category": "Category",
     "choose": "Choose",
     "choosedots": "Choose...",
diff --git a/www/core/lib/app.js b/www/core/lib/app.js
index 4b40c7d47f3..be75fa0233e 100644
--- a/www/core/lib/app.js
+++ b/www/core/lib/app.js
@@ -103,6 +103,30 @@ angular.module('mm.core')
             self = {},
             ssoAuthenticationDeferred;
 
+        /**
+         * Check if the browser supports mediaDevices.getUserMedia.
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmApp#canGetUserMedia
+         * @return {Boolean} Whether the function is supported.
+         */
+        self.canGetUserMedia = function() {
+            return !!(navigator && navigator.mediaDevices && navigator.mediaDevices.getUserMedia);
+        };
+
+        /**
+         * Check if the browser supports MediaRecorder.
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmApp#canRecordMedia
+         * @return {Boolean} Whether the function is supported.
+         */
+        self.canRecordMedia = function() {
+            return !!window.MediaRecorder;
+        };
+
         /**
          * Create a new state in the UI-router.
          *
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 125685f726f..8af1907df25 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -1639,3 +1639,19 @@ h2.invert {
   position: absolute;
   left: -10000px;
 }
+
+// Full screen modal.
+.modal-wrapper .modal.mm-fullscreen-modal {
+  width: 100%;
+  height: 100%;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0
+}
+
+// Buttons in header in modals.
+.modal .bar-header .button {
+  border-color: transparent;
+  background: none;
+}
diff --git a/www/index.html b/www/index.html
index 646aa4240a6..03a307c50fa 100644
--- a/www/index.html
+++ b/www/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
-    <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: gap: https://ssl.gstatic.com; img-src * filesystem: gap: data: cdvfile: file: https://ssl.gstatic.com android-webview-video-poster:; style-src 'self' 'unsafe-inline' filesystem: cdvfile: file:; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:* filesystem: cdvfile: file:">
+    <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: gap: https://ssl.gstatic.com; img-src * filesystem: gap: data: cdvfile: file: https://ssl.gstatic.com android-webview-video-poster:; style-src 'self' 'unsafe-inline' filesystem: cdvfile: file:; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:* filesystem: cdvfile: file:; media-src * filesystem: cdvfile: file: gap: blob:">
     <title>Moodle Mobile</title>
     <link href="build/mm.bundle.css" rel="stylesheet">
     <script src="lib/ionic/release/js/ionic.bundle.js"></script>

From 8b5edd5d4789ec49d2645bb10ac7df693a277c4e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 22 Jun 2017 12:33:47 +0200
Subject: [PATCH 035/118] MOBILE-2146 media: Allow capturing images

---
 www/core/components/emulator/scss/styles.scss |  21 +-
 .../emulator/services/mediacapture.js         | 419 +++++++++++++-----
 .../emulator/templates/capturemediamodal.html |  15 +-
 .../fileuploader/services/handlers.js         |   2 +-
 www/core/lang/en.json                         |   5 +-
 www/index.html                                |   2 +-
 6 files changed, 334 insertions(+), 130 deletions(-)

diff --git a/www/core/components/emulator/scss/styles.scss b/www/core/components/emulator/scss/styles.scss
index b6c3f5e369f..cbcaf50563e 100644
--- a/www/core/components/emulator/scss/styles.scss
+++ b/www/core/components/emulator/scss/styles.scss
@@ -10,16 +10,25 @@
         }
     }
 
-    video {
-        width: 100%;
-        height: 100%;
+    .mm-capture-media-modal-content {
+        text-align: center;
 
-        &.mm-webcam-stream {
-            -webkit-transform: scaleX(-1);
-            transform: scaleX(-1);
+        video {
+            max-width: 100%;
+            max-height: 100%;
+
+            &.mm-webcam-stream {
+                -webkit-transform: scaleX(-1);
+                transform: scaleX(-1);
+            }
+        }
+
+        .mm-webcam-image-canvas {
+            display: none;
         }
     }
 
+
     .bar-footer {
         background-color: $gray;
         border-top-color: $gray-dark;
diff --git a/www/core/components/emulator/services/mediacapture.js b/www/core/components/emulator/services/mediacapture.js
index 46183df830d..471006e7801 100644
--- a/www/core/components/emulator/services/mediacapture.js
+++ b/www/core/components/emulator/services/mediacapture.js
@@ -33,6 +33,250 @@ angular.module('mm.core.emulator')
         },
         videoMimeType;
 
+    /**
+     * Capture media (image, audio, video).
+     *
+     * @param  {String} type              Type of media: image, audio, video.
+     * @param  {Function} successCallback Function called when media taken.
+     * @param  {Function} errorCallback   Function called when error or cancel.
+     * @param  {Object} [options]         Optional options.
+     * @return {Void}
+     */
+    function captureMedia(type, successCallback, errorCallback, options) {
+        options = options || {};
+
+        try {
+            var scope = $rootScope.$new(),
+                loadingModal = $mmUtil.showModalLoading(),
+                facingMode = 'environment',
+                mimetype,
+                extension,
+                quality = 0.92, // Image only.
+                returnData = false; // Image only.
+
+            // Initialize some data based on the type of media to capture.
+            if (type == 'video') {
+                scope.isVideo = true;
+                title = 'mm.core.capturevideo';
+                mimetype = videoMimeType;
+                extension = possibleVideoMimeTypes[mimetype];
+            } else if (type == 'audio') {
+                scope.isAudio = true;
+                title = 'mm.core.captureaudio';
+            } else if (type == 'image') {
+                scope.isImage = true;
+                title = 'mm.core.captureimage';
+
+                if (typeof options.sourceType != 'undefined' && options.sourceType != Camera.PictureSourceType.CAMERA) {
+                    errorCallback && errorCallback('This source type is not supported in desktop.');
+                    loadingModal.dismiss();
+                    return;
+                }
+
+                if (options.cameraDirection == Camera.Direction.FRONT) {
+                    facingMode = 'user';
+                }
+
+                if (options.encodingType == Camera.EncodingType.PNG) {
+                    mimetype = 'image/png';
+                    extension = 'png';
+                } else {
+                    mimetype = 'image/jpeg';
+                    extension = 'jpeg';
+                }
+
+                if (options.quality >= 0 && options.quality <= 100) {
+                    quality = options.quality / 100;
+                }
+
+                if (options.destinationType == Camera.DestinationType.DATA_URL) {
+                    returnData = true;
+                }
+            }
+
+            if (options.duration) {
+                scope.chronoEndTime = options.duration * 1000;
+            }
+
+            initModal(scope).then(function(modal) {
+                var constraints = {
+                    video: scope.isAudio ? false : {facingMode: facingMode},
+                    audio: !scope.isImage
+                };
+
+                navigator.mediaDevices.getUserMedia(constraints).then(function(localMediaStream) {
+                    var streamVideo,
+                        viewVideo,
+                        canvas,
+                        imgEl,
+                        mediaRecorder,
+                        chunks = [],
+                        mediaBlob;
+
+                    if (scope.isImage) {
+                        canvas = modal.modalEl.querySelector('canvas.mm-webcam-image-canvas');
+                        imgEl = modal.modalEl.querySelector('img.mm-webcam-image');
+                    } else {
+                        if (scope.isVideo) {
+                            viewVideo = modal.modalEl.querySelector('video.mm-webcam-video-captured');
+                        }
+
+                        mediaRecorder = new MediaRecorder(localMediaStream, {mimeType: mimetype});
+
+                        // When video or audio is recorded, add it to the list of chunks.
+                        mediaRecorder.ondataavailable = function(e) {
+                            if (e.data.size > 0) {
+                                chunks.push(e.data);
+                            }
+                        };
+
+                        // When recording stops, create a Blob element with the recording and set it to the video or audio.
+                        mediaRecorder.onstop = function() {
+                            mediaBlob = new Blob(chunks);
+                            chunks = [];
+
+                            viewVideo.src = $window.URL.createObjectURL(mediaBlob);
+                        };
+                    }
+
+                    if (scope.isImage || scope.isVideo) {
+                        // Set the stream as the source of the video.
+                        streamVideo = modal.modalEl.querySelector('video.mm-webcam-stream');
+                        streamVideo.src = $window.URL.createObjectURL(localMediaStream);
+
+                        // Stream ready, show modal.
+                        streamVideo.onloadedmetadata = function() {
+                            loadingModal.dismiss();
+                            modal.show();
+                            scope.readyToCapture = true;
+                            streamVideo.onloadedmetadata = null;
+                        };
+                    }
+
+                    // Capture or stop capturing (stop is only for video and audio).
+                    scope.actionClicked = function() {
+                        if (scope.isCapturing) {
+                            // It's capturing, stop.
+                            scope.stopCapturing();
+                        } else {
+                            if (!scope.isImage) {
+                                // Start the capture.
+                                scope.isCapturing = true;
+                                mediaRecorder.start();
+                                scope.$broadcast('mm-chrono-start');
+                            } else {
+                                // Get the image from the video and set it to the canvas, using video width/height.
+                                var width = streamVideo.offsetWidth,
+                                    height = streamVideo.offsetHeight;
+
+                                canvas.width = width;
+                                canvas.height = height;
+                                canvas.getContext('2d').drawImage(streamVideo, 0, 0, width, height);
+
+                                // Convert the image to blob and show it in an image element.
+                                loadingModal = $mmUtil.showModalLoading();
+                                canvas.toBlob(function(blob) {
+                                    loadingModal.dismiss();
+
+                                    mediaBlob = blob;
+                                    imgEl.setAttribute('src', $window.URL.createObjectURL(mediaBlob));
+                                    scope.hasCaptured = true;
+                                }, mimetype, quality);
+
+                            }
+                        }
+                    };
+
+                    // Stop capturing. Only for video and audio.
+                    scope.stopCapturing = function() {
+                        viewVideo && streamVideo.pause();
+                        mediaRecorder.stop();
+                        scope.isCapturing = false;
+                        scope.hasCaptured = true;
+                        scope.$broadcast('mm-chrono-stop');
+                    };
+
+                    // Discard the captured media.
+                    scope.discard = function() {
+                        viewVideo && viewVideo.pause();
+                        streamVideo && streamVideo.play();
+
+                        scope.hasCaptured = false;
+                        scope.isCapturing = false;
+                        scope.$broadcast('mm-chrono-reset');
+                        delete mediaBlob;
+                    };
+
+                    // Done capturing, write the file.
+                    scope.done = function() {
+                        if (returnData) {
+                            // Return the image as a base64 string.
+                            success(canvas.toDataURL(mimetype, quality));
+                            return;
+                        }
+
+                        if (!mediaBlob) {
+                            // Shouldn't happen.
+                            $mmUtil.showErrorModal('Please capture the media first.');
+                            return;
+                        }
+
+                        // Create the file and return it.
+                        var fileName = type + '_' + $mmUtil.readableTimestamp() + '.' + extension,
+                            path = $mmFS.concatenatePaths($mmFS.getTmpFolder(), 'media/' + fileName);
+
+                        loadingModal = $mmUtil.showModalLoading();
+
+                        $mmFS.writeFile(path, mediaBlob).then(function(fileEntry) {
+                            if (scope.isImage) {
+                                success(fileEntry.toURL());
+                            } else {
+                                success([fileEntry]);
+                            }
+                        }).catch(function(err) {
+                            $mmUtil.showErrorModal(err);
+                        }).finally(function() {
+                            loadingModal.dismiss();
+                        });
+                    };
+
+                    // Success capturing the data.
+                    function success(data) {
+                        scope.modal.hide();
+
+                        // Wait for the modal to close before calling the callback to prevent Ionic bug with modals.
+                        $timeout(function() {
+                            successCallback && successCallback(data);
+                        }, 400);
+                    }
+
+                    // Capture cancelled.
+                    scope.cancel = function() {
+                        scope.modal.hide();
+                        errorCallback && errorCallback({code: 3, message: "Canceled."});
+                    };
+
+                    scope.$on('modal.hidden', function() {
+                        // Modal hidden, stop video and stream and destroy the scope.
+                        var tracks = localMediaStream.getTracks();
+                        angular.forEach(tracks, function(track) {
+                            track.stop();
+                        });
+                        streamVideo && streamVideo.pause();
+                        viewVideo && viewVideo.pause();
+                        scope.$destroy();
+                    });
+
+                    scope.$on('$destroy', function() {
+                        scope.modal.remove();
+                    });
+                  }).catch(errorCallback);
+            }, errorCallback);
+        } catch(ex) {
+            errorCallback(ex.toString());
+        }
+    }
+
     /**
      * Init the getUserMedia function, using a deprecated function as fallback if the new one doesn't exist.
      *
@@ -118,136 +362,79 @@ angular.module('mm.core.emulator')
 
         navigator.device = navigator.device || {};
         navigator.device.capture = navigator.device.capture || {};
+        navigator.camera = navigator.camera || {};
 
-        navigator.device.capture.captureVideo = function(successCallback, errorCallback, options) {
-            try {
-                var scope = $rootScope.$new(),
-                    loadingModal = $mmUtil.showModalLoading();
-
-                if (options && options.duration) {
-                    scope.chronoEndTime = options.duration * 1000;
-                }
-
-                initModal(scope).then(function(modal) {
-                    navigator.mediaDevices.getUserMedia({video: true, audio: true}).then(function(localMediaStream) {
-                        var streamVideo = modal.modalEl.querySelector('video.mm-webcam-stream'),
-                            viewVideo = modal.modalEl.querySelector('video.mm-webcam-video-captured'),
-                            mediaRecorder = new MediaRecorder(localMediaStream, {mimeType: videoMimeType}),
-                            chunks = [],
-                            mediaBlob;
-
-                        // Set the stream as the source of the video.
-                        streamVideo.src = $window.URL.createObjectURL(localMediaStream);
-
-                        // When data is captured, add it to the list of chunks.
-                        mediaRecorder.ondataavailable = function(e) {
-                            if (e.data.size > 0) {
-                                chunks.push(e.data);
-                            }
-                        };
+        // Create Camera constants.
+        $window.Camera = $window.Camera || {};
 
-                        // When capturing stops, create a Blob element with the recording and set it to the video.
-                        mediaRecorder.onstop = function() {
-                            mediaBlob = new Blob(chunks);
-                            chunks = [];
-
-                            viewVideo.src = $window.URL.createObjectURL(mediaBlob);
-                        };
-
-                        // Stream ready, show modal.
-                        streamVideo.onloadedmetadata = function() {
-                            loadingModal.dismiss();
-                            modal.show();
-                            scope.readyToCapture = true;
-                            streamVideo.onloadedmetadata = null;
-                        };
+        $window.Camera.DestinationType = {
+            DATA_URL: 0,
+            FILE_URI: 1,
+            NATIVE_URI: 2
+        };
 
-                        // Capture or stop capturing (for video and audio).
-                        scope.actionClicked = function() {
-                            if (scope.isCapturing) {
-                                // It's capturing, stop.
-                                scope.stopCapturing();
-                            } else {
-                                // Start the capture.
-                                mediaRecorder.start();
-                                scope.isCapturing = true;
-                                scope.$broadcast('mm-chrono-start');
-                            }
-                        };
+        $window.Camera.Direction = {
+            BACK: 0,
+            FRONT: 1
+        };
 
-                        // Stop capturing.
-                        scope.stopCapturing = function() {
-                            streamVideo.pause();
-                            mediaRecorder.stop();
-                            scope.isCapturing = false;
-                            scope.hasCaptured = true;
-                            scope.$broadcast('mm-chrono-stop');
-                        };
+        $window.Camera.EncodingType = {
+            JPEG: 0,
+            PNG: 1
+        };
 
-                        // Discard the captured media.
-                        scope.discard = function() {
-                            viewVideo.pause();
-                            streamVideo.play();
+        $window.Camera.MediaType = {
+            PICTURE: 0,
+            VIDEO: 1,
+            ALLMEDIA: 2
+        };
 
-                            scope.hasCaptured = false;
-                            scope.isCapturing = false;
-                            scope.$broadcast('mm-chrono-reset');
-                            delete mediaBlob;
-                        };
+        $window.Camera.PictureSourceType = {
+            PHOTOLIBRARY: 0,
+            CAMERA: 1,
+            SAVEDPHOTOALBUM: 2
+        };
 
-                        // Done capturing, write the file.
-                        scope.done = function() {
-                            if (!mediaBlob) {
-                                // Shouldn't happen.
-                                $mmUtil.showErrorModal('Please capture the media first.');
-                                return;
-                            }
+        $window.Camera.PopoverArrowDirection = {
+            ARROW_UP: 1,
+            ARROW_DOWN: 2,
+            ARROW_LEFT: 4,
+            ARROW_RIGHT: 8,
+            ARROW_ANY: 15
+        };
 
-                            // Create the file and return it.
-                            var fileName = 'video_' + $mmUtil.readableTimestamp() + '.' + possibleVideoMimeTypes[videoMimeType],
-                                path = $mmFS.concatenatePaths($mmFS.getTmpFolder(), 'media/' + fileName);
+        // Copy the constants to navigator.camera.
+        angular.extend(navigator.camera, $window.Camera);
 
-                            loadingModal = $mmUtil.showModalLoading();
+        // Create CameraPopoverOptions and CameraPopoverHandle.
+        $window.CameraPopoverOptions = function() {
+            // Nothing to do, not supported in desktop.
+        };
 
-                            $mmFS.writeFile(path, mediaBlob).then(function(fileEntry) {
-                                scope.modal.hide();
+        $window.CameraPopoverHandle = function() {
+            // Nothing to do, not supported in desktop.
+        };
+        $window.CameraPopoverHandle.prototype.setPosition = function() {
+            // Nothing to do, not supported in desktop.
+        };
 
-                                // Wait for the modal to close before calling the callback to prevent Ionic bug with modals.
-                                $timeout(function() {
-                                    successCallback && successCallback([fileEntry]);
-                                }, 400);
-                            }).catch(function(err) {
-                                $mmUtil.showErrorModal(err);
-                            }).finally(function() {
-                                loadingModal.dismiss();
-                            });
-                        };
+        // Create camera methods.
+        navigator.camera.getPicture = function(successCallback, errorCallback, options) {
+            return captureMedia('image', successCallback, errorCallback, options);
+        };
 
-                        // Capture cancelled.
-                        scope.cancel = function() {
-                            scope.modal.hide();
-                            errorCallback && errorCallback({code: 3, message: "Canceled."});
-                        };
+        navigator.camera.cleanup = function(successCallback, errorCallback) {
+            // The tmp folder is cleaned when the app is started, do nothing.
+            successCallback && successCallback();
+        };
 
-                        scope.$on('modal.hidden', function() {
-                            // Modal hidden, stop video and stream and destroy the scope.
-                            var tracks = localMediaStream.getTracks();
-                            angular.forEach(tracks, function(track) {
-                                track.stop();
-                            });
-                            streamVideo.pause();
-                            viewVideo.pause();
-                            scope.$destroy();
-                        });
+        // Support Media Capture methods.
+        navigator.device.capture.captureImage = function(successCallback, errorCallback, options) {
+            return captureMedia('image', successCallback, errorCallback, options);
+        };
 
-                        scope.$on('$destroy', function() {
-                            scope.modal.remove();
-                        });
-                      }).catch(errorCallback);
-                }, errorCallback);
-            } catch(ex) {
-                errorCallback(ex.toString());
-            }
+        navigator.device.capture.captureVideo = function(successCallback, errorCallback, options) {
+            return captureMedia('video', successCallback, errorCallback, options);
         };
 
         return $q.when();
diff --git a/www/core/components/emulator/templates/capturemediamodal.html b/www/core/components/emulator/templates/capturemediamodal.html
index e3680c156b1..1ad45c34640 100644
--- a/www/core/components/emulator/templates/capturemediamodal.html
+++ b/www/core/components/emulator/templates/capturemediamodal.html
@@ -1,14 +1,19 @@
 <ion-modal-view class="mm-fullscreen-modal mm-capture-media-modal">
     <ion-header-bar class="bar-header">
         <button class="button button-clear" ng-click="cancel()">{{ 'mm.core.cancel' | translate }}</button>
-        <h1 class="title">{{ 'mm.core.capturemedia' | translate }}</h1>
+        <h1 class="title">{{ title }}</h1>
         <button class="button button-clear" ng-if="hasCaptured" ng-click="done()">{{ 'mm.core.done' | translate }}</button>
     </ion-header-bar>
 
-    <ion-content>
+    <ion-content class="mm-capture-media-modal-content">
         <!-- For video recording, use 2 videos and show/hide them because a CSS rule caused problems with the controls. -->
         <video ng-show="!hasCaptured" class="mm-webcam-stream" autoplay></video>
-        <video ng-show="hasCaptured" class="mm-webcam-video-captured" controls></video>
+        <video ng-if="isVideo" ng-show="hasCaptured" class="mm-webcam-video-captured" controls></video>
+
+        <div ng-if="isImage" ng-show="hasCaptured">
+            <canvas class="mm-webcam-image-canvas"></canvas>
+            <img class="mm-webcam-image" alt="{{ 'mm.core.capturedimage' | translate }}" />
+        </div>
     </ion-content>
 
     <ion-footer-bar class="row">
@@ -16,10 +21,10 @@ <h1 class="title">{{ 'mm.core.capturemedia' | translate }}</h1>
             <button ng-if="hasCaptured" class="button button-clear" ng-click="discard()">{{ 'mm.core.discard' | translate }}</button>
         </div>
         <div class="col text-center">
-            <button ng-if="!hasCaptured" class="button button-clear button-icon" ng-class="{'ion-record': readyToCapture && !isCapturing, 'ion-stop': isCapturing}" ng-click="actionClicked()"></button>
+            <button ng-if="!hasCaptured" class="button button-clear button-icon" ng-class="{'ion-record': readyToCapture && !isCapturing && !isImage, 'ion-camera': readyToCapture && isImage, 'ion-stop': isCapturing}" ng-click="actionClicked()" aria-label="{{ title }}"></button>
         </div>
         <div class="col text-right">
-            <mm-chrono ng-show="!hasCaptured" end-time="chronoEndTime" on-end="stopCapturing()"></mm-chrono>
+            <mm-chrono ng-if="!isImage" ng-show="!hasCaptured" end-time="chronoEndTime" on-end="stopCapturing()"></mm-chrono>
         </div>
     </ion-footer-bar>
 </ion-modal-view>
\ No newline at end of file
diff --git a/www/core/components/fileuploader/services/handlers.js b/www/core/components/fileuploader/services/handlers.js
index edb5f56c9cc..fd892f939c1 100644
--- a/www/core/components/fileuploader/services/handlers.js
+++ b/www/core/components/fileuploader/services/handlers.js
@@ -87,7 +87,7 @@ angular.module('mm.core.fileuploader')
          * @return {Boolean} True if handler is enabled, false otherwise.
          */
         self.isEnabled = function() {
-            return $mmApp.isDevice();
+            return $mmApp.isDevice() || $mmApp.canGetUserMedia();
         };
 
         /**
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 027f92f4322..ae7b95ab827 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -7,7 +7,10 @@
     "cancel": "Cancel",
     "cannotconnect": "Cannot connect: Verify that you have typed correctly the URL and that your site uses Moodle 2.4 or later.",
     "cannotdownloadfiles": "File downloading is disabled in your Mobile service. Please, contact your site administrator.",
-    "capturemedia": "Capture media",
+    "captureaudio": "Record audio",
+    "capturedimage": "Taken picture.",
+    "captureimage": "Take picture",
+    "capturevideo": "Record video",
     "category": "Category",
     "choose": "Choose",
     "choosedots": "Choose...",
diff --git a/www/index.html b/www/index.html
index 03a307c50fa..7ea51cb8406 100644
--- a/www/index.html
+++ b/www/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
-    <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: gap: https://ssl.gstatic.com; img-src * filesystem: gap: data: cdvfile: file: https://ssl.gstatic.com android-webview-video-poster:; style-src 'self' 'unsafe-inline' filesystem: cdvfile: file:; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:* filesystem: cdvfile: file:; media-src * filesystem: cdvfile: file: gap: blob:">
+    <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: gap: https://ssl.gstatic.com; img-src * filesystem: gap: data: cdvfile: file: https://ssl.gstatic.com android-webview-video-poster: blob:; style-src 'self' 'unsafe-inline' filesystem: cdvfile: file:; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:* filesystem: cdvfile: file:; media-src * filesystem: cdvfile: file: gap: blob:">
     <title>Moodle Mobile</title>
     <link href="build/mm.bundle.css" rel="stylesheet">
     <script src="lib/ionic/release/js/ionic.bundle.js"></script>

From 1fc5e81497d7673fe981efeeeb1d585890cce008 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 22 Jun 2017 16:12:20 +0200
Subject: [PATCH 036/118] MOBILE-2146 media: Allow capturing audio

---
 www/core/components/emulator/scss/styles.scss |  14 ++
 .../emulator/services/mediacapture.js         | 161 ++++++++++++++++--
 .../emulator/templates/capturemediamodal.html |  11 +-
 .../fileuploader/services/handlers.js         |   2 +-
 4 files changed, 173 insertions(+), 15 deletions(-)

diff --git a/www/core/components/emulator/scss/styles.scss b/www/core/components/emulator/scss/styles.scss
index cbcaf50563e..de49a540725 100644
--- a/www/core/components/emulator/scss/styles.scss
+++ b/www/core/components/emulator/scss/styles.scss
@@ -26,6 +26,20 @@
         .mm-webcam-image-canvas {
             display: none;
         }
+
+        .mm-audio-record-container {
+            width: 100%;
+            height: 100%;
+
+            .mm-audio-canvas {
+                width: 100%;
+                height: 100%;
+            }
+
+            .mm-audio-captured {
+                width: 100%;
+            }
+        }
     }
 
 
diff --git a/www/core/components/emulator/services/mediacapture.js b/www/core/components/emulator/services/mediacapture.js
index 471006e7801..fbecee6eb1c 100644
--- a/www/core/components/emulator/services/mediacapture.js
+++ b/www/core/components/emulator/services/mediacapture.js
@@ -26,12 +26,17 @@ angular.module('mm.core.emulator')
     $log = $log.getInstance('$mmEmulatorMediaCapture');
 
     var self = {},
+        possibleAudioMimeTypes = {
+            'audio/webm': 'weba',
+            'audio/ogg': 'ogg'
+        },
         possibleVideoMimeTypes = {
             'video/webm;codecs=vp9': 'webm',
             'video/webm;codecs=vp8': 'webm',
             'video/ogg': 'ogv'
         },
-        videoMimeType;
+        videoMimeType,
+        audioMimeType;
 
     /**
      * Capture media (image, audio, video).
@@ -52,7 +57,13 @@ angular.module('mm.core.emulator')
                 mimetype,
                 extension,
                 quality = 0.92, // Image only.
-                returnData = false; // Image only.
+                returnData = false, // Image only.
+                isCaptureImage = false; // To identify if it's capturing an image using media capture plugin (instead of camera).
+
+            if (type == 'captureimage') {
+                isCaptureImage = true;
+                type = 'image';
+            }
 
             // Initialize some data based on the type of media to capture.
             if (type == 'video') {
@@ -63,6 +74,8 @@ angular.module('mm.core.emulator')
             } else if (type == 'audio') {
                 scope.isAudio = true;
                 title = 'mm.core.captureaudio';
+                mimetype = audioMimeType;
+                extension = possibleAudioMimeTypes[mimetype];
             } else if (type == 'image') {
                 scope.isImage = true;
                 title = 'mm.core.captureimage';
@@ -106,19 +119,25 @@ angular.module('mm.core.emulator')
 
                 navigator.mediaDevices.getUserMedia(constraints).then(function(localMediaStream) {
                     var streamVideo,
-                        viewVideo,
+                        previewMedia,
                         canvas,
                         imgEl,
                         mediaRecorder,
                         chunks = [],
-                        mediaBlob;
+                        mediaBlob,
+                        audioDrawer;
 
                     if (scope.isImage) {
                         canvas = modal.modalEl.querySelector('canvas.mm-webcam-image-canvas');
                         imgEl = modal.modalEl.querySelector('img.mm-webcam-image');
                     } else {
                         if (scope.isVideo) {
-                            viewVideo = modal.modalEl.querySelector('video.mm-webcam-video-captured');
+                            previewMedia = modal.modalEl.querySelector('video.mm-webcam-video-captured');
+                        } else {
+                            previewMedia = modal.modalEl.querySelector('audio.mm-audio-captured');
+                            canvas = modal.modalEl.querySelector('canvas.mm-audio-canvas');
+                            audioDrawer = initAudioDrawer(localMediaStream, canvas);
+                            audioDrawer.start();
                         }
 
                         mediaRecorder = new MediaRecorder(localMediaStream, {mimeType: mimetype});
@@ -135,7 +154,7 @@ angular.module('mm.core.emulator')
                             mediaBlob = new Blob(chunks);
                             chunks = [];
 
-                            viewVideo.src = $window.URL.createObjectURL(mediaBlob);
+                            previewMedia.src = $window.URL.createObjectURL(mediaBlob);
                         };
                     }
 
@@ -151,6 +170,11 @@ angular.module('mm.core.emulator')
                             scope.readyToCapture = true;
                             streamVideo.onloadedmetadata = null;
                         };
+                    } else {
+                        // No need to wait to show the modal.
+                        loadingModal.dismiss();
+                        modal.show();
+                        scope.readyToCapture = true;
                     }
 
                     // Capture or stop capturing (stop is only for video and audio).
@@ -189,7 +213,8 @@ angular.module('mm.core.emulator')
 
                     // Stop capturing. Only for video and audio.
                     scope.stopCapturing = function() {
-                        viewVideo && streamVideo.pause();
+                        streamVideo && streamVideo.pause();
+                        audioDrawer && audioDrawer.stop();
                         mediaRecorder.stop();
                         scope.isCapturing = false;
                         scope.hasCaptured = true;
@@ -198,8 +223,9 @@ angular.module('mm.core.emulator')
 
                     // Discard the captured media.
                     scope.discard = function() {
-                        viewVideo && viewVideo.pause();
+                        previewMedia && previewMedia.pause();
                         streamVideo && streamVideo.play();
+                        audioDrawer && audioDrawer.start();
 
                         scope.hasCaptured = false;
                         scope.isCapturing = false;
@@ -228,9 +254,15 @@ angular.module('mm.core.emulator')
                         loadingModal = $mmUtil.showModalLoading();
 
                         $mmFS.writeFile(path, mediaBlob).then(function(fileEntry) {
-                            if (scope.isImage) {
+                            if (scope.isImage && !isCaptureImage) {
                                 success(fileEntry.toURL());
                             } else {
+                                // The capture plugin returns a MediaFile, not a FileEntry. The only difference is that
+                                // it supports a new function that won't be supported in desktop.
+                                fileEntry.getFormatData = function(successFn, errorFn) {
+                                    errorFn && errorFn('Not supported');
+                                };
+
                                 success([fileEntry]);
                             }
                         }).catch(function(err) {
@@ -253,7 +285,8 @@ angular.module('mm.core.emulator')
                     // Capture cancelled.
                     scope.cancel = function() {
                         scope.modal.hide();
-                        errorCallback && errorCallback({code: 3, message: "Canceled."});
+                        var error = scope.isImage && !isCaptureImage ? 'Camera cancelled' : {code: 3, message: 'Canceled.'};
+                        errorCallback && errorCallback(error);
                     };
 
                     scope.$on('modal.hidden', function() {
@@ -263,7 +296,8 @@ angular.module('mm.core.emulator')
                             track.stop();
                         });
                         streamVideo && streamVideo.pause();
-                        viewVideo && viewVideo.pause();
+                        previewMedia && previewMedia.pause();
+                        audioDrawer && audioDrawer.stop();
                         scope.$destroy();
                     });
 
@@ -277,6 +311,88 @@ angular.module('mm.core.emulator')
         }
     }
 
+    /**
+     * Initialize the audio drawer. This code has been extracted from MDN's example on MediaStream Recording:
+     * https://github.com/mdn/web-dictaphone
+     *
+     * @param  {Object} stream Stream returned by getUserMedia.
+     * @param  {Object} canvas Canvas element where to draw the audio waves.
+     * @return {Object}        Object to start and stop the drawer.
+     */
+    function initAudioDrawer(stream, canvas) {
+        var audioCtx = new (window.AudioContext || webkitAudioContext)(),
+            canvasCtx = canvas.getContext("2d"),
+            source = audioCtx.createMediaStreamSource(stream),
+            analyser = audioCtx.createAnalyser(),
+            bufferLength = analyser.frequencyBinCount,
+            dataArray = new Uint8Array(bufferLength),
+            width = canvas.width,
+            height = canvas.height,
+            running = false,
+            skip = true;
+
+        analyser.fftSize = 2048;
+        source.connect(analyser);
+
+        return {
+            start: function() {
+                if (running) {
+                    return;
+                }
+
+                running = true;
+                drawAudio();
+            },
+            stop: function() {
+                running = false;
+            }
+        };
+
+        function drawAudio() {
+            if (!running) {
+                return;
+            }
+
+            // Update the draw every animation frame.
+            requestAnimationFrame(drawAudio);
+
+             // Skip half of the frames to improve performance, shouldn't affect the smoothness.
+            skip = !skip;
+            if (skip) {
+                return;
+            }
+
+            var sliceWidth = width / bufferLength,
+                x = 0;
+
+            analyser.getByteTimeDomainData(dataArray);
+
+            canvasCtx.fillStyle = 'rgb(200, 200, 200)';
+            canvasCtx.fillRect(0, 0, width, height);
+
+            canvasCtx.lineWidth = 1;
+            canvasCtx.strokeStyle = 'rgb(0, 0, 0)';
+
+            canvasCtx.beginPath();
+
+            for(var i = 0; i < bufferLength; i++) {
+                var v = dataArray[i] / 128.0,
+                    y = v * height / 2;
+
+                if (i === 0) {
+                    canvasCtx.moveTo(x, y);
+                } else {
+                    canvasCtx.lineTo(x, y);
+                }
+
+                x += sliceWidth;
+            }
+
+            canvasCtx.lineTo(width, height / 2);
+            canvasCtx.stroke();
+        }
+    }
+
     /**
      * Init the getUserMedia function, using a deprecated function as fallback if the new one doesn't exist.
      *
@@ -312,13 +428,20 @@ angular.module('mm.core.emulator')
      * @return {Void}
      */
     function initMimeTypes() {
-        // Determine video mimetype.
+        // Determine video and audio mimetype to use.
         for (var mimeType in possibleVideoMimeTypes) {
             if (MediaRecorder.isTypeSupported(mimeType)) {
                 videoMimeType = mimeType;
                 break;
             }
         }
+
+        for (mimeType in possibleAudioMimeTypes) {
+            if (MediaRecorder.isTypeSupported(mimeType)) {
+                audioMimeType = mimeType;
+                break;
+            }
+        }
     }
 
     /**
@@ -430,13 +553,25 @@ angular.module('mm.core.emulator')
 
         // Support Media Capture methods.
         navigator.device.capture.captureImage = function(successCallback, errorCallback, options) {
-            return captureMedia('image', successCallback, errorCallback, options);
+            return captureMedia('captureimage', successCallback, errorCallback, options);
         };
 
         navigator.device.capture.captureVideo = function(successCallback, errorCallback, options) {
             return captureMedia('video', successCallback, errorCallback, options);
         };
 
+        navigator.device.capture.captureAudio = function(successCallback, errorCallback, options) {
+            return captureMedia('audio', successCallback, errorCallback, options);
+        };
+
+        // Support other Media Capture variables.
+        $window.CaptureAudioOptions = function() {};
+        $window.CaptureImageOptions = function() {};
+        $window.CaptureVideoOptions = function() {};
+        $window.CaptureError = function(c) {
+            this.code = c || null;
+        };
+
         return $q.when();
     };
 
diff --git a/www/core/components/emulator/templates/capturemediamodal.html b/www/core/components/emulator/templates/capturemediamodal.html
index 1ad45c34640..aaf6e993159 100644
--- a/www/core/components/emulator/templates/capturemediamodal.html
+++ b/www/core/components/emulator/templates/capturemediamodal.html
@@ -6,14 +6,23 @@ <h1 class="title">{{ title }}</h1>
     </ion-header-bar>
 
     <ion-content class="mm-capture-media-modal-content">
+        <!-- Video stream for image and video. -->
+        <video ng-if="!isAudio" ng-show="!hasCaptured" class="mm-webcam-stream" autoplay></video>
+
         <!-- For video recording, use 2 videos and show/hide them because a CSS rule caused problems with the controls. -->
-        <video ng-show="!hasCaptured" class="mm-webcam-stream" autoplay></video>
         <video ng-if="isVideo" ng-show="hasCaptured" class="mm-webcam-video-captured" controls></video>
 
         <div ng-if="isImage" ng-show="hasCaptured">
+            <!-- Canvas to treat the image and an img to show the result. -->
             <canvas class="mm-webcam-image-canvas"></canvas>
             <img class="mm-webcam-image" alt="{{ 'mm.core.capturedimage' | translate }}" />
         </div>
+
+        <!-- Canvas to show audio waves when recording audio and audio player to listen to the result. -->
+        <div ng-if="isAudio" class="mm-audio-record-container">
+            <canvas ng-show="!hasCaptured" class="mm-audio-canvas"></canvas>
+            <audio ng-show="hasCaptured" class="mm-audio-captured" controls></audio>
+        </div>
     </ion-content>
 
     <ion-footer-bar class="row">
diff --git a/www/core/components/fileuploader/services/handlers.js b/www/core/components/fileuploader/services/handlers.js
index fd892f939c1..3f612ae4d04 100644
--- a/www/core/components/fileuploader/services/handlers.js
+++ b/www/core/components/fileuploader/services/handlers.js
@@ -132,7 +132,7 @@ angular.module('mm.core.fileuploader')
          * @return {Boolean} True if handler is enabled, false otherwise.
          */
         self.isEnabled = function() {
-            return $mmApp.isDevice();
+            return $mmApp.isDevice() || ($mmApp.canGetUserMedia() && $mmApp.canRecordMedia());
         };
 
         /**

From 42feb7a6a848ad9279341b72838dccbd1068b8e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 23 Jun 2017 16:14:53 +0200
Subject: [PATCH 037/118] MOBILE-2146 electron: Style audio and video recording

---
 www/core/components/emulator/scss/styles.scss | 33 +++++++++++++++----
 .../emulator/services/mediacapture.js         |  4 +--
 .../emulator/templates/capturemediamodal.html | 32 +++++++++---------
 3 files changed, 45 insertions(+), 24 deletions(-)

diff --git a/www/core/components/emulator/scss/styles.scss b/www/core/components/emulator/scss/styles.scss
index de49a540725..7bfb9f8e8dd 100644
--- a/www/core/components/emulator/scss/styles.scss
+++ b/www/core/components/emulator/scss/styles.scss
@@ -13,9 +13,27 @@
     .mm-capture-media-modal-content {
         text-align: center;
 
-        video {
-            max-width: 100%;
-            max-height: 100%;
+        .mm-av-wrapper {
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: 0;
+            right: 0;
+            display: table;
+            height: 100%;
+            width: 100%;
+            margin: 0;
+            padding: 0;
+            clear: both;
+        }
+
+        audio, video, img {
+            width: 100%;
+            height: 100%;
+            display: table-cell;
+            text-align: center;
+            vertical-align: middle;
+            object-fit: contain;
 
             &.mm-webcam-stream {
                 -webkit-transform: scaleX(-1);
@@ -50,10 +68,13 @@
         .col {
             padding: 0;
             line-height: $bar-height - $bar-padding-portrait * 2;
-            color: $positive;
 
-            .ion-record {
-                color: red;
+            .button-icon {
+                color: $black;
+            }
+
+            .ion-record, .ion-trash-a {
+                color: $red;
             }
         }
     }
diff --git a/www/core/components/emulator/services/mediacapture.js b/www/core/components/emulator/services/mediacapture.js
index fbecee6eb1c..473ff8cc621 100644
--- a/www/core/components/emulator/services/mediacapture.js
+++ b/www/core/components/emulator/services/mediacapture.js
@@ -190,8 +190,8 @@ angular.module('mm.core.emulator')
                                 scope.$broadcast('mm-chrono-start');
                             } else {
                                 // Get the image from the video and set it to the canvas, using video width/height.
-                                var width = streamVideo.offsetWidth,
-                                    height = streamVideo.offsetHeight;
+                                var width = streamVideo.videoWidth,
+                                    height = streamVideo.videoHeight;
 
                                 canvas.width = width;
                                 canvas.height = height;
diff --git a/www/core/components/emulator/templates/capturemediamodal.html b/www/core/components/emulator/templates/capturemediamodal.html
index aaf6e993159..7d8be7d37d9 100644
--- a/www/core/components/emulator/templates/capturemediamodal.html
+++ b/www/core/components/emulator/templates/capturemediamodal.html
@@ -5,32 +5,32 @@ <h1 class="title">{{ title }}</h1>
         <button class="button button-clear" ng-if="hasCaptured" ng-click="done()">{{ 'mm.core.done' | translate }}</button>
     </ion-header-bar>
 
-    <ion-content class="mm-capture-media-modal-content">
-        <!-- Video stream for image and video. -->
-        <video ng-if="!isAudio" ng-show="!hasCaptured" class="mm-webcam-stream" autoplay></video>
+    <ion-content class="mm-capture-media-modal-content" scroll="false">
 
-        <!-- For video recording, use 2 videos and show/hide them because a CSS rule caused problems with the controls. -->
-        <video ng-if="isVideo" ng-show="hasCaptured" class="mm-webcam-video-captured" controls></video>
+        <div class="mm-av-wrapper">
+            <!-- Video stream for image and video. -->
+            <video ng-if="!isAudio" ng-show="!hasCaptured" class="mm-webcam-stream" autoplay></video>
+
+            <!-- For video recording, use 2 videos and show/hide them because a CSS rule caused problems with the controls. -->
+            <video ng-if="isVideo" ng-show="hasCaptured" class="mm-webcam-video-captured" controls></video>
 
-        <div ng-if="isImage" ng-show="hasCaptured">
             <!-- Canvas to treat the image and an img to show the result. -->
-            <canvas class="mm-webcam-image-canvas"></canvas>
-            <img class="mm-webcam-image" alt="{{ 'mm.core.capturedimage' | translate }}" />
-        </div>
+            <canvas ng-if="isImage" class="mm-webcam-image-canvas"></canvas>
+            <img ng-if="isImage" ng-show="hasCaptured" class="mm-webcam-image" alt="{{ 'mm.core.capturedimage' | translate }}" />
 
-        <!-- Canvas to show audio waves when recording audio and audio player to listen to the result. -->
-        <div ng-if="isAudio" class="mm-audio-record-container">
-            <canvas ng-show="!hasCaptured" class="mm-audio-canvas"></canvas>
-            <audio ng-show="hasCaptured" class="mm-audio-captured" controls></audio>
+            <!-- Canvas to show audio waves when recording audio and audio player to listen to the result. -->
+            <div ng-if="isAudio" class="mm-audio-record-container">
+                <canvas ng-show="!hasCaptured" class="mm-audio-canvas"></canvas>
+                <audio ng-show="hasCaptured" class="mm-audio-captured" controls></audio>
+            </div>
         </div>
     </ion-content>
 
     <ion-footer-bar class="row">
-        <div class="col">
-            <button ng-if="hasCaptured" class="button button-clear" ng-click="discard()">{{ 'mm.core.discard' | translate }}</button>
-        </div>
+        <div class="col"></div>
         <div class="col text-center">
             <button ng-if="!hasCaptured" class="button button-clear button-icon" ng-class="{'ion-record': readyToCapture && !isCapturing && !isImage, 'ion-camera': readyToCapture && isImage, 'ion-stop': isCapturing}" ng-click="actionClicked()" aria-label="{{ title }}"></button>
+            <button ng-if="hasCaptured" class="button button-clear button-icon ion-trash-a" ng-click="discard()" aria-label="{{ 'mm.core.discard' | translate }}"></button>
         </div>
         <div class="col text-right">
             <mm-chrono ng-if="!isImage" ng-show="!hasCaptured" end-time="chronoEndTime" on-end="stopCapturing()"></mm-chrono>

From 9befd13c764a1f757e58cb129dba2b624f8dfd8f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 15 Jun 2017 10:13:32 +0200
Subject: [PATCH 038/118] MOBILE-2145 electron: Simulate push notifications in
 desktop

---
 www/addons/messages/main.js                   |  36 ++--
 www/addons/messages/services/handlers.js      |  46 ++++-
 www/addons/messages/services/messages.js      | 125 +++++++++++---
 www/addons/notifications/main.js              |  40 +++--
 www/addons/notifications/services/handlers.js |  41 ++++-
 .../notifications/services/notifications.js   | 114 +++++++-----
 .../components/emulator/services/emulator.js  |   6 +-
 .../components/emulator/services/helper.js    | 162 ++++++++++++++++++
 www/core/lib/cron.js                          |   8 +-
 9 files changed, 478 insertions(+), 100 deletions(-)
 create mode 100644 www/core/components/emulator/services/helper.js

diff --git a/www/addons/messages/main.js b/www/addons/messages/main.js
index 740671284eb..2e7697e54a4 100644
--- a/www/addons/messages/main.js
+++ b/www/addons/messages/main.js
@@ -29,6 +29,7 @@ angular.module('mm.addons.messages', ['mm.core'])
 .constant('mmaMessagesReadCronEvent', 'mma-messages_read_cron')
 .constant('mmaMessagesAutomSyncedEvent', 'mma_messages_autom_synced')
 .constant('mmaMessagesLimitSearchMessages', 50)
+.constant('mmaMessagesPushSimulationComponent', 'mmaMessagesPushSimulation')
 
 .config(function($stateProvider, $mmUserDelegateProvider, $mmSideMenuDelegateProvider, mmaMessagesSendMessagePriority,
             mmaMessagesAddContactPriority, mmaMessagesBlockContactPriority, mmaMessagesPriority, $mmContentLinksDelegateProvider,
@@ -87,7 +88,7 @@ angular.module('mm.addons.messages', ['mm.core'])
 })
 
 .run(function($mmaMessages, $mmEvents, $state, $mmAddonManager, $mmUtil, mmCoreEventLogin, $mmCronDelegate, $mmaMessagesSync,
-            mmCoreEventOnlineStatusChanged, $mmSitesManager) {
+            mmCoreEventOnlineStatusChanged, $mmSitesManager, $mmLocalNotifications, $mmApp, mmaMessagesPushSimulationComponent) {
 
     // Invalidate messaging enabled WS calls.
     $mmEvents.on(mmCoreEventLogin, function() {
@@ -99,18 +100,7 @@ angular.module('mm.addons.messages', ['mm.core'])
     if ($mmPushNotificationsDelegate) {
         $mmPushNotificationsDelegate.registerHandler('mmaMessages', function(notification) {
             if ($mmUtil.isFalseOrZero(notification.notif)) {
-                $mmaMessages.isMessagingEnabledForSite(notification.site).then(function() {
-                    $mmSitesManager.isFeatureDisabled('$mmSideMenuDelegate_mmaMessages', notification.site).then(function(disabled) {
-                        if (disabled) {
-                            // Messages are disabled, stop.
-                            return;
-                        }
-
-                        $mmaMessages.invalidateDiscussionsCache().finally(function() {
-                            $state.go('redirect', {siteid: notification.site, state: 'site.messages'});
-                        });
-                    });
-                });
+                notificationClicked(notification);
                 return true;
             }
         });
@@ -126,4 +116,24 @@ angular.module('mm.addons.messages', ['mm.core'])
             $mmaMessagesSync.syncAllDiscussions(undefined, true);
         }
     });
+
+    if ($mmApp.isDesktop()) {
+        // Listen for clicks in simulated push notifications.
+        $mmLocalNotifications.registerClick(mmaMessagesPushSimulationComponent, notificationClicked);
+    }
+
+    function notificationClicked(notification) {
+        $mmaMessages.isMessagingEnabledForSite(notification.site).then(function() {
+            $mmSitesManager.isFeatureDisabled('$mmSideMenuDelegate_mmaMessages', notification.site).then(function(disabled) {
+                if (disabled) {
+                    // Messages are disabled, stop.
+                    return;
+                }
+
+                $mmaMessages.invalidateDiscussionsCache().finally(function() {
+                    $state.go('redirect', {siteid: notification.site, state: 'site.messages'});
+                });
+            });
+        });
+    }
 });
diff --git a/www/addons/messages/services/handlers.js b/www/addons/messages/services/handlers.js
index 412b112500f..3ce6f4c4c3e 100644
--- a/www/addons/messages/services/handlers.js
+++ b/www/addons/messages/services/handlers.js
@@ -25,11 +25,43 @@ angular.module('mm.addons.messages')
  */
 .factory('$mmaMessagesHandlers', function($log, $mmaMessages, $mmSite, $state, $mmUtil, $mmContentLinksHelper, $mmaMessagesSync,
             $mmSitesManager, mmUserProfileHandlersTypeCommunication, mmUserProfileHandlersTypeAction, $translate,
-            mmaMessagesReadChangedEvent, $mmEvents, mmaMessagesReadCronEvent, $mmAddonManager, $mmContentLinkHandlerFactory) {
+            mmaMessagesReadChangedEvent, $mmEvents, mmaMessagesReadCronEvent, $mmAddonManager, $mmContentLinkHandlerFactory,
+            $mmText, $mmApp, $mmLocalNotifications, $mmEmulatorHelper, mmaMessagesPushSimulationComponent) {
     $log = $log.getInstance('$mmaMessagesHandlers');
 
     var self = {};
 
+    /**
+     * Get the latest unread received messages from a site.
+     *
+     * @param  {String} siteId Site ID.
+     * @return {Promise}       Promise resolved with the notifications.
+     */
+    function fetchMessages(siteId) {
+        return $mmaMessages.getUnreadReceivedMessages(true, false, true, siteId).then(function(response) {
+            return response.messages;
+        });
+    }
+
+    /**
+     * Given a message, return the title and the text for the message.
+     *
+     * @param  {Object} message Message.
+     * @return {Promise}        Promise resolved with an object with title and text.
+     */
+    function getTitleAndText(message) {
+        var data = {
+                title: message.userfromfullname,
+            };
+
+        return $mmText.formatText(message.text, true, true).catch(function() {
+            return message.text;
+        }).then(function(formattedText) {
+            data.text = formattedText;
+            return data;
+        });
+    }
+
     /**
      * Add contact handler.
      *
@@ -407,6 +439,11 @@ angular.module('mm.addons.messages')
                     siteid: siteId
                 });
             }
+
+            if ($mmApp.isDesktop() && $mmLocalNotifications.isAvailable()) {
+                $mmEmulatorHelper.checkNewNotifications(
+                        mmaMessagesPushSimulationComponent, fetchMessages, getTitleAndText, siteId);
+            }
         };
 
         /**
@@ -415,7 +452,7 @@ angular.module('mm.addons.messages')
          * @return {Number} Time between consecutive executions (in ms).
          */
         self.getInterval = function() {
-            return 600000; // 10 minutes.
+            return $mmApp.isDesktop() ? 60000 : 600000; // 1 or 10 minutes.
         };
 
         /**
@@ -424,8 +461,9 @@ angular.module('mm.addons.messages')
          * @return {Boolean} True if is a sync process, false otherwise.
          */
         self.isSync = function() {
-            // This is done to use only wifi if using the fallback function
-            return !$mmaMessages.isMessageCountEnabled();
+            // This is done to use only wifi if using the fallback function.
+            // In desktop it is always sync, since it fetches messages to see if there's a new one.
+            return !$mmaMessages.isMessageCountEnabled() || $mmApp.isDesktop();
         };
 
         /**
diff --git a/www/addons/messages/services/messages.js b/www/addons/messages/services/messages.js
index 41f22f2a6aa..16aa328c250 100644
--- a/www/addons/messages/services/messages.js
+++ b/www/addons/messages/services/messages.js
@@ -22,7 +22,8 @@ angular.module('mm.addons.messages')
  * @name $mmaMessages
  */
 .factory('$mmaMessages', function($mmSite, $mmSitesManager, $log, $q, $mmUser, $mmaMessagesOffline, $mmApp, $mmUtil,
-            mmaMessagesNewMessageEvent, mmaMessagesLimitMessages, mmaMessagesLimitSearchMessages) {
+            mmaMessagesNewMessageEvent, mmaMessagesLimitMessages, mmaMessagesLimitSearchMessages, $mmEmulatorHelper,
+            mmaMessagesPushSimulationComponent) {
     $log = $log.getInstance('$mmaMessages');
 
     var self = {};
@@ -286,9 +287,12 @@ angular.module('mm.addons.messages')
      * @param  {Number} [lfReceivedRead=0]   Number of read received messages already fetched, so fetch will be done from this.
      * @param  {Number} [lfSentUnread=0]     Number of unread sent messages already fetched, so fetch will be done from this.
      * @param  {Number} [lfSentRead=0]       Number of read sent messages already fetched, so fetch will be done from this.
+     * @param  {Boolean} [toDisplay=true]    True if messages will be displayed to the user, either in view or in a notification.
+     * @param  {String} [siteId]             Site ID. If not defined, use current site.
      * @return {Promise}                     Promise resolved with messages and a boolean telling if can load more messages.
      */
-    self.getDiscussion = function(userId, excludePending, lfReceivedUnread, lfReceivedRead, lfSentUnread, lfSentRead) {
+    self.getDiscussion = function(userId, excludePending, lfReceivedUnread, lfReceivedRead, lfSentUnread, lfSentRead, toDisplay,
+                siteId) {
         lfReceivedUnread = lfReceivedUnread || 0;
         lfReceivedRead = lfReceivedRead || 0;
         lfSentUnread = lfSentUnread || 0;
@@ -315,14 +319,15 @@ angular.module('mm.addons.messages')
         }
 
         // Get message received by current user.
-        return self._getRecentMessages(params, presets, lfReceivedUnread, lfReceivedRead).then(function(response) {
+        return self._getRecentMessages(params, presets, lfReceivedUnread, lfReceivedRead, toDisplay, siteId)
+                .then(function(response) {
             result.messages = response;
             params.useridto = userId;
             params.useridfrom = $mmSite.getUserId();
             hasReceived = response.length > 0;
 
             // Get message sent by current user.
-            return self._getRecentMessages(params, presets, lfSentUnread, lfSentRead);
+            return self._getRecentMessages(params, presets, lfSentUnread, lfSentRead, toDisplay, siteId);
         }).then(function(response) {
             result.messages = result.messages.concat(response);
             hasSent = response.length > 0;
@@ -524,25 +529,40 @@ angular.module('mm.addons.messages')
      * @module mm.addons.messages
      * @ngdoc method
      * @name $mmaMessages#_getMessages
-     * @param {Object} params Parameters to pass to the WS.
-     * @param {Object} presets Set of presets for the WS.
+     * @param  {Object} params            Parameters to pass to the WS.
+     * @param  {Object} preSets           Set of presets for the WS.
+     * @param  {Boolean} [toDisplay=true] True if messages will be displayed to the user, either in view or in a notification.
+     * @param  {String} [siteId]          Site ID. If not defined, use current site.
      * @return {Promise}
      * @protected
      */
-    self._getMessages = function(params, presets) {
+    self._getMessages = function(params, preSets, toDisplay, siteId) {
+        toDisplay = typeof toDisplay == 'undefined' ? true : toDisplay;
+        siteId = siteId || $mmSite.getId();
+
         params = angular.extend(params, {
             type: 'conversations',
             newestfirst: 1,
         });
 
-        return $mmSite.read('core_message_get_messages', params, presets).then(function(response) {
-            angular.forEach(response.messages, function(message) {
-                message.read = params.read == 0 ? 0 : 1;
-                // Convert times to milliseconds.
-                message.timecreated = message.timecreated ? message.timecreated * 1000 : 0;
-                message.timeread = message.timeread ? message.timeread * 1000 : 0;
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var userId = site.getUserId();
+
+            return site.read('core_message_get_messages', params, preSets).then(function(response) {
+                angular.forEach(response.messages, function(message) {
+                    message.read = params.read == 0 ? 0 : 1;
+                    // Convert times to milliseconds.
+                    message.timecreated = message.timecreated ? message.timecreated * 1000 : 0;
+                    message.timeread = message.timeread ? message.timeread * 1000 : 0;
+                });
+
+                if ($mmApp.isDesktop() && toDisplay && !params.read && params.useridto == userId && params.limitfrom === 0) {
+                    // Store the last unread received messages. Don't block the user for this.
+                    storeLastReceivedMessageIfNeeded(params.useridfrom, response.messages[0], siteId);
+                }
+
+                return response;
             });
-            return response;
         });
     };
 
@@ -556,10 +576,12 @@ angular.module('mm.addons.messages')
      * @param  {Object} preSets             Set of presets for the WS.
      * @param  {Number} [limitFromUnread=0] Number of read messages already fetched, so fetch will be done from this number.
      * @param  {Number} [limitFromRead=0]   Number of unread messages already fetched, so fetch will be done from this number.
+     * @param  {Boolean} [toDisplay=true]   True if messages will be displayed to the user, either in view or in a notification.
+     * @param  {String} [siteId]            Site ID. If not defined, use current site.
      * @return {Promise}
      * @protected
      */
-    self._getRecentMessages = function(params, preSets, limitFromUnread, limitFromRead) {
+    self._getRecentMessages = function(params, preSets, limitFromUnread, limitFromRead, toDisplay, siteId) {
         limitFromUnread = limitFromUnread || 0;
         limitFromRead = limitFromRead || 0;
 
@@ -568,7 +590,7 @@ angular.module('mm.addons.messages')
             limitfrom: limitFromUnread
         });
 
-        return self._getMessages(params, preSets).then(function(response) {
+        return self._getMessages(params, preSets, toDisplay, siteId).then(function(response) {
             var messages = response.messages;
             if (messages) {
                 if (messages.length >= params.limitnum) {
@@ -580,7 +602,7 @@ angular.module('mm.addons.messages')
                 params.read = 1;
                 params.limitfrom = limitFromRead;
 
-                return self._getMessages(params, preSets).then(function(response) {
+                return self._getMessages(params, preSets, toDisplay, siteId).then(function(response) {
                     if (response.messages) {
                         messages = messages.concat(response.messages);
                     }
@@ -642,11 +664,13 @@ angular.module('mm.addons.messages')
      * @return {Promise}         Promise resolved with the message unread count.
      */
     self.getUnreadConversationsCount = function(userId, siteId) {
+        var params;
+
         return $mmSitesManager.getSite(siteId).then(function(site) {
             userId = userId || site.getUserId();
 
             if (site.wsAvailable('core_message_get_unread_conversations_count')) {
-                var params = {
+                params = {
                         useridto: userId
                     },
                     preSets = {
@@ -663,14 +687,14 @@ angular.module('mm.addons.messages')
             }
 
             // Fallback call.
-            var params = {
+            params = {
                 read: 0,
                 limitfrom: 0,
                 limitnum: mmaMessagesLimitMessages + 1,
                 useridto: userId,
                 useridfrom: 0,
             };
-            return self._getMessages(params).then(function(response) {
+            return self._getMessages(params, undefined, false, siteId).then(function(response) {
                 // Count the discussions by filtering same senders.
                 var discussions = {},
                     count;
@@ -688,6 +712,40 @@ angular.module('mm.addons.messages')
         });
     };
 
+    /**
+     * Get the latest unread received messages.
+     *
+     * @module mm.addons.messages
+     * @ngdoc method
+     * @name $mmaMessages#getUnreadReceivedMessages
+     * @param  {Boolean} [toDisplay=true] True if messages will be displayed to the user, either in view or in a notification.
+     * @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, use current site.
+     * @return {Promise}                  Promise resolved with the message unread count.
+     */
+    self.getUnreadReceivedMessages = function(toDisplay, forceCache, ignoreCache, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var params = {
+                    read: 0,
+                    limitfrom: 0,
+                    limitnum: mmaMessagesLimitMessages,
+                    useridto: site.getUserId(),
+                    useridfrom: 0
+                },
+                preSets = {};
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
+            return self._getMessages(params, preSets, toDisplay, siteId);
+        });
+    };
+
     /**
      * Invalidate all contacts cache.
      *
@@ -1274,6 +1332,33 @@ angular.module('mm.addons.messages')
         });
     }
 
+    /**
+     * Store the last received message if it's newer than the last stored.
+     *
+     * @param  {Number} userIdFrom ID of the useridfrom retrieved, 0 for all users.
+     * @param  {Object} message    Last message received.
+     * @param  {String} siteId     Site ID.
+     * @return {Promise}           Promise resolved when done.
+     */
+    function storeLastReceivedMessageIfNeeded(userIdFrom, message, siteId) {
+        var component = mmaMessagesPushSimulationComponent;
+
+        // Get the last received message.
+        return $mmEmulatorHelper.getLastReceivedNotification(component, siteId).then(function(lastMessage) {
+            if (userIdFrom > 0 && (!message || !lastMessage)) {
+                // Seeing a single discussion. No received message or cannot know if it really is the last received message. Stop.
+                return;
+            }
+
+            if (message && lastMessage && message.timecreated <= lastMessage.timecreated) {
+                // The message isn't newer than the stored message, don't store it.
+                return;
+            }
+
+            return $mmEmulatorHelper.storeLastReceivedNotification(component, message, siteId);
+        });
+    }
+
     /**
      * Unblock a user.
      *
diff --git a/www/addons/notifications/main.js b/www/addons/notifications/main.js
index 715ca9acb8d..d178e938f10 100644
--- a/www/addons/notifications/main.js
+++ b/www/addons/notifications/main.js
@@ -19,6 +19,7 @@ angular.module('mm.addons.notifications', [])
 .constant('mmaNotificationsPreferencesPriority', 500)
 .constant('mmaNotificationsReadChangedEvent', 'mma-notifications_read_changed')
 .constant('mmaNotificationsReadCronEvent', 'mma-notifications_read_cron')
+.constant('mmaNotificationsPushSimulationComponent', 'mmaNotificationsPushSimulation')
 
 .config(function($stateProvider, $mmSideMenuDelegateProvider, mmaNotificationsPriority, $mmSettingsDelegateProvider,
             mmaNotificationsPreferencesPriority) {
@@ -53,7 +54,8 @@ angular.module('mm.addons.notifications', [])
             '$mmaNotificationsHandlers.preferences', mmaNotificationsPreferencesPriority);
 })
 
-.run(function($log, $mmaNotifications, $mmUtil, $state, $mmAddonManager, $mmCronDelegate, $mmSitesManager) {
+.run(function($log, $mmaNotifications, $mmUtil, $state, $mmAddonManager, $mmCronDelegate, $mmSitesManager, $mmLocalNotifications,
+            $mmApp, mmaNotificationsPushSimulationComponent) {
     $log = $log.getInstance('mmaNotifications');
 
     // Register push notification clicks.
@@ -61,19 +63,7 @@ angular.module('mm.addons.notifications', [])
     if ($mmPushNotificationsDelegate) {
         $mmPushNotificationsDelegate.registerHandler('mmaNotifications', function(notification) {
             if ($mmUtil.isTrueOrOne(notification.notif)) {
-                $mmaNotifications.isPluginEnabledForSite(notification.site).then(function() {
-                    $mmSitesManager.isFeatureDisabled('$mmSideMenuDelegate_mmaNotifications', notification.site)
-                            .then(function(disabled) {
-                        if (disabled) {
-                            // Notifications are disabled, stop.
-                            return;
-                        }
-
-                        $mmaNotifications.invalidateNotificationsList().finally(function() {
-                            $state.go('redirect', {siteid: notification.site, state: 'site.notifications'});
-                        });
-                    });
-                });
+                notificationClicked(notification);
                 return true;
             }
         });
@@ -81,4 +71,26 @@ angular.module('mm.addons.notifications', [])
 
     // Register sync process.
     $mmCronDelegate.register('mmaNotificationsMenu', '$mmaNotificationsHandlers.sideMenuNav');
+
+    if ($mmApp.isDesktop()) {
+        // Listen for clicks in simulated push notifications.
+        $mmLocalNotifications.registerClick(mmaNotificationsPushSimulationComponent, notificationClicked);
+    }
+
+    // A push notification belonging to notifications was clicked.
+    function notificationClicked(notification) {
+        return $mmaNotifications.isPluginEnabledForSite(notification.site).then(function() {
+            $mmSitesManager.isFeatureDisabled('$mmSideMenuDelegate_mmaNotifications', notification.site)
+                    .then(function(disabled) {
+                if (disabled) {
+                    // Notifications are disabled, stop.
+                    return;
+                }
+
+                $mmaNotifications.invalidateNotificationsList().finally(function() {
+                    $state.go('redirect', {siteid: notification.site, state: 'site.notifications'});
+                });
+            });
+        });
+    }
 });
diff --git a/www/addons/notifications/services/handlers.js b/www/addons/notifications/services/handlers.js
index f832baa8c98..9dd39235d82 100644
--- a/www/addons/notifications/services/handlers.js
+++ b/www/addons/notifications/services/handlers.js
@@ -24,11 +24,38 @@ angular.module('mm.addons.notifications')
  * @name $mmaNotificationsHandlers
  */
 .factory('$mmaNotificationsHandlers', function($log, $mmaNotifications, $mmEvents, $mmSitesManager, $mmUtil, $mmSite,
-        mmaNotificationsReadChangedEvent, mmaNotificationsReadCronEvent, $mmAddonManager) {
+        mmaNotificationsReadChangedEvent, mmaNotificationsReadCronEvent, $mmAddonManager, $mmApp, $mmLocalNotifications,
+        $mmEmulatorHelper, $mmText, mmaNotificationsPushSimulationComponent) {
     $log = $log.getInstance('$mmaNotificationsHandlers');
 
     var self = {};
 
+    /**
+     * Get the latest unread notifications from a site.
+     *
+     * @param  {String} siteId Site ID.
+     * @return {Promise}       Promise resolved with the notifications.
+     */
+    function fetchNotifications(siteId) {
+        return $mmaNotifications.getUnreadNotifications(0, undefined, true, false, true, siteId);
+    }
+
+    /**
+     * Given a notification, return the title and the text for the notification.
+     *
+     * @param  {Object} notification Notification.
+     * @return {Object}              Object with title and text.
+     */
+    function getTitleAndText(notification) {
+        var data = {
+                title: notification.userfromfullname,
+                text: notification.mobiletext.replace(/-{4,}/ig, '')
+            };
+        data.text = $mmText.replaceNewLines(data.text, '<br>');
+
+        return data;
+    }
+
     /**
      * Side menu nav handler.
      *
@@ -142,6 +169,11 @@ angular.module('mm.addons.notifications')
                     siteid: siteId
                 });
             }
+
+            if ($mmApp.isDesktop() && $mmLocalNotifications.isAvailable()) {
+                $mmEmulatorHelper.checkNewNotifications(
+                        mmaNotificationsPushSimulationComponent, fetchNotifications, getTitleAndText, siteId);
+            }
         };
 
         /**
@@ -150,7 +182,7 @@ angular.module('mm.addons.notifications')
          * @return {Number} Time between consecutive executions (in ms).
          */
         self.getInterval = function() {
-            return 600000; // 10 minutes.
+            return $mmApp.isDesktop() ? 60000 : 600000; // 1 or 10 minutes.
         };
 
         /**
@@ -159,8 +191,9 @@ angular.module('mm.addons.notifications')
          * @return {Boolean} True if is a sync process, false otherwise.
          */
         self.isSync = function() {
-            // This is done to use only wifi if using the fallback function
-            return !$mmaNotifications.isNotificationCountEnabled();
+            // This is done to use only wifi if using the fallback function.
+            // In desktop it is always sync, since it fetches notification to see if there's a new one.
+            return !$mmaNotifications.isNotificationCountEnabled() || $mmApp.isDesktop();
         };
 
         /**
diff --git a/www/addons/notifications/services/notifications.js b/www/addons/notifications/services/notifications.js
index 44e7179dca3..58a3470f1ba 100644
--- a/www/addons/notifications/services/notifications.js
+++ b/www/addons/notifications/services/notifications.js
@@ -21,13 +21,19 @@ angular.module('mm.addons.notifications')
  * @ngdoc service
  * @name $mmaNotifications
  */
-.factory('$mmaNotifications', function($q, $log, $mmSite, $mmSitesManager, $mmUser, $mmUtil, mmaNotificationsListLimit) {
+.factory('$mmaNotifications', function($q, $log, $mmSite, $mmSitesManager, $mmUser, $mmUtil, $mmApp, mmaNotificationsListLimit,
+            mmaNotificationsPushSimulationComponent, $mmEmulatorHelper) {
 
     $log = $log.getInstance('$mmaNotifications');
 
     var self = {};
 
-    // Function to format notification data.
+    /**
+     * Function to format notification data.
+     *
+     * @param  {Object[]} notifications List of notifications.
+     * @return {Void}
+     */
     function formatNotificationsData(notifications) {
         angular.forEach(notifications, function(notification) {
             // Set message to show.
@@ -97,39 +103,60 @@ angular.module('mm.addons.notifications')
      * @module mm.addons.notifications
      * @ngdoc method
      * @name $mmaNotifications#getNotifications
-     * @param {Boolean} read       True if should get read notifications, false otherwise.
-     * @param {Number} limitFrom   Position of the first notification to get.
-     * @param {Number} limitNumber Number of notifications to get.
-     * @return {Promise}           Promise resolved with notifications.
+     * @param  {Boolean} read             True if should get read notifications, false otherwise.
+     * @param  {Number} limitFrom         Position of the first notification to get.
+     * @param  {Number} limitNumber       Number of notifications to get.
+     * @param  {Boolean} [toDisplay=true] True if notifications will be displayed to the user, either in view or in a notification.
+     * @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, use current site.
+     * @return {Promise}                  Promise resolved with notifications.
      */
-    self.getNotifications = function(read, limitFrom, limitNumber) {
+    self.getNotifications = function(read, limitFrom, limitNumber, toDisplay, forceCache, ignoreCache, siteId) {
+        toDisplay = typeof toDisplay == 'undefined' ? true : toDisplay;
         limitFrom = limitFrom || 0;
         limitNumber = limitNumber || mmaNotificationsListLimit;
+        siteId = siteId || $mmSite.getId();
 
         $log.debug('Get ' + (read ? 'read' : 'unread') + ' notifications from ' + limitFrom + '. Limit: ' + limitNumber);
 
-        var data = {
-            useridto: $mmSite.getUserId(),
-            useridfrom: 0,
-            type: 'notifications',
-            read: read ? 1 : 0,
-            newestfirst: 1,
-            limitfrom: limitFrom,
-            limitnum: limitNumber
-        };
-        var preSets = {
-            cacheKey: getNotificationsCacheKey()
-        };
-
-        // Get unread notifications.
-        return $mmSite.read('core_message_get_messages', data, preSets).then(function(response) {
-            if (response.messages) {
-                var notifications = response.messages;
-                formatNotificationsData(notifications);
-                return notifications;
-            } else {
-                return $q.reject();
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            var data = {
+                    useridto: site.getUserId(),
+                    useridfrom: 0,
+                    type: 'notifications',
+                    read: read ? 1 : 0,
+                    newestfirst: 1,
+                    limitfrom: limitFrom,
+                    limitnum: limitNumber
+                }, preSets = {
+                    cacheKey: getNotificationsCacheKey()
+                };
+
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
             }
+
+            // Get unread notifications.
+            return site.read('core_message_get_messages', data, preSets).then(function(response) {
+                if (response.messages) {
+                    var notifications = response.messages;
+                    formatNotificationsData(notifications);
+
+                    if ($mmApp.isDesktop() && toDisplay && !read && limitFrom === 0) {
+                        // Store the last received notification. Don't block the user for this.
+                        $mmEmulatorHelper.storeLastReceivedNotification(
+                                mmaNotificationsPushSimulationComponent, notifications[0], siteId);
+                    }
+
+                    return notifications;
+                } else {
+                    return $q.reject();
+                }
+            });
         });
     };
 
@@ -139,12 +166,16 @@ angular.module('mm.addons.notifications')
      * @module mm.addons.notifications
      * @ngdoc method
      * @name $mmaNotifications#getReadNotifications
-     * @param {Number} limitFrom   Position of the first notification to get.
-     * @param {Number} limitNumber Number of notifications to get.
-     * @return {Promise}           Promise resolved with notifications.
+     * @param  {Number} limitFrom         Position of the first notification to get.
+     * @param  {Number} limitNumber       Number of notifications to get.
+     * @param  {Boolean} [toDisplay=true] True if notifications will be displayed to the user, either in view or in a notification.
+     * @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, use current site.
+     * @return {Promise}                  Promise resolved with notifications.
      */
-    self.getReadNotifications = function(limitFrom, limitNumber) {
-        return self.getNotifications(true, limitFrom, limitNumber);
+    self.getReadNotifications = function(limitFrom, limitNumber, toDisplay, forceCache, ignoreCache, siteId) {
+        return self.getNotifications(true, limitFrom, limitNumber, toDisplay, forceCache, ignoreCache, siteId);
     };
 
     /**
@@ -153,12 +184,16 @@ angular.module('mm.addons.notifications')
      * @module mm.addons.notifications
      * @ngdoc method
      * @name $mmaNotifications#getUnreadNotifications
-     * @param {Number} limitFrom   Position of the first notification to get.
-     * @param {Number} limitNumber Number of notifications to get.
-     * @return {Promise}           Promise resolved with notifications.
+     * @param  {Number} limitFrom         Position of the first notification to get.
+     * @param  {Number} limitNumber       Number of notifications to get.
+     * @param  {Boolean} [toDisplay=true] True if notifications will be displayed to the user, either in view or in a notification.
+     * @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, use current site.
+     * @return {Promise}                  Promise resolved with notifications.
      */
-    self.getUnreadNotifications = function(limitFrom, limitNumber) {
-        return self.getNotifications(false, limitFrom, limitNumber);
+    self.getUnreadNotifications = function(limitFrom, limitNumber, toDisplay, forceCache, ignoreCache, siteId) {
+        return self.getNotifications(false, limitFrom, limitNumber, toDisplay, forceCache, ignoreCache, siteId);
     };
 
     /**
@@ -193,7 +228,8 @@ angular.module('mm.addons.notifications')
             }
 
             // Fallback call.
-            return self.getNotifications(false, 0, mmaNotificationsListLimit + 1).then(function(unread) {
+            var limit = mmaNotificationsListLimit + 1;
+            return self.getUnreadNotifications(0, limit, false, false, false, siteId).then(function(unread) {
                 // Add + sign if there are more than the limit reachable.
                 return (unread.length > mmaNotificationsListLimit) ? unread.length + "+" : unread.length;
             }).catch(function() {
diff --git a/www/core/components/emulator/services/emulator.js b/www/core/components/emulator/services/emulator.js
index 0d370a95ce1..0a72c044be3 100644
--- a/www/core/components/emulator/services/emulator.js
+++ b/www/core/components/emulator/services/emulator.js
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-angular.module('mm.core')
+angular.module('mm.core.emulator')
 
 /**
  * @ngdoc service
  * @name $mmEmulatorManager
- * @module mm.core
+ * @module mm.core.emulator
  * @description
  * This service handles the emulation of Cordova plugins in other environments like browser.
  */
@@ -32,7 +32,7 @@ angular.module('mm.core')
     /**
      * Loads HTML API to simulate Cordova APIs. Reserved for core use.
      *
-     * @module mm.core
+     * @module mm.core.emulator
      * @ngdoc method
      * @name $mmEmulatorManager#loadHTMLAPI
      * @return {Promise} Promise resolved when the API is loaded.
diff --git a/www/core/components/emulator/services/helper.js b/www/core/components/emulator/services/helper.js
new file mode 100644
index 00000000000..555e9445717
--- /dev/null
+++ b/www/core/components/emulator/services/helper.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.core.emulator')
+
+.constant('mmCoreEmulatorLastReceivedNotificationStore', 'mm_emulator_last_received_notification')
+
+.config(function($mmSitesFactoryProvider, mmCoreEmulatorLastReceivedNotificationStore) {
+    var stores = [
+        {
+            name: mmCoreEmulatorLastReceivedNotificationStore,
+            keyPath: 'component' // Only 1 entry per component.
+        }
+    ];
+    $mmSitesFactoryProvider.registerStores(stores);
+})
+
+.factory('$mmEmulatorHelper', function($log, $mmSitesManager, $mmApp, $q, $mmLocalNotifications, $mmUtil, mmCoreSecondsDay,
+            mmCoreEmulatorLastReceivedNotificationStore) {
+
+    $log = $log.getInstance('$mmEmulatorHelper');
+
+    var self = {};
+
+    /**
+     * Check if there are new notifications, triggering a local notification if found.
+     * Only for desktop apps since they don't support push notifications.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorHelper#checkNewNotifications
+     * @param {String} [siteId] Site ID to check. If not defined, check all sites.
+     * @return {Promise}        Promise resolved when done.
+     */
+    self.checkNewNotifications = function(component, fetchFn, getDataFn, siteId) {
+        if (!$mmApp.isDesktop() || !$mmLocalNotifications.isAvailable()) {
+            return $q.when();
+        }
+
+        if (!$mmApp.isOnline()) {
+            $log.debug('Cannot check push notifications because device is offline.');
+            return $q.reject();
+        }
+
+        var promise;
+        if (!siteId) {
+            // No site ID defined, check all sites.
+            promise = $mmSitesManager.getSitesIds();
+        } else {
+            promise = $q.when([siteId]);
+        }
+
+        return promise.then(function(siteIds) {
+            var sitePromises = [];
+
+            angular.forEach(siteIds, function(siteId) {
+                // Check new notifications for each site.
+                sitePromises.push(checkNewNotificationsForSite(component, fetchFn, getDataFn, siteId));
+            });
+
+            return $q.all(sitePromises);
+        });
+    };
+
+    /**
+     * Check if there are new notifications for a certain site, triggering a local notification if found.
+     *
+     * @param {String} siteId Site ID to check.
+     * @return {Promise}      Promise resolved when done.
+     */
+    function checkNewNotificationsForSite(component, fetchFn, getDataFn, siteId) {
+        // Get the last received notification in the app.
+        return self.getLastReceivedNotification(component, siteId).then(function(lastNotification) {
+            // Now fetch the latest notifications from the server.
+            return fetchFn(siteId).then(function(notifications) {
+                if (!lastNotification || !notifications.length) {
+                    // No last notification stored (first call) or no new notifications. Stop.
+                    return;
+                }
+
+                var notification = notifications[0];
+
+                if (notification.id == lastNotification.id || notification.timecreated <= lastNotification.timecreated ||
+                        $mmUtil.timestamp() - notification.timecreated > mmCoreSecondsDay) {
+                    // There are no new notifications or the newest one happened more than a day ago, stop.
+                    return;
+                }
+
+                // There is a new notification, show it.
+                return $q.when(getDataFn(notification)).then(function(titleAndText) {
+                    var localNotif = {
+                            id: 1,
+                            at: new Date(),
+                            title: titleAndText.title,
+                            text: titleAndText.text,
+                            data: {
+                                notif: notification,
+                                site: siteId
+                            }
+                        };
+
+                    $mmLocalNotifications.schedule(localNotif, component, siteId);
+                });
+            });
+        });
+    }
+
+
+    /**
+     * Get the last notification received in a certain site for a certain component.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorHelper#getLastReceivedNotification
+     * @param  {String} component Component of the notification to get.
+     * @param  {String} siteId    Site ID of the notification.
+     * @return {Promise}          Promise resolved with the notification or false if not found.
+     */
+    self.getLastReceivedNotification = function(component, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().get(mmCoreEmulatorLastReceivedNotificationStore, component);
+        }).catch(function() {
+            return false;
+        });
+    };
+
+    /**
+     * Store the last notification received in a certain site.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorHelper#storeLastReceivedNotification
+     * @param  {String} component    Component of the notification to store.
+     * @param  {Object} notification Notification to store.
+     * @param  {String} siteId       Site ID of the notification.
+     * @return {Promise}             Promise resolved when done.
+     */
+    self.storeLastReceivedNotification = function(component, notification, siteId) {
+        if (!notification) {
+            // No notification, store a fake one.
+            notification = {id: -1, timecreated: 0};
+        }
+        notification.component = component;
+
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().insert(mmCoreEmulatorLastReceivedNotificationStore, notification);
+        });
+    };
+
+    return self;
+});
diff --git a/www/core/lib/cron.js b/www/core/lib/cron.js
index 4ef83d830c2..b9405333e49 100644
--- a/www/core/lib/cron.js
+++ b/www/core/lib/cron.js
@@ -16,6 +16,7 @@ angular.module('mm.core')
 
 .constant('mmCoreCronInterval', 3600000) // Default interval is 1 hour.
 .constant('mmCoreCronMinInterval', 300000) // Minimum interval is 5 minutes.
+.constant('mmCoreCronDesktopMinInterval', 60000) // Minimum interval in desktop is 1 minute.
 .constant('mmCoreCronMaxTimeProcess', 120000) // Max time a process can block the queue. Defaults to 2 minutes.
 .constant('mmCoreCronStore', 'cron')
 
@@ -37,7 +38,7 @@ angular.module('mm.core')
  * @name $mmCronDelegate
  */
 .factory('$mmCronDelegate', function($log, $mmConfig, $mmApp, $timeout, $q, $mmUtil, mmCoreCronInterval, mmCoreCronStore,
-            mmCoreSettingsSyncOnlyOnWifi, mmCoreCronMinInterval, mmCoreCronMaxTimeProcess) {
+            mmCoreSettingsSyncOnlyOnWifi, mmCoreCronMinInterval, mmCoreCronMaxTimeProcess, mmCoreCronDesktopMinInterval) {
 
     $log = $log.getInstance('$mmCronDelegate');
 
@@ -190,8 +191,9 @@ angular.module('mm.core')
             return mmCoreCronInterval;
         }
 
-        // Don't allow intervals lower than 5 minutes.
-        return Math.max(mmCoreCronMinInterval, parseInt(hooks[name].instance.getInterval(), 10));
+        // Don't allow intervals lower than the minimum.
+        var minInterval = $mmApp.isDesktop() ? mmCoreCronDesktopMinInterval : mmCoreCronMinInterval;
+        return Math.max(minInterval, parseInt(hooks[name].instance.getInterval(), 10));
     };
 
     /**

From 0bb4843724da000c28e9761b8496f4e5d3658b04 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 26 Jun 2017 08:39:10 +0200
Subject: [PATCH 039/118] MOBILE-2145 electron: Use ToastNotification and
 TileNotification

---
 package.json                                  | 13 ++--
 .../components/emulator/services/helper.js    | 17 +++++
 .../emulator/services/localnotif.js           | 73 ++++++++++++++++---
 3 files changed, 88 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index fcc4f55f831..2fe9eed3a62 100644
--- a/package.json
+++ b/package.json
@@ -13,22 +13,25 @@
       "url": "http://www.apache.org/licenses/LICENSE-2.0"
     }
   ],
-  "dependencies": {},
+  "dependencies": {
+    "electron-windows-notifications": "^1.1.13"
+  },
   "devDependencies": {
     "appium": "^1.6.0",
     "bower": "^1.3.3",
+    "electron-rebuild": "^1.5.11",
     "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-clean": "^0.3.2",
+    "gulp-clean-css": "^3.0.3",
     "gulp-clip-empty-files": "^0.1.1",
+    "gulp-concat": "^2.6.0",
     "gulp-concat-util": "^0.5.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-rename": "^1.2.0",
+    "gulp-sass": "^2.3.2",
     "gulp-slash": "^1.1.3",
     "gulp-strip-comments": "^2.4.3",
     "gulp-tap": "^0.1.3",
diff --git a/www/core/components/emulator/services/helper.js b/www/core/components/emulator/services/helper.js
index 555e9445717..a95570a5b4a 100644
--- a/www/core/components/emulator/services/helper.js
+++ b/www/core/components/emulator/services/helper.js
@@ -135,6 +135,23 @@ angular.module('mm.core.emulator')
         });
     };
 
+    /**
+     * Check if the app is running in a Windows environment.
+     *
+     * @module mm.core.emulator
+     * @ngdoc method
+     * @name $mmEmulatorHelper#isWindows
+     * @return {Boolean} Whether it's running in a Windows environment.
+     */
+    self.isWindows = function() {
+        try {
+            var os = require('os');
+            return os.platform().indexOf('win') === 0;
+        } catch(ex) {
+            return false;
+        }
+    };
+
     /**
      * Store the last notification received in a certain site.
      *
diff --git a/www/core/components/emulator/services/localnotif.js b/www/core/components/emulator/services/localnotif.js
index 1e2c7fc3ede..6e41fbfd3fd 100644
--- a/www/core/components/emulator/services/localnotif.js
+++ b/www/core/components/emulator/services/localnotif.js
@@ -40,7 +40,7 @@ angular.module('mm.core.emulator')
  */
 .factory('$mmEmulatorLocalNotifications', function($log, $q, $mmApp, $mmUtil, $timeout, $interval, $rootScope,
             $cordovaLocalNotification, mmCoreDesktopLocalNotificationsStore, mmCoreSecondsYear, mmCoreSecondsDay,
-            mmCoreSecondsHour, mmCoreSecondsMinute) {
+            mmCoreSecondsHour, mmCoreSecondsMinute, $mmEmulatorHelper, mmCoreConfigConstants) {
 
     $log = $log.getInstance('$mmEmulatorLocalNotifications');
 
@@ -56,7 +56,17 @@ angular.module('mm.core.emulator')
             data:  undefined,
             every: undefined,
             at:    undefined
-        };
+        },
+        winNotif, // Library for Windows notifications.
+        toastTemplate = '<toast><visual><binding template="ToastText02"><text id="1" hint-wrap="true">%s</text>' +
+                        '<text id="2" hint-wrap="true">%s</text></binding></visual></toast>', // Template for Windows ToastNotifications.
+        tileBindingTemplate =   '<text hint-style="base" hint-wrap="true">%s</text>' +
+                                '<text hint-style="captionSubtle" hint-wrap="true">%s</text>',
+        tileTemplate = '<tile><visual branding="nameAndLogo">' +
+                            '<binding template="TileMedium">' + tileBindingTemplate + '</binding>' +
+                            '<binding template="TileWide">' + tileBindingTemplate + '</binding>' +
+                            '<binding template="TileLarge">' + tileBindingTemplate + '</binding>' +
+                        '</visual></tile>'; // Template for Windows TileNotifications. Use same template for all sizes.
 
     /**
      * Cancel a local notification.
@@ -218,6 +228,12 @@ angular.module('mm.core.emulator')
             return $q.when();
         }
 
+        if ($mmEmulatorHelper.isWindows()) {
+            try {
+                winNotif = require('electron-windows-notifications');
+            } catch(ex) {}
+        }
+
         // Redefine $cordovaLocalNotification methods instead of the core plugin (window.cordova.plugins.notification.local)
         // because creating window.cordova breaks the app (it thinks it's a real device).
         $cordovaLocalNotification.schedule = function(notifications, scope, isUpdate) {
@@ -242,9 +258,7 @@ angular.module('mm.core.emulator')
                 var toTrigger = notification.at * 1000 - Date.now();
                 scheduled[notification.id].timeout = $timeout(function trigger() {
                     // Trigger the notification.
-                    var notifInstance = new Notification(notification.title, {
-                        body: notification.text
-                    });
+                    triggerNotification(notification);
 
                     // Store the notification as triggered. Don't remove it from scheduled, it's how the plugin works.
                     triggered[notification.id] = notification;
@@ -253,11 +267,6 @@ angular.module('mm.core.emulator')
                     // Launch the trigger event.
                     $rootScope.$broadcast('$cordovaLocalNotification:trigger', notification, 'foreground');
 
-                    // Listen for click events.
-                    notifInstance.onclick = function() {
-                        $rootScope.$broadcast('$cordovaLocalNotification:click', notification, 'foreground');
-                    };
-
                     if (notification.every && scheduled[notification.id] && !scheduled[notification.id].interval) {
                         var interval = parseInterval(notification.every);
                         if (interval > 0) {
@@ -538,5 +547,49 @@ angular.module('mm.core.emulator')
         return $mmApp.getDB().insert(mmCoreDesktopLocalNotificationsStore, notification);
     }
 
+    /**
+     * Trigger a notification, using the best method depending on the OS.
+     *
+     * @param  {Object} notification Notification to trigger.
+     * @return {Void}
+     */
+    function triggerNotification(notification) {
+        if (winNotif) {
+            // Use Windows notifications.
+            var notifInstance = new winNotif.ToastNotification({
+                appId: mmCoreConfigConstants.app_id,
+                template: toastTemplate,
+                strings: [notification.title,  notification.text]
+            });
+
+            // Listen for click events.
+            notifInstance.on('activated', function() {
+                $rootScope.$broadcast('$cordovaLocalNotification:click', notification, 'foreground');
+            });
+
+            notifInstance.show()
+
+            // Show it in Tile too.
+            var tileNotif = new winNotif.TileNotification({
+                tag: notification.id + '',
+                template: tileTemplate,
+                strings: [notification.title,  notification.text, notification.title,  notification.text, notification.title,  notification.text],
+                expirationTime: new Date(Date.now() + mmCoreSecondsHour * 1000) // Expire in 1 hour.
+            })
+
+            tileNotif.show()
+        } else {
+            // Use Electron default notifications.
+            var notifInstance = new Notification(notification.title, {
+                body: notification.text
+            });
+
+            // Listen for click events.
+            notifInstance.onclick = function() {
+                $rootScope.$broadcast('$cordovaLocalNotification:click', notification, 'foreground');
+            };
+        }
+    }
+
     return self;
 });

From 7d98ce41bd29c8a2519fba76c44ebf065271f4c8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 27 Jun 2017 14:45:42 +0200
Subject: [PATCH 040/118] MOBILE-2136 course: Support links to sections

---
 .../components/course/controllers/sections.js | 37 ++++++++++++++-----
 www/core/components/course/main.js            |  3 +-
 .../components/courses/services/handlers.js   | 25 ++++++++++---
 3 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/www/core/components/course/controllers/sections.js b/www/core/components/course/controllers/sections.js
index 82f9dbd431e..58ac12947fb 100644
--- a/www/core/components/course/controllers/sections.js
+++ b/www/core/components/course/controllers/sections.js
@@ -26,6 +26,7 @@ angular.module('mm.core.course')
             mmCoreEventSectionStatusChanged, $state, $timeout, $mmCoursesDelegate, $controller) {
     var courseId = $stateParams.courseid,
         sectionId = $stateParams.sid,
+        sectionNumber = $stateParams.sectionnumber,
         moduleId = $stateParams.moduleid,
         course = $stateParams.course ? angular.copy($stateParams.course) : false;
 
@@ -171,14 +172,17 @@ angular.module('mm.core.course')
 
     // Convenience function to autoload a section if sectionId param is set.
     function autoloadSection() {
-        if (sectionId) {
+        if (sectionId || sectionNumber >= 0) {
             if ($ionicPlatform.isTablet()) {
                 // Search the position of the section to load.
-                angular.forEach($scope.sections, function(section, index) {
-                    if (section.id == sectionId) {
-                        $scope.sectionToLoad = index + 1;
+                for (var index in $scope.sections) {
+                    var section = $scope.sections[index];
+                    if (section.id == sectionId || (sectionNumber >= 0 && section.section === sectionNumber)) {
+                        $scope.sectionToLoad = parseInt(index, 10) + 1;
+                        break;
                     }
-                });
+                }
+
                 // Set moduleId to pass it to the new state when the section is autoloaded. We unset it after this
                 // to prevent autoloading the module when the user manually loads a section.
                 $scope.moduleId = moduleId;
@@ -186,11 +190,24 @@ angular.module('mm.core.course')
                     $scope.moduleId = null; // Unset moduleId when
                 }, 500);
             } else {
-                $state.go('site.mm_course-section', {
-                    sectionid: sectionId,
-                    cid: courseId,
-                    mid: moduleId
-                });
+                if (!sectionId) {
+                    // Search the section ID by section number.
+                    for (var index in $scope.sections) {
+                        var section = $scope.sections[index];
+                        if (section.section == sectionNumber) {
+                            sectionId = section.id
+                            break;
+                        }
+                    }
+                }
+
+                if (sectionId) {
+                    $state.go('site.mm_course-section', {
+                        sectionid: sectionId,
+                        cid: courseId,
+                        mid: moduleId
+                    });
+                }
             }
         }
     }
diff --git a/www/core/components/course/main.js b/www/core/components/course/main.js
index ea85c0ea079..99205b24219 100644
--- a/www/core/components/course/main.js
+++ b/www/core/components/course/main.js
@@ -17,7 +17,7 @@ angular.module('mm.core.course', ['mm.core.courses'])
 .constant('mmCoreCoursePriority', 800)
 .constant('mmCoreCourseAllSectionsId', -1)
 
-.config(function($stateProvider, $mmCoursesDelegateProvider, mmCoreCoursePriority) {
+.config(function($stateProvider) {
 
     $stateProvider
 
@@ -26,6 +26,7 @@ angular.module('mm.core.course', ['mm.core.courses'])
         params: {
             courseid: null,
             sid: null, // Section to load. Not naming it sectionid because it collides with 'mm_course-section' param in split-view.
+            sectionnumber: null, // Section to load. If sid is provided there is no need to provide sectionnumber and vice versa.
             moduleid: null, // Module to load.
             course: null
         },
diff --git a/www/core/components/courses/services/handlers.js b/www/core/components/courses/services/handlers.js
index 6ebbe389417..08daca0ee07 100644
--- a/www/core/components/courses/services/handlers.js
+++ b/www/core/components/courses/services/handlers.js
@@ -91,17 +91,29 @@ angular.module('mm.core.courses')
     self.courseLinksHandler.getActions = function(siteIds, url, params, courseId) {
         courseId = parseInt(params.id, 10);
 
+        var sectionId = params.sectionid ? parseInt(params.sectionid, 10) : null,
+            sectionNumber = typeof params.section != 'undefined' ? parseInt(params.section, 10) : NaN,
+            stateParams = {
+                courseid: courseId,
+                sid: sectionId || null
+            };
+
+        if (!isNaN(sectionNumber)) {
+            stateParams.sectionnumber = sectionNumber;
+        }
+
         return [{
             action: function(siteId) {
                 siteId = siteId || $mmSite.getId();
                 if (siteId == $mmSite.getId()) {
-                    actionEnrol(courseId, url);
+                    actionEnrol(courseId, url, stateParams);
                 } else {
+
                     // Use redirect to make the course the new history root (to avoid "loops" in history).
                     $state.go('redirect', {
                         siteid: siteId,
                         state: 'site.mm_course',
-                        params: {courseid: courseId}
+                        params: stateParams
                     });
                 }
             }
@@ -111,11 +123,12 @@ angular.module('mm.core.courses')
     /**
      * Action to perform when an enrol link is clicked.
      *
-     * @param  {Number} courseId Course ID.
-     * @param  {String} url      Treated URL.
+     * @param  {Number} courseId    Course ID.
+     * @param  {String} url         Treated URL.
+     * @param  {Object} stateParams Params to send to the new state.
      * @return {Void}
      */
-    function actionEnrol(courseId, url) {
+    function actionEnrol(courseId, url, stateParams) {
         var modal = $mmUtil.showModalLoading(),
             isEnrolUrl = !!url.match(/(\/enrol\/index\.php)|(\/course\/enrol\.php)/);
 
@@ -164,7 +177,7 @@ angular.module('mm.core.courses')
             $state.go('redirect', {
                 siteid: $mmSite.getId(),
                 state: 'site.mm_course',
-                params: {courseid: courseId}
+                params: stateParams
             });
         });
     }

From 3da835b043f4f5b9da6ba9d5683c6ba1c016571f Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 27 Jun 2017 13:12:52 +0200
Subject: [PATCH 041/118] MOBILE-2148: Prepare app for Windows Store

---
 .gitignore                                    |   1 +
 AppXManifest.xml                              |  44 +++++++++++++++
 package.json                                  |  53 ++++++++++++++++--
 resources/desktop/Square150x150Logo.png       | Bin 0 -> 21500 bytes
 resources/desktop/Square44x44Logo.png         | Bin 0 -> 5300 bytes
 resources/desktop/StoreLogo.png               | Bin 0 -> 5326 bytes
 resources/desktop/Wide310x150Logo.png         | Bin 0 -> 22634 bytes
 resources/desktop/icon.icns                   | Bin 0 -> 32691 bytes
 resources/desktop/icon.ico                    | Bin 0 -> 29466 bytes
 www/config.json                               |   1 +
 .../components/settings/controllers/about.js  |   4 +-
 www/electron.js                               |   6 +-
 www/index.html                                |   2 +-
 13 files changed, 100 insertions(+), 11 deletions(-)
 create mode 100644 AppXManifest.xml
 create mode 100644 resources/desktop/Square150x150Logo.png
 create mode 100644 resources/desktop/Square44x44Logo.png
 create mode 100644 resources/desktop/StoreLogo.png
 create mode 100644 resources/desktop/Wide310x150Logo.png
 create mode 100644 resources/desktop/icon.icns
 create mode 100644 resources/desktop/icon.ico

diff --git a/.gitignore b/.gitignore
index aabd7486658..de95095bf11 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ www/build
 .sass-cache/
 www/lib
 e2e/build
+/desktop
diff --git a/AppXManifest.xml b/AppXManifest.xml
new file mode 100644
index 00000000000..d525ac270d7
--- /dev/null
+++ b/AppXManifest.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Package
+   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities">
+  <Identity Name="3312ADB7.MoodleDesktop"
+    ProcessorArchitecture="x64"
+    Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
+    Version="3.3.0.0" />
+  <Properties>
+    <DisplayName>Moodle Desktop</DisplayName>
+    <PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>
+    <Description>The official app for Moodle.</Description>
+    <Logo>assets\StoreLogo.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource Language="en-us" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0" MaxVersionTested="10.0.14316.0" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust"/>
+  </Capabilities>
+  <Applications>
+    <Application Id="com.moodle.moodlemobile" Executable="app\MoodleDesktop.exe" EntryPoint="Windows.FullTrustApplication">
+      <uap:VisualElements
+       BackgroundColor="#464646"
+       DisplayName="Moodle Desktop"
+       Square150x150Logo="assets\Square150x150Logo.png"
+       Square44x44Logo="assets\Square44x44Logo.png"
+       Description="Moodle Desktop: The official desktop app for Moodle.">
+        <uap:DefaultTile Wide310x150Logo="assets\Wide310x150Logo.png" />
+      </uap:VisualElements>
+      <Extensions>
+        <uap:Extension Category="windows.protocol">
+          <uap:Protocol Name="moodlemobile">
+            <uap:DisplayName>Moodle Mobile URI Scheme</uap:DisplayName>
+          </uap:Protocol>
+        </uap:Extension>
+      </Extensions>
+    </Application>
+  </Applications>
+</Package>
diff --git a/package.json b/package.json
index 2fe9eed3a62..d8d37a8dabb 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,11 @@
 {
-  "name": "mm2",
+  "name": "com.moodle.moodlemobile",
   "version": "3.3.0",
-  "description": "Moodle Mobile 2: The official mobile app for Moodle.",
+  "description": "The official app for Moodle.",
+  "author": {
+    "name": "Moodle Pty Ltd.",
+    "email": "mobile@moodle.com"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/moodlehq/moodlemobile2.git"
@@ -14,7 +18,8 @@
     }
   ],
   "dependencies": {
-    "electron-windows-notifications": "^1.1.13"
+    "electron-windows-notifications": "^1.1.13",
+    "electron-builder-squirrel-windows": "^19.3.0"
   },
   "devDependencies": {
     "appium": "^1.6.0",
@@ -123,7 +128,45 @@
     "android": "ionic run android",
     "serve.e2e": "ionic serve -b -a",
     "serve.dev": "ionic serve",
-    "e2e": "protractor e2e/build/protractor.conf.js"
+    "e2e": "protractor e2e/build/protractor.conf.js",
+    "desktop.pack": "build --dir",
+    "desktop.dist": "build",
+    "windows.store": "electron-windows-store --input-directory .\\desktop\\dist\\win-unpacked --output-directory .\\desktop\\store --flatten true -a .\\resources\\desktop -m .\\AppXManifest.xml --package-version 0.0.0.0 --package-name MoodleDesktop"
   },
-  "main": "www/electron.js"
+  "main": "www/electron.js",
+  "build": {
+    "appId": "com.moodle.moodlemobile",
+    "productName": "MoodleDesktop",
+    "files": [
+      "!desktop",
+      "!**/e2e",
+      "!hooks",
+      "!platforms",
+      "!plugins",
+      "!resources",
+      "!**/*.scss"
+    ],
+    "directories": {
+      "output": "desktop/dist"
+    },
+    "protocols": [
+      {
+        "name": "Moodle Mobile URL",
+        "schemes": [
+          "moodlemobile"
+        ],
+        "role": "Viewer"
+      }
+    ],
+    "compression": "maximum",
+    "electronVersion": "1.6.11",
+    "mac": {
+      "category": "public.app-category.education",
+      "icon": "resources/desktop/icon.icns"
+    },
+    "win": {
+      "target": "appx",
+      "icon": "resources/desktop/icon.ico"
+    }
+  }
 }
diff --git a/resources/desktop/Square150x150Logo.png b/resources/desktop/Square150x150Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..6dbca4bea3f1f3a62f259fc51bcefa9560072fe5
GIT binary patch
literal 21500
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
OJF1FW3YBtJ;r{^=+OduR

literal 0
HcmV?d00001

diff --git a/resources/desktop/Square44x44Logo.png b/resources/desktop/Square44x44Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1ad9e9bdc27f8dd88d1f16519ee89ca78b379da
GIT binary patch
literal 5300
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
GLSTY<?d_ic

literal 0
HcmV?d00001

diff --git a/resources/desktop/StoreLogo.png b/resources/desktop/StoreLogo.png
new file mode 100644
index 0000000000000000000000000000000000000000..4061075bcf36aa295bfe7cec10488302ef53b660
GIT binary patch
literal 5326
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

literal 0
HcmV?d00001

diff --git a/resources/desktop/Wide310x150Logo.png b/resources/desktop/Wide310x150Logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..40787a6d884a17ea16aef79582b9b8f678b737e0
GIT binary patch
literal 22634
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

literal 0
HcmV?d00001

diff --git a/resources/desktop/icon.icns b/resources/desktop/icon.icns
new file mode 100644
index 0000000000000000000000000000000000000000..4e3c10b84e49e86832207091abba9855f1b0a80d
GIT binary patch
literal 32691
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
A<p2Nx

literal 0
HcmV?d00001

diff --git a/resources/desktop/icon.ico b/resources/desktop/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c65354c8136abd2d9c10d533768db6fb933cfc7a
GIT binary patch
literal 29466
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
Y4M%#?;&TK-+2shubLY<%$(RQJKlNh!7XSbN

literal 0
HcmV?d00001

diff --git a/www/config.json b/www/config.json
index 8567b881866..7ce5ad6b66f 100644
--- a/www/config.json
+++ b/www/config.json
@@ -1,6 +1,7 @@
 {
     "app_id" : "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
+    "desktopappname": "Moodle Desktop",
     "versioncode" : "2018",
     "versionname" : "3.3.0",
     "cache_expiration_time" : 300000,
diff --git a/www/core/components/settings/controllers/about.js b/www/core/components/settings/controllers/about.js
index ec343459ea2..750f820d638 100644
--- a/www/core/components/settings/controllers/about.js
+++ b/www/core/components/settings/controllers/about.js
@@ -21,11 +21,11 @@ angular.module('mm.core.settings')
  * @ngdoc controller
  * @name mmSettingsAboutCtrl
  */
-.controller('mmSettingsAboutCtrl', function($scope, $translate, $window, $mmApp, $ionicPlatform, $mmLang, $mmFS,
+.controller('mmSettingsAboutCtrl', function($scope, $window, $mmApp, $ionicPlatform, $mmLang, $mmFS,
             $mmLocalNotifications, mmCoreConfigConstants) {
 
     $scope.versionname = mmCoreConfigConstants.versionname;
-    $scope.appname = mmCoreConfigConstants.appname;
+    $scope.appname = $mmApp.isDesktop() ? mmCoreConfigConstants.desktopappname : mmCoreConfigConstants.appname;
     $scope.versioncode = mmCoreConfigConstants.versioncode;
     $scope.privacyPolicy = mmCoreConfigConstants.privacypolicy;
 
diff --git a/www/electron.js b/www/electron.js
index c95bdfb7566..fa074b33b8a 100644
--- a/www/electron.js
+++ b/www/electron.js
@@ -53,9 +53,6 @@ function createWindow() {
 // Some APIs can only be used after this event occurs.
 app.on('ready', function() {
     createWindow();
-
-    // Open the app when a link with "moodlemobile://" is clicked.
-    app.setAsDefaultProtocolClient('moodlemobile');
 });
 
 // Quit when all windows are closed.
@@ -70,6 +67,9 @@ app.on('activate', () => {
     }
 });
 
+// Open the app when a link with "moodlemobile://" is clicked.
+app.setAsDefaultProtocolClient('moodlemobile');
+
 // Make sure that only a single instance of the app is running.
 var shouldQuit = app.makeSingleInstance((argv, workingDirectory) => {
     // Another instance was launched. If it was launched with a URL, it should be in the second param.
diff --git a/www/index.html b/www/index.html
index 7ea51cb8406..a3bea4024f6 100644
--- a/www/index.html
+++ b/www/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
     <meta http-equiv="Content-Security-Policy" content="default-src * filesystem: cdvfile: file: gap: https://ssl.gstatic.com; img-src * filesystem: gap: data: cdvfile: file: https://ssl.gstatic.com android-webview-video-poster: blob:; style-src 'self' 'unsafe-inline' filesystem: cdvfile: file:; script-src 'self' 'unsafe-inline' 'unsafe-eval' http://localhost:* filesystem: cdvfile: file:; media-src * filesystem: cdvfile: file: gap: blob:">
-    <title>Moodle Mobile</title>
+    <title>Moodle Desktop</title> <!-- Title is used in desktop, but should be ignored in mobile apps. -->
     <link href="build/mm.bundle.css" rel="stylesheet">
     <script src="lib/ionic/release/js/ionic.bundle.js"></script>
     <script src="cordova.js"></script>

From b29b7294391bc5502acd1043250ac37b588be977 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 27 Jun 2017 13:13:04 +0200
Subject: [PATCH 042/118] MOBILE-2148 notifications: Fix trigger in desktop for
 distant events

---
 www/core/components/emulator/services/localnotif.js |  6 ++++++
 www/core/lib/localnotif.js                          | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/www/core/components/emulator/services/localnotif.js b/www/core/components/emulator/services/localnotif.js
index 6e41fbfd3fd..9ad132cad7f 100644
--- a/www/core/components/emulator/services/localnotif.js
+++ b/www/core/components/emulator/services/localnotif.js
@@ -254,6 +254,12 @@ angular.module('mm.core.emulator')
                 };
                 promises.push(storeNotification(notification, false));
 
+                if (Math.abs(moment().diff(notification.at * 1000, 'days')) > 15) {
+                    // Notification should trigger more than 15 days from now, don't schedule it. Using $timeout
+                    // with numbers higher than (2^31 - 1) will trigger the function immediately.
+                    return;
+                }
+
                 // Schedule the notification.
                 var toTrigger = notification.at * 1000 - Date.now();
                 scheduled[notification.id].timeout = $timeout(function trigger() {
diff --git a/www/core/lib/localnotif.js b/www/core/lib/localnotif.js
index 883e015bec0..a585573832c 100644
--- a/www/core/lib/localnotif.js
+++ b/www/core/lib/localnotif.js
@@ -106,7 +106,7 @@ angular.module('mm.core')
         }
 
         return db.get(store, id).then(function(entry) {
-            var code = parseInt(entry.code);
+            var code = parseInt(entry.code, 10);
             codes[key] = code;
             return code;
         }, function() {
@@ -114,7 +114,7 @@ angular.module('mm.core')
             return db.query(store, undefined, 'code', true).then(function(entries) {
                 var newCode = 0;
                 if (entries.length > 0) {
-                    newCode = parseInt(entries[0].code) + 1;
+                    newCode = parseInt(entries[0].code, 10) + 1;
                 }
                 return db.insert(store, {id: id, code: newCode}).then(function() {
                     codes[key] = newCode;
@@ -167,7 +167,7 @@ angular.module('mm.core')
         return getSiteCode(siteid).then(function(sitecode) {
             return getComponentCode(component).then(function(componentcode) {
                 // We use the % operation to keep the number under Android's limit.
-                return (sitecode * 100000000 + componentcode * 10000000 + parseInt(notificationid)) % 2147483647;
+                return (sitecode * 100000000 + componentcode * 10000000 + parseInt(notificationid, 10)) % 2147483647;
             });
         });
     }
@@ -528,11 +528,11 @@ angular.module('mm.core')
             self.showNotificationPopover(notification);
         }
 
-        var id = parseInt(notification.id);
+        var id = parseInt(notification.id, 10);
         if (!isNaN(id)) {
             return $mmApp.getDB().insert(mmCoreNotificationsTriggeredStore, {
                 id: id,
-                at: parseInt(notification.at)
+                at: parseInt(notification.at, 10)
             });
         } else {
             return $q.reject();

From fff34d26c9d678b3c288e94dc954695d00ccbcf5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 27 Jun 2017 16:10:52 +0200
Subject: [PATCH 043/118] MOBILE-2148 electron: Read customurlscheme from
 config.json

---
 www/electron.js | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/www/electron.js b/www/electron.js
index fa074b33b8a..9a354b1d504 100644
--- a/www/electron.js
+++ b/www/electron.js
@@ -2,6 +2,7 @@
 const {app, BrowserWindow, ipcMain, shell} = require('electron');
 const path = require('path');
 const url = require('url');
+const fs = require('fs');
 
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
@@ -67,8 +68,18 @@ app.on('activate', () => {
     }
 });
 
-// Open the app when a link with "moodlemobile://" is clicked.
-app.setAsDefaultProtocolClient('moodlemobile');
+// Read the config.json file to set app's protocol (custom URL scheme).
+fs.readFile(path.join(__dirname, 'config.json'), 'utf8', (err, data) => {
+    var ssoScheme = 'moodlemobile'; // Default value.
+    if (!err) {
+        try {
+            data = JSON.parse(data);
+            ssoScheme = data.customurlscheme;
+        } catch(ex) {}
+    }
+
+    app.setAsDefaultProtocolClient(ssoScheme);
+});
 
 // Make sure that only a single instance of the app is running.
 var shouldQuit = app.makeSingleInstance((argv, workingDirectory) => {

From 15d6d4fcf787cc8110eb028845252d7c685ced06 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 28 Jun 2017 10:02:17 +0200
Subject: [PATCH 044/118] MOBILE-2155 lesson: Fix videos in lesson page

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

diff --git a/www/addons/mod/lesson/controllers/player.js b/www/addons/mod/lesson/controllers/player.js
index 7c2e5f840d5..b7eb0b459c1 100644
--- a/www/addons/mod/lesson/controllers/player.js
+++ b/www/addons/mod/lesson/controllers/player.js
@@ -190,7 +190,7 @@ angular.module('mm.addons.mod_lesson')
 
             $scope.pageData = data;
             $scope.title = data.page.title;
-            $scope.pageContent = data.page.contents;
+            $scope.pageContent = $mmaModLessonHelper.getPageContentsFromPageData(data);
             $scope.pageLoaded = true;
             $scope.currentPage = pageId;
             $scope.messages = $scope.messages.concat(data.messages);
diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 7999d10a59e..42c4ed36cb2 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -141,6 +141,31 @@ angular.module('mm.addons.mod_lesson')
         return buttons;
     };
 
+    /**
+     * Given a page data (result of getPageData), get the page contents.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHelper#getPageContentsFromPageData
+     * @param  {Object} data Page data.
+     * @return {String}      Page contents.
+     */
+    self.getPageContentsFromPageData = function(data) {
+        var contents,
+            rootElement = document.createElement('div');
+
+        // Search the page contents inside the whole page HTML. Use data.pagecontent because it's filtered.
+        rootElement.innerHTML = data.pagecontent;
+        contents = rootElement.querySelector('.contents');
+
+        if (contents) {
+            return contents.innerHTML.trim();
+        }
+
+        // Cannot find contents element, return the page.contents (some elements like videos might not work).
+        return data.page.contents;
+    };
+
     /**
      * Given the HTML of an answer from a question page, extract the data to render the answer.
      *

From 62e38bc572869b9f8ad321a4c4d1c13abcd8bcc5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 28 Jun 2017 11:36:23 +0200
Subject: [PATCH 045/118] MOBILE-839 icons: Fix icon size for Windows

---
 resources/desktop/Square150x150Logo.png | Bin 21500 -> 11485 bytes
 resources/desktop/Wide310x150Logo.png   | Bin 22634 -> 11880 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/resources/desktop/Square150x150Logo.png b/resources/desktop/Square150x150Logo.png
index 6dbca4bea3f1f3a62f259fc51bcefa9560072fe5..dd059984b4aa5f7575f576354b31026fecd7a94d 100644
GIT binary patch
delta 8846
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

delta 18940
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
Z3kGj0bHn{dMgOOWp{*T|mGHZ<zX3ZH<0=3E

diff --git a/resources/desktop/Wide310x150Logo.png b/resources/desktop/Wide310x150Logo.png
index 40787a6d884a17ea16aef79582b9b8f678b737e0..70e54eb7375b22356ae94207da7f843f271a1c83 100644
GIT binary patch
delta 9244
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

delta 20083
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


From 87b1dd11ccc7e6e04c3766e94a7718cf9344a3ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 21 Jun 2017 14:25:59 +0200
Subject: [PATCH 046/118] MOBILE-2121 data: Check if fields have changed

---
 www/addons/mod/data/controllers/edit.js       | 111 +++++++++------
 .../mod/data/fields/checkbox/handler.js       |  22 +++
 www/addons/mod/data/fields/date/directive.js  |   6 +-
 www/addons/mod/data/fields/date/handler.js    |  62 +++++---
 www/addons/mod/data/fields/date/template.html |   2 +-
 www/addons/mod/data/fields/file/directive.js  |   5 +-
 www/addons/mod/data/fields/file/handler.js    |  45 +++++-
 www/addons/mod/data/fields/file/template.html |   2 +-
 www/addons/mod/data/fields/latlong/handler.js |  18 +++
 www/addons/mod/data/fields/menu/directive.js  |   2 +-
 www/addons/mod/data/fields/menu/handler.js    |  15 ++
 www/addons/mod/data/fields/menu/template.html |   2 +-
 .../mod/data/fields/multimenu/handler.js      |  18 ++-
 .../mod/data/fields/number/directive.js       |   2 +-
 www/addons/mod/data/fields/number/handler.js  |  16 +++
 .../mod/data/fields/number/template.html      |   2 +-
 .../mod/data/fields/picture/directive.js      |   5 +-
 www/addons/mod/data/fields/picture/handler.js |  45 +++++-
 .../mod/data/fields/radiobutton/directive.js  |   2 +-
 .../mod/data/fields/radiobutton/handler.js    |  16 +++
 .../mod/data/fields/radiobutton/template.html |   2 +-
 www/addons/mod/data/fields/text/directive.js  |   2 +-
 www/addons/mod/data/fields/text/handler.js    |  16 +++
 www/addons/mod/data/fields/text/template.html |   2 +-
 .../mod/data/fields/textarea/directive.js     |   7 +-
 .../mod/data/fields/textarea/handler.js       |  56 +++++---
 .../mod/data/fields/textarea/template.html    |   2 +-
 www/addons/mod/data/fields/url/directive.js   |   2 +-
 www/addons/mod/data/fields/url/handler.js     |  18 ++-
 www/addons/mod/data/fields/url/template.html  |   2 +-
 .../mod/data/services/fieldsdelegate.js       |  67 ++++++---
 www/addons/mod/data/services/helper.js        | 133 ++++++++++++++++--
 www/addons/mod/data/templates/edit.html       |   1 -
 www/addons/mod/data/templates/index.html      |   7 +-
 www/core/directives/multipleselect.js         |   3 +
 35 files changed, 577 insertions(+), 141 deletions(-)

diff --git a/www/addons/mod/data/controllers/edit.js b/www/addons/mod/data/controllers/edit.js
index 9deabef28c8..f8f4e1b3240 100644
--- a/www/addons/mod/data/controllers/edit.js
+++ b/www/addons/mod/data/controllers/edit.js
@@ -22,14 +22,12 @@ angular.module('mm.addons.mod_data')
  * @name mmaModDataEditCtrl
  */
 .controller('mmaModDataEditCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $q, $mmUtil, $mmaModDataHelper,
-        $mmGroups) {
+        $mmGroups, $ionicHistory, $mmEvents, mmaModDataEventEntryChanged, $mmSite, $translate, $mmFileUploaderHelper) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         data,
-        entry = {
-            id: $stateParams.entryid || false
-        };
+        entryId = $stateParams.entryid || false;
 
     $scope.title = module.name;
     $scope.component = mmaModDataComponent;
@@ -37,7 +35,10 @@ angular.module('mm.addons.mod_data')
     $scope.selectedGroup = $stateParams.group || 0;
     $scope.entryContents = {};
 
-    function fetchEntryData(refresh) {
+    // Block leaving the view, we want to show a confirm to the user if there's unsaved data.
+    $mmUtil.blockLeaveView($scope, cancel);
+
+    function fetchEntryData() {
 
         return $mmaModData.getDatabase(courseId, module.id).then(function(databaseData) {
             data = databaseData;
@@ -51,9 +52,9 @@ angular.module('mm.addons.mod_data')
         }).then(function(accessData) {
             $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
 
-            if (entry.id) {
+            if (entryId) {
                 // Editing, group is set.
-                return $mmaModData.getEntry(data.id, entry.id).then(function(entryData) {
+                return $mmaModData.getEntry(data.id, entryId).then(function(entryData) {
                     $scope.entryContents = {};
                     angular.forEach(entryData.entry.contents, function(field) {
                         $scope.entryContents[field.fieldid] = field;
@@ -89,11 +90,6 @@ angular.module('mm.addons.mod_data')
 
             $scope.editForm = $mmaModDataHelper.displayEditFields(data.addtemplate, $scope.fields, $scope.entryContents);
         }).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() {
@@ -110,50 +106,73 @@ angular.module('mm.addons.mod_data')
     };
 
     // Saves data.
-    $scope.save = function(page) {
-        return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields)
-                .then(function(editData) {
-            if (editData.length > 0) {
-                var promise;
-
-                if (entry.id) {
-                    promise = $mmaModData.editEntry(entry.id, editData);
-                } else {
-                    promise = $mmaModData.addEntry(data.id, editData, $scope.selectedGroup);
-                }
+    $scope.save = function() {
+        return $mmaModDataHelper.hasEditDataChanged(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
+                $scope.entryContents).then(function(changed) {
 
-                // TODO: Treat result.
-                return promise;
+            if (!changed) {
+                return returnToEntryList();
             }
+
+            var modal = $mmUtil.showModalLoading('mm.core.sending', true);
+
+            return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
+                    $scope.entryContents).then(function(editData) {
+                if (editData.length > 0) {
+                    if (entryId) {
+                        return $mmaModData.editEntry(entryId, editData);
+                    } else {
+                        return $mmaModData.addEntry(data.id, editData, $scope.selectedGroup);
+                    }
+                }
+             }).then(function(result) {
+                if (!result) {
+                    // Nothing done, just go back.
+                    return returnToEntryList();
+                }
+
+                // This is done if entry is updated when editing or creating if not.
+                if ((entryId && result.updated) || (!entryId && result.newentryid)) {
+                    entryId = entryId || result.newentryid;
+                    $mmEvents.trigger(mmaModDataEventEntryChanged, {dataId: data.id, entryId: entryId, siteId: $mmSite.getId()});
+                    return returnToEntryList();
+                }
+            }).catch(function(error) {
+                $mmUtil.showErrorModalDefault(error, 'Cannot edit entry', true);
+            }).finally(function() {
+                modal.dismiss();
+            });
         });
     };
 
-    // Convenience function to refresh all the data.
-    function refreshAllData() {
-        var promises = [];
+    function returnToEntryList() {
+        return $mmaModDataHelper.getEditTmpFiles(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
+                $scope.entryContents).then(function(files) {
+            $mmFileUploaderHelper.clearTmpFiles(files);
+        }).finally(function() {
+            // Go back to discussions list.
+            $ionicHistory.goBack();
+        });
+    }
 
-        promises.push($mmaModData.invalidateDatabaseData(courseId));
-        if (data) {
-            if (entry.id) {
-                promises.push($mmaModData.invalidateEntryData(data.id, entry.id));
+    // Just ask to confirm the lost of data.
+    function cancel() {
+        return $mmaModDataHelper.hasEditDataChanged(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
+                $scope.entryContents).then(function(changed) {
+            if (!changed) {
+                return $q.when();
             }
-            promises.push($mmGroups.invalidateActivityGroupInfo(data.coursemodule));
-            promises.push($mmaModData.invalidateEntriesData(data.id));
-        }
-
-        return $q.all(promises).finally(function() {
-            return fetchEntryData(true);
+            // Show confirmation if some data has been modified.
+            return  $mmUtil.showConfirm($translate('mm.core.confirmcanceledit'));
+        }).then(function() {
+            // Delete the local files from the tmp folder.
+            $mmaModDataHelper.getEditTmpFiles(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
+                    $scope.entryContents).then(function(files) {
+                $mmFileUploaderHelper.clearTmpFiles(files);
+            });
         });
     }
 
     fetchEntryData();
 
-    // Pull to refresh.
-    $scope.refreshDatabase = function() {
-        if ($scope.databaseLoaded) {
-            return refreshAllData().finally(function() {
-                $scope.$broadcast('scroll.refreshComplete');
-            });
-        }
-    };
 });
diff --git a/www/addons/mod/data/fields/checkbox/handler.js b/www/addons/mod/data/fields/checkbox/handler.js
index b3ee51cd76e..1fdee4bc853 100644
--- a/www/addons/mod/data/fields/checkbox/handler.js
+++ b/www/addons/mod/data/fields/checkbox/handler.js
@@ -87,6 +87,28 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            checkboxes = [];
+
+        angular.forEach(inputData[fieldName], function(value, option) {
+            if (value) {
+                checkboxes.push(option);
+            }
+        });
+
+        originalData = (originalData && originalData.content) || "";
+        return checkboxes.join("##") != originalData;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/date/directive.js b/www/addons/mod/data/fields/date/directive.js
index a50a3f49615..7844ee95216 100644
--- a/www/addons/mod/data/fields/date/directive.js
+++ b/www/addons/mod/data/fields/date/directive.js
@@ -28,12 +28,14 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/date/template.html',
         link: function(scope) {
             if (scope.mode == 'edit' && scope.value) {
-                scope.value = new Date(scope.value.content * 1000).toISOString().substr(0, 10);
                 scope.enable = true;
             } else {
-                scope.value = new Date().toISOString().substr(0, 10);
+                scope.value = {
+                        content: Math.floor(Date.now() / 1000)
+                    };
                 scope.enable = false;
             }
+            scope.val = new Date(scope.value.content * 1000).toISOString().substr(0, 10);
         }
     };
 });
diff --git a/www/addons/mod/data/fields/date/handler.js b/www/addons/mod/data/fields/date/handler.js
index 2c981eb43f6..65aa27354ff 100644
--- a/www/addons/mod/data/fields/date/handler.js
+++ b/www/addons/mod/data/fields/date/handler.js
@@ -73,27 +73,47 @@ angular.module('mm.addons.mod_data')
     self.getFieldEditData = function(field, inputData) {
         var fieldName = 'f_' + field.id;
 
-        var values = [],
-            date = inputData[fieldName].split('-'),
-            year = date[0],
-            month = date[1],
-            day = date[2];
-        values.push({
-            fieldid: field.id,
-            subfield: 'year',
-            value: year
-        });
-        values.push({
-            fieldid: field.id,
-            subfield: 'month',
-            value: month
-        });
-        values.push({
-            fieldid: field.id,
-            subfield: 'day',
-            value: day
-        });
-        return values;
+        if (inputData[fieldName]) {
+            var values = [],
+                date = inputData[fieldName].split('-'),
+                year = date[0],
+                month = date[1],
+                day = date[2];
+            values.push({
+                fieldid: field.id,
+                subfield: 'year',
+                value: year
+            });
+            values.push({
+                fieldid: field.id,
+                subfield: 'month',
+                value: month
+            });
+            values.push({
+                fieldid: field.id,
+                subfield: 'day',
+                value: day
+            });
+            return values;
+        }
+        return false;
+    };
+
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            input = inputData[fieldName] || "",
+            originalData = (originalData && originalData.content &&
+                new Date(originalData.content * 1000).toISOString().substr(0, 10)) || "";
+
+        return input != originalData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/date/template.html b/www/addons/mod/data/fields/date/template.html
index bd54b7a2e99..6fb55039f52 100644
--- a/www/addons/mod/data/fields/date/template.html
+++ b/www/addons/mod/data/fields/date/template.html
@@ -1,3 +1,3 @@
 <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
-<input type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable && mode == 'search'" ng-value="value">
+<input type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable && mode == 'search'" ng-value="val">
 <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_z" ng-model="enable" ng-value="1">{{ 'mma.mod_data.usedate' | translate }}</ion-checkbox>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/file/directive.js b/www/addons/mod/data/fields/file/directive.js
index a84d2c1cd3a..719219f56f0 100644
--- a/www/addons/mod/data/fields/file/directive.js
+++ b/www/addons/mod/data/fields/file/directive.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc directive
  * @name mmaModDataFieldFile
  */
-.directive('mmaModDataFieldFile', function(mmaModDataComponent) {
+.directive('mmaModDataFieldFile', function($mmFileSession, mmaModDataComponent) {
     return {
         restrict: 'A',
         priority: 100,
@@ -31,6 +31,9 @@ angular.module('mm.addons.mod_data')
                 scope.component = mmaModDataComponent;
                 scope.componentId = scope.database.coursemodule;
                 scope.maxSizeBytes = parseInt(scope.field.param3, 10);
+
+                scope.files = angular.copy((scope.value && scope.value.files) || []);
+                $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
             }
         }
     };
diff --git a/www/addons/mod/data/fields/file/handler.js b/www/addons/mod/data/fields/file/handler.js
index 6f6dcdd2374..45fe97dde67 100644
--- a/www/addons/mod/data/fields/file/handler.js
+++ b/www/addons/mod/data/fields/file/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldFileHandler
  */
-.factory('$mmaModDataFieldFileHandler', function() {
+.factory('$mmaModDataFieldFileHandler', function($mmFileSession, mmaModDataComponent, $mmFileUploaderHelper) {
 
     var self = {};
 
@@ -43,6 +43,49 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @return {Promise}           With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field) {
+        var files = self.getFieldEditFiles(field);
+        if (!!files.length) {
+            return [{
+                fieldid: field.id,
+                subfield: 'file',
+                files: files
+            }];
+        }
+        return false;
+    };
+
+    /**
+     * Get field edit files in the input data.
+     *
+     * @param  {Object} field        Defines the field..
+     * @return {Promise}             With name and value of the data to be sent.
+     */
+    self.getFieldEditFiles = function(field) {
+        return $mmFileSession.getFiles(mmaModDataComponent,  field.dataid + '_' + field.id);
+    };
+
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var files = $mmFileSession.getFiles(mmaModDataComponent,  field.dataid + '_' + field.id) || [],
+            originalFiles = (originalData && originalData.files) || [];
+
+        return $mmFileUploaderHelper.areFileListDifferent(files, originalFiles);
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/file/template.html b/www/addons/mod/data/fields/file/template.html
index d3ea0fa63d2..053317062c8 100644
--- a/www/addons/mod/data/fields/file/template.html
+++ b/www/addons/mod/data/fields/file/template.html
@@ -1,3 +1,3 @@
 <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
-<mm-attachments ng-if="mode == 'edit'" files="value.files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
\ No newline at end of file
+<mm-attachments ng-if="mode == 'edit'" files="files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/latlong/handler.js b/www/addons/mod/data/fields/latlong/handler.js
index f99ddb3e7a6..1d2e25a8477 100644
--- a/www/addons/mod/data/fields/latlong/handler.js
+++ b/www/addons/mod/data/fields/latlong/handler.js
@@ -72,6 +72,24 @@ angular.module('mm.addons.mod_data')
         return values;
     };
 
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            lat = inputData[fieldName + '_0'] || "",
+            long = inputData[fieldName + '_1'] || "",
+            originalLat = (originalData && originalData.content) || "",
+            originalLong = (originalData && originalData.content1) || "";
+
+        return lat != originalLat || long != originalLong;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/menu/directive.js b/www/addons/mod/data/fields/menu/directive.js
index 7eb41e54c48..a5fbb2032c9 100644
--- a/www/addons/mod/data/fields/menu/directive.js
+++ b/www/addons/mod/data/fields/menu/directive.js
@@ -30,7 +30,7 @@ angular.module('mm.addons.mod_data')
             scope.options = scope.field.param1.split("\n");
 
             if (scope.mode == 'edit' && scope.value) {
-                scope.value = scope.value.content;
+                scope.val = scope.value.content;
             }
         }
     };
diff --git a/www/addons/mod/data/fields/menu/handler.js b/www/addons/mod/data/fields/menu/handler.js
index 6ff0dcc2139..7287cb90f3d 100644
--- a/www/addons/mod/data/fields/menu/handler.js
+++ b/www/addons/mod/data/fields/menu/handler.js
@@ -62,6 +62,21 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            input = inputData[fieldName] || "",
+            originalData = (originalData && originalData.content) || "";
+
+        return input != originalData;
+    };
 
     return self;
 })
diff --git a/www/addons/mod/data/fields/menu/template.html b/www/addons/mod/data/fields/menu/template.html
index 6d99d81b8f1..ffeb42e0abf 100644
--- a/www/addons/mod/data/fields/menu/template.html
+++ b/www/addons/mod/data/fields/menu/template.html
@@ -1,6 +1,6 @@
 <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
 <div class="item item-input item-select">
-    <select name="f_{{field.id}}" ng-model="value">
+    <select name="f_{{field.id}}" ng-model="val">
         <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
         <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
     </select>
diff --git a/www/addons/mod/data/fields/multimenu/handler.js b/www/addons/mod/data/fields/multimenu/handler.js
index 8fa7078568c..8d29c4496b2 100644
--- a/www/addons/mod/data/fields/multimenu/handler.js
+++ b/www/addons/mod/data/fields/multimenu/handler.js
@@ -68,7 +68,7 @@ angular.module('mm.addons.mod_data')
     self.getFieldEditData = function(field, inputData) {
         var fieldName = 'f_' + field.id;
 
-        if (inputData[fieldName].length > 0) {
+        if (inputData[fieldName] && inputData[fieldName].length > 0) {
             var options = inputData[fieldName].split('###');
             if (options.length > 0) {
                 return [{
@@ -81,6 +81,22 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            input = inputData[fieldName] || "",
+            originalData = (originalData && originalData.content) || "";
+
+        return input != originalData;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/number/directive.js b/www/addons/mod/data/fields/number/directive.js
index 448f00855db..327f67c0c1e 100644
--- a/www/addons/mod/data/fields/number/directive.js
+++ b/www/addons/mod/data/fields/number/directive.js
@@ -28,7 +28,7 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/number/template.html',
         link: function(scope) {
             if (scope.mode == 'edit' && scope.value) {
-                scope.value = parseFloat(scope.value.content);
+                scope.val = parseFloat(scope.value.content);
             }
         }
     };
diff --git a/www/addons/mod/data/fields/number/handler.js b/www/addons/mod/data/fields/number/handler.js
index 46fd202ba44..e99268e5914 100644
--- a/www/addons/mod/data/fields/number/handler.js
+++ b/www/addons/mod/data/fields/number/handler.js
@@ -62,6 +62,22 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            input = inputData[fieldName] || "",
+            originalData = (originalData && originalData.content) || "";
+
+        return input != originalData;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/number/template.html b/www/addons/mod/data/fields/number/template.html
index 246b94e3dfb..91c9c4cb065 100644
--- a/www/addons/mod/data/fields/number/template.html
+++ b/www/addons/mod/data/fields/number/template.html
@@ -1,2 +1,2 @@
 <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
-<input type="number" placeholder="{{field.name}}" name="f_{{field.id}}"  ng-model="value">
\ No newline at end of file
+<input type="number" placeholder="{{field.name}}" name="f_{{field.id}}"  ng-model="val">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/picture/directive.js b/www/addons/mod/data/fields/picture/directive.js
index ee9d61efc24..590217a2b4b 100644
--- a/www/addons/mod/data/fields/picture/directive.js
+++ b/www/addons/mod/data/fields/picture/directive.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc directive
  * @name mmaModDataFieldPicture
  */
-.directive('mmaModDataFieldPicture', function(mmaModDataComponent) {
+.directive('mmaModDataFieldPicture', function(mmaModDataComponent, $mmFileSession) {
     return {
         restrict: 'A',
         priority: 100,
@@ -31,6 +31,9 @@ angular.module('mm.addons.mod_data')
                 scope.component = mmaModDataComponent;
                 scope.componentId = scope.database.coursemodule;
                 scope.maxSizeBytes = parseInt(scope.field.param3, 10);
+
+                scope.files = angular.copy((scope.value && scope.value.files) || []);
+                $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
             }
         }
     };
diff --git a/www/addons/mod/data/fields/picture/handler.js b/www/addons/mod/data/fields/picture/handler.js
index 8d464a8d8b8..01fe1754214 100644
--- a/www/addons/mod/data/fields/picture/handler.js
+++ b/www/addons/mod/data/fields/picture/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldPictureHandler
  */
-.factory('$mmaModDataFieldPictureHandler', function() {
+.factory('$mmaModDataFieldPictureHandler', function($mmFileSession, mmaModDataComponent, $mmFileUploaderHelper) {
 
     var self = {};
 
@@ -43,6 +43,49 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field edit data in the input data.
+     *
+     * @param  {Object} field      Defines the field to be rendered.
+     * @return {Promise}           With name and value of the data to be sent.
+     */
+    self.getFieldEditData = function(field) {
+        var files = self.getFieldEditFiles(field);
+        if (!!files.length) {
+            return [{
+                fieldid: field.id,
+                subfield: 'file',
+                files: files
+            }];
+        }
+        return false;
+    };
+
+    /**
+     * Get field edit files in the input data.
+     *
+     * @param  {Object} field        Defines the field..
+     * @return {Promise}             With name and value of the data to be sent.
+     */
+    self.getFieldEditFiles = function(field) {
+        return $mmFileSession.getFiles(mmaModDataComponent,  field.dataid + '_' + field.id);
+    };
+
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var files = $mmFileSession.getFiles(mmaModDataComponent,  field.dataid + '_' + field.id) || [],
+            originalFiles = (originalData && originalData.files) || [];
+
+        return $mmFileUploaderHelper.areFileListDifferent(files, originalFiles);
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/radiobutton/directive.js b/www/addons/mod/data/fields/radiobutton/directive.js
index 6d152555648..48e1e23039e 100644
--- a/www/addons/mod/data/fields/radiobutton/directive.js
+++ b/www/addons/mod/data/fields/radiobutton/directive.js
@@ -30,7 +30,7 @@ angular.module('mm.addons.mod_data')
             scope.options = scope.field.param1.split("\n");
 
             if (scope.mode == 'edit' && scope.value) {
-                scope.value = scope.value.content;
+                scope.val = scope.value.content;
             }
         }
     };
diff --git a/www/addons/mod/data/fields/radiobutton/handler.js b/www/addons/mod/data/fields/radiobutton/handler.js
index a599e6af342..93d09562ad0 100644
--- a/www/addons/mod/data/fields/radiobutton/handler.js
+++ b/www/addons/mod/data/fields/radiobutton/handler.js
@@ -62,6 +62,22 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            input = inputData[fieldName] || "",
+            originalData = (originalData && originalData.content) || "";
+
+        return input != originalData;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/radiobutton/template.html b/www/addons/mod/data/fields/radiobutton/template.html
index 6d99d81b8f1..ffeb42e0abf 100644
--- a/www/addons/mod/data/fields/radiobutton/template.html
+++ b/www/addons/mod/data/fields/radiobutton/template.html
@@ -1,6 +1,6 @@
 <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
 <div class="item item-input item-select">
-    <select name="f_{{field.id}}" ng-model="value">
+    <select name="f_{{field.id}}" ng-model="val">
         <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
         <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
     </select>
diff --git a/www/addons/mod/data/fields/text/directive.js b/www/addons/mod/data/fields/text/directive.js
index 9fcb4f4d3f8..7517e5775ba 100644
--- a/www/addons/mod/data/fields/text/directive.js
+++ b/www/addons/mod/data/fields/text/directive.js
@@ -28,7 +28,7 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/text/template.html',
         link: function(scope) {
             if (scope.mode == 'edit' && scope.value) {
-                scope.value = scope.value.content;
+                scope.val = scope.value.content;
             }
         }
     };
diff --git a/www/addons/mod/data/fields/text/handler.js b/www/addons/mod/data/fields/text/handler.js
index 755f5768fe2..1eeec43b579 100644
--- a/www/addons/mod/data/fields/text/handler.js
+++ b/www/addons/mod/data/fields/text/handler.js
@@ -61,6 +61,22 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            input = inputData[fieldName] || "",
+            originalData = (originalData && originalData.content) || "";
+
+        return input != originalData;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/text/template.html b/www/addons/mod/data/fields/text/template.html
index 189f72e0ffe..0b3cbb41a5c 100644
--- a/www/addons/mod/data/fields/text/template.html
+++ b/www/addons/mod/data/fields/text/template.html
@@ -1,2 +1,2 @@
 <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}"  ng-model="value">
\ No newline at end of file
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}"  ng-model="val">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/textarea/directive.js b/www/addons/mod/data/fields/textarea/directive.js
index c6d8ecb8094..3a2544bcc07 100644
--- a/www/addons/mod/data/fields/textarea/directive.js
+++ b/www/addons/mod/data/fields/textarea/directive.js
@@ -30,13 +30,18 @@ angular.module('mm.addons.mod_data')
             // Check if rich text editor is enabled.
             if (scope.mode == 'edit') {
                 $mmUtil.isRichTextEditorEnabled().then(function(enabled) {
-                    var text = scope.value ? $mmText.replacePluginfileUrls(scope.value.content, scope.value.files) : "";
+                    var files = (scope.value && scope.value.files) || [],
+                        text = scope.value ? $mmText.replacePluginfileUrls(scope.value.content, files) : "";
 
                     // Get the text.
                     scope.model = {
                         text: text
                     };
                 });
+
+                scope.firstRender = function() {
+                    scope.value.content = scope.model.text;
+                };
             }
         }
     };
diff --git a/www/addons/mod/data/fields/textarea/handler.js b/www/addons/mod/data/fields/textarea/handler.js
index be9fce8766b..8ac11fd309f 100644
--- a/www/addons/mod/data/fields/textarea/handler.js
+++ b/www/addons/mod/data/fields/textarea/handler.js
@@ -43,31 +43,19 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
-    /**
-     * Get the text to submit.
-     *
-     * @param  {Object} field     Field.
-     * @param  {Object} inputData Data entered in the edit form.
-     * @return {String}           Text to submit.
-     */
-    function getTextToSubmit(plugin, text) {
-
-
-        return
-    }
-
     /**
      * Get field edit data in the input data.
      *
-     * @param  {Object} field      Defines the field to be rendered.
-     * @param  {Object} inputData  Data entered in the edit form.
-     * @return {Array}             With name and value of the data to be sent.
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Promise}             With name and value of the data to be sent.
      */
-    self.getFieldEditData = function(field, inputData) {
+    self.getFieldEditData = function(field, inputData, originalData) {
         var fieldName = 'f_' + field.id;
         if (inputData[fieldName]) {
             return $mmUtil.isRichTextEditorEnabled().then(function(enabled) {
-                var files = field.files ? field.files : [],
+                var files = self.getFieldEditFiles(field, inputData, originalData),
                     text = $mmText.restorePluginfileUrls(inputData[fieldName], files);
 
                 if (!enabled) {
@@ -78,12 +66,44 @@ angular.module('mm.addons.mod_data')
                 return [{
                     fieldid: field.id,
                     value: text
+                },
+                {
+                    fieldid: field.id,
+                    files: files
                 }];
             });
         }
         return false;
     };
 
+    /**
+     * Get field edit files in the input data.
+     *
+     * @param  {Object} field        Defines the field..
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Promise}             With name and value of the data to be sent.
+     */
+    self.getFieldEditFiles = function(field, inputData, originalData) {
+        return (originalData && originalData.files) || [];
+    };
+
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            input = inputData[fieldName] || "",
+            originalData = (originalData && originalData.content) || "";
+
+        return input != originalData;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/textarea/template.html b/www/addons/mod/data/fields/textarea/template.html
index 7759a113d91..5a357df6990 100644
--- a/www/addons/mod/data/fields/textarea/template.html
+++ b/www/addons/mod/data/fields/textarea/template.html
@@ -1,5 +1,5 @@
 <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
 <div ng-if="mode == 'edit'" class="item item-text-wrap mm-item-has-rich-text-editor">
-    <mm-rich-text-editor model="model" placeholder="{{ field.name }}" name="f_{{field.id}}" component="{{component}}" component-id="{{componentId}}"></mm-rich-text-editor>
+    <mm-rich-text-editor model="model" placeholder="{{ field.name }}" name="f_{{field.id}}" component="{{component}}" component-id="{{componentId}}" first-render="firstRender()"></mm-rich-text-editor>
 </div>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/url/directive.js b/www/addons/mod/data/fields/url/directive.js
index dd641ac988d..92b942ab12a 100644
--- a/www/addons/mod/data/fields/url/directive.js
+++ b/www/addons/mod/data/fields/url/directive.js
@@ -28,7 +28,7 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/url/template.html',
         link: function(scope) {
             if (scope.mode == 'edit' && scope.value) {
-                scope.value = scope.value.content;
+                scope.val = scope.value.content;
             }
         }
     };
diff --git a/www/addons/mod/data/fields/url/handler.js b/www/addons/mod/data/fields/url/handler.js
index bc71b7fb7db..fa38a7bfffb 100644
--- a/www/addons/mod/data/fields/url/handler.js
+++ b/www/addons/mod/data/fields/url/handler.js
@@ -43,7 +43,7 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
-        /**
+    /**
      * Get field edit data in the input data.
      *
      * @param  {Object} field      Defines the field to be rendered.
@@ -61,6 +61,22 @@ angular.module('mm.addons.mod_data')
         return false;
     };
 
+    /**
+     * Get field data in changed.
+     *
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the edit form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Boolean}             If the field has changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var fieldName = 'f_' + field.id,
+            input = inputData[fieldName] || "",
+            originalData = (originalData && originalData.content) || "";
+
+        return input != originalData;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/url/template.html b/www/addons/mod/data/fields/url/template.html
index 78f2af414af..cc75865221f 100644
--- a/www/addons/mod/data/fields/url/template.html
+++ b/www/addons/mod/data/fields/url/template.html
@@ -1,2 +1,2 @@
 <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="value">
\ No newline at end of file
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
\ No newline at end of file
diff --git a/www/addons/mod/data/services/fieldsdelegate.js b/www/addons/mod/data/services/fieldsdelegate.js
index 96e528cbb3f..285463979b8 100644
--- a/www/addons/mod/data/services/fieldsdelegate.js
+++ b/www/addons/mod/data/services/fieldsdelegate.js
@@ -69,7 +69,7 @@ angular.module('mm.addons.mod_data')
     /**
      * Get database data in the input data to search.
      *
-     * @module mm.addons.mod_assign
+     * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModDataFieldsDelegate#getFieldSearchData
      * @param  {Object} field      Defines the field to be rendered.
@@ -87,38 +87,60 @@ angular.module('mm.addons.mod_data')
     /**
      * Get database data in the input data to add or update entry.
      *
-     * @module mm.addons.mod_assign
+     * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModDataFieldsDelegate#getFieldEditData
-     * @param  {Object} field      Defines the field to be rendered.
-     * @param  {Object} inputData  Data entered in the search form.
-     * @return {Array}             Name and data field.
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the search form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Array}               Name and data field.
      */
-    self.getFieldEditData = function(field, inputData) {
+    self.getFieldEditData = function(field, inputData, originalData) {
         var handler = self.getPluginHandler(field.type);
         if (handler && handler.getFieldEditData) {
-            return handler.getFieldEditData(field, inputData);
+            return handler.getFieldEditData(field, inputData, originalData);
         }
         return false;
     };
 
     /**
-     * Get files used by this plugin.
-     * The files returned by this function will be prefetched when the user prefetches the database.
+     * Get database data in the input files to add or update entry.
      *
      * @module mm.addons.mod_data
      * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#getPluginFiles
-     * @param  {Object} field      Defines the field.
-     * @param  {Object} content    Defines the content that contains the files.
-     * @return {Array}             List of files.
+     * @name $mmaModDataFieldsDelegate#getFieldEditFiles
+     * @param  {Object} field        Defines the field to be rendered.
+     * @param  {Object} inputData    Data entered in the search form.
+     * @param  {Object} originalData Original form data entered.
+     * @return {Array}               Name and data field.
      */
-    self.getPluginFiles = function(field, content) {
+    self.getFieldEditFiles = function(field, inputData, originalData) {
         var handler = self.getPluginHandler(field.type);
-        if (handler && handler.getPluginFiles) {
-            return handler.getPluginFiles(field, content);
+        if (handler && handler.getFieldEditFiles) {
+            return handler.getFieldEditFiles(field, inputData, originalData);
         }
-        return content.files;
+        return [];
+    };
+
+    /**
+     * Check if the data has changed for a certain field.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#hasFieldDataChanged
+     * @param  {Object} field         Defines the field to be rendered.
+     * @param  {Object} inputData     Data entered in the search form.
+     * @param  {Object} originalData  Original form data entered.
+     * @return {Promise}              Promise rejected if has changed, resolved if no changes.
+     */
+    self.hasFieldDataChanged = function(field, inputData, originalData) {
+        var handler = self.getPluginHandler(field.type);
+        if (handler && handler.hasFieldDataChanged) {
+            return $q.when(handler.hasFieldDataChanged(field, inputData, originalData)).then(function(result) {
+                return result ? $q.reject() : $q.when();
+            });
+        }
+        return $q.when();
     };
 
     /**
@@ -168,10 +190,13 @@ angular.module('mm.addons.mod_data')
      *                           returning an object defining these properties. See {@link $mmUtil#resolveObject}.
      *                             - getFieldSearchData(field, inputData) Optional.
      *                                                           Should return name and data entered to the field.
-     *                             - getFieldEditData(field, inputData) Optional.
-     *                                                           Should return name and data entered to the field.
-     *                             - getPluginFiles(plugin, inputData) Optional.
-     *                                                           Should return file list of the field.
+     *                             - getFieldEditData(field, inputData, originalData) Optional.
+     *                                                           Should return fielid and data entered to the field in a promise
+     *                                                           or array.
+     *                             - hasFieldDataChanged(field, inputData, originalData) Optional.
+     *                                                           Should return if field has been changed by the user.
+     *                             - getFieldEditFiles(field, inputData, originalData) Optional.
+     *                                                           Should return an array of files stored in temp store.
      */
     self.registerHandler = function(addon, pluginType, handler) {
         if (typeof handlers[pluginType] !== 'undefined') {
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index baba019d798..b83972ac25d 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataHelper
  */
-.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q) {
+.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q, mmaModDataComponent, $mmFileUploader) {
 
     var self = {
             searchOther: {
@@ -186,13 +186,15 @@ angular.module('mm.addons.mod_data')
      * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModDataHelper#getEditDataFromForm
-     * @param  {Object} form     Form (DOM element).
-     * @param  {Array}  fields   Fields that defines every content in the entry.
-     * @return {Object}          Object with the answers.
+     * @param  {Object}  form            Form (DOM element).
+     * @param  {Array}   fields          Fields that defines every content in the entry.
+     * @param  {Number}  [dataId]        Database Id. If set, fils will be uploaded and itemId set.
+     * @param  {Object}   entryContents  Original entry contents indexed by field id.
+     * @return {Promise}                 That contains object with the answers.
      */
-    self.getEditDataFromForm = function(form, fields) {
+    self.getEditDataFromForm = function(form, fields, dataId, entryContents) {
         if (!form || !form.elements) {
-            return {};
+            return $q.when({});
         }
 
         var formData = getFormData(form);
@@ -201,23 +203,132 @@ angular.module('mm.addons.mod_data')
         var edit = [],
             promises = [];
         angular.forEach(fields, function(field) {
-            promises.push($q.when($mmaModDataFieldsDelegate.getFieldEditData(field, formData)).then(function (fieldData) {
+            promises.push($q.when($mmaModDataFieldsDelegate.getFieldEditData(field, formData, entryContents[field.id] || undefined))
+                    .then(function (fieldData) {
                 if (fieldData) {
+                    var proms = [];
+
                     angular.forEach(fieldData, function(data) {
-                        data.value = JSON.stringify(data.value);
-                        // WS wants values in Json format.
-                        edit.push(data);
+                        var dataProm;
+
+                        // Upload Files if asked.
+                        if (dataId && data.files) {
+                            dataProm = self.uploadOrStoreFiles(dataId, data.fieldid, undefined, data.files).then(function(itemId) {
+                                delete data.files;
+                                data.value = itemId;
+                            });
+                        } else {
+                            dataProm = $q.when();
+                        }
+
+                        proms.push(dataProm.then(function() {
+                            if (data.value) {
+                                data.value = JSON.stringify(data.value);
+                            }
+
+                            // WS wants values in Json format.
+                            edit.push(data);
+                        }));
                     });
+
+                    return $q.all(proms);
                 }
             }));
         });
 
         return $q.all(promises).then(function() {
-            console.error(formData, edit);
             return edit;
         });
     };
 
+    /**
+     * Retrieve the temp files to be updated.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getEditTmpFiles
+     * @param  {Object}  form            Form (DOM element).
+     * @param  {Array}   fields          Fields that defines every content in the entry.
+     * @param  {Number}  [dataId]        Database Id. If set, fils will be uploaded and itemId set.
+     * @param  {Object}   entryContents  Original entry contents indexed by field id.
+     * @return {Promise}                 That contains object with the files.
+     */
+    self.getEditTmpFiles = function(form, fields, dataId, entryContents) {
+        if (!form || !form.elements) {
+            return $q.when([]);
+        }
+
+        var formData = getFormData(form);
+
+        // Filter and translate fields to each field plugin.
+        var promises = [];
+        angular.forEach(fields, function(field) {
+            promises.push(
+                $q.when($mmaModDataFieldsDelegate.getFieldEditFiles(field, formData, entryContents[field.id] || undefined))
+            );
+        });
+
+        return $q.all(promises).then(function(fieldsFiles) {
+            var files = [];
+
+            angular.forEach(fieldsFiles, function(fieldFiles) {
+                files = files.concat(fieldFiles);
+            });
+            return files;
+        });
+    };
+
+    /**
+     * Check if data has been changed by the user.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#hasEditDataChanged
+     * @param  {Object}  form           Form (DOM element).
+     * @param  {Array}   fields         Fields that defines every content in the entry.
+     * @param  {Number}  [dataId]       Database Id. If set, fils will be uploaded and itemId set.
+     * @param  {Object}   entryContents Original entry contents indexed by field id.
+     * @return {Promise}                True if changed, false if not.
+     */
+    self.hasEditDataChanged = function(form, fields, dataId, entryContents) {
+        var inputData = getFormData(form),
+            promises = [];
+
+        angular.forEach(fields, function(field) {
+            promises.push($mmaModDataFieldsDelegate.hasFieldDataChanged(field, inputData, entryContents[field.id] || undefined));
+        });
+        // Will reject on first change detected.
+        return $q.all(promises).then(function() {
+            // No changes.
+            return false;
+        }).catch(function() {
+            // Has changes.
+            return true;
+        });
+    };
+
+    /**
+     * Upload or store some files, depending if the user is offline or not.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#uploadOrStoreFiles
+     * @param  {Number}   dataId        Database ID.
+     * @param  {Number}   [itemId]      Draft ID to use. Undefined or 0 to create a new draft ID.
+     * @param  {Number}   [timecreated] The time the entry was created.
+     * @param  {Object[]} files         List of files.
+     * @param  {Boolean}  offline       True if files sould be stored for offline, false to upload them.
+     * @param  {String}   [siteId]      Site ID. If not defined, current site.
+     * @return {Promise}                Promise resolved if success.
+     */
+    self.uploadOrStoreFiles = function(dataId, itemId, timecreated, files, offline, siteId) {
+        if (offline) {
+            // @todo in future issues.
+            //return self.storeFiles(dataId, timecreated, files, siteId);
+        }
+        return $mmFileUploader.uploadOrReuploadFiles(files, mmaModDataComponent, itemId, siteId);
+    };
+
     /**
      * Add a prefix to all rules in a CSS string.
      *
diff --git a/www/addons/mod/data/templates/edit.html b/www/addons/mod/data/templates/edit.html
index 9bd0062315b..275ed7517ea 100644
--- a/www/addons/mod/data/templates/edit.html
+++ b/www/addons/mod/data/templates/edit.html
@@ -4,7 +4,6 @@
         <a class="button button-clear" ng-click="save()" aria-label="{{ 'mm.core.save' | translate }}"> {{ 'mm.core.save' | translate }}</a>
     </ion-nav-buttons>
     <ion-content mm-state-class delegate-handle="mmaModDataEntryScroll">
-        <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="databaseLoaded" on-refresh="refreshDatabase(false)"></ion-refresher>
         <mm-loading hide-until="databaseLoaded">
             <div ng-if="(groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
                 <ion-label id="mma-data-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
index d6e9d29c44e..3ce95a59c5f 100644
--- a/www/addons/mod/data/templates/index.html
+++ b/www/addons/mod/data/templates/index.html
@@ -68,7 +68,12 @@ <h2>{{ 'mma.mod_data.numrecords' | translate: {$a: numEntries } }}</h2>
             </div>
 
             <mm-empty-box ng-if="isEmpty && !search.searching" icon="ion-archive" message="{{ 'mma.mod_data.norecords' | translate}}">
-            </mm-empty-box>
+                <div class="padding-top" ng-if="canAdd">
+                    <button class="button button-block" ng-click="gotoAddEntries($event)">
+                        {{ 'mma.mod_data.addentries' | translate }}
+                    </button>
+                </div>
+        </mm-empty-box>
 
             <mm-empty-box ng-if="isEmpty && search.searching" icon="ion-archive" message="{{ 'mma.mod_data.nomatch' | translate}}">
                 <a ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate}}</a>
diff --git a/www/core/directives/multipleselect.js b/www/core/directives/multipleselect.js
index 0fff7861e06..0b93e7d2388 100644
--- a/www/core/directives/multipleselect.js
+++ b/www/core/directives/multipleselect.js
@@ -56,6 +56,9 @@ angular.module('mm.core')
 
             scope.optionsRender = [];
             scope.selectedOptions = getSelectedOptionsText();
+            if (scope.name) {
+                scope.selectedValues = getSelectedOptionsValues();
+            }
 
             element.on('click', function(e) {
                 e.preventDefault();

From 9c0317a9a868299e987a35ec8c99022eb4987ada Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 28 Jun 2017 15:43:30 +0200
Subject: [PATCH 047/118] MOBILE-839 login: Fix SSO login in Windows

---
 www/core/components/login/main.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/www/core/components/login/main.js b/www/core/components/login/main.js
index 75880aea5d9..77987043fc8 100644
--- a/www/core/components/login/main.js
+++ b/www/core/components/login/main.js
@@ -376,14 +376,8 @@ angular.module('mm.core.login', [])
         url = url.replace(ssoScheme, '');
 
         // Some platforms like Windows add a slash at the end. Remove it.
-        if (url.slice(-1) == '/') {
-            url = url.substring(0, url.length - 1);
-        }
-
         // 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);
-        }
+        url = url.replace(/\/?#?\/?$/, '');
 
         // Decode from base64.
         try {

From 30bac534a49ce3e72dc96c1ac8a8bca60129ca1b Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 28 Jun 2017 15:44:03 +0200
Subject: [PATCH 048/118] MOBILE-839 styles: Hide pseudo-elements in date input

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

diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 8af1907df25..5c0985bd3cf 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -1655,3 +1655,7 @@ h2.invert {
   border-color: transparent;
   background: none;
 }
+
+::-webkit-calendar-picker-indicator, ::-webkit-inner-spin-button, ::-webkit-clear-button {
+  display: none;
+}

From 2bebb0d544b30d7bfe97d1e0a7e985ce49023bba Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 28 Jun 2017 15:44:37 +0200
Subject: [PATCH 049/118] MOBILE-839 desktop: Improve error handling in capture
 media

---
 .../emulator/services/mediacapture.js           | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/www/core/components/emulator/services/mediacapture.js b/www/core/components/emulator/services/mediacapture.js
index 473ff8cc621..211f437bda9 100644
--- a/www/core/components/emulator/services/mediacapture.js
+++ b/www/core/components/emulator/services/mediacapture.js
@@ -50,9 +50,10 @@ angular.module('mm.core.emulator')
     function captureMedia(type, successCallback, errorCallback, options) {
         options = options || {};
 
+        var loadingModal;
+
         try {
             var scope = $rootScope.$new(),
-                loadingModal = $mmUtil.showModalLoading(),
                 facingMode = 'environment',
                 mimetype,
                 extension,
@@ -60,6 +61,8 @@ angular.module('mm.core.emulator')
                 returnData = false, // Image only.
                 isCaptureImage = false; // To identify if it's capturing an image using media capture plugin (instead of camera).
 
+            loadingModal = $mmUtil.showModalLoading();
+
             if (type == 'captureimage') {
                 isCaptureImage = true;
                 type = 'image';
@@ -117,7 +120,7 @@ angular.module('mm.core.emulator')
                     audio: !scope.isImage
                 };
 
-                navigator.mediaDevices.getUserMedia(constraints).then(function(localMediaStream) {
+                return navigator.mediaDevices.getUserMedia(constraints).then(function(localMediaStream) {
                     var streamVideo,
                         previewMedia,
                         canvas,
@@ -304,10 +307,14 @@ angular.module('mm.core.emulator')
                     scope.$on('$destroy', function() {
                         scope.modal.remove();
                     });
-                  }).catch(errorCallback);
-            }, errorCallback);
+                });
+            }).catch(function(err) {
+                loadingModal && loadingModal.dismiss();
+                errorCallback && errorCallback(err);
+            });
         } catch(ex) {
-            errorCallback(ex.toString());
+            loadingModal && loadingModal.dismiss();
+            errorCallback && errorCallback(ex.toString());
         }
     }
 

From 5e0a62debb009b12bddffd9458a11b721795eb2e Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 29 Jun 2017 09:01:34 +0200
Subject: [PATCH 050/118] MOBILE-2158 lesson: Improve retrieve buttons for
 content pages

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

diff --git a/www/addons/mod/lesson/services/helper.js b/www/addons/mod/lesson/services/helper.js
index 7999d10a59e..0e6e1cd9aa9 100644
--- a/www/addons/mod/lesson/services/helper.js
+++ b/www/addons/mod/lesson/services/helper.js
@@ -93,8 +93,7 @@ angular.module('mm.addons.mod_lesson')
         var buttons = [],
             rootElement = document.createElement('div'),
             buttonsContainer,
-            forms,
-            isLegacy = false;
+            forms;
 
         // Get the container of the buttons if it exists.
         rootElement.innerHTML = html;
@@ -106,14 +105,12 @@ angular.module('mm.addons.mod_lesson')
                 // No buttons found.
                 return buttons;
             }
-            isLegacy = true;
             buttonsContainer = rootElement;
         }
 
         forms = buttonsContainer.querySelectorAll('form');
         angular.forEach(forms, function(form) {
-            var buttonSelector = isLegacy ? 'input[type="submit"]' : 'button[type="submit"]',
-                buttonEl = form.querySelector(buttonSelector),
+            var buttonEl = form.querySelector('input[type="submit"], button[type="submit"]'),
                 inputs = form.querySelectorAll('input'),
                 button;
 
@@ -125,7 +122,7 @@ angular.module('mm.addons.mod_lesson')
             button = {
                 id: buttonEl.id,
                 title: buttonEl.title || buttonEl.value,
-                content: isLegacy ? buttonEl.value : buttonEl.innerHTML.trim(),
+                content: buttonEl.tagName == 'INPUT' ? buttonEl.value : buttonEl.innerHTML.trim(),
                 data: {}
             };
 

From dc4a5daa702936df6ead781c0702f27be94694bf Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 29 Jun 2017 16:28:12 +0200
Subject: [PATCH 051/118] MOBILE-839 udesktop Fix promise not resolved when
 open file

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

diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 1e4f82db24b..3dd00b5cddb 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -296,6 +296,7 @@ angular.module('mm.core')
                 // It's a desktop app, send an event so the file is opened. It has to be done with an event
                 // because opening the file from here (renderer process) doesn't focus the opened app.
                 require('electron').ipcRenderer.send('openItem', path);
+                deferred.resolve();
             } else if (window.plugins) {
                 var extension = $mmFS.getFileExtension(path),
                     mimetype = $mmFS.getMimeType(extension);

From 3513336a767a43fa8726543937b702a20b847001 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 29 Jun 2017 10:09:12 -0700
Subject: [PATCH 052/118] MOBILE-839 desktop: Focus app when notification
 clicked

---
 .../components/emulator/services/localnotif.js   | 16 ++++++++++++++--
 www/electron.js                                  | 10 +++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/www/core/components/emulator/services/localnotif.js b/www/core/components/emulator/services/localnotif.js
index 9ad132cad7f..2d063e6e19f 100644
--- a/www/core/components/emulator/services/localnotif.js
+++ b/www/core/components/emulator/services/localnotif.js
@@ -488,6 +488,18 @@ angular.module('mm.core.emulator')
         return options;
     }
 
+    /**
+     * Function called when a notification is clicked.
+     *
+     * @param  {Object} notification Clicked notification.
+     * @return {Void}
+     */
+    function notificationClicked(notification) {
+        $rootScope.$broadcast('$cordovaLocalNotification:click', notification, 'foreground');
+        // Focus the app.
+        require('electron').ipcRenderer.send('focusApp');
+    }
+
     /**
      * Parse a interval and convert it to a number of milliseconds (0 if not valid).
      * Code extracted from the Cordova plugin.
@@ -570,7 +582,7 @@ angular.module('mm.core.emulator')
 
             // Listen for click events.
             notifInstance.on('activated', function() {
-                $rootScope.$broadcast('$cordovaLocalNotification:click', notification, 'foreground');
+                notificationClicked(notification);
             });
 
             notifInstance.show()
@@ -592,7 +604,7 @@ angular.module('mm.core.emulator')
 
             // Listen for click events.
             notifInstance.onclick = function() {
-                $rootScope.$broadcast('$cordovaLocalNotification:click', notification, 'foreground');
+                notificationClicked(notification);
             };
         }
     }
diff --git a/www/electron.js b/www/electron.js
index 9a354b1d504..16bfff11106 100644
--- a/www/electron.js
+++ b/www/electron.js
@@ -102,12 +102,18 @@ if (shouldQuit) {
 
 function appLaunched(url) {
     // App was launched again with a URL. Focus the main window and send an event to treat the URL.
+    if (mainWindow) {
+        focusApp();
+        mainWindow.webContents.send('mmAppLaunched', url); // Send an event to the main window.
+    }
+}
+
+function focusApp() {
     if (mainWindow) {
         if (mainWindow.isMinimized()) {
             mainWindow.restore();
         }
         mainWindow.focus();
-        mainWindow.webContents.send('mmAppLaunched', url); // Send an event to the main window.
     }
 }
 
@@ -124,3 +130,5 @@ ipcMain.on('closeSecondaryWindows', () => {
         }
     }
 });
+
+ipcMain.on('focusApp', focusApp);

From d49025a483c8ad5458a8f8e059d814ecbabd26d9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 30 Jun 2017 08:48:57 +0200
Subject: [PATCH 053/118] MOBILE-839 desktop: Show error if cannot get stream.

---
 .../emulator/services/mediacapture.js         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/www/core/components/emulator/services/mediacapture.js b/www/core/components/emulator/services/mediacapture.js
index 211f437bda9..98d5e34557d 100644
--- a/www/core/components/emulator/services/mediacapture.js
+++ b/www/core/components/emulator/services/mediacapture.js
@@ -162,17 +162,37 @@ angular.module('mm.core.emulator')
                     }
 
                     if (scope.isImage || scope.isVideo) {
+                        var hasLoaded = false,
+                            waitTimeout;
+
                         // Set the stream as the source of the video.
                         streamVideo = modal.modalEl.querySelector('video.mm-webcam-stream');
                         streamVideo.src = $window.URL.createObjectURL(localMediaStream);
 
                         // Stream ready, show modal.
                         streamVideo.onloadedmetadata = function() {
+                            if (hasLoaded) {
+                                // Already loaded or timeout triggered, stop.
+                                return;
+                            }
+
+                            hasLoaded = true;
+                            $timeout.cancel(waitTimeout);
                             loadingModal.dismiss();
                             modal.show();
                             scope.readyToCapture = true;
                             streamVideo.onloadedmetadata = null;
                         };
+
+                        // If stream isn't ready in a while, show error.
+                        waitTimeout = $timeout(function() {
+                            if (!hasLoaded) {
+                                // Show error.
+                                hasLoaded = true;
+                                loadingModal.dismiss();
+                                errorCallback && errorCallback({code: -1, message: 'Cannot connect to webcam.'});
+                            }
+                        }, 10000);
                     } else {
                         // No need to wait to show the modal.
                         loadingModal.dismiss();

From 0fad7629c7ad964afec97ff4511faba68d92e011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 28 Jun 2017 13:07:36 +0200
Subject: [PATCH 054/118] MOBILE-2121 data: Show error messages

---
 www/addons/mod/data/controllers/edit.js       | 65 +++++++++++++++----
 www/addons/mod/data/directives/field.js       |  1 +
 .../mod/data/fields/checkbox/handler.js       | 14 ++--
 .../mod/data/fields/checkbox/template.html    |  3 +-
 www/addons/mod/data/fields/date/directive.js  |  4 +-
 www/addons/mod/data/fields/date/handler.js    | 16 ++---
 www/addons/mod/data/fields/date/template.html |  3 +-
 www/addons/mod/data/fields/file/handler.js    | 14 ++--
 www/addons/mod/data/fields/file/template.html |  3 +-
 .../mod/data/fields/latlong/directive.js      |  4 +-
 www/addons/mod/data/fields/latlong/handler.js | 14 ++--
 .../mod/data/fields/latlong/template.html     |  3 +-
 www/addons/mod/data/fields/menu/handler.js    | 14 ++--
 www/addons/mod/data/fields/menu/template.html |  3 +-
 .../mod/data/fields/multimenu/handler.js      | 14 ++--
 .../mod/data/fields/multimenu/template.html   |  3 +-
 .../mod/data/fields/number/directive.js       |  2 +-
 www/addons/mod/data/fields/number/handler.js  | 14 ++--
 .../mod/data/fields/number/template.html      |  5 +-
 .../mod/data/fields/picture/directive.js      |  1 +
 www/addons/mod/data/fields/picture/handler.js | 42 ++++++++----
 .../mod/data/fields/picture/template.html     |  9 ++-
 .../mod/data/fields/radiobutton/handler.js    | 14 ++--
 .../mod/data/fields/radiobutton/template.html |  3 +-
 www/addons/mod/data/fields/text/handler.js    | 14 ++--
 www/addons/mod/data/fields/text/template.html |  5 +-
 .../mod/data/fields/textarea/directive.js     |  3 +
 .../mod/data/fields/textarea/handler.js       | 59 +++++++++--------
 .../mod/data/fields/textarea/template.html    |  3 +-
 www/addons/mod/data/fields/url/handler.js     | 14 ++--
 www/addons/mod/data/fields/url/template.html  |  2 +-
 www/addons/mod/data/lang/en.json              |  2 +
 www/addons/mod/data/services/data.js          |  2 +-
 .../mod/data/services/fieldsdelegate.js       | 44 ++++++-------
 www/addons/mod/data/services/helper.js        | 15 +++--
 www/addons/mod/data/templates/index.html      |  2 +-
 36 files changed, 259 insertions(+), 174 deletions(-)

diff --git a/www/addons/mod/data/controllers/edit.js b/www/addons/mod/data/controllers/edit.js
index f8f4e1b3240..b9f52d71b5d 100644
--- a/www/addons/mod/data/controllers/edit.js
+++ b/www/addons/mod/data/controllers/edit.js
@@ -22,11 +22,14 @@ angular.module('mm.addons.mod_data')
  * @name mmaModDataEditCtrl
  */
 .controller('mmaModDataEditCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $q, $mmUtil, $mmaModDataHelper,
-        $mmGroups, $ionicHistory, $mmEvents, mmaModDataEventEntryChanged, $mmSite, $translate, $mmFileUploaderHelper) {
+        $mmGroups, $ionicHistory, $mmEvents, mmaModDataEventEntryChanged, $mmSite, $translate, $mmFileUploaderHelper, $timeout,
+        $ionicScrollDelegate) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         data,
+        scrollView,
+        siteId = $mmSite.getId(),
         entryId = $stateParams.entryid || false;
 
     $scope.title = module.name;
@@ -46,8 +49,6 @@ angular.module('mm.addons.mod_data')
             $scope.title = data.name || $scope.title;
             $scope.data = databaseData;
 
-            $scope.database = data;
-
             return $mmaModData.getDatabaseAccessInformation(data.id);
         }).then(function(accessData) {
             $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
@@ -111,40 +112,78 @@ angular.module('mm.addons.mod_data')
                 $scope.entryContents).then(function(changed) {
 
             if (!changed) {
-                return returnToEntryList();
+                if (entryId) {
+                    return returnToEntryList();
+                } else {
+                    // New entry, no changes means no field filled, warn the user.
+                    return $q.reject('mma.mod_data.emptyaddform');
+                }
             }
 
             var modal = $mmUtil.showModalLoading('mm.core.sending', true);
 
             return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
                     $scope.entryContents).then(function(editData) {
+
                 if (editData.length > 0) {
                     if (entryId) {
                         return $mmaModData.editEntry(entryId, editData);
-                    } else {
-                        return $mmaModData.addEntry(data.id, editData, $scope.selectedGroup);
                     }
+                    return $mmaModData.addEntry(data.id, editData, $scope.selectedGroup);
                 }
              }).then(function(result) {
                 if (!result) {
-                    // Nothing done, just go back.
-                    return returnToEntryList();
+                    // No field filled, warn the user.
+                    return $q.reject('mma.mod_data.emptyaddform');
                 }
 
                 // This is done if entry is updated when editing or creating if not.
                 if ((entryId && result.updated) || (!entryId && result.newentryid)) {
+                    var promises = [];
+
                     entryId = entryId || result.newentryid;
-                    $mmEvents.trigger(mmaModDataEventEntryChanged, {dataId: data.id, entryId: entryId, siteId: $mmSite.getId()});
-                    return returnToEntryList();
+
+                    promises.push($mmaModData.invalidateEntryData(data.id, entryId, siteId));
+                    promises.push($mmaModData.invalidateEntriesData(data.id, siteId));
+
+                    return $q.all(promises).then(function() {
+                        $mmEvents.trigger(mmaModDataEventEntryChanged, {dataId: data.id, entryId: entryId, siteId: siteId});
+                    }).finally(function() {
+                        return returnToEntryList();
+                    });
+                } else {
+                    $scope.errors = {};
+                    angular.forEach(result.fieldnotifications, function(field) {
+                        for (var x in $scope.fields) {
+                            if ($scope.fields[x].name == field.fieldname) {
+                                $scope.errors[$scope.fields[x].id] = field.notification;
+                                return;
+                            }
+                        }
+                    });
+                    $timeout(function() {
+                        scrollToFirstError();
+                    });
                 }
-            }).catch(function(error) {
-                $mmUtil.showErrorModalDefault(error, 'Cannot edit entry', true);
             }).finally(function() {
                 modal.dismiss();
             });
+        }).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'Cannot edit entry', true);
+            return $q.reject();
         });
     };
 
+    // Scroll to first error.
+    function scrollToFirstError() {
+        if (!scrollView) {
+            scrollView = $ionicScrollDelegate.$getByHandle('mmaModDataEntryScroll');
+        }
+        if (!$mmUtil.scrollToElement(document.body, '.mm-data-error', scrollView)) {
+            scrollView && scrollView.scrollTop && scrollView.scrollTop();
+        }
+    }
+
     function returnToEntryList() {
         return $mmaModDataHelper.getEditTmpFiles(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
                 $scope.entryContents).then(function(files) {
@@ -166,7 +205,7 @@ angular.module('mm.addons.mod_data')
             return  $mmUtil.showConfirm($translate('mm.core.confirmcanceledit'));
         }).then(function() {
             // Delete the local files from the tmp folder.
-            $mmaModDataHelper.getEditTmpFiles(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
+            return $mmaModDataHelper.getEditTmpFiles(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
                     $scope.entryContents).then(function(files) {
                 $mmFileUploaderHelper.clearTmpFiles(files);
             });
diff --git a/www/addons/mod/data/directives/field.js b/www/addons/mod/data/directives/field.js
index 60c79eb329a..c7eab2dfbf0 100644
--- a/www/addons/mod/data/directives/field.js
+++ b/www/addons/mod/data/directives/field.js
@@ -29,6 +29,7 @@ angular.module('mm.addons.mod_data')
             field: '=',
             value: '=?',
             database: '=?',
+            error: '=?',
             mode: '@'
         },
         templateUrl: 'addons/mod/data/templates/field.html',
diff --git a/www/addons/mod/data/fields/checkbox/handler.js b/www/addons/mod/data/fields/checkbox/handler.js
index 1fdee4bc853..e2fd082c7c8 100644
--- a/www/addons/mod/data/fields/checkbox/handler.js
+++ b/www/addons/mod/data/fields/checkbox/handler.js
@@ -90,12 +90,12 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             checkboxes = [];
 
@@ -105,8 +105,8 @@ angular.module('mm.addons.mod_data')
             }
         });
 
-        originalData = (originalData && originalData.content) || "";
-        return checkboxes.join("##") != originalData;
+        originalFieldData = (originalFieldData && originalFieldData.content) || "";
+        return checkboxes.join("##") != originalFieldData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/checkbox/template.html b/www/addons/mod/data/fields/checkbox/template.html
index b2304beb661..df1592037fa 100644
--- a/www/addons/mod/data/fields/checkbox/template.html
+++ b/www/addons/mod/data/fields/checkbox/template.html
@@ -1,5 +1,6 @@
 <ion-list>
-    <span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+    <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+    <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
     <ion-checkbox ng-repeat="option in options" name="f_{{field.id}}" ng-value="option" ng-model="values[option]">{{ option }}</ion-checkbox>
     <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
 </ion-list>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/date/directive.js b/www/addons/mod/data/fields/date/directive.js
index 7844ee95216..e544c7b941d 100644
--- a/www/addons/mod/data/fields/date/directive.js
+++ b/www/addons/mod/data/fields/date/directive.js
@@ -31,8 +31,8 @@ angular.module('mm.addons.mod_data')
                 scope.enable = true;
             } else {
                 scope.value = {
-                        content: Math.floor(Date.now() / 1000)
-                    };
+                    content: Math.floor(Date.now() / 1000)
+                };
                 scope.enable = false;
             }
             scope.val = new Date(scope.value.content * 1000).toISOString().substr(0, 10);
diff --git a/www/addons/mod/data/fields/date/handler.js b/www/addons/mod/data/fields/date/handler.js
index 65aa27354ff..0d3c9f5e826 100644
--- a/www/addons/mod/data/fields/date/handler.js
+++ b/www/addons/mod/data/fields/date/handler.js
@@ -102,18 +102,18 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             input = inputData[fieldName] || "",
-            originalData = (originalData && originalData.content &&
-                new Date(originalData.content * 1000).toISOString().substr(0, 10)) || "";
+            originalFieldData = (originalFieldData && originalFieldData.content &&
+                new Date(originalFieldData.content * 1000).toISOString().substr(0, 10)) || "";
 
-        return input != originalData;
+        return input != originalFieldData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/date/template.html b/www/addons/mod/data/fields/date/template.html
index 6fb55039f52..9dccb227e02 100644
--- a/www/addons/mod/data/fields/date/template.html
+++ b/www/addons/mod/data/fields/date/template.html
@@ -1,3 +1,4 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable && mode == 'search'" ng-value="val">
 <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_z" ng-model="enable" ng-value="1">{{ 'mma.mod_data.usedate' | translate }}</ion-checkbox>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/file/handler.js b/www/addons/mod/data/fields/file/handler.js
index 45fe97dde67..ef530875b86 100644
--- a/www/addons/mod/data/fields/file/handler.js
+++ b/www/addons/mod/data/fields/file/handler.js
@@ -51,7 +51,7 @@ angular.module('mm.addons.mod_data')
      */
     self.getFieldEditData = function(field) {
         var files = self.getFieldEditFiles(field);
-        if (!!files.length) {
+        if (files.length) {
             return [{
                 fieldid: field.id,
                 subfield: 'file',
@@ -74,14 +74,14 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var files = $mmFileSession.getFiles(mmaModDataComponent,  field.dataid + '_' + field.id) || [],
-            originalFiles = (originalData && originalData.files) || [];
+            originalFiles = (originalFieldData && originalFieldData.files) || [];
 
         return $mmFileUploaderHelper.areFileListDifferent(files, originalFiles);
     };
diff --git a/www/addons/mod/data/fields/file/template.html b/www/addons/mod/data/fields/file/template.html
index 053317062c8..dea9aa1eaae 100644
--- a/www/addons/mod/data/fields/file/template.html
+++ b/www/addons/mod/data/fields/file/template.html
@@ -1,3 +1,4 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
 <mm-attachments ng-if="mode == 'edit'" files="files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/latlong/directive.js b/www/addons/mod/data/fields/latlong/directive.js
index ce46f8dae9b..9d6c0f68cc0 100644
--- a/www/addons/mod/data/fields/latlong/directive.js
+++ b/www/addons/mod/data/fields/latlong/directive.js
@@ -28,8 +28,8 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/latlong/template.html',
         link: function(scope) {
             if (scope.value) {
-                scope.north = parseFloat(scope.value.content);
-                scope.east = parseFloat(scope.value.content1);
+                scope.north = scope.value && parseFloat(scope.value.content);
+                scope.east = scope.value && parseFloat(scope.value.content1);
             }
         }
     };
diff --git a/www/addons/mod/data/fields/latlong/handler.js b/www/addons/mod/data/fields/latlong/handler.js
index 1d2e25a8477..5daf7f39263 100644
--- a/www/addons/mod/data/fields/latlong/handler.js
+++ b/www/addons/mod/data/fields/latlong/handler.js
@@ -75,17 +75,17 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             lat = inputData[fieldName + '_0'] || "",
             long = inputData[fieldName + '_1'] || "",
-            originalLat = (originalData && originalData.content) || "",
-            originalLong = (originalData && originalData.content1) || "";
+            originalLat = (originalFieldData && originalFieldData.content) || "",
+            originalLong = (originalFieldData && originalFieldData.content1) || "";
 
         return lat != originalLat || long != originalLong;
     };
diff --git a/www/addons/mod/data/fields/latlong/template.html b/www/addons/mod/data/fields/latlong/template.html
index 1745e268c0a..0b1fa4eef79 100644
--- a/www/addons/mod/data/fields/latlong/template.html
+++ b/www/addons/mod/data/fields/latlong/template.html
@@ -1,5 +1,6 @@
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <label ng-if="mode == 'edit'" class="item item-input mm-latlong">
     <input type="text" name="f_{{field.id}}_0" ng-model="north" size="10"/>
     <span class="placeholder-icon">°N</span>
diff --git a/www/addons/mod/data/fields/menu/handler.js b/www/addons/mod/data/fields/menu/handler.js
index 7287cb90f3d..eaea337eaa1 100644
--- a/www/addons/mod/data/fields/menu/handler.js
+++ b/www/addons/mod/data/fields/menu/handler.js
@@ -65,17 +65,17 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             input = inputData[fieldName] || "",
-            originalData = (originalData && originalData.content) || "";
+            originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
-        return input != originalData;
+        return input != originalFieldData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/menu/template.html b/www/addons/mod/data/fields/menu/template.html
index ffeb42e0abf..57a7816f6f8 100644
--- a/www/addons/mod/data/fields/menu/template.html
+++ b/www/addons/mod/data/fields/menu/template.html
@@ -1,4 +1,5 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <div class="item item-input item-select">
     <select name="f_{{field.id}}" ng-model="val">
         <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
diff --git a/www/addons/mod/data/fields/multimenu/handler.js b/www/addons/mod/data/fields/multimenu/handler.js
index 8d29c4496b2..338cd3cc3fc 100644
--- a/www/addons/mod/data/fields/multimenu/handler.js
+++ b/www/addons/mod/data/fields/multimenu/handler.js
@@ -84,17 +84,17 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             input = inputData[fieldName] || "",
-            originalData = (originalData && originalData.content) || "";
+            originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
-        return input != originalData;
+        return input != originalFieldData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/multimenu/template.html b/www/addons/mod/data/fields/multimenu/template.html
index 7e47d843905..ab193769d07 100644
--- a/www/addons/mod/data/fields/multimenu/template.html
+++ b/www/addons/mod/data/fields/multimenu/template.html
@@ -1,3 +1,4 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <mm-multiple-select title="{{field.name}}" name="f_{{field.id}}" options="options"></mm-multiple-select>
 <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/number/directive.js b/www/addons/mod/data/fields/number/directive.js
index 327f67c0c1e..1d1ed405512 100644
--- a/www/addons/mod/data/fields/number/directive.js
+++ b/www/addons/mod/data/fields/number/directive.js
@@ -28,7 +28,7 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/number/template.html',
         link: function(scope) {
             if (scope.mode == 'edit' && scope.value) {
-                scope.val = parseFloat(scope.value.content);
+                scope.val = scope.value && parseFloat(scope.value.content);
             }
         }
     };
diff --git a/www/addons/mod/data/fields/number/handler.js b/www/addons/mod/data/fields/number/handler.js
index e99268e5914..ecf5fafca93 100644
--- a/www/addons/mod/data/fields/number/handler.js
+++ b/www/addons/mod/data/fields/number/handler.js
@@ -65,17 +65,17 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             input = inputData[fieldName] || "",
-            originalData = (originalData && originalData.content) || "";
+            originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
-        return input != originalData;
+        return input != originalFieldData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/number/template.html b/www/addons/mod/data/fields/number/template.html
index 91c9c4cb065..a688d21785f 100644
--- a/www/addons/mod/data/fields/number/template.html
+++ b/www/addons/mod/data/fields/number/template.html
@@ -1,2 +1,3 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
-<input type="number" placeholder="{{field.name}}" name="f_{{field.id}}"  ng-model="val">
\ No newline at end of file
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
+<input type="number" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/picture/directive.js b/www/addons/mod/data/fields/picture/directive.js
index 590217a2b4b..7a903eed71d 100644
--- a/www/addons/mod/data/fields/picture/directive.js
+++ b/www/addons/mod/data/fields/picture/directive.js
@@ -33,6 +33,7 @@ angular.module('mm.addons.mod_data')
                 scope.maxSizeBytes = parseInt(scope.field.param3, 10);
 
                 scope.files = angular.copy((scope.value && scope.value.files) || []);
+                scope.alttext = (scope.value && scope.value.content1) || "";
                 $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
             }
         }
diff --git a/www/addons/mod/data/fields/picture/handler.js b/www/addons/mod/data/fields/picture/handler.js
index 01fe1754214..a9dc56768e2 100644
--- a/www/addons/mod/data/fields/picture/handler.js
+++ b/www/addons/mod/data/fields/picture/handler.js
@@ -49,16 +49,27 @@ angular.module('mm.addons.mod_data')
      * @param  {Object} field      Defines the field to be rendered.
      * @return {Promise}           With name and value of the data to be sent.
      */
-    self.getFieldEditData = function(field) {
-        var files = self.getFieldEditFiles(field);
-        if (!!files.length) {
-            return [{
+    self.getFieldEditData = function(field, inputData) {
+        var files = self.getFieldEditFiles(field),
+            values = [],
+            fieldName = 'f_' + field.id + '_alttext';
+
+        if (files.length) {
+            values.push({
                 fieldid: field.id,
                 subfield: 'file',
                 files: files
-            }];
+            });
         }
-        return false;
+
+        if (inputData[fieldName]) {
+            values.push({
+                fieldid: field.id,
+                subfield: 'alttext',
+                value: inputData[fieldName]
+            });
+        }
+        return values;
     };
 
     /**
@@ -74,16 +85,19 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
-        var files = $mmFileSession.getFiles(mmaModDataComponent,  field.dataid + '_' + field.id) || [],
-            originalFiles = (originalData && originalData.files) || [];
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
+        var fieldName = 'f_' + field.id + '_alttext',
+            altText = inputData[fieldName] || "",
+            originalAltText = (originalFieldData && originalFieldData.content1) || "",
+            files = $mmFileSession.getFiles(mmaModDataComponent,  field.dataid + '_' + field.id) || [],
+            originalFiles = (originalFieldData && originalFieldData.files) || [];
 
-        return $mmFileUploaderHelper.areFileListDifferent(files, originalFiles);
+        return altText != originalAltText || $mmFileUploaderHelper.areFileListDifferent(files, originalFiles);
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/picture/template.html b/www/addons/mod/data/fields/picture/template.html
index d3ea0fa63d2..2a7cc3eba6e 100644
--- a/www/addons/mod/data/fields/picture/template.html
+++ b/www/addons/mod/data/fields/picture/template.html
@@ -1,3 +1,8 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
-<mm-attachments ng-if="mode == 'edit'" files="value.files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
\ No newline at end of file
+<mm-attachments ng-if="mode == 'edit'" files="files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
+<ion-input ng-if="mode == 'edit'" class="item item-input item-stacked-label item-text-wrap">
+    <ion-label>{{ 'mma.mod_data.alttext' | translate }}</ion-label>
+    <input type="text" name="f_{{field.id}}_alttext" placeholder="{{ 'mma.mod_data.alttext' | translate }}" ng-model="alttext">
+</ion-input>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/radiobutton/handler.js b/www/addons/mod/data/fields/radiobutton/handler.js
index 93d09562ad0..f20c02d307f 100644
--- a/www/addons/mod/data/fields/radiobutton/handler.js
+++ b/www/addons/mod/data/fields/radiobutton/handler.js
@@ -65,17 +65,17 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             input = inputData[fieldName] || "",
-            originalData = (originalData && originalData.content) || "";
+            originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
-        return input != originalData;
+        return input != originalFieldData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/radiobutton/template.html b/www/addons/mod/data/fields/radiobutton/template.html
index ffeb42e0abf..57a7816f6f8 100644
--- a/www/addons/mod/data/fields/radiobutton/template.html
+++ b/www/addons/mod/data/fields/radiobutton/template.html
@@ -1,4 +1,5 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <div class="item item-input item-select">
     <select name="f_{{field.id}}" ng-model="val">
         <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
diff --git a/www/addons/mod/data/fields/text/handler.js b/www/addons/mod/data/fields/text/handler.js
index 1eeec43b579..e679ed58422 100644
--- a/www/addons/mod/data/fields/text/handler.js
+++ b/www/addons/mod/data/fields/text/handler.js
@@ -64,17 +64,17 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             input = inputData[fieldName] || "",
-            originalData = (originalData && originalData.content) || "";
+            originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
-        return input != originalData;
+        return input != originalFieldData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/text/template.html b/www/addons/mod/data/fields/text/template.html
index 0b3cbb41a5c..ab1fd196e5d 100644
--- a/www/addons/mod/data/fields/text/template.html
+++ b/www/addons/mod/data/fields/text/template.html
@@ -1,2 +1,3 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}"  ng-model="val">
\ No newline at end of file
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
+<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/textarea/directive.js b/www/addons/mod/data/fields/textarea/directive.js
index 3a2544bcc07..c5d3a500806 100644
--- a/www/addons/mod/data/fields/textarea/directive.js
+++ b/www/addons/mod/data/fields/textarea/directive.js
@@ -40,6 +40,9 @@ angular.module('mm.addons.mod_data')
                 });
 
                 scope.firstRender = function() {
+                    if (!scope.value) {
+                        scope.value = {};
+                    }
                     scope.value.content = scope.model.text;
                 };
             }
diff --git a/www/addons/mod/data/fields/textarea/handler.js b/www/addons/mod/data/fields/textarea/handler.js
index 8ac11fd309f..96017e9b8b3 100644
--- a/www/addons/mod/data/fields/textarea/handler.js
+++ b/www/addons/mod/data/fields/textarea/handler.js
@@ -46,16 +46,16 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field edit data in the input data.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Promise}             With name and value of the data to be sent.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Promise}                    With name and value of the data to be sent.
      */
-    self.getFieldEditData = function(field, inputData, originalData) {
+    self.getFieldEditData = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id;
         if (inputData[fieldName]) {
             return $mmUtil.isRichTextEditorEnabled().then(function(enabled) {
-                var files = self.getFieldEditFiles(field, inputData, originalData),
+                var files = self.getFieldEditFiles(field, inputData, originalFieldData),
                     text = $mmText.restorePluginfileUrls(inputData[fieldName], files);
 
                 if (!enabled) {
@@ -64,13 +64,20 @@ angular.module('mm.addons.mod_data')
                 }
 
                 return [{
-                    fieldid: field.id,
-                    value: text
-                },
-                {
-                    fieldid: field.id,
-                    files: files
-                }];
+                        fieldid: field.id,
+                        value: text
+                    },
+                    {
+                        fieldid: field.id,
+                        subfield: 'content1',
+                        value: 1
+                    },
+                    {
+                        fieldid: field.id,
+                        subfield: 'itemid',
+                        files: files
+                    }
+                ];
             });
         }
         return false;
@@ -79,29 +86,29 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field edit files in the input data.
      *
-     * @param  {Object} field        Defines the field..
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Promise}             With name and value of the data to be sent.
+     * @param  {Object} field               Defines the field..
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Promise}                    With name and value of the data to be sent.
      */
-    self.getFieldEditFiles = function(field, inputData, originalData) {
-        return (originalData && originalData.files) || [];
+    self.getFieldEditFiles = function(field, inputData, originalFieldData) {
+        return (originalFieldData && originalFieldData.files) || [];
     };
 
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             input = inputData[fieldName] || "",
-            originalData = (originalData && originalData.content) || "";
+            originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
-        return input != originalData;
+        return input != originalFieldData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/textarea/template.html b/www/addons/mod/data/fields/textarea/template.html
index 5a357df6990..c7046fd319d 100644
--- a/www/addons/mod/data/fields/textarea/template.html
+++ b/www/addons/mod/data/fields/textarea/template.html
@@ -1,4 +1,5 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
+<span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
 <div ng-if="mode == 'edit'" class="item item-text-wrap mm-item-has-rich-text-editor">
     <mm-rich-text-editor model="model" placeholder="{{ field.name }}" name="f_{{field.id}}" component="{{component}}" component-id="{{componentId}}" first-render="firstRender()"></mm-rich-text-editor>
diff --git a/www/addons/mod/data/fields/url/handler.js b/www/addons/mod/data/fields/url/handler.js
index fa38a7bfffb..b4fbf6539b2 100644
--- a/www/addons/mod/data/fields/url/handler.js
+++ b/www/addons/mod/data/fields/url/handler.js
@@ -64,17 +64,17 @@ angular.module('mm.addons.mod_data')
     /**
      * Get field data in changed.
      *
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the edit form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Boolean}             If the field has changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Boolean}                    If the field has changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
             input = inputData[fieldName] || "",
-            originalData = (originalData && originalData.content) || "";
+            originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
-        return input != originalData;
+        return input != originalFieldData;
     };
 
     return self;
diff --git a/www/addons/mod/data/fields/url/template.html b/www/addons/mod/data/fields/url/template.html
index cc75865221f..d5c7fd11aa4 100644
--- a/www/addons/mod/data/fields/url/template.html
+++ b/www/addons/mod/data/fields/url/template.html
@@ -1,2 +1,2 @@
-<span ng-if="mode == 'edit' && field.required" mm-mark-required="mode == 'edit' && {{field.required}}"></span>
+<span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <input type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index 4c464b12bfb..5c137b1c2d1 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -1,6 +1,7 @@
 {
     "addentries": "Add entries",
     "advancedsearch": "Advanced search",
+    "alttext": "Alternative text",
     "approved": "Approved",
     "authorfirstname": "Author first name",
     "authorlastname": "Author surname",
@@ -9,6 +10,7 @@
     "authorlastname": "Author surname",
     "confirmdeleterecord": "Are you sure you want to delete this entry?",
     "descending": "Descending",
+    "emptyaddform": "You did not fill out any fields!",
     "entrieslefttoadd": "You must add {{$a.entriesleft}} more entry/entries in order to complete this activity",
     "entrieslefttoaddtoview": "You must add {{$a.entrieslefttoview}} more entry/entries before you can view other participants' entries.",
     "errorapproving": "Error approving or unapproving entry.",
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 3b629da7c32..5ccc1c97a19 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -468,7 +468,7 @@ angular.module('mm.addons.mod_data')
      *
      * @module mm.addons.mod_data
      * @ngdoc method
-     * @name $mmaModData#addEntry
+     * @name $mmaModData#editEntry
      * @param   {Number}    entryId         Entry ID.
      * @param   {Object}    data            The fields data to be updated.
      * @param   {String}    [siteId]        Site ID. If not defined, current site.
diff --git a/www/addons/mod/data/services/fieldsdelegate.js b/www/addons/mod/data/services/fieldsdelegate.js
index 285463979b8..234f019219e 100644
--- a/www/addons/mod/data/services/fieldsdelegate.js
+++ b/www/addons/mod/data/services/fieldsdelegate.js
@@ -90,15 +90,15 @@ angular.module('mm.addons.mod_data')
      * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModDataFieldsDelegate#getFieldEditData
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the search form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Array}               Name and data field.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the search form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Array}                      Name and data field.
      */
-    self.getFieldEditData = function(field, inputData, originalData) {
+    self.getFieldEditData = function(field, inputData, originalFieldData) {
         var handler = self.getPluginHandler(field.type);
         if (handler && handler.getFieldEditData) {
-            return handler.getFieldEditData(field, inputData, originalData);
+            return handler.getFieldEditData(field, inputData, originalFieldData);
         }
         return false;
     };
@@ -109,15 +109,15 @@ angular.module('mm.addons.mod_data')
      * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModDataFieldsDelegate#getFieldEditFiles
-     * @param  {Object} field        Defines the field to be rendered.
-     * @param  {Object} inputData    Data entered in the search form.
-     * @param  {Object} originalData Original form data entered.
-     * @return {Array}               Name and data field.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the search form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Array}                      Name and data field.
      */
-    self.getFieldEditFiles = function(field, inputData, originalData) {
+    self.getFieldEditFiles = function(field, inputData, originalFieldData) {
         var handler = self.getPluginHandler(field.type);
         if (handler && handler.getFieldEditFiles) {
-            return handler.getFieldEditFiles(field, inputData, originalData);
+            return handler.getFieldEditFiles(field, inputData, originalFieldData);
         }
         return [];
     };
@@ -128,15 +128,15 @@ angular.module('mm.addons.mod_data')
      * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModDataFieldsDelegate#hasFieldDataChanged
-     * @param  {Object} field         Defines the field to be rendered.
-     * @param  {Object} inputData     Data entered in the search form.
-     * @param  {Object} originalData  Original form data entered.
-     * @return {Promise}              Promise rejected if has changed, resolved if no changes.
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the search form.
+     * @param  {Object} originalFieldData   Original field entered data.
+     * @return {Promise}                    Promise rejected if has changed, resolved if no changes.
      */
-    self.hasFieldDataChanged = function(field, inputData, originalData) {
+    self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var handler = self.getPluginHandler(field.type);
         if (handler && handler.hasFieldDataChanged) {
-            return $q.when(handler.hasFieldDataChanged(field, inputData, originalData)).then(function(result) {
+            return $q.when(handler.hasFieldDataChanged(field, inputData, originalFieldData)).then(function(result) {
                 return result ? $q.reject() : $q.when();
             });
         }
@@ -190,12 +190,12 @@ angular.module('mm.addons.mod_data')
      *                           returning an object defining these properties. See {@link $mmUtil#resolveObject}.
      *                             - getFieldSearchData(field, inputData) Optional.
      *                                                           Should return name and data entered to the field.
-     *                             - getFieldEditData(field, inputData, originalData) Optional.
-     *                                                           Should return fielid and data entered to the field in a promise
+     *                             - getFieldEditData(field, inputData, originalFieldData) Optional.
+     *                                                           Should return fieldid and data entered to the field in a promise
      *                                                           or array.
-     *                             - hasFieldDataChanged(field, inputData, originalData) Optional.
+     *                             - hasFieldDataChanged(field, inputData, originalFieldData) Optional.
      *                                                           Should return if field has been changed by the user.
-     *                             - getFieldEditFiles(field, inputData, originalData) Optional.
+     *                             - getFieldEditFiles(field, inputData, originalFieldData) Optional.
      *                                                           Should return an array of files stored in temp store.
      */
     self.registerHandler = function(addon, pluginType, handler) {
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index b83972ac25d..74d817a8d10 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -165,7 +165,7 @@ angular.module('mm.addons.mod_data')
             replace = new RegExp(replace);
 
             // Replace field by a generic directive.
-            var render = '<mma-mod-data-field mode="edit" field="fields['+ field.id + ']" value="entryContents['+ field.id + ']" database="database"></mma-mod-data-field>';
+            var render = '<mma-mod-data-field mode="edit" field="fields['+ field.id + ']" value="entryContents['+ field.id + ']" database="data" error="errors['+ field.id + ']"></mma-mod-data-field>';
             template = template.replace(replace, render);
 
             // Replace the field id tag.
@@ -188,7 +188,7 @@ angular.module('mm.addons.mod_data')
      * @name $mmaModDataHelper#getEditDataFromForm
      * @param  {Object}  form            Form (DOM element).
      * @param  {Array}   fields          Fields that defines every content in the entry.
-     * @param  {Number}  [dataId]        Database Id. If set, fils will be uploaded and itemId set.
+     * @param  {Number}  [dataId]        Database Id. If set, files will be uploaded and itemId set.
      * @param  {Object}   entryContents  Original entry contents indexed by field id.
      * @return {Promise}                 That contains object with the answers.
      */
@@ -203,7 +203,7 @@ angular.module('mm.addons.mod_data')
         var edit = [],
             promises = [];
         angular.forEach(fields, function(field) {
-            promises.push($q.when($mmaModDataFieldsDelegate.getFieldEditData(field, formData, entryContents[field.id] || undefined))
+            promises.push($q.when($mmaModDataFieldsDelegate.getFieldEditData(field, formData, entryContents[field.id]))
                     .then(function (fieldData) {
                 if (fieldData) {
                     var proms = [];
@@ -213,7 +213,7 @@ angular.module('mm.addons.mod_data')
 
                         // Upload Files if asked.
                         if (dataId && data.files) {
-                            dataProm = self.uploadOrStoreFiles(dataId, data.fieldid, undefined, data.files).then(function(itemId) {
+                            dataProm = self.uploadOrStoreFiles(dataId, 0, undefined, data.files).then(function(itemId) {
                                 delete data.files;
                                 data.value = itemId;
                             });
@@ -225,6 +225,9 @@ angular.module('mm.addons.mod_data')
                             if (data.value) {
                                 data.value = JSON.stringify(data.value);
                             }
+                            if (typeof data.subfield == "undefined") {
+                                data.subfield = "";
+                            }
 
                             // WS wants values in Json format.
                             edit.push(data);
@@ -264,7 +267,7 @@ angular.module('mm.addons.mod_data')
         var promises = [];
         angular.forEach(fields, function(field) {
             promises.push(
-                $q.when($mmaModDataFieldsDelegate.getFieldEditFiles(field, formData, entryContents[field.id] || undefined))
+                $q.when($mmaModDataFieldsDelegate.getFieldEditFiles(field, formData, entryContents[field.id]))
             );
         });
 
@@ -295,7 +298,7 @@ angular.module('mm.addons.mod_data')
             promises = [];
 
         angular.forEach(fields, function(field) {
-            promises.push($mmaModDataFieldsDelegate.hasFieldDataChanged(field, inputData, entryContents[field.id] || undefined));
+            promises.push($mmaModDataFieldsDelegate.hasFieldDataChanged(field, inputData, entryContents[field.id]));
         });
         // Will reject on first change detected.
         return $q.all(promises).then(function() {
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
index 3ce95a59c5f..d222c017188 100644
--- a/www/addons/mod/data/templates/index.html
+++ b/www/addons/mod/data/templates/index.html
@@ -73,7 +73,7 @@ <h2>{{ 'mma.mod_data.numrecords' | translate: {$a: numEntries } }}</h2>
                         {{ 'mma.mod_data.addentries' | translate }}
                     </button>
                 </div>
-        </mm-empty-box>
+            </mm-empty-box>
 
             <mm-empty-box ng-if="isEmpty && search.searching" icon="ion-archive" message="{{ 'mma.mod_data.nomatch' | translate}}">
                 <a ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate}}</a>

From ecce74604e9e8b610ea5c66f579aa21b58d3324c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 29 Jun 2017 09:37:24 +0200
Subject: [PATCH 055/118] MOBILE-2122 data: Support native comments

---
 www/addons/mod/data/controllers/index.js      | 21 +++++++++-
 www/addons/mod/data/services/helper.js        | 41 +++++++++++++++++++
 .../mod/data/services/prefetch_handler.js     |  4 ++
 .../components/comments/services/comments.js  |  6 ---
 4 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index b802b565374..ae2e37d49fe 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -23,13 +23,14 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
         $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups,
-        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage, $state) {
+        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage, $state, $mmComments) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         data,
         entryChangedObserver,
-        onlineObserver;
+        onlineObserver,
+        hasComments = false;
 
     $scope.title = module.name;
     $scope.description = module.description;
@@ -139,6 +140,8 @@ angular.module('mm.addons.mod_data')
     }
 
     function fetchEntriesData() {
+        hasComments = false;
+
         return $mmaModData.getDatabaseAccessInformation(data.id, $scope.selectedGroup).then(function(accessData) {
             // Update values for current group.
             $scope.access.canaddentry = accessData.canaddentry;
@@ -160,6 +163,17 @@ angular.module('mm.addons.mod_data')
 
             if (!$scope.isEmpty) {
                 $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
+
+                // Are comments present on the template? Replace it with native ones.
+                if (data.comments) {
+                    var commentsNumber = data.listtemplate.match(/##comments##/g).length;
+                    if (commentsNumber > 0) {
+                        hasComments = true;
+
+                        entries.listviewcontents = $mmaModDataHelper.replaceComments(entries.listviewcontents, entries.entries,
+                            commentsNumber);
+                    }
+                }
                 $scope.entries = entries.listviewcontents;
             } else if (!$scope.search.searching) {
                 $scope.canSearch = false;
@@ -186,6 +200,9 @@ angular.module('mm.addons.mod_data')
             promises.push($mmaModData.invalidateDatabaseAccessInformationData(data.id));
             promises.push($mmGroups.invalidateActivityGroupInfo(data.coursemodule));
             promises.push($mmaModData.invalidateEntriesData(data.id));
+            if (hasComments) {
+                promises.push($mmComments.invalidateCommentsByInstance('module', data.coursemodule));
+            }
         }
 
         return $q.all(promises).finally(function() {
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 74d817a8d10..170a1ab095a 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -354,6 +354,47 @@ angular.module('mm.addons.mod_data')
         return css.replace(regExp, prefix + " $1 $2");
     };
 
+    /**
+     * Replaces HTML comments by MM native comments.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#replaceComments
+     * @param {String} html             HTML to be replaced.
+     * @param {Array}  entries          Entries to be placed in the comments.
+     * @param {Number} commentsNumber   Number of times we have to add the comments to every entry.
+     * @return {String}                 HTML with native comments.
+     */
+    self.replaceComments = function(html, entries, commentsNumber) {
+        html = angular.element(html);
+
+        var links = html.find('a'),
+            entryIdx = 0,
+            timesAdded = 0;
+
+        // Replace current comment area by the native directive.
+        angular.forEach(links, function(link) {
+            link = angular.element(link);
+            if (link.hasClass('showcommentsnonjs')) {
+                var entryId = entries[entryIdx].id;
+                link.parent().replaceWith('<mm-comments context-level="module" instance-id="{{data.coursemodule}}" component="mod_data" item-id="' + entryId + '" area="database_entry"></mm-comments>');
+
+                // Only go forward the entries array if we've added the comments this number of times.
+                timesAdded++;
+                if (timesAdded >= commentsNumber) {
+                    entryIdx++;
+                    timesAdded = 0;
+                }
+            }
+        });
+
+        var content = "";
+        angular.forEach(html, function(entry) {
+            content += entry.outerHTML;
+        });
+        return content;
+    };
+
 
     /**
      * Get page info related to an entry.
diff --git a/www/addons/mod/data/services/prefetch_handler.js b/www/addons/mod/data/services/prefetch_handler.js
index 078a30e2a2b..bfd3afb8fa4 100644
--- a/www/addons/mod/data/services/prefetch_handler.js
+++ b/www/addons/mod/data/services/prefetch_handler.js
@@ -331,6 +331,10 @@ angular.module('mm.addons.mod_data')
 
             angular.forEach(info.entries, function(entry) {
                 promises.push($mmaModData.getEntry(database.id, entry.id, siteId));
+                if (database.comments) {
+                    promises.push($mmComments.getComments('module', database.coursemodule, 'mod_data', entry.id, 'database_entry',
+                        0, siteId));
+                }
             });
 
             // Add Basic Info to manage links.
diff --git a/www/core/components/comments/services/comments.js b/www/core/components/comments/services/comments.js
index 274e3556028..b8569dfd6ee 100644
--- a/www/core/components/comments/services/comments.js
+++ b/www/core/components/comments/services/comments.js
@@ -72,8 +72,6 @@ angular.module('mm.core.comments')
      * @return {Promise}                Promise resolved with the comments.
      */
     self.getComments = function(contextLevel, instanceId, component, itemId, area, page, siteId) {
-        siteId = siteId || $mmSite.getId();
-
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                 "contextlevel": contextLevel,
@@ -118,7 +116,6 @@ angular.module('mm.core.comments')
      * @return {Promise}        Promise resolved when the data is invalidated.
      */
     self.invalidateCommentsData = function(contextLevel, instanceId, component, itemId, area, page, siteId) {
-        siteId = siteId || $mmSite.getId();
         return $mmSitesManager.getSite(siteId).then(function(site) {
             return site.invalidateWsCacheForKey(getCommentsCacheKey(contextLevel, instanceId, component, itemId, area, page));
         });
@@ -135,7 +132,6 @@ angular.module('mm.core.comments')
      * @return {Promise}        Promise resolved when the data is invalidated.
      */
     self.invalidateCommentsByInstance = function(contextLevel, instanceId, siteId) {
-        siteId = siteId || $mmSite.getId();
         return $mmSitesManager.getSite(siteId).then(function(site) {
             return site.invalidateWsCacheForKeyStartingWith(getCommentsPrefixCacheKey(contextLevel, instanceId));
         });
@@ -151,8 +147,6 @@ angular.module('mm.core.comments')
      * @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.wsAvailable('core_comment_get_comments');
         });

From 610bbefbb99ed6aaf7db62ad48fa9e1cb0680bfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 29 Jun 2017 10:33:45 +0200
Subject: [PATCH 056/118] MOBILE-2122 core: Improve relative link handling

---
 www/addons/mod/data/controllers/index.js      |  2 +
 .../contentlinks/services/delegate.js         |  2 +-
 .../contentlinks/services/handlerfactory.js   | 12 +++++-
 www/core/directives/link.js                   | 43 ++++++++++++-------
 www/core/lib/sitesmanager.js                  |  2 +-
 www/core/lib/util.js                          | 13 ++++++
 6 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index ae2e37d49fe..b7e59b3fec3 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -175,6 +175,8 @@ angular.module('mm.addons.mod_data')
                     }
                 }
                 $scope.entries = entries.listviewcontents;
+                // Solve picture field relative links problem.
+                $scope.entries = $scope.entries.replace("href\=\"view.php", "href\=\"/mod/data/view.php");
             } else if (!$scope.search.searching) {
                 $scope.canSearch = false;
             }
diff --git a/www/core/components/contentlinks/services/delegate.js b/www/core/components/contentlinks/services/delegate.js
index 892378b608d..f9b7e9ca23c 100644
--- a/www/core/components/contentlinks/services/delegate.js
+++ b/www/core/components/contentlinks/services/delegate.js
@@ -191,7 +191,7 @@ angular.module('mm.core.contentlinks')
                 }
 
                 if (handler.instance && handler.instance.handles) {
-                    var siteUrl = handler.instance.handles(url);
+                    var siteUrl = handler.instance.getHandlerUrl(url);
                     if (siteUrl) {
                         return siteUrl;
                     }
diff --git a/www/core/components/contentlinks/services/handlerfactory.js b/www/core/components/contentlinks/services/handlerfactory.js
index 65fb04662e2..8490f1adbf2 100644
--- a/www/core/components/contentlinks/services/handlerfactory.js
+++ b/www/core/components/contentlinks/services/handlerfactory.js
@@ -46,13 +46,23 @@ angular.module('mm.core')
                 return [];
             };
 
+            /**
+             * Check if the URL is handled by this handler.
+             *
+             * @param  {String}  url URL to check.
+             * @return {Boolean}     If the URL is handled.
+             */
+            this.handles = function(url) {
+                return this.pattern && url.search(this.pattern) >= 0;
+            };
+
             /**
              * Check if the URL is handled by this handler. If so, returns the URL of the site.
              *
              * @param  {String} url URL to check.
              * @return {String}     Site URL. Undefined if the URL doesn't belong to this handler.
              */
-            this.handles = function(url) {
+            this.getHandlerUrl = function(url) {
                 if (this.pattern) {
                     var position = url.search(this.pattern);
                     if (position > -1) {
diff --git a/www/core/directives/link.js b/www/core/directives/link.js
index 1edfb179a87..4e067bc5179 100644
--- a/www/core/directives/link.js
+++ b/www/core/directives/link.js
@@ -56,6 +56,7 @@ angular.module('mm.core')
                 $mmUtil.scrollToElement(document, "#" + href + ", [name='" + href + "']");
             }
         } else {
+
             // It's an external link, we will open with browser. Check if we need to auto-login.
             if (!$mmSite.isLoggedIn()) {
                 // Not logged in, cannot auto-login.
@@ -64,23 +65,35 @@ angular.module('mm.core')
                 } else {
                     $mmUtil.openInBrowser(href);
                 }
-            } else if (autoLogin == 'yes') {
-                if (inApp) {
-                    $mmSite.openInAppWithAutoLogin(href);
-                } else {
-                    $mmSite.openInBrowserWithAutoLogin(href);
-                }
-            } else if (autoLogin == 'no') {
-                if (inApp) {
-                    $mmUtil.openInApp(href);
-                } else {
-                    $mmUtil.openInBrowser(href);
-                }
             } else {
-                if (inApp) {
-                    $mmSite.openInAppWithAutoLoginIfSameSite(href);
+                // Check if URL does not have any protocol, so it's a relative URL.
+                if (!$mmUtil.isAbsoluteURL(url)) {
+                    // Add the site URL at the begining.
+                    if (href.charAt(0) == '/') {
+                        href = $mmSite.getURL() + href;
+                    } else {
+                        href = $mmSite.getURL() + '/' + href;
+                    }
+                }
+
+                if (autoLogin == 'yes') {
+                    if (inApp) {
+                        $mmSite.openInAppWithAutoLogin(href);
+                    } else {
+                        $mmSite.openInBrowserWithAutoLogin(href);
+                    }
+                } else if (autoLogin == 'no') {
+                    if (inApp) {
+                        $mmUtil.openInApp(href);
+                    } else {
+                        $mmUtil.openInBrowser(href);
+                    }
                 } else {
-                    $mmSite.openInBrowserWithAutoLoginIfSameSite(href);
+                    if (inApp) {
+                        $mmSite.openInAppWithAutoLoginIfSameSite(href);
+                    } else {
+                        $mmSite.openInBrowserWithAutoLoginIfSameSite(href);
+                    }
                 }
             }
         }
diff --git a/www/core/lib/sitesmanager.js b/www/core/lib/sitesmanager.js
index fe6b6e3c2f5..a51f329e830 100644
--- a/www/core/lib/sitesmanager.js
+++ b/www/core/lib/sitesmanager.js
@@ -913,7 +913,7 @@ angular.module('mm.core')
         // Check if URL has http(s) protocol.
         if (!url.match(/^https?:\/\//i)) {
             // URL doesn't have http(s) protocol. Check if it has any protocol.
-            if (url.match(/^[^:]{2,10}:\/\//i)) {
+            if ($mmUtil.isAbsoluteURL(url)) {
                 // It has some protocol. Return empty array.
                 return $q.when([]);
             } else {
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 0edb004b4b3..5968f3cbb87 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -199,6 +199,19 @@ angular.module('mm.core')
             return url && url.indexOf('/pluginfile.php') !== -1;
         };
 
+        /**
+         * Returns if a URL has any protocol, if not is a relative URL.
+         *
+         * @module mm.core
+         * @ngdoc method
+         * @name $mmUtil#isAbsoluteURL
+         * @param {String} url The url to test against the pattern
+         * @return {Boolean}   TRUE if the url is absolute. FALSE if it is relative.
+         */
+        self.isAbsoluteURL = function(url) {
+            return /^[^:]{2,10}:\/\//i.test(url);
+        };
+
         /**
          * Returns if a URL is a theme image URL.
          *

From f4f6e066c1cf4648cd63bdf82a21f91076047898 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 30 Jun 2017 17:03:07 +0200
Subject: [PATCH 057/118] MOBILE-839 desktop: Maximize window

---
 www/electron.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/electron.js b/www/electron.js
index 16bfff11106..9e149a52fac 100644
--- a/www/electron.js
+++ b/www/electron.js
@@ -41,6 +41,7 @@ function createWindow() {
 
     mainWindow.once('ready-to-show', () => {
         mainWindow.show();
+        mainWindow.maximize();
     });
 
     // Emitted when the window is closed.

From 2694dd72662ebacba7259cc88f4216424a6d5e36 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 3 Jul 2017 12:07:50 +0200
Subject: [PATCH 058/118] MOBILE-839 windows: Avoid notification error in
 development

---
 .../emulator/services/localnotif.js           | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/www/core/components/emulator/services/localnotif.js b/www/core/components/emulator/services/localnotif.js
index 2d063e6e19f..54b45ba1215 100644
--- a/www/core/components/emulator/services/localnotif.js
+++ b/www/core/components/emulator/services/localnotif.js
@@ -585,17 +585,21 @@ angular.module('mm.core.emulator')
                 notificationClicked(notification);
             });
 
-            notifInstance.show()
+            notifInstance.show();
 
-            // Show it in Tile too.
-            var tileNotif = new winNotif.TileNotification({
-                tag: notification.id + '',
-                template: tileTemplate,
-                strings: [notification.title,  notification.text, notification.title,  notification.text, notification.title,  notification.text],
-                expirationTime: new Date(Date.now() + mmCoreSecondsHour * 1000) // Expire in 1 hour.
-            })
-
-            tileNotif.show()
+            try {
+                // Show it in Tile too.
+                var tileNotif = new winNotif.TileNotification({
+                    tag: notification.id + '',
+                    template: tileTemplate,
+                    strings: [notification.title,  notification.text, notification.title,  notification.text, notification.title,  notification.text],
+                    expirationTime: new Date(Date.now() + mmCoreSecondsHour * 1000) // Expire in 1 hour.
+                })
+
+                tileNotif.show()
+            } catch(ex) {
+                $log.warn('Error showing TileNotification. Please notice they only work with the app installed.', ex);
+            }
         } else {
             // Use Electron default notifications.
             var notifInstance = new Notification(notification.title, {

From 7c4a78a0b89716bc75e55040a87ffd9a17e64a61 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 3 Jul 2017 12:09:53 +0200
Subject: [PATCH 059/118] MOBILE-839 windows: Use 'en' and increase store logo

---
 AppXManifest.xml                |   2 +-
 resources/desktop/StoreLogo.png | Bin 5326 -> 56185 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/AppXManifest.xml b/AppXManifest.xml
index d525ac270d7..d31855a1b76 100644
--- a/AppXManifest.xml
+++ b/AppXManifest.xml
@@ -14,7 +14,7 @@
     <Logo>assets\StoreLogo.png</Logo>
   </Properties>
   <Resources>
-    <Resource Language="en-us" />
+    <Resource Language="en" />
   </Resources>
   <Dependencies>
     <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0" MaxVersionTested="10.0.14316.0" />
diff --git a/resources/desktop/StoreLogo.png b/resources/desktop/StoreLogo.png
index 4061075bcf36aa295bfe7cec10488302ef53b660..fa5cebb178bdc2d1214d330949932fe65ba87030 100644
GIT binary patch
literal 56185
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

delta 2639
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


From ad48149469877481405bc7cdd089264e3c9191a5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 4 Jul 2017 09:02:43 +0200
Subject: [PATCH 060/118] MOBILE-2136 course: Fix section opened when it
 shouldn't

---
 www/core/components/course/controllers/sections.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/core/components/course/controllers/sections.js b/www/core/components/course/controllers/sections.js
index 58ac12947fb..05a05cba0c5 100644
--- a/www/core/components/course/controllers/sections.js
+++ b/www/core/components/course/controllers/sections.js
@@ -25,8 +25,8 @@ angular.module('mm.core.course')
             $mmSite, $mmCoursePrefetchDelegate, $mmCourses, $q, $ionicHistory, $ionicPlatform, mmCoreCourseAllSectionsId,
             mmCoreEventSectionStatusChanged, $state, $timeout, $mmCoursesDelegate, $controller) {
     var courseId = $stateParams.courseid,
-        sectionId = $stateParams.sid,
-        sectionNumber = $stateParams.sectionnumber,
+        sectionId = parseInt($stateParams.sid, 10),
+        sectionNumber = parseInt($stateParams.sectionnumber, 10),
         moduleId = $stateParams.moduleid,
         course = $stateParams.course ? angular.copy($stateParams.course) : false;
 

From 5b7d6cbb0c55d95e24d1bbd622ff746eec21f8f7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 4 Jul 2017 12:55:29 +0200
Subject: [PATCH 061/118] MOBILE-2139 config: Refurbish config.xml and change
 author

---
 config.xml | 162 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 87 insertions(+), 75 deletions(-)

diff --git a/config.xml b/config.xml
index 762cadb9a29..dcf510ffbd7 100644
--- a/config.xml
+++ b/config.xml
@@ -1,77 +1,89 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<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>
-  <content src="index.html"/>
-  <access origin="*"/>
-  <allow-navigation href="cdvfile:*"/>
-  <allow-navigation href="content:*"/>
-  <allow-navigation href="data:*"/>
-  <allow-navigation href="*"/>
-  <allow-intent href="*"/>
-  <preference name="webviewbounce" value="false"/>
-  <preference name="UIWebViewBounce" value="false"/>
-  <preference name="DisallowOverscroll" value="true"/>
-  <preference name="BackupWebStorage" value="none"/>
-  <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" />
-  <preference name="AppendUserAgent" value="MoodleMobile" />
-  <feature name="StatusBar">
-    <param name="ios-package" value="CDVStatusBar" onload="true"/>
-  </feature>
-  <platform name="android">
-    <splash src="resources/android/splash/drawable-land-ldpi-screen.png" density="land-ldpi"/>
-    <splash src="resources/android/splash/drawable-land-mdpi-screen.png" density="land-mdpi"/>
-    <splash src="resources/android/splash/drawable-land-hdpi-screen.png" density="land-hdpi"/>
-    <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" density="land-xhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" density="land-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" density="land-xxxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-ldpi-screen.png" density="port-ldpi"/>
-    <splash src="resources/android/splash/drawable-port-mdpi-screen.png" density="port-mdpi"/>
-    <splash src="resources/android/splash/drawable-port-hdpi-screen.png" density="port-hdpi"/>
-    <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" density="port-xhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" density="port-xxhdpi"/>
-    <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" density="port-xxxhdpi"/>
-    <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
-    <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
-    <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
-    <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
-    <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
-    <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
-  </platform>
-  <platform name="ios">
-    <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
-    <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
-    <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
-    <splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
-    <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
-    <splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
-    <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
-    <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
-    <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
-    <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
-    <icon src="resources/ios/icon/icon.png" width="57" height="57"/>
-    <icon src="resources/ios/icon/icon@2x.png" width="114" height="114"/>
-    <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
-    <icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/>
-    <icon src="resources/ios/icon/icon-40@3x.png" width="120" height="120"/>
-    <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
-    <icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/>
-    <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
-    <icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/>
-    <icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/>
-    <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
-    <icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/>
-    <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
-    <icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/>
-    <icon src="resources/ios/icon/icon-83.5@2x.png" width="167" height="167"/>
-    <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
-    <icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/>
-    <icon src="resources/ios/icon/icon-small@3x.png" width="87" height="87"/>
-  </platform>
-  <icon src="resources/android/icon/drawable-xhdpi-icon.png"/>
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.moodle.moodlemobile" version="3.3.0">
+    <name>Moodle Mobile</name>
+    <description>
+        Moodle Mobile official app
+    </description>
+    <author href="http://moodle.com" email="mobile@moodle.com">
+        Moodle Mobile team
+    </author>
+    <content src="index.html"/>
+    <access origin="*"/>
+    <access origin="tel:*" launch-external="yes"/>
+    <access origin="mailto:*" launch-external="yes"/>
+    <access origin="geo:*" launch-external="yes"/>
+    <allow-navigation href="cdvfile:*"/>
+    <allow-navigation href="content:*"/>
+    <allow-navigation href="data:*"/>
+    <allow-navigation href="*"/>
+    <allow-intent href="*"/>
+    <preference name="orientation" value="default"/>
+    <preference name="target-device" value="universal"/>
+    <preference name="fullscreen" value="false"/>
+    <preference name="webviewbounce" value="false"/>
+    <preference name="AppendUserAgent" value="MoodleMobile"/>
+    <preference name="android-minSdkVersion" value="14"/>
+    <preference name="android-targetSdkVersion" value="19"/>
+    <preference name="UIWebViewBounce" value="false"/>
+    <preference name="DisallowOverscroll" value="true"/>
+    <preference name="BackupWebStorage" value="none"/>
+    <preference name="KeyboardDisplayRequiresUserAction" value="false"/>
+    <preference name="AndroidPersistentFileLocation" value="Compatibility"/>
+    <preference name="iosPersistentFileLocation" value="Compatibility"/>
+    <preference name="SplashScreen" value="screen"/>
+    <preference name="SplashScreenDelay" value="3000"/>
+    <feature name="StatusBar">
+        <param name="ios-package" value="CDVStatusBar" onload="true"/>
+    </feature>
+    <platform name="android">
+        <splash src="resources/android/splash/drawable-land-ldpi-screen.png" qualifier="land-ldpi"/>
+        <splash src="resources/android/splash/drawable-land-mdpi-screen.png" qualifier="land-mdpi"/>
+        <splash src="resources/android/splash/drawable-land-hdpi-screen.png" qualifier="land-hdpi"/>
+        <splash src="resources/android/splash/drawable-land-xhdpi-screen.png" qualifier="land-xhdpi"/>
+        <splash src="resources/android/splash/drawable-land-xxhdpi-screen.png" qualifier="land-xxhdpi"/>
+        <splash src="resources/android/splash/drawable-land-xxxhdpi-screen.png" qualifier="land-xxxhdpi"/>
+        <splash src="resources/android/splash/drawable-port-ldpi-screen.png" qualifier="port-ldpi"/>
+        <splash src="resources/android/splash/drawable-port-mdpi-screen.png" qualifier="port-mdpi"/>
+        <splash src="resources/android/splash/drawable-port-hdpi-screen.png" qualifier="port-hdpi"/>
+        <splash src="resources/android/splash/drawable-port-xhdpi-screen.png" qualifier="port-xhdpi"/>
+        <splash src="resources/android/splash/drawable-port-xxhdpi-screen.png" qualifier="port-xxhdpi"/>
+        <splash src="resources/android/splash/drawable-port-xxxhdpi-screen.png" qualifier="port-xxxhdpi"/>
+        <icon src="resources/android/icon/drawable-ldpi-icon.png" density="ldpi"/>
+        <icon src="resources/android/icon/drawable-mdpi-icon.png" density="mdpi"/>
+        <icon src="resources/android/icon/drawable-hdpi-icon.png" density="hdpi"/>
+        <icon src="resources/android/icon/drawable-xhdpi-icon.png" density="xhdpi"/>
+        <icon src="resources/android/icon/drawable-xxhdpi-icon.png" density="xxhdpi"/>
+        <icon src="resources/android/icon/drawable-xxxhdpi-icon.png" density="xxxhdpi"/>
+    </platform>
+    <platform name="ios">
+        <splash src="resources/ios/splash/Default-568h@2x~iphone.png" width="640" height="1136"/>
+        <splash src="resources/ios/splash/Default-667h.png" width="750" height="1334"/>
+        <splash src="resources/ios/splash/Default-736h.png" width="1242" height="2208"/>
+        <splash src="resources/ios/splash/Default-Landscape-736h.png" width="2208" height="1242"/>
+        <splash src="resources/ios/splash/Default-Landscape@2x~ipad.png" width="2048" height="1536"/>
+        <splash src="resources/ios/splash/Default-Landscape~ipad.png" width="1024" height="768"/>
+        <splash src="resources/ios/splash/Default-Portrait@2x~ipad.png" width="1536" height="2048"/>
+        <splash src="resources/ios/splash/Default-Portrait~ipad.png" width="768" height="1024"/>
+        <splash src="resources/ios/splash/Default@2x~iphone.png" width="640" height="960"/>
+        <splash src="resources/ios/splash/Default~iphone.png" width="320" height="480"/>
+        <icon src="resources/ios/icon/icon.png" width="57" height="57"/>
+        <icon src="resources/ios/icon/icon@2x.png" width="114" height="114"/>
+        <icon src="resources/ios/icon/icon-40.png" width="40" height="40"/>
+        <icon src="resources/ios/icon/icon-40@2x.png" width="80" height="80"/>
+        <icon src="resources/ios/icon/icon-40@3x.png" width="120" height="120"/>
+        <icon src="resources/ios/icon/icon-50.png" width="50" height="50"/>
+        <icon src="resources/ios/icon/icon-50@2x.png" width="100" height="100"/>
+        <icon src="resources/ios/icon/icon-60.png" width="60" height="60"/>
+        <icon src="resources/ios/icon/icon-60@2x.png" width="120" height="120"/>
+        <icon src="resources/ios/icon/icon-60@3x.png" width="180" height="180"/>
+        <icon src="resources/ios/icon/icon-72.png" width="72" height="72"/>
+        <icon src="resources/ios/icon/icon-72@2x.png" width="144" height="144"/>
+        <icon src="resources/ios/icon/icon-76.png" width="76" height="76"/>
+        <icon src="resources/ios/icon/icon-76@2x.png" width="152" height="152"/>
+        <icon src="resources/ios/icon/icon-83.5@2x.png" width="167" height="167"/>
+        <icon src="resources/ios/icon/icon-small.png" width="29" height="29"/>
+        <icon src="resources/ios/icon/icon-small@2x.png" width="58" height="58"/>
+        <icon src="resources/ios/icon/icon-small@3x.png" width="87" height="87"/>
+    </platform>
+    <icon src="resources/ios/icon/icon-small@3x.png"/>
 </widget>
\ No newline at end of file

From cf3eb1399ef0b7f2cb3beed043d4e92243e52bfe Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 4 Jul 2017 14:52:40 +0200
Subject: [PATCH 062/118] MOBILE-2116 icons: Use flat icons

---
 resources/android/icon.png                    | Bin 49909 -> 29955 bytes
 resources/android/icon/drawable-hdpi-icon.png | Bin 4365 -> 2609 bytes
 resources/android/icon/drawable-ldpi-icon.png | Bin 1899 -> 1439 bytes
 resources/android/icon/drawable-mdpi-icon.png | Bin 2665 -> 1783 bytes
 .../android/icon/drawable-xhdpi-icon.png      | Bin 6268 -> 3666 bytes
 .../android/icon/drawable-xxhdpi-icon.png     | Bin 10543 -> 5603 bytes
 .../android/icon/drawable-xxxhdpi-icon.png    | Bin 15723 -> 7733 bytes
 resources/ios/icon.png                        | Bin 50649 -> 42924 bytes
 resources/ios/icon/icon-40.png                | Bin 1442 -> 1547 bytes
 resources/ios/icon/icon-40@2x.png             | Bin 2693 -> 3051 bytes
 resources/ios/icon/icon-40@3x.png             | Bin 4175 -> 4670 bytes
 resources/ios/icon/icon-50.png                | Bin 1609 -> 1916 bytes
 resources/ios/icon/icon-50@2x.png             | Bin 3373 -> 3852 bytes
 resources/ios/icon/icon-60.png                | Bin 1986 -> 2310 bytes
 resources/ios/icon/icon-60@2x.png             | Bin 4175 -> 4670 bytes
 resources/ios/icon/icon-60@3x.png             | Bin 6584 -> 7310 bytes
 resources/ios/icon/icon-72.png                | Bin 2375 -> 2723 bytes
 resources/ios/icon/icon-72@2x.png             | Bin 5037 -> 5729 bytes
 resources/ios/icon/icon-76.png                | Bin 2532 -> 2839 bytes
 resources/ios/icon/icon-76@2x.png             | Bin 5363 -> 6018 bytes
 resources/ios/icon/icon-83.5@2x.png           | Bin 6060 -> 6752 bytes
 resources/ios/icon/icon-small.png             | Bin 1137 -> 1237 bytes
 resources/ios/icon/icon-small@2x.png          | Bin 1946 -> 2143 bytes
 resources/ios/icon/icon-small@3x.png          | Bin 2907 -> 3371 bytes
 resources/ios/icon/icon.png                   | Bin 1836 -> 2150 bytes
 resources/ios/icon/icon@2x.png                | Bin 3903 -> 4439 bytes
 26 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 resources/android/icon.png

diff --git a/resources/android/icon.png b/resources/android/icon.png
old mode 100644
new mode 100755
index b98d8a19f2af338eb2c0985c3f2ed04956f519b7..23e0183345327729939a490162614ace2d77edf0
GIT binary patch
literal 29955
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
HHaGqktA`|U

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

diff --git a/resources/android/icon/drawable-hdpi-icon.png b/resources/android/icon/drawable-hdpi-icon.png
index 7cf11c2ab6f997b823ed206cece13039e92a5586..d20db6c0a097d65668d5bc6e57f0e4c81b4e4361 100644
GIT binary patch
delta 2442
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
Ir<2?eG0EYLZU6uP

delta 4175
zcmV-V5U}sD6pbQ~lYbB0Nkl<Zc-rlpU5q5xRmXqlR#kV;=g!Q2WZA^_TH06(F(ytV
zY$rI511Jef<lrbmAV1{+A>}O!4}3l#@j${G0z*Ioq`V+73PC(Yd`mHi1PsPbY{%<(
z*Xx<}&gb^@^mJF<dw8f@)wilYXLi@Ngs(Kyx4Wxu-TSNmIe+)wQ)fo@e*J@rD({pL
zMT8ht-T^een76tEZ};*JpeZGOt2=;9`Ti}o{x=tp)a%pe6o+UP)SC$H_5-Rwk?>{w
zaYGOUB$!Ji0Ct;U-9A9Yfa_3X#4)3kR46BS5h>~taH$^i_6HPz8G=%n)ksKV8q?qy
zrBqJ|OT;Vd_J4r7b%4f!sY8*P`;jSrNCyK~A^%mv@vyjkpl%JI0E7s`U?em#sR5nR
zwn{l*34o~v-vyvFl-n(Ubn}3OfoehsA(#+KMM*LPAV1DhNfMZtRzabq=_$gkfOK<!
z>Tn7eA($Gt(SE5?8IbWWQh+Hq1+YYGp!|0OHQgMf<9`9F4|o(9Gk_+6sg3nXBQ8>o
ztDMr+0}=0&{NM{vPAeu>ffTlL+X0P&V}?~Dp@QmW=i3;99zZESD*cY1)wF=+RaK1K
z2okEv1(1%pAwN2xx>=b~${DAu08|A^O-6+}3N|8nvxRwS2rCCwnw}G+KxS%?j$v*`
z12hRvS$_}BYZz2nAF!yjF9^nf5y1$=2Ap#ors8KS@1#rLBLmZOf|~poakmE2?107$
zxB|z>Sd-Jh_lV>WA_I}hL4aZv`kB&6mHnP$|IqT<o+WC`^WZrpD%Lusk_wX&aDee@
za+;glEr2u|pvsh8126%Oil81w66HS#q*mGQD}S2@j*YhC>YnvK85?cK_JL#fAm#P8
zaPiJHe&rEE99bMWkb#L6YN1pPP7yN#l7x6>hjauJtIkAHQIV7;r~Y#jK_dbq%0Z^Q
zx~p8;QNFind1=$~gB{DYwq>vD=%x;9UEU$1WSNCzj-P*UjW2yjI6H4Sv?ia|N)yZL
z8h<DUr>Lnx67Q4B<@>ERvCy;#>VZR6ldB~Xp&2WRW$RFQX;=8KYr-=d%B3C0X2){a
zcc2!7BLWfwNmGCbQA_(!Id^82FFv}=XD?a+x*A~$h2R~y^P6B(m{_2g0+M*2<Rm}N
zl|z_WMKdXA*wKcsLS&TKSlTH(vz74lwSN}hxn_8Ivq!s|(u^Y_l(|@F8E{UpR<KTS
zzSGWH+Nt3~7f<u6A8YVqXA0HiDh&5vqM(Mr#0F4GNFw0j<Q_b5^5XH_w26(_CP?9M
zMM#VyWUO}+{%vcKe}28e^Vc2iZl8w9ICu68%S(&A_`(Y~1)G7@d>l>(&35}1Nq^?}
zrH`%hg$Lk7Q|Y;g$OnYA*wL5qAPG!NbDtMND&YkErCKi{0n=18RY8M2RxukHlE|TI
zdHF`dKU`ntTi55g-iuk9Yx2YQoZ!^SRa$ckC~)c0C2Y~r8hmy6%yr>CYkcV^7kKo%
z#j2r?<R;|@BF5x?&ME3F>MW?sr+@c+hCreSMNsQdZ0@+lt3~|ENUCa@MMdKQ)z&K*
zLu?#b*5$i<3IEzY%k$a0k;OGG-oMO)i*sbwvc0{_`o=oz8yoCwZIfjgaS~%QTWQ`|
zN2AfeBrV7e*uRlsS;j=huY4VObU?7Z4(Z_`sYbYH9*q~k#5r->hkh67w||LUN*u++
zjd_S-&@3>uzyd-=PEnEU{n`gcKR7I$voV+mvcr8|Pn-Nt^Ionj-$$}^in++qY45SV
zzQOv&2HRWPbh};D4-OQYWu$3}wH9kF&N{5kXtw4M5pL}5((Pq*Q{@+ae39S$^cpSc
z6StOd{Vtt@F81X6NX~zR#(&v+iBFuvG?$Pl$pvOp++myS#s>Y3?~=aq@3<@9rkS>B
z&9CHcDziBQmxC%^QSZ2Q3?PvSfJ{DH8GFd}9$Y#7AnWHIW>4qX-&$wm>T7IVdxQP`
zeX=aWIYm{mHX}_lvMj^e3}+qAS)5ax%j-#_LBHQ;|Hch}sr*{kc7Hm2?x#P%?>uo2
z>G!{hJ8?JjAO0eX@BL_QVpB^ljo#K}ZhY&{vCsS!i;V~qHPOtX>cKb<#uaNS|M>_&
zqfN~B#UebH+{4cMAE&+W9<F@<du(6-0SAYDR2r<Fy@Ms|aMqGYhRZUn%imiMqX1;B
zLj<<Awz%@@t7K_P6n{lIG*yfknv(MVM?cHTr#{d6Km9(dKk{)}XD;OC=3Eep4EAo7
zC}QqsnrnA(`qRHb=iZ-T@2OvAvA0Fsm`Ag$W+BC?#SAyAiFsS?W4N+(k>v~bbK^VT
zAZay;;+PCWUzNTE3tYXC@fXkb>B>CnEH<-b){<puuB0p@%YUp_l*KuRs+Mq~C}L}K
zlgA!^oUi`zSIdEVy8wx1P){f%hpIzNOmFitTYvU>mik+{lB}KG%*HB+e70)1KIeO{
z;Myykk`0n*A#ccl!~zXyHVn`A4ry;W4qIn1IIkX8nh#Noj|x%T!(359Vhmf`+dS~l
zLwxxwU-qI<B!6Eb55v&{ngpsb)d@umA_lb?%~N->{F&dT{k31@#GGFr`N*Rd>#7OS
zkg+Bvo?zBkz(fhoG;mQ9#pV9VfEvLV1Cg?@+(6A7*gkVfgI24Bh>&F|y<U%AuTQ_%
zLwmV$A|qG}J2yIf_~D27gFk$dm6a8ob9tL1@0t%1g@4feMt7jP;HxMGm$7)^0S@l{
z6uoDkqA|aUx@@FcMo}80AgR`J4d&#1%ThjfQRWh8He1kK;?&6#BuSHA?~qQXgSEC)
zj|e1jgv(O)Q->qs=N|hgzxBIMvbeZ70~{f3U#I=Qe}mn62^6BW3oPCD8Iq;bBOxJq
zdkY_YoPYMSe@hcLv>qEQKp6rz3`j;DT#NkG0$xcZterW_;<<Z>G^5>aqngXu_}S2@
zBh4HKJq0t*kG^-FCmxvNk@Ht^FMS=o{|O)V7!RknbD8b0e}TD!%QWK#sFJ??cU*t=
zuQ~a-Kcac^&S6Nt-g@`@xUq5vu5%TlM)25Z1b>z33L-d3A&N?~3!mc&f>UTDhL8W$
zBfRiN%IlXe(dl&P?C*1Ma6qruBg;~fW{Z={EiRlEe&TN7p}QQX7A$>h*!j;tp?Urz
zG*|ER{>6;wi?H|flPvYG(mHt#m!_afb775W`!#m|<@b2k&wi!WLw^_55j9$vlXqeF
zUVkBuTPU`22uJckA$^;nHVcB`btNexhEII*lRS3vE_Qad+1%V>cXyA2g9A{<@~Iz!
zm%hQ;m8Up&dWpn1QjO?2L!302kG45{?LRyqt&Yz-;k3I4*Po@au!2kb`C`;5RxOQ%
z6C7OoZ_<N3lKB(ED)Mcb#nY&B9HmSElz%%dYZBtK7qKt?eXtIx-d!~j&Zio!uB@`U
zx)ywGK_YfHx-{o4DiMb+-$E276&azwzcE3{g6(W!vVA0pQCr=;iit338{65;0S&3h
zmna(S$!08L6R1Q4oA%JPJDI!h6QmNuNcuU*!nu~~8|VD?B6o^u{}4wW^zvb(YJU^9
zU)D!rvOPrYgaaIEGbWZITziBvVY4bYYmt?6G~abMI)4&pw~?q>yGr$LiAZ%@;NuHM
zCfqn3JM7^Bj(&5ra)eVSrr@b6rnQ*g@x{}AsV<e({gL`v-a)@^@jr6BMs6O|%>qI|
z(_H$pcoJu`stS%euKE+s3MZZIe1B#14LTAho%nV#px}bWMA+T+{J^<oToKe&X1>4>
zpW?aA;Q37zj!tXjX5kd)%yx1-?qpRZiW}JLmr%eo7xN8XnU3N^o-=pOgQ)uv)iUfb
z)1bni5_CA=soki8ono!yH>>I}NfWj&)7!j)X)gF#EF8=ck^+kHgo6SPXMeWor8LEX
z_>T4zr?~#O#zz!0sWHUR$U1bN`$r^h1Pai=LT2n``82dpk`Ca^n(bf08Jwfx=QBd0
zc26c<dh#shlty!o?7443XB!j6Bk$mBovT985YBN;tc1mEfD1sCK21J69@~iIaTn8=
zBfkD3bhn6`3#fBJwrOxTW`F5es5&VwGoylrz%cC7W>In37Bih2Piia=`U|mU&|XL4
znDUW;&%==kjSm9~23SnllB;P}5f<%er7Z?+9_2<+nA-UBrvI%*5wkUM*&(HV7iT0C
zs-Q5dqxv9MgQMgj)S1p_;J0o%d7-!?MWoGvnj$a9ALFB<vnohk;D39H1*fYiVNw%L
zYd$cTEN0rI>yUz`U3==2)p9Il@{(Wwpp}fTsUr+$o*?&GMDyjtEGy}{lP-eoGp5*u
z%cog==VU+?6$QY;dLeJW(^r=vKH!y~Zjq=lc=n_Wo}Z)M2N9faYvCY=L<ZCjpg0})
zj_}plvW>En<e!U)Mt{tB$DPGSke9N-K^8^n$Q3YoAYDvcZrgJQUerx(N)Hy9>hb}Q
z$99UgfHF}N6V+0FLk0Q!XyQQ|GVEUS8>i)%Zq5hQRHQ`~z506Tu%RK!!P8%(Gq-|j
zHVAhVV@sNt-B*yPfpacDx7e{@iQ^Xbjpx~Y`cH9bw^U#WGJi^-y+IO1d9W;S(gm!B
zF&upRFF9B|gJx-PKHwaZ%)$Ee#7QeygG~oC{?T*gD2DSBYbkhHw~h0UgsRD$f{2pL
zFJh8L1zedHCkC7L$a<Y>Xg6@ACW=W~i=)>;ega54ZCsY+!>K<QbV|~i$HdJ%>^h5r
zCOtSDtD@oq&3~gf;>|5tSV4>_GhFN0uBt9i4yvTn6cet)#7&yX+=y!r9G+TRQB7qg
zbI_PSk@qV!KMxNDwYIF!x;2?SN3jmcgDD^>K5s|-L&Xs}j2b9V!Z4x$)>fZ1R1{QP
zzP`<=I%~Cdpeh$G0dyGbjOA!~(o-N6nO*7%bId<e(SKSNevx@vC~5NbhQbrYVlPxl
zWj3pArjH5d=zyj{Ld%>$EzPW$HM~iMvFUJAC!?-23~Dg@RQ=EB#bXW5G0O4(Rzqu$
zBu@brqvdE7^?8CtmH^(=idjwvY(@ampk7?Fx=9{ma-)=0hkjcD1wF4gZhYQy&7_LI
zyO6-d27hEgC)?PNiG_Q?A=QjBt7F1BKA=kf>yXH25*Yz1+=Gb(%F&6}(6Ca0RRdGm
zM8k1>&aDMhgH-HF2FrXOvo1h+F!^ifsHe4Gg+lRCH@$FwbqnC!8bAT0{I?85;hpk8
zQF+HJ0k>KIs5h*RP|N_@&6(8g0aWRbm%Y?Lm4Cil2Fct|-BeC%d(^aFGCA4;@XZG_
z0aR&vAuK4>HMKz<ZogtmmFvFU0gV7P_#MD1KUAhoV&z*M@#Z#xx&46ZgDlijjIEO3
zFiSgnwBv74d2|2!OI-o8rs=$iK<eeK{r^F4;lO7t@B9a<DdinNQ%Zc4e7*m7MTGwY
zN(a18Bho>0>XV)c7aBD!Ff}bQH&ih&IxsmpGc+qOFgh?WJ!Pazlg|kk8Z|92H7znX
ZR536*FgZFiG%GMLIxsLyI2`wq3Nfo`1cU$p

diff --git a/resources/android/icon/drawable-ldpi-icon.png b/resources/android/icon/drawable-ldpi-icon.png
index 18cbb4dbd57479170449a148629a0dccc217526f..f96ff0b7157f207bece16835cc0b429d4e2df4b4 100644
GIT binary patch
delta 1315
zcma)4Sx{346pdPIRYU?oOjtz7B6*O7oflCMVnQHRB54B%6Lu4&I*_8!!b^lAMPVQ;
z8W?wK5Q`$Ql9r*iZfGr*y0ki2jFClxAhHPWz2v3wqaU6A^v;<%ckVss-j937?N6?(
zA%3(3hr|6bxT~#peJr#X+8&p{wH08c<NpDobVOB-W|gDmpyNE`I9uX`s_<qN-c&?*
zyl+i+mdhy#u`G^M6yx!;+znCU-xd=d=8?`x*B^+Z?BGzt7!*2{?CI$h$tJg_d(1#3
z1XzhT7Lq#TKv7b-<YOKPau^I2oet2bG&+sCn@fJ2PlO={7+MWOcw@2GrTtuJZ<<Ud
zm!@UJ$BV*3!`MuwF8}~^fWxBykVQn54)8%2q}ms01d+y#NDT}A%59>Q+*_5{SP2z=
zsmzh*N+gM~v9VE6P}Js4o4~NJ0Jc8^@THO|(f*V_4+dLK3oVa2u*pH|+-vLH1UB{3
z^8ALms|c<nFDRW}Hf(#?kaD9;p#LITtJs>JEEdKIdEBjAHb-m(Icx@#PNPx0ym#%A
zy&17h7`NI2vsj+$5p^J1?rK&#m`dET#C#r)4+;1&Q4x{B0fD|g0N_K<&dhpYc!ABD
zu<22&1vU3J!YU`EE(k7npH#UYE|l%b-J6`WQ@|H&*~k%XW;Z1JjD25id2|tJ0Fl}N
z^UYeT#f-gvhExGaT`+uT9bD~e8tCi){XtL9kNV3OZWnWg3W;bVXoY8y69O12wu4LT
zk!n9|(qNsRLNpO@$!fGc8=D%kz8x~xvJl7tsiI>OgGhY{T;Yk0^jjCEk!CJ>CLXC_
zViSL1Gh^@}Pi*)%^G{!+ZBkU5gtn$2hp9+?D6Ar2Q$}p&6*hd|y6_fl-3gbw!DS@$
zToT%zgPu=?OCcAuMT}lZvpwK)VQG(zRw+c=cHr!@@67cQ&n&FUc{gj67M!*<7Ny7X
zqHz^V-TCju`}m3ZHh!P;aa-^1-eeQ>$3#aagx<@LN~M|U*)MJ_l1MabiArVF@lu!7
z25C-))Q~w!!958h>h;Tgj3en%3e-}5^k{?XP=}Ythu7r?3h!>e*~|32!z3R`#-FTc
ztvRMIYpK6t$KZB)<xQ`s6#PPOlbc9SobSrzvhi1@G1s*uV)N8YQ<Fv`KjWhg>gu@C
zdG+#ly8ZhUc?InJ&-3S}X8i+r@k0|Y$4A#WtR=WPlGb?OiO%j$t}Z8QjzO7~EgQlp
zL4M)h0RV><!n}5>qgDTbo#5WHIDF-=_kf-B3vIjQ<0e;9b5rEBUwdvuThEfye4Q?K
z$JK6a*Cpus&6v8#@;D8ciyTp_HM%%FweQ4P8MuGYymY0DUvSC;k*HJgblMsCw4wgn
zRNb13cN8hw^XEqqwR)8+6r%ZTP$YWL`8Xke;GJ6S&arLPzDZj73E|qnBgM=KwYo<q
z44R+di8Bifh81?)fqp`JxZ+rc*Nit$xSVbr4!<2+=9QZ6eCuev+cKY~L{Z-2q3${g
zMcYr16&z3Pnw%vH`*frCFLkqcb@Rq=X2uyb%~>kg=Ny3(KvAqBzj|tbw?P!0FhZs`
zJBg(Z;#miA1%89QCi2#L-2B<O=X=Js2ip!!QE(-S%rr$7n30!dBb+~r9pcBbAuxgM
o4+e&UtU!Rp0$D7eXV~>$hTOfGvh2eD8tndYBpFh)b>K4g-_tl}ga7~l

delta 1760
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
CSx2-0

diff --git a/resources/android/icon/drawable-mdpi-icon.png b/resources/android/icon/drawable-mdpi-icon.png
index 85492e12e16b8441e4ebd141ed92e33cc578f006..1911c9d650d72df49339360ca9cd889164b3758c 100644
GIT binary patch
delta 1610
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
Ir;|7eF)zXjFaQ7m

delta 2499
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
NFfg*RG5wRq1~JW#w@Uy3

diff --git a/resources/android/icon/drawable-xhdpi-icon.png b/resources/android/icon/drawable-xhdpi-icon.png
index 408ce3ab19ce3376d6936ad68b18946f3d95e2ec..b87391cffceab5d34f58573fb7bd8ce238455b14 100644
GIT binary patch
delta 3508
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

delta 6094
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
UIx{&dFfckWFfH$WH<KX_F^X`n`v3p{

diff --git a/resources/android/icon/drawable-xxhdpi-icon.png b/resources/android/icon/drawable-xxhdpi-icon.png
index 68d01f62dc1730ee56a832bea5049cf9ac18278c..3bc10a5e21c3b39316385a6b269a4d697ea3807f 100644
GIT binary patch
delta 5442
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

delta 10402
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
MFibcc_mi>}F+*}7o&W#<

diff --git a/resources/android/icon/drawable-xxxhdpi-icon.png b/resources/android/icon/drawable-xxxhdpi-icon.png
index 5a73b291c3522aaea4ee35ff5e3485b212e484cd..91640a3cde59b0149d81fac28dc32024ffdf8876 100644
GIT binary patch
literal 7733
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

delta 15660
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

diff --git a/resources/ios/icon.png b/resources/ios/icon.png
index 2f5b179c7bcb63512dd922f0365f6c553dacf5b1..ddcce9da81bc300127e4696d9ac715f1ad0645fb 100644
GIT binary patch
literal 42924
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

literal 50649
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%0A9*Oj^a1PC&w<>w=PKM23nAGsl-C3W{*
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

diff --git a/resources/ios/icon/icon-40.png b/resources/ios/icon/icon-40.png
index 5f586ad9cdd475ccdaba27539004c35f6dea3c84..9311b8b3f6950d02e6222f7695ae36ff08649c08 100644
GIT binary patch
delta 1451
zcmV;c1yuT?3yTbp83+ad004~sxNVUkOAr7CVoOIv00000008+zyML2S0~db<07*na
zR9M69m``jJRT#j3@4eZb-EEhaLV=hDC`E!MBqm;r31~1;BNt<cH@z7(1`~+^k0u_7
zdhtMrF&?~_fEN=F-bl1YjS!5eM5{ttpeQZdKih71W@p~}JiJ-@4_a!$_Ruex-OcXz
z-u&M8e^$kBcL=Lk^hyJ)0j_@mt~9_J;JudMZfqjii)5b_pw$Wjx(o)q3yg-q09wF+
zq(YM39p~IJpc91vff5RVfboc86_X83B~n!C@LR=DF6DV<>l7l(Z&C{aN(L4vp^&qn
zA#P}XAIo#0lH=D(K;MXBa6&Oub6lM?Jh3Cku}7<D94U(Bdis`tf<k{#<g~-+gs7o8
z_fLthueWlp(#pkA7_D29B*jQdoTQi_<lX(2SNGfimy*~VN`sHcW=uF(qE+VsiZTSG
z7>O9Jm*^eu=9_94gLVVDSYSvE07G<yLaHtGMCj?r^TA^^_H@>WV}&@4PO9Ki52O@m
z13?jj5X9aw=qx~uBS?QH7^9sZ*vA=pfZ<XriLTKyKFsj-exm9q&N<Q~MQcM?2#J%3
ziP{vlSVOEs7s{yay{PruAzy+dLdLHm*Dt`>6$r~<av*L|K-C<#6hcISKi2Q(Y`B;H
zF-5g<jq30<;)xNWD8^cgbrzeZ#Boe*a*`yDsn!!ru0ZeWTj_u5Y{fnK9=c;Y(?utH
zua9ESpTeGg2cmJv6&HofET~YfK~(OcedA^xzx*k+D5a5iRJOEmvay9Ij<IP%BW_@=
zC5~f~M(ht(9pUhix9B=_1lOpe^F{AQ=fDJDQ&1WT?U+YiL3i&X`Q!jhjbxUT#Q+6|
zro)ZUSvd_8KO=u(8I_Nzu!)bVMW$+XO2r~dX{IKsq;Z{wRn!v2%ZJ|J$k8`_dIh1k
ziqgJ7rZJe%$Duf|32O6$1Wz9$J@umh4ZFAn5y9#J8?@p~D^S2lfOEpO`!-XTJd@*N
zRECGBJ42FN$M$s*FFgbY4?T}l8k|Kb<>97okbeFeZt#CcROc>&XHTHkZv*Xbsdpbh
zZQO~BUC9zh76Qbd(4{DwptGhWX-wOOE)KtNl)j7o3|<+ao+ye}d+8bP<>4(tIlfHt
z)%yeoKlU{*v!4C#IQHCUsP>JxU%te)9V2+|!|9j{%h1sSm5V;RZ)3%vX+WGsg>9%!
zyOF<tf?R*eyDV3rd*}Uh@7(3fh7RD1vv6jBluguKkznMKhtt}}9Uwz}sA32vhiWMy
zmA^7W7{KeOT+w%%W**%_^i3D1F>1pO^scACCf=exJaNw9oWnYY1L7#9o(5PnM%^yJ
zC98KXgO;1OT8hjm)C$_VK+n!Bt#!7uKaVjArS5;m!{7p@n{7b>lSjrbdp9l+v`zK@
zOFW<m<U(ZR5_0W4<XgOZR)I_pZAycUapzBxb@^2x(=jLlI*$zZ`D|2XrP+Xa&m`ho
z)7(_EDLCt|rrz9j;N#b&(+8fpPcx=%>My^5#nO8IJUBBs1Yd4$LN`l=nyu5ki4JJi
zIIn**W3T2K6U-P8G>c{20u!}>F@6I1_ITDyE#ykbjX$U7Iuk%`2>bns={YYbAfx@h
z&q_8hOlCUH`n`h?85_uSZV#yz{&!1(q!3kSTR3c;QHp$vB%Z5Nh9JKLoh4f^v!V*1
zrE|{LGbdv4u3fgye*(-lZwCH7*O@P?r{I6B0j>eAQdt9BuKWuy@^ZJ5Y8t2j001R)
zMObuXVRU6WV{&C-bY%cCFflhRFgGnQG*mG%Iy5*sFf}VMFgh?Wjmqw?0000bbVXQn
zWMOn=I&E)cX=Zr<GB7bWEigANFf>##GCDLkIxsaWFfckWF#MNR6951J07*qoM6Lru
FV1gTepBexF

delta 1326
zcmV+}1=0G845AB=83+Ra006rnNMDg5OMe2&P)t-s_<$MtfED<F7Wse@_<$GsffD<H
z68wP@`hXJheG}$*6W4JR!)O(`Wf|yt7W;t_{DBene-q<(7Q|~ApIaPzOCDW3A4V}B
zGbkTIF(jd0A@O|_+;$qPWFvS_D^ETyHZd(KDJmr;Cn6#wAtEGKJtoI(9Q%L~?|*$2
z#d0Q#VLM`0OITM|RaRItGc_+RE-Wf4C?+Q_Dkp<cB;|P*`F|1le-HV75Bh%)@O~G_
zdo`1FT6J-6ZEkU7WMx!SR6;>PG%_<RDl084EIBYLtX~@Ve-Qb95c!ED`j$NUok{wY
zJM@7V+KE7`k9LTOigkK^WM*kqRex4WN=igSL_a=1JUcr#Ha0RaF)b@ACL|>@C?dOa
zGyIS*{J)9*=hOf7?f?1o{`Ktq#+Lbj5#^0M(4u+2j$^NZR-}1QlW|gEURzUBR834x
zNJd6OK|wq^IxZ_LDkmo;A|psfNZ8WN|LfTQ{rvy`|NidZ`=(m?j4S$*HGlel5Bh)+
z-+UrlQAt2QKtVn~IW{;kEiNo6DJUi=LqbErz`*|P-ujg~`i(65k~HOgAZ}t;U}0lj
zTwYI2PC!0DGcq+YFE3(9Gt0TF|Ns8|-NE~_a{IM*{^QI1z>E5fEBcW&@`^0DtD%yU
zm3eu3Yiew2T~vQoGP7wW>VJC{{i<O9`}h9r-1?C+`F#!feGK}SKK}CN{o1_wgBkjd
zFZ!B8{`Kwo`ug$l@$T^Q@w$oke-ZkQE&lG|{nWAfffV_K8U5bD`Gy|(eh&MiRQ$Mm
z`j$Qa_3r$>i292r{_5HN(5Lx=75&(?{^ZR0haUT^X8p{d{n)hoq<>fa(yRKBGyKSy
z`GgqxgBbg$UHOC>`Gp+)(5U%<6aV(_|Mu?x_woF>fcc6g{^H92`11V9o&D0O{oTL$
zh8_BsKl+O(`GOYulQ;T~F8Yu#0000LI{I4x0004EOGiZQR=$Ic00009a7bBm0000;
z0000;07l7cJ^%m##(zmfK~y-)V_;w;4lpn=69*VrMiqhqD;qmI2LXkw?Ci{(T--do
zd>nWb@(TzG35$q|iAzXIN#j(=!7nHyD<`j@sHCi-s>X`TY7TV`O)YI5T|IpRLnC7o
zc4kvEb8|CO422e!R@OGQcJ>aA`cBR+u5Rw89-dxa-X6^EsDBE5eEs|b0)v7>Lc_u%
zBBP>XV&mcy5)+f+lf6xm6{e)7rDtSjW#{DP<rfqd6_=Ejl~+JOWtAzCLig&LT8_H<
zhQ|D+=9bpB_Kpe!=<ISwQrO+&&Ro~q*FRz6q{&mJP6H{JK4a#r*&xOoWQB9*xih=Z
zU$Ah|;w4L$Eq`CJ5-7iF^_sQo)&m(EHX<q9wAr26%yY}uZQFP36tLK}8z{eLFEjJL
z{XoX-11WHY2M--KXEr->6exVmoZ0mF2_WMnQ0mlaAmhwgB!%bBGh<bF0bSw6OQ(oZ
z=zjUiRiYF!U%P&TIEBnN_Y$cvg*eZE0h+>Fw{a@$>QTIN_uhS=!UqrU-F@^JWa5)Y
zckexYhNh7DhWEO4&tCvVU%mn|UIRsLzj?lHUC&;OJYxm~;6&vPWVoX+aAa5PU{oP>
z6aoO+LkpgG@+fJOodp*fHZ3tREiyG!F*!OjH99dgD=;uRFfd8nk=B#W1s5hZEio}I
kGBs2&IXW{nIx#dWFfckWFgSrJY5)KL07*qoM6N<$f^z0}KmY&$

diff --git a/resources/ios/icon/icon-40@2x.png b/resources/ios/icon/icon-40@2x.png
index 7b1f2478c512fe5b3e2f9356fb75bc4f049bb909..63f826ea1bdba3a49de28ff1061cce1a1869fa97 100644
GIT binary patch
delta 2933
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
ZaB&Ly-@t&6Pr*L`NJCW@S*KzX`7aY1qdx!u

delta 2536
zcmah~M^sY_0;P9Ef^<X%LX(yNfe@ld2MG`%i1aGG3CX8eo(a`RQHpdaf<hn^=>(~w
zpN@!$(#r?rYp8-$8PA+q%wo>@cX!WS+_JgfgyRLDWB{Bo=0^IMs404$Q;>wc=)<nF
zVOP4#{L(=>{H=MuR`A~@NnE7n$~@8&EwaL8skg>VmE{J(ZvIN!*Z4so<Zi-SZa%3v
zjGZ9JtWmHOZIoG--8d5OEG}PvasH<kC1P}}uR23BDspyM?hlWvLwWVSk*fuvzjU&J
z)J(UjQotZL$2ygPvoRsb?M!1e!?V{?dD9VE<?_&4x4t{+Et3q0JK0PbBK=P!{T7``
zIngYqB=hL%L)*G@5)0&#A1frT3!Il2886gvbqaF9a(>3I6Crk5sAqAHO3_k7&u`oY
zXh+f5rjbu=9!%M#{^rj@;}1z;CEjqSE%+OEc!M9@{`|}9z0Rye*cNkzP9NG$e*R)a
z@}5;~bAz}%nn8vreSx{}F#Y{@JUG!;K%&rM>qDsriKYKChPl78cS3EE3QnJSBRkaK
z#o9Tpou*Gi{csV+TTCzssvdEss(1rYcjfx-epIwli5Y&@!zVGS2!Bi>Adt-O6fN|u
z{zc1OQJNM&Mh_Wl`3%9cV6wGjrW6HIFA6rm&RuvCh<H!Y5FHibDJLxzF#FyK*an|;
z2!tKY^OrBx-!6`Q_3obJbQr!`cmd11CqV~^GzVVqk10@IJ6J<qI`-KqZ~#!~AIt?!
zf9)2Qk#C2DoRhblJM;gnC6}(aA!@lhoT{_&-Ie9`$RNcBPmt~=Sl+2<P1W{ghilRX
zP^@98sm=+O`Nv;3-Nsf&iWV1oTE27vK;N$aX-M@@<klX2u%*Rnyl98k*cu3G1&56K
z=%B?`N7_76g>^a2#%GJX0E;t3dpqUETF&#_)!|%?@6#=5p7jr*pys<n3!;XI>7JMO
zQcM%%M9pX%&H~YUe`J`blybPM@=4n}6;G~=P?Xt~@}sKYgRFFUz41O@+FtsIw_+Bt
zKo7t#%UeNobz|Ks-O1e3ohuTPEdv-L7GYTKygIwhrS=SQu;>EFZb+W%9X%Kfg|oYI
zA&#G(K+?tIP?DgFi`$O;mmm9iFu8OvtoYY`IyzWCLbaEjEc3%`0uC5sUsQ<BwK%~Q
zbQM>dCuTodsINoyw8st(-~s{y%Bre1RX6KLm#Sqsl&NgD0&5R&aNj%B5`{{Pm{*)l
ziP?FUip$g<bRw`4Pq}{2zadRTz{IJYy8)-|bL{FJC7*sN4kItJ`C0<!&Rik%p`R1G
zbbn@BdprX$79LF~8DFgkQb3~v!0_Pa@J3(l{!ZO)3w1s1q2K-)85x;GkA5;Q2b1^)
zdx_?ns)a3Yq6&#f>T^s?IzJhJ8I&!E*z+nTvEY}1U0svI6@gQ1N*5!u?$#e&Np0(l
zW@UN~yoJWEQr-DZ*nW;~7OT^!e$M;+LYW4oY0QOupqa)*lyu+lfvIyr-b;+47iQg!
zW;#ACFxU<r__U(qd}XQ{2M?^rm5d^Y@l4CUV>aZYz4utf%LW5&&g^LqcFm7E+l7CQ
zUV;El8~SXaUCm-*e4-tNZ=V+}HGl8@wIctu|3z>{YxOl&ByX!MOn>ff(ZpTAJ2655
zZDII{%TE44s5&Cq{&h$A1Lg*9V}fIf6bDB@Px*au794)VrV%gwTC={&&Aw+Bxqo$E
zBu($vZE$`c<+yS`j%Xg22COmkD2<f}r!@k`p0QR&f3ieiC#_`SaabX~Sm>UN{Q^E4
zovPklg)nNvNOKS%px8PUj9oG`i9@<Z_2Va*&E+>0Nn!J+KX<=JjHQpQP04Khofq8B
zz4=&;zvBdTdMA}Cr?no>x);945b1xbTb-HRE;$>Vi*g06L`!}NVz0z-F$TF;QUMa?
zei3PN*}f_pky8GHu#Mb!6DmB`wS|<Ck)avSfqbS7bLwjs_fLrx7RPyfUdfDvmzQox
z1z)hv^j0^IwB|d!C;U!?)M?%3{7%jOiPU#SV-}ebKl0es@I%#o<OzrM*@C}`R)}--
z`l&PmC*mT)zWrqGM%mda^<s+o0zf}u+ZZ2OM9Ujo(BiL9>eNvrk7rrd(W%pBuWS#p
zxXNwT!);cGwh3ok8kz%G_GvZ^WIcIMhL3jwhHPCTe0$6OnFb{2o<>#(8FJ=I4wKWC
z=no_Z_+Y1<JTnPADJAl*?AtYo*Elr_lya<O1tjxLOyKrA6`4bm0kCSIsUiZ7Tcqk>
zcwE&jL$yZy_-1r5OZZ<6$z?(dWVZ#j7SCqA8An(DgavCogS0L-IsQT0V)&!!v%vGR
z^*`4Ziz$mPo83IKkFIPV!G;3=bso)~UhJSiLhO9g+9`bBHD>zJ*s2K8-xjf!oBQ0y
z;|~7!+yydOs0mwmF9)z3G$i;r&!vo3C8cl<zoWcCpZ9FO^0{N_;qw#mnAJ-QvbF7N
zZ0MQ9+R~z9$=4pfyHh_?O^BUTCYQ>&NX`6gg7?mkeZC1wNv!Vsjcy%N@=eNxN1n*^
zCf4E2uK38s`6Os|_}zAF2=wb;iGFv)*2O|px4tuSoP-I5!$80s&zr3f3w-)I*K{<_
zS;>;kfa}Wx@2H?d!ULX7FW!1+0v2JZn*D-8$*;MWnp~eVC~>YwHD5$<vM6>ZXxF0B
zP<YI+VUpDFwfB(PWS#Tpw{POy7~_OUPm@Uf%e0Q}#;eHz2LWV$rq5z5S=6-;0acIn
zgFA8bX^2{gG8*8SXc3Iji~WllVHe<?<zU_)ii*zX9^RMA4f&I|28s_%q-N-=#bayM
zOlCh=i(5`zOMK?jdm6MEkR35H;k+<x&H&DJpoiBu<RN<rRuW7AzbBs8UwK>vdnAI0
z2JiTt0=cUZi-Qsyp9A9pOFf^xFjlK>^#V+|1!#0KKz&uX8sV`$UfH)W_MS<6e2TdD
z;frmR%P7o3;wJwiRuiz0$kSWyMpN=(^jaf|YNKyF$+5ytwQHtL4C=wviK7Y<0&;HQ
znzx(8E>b|geG#zhw0xr|q_m2?FS%RNJLYMR?vn&BWBpk5m|qv`9xU7DvZ%uo$|!zd
zryE${Z$pLOXR4qyafR?>Ze|OaRNQZl-GSV&!3CecmHqW5WH#_HBp%Z1_{sEUU6hT>
zH*lCZmABddX<IdFlxVfm^y*61SGDAu1~c5I|BdR2|DW9dK!pF(k45^dHWWPF3o!V&
zd1yHd=zPey&n+ybr2>VjsKYQ&9fSr90o7E3KoAg!`OH&lMh&;H-2a#1c*OvQ-!M0}
KGO96fC;S_-<-kt>

diff --git a/resources/ios/icon/icon-40@3x.png b/resources/ios/icon/icon-40@3x.png
index bc5c9ba0c204fa144135942d28c75b9c3abd5a21..8d8da6199853f4b7f6a4d654e4b2df197919d252 100644
GIT binary patch
literal 4670
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

literal 4175
zcmb`KcQhMr+s9+ari!RdjoOMBjlFBDT}4DoHL+sH`k_L#)F@S>rBz#FQ!_R-s?>@d
z8hf@z36J-E|9a1Pp8uZvoa_Fa>$=YOpZkyRxxWeKruy_Ww`c$W0KK7sj^#Cj|EGYI
z*SE48_{TNK-8D@#0f4Gx+6ySfbx(q{)Yk%3j&N;UH+(PyOA`PfR2Tq=iUk1vUXP;I
z0e}D*0ASMv08n`g0I>Vye6@gFFDPA&^mVRzea^I-Bd<a2V_=WGrosP~-oP_80Dw`)
zP)E}$cy=fEA)IR}B&z*tXgjyr=!Jl!#V5CcjMZtq8{+l&0vp$l)Gzs-x;7?_-}K%7
zd}p@6JKVs6T$AS=x`0tPkyMiA=DPO#Tk^WjsccP+{e=nm>DP`p!`tGi#tG?$hArD~
zn&k)=;cx9zQ>AALyA%74ND?3U1uDxCvafQka+KZg41Zb3&zm6O7lHy$wb->e=XYZa
zn>OO3NetJ7K{fMKudACrMYEWSDJ}okkkmd;g_#HP9h7oscCZ2x*d=Zly>u>%Ce4rO
z(7bo^7Kze9mP8!LFk?*zxI6GrdQ8k;LY@@bB<N_*Tv<zpl!R6a4K>7yBcN3<%#0Xs
z(=frzyWK#FwWYN@liK1oSQ}a;IMhJT&KXDhXZ_4_+^0!Mq5?R~cf;$E6>FJT9-+oN
zELJ2bF6_x>fL|}-WMkexu*HSM7%pe!K^}Kj5B<9A`(%b-`;BKjpeyWw-6n7cpjA{%
zS_-`7OlRR1N=hk|CcWQAX5AL-pMd{pyRXaA1oZBsc1koC^6B)Of_>dUhAMZBvdiVz
zA2v<MO9aK57B`A=eN;$2sFD64+Wk|ZTvf2sC*Z9<gZn8_yM{|l!ROr^YsNh-pPPj*
z1mv~5jK#aejg*~Q-Vr7&<BUv__1Lx8e|||ZMoTXl=O{grJ~WYWiX%hCoy~EJhk3eY
zRP!#$&(JP5nE2c*v9NZa4Icp?=Gck)x#o8?Ib;;F@?#h#{t?p?$oJHkcllXD+T@yW
z?#;cznC!T=uuMUB+er!@<HBN_JNzB*SkphsCf0&6UkOt+`bayeti!Fvl^-?!%K8Hh
zU);Q)wOWWy@Zn^l@#@2b%G59JM&u_23jUq&qJCPVE=aS?P*!N3gTBv5{)lV$@&vTY
z2l0EEa{sP<(ssq+1a|-rN4qhWc9GShInRWZi(W=ll7K9=UlTEc<v5n!ZC_!DWteci
z-Cfc%%LIe$e%+Ev;%-LoMVz3F&D!hpiDFv59`Sf8WZ1#6@~+raRFM9gFx6~<Mq3i8
z8HhAE@TlDgr8EyJU<P_hZjw$s|8T!VzB{iKr4+nXF<0%*_{J}*r$^Uj7ExgI>1xo*
zTDBMFTH6UjljXgA_e35SV*6sp_W{L8w-dDyWHDz+q>lPCPS=JMP20RA!LbN~!_!Mj
zh{h%+mSS&;e|qNJLnX0@nBG14yHz_YNsf*Gy?9xg`i*dh-uiSY_|@o6WbXZ5*To*c
zWnpS3)@R=!Q?sLHoM}Vls~eR3N=8jqE@2k{s^dNPurRJIiOeU`zAN3-QcjHq74^nU
zu~7x3r)|kK3_JRjdSo1he$O4H^jmH44`~rCrg`cido-x~UYKm4?_|Udb?DY2Q!C-!
z&acm_blF&X>fMCa&B2!M%KgX+vZ2}|CF{5{-DA`3$DV#K?iU(=99z0LJIV<=xP62?
zs>LC4kWm7z`w;2-^$X=ui=@{3VekE#qE-5Sbdo|r1wd!@H~6q&{OBISmrxvz8rUqz
z=#bX%RkWNzTM4^(a1F5YH#{?`-qLVqM%3jiCr<wQ{#T;*i&kUx?(xJ3QyV{4wMs$K
zSD^8gyR8>&!G@!h&UbW7bsN`^>?qauv&>c*b!=;F=Ir9@o5BY)XMa4{d!*4}uRp<Y
zi;m*(4ANtn5Ll*LHq)W3yV6WA&}k-p7Pf&FYCFWTo$OKDP)UAa7FVl22m0;v4`HcN
z4nFpOS8}6Sdc1JS2WS5(S*wP2ieL>|R{mZ0{zGOYi6+@gXtS=-R#`)dNMd+o$C5`1
zffdE6jtqJrzD>wbMP=no8wsaDy}Xi;gb`UeIqg;_5jyQ0<XD$OInwS~)#OS}k3Aa6
z_H2Ihe4?T?@PH!U6z@(2eD2D;c=B|@)4w@aX<dQmrvv9?HO)DiEAo$dN7a~crR`E_
z|2p$fs~L3R2xkx=Q0nPTZe3d!WvY%oZ~uZHxnwMt=qqT@lp@o?ECC06;<R&yB3_T=
z!MJ7`-fKyHyIA|y^84_c<Gb9#1rL`lCU*UlZbVw?iq)8%%kTKvxje3w12<h}K@eT<
zTMtM31oCG$o1jeQ4;{K4IQO(IUgbTW2i0oY%L_U-o(DBG9NyTSXaHd6&O{fwoV9ux
z7Q1h-ev*IDLV&%+@pk5(GavUwCbu2q8|$b4dh8lu1RRfxg0bz%JyleV#7daIjYEzq
zDkCe){@t+fh;oZ@(xA^11yaE(-#?tRdjTk`sS#TpCbv4<Pi1>e#~dyZUU_mwW;NA6
zoQT<54f=jl$M_H)MxHAZp3n<M844^!j=D1O<e{_P3&CvL>MYV<{rV{hC-^*~{x<T8
zZvOA9sT*WJ&@MtUx+6(pAip%o=|9c(5jzwa?w@C1k_~h*Wm;3pr0&4-@4jmJ0kzsd
zEh7(Y6_N>+`=Gd3Xgs~7Cdeh`H6I=DD+!dT8&_}=J9#6H1YGMM1JJCRgd$FbRoxQ$
z>ZcIQ%iou~Ab%zZ9P@SJD$B_cLN7i$J~g7Ti|gIzxugZDMG+UKK7>Cu5<20x>u&`2
zRYs6KxFs@P&eV1|HOEnl-?3oj6jLJKA}@;;d}qBZ@7dtI`|?OSGpQP5CkXuN4fnRi
zxo|c#v~HqyNLoF14Y#caszbT9W>mqw56skut6+VT5m}OO`{l}&$NOsgx8t!9=ik0R
zh1&<r+p<cEa^UnJn%gwO@EFReJZ<lc9?wjRDZ~RQ<wA2&*Nm+)L`{5@Y`h+Oou($e
zDOcQ2n-GOQo7Vd9M^|5iKD82U(CD)vclB=~Y6sLqU?JrxwgPN3p#~%Wia54dos!q3
z2P)5AwbdXh2L6Usez}Wk3=TC0XY1a+mH)#I<LMt{NdEFYf3{q3FB$nyQT(p;78K-)
zIQ?wV;^bB6uvWDgk~124Y51ZC5kK9~dHR;>5~xUg@cV+XBUtfLF_J!p8hj?|_miPT
zaP(v!!l=mvd#yx$1WC3m(cyRQ7<DseZy49qU{Wu*4c|$%ptmjCt`kivKuxWC@q};7
zw(UQcmVrQ8HYk)tEoWbybnvo_<i%pJPfpUPn99diMcFZIvcxn+Hb!=nK4$*3fxC`8
z1(qeL2Xe7cg9cn7Zii`Y?3VkuFXx>2hek@w*5)q{9r3QV0Yf!nH%r*x@#F_mnck+<
zO-w5EwK%}RYe$ai9?tveL;3jr)$sM1Jw)iu6KT5y_j39OSDKr*bsVDzXI5x^5C^wV
z=I{-2{&`b$9a{tAN_-%VYi$1g=go{sM<_G3;RAg&LokvhZn{}=F3a7g{Zu$~&3aub
z`qUhxExdqkI=2{VgK@H?i^Gy2(W+O(%h8Y+_=nqIKMk$kI?>=HZFI7^RAv>_plG~F
zSmhiS4rv+z(LBGA24m&Pb6m#bzxX^OE*@;2bX3MDT8YlKL=$(NSDgOp$*%&R*?-B?
zDvFFnovH69U2!agn_d0oA6CS21p^*}o=>is3>TlXOX#G%R%~qR^5{30O<tw3bGN0^
znjH0wkgGIFrI5}pN*|SzO(nD)Ffb;YBK4QW?5n1oBWVB7oWB2iub&=Kt^<!EVi%W8
zFP=d-_rC&nxZy_u+j7p@F9hG7sHyFHxdp3Rsz%lSvYYzTxIxE+z44}gK-S~DtTbKk
z^JzbtXRWX%vr$IXq}93zx1odo0W|>W;eTwQr75sSVb}Ij?G2IwQVo*ql}Q|39#VX+
zR;cb>u_};#0`n=l;yl@ud)utuluzo*p4ZoU>ivvxk<kPFQ1deUnD@0duU=d)CC(xO
z$dRSv{vJ00d4>_2txI6L9ohlNsujx`1TsQS`FA6W4O*RG5fORUt|s*;H23-QG6`wv
zad<rjn$DldO!HizD=TUqx#-^M>?UUGE-_x<5nW8LSD9VG&m`|#bV-XO^eIlLZEoyo
zpz_-tyMos*q`xPQ3I>J2G29%ygH+Sk_Un?(2hA~ItQQ<ej>^P>@*OHHD{Pd*ly0pD
zjZ|zA^w^UKA;DQ(3nkv2k(Vs4&A%t_tmBB{e9Zp4thIGA!Bzne8)sPP(%s1s{=Y&%
zRx*5N!@N@5#ux`tE9^JDd9<bs$AYJFwQL+5Yy{2@?*cc6@o)xGt!Dsd9ik?0(23gF
zZkoU6mD#ZHKM+v57yK&a089+@y$a{CcKa>*t0Tt3ZJkYW!c*})Z<(Zfz=ceOxQKTW
zD%Qq8meAxjmC^K+7hFpr@Ib|<QKl7q=exRr+&Y2tV7vT9CeFt0NAZ;6F_EUI@B@+)
z4vBUsJfi4(yNi1A+#%0?P5-n7_<Rtj<Xhif*w=u}%sswi$DgJ@i2BH@@10!Tk<M)v
z8I6)-I2t>xq%+e^uo+A$x&nf;eipy^0dg~XIL#oEE-BikM$s3P;+SKwT4qq+sG$GW
zt=`2_KQfvEh{ISWM~vL$ufbL=q)QfF0U2z*|8@NRk)SR7-eznM@OMvmh9UG!9^eYu
zr)t;D@Z-K$L{B-9UnBC7nKMoEVtbMcI!Hg(?sEOwkNrcyJnRb`iDi}xc_ieVwcr@1
z)0w14VrNOPKDX-+49)J(Jq=9i{Wgy6Vlb#cG-9W3{f%77QZ_az(S^BIE%6?4N4`B2
zjrr#uCBw-#?_TklppMkn=?#y4u&&?5+h4Z*;A3sU&rGYT2Ru~#D7Y49pe^%%Nh|o?
zj4yF1J^NeI7FAIT-he_R$I7SE@ER4_bLF=x5PoECY`wVCsQY`!%2Dgru3qr{-U?!5
z!sRI9Xng&j_A)>1Vu3e?ZikoHU9E%<NOgVbtFVsIkp9a>jX1B3b|&2q54v)%pz>JE
z;!RuD`^_@v$&B?N4f0k$np{-LRXBY-#yT2BQI!H@o|%3dbYa~?R+F+fH@%76IvK5b
zV_n-H;9TB10AI^|kNDF>Z%Ky>2i(av`fo<Xf15j#c!`+{={f@YS25G`!dIwt&+A|<
z<gaVz?*{dMtOE0Ud=0=|8CkHTtgPf+1uI!)6*&bJSvheT85J3sm#8mx|4)GMc6<6H
X<Ub3D!tATp0)U~esZOPqOZ2}0yh_kQ

diff --git a/resources/ios/icon/icon-50.png b/resources/ios/icon/icon-50.png
index 810b1fa020bfa79229a708ae71327cdb533b159f..02f6868c01cda721ef892c7ea6d1a4f6a390827f 100644
GIT binary patch
delta 1789
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

delta 1443
zcmV;U1zh_44#^CVlYa$1Nkl<ZXx{CaO>9(E6vuz(zL`#EN<W~jKr5gH>$gUfun{By
zC1B8v(G?35T^ZC66BowBg-czVxHB$Xxez~yi3<~mC?w)135W%>^uy9lJ2UUSnK$p=
z<6?@nok3@W%2fMLZe}LAbKd!#d(ORQ?nv>qeib4>SjtL(rGGM(w#@Z*U>Rf?q{+1m
z(rj7=X*T_9Aj0DI4vA~-tjxWtf>VeU!Wd#Tbhfxf0lF%XImZ>JLSTjIqA(s9MtsA?
zf-qVTMtvcc6p!Dc>|K{b(CZH(fDy$Z6v~ESKgsFoB&VhloSimY%)?X&L0O4nhgD&)
zH_3tfB6juVF@K8y(GZA1K_DL|IGay%;!=jMCsLfxd1OPSRF1LMqRyhuVV#mnCfGG#
zc<$~3x3q`2#bKxq#88R;#Znu`vnx3^*~vLSgG;v2aYF||?kAK0&j7PEVFgxqB-wvw
z%u@qd+7t1jLi{Dj<-9*1b#bh)j&F;76wFFm*0!=i9DjbnC!3wZSvyy}3L=J7D#fn#
z0sA**NqIU8q2SzXbUZK#KtL_H7}SB7%D5IF6#y8ghi|x>Gp&OJnGVuXiBfiw-^NDB
zX0wE0KshQ`(n$eTyo876c|^q$hfXVPq<HqOfE7talNn^~X3YAnNcTo)?WzDpKAImx
z$9_PEPk*4<p*g6l0m+$_40S%p*|rB550lJHPI75{oLnwPxfEh;OgfV$*^<P@mAbIb
zQ7RS*gOF0Oh_x}172X?K#kQS$*qS~MTb{w({wSo{YkQ&&ow<nn{(ao>x6%A)Loo9|
z6d~7n8y#zIVsPXO`uu<prPKw%3ixWWlhGWNVt-a})?v#r<v6BXiik=@R2?9QI3C%v
zmwTRm1tUdh>-lTP#2{Vk@V32x^l!#~bP%2Txo((wAflEV<6n^}ADuplh*#Mx6H3ub
z@m;i;@v#tRV?;q!vDQ*5l_-~^Kavxa?GNqX`4^t2t-S;2Xdp=hGq4?YzDoST0Vo%!
zr++7?E_RbZQ51vzVL&iONGCnIR<2@2CJjIk1o(vlB7!=lXd_ZB2_D|Lg99(UOn-lW
z?JV*q(UFr-4v^m4ke*FdkvD_8F*j|)o&LB|OAUiuK}H>Yy<N<7-AFMkkei;tS&Ov}
z#G@_U!d+`U_HFQa`2J}+S7mBL%nV}>y?=<ia1@+H+WYW!zmB<M-~5TmR%BoYoH<;V
zf7Kw))>ul#OQzWO=#$)O*D(Cc1tumY2!jw4`*aU~%BJKLgY7<Di6T05828g-n0ub6
zHvi)XxU-*uF@T`c=dfSCh1s~HY9o;D0Z634M*N+sL6RwCMQ?Q@;U&1CZ#}E~?tg`?
zTToS01jc?q-+c#yNgM{J0xm*-J5_5v(D74%&IL<6n7)Ae6Uf3HttDMaEBmMUSIU_A
z&vBKUy?I-WFV6ogA{ans)5|Vw1tY%(hk`9u*;QMDIINm34YbMCdt3V&r1w@xwA63q
zs-?5zpQ{?g#Ym>RlADXvsV;^VfPV<g{91YIwJar$1t22m#2GX{iqx@pH<K2C7&JeM
z8#=;LyPdCDBYOH1v{YD9EY;_T2$~;Z@$WsZt*+2oE**fs0a<!#5Ttoms?P3Lpd4V2
zya|~ez|F<Mzckxk{0UMF?)*{o!-LE_j1+X_oB1uf2t*<F^EV*fJ>Pa=6jE%tt^i8$
zwKcPUhSnixsXis8_U{FCl~MIXuXYpFi0yyABA0{Iz#-Y_jmT9V!2j1`Z(c2fG@F(|
znoY|f&8B6LX48KHM1bD`WAjKqQi#<1lMV+L8a6F4F)cDRR53X^Gc`IfGb=DKIxsMd
xd#_lNKL-~kHZ3tREiyG!F*!OjH99dfD=;uRFfjcl7vul{002ovPDHLkV1kuIrD6a8

diff --git a/resources/ios/icon/icon-50@2x.png b/resources/ios/icon/icon-50@2x.png
index d500206f169b9627854d62314a4c6733b65de7b7..f131e00094ee62d9f342c3d60a055c6373aed993 100644
GIT binary patch
delta 3704
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
bw0%kjp8q^QyA{Y!^e@`#57lZ^Y$N{<sX+ky

delta 3221
zcmZvec{J3G8pp}<BKtB(Ldnh`>tL8{6OxeKYip3bjF9Em$UcNC+l!%8jD0O;>_a1D
zkgQpTFj>Q73Ax^T&%NjVai4RZKc46Nob!Co`Tp}sxl(m0JriKPddmQ29X7pL;OOT>
z3?~Bf1r7XL3W2Y#XEa_jsrQ?5e_{97od|O$nv;9H*DgeTH{D%m46#suK662yv$$-A
zmmwKSZ3AzjQECjMIUwm_UU*^8?L|>bamj2S`?rRcD$*HWowwrf5krF$2@S3A>`(gn
zvR81cf5`32H3M1&d#7IQ1A`kTdvW+NxG<;XV?kOMifAL8VJga?3keRzgQcAZ142a+
zbl3UB?=oRUldkcJ!(J=MqF%>{r&y=cXE6Sx{|C!I6fI%gMl$di_~*I5N6}Ha|6Igo
z{985nYhNOTBP9F!MqB0umP7n((gA>`x$0aJT6C{Vnx1_c#H%m8^cY_;gDdU1_^6Pa
zWOR3-SdgXZxkUi;giQ(YroNpw3%Vlyp4B2cl%*qzvWEFfI*I#!!_EY&%enx_v3rJ%
zVD`xa=h<w@zmng*TV6Yg`l81q9BTv9{tzg%Fp!xIPH`q6XQpL0%0-1PNC7r+4z9T_
zKXV;+TI_y?m2fi$RXr$cdg;%%o*0=aQ#?CTQ=Cp()=(WGO_*2y_@05#M&3!H#fv7=
z81WjG{ShyFyXfMV%QXsK;cbh-Z#>K1#hI6Btd6s#L0Cm!W#l1l=af~UP*+`WT7=I;
zP_C3pkW7R*YqMcYWs>VXsZbztu54Me?JKcmS=&k$ngyb_xx1<-T+V){Qy@{L<p^%8
zmqH>xJJr^iT2cStCH+Lq{J?Uo8G~VQ7k_m9iz1=d0cD$gtl8k?`gZFxh4T}Q7i|JK
zna6Gq?)Z{r$_bOe!GAd2hA?Nd;hg;JuE#;2v>3y!L9lM<Bgqg>kidiV_iLJK!oBur
zHab@Jd3Ac!?EaaB(uR=SuH!+c?eoEhiWAcf3TsA>%{ad^PU1fOaPY{@88{9PK|Fnv
zEyi@yNkDXsGO#KjD7e&>aOG;zz|JBX?CvkSf2Q<j{8EWw^nt-M7p-Qv`39zl&vygv
z)~u#5phf~;Drt2RTn60R;3b>2YMnQ_hx?#L#>Rp|LM3)`quwgHc^FS0pJY*{NjP#o
z->*IGc)M>$QnKdZ9W011CZfE5vOilyFI`nE+drd7eR~1$c^}*|VyuPyR(~bI_&^B?
z{m>qDY;g|+0yPJbF9dez5c^G16<No5$_|XUJf!%N6L)g)fWyk@7Z8zUp?CCVjcKNO
zK$JhH)H<RRPMtK&crV}g7bl<XH{`LRZnemw2_CLCPpsSFI=3mEl{~i2=IP}XzS*=V
zC$BK-(-fr8U);llStS<`rb4a6`zue(;@#^EN@w5J)!&?w2A?$d<;(hGFn)LYrOfA#
z><j3W(uDv6lM+Qmkj^SPT{tDBS`1lUJFU0AXOVBbesLI!nx^bMTJM>9H=wNH<FMct
z6l)71V($|LT7q?pv}%j|)J$8PR(7d~mFmH}RW{5qG$HKka+p<G*QyV)g@)&`eDn-f
zSr3`slo}F1d3qln2ZvXy#p>cZJ_h|cVQMgj0*Z{cnni*S_|x?{#0Wg_dC|j`zCQKE
z%dzsvrkHGSiS1BvV0$cnH`va(717NkS^+jI%a{fQA{#&M;;t+^?ZX_7w-EQwV2=cg
zdfyl-xL`cpqA^d}%mw1@d>@W;JD}P0ySIGt-^rD|kc426m$Ql^t|oPdBFk$LqT&OD
zRI;fjcLtbWb|&25;P{c6$@lsmBfaLKQtKUEbjvX_Md-=dIJ3>eV6TTAhmv29fP``G
z#ED?oy8<zGLS^29Z7-?V7)tbhkZ2N~hs8>t$L*~qG^yC5X{?q**gFj&lz$G<uaOU|
z%nDn>{dT0EqSlVrw>A!%G@1A|B?0AE>oq9@IH@>y)QIHo^ucG>Cby$53bycUqk+_v
z%SQ|2AE|B<(72W*+OOXN-Cce;B3H67Loe(Ue9Nh~qV1o=CZ$2m?C>9``K1q3F0sC(
zicknXs7~pZRuCKJDuTVKt5{<|lu@i(BAfh6wmO)APJ$SWlRKW)jdPTl4j6OraaN)+
zP@|tLNEP%5+t?u<jauDti%&==mkg^XvOeFg%xYy_nOy4oy)=3D3$&Fp|1xJF%aKKS
z4np#NXYMjH4Bg`}!*SA-nv`*B=u=*0O<6F^@U6Pk%=Wfa*gJe;9P)o;MSklm#1LLO
zQlGSb32O5AwPRg}73));Oh9D$023ZhCcmWAlpO32!fBMlwB|AaI`^Q}_Swul?g7M4
z21E~=+ccteNHstW(o<V^AT_ev3m+j0JS#_!m*KKO*AiKb@F+{R@(kaGA!mL`gI5}L
zQwVH#PsTOvgOgx0a|{K`wB1bVR-9WsW34hP`3yb~f7{bnPk#c?Hu^T_r?R$@;|S@W
zRyaqhrC7#|u62^qNeATP=*InTmtg|jjI^*)eNOsVw`QngK!G4n0>@tJYSHS5u}E8-
zrC<Grh0U;{Q;+WLf&?1`(aVGt#@qA9#0u`}S{sDzn=&I8nyV|xLW)-^>(|HSM`brT
zk(9<6Bt*Et$QN+>u=fL3JrI}S%bQeh>7l)aJJujYpW0uE*icG2dP=07Lj?79T|Sjt
zndE7<JqtJXx^)8Sah%al<sVFuisF8HiKUlYpFrR>y*{QnU8S~Z<6DBwR}qxAU>Pzr
zlFd%mrY0R97S03D(}0cp6LJ0r0esH5SUi;*cL<?Z1;ha%<;UEbznDe=#c0PrK{t+g
zx4Jt}&WKW(W6UP@qRG&>fUwq3JK2rKp$b%G<2#_E9Tzf@3x1&yS=^JEaOvdN4myS1
zdTze#F(`C@W>Vxt*a4F)LsjJov%kN=JI4bg<sDj|M6{mrDkGVkTWd=KWanB#l`7Ul
zDr9;Ar+8GCTV*gk?CEErI{@VgsLAG=G$T0EBgi{9O+=^DR;2HT?ZNH6<sH)$YZ7PV
zK|W>i&F1>U?;Xr%d!&(NbsQcMeLzMzAonFFw|`6Hcsu;1w~Pbul5;D!of^2*%PQzH
zuf2;FfbR5Vva(0Tqt7Bxd3pBP**WJS+y#uj6w+c=VQR(-^TtE;Dfj8va~ujTmpyuA
zx8nL1l|T?HI}G}%`n3h<ia5#N*;e)@NAIT%w}O&_Zlt6Q6%h(&jb<=u8(OU%?v-35
z#MBq~i{^Gq)@L3GVL`jm(4$W2=}omSYb;qNc_wd6N=7IOczuPO(jo|*?yrmS)4&bt
zF>QNuz&i<bxf<DkwS=&$8vS-%8{5W6LG@6G&5sZ(FuCbB%`V-}R)fmBC2XKJ%<1As
z&yw2#sSkgcMgBmKykR<u#6&_#UC;gq2x!bJatD;trqz;LkK;3$tXGFuxVatEAJ|p-
zZLS&?L(poVjNBOb2g!gH!JMk7bU=nRl3tUlc%OypKBbp`&uMtdt}ZH+rx+&Rf3`H*
z%2>^_lp4c$+uL^O{bqy~E`<BouSQTeE@eJ}nzrT5=_omFbniV;;i=;9Y_QLgssi^H
z2R9EP;rXNG%qj*YX#E*RszLyhxLW_@cFp+ycqk||t%_ks*<xDcO(KB@4@^&SXeqUe
zymD1e|ISG1O8Xi~lt&N~xyFROU%WDT0LZ{OlDNhg{Aem>2e0W~{*?OyQ};6{l-40H
zsrtr|RQ79Xik*V#D!}J_+)}1-VsUxeOv3Tv)tI3ow2U1%*pwuF3W#Gwv)&K41V7O0
zVCbo>)hm6DKh&uuj|a{V02{mC(#~{3xTvECBmGE-=@a<LHWm$&4J6MULh;a)C$}y<
z$~q*>GBi(|(Zv+b=$nU2&dgW^-h=m2<Y!o!umWx3r#pH7B2MU72V<k{ErweHSW)Iz
zp|GganaVod&Uebq{?{XB{6cehKF*yq#ycRl<c0>2ccNNzxBzYHW`lulc^w~j;pak~
zRQk;@e-|B*j`<<7CrK2Ap4yKSR(0F}N40~^Bz|L|O(Q#)Nq?`U8tirKraWa6+}}bo
z*)sI!{NsXWfy{ndj1MgC{QaFE?%Jz~;E`}vFau!+O#WV-Q?uKDh<QsuBHcRuoQn<4
zIa&Ve|KM{s{NMJk%CqvoW#IoEtHyYYE}b{h!u<aGw1&5Si)S?5Z_@0(Lgpcv7<T?k
zYVt}-^2(~#N}7-xst~0cvWkijMa7he8oNvqJHN#Lmro`5ztNo6EkkpI>YJ`H{{$qF
BGY<d&

diff --git a/resources/ios/icon/icon-60.png b/resources/ios/icon/icon-60.png
index 2ab0816738cd3cdfe2f72d0eefae00d52723a617..854c33f6c091d9f916aa9cc312c6626a0b341a2f 100644
GIT binary patch
delta 2187
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
N07*qoL<FuvV1gBf9*_V4

delta 1860
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

diff --git a/resources/ios/icon/icon-60@2x.png b/resources/ios/icon/icon-60@2x.png
index bc5c9ba0c204fa144135942d28c75b9c3abd5a21..8d8da6199853f4b7f6a4d654e4b2df197919d252 100644
GIT binary patch
literal 4670
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

literal 4175
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
X<Ub3D!tATp0)U~esZOPqOZ2}0yh_kQ

diff --git a/resources/ios/icon/icon-60@3x.png b/resources/ios/icon/icon-60@3x.png
index 4c3d9fe188c4f1f9cd585efbcbcdcf79e681cad9..b94721b25cd5d8ceb7d3f155147175829f23c14b 100644
GIT binary patch
literal 7310
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

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

diff --git a/resources/ios/icon/icon-72.png b/resources/ios/icon/icon-72.png
index 93f8d10b773e4c791154e53b7a5a405d4588d6f5..9204a054b40f2a4478472a54eb558531e3ad18bf 100644
GIT binary patch
delta 2603
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

delta 2252
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

diff --git a/resources/ios/icon/icon-72@2x.png b/resources/ios/icon/icon-72@2x.png
index e0915e1bff805d95db1d4a898622f285bbf29a4d..5dff7993c18466d3d03eae22515a13ea7b44a2a9 100644
GIT binary patch
literal 5729
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
RR?>q2pbpjn)hXLX{s-i-&Zz(Z

literal 5037
zcmd5=Wl$SHm`#JbrC5tYahC$c-6<iZSaD0Rh9CusySuv;LXkoU#VIWk+}+yZMO&ay
z^tk(XH*<e)ZfD-U`F7{cw>#g?H#;xprJgzoAw3}g03gxSPys)1@_zy!_hH^q``Pk9
z*p7<2iU2@E648w{&O`hN0ajN6)QvsedkC0qHNd(6fZsC!AUGTVxO!L$-UR@>gaCkF
zRseu>HUL2LHowh4=3xWZMq6Fwfgi>{<@TTlB6zD|f_Pw!|AN|}vm5|GS*od`2zj@3
zSYYB}KJOdcjW{Yu5MALmrPS1%`6Zc3!!hRY0=mJDnUl~md!e^cJ!lvr!=Vsds+boA
z#5FB`bd?;{<a-b|3FN1&)SZ?doszU@9E`JzOXZ6z<<eRiG&z>tIsR5a2ae^7LO78?
z3(2xsj^p3$toX~_?#K^!mSuK(8w1hN11O{P(3hGC3jAz`0tt@OCD>wwf=QM3p6x{6
z7gyee$msoFBm7X{i-Xc^5oE&$n-`|N&Nx8SM5yX9U;BZXu!cP;H>BDC#AaN>z5Ow^
zbo6bxyp7qjrAA6usStXb8n^aZ1-lXuZze2uG4?0S1YS|zY7RE%=2)J#?^AkZ5D&6z
zla!enwe+^M5;9X(L0?ZSeKj*Jo~6L~f}d{NXQK;8m*()n1o)r=j~`PF=OR;W>hd)p
zi7X<6tIOqg<-yGOyG*+~-~6!>kLetn%A!|G|9mmiVeZt*#3%_Hne*et3*vRORY`rO
z73u;BnLtKfr*3me#29O(s%fx{-aK<U(BYu05HV5n`Fomks~Q+|&He`Iq&<w4XI`vA
ztN8Na5H8~1Z@`$nh~(*0mU;nPa{(B2bu5gS6`aI=9<Lg%KtPYwPVEpFt;CI0@_Bx7
zBybWDVAz3jq$V-5U|g^Rax3sE23Jp-Bg6Aebbe2n=cb)P1^94vvcxlJYu<3g87twG
z(vKRj#&NBECoKyl1rxjN@1$Mx6|H&|mbgHNFFK4+KX70gwki$eIQf=(r(ewzEyo=s
zQOP!KHF=Y&F}kIMp+?O3tj?`OhiJ751P&?5`N{5`ubhaas(_H(FY|#&kP})=6rDUB
zClx51x6^B$_<JjPE4NymHcy3yKN@E^A-9NH&XT*$&#yH|Y<Ndq5Z;1#bfP<#u<#NH
z%}|Mt;OgVm_ASgg-0U?kjIq&>0!JIC8w2ePv_3V;eXU`}w$3g1d=7W9Oo)mc7f!D8
zgS#m$<7l-lDJ^2>3vT&(*F_bLdwY~*mw-Z|ahwS<`dDdsHP3vhFxxMrM5YFR2Z(lb
z-}7+WcgnacEMrgMQ)k!NOEt_48=`JII?^3WK2SJ+d6v?zH6>=!Kx@1E>lZ7rvV()e
zBb0!>fpl@@=PW#R@qvqYRJ|>M$!y6*humjKv0771&9-?(oFg@^uUkn{j7KIHbuT@T
zm|BRH)>f#WJd)-1_A`8Z(*N?T!PdM(vd1<_Rt*X9<W0u6=J{54*eTNylp}v)`@(rU
z6F+@~pTPc!N88GPK8?@G4VVdm1~~IYEAp~XYd;+TfTW3t$w=VezbkqlE~!dq{QPw$
zmLz{CS*cf0YA%2XsE4{nfIYpvJv__9HvB7F=93Padh>W*D(BnhZCCtZmVZP4Bg2NQ
z&zPmZm|d-=XRd6-H7qRtXmz+Nz<+OVuf&+o<LJPo@N&$j<sCe<qEFR^s_bP|fA*Lu
z1q(i~t<8V%gV^zL;rCTpqGE{i_43aSZeT6-PT!E;U42UwYRiqM;p-B<OMG<2ORi70
z1EhbC*9Rsh$Q8+je4(j3ML~rq$1xF6QRP}A*F^Gt1*&QgE4A|>y><pMp94y&t*sqt
zRIM{MazZwp`_CqEyt7uzQF?C?Jyz}ZW7Gxmaa)5P)t;B`^_Yud0G!SzI2-xT1S;sr
zE1S;NlN+r-)VUgPuq6I<cbDt-7At+2!y@2ZX8n3C2o8UrU$JFhqnT>^a1W&#SA0Vz
zHMa^EErZ<y)~tOixOJfiG8&(6PHbH=W#d5UOIBhg9nXTe282cxz@W4cGUToFfk}iL
z<EglyX-F<iKB|Z&p5*}-M8XJug8wkGpNi&bRC!Tp*m7&<W^GUuR<Dh<YLRUj<BJ_E
ztPK~gwl8%0ll^;-heDz9r4W&vMK_OL*ISgBYL>=FlRG5<YtW;ZjY#rHZt3>6N7mj~
zJO-diOcA~A51;XhhtAY>RY&P_mY1i^E|Ehs=vi__R_wi&uoOr;+s*WfHrSkrM@KPP
zt2cCe#~KzL!&0r}OK*~^=%B}DSeZO5$ck_*5g{{v`6Q^PiYM@}I2_h?&R`Xz0Uskh
zg&ex(*OA(I=H9Kj{XJM4JvkxY^Nd6yx%>P3C4=r{PESu&48o&TYsA>%8*rUn5Z71g
zWqXv+n*^~77FJ`;wY2_yR=Y+i!U*6NIA*J&?}|2c#*Eek3RQ{5aXS{iIroo!+R5Lg
z_*^bVqS_zZ>!fUVSw1CtdUC^JagH^^ck>sm#}Vg3!@b%E3ysn=(xqpZ(fu_=<_N1v
z9gKIOggUJ)S<aa2!J2q41|x)o#15xrNd;VqZES4t3GiG0Y%%%QpWTMdJGBB~Zou$B
z>u8)*3;j01vG2PScrqNI@IqLHM}pXBj*m%B4qkNa+nv8+LHAZ88ZZY{)`sLgMW#Ep
zP=EO(dYQ8iMl~SEWR!gG&99;qqVZsE_m=2#rxF6^5#{kJxxl_R`Gc#v<0p^gnjD`m
zx<v9CzP{`e3>@r>qcO2CeU_LOZo(ZgM{i3!llM`r>C^dcgK4H(Z%UgaYcqEi^C;F!
zQ#P%M(zKv5kQUzNsjrSpc3wgMOcbus#fn8e4Gk<}>9==j(hb4Y&u**!E;0$Va|ZUy
z@2@9)-V=wO<ylJo3!Etkik3TJ-rn^2B!7)7ayt~6<}?b-fD{`3u-3yqF7`i`?YRG|
z49d!ql9lLpu76_%g;Us4X-?%3Tl2U`ys&YddgFFe6X!*ede)q5ch1DVY|6=5_xl(<
zhfgkMF)!__A09^|;Bl3awI9=1ocqS}5lBljfB?233(frKZWU}hAlDaiEgvDUo+R_{
zGv*S3%@jl|>$hH8Ut&(y^MX+|se|aWtovKxm4q>>nseS_jyd_|v~Qr?iO|lsfP)pe
z-jvVX30eAGy<6H;D)5mB1<ol;1%Pc@ghfAL^WC&DOIuy*6xhAF*TyCc9my5@sUI8%
z8yp9dP!06L<AsIcASzXg{@xjwczgqdC!@UbnNqD$nQ86JaDZ!LNA7HW4E~~dBA(ns
zk?wvcm7qg!B)*c}KW>yspkG*?iv@>8;RhY>XRpa-J9ZHmK$SI`a6>>PDk~N@+)<kY
zpuY^9wEiLf7MHKn=SCd{W64cQ97-IpV7M?NLzI%s<Hu#Wx)5Q~cODMeNLC2%)+^u1
z>L_8_v`sA=qf{pfWc};R{XaSELmh>Z^~;_SEIv==zLo`DJ#?d6UiZy5gVrPOc|)b<
zyzf3;KqTpieplh9s_W68dL+R#rEtrQNVKYG6kmJ_e^JEu=V^o6m&WhH=6}gk>qJsz
z$c{iBbD&m0RooHmB2E<wP<D;nPwZr-DUN8BVz-Ig?z+~tI=X37l)q>CMv!+tTNK%6
zw9;Bje<SwsH7mHVNA5JK=~{bvJ|8P)su+klQ$VM?tbYg2&&$@RQ4$%8A$4#WXw$)?
z>QosJvGe)YJN$#o)j4M3{S|5Xl@#`FGOxW|MQRtMWJY!v1JcO?c6-)G1|?XLd_7o}
zk$b3xhT||dOPkdtg;GM6*|1*ms3biVOt~o6D?LA`77OeZw!!%a4FW~lWYVc{#ccMG
ziKnDO{p|k?*z_B>bGbZSQE1kTx!A)Ok(VQENpBApDm5y=t{<btUn>RzZog!GO5-ek
zSK<2aWgOci3lAokyR`tjLZf0@0m-dT8IejjZ<;o|g|SDJPeDP1wj>V^WxzlLVJQ#i
z)n&8-vHtebUDVRE<HuISOknWIWN(DX<Zs9s7#LiU0GcyQ=PnzWb<v&L^3a40Hjo0V
zc{}+VH!$2B--aWGht-N73CVq5qTuLAvj=Hg6pe!!h$J?(nY8tsW!ubVPkRkEMJJCs
z(5-$hQkT2NFS^;}#5kZ_KLR*C72eJ(FVNhRWO6Q1Mwn7*@IrPa2zeE%h)o__@7s!7
z(@rhV>swkfJtUA!j43q@IDxzR>r>Ywo&B7&@H{WhJa*proGz*}Zg(CBkXc_o<I@ll
z7P;o}*uxgNpa-|cPH|(7Ra}>omf)P#h~)EKMP!fiuIz=i<-7M(1larF1#%YqA!a3a
zcP6Z`uuTt!Y)QIx6BEXU?XTiRRB%x1`w)gOEEyrt>0Z*2!`Z63fqSToh(F`$nLLZ2
zd<dU@Xp9E+R(1I)g@XYW-sG{Q-rIR5W$EL;A&P{Z_hAcZ_oS4y*S|X`Y6}!uG})gT
z^xADmMf!9W+;v%~@Xf+TeW~SI8FgN2rSXDxkB_%7#XrlIpS64z(md+R`ozEyO7<QH
z-0JlrN5m`jGDeV%rVxi?uqmvoE(^wk*{l~{_s7YRQ@-r!4%X>8lsW2n@+a(*=kHAQ
zk~!?gP+Fgm<Z{k(PX)B8CNBGrCCr^!eo~|mKnpsR1Ils1yOm{FS#xad_KEeOezr%%
zi%)14_hZjpY5h@XSyIh-4&S)--Hv-Qk^VfVi97ghZI98X@c^P}biwy7!8>ofE9t5_
zhN?mXJNWxFd~B}A!Fu(?H_c6H#1|dMwva45sTbb4dpUHlSy;gR;MU+Ads^kkI#c%>
z_@5eaYiZ@|!4$0uE<0s!5TB2y09=1Ziqyezj}R6kIclJTV?c0y@Ok1oh-MbO`cEY{
z?LI{Iy4yLs<h9kug`KVlxigBHFFkYeGHL4Pq-->9x5YMbK)T);g?7&X90KLPj8a2g
zlh<62<IKBc`Ytae>pQ(ekjUYYkr6OYMpgPStu28eG*l=egP1jW&~6vwup3`5M9U|V
zT43+)U6?Y$+G!n8EVtz1Zr3u0nN7nu>z5?HUpnNQ)50J*zd+`idzGPfflpuj#RAfV
zq^o%ymoWJ7xd`KlSjD=r6$8WRAkD$RKmTN||8fxhdIUq$XJ|!iZP~~6v1VvxnAXna
zztOLpwnH$0s?+R>E)k7e+U1Z9fhU^s2PE~MqInmH#!JbV5QMjlLLmiyNOT3Y%|jV_
zIxT}ItaCI56jIAkq{u#cCxc>omD4Inzw5JSyTK>@oynfky3z$7K7QQaR+T~&N*1bu
zG|NqFeJtw=L#lv#b7{~Vf07|ot!5QS1c8g>D<)hv6$m5rN^M!UF(qQ*2~TvL5cL=)
zdN1q!14x-=c5PcxEEYDCSun(`{rXFjbZuF22X+R|XQ~uEv}!S0otXkdRvNV)7EV_~
z3eThPmf1DUS2;8?n|6{jG22kGr)PI-r2`p;E~T2$Ej57~I6@%zk09$ucCuQ{L_?>C
zW-FVUMWHR3GWkT4Ha-xfou04<s7kjf^_+ufXqsU{Jf6p8pqBdi*FOaF6UTnUwU)<o
zZgT?3ga!e4sg{V<s<jmAdf~qvkB!?EOiKu52am0B{k%~o_ZRP0po+y}c7Azz)s7dD
z?K8cIeW#M`S@Ew`W6MTwy7m`gP0YzS?XX3KE+(MhgpvIraFIUUF*lEAnn;nf2+vjb
zAq|C{Z=n5)5q5;+S`oh{k#6?GpON$V69E47V6BdfS!!mgQ;r<g?A1*Q>AohKOwlZb
z8kh31h!1Jb6aD6I#FzL@_E1e`EzyM-%eugZ)qx*Ss@ep=68)cFNj=SSScksO6F>c!
z6XNBgM)EI!u5eS328%Y;0z&@lb4#<lInD-`@PL2v%k9*dX>U^+4d=}%!IT(F|Bz-O
z(&=5o>eGd^^~m!U%mj)Xo`>_w%JSB_v3Nwigg<6OtSz((GbBqOYnI?;Ot9UzICNPN
z&dAxJz{n{PtPn^YB#L^3{YPrX!2t_@b8+N<+8Hi^A#?VmV_r;8iiz{~+ePMLT0-OH
z<M=E}EBvpKfE-4I^o33Jxrk1)5w4gBg1S=4xJNHvfe!uWeBD`=%&^k*{ykoPH+u2+
z1`DQTHNU5SaJJEvU)l3;Yps^tZgq&c;hXDU)3OS|)i;*xt>Q<Sf>=+=i1|PLLon-`
z{RaBxpZq_-#NDumj6gV7g3^y}@4*L82z(>YOn3z7-xSDwu&p>eRgFFEtUc|eZ9VKC
z2p}RPEWs}<%r7Di5tfn`6_*wk;uR8-782@AL-+kRfvdY6)WP?E7mSRN_&x{#nyPv#
JbxKyD{{d4!RHpy{

diff --git a/resources/ios/icon/icon-76.png b/resources/ios/icon/icon-76.png
index f57b285daace0f42e9f898ad37c7e526fcebc445..87c4cc3f2bf8df7c1cb609289c041f211616a184 100644
GIT binary patch
delta 2720
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

delta 2410
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

diff --git a/resources/ios/icon/icon-76@2x.png b/resources/ios/icon/icon-76@2x.png
index 0d753ccd2f5384c69d94a855aa155b04502cf9ce..3345289a548f23150348b5703d203a209d3e743f 100644
GIT binary patch
literal 6018
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
G8U7!)_-;S|

literal 5363
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
KrGf@o1^o|5S0^a|

diff --git a/resources/ios/icon/icon-83.5@2x.png b/resources/ios/icon/icon-83.5@2x.png
index 37c031c37a92a39f2019d881e405479792bdbe6f..779bb361ae90b8b7bd33d5ac3998053f50e7d351 100644
GIT binary patch
literal 6752
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

literal 6060
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
I|33Wx0Ac%|RsaA1

diff --git a/resources/ios/icon/icon-small.png b/resources/ios/icon/icon-small.png
index 0ceb97036ea2faf16d5fb06dd428c3631b96f9be..457fe4a65809d14b9a713e0c7a49c1b7567b4a76 100644
GIT binary patch
delta 1143
zcmZ{hX-w017{?1Dh#b<^I+=qgP(dh^atH+_&;whbw9Wz|14aHt4!O!vT5SJ41OkG{
zZ9VV~Bo1((Lt$odPGIbC$-vDyW0t_;3p9dA`}?2!Z}0YE-+Z5Z^CZvb`{r5MwBUNK
z3{F#|DaF9Zuv3N^>oCIxGf)$Qv@pmfI&qqAgPArXlQ1*LMlZ6-i?GmF^vpkNnGXtB
zkBYr*#;u5nNm@J!lgDBmbE43vQQ?=f-=ELf#oFPY9>bom{usBg?B;ENvWW$ZOuLbZ
z80jSJx~|{yxC#zz%umWxq=oQecLs8O{esx+z~00DX!CZ$>~61j0vbo4a|T8_3VW`>
ztS2U+rLN@YiOP(e;}S_qOmtKPH#CgH*~{fTDfA+>wDo3xbT9`UuR`yfM6RR)6BFoM
zfNAU7rl3a`>UvsWOKovU{t>xco-7s#1p+vp&yNh_FzC!IWd`}fdHmfH`Hu+V?JJ=7
zu(fgQ9bEe<w@XE_{6tAgvN$0wJ~SlE+m|g#RlNRdiNJ9Z10;b_1PRuV?r3moGcb4}
zt!(7XZku5XX>yx1NLA&U?92?IKqTB3XG-%~e%M7I>-e)V1a8}dUXzm_-jD>2eRCFQ
z9FX>4<Qx~kUiNxNY`S-O4gKxKt6wLtzR@vA^JcU=0>=r&nrN@4;Xhu(=SP6n37A=+
z-U+>xg$}E*+4JPHQB3CqI>JcQj`Z&bhAlw55nmVs^^WLJF7}lf)NjCM`U#T6Nti_E
z@7T4@K<|!@t3iV+zVHRmIwKuiY^D#PDv%FI-#%=*2cI7Wr`(W%6zqNjHlagrC_$4i
zdRL9zs{^e8$bb}^(4sdpfQCkCW%qRlDjbfd9uPflEjlZp7S~Eib~Tlfe<%67(gf;2
z14~6o%AltO$F{E-J6o(9o82QLnISvkUH0<R!^(a05)2MWyE5JR`SgRlDp%>AV()Ce
zcB7cB3gELcqH8^5p=Ca~`}G@y{sjfhL+txE$E*(;Z}r}5AHMw1a-)0v%<YR)&4VAM
z4O%BUMz6q$#}t*4qQmtfNU4PGP6aCAi34dTKiel49RF0EQgTEGB}0Xobx?Y_uV_MT
zNXkE0B`wa@id7j<EhH<;)eE75Za-y3b!ur&!+{f78hOQ0B?SL+x}~$Td$-)-`(WAS
zy)U8Fw%J+h`22~dEp3<LD+~?LqT|qVPve<wT<h00&sSL??{gwdW4HS_?Qq-Yra9f>
z(nww;Ye@5E68qrw++$O=^PyYqdDF2f@9nFsi$=%pXG;}-%>R5xyU-Qd*_lHhn`@N?
z>H4p~R=xZEOa07GxxC>i+w#k)(b@&V$HjAGHBoeW=7LZ*Fy}rzEt9?9`ALBEYPndf
zm<^`%m~YuequGhBzN4j;FMOzfuxrGJYoPoZRa}8uMFlM)oEH-sPB}`+i-?PgjpOk`
m!o%aj!|!qD{Qd)!RY1js+W!Z>RjUUmfF>2Ei$(;;%zp#Wj~T51

delta 1023
zcmV<b0|5Nh3GoP!ZGRI`OjJeqfEW3I6!?G@`G6AofD-zF68wP@`+*Yne-iC`6XbUk
z^nMfkff4wB66bjp%54~?T^oc=9A!TpSvnt`TORR!6#9S>>3bKxZ6k|ZGFnA5IWjFO
zDJdf(B|k7Fr(YiPeiZqC5cz-+=YAfxcRhh?S7KjYRaRI$JbykeEiEf5Dl{!BuVEbg
zfDihA5c!53`i(03jVt+wA@YMB&y7)<h<A2(cw%H`Qc_b!MMXY6JvTNsFD))8CMH=v
zDd>(q{kVGm;Ku&#-Tv+0{^ig7$(#C^Kly(V?u|9xlv2@yJIH)CifBkmOH4*YML<11
zHZ(LVC@Co?DSw59hWPR7|NQ#@|Ns8(-}<0U`iv?2iX{7g5B`A=t8O?`Raa6_Q9?jL
zGBGqeF)NIGZ}IW*|M~R&)v^80r~dTo{o1?vg&X;bCf%ZJsjIGzj*o+Qag|>%%5NO^
zoJs%o?fuWD`GObxyn_Dm=K7H{`F{`km_YiNKK#U!{D1!c``p3%g&O;S5c-NF{^{5J
zw|e=04*R21|NQy?_3ZkVJNv3)`>bXC-NE^U8u^JM{^->Fws`xZQ2+b*|Ml(rqg4B{
zZ~V7-`i(66qEh*R6#T!5|M&6z*0uSA8Tp7J|M&3wvvK);5Bs1@{_^Ml_V4<YIQo}9
z`jImEfh`mHf))CcHTsu5`HCg_mOT2EI{Abd`G6Gw006Y5f~Wuh00Cl4M?|ngWUj=M
z&jJ{KOi4sRR4C75U|_@p7?_yx0J_Ptu;P$qVPj+G;N;@QBFn<V%f~MuC?qT*%7QK{
zCMGT+DJ3l<D<`iYrl_cdEGwp{tfH!>uA!-=t)r`_Z(wM|tO%D?GBz<aGq<p`vbM3c
zvv+WGa&~cbbBD<)dU$$y`}q3#2LuKMhlGZIfk1eKB1|?iDmo@ME<PbKDLEx9EHy1X
zBP=X4O9>{M?XH)To0nfuSX3MqR#NI-78X`sp$L(!tg5b5tO={Ft8Zv*3JYs)X=!Z>
zYwxIp$hLHLwE$(qx_cCR`@+KdTUsVe44VX(oje6ub}CpFu2*r|bVb~<%ro?v@yIfN
zD`Cn`LdY^RE6$uXYxW%XxsLPZ&2L$-aM5C?C5lLK6uETivgOPxRxVw&T1iQN&8oHQ
zkYmujvJ#|Nv9b~v!b+8um2^&Zq{*(wCkp_nTYo~i>t*5q001R)MObuXVRU6WV{&C-
zbY%cCFfleQF)=MNHB>P<Ix{soF)}MgFfckWFe(hB>;M1&C3HntbYx+4WjbwdWNBu3
t05UK!HZ3tREiyG!F*!OjH99deD=;uRFfdzD98drN002ovPDHLkV1lVx?@Ryy

diff --git a/resources/ios/icon/icon-small@2x.png b/resources/ios/icon/icon-small@2x.png
index 450216cf66c0c664d1ee3973d80f32d366968335..f7e20964b6322e71921140e59490ae3220b66c6e 100644
GIT binary patch
delta 2000
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

delta 1801
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

diff --git a/resources/ios/icon/icon-small@3x.png b/resources/ios/icon/icon-small@3x.png
index 1f75d32fa50494bd8d2aaefe651c629219c7ff9f..95b5d64681b8183120dfda42123320ca7fd9b1a2 100644
GIT binary patch
delta 3219
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

delta 2768
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
Pnd7+%vofoMc;Nm4{M%~p

diff --git a/resources/ios/icon/icon.png b/resources/ios/icon/icon.png
index 1540b25956836e9db8a62a6c0c6529ddce714844..2414ad2b8d4cc48a224d7c0cd22b83cead8fb541 100644
GIT binary patch
delta 2000
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

delta 1709
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
D?m;=4

diff --git a/resources/ios/icon/icon@2x.png b/resources/ios/icon/icon@2x.png
index 023384d9db2db070b9c13bf9ff16cab8d4060c24..a0bbf3d384d56f897ea32d8a42565c04496bdffa 100644
GIT binary patch
literal 4439
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

literal 3903
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
MNY4yWtK$;?AJ8U1@Bjb+


From a66a42fdc9334359ee10f81567e6a3ab19998512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 30 Jun 2017 11:55:03 +0200
Subject: [PATCH 063/118] MOBILE-2127 data: Add offline store

---
 www/addons/mod/data/services/data.js         | 130 +++++++++-
 www/addons/mod/data/services/data_offline.js | 238 +++++++++++++++++++
 www/addons/mod/data/services/handlers.js     |   4 +-
 3 files changed, 360 insertions(+), 12 deletions(-)
 create mode 100644 www/addons/mod/data/services/data_offline.js

diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 5ccc1c97a19..27d5674fb35 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -21,7 +21,8 @@ angular.module('mm.addons.mod_data')
  * @ngdoc controller
  * @name $mmaModData
  */
-.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage) {
+.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage,
+        $mmaModDataOffline) {
     var self = {};
 
     /**
@@ -400,39 +401,148 @@ angular.module('mm.addons.mod_data')
      * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModData#approveEntry
+     * @param   {Number}    dataId      Database ID.
+     * @param   {Number}    entryId     Entry ID.
+     * @param   {Boolean}   approve     Whether to approve (true) or unapprove the entry.
+     * @param   {Number}    courseId    Entry ID.
+     * @param   {String}    [siteId]    Site ID. If not defined, current site.
+     * @return  {Promise}               Promise resolved when the action is done.
+     */
+    self.approveEntry = function(dataId, entryId, approve, courseId, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        // Get if the opposite action is not synced.
+        var action = approve ? 'disapprove' : 'approve';
+        return $mmaModDataOffline.getEntry(dataId, entryId, action, siteId).then(function(entry) {
+            if (entry) {
+                // Found. Just delete the action.
+                return $mmaModDataOffline.deleteEntry(dataId, entryId, action, siteId);
+            }
+
+            if (!$mmApp.isOnline()) {
+                // App is offline, store the action.
+                return storeOffline();
+            }
+
+            return self.approveEntryOnline(entryId, approve, siteId).catch(function(error) {
+                if (error && !error.wserror) {
+                    // Couldn't connect to server, store in offline.
+                    return storeOffline();
+                } else {
+                    // The WebService has thrown an error or offline not supported, reject.
+                    return $q.reject(error.error);
+                }
+            });
+        });
+
+        // Convenience function to store a data to be synchronized later.
+        function storeOffline() {
+            var action = approve ? 'approve' : 'disapprove';
+            return $mmaModDataOffline.saveEntry(dataId, entryId, action, courseId, false, undefined, siteId);
+        }
+    };
+
+    /**
+     * Approves or unapproves an entry. It does not cache calls. It will fail if offline or cannot connect.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#approveEntry
      * @param   {Number}    entryId         Entry ID.
      * @param   {Boolean}   approve         Whether to approve (true) or unapprove the entry.
-     * @param   {String}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise}                   Promise resolved when the action is done.
+     * @return  {Promise}            Promise resolved when the action is done. Rejected with object containing
+     *                                   the error message (if any) and a boolean indicating if the error was returned by WS.
      */
-    self.approveEntry = function(entryId, approve, siteId) {
+    self.approveEntryOnline = function(entryId, approve, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     entryid: entryId,
                     approve: approve ? 1 : 0
                 };
 
-            return site.write('mod_data_approve_entry', params);
+            return site.write('mod_data_approve_entry', params).catch(function(error) {
+                return $q.reject({
+                    error: error,
+                    wserror: $mmUtil.isWebServiceError(error)
+                });
+            });
         });
     };
 
+
     /**
      * Deletes an entry.
      *
      * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModData#deleteEntry
-     * @param   {Number}    entryId         Entry ID.
-     * @param   {String}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise}                   Promise resolved when the action is done.
+     * @param   {Number}    dataId      Database ID.
+     * @param   {Number}    entryId     Entry ID.
+     * @param   {Number}    courseId    Entry ID.
+     * @param   {String}    [siteId]    Site ID. If not defined, current site.
+     * @return  {Promise}               Promise resolved when the action is done.
      */
-    self.deleteEntry = function(entryId, siteId) {
+    self.deleteEntry = function(dataId, entryId, courseId, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        // Get if the opposite action is not synced.
+        return $mmaModDataOffline.getEntryActions(dataId, entryId, siteId).then(function(entries) {
+            if (entries && entries.length) {
+                // Found. Delete other actions first.
+                var proms = [];
+                angular.forEach(entries, function(entry) {
+                    proms.push($mmaModDataOffline.deleteEntry(dataId, entryId, entry.action, siteId));
+                });
+
+                return $q.all(proms);
+            }
+        }).then(function(){
+            if (!$mmApp.isOnline()) {
+                // App is offline, store the action.
+                return storeOffline();
+            }
+
+            return self.deleteEntryOnline(entryId, siteId).catch(function(error) {
+                console.error(error);
+                if (error && !error.wserror) {
+                    // Couldn't connect to server, store in offline.
+                    return storeOffline();
+                } else {
+                    // The WebService has thrown an error or offline not supported, reject.
+                    return $q.reject(error.error);
+                }
+            });
+        });
+
+        // Convenience function to store a data to be synchronized later.
+        function storeOffline() {
+            return $mmaModDataOffline.saveEntry(dataId, entryId, 'delete', courseId, false, undefined, siteId);
+        }
+    };
+
+    /**
+     * Deletes an entry. It does not cache calls. It will fail if offline or cannot connect.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#deleteEntry
+     * @param   {Number}    entryId  Entry ID.
+     * @param   {String}    [siteId] Site ID. If not defined, current site.
+     * @return  {Promise}            Promise resolved when the action is done. Rejected with object containing
+     *                                   the error message (if any) and a boolean indicating if the error was returned by WS.
+     */
+    self.deleteEntryOnline = function(entryId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     entryid: entryId
                 };
 
-            return site.write('mod_data_delete_entry', params);
+            return site.write('mod_data_delete_entry', params).catch(function(error) {
+                return $q.reject({
+                    error: error,
+                    wserror: $mmUtil.isWebServiceError(error)
+                });
+            });
         });
     };
 
diff --git a/www/addons/mod/data/services/data_offline.js b/www/addons/mod/data/services/data_offline.js
new file mode 100644
index 00000000000..77838ce2821
--- /dev/null
+++ b/www/addons/mod/data/services/data_offline.js
@@ -0,0 +1,238 @@
+// (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_data')
+
+.constant('mmaModDataEntriesStore', 'mma_mod_data_entry')
+
+.config(function($mmSitesFactoryProvider, mmaModDataEntriesStore) {
+    var stores = [
+        {
+            name: mmaModDataEntriesStore,
+            keyPath: ['dataid', 'entryid', 'action'],
+            indexes: [
+                {
+                    name: 'dataid'
+                },
+                {
+                    name: 'courseid'
+                },
+                {
+                    name: 'action'
+                },
+                {
+                    name: 'entryid'
+                },
+                {
+                    name: 'fields'
+                },
+                {
+                    name: 'timemodified'
+                },
+                {
+                    name: 'dataAndEntry',
+                    keyPath: ['dataid', 'entryid']
+                }
+            ]
+        }
+    ];
+    $mmSitesFactoryProvider.registerStores(stores);
+})
+
+/**
+ * Offline data factory.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataOffline
+ */
+.factory('$mmaModDataOffline', function($mmSitesManager, $log, $mmFS, mmaModDataEntriesStore) {
+    $log = $log.getInstance('$mmaModDataOffline');
+
+    var self = {};
+
+    /**
+     * Delete an stored entry.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataOffline#deleteEntry
+     * @param  {Number} dataId       Database ID.
+     * @param  {String} entryId      Database entry Id.
+     * @param  {String} action       Action to be done
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved if deleted, rejected if failure.
+     */
+    self.deleteEntry = function(dataId, entryId, action, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().remove(mmaModDataEntriesStore, [dataId, entryId, action]);
+        });
+    };
+
+    /**
+     * Get all the stored entry data from all the databases.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataOffline#getAllEntries
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved with entries.
+     */
+    self.getAllEntries = function(siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().getAll(mmaModDataEntriesStore);
+        });
+    };
+
+    /**
+     * Get an stored entry data.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataOffline#getEntry
+     * @param  {Number} dataId      Database ID.
+     * @param  {String} entryId     Database entry Id.
+     * @param  {String} action       Action to be done
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with entry.
+     */
+    self.getEntry = function(dataId, entryId, action, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().get(mmaModDataEntriesStore, [dataId, entryId, action]);
+        });
+    };
+
+    /**
+     * Get an all stored entry actions data.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataOffline#getEntryActions
+     * @param  {Number} dataId      Database ID.
+     * @param  {String} entryId     Database entry Id.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with entry.
+     */
+    self.getEntryActions = function(dataId, entryId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModDataEntriesStore, 'dataAndEntry', [dataId, entryId]);
+        });
+    };
+
+    /**
+     * Get all the stored entry data from a certain database.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataOffline#getDatabaseEntries
+     * @param  {Number} dataId     Database ID.
+     * @param  {String} [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}           Promise resolved with entries.
+     */
+    self.getDatabaseEntries = function(dataId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            return site.getDb().whereEqual(mmaModDataEntriesStore, 'dataid', [dataId]);
+        });
+    };
+
+    /**
+     * Check if there are offline entries to send.
+     *
+     * @module mm.addons.method
+     * @ngdoc method
+     * @name $mmaModDataOffline#hasOfflineData
+     * @param  {Number} dataId    Database ID.
+     * @param  {String} [siteId]  Site ID. If not defined, current site.
+     * @return {Promise}          Promise resolved with boolean: true if has offline answers, false otherwise.
+     */
+    self.hasOfflineData = function(dataId, siteId) {
+        return self.getDatabaseEntries(dataId, siteId).then(function(entries) {
+            return !!entries.length;
+        }).catch(function() {
+            // No offline data found, return false.
+            return false;
+        });
+    };
+
+    /**
+     * Save an entry data to be sent later.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataOffline#saveEntry
+     * @param  {Number} dataId          Database ID.
+     * @param  {String} entryId         Database entry Id. If action is add entryId should be 0 and -timemodified will be used.
+     * @param  {String} action          Action to be done to the entry: [add, edit, delete, approve, disapprove]
+     * @param  {Number} courseId        Course ID of the database.
+     * @param  {Array}  [fields]        Array of field data of the entry if needed.
+     * @param  {Number} [timemodified]  The time the entry was modified. If not defined, current time.
+     * @param  {String} [siteId]        Site ID. If not defined, current site.
+     * @return {Promise}                Promise resolved if stored, rejected if failure.
+     */
+    self.saveEntry = function(dataId, entryId, action, courseId, fields, timemodified, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            timemodified = timemodified || new Date().getTime();
+
+            var entry = {
+                    dataid: dataId,
+                    courseid: courseId,
+                    action: action,
+                    entryid: -(entryId || timemodified),
+                    fields: fields,
+                    timemodified: timemodified
+                };
+
+            return site.getDb().insert(mmaModDataEntriesStore, entry);
+        });
+    };
+
+    /**
+     * Get the path to the folder where to store files for offline files in a database.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataOffline#getDatabaseFolder
+     * @param  {Number} dataId      Database ID.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with the path.
+     */
+    self.getDatabaseFolder = function(dataId, siteId) {
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+
+            var siteFolderPath = $mmFS.getSiteFolder(site.getId()),
+                folderPath = 'offlinedatabase/' + dataId;
+
+            return $mmFS.concatenatePaths(siteFolderPath, folderPath);
+        });
+    };
+
+    /**
+     * Get the path to the folder where to store files for a new offline entry.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataOffline#getEntryFolder
+     * @param  {Number} dataId      Database ID.
+     * @param  {Number} entryId     The ID of the entry.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved with the path.
+     */
+    self.getEntryFolder = function(dataId, entryId, siteId) {
+        return self.getDatabaseFolder(dataId, siteId).then(function(folderPath) {
+            return $mmFS.concatenatePaths(folderPath, 'entry_' + entryId);
+        });
+    };
+
+    return self;
+});
\ No newline at end of file
diff --git a/www/addons/mod/data/services/handlers.js b/www/addons/mod/data/services/handlers.js
index dfd2b0f34fc..654a72f3c17 100644
--- a/www/addons/mod/data/services/handlers.js
+++ b/www/addons/mod/data/services/handlers.js
@@ -244,7 +244,7 @@ angular.module('mm.addons.mod_data')
                     approve = parseInt(params.approve, 10) ? true : false;
 
                 // Approve/disapprove entry.
-                return $mmaModData.approveEntry(entryId, approve, siteId).catch(function(message) {
+                return $mmaModData.approveEntry(dataId, entryId, approve, courseId, siteId).catch(function(message) {
                     modal.dismiss();
                     $mmUtil.showErrorModal(message, 'mma.mod_data.errorapproving', true);
 
@@ -298,7 +298,7 @@ angular.module('mm.addons.mod_data')
                         entryId = parseInt(params.delete, 10);
 
                     // Delete entry.
-                    return $mmaModData.deleteEntry(entryId, siteId).catch(function(message) {
+                    return $mmaModData.deleteEntry(dataId, entryId, courseId, siteId, true).catch(function(message) {
                         modal.dismiss();
                         $mmUtil.showErrorModal(message, 'mma.mod_data.errordeleting', true);
 

From 9a0ae188d3eb3c09744e5bde41e67b5cf2a51039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 5 Jul 2017 10:53:40 +0200
Subject: [PATCH 064/118] MOBILE-2127 data: Render entries

---
 www/addons/mod/data/controllers/index.js      | 113 +++++++++++-----
 www/addons/mod/data/directives/action.js      |  44 ++++++
 www/addons/mod/data/directives/field.js       |   1 +
 .../mod/data/fields/checkbox/directive.js     |   6 +
 .../mod/data/fields/checkbox/template.html    |   5 +-
 www/addons/mod/data/fields/date/directive.js  |   6 +
 www/addons/mod/data/fields/date/template.html |   5 +-
 www/addons/mod/data/fields/file/directive.js  |  17 ++-
 www/addons/mod/data/fields/file/handler.js    |   4 +
 www/addons/mod/data/fields/file/template.html |   8 +-
 .../mod/data/fields/latlong/directive.js      |  20 ++-
 .../mod/data/fields/latlong/template.html     |   4 +
 www/addons/mod/data/fields/menu/directive.js  |   6 +
 www/addons/mod/data/fields/menu/template.html |   5 +-
 .../mod/data/fields/multimenu/directive.js    |   6 +
 .../mod/data/fields/multimenu/template.html   |   5 +-
 .../mod/data/fields/number/directive.js       |   6 +
 .../mod/data/fields/number/template.html      |   3 +-
 .../mod/data/fields/picture/directive.js      |  34 ++++-
 www/addons/mod/data/fields/picture/handler.js |  14 ++
 .../mod/data/fields/picture/template.html     |   5 +-
 .../mod/data/fields/radiobutton/directive.js  |   6 +
 .../mod/data/fields/radiobutton/template.html |   5 +-
 www/addons/mod/data/fields/text/directive.js  |   6 +
 www/addons/mod/data/fields/text/template.html |   3 +-
 .../mod/data/fields/textarea/directive.js     |  13 +-
 .../mod/data/fields/textarea/template.html    |   3 +-
 www/addons/mod/data/fields/url/directive.js   |   6 +
 www/addons/mod/data/fields/url/template.html  |   3 +-
 www/addons/mod/data/lang/en.json              |   4 +
 www/addons/mod/data/services/data.js          |  19 ++-
 www/addons/mod/data/services/data_offline.js  |   5 +-
 www/addons/mod/data/services/handlers.js      |  25 ++--
 www/addons/mod/data/services/helper.js        | 126 +++++++++++-------
 www/addons/mod/data/templates/action.html     |  23 ++++
 www/addons/mod/data/templates/index.html      |   7 +-
 www/core/directives/link.js                   |   2 +-
 www/core/scss/styles.scss                     |   7 +
 38 files changed, 453 insertions(+), 127 deletions(-)
 create mode 100644 www/addons/mod/data/directives/action.js
 create mode 100644 www/addons/mod/data/templates/action.html

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index b7e59b3fec3..10ff6c25bcb 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -23,10 +23,11 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
         $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups,
-        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage, $state, $mmComments) {
+        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage, $state, $mmComments, $mmaModDataOffline) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
+        siteId = $mmSite.getId(),
         data,
         entryChangedObserver,
         onlineObserver,
@@ -41,6 +42,7 @@ angular.module('mm.addons.mod_data')
     $scope.component = mmaModDataComponent;
     $scope.databaseLoaded = false;
     $scope.selectedGroup = $stateParams.group || 0;
+    $scope.entries = {};
 
     $scope.search = {
         sortBy: "0",
@@ -104,24 +106,23 @@ angular.module('mm.addons.mod_data')
                         $scope.selectedGroup = groupInfo.groups[0].id;
                     }
                 }
+                return fetchOfflineEntries();
+            });
+        }).then(function() {
+            return $mmaModData.getFields(data.id).then(function(fields) {
+                if (fields.length == 0) {
+                    $scope.canSearch = false;
+                    $scope.canAdd = false;
+                }
+                $scope.search.advanced = {};
 
-                var promises = [
-                    fetchEntriesData(),
-                    $mmaModData.getFields(data.id).then(function(fields) {
-                        if (fields.length == 0) {
-                            $scope.canSearch = false;
-                            $scope.canAdd = false;
-                        }
-                        $scope.search.advanced = {};
-
-                        $scope.fields = {};
-                        angular.forEach(fields, function(field) {
-                            $scope.fields[field.id] = field;
-                        });
-                        $scope.advancedSearch = $mmaModDataHelper.displayAdvancedSearchFields(data.asearchtemplate, $scope.fields);
-                    })
-                ];
-                return $q.all(promises);
+                $scope.fields = {};
+                angular.forEach(fields, function(field) {
+                    $scope.fields[field.id] = field;
+                });
+                $scope.advancedSearch = $mmaModDataHelper.displayAdvancedSearchFields(data.asearchtemplate, $scope.fields);
+
+                return fetchEntriesData();
             });
         }).then(function() {
             // All data obtained, now fill the context menu.
@@ -139,6 +140,33 @@ angular.module('mm.addons.mod_data')
         });
     }
 
+    function fetchOfflineEntries() {
+        // Check if there are entries stored in offline.
+        return $mmaModDataOffline.getDatabaseEntries(data.id).then(function(offlineEntries) {
+            $scope.hasOffline = !!offlineEntries.length;
+
+            $scope.offlineEntries = {};
+
+            // Only show offline entries on first page.
+            if ($scope.search.page == 0 && $scope.hasOffline) {
+                angular.forEach(offlineEntries, function(entry) {
+                    if (typeof $scope.offlineEntries[entry.entryid] == "undefined") {
+                        $scope.offlineEntries[entry.entryid] = {
+                            actions: [],
+                            entry: false,
+                            id: entry.entryid,
+
+                        };
+                    }
+                    if (entry.action == 'add') {
+                        $scope.offlineEntries[entry.entryid].entry = entry.fields;
+                    }
+                    $scope.offlineEntries[entry.entryid].actions.push(entry);
+                });
+            }
+        });
+    }
+
     function fetchEntriesData() {
         hasComments = false;
 
@@ -157,33 +185,43 @@ angular.module('mm.addons.mod_data')
             }
         }).then(function(entries) {
             $scope.numEntries = entries && entries.totalcount;
-            $scope.isEmpty = $scope.numEntries <= 0;
+            $scope.isEmpty = $scope.numEntries <= 0 && $scope.offlineEntries.length <= 0;
             $scope.hasNextPage = (($scope.search.page + 1) * mmaModDataPerPage) < $scope.numEntries;
-            $scope.entries = "";
+            $scope.entriesRendered = "";
 
             if (!$scope.isEmpty) {
                 $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
 
-                // Are comments present on the template? Replace it with native ones.
-                if (data.comments) {
-                    var commentsNumber = data.listtemplate.match(/##comments##/g).length;
-                    if (commentsNumber > 0) {
-                        hasComments = true;
+                var entriesHTML = data.listtemplateheader;
+
+                $scope.entryContents = {};
 
-                        entries.listviewcontents = $mmaModDataHelper.replaceComments(entries.listviewcontents, entries.entries,
-                            commentsNumber);
+                angular.forEach(entries.entries, function(entry) {
+                    var contents = {};
+                    angular.forEach(entry.contents, function(field) {
+                        contents[field.fieldid] = field;
+                    });
+                    $scope.entryContents[entry.id] = contents;
+
+                    $scope.entries[entry.id] = entry;
+
+                    var actions = $mmaModDataHelper.getActions(data, $scope.access, entry);
+
+                    entriesHTML += $mmaModDataHelper.displayShowFields(data.listtemplate, $scope.fields, entry.id, 'list', actions);
+                    if (typeof $scope.offlineEntries[entry.id] != "undefined") {
+                        $scope.offlineEntries[entry.id].entry = entry;
                     }
-                }
-                $scope.entries = entries.listviewcontents;
-                // Solve picture field relative links problem.
-                $scope.entries = $scope.entries.replace("href\=\"view.php", "href\=\"/mod/data/view.php");
+                });
+
+                entriesHTML += data.listtemplatefooter;
+
+                $scope.entriesRendered = entriesHTML;
             } else if (!$scope.search.searching) {
                 $scope.canSearch = false;
             }
         });
     }
 
-
     // Set group to see the database.
     $scope.setGroup = function(groupId) {
         $scope.selectedGroup = groupId;
@@ -307,6 +345,17 @@ angular.module('mm.addons.mod_data')
         $state.go('site.mod_data-edit', stateParams);
     };
 
+    $scope.gotoEntry = function(entryId) {
+        var stateParams = {
+            module: module,
+            moduleid: module.id,
+            courseid: courseId,
+            entryid: entryId,
+            group: $scope.selectedGroup
+        };
+        $state.go('site.mod_data-entry', stateParams);
+    };
+
     // Refresh online status when changes.
     onlineObserver = $mmEvents.on(mmCoreEventOnlineStatusChanged, function(online) {
         $scope.isOnline = online;
diff --git a/www/addons/mod/data/directives/action.js b/www/addons/mod/data/directives/action.js
new file mode 100644
index 00000000000..0500ce5008b
--- /dev/null
+++ b/www/addons/mod/data/directives/action.js
@@ -0,0 +1,44 @@
+// (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_data')
+
+/**
+ * Directive to render data action.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc directive
+ * @name mmaModDataField
+ */
+.directive('mmaModDataAction', function($mmSite, $mmUser) {
+    return {
+        restrict: 'E',
+        priority: 100,
+        scope: {
+            action: '@',
+            database: '=',
+            entry: '=?'
+        },
+        templateUrl: 'addons/mod/data/templates/action.html',
+        link: function(scope) {
+            scope.url = $mmSite.getURL();
+
+            if (scope.action == 'userpicture') {
+                $mmUser.getProfile(scope.entry.userid, scope.database.courseid).then(function(profile) {
+                    scope.userpicture = profile.profileimageurl;
+                });
+            }
+        }
+    };
+});
diff --git a/www/addons/mod/data/directives/field.js b/www/addons/mod/data/directives/field.js
index c7eab2dfbf0..97039efa03e 100644
--- a/www/addons/mod/data/directives/field.js
+++ b/www/addons/mod/data/directives/field.js
@@ -30,6 +30,7 @@ angular.module('mm.addons.mod_data')
             value: '=?',
             database: '=?',
             error: '=?',
+            viewAction: '&?',
             mode: '@'
         },
         templateUrl: 'addons/mod/data/templates/field.html',
diff --git a/www/addons/mod/data/fields/checkbox/directive.js b/www/addons/mod/data/fields/checkbox/directive.js
index aa40f0bf19c..9615d28647c 100644
--- a/www/addons/mod/data/fields/checkbox/directive.js
+++ b/www/addons/mod/data/fields/checkbox/directive.js
@@ -27,6 +27,12 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/checkbox/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show') {
+                scope.text = scope.value && scope.value.content ? scope.value.content.split("##").join("<br>") : "";
+                return;
+            }
+
             scope.options = scope.field.param1.split("\n");
 
             if (scope.mode == 'edit' && scope.value) {
diff --git a/www/addons/mod/data/fields/checkbox/template.html b/www/addons/mod/data/fields/checkbox/template.html
index df1592037fa..04ab7849e15 100644
--- a/www/addons/mod/data/fields/checkbox/template.html
+++ b/www/addons/mod/data/fields/checkbox/template.html
@@ -1,6 +1,7 @@
-<ion-list>
+<ion-list ng-if="mode != 'show'">
     <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
     <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
     <ion-checkbox ng-repeat="option in options" name="f_{{field.id}}" ng-value="option" ng-model="values[option]">{{ option }}</ion-checkbox>
     <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
-</ion-list>
\ No newline at end of file
+</ion-list>
+<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/date/directive.js b/www/addons/mod/data/fields/date/directive.js
index e544c7b941d..1e23db4adb9 100644
--- a/www/addons/mod/data/fields/date/directive.js
+++ b/www/addons/mod/data/fields/date/directive.js
@@ -27,6 +27,12 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/date/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show') {
+                scope.text = scope.value ? scope.value.content * 1000 : "";
+                return;
+            }
+
             if (scope.mode == 'edit' && scope.value) {
                 scope.enable = true;
             } else {
diff --git a/www/addons/mod/data/fields/date/template.html b/www/addons/mod/data/fields/date/template.html
index 9dccb227e02..b01f5edc6bc 100644
--- a/www/addons/mod/data/fields/date/template.html
+++ b/www/addons/mod/data/fields/date/template.html
@@ -1,4 +1,5 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
-<input type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable && mode == 'search'" ng-value="val">
-<ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_z" ng-model="enable" ng-value="1">{{ 'mma.mod_data.usedate' | translate }}</ion-checkbox>
\ No newline at end of file
+<input ng-if="mode != 'show'" type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable && mode == 'search'" ng-value="val">
+<ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_z" ng-model="enable" ng-value="1">{{ 'mma.mod_data.usedate' | translate }}</ion-checkbox>
+<mm-format-text ng-if="mode == 'show'" watch="true">{{ text | mmFormatDate:"dfdaymonthyear" }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/file/directive.js b/www/addons/mod/data/fields/file/directive.js
index 719219f56f0..a167fc85690 100644
--- a/www/addons/mod/data/fields/file/directive.js
+++ b/www/addons/mod/data/fields/file/directive.js
@@ -27,13 +27,22 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/file/template.html',
         link: function(scope) {
-            if (scope.mode == 'edit') {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show' || scope.mode == 'edit') {
                 scope.component = mmaModDataComponent;
                 scope.componentId = scope.database.coursemodule;
-                scope.maxSizeBytes = parseInt(scope.field.param3, 10);
 
-                scope.files = angular.copy((scope.value && scope.value.files) || []);
-                $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
+                scope.files = angular.copy(scope.value && scope.value.files) || [];
+
+                // Reduce to first element.
+                if (scope.files.length > 0) {
+                    scope.files = [scope.files[0]];
+                }
+
+                if (scope.mode == 'edit') {
+                    scope.maxSizeBytes = parseInt(scope.field.param3, 10);
+                    $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
+                }
             }
         }
     };
diff --git a/www/addons/mod/data/fields/file/handler.js b/www/addons/mod/data/fields/file/handler.js
index ef530875b86..c1482b1ce21 100644
--- a/www/addons/mod/data/fields/file/handler.js
+++ b/www/addons/mod/data/fields/file/handler.js
@@ -83,6 +83,10 @@ angular.module('mm.addons.mod_data')
         var files = $mmFileSession.getFiles(mmaModDataComponent,  field.dataid + '_' + field.id) || [],
             originalFiles = (originalFieldData && originalFieldData.files) || [];
 
+        if (originalFiles.length) {
+            originalFiles = [originalFiles[0]];
+        }
+
         return $mmFileUploaderHelper.areFileListDifferent(files, originalFiles);
     };
 
diff --git a/www/addons/mod/data/fields/file/template.html b/www/addons/mod/data/fields/file/template.html
index dea9aa1eaae..1facd582efa 100644
--- a/www/addons/mod/data/fields/file/template.html
+++ b/www/addons/mod/data/fields/file/template.html
@@ -1,4 +1,10 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
-<mm-attachments ng-if="mode == 'edit'" files="files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
\ No newline at end of file
+<mm-attachments ng-if="mode == 'edit'" files="files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
+<div ng-if="mode == 'show'" ng-repeat="file in files">
+    <!-- Files already attached to the submission. -->
+    <mm-file ng-if="!file.name" file="file" component="{{component}}" component-id="{{componentId}" always-download="true" no-border="true"></mm-file>
+    <!-- Files stored in offline to be sent later. -->
+    <mm-local-file ng-if="file.name" file="file" no-border="true"></mm-local-file>
+</div>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/latlong/directive.js b/www/addons/mod/data/fields/latlong/directive.js
index 9d6c0f68cc0..0f214ac81d0 100644
--- a/www/addons/mod/data/fields/latlong/directive.js
+++ b/www/addons/mod/data/fields/latlong/directive.js
@@ -27,9 +27,25 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/latlong/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
             if (scope.value) {
-                scope.north = scope.value && parseFloat(scope.value.content);
-                scope.east = scope.value && parseFloat(scope.value.content1);
+                scope.north = (scope.value && parseFloat(scope.value.content)) || "";
+                scope.east = (scope.value && parseFloat(scope.value.content1)) || "";
+
+                if (scope.mode == 'show') {
+                    if (scope.north != "" || scope.east != "") {
+                        scope.north = scope.north ? parseFloat(scope.north).toFixed(4) : '0.0000';
+                        scope.east = scope.east ? parseFloat(scope.east).toFixed(4) : '0.0000';
+                        scope.latitude = scope.north < 0 ? -scope.north + '°S' : scope.north + '°N';
+                        scope.longitude = scope.east < 0 ? -scope.east + '°W' : scope.east + '°E';
+
+                        if (ionic.Platform.isIOS()) {
+                            scope.link = "http://maps.apple.com/?ll=" + scope.north + "," + scope.east + "&near=" + scope.north + "," + scope.east;
+                        } else {
+                            scope.link = "geo:"+scope.north+","+scope.east;
+                        }
+                    }
+                }
             }
         }
     };
diff --git a/www/addons/mod/data/fields/latlong/template.html b/www/addons/mod/data/fields/latlong/template.html
index 0b1fa4eef79..545ed0137b5 100644
--- a/www/addons/mod/data/fields/latlong/template.html
+++ b/www/addons/mod/data/fields/latlong/template.html
@@ -9,3 +9,7 @@
     <input type="text" name="f_{{field.id}}_1" ng-model="east" size="10"/>
     <span class="placeholder-icon">°E</span>
 </label>
+
+<a ng-href="{{link}}" ng-if="mode == 'show' && latitude">
+    {{latitude}} {{longitude}}
+</label>
diff --git a/www/addons/mod/data/fields/menu/directive.js b/www/addons/mod/data/fields/menu/directive.js
index a5fbb2032c9..fb046e29fa4 100644
--- a/www/addons/mod/data/fields/menu/directive.js
+++ b/www/addons/mod/data/fields/menu/directive.js
@@ -27,6 +27,12 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/menu/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show') {
+                scope.text = scope.value ? scope.value.content : "";
+                return;
+            }
+
             scope.options = scope.field.param1.split("\n");
 
             if (scope.mode == 'edit' && scope.value) {
diff --git a/www/addons/mod/data/fields/menu/template.html b/www/addons/mod/data/fields/menu/template.html
index 57a7816f6f8..38a0de74239 100644
--- a/www/addons/mod/data/fields/menu/template.html
+++ b/www/addons/mod/data/fields/menu/template.html
@@ -1,8 +1,9 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
-<div class="item item-input item-select">
+<div ng-if="mode != 'show'" class="item item-input item-select">
     <select name="f_{{field.id}}" ng-model="val">
         <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
         <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
     </select>
-</div>
\ No newline at end of file
+</div>
+<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/multimenu/directive.js b/www/addons/mod/data/fields/multimenu/directive.js
index 0979d997763..2c03ba665bb 100644
--- a/www/addons/mod/data/fields/multimenu/directive.js
+++ b/www/addons/mod/data/fields/multimenu/directive.js
@@ -27,6 +27,12 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/multimenu/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show') {
+                scope.text = scope.value && scope.value.content ? scope.value.content.split("##").join("<br>") : "";
+                return;
+            }
+
             scope.options = scope.field.param1.split("\n").map(function(option) {
                 return {key: option, value: option};
             });
diff --git a/www/addons/mod/data/fields/multimenu/template.html b/www/addons/mod/data/fields/multimenu/template.html
index ab193769d07..d5ff2a43fb2 100644
--- a/www/addons/mod/data/fields/multimenu/template.html
+++ b/www/addons/mod/data/fields/multimenu/template.html
@@ -1,4 +1,5 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
-<mm-multiple-select title="{{field.name}}" name="f_{{field.id}}" options="options"></mm-multiple-select>
-<ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
\ No newline at end of file
+<mm-multiple-select ng-if="mode != 'show'" title="{{field.name}}" name="f_{{field.id}}" options="options"></mm-multiple-select>
+<ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
+<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/number/directive.js b/www/addons/mod/data/fields/number/directive.js
index 1d1ed405512..7b0708dc79a 100644
--- a/www/addons/mod/data/fields/number/directive.js
+++ b/www/addons/mod/data/fields/number/directive.js
@@ -27,6 +27,12 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/number/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show') {
+                scope.text = scope.value ? scope.value.content : "";
+                return;
+            }
+
             if (scope.mode == 'edit' && scope.value) {
                 scope.val = scope.value && parseFloat(scope.value.content);
             }
diff --git a/www/addons/mod/data/fields/number/template.html b/www/addons/mod/data/fields/number/template.html
index a688d21785f..ee80050dfb6 100644
--- a/www/addons/mod/data/fields/number/template.html
+++ b/www/addons/mod/data/fields/number/template.html
@@ -1,3 +1,4 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
-<input type="number" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
\ No newline at end of file
+<input ng-if="mode != 'show'" type="number" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
+<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/picture/directive.js b/www/addons/mod/data/fields/picture/directive.js
index 7a903eed71d..9648787bfc4 100644
--- a/www/addons/mod/data/fields/picture/directive.js
+++ b/www/addons/mod/data/fields/picture/directive.js
@@ -27,14 +27,38 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/picture/template.html',
         link: function(scope) {
-            if (scope.mode == 'edit') {
+            if (scope.mode != 'search') {
+                var files = angular.copy(scope.value && scope.value.files) || [];
+
                 scope.component = mmaModDataComponent;
                 scope.componentId = scope.database.coursemodule;
-                scope.maxSizeBytes = parseInt(scope.field.param3, 10);
+                scope.image = false;
+
+                // Get image or thumb.
+                if (files.length > 0) {
+                    var filenameSeek = scope.mode == 'list' ? 'thumb_' + scope.value.content : scope.value.content;
+                    for (var x in files) {
+                        if (files[x].filename == filenameSeek) {
+                            scope.image = angular.copy(files[x]);
+                            break;
+                        }
+                    }
+                    scope.files = [scope.image];
+                } else {
+                    scope.files = [];
+                }
 
-                scope.files = angular.copy((scope.value && scope.value.files) || []);
-                scope.alttext = (scope.value && scope.value.content1) || "";
-                $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
+                if (scope.mode == 'edit') {
+                    scope.maxSizeBytes = parseInt(scope.field.param3, 10);
+                    $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
+                    scope.alttext = (scope.value && scope.value.content1) || "";
+                } else {
+                    scope.entryId = (scope.value && scope.value.recordid) || false;
+                    scope.title = (scope.value && scope.value.content1) || "";
+                    scope.imageUrl = (scope.image && scope.image.fileurl) || false;
+                    scope.width  = scope.field.param1 || "";
+                    scope.height = scope.field.param2 || "";
+                }
             }
         }
     };
diff --git a/www/addons/mod/data/fields/picture/handler.js b/www/addons/mod/data/fields/picture/handler.js
index a9dc56768e2..a62bac04be4 100644
--- a/www/addons/mod/data/fields/picture/handler.js
+++ b/www/addons/mod/data/fields/picture/handler.js
@@ -97,6 +97,20 @@ angular.module('mm.addons.mod_data')
             files = $mmFileSession.getFiles(mmaModDataComponent,  field.dataid + '_' + field.id) || [],
             originalFiles = (originalFieldData && originalFieldData.files) || [];
 
+            // Get image.
+            if (originalFiles.length > 0) {
+                var filenameSeek = (originalFieldData && originalFieldData.content) || "";
+                for (var x in originalFiles) {
+                    if (originalFiles[x].filename == filenameSeek) {
+                        originalFiles = angular.copy(originalFiles[x]);
+                        break;
+                    }
+                }
+                originalFiles = [originalFiles];
+            } else {
+                originalFiles = [];
+            }
+
         return altText != originalAltText || $mmFileUploaderHelper.areFileListDifferent(files, originalFiles);
     };
 
diff --git a/www/addons/mod/data/fields/picture/template.html b/www/addons/mod/data/fields/picture/template.html
index 2a7cc3eba6e..89493cb4e80 100644
--- a/www/addons/mod/data/fields/picture/template.html
+++ b/www/addons/mod/data/fields/picture/template.html
@@ -5,4 +5,7 @@
 <ion-input ng-if="mode == 'edit'" class="item item-input item-stacked-label item-text-wrap">
     <ion-label>{{ 'mma.mod_data.alttext' | translate }}</ion-label>
     <input type="text" name="f_{{field.id}}_alttext" placeholder="{{ 'mma.mod_data.alttext' | translate }}" ng-model="alttext">
-</ion-input>
\ No newline at end of file
+</ion-input>
+
+<span ng-if="mode == 'list' && imageUrl" ng-click="viewAction()"><img ng-src="{{imageUrl}}" alt="{{title}}" title="{{title}}" class="list_picture" mm-external-content/></span>
+<img ng-if="mode == 'show' && imageUrl" ng-src="{{imageUrl}}" alt="{{title}}" title="{{title}}" class="list_picture" width="{{width}}" height="{{height}}" mm-external-content/>
diff --git a/www/addons/mod/data/fields/radiobutton/directive.js b/www/addons/mod/data/fields/radiobutton/directive.js
index 48e1e23039e..4d33daace68 100644
--- a/www/addons/mod/data/fields/radiobutton/directive.js
+++ b/www/addons/mod/data/fields/radiobutton/directive.js
@@ -27,6 +27,12 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/radiobutton/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show') {
+                scope.text = scope.value ? scope.value.content : "";
+                return;
+            }
+
             scope.options = scope.field.param1.split("\n");
 
             if (scope.mode == 'edit' && scope.value) {
diff --git a/www/addons/mod/data/fields/radiobutton/template.html b/www/addons/mod/data/fields/radiobutton/template.html
index 57a7816f6f8..38a0de74239 100644
--- a/www/addons/mod/data/fields/radiobutton/template.html
+++ b/www/addons/mod/data/fields/radiobutton/template.html
@@ -1,8 +1,9 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
-<div class="item item-input item-select">
+<div ng-if="mode != 'show'" class="item item-input item-select">
     <select name="f_{{field.id}}" ng-model="val">
         <option value="">{{ 'mma.mod_data.menuchoose' | translate }}</option>
         <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
     </select>
-</div>
\ No newline at end of file
+</div>
+<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/text/directive.js b/www/addons/mod/data/fields/text/directive.js
index 7517e5775ba..dc6352f4a16 100644
--- a/www/addons/mod/data/fields/text/directive.js
+++ b/www/addons/mod/data/fields/text/directive.js
@@ -27,6 +27,12 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/text/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show') {
+                scope.text = scope.value ? scope.value.content : "";
+                return;
+            }
+
             if (scope.mode == 'edit' && scope.value) {
                 scope.val = scope.value.content;
             }
diff --git a/www/addons/mod/data/fields/text/template.html b/www/addons/mod/data/fields/text/template.html
index ab1fd196e5d..926a77c56c0 100644
--- a/www/addons/mod/data/fields/text/template.html
+++ b/www/addons/mod/data/fields/text/template.html
@@ -1,3 +1,4 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
\ No newline at end of file
+<input ng-if="mode != 'show'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
+<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/textarea/directive.js b/www/addons/mod/data/fields/textarea/directive.js
index c5d3a500806..58edaf071c7 100644
--- a/www/addons/mod/data/fields/textarea/directive.js
+++ b/www/addons/mod/data/fields/textarea/directive.js
@@ -21,12 +21,23 @@ angular.module('mm.addons.mod_data')
  * @ngdoc directive
  * @name mmaModDataFieldTextarea
  */
-.directive('mmaModDataFieldTextarea', function($mmUtil, $mmText) {
+.directive('mmaModDataFieldTextarea', function($mmUtil, $mmText, mmaModDataComponent) {
     return {
         restrict: 'A',
         priority: 100,
         templateUrl: 'addons/mod/data/fields/textarea/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show') {
+                scope.component = mmaModDataComponent;
+                scope.componentId = scope.database.coursemodule;
+
+                var files = (scope.value && scope.value.files) || [];
+
+                scope.text = scope.value ? $mmText.replacePluginfileUrls(scope.value.content, files) : "";
+                return;
+            }
+
             // Check if rich text editor is enabled.
             if (scope.mode == 'edit') {
                 $mmUtil.isRichTextEditorEnabled().then(function(enabled) {
diff --git a/www/addons/mod/data/fields/textarea/template.html b/www/addons/mod/data/fields/textarea/template.html
index c7046fd319d..f3623b92ab7 100644
--- a/www/addons/mod/data/fields/textarea/template.html
+++ b/www/addons/mod/data/fields/textarea/template.html
@@ -3,4 +3,5 @@
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
 <div ng-if="mode == 'edit'" class="item item-text-wrap mm-item-has-rich-text-editor">
     <mm-rich-text-editor model="model" placeholder="{{ field.name }}" name="f_{{field.id}}" component="{{component}}" component-id="{{componentId}}" first-render="firstRender()"></mm-rich-text-editor>
-</div>
\ No newline at end of file
+</div>
+<mm-format-text ng-if="mode == 'show'" watch="true" component="{{component}}" component-id="{{componentId}}">{{ text }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/url/directive.js b/www/addons/mod/data/fields/url/directive.js
index 92b942ab12a..e621cbe2e3f 100644
--- a/www/addons/mod/data/fields/url/directive.js
+++ b/www/addons/mod/data/fields/url/directive.js
@@ -27,6 +27,12 @@ angular.module('mm.addons.mod_data')
         priority: 100,
         templateUrl: 'addons/mod/data/fields/url/template.html',
         link: function(scope) {
+            scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
+            if (scope.mode == 'show') {
+                scope.text = scope.value ? scope.value.content : "";
+                return;
+            }
+
             if (scope.mode == 'edit' && scope.value) {
                 scope.val = scope.value.content;
             }
diff --git a/www/addons/mod/data/fields/url/template.html b/www/addons/mod/data/fields/url/template.html
index d5c7fd11aa4..e313e99289b 100644
--- a/www/addons/mod/data/fields/url/template.html
+++ b/www/addons/mod/data/fields/url/template.html
@@ -1,2 +1,3 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
-<input type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
\ No newline at end of file
+<input ng-if="mode != 'show'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
+<mm-format-text ng-if="mode == 'show'" watch="true"><a ng-href="text">{{text}}</a></mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index 5c137b1c2d1..01844673606 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -2,6 +2,7 @@
     "addentries": "Add entries",
     "advancedsearch": "Advanced search",
     "alttext": "Alternative text",
+    "approve": "Approve",
     "approved": "Approved",
     "authorfirstname": "Author first name",
     "authorlastname": "Author surname",
@@ -10,6 +11,7 @@
     "authorlastname": "Author surname",
     "confirmdeleterecord": "Are you sure you want to delete this entry?",
     "descending": "Descending",
+    "disapprove": "Undo approval",
     "emptyaddform": "You did not fill out any fields!",
     "entrieslefttoadd": "You must add {{$a.entriesleft}} more entry/entries in order to complete this activity",
     "entrieslefttoaddtoview": "You must add {{$a.entrieslefttoview}} more entry/entries before you can view other participants' entries.",
@@ -18,8 +20,10 @@
     "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "fields": "Fields",
     "menuchoose": "Choose...",
+    "more": "More",
     "nomatch": "No matching entries found!",
     "norecords": "No entries in database",
+    "notapproved": "Entry is not approved yet.",
     "notopenyet": "Sorry, this activity is not available until {{$a}}",
     "numrecords": "{{$a}} entries",
     "other": "Other",
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 27d5674fb35..d088c2ba4d1 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc controller
  * @name $mmaModData
  */
-.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage,
+.factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage, $mmApp, $mmUtil,
         $mmaModDataOffline) {
     var self = {};
 
@@ -414,10 +414,9 @@ angular.module('mm.addons.mod_data')
         // Get if the opposite action is not synced.
         var action = approve ? 'disapprove' : 'approve';
         return $mmaModDataOffline.getEntry(dataId, entryId, action, siteId).then(function(entry) {
-            if (entry) {
-                // Found. Just delete the action.
-                return $mmaModDataOffline.deleteEntry(dataId, entryId, action, siteId);
-            }
+            // Found. Just delete the action.
+            return $mmaModDataOffline.deleteEntry(dataId, entryId, action, siteId);
+        }).catch(function() {
 
             if (!$mmApp.isOnline()) {
                 // App is offline, store the action.
@@ -484,6 +483,7 @@ angular.module('mm.addons.mod_data')
      */
     self.deleteEntry = function(dataId, entryId, courseId, siteId) {
         siteId = siteId || $mmSite.getId();
+        var justAdded = false;
 
         // Get if the opposite action is not synced.
         return $mmaModDataOffline.getEntryActions(dataId, entryId, siteId).then(function(entries) {
@@ -491,19 +491,26 @@ angular.module('mm.addons.mod_data')
                 // Found. Delete other actions first.
                 var proms = [];
                 angular.forEach(entries, function(entry) {
+                    if (entry.action == 'add') {
+                        justAdded = true;
+                    }
                     proms.push($mmaModDataOffline.deleteEntry(dataId, entryId, entry.action, siteId));
                 });
 
                 return $q.all(proms);
             }
         }).then(function(){
+            if (justAdded) {
+                // The field was added offline, delete and stop.
+                return;
+            }
+
             if (!$mmApp.isOnline()) {
                 // App is offline, store the action.
                 return storeOffline();
             }
 
             return self.deleteEntryOnline(entryId, siteId).catch(function(error) {
-                console.error(error);
                 if (error && !error.wserror) {
                     // Couldn't connect to server, store in offline.
                     return storeOffline();
diff --git a/www/addons/mod/data/services/data_offline.js b/www/addons/mod/data/services/data_offline.js
index 77838ce2821..c404cc7a9b4 100644
--- a/www/addons/mod/data/services/data_offline.js
+++ b/www/addons/mod/data/services/data_offline.js
@@ -142,7 +142,7 @@ angular.module('mm.addons.mod_data')
      */
     self.getDatabaseEntries = function(dataId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
-            return site.getDb().whereEqual(mmaModDataEntriesStore, 'dataid', [dataId]);
+            return site.getDb().whereEqual(mmaModDataEntriesStore, 'dataid', dataId);
         });
     };
 
@@ -183,12 +183,11 @@ angular.module('mm.addons.mod_data')
     self.saveEntry = function(dataId, entryId, action, courseId, fields, timemodified, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             timemodified = timemodified || new Date().getTime();
-
             var entry = {
                     dataid: dataId,
                     courseid: courseId,
                     action: action,
-                    entryid: -(entryId || timemodified),
+                    entryid: entryId || -timemodified,
                     fields: fields,
                     timemodified: timemodified
                 };
diff --git a/www/addons/mod/data/services/handlers.js b/www/addons/mod/data/services/handlers.js
index 654a72f3c17..65c5ac4ca47 100644
--- a/www/addons/mod/data/services/handlers.js
+++ b/www/addons/mod/data/services/handlers.js
@@ -243,12 +243,15 @@ angular.module('mm.addons.mod_data')
                     entryId = parseInt(params.approve, 10) || parseInt(params.disapprove, 10),
                     approve = parseInt(params.approve, 10) ? true : false;
 
-                // Approve/disapprove entry.
-                return $mmaModData.approveEntry(dataId, entryId, approve, courseId, siteId).catch(function(message) {
-                    modal.dismiss();
-                    $mmUtil.showErrorModal(message, 'mma.mod_data.errorapproving', true);
+                return $mmCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId).then(function(module) {
 
-                    return $q.reject();
+                    // Approve/disapprove entry.
+                    return $mmaModData.approveEntry(dataId, entryId, approve, module.course, siteId).catch(function(message) {
+                        modal.dismiss();
+                        $mmUtil.showErrorModal(message, 'mma.mod_data.errorapproving', true);
+
+                        return $q.reject();
+                    });
                 }).then(function() {
                     var promises = [];
                     promises.push($mmaModData.invalidateEntryData(dataId, entryId, siteId));
@@ -297,12 +300,14 @@ angular.module('mm.addons.mod_data')
                         dataId = parseInt(params.d, 10),
                         entryId = parseInt(params.delete, 10);
 
-                    // Delete entry.
-                    return $mmaModData.deleteEntry(dataId, entryId, courseId, siteId, true).catch(function(message) {
-                        modal.dismiss();
-                        $mmUtil.showErrorModal(message, 'mma.mod_data.errordeleting', true);
+                    return $mmCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId).then(function(module) {
+                        // Delete entry.
+                        return $mmaModData.deleteEntry(dataId, entryId, module.course, siteId, true).catch(function(message) {
+                            modal.dismiss();
+                            $mmUtil.showErrorModal(message, 'mma.mod_data.errordeleting', true);
 
-                        return $q.reject();
+                            return $q.reject();
+                        });
                     }).then(function() {
                         var promises = [];
                         promises.push($mmaModData.invalidateEntryData(dataId, entryId, siteId));
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 170a1ab095a..67b88943f25 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -30,6 +30,82 @@ angular.module('mm.addons.mod_data')
             }
         };
 
+    /**
+     * Displays fields for being shown.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#displayShowFields
+     * @param {String} template   Template HMTL.
+     * @param {Array}  fields     Fields that defines every content in the entry.
+     * @param {Number} entryId    Entry ID.
+     * @param {String} mode       Mode list or show.
+     * @param {Object} actions    Actions that can be performed to the record.
+     * @return {String}           Generated HTML.
+     */
+    self.displayShowFields = function(template, fields, entryId, mode, actions) {
+        var replace;
+
+        // Replace the fields found on template.
+        angular.forEach(fields, function(field) {
+            replace = "[[" + field.name + "]]";
+            replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            replace = new RegExp(replace, 'g');
+
+            // Replace field by a generic directive.
+            var render = '<mma-mod-data-field mode="'+mode+'" field="fields['+ field.id + ']" value="entryContents['+ entryId +']['+ field.id + ']" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
+            template = template.replace(replace, render);
+        });
+
+        angular.forEach(actions, function(enabled, action) {
+            replace = new RegExp("##" + action + "##", 'g');
+            if (enabled) {
+                var render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +']" database="data"></mma-mod-data-action>';
+                template = template.replace(replace, render);
+            } else {
+                template = template.replace(replace, "");
+            }
+        });
+
+        return template;
+    };
+
+    /**
+     * Returns an object with all the actions that the user can do over the record.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getActions
+     * @param {Object}  database     Database activity.
+     * @param {Object}  accessInfo   Access info to the activity.
+     * @param {Object}  record       Entry or record where the actions will be performed.
+     * @return {Object}              Keyed with the action names and boolean to evalute if it can or cannot be done.
+     */
+    self.getActions = function(database, accessInfo, record) {
+        var replacements = {};
+
+        replacements.more = true;
+        replacements.moreurl = true;
+        replacements.user = true;
+        replacements.userpicture = true;
+        replacements.timeadded = true;
+        replacements.timemodified = true;
+
+        replacements.edit = accessInfo.canmanageentries || (accessInfo.inreadonlyperiod && record.canmanageentry);
+        replacements.delete = replacements.edit;
+        replacements.approve = database.approval && accessInfo.canapprove && !record.approved;
+        replacements.disapprove = database.approval && accessInfo.canapprove && record.approved;
+
+        replacements.approvalstatus = database.approval;
+        replacements.comments = database.comments;
+
+        // Unsupported actions.
+        replacements.delcheck = false;
+        replacements.export = false;
+
+        return replacements;
+    };
+
     /**
      * Displays Advanced Search Fields.
      *
@@ -47,7 +123,7 @@ angular.module('mm.addons.mod_data')
         angular.forEach(fields, function(field) {
             replace = "[[" + field.name + "]]";
             replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-            replace = new RegExp(replace);
+            replace = new RegExp(replace, 'g');
 
             // Replace field by a generic directive.
             var render = '<mma-mod-data-field mode="search" field="fields['+ field.id + ']"></mma-mod-data-field>';
@@ -56,7 +132,7 @@ angular.module('mm.addons.mod_data')
 
         // Not pluginable other search elements.
         angular.forEach(self.searchOther, function(field, name) {
-            replace = new RegExp("##" + field + "##");
+            replace = new RegExp("##" + field + "##", 'g');
 
             // Replace field by the text input.
             var render = '<input type="text" name="' + name + '" placeholder="{{ \'mma.mod_data.author' + field + '\' | translate }}">';
@@ -162,7 +238,7 @@ angular.module('mm.addons.mod_data')
         angular.forEach(fields, function(field) {
             replace = "[[" + field.name + "]]";
             replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-            replace = new RegExp(replace);
+            replace = new RegExp(replace, 'g');
 
             // Replace field by a generic directive.
             var render = '<mma-mod-data-field mode="edit" field="fields['+ field.id + ']" value="entryContents['+ field.id + ']" database="data" error="errors['+ field.id + ']"></mma-mod-data-field>';
@@ -171,7 +247,7 @@ angular.module('mm.addons.mod_data')
             // Replace the field id tag.
             replace = "[[" + field.name + "#id]]";
             replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-            replace = new RegExp(replace);
+            replace = new RegExp(replace, 'g');
 
             template = template.replace(replace, 'field_'+ field.id);
         });
@@ -354,48 +430,6 @@ angular.module('mm.addons.mod_data')
         return css.replace(regExp, prefix + " $1 $2");
     };
 
-    /**
-     * Replaces HTML comments by MM native comments.
-     *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataHelper#replaceComments
-     * @param {String} html             HTML to be replaced.
-     * @param {Array}  entries          Entries to be placed in the comments.
-     * @param {Number} commentsNumber   Number of times we have to add the comments to every entry.
-     * @return {String}                 HTML with native comments.
-     */
-    self.replaceComments = function(html, entries, commentsNumber) {
-        html = angular.element(html);
-
-        var links = html.find('a'),
-            entryIdx = 0,
-            timesAdded = 0;
-
-        // Replace current comment area by the native directive.
-        angular.forEach(links, function(link) {
-            link = angular.element(link);
-            if (link.hasClass('showcommentsnonjs')) {
-                var entryId = entries[entryIdx].id;
-                link.parent().replaceWith('<mm-comments context-level="module" instance-id="{{data.coursemodule}}" component="mod_data" item-id="' + entryId + '" area="database_entry"></mm-comments>');
-
-                // Only go forward the entries array if we've added the comments this number of times.
-                timesAdded++;
-                if (timesAdded >= commentsNumber) {
-                    entryIdx++;
-                    timesAdded = 0;
-                }
-            }
-        });
-
-        var content = "";
-        angular.forEach(html, function(entry) {
-            content += entry.outerHTML;
-        });
-        return content;
-    };
-
-
     /**
      * Get page info related to an entry.
      *
diff --git a/www/addons/mod/data/templates/action.html b/www/addons/mod/data/templates/action.html
new file mode 100644
index 00000000000..63cde9545e0
--- /dev/null
+++ b/www/addons/mod/data/templates/action.html
@@ -0,0 +1,23 @@
+<a ng-if="action == 'more'" class="button button-icon icon ion-ios-search-strong" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&rid={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.more' | translate }}"></a>
+<a ng-if="action == 'edit'" class="button button-icon icon ion-gear-b" ng-href="{{url}}/mod/data/edit.php?d={{entry.dataid}}&rid={{entry.id}}" mm-link capture-link="true" title="{{ 'mm.core.edit' | translate }}"></a>
+<a ng-if="action == 'delete'" class="button button-icon icon ion-trash-a" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&delete={{entry.id}}" mm-link capture-link="true" title="{{ 'mm.core.delete' | translate }}"></a>
+<a ng-if="action == 'approve'" class="button button-icon icon ion-thumbsup" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&approve={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.approve' | translate }}"></a>
+<a ng-if="action == 'disapprove'" class="button button-icon icon ion-minus-circled" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&disapprove={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.disapprove' | translate }}"></a>
+
+<mm-comments ng-if="action == 'comments'" context-level="module" instance-id="{{database.coursemodule}}" component="mod_data" item-id="{{entry.id}}" area="database_entry"></mm-comments>
+
+<span ng-if="action == 'moreurl'">{{url}}/mod/data/view.php?d={{entry.dataid}}&amp;rid={{entry.id}}</span>
+<span ng-if="action == 'timeadded'">{{ entry.timecreated * 1000 |  mmFormatDate:"dffulldate" }}</span>
+<span ng-if="action == 'timemodified'">{{ entry.timemodified * 1000 |  mmFormatDate:"dffulldate" }}</span>
+
+<span ng-if="action == 'approvalstatus'">
+    <span ng-if="entry.approved">{{ 'mma.mod_data.approved' | translate }}</span>
+    <span ng-if="!entry.approved">{{ 'mma.mod_data.notapproved' | translate }}</span>
+</span>
+
+<a ng-if="action == 'userpicture'" mm-user-link courseid="{{database.courseid}}" userid="{{entry.userid}}" title="{{entry.fullname}}">
+    <img ng-if="userpicture" ng-src="{{userpicture}}" class="avatar-round" alt="{{ 'mm.core.pictureof' | translate:{$a: entry.fullname} }}" role="presentation" mm-external-content>
+    <img ng-if="!userpicture" class="avatar-round" src="img/user-avatar.png" alt="{{ 'mm.core.pictureof' | translate:{$a: entry.fullname} }}" role="presentation">
+</a>
+
+<a ng-if="action == 'user'" mm-user-link courseid="{{database.courseid}}" userid="{{entry.userid}}" title="{{entry.fullname}}">{{entry.fullname}}</a>
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
index d222c017188..5015b47d459 100644
--- a/www/addons/mod/data/templates/index.html
+++ b/www/addons/mod/data/templates/index.html
@@ -21,6 +21,11 @@
                 </div>
             </div>
 
+            <!-- Database entries 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 ng-if="(groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
                 <ion-label id="mma-data-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
                 <ion-label id="mma-data-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
@@ -54,7 +59,7 @@ <h2>{{ 'mma.mod_data.numrecords' | translate: {$a: numEntries } }}</h2>
                 </style>
 
                 <mm-format-text component="{{component}}" component-id="{{data.cmid}}" watch="true">
-                    {{ entries }}
+                    {{ entriesRendered }}
                 </mm-format-text>
             </div>
 
diff --git a/www/core/directives/link.js b/www/core/directives/link.js
index 4e067bc5179..5c6bc32f62e 100644
--- a/www/core/directives/link.js
+++ b/www/core/directives/link.js
@@ -67,7 +67,7 @@ angular.module('mm.core')
                 }
             } else {
                 // Check if URL does not have any protocol, so it's a relative URL.
-                if (!$mmUtil.isAbsoluteURL(url)) {
+                if (!$mmUtil.isAbsoluteURL(href)) {
                     // Add the site URL at the begining.
                     if (href.charAt(0) == '/') {
                         href = $mmSite.getURL() + href;
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 62f14561477..09dd660264c 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -353,6 +353,13 @@ p.item-text-wrap {
     height: 100%;
     border-radius: 50%;
 }
+.avatar-round {
+  max-width: 40px;
+  max-height: 40px;
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+}
 
 // Split pane.
 .mm-split-pane {

From 604edd5dd864ad52b736f0dbf08deb1556e17a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 6 Jul 2017 13:18:56 +0200
Subject: [PATCH 065/118] MOBILE-2127 data: Offline approve, disapprove and
 delete actions

---
 www/addons/mod/data/controllers/entry.js      | 38 ++++++++++++++++---
 www/addons/mod/data/controllers/index.js      | 33 +++++++---------
 www/addons/mod/data/directives/action.js      | 13 ++++++-
 .../mod/data/fields/picture/template.html     |  4 +-
 www/addons/mod/data/lang/en.json              |  1 +
 www/addons/mod/data/services/helper.js        | 37 ++++++++++++++++--
 www/addons/mod/data/templates/action.html     |  3 +-
 www/addons/mod/data/templates/entry.html      |  8 +++-
 8 files changed, 103 insertions(+), 34 deletions(-)

diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index 1288a632512..fd4ec958def 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataEntryCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $q, $mmEvents,
         $mmText, $translate, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups, $ionicScrollDelegate, mmaModDataEventEntryChanged,
-        $ionicHistory) {
+        $ionicHistory, $mmaModDataOffline) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -31,7 +31,9 @@ angular.module('mm.addons.mod_data')
         page = $stateParams.page || false,
         data,
         entryChangedObserver,
-        scrollView;
+        scrollView,
+        access,
+        offlineActions = [];
 
     $scope.title = module.name;
     $scope.description = module.description;
@@ -40,6 +42,7 @@ angular.module('mm.addons.mod_data')
     $scope.component = mmaModDataComponent;
     $scope.databaseLoaded = false;
     $scope.selectedGroup = $stateParams.group || 0;
+    $scope.entries = {};
 
     function fetchEntryData(refresh) {
         return $mmaModData.getDatabase(courseId, module.id).then(function(databaseData) {
@@ -49,12 +52,11 @@ angular.module('mm.addons.mod_data')
             $scope.description = data.intro || $scope.description;
             $scope.data = databaseData;
 
-            $scope.database = data;
-
             return setEntryIdFromPage(data.id, page, $scope.selectedGroup).then(function() {
                 return $mmaModData.getDatabaseAccessInformation(data.id);
             });
         }).then(function(accessData) {
+            access = accessData;
             return $mmGroups.getActivityGroupInfo(data.coursemodule, accessData.canmanageentries).then(function(groupInfo) {
                 $scope.groupInfo = groupInfo;
 
@@ -72,11 +74,37 @@ angular.module('mm.addons.mod_data')
                     }
                 }
 
+                return $mmaModDataOffline.getEntryActions(data.id, entryId);
+            });
+        }).then(function(actions) {
+            offlineActions = actions;
+            $scope.hasOffline = !!offlineActions.length;
+
+            return $mmaModData.getFields(data.id).then(function(fieldsData) {
+                $scope.fields = {};
+                angular.forEach(fieldsData, function(field) {
+                    $scope.fields[field.id] = field;
+                });
+
                 return $mmaModData.getEntry(data.id, entryId);
             });
         }).then(function(entry) {
+            entry = entry.entry;
             $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
-            $scope.entryContents = entry.entryviewcontents;
+
+            // Index contents by fieldid.
+            var contents = {};
+            angular.forEach(entry.contents, function(field) {
+                contents[field.fieldid] = field;
+            });
+            entry.contents = contents;
+
+            $scope.entry = $mmaModDataHelper.applyOfflineActions(entry, offlineActions);
+            $scope.entries[entryId] = $scope.entry;
+
+            var actions = $mmaModDataHelper.getActions(data, access, $scope.entry);
+
+            $scope.entryRendered = $mmaModDataHelper.displayShowFields(data.singletemplate, $scope.fields, entryId, 'show', actions);
 
             return $mmaModDataHelper.getPageInfoByEntry(data.id, entryId, $scope.selectedGroup).then(function(result) {
                 $scope.previousId = result.previousId;
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 10ff6c25bcb..ff7fac33e43 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -145,23 +145,15 @@ angular.module('mm.addons.mod_data')
         return $mmaModDataOffline.getDatabaseEntries(data.id).then(function(offlineEntries) {
             $scope.hasOffline = !!offlineEntries.length;
 
-            $scope.offlineEntries = {};
+            $scope.offlineActions = {};
 
             // Only show offline entries on first page.
             if ($scope.search.page == 0 && $scope.hasOffline) {
                 angular.forEach(offlineEntries, function(entry) {
-                    if (typeof $scope.offlineEntries[entry.entryid] == "undefined") {
-                        $scope.offlineEntries[entry.entryid] = {
-                            actions: [],
-                            entry: false,
-                            id: entry.entryid,
-
-                        };
-                    }
-                    if (entry.action == 'add') {
-                        $scope.offlineEntries[entry.entryid].entry = entry.fields;
+                    if (typeof $scope.offlineActions[entry.entryid] == "undefined") {
+                        $scope.offlineActions[entry.entryid] = [];
                     }
-                    $scope.offlineEntries[entry.entryid].actions.push(entry);
+                    $scope.offlineActions[entry.entryid].push(entry);
                 });
             }
         });
@@ -185,7 +177,7 @@ angular.module('mm.addons.mod_data')
             }
         }).then(function(entries) {
             $scope.numEntries = entries && entries.totalcount;
-            $scope.isEmpty = $scope.numEntries <= 0 && $scope.offlineEntries.length <= 0;
+            $scope.isEmpty = $scope.numEntries <= 0 && $scope.offlineActions.length <= 0;
             $scope.hasNextPage = (($scope.search.page + 1) * mmaModDataPerPage) < $scope.numEntries;
             $scope.entriesRendered = "";
 
@@ -194,23 +186,24 @@ angular.module('mm.addons.mod_data')
 
                 var entriesHTML = data.listtemplateheader;
 
-                $scope.entryContents = {};
-
                 angular.forEach(entries.entries, function(entry) {
+
+                    // Index contents by fieldid.
                     var contents = {};
                     angular.forEach(entry.contents, function(field) {
                         contents[field.fieldid] = field;
                     });
-                    $scope.entryContents[entry.id] = contents;
+                    entry.contents = contents;
+
+                    if (typeof $scope.offlineActions[entry.id] != "undefined") {
+                        entry = $mmaModDataHelper.applyOfflineActions(entry, $scope.offlineActions[entry.id]);
+                    }
 
                     $scope.entries[entry.id] = entry;
 
                     var actions = $mmaModDataHelper.getActions(data, $scope.access, entry);
 
                     entriesHTML += $mmaModDataHelper.displayShowFields(data.listtemplate, $scope.fields, entry.id, 'list', actions);
-                    if (typeof $scope.offlineEntries[entry.id] != "undefined") {
-                        $scope.offlineEntries[entry.id].entry = entry;
-                    }
                 });
 
                 entriesHTML += data.listtemplatefooter;
@@ -363,7 +356,7 @@ angular.module('mm.addons.mod_data')
 
     // Refresh entry on change.
     entryChangedObserver = $mmEvents.on(mmaModDataEventEntryChanged, function(eventData) {
-        if (data.id == eventData.dataId && $mmSite.getId() == eventData.siteId) {
+        if (data.id == eventData.dataId && siteId == eventData.siteId) {
             $scope.databaseLoaded = false;
             return fetchDatabaseData(true);
         }
diff --git a/www/addons/mod/data/directives/action.js b/www/addons/mod/data/directives/action.js
index 0500ce5008b..35772abe366 100644
--- a/www/addons/mod/data/directives/action.js
+++ b/www/addons/mod/data/directives/action.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc directive
  * @name mmaModDataField
  */
-.directive('mmaModDataAction', function($mmSite, $mmUser) {
+.directive('mmaModDataAction', function($mmSite, $mmUser, $mmaModDataOffline, $mmSite, $mmEvents, mmaModDataEventEntryChanged) {
     return {
         restrict: 'E',
         priority: 100,
@@ -39,6 +39,17 @@ angular.module('mm.addons.mod_data')
                     scope.userpicture = profile.profileimageurl;
                 });
             }
+
+            scope.undoDelete = function(entryId) {
+                var dataId = scope.database.id,
+                    entryId = scope.entry.id;
+                return $mmaModDataOffline.getEntry(dataId, entryId, 'delete').then(function(entry) {
+                    // Found. Just delete the action.
+                    return $mmaModDataOffline.deleteEntry(dataId, entryId, 'delete');
+                }).then(function() {
+                    $mmEvents.trigger(mmaModDataEventEntryChanged, {dataId: dataId, entryId: entryId, siteId: $mmSite.getId()});
+                });
+            };
         }
     };
 });
diff --git a/www/addons/mod/data/fields/picture/template.html b/www/addons/mod/data/fields/picture/template.html
index 89493cb4e80..908b6e8cca1 100644
--- a/www/addons/mod/data/fields/picture/template.html
+++ b/www/addons/mod/data/fields/picture/template.html
@@ -7,5 +7,5 @@
     <input type="text" name="f_{{field.id}}_alttext" placeholder="{{ 'mma.mod_data.alttext' | translate }}" ng-model="alttext">
 </ion-input>
 
-<span ng-if="mode == 'list' && imageUrl" ng-click="viewAction()"><img ng-src="{{imageUrl}}" alt="{{title}}" title="{{title}}" class="list_picture" mm-external-content/></span>
-<img ng-if="mode == 'show' && imageUrl" ng-src="{{imageUrl}}" alt="{{title}}" title="{{title}}" class="list_picture" width="{{width}}" height="{{height}}" mm-external-content/>
+<span ng-if="mode == 'list' && imageUrl" ng-click="viewAction()"><img ng-src="{{imageUrl}}" alt="{{title}}" title="{{title}}" class="mm-media-adapt-width list_picture" mm-external-content/></span>
+<img ng-if="mode == 'show' && imageUrl" ng-src="{{imageUrl}}" alt="{{title}}" title="{{title}}" class="mm-media-adapt-width list_picture" width="{{width}}" height="{{height}}" mm-external-content/>
diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index 01844673606..02625ac2d3a 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -31,6 +31,7 @@
     "recorddeleted": "Entry deleted",
     "recorddisapproved": "Entry unapproved",
     "resetsettings": "Reset filters",
+    "restore": "Restore",
     "search": "Search",
     "selectedrequired": "All selected required",
     "timeadded": "Time added",
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 67b88943f25..7dc10838bb5 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -44,7 +44,7 @@ angular.module('mm.addons.mod_data')
      * @return {String}           Generated HTML.
      */
     self.displayShowFields = function(template, fields, entryId, mode, actions) {
-        var replace;
+        var replace, render;
 
         // Replace the fields found on template.
         angular.forEach(fields, function(field) {
@@ -53,14 +53,14 @@ angular.module('mm.addons.mod_data')
             replace = new RegExp(replace, 'g');
 
             // Replace field by a generic directive.
-            var render = '<mma-mod-data-field mode="'+mode+'" field="fields['+ field.id + ']" value="entryContents['+ entryId +']['+ field.id + ']" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
+            render = '<mma-mod-data-field mode="'+mode+'" field="fields['+ field.id + ']" value="entries['+ entryId +'].contents['+ field.id + ']" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
             template = template.replace(replace, render);
         });
 
         angular.forEach(actions, function(enabled, action) {
             replace = new RegExp("##" + action + "##", 'g');
             if (enabled) {
-                var render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +']" database="data"></mma-mod-data-action>';
+                render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +']" database="data"></mma-mod-data-action>';
                 template = template.replace(replace, render);
             } else {
                 template = template.replace(replace, "");
@@ -106,6 +106,35 @@ angular.module('mm.addons.mod_data')
         return replacements;
     };
 
+    /**
+     * Returns the record with the offline actions applied.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#applyOfflineActions
+     * @param  {Object} record         Entry to modify.
+     * @param  {Object} offlineActions Offline data with the actions done.
+     * @return {Object}                Modified entry.
+     */
+    self.applyOfflineActions = function(record, offlineActions) {
+        console.error(record, offlineActions);
+
+        angular.forEach(offlineActions, function(action) {
+            switch (action.action) {
+                case 'approve':
+                    record.approved = true;
+                    break;
+                case 'disapprove':
+                    record.approved = false;
+                    break;
+                case 'delete':
+                    record.deleted = true;
+                    break;
+            }
+        });
+        return record;
+    };
+
     /**
      * Displays Advanced Search Fields.
      *
@@ -501,7 +530,7 @@ angular.module('mm.addons.mod_data')
      * @return {Promise}        Containing and array of EntryId.
      */
     self.getAllEntriesIds = function(dataId, groupId, siteId) {
-        return $mmaModData.fetchAllEntries(dataId, groupId, undefined, undefined, undefined, undefined, true, undefined, siteId)
+        return $mmaModData.fetchAllEntries(dataId, groupId, undefined, undefined, undefined, true, undefined, undefined, siteId)
                 .then(function(entries) {
             return entries.map(function(entry) {
                 return entry.id;
diff --git a/www/addons/mod/data/templates/action.html b/www/addons/mod/data/templates/action.html
index 63cde9545e0..5d2c9026dd3 100644
--- a/www/addons/mod/data/templates/action.html
+++ b/www/addons/mod/data/templates/action.html
@@ -1,6 +1,7 @@
 <a ng-if="action == 'more'" class="button button-icon icon ion-ios-search-strong" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&rid={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.more' | translate }}"></a>
 <a ng-if="action == 'edit'" class="button button-icon icon ion-gear-b" ng-href="{{url}}/mod/data/edit.php?d={{entry.dataid}}&rid={{entry.id}}" mm-link capture-link="true" title="{{ 'mm.core.edit' | translate }}"></a>
-<a ng-if="action == 'delete'" class="button button-icon icon ion-trash-a" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&delete={{entry.id}}" mm-link capture-link="true" title="{{ 'mm.core.delete' | translate }}"></a>
+<a ng-if="action == 'delete' && !entry.deleted" class="button button-icon icon ion-trash-a" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&delete={{entry.id}}" mm-link capture-link="true" title="{{ 'mm.core.delete' | translate }}"></a>
+<a ng-if="action == 'delete' && entry.deleted" class="button button-icon icon ion-reply" ng-click="undoDelete(entry.id)" mm-link capture-link="true" title="{{ 'mma.mod_data.restore' | translate }}"></a>
 <a ng-if="action == 'approve'" class="button button-icon icon ion-thumbsup" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&approve={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.approve' | translate }}"></a>
 <a ng-if="action == 'disapprove'" class="button button-icon icon ion-minus-circled" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&disapprove={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.disapprove' | translate }}"></a>
 
diff --git a/www/addons/mod/data/templates/entry.html b/www/addons/mod/data/templates/entry.html
index 759db3c2cc0..e24fee064a2 100644
--- a/www/addons/mod/data/templates/entry.html
+++ b/www/addons/mod/data/templates/entry.html
@@ -9,6 +9,12 @@
     <ion-content mm-state-class delegate-handle="mmaModDataEntryScroll">
         <ion-refresher pulling-text="{{ 'mm.core.pulltorefresh' | translate }}" ng-if="databaseLoaded" on-refresh="refreshDatabase(false)"></ion-refresher>
         <mm-loading hide-until="databaseLoaded">
+
+            <!-- Database entries 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 ng-if="(groupInfo.separateGroups || groupInfo.visibleGroups)" class="item item-text-wrap item-input item-select">
                 <ion-label id="mma-data-groupslabel" ng-if="groupInfo.separateGroups">{{ 'mm.core.groupsseparate' | translate }}</ion-label>
                 <ion-label id="mma-data-groupslabel" ng-if="groupInfo.visibleGroups">{{ 'mm.core.groupsvisible' | translate }}</ion-label>
@@ -21,7 +27,7 @@
                 </style>
 
                 <mm-format-text component="{{component}}" component-id="{{data.cmid}}" watch="true">
-                    {{ entryContents }}
+                    {{ entryRendered }}
                 </mm-format-text>
             </div>
             <div ng-if="previousId || nextId" class="item item-text-wrap row-buttons responsive-sm">

From d60c32b231487f0fe3ba3ee2f17198acfabc7aa4 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 10 Jul 2017 15:12:00 +0200
Subject: [PATCH 066/118] MOBILE-2127 fs: Fix copy file in browser

---
 www/core/lib/fs.js | 44 +++++++++++++-------------------------------
 1 file changed, 13 insertions(+), 31 deletions(-)

diff --git a/www/core/lib/fs.js b/www/core/lib/fs.js
index fbd69d7f431..41898cfb023 100644
--- a/www/core/lib/fs.js
+++ b/www/core/lib/fs.js
@@ -765,41 +765,23 @@ angular.module('mm.core')
         from = self.removeStartingSlash(from.replace(basePath, ''));
         to = self.removeStartingSlash(to.replace(basePath, ''));
 
+        var fromFileAndDir = self.getFileAndDirectoryFromPath(from),
+            toFileAndDir = self.getFileAndDirectoryFromPath(to);
+
         return self.init().then(function() {
+            if (toFileAndDir.directory) {
+                // Create the target directory if it doesn't exist.
+                return self.createDir(toFileAndDir.directory);
+            }
+        }).then(function() {
             if (isHTMLAPI) {
-                // In Cordova API we need to calculate the longest matching path to make it work.
-                // $cordovaFile.copyFile('a/', 'b/c.ext', 'a/', 'b/d.ext') doesn't work.
-                // cordovaFile.copyFile('a/b/', 'c.ext', 'a/b/', 'd.ext') works.
-                var commonPath = basePath,
-                    dirsA = from.split('/'),
-                    dirsB = to.split('/');
+                // In HTML API, the file name cannot include a directory, otherwise it fails.
+                var fromDir = self.concatenatePaths(basePath, fromFileAndDir.directory),
+                    toDir = self.concatenatePaths(basePath, toFileAndDir.directory);
 
-                for (var i = 0; i < dirsA.length; i++) {
-                    var dir = dirsA[i];
-                    if (dirsB[i] === dir) {
-                        // Found a common folder, add it to common path and remove it from each specific path.
-                        dir = dir + '/';
-                        commonPath = self.concatenatePaths(commonPath, dir);
-                        from = from.replace(dir, '');
-                        to = to.replace(dir, '');
-                    } else {
-                        // Folder doesn't match, stop searching.
-                        break;
-                    }
-                }
-
-                return $cordovaFile.copyFile(commonPath, from, commonPath, to);
+                return $cordovaFile.copyFile(fromDir, fromFileAndDir.name, toDir, toFileAndDir.name);
             } else {
-                // Check if to contains a directory.
-                var toFile = self.getFileAndDirectoryFromPath(to);
-                if (toFile.directory == '') {
-                    return $cordovaFile.copyFile(basePath, from, basePath, to);
-                } else {
-                    // Ensure directory is created.
-                    return self.createDir(toFile.directory).then(function() {
-                        return $cordovaFile.copyFile(basePath, from, basePath, to);
-                    });
-                }
+                return $cordovaFile.copyFile(basePath, from, basePath, to);
             }
         });
     };

From d617e9b0018828c38de40a8b8fbd63beffc51814 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 10 Jul 2017 15:48:31 +0200
Subject: [PATCH 067/118] MOBILE-2127 fs: Fix missing parameter error in
 browser

---
 www/core/components/emulator/services/file.js       | 10 +++++-----
 www/core/components/fileuploader/services/helper.js |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/www/core/components/emulator/services/file.js b/www/core/components/emulator/services/file.js
index 4de40822e7e..01885a7f874 100644
--- a/www/core/components/emulator/services/file.js
+++ b/www/core/components/emulator/services/file.js
@@ -216,7 +216,7 @@ angular.module('mm.core.emulator')
                             }
                         }
 
-                        successCallback(entries);
+                        successCallback && successCallback(entries);
                     } catch(ex) {
                         errorCallback && errorCallback(ex);
                     }
@@ -259,7 +259,7 @@ angular.module('mm.core.emulator')
 
         $window.Entry.prototype.setMetadata = function(successCallback, errorCallback, metadataObject) {
             // Not supported.
-            errorCallback('Not supported');
+            errorCallback && errorCallback('Not supported');
         };
 
         $window.Entry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
@@ -318,9 +318,9 @@ angular.module('mm.core.emulator')
             var removeFn = this.isDirectory ? fs.rmdir : fs.unlink;
             removeFn(this.fullPath, function(err) {
                 if (err < 0) {
-                    errorCallback(err);
+                    errorCallback && errorCallback(err);
                 } else {
-                    successCallback();
+                    successCallback && successCallback();
                 }
             });
         };
@@ -521,7 +521,7 @@ angular.module('mm.core.emulator')
         // Success, return the DirectoryEntry or FileEntry.
         function success() {
             var constructorFn = isDir ? DirectoryEntry : FileEntry;
-            successCallback(new constructorFn(filename, fileDirPath));
+            successCallback && successCallback(new constructorFn(filename, fileDirPath));
         }
 
         // Create the file/dir.
diff --git a/www/core/components/fileuploader/services/helper.js b/www/core/components/fileuploader/services/helper.js
index ac06e7d6d48..8e3bdc60cd6 100644
--- a/www/core/components/fileuploader/services/helper.js
+++ b/www/core/components/fileuploader/services/helper.js
@@ -69,7 +69,8 @@ angular.module('mm.core.fileuploader')
         // Delete the local files from the tmp folder.
         files.forEach(function(file) {
             if (!file.offline && file.remove) {
-                file.remove();
+                // Pass an empty function to prevent missing parameter error.
+                file.remove(function() {});
             }
         });
     };

From cade2c20800fe9de74d4e59a818f769682f23f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 7 Jul 2017 13:07:12 +0200
Subject: [PATCH 068/118] MOBILE-2127 data: Edit entries in offline mode

---
 www/addons/mod/data/controllers/edit.js       |  76 ++++++----
 www/addons/mod/data/controllers/entry.js      |   5 +-
 www/addons/mod/data/controllers/index.js      |  24 ++--
 .../mod/data/fields/checkbox/handler.js       |  31 +++-
 www/addons/mod/data/fields/date/handler.js    |  41 +++++-
 www/addons/mod/data/fields/file/directive.js  |   2 +-
 www/addons/mod/data/fields/file/handler.js    |  39 ++++-
 www/addons/mod/data/fields/file/template.html |   4 +-
 www/addons/mod/data/fields/latlong/handler.js |  45 +++++-
 www/addons/mod/data/fields/menu/handler.js    |  35 ++++-
 .../mod/data/fields/multimenu/handler.js      |  36 ++++-
 www/addons/mod/data/fields/number/handler.js  |  35 ++++-
 .../mod/data/fields/picture/directive.js      |  34 +++--
 www/addons/mod/data/fields/picture/handler.js |  55 +++++++-
 .../mod/data/fields/picture/template.html     |   2 +-
 .../mod/data/fields/radiobutton/handler.js    |  35 ++++-
 www/addons/mod/data/fields/text/handler.js    |  35 ++++-
 .../mod/data/fields/textarea/handler.js       |  53 ++++++-
 www/addons/mod/data/fields/url/handler.js     |  35 ++++-
 www/addons/mod/data/lang/en.json              |   4 +-
 www/addons/mod/data/scss/styles.scss          |   7 +-
 www/addons/mod/data/services/data.js          | 121 +++++++++++++++-
 www/addons/mod/data/services/data_offline.js  |   5 +-
 .../mod/data/services/fieldsdelegate.js       |  57 ++++++++
 www/addons/mod/data/services/helper.js        | 133 ++++++++++++++++--
 www/core/lib/filesession.js                   |   1 +
 www/core/lib/fs.js                            |   2 +-
 27 files changed, 853 insertions(+), 99 deletions(-)

diff --git a/www/addons/mod/data/controllers/edit.js b/www/addons/mod/data/controllers/edit.js
index b9f52d71b5d..b2ed0bad570 100644
--- a/www/addons/mod/data/controllers/edit.js
+++ b/www/addons/mod/data/controllers/edit.js
@@ -23,20 +23,23 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataEditCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $q, $mmUtil, $mmaModDataHelper,
         $mmGroups, $ionicHistory, $mmEvents, mmaModDataEventEntryChanged, $mmSite, $translate, $mmFileUploaderHelper, $timeout,
-        $ionicScrollDelegate) {
+        $ionicScrollDelegate, $mmApp, $mmaModDataOffline) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
         data,
         scrollView,
+        offlineActions,
         siteId = $mmSite.getId(),
-        entryId = $stateParams.entryid || false;
+        offline = !$mmApp.isOnline(),
+        entryId = $stateParams.entryid || false,
+        editing = entryId > 0,
+        entry;
 
     $scope.title = module.name;
     $scope.component = mmaModDataComponent;
     $scope.databaseLoaded = false;
     $scope.selectedGroup = $stateParams.group || 0;
-    $scope.entryContents = {};
 
     // Block leaving the view, we want to show a confirm to the user if there's unsaved data.
     $mmUtil.blockLeaveView($scope, cancel);
@@ -53,16 +56,8 @@ angular.module('mm.addons.mod_data')
         }).then(function(accessData) {
             $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
 
-            if (entryId) {
-                // Editing, group is set.
-                return $mmaModData.getEntry(data.id, entryId).then(function(entryData) {
-                    $scope.entryContents = {};
-                    angular.forEach(entryData.entry.contents, function(field) {
-                        $scope.entryContents[field.fieldid] = field;
-                    });
-                });
-            } else {
-                // Adding, get groups.
+            if (!editing) {
+                // Adding, get groups because it's not set.
                 return $mmGroups.getActivityGroupInfo(data.coursemodule, accessData.canmanageentries).then(function(groupInfo) {
                     $scope.groupInfo = groupInfo;
 
@@ -82,14 +77,37 @@ angular.module('mm.addons.mod_data')
                 });
             }
         }).then(function() {
+            return $mmaModDataOffline.getEntryActions(data.id, entryId);
+        }).then(function(actions) {
+            offlineActions = actions;
+
             return $mmaModData.getFields(data.id);
-        }).then(function(fields) {
+        }).then(function(fieldsData) {
             $scope.fields = {};
-            angular.forEach(fields, function(field) {
+            angular.forEach(fieldsData, function(field) {
                 $scope.fields[field.id] = field;
             });
 
-            $scope.editForm = $mmaModDataHelper.displayEditFields(data.addtemplate, $scope.fields, $scope.entryContents);
+            if (editing) {
+                return $mmaModData.getEntry(data.id, entryId);
+            }
+        }).then(function(entryData) {
+            if (entryData) {
+                entry = entryData.entry;
+
+                // Index contents by fieldid.
+                var contents = {};
+                angular.forEach(entry.contents, function(field) {
+                    contents[field.fieldid] = field;
+                });
+                entry.contents = contents;
+            }
+
+            return $mmaModDataHelper.applyOfflineActions(entry, offlineActions, $scope.fields);
+        }).then(function(entryData) {
+            $scope.entry = entryData;
+
+            $scope.editForm = $mmaModDataHelper.displayEditFields(data.addtemplate, $scope.fields, entryData.contents);
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
@@ -109,7 +127,7 @@ angular.module('mm.addons.mod_data')
     // Saves data.
     $scope.save = function() {
         return $mmaModDataHelper.hasEditDataChanged(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
-                $scope.entryContents).then(function(changed) {
+                $scope.entry.contents).then(function(changed) {
 
             if (!changed) {
                 if (entryId) {
@@ -122,14 +140,24 @@ angular.module('mm.addons.mod_data')
 
             var modal = $mmUtil.showModalLoading('mm.core.sending', true);
 
-            return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
-                    $scope.entryContents).then(function(editData) {
+            return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id, entryId,
+                    $scope.entry.contents, offline).catch(function(e) {
+                if (!offline) {
+                    // Cannot submit in online, prepare for offline usage.
+                    offline = true;
+
+                    return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
+                        entryId, $scope.entry.contents, offline);
+                }
+
+                return $q.reject(e);
+            }).then(function(editData) {
 
                 if (editData.length > 0) {
                     if (entryId) {
-                        return $mmaModData.editEntry(entryId, editData);
+                        return $mmaModData.editEntry(data.id, entryId, courseId, editData, $scope.fields, undefined, offline);
                     }
-                    return $mmaModData.addEntry(data.id, editData, $scope.selectedGroup);
+                    return $mmaModData.addEntry(data.id, editData, $scope.selectedGroup, undefined, offline);
                 }
              }).then(function(result) {
                 if (!result) {
@@ -186,7 +214,7 @@ angular.module('mm.addons.mod_data')
 
     function returnToEntryList() {
         return $mmaModDataHelper.getEditTmpFiles(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
-                $scope.entryContents).then(function(files) {
+                $scope.entry.contents).then(function(files) {
             $mmFileUploaderHelper.clearTmpFiles(files);
         }).finally(function() {
             // Go back to discussions list.
@@ -197,7 +225,7 @@ angular.module('mm.addons.mod_data')
     // Just ask to confirm the lost of data.
     function cancel() {
         return $mmaModDataHelper.hasEditDataChanged(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
-                $scope.entryContents).then(function(changed) {
+                $scope.entry.contents).then(function(changed) {
             if (!changed) {
                 return $q.when();
             }
@@ -206,7 +234,7 @@ angular.module('mm.addons.mod_data')
         }).then(function() {
             // Delete the local files from the tmp folder.
             return $mmaModDataHelper.getEditTmpFiles(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
-                    $scope.entryContents).then(function(files) {
+                    $scope.entry.contents).then(function(files) {
                 $mmFileUploaderHelper.clearTmpFiles(files);
             });
         });
diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index fd4ec958def..18afe166244 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -99,7 +99,10 @@ angular.module('mm.addons.mod_data')
             });
             entry.contents = contents;
 
-            $scope.entry = $mmaModDataHelper.applyOfflineActions(entry, offlineActions);
+            return $mmaModDataHelper.applyOfflineActions(entry, offlineActions, $scope.fields);
+        }).then(function(entryData) {
+            $scope.entry = entryData;
+
             $scope.entries[entryId] = $scope.entry;
 
             var actions = $mmaModDataHelper.getActions(data, access, $scope.entry);
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index ff7fac33e43..1e09e2d5f81 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -184,10 +184,9 @@ angular.module('mm.addons.mod_data')
             if (!$scope.isEmpty) {
                 $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
 
-                var entriesHTML = data.listtemplateheader;
+                var promises = [];
 
                 angular.forEach(entries.entries, function(entry) {
-
                     // Index contents by fieldid.
                     var contents = {};
                     angular.forEach(entry.contents, function(field) {
@@ -196,19 +195,26 @@ angular.module('mm.addons.mod_data')
                     entry.contents = contents;
 
                     if (typeof $scope.offlineActions[entry.id] != "undefined") {
-                        entry = $mmaModDataHelper.applyOfflineActions(entry, $scope.offlineActions[entry.id]);
+                        promises.push($mmaModDataHelper.applyOfflineActions(entry, $scope.offlineActions[entry.id], $scope.fields));
+                    } else {
+                        promises.push($q.when(entry));
                     }
+                });
 
-                    $scope.entries[entry.id] = entry;
+                return $q.all(promises).then(function(entries) {
+                    var entriesHTML = data.listtemplateheader;
 
-                    var actions = $mmaModDataHelper.getActions(data, $scope.access, entry);
+                    angular.forEach(entries, function(entry) {
+                        $scope.entries[entry.id] = entry;
 
-                    entriesHTML += $mmaModDataHelper.displayShowFields(data.listtemplate, $scope.fields, entry.id, 'list', actions);
-                });
+                        var actions = $mmaModDataHelper.getActions(data, $scope.access, entry);
 
-                entriesHTML += data.listtemplatefooter;
+                        entriesHTML += $mmaModDataHelper.displayShowFields(data.listtemplate, $scope.fields, entry.id, 'list', actions);
+                    });
+                    entriesHTML += data.listtemplatefooter;
 
-                $scope.entriesRendered = entriesHTML;
+                    $scope.entriesRendered = entriesHTML;
+                });
             } else if (!$scope.search.searching) {
                 $scope.canSearch = false;
             }
diff --git a/www/addons/mod/data/fields/checkbox/handler.js b/www/addons/mod/data/fields/checkbox/handler.js
index e2fd082c7c8..0bc19b82fb2 100644
--- a/www/addons/mod/data/fields/checkbox/handler.js
+++ b/www/addons/mod/data/fields/checkbox/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldCheckboxHandler
  */
-.factory('$mmaModDataFieldCheckboxHandler', function() {
+.factory('$mmaModDataFieldCheckboxHandler', function($translate) {
 
     var self = {};
 
@@ -109,6 +109,35 @@ angular.module('mm.addons.mod_data')
         return checkboxes.join("##") != originalFieldData;
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        originalContent.content = (offlineContent[''] && offlineContent[''].join("##")) || "";
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/date/handler.js b/www/addons/mod/data/fields/date/handler.js
index 0d3c9f5e826..d71db316ded 100644
--- a/www/addons/mod/data/fields/date/handler.js
+++ b/www/addons/mod/data/fields/date/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldDateHandler
  */
-.factory('$mmaModDataFieldDateHandler', function() {
+.factory('$mmaModDataFieldDateHandler', function($translate) {
 
     var self = {};
 
@@ -109,13 +109,48 @@ angular.module('mm.addons.mod_data')
      */
     self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
-            input = inputData[fieldName] || "",
-            originalFieldData = (originalFieldData && originalFieldData.content &&
+            input = inputData[fieldName] || "";
+
+        originalFieldData = (originalFieldData && originalFieldData.content &&
                 new Date(originalFieldData.content * 1000).toISOString().substr(0, 10)) || "";
 
         return input != originalFieldData;
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required &&
+                (!inputData || inputData.length < 2 || !inputData[0].value || !inputData[1].value || !inputData[2].value)) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        var date = Date.UTC(offlineContent['year'] || "", offlineContent['month'] ? offlineContent['month'] - 1 : "",
+            offlineContent['day'] || "");
+        date = Math.floor(date / 1000);
+
+        originalContent.content = date || "";
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/file/directive.js b/www/addons/mod/data/fields/file/directive.js
index a167fc85690..149b59fcce7 100644
--- a/www/addons/mod/data/fields/file/directive.js
+++ b/www/addons/mod/data/fields/file/directive.js
@@ -32,7 +32,7 @@ angular.module('mm.addons.mod_data')
                 scope.component = mmaModDataComponent;
                 scope.componentId = scope.database.coursemodule;
 
-                scope.files = angular.copy(scope.value && scope.value.files) || [];
+                scope.files = (scope.value && scope.value.files) || [];
 
                 // Reduce to first element.
                 if (scope.files.length > 0) {
diff --git a/www/addons/mod/data/fields/file/handler.js b/www/addons/mod/data/fields/file/handler.js
index c1482b1ce21..e026a464613 100644
--- a/www/addons/mod/data/fields/file/handler.js
+++ b/www/addons/mod/data/fields/file/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldFileHandler
  */
-.factory('$mmaModDataFieldFileHandler', function($mmFileSession, mmaModDataComponent, $mmFileUploaderHelper) {
+.factory('$mmaModDataFieldFileHandler', function($mmFileSession, mmaModDataComponent, $mmFileUploaderHelper, $translate) {
 
     var self = {};
 
@@ -90,6 +90,43 @@ angular.module('mm.addons.mod_data')
         return $mmFileUploaderHelper.areFileListDifferent(files, originalFiles);
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @param  {Array}  offlineFiles        Array with all the offline files in the field.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent, offlineFiles) {
+        if (offlineContent && offlineContent.file && offlineContent.file.offline > 0) {
+            originalContent.content = offlineFiles[0].filename;
+            originalContent.files = [offlineFiles[0]];
+        } else if (offlineContent && offlineContent.file && offlineContent.file.online && offlineContent.file.online.length > 0) {
+            originalContent.content = offlineContent.file.online[0].filename;
+            originalContent.files = [offlineContent.file.online[0]];
+        }
+
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/file/template.html b/www/addons/mod/data/fields/file/template.html
index 1facd582efa..713ac633e29 100644
--- a/www/addons/mod/data/fields/file/template.html
+++ b/www/addons/mod/data/fields/file/template.html
@@ -1,10 +1,10 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
-<mm-attachments ng-if="mode == 'edit'" files="files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
+<mm-attachments ng-if="mode == 'edit'" files="files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}" allow-offline="true"></mm-attachments>
 <div ng-if="mode == 'show'" ng-repeat="file in files">
     <!-- Files already attached to the submission. -->
-    <mm-file ng-if="!file.name" file="file" component="{{component}}" component-id="{{componentId}" always-download="true" no-border="true"></mm-file>
+    <mm-file ng-if="!file.name" file="file" component="{{component}}" component-id="{{componentId}}" always-download="true" no-border="true"></mm-file>
     <!-- Files stored in offline to be sent later. -->
     <mm-local-file ng-if="file.name" file="file" no-border="true"></mm-local-file>
 </div>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/latlong/handler.js b/www/addons/mod/data/fields/latlong/handler.js
index 5daf7f39263..bcaa7822cae 100644
--- a/www/addons/mod/data/fields/latlong/handler.js
+++ b/www/addons/mod/data/fields/latlong/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldLatlongHandler
  */
-.factory('$mmaModDataFieldLatlongHandler', function() {
+.factory('$mmaModDataFieldLatlongHandler', function($translate) {
 
     var self = {};
 
@@ -90,6 +90,49 @@ angular.module('mm.addons.mod_data')
         return lat != originalLat || long != originalLong;
     };
 
+
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        var valuecount = 0;
+
+        // The lat long class has two values that need to be checked.
+        angular.forEach(inputData, function(value) {
+            if (typeof value.value != "undefined" && value.value != "") {
+                valuecount++;
+            }
+        });
+
+        // If we get here then only one field has been filled in.
+        if (valuecount == 1) {
+            return $translate.instant('mma.mod_data.latlongboth');
+        } else if (field.required && valuecount == 0) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        originalContent.content = offlineContent[0] || "";
+        originalContent.content1 = offlineContent[1] || "";
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/menu/handler.js b/www/addons/mod/data/fields/menu/handler.js
index eaea337eaa1..22c3a4e1f41 100644
--- a/www/addons/mod/data/fields/menu/handler.js
+++ b/www/addons/mod/data/fields/menu/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldMenuHandler
  */
-.factory('$mmaModDataFieldMenuHandler', function() {
+.factory('$mmaModDataFieldMenuHandler', function($translate) {
 
     var self = {};
 
@@ -72,12 +72,41 @@ angular.module('mm.addons.mod_data')
      */
     self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
-            input = inputData[fieldName] || "",
-            originalFieldData = (originalFieldData && originalFieldData.content) || "";
+            input = inputData[fieldName] || "";
+        originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
         return input != originalFieldData;
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        originalContent.content = offlineContent[''] || "";
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/multimenu/handler.js b/www/addons/mod/data/fields/multimenu/handler.js
index 338cd3cc3fc..209aad1c94a 100644
--- a/www/addons/mod/data/fields/multimenu/handler.js
+++ b/www/addons/mod/data/fields/multimenu/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldMultimenuHandler
  */
-.factory('$mmaModDataFieldMultimenuHandler', function() {
+.factory('$mmaModDataFieldMultimenuHandler', function($translate) {
 
     var self = {};
 
@@ -91,12 +91,42 @@ angular.module('mm.addons.mod_data')
      */
     self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
-            input = inputData[fieldName] || "",
-            originalFieldData = (originalFieldData && originalFieldData.content) || "";
+            input = inputData[fieldName] || "";
+        originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
         return input != originalFieldData;
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        originalContent.content = (offlineContent[''] && offlineContent[''].join("###")) || "";
+        return originalContent;
+    };
+
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/number/handler.js b/www/addons/mod/data/fields/number/handler.js
index ecf5fafca93..1aed84480cc 100644
--- a/www/addons/mod/data/fields/number/handler.js
+++ b/www/addons/mod/data/fields/number/handler.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldNumberHandler
  */
-.factory('$mmaModDataFieldNumberHandler', function() {
+.factory('$mmaModDataFieldNumberHandler', function($translate) {
 
     var self = {};
 
@@ -72,12 +72,41 @@ angular.module('mm.addons.mod_data')
      */
     self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
-            input = inputData[fieldName] || "",
-            originalFieldData = (originalFieldData && originalFieldData.content) || "";
+            input = inputData[fieldName] || "";
+        originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
         return input != originalFieldData;
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required && (!inputData || !inputData.length || inputData[0].value == "")) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        originalContent.content = offlineContent[''] || "";
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/picture/directive.js b/www/addons/mod/data/fields/picture/directive.js
index 9648787bfc4..7c81317bfa2 100644
--- a/www/addons/mod/data/fields/picture/directive.js
+++ b/www/addons/mod/data/fields/picture/directive.js
@@ -22,29 +22,40 @@ angular.module('mm.addons.mod_data')
  * @name mmaModDataFieldPicture
  */
 .directive('mmaModDataFieldPicture', function(mmaModDataComponent, $mmFileSession) {
+
+    // Find file in a list.
+    function findFile(files, filenameSeek) {
+        for (var x in files) {
+            if (files[x].filename == filenameSeek) {
+                return files[x];
+            }
+        }
+        return false;
+    }
+
     return {
         restrict: 'A',
         priority: 100,
         templateUrl: 'addons/mod/data/fields/picture/template.html',
         link: function(scope) {
             if (scope.mode != 'search') {
-                var files = angular.copy(scope.value && scope.value.files) || [];
+                var files = scope.value && scope.value.files || [];
 
                 scope.component = mmaModDataComponent;
                 scope.componentId = scope.database.coursemodule;
-                scope.image = false;
 
                 // Get image or thumb.
                 if (files.length > 0) {
                     var filenameSeek = scope.mode == 'list' ? 'thumb_' + scope.value.content : scope.value.content;
-                    for (var x in files) {
-                        if (files[x].filename == filenameSeek) {
-                            scope.image = angular.copy(files[x]);
-                            break;
-                        }
+                    scope.image = findFile(files, filenameSeek);
+
+                    if (!scope.image && scope.mode == 'list') {
+                        scope.image = findFile(files, scope.value.content);
                     }
+
                     scope.files = [scope.image];
                 } else {
+                    scope.image = false;
                     scope.files = [];
                 }
 
@@ -55,7 +66,14 @@ angular.module('mm.addons.mod_data')
                 } else {
                     scope.entryId = (scope.value && scope.value.recordid) || false;
                     scope.title = (scope.value && scope.value.content1) || "";
-                    scope.imageUrl = (scope.image && scope.image.fileurl) || false;
+                    scope.imageUrl = false;
+                    if (scope.image) {
+                        if (scope.image.offline) {
+                            scope.imageUrl = (scope.image && scope.image.toURL()) || false;
+                        } else {
+                            scope.imageUrl = (scope.image && scope.image.fileurl) || false;
+                        }
+                    }
                     scope.width  = scope.field.param1 || "";
                     scope.height = scope.field.param2 || "";
                 }
diff --git a/www/addons/mod/data/fields/picture/handler.js b/www/addons/mod/data/fields/picture/handler.js
index a62bac04be4..2d933e07e11 100644
--- a/www/addons/mod/data/fields/picture/handler.js
+++ b/www/addons/mod/data/fields/picture/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldPictureHandler
  */
-.factory('$mmaModDataFieldPictureHandler', function($mmFileSession, mmaModDataComponent, $mmFileUploaderHelper) {
+.factory('$mmaModDataFieldPictureHandler', function($mmFileSession, mmaModDataComponent, $mmFileUploaderHelper, $translate) {
 
     var self = {};
 
@@ -102,7 +102,7 @@ angular.module('mm.addons.mod_data')
                 var filenameSeek = (originalFieldData && originalFieldData.content) || "";
                 for (var x in originalFiles) {
                     if (originalFiles[x].filename == filenameSeek) {
-                        originalFiles = angular.copy(originalFiles[x]);
+                        originalFiles = originalFiles[x];
                         break;
                     }
                 }
@@ -114,6 +114,57 @@ angular.module('mm.addons.mod_data')
         return altText != originalAltText || $mmFileUploaderHelper.areFileListDifferent(files, originalFiles);
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required) {
+            if (!inputData || !inputData.length) {
+                return $translate.instant('mma.mod_data.errormustsupplyvalue');
+            }
+            var found = false;
+            for (var x in inputData) {
+                if (typeof inputData[x].subfield !="undefined" && inputData[x].subfield == 'file') {
+                    found = !!inputData[x].value;
+                    break;
+                }
+            }
+
+            if (!found) {
+                return $translate.instant('mma.mod_data.errormustsupplyvalue');
+            }
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @param  {Array}  offlineFiles        Array with all the offline files in the field.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent, offlineFiles) {
+        if (offlineContent && offlineContent.file && offlineContent.file.offline > 0) {
+            originalContent.content = offlineFiles[0].filename;
+            originalContent.files = [offlineFiles[0]];
+        } else if (offlineContent && offlineContent.file && offlineContent.file.online && offlineContent.file.online.length > 0) {
+            originalContent.content = offlineContent.file.online[0].filename;
+            originalContent.files = [offlineContent.file.online[0]];
+        }
+
+        originalContent.content1 = offlineContent.alttext || "";
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/picture/template.html b/www/addons/mod/data/fields/picture/template.html
index 908b6e8cca1..9b92ee53e3b 100644
--- a/www/addons/mod/data/fields/picture/template.html
+++ b/www/addons/mod/data/fields/picture/template.html
@@ -1,7 +1,7 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input ng-if="mode == 'search'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}">
-<mm-attachments ng-if="mode == 'edit'" files="files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}"></mm-attachments>
+<mm-attachments ng-if="mode == 'edit'" files="files" max-size="{{maxSizeBytes}}" max-submissions="1" component="{{component}}" component-id="{{componentId}}" allow-offline="true"></mm-attachments>
 <ion-input ng-if="mode == 'edit'" class="item item-input item-stacked-label item-text-wrap">
     <ion-label>{{ 'mma.mod_data.alttext' | translate }}</ion-label>
     <input type="text" name="f_{{field.id}}_alttext" placeholder="{{ 'mma.mod_data.alttext' | translate }}" ng-model="alttext">
diff --git a/www/addons/mod/data/fields/radiobutton/handler.js b/www/addons/mod/data/fields/radiobutton/handler.js
index f20c02d307f..29974029339 100644
--- a/www/addons/mod/data/fields/radiobutton/handler.js
+++ b/www/addons/mod/data/fields/radiobutton/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldRadiobuttonHandler
  */
-.factory('$mmaModDataFieldRadiobuttonHandler', function() {
+.factory('$mmaModDataFieldRadiobuttonHandler', function($translate) {
 
     var self = {};
 
@@ -72,12 +72,41 @@ angular.module('mm.addons.mod_data')
      */
     self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
-            input = inputData[fieldName] || "",
-            originalFieldData = (originalFieldData && originalFieldData.content) || "";
+            input = inputData[fieldName] || "";
+        originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
         return input != originalFieldData;
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        originalContent.content = offlineContent[''] || "";
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/text/handler.js b/www/addons/mod/data/fields/text/handler.js
index e679ed58422..a6b0db201e8 100644
--- a/www/addons/mod/data/fields/text/handler.js
+++ b/www/addons/mod/data/fields/text/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldTextHandler
  */
-.factory('$mmaModDataFieldTextHandler', function() {
+.factory('$mmaModDataFieldTextHandler', function($translate) {
 
     var self = {};
 
@@ -71,12 +71,41 @@ angular.module('mm.addons.mod_data')
      */
     self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
-            input = inputData[fieldName] || "",
-            originalFieldData = (originalFieldData && originalFieldData.content) || "";
+            input = inputData[fieldName] || "";
+        originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
         return input != originalFieldData;
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        originalContent.content = offlineContent[''] || "";
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/textarea/handler.js b/www/addons/mod/data/fields/textarea/handler.js
index 96017e9b8b3..3f6f49081fe 100644
--- a/www/addons/mod/data/fields/textarea/handler.js
+++ b/www/addons/mod/data/fields/textarea/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldTextareaHandler
  */
-.factory('$mmaModDataFieldTextareaHandler', function($mmText, $mmUtil) {
+.factory('$mmaModDataFieldTextareaHandler', function($mmText, $mmUtil, $translate) {
 
     var self = {};
 
@@ -105,12 +105,59 @@ angular.module('mm.addons.mod_data')
      */
     self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
-            input = inputData[fieldName] || "",
-            originalFieldData = (originalFieldData && originalFieldData.content) || "";
+            input = inputData[fieldName] || "";
+        originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
         return input != originalFieldData;
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required) {
+            if (!inputData || !inputData.length) {
+                return $translate.instant('mma.mod_data.errormustsupplyvalue');
+            }
+            var found = false;
+            for (var x in inputData) {
+                if (!inputData[x].subfield) {
+                    found = inputData[x].value;
+                    break;
+                }
+            }
+
+            if (!found) {
+                return $translate.instant('mma.mod_data.errormustsupplyvalue');
+            }
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        originalContent.content = offlineContent[''] || "";
+        if (originalContent.content.length > 0 && originalContent.files.length > 0) {
+            // Take the original files since we cannot edit them on the app.
+            originalContent.content = $mmText.replacePluginfileUrls(originalContent.content, originalContent.files);
+        }
+
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/fields/url/handler.js b/www/addons/mod/data/fields/url/handler.js
index b4fbf6539b2..98fc6a168b9 100644
--- a/www/addons/mod/data/fields/url/handler.js
+++ b/www/addons/mod/data/fields/url/handler.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataFieldUrlHandler
  */
-.factory('$mmaModDataFieldUrlHandler', function() {
+.factory('$mmaModDataFieldUrlHandler', function($translate) {
 
     var self = {};
 
@@ -71,12 +71,41 @@ angular.module('mm.addons.mod_data')
      */
     self.hasFieldDataChanged = function(field, inputData, originalFieldData) {
         var fieldName = 'f_' + field.id,
-            input = inputData[fieldName] || "",
-            originalFieldData = (originalFieldData && originalFieldData.content) || "";
+            input = inputData[fieldName] || "";
+        originalFieldData = (originalFieldData && originalFieldData.content) || "";
 
         return input != originalFieldData;
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        if (field.required && (!inputData || !inputData.length || !inputData[0].value)) {
+            return $translate.instant('mma.mod_data.errormustsupplyvalue');
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(originalContent, offlineContent) {
+        originalContent.content = offlineContent[''] || "";
+        return originalContent;
+    };
+
     return self;
 })
 
diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index 02625ac2d3a..b1931a4b23f 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -17,8 +17,10 @@
     "entrieslefttoaddtoview": "You must add {{$a.entrieslefttoview}} more entry/entries before you can view other participants' entries.",
     "errorapproving": "Error approving or unapproving entry.",
     "errordeleting": "Error deleting the entry.",
+    "errormustsupplyvalue": "You must supply a value here.",
     "expired": "Sorry, this activity closed on {{$a}} and is no longer available",
     "fields": "Fields",
+    "latlongboth": "Both latitude and longitude are required.",
     "menuchoose": "Choose...",
     "more": "More",
     "nomatch": "No matching entries found!",
@@ -37,4 +39,4 @@
     "timeadded": "Time added",
     "timemodified": "Time modified",
     "usedate": "Include in search."
-}
\ No newline at end of file
+}
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index 61002f7dacb..d1a9230dbce 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -8,13 +8,18 @@
 .mm-data-contents {
   overflow: visible;
   white-space: normal;
-  word-break: break-all;
+  word-break: break-word;
   padding: $item-padding;
   background-color: white;
   border-top-width: $item-border-width;
   border-bottom-width: $item-border-width;
   border-style: solid;
   border-color: $item-default-border;
+
+  td {
+    padding-left: 2px;
+    padding-right: 2px;
+  }
 }
 
 #mma-mod_data-advanced-search-form,
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index d088c2ba4d1..b03e5182354 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
  * @name $mmaModData
  */
 .factory('$mmaModData', function($q, $mmSitesManager, mmaModDataComponent, $mmFilepool, $mmSite, mmaModDataPerPage, $mmApp, $mmUtil,
-        $mmaModDataOffline) {
+        $mmaModDataOffline, $mmaModDataFieldsDelegate) {
     var self = {};
 
     /**
@@ -413,7 +413,7 @@ angular.module('mm.addons.mod_data')
 
         // Get if the opposite action is not synced.
         var action = approve ? 'disapprove' : 'approve';
-        return $mmaModDataOffline.getEntry(dataId, entryId, action, siteId).then(function(entry) {
+        return $mmaModDataOffline.getEntry(dataId, entryId, action, siteId).then(function() {
             // Found. Just delete the action.
             return $mmaModDataOffline.deleteEntry(dataId, entryId, action, siteId);
         }).catch(function() {
@@ -446,7 +446,7 @@ angular.module('mm.addons.mod_data')
      *
      * @module mm.addons.mod_data
      * @ngdoc method
-     * @name $mmaModData#approveEntry
+     * @name $mmaModData#approveEntryOnline
      * @param   {Number}    entryId         Entry ID.
      * @param   {Boolean}   approve         Whether to approve (true) or unapprove the entry.
      * @return  {Promise}            Promise resolved when the action is done. Rejected with object containing
@@ -532,7 +532,7 @@ angular.module('mm.addons.mod_data')
      *
      * @module mm.addons.mod_data
      * @ngdoc method
-     * @name $mmaModData#deleteEntry
+     * @name $mmaModData#deleteEntryOnline
      * @param   {Number}    entryId  Entry ID.
      * @param   {String}    [siteId] Site ID. If not defined, current site.
      * @return  {Promise}            Promise resolved when the action is done. Rejected with object containing
@@ -586,19 +586,128 @@ angular.module('mm.addons.mod_data')
      * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModData#editEntry
+     * @param   {Number}    dataId          Database ID.
+     * @param   {Number}    entryId         Entry ID.
+     * @param   {Number}    courseId        Entry ID.
+     * @param   {Object}    fields          The fields that define the contents;
+     * @param   {Object}    contents        The contents data to be updated.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @param   {Boolean}   forceOffline    Force editing entry in offline.
+     * @return  {Promise}                   Promise resolved when the action is done.
+     */
+    self.editEntry = function(dataId, entryId, courseId, contents, fields, siteId, forceOffline) {
+        siteId = siteId || $mmSite.getId();
+        var justAdded = false,
+            groupId;
+
+        if (!$mmApp.isOnline() || forceOffline) {
+            var notifications = checkFields(fields, contents);
+            if (notifications) {
+                return {
+                    fieldnotifications: notifications
+                };
+            }
+        }
+
+        // Get if the opposite action is not synced.
+        return $mmaModDataOffline.getEntryActions(dataId, entryId, siteId).then(function(entries) {
+            if (entries && entries.length) {
+                // Found. Delete add and edit actions first.
+                var proms = [];
+                angular.forEach(entries, function(entry) {
+                    if (entry.action == 'add') {
+                        justAdded = true;
+                        groupId = entry.groupid;
+                        proms.push($mmaModDataOffline.deleteEntry(dataId, entryId, entry.action, siteId));
+                    } else if (entry.action == 'edit') {
+                        proms.push($mmaModDataOffline.deleteEntry(dataId, entryId, entry.action, siteId));
+                    }
+                });
+
+                return $q.all(proms);
+            }
+        }).then(function(){
+            if (justAdded) {
+                // The field was added offline, add again and stop.
+                return self.addEntry(dataId, contents, groupId, siteId, forceOffline);
+            }
+
+            if (!$mmApp.isOnline() || forceOffline) {
+                // App is offline, store the action.
+                return storeOffline();
+            }
+
+            return self.editEntryOnline(entryId, contents, siteId).catch(function(error) {
+                if (error && !error.wserror) {
+                    // Couldn't connect to server, store in offline.
+                    return storeOffline();
+                } else {
+                    // The WebService has thrown an error or offline not supported, reject.
+                    return $q.reject(error.error);
+                }
+            });
+        });
+
+        // Convenience function to store a data to be synchronized later.
+        function storeOffline() {
+            return $mmaModDataOffline.saveEntry(dataId, entryId, 'edit', courseId, contents, undefined, siteId).then(function() {
+                return {
+                    updated: true
+                };
+            });
+        }
+    };
+
+    function checkFields(fields, contents) {
+        var notifications = [],
+            notification,
+            contentsIndexed = {};
+
+        angular.forEach(contents, function(content) {
+            if (typeof contentsIndexed[content.fieldid] == "undefined") {
+                contentsIndexed[content.fieldid] = [];
+            }
+            contentsIndexed[content.fieldid].push(content);
+        });
+
+        // App is offline, check required fields.
+        angular.forEach(fields, function(field) {
+            notification = $mmaModDataFieldsDelegate.getFieldsNotifications(field, contentsIndexed[field.id]);
+            if (notification) {
+                notifications.push({
+                    fieldname: field.name,
+                    notification: notification
+                });
+            }
+        });
+
+        return notifications.length ? notifications : false;
+    }
+
+    /**
+     * Updates an existing entry. It does not cache calls. It will fail if offline or cannot connect.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#editEntryOnline
      * @param   {Number}    entryId         Entry ID.
      * @param   {Object}    data            The fields data to be updated.
      * @param   {String}    [siteId]        Site ID. If not defined, current site.
      * @return  {Promise}                   Promise resolved when the action is done.
      */
-    self.editEntry = function(entryId, data, siteId) {
+    self.editEntryOnline = function(entryId, data, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     entryid: entryId,
                     data: data
                 };
 
-            return site.write('mod_data_update_entry', params);
+            return site.write('mod_data_update_entry', params).catch(function(error) {
+                return $q.reject({
+                    error: error,
+                    wserror: $mmUtil.isWebServiceError(error)
+                });
+            });
         });
     };
 
diff --git a/www/addons/mod/data/services/data_offline.js b/www/addons/mod/data/services/data_offline.js
index c404cc7a9b4..cdbe21b4f00 100644
--- a/www/addons/mod/data/services/data_offline.js
+++ b/www/addons/mod/data/services/data_offline.js
@@ -224,12 +224,13 @@ angular.module('mm.addons.mod_data')
      * @name $mmaModDataOffline#getEntryFolder
      * @param  {Number} dataId      Database ID.
      * @param  {Number} entryId     The ID of the entry.
+     * @param  {Number} fieldId     Field ID.
      * @param  {String} [siteId]    Site ID. If not defined, current site.
      * @return {Promise}            Promise resolved with the path.
      */
-    self.getEntryFolder = function(dataId, entryId, siteId) {
+    self.getEntryFieldFolder = function(dataId, entryId, fieldId ,siteId) {
         return self.getDatabaseFolder(dataId, siteId).then(function(folderPath) {
-            return $mmFS.concatenatePaths(folderPath, 'entry_' + entryId);
+            return $mmFS.concatenatePaths(folderPath, 'entry_' + entryId + '_' + fieldId);
         });
     };
 
diff --git a/www/addons/mod/data/services/fieldsdelegate.js b/www/addons/mod/data/services/fieldsdelegate.js
index 234f019219e..e8cff5b87d7 100644
--- a/www/addons/mod/data/services/fieldsdelegate.js
+++ b/www/addons/mod/data/services/fieldsdelegate.js
@@ -122,6 +122,20 @@ angular.module('mm.addons.mod_data')
         return [];
     };
 
+    /**
+     * Check if field type manage files or not.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#hasFiles
+     * @param  {Object} field  Defines the field to be checked.
+     * @return {Boolean}       If the field type manages files.
+     */
+    self.hasFiles = function(field) {
+        var handler = self.getPluginHandler(field.type);
+        return handler && handler.getFieldEditFiles;
+    };
+
     /**
      * Check if the data has changed for a certain field.
      *
@@ -143,6 +157,44 @@ angular.module('mm.addons.mod_data')
         return $q.when();
     };
 
+    /**
+     * Check and get field requeriments.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#getFieldsNotification
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} inputData           Data entered in the edit form.
+     * @return {String}                     String with the notification or false.
+     */
+    self.getFieldsNotifications = function(field, inputData) {
+        var handler = self.getPluginHandler(field.type);
+        if (handler && handler.getFieldsNotifications) {
+            return handler.getFieldsNotifications(field, inputData);
+        }
+        return false;
+    };
+
+    /**
+     * Override field content data with offline submission.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataFieldsDelegate#overrideData
+     * @param  {Object} field               Defines the field to be rendered.
+     * @param  {Object} originalContent     Original data to be overriden.
+     * @param  {Array}  offlineContent      Array with all the offline data to override.
+     * @param  {Array}  offlineFiles        Array with all the offline files in the field.
+     * @return {Object}                     Data overriden
+     */
+    self.overrideData = function(field, originalContent, offlineContent, offlineFiles) {
+        var handler = self.getPluginHandler(field.type);
+        if (handler && handler.overrideData) {
+            return handler.overrideData(originalContent, offlineContent, offlineFiles);
+        }
+        return originalContent;
+    };
+
     /**
      * Get the directive to use for a certain feedback plugin.
      *
@@ -197,6 +249,11 @@ angular.module('mm.addons.mod_data')
      *                                                           Should return if field has been changed by the user.
      *                             - getFieldEditFiles(field, inputData, originalFieldData) Optional.
      *                                                           Should return an array of files stored in temp store.
+     *                             - getFieldsNotifications(field, inputData) Optional.
+     *                                                           Should return an array of notifications before sending data.
+     *                             - overrideData(originalContent, offlineContent, offlineFiles) Optional.
+     *                                                            Should return and object with the overriden content from offline
+     *                                                            submission.
      */
     self.registerHandler = function(addon, pluginType, handler) {
         if (typeof handlers[pluginType] !== 'undefined') {
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 7dc10838bb5..350d22e2f08 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -21,7 +21,8 @@ angular.module('mm.addons.mod_data')
  * @ngdoc service
  * @name $mmaModDataHelper
  */
-.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q, mmaModDataComponent, $mmFileUploader) {
+.factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q, mmaModDataComponent, $mmFileUploader, $mmSite,
+        $mmaModDataOffline, $mmFS, $mmFileUploaderHelper) {
 
     var self = {
             searchOther: {
@@ -44,6 +45,10 @@ angular.module('mm.addons.mod_data')
      * @return {String}           Generated HTML.
      */
     self.displayShowFields = function(template, fields, entryId, mode, actions) {
+        if (!template) {
+            return "";
+        }
+
         var replace, render;
 
         // Replace the fields found on template.
@@ -114,11 +119,11 @@ angular.module('mm.addons.mod_data')
      * @name $mmaModDataHelper#applyOfflineActions
      * @param  {Object} record         Entry to modify.
      * @param  {Object} offlineActions Offline data with the actions done.
+     * @param  {Object} fields         Entry defined fields indexed by fieldid.
      * @return {Object}                Modified entry.
      */
-    self.applyOfflineActions = function(record, offlineActions) {
-        console.error(record, offlineActions);
-
+    self.applyOfflineActions = function(record, offlineActions, fields) {
+        var promises  = [];
         angular.forEach(offlineActions, function(action) {
             switch (action.action) {
                 case 'approve':
@@ -130,9 +135,38 @@ angular.module('mm.addons.mod_data')
                 case 'delete':
                     record.deleted = true;
                     break;
+                case 'edit':
+                    var offlineContents = {};
+                    angular.forEach(action.fields, function(offlineContent) {
+                        if (typeof offlineContents[offlineContent.fieldid] == "undefined") {
+                            offlineContents[offlineContent.fieldid] = {};
+                        }
+
+                        if (offlineContent.subfield) {
+                            offlineContents[offlineContent.fieldid][offlineContent.subfield] = JSON.parse(offlineContent.value);
+                        } else {
+                            offlineContents[offlineContent.fieldid][''] = JSON.parse(offlineContent.value);
+                        }
+                    });
+
+                    // Override field contents.
+                    angular.forEach(fields, function(field) {
+                        if ($mmaModDataFieldsDelegate.hasFiles(field)) {
+                            promises.push(self.getStoredFiles(record.dataid, record.id, field.id).then(function(offlineFiles) {
+                                record.contents[field.id] = $mmaModDataFieldsDelegate.overrideData(field, record.contents[field.id],
+                                        offlineContents[field.id], offlineFiles);
+                            }));
+                        } else {
+                            record.contents[field.id] = $mmaModDataFieldsDelegate.overrideData(field, record.contents[field.id],
+                                    offlineContents[field.id]);
+                        }
+                    });
+                    break;
             }
         });
-        return record;
+        return $q.all(promises).then(function() {
+            return record;
+        });
     };
 
     /**
@@ -146,6 +180,10 @@ angular.module('mm.addons.mod_data')
      * @return {String}         Generated HTML.
      */
     self.displayAdvancedSearchFields = function(template, fields) {
+        if (!template) {
+            return "";
+        }
+
         var replace;
 
         // Replace the fields found on template.
@@ -261,6 +299,10 @@ angular.module('mm.addons.mod_data')
      * @return {String}         Generated HTML.
      */
     self.displayEditFields = function(template, fields) {
+        if (!template) {
+            return "";
+        }
+
         var replace;
 
         // Replace the fields found on template.
@@ -270,7 +312,7 @@ angular.module('mm.addons.mod_data')
             replace = new RegExp(replace, 'g');
 
             // Replace field by a generic directive.
-            var render = '<mma-mod-data-field mode="edit" field="fields['+ field.id + ']" value="entryContents['+ field.id + ']" database="data" error="errors['+ field.id + ']"></mma-mod-data-field>';
+            var render = '<mma-mod-data-field mode="edit" field="fields['+ field.id + ']" value="entry.contents['+ field.id + ']" database="data" error="errors['+ field.id + ']"></mma-mod-data-field>';
             template = template.replace(replace, render);
 
             // Replace the field id tag.
@@ -294,14 +336,19 @@ angular.module('mm.addons.mod_data')
      * @param  {Object}  form            Form (DOM element).
      * @param  {Array}   fields          Fields that defines every content in the entry.
      * @param  {Number}  [dataId]        Database Id. If set, files will be uploaded and itemId set.
-     * @param  {Object}   entryContents  Original entry contents indexed by field id.
+     * @param  {Number}  entryId         Entry Id.
+     * @param  {Object}  entryContents   Original entry contents indexed by field id.
+     * @param  {Boolean} offline         True to prepare the data for an offline uploading, false otherwise.
+     * @param  {String}  [siteId]        Site ID. If not defined, current site.
      * @return {Promise}                 That contains object with the answers.
      */
-    self.getEditDataFromForm = function(form, fields, dataId, entryContents) {
+    self.getEditDataFromForm = function(form, fields, dataId, entryId, entryContents, offline, siteId) {
         if (!form || !form.elements) {
             return $q.when({});
         }
 
+        siteId = siteId || $mmSite.getId();
+
         var formData = getFormData(form);
 
         // Filter and translate fields to each field plugin.
@@ -318,7 +365,7 @@ angular.module('mm.addons.mod_data')
 
                         // Upload Files if asked.
                         if (dataId && data.files) {
-                            dataProm = self.uploadOrStoreFiles(dataId, 0, undefined, data.files).then(function(itemId) {
+                            dataProm = self.uploadOrStoreFiles(dataId, 0, entryId, data.fieldid, data.files, offline, siteId).then(function(itemId) {
                                 delete data.files;
                                 data.value = itemId;
                             });
@@ -423,20 +470,80 @@ angular.module('mm.addons.mod_data')
      * @name $mmaModDataHelper#uploadOrStoreFiles
      * @param  {Number}   dataId        Database ID.
      * @param  {Number}   [itemId]      Draft ID to use. Undefined or 0 to create a new draft ID.
-     * @param  {Number}   [timecreated] The time the entry was created.
+     * @param  {Number}   entryId       Entry ID or, if creating, timemodified.
+     * @param  {Number}   fieldId       Field ID.
      * @param  {Object[]} files         List of files.
      * @param  {Boolean}  offline       True if files sould be stored for offline, false to upload them.
      * @param  {String}   [siteId]      Site ID. If not defined, current site.
      * @return {Promise}                Promise resolved if success.
      */
-    self.uploadOrStoreFiles = function(dataId, itemId, timecreated, files, offline, siteId) {
+    self.uploadOrStoreFiles = function(dataId, itemId, entryId, fieldId, files, offline, siteId) {
         if (offline) {
-            // @todo in future issues.
-            //return self.storeFiles(dataId, timecreated, files, siteId);
+            return self.storeFiles(dataId, entryId, fieldId, files, siteId);
         }
         return $mmFileUploader.uploadOrReuploadFiles(files, mmaModDataComponent, itemId, siteId);
     };
 
+    /**
+     * Given a list of files (either online files or local files), store the local files in a local folder
+     * to be submitted later.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#storeFiles
+     * @param  {Number}   dataId     Database ID.
+     * @param  {Number}   entryId    Entry ID or, if creating, timemodified.
+     * @param  {Number}   fieldId    Field ID.
+     * @param  {Object[]} files      List of files.
+     * @param  {String}   [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved if success, rejected otherwise.
+     */
+    self.storeFiles = function(dataId, entryId, fieldId, files, siteId) {
+        // Get the folder where to store the files.
+        return $mmaModDataOffline.getEntryFieldFolder(dataId, entryId, fieldId, siteId).then(function(folderPath) {
+            return $mmFileUploader.storeFilesToUpload(folderPath, files);
+        });
+    };
+
+    /**
+     * Delete stored attachment files for an entry.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#deleteStoredFiles
+     * @param  {Number}   dataId     Database ID.
+     * @param  {Number}   entryId    Entry ID or, if creating, timemodified.
+     * @param  {Number}   fieldId    Field ID.
+     * @param  {String}   [siteId]   Site ID. If not defined, current site.
+     * @return {Promise}             Promise resolved when deleted.
+     */
+    self.deleteStoredFiles = function(dataId, entryId, fieldId, siteId) {
+        return $mmaModDataOffline.getEntryFieldFolder(dataId, entryId, fieldId, siteId).then(function(folderPath) {
+            return $mmFS.removeDir(folderPath);
+        });
+    };
+
+    /**
+     * Get a list of stored attachment files for a new entry. See $mmaModDataHelper#storeFiles.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getStoredFiles
+     * @param  {Number}   dataId     Database ID.
+     * @param  {Number}   entryId    Entry ID or, if creating, timemodified.
+     * @param  {Number}   fieldId    Field ID.
+     * @param  {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}                Promise resolved with the files.
+     */
+    self.getStoredFiles = function(dataId, entryId, fieldId, siteId) {
+        return $mmaModDataOffline.getEntryFieldFolder(dataId, entryId, fieldId, siteId).then(function(folderPath) {
+            return $mmFileUploaderHelper.getStoredFiles(folderPath).catch(function(b) {
+                // Ignore not found files.
+                return [];
+            });
+        });
+    };
+
     /**
      * Add a prefix to all rules in a CSS string.
      *
diff --git a/www/core/lib/filesession.js b/www/core/lib/filesession.js
index 5d7d51b36d7..1bcded70804 100644
--- a/www/core/lib/filesession.js
+++ b/www/core/lib/filesession.js
@@ -98,6 +98,7 @@ angular.module('mm.core')
      * @param  {String}         component    Component Name.
      * @param  {String|Number}  id           File area identifier.
      * @param  {String}         [siteId]     Site ID. If not defined, current site.
+     * @return {Array}          Array of files in session.
      */
     self.getFiles = function(component, id, siteId) {
         siteId = siteId || $mmSite.getId();
diff --git a/www/core/lib/fs.js b/www/core/lib/fs.js
index 41898cfb023..30f4435d8ba 100644
--- a/www/core/lib/fs.js
+++ b/www/core/lib/fs.js
@@ -413,7 +413,7 @@ angular.module('mm.core')
      *
      * @module mm.core
      * @ngdoc method
-     * @name $mmFS#getFileSizeFromFileEntry
+     * @name $mmFS#getFileObjectFromFileEntry
      * @param  {String} path Relative path to the file.
      * @return {Promise}     Promise to be resolved when the size is calculated.
      */

From 43bfa52ce12f4695a79c47902fdad5caddb0aaf1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 14 Jul 2017 14:38:39 +0200
Subject: [PATCH 069/118] MOBILE-2175 sidemenu: Support 'app' custom items

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

diff --git a/www/core/components/sidemenu/templates/menu.html b/www/core/components/sidemenu/templates/menu.html
index f7acee79e28..3118087551f 100644
--- a/www/core/components/sidemenu/templates/menu.html
+++ b/www/core/components/sidemenu/templates/menu.html
@@ -40,7 +40,7 @@ <h2>{{siteinfo.fullname}}</h2>
                         </a>
                     </li>
                     <li ng-repeat="item in customItems" class="mm-sidemenu-customitem">
-                        <a ng-if="item.type != 'embedded'" menu-close class="item item-icon-left" ng-href="{{item.url}}" mm-link in-app="{{item.type == 'inappbrowser'}}" title="{{item.label}}">
+                        <a ng-if="item.type != 'embedded'" menu-close class="item item-icon-left" ng-href="{{item.url}}" mm-link in-app="{{item.type == 'inappbrowser'}}" capture-link="{{item.type == 'app'}}" title="{{item.label}}">
                             <i class="icon {{item.icon}}"></i>{{item.label}}
                         </a>
                         <a ng-if="item.type == 'embedded'" menu-close class="item item-icon-left" ui-sref="site.iframe-view({title: item.label, url: item.url})" title="{{item.label}}">

From 8e374a3597261bdcccd5f19df6f4b20a07845818 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 14 Jul 2017 16:17:17 +0200
Subject: [PATCH 070/118] MOBILE-2170 ionic: Fix scroll with trackpad when
 hovering deep items

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

diff --git a/www/core/main.js b/www/core/main.js
index 3436248ff2c..289fb5aef6c 100644
--- a/www/core/main.js
+++ b/www/core/main.js
@@ -277,6 +277,7 @@ angular.module('mm.core', ['pascalprecht.translate'])
                 }
             }
         });
+
         $window.addEventListener('native.keyboardhide', function(e) {
             $mmEvents.trigger(mmCoreEventKeyboardHide, e);
 
@@ -285,6 +286,16 @@ angular.module('mm.core', ['pascalprecht.translate'])
                 ionic.trigger('resize');
             }
         });
+
+        if (!$mmApp.isDevice()) {
+            // Re-define getParentOrSelfWithClass to change the default value of the depth param.
+            // This is to allow scrolling with trackpad when hovering deep elements.
+            var originalFunction = ionic.DomUtil.getParentOrSelfWithClass;
+            ionic.DomUtil.getParentOrSelfWithClass = function(e, className, depth) {
+                depth = depth || 20;
+                return originalFunction(e, className, depth);
+            };
+        }
     });
 
     // Send event when device goes online.

From 6c6fd78fa939a6933923b3320ffc5e67e100515e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Wed, 12 Jul 2017 16:32:52 +0200
Subject: [PATCH 071/118] MOBILE-2127 data: Add entries in offline mode

---
 www/addons/mod/data/controllers/edit.js       | 54 +++++++++++---
 www/addons/mod/data/controllers/index.js      | 47 +++++++++++-
 www/addons/mod/data/fields/file/handler.js    |  2 +-
 www/addons/mod/data/fields/picture/handler.js |  2 +-
 .../mod/data/fields/textarea/handler.js       |  2 +-
 www/addons/mod/data/services/data.js          | 74 ++++++++++++++++---
 www/addons/mod/data/services/data_offline.js  | 11 ++-
 .../mod/data/services/fieldsdelegate.js       |  4 +-
 www/addons/mod/data/services/helper.js        | 16 ++--
 9 files changed, 175 insertions(+), 37 deletions(-)

diff --git a/www/addons/mod/data/controllers/edit.js b/www/addons/mod/data/controllers/edit.js
index b2ed0bad570..7d07431cc7d 100644
--- a/www/addons/mod/data/controllers/edit.js
+++ b/www/addons/mod/data/controllers/edit.js
@@ -33,7 +33,6 @@ angular.module('mm.addons.mod_data')
         siteId = $mmSite.getId(),
         offline = !$mmApp.isOnline(),
         entryId = $stateParams.entryid || false,
-        editing = entryId > 0,
         entry;
 
     $scope.title = module.name;
@@ -56,7 +55,7 @@ angular.module('mm.addons.mod_data')
         }).then(function(accessData) {
             $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
 
-            if (!editing) {
+            if (entryId !== false) {
                 // Adding, get groups because it's not set.
                 return $mmGroups.getActivityGroupInfo(data.coursemodule, accessData.canmanageentries).then(function(groupInfo) {
                     $scope.groupInfo = groupInfo;
@@ -88,9 +87,31 @@ angular.module('mm.addons.mod_data')
                 $scope.fields[field.id] = field;
             });
 
-            if (editing) {
+            if (entryId > 0) {
                 return $mmaModData.getEntry(data.id, entryId);
             }
+
+            for (var x in offlineActions) {
+                if (offlineActions[x].action == 'add') {
+                    offlineEntry = offlineActions[x];
+
+                    var siteInfo = $mmSite.getInfo(),
+                        entryData = {
+                            id: offlineEntry.entryid,
+                            canmanageentry: true,
+                            approved: !data.approval || data.manageapproved,
+                            dataid: offlineEntry.dataid,
+                            groupid: offlineEntry.groupid,
+                            timecreated: -offlineEntry.entryid,
+                            timemodified: -offlineEntry.entryid,
+                            userid: siteInfo.userid,
+                            fullname: siteInfo.fullname,
+                            contents: {}
+                        };
+
+                    return $q.when({entry: entryData});
+                }
+            }
         }).then(function(entryData) {
             if (entryData) {
                 entry = entryData.entry;
@@ -101,13 +122,16 @@ angular.module('mm.addons.mod_data')
                     contents[field.fieldid] = field;
                 });
                 entry.contents = contents;
+            } else {
+                entry = {};
+                entry.contents = {};
             }
 
             return $mmaModDataHelper.applyOfflineActions(entry, offlineActions, $scope.fields);
         }).then(function(entryData) {
             $scope.entry = entryData;
 
-            $scope.editForm = $mmaModDataHelper.displayEditFields(data.addtemplate, $scope.fields, entryData.contents);
+            $scope.editForm = $mmaModDataHelper.displayEditFields(data.addtemplate, $scope.fields, entry.contents);
         }).catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
@@ -140,24 +164,34 @@ angular.module('mm.addons.mod_data')
 
             var modal = $mmUtil.showModalLoading('mm.core.sending', true);
 
-            return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id, entryId,
-                    $scope.entry.contents, offline).catch(function(e) {
+            // Create an ID to assign files.
+            var entryTemp = entryId;
+            if ((typeof entryId == "undefined" || entryId === false) && offline) {
+                entryTemp = - (new Date().getTime());
+            }
+
+            return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
+                    entryTemp, $scope.entry.contents, offline).catch(function(e) {
                 if (!offline) {
                     // Cannot submit in online, prepare for offline usage.
                     offline = true;
+                    if (typeof entryTemp == "undefined") {
+                        entryTemp = - (new Date().getTime());
+                    }
 
                     return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
-                        entryId, $scope.entry.contents, offline);
+                        entryTemp, $scope.entry.contents, offline);
                 }
 
                 return $q.reject(e);
             }).then(function(editData) {
 
                 if (editData.length > 0) {
-                    if (entryId) {
+                    if (entryId !== false) {
                         return $mmaModData.editEntry(data.id, entryId, courseId, editData, $scope.fields, undefined, offline);
                     }
-                    return $mmaModData.addEntry(data.id, editData, $scope.selectedGroup, undefined, offline);
+                    return $mmaModData.addEntry(data.id, entryTemp, courseId, editData, $scope.selectedGroup, $scope.fields, undefined,
+                            offline);
                 }
              }).then(function(result) {
                 if (!result) {
@@ -166,7 +200,7 @@ angular.module('mm.addons.mod_data')
                 }
 
                 // This is done if entry is updated when editing or creating if not.
-                if ((entryId && result.updated) || (!entryId && result.newentryid)) {
+                if ((entryId !== false && result.updated) || (!entryId && result.newentryid)) {
                     var promises = [];
 
                     entryId = entryId || result.newentryid;
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 1e09e2d5f81..36fa90e6d37 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -146,14 +146,22 @@ angular.module('mm.addons.mod_data')
             $scope.hasOffline = !!offlineEntries.length;
 
             $scope.offlineActions = {};
+            $scope.offlineEntries = {};
 
             // Only show offline entries on first page.
             if ($scope.search.page == 0 && $scope.hasOffline) {
                 angular.forEach(offlineEntries, function(entry) {
-                    if (typeof $scope.offlineActions[entry.entryid] == "undefined") {
-                        $scope.offlineActions[entry.entryid] = [];
+                    if (entry.entryid > 0) {
+                        if (typeof $scope.offlineActions[entry.entryid] == "undefined") {
+                            $scope.offlineActions[entry.entryid] = [];
+                        }
+                        $scope.offlineActions[entry.entryid].push(entry);
+                    } else {
+                        if (typeof $scope.offlineActions[entry.entryid] == "undefined") {
+                            $scope.offlineEntries[entry.entryid] = [];
+                        }
+                        $scope.offlineEntries[entry.entryid].push(entry);
                     }
-                    $scope.offlineActions[entry.entryid].push(entry);
                 });
             }
         });
@@ -184,7 +192,38 @@ angular.module('mm.addons.mod_data')
             if (!$scope.isEmpty) {
                 $scope.cssTemplate = $mmaModDataHelper.prefixCSS(data.csstemplate, '.mma-data-entries-' + data.id);
 
-                var promises = [];
+                var siteInfo = $mmSite.getInfo(),
+                    promises = [];
+
+                angular.forEach($scope.offlineEntries, function(offlineActions) {
+                    var entry;
+
+                    angular.forEach(offlineActions, function(offlineEntry) {
+                        if (offlineEntry.action == 'add') {
+                            entry = {
+                                id: offlineEntry.entryid,
+                                canmanageentry: true,
+                                approved: !data.approval || data.manageapproved,
+                                dataid: offlineEntry.dataid,
+                                groupid: offlineEntry.groupid,
+                                timecreated: -offlineEntry.entryid,
+                                timemodified: -offlineEntry.entryid,
+                                userid: siteInfo.userid,
+                                fullname: siteInfo.fullname,
+                                contents: {}
+                            };
+                        }
+                    });
+
+                    if (entry) {
+                        if (offlineActions.length > 0) {
+                            promises.push($mmaModDataHelper.applyOfflineActions(entry, offlineActions, $scope.fields));
+                        } else {
+                            promises.push($q.when(entry));
+                        }
+                    }
+
+                });
 
                 angular.forEach(entries.entries, function(entry) {
                     // Index contents by fieldid.
diff --git a/www/addons/mod/data/fields/file/handler.js b/www/addons/mod/data/fields/file/handler.js
index e026a464613..7c6d6123d36 100644
--- a/www/addons/mod/data/fields/file/handler.js
+++ b/www/addons/mod/data/fields/file/handler.js
@@ -116,7 +116,7 @@ angular.module('mm.addons.mod_data')
      * @return {Object}                     Data overriden
      */
     self.overrideData = function(originalContent, offlineContent, offlineFiles) {
-        if (offlineContent && offlineContent.file && offlineContent.file.offline > 0) {
+        if (offlineContent && offlineContent.file && offlineContent.file.offline > 0 && offlineFiles && offlineFiles.length > 0) {
             originalContent.content = offlineFiles[0].filename;
             originalContent.files = [offlineFiles[0]];
         } else if (offlineContent && offlineContent.file && offlineContent.file.online && offlineContent.file.online.length > 0) {
diff --git a/www/addons/mod/data/fields/picture/handler.js b/www/addons/mod/data/fields/picture/handler.js
index 2d933e07e11..d78e5bbe986 100644
--- a/www/addons/mod/data/fields/picture/handler.js
+++ b/www/addons/mod/data/fields/picture/handler.js
@@ -153,7 +153,7 @@ angular.module('mm.addons.mod_data')
      * @return {Object}                     Data overriden
      */
     self.overrideData = function(originalContent, offlineContent, offlineFiles) {
-        if (offlineContent && offlineContent.file && offlineContent.file.offline > 0) {
+        if (offlineContent && offlineContent.file && offlineContent.file.offline > 0 && offlineFiles && offlineFiles.length > 0) {
             originalContent.content = offlineFiles[0].filename;
             originalContent.files = [offlineFiles[0]];
         } else if (offlineContent && offlineContent.file && offlineContent.file.online && offlineContent.file.online.length > 0) {
diff --git a/www/addons/mod/data/fields/textarea/handler.js b/www/addons/mod/data/fields/textarea/handler.js
index 3f6f49081fe..524f8e92c60 100644
--- a/www/addons/mod/data/fields/textarea/handler.js
+++ b/www/addons/mod/data/fields/textarea/handler.js
@@ -150,7 +150,7 @@ angular.module('mm.addons.mod_data')
      */
     self.overrideData = function(originalContent, offlineContent) {
         originalContent.content = offlineContent[''] || "";
-        if (originalContent.content.length > 0 && originalContent.files.length > 0) {
+        if (originalContent.content.length > 0 && originalContent.files && originalContent.files.length > 0) {
             // Take the original files since we cannot edit them on the app.
             originalContent.content = $mmText.replacePluginfileUrls(originalContent.content, originalContent.files);
         }
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index b03e5182354..c2aab5107d8 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -437,7 +437,7 @@ angular.module('mm.addons.mod_data')
         // Convenience function to store a data to be synchronized later.
         function storeOffline() {
             var action = approve ? 'approve' : 'disapprove';
-            return $mmaModDataOffline.saveEntry(dataId, entryId, action, courseId, false, undefined, siteId);
+            return $mmaModDataOffline.saveEntry(dataId, entryId, action, courseId, undefined, false, undefined, siteId);
         }
     };
 
@@ -523,7 +523,7 @@ angular.module('mm.addons.mod_data')
 
         // Convenience function to store a data to be synchronized later.
         function storeOffline() {
-            return $mmaModDataOffline.saveEntry(dataId, entryId, 'delete', courseId, false, undefined, siteId);
+            return $mmaModDataOffline.saveEntry(dataId, entryId, 'delete', courseId, undefined, false, undefined, siteId);
         }
     };
 
@@ -560,12 +560,62 @@ angular.module('mm.addons.mod_data')
      * @ngdoc method
      * @name $mmaModData#addEntry
      * @param   {Number}    dataId          Data instance ID.
+     * @param   {Number}    entryId         Provisiona entry ID when offline.
+     * @param   {Number}    courseId        Course ID.
+     * @param   {Object}    contents        The fields data to be created.
+     * @param   {Number}    [groupId]       Group id, 0 means that the function will determine the user group.
+     * @param   {Object}    fields          The fields that define the contents.
+     * @param   {String}    [siteId]        Site ID. If not defined, current site.
+     * @param   {Boolean}   forceOffline    Force editing entry in offline.
+     * @return  {Promise}                   Promise resolved when the action is done.
+     */
+    self.addEntry = function(dataId, entryId, courseId, contents, groupId, fields, siteId, forceOffline) {
+        siteId = siteId || $mmSite.getId();
+
+        if (!$mmApp.isOnline() || forceOffline) {
+            var notifications = checkFields(fields, contents);
+            if (notifications) {
+                return {
+                    fieldnotifications: notifications
+                };
+            }
+        }
+
+        return self.addEntryOnline(dataId, contents, groupId, siteId).catch(function(error) {
+            if (error && !error.wserror) {
+                // Couldn't connect to server, store in offline.
+                return storeOffline();
+            } else {
+                // The WebService has thrown an error or offline not supported, reject.
+                return $q.reject(error.error);
+            }
+            });
+
+        // Convenience function to store a data to be synchronized later.
+        function storeOffline() {
+            return $mmaModDataOffline.saveEntry(dataId, entryId, 'add', courseId, groupId, contents, undefined, siteId)
+                    .then(function(entry) {
+                return {
+                    // Return provissional entry Id.
+                    newentryid: entry[1]
+                };
+            });
+        }
+    };
+
+    /**
+     * Adds a new entry to a database. It does not cache calls. It will fail if offline or cannot connect.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModData#addEntry
+     * @param   {Number}    dataId          Data instance ID.
      * @param   {Object}    data            The fields data to be created.
      * @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.
      * @return  {Promise}                   Promise resolved when the action is done.
      */
-    self.addEntry = function(dataId, data, groupId, siteId) {
+    self.addEntryOnline = function(dataId, data, groupId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     databaseid: dataId,
@@ -576,7 +626,12 @@ angular.module('mm.addons.mod_data')
                 params.groupid = groupId;
             }
 
-            return site.write('mod_data_add_entry', params);
+            return site.write('mod_data_add_entry', params).catch(function(error) {
+                return $q.reject({
+                    error: error,
+                    wserror: $mmUtil.isWebServiceError(error)
+                });
+            });
         });
     };
 
@@ -588,9 +643,9 @@ angular.module('mm.addons.mod_data')
      * @name $mmaModData#editEntry
      * @param   {Number}    dataId          Database ID.
      * @param   {Number}    entryId         Entry ID.
-     * @param   {Number}    courseId        Entry ID.
-     * @param   {Object}    fields          The fields that define the contents;
+     * @param   {Number}    courseId        Course ID.
      * @param   {Object}    contents        The contents data to be updated.
+     * @param   {Object}    fields          The fields that define the contents.
      * @param   {String}    [siteId]        Site ID. If not defined, current site.
      * @param   {Boolean}   forceOffline    Force editing entry in offline.
      * @return  {Promise}                   Promise resolved when the action is done.
@@ -609,7 +664,7 @@ angular.module('mm.addons.mod_data')
             }
         }
 
-        // Get if the opposite action is not synced.
+        // Get other not not synced actions.
         return $mmaModDataOffline.getEntryActions(dataId, entryId, siteId).then(function(entries) {
             if (entries && entries.length) {
                 // Found. Delete add and edit actions first.
@@ -629,7 +684,7 @@ angular.module('mm.addons.mod_data')
         }).then(function(){
             if (justAdded) {
                 // The field was added offline, add again and stop.
-                return self.addEntry(dataId, contents, groupId, siteId, forceOffline);
+                return self.addEntry(dataId, entryId, courseId, contents, groupId, fields, siteId, forceOffline);
             }
 
             if (!$mmApp.isOnline() || forceOffline) {
@@ -650,7 +705,8 @@ angular.module('mm.addons.mod_data')
 
         // Convenience function to store a data to be synchronized later.
         function storeOffline() {
-            return $mmaModDataOffline.saveEntry(dataId, entryId, 'edit', courseId, contents, undefined, siteId).then(function() {
+            return $mmaModDataOffline.saveEntry(dataId, entryId, 'edit', courseId, undefined, contents, undefined, siteId)
+                    .then(function() {
                 return {
                     updated: true
                 };
diff --git a/www/addons/mod/data/services/data_offline.js b/www/addons/mod/data/services/data_offline.js
index cdbe21b4f00..fdd057dae39 100644
--- a/www/addons/mod/data/services/data_offline.js
+++ b/www/addons/mod/data/services/data_offline.js
@@ -28,6 +28,9 @@ angular.module('mm.addons.mod_data')
                 {
                     name: 'courseid'
                 },
+                {
+                    name: 'groupid'
+                },
                 {
                     name: 'action'
                 },
@@ -175,23 +178,25 @@ angular.module('mm.addons.mod_data')
      * @param  {String} entryId         Database entry Id. If action is add entryId should be 0 and -timemodified will be used.
      * @param  {String} action          Action to be done to the entry: [add, edit, delete, approve, disapprove]
      * @param  {Number} courseId        Course ID of the database.
+     * @param  {Number} [groupId]       Group ID. ONly provided when adding.
      * @param  {Array}  [fields]        Array of field data of the entry if needed.
      * @param  {Number} [timemodified]  The time the entry was modified. If not defined, current time.
      * @param  {String} [siteId]        Site ID. If not defined, current site.
      * @return {Promise}                Promise resolved if stored, rejected if failure.
      */
-    self.saveEntry = function(dataId, entryId, action, courseId, fields, timemodified, siteId) {
+    self.saveEntry = function(dataId, entryId, action, courseId, groupId, fields, timemodified, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             timemodified = timemodified || new Date().getTime();
+            entryId = typeof entryId == "undefined" || entryId === false ? -timemodified : entryId;
             var entry = {
                     dataid: dataId,
                     courseid: courseId,
+                    groupid: groupId,
                     action: action,
-                    entryid: entryId || -timemodified,
+                    entryid: entryId,
                     fields: fields,
                     timemodified: timemodified
                 };
-
             return site.getDb().insert(mmaModDataEntriesStore, entry);
         });
     };
diff --git a/www/addons/mod/data/services/fieldsdelegate.js b/www/addons/mod/data/services/fieldsdelegate.js
index e8cff5b87d7..275f2121675 100644
--- a/www/addons/mod/data/services/fieldsdelegate.js
+++ b/www/addons/mod/data/services/fieldsdelegate.js
@@ -189,8 +189,8 @@ angular.module('mm.addons.mod_data')
      */
     self.overrideData = function(field, originalContent, offlineContent, offlineFiles) {
         var handler = self.getPluginHandler(field.type);
-        if (handler && handler.overrideData) {
-            return handler.overrideData(originalContent, offlineContent, offlineFiles);
+        if (handler && handler.overrideData && offlineContent) {
+            return handler.overrideData(originalContent || {}, offlineContent, offlineFiles);
         }
         return originalContent;
     };
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 350d22e2f08..25338582bb2 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -135,6 +135,7 @@ angular.module('mm.addons.mod_data')
                 case 'delete':
                     record.deleted = true;
                     break;
+                case 'add':
                 case 'edit':
                     var offlineContents = {};
                     angular.forEach(action.fields, function(offlineContent) {
@@ -365,9 +366,9 @@ angular.module('mm.addons.mod_data')
 
                         // Upload Files if asked.
                         if (dataId && data.files) {
-                            dataProm = self.uploadOrStoreFiles(dataId, 0, entryId, data.fieldid, data.files, offline, siteId).then(function(itemId) {
+                            dataProm = self.uploadOrStoreFiles(dataId, 0, entryId, data.fieldid, data.files, offline, siteId).then(function(filesResult) {
                                 delete data.files;
-                                data.value = itemId;
+                                data.value = filesResult;
                             });
                         } else {
                             dataProm = $q.when();
@@ -478,10 +479,13 @@ angular.module('mm.addons.mod_data')
      * @return {Promise}                Promise resolved if success.
      */
     self.uploadOrStoreFiles = function(dataId, itemId, entryId, fieldId, files, offline, siteId) {
-        if (offline) {
-            return self.storeFiles(dataId, entryId, fieldId, files, siteId);
+        if (files.length) {
+            if (offline) {
+                return self.storeFiles(dataId, entryId, fieldId, files, siteId);
+            }
+            return $mmFileUploader.uploadOrReuploadFiles(files, mmaModDataComponent, itemId, siteId);
         }
-        return $mmFileUploader.uploadOrReuploadFiles(files, mmaModDataComponent, itemId, siteId);
+        return $q.when(0);
     };
 
     /**
@@ -537,7 +541,7 @@ angular.module('mm.addons.mod_data')
      */
     self.getStoredFiles = function(dataId, entryId, fieldId, siteId) {
         return $mmaModDataOffline.getEntryFieldFolder(dataId, entryId, fieldId, siteId).then(function(folderPath) {
-            return $mmFileUploaderHelper.getStoredFiles(folderPath).catch(function(b) {
+            return $mmFileUploaderHelper.getStoredFiles(folderPath).catch(function() {
                 // Ignore not found files.
                 return [];
             });

From 851379a375070b154cfee88ffcfc02052f3b4b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Mon, 17 Jul 2017 16:48:59 +0200
Subject: [PATCH 072/118] MOBILE-2127 data: Sync activity

---
 www/addons/mod/data/controllers/edit.js       |   7 +-
 www/addons/mod/data/controllers/entry.js      |  17 +-
 www/addons/mod/data/controllers/index.js      |  45 ++-
 www/addons/mod/data/directives/action.js      |  10 +-
 .../mod/data/fields/checkbox/handler.js       |   3 -
 www/addons/mod/data/fields/date/handler.js    |   7 +-
 www/addons/mod/data/fields/file/handler.js    |   3 -
 www/addons/mod/data/fields/latlong/handler.js |  11 +-
 www/addons/mod/data/fields/menu/handler.js    |   3 -
 .../mod/data/fields/multimenu/handler.js      |   3 -
 www/addons/mod/data/fields/number/handler.js  |   3 -
 www/addons/mod/data/fields/picture/handler.js |   3 -
 .../mod/data/fields/radiobutton/handler.js    |   3 -
 www/addons/mod/data/fields/text/handler.js    |   3 -
 .../mod/data/fields/textarea/handler.js       |   3 -
 www/addons/mod/data/fields/url/handler.js     |   3 -
 www/addons/mod/data/main.js                   |   7 +
 www/addons/mod/data/services/data.js          |  46 ++-
 www/addons/mod/data/services/data_offline.js  |   4 +-
 www/addons/mod/data/services/data_sync.js     | 343 ++++++++++++++++++
 .../mod/data/services/fieldsdelegate.js       |   7 +-
 www/addons/mod/data/services/handlers.js      |  87 ++++-
 www/addons/mod/data/templates/action.html     |   2 +-
 23 files changed, 535 insertions(+), 88 deletions(-)
 create mode 100644 www/addons/mod/data/services/data_sync.js

diff --git a/www/addons/mod/data/controllers/edit.js b/www/addons/mod/data/controllers/edit.js
index 7d07431cc7d..afb0eb308f0 100644
--- a/www/addons/mod/data/controllers/edit.js
+++ b/www/addons/mod/data/controllers/edit.js
@@ -109,7 +109,7 @@ angular.module('mm.addons.mod_data')
                             contents: {}
                         };
 
-                    return $q.when({entry: entryData});
+                    return {entry: entryData};
                 }
             }
         }).then(function(entryData) {
@@ -166,7 +166,7 @@ angular.module('mm.addons.mod_data')
 
             // Create an ID to assign files.
             var entryTemp = entryId;
-            if ((typeof entryId == "undefined" || entryId === false) && offline) {
+            if (typeof entryId == "undefined" || entryId === false) {
                 entryTemp = - (new Date().getTime());
             }
 
@@ -175,9 +175,6 @@ angular.module('mm.addons.mod_data')
                 if (!offline) {
                     // Cannot submit in online, prepare for offline usage.
                     offline = true;
-                    if (typeof entryTemp == "undefined") {
-                        entryTemp = - (new Date().getTime());
-                    }
 
                     return $mmaModDataHelper.getEditDataFromForm(document.forms['mma-mod_data-edit-form'], $scope.fields, data.id,
                         entryTemp, $scope.entry.contents, offline);
diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index 18afe166244..d63244fe152 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataEntryCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $q, $mmEvents,
         $mmText, $translate, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups, $ionicScrollDelegate, mmaModDataEventEntryChanged,
-        $ionicHistory, $mmaModDataOffline) {
+        $ionicHistory, $mmaModDataOffline, mmaModDataEventAutomSynced) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -31,6 +31,7 @@ angular.module('mm.addons.mod_data')
         page = $stateParams.page || false,
         data,
         entryChangedObserver,
+        syncObserver,
         scrollView,
         access,
         offlineActions = [];
@@ -211,7 +212,21 @@ angular.module('mm.addons.mod_data')
         }
     });
 
+    // Refresh entry on sync.
+    syncObserver = $mmEvents.on(mmaModDataEventAutomSynced, function(eventData) {
+        if (eventData.entryid == entryId && data.id == eventData.dataid && $mmSite.getId() == eventData.siteid) {
+            if (eventData.deleted) {
+                // If deleted, go back.
+                $ionicHistory.goBack();
+            } else {
+                $scope.databaseLoaded = false;
+                return fetchEntryData(true);
+            }
+        }
+    });
+
     $scope.$on('$destroy', function() {
         entryChangedObserver && entryChangedObserver.off && entryChangedObserver.off();
+        syncObserver && syncObserver.off && syncObserver.off();
     });
 });
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 36fa90e6d37..8638d4ee982 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -23,7 +23,8 @@ angular.module('mm.addons.mod_data')
  */
 .controller('mmaModDataIndexCtrl', function($scope, $stateParams, $mmaModData, mmaModDataComponent, $mmCourse, $mmCourseHelper, $q,
         $mmText, $translate, $mmEvents, mmCoreEventOnlineStatusChanged, $mmApp, $mmUtil, $mmSite, $mmaModDataHelper, $mmGroups,
-        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage, $state, $mmComments, $mmaModDataOffline) {
+        mmaModDataEventEntryChanged, $ionicModal, mmaModDataPerPage, $state, $mmComments, $mmaModDataOffline, $mmaModDataSync,
+        mmaModDataEventAutomSynced) {
 
     var module = $stateParams.module || {},
         courseId = $stateParams.courseid,
@@ -31,6 +32,7 @@ angular.module('mm.addons.mod_data')
         data,
         entryChangedObserver,
         onlineObserver,
+        syncObserver,
         hasComments = false;
 
     $scope.title = module.name;
@@ -65,9 +67,14 @@ angular.module('mm.addons.mod_data')
             $scope.data = databaseData;
 
             $scope.database = data;
-
+            if (sync) {
+                // Try to synchronize the database.
+                return syncDatabase(showErrors).catch(function() {
+                    // Ignore errors.
+                });
+            }
+        }).then(function() {
             return $mmaModData.getDatabaseAccessInformation(data.id);
-
         }).then(function(accessData) {
             $scope.access = accessData;
 
@@ -135,7 +142,7 @@ angular.module('mm.addons.mod_data')
 
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
-        }).finally(function(){
+        }).finally(function() {
             $scope.databaseLoaded = true;
         });
     }
@@ -288,6 +295,22 @@ angular.module('mm.addons.mod_data')
         });
     }
 
+    // Tries to synchronize the database.
+    function syncDatabase(showErrors) {
+        return $mmaModDataSync.syncDatabase(data.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();
+        });
+    }
+
     fetchDatabaseData(false, true).then(function() {
         $mmaModData.logView(data.id).then(function() {
             $mmCourse.checkModuleCompletion(courseId, module.completionstatus);
@@ -356,7 +379,7 @@ angular.module('mm.addons.mod_data')
         return fetchEntriesData().catch(function(message) {
             $mmUtil.showErrorModalDefault(message, 'mm.course.errorgetmodule', true);
             return $q.reject();
-        }).finally(function(){
+        }).finally(function() {
             $scope.databaseLoaded = true;
         });
     };
@@ -399,7 +422,7 @@ angular.module('mm.addons.mod_data')
         $scope.isOnline = online;
     });
 
-    // Refresh entry on change.
+    // Refresh entries on change.
     entryChangedObserver = $mmEvents.on(mmaModDataEventEntryChanged, function(eventData) {
         if (data.id == eventData.dataId && siteId == eventData.siteId) {
             $scope.databaseLoaded = false;
@@ -407,8 +430,18 @@ angular.module('mm.addons.mod_data')
         }
     });
 
+    // Refresh entries on sync.
+    syncObserver = $mmEvents.on(mmaModDataEventAutomSynced, function(eventData) {
+        // Update just when all database is synced.
+        if (data.id == eventData.dataid && siteId == eventData.siteid && typeof eventData.entryid == "undefined") {
+            $scope.databaseLoaded = false;
+            return fetchDatabaseData(true);
+        }
+    });
+
     $scope.$on('$destroy', function() {
         onlineObserver && onlineObserver.off && onlineObserver.off();
         entryChangedObserver && entryChangedObserver.off && entryChangedObserver.off();
+        syncObserver && syncObserver.off && syncObserver.off();
     });
 });
diff --git a/www/addons/mod/data/directives/action.js b/www/addons/mod/data/directives/action.js
index 35772abe366..c934ee8d8c8 100644
--- a/www/addons/mod/data/directives/action.js
+++ b/www/addons/mod/data/directives/action.js
@@ -19,9 +19,9 @@ angular.module('mm.addons.mod_data')
  *
  * @module mm.addons.mod_data
  * @ngdoc directive
- * @name mmaModDataField
+ * @name mmaModDataAction
  */
-.directive('mmaModDataAction', function($mmSite, $mmUser, $mmaModDataOffline, $mmSite, $mmEvents, mmaModDataEventEntryChanged) {
+.directive('mmaModDataAction', function($mmSite, $mmUser, $mmaModDataOffline, $mmEvents, mmaModDataEventEntryChanged) {
     return {
         restrict: 'E',
         priority: 100,
@@ -40,10 +40,10 @@ angular.module('mm.addons.mod_data')
                 });
             }
 
-            scope.undoDelete = function(entryId) {
-                var dataId = scope.database.id,
+            scope.undoDelete = function() {
+                var dataId = scope.database.id;
                     entryId = scope.entry.id;
-                return $mmaModDataOffline.getEntry(dataId, entryId, 'delete').then(function(entry) {
+                return $mmaModDataOffline.getEntry(dataId, entryId, 'delete').then(function() {
                     // Found. Just delete the action.
                     return $mmaModDataOffline.deleteEntry(dataId, entryId, 'delete');
                 }).then(function() {
diff --git a/www/addons/mod/data/fields/checkbox/handler.js b/www/addons/mod/data/fields/checkbox/handler.js
index 0bc19b82fb2..d7d89c69554 100644
--- a/www/addons/mod/data/fields/checkbox/handler.js
+++ b/www/addons/mod/data/fields/checkbox/handler.js
@@ -126,9 +126,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
diff --git a/www/addons/mod/data/fields/date/handler.js b/www/addons/mod/data/fields/date/handler.js
index d71db316ded..a41d81653e3 100644
--- a/www/addons/mod/data/fields/date/handler.js
+++ b/www/addons/mod/data/fields/date/handler.js
@@ -135,16 +135,13 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
      */
     self.overrideData = function(originalContent, offlineContent) {
-        var date = Date.UTC(offlineContent['year'] || "", offlineContent['month'] ? offlineContent['month'] - 1 : "",
-            offlineContent['day'] || "");
+        var date = Date.UTC(offlineContent.year || "", offlineContent.month ? offlineContent.month - 1 : "",
+            offlineContent.day || "");
         date = Math.floor(date / 1000);
 
         originalContent.content = date || "";
diff --git a/www/addons/mod/data/fields/file/handler.js b/www/addons/mod/data/fields/file/handler.js
index 7c6d6123d36..9785294c354 100644
--- a/www/addons/mod/data/fields/file/handler.js
+++ b/www/addons/mod/data/fields/file/handler.js
@@ -107,9 +107,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @param  {Array}  offlineFiles        Array with all the offline files in the field.
diff --git a/www/addons/mod/data/fields/latlong/handler.js b/www/addons/mod/data/fields/latlong/handler.js
index bcaa7822cae..9922c1397a1 100644
--- a/www/addons/mod/data/fields/latlong/handler.js
+++ b/www/addons/mod/data/fields/latlong/handler.js
@@ -99,19 +99,19 @@ angular.module('mm.addons.mod_data')
      * @return {String}                     String with the notification or false.
      */
     self.getFieldsNotifications = function(field, inputData) {
-        var valuecount = 0;
+        var valueCount = 0;
 
         // The lat long class has two values that need to be checked.
         angular.forEach(inputData, function(value) {
             if (typeof value.value != "undefined" && value.value != "") {
-                valuecount++;
+                valueCount++;
             }
         });
 
         // If we get here then only one field has been filled in.
-        if (valuecount == 1) {
+        if (valueCount == 1) {
             return $translate.instant('mma.mod_data.latlongboth');
-        } else if (field.required && valuecount == 0) {
+        } else if (field.required && valueCount == 0) {
             return $translate.instant('mma.mod_data.errormustsupplyvalue');
         }
         return false;
@@ -120,9 +120,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
diff --git a/www/addons/mod/data/fields/menu/handler.js b/www/addons/mod/data/fields/menu/handler.js
index 22c3a4e1f41..08af08fefb9 100644
--- a/www/addons/mod/data/fields/menu/handler.js
+++ b/www/addons/mod/data/fields/menu/handler.js
@@ -95,9 +95,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
diff --git a/www/addons/mod/data/fields/multimenu/handler.js b/www/addons/mod/data/fields/multimenu/handler.js
index 209aad1c94a..ada5c6c7704 100644
--- a/www/addons/mod/data/fields/multimenu/handler.js
+++ b/www/addons/mod/data/fields/multimenu/handler.js
@@ -114,9 +114,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
diff --git a/www/addons/mod/data/fields/number/handler.js b/www/addons/mod/data/fields/number/handler.js
index 1aed84480cc..0229ff1b1cb 100644
--- a/www/addons/mod/data/fields/number/handler.js
+++ b/www/addons/mod/data/fields/number/handler.js
@@ -95,9 +95,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
diff --git a/www/addons/mod/data/fields/picture/handler.js b/www/addons/mod/data/fields/picture/handler.js
index d78e5bbe986..e8fd592b4a6 100644
--- a/www/addons/mod/data/fields/picture/handler.js
+++ b/www/addons/mod/data/fields/picture/handler.js
@@ -144,9 +144,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @param  {Array}  offlineFiles        Array with all the offline files in the field.
diff --git a/www/addons/mod/data/fields/radiobutton/handler.js b/www/addons/mod/data/fields/radiobutton/handler.js
index 29974029339..93fd7d5d740 100644
--- a/www/addons/mod/data/fields/radiobutton/handler.js
+++ b/www/addons/mod/data/fields/radiobutton/handler.js
@@ -95,9 +95,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
diff --git a/www/addons/mod/data/fields/text/handler.js b/www/addons/mod/data/fields/text/handler.js
index a6b0db201e8..909a1e2b92c 100644
--- a/www/addons/mod/data/fields/text/handler.js
+++ b/www/addons/mod/data/fields/text/handler.js
@@ -94,9 +94,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
diff --git a/www/addons/mod/data/fields/textarea/handler.js b/www/addons/mod/data/fields/textarea/handler.js
index 524f8e92c60..0e04c8951ae 100644
--- a/www/addons/mod/data/fields/textarea/handler.js
+++ b/www/addons/mod/data/fields/textarea/handler.js
@@ -141,9 +141,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
diff --git a/www/addons/mod/data/fields/url/handler.js b/www/addons/mod/data/fields/url/handler.js
index 98fc6a168b9..8719873723f 100644
--- a/www/addons/mod/data/fields/url/handler.js
+++ b/www/addons/mod/data/fields/url/handler.js
@@ -94,9 +94,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
      * @return {Object}                     Data overriden
diff --git a/www/addons/mod/data/main.js b/www/addons/mod/data/main.js
index 105f0cd808c..3ce8a7aa2eb 100644
--- a/www/addons/mod/data/main.js
+++ b/www/addons/mod/data/main.js
@@ -17,6 +17,8 @@ angular.module('mm.addons.mod_data', ['mm.core'])
 .constant('mmaModDataComponent', 'mmaModData')
 .constant('mmaModDataEventEntryChanged', 'mma-mod_data_entry_changed')
 .constant('mmaModDataPerPage', 25)
+.constant('mmaModDataEventAutomSynced', 'mma_mod_data_autom_synced')
+.constant('mmaModDataSyncTime', 300000) // In milliseconds.
 
 .config(function($stateProvider) {
 
@@ -81,4 +83,9 @@ angular.module('mm.addons.mod_data', ['mm.core'])
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:approve', '$mmaModDataHandlers.approveEntryLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:delete', '$mmaModDataHandlers.deleteEntryLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModData:edit', '$mmaModDataHandlers.editEntryLinksHandler');
+})
+
+.run(function($mmCronDelegate) {
+    // Register sync handler.
+    $mmCronDelegate.register('mmaModData', '$mmaModDataHandlers.syncHandler');
 });
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index c2aab5107d8..dcb5962cbd7 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -404,7 +404,7 @@ angular.module('mm.addons.mod_data')
      * @param   {Number}    dataId      Database ID.
      * @param   {Number}    entryId     Entry ID.
      * @param   {Boolean}   approve     Whether to approve (true) or unapprove the entry.
-     * @param   {Number}    courseId    Entry ID.
+     * @param   {Number}    courseId    Course ID.
      * @param   {String}    [siteId]    Site ID. If not defined, current site.
      * @return  {Promise}               Promise resolved when the action is done.
      */
@@ -447,10 +447,11 @@ angular.module('mm.addons.mod_data')
      * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModData#approveEntryOnline
-     * @param   {Number}    entryId         Entry ID.
-     * @param   {Boolean}   approve         Whether to approve (true) or unapprove the entry.
-     * @return  {Promise}            Promise resolved when the action is done. Rejected with object containing
-     *                                   the error message (if any) and a boolean indicating if the error was returned by WS.
+     * @param   {Number}    entryId     Entry ID.
+     * @param   {Boolean}   approve     Whether to approve (true) or unapprove the entry.
+     * @param   {String}    [siteId]    Site ID. If not defined, current site.
+     * @return  {Promise}               Promise resolved when the action is done. Rejected with object containing the error message
+     *                                  (if any) and a boolean indicating if the error was returned by WS.
      */
     self.approveEntryOnline = function(entryId, approve, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
@@ -477,7 +478,7 @@ angular.module('mm.addons.mod_data')
      * @name $mmaModData#deleteEntry
      * @param   {Number}    dataId      Database ID.
      * @param   {Number}    entryId     Entry ID.
-     * @param   {Number}    courseId    Entry ID.
+     * @param   {Number}    courseId    Course ID.
      * @param   {String}    [siteId]    Site ID. If not defined, current site.
      * @return  {Promise}               Promise resolved when the action is done.
      */
@@ -485,7 +486,7 @@ angular.module('mm.addons.mod_data')
         siteId = siteId || $mmSite.getId();
         var justAdded = false;
 
-        // Get if the opposite action is not synced.
+        // Check if the opposite action is not synced and just delete it.
         return $mmaModDataOffline.getEntryActions(dataId, entryId, siteId).then(function(entries) {
             if (entries && entries.length) {
                 // Found. Delete other actions first.
@@ -499,7 +500,7 @@ angular.module('mm.addons.mod_data')
 
                 return $q.all(proms);
             }
-        }).then(function(){
+        }).then(function() {
             if (justAdded) {
                 // The field was added offline, delete and stop.
                 return;
@@ -560,7 +561,7 @@ angular.module('mm.addons.mod_data')
      * @ngdoc method
      * @name $mmaModData#addEntry
      * @param   {Number}    dataId          Data instance ID.
-     * @param   {Number}    entryId         Provisiona entry ID when offline.
+     * @param   {Number}    entryId         EntryId or provisional entry ID when offline.
      * @param   {Number}    courseId        Course ID.
      * @param   {Object}    contents        The fields data to be created.
      * @param   {Number}    [groupId]       Group id, 0 means that the function will determine the user group.
@@ -608,8 +609,8 @@ angular.module('mm.addons.mod_data')
      *
      * @module mm.addons.mod_data
      * @ngdoc method
-     * @name $mmaModData#addEntry
-     * @param   {Number}    dataId          Data instance ID.
+     * @name $mmaModData#addEntryOnline
+     * @param   {Number}    dataId          Database ID.
      * @param   {Object}    data            The fields data to be created.
      * @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.
@@ -626,7 +627,12 @@ angular.module('mm.addons.mod_data')
                 params.groupid = groupId;
             }
 
-            return site.write('mod_data_add_entry', params).catch(function(error) {
+            return site.write('mod_data_add_entry', params).then(function(result) {
+                if (result.newentryid) {
+                    return result;
+                }
+                return $q.reject();
+            }).catch(function(error) {
                 return $q.reject({
                     error: error,
                     wserror: $mmUtil.isWebServiceError(error)
@@ -681,7 +687,7 @@ angular.module('mm.addons.mod_data')
 
                 return $q.all(proms);
             }
-        }).then(function(){
+        }).then(function() {
             if (justAdded) {
                 // The field was added offline, add again and stop.
                 return self.addEntry(dataId, entryId, courseId, contents, groupId, fields, siteId, forceOffline);
@@ -714,6 +720,13 @@ angular.module('mm.addons.mod_data')
         }
     };
 
+    /**
+     * Convenience function to check fields requeriments here named "notifications"
+     *
+     * @param   {Object}    fields          The fields that define the contents.
+     * @param   {Object}    contents        The contents data of the fields.
+     * @return  {Array}                     Array of notifications if any or false.
+     */
     function checkFields(fields, contents) {
         var notifications = [],
             notification,
@@ -758,7 +771,12 @@ angular.module('mm.addons.mod_data')
                     data: data
                 };
 
-            return site.write('mod_data_update_entry', params).catch(function(error) {
+            return site.write('mod_data_update_entry', params).then(function(result) {
+                if (result.updated) {
+                    return result;
+                }
+                return $q.reject();
+            }).catch(function(error) {
                 return $q.reject({
                     error: error,
                     wserror: $mmUtil.isWebServiceError(error)
diff --git a/www/addons/mod/data/services/data_offline.js b/www/addons/mod/data/services/data_offline.js
index fdd057dae39..7a16d8d1755 100644
--- a/www/addons/mod/data/services/data_offline.js
+++ b/www/addons/mod/data/services/data_offline.js
@@ -226,7 +226,7 @@ angular.module('mm.addons.mod_data')
      *
      * @module mm.addons.mod_data
      * @ngdoc method
-     * @name $mmaModDataOffline#getEntryFolder
+     * @name $mmaModDataOffline#getEntryFieldFolder
      * @param  {Number} dataId      Database ID.
      * @param  {Number} entryId     The ID of the entry.
      * @param  {Number} fieldId     Field ID.
@@ -235,7 +235,7 @@ angular.module('mm.addons.mod_data')
      */
     self.getEntryFieldFolder = function(dataId, entryId, fieldId ,siteId) {
         return self.getDatabaseFolder(dataId, siteId).then(function(folderPath) {
-            return $mmFS.concatenatePaths(folderPath, 'entry_' + entryId + '_' + fieldId);
+            return $mmFS.concatenatePaths(folderPath, entryId + '_' + fieldId);
         });
     };
 
diff --git a/www/addons/mod/data/services/data_sync.js b/www/addons/mod/data/services/data_sync.js
new file mode 100644
index 00000000000..20300452faa
--- /dev/null
+++ b/www/addons/mod/data/services/data_sync.js
@@ -0,0 +1,343 @@
+// (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_data')
+
+/**
+ * Data synchronization service.
+ *
+ * @module mm.addons.mod_data
+ * @ngdoc service
+ * @name $mmaModDataSync
+ */
+.factory('$mmaModDataSync', function($log, $mmaModData, $mmSite, $mmSitesManager, $q, $mmaModDataOffline, $mmCourse, $mmUtil,
+            $mmApp, $mmEvents, $translate, mmaModDataSyncTime, $mmSync, mmaModDataEventAutomSynced, mmaModDataComponent,
+            $mmSyncBlock, $mmLang, $mmaModDataHelper) {
+
+    $log = $log.getInstance('$mmaModDataSync');
+
+    // Inherit self from $mmSync.
+    var self = $mmSync.createChild(mmaModDataComponent, mmaModDataSyncTime);
+
+    /**
+     * Check if a database has data to synchronize.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataSync#hasDataToSync
+     * @param  {Number} dataId   Database ID.
+     * @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(dataId, siteId) {
+        return $mmaModDataOffline.hasOfflineData(dataId, siteId);
+    };
+
+    /**
+     * Try to synchronize all data that need it and haven't been synchronized in a while.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataSync#syncAllDatabases
+     * @param {String} [siteId] Site ID to sync. If not defined, sync all sites.
+     * @return {Promise}        Promise resolved when the sync is done.
+     */
+    self.syncAllDatabases = function(siteId) {
+        if (!$mmApp.isOnline()) {
+            $log.debug('Cannot sync all databases because device is offline.');
+            return $q.reject();
+        }
+
+        var promise;
+        if (!siteId) {
+            // No site ID defined, sync all sites.
+            $log.debug('Try to sync database in all sites.');
+            promise = $mmSitesManager.getSitesIds();
+        } else {
+            $log.debug('Try to sync database in site ' + siteId);
+            promise = $q.when([siteId]);
+        }
+
+        return promise.then(function(siteIds) {
+            var sitePromises = [];
+
+            angular.forEach(siteIds, function(siteId) {
+                // Sync submissions.
+                sitePromises.push($mmaModDataOffline.getAllEntries(siteId).then(function(offlineActions) {
+                    var promises = {};
+
+                    // Do not sync same database twice.
+                    angular.forEach(offlineActions, function(action) {
+                        if (typeof promises[action.dataid] != 'undefined') {
+                            return;
+                        }
+
+                        promises[action.dataid] = self.syncDatabaseIfNeeded(action.dataid, siteId)
+                                .then(function(result) {
+                            if (result && result.updated) {
+                                // Sync done. Send event.
+                                $mmEvents.trigger(mmaModDataEventAutomSynced, {
+                                    siteid: siteId,
+                                    dataid: action.dataid,
+                                    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 database only if a certain time has passed since the last time.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataSync#syncDatabaseIfNeeded
+     * @param  {Number} dataId      Database ID.
+     * @param {String} [siteId]     Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved when the data is synced or if it doesn't need to be synced.
+     */
+    self.syncDatabaseIfNeeded = function(dataId, siteId) {
+        return self.isSyncNeeded(dataId, siteId).then(function(needed) {
+            if (needed) {
+                return self.syncDatabase(dataId, siteId);
+            }
+        });
+    };
+
+    /**
+     * Try to synchronize a database.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataSync#syncDatabase
+     * @param  {Number} dataId      Data ID.
+     * @param  {String} [siteId]    Site ID. If not defined, current site.
+     * @return {Promise}            Promise resolved if sync is successful, rejected otherwise.
+     */
+    self.syncDatabase = function(dataId, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        var syncPromise,
+            data,
+            courseId,
+            result = {
+                warnings: [],
+                updated: false
+            };
+
+        if (self.isSyncing(dataId, siteId)) {
+            // There's already a sync ongoing for this discussion, return the promise.
+            return self.getOngoingSync(dataId, siteId);
+        }
+
+        // Verify that data isn't blocked.
+        if ($mmSyncBlock.isBlocked(mmaModDataComponent, dataId, siteId)) {
+            $log.debug('Cannot sync database ' + dataId + ' because it is blocked.');
+            var modulename = $mmCourse.translateModuleName('data');
+            return $mmLang.translateAndReject('mm.core.errorsyncblocked', {$a: modulename});
+        }
+
+        $log.debug('Try to sync database ' + dataId);
+
+        // Get offline actions to be sent.
+        syncPromise = $mmaModDataOffline.getDatabaseEntries(dataId, siteId).catch(function() {
+            // No offline data found, return empty array.
+            return [];
+        }).then(function(offlineActions) {
+            if (!offlineActions.length) {
+                // Nothing to sync.
+                return;
+            } else if (!$mmApp.isOnline()) {
+                // Cannot sync in offline.
+                return $q.reject();
+            }
+
+            courseId = offlineActions[0].courseid;
+
+            return $mmaModData.getDatabaseById(courseId, dataId, siteId).then(function(database) {
+                data = database;
+
+                var promises = [],
+                    offlineEntries = {};
+
+                angular.forEach(offlineActions, function(entry) {
+                    if (typeof offlineEntries[entry.entryid] == "undefined") {
+                        offlineEntries[entry.entryid] = [];
+                    }
+                    offlineEntries[entry.entryid].push(entry);
+                });
+
+                angular.forEach(offlineEntries, function(entryActions) {
+                    promises.push(syncEntry(data, entryActions, result.warnings, siteId));
+                });
+
+                return $q.all(promises);
+            }).then(function() {
+                if (result.updated) {
+                    // Data has been sent to server. Now invalidate the WS calls.
+                    return $mmaModData.invalidateContent(data.cmid, courseId, siteId).catch(function() {
+                        // Ignore errors.
+                    });
+                }
+            });
+        }).then(function() {
+            // Sync finished, set sync time.
+            return self.setSyncTime(dataId, siteId).catch(function() {
+                // Ignore errors.
+            });
+        }).then(function() {
+            // All done, return the warnings.
+            return result;
+        });
+
+        return self.addOngoingSync(dataId, syncPromise, siteId);
+    };
+
+    /**
+     * Synchronize an entry.
+     *
+     * @param  {Object}   data          Database.
+     * @param  {Object}   entryActions  Entry actions.
+     * @param  {Object[]} warnings      List of warnings.
+     * @param  {String}   [siteId]      Site ID. If not defined, current site.
+     * @return {Promise}                Promise resolved if success, rejected otherwise.
+     */
+    function syncEntry(data, entryActions, warnings, siteId) {
+        var discardError,
+            timePromise,
+            entryId = 0,
+            deleted = false,
+            promises = [];
+
+        // Sort entries by timemodified.
+        entryActions = entryActions.sort(function(a, b) {
+            return a.timemodified - b.timemodified;
+        });
+
+        entryId = entryActions[0].entryid;
+
+        if (entryId > 0) {
+            timePromise = $mmaModData.getEntry(data.id, entryActions[0].entryid, siteId).then(function(entry) {
+                return entry.entry.timemodified;
+            }).catch(function() {
+                return -1;
+            });
+        } else {
+            timePromise = $q.when(0);
+        }
+
+        return timePromise.then(function(timemodified) {
+            if (timemodified < 0 || timemodified >= entryActions[0].timemodified) {
+                // The entry was not found in Moodle or the entry has been modified, discard the action.
+                discardError = $translate.instant('mma.mod_data.warningsubmissionmodified');
+                return;
+            }
+
+            angular.forEach(entryActions, function(action) {
+                var actionPromise,
+                    proms = [];
+
+                entryId = action.entryid > 0 ? action.entryid : entryId;
+
+                if (action.fields) {
+                    angular.forEach(action.fields, function(field) {
+                        // Upload Files if asked.
+                        var value = JSON.parse(field.value);
+                        if (value.online || value.offline) {
+                            var files = value.online || [],
+                                fileProm = value.offline ? $mmaModDataHelper.getStoredFiles(action.dataid, entryId, field.fieldid) :
+                                    $q.when([]);
+
+                            proms.push(fileProm.then(function(offlineFiles) {
+                                files = files.concat(offlineFiles);
+                                return $mmaModDataHelper.uploadOrStoreFiles(action.dataid, 0, entryId, field.fieldid, files, false,
+                                        siteId).then(function(filesResult) {
+                                    field.value = JSON.stringify(filesResult);
+                                });
+                            }));
+                        }
+                    });
+                }
+
+                actionPromise = $q.all(proms).then(function() {
+                    // Perform the action.
+                    switch (action.action) {
+                        case 'add':
+                            return $mmaModData.addEntryOnline(action.dataid, action.fields, data.groupid, siteId)
+                                    .then(function(result) {
+                                entryId = result.newentryid;
+                            });
+                        case 'edit':
+                            return $mmaModData.editEntryOnline(entryId, action.fields, siteId);
+                        case 'approve':
+                            return $mmaModData.approveEntryOnline(entryId, true, siteId);
+                        case 'disapprove':
+                            return $mmaModData.approveEntryOnline(entryId, false, siteId);
+                        case 'delete':
+                            return $mmaModData.deleteEntryOnline(entryId, siteId).then(function() {
+                                deleted = true;
+                            });
+                    }
+                });
+
+                promises.push(actionPromise.catch(function(error) {
+                    if (error && error.wserror) {
+                        // The WebService has thrown an error, this means it cannot be performed. Discard.
+                        discardError = error.error;
+                    } else {
+                        // Couldn't connect to server, reject.
+                        return $q.reject(error && error.error);
+                    }
+                }).then(function() {
+                    // Delete the offline data.
+                    return $mmaModDataOffline.deleteEntry(action.dataid, action.entryid, action.action, siteId);
+                }));
+            });
+            return $q.all(promises);
+        }).then(function() {
+            if (discardError) {
+                // Submission was discarded, add a warning.
+                var message = $translate.instant('mm.core.warningofflinedatadeleted', {
+                    component: $mmCourse.translateModuleName('data'),
+                    name: data.name,
+                    error: discardError
+                });
+
+                if (warnings.indexOf(message) == -1) {
+                    warnings.push(message);
+                }
+            }
+
+            // Sync done. Send event.
+            $mmEvents.trigger(mmaModDataEventAutomSynced, {
+                siteid: siteId,
+                dataid: action.dataid,
+                entryid: action.entryid,
+                warnings: warnings,
+                deleted: deleted
+            });
+        });
+    }
+
+    return self;
+});
diff --git a/www/addons/mod/data/services/fieldsdelegate.js b/www/addons/mod/data/services/fieldsdelegate.js
index 275f2121675..5e3f3c0cd0a 100644
--- a/www/addons/mod/data/services/fieldsdelegate.js
+++ b/www/addons/mod/data/services/fieldsdelegate.js
@@ -178,9 +178,6 @@ angular.module('mm.addons.mod_data')
     /**
      * Override field content data with offline submission.
      *
-     * @module mm.addons.mod_data
-     * @ngdoc method
-     * @name $mmaModDataFieldsDelegate#overrideData
      * @param  {Object} field               Defines the field to be rendered.
      * @param  {Object} originalContent     Original data to be overriden.
      * @param  {Array}  offlineContent      Array with all the offline data to override.
@@ -196,7 +193,7 @@ angular.module('mm.addons.mod_data')
     };
 
     /**
-     * Get the directive to use for a certain feedback plugin.
+     * Get the directive to use for a certain database plugin.
      *
      * @module mm.addons.mod_data
      * @ngdoc method
@@ -252,7 +249,7 @@ angular.module('mm.addons.mod_data')
      *                             - getFieldsNotifications(field, inputData) Optional.
      *                                                           Should return an array of notifications before sending data.
      *                             - overrideData(originalContent, offlineContent, offlineFiles) Optional.
-     *                                                            Should return and object with the overriden content from offline
+     *                                                            Should return an object with the overriden content from offline
      *                                                            submission.
      */
     self.registerHandler = function(addon, pluginType, handler) {
diff --git a/www/addons/mod/data/services/handlers.js b/www/addons/mod/data/services/handlers.js
index 65c5ac4ca47..343d607e42e 100644
--- a/www/addons/mod/data/services/handlers.js
+++ b/www/addons/mod/data/services/handlers.js
@@ -23,7 +23,8 @@ angular.module('mm.addons.mod_data')
  */
 .factory('$mmaModDataHandlers', function($mmCourse, $mmaModData, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite, $q,
         mmaModDataComponent, $mmaModDataPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded, $mmContentLinkHandlerFactory,
-        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate, mmaModDataEventEntryChanged, $translate) {
+        mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate, mmaModDataEventEntryChanged, $translate,
+        $mmaModDataSync) {
     var self = {};
 
     /**
@@ -215,6 +216,23 @@ angular.module('mm.addons.mod_data')
         }];
     };
 
+    /**
+     * Convenience function to help get courseId.
+     * @param {Number} dataId   Database Id.
+     * @param {Number} siteId   Site Id, if not set, current site will be used.
+     * @param {Number} courseId Course Id if already set.
+     * @return {Promise}        Resolved with course Id when done.
+     */
+    function getActivityCourseIdIfNotSet(dataId, siteId, courseId) {
+        if (courseId) {
+            return $q.when(courseId);
+        }
+
+        return $mmCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId).then(function(module) {
+            return module.course;
+        });
+    }
+
     /**
      * Content links handler for database approve/disapprove entry.
      * Match mod/data/view.php?d=6&approve=5 with a valid data id and entryid.
@@ -243,12 +261,13 @@ angular.module('mm.addons.mod_data')
                     entryId = parseInt(params.approve, 10) || parseInt(params.disapprove, 10),
                     approve = parseInt(params.approve, 10) ? true : false;
 
-                return $mmCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId).then(function(module) {
+                return getActivityCourseIdIfNotSet(dataId, siteId, courseId).then(function(cId) {
+                    courseId = cId;
 
                     // Approve/disapprove entry.
-                    return $mmaModData.approveEntry(dataId, entryId, approve, module.course, siteId).catch(function(message) {
+                    return $mmaModData.approveEntry(dataId, entryId, approve, courseId, siteId).catch(function(message) {
                         modal.dismiss();
-                        $mmUtil.showErrorModal(message, 'mma.mod_data.errorapproving', true);
+                        $mmUtil.showErrorModalDefault(message, 'mma.mod_data.errorapproving', true);
 
                         return $q.reject();
                     });
@@ -300,11 +319,13 @@ angular.module('mm.addons.mod_data')
                         dataId = parseInt(params.d, 10),
                         entryId = parseInt(params.delete, 10);
 
-                    return $mmCourse.getModuleBasicInfoByInstance(dataId, 'data', siteId).then(function(module) {
+                    return getActivityCourseIdIfNotSet(dataId, siteId, courseId).then(function(cId) {
+                        courseId = cId;
+
                         // Delete entry.
-                        return $mmaModData.deleteEntry(dataId, entryId, module.course, siteId, true).catch(function(message) {
+                        return $mmaModData.deleteEntry(dataId, entryId, courseId, siteId, true).catch(function(message) {
                             modal.dismiss();
-                            $mmUtil.showErrorModal(message, 'mma.mod_data.errordeleting', true);
+                            $mmUtil.showErrorModalDefault(message, 'mma.mod_data.errordeleting', true);
 
                             return $q.reject();
                         });
@@ -375,5 +396,57 @@ angular.module('mm.addons.mod_data')
         }];
     };
 
+    /**
+     * Synchronization handler.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHandlers#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 $mmaModDataSync.syncAllDatabases(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/data/templates/action.html b/www/addons/mod/data/templates/action.html
index 5d2c9026dd3..91581409647 100644
--- a/www/addons/mod/data/templates/action.html
+++ b/www/addons/mod/data/templates/action.html
@@ -1,7 +1,7 @@
 <a ng-if="action == 'more'" class="button button-icon icon ion-ios-search-strong" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&rid={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.more' | translate }}"></a>
 <a ng-if="action == 'edit'" class="button button-icon icon ion-gear-b" ng-href="{{url}}/mod/data/edit.php?d={{entry.dataid}}&rid={{entry.id}}" mm-link capture-link="true" title="{{ 'mm.core.edit' | translate }}"></a>
 <a ng-if="action == 'delete' && !entry.deleted" class="button button-icon icon ion-trash-a" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&delete={{entry.id}}" mm-link capture-link="true" title="{{ 'mm.core.delete' | translate }}"></a>
-<a ng-if="action == 'delete' && entry.deleted" class="button button-icon icon ion-reply" ng-click="undoDelete(entry.id)" mm-link capture-link="true" title="{{ 'mma.mod_data.restore' | translate }}"></a>
+<a ng-if="action == 'delete' && entry.deleted" class="button button-icon icon ion-reply" ng-click="undoDelete()" mm-link capture-link="true" title="{{ 'mma.mod_data.restore' | translate }}"></a>
 <a ng-if="action == 'approve'" class="button button-icon icon ion-thumbsup" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&approve={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.approve' | translate }}"></a>
 <a ng-if="action == 'disapprove'" class="button button-icon icon ion-minus-circled" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&disapprove={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.disapprove' | translate }}"></a>
 

From 4838d4f1d9b4aedf74d01daa79ffbad33e196e1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 20 Jul 2017 12:40:35 +0200
Subject: [PATCH 073/118] MOBILE-2131 data: Apply UX changes

---
 www/addons/mod/data/controllers/index.js      |  5 ++++
 www/addons/mod/data/scss/styles.scss          | 30 ++++++++++++++++++-
 .../mod/data/templates/search-modal.html      |  7 +++--
 www/core/scss/styles.scss                     | 17 +++++++++++
 4 files changed, 55 insertions(+), 4 deletions(-)

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 8638d4ee982..258873390b1 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -395,6 +395,11 @@ angular.module('mm.addons.mod_data')
         $scope.searchEntries(0);
     };
 
+    // Switches between advanced to normal search
+    $scope.switchAdvanced = function(enable) {
+        $scope.search.searchingAdvanced = enable;
+    };
+
     // Opens add entries form
     $scope.gotoAddEntries = function() {
         var stateParams = {
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index d1a9230dbce..f563d867542 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -19,6 +19,7 @@
   td {
     padding-left: 2px;
     padding-right: 2px;
+    vertical-align: top;
   }
 }
 
@@ -27,6 +28,9 @@
   table {
     width: 100%;
   }
+  td {
+    vertical-align: top;
+  }
 
   textarea,
   input[type="text"],
@@ -66,6 +70,22 @@
     padding: 16px 0 16px 16px;
   }
 
+  mm-attachments + .item-stacked-label {
+    border-top: 0px;
+    padding: 0;
+    margin-right: 1px;
+
+    ion-label {
+      margin: 0;
+      padding-left: 16px;
+    }
+
+    input {
+      border: 0;
+      margin: 0;
+    }
+  }
+
   mm-attachments .item {
     width: 100%;
     margin: -1px;
@@ -76,10 +96,14 @@
     margin-right: 1px;
   }
 
-  .item-select select {
+  .item-input.item-select {
+    margin-bottom: -6px;
+
+    select {
       width: 100%;
       left: 0;
       max-width: none;
+    }
   }
 
   .item-input.mm-latlong {
@@ -93,4 +117,8 @@
       border: 0;
     }
   }
+
+  .mm-item-has-rich-text-editor {
+    margin-right: 1px;
+  }
 }
\ No newline at end of file
diff --git a/www/addons/mod/data/templates/search-modal.html b/www/addons/mod/data/templates/search-modal.html
index 88468aac721..8402fcd17a3 100644
--- a/www/addons/mod/data/templates/search-modal.html
+++ b/www/addons/mod/data/templates/search-modal.html
@@ -5,6 +5,10 @@ <h1 class="title">{{ 'mma.mod_data.search' | translate}}</h1>
         <button class="button button-icon ion-search" ng-click="searchEntries(0)"></button>
     </ion-header-bar>
     <ion-content>
+        <div class="tabs tabs-striped tabs-free mm-tabs-color">
+            <a class="tab-item" ng-class="{'active': !search.searchingAdvanced}" ng-click="switchAdvanced(false)">{{ 'mma.mod_data.search' | translate}}</a>
+            <a class="tab-item" ng-class="{'active': search.searchingAdvanced}" ng-click="switchAdvanced(true)">{{ 'mma.mod_data.advancedsearch' | translate }}</a>
+        </div>
         <div class="list">
             <label class="item item-input" ng-if="!search.searchingAdvanced">
                 <input type="text" placeholder="{{ 'mma.mod_data.search' | translate}}" ng-model="search.text">
@@ -28,9 +32,6 @@ <h1 class="title">{{ 'mma.mod_data.search' | translate}}</h1>
                 <ion-radio ng-model="search.sortDirection" value="ASC">{{ 'mma.mod_data.ascending' | translate }}</ion-radio>
                 <ion-radio ng-model="search.sortDirection" value="DESC">{{ 'mma.mod_data.descending' | translate }}</ion-radio>
             </ion-list>
-            <div ng-if="advancedSearch" class="item item-text-wrap">
-                <ion-toggle ng-model="search.searchingAdvanced" class="item-borderless">{{ 'mma.mod_data.advancedsearch' | translate }}</ion-toggle>
-            </div>
             <form id="mma-mod_data-advanced-search-form" class="padding" ng-if="advancedSearch && search.searchingAdvanced">
                 <mm-format-text component="{{component}}" component-id="{{data.cmid}}" watch="true">
                     {{ advancedSearch }}
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 09dd660264c..600a52eb370 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -979,6 +979,23 @@ mm-timer {
   background: transparent;
 }
 
+mm-multiple-select {
+  cursor: pointer;
+
+  .item-stacked-label {
+    ion-label.input-label, p {
+      padding-right: 30px;
+      white-space: normal;
+    }
+  }
+  .icon.ion-android-arrow-dropdown {
+    font-size: 21px;
+    color: #999999;
+    right: 5px;
+  }
+
+}
+
 .button.mm-button-icon-small {
   padding: 0 3px;
   min-height: $mm-button-icon-small-height;

From fbbee5c4b13a36df1c3d89cdba739bc6d96e9cb7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 20 Jul 2017 16:50:12 +0200
Subject: [PATCH 074/118] MOBILE-2180 desktop: Focus when relaunched and use
 exit instead of quit

---
 www/electron.js | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/www/electron.js b/www/electron.js
index 9e149a52fac..7f7c6b03bdf 100644
--- a/www/electron.js
+++ b/www/electron.js
@@ -59,7 +59,7 @@ app.on('ready', function() {
 
 // Quit when all windows are closed.
 app.on('window-all-closed', () => {
-    app.quit();
+    app.exit();
 });
 
 app.on('activate', () => {
@@ -87,20 +87,24 @@ var shouldQuit = app.makeSingleInstance((argv, workingDirectory) => {
     // Another instance was launched. If it was launched with a URL, it should be in the second param.
     if (argv && argv[1]) {
         appLaunched(argv[1]);
+    } else {
+        focusApp();
     }
 });
 
-if (shouldQuit) {
+// For some reason, shouldQuit is always true in signed Mac apps so we should ingore it.
+if (shouldQuit && os.platform().indexOf('darwin') == -1) {
     // It's not the main instance of the app, kill it.
-    app.quit();
-} else {
-    // Listen for open-url events (Mac OS only).
-    app.on('open-url', (event, url) => {
-        event.preventDefault();
-        appLaunched(url);
-    });
+    app.exit();
+    return;
 }
 
+// Listen for open-url events (Mac OS only).
+app.on('open-url', (event, url) => {
+    event.preventDefault();
+    appLaunched(url);
+});
+
 function appLaunched(url) {
     // App was launched again with a URL. Focus the main window and send an event to treat the URL.
     if (mainWindow) {

From 12225e09b963a80f13b2a8a17a3cf6c0212338da Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 17 Jul 2017 11:21:33 +0200
Subject: [PATCH 075/118] MOBILE-2169 errors: Improve errors when offline

---
 www/addons/files/controllers/list.js          |  5 ++--
 www/addons/files/services/files.js            | 24 ++++---------------
 www/addons/mod/assign/services/handlers.js    |  7 +++---
 www/addons/mod/book/controllers/index.js      |  4 ++--
 www/addons/mod/choice/services/handlers.js    |  7 +++---
 www/addons/mod/data/services/handlers.js      |  3 ++-
 www/addons/mod/feedback/services/handlers.js  |  7 +++---
 www/addons/mod/forum/services/handlers.js     |  7 +++---
 www/addons/mod/glossary/controllers/index.js  | 10 ++++----
 www/addons/mod/glossary/services/handlers.js  |  5 ++--
 www/addons/mod/imscp/controllers/index.js     |  4 ++--
 www/addons/mod/lesson/services/handlers.js    |  3 ++-
 www/addons/mod/scorm/controllers/index.js     |  4 ++--
 www/addons/mod/scorm/services/handlers.js     | 13 ++++------
 www/addons/mod/scorm/services/helper.js       |  9 ++++---
 www/addons/mod/survey/services/handlers.js    |  7 +++---
 www/addons/mod/wiki/services/handlers.js      |  5 ++--
 .../components/course/controllers/sections.js |  8 +++----
 www/core/components/course/services/helper.js | 14 +++++------
 .../course/services/prefetchdelegate.js       |  4 ++--
 .../login/controllers/credentials.js          |  5 ++++
 .../login/controllers/emailsignup.js          | 22 +++++++++--------
 .../components/login/controllers/reconnect.js |  5 ++++
 www/core/components/login/controllers/site.js |  5 ++++
 .../login/controllers/sitepolicy.js           |  2 +-
 www/core/directives/file.js                   |  4 ++--
 www/core/lang/en.json                         |  2 +-
 www/core/lib/util.js                          |  3 ++-
 www/core/lib/ws.js                            |  8 +++++++
 29 files changed, 111 insertions(+), 95 deletions(-)

diff --git a/www/addons/files/controllers/list.js b/www/addons/files/controllers/list.js
index 3dd985cc11d..79f1066cf54 100644
--- a/www/addons/files/controllers/list.js
+++ b/www/addons/files/controllers/list.js
@@ -49,8 +49,9 @@ angular.module('mm.addons.files')
         return promise.then(function(files) {
             $scope.files = files.entries;
             $scope.count = files.count;
-        }).catch(function() {
-            $mmUtil.showErrorModal('mma.files.couldnotloadfiles', true);
+        }).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'mma.files.couldnotloadfiles', true);
+            return $q.reject();
         });
     }
 
diff --git a/www/addons/files/services/files.js b/www/addons/files/services/files.js
index 058c3a9b62e..6f7c543f0bf 100644
--- a/www/addons/files/services/files.js
+++ b/www/addons/files/services/files.js
@@ -71,20 +71,18 @@ angular.module('mm.addons.files')
      *                          - linkId: A hash of the file parameters.
      */
     self.getFiles = function(params) {
-        var deferred = $q.defer(),
-            options = {};
+        var options = {};
 
         options.cacheKey = getFilesListCacheKey(params);
 
-        $mmSite.read('core_files_get_files', params, options).then(function(result) {
+        return $mmSite.read('core_files_get_files', params, options).then(function(result) {
             var data = {
                 entries: [],
                 count: 0
             };
 
             if (typeof result.files == 'undefined') {
-                deferred.reject();
-                return;
+                return $q.reject();
             }
 
             angular.forEach(result.files, function(entry) {
@@ -109,27 +107,13 @@ angular.module('mm.addons.files')
 
                 entry.link = JSON.stringify(entry.link);
                 entry.linkId = md5.createHash(entry.link);
-                // entry.localpath = "";
-
-                // if (!entry.isdir && entry.url) {
-                //     // TODO Check $mmSite.
-                //     var uniqueId = $mmSite.id + "-" + md5.createHash(entry.url);
-                //     var path = MM.db.get("files", uniqueId);
-                //     if (path) {
-                //         entry.localpath = path.get("localpath");
-                //     }
-                // }
 
                 data.count += 1;
                 data.entries.push(entry);
             });
 
-            deferred.resolve(data);
-        }, function() {
-            deferred.reject();
+            return data;
         });
-
-        return deferred.promise;
     };
 
     /**
diff --git a/www/addons/mod/assign/services/handlers.js b/www/addons/mod/assign/services/handlers.js
index 0dd88eac33b..818e81c48d3 100644
--- a/www/addons/mod/assign/services/handlers.js
+++ b/www/addons/mod/assign/services/handlers.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_assign')
  * @ngdoc service
  * @name $mmaModAssignHandlers
  */
-.factory('$mmaModAssignHandlers', function($mmCourse, $mmaModAssign, $state, $mmContentLinksHelper, $mmUtil, mmCoreDownloading,
+.factory('$mmaModAssignHandlers', function($mmCourse, $mmaModAssign, $state, $mmContentLinksHelper, $mmUtil, mmCoreDownloading, $q,
         mmCoreNotDownloaded, mmCoreOutdated, $mmEvents, mmCoreEventPackageStatusChanged, $mmSite, mmaModAssignComponent,
         $mmCoursePrefetchDelegate, $mmaModAssignPrefetchHandler, $mmaModAssignSync) {
     var self = {};
@@ -102,9 +102,10 @@ angular.module('mm.addons.mod_assign')
                     // We need to call getDownloadSize, the package might have been updated.
                     $mmaModAssignPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
                         $mmUtil.confirmDownloadSize(size).then(function() {
-                            $mmaModAssignPrefetchHandler.prefetch(module, courseId).catch(function() {
+                            return $mmaModAssignPrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
-                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                                    return $q.reject();
                                 }
                             });
                         }).catch(function() {
diff --git a/www/addons/mod/book/controllers/index.js b/www/addons/mod/book/controllers/index.js
index 8ab97e48515..9677627c1d4 100644
--- a/www/addons/mod/book/controllers/index.js
+++ b/www/addons/mod/book/controllers/index.js
@@ -56,8 +56,8 @@ angular.module('mm.addons.mod_book')
                     $mmCourse.checkModuleCompletion(courseId, module.completionstatus);
                 }
             });
-        }).catch(function() {
-            $mmUtil.showErrorModal('mma.mod_book.errorchapter', true);
+        }).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'mma.mod_book.errorchapter', true);
             return $q.reject();
         }).finally(function() {
             $scope.loaded = true;
diff --git a/www/addons/mod/choice/services/handlers.js b/www/addons/mod/choice/services/handlers.js
index 4d9145c5d7f..96c13d47b93 100644
--- a/www/addons/mod/choice/services/handlers.js
+++ b/www/addons/mod/choice/services/handlers.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_choice')
  * @ngdoc service
  * @name $mmaModChoiceHandlers
  */
-.factory('$mmaModChoiceHandlers', function($mmCourse, $mmaModChoice, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite,
+.factory('$mmaModChoiceHandlers', function($mmCourse, $mmaModChoice, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite, $q,
             $mmaModChoicePrefetchHandler, $mmCoursePrefetchDelegate, mmCoreDownloading, mmCoreNotDownloaded, mmCoreOutdated,
             mmaModChoiceComponent, mmCoreEventPackageStatusChanged, mmCoreDownloaded, $mmaModChoiceSync) {
     var self = {};
@@ -103,9 +103,10 @@ angular.module('mm.addons.mod_choice')
                     // Get download size to ask for confirm if it's high.
                     $mmaModChoicePrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
                         $mmUtil.confirmDownloadSize(size).then(function() {
-                            $mmaModChoicePrefetchHandler.prefetch(module, courseId).catch(function() {
+                            return $mmaModChoicePrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
-                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                                    return $q.reject();
                                 }
                             });
                         }).catch(function() {
diff --git a/www/addons/mod/data/services/handlers.js b/www/addons/mod/data/services/handlers.js
index dfd2b0f34fc..e4d176a1d9c 100644
--- a/www/addons/mod/data/services/handlers.js
+++ b/www/addons/mod/data/services/handlers.js
@@ -102,9 +102,10 @@ angular.module('mm.addons.mod_data')
                     // We need to call getDownloadSize, the package might have been updated.
                     $mmaModDataPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
                         $mmUtil.confirmDownloadSize(size).then(function() {
-                            $mmaModDataPrefetchHandler.prefetch(module, courseId).catch(function(error) {
+                            return $mmaModDataPrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
                                     $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                                    return $q.reject();
                                 }
                             });
                         }).catch(function() {
diff --git a/www/addons/mod/feedback/services/handlers.js b/www/addons/mod/feedback/services/handlers.js
index 48661bcd919..04b5f6d2613 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, $mmaModFeedbackSync,
+        mmaModFeedbackComponent, $mmaModFeedbackPrefetchHandler, mmCoreDownloading, mmCoreNotDownloaded, $mmaModFeedbackSync, $q,
         mmCoreEventPackageStatusChanged, mmCoreOutdated, $mmCoursePrefetchDelegate, $mmContentLinkHandlerFactory) {
     var self = {};
 
@@ -102,9 +102,10 @@ angular.module('mm.addons.mod_feedback')
                     // 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() {
+                            return $mmaModFeedbackPrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
-                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                                    return $q.reject();
                                 }
                             });
                         }).catch(function() {
diff --git a/www/addons/mod/forum/services/handlers.js b/www/addons/mod/forum/services/handlers.js
index dd5160f0a50..c8db7b531ac 100644
--- a/www/addons/mod/forum/services/handlers.js
+++ b/www/addons/mod/forum/services/handlers.js
@@ -21,7 +21,7 @@ angular.module('mm.addons.mod_forum')
  * @ngdoc service
  * @name $mmaModForumHandlers
  */
-.factory('$mmaModForumHandlers', function($mmCourse, $mmaModForum, $state, $mmUtil, $mmContentLinksHelper, $mmEvents, $mmSite,
+.factory('$mmaModForumHandlers', function($mmCourse, $mmaModForum, $state, $mmUtil, $mmContentLinksHelper, $mmEvents, $mmSite, $q,
             $mmaModForumPrefetchHandler, $mmCoursePrefetchDelegate, mmCoreDownloading, mmCoreNotDownloaded, mmCoreOutdated,
             mmaModForumComponent, mmCoreEventPackageStatusChanged, $mmaModForumSync, $mmContentLinkHandlerFactory) {
     var self = {};
@@ -110,9 +110,10 @@ angular.module('mm.addons.mod_forum')
                     // Get download size to ask for confirm if it's high.
                     $mmaModForumPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
                         $mmUtil.confirmDownloadSize(size).then(function() {
-                            $mmaModForumPrefetchHandler.prefetch(module, courseId).catch(function() {
+                            return $mmaModForumPrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
-                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                                    return $q.reject();
                                 }
                             });
                         }).catch(function() {
diff --git a/www/addons/mod/glossary/controllers/index.js b/www/addons/mod/glossary/controllers/index.js
index 29913639991..168344cafcd 100644
--- a/www/addons/mod/glossary/controllers/index.js
+++ b/www/addons/mod/glossary/controllers/index.js
@@ -168,8 +168,10 @@ angular.module('mm.addons.mod_glossary')
         var promises = [];
         // Ignore search mode that is not set yet.
         if (fetchMode != 'search' || $scope.searchQuery) {
-            var args = angular.extend([], fetchArguments);
-            promises.push(fetchInvalidate.apply(this, args));
+            if (fetchInvalidate) {
+                var args = angular.extend([], fetchArguments);
+                promises.push(fetchInvalidate.apply(this, args));
+            }
             promises.push($mmaModGlossary.invalidateCourseGlossaries(courseId));
         }
         if (glossary && glossary.id) {
@@ -356,9 +358,9 @@ angular.module('mm.addons.mod_glossary')
             $scope.canLoadMore = (limitFrom + limitNum) < result.count;
 
             $scope.showNoEntries = ($scope.entries.length + $scope.offlineEntries.length) <= 0;
-        }).catch(function() {
+        }).catch(function(error) {
             if (append) {
-                $mmUtil.showErrorModal('mma.mod_glossary.errorloadingentries', true);
+                $mmUtil.showErrorModalDefault(error, 'mma.mod_glossary.errorloadingentries', true);
             }
             $scope.canLoadMore = false; // Set to false to prevent infinite calls with infinite-loading.
             return $q.reject();
diff --git a/www/addons/mod/glossary/services/handlers.js b/www/addons/mod/glossary/services/handlers.js
index 0cf6d199865..80834abf457 100644
--- a/www/addons/mod/glossary/services/handlers.js
+++ b/www/addons/mod/glossary/services/handlers.js
@@ -105,9 +105,10 @@ angular.module('mm.addons.mod_glossary')
                     // Get download size to ask for confirm if it's high.
                     $mmaModGlossaryPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
                         $mmUtil.confirmDownloadSize(size).then(function() {
-                            $mmaModGlossaryPrefetchHandler.prefetch(module, courseId).catch(function() {
+                            return $mmaModGlossaryPrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
-                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                                    return $q.reject();
                                 }
                             });
                         }).catch(function() {
diff --git a/www/addons/mod/imscp/controllers/index.js b/www/addons/mod/imscp/controllers/index.js
index 506860b14c5..41f6ebd7227 100644
--- a/www/addons/mod/imscp/controllers/index.js
+++ b/www/addons/mod/imscp/controllers/index.js
@@ -101,8 +101,8 @@ angular.module('mm.addons.mod_imscp')
                     // We could load the main file but the download failed. Show error message.
                     $mmUtil.showErrorModal('mm.core.errordownloadingsomefiles', true);
                 }
-            }).catch(function() {
-                $mmUtil.showErrorModal('mma.mod_imscp.deploymenterror', true);
+            }).catch(function(error) {
+                $mmUtil.showErrorModalDefault(error, 'mma.mod_imscp.deploymenterror', true);
                 return $q.reject();
             });
         }).finally(function() {
diff --git a/www/addons/mod/lesson/services/handlers.js b/www/addons/mod/lesson/services/handlers.js
index f1308aa0422..95a575059c6 100644
--- a/www/addons/mod/lesson/services/handlers.js
+++ b/www/addons/mod/lesson/services/handlers.js
@@ -98,9 +98,10 @@ angular.module('mm.addons.mod_lesson')
 
                     $mmaModLessonPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
                         $mmUtil.confirmDownloadSize(size).then(function() {
-                            $mmaModLessonPrefetchHandler.prefetch(module, courseId).catch(function(error) {
+                            return $mmaModLessonPrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
                                     $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                                    return $q.reject();
                                 }
                             });
                         }).catch(function() {
diff --git a/www/addons/mod/scorm/controllers/index.js b/www/addons/mod/scorm/controllers/index.js
index 7be5e3f2ce2..e4073952ac5 100644
--- a/www/addons/mod/scorm/controllers/index.js
+++ b/www/addons/mod/scorm/controllers/index.js
@@ -419,9 +419,9 @@ angular.module('mm.addons.mod_scorm')
                         if (!$scope.$$destroyed) {
                             openScorm(scoId);
                         }
-                    }).catch(function() {
+                    }).catch(function(error) {
                         if (!$scope.$$destroyed) {
-                            $mmaModScormHelper.showDownloadError(scorm);
+                            $mmaModScormHelper.showDownloadError(scorm, error);
                         }
                     });
                 });
diff --git a/www/addons/mod/scorm/services/handlers.js b/www/addons/mod/scorm/services/handlers.js
index b9048febd28..6badb7af26e 100644
--- a/www/addons/mod/scorm/services/handlers.js
+++ b/www/addons/mod/scorm/services/handlers.js
@@ -23,7 +23,7 @@ angular.module('mm.addons.mod_scorm')
  */
 .factory('$mmaModScormHandlers', function($mmCourse, $mmaModScorm, $mmEvents, $state, $mmSite, $mmaModScormHelper,
         $mmCoursePrefetchDelegate, mmCoreDownloading, mmCoreNotDownloaded, mmCoreOutdated, mmCoreEventPackageStatusChanged,
-        mmaModScormComponent, $q, $mmContentLinksHelper, $mmUtil, $mmaModScormSync, $mmaModScormPrefetchHandler) {
+        mmaModScormComponent, $q, $mmContentLinksHelper, $mmaModScormSync, $mmaModScormPrefetchHandler) {
     var self = {};
 
     /**
@@ -95,9 +95,10 @@ angular.module('mm.addons.mod_scorm')
                         $scope.spinner = true; // Show spinner since this operation might take a while.
                         $mmaModScorm.getScorm(courseid, module.id, module.url).then(function(scorm) {
                             $mmaModScormHelper.confirmDownload(scorm, isOutdated).then(function() {
-                                $mmaModScormPrefetchHandler.prefetch(module, courseid).catch(function() {
+                                return $mmaModScormPrefetchHandler.prefetch(module, courseid).catch(function(error) {
                                     if (!$scope.$$destroyed) {
-                                        $mmaModScormHelper.showDownloadError(scorm);
+                                        $mmaModScormHelper.showDownloadError(scorm, error);
+                                        return $q.reject();
                                     }
                                 });
                             }).catch(function() {
@@ -106,11 +107,7 @@ angular.module('mm.addons.mod_scorm')
                             });
                         }).catch(function(error) {
                             $scope.spinner = false;
-                            if (error) {
-                                $mmUtil.showErrorModal(error);
-                            } else {
-                                $mmaModScormHelper.showDownloadError(scorm);
-                            }
+                            $mmaModScormHelper.showDownloadError(scorm, error);
                         });
                     }
 
diff --git a/www/addons/mod/scorm/services/helper.js b/www/addons/mod/scorm/services/helper.js
index 056636d7a38..052b2654c29 100644
--- a/www/addons/mod/scorm/services/helper.js
+++ b/www/addons/mod/scorm/services/helper.js
@@ -352,13 +352,12 @@ angular.module('mm.addons.mod_scorm')
      * @module mm.addons.mod_scorm
      * @ngdoc method
      * @name $mmaModScormHelper#showDownloadError
-     * @param {Object} scorm SCORM downloaded.
+     * @param {Object} scorm   SCORM downloaded.
+     * @param {String} [error] Error returned by the download.
      * @return {Void}
      */
-    self.showDownloadError = function(scorm) {
-        $translate('mma.mod_scorm.errordownloadscorm', {name: scorm.name}).then(function(message) {
-            $mmUtil.showErrorModal(message);
-        });
+    self.showDownloadError = function(scorm, error) {
+        $mmUtil.showErrorModalDefault(error, $translate.instant('mma.mod_scorm.errordownloadscorm', {name: scorm.name}));
     };
 
     return self;
diff --git a/www/addons/mod/survey/services/handlers.js b/www/addons/mod/survey/services/handlers.js
index 4bbccfbe032..22a6cb83fbf 100644
--- a/www/addons/mod/survey/services/handlers.js
+++ b/www/addons/mod/survey/services/handlers.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_survey')
  * @name $mmaModSurveyHandlers
  */
 .factory('$mmaModSurveyHandlers', function($mmCourse, $mmaModSurvey, $state, $mmContentLinksHelper, $mmUtil, $mmEvents, $mmSite,
-            $mmaModSurveyPrefetchHandler, $mmCoursePrefetchDelegate, mmCoreDownloading, mmCoreNotDownloaded, mmCoreOutdated,
+            $mmaModSurveyPrefetchHandler, $mmCoursePrefetchDelegate, mmCoreDownloading, mmCoreNotDownloaded, mmCoreOutdated, $q,
             mmaModSurveyComponent, mmCoreEventPackageStatusChanged, $mmaModSurveySync) {
     var self = {};
 
@@ -103,9 +103,10 @@ angular.module('mm.addons.mod_survey')
                     // Get download size to ask for confirm if it's high.
                     $mmaModSurveyPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
                         $mmUtil.confirmDownloadSize(size).then(function() {
-                            $mmaModSurveyPrefetchHandler.prefetch(module, courseId).catch(function() {
+                            return $mmaModSurveyPrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
-                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                                    return $q.reject();
                                 }
                             });
                         }).catch(function() {
diff --git a/www/addons/mod/wiki/services/handlers.js b/www/addons/mod/wiki/services/handlers.js
index 04ecf9ea010..eacdbf6c62f 100644
--- a/www/addons/mod/wiki/services/handlers.js
+++ b/www/addons/mod/wiki/services/handlers.js
@@ -102,9 +102,10 @@ angular.module('mm.addons.mod_wiki')
                     // We need to call getDownloadSize, the package might have been updated.
                     $mmaModWikiPrefetchHandler.getDownloadSize(module, courseId).then(function(size) {
                         $mmUtil.confirmDownloadSize(size).then(function() {
-                            $mmaModWikiPrefetchHandler.prefetch(module, courseId).catch(function() {
+                            return $mmaModWikiPrefetchHandler.prefetch(module, courseId).catch(function(error) {
                                 if (!$scope.$$destroyed) {
-                                    $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                    $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                                    return $q.reject();
                                 }
                             });
                         }).catch(function() {
diff --git a/www/core/components/course/controllers/sections.js b/www/core/components/course/controllers/sections.js
index 05a05cba0c5..bd515513f06 100644
--- a/www/core/components/course/controllers/sections.js
+++ b/www/core/components/course/controllers/sections.js
@@ -131,9 +131,9 @@ angular.module('mm.core.course')
         }).then(function(downloadpromises) {
             // If we restored any download we'll recalculate the status once all of them have finished.
             if (downloadpromises && downloadpromises.length) {
-                $mmUtil.allPromises(downloadpromises).catch(function() {
+                $mmUtil.allPromises(downloadpromises).catch(function(error) {
                     if (!$scope.$$destroyed) {
-                        $mmUtil.showErrorModal('mm.course.errordownloadingsection', true);
+                        $mmUtil.showErrorModalDefault(error, 'mm.course.errordownloadingsection', true);
                     }
                 }).finally(function() {
                     if (!$scope.$$destroyed) {
@@ -148,7 +148,7 @@ angular.module('mm.core.course')
     // Prefetch a section. The second parameter indicates if the prefetch was started manually (true)
     // or it was automatically started because all modules are being downloaded (false).
     function prefetch(section, manual) {
-        $mmCourseHelper.prefetch(section, courseId, $scope.sections).catch(function() {
+        $mmCourseHelper.prefetch(section, courseId, $scope.sections).catch(function(error) {
             // Don't show error message if scope is destroyed or it's an automatic download but we aren't in this state.
             if ($scope.$$destroyed) {
                 return;
@@ -161,7 +161,7 @@ angular.module('mm.core.course')
                 return;
             }
 
-            $mmUtil.showErrorModal('mm.course.errordownloadingsection', true);
+            $mmUtil.showErrorModalDefault(error, 'mm.course.errordownloadingsection', true);
         }).finally(function() {
             if (!$scope.$$destroyed) {
                 // Recalculate the status.
diff --git a/www/core/components/course/services/helper.js b/www/core/components/course/services/helper.js
index 67ac9522f35..65d30da17fd 100644
--- a/www/core/components/course/services/helper.js
+++ b/www/core/components/course/services/helper.js
@@ -530,9 +530,10 @@ angular.module('mm.core.course')
                     return $q.reject();
                 }
 
-                return promise.catch(function() {
+                return promise.catch(function(error) {
                     if (!scope.$$destroyed) {
-                        $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                        $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
+                        return $q.reject();
                     }
                 });
             });
@@ -613,10 +614,7 @@ angular.module('mm.core.course')
 
         // We prefetch all the modules to prevent incoeherences in the download count
         // and also to download stale data that might not be marked as outdated.
-        return $mmCoursePrefetchDelegate.prefetchAll(downloadid, modules, courseid).then(function() {}, function() {
-            // Return a rejected promise so errors are handled outside of this function.
-            return $q.reject();
-        }, function(id) {
+        return $mmCoursePrefetchDelegate.prefetchAll(downloadid, modules, courseid).then(undefined, undefined, function(id) {
             // Progress. Check that the module downloaded is one of the expected ones.
             var index = section.dwnModuleIds.indexOf(id);
             if (index > -1) {
@@ -677,8 +675,8 @@ angular.module('mm.core.course')
         // We need to call getDownloadSize, the package might have been updated.
         return $mmCoursePrefetchDelegate.getModuleDownloadSize(module, courseId).then(function(size) {
             return $mmUtil.confirmDownloadSize(size).then(function() {
-                return $mmCoursePrefetchDelegate.prefetchModule(module, courseId).catch(function() {
-                    return failPrefetch(!scope.$$destroyed);
+                return $mmCoursePrefetchDelegate.prefetchModule(module, courseId).catch(function(error) {
+                    return failPrefetch(!scope.$$destroyed, error);
                 });
             }, function() {
                 // User hasn't confirmed, stop spinner.
diff --git a/www/core/components/course/services/prefetchdelegate.js b/www/core/components/course/services/prefetchdelegate.js
index 6859ca5ed9d..5a4c9d4afd6 100644
--- a/www/core/components/course/services/prefetchdelegate.js
+++ b/www/core/components/course/services/prefetchdelegate.js
@@ -1318,9 +1318,9 @@ angular.module('mm.core')
             $q.all(promises).then(function() {
                 delete deferreds[siteid][id]; // Remove from array before resolving.
                 deferred.resolve();
-            }, function() {
+            }, function(error) {
                 delete deferreds[siteid][id]; // Remove from array before rejecting.
-                deferred.reject();
+                deferred.reject(error);
             });
 
             return deferred.promise;
diff --git a/www/core/components/login/controllers/credentials.js b/www/core/components/login/controllers/credentials.js
index 3ab1519ac05..2e697ea05f9 100644
--- a/www/core/components/login/controllers/credentials.js
+++ b/www/core/components/login/controllers/credentials.js
@@ -141,6 +141,11 @@ angular.module('mm.core.login')
             return;
         }
 
+        if (!$mmApp.isOnline()) {
+            $mmUtil.showErrorModal('mm.core.networkerrormsg', true);
+            return;
+        }
+
         var modal = $mmUtil.showModalLoading();
 
         // Start the authentication process.
diff --git a/www/core/components/login/controllers/emailsignup.js b/www/core/components/login/controllers/emailsignup.js
index 6821a34ca54..241a0b9c3f9 100644
--- a/www/core/components/login/controllers/emailsignup.js
+++ b/www/core/components/login/controllers/emailsignup.js
@@ -81,6 +81,7 @@ angular.module('mm.core.login')
             if (settings.country && !$scope.data.country) {
                 $scope.data.country = settings.country;
             }
+            $scope.data.recaptcharesponse = ''; // Reset captcha.
 
             $scope.namefieldsErrors = {};
             angular.forEach(settings.namefields, function(field) {
@@ -123,10 +124,14 @@ angular.module('mm.core.login')
     };
 
     // Request another captcha.
-    $scope.requestCaptcha = function() {
+    $scope.requestCaptcha = function(ignoreError) {
         var modal = $mmUtil.showModalLoading();
-        $scope.data.recaptcharesponse = '';
-        getSignupSettings().finally(function() {
+        getSignupSettings().catch(function(err) {
+            if (!ignoreError && err) {
+                $mmUtil.showErrorModal(err);
+            }
+            return $q.reject();
+        }).finally(function() {
             modal.dismiss();
         });
     };
@@ -181,17 +186,14 @@ angular.module('mm.core.login')
                         }
 
                         // Error sending, request another capctha since the current one is probably invalid now.
-                        $scope.requestCaptcha();
+                        $scope.requestCaptcha(true);
                     }
                 });
             }).catch(function(error) {
-                if (error) {
-                    $mmUtil.showErrorModal(error);
-                } else {
-                    $mmUtil.showErrorModal('mm.login.usernotaddederror', true);
-                }
+                $mmUtil.showErrorModalDefault(error && error.error, 'mm.login.usernotaddederror', true);
+
                 // Error sending, request another capctha since the current one is probably invalid now.
-                $scope.requestCaptcha();
+                $scope.requestCaptcha(true);
             }).finally(function() {
                 modal.dismiss();
             });
diff --git a/www/core/components/login/controllers/reconnect.js b/www/core/components/login/controllers/reconnect.js
index f79b6380be2..74c82fe63ca 100644
--- a/www/core/components/login/controllers/reconnect.js
+++ b/www/core/components/login/controllers/reconnect.js
@@ -84,6 +84,11 @@ angular.module('mm.core.login')
             return;
         }
 
+        if (!$mmApp.isOnline()) {
+            $mmUtil.showErrorModal('mm.core.networkerrormsg', true);
+            return;
+        }
+
         var modal = $mmUtil.showModalLoading();
 
         // Start the authentication process.
diff --git a/www/core/components/login/controllers/site.js b/www/core/components/login/controllers/site.js
index a08b4c1af33..88dc90e90a5 100644
--- a/www/core/components/login/controllers/site.js
+++ b/www/core/components/login/controllers/site.js
@@ -35,6 +35,11 @@ angular.module('mm.core.login')
             return;
         }
 
+        if (!$mmApp.isOnline()) {
+            $mmUtil.showErrorModal('mm.core.networkerrormsg', true);
+            return;
+        }
+
         var modal = $mmUtil.showModalLoading(),
             sitedata = $mmSitesManager.getDemoSiteData(url);
 
diff --git a/www/core/components/login/controllers/sitepolicy.js b/www/core/components/login/controllers/sitepolicy.js
index d6afcecb1dc..6b3df7f091e 100644
--- a/www/core/components/login/controllers/sitepolicy.js
+++ b/www/core/components/login/controllers/sitepolicy.js
@@ -56,7 +56,7 @@ angular.module('mm.core.login')
                 $scope.policyLoaded = true;
             });
         }).catch(function(error) {
-            $mmUtil.showErrorModalDefault(error, 'Error getting site policy.');
+            $mmUtil.showErrorModalDefault(error && error.error, 'Error getting site policy.');
             cancel();
         });
     }
diff --git a/www/core/directives/file.js b/www/core/directives/file.js
index e7f44d95d03..7b59ab12bf6 100644
--- a/www/core/directives/file.js
+++ b/www/core/directives/file.js
@@ -265,8 +265,8 @@ angular.module('mm.core')
                         $mmFilepool.invalidateFileByUrl(siteId, fileUrl).finally(function() {
                             scope.isDownloading = true;
                             $mmFilepool.addToQueueByUrl(siteId, fileUrl, component, componentId, timeModified,
-                                    undefined, 0, scope.file).catch(function() {
-                                $mmUtil.showErrorModal('mm.core.errordownloading', true);
+                                    undefined, 0, scope.file).catch(function(error) {
+                                $mmUtil.showErrorModalDefault(error, 'mm.core.errordownloading', true);
                             });
                         });
                     });
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 56e619ab642..2da04fdfdd7 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -133,7 +133,7 @@
     "mygroups": "My groups",
     "name": "Name",
     "nograde": "No grade",
-    "networkerrormsg": "Network not enabled or not working.",
+    "networkerrormsg": "There was a problem connecting to the site. Please check your connection and try again.",
     "never": "Never",
     "next": "Next",
     "no": "No",
diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 268c03d4833..2d08ef07a1f 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -751,7 +751,8 @@ angular.module('mm.core')
         };
 
         function getErrorTitle(message) {
-            if (message == $translate.instant('mm.core.networkerrormsg')) {
+            if (message == $translate.instant('mm.core.networkerrormsg') ||
+                    message == $translate.instant('mm.fileuploader.errormustbeonlinetoupload')) {
                 return '<span class="mm-icon-with-badge"><i class="icon ion-wifi"></i>\
                     <i class="icon ion-alert-circled mm-icon-badge"></i></span>';
             }
diff --git a/www/core/lib/ws.js b/www/core/lib/ws.js
index 84b5f214d1e..c6b4a2382fc 100644
--- a/www/core/lib/ws.js
+++ b/www/core/lib/ws.js
@@ -326,6 +326,10 @@ angular.module('mm.core')
     self.downloadFile = function(url, path, addExtension) {
         $log.debug('Downloading file', url, path, addExtension);
 
+        if (!$mmApp.isOnline()) {
+            return $mmLang.translateAndReject('mm.core.networkerrormsg');
+        }
+
         // 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.
         var tmpPath = path + '.tmp';
@@ -399,6 +403,10 @@ angular.module('mm.core')
             return $q.reject();
         }
 
+        if (!$mmApp.isOnline()) {
+            return $mmLang.translateAndReject('mm.core.networkerrormsg');
+        }
+
         var ftOptions = {},
             uploadUrl = preSets.siteurl + '/webservice/upload.php';
 

From 8a5f947b4ac0821b4f05efa746ae6eae0a460b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Fri, 21 Jul 2017 13:46:50 +0200
Subject: [PATCH 076/118] MOBILE-2117 data: Add moreurl action exception

---
 www/addons/mod/data/services/helper.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 25338582bb2..f00dbdb7281 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -65,7 +65,12 @@ angular.module('mm.addons.mod_data')
         angular.forEach(actions, function(enabled, action) {
             replace = new RegExp("##" + action + "##", 'g');
             if (enabled) {
-                render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +']" database="data"></mma-mod-data-action>';
+                if (action == "moreurl") {
+                    // Render more url directly because it can be part of an HTML attribute.
+                    render = $mmSite.getURL() + '/mod/data/view.php?d={{data.id}}&rid=' + entryId;
+                } else {
+                    render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +']" database="data"></mma-mod-data-action>';
+                }
                 template = template.replace(replace, render);
             } else {
                 template = template.replace(replace, "");

From d038cc0bbe9f489753715e6d8601ca67147161f8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 24 Jul 2017 09:16:28 +0200
Subject: [PATCH 077/118] MOBILE-2178 lesson: Support lesson grade links

---
 www/addons/mod/lesson/main.js              |  1 +
 www/addons/mod/lesson/services/handlers.js | 55 ++++++++++++++++++++++
 2 files changed, 56 insertions(+)

diff --git a/www/addons/mod/lesson/main.js b/www/addons/mod/lesson/main.js
index e786c188432..fae4bc2fefd 100644
--- a/www/addons/mod/lesson/main.js
+++ b/www/addons/mod/lesson/main.js
@@ -83,6 +83,7 @@ angular.module('mm.addons.mod_lesson', ['mm.core'])
     $mmCoursePrefetchDelegateProvider.registerPrefetchHandler('mmaModLesson', 'lesson', '$mmaModLessonPrefetchHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModLesson:view', '$mmaModLessonHandlers.viewLinksHandler');
     $mmContentLinksDelegateProvider.registerLinkHandler('mmaModLesson:overview', '$mmaModLessonHandlers.overviewLinksHandler');
+    $mmContentLinksDelegateProvider.registerLinkHandler('mmaModLesson:grade', '$mmaModLessonHandlers.gradeLinksHandler');
 })
 
 .run(function($mmCronDelegate) {
diff --git a/www/addons/mod/lesson/services/handlers.js b/www/addons/mod/lesson/services/handlers.js
index 95a575059c6..61fb53e1c37 100644
--- a/www/addons/mod/lesson/services/handlers.js
+++ b/www/addons/mod/lesson/services/handlers.js
@@ -364,5 +364,60 @@ angular.module('mm.addons.mod_lesson')
         });
     }
 
+    /**
+     * Content links handler for lesson grade link.
+     *
+     * @module mm.addons.mod_lesson
+     * @ngdoc method
+     * @name $mmaModLessonHandlers#gradeLinksHandler
+     */
+    self.gradeLinksHandler = $mmContentLinksHelper.createModuleGradeLinkHandler('mmaModLesson', 'lesson', $mmaModLesson, viewGrade);
+
+    /**
+     * Treat a grade link to a user different than current one.
+     *
+     * @param  {String} url        URL to treat.
+     * @param  {Object} params     Params of the URL.
+     * @param  {Number} [courseId] Course ID related to the URL.
+     * @param  {String} siteId     Site ID.
+     * @return {[type]}          [description]
+     */
+    function viewGrade(url, params, courseId, siteId) {
+        siteId = siteId || $mmSite.getId();
+
+        var moduleId = parseInt(params.id, 10),
+            modal = $mmUtil.showModalLoading(),
+            module;
+
+        return $mmCourse.getModuleBasicInfo(moduleId, siteId).then(function(mod) {
+            module = mod;
+            courseId = module.course || courseId || params.courseid || params.cid;
+
+            // Check if the user can see the user reports in the lesson.
+            return $mmaModLesson.getAccessInformation(module.instance);
+        }).then(function(info) {
+            if (info.canviewreports) {
+                // User can view reports, go to view the report.
+                return $state.go('redirect', {
+                    siteid: siteId,
+                    state: 'site.mod_lesson-userretake',
+                    params: {
+                        courseid: courseId,
+                        lessonid: module.instance,
+                        userid: parseInt(params.userid, 10)
+                    }
+                });
+            } else {
+                // User cannot view the report, go to lesson index.
+                return $mmCourseHelper.navigateToModule(moduleId, siteId, courseId, module.section);
+            }
+        }).catch(function(error) {
+            $mmUtil.showErrorModalDefault(error, 'mm.course.errorgetmodule', true);
+            return $q.reject();
+        }).finally(function() {
+            modal.dismiss();
+        });
+    }
+
     return self;
 });

From aa89d43df91b71eff5c875e25bfccddeec0cfb62 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 24 Jul 2017 10:04:01 +0200
Subject: [PATCH 078/118] MOBILE-2178 links: Treat mail/tel/geo links as
 absolute

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

diff --git a/www/core/lib/util.js b/www/core/lib/util.js
index 2d08ef07a1f..b35f16f21cb 100644
--- a/www/core/lib/util.js
+++ b/www/core/lib/util.js
@@ -209,7 +209,7 @@ angular.module('mm.core')
          * @return {Boolean}   TRUE if the url is absolute. FALSE if it is relative.
          */
         self.isAbsoluteURL = function(url) {
-            return /^[^:]{2,10}:\/\//i.test(url);
+            return /^[^:]{2,10}:\/\//i.test(url) || /^(tel:|mailto:|geo:)/.test(url);
         };
 
         /**

From 4c12173f404d569c565fa34db3a4432d62c3fdf2 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 24 Jul 2017 13:33:43 +0200
Subject: [PATCH 079/118] MOBILE-2178 attachments: Fix existing attachments not
 shown

---
 www/core/directives/attachments.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/www/core/directives/attachments.js b/www/core/directives/attachments.js
index 1e01808baab..075c1f3af1a 100644
--- a/www/core/directives/attachments.js
+++ b/www/core/directives/attachments.js
@@ -73,10 +73,6 @@ angular.module('mm.core')
                 scope.unlimitedFiles = true;
             }
 
-            if (typeof scope.files == 'undefined') {
-                scope.files = [];
-            }
-
             scope.add = function() {
                 if (!allowOffline && !$mmApp.isOnline()) {
                     $mmUtil.showErrorModal('mm.fileuploader.errormustbeonlinetoupload', true);

From 257fd9724318dd9fa78d1b073465bd99943b350c Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Mon, 24 Jul 2017 16:22:50 +0200
Subject: [PATCH 080/118] MOBILE-2178 survey: Remove HTML from select question

---
 www/addons/mod/survey/controllers/index.js | 7 +++++++
 www/addons/mod/survey/templates/index.html | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/survey/controllers/index.js b/www/addons/mod/survey/controllers/index.js
index 469f5cc7b63..5d4f0dab873 100644
--- a/www/addons/mod/survey/controllers/index.js
+++ b/www/addons/mod/survey/controllers/index.js
@@ -110,6 +110,13 @@ angular.module('mm.addons.mod_survey')
                         var isTextArea = q.multi && q.multi.length === 0 && q.type === 0;
                         $scope.answers[q.name] = q.required ? -1 : (isTextArea ? '' : '0');
                     }
+
+                    if (q.multi && !q.multi.length && q.parent === 0 && q.type > 0) {
+                        // Options shown in a select. Remove all HTML.
+                        q.options = q.options.map(function(option) {
+                            return $mmText.cleanTags(option);
+                        });
+                    }
                 });
             });
         });
diff --git a/www/addons/mod/survey/templates/index.html b/www/addons/mod/survey/templates/index.html
index e3f4ac67837..f9ef701c354 100644
--- a/www/addons/mod/survey/templates/index.html
+++ b/www/addons/mod/survey/templates/index.html
@@ -70,7 +70,7 @@ <h3 class="padding-horizontal">{{ question.text }}</h3>
                                     <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 class="mma-mod_survey-select" 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>

From dd878332f232ff91ce96c23fcb806f6cc21dc330 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 25 Jul 2017 09:22:04 +0200
Subject: [PATCH 081/118] MOBILE-2178 scorm: Hide module spinner if WS call
 fails

---
 www/addons/mod/scorm/services/handlers.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/addons/mod/scorm/services/handlers.js b/www/addons/mod/scorm/services/handlers.js
index 6badb7af26e..8e9bf9b482c 100644
--- a/www/addons/mod/scorm/services/handlers.js
+++ b/www/addons/mod/scorm/services/handlers.js
@@ -153,6 +153,9 @@ angular.module('mm.addons.mod_scorm')
                     $scope.$on('$destroy', function() {
                         statusObserver && statusObserver.off && statusObserver.off();
                     });
+                }).catch(function() {
+                    // Error getting SCORM, hide the spinner.
+                    $scope.spinner = false;
                 });
             };
         };

From b9280b655c3edc54bb2e3b8de6a9ffa988a4ad24 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 25 Jul 2017 12:06:03 +0200
Subject: [PATCH 082/118] MOBILE-2178 upload: Fix wrong max size in upload File

---
 .../fileuploader/services/handlers.js         | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/www/core/components/fileuploader/services/handlers.js b/www/core/components/fileuploader/services/handlers.js
index 3f612ae4d04..1cc6ea3e1d6 100644
--- a/www/core/components/fileuploader/services/handlers.js
+++ b/www/core/components/fileuploader/services/handlers.js
@@ -247,25 +247,25 @@ angular.module('mm.core.fileuploader')
                         if (!uploadFileScope) {
                             // Create a scope for the on change directive.
                             uploadFileScope = $rootScope.$new();
+                        }
 
-                            uploadFileScope.filePicked = function(evt) {
-                                var input = evt.srcElement;
-                                var file = input.files[0];
-                                input.value = ''; // Unset input.
-                                if (!file) {
-                                    return;
+                        uploadFileScope.filePicked = function(evt) {
+                            var input = evt.srcElement;
+                            var file = input.files[0];
+                            input.value = ''; // Unset input.
+                            if (!file) {
+                                return;
+                            }
+
+                            // Upload the picked file.
+                            $mmFileUploaderHelper.uploadFileObject(file, maxSize, upload, allowOffline).then(function(result) {
+                                $mmFileUploaderHelper.fileUploaded(result);
+                            }).catch(function(error) {
+                                if (error) {
+                                    $mmUtil.showErrorModal(error);
                                 }
-
-                                // Upload the picked file.
-                                $mmFileUploaderHelper.uploadFileObject(file, maxSize, upload, allowOffline).then(function(result) {
-                                    $mmFileUploaderHelper.fileUploaded(result);
-                                }).catch(function(error) {
-                                    if (error) {
-                                        $mmUtil.showErrorModal(error);
-                                    }
-                                });
-                            };
-                        }
+                            });
+                        };
 
                         $compile(input)(uploadFileScope);
 

From f8b847f654c7e6cf4aa60c198f1444fe28b34279 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 25 Jul 2017 13:00:27 +0200
Subject: [PATCH 083/118] MOBILE-2178 database: Fix database prefetch

---
 www/addons/mod/data/controllers/index.js               | 1 -
 www/addons/mod/data/services/prefetch_handler.js       | 6 +++---
 www/core/components/course/services/prefetchfactory.js | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 258873390b1..230f022cd21 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -66,7 +66,6 @@ angular.module('mm.addons.mod_data')
             $scope.description = data.intro || $scope.description;
             $scope.data = databaseData;
 
-            $scope.database = data;
             if (sync) {
                 // Try to synchronize the database.
                 return syncDatabase(showErrors).catch(function() {
diff --git a/www/addons/mod/data/services/prefetch_handler.js b/www/addons/mod/data/services/prefetch_handler.js
index bfd3afb8fa4..493a2723e16 100644
--- a/www/addons/mod/data/services/prefetch_handler.js
+++ b/www/addons/mod/data/services/prefetch_handler.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
  * @name $mmaModDataPrefetchHandler
  */
 .factory('$mmaModDataPrefetchHandler', function($mmaModData, mmaModDataComponent, $mmFilepool, $q, $mmUtil, $mmPrefetchFactory,
-        $mmSite, $mmGroups, $mmCourse) {
+        $mmSite, $mmGroups, $mmCourse, $mmComments) {
 
     var self = $mmPrefetchFactory.createPrefetchHandler(mmaModDataComponent);
 
@@ -130,7 +130,7 @@ angular.module('mm.addons.mod_data')
         var promises = [];
 
         angular.forEach(groups, function(group) {
-            promises.push($mmaModData.fetchAllEntries(dataId, group.id, undefined, undefined, undefined, undefined, forceCache,
+            promises.push($mmaModData.fetchAllEntries(dataId, group.id, undefined, undefined, undefined, forceCache,
                 ignoreCache, siteId));
         });
 
@@ -319,7 +319,7 @@ angular.module('mm.addons.mod_data')
         siteId = siteId || $mmSite.getId();
 
         // Prefetch the database data.
-        return getDatabaseInfoHelper(module, courseId, false, true, siteId).then(function(info) {
+        return getDatabaseInfoHelper(module, courseId, false, false, true, siteId).then(function(info) {
             var database = info.database,
                 promises = [];
 
diff --git a/www/core/components/course/services/prefetchfactory.js b/www/core/components/course/services/prefetchfactory.js
index b651a2d01e6..db6dabfbd0a 100644
--- a/www/core/components/course/services/prefetchfactory.js
+++ b/www/core/components/course/services/prefetchfactory.js
@@ -278,7 +278,7 @@ angular.module('mm.core.course')
                 }
 
                 if (module.description) {
-                    return $q.when($mmUtil.extractDownloadableFilesFromHtmlAsFakeFileObjects(module.description));
+                    return $mmUtil.extractDownloadableFilesFromHtmlAsFakeFileObjects(module.description);
                 }
 
                 return [];

From ca56066c57df0b318e258ba9319895ccde89294a Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 25 Jul 2017 13:15:17 +0200
Subject: [PATCH 084/118] MOBILE-2178 database: Fix isEmpty and pagination in
 list

---
 www/addons/mod/data/controllers/index.js | 6 +++---
 www/addons/mod/data/templates/index.html | 1 -
 www/core/scss/styles.scss                | 4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 230f022cd21..d131c30e69e 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -190,9 +190,9 @@ angular.module('mm.addons.mod_data')
                     $scope.search.page);
             }
         }).then(function(entries) {
-            $scope.numEntries = entries && entries.totalcount;
-            $scope.isEmpty = $scope.numEntries <= 0 && $scope.offlineActions.length <= 0;
-            $scope.hasNextPage = (($scope.search.page + 1) * mmaModDataPerPage) < $scope.numEntries;
+            var numEntries = (entries && entries.entries && entries.entries.length) || 0;
+            $scope.isEmpty = !numEntries && Object.keys($scope.offlineActions).length <= 0;
+            $scope.hasNextPage = numEntries >= mmaModDataPerPage && (($scope.search.page + 1) * mmaModDataPerPage) < entries.totalcount;
             $scope.entriesRendered = "";
 
             if (!$scope.isEmpty) {
diff --git a/www/addons/mod/data/templates/index.html b/www/addons/mod/data/templates/index.html
index 5015b47d459..fb2446fbac7 100644
--- a/www/addons/mod/data/templates/index.html
+++ b/www/addons/mod/data/templates/index.html
@@ -49,7 +49,6 @@
             </div>
 
             <div class="item" ng-if="search.searching && !isEmpty">
-                <h2>{{ 'mma.mod_data.numrecords' | translate: {$a: numEntries } }}</h2>
                 <a ng-click="searchReset()">{{ 'mma.mod_data.resetsettings' | translate}}</a>
             </div>
 
diff --git a/www/core/scss/styles.scss b/www/core/scss/styles.scss
index 600a52eb370..9abc3227855 100644
--- a/www/core/scss/styles.scss
+++ b/www/core/scss/styles.scss
@@ -1683,3 +1683,7 @@ h2.invert {
 ::-webkit-calendar-picker-indicator, ::-webkit-inner-spin-button, ::-webkit-clear-button {
   display: none;
 }
+
+*[ng-click] {
+  cursor: pointer;
+}

From cfa3fc8960af085cd30c5f907f5d2f8e479c6554 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Tue, 25 Jul 2017 13:54:57 +0200
Subject: [PATCH 085/118] MOBILE-2178 database: Use row/col styles in database
 tables

---
 www/addons/mod/data/scss/styles.scss | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index f563d867542..a9a3b423711 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -16,10 +16,17 @@
   border-style: solid;
   border-color: $item-default-border;
 
+  table, tbody {
+    display: block;
+  }
+
+  tr {
+    @extend .row;
+    padding: 0;
+  }
+
   td {
-    padding-left: 2px;
-    padding-right: 2px;
-    vertical-align: top;
+    @extend .col;
   }
 }
 

From ab6db795dfe8d70b04905cecb2cd4ac38a8ddf75 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 26 Jul 2017 10:29:43 +0200
Subject: [PATCH 086/118] MOBILE-2178 database: Don't force cache in
 getAllEntriesIds

---
 www/addons/mod/data/services/data.js   | 13 ++++-------
 www/addons/mod/data/services/helper.js | 30 +++++++++++++++-----------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index dcb5962cbd7..926b0ab2d1d 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -307,25 +307,20 @@ angular.module('mm.addons.mod_data')
      */
     self.getEntries = function(dataId, groupId, sort, order, page, perPage, forceCache, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
+            // Always use sort and order params to improve cache usage (entries are identified by params).
             var params = {
                     databaseid: dataId,
                     returncontents: 1,
                     page: page || 0,
                     perpage: perPage || mmaModDataPerPage,
-                    groupid: groupId || 0
+                    groupid: groupId || 0,
+                    sort: sort || "0",
+                    order: order || "ASC"
                 },
                 preSets = {
                     cacheKey: getEntriesCacheKey(dataId, groupId)
                 };
 
-            if (typeof sort != "undefined") {
-                params.sort = sort;
-            }
-
-            if (typeof order !== "undefined") {
-                params.order = order;
-            }
-
             if (forceCache) {
                 preSets.omitExpires = true;
             } else if (ignoreCache) {
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index f00dbdb7281..53666cb89e1 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -584,11 +584,13 @@ angular.module('mm.addons.mod_data')
      * @param  {Number}    dataId          Data ID.
      * @param  {Number}    entryId         Entry ID.
      * @param  {Number}    groupId         Group ID.
-     * @param  {String}    siteId          Site ID. Current if not defined.
-     * @return {Promise}        Containing page number, if has next and have following page.
+     * @param  {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
+     * @param  {Boolean}   [ignoreCache]   True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String}    [siteId]        Site ID. Current if not defined.
+     * @return {Promise}                   Containing page number, if has next and have following page.
      */
-    self.getPageInfoByEntry = function(dataId, entryId, groupId, siteId) {
-        return self.getAllEntriesIds(dataId, groupId, siteId).then(function(entries) {
+    self.getPageInfoByEntry = function(dataId, entryId, groupId, forceCache, ignoreCache, siteId) {
+        return self.getAllEntriesIds(dataId, groupId, forceCache, ignoreCache, siteId).then(function(entries) {
             for (var index in entries) {
                 if (entries[index] == entryId) {
                     index = parseInt(index, 10);
@@ -614,11 +616,13 @@ angular.module('mm.addons.mod_data')
      * @param  {Number}    dataId          Data ID.
      * @param  {Number}    page            Page number.
      * @param  {Number}    groupId         Group ID.
-     * @param  {String}    siteId          Site ID. Current if not defined.
-     * @return {Promise}        Containing page number, if has next and have following page.
+     * @param  {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
+     * @param  {Boolean}   [ignoreCache]   True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String}    [siteId]        Site ID. Current if not defined.
+     * @return {Promise}                   Containing page number, if has next and have following page.
      */
-    self.getPageInfoByPage = function(dataId, page, groupId, siteId) {
-        return self.getAllEntriesIds(dataId, groupId, siteId).then(function(entries) {
+    self.getPageInfoByPage = function(dataId, page, groupId, forceCache, ignoreCache, siteId) {
+        return self.getAllEntriesIds(dataId, groupId, forceCache, ignoreCache, siteId).then(function(entries) {
             var index = parseInt(page, 10) - 1,
                 entryId = entries[index];
             if (entryId) {
@@ -642,11 +646,13 @@ angular.module('mm.addons.mod_data')
      * @name $mmaModDataHelper#getAllEntriesIds
      * @param  {Number}    dataId          Data ID.
      * @param  {Number}    groupId         Group ID.
-     * @param  {String}    siteId          Site ID. Current if not defined.
-     * @return {Promise}        Containing and array of EntryId.
+     * @param  {Boolean}   [forceCache]    True to always get the value from cache, false otherwise. Default false.
+     * @param  {Boolean}   [ignoreCache]   True if it should ignore cached data (it will always fail in offline or server down).
+     * @param  {String}    [siteId]        Site ID. Current if not defined.
+     * @return {Promise}                   Resolved with an array of entry ID.
      */
-    self.getAllEntriesIds = function(dataId, groupId, siteId) {
-        return $mmaModData.fetchAllEntries(dataId, groupId, undefined, undefined, undefined, true, undefined, undefined, siteId)
+    self.getAllEntriesIds = function(dataId, groupId, forceCache, ignoreCache, siteId) {
+        return $mmaModData.fetchAllEntries(dataId, groupId, undefined, undefined, undefined, forceCache, ignoreCache, siteId)
                 .then(function(entries) {
             return entries.map(function(entry) {
                 return entry.id;

From 0fad8c168f6f4a8188785196aa4087c796cde4d1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 26 Jul 2017 15:00:29 +0200
Subject: [PATCH 087/118] MOBILE-2178 modules: Show last download time if no
 timemodified

---
 www/core/components/course/services/helper.js | 27 ++++++++++++++++---
 www/core/lang/en.json                         |  1 +
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/www/core/components/course/services/helper.js b/www/core/components/course/services/helper.js
index 65d30da17fd..2283ff9b969 100644
--- a/www/core/components/course/services/helper.js
+++ b/www/core/components/course/services/helper.js
@@ -23,7 +23,8 @@ 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, mmCoreNotDownloadable) {
+            $controller, $mmCourseDelegate, $translate, $mmEvents, mmCoreEventPackageStatusChanged, mmCoreNotDownloadable,
+            mmCoreDownloaded) {
 
     var self = {},
         calculateSectionStatus = false;
@@ -243,9 +244,10 @@ angular.module('mm.core.course')
      * @param {Object} module                   Module to get the info from.
      * @param {Number} courseid                 Course ID the section belongs to.
      * @param {Number} [invalidateCache=false]  Invalidates the cache first.
+     * @param  {String} [component]             Component of the module.
      * @return {Promise}                        Promise resolved with the download size, timemodified and module status.
      */
-    self.getModulePrefetchInfo = function(module, courseId, invalidateCache) {
+    self.getModulePrefetchInfo = function(module, courseId, invalidateCache, component) {
 
         var moduleInfo = {
                 size: false,
@@ -255,6 +257,7 @@ angular.module('mm.core.course')
                 status: false,
                 statusIcon: false
             },
+            siteId = $mmSite.getId(),
             promises = [];
 
         if (typeof invalidateCache != "undefined" && invalidateCache) {
@@ -298,6 +301,22 @@ angular.module('mm.core.course')
             }
         }));
 
+        // Get the time it was downloaded (if it was downloaded).
+        promises.push($mmFilepool.getPackageData(siteId, component, module.id).then(function(data) {
+            if (data && data.downloadtime && (data.status == mmCoreOutdated || data.status == mmCoreDownloaded)) {
+                moduleInfo.downloadtime = data.downloadtime;
+                var now = $mmUtil.timestamp();
+                if (now - data.downloadtime < 7 * 86400) {
+                    moduleInfo.downloadtimeReadable = moment(data.downloadtime * 1000).fromNow();
+                } else {
+                    moduleInfo.downloadtimeReadable = moment(data.downloadtime * 1000).calendar();
+                }
+            }
+        }).catch(function() {
+            // Not downloaded.
+            moduleInfo.downloadtime = 0;
+        }));
+
         return $q.all(promises).then(function () {
             return moduleInfo;
         });
@@ -711,7 +730,7 @@ angular.module('mm.core.course')
      * @return {Promise}                        Promise resolved when done.
      */
     self.fillContextMenu = function(scope, module, courseId, invalidateCache, component) {
-        return self.getModulePrefetchInfo(module, courseId, invalidateCache).then(function(moduleInfo) {
+        return self.getModulePrefetchInfo(module, courseId, invalidateCache, component).then(function(moduleInfo) {
             scope.size = moduleInfo.size > 0 ? moduleInfo.sizeReadable : 0;
             scope.prefetchStatusIcon = moduleInfo.statusIcon;
 
@@ -719,6 +738,8 @@ angular.module('mm.core.course')
                 // Module is downloadable, calculate timemodified.
                 if (moduleInfo.timemodified > 0) {
                     scope.timemodified = $translate.instant('mm.core.lastmodified') + ': ' + moduleInfo.timemodifiedReadable;
+                } else if (moduleInfo.downloadtime > 0) {
+                    scope.timemodified = $translate.instant('mm.core.lastdownloaded') + ': ' + moduleInfo.downloadtimeReadable;
                 } else {
                     // Cannot calculate time modified, show a default text.
                     scope.timemodified = $translate.instant('mm.core.download');
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index 2da04fdfdd7..d48edfa86b1 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -94,6 +94,7 @@
     "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
+    "lastdownloaded": "Last downloaded",
     "lastmodified": "Last modified",
     "lastsync": "Last synchronization",
     "listsep": ",",

From ec33b4afe65d1a90178f79ae0a50a3f33506e92d Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 26 Jul 2017 15:46:25 +0200
Subject: [PATCH 088/118] MOBILE-2178 database: Improve date field in edit form

---
 www/addons/mod/data/fields/date/directive.js  | 2 +-
 www/addons/mod/data/fields/date/template.html | 2 +-
 www/addons/mod/data/scss/styles.scss          | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/data/fields/date/directive.js b/www/addons/mod/data/fields/date/directive.js
index 1e23db4adb9..859ed4c1064 100644
--- a/www/addons/mod/data/fields/date/directive.js
+++ b/www/addons/mod/data/fields/date/directive.js
@@ -41,7 +41,7 @@ angular.module('mm.addons.mod_data')
                 };
                 scope.enable = false;
             }
-            scope.val = new Date(scope.value.content * 1000).toISOString().substr(0, 10);
+            scope.val = new Date(scope.value.content * 1000);
         }
     };
 });
diff --git a/www/addons/mod/data/fields/date/template.html b/www/addons/mod/data/fields/date/template.html
index b01f5edc6bc..e9bac5373f2 100644
--- a/www/addons/mod/data/fields/date/template.html
+++ b/www/addons/mod/data/fields/date/template.html
@@ -1,5 +1,5 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
-<input ng-if="mode != 'show'" type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable && mode == 'search'" ng-value="val">
+<input ng-if="mode != 'show'" type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable && mode == 'search'" ng-model="val"> <!-- Use ng-model because iOS doesn't seem to like ng-value. -->
 <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_z" ng-model="enable" ng-value="1">{{ 'mma.mod_data.usedate' | translate }}</ion-checkbox>
 <mm-format-text ng-if="mode == 'show'" watch="true">{{ text | mmFormatDate:"dfdaymonthyear" }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index a9a3b423711..bad4851771e 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -63,6 +63,12 @@
     height: 56px;
   }
 
+  input[type="datetime"],
+  input[type="datetime-local"],
+  input[type="date"] {
+    -webkit-appearance: none;
+  }
+
   mm-attachments .item-media {
     width: 100%;
     margin: -1px;

From 9283f825caa86522a2479826381a4f08192af4d3 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 26 Jul 2017 16:21:53 +0200
Subject: [PATCH 089/118] MOBILE-2178 database: Don't save offline if
 fieldnotifications

---
 www/addons/mod/data/services/data.js | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 926b0ab2d1d..58096d51985 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -622,12 +622,7 @@ angular.module('mm.addons.mod_data')
                 params.groupid = groupId;
             }
 
-            return site.write('mod_data_add_entry', params).then(function(result) {
-                if (result.newentryid) {
-                    return result;
-                }
-                return $q.reject();
-            }).catch(function(error) {
+            return site.write('mod_data_add_entry', params).catch(function(error) {
                 return $q.reject({
                     error: error,
                     wserror: $mmUtil.isWebServiceError(error)
@@ -766,12 +761,7 @@ angular.module('mm.addons.mod_data')
                     data: data
                 };
 
-            return site.write('mod_data_update_entry', params).then(function(result) {
-                if (result.updated) {
-                    return result;
-                }
-                return $q.reject();
-            }).catch(function(error) {
+            return site.write('mod_data_update_entry', params).catch(function(error) {
                 return $q.reject({
                     error: error,
                     wserror: $mmUtil.isWebServiceError(error)

From 6c272b46591e0f9c166ec3cb82abe2b1d3e11e77 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Thu, 27 Jul 2017 00:05:07 +0200
Subject: [PATCH 090/118] MOBILE-2156 lang: Sync with amos for new languages

New languages: Lithuanian and Serbian (Cyrillic and Latin alphabets).
---
 www/addons/calendar/lang/ar.json              |  2 +-
 www/addons/calendar/lang/da.json              |  2 +-
 www/addons/calendar/lang/el.json              |  1 +
 www/addons/calendar/lang/es.json              |  1 +
 www/addons/calendar/lang/he.json              |  4 +-
 www/addons/calendar/lang/ja.json              |  6 +-
 www/addons/calendar/lang/sr-cr.json           |  8 ++
 www/addons/calendar/lang/sr-lt.json           |  8 ++
 www/addons/competency/lang/da.json            |  2 +-
 www/addons/competency/lang/ja.json            |  3 +-
 www/addons/competency/lang/sr-cr.json         |  4 +
 www/addons/competency/lang/sr-lt.json         |  4 +
 www/addons/coursecompletion/lang/ar.json      | 18 ++--
 www/addons/coursecompletion/lang/da.json      | 26 ++---
 www/addons/coursecompletion/lang/el.json      |  2 +-
 www/addons/coursecompletion/lang/he.json      | 22 ++---
 www/addons/coursecompletion/lang/ja.json      | 26 ++---
 www/addons/coursecompletion/lang/sr-cr.json   | 21 ++++
 www/addons/coursecompletion/lang/sr-lt.json   | 21 ++++
 www/addons/coursecompletion/lang/uk.json      |  2 +-
 www/addons/files/lang/ar.json                 |  2 +-
 www/addons/files/lang/da.json                 |  4 +-
 www/addons/files/lang/he.json                 |  2 +-
 www/addons/files/lang/ja.json                 | 10 +-
 www/addons/files/lang/sr-cr.json              | 10 ++
 www/addons/files/lang/sr-lt.json              | 10 ++
 www/addons/files/lang/uk.json                 |  2 +-
 .../messageoutput/airnotifier/lang/ja.json    |  3 +
 .../messageoutput/airnotifier/lang/sr-cr.json |  3 +
 .../messageoutput/airnotifier/lang/sr-lt.json |  3 +
 www/addons/messages/lang/ar.json              |  4 +-
 www/addons/messages/lang/da.json              |  4 +-
 www/addons/messages/lang/el.json              |  4 +
 www/addons/messages/lang/es.json              |  4 +
 www/addons/messages/lang/he.json              |  6 +-
 www/addons/messages/lang/ja.json              | 26 ++++-
 www/addons/messages/lang/sr-cr.json           | 23 +++++
 www/addons/messages/lang/sr-lt.json           | 23 +++++
 www/addons/messages/lang/uk.json              |  2 +-
 www/addons/mod/assign/lang/el.json            |  2 +
 www/addons/mod/assign/lang/es.json            |  1 +
 www/addons/mod/assign/lang/fr.json            |  2 +-
 www/addons/mod/assign/lang/ja.json            | 15 ++-
 www/addons/mod/assign/lang/sr-cr.json         | 15 +++
 www/addons/mod/assign/lang/sr-lt.json         | 15 +++
 www/addons/mod/assign/lang/uk.json            |  4 +-
 www/addons/mod/chat/lang/ja.json              |  7 +-
 www/addons/mod/chat/lang/sr-cr.json           |  8 ++
 www/addons/mod/chat/lang/sr-lt.json           |  8 ++
 www/addons/mod/chat/lang/uk.json              |  4 +-
 www/addons/mod/choice/lang/ar.json            |  2 +-
 www/addons/mod/choice/lang/da.json            |  4 +-
 www/addons/mod/choice/lang/ja.json            |  7 +-
 www/addons/mod/choice/lang/sr-cr.json         |  7 ++
 www/addons/mod/choice/lang/sr-lt.json         |  7 ++
 www/addons/mod/choice/lang/uk.json            |  2 +-
 www/addons/mod/feedback/lang/el.json          |  2 +
 www/addons/mod/feedback/lang/es.json          |  2 +
 www/addons/mod/feedback/lang/fr.json          |  2 +
 www/addons/mod/feedback/lang/ja.json          |  2 +
 www/addons/mod/feedback/lang/sr-cr.json       |  4 +
 www/addons/mod/feedback/lang/sr-lt.json       |  4 +
 www/addons/mod/folder/lang/da.json            |  2 +-
 www/addons/mod/folder/lang/he.json            |  2 +-
 www/addons/mod/folder/lang/ja.json            |  3 +-
 www/addons/mod/folder/lang/sr-cr.json         |  4 +
 www/addons/mod/folder/lang/sr-lt.json         |  4 +
 www/addons/mod/folder/lang/uk.json            |  2 +-
 www/addons/mod/forum/lang/da.json             |  2 +-
 www/addons/mod/forum/lang/he.json             |  2 +-
 www/addons/mod/forum/lang/ja.json             |  8 +-
 www/addons/mod/forum/lang/sr-cr.json          | 11 +++
 www/addons/mod/forum/lang/sr-lt.json          | 11 +++
 www/addons/mod/glossary/lang/da.json          |  2 +-
 www/addons/mod/glossary/lang/el.json          |  3 +
 www/addons/mod/glossary/lang/es.json          |  3 +
 www/addons/mod/glossary/lang/ja.json          | 18 +++-
 www/addons/mod/glossary/lang/sr-cr.json       | 17 ++++
 www/addons/mod/glossary/lang/sr-lt.json       | 17 ++++
 www/addons/mod/glossary/lang/uk.json          |  4 +-
 www/addons/mod/imscp/lang/ja.json             |  3 +-
 www/addons/mod/imscp/lang/sr-cr.json          |  3 +
 www/addons/mod/imscp/lang/sr-lt.json          |  3 +
 www/addons/mod/label/lang/he.json             |  2 +-
 www/addons/mod/label/lang/sr-cr.json          |  3 +
 www/addons/mod/label/lang/sr-lt.json          |  3 +
 www/addons/mod/lesson/lang/el.json            |  6 ++
 www/addons/mod/lesson/lang/es.json            |  6 ++
 www/addons/mod/lesson/lang/fr.json            |  6 ++
 www/addons/mod/lesson/lang/ja.json            |  6 ++
 www/addons/mod/lesson/lang/sr-cr.json         |  8 ++
 www/addons/mod/lesson/lang/sr-lt.json         |  8 ++
 www/addons/mod/lesson/lang/uk.json            |  2 +-
 www/addons/mod/lti/lang/ja.json               |  5 +
 www/addons/mod/lti/lang/sr-cr.json            |  5 +
 www/addons/mod/lti/lang/sr-lt.json            |  5 +
 www/addons/mod/lti/lang/uk.json               |  2 +-
 www/addons/mod/page/lang/ja.json              |  4 +-
 www/addons/mod/page/lang/sr-cr.json           |  3 +
 www/addons/mod/page/lang/sr-lt.json           |  3 +
 www/addons/mod/quiz/lang/ja.json              | 20 ++++
 www/addons/mod/quiz/lang/sr-cr.json           | 22 +++++
 www/addons/mod/quiz/lang/sr-lt.json           | 22 +++++
 www/addons/mod/quiz/lang/uk.json              | 10 +-
 www/addons/mod/resource/lang/ja.json          |  5 +-
 www/addons/mod/resource/lang/sr-cr.json       |  4 +
 www/addons/mod/resource/lang/sr-lt.json       |  4 +
 www/addons/mod/scorm/lang/el.json             |  1 +
 www/addons/mod/scorm/lang/ja.json             | 18 +++-
 www/addons/mod/scorm/lang/sr-cr.json          | 18 ++++
 www/addons/mod/scorm/lang/sr-lt.json          | 18 ++++
 www/addons/mod/scorm/lang/uk.json             |  8 +-
 www/addons/mod/survey/lang/ar.json            |  2 +-
 www/addons/mod/survey/lang/ja.json            |  2 +
 www/addons/mod/survey/lang/sr-cr.json         |  5 +
 www/addons/mod/survey/lang/sr-lt.json         |  5 +
 www/addons/mod/survey/lang/uk.json            |  4 +-
 www/addons/mod/url/lang/ja.json               |  5 +-
 www/addons/mod/url/lang/sr-cr.json            |  4 +
 www/addons/mod/url/lang/sr-lt.json            |  4 +
 www/addons/mod/wiki/lang/ja.json              |  7 ++
 www/addons/mod/wiki/lang/sr-cr.json           | 10 ++
 www/addons/mod/wiki/lang/sr-lt.json           | 10 ++
 www/addons/mod/wiki/lang/uk.json              |  2 +-
 www/addons/notes/lang/ar.json                 |  2 +-
 www/addons/notes/lang/da.json                 |  2 +-
 www/addons/notes/lang/he.json                 |  2 +-
 www/addons/notes/lang/ja.json                 | 13 ++-
 www/addons/notes/lang/sr-cr.json              | 13 +++
 www/addons/notes/lang/sr-lt.json              | 13 +++
 www/addons/notes/lang/uk.json                 |  2 +-
 www/addons/notifications/lang/ar.json         |  2 +-
 www/addons/notifications/lang/da.json         |  2 +-
 www/addons/notifications/lang/de.json         |  2 +-
 www/addons/notifications/lang/el.json         |  1 +
 www/addons/notifications/lang/es.json         |  1 +
 www/addons/notifications/lang/fr.json         |  1 +
 www/addons/notifications/lang/he.json         |  2 +-
 www/addons/notifications/lang/ja.json         |  4 +-
 www/addons/notifications/lang/ru.json         |  1 +
 www/addons/notifications/lang/sr-cr.json      |  7 ++
 www/addons/notifications/lang/sr-lt.json      |  7 ++
 www/addons/participants/lang/ar.json          |  2 +-
 www/addons/participants/lang/ja.json          |  2 +-
 www/addons/participants/lang/sr-cr.json       |  4 +
 www/addons/participants/lang/sr-lt.json       |  4 +
 www/config.json                               |  2 +-
 www/core/components/contentlinks/lang/ja.json |  7 ++
 .../components/contentlinks/lang/sr-cr.json   |  7 ++
 .../components/contentlinks/lang/sr-lt.json   |  7 ++
 www/core/components/contentlinks/lang/uk.json |  2 +-
 www/core/components/course/lang/ar.json       |  4 +-
 www/core/components/course/lang/da.json       |  2 +-
 www/core/components/course/lang/el.json       |  1 +
 www/core/components/course/lang/es.json       |  1 +
 www/core/components/course/lang/he.json       |  2 +-
 www/core/components/course/lang/ja.json       |  2 +-
 www/core/components/course/lang/sr-cr.json    | 20 ++++
 www/core/components/course/lang/sr-lt.json    | 20 ++++
 www/core/components/course/lang/uk.json       |  6 +-
 www/core/components/courses/lang/da.json      |  6 +-
 www/core/components/courses/lang/el.json      |  2 +
 www/core/components/courses/lang/es.json      |  2 +
 www/core/components/courses/lang/ru.json      |  1 +
 www/core/components/courses/lang/sr-cr.json   | 19 ++++
 www/core/components/courses/lang/sr-lt.json   | 19 ++++
 www/core/components/courses/lang/uk.json      |  4 +-
 www/core/components/fileuploader/lang/ar.json |  6 +-
 www/core/components/fileuploader/lang/da.json |  4 +-
 www/core/components/fileuploader/lang/fr.json |  2 +-
 www/core/components/fileuploader/lang/he.json |  6 +-
 www/core/components/fileuploader/lang/ja.json |  6 +-
 .../components/fileuploader/lang/sr-cr.json   | 25 +++++
 .../components/fileuploader/lang/sr-lt.json   | 25 +++++
 www/core/components/login/lang/da.json        |  2 +-
 www/core/components/login/lang/de.json        |  2 +-
 www/core/components/login/lang/el.json        | 36 ++++++-
 www/core/components/login/lang/es.json        |  2 +
 www/core/components/login/lang/he.json        |  2 +-
 www/core/components/login/lang/ja.json        |  1 +
 www/core/components/login/lang/sr-cr.json     | 49 ++++++++++
 www/core/components/login/lang/sr-lt.json     | 49 ++++++++++
 www/core/components/login/lang/uk.json        | 20 ++--
 www/core/components/question/lang/el.json     |  7 +-
 www/core/components/question/lang/sr-cr.json  |  8 ++
 www/core/components/question/lang/sr-lt.json  |  8 ++
 www/core/components/question/lang/uk.json     |  2 +-
 www/core/components/settings/lang/de.json     | 12 +--
 www/core/components/settings/lang/el.json     | 47 ++++++++-
 www/core/components/settings/lang/es.json     |  1 +
 www/core/components/settings/lang/sr-cr.json  | 47 +++++++++
 www/core/components/settings/lang/sr-lt.json  | 47 +++++++++
 www/core/components/settings/lang/uk.json     | 18 ++--
 www/core/components/sharedfiles/lang/de.json  |  4 +-
 www/core/components/sharedfiles/lang/el.json  |  9 +-
 www/core/components/sharedfiles/lang/fr.json  |  2 +-
 .../components/sharedfiles/lang/sr-cr.json    | 11 +++
 .../components/sharedfiles/lang/sr-lt.json    | 11 +++
 www/core/components/sidemenu/lang/ar.json     |  4 +-
 www/core/components/sidemenu/lang/el.json     |  8 +-
 www/core/components/sidemenu/lang/sr-cr.json  |  9 ++
 www/core/components/sidemenu/lang/sr-lt.json  |  9 ++
 www/core/components/user/lang/ar.json         |  4 +-
 www/core/components/user/lang/da.json         |  4 +-
 www/core/components/user/lang/el.json         | 12 ++-
 www/core/components/user/lang/es.json         |  1 +
 www/core/components/user/lang/he.json         |  8 +-
 www/core/components/user/lang/ja.json         |  4 +-
 www/core/components/user/lang/sr-cr.json      | 12 +++
 www/core/components/user/lang/sr-lt.json      | 12 +++
 www/core/lang/ar.json                         |  2 +-
 www/core/lang/da.json                         | 14 +--
 www/core/lang/el.json                         |  8 ++
 www/core/lang/es.json                         |  8 ++
 www/core/lang/fr.json                         |  5 +-
 www/core/lang/he.json                         | 16 ++--
 www/core/lang/ja.json                         | 95 ++++++++++++++++---
 www/core/lang/sr-cr.json                      | 95 +++++++++++++++++++
 www/core/lang/sr-lt.json                      | 95 +++++++++++++++++++
 www/core/lang/uk.json                         | 26 ++---
 220 files changed, 1754 insertions(+), 258 deletions(-)
 create mode 100644 www/addons/calendar/lang/sr-cr.json
 create mode 100644 www/addons/calendar/lang/sr-lt.json
 create mode 100644 www/addons/competency/lang/sr-cr.json
 create mode 100644 www/addons/competency/lang/sr-lt.json
 create mode 100644 www/addons/coursecompletion/lang/sr-cr.json
 create mode 100644 www/addons/coursecompletion/lang/sr-lt.json
 create mode 100644 www/addons/files/lang/sr-cr.json
 create mode 100644 www/addons/files/lang/sr-lt.json
 create mode 100644 www/addons/messageoutput/airnotifier/lang/ja.json
 create mode 100644 www/addons/messageoutput/airnotifier/lang/sr-cr.json
 create mode 100644 www/addons/messageoutput/airnotifier/lang/sr-lt.json
 create mode 100644 www/addons/messages/lang/sr-cr.json
 create mode 100644 www/addons/messages/lang/sr-lt.json
 create mode 100644 www/addons/mod/assign/lang/sr-cr.json
 create mode 100644 www/addons/mod/assign/lang/sr-lt.json
 create mode 100644 www/addons/mod/chat/lang/sr-cr.json
 create mode 100644 www/addons/mod/chat/lang/sr-lt.json
 create mode 100644 www/addons/mod/choice/lang/sr-cr.json
 create mode 100644 www/addons/mod/choice/lang/sr-lt.json
 create mode 100644 www/addons/mod/feedback/lang/sr-cr.json
 create mode 100644 www/addons/mod/feedback/lang/sr-lt.json
 create mode 100644 www/addons/mod/folder/lang/sr-cr.json
 create mode 100644 www/addons/mod/folder/lang/sr-lt.json
 create mode 100644 www/addons/mod/forum/lang/sr-cr.json
 create mode 100644 www/addons/mod/forum/lang/sr-lt.json
 create mode 100644 www/addons/mod/glossary/lang/sr-cr.json
 create mode 100644 www/addons/mod/glossary/lang/sr-lt.json
 create mode 100644 www/addons/mod/imscp/lang/sr-cr.json
 create mode 100644 www/addons/mod/imscp/lang/sr-lt.json
 create mode 100644 www/addons/mod/label/lang/sr-cr.json
 create mode 100644 www/addons/mod/label/lang/sr-lt.json
 create mode 100644 www/addons/mod/lesson/lang/sr-cr.json
 create mode 100644 www/addons/mod/lesson/lang/sr-lt.json
 create mode 100644 www/addons/mod/lti/lang/ja.json
 create mode 100644 www/addons/mod/lti/lang/sr-cr.json
 create mode 100644 www/addons/mod/lti/lang/sr-lt.json
 create mode 100644 www/addons/mod/page/lang/sr-cr.json
 create mode 100644 www/addons/mod/page/lang/sr-lt.json
 create mode 100644 www/addons/mod/quiz/lang/sr-cr.json
 create mode 100644 www/addons/mod/quiz/lang/sr-lt.json
 create mode 100644 www/addons/mod/resource/lang/sr-cr.json
 create mode 100644 www/addons/mod/resource/lang/sr-lt.json
 create mode 100644 www/addons/mod/scorm/lang/sr-cr.json
 create mode 100644 www/addons/mod/scorm/lang/sr-lt.json
 create mode 100644 www/addons/mod/survey/lang/sr-cr.json
 create mode 100644 www/addons/mod/survey/lang/sr-lt.json
 create mode 100644 www/addons/mod/url/lang/sr-cr.json
 create mode 100644 www/addons/mod/url/lang/sr-lt.json
 create mode 100644 www/addons/mod/wiki/lang/sr-cr.json
 create mode 100644 www/addons/mod/wiki/lang/sr-lt.json
 create mode 100644 www/addons/notes/lang/sr-cr.json
 create mode 100644 www/addons/notes/lang/sr-lt.json
 create mode 100644 www/addons/notifications/lang/sr-cr.json
 create mode 100644 www/addons/notifications/lang/sr-lt.json
 create mode 100644 www/addons/participants/lang/sr-cr.json
 create mode 100644 www/addons/participants/lang/sr-lt.json
 create mode 100644 www/core/components/contentlinks/lang/ja.json
 create mode 100644 www/core/components/contentlinks/lang/sr-cr.json
 create mode 100644 www/core/components/contentlinks/lang/sr-lt.json
 create mode 100644 www/core/components/course/lang/sr-cr.json
 create mode 100644 www/core/components/course/lang/sr-lt.json
 create mode 100644 www/core/components/courses/lang/sr-cr.json
 create mode 100644 www/core/components/courses/lang/sr-lt.json
 create mode 100644 www/core/components/fileuploader/lang/sr-cr.json
 create mode 100644 www/core/components/fileuploader/lang/sr-lt.json
 create mode 100644 www/core/components/login/lang/sr-cr.json
 create mode 100644 www/core/components/login/lang/sr-lt.json
 create mode 100644 www/core/components/question/lang/sr-cr.json
 create mode 100644 www/core/components/question/lang/sr-lt.json
 create mode 100644 www/core/components/settings/lang/sr-cr.json
 create mode 100644 www/core/components/settings/lang/sr-lt.json
 create mode 100644 www/core/components/sharedfiles/lang/sr-cr.json
 create mode 100644 www/core/components/sharedfiles/lang/sr-lt.json
 create mode 100644 www/core/components/sidemenu/lang/sr-cr.json
 create mode 100644 www/core/components/sidemenu/lang/sr-lt.json
 create mode 100644 www/core/components/user/lang/sr-cr.json
 create mode 100644 www/core/components/user/lang/sr-lt.json
 create mode 100644 www/core/lang/sr-cr.json
 create mode 100644 www/core/lang/sr-lt.json

diff --git a/www/addons/calendar/lang/ar.json b/www/addons/calendar/lang/ar.json
index 9bece3c914d..23e2ee91b94 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/da.json b/www/addons/calendar/lang/da.json
index 70693816a85..6826baea7eb 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": "Beskeder"
+    "notifications": "Notifikationer"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/el.json b/www/addons/calendar/lang/el.json
index 744426a674d..9a2040a3e51 100644
--- a/www/addons/calendar/lang/el.json
+++ b/www/addons/calendar/lang/el.json
@@ -1,5 +1,6 @@
 {
     "calendarevents": "Ημερολόγιο συμβάντων",
+    "defaultnotificationtime": "Προεπιλεγμένος χρόνος ειδοποίησης",
     "errorloadevent": "Σφάλμα στην φόρτωση συμβάντου.",
     "errorloadevents": "Σφάλμα στην φόρτωση συμβάντων.",
     "noevents": "Δεν υπάρχουν συμβάντα",
diff --git a/www/addons/calendar/lang/es.json b/www/addons/calendar/lang/es.json
index 39bf009cfb6..993aec44200 100644
--- a/www/addons/calendar/lang/es.json
+++ b/www/addons/calendar/lang/es.json
@@ -1,5 +1,6 @@
 {
     "calendarevents": "Eventos de calendario",
+    "defaultnotificationtime": "Tiempo de notificación por defecto",
     "errorloadevent": "Error cargando el evento.",
     "errorloadevents": "Error cargando los eventos.",
     "noevents": "No hay eventos",
diff --git a/www/addons/calendar/lang/he.json b/www/addons/calendar/lang/he.json
index 3702664d6e1..368fb1895c4 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/ja.json b/www/addons/calendar/lang/ja.json
index 5064bdee92f..b6e5457e412 100644
--- a/www/addons/calendar/lang/ja.json
+++ b/www/addons/calendar/lang/ja.json
@@ -1,4 +1,8 @@
 {
-    "noevents": "到来する活動期限はありません。",
+    "calendarevents": "カレンダーイベント",
+    "defaultnotificationtime": "デフォルト通知時間",
+    "errorloadevent": "イベントの読み込み時にエラーがありました。",
+    "errorloadevents": "イベントの読み込み時にエラーがありました。",
+    "noevents": "イベントはありません",
     "notifications": "通知"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sr-cr.json b/www/addons/calendar/lang/sr-cr.json
new file mode 100644
index 00000000000..dba4ebcd807
--- /dev/null
+++ b/www/addons/calendar/lang/sr-cr.json
@@ -0,0 +1,8 @@
+{
+    "calendarevents": "Догађаји у календару",
+    "defaultnotificationtime": "Подразумевано време за слање обавештења",
+    "errorloadevent": "Грешка приликом учитавања догађаја.",
+    "errorloadevents": "Грешка приликом учитавања догађаја.",
+    "noevents": "Нема догађаја",
+    "notifications": "Обавештења"
+}
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sr-lt.json b/www/addons/calendar/lang/sr-lt.json
new file mode 100644
index 00000000000..7db382ef521
--- /dev/null
+++ b/www/addons/calendar/lang/sr-lt.json
@@ -0,0 +1,8 @@
+{
+    "calendarevents": "Događaji u kalendaru",
+    "defaultnotificationtime": "Podrazumevano vreme za slanje obaveštenja",
+    "errorloadevent": "Greška prilikom učitavanja događaja.",
+    "errorloadevents": "Greška prilikom učitavanja događaja.",
+    "noevents": "Nema događaja",
+    "notifications": "Nema događaja"
+}
\ No newline at end of file
diff --git a/www/addons/competency/lang/da.json b/www/addons/competency/lang/da.json
index 57b4efe1f8c..dfda559c46e 100644
--- a/www/addons/competency/lang/da.json
+++ b/www/addons/competency/lang/da.json
@@ -11,7 +11,7 @@
     "learningplans": "Læringsplaner",
     "myplans": "Mine læringsplaner",
     "noactivities": "Ingen aktiviteter",
-    "nocompetencies": "Ingen kompetencer er oprettet i denne ramme.",
+    "nocompetencies": "Ingen kompetencer",
     "nocrossreferencedcompetencies": "Ingen andre kompetencer er krydsrefereret til denne kompetence.",
     "noevidence": "Ingen vidnesbyrd",
     "noplanswerecreated": "Der blev ikke oprettet nogen læringsplaner.",
diff --git a/www/addons/competency/lang/ja.json b/www/addons/competency/lang/ja.json
index 5b45ea08016..c2210f5308d 100644
--- a/www/addons/competency/lang/ja.json
+++ b/www/addons/competency/lang/ja.json
@@ -6,12 +6,13 @@
     "coursecompetencyratingsarepushedtouserplans": "このコース内でのコンピテンシー評定は学習プラン内ですぐに更新されます。",
     "crossreferencedcompetencies": "クロスリファレンスコンピテンシー",
     "duedate": "終了日時",
+    "errornocompetenciesfound": "コンピテンシーが見つかりません",
     "evidence": "エビデンス",
     "learningplancompetencies": "学習プランコンピテンシー",
     "learningplans": "学習プラン",
     "myplans": "マイ学習プラン",
     "noactivities": "活動なし",
-    "nocompetencies": "このフレームワークにコンピテンシーは作成されていません。",
+    "nocompetencies": "コンピテンシーなし",
     "nocrossreferencedcompetencies": "このコンピテンシーに相互参照されている他のコンピテンシーはありません。",
     "noevidence": "エビデンスなし",
     "noplanswerecreated": "学習プランは作成されませんでした。",
diff --git a/www/addons/competency/lang/sr-cr.json b/www/addons/competency/lang/sr-cr.json
new file mode 100644
index 00000000000..7a73abc828d
--- /dev/null
+++ b/www/addons/competency/lang/sr-cr.json
@@ -0,0 +1,4 @@
+{
+    "errornocompetenciesfound": "Није пронађена ниједна компетенција",
+    "nocompetencies": "Нема компетенција"
+}
\ No newline at end of file
diff --git a/www/addons/competency/lang/sr-lt.json b/www/addons/competency/lang/sr-lt.json
new file mode 100644
index 00000000000..31af28b95ea
--- /dev/null
+++ b/www/addons/competency/lang/sr-lt.json
@@ -0,0 +1,4 @@
+{
+    "errornocompetenciesfound": "Nije pronađena nijedna kompetencija",
+    "nocompetencies": "Nema kompetencija"
+}
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ar.json b/www/addons/coursecompletion/lang/ar.json
index 7faf3c038ac..f88bc955bca 100644
--- a/www/addons/coursecompletion/lang/ar.json
+++ b/www/addons/coursecompletion/lang/ar.json
@@ -1,19 +1,19 @@
 {
-    "complete": "كامل",
+    "complete": "مكتمل",
     "completecourse": "مقرر مكتمل",
-    "completed": "تم",
+    "completed": "تم إكمال المقرر",
     "completiondate": "تاريخ إكمال المقرر",
     "couldnotloadreport": "لا يمكن تحميل تقرير إكمال المقرر، الرجاء المحاولة في وقت آخر",
-    "coursecompletion": "إكمال المقرر الدراسي",
-    "criteria": "معايير",
-    "criteriagroup": "مجموعة المعايير",
+    "coursecompletion": "إكمال المقرر",
+    "criteria": "المعايير",
+    "criteriagroup": "معايير المجموعة",
     "criteriarequiredall": "كل المعايير في الأسفل مطلوبة",
-    "criteriarequiredany": "أي معيار في الأسفل مطلوب",
+    "criteriarequiredany": "أي معايير في الأسفل مطلوبة",
     "inprogress": "قيد التنفيذ",
-    "manualselfcompletion": "إكمال يدوي ذاتي",
+    "manualselfcompletion": "إكمال ذاتي يدوي",
     "notyetstarted": "لم يبدأ بعد",
-    "pending": "معلق",
-    "required": "مفروض",
+    "pending": "قيد الانتظار",
+    "required": "مطلوب",
     "requiredcriteria": "المعايير المطلوبة",
     "requirement": "المتطلبات",
     "status": "الحالة",
diff --git a/www/addons/coursecompletion/lang/da.json b/www/addons/coursecompletion/lang/da.json
index 21281be057e..9d2cdeb93a0 100644
--- a/www/addons/coursecompletion/lang/da.json
+++ b/www/addons/coursecompletion/lang/da.json
@@ -1,20 +1,20 @@
 {
-    "complete": "Færdiggør",
+    "complete": "Fuldfør",
     "completecourse": "Fuldfør kursus",
-    "completed": "Gennemført",
+    "completed": "Fuldført",
     "completiondate": "Afslutningsdato",
     "couldnotloadreport": "Kunne ikke indlæse rapporten vedrørende  kursusfuldførelse, prøv igen senere.",
-    "coursecompletion": "Kursusgennemførelse",
-    "criteria": "Kriterie",
-    "criteriagroup": "Kriteriegruppe",
-    "criteriarequiredall": "Alle kriterier herunder er påkrævet",
-    "criteriarequiredany": "Ethvert kriterium herunder er påkrævet",
-    "inprogress": "Igangværende",
-    "manualselfcompletion": "Manuel selvregistrering af gennemførelse",
-    "notyetstarted": "Ikke begyndt endnu",
-    "pending": "Behandles",
-    "required": "Påkrævet",
-    "requiredcriteria": "Påkrævede kriterier",
+    "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",
+    "pending": "Afventer",
+    "required": "Krævet",
+    "requiredcriteria": "Krævet kriterie",
     "requirement": "Krav",
     "status": "Status",
     "viewcoursereport": "Se kursusrapport"
diff --git a/www/addons/coursecompletion/lang/el.json b/www/addons/coursecompletion/lang/el.json
index 555b60517bd..a6fb10fd47b 100644
--- a/www/addons/coursecompletion/lang/el.json
+++ b/www/addons/coursecompletion/lang/el.json
@@ -10,7 +10,7 @@
     "criteriarequiredall": "Όλα τα παρακάτω κριτήρια είναι υποχρεωτικά",
     "criteriarequiredany": "Οποιοδήποτε από τα παρακάτω κριτήρια είναι υποχρεωτικά",
     "inprogress": "Σε εξέλιξη",
-    "manualselfcompletion": "Χειροκίνητη αυτό-ολοκλήρωση",
+    "manualselfcompletion": "Μη αυτόματη ολοκλήρωση",
     "notyetstarted": "Δεν έχει ξεκινήσει ακόμα",
     "pending": "Εκκρεμής",
     "required": "Απαιτείται",
diff --git a/www/addons/coursecompletion/lang/he.json b/www/addons/coursecompletion/lang/he.json
index 3036661befc..dca12273f76 100644
--- a/www/addons/coursecompletion/lang/he.json
+++ b/www/addons/coursecompletion/lang/he.json
@@ -1,19 +1,19 @@
 {
-    "complete": "הושלם",
+    "complete": "השלמה",
     "completecourse": "השלמת קורס",
     "completed": "הושלם",
     "completiondate": "תאריך השלמה",
-    "coursecompletion": "השלמת הקורס",
-    "criteria": "תנאי",
-    "criteriagroup": "קבוצת תנאים",
-    "criteriarequiredall": "כל התנאים המצויינים מטה נדרשים",
-    "criteriarequiredany": "לפחות אחד מהתנאים המצויינים מטה נדרשים",
+    "coursecompletion": "השלמת קורס",
+    "criteria": "מדד־הערכה",
+    "criteriagroup": "קבוצת מדדיי־הערכה",
+    "criteriarequiredall": "כל מדדיי־הערכה להלן נדרשים",
+    "criteriarequiredany": "אחד ממדדיי־הערכה להלן נדרש",
     "inprogress": "בתהליך",
-    "manualselfcompletion": "השלמה עצמאית ידנית",
-    "notyetstarted": "עדיין לא התחיל",
-    "pending": "בתהליך למידה",
-    "required": "דרוש",
-    "requiredcriteria": "תנאי נדרש",
+    "manualselfcompletion": "הזנת השלמה עצמית",
+    "notyetstarted": "עדיין לא החל",
+    "pending": "בהמתנה",
+    "required": "נדרש",
+    "requiredcriteria": "מדד־הערכה נדרש",
     "requirement": "דרישה",
     "status": "מצב",
     "viewcoursereport": "צפיה בדוח הקורס"
diff --git a/www/addons/coursecompletion/lang/ja.json b/www/addons/coursecompletion/lang/ja.json
index f53547d1c99..344ea673aea 100644
--- a/www/addons/coursecompletion/lang/ja.json
+++ b/www/addons/coursecompletion/lang/ja.json
@@ -1,17 +1,21 @@
 {
-    "complete": "詳細",
-    "completed": "完了",
+    "complete": "完了",
+    "completecourse": "コース完了",
+    "completed": "完了しました",
+    "completiondate": "完了した日",
+    "couldnotloadreport": "コース完了の読み込みができませんでした。後でもう一度試してください。",
     "coursecompletion": "コース完了",
     "criteria": "クライテリア",
     "criteriagroup": "クライテリアグループ",
-    "criteriarequiredall": "下記のクライテリアすべてが必須である",
-    "criteriarequiredany": "下記いくつかのクライテリアが必須である",
+    "criteriarequiredall": "以下すべてのクライテリアが必要",
+    "criteriarequiredany": "以下のクライテリアいずれかが必要",
     "inprogress": "進行中",
-    "manualselfcompletion": "手動による自己完了",
-    "notyetstarted": "未開始",
-    "pending": "保留",
-    "required": "必須",
-    "requiredcriteria": "必須クライテリア",
-    "status": "ステータス",
-    "viewcoursereport": "コースレポートを表示する"
+    "manualselfcompletion": "手動自己完了",
+    "notyetstarted": "まだ開始されていない",
+    "pending": "保留中",
+    "required": "必要な",
+    "requiredcriteria": "必要なクライテリア",
+    "requirement": "要求",
+    "status": "状態",
+    "viewcoursereport": "コースレポートを見る"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sr-cr.json b/www/addons/coursecompletion/lang/sr-cr.json
new file mode 100644
index 00000000000..610e78602a3
--- /dev/null
+++ b/www/addons/coursecompletion/lang/sr-cr.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/coursecompletion/lang/sr-lt.json b/www/addons/coursecompletion/lang/sr-lt.json
new file mode 100644
index 00000000000..6553f9f3960
--- /dev/null
+++ b/www/addons/coursecompletion/lang/sr-lt.json
@@ -0,0 +1,21 @@
+{
+    "complete": "Završi",
+    "completecourse": "Završi kurs",
+    "completed": "Završeno",
+    "completiondate": "Datum završetka",
+    "couldnotloadreport": "Nije moguće učitati izveštaj o završetku kursa. Molimo vas, pokušajte ponovo kasnije.",
+    "coursecompletion": "Završetak kursa",
+    "criteria": "Kriterijumi",
+    "criteriagroup": "Grupa kriterijuma",
+    "criteriarequiredall": "Svi dole navedeni kriterijumi su neophodni",
+    "criteriarequiredany": "Bilo koji od dole navedenih kriterijuma je neophodan",
+    "inprogress": "U toku",
+    "manualselfcompletion": "Ručni samostalni završetak",
+    "notyetstarted": "Još nije započeto",
+    "pending": "Na čekanju",
+    "required": "Neophodno",
+    "requiredcriteria": "Neophodni kriterijumi",
+    "requirement": "Uslov",
+    "status": "Status",
+    "viewcoursereport": "Prikaži izveštaj sa kursa"
+}
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/uk.json b/www/addons/coursecompletion/lang/uk.json
index 86fa3eecf17..790fda5169e 100644
--- a/www/addons/coursecompletion/lang/uk.json
+++ b/www/addons/coursecompletion/lang/uk.json
@@ -10,7 +10,7 @@
     "criteriarequiredall": "Всі критерії нижче обов'язкові",
     "criteriarequiredany": "Будь-яка критерія нижче обов'язкова",
     "inprogress": "В процесі...",
-    "manualselfcompletion": "Завершення самостійно",
+    "manualselfcompletion": "Самостійне завершення",
     "notyetstarted": "Не розпочато",
     "pending": "В очікуванні",
     "required": "Необхідно",
diff --git a/www/addons/files/lang/ar.json b/www/addons/files/lang/ar.json
index 2ab44cda49c..3521b2b6f32 100644
--- a/www/addons/files/lang/ar.json
+++ b/www/addons/files/lang/ar.json
@@ -4,5 +4,5 @@
     "files": "ملفات",
     "privatefiles": "ملفات خاصة",
     "sitefiles": "ملفات الموقع",
-    "uploadfiles": "إرسل ملفات التغذية الراجعة"
+    "uploadfiles": "رفع ملفات"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/da.json b/www/addons/files/lang/da.json
index 5f9d7d54b3b..1453d08f9f7 100644
--- a/www/addons/files/lang/da.json
+++ b/www/addons/files/lang/da.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Bemærk venligst at din Moodleadministrator har deaktiveret download af filer. Du kan se filerne men ikke downloade dem.",
     "clicktoupload": "Klik på knappen nedenfor for at uploade filer til dine private filer.",
     "couldnotloadfiles": "Fillisten kunne ikke hentes",
-    "emptyfilelist": "Der er ingen filer at vise",
+    "emptyfilelist": "Der er ingen filer at vise.",
     "erroruploadnotworking": "Desværre er det p.t. ikke muligt at uploade filer til dit site.",
     "files": "Filer",
     "myprivatefilesdesc": "Filerne som er tilgængelige i dit private område på dette Moodlewebsted.",
     "privatefiles": "Private filer",
     "sitefiles": "Site filer",
     "sitefilesdesc": "De andre filer som er tilgængelige for dig på denne Moodlewebside.",
-    "uploadfiles": "Send feedbackfiler"
+    "uploadfiles": "Upload filer"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/he.json b/www/addons/files/lang/he.json
index 6f612548ac8..0ed31567503 100644
--- a/www/addons/files/lang/he.json
+++ b/www/addons/files/lang/he.json
@@ -2,7 +2,7 @@
     "admindisableddownload": "יש לשים לב כי מנהל/ת אתר המוודל שלך, ביטל/ה את אפשרות להורדת הקבצים. באפשרותך לעיין בקבצים אך לא להורידם.",
     "clicktoupload": "להעלאת הקבצים לקבצים הפרטיים שלך, יש להקליק על הכפתור למטה.",
     "couldnotloadfiles": "לא ניתן לטעון את רשימת הקבצים.",
-    "emptyfilelist": "אין קבצים להציג",
+    "emptyfilelist": "אין קבצים להצגה.",
     "files": "קבצים",
     "myprivatefilesdesc": "הקבצים הזמינים לך באזור הפרטי באתר מוודל זה.",
     "privatefiles": "הקבצים שלי",
diff --git a/www/addons/files/lang/ja.json b/www/addons/files/lang/ja.json
index 0f3df892d31..de63504d659 100644
--- a/www/addons/files/lang/ja.json
+++ b/www/addons/files/lang/ja.json
@@ -1,7 +1,13 @@
 {
-    "emptyfilelist": "表示するファイルはありません。",
+    "admindisableddownload": "あなたのMoodle管理者に、ファイルのダウンロードを無効にするよう知らせてください。そうすれば、ファイルをデバイスにダウンロードせず閲覧のみにすることができます。",
+    "clicktoupload": "ファイルをあなたのプライベートファイル領域にアップロードするには、下のボタンをクリックしてください。",
+    "couldnotloadfiles": "以下のファイルが読み込みできませんでした。",
+    "emptyfilelist": "表示するファイルがありません。",
+    "erroruploadnotworking": "残念ながら、現在、あなたのサイトにファイルをアップロードすることはできません。",
     "files": "ファイル",
+    "myprivatefilesdesc": "ファイルはMoodleサイト上のあなたのプライベート領域にあります。",
     "privatefiles": "プライベートファイル",
     "sitefiles": "サイトファイル",
-    "uploadfiles": "フィードバックファイルを送信する"
+    "sitefilesdesc": "本Moodleサイトであなたが利用できる他のファイル",
+    "uploadfiles": "アップロードファイル"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/sr-cr.json b/www/addons/files/lang/sr-cr.json
new file mode 100644
index 00000000000..2faaa2353ae
--- /dev/null
+++ b/www/addons/files/lang/sr-cr.json
@@ -0,0 +1,10 @@
+{
+    "admindisableddownload": "Имајте у виду да је ваш Moodle администратор онемогућио преузимање датотека. Датотеке можете да прегледате, али не и да их преузмете.",
+    "clicktoupload": "Кликните на доње дугме како бисте отпремили датотеке међу своје приватне датотеке.",
+    "couldnotloadfiles": "Списак датотека не може бити учитан.",
+    "emptyfilelist": "Нема датотека за приказ.",
+    "erroruploadnotworking": "Нажалост, тренутно није могуће отпремити датотеке на ваш сајт.",
+    "myprivatefilesdesc": "Датотеке које су доступне у вашем приватном простору на овом Moodle сајту.",
+    "sitefilesdesc": "Остале датотеке које су доступне на овом Moodle сајту.",
+    "uploadfiles": "Отпреми датотеке"
+}
\ No newline at end of file
diff --git a/www/addons/files/lang/sr-lt.json b/www/addons/files/lang/sr-lt.json
new file mode 100644
index 00000000000..d847189a2dd
--- /dev/null
+++ b/www/addons/files/lang/sr-lt.json
@@ -0,0 +1,10 @@
+{
+    "admindisableddownload": "Imajte u vidu da je vaš Moodle administrator onemogućio preuzimanje datoteka. Datoteke možete da pregledate, ali ne i da ih preuzmete.",
+    "clicktoupload": "Kliknite na donje dugme kako biste otpremili datoteke među svoje privatne datoteke.",
+    "couldnotloadfiles": "Spisak datoteka ne može biti učitan.",
+    "emptyfilelist": "Nema datoteka za prikaz.",
+    "erroruploadnotworking": "Nažalost, trenutno nije moguće otpremiti datoteke na vaš sajt.",
+    "myprivatefilesdesc": "Datoteke koje su dostupne u vašem privatnom prostoru na ovom Moodle sajtu.",
+    "sitefilesdesc": "Ostale datoteke koje su dostupne na ovom Moodle sajtu.",
+    "uploadfiles": "Otpremi datoteke"
+}
\ No newline at end of file
diff --git a/www/addons/files/lang/uk.json b/www/addons/files/lang/uk.json
index cb8988a3eaf..083a9f56194 100644
--- a/www/addons/files/lang/uk.json
+++ b/www/addons/files/lang/uk.json
@@ -1,5 +1,5 @@
 {
-    "admindisableddownload": "Зверніть увагу, що ваш адміністратор Moodle відключив завантаження файлів, ви можете переглядати файли, але не завантажувати їх.",
+    "admindisableddownload": "Зверніть увагу, що ваш адміністратор Moodle відключив завантаження файлів. Ви можете переглядати файли, але не завантажувати їх.",
     "clicktoupload": "Натисніть на кнопку нижче, щоб завантажити ваші особисті файли.",
     "couldnotloadfiles": "Список файлів не може бути завантажений.",
     "emptyfilelist": "Немає файлів для показу.",
diff --git a/www/addons/messageoutput/airnotifier/lang/ja.json b/www/addons/messageoutput/airnotifier/lang/ja.json
new file mode 100644
index 00000000000..3746717dab7
--- /dev/null
+++ b/www/addons/messageoutput/airnotifier/lang/ja.json
@@ -0,0 +1,3 @@
+{
+    "processorsettingsdesc": "デバイスの設定"
+}
\ No newline at end of file
diff --git a/www/addons/messageoutput/airnotifier/lang/sr-cr.json b/www/addons/messageoutput/airnotifier/lang/sr-cr.json
new file mode 100644
index 00000000000..fda693e8ae3
--- /dev/null
+++ b/www/addons/messageoutput/airnotifier/lang/sr-cr.json
@@ -0,0 +1,3 @@
+{
+    "processorsettingsdesc": "Конфигуриши уређаје"
+}
\ No newline at end of file
diff --git a/www/addons/messageoutput/airnotifier/lang/sr-lt.json b/www/addons/messageoutput/airnotifier/lang/sr-lt.json
new file mode 100644
index 00000000000..4419d93d89a
--- /dev/null
+++ b/www/addons/messageoutput/airnotifier/lang/sr-lt.json
@@ -0,0 +1,3 @@
+{
+    "processorsettingsdesc": "Komfiguriši uređaj"
+}
\ No newline at end of file
diff --git a/www/addons/messages/lang/ar.json b/www/addons/messages/lang/ar.json
index a047f3dfa6a..afa651966c1 100644
--- a/www/addons/messages/lang/ar.json
+++ b/www/addons/messages/lang/ar.json
@@ -10,8 +10,8 @@
     "messages": "رسائل",
     "mustbeonlinetosendmessages": "لابد أن تكون متصل بالأنترنت لكي ترسل أي رسائل",
     "newmessage": "رسالة جديدة",
-    "nomessages": "لا توجد رسائل بعد",
-    "nousersfound": "لا يوجد مستخدمون",
+    "nomessages": "لا يوجد رسائل",
+    "nousersfound": "لا يوجد مستخدمين",
     "removecontact": "ازل عنوان الاتصال",
     "send": "إرسل",
     "sendmessage": "إرسل رسالة",
diff --git a/www/addons/messages/lang/da.json b/www/addons/messages/lang/da.json
index 160591f104a..0e63f8c9314 100644
--- a/www/addons/messages/lang/da.json
+++ b/www/addons/messages/lang/da.json
@@ -16,8 +16,8 @@
     "messagepreferences": "Indstillinger for beskeder",
     "messages": "Beskeder",
     "mustbeonlinetosendmessages": "Du skal være online for at sende beskeder",
-    "newmessage": "Ny besked",
-    "nomessages": "Ingen beskeder endnu",
+    "newmessage": "Ny besked...",
+    "nomessages": "Ingen besked.",
     "nousersfound": "Ingen brugere fundet",
     "removecontact": "Fjern kontakt",
     "send": "send",
diff --git a/www/addons/messages/lang/el.json b/www/addons/messages/lang/el.json
index 3476b0c695a..972f33b7539 100644
--- a/www/addons/messages/lang/el.json
+++ b/www/addons/messages/lang/el.json
@@ -1,6 +1,7 @@
 {
     "addcontact": "Προσθήκη επαφής",
     "blockcontact": "Φραγμός επαφής",
+    "blockcontactconfirm": "Θα σταματήσετε να λαμβάνετε μηνύματα από αυτήν την επαφή.",
     "blocknoncontacts": "Φραγή όλων των νέων μηνυμάτων που προέρχονται από χρήστες που δεν βρίσκονται στη λίστα επαφών σας.",
     "contactlistempty": "Η λίστα επαφών είναι κενή",
     "contactname": "Όνομα επαφής",
@@ -9,15 +10,18 @@
     "errorwhileretrievingcontacts": "Σφάλμα κατά την ανάκτηση των επαφών από το διακομιστή.",
     "errorwhileretrievingdiscussions": "Σφάλμα κατά την ανάκτηση των συζητήσεων από το διακομιστή.",
     "errorwhileretrievingmessages": "Σφάλμα κατά την ανάκτηση των μηνυμάτων από το διακομιστή.",
+    "loadpreviousmessages": "Φορτώστε τα προηγούμενα μηνύματα",
     "message": "Σώμα μηνύματος",
     "messagenotsent": "Το μήνυμα δεν στάλθηκε, δοκιμάστε ξανά αργότερα.",
     "messagepreferences": "Προτιμήσεις μηνύματος",
     "messages": "Μηνύματα",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
     "newmessage": "Νέο μήνυμα...",
+    "newmessages": "Νέα μηνύματα",
     "nomessages": "Κανένα μήνυμα.",
     "nousersfound": "Δεν βρέθηκαν χρήστες",
     "removecontact": "Αφαίρεσε την επαφή",
+    "removecontactconfirm": "Η επαφή θα καταργηθεί από τη λίστα επαφών σας.",
     "send": "Αποστολή",
     "sendmessage": "Αποστολή μηνύματος",
     "type_blocked": "Μπλοκαρισμένοι",
diff --git a/www/addons/messages/lang/es.json b/www/addons/messages/lang/es.json
index 9f18c4105e8..c2662e87fb9 100644
--- a/www/addons/messages/lang/es.json
+++ b/www/addons/messages/lang/es.json
@@ -1,6 +1,7 @@
 {
     "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",
     "contactlistempty": "Lista de contactos vacía",
     "contactname": "Nombre del contacto",
@@ -11,15 +12,18 @@
     "errorwhileretrievingcontacts": "Error al recuperar los contactos del servidor.",
     "errorwhileretrievingdiscussions": "Error al recuperar las discusiones del servidor.",
     "errorwhileretrievingmessages": "Error al recuperar los mensajes del servidor.",
+    "loadpreviousmessages": "Cargar mensajes anteriores",
     "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...",
+    "newmessages": "Nuevos mensajes",
     "nomessages": "No hay mensajes en espera",
     "nousersfound": "No se encuentran usuarios",
     "removecontact": "Eliminar contacto",
+    "removecontactconfirm": "El contacto se eliminará de su lista de contactos.",
     "send": "enviar",
     "sendmessage": "Enviar mensaje",
     "type_blocked": "Bloqueado",
diff --git a/www/addons/messages/lang/he.json b/www/addons/messages/lang/he.json
index fb473cf8205..99fc18ee0ff 100644
--- a/www/addons/messages/lang/he.json
+++ b/www/addons/messages/lang/he.json
@@ -15,9 +15,9 @@
     "messagepreferences": "העדפות מסרים",
     "messages": "הודעות",
     "mustbeonlinetosendmessages": "עליך להיות מחובר/ת בכדי לשלוח מסר.",
-    "newmessage": "הודעה חדשה",
-    "nomessages": "אין הודעות עדיין",
-    "nousersfound": "לתשומת-לב",
+    "newmessage": "מסר חדש...",
+    "nomessages": "אין מסרים.",
+    "nousersfound": "לא נמצאו משתמשים",
     "removecontact": "הסרת איש הקשר",
     "send": "שליחה",
     "sendmessage": "שליחת הודעה",
diff --git a/www/addons/messages/lang/ja.json b/www/addons/messages/lang/ja.json
index fdd373a6acd..ea482d4418d 100644
--- a/www/addons/messages/lang/ja.json
+++ b/www/addons/messages/lang/ja.json
@@ -1,20 +1,36 @@
 {
     "addcontact": "コンタクトに追加する",
     "blockcontact": "受信拒否",
+    "blockcontactconfirm": "この連絡先からのメッセージ受信を停止します。",
     "blocknoncontacts": "不明なユーザをブロックする",
-    "contactlistempty": "コンタクトリストは空です。",
-    "contactname": "連絡先",
+    "contactlistempty": "連絡先リストが空",
+    "contactname": "連絡先名称",
     "contacts": "コンタクト",
     "deletemessage": "メッセージを削除する",
     "deletemessageconfirmation": "本当にこのメッセージを削除してもよろしいですか? あなたのメッセージング履歴からのみ削除され、メッセージを送受信したユーザはまだ閲覧することができます。",
+    "errordeletemessage": "メッセージ消去中にエラーが発生しました。",
+    "errorwhileretrievingcontacts": "サーバから連絡先を取得中にエラーが発生しました。",
+    "errorwhileretrievingdiscussions": "サーバからディスカッションを受信中にエラーが発生しました。",
+    "errorwhileretrievingmessages": "サーバからメッセージを受信中にエラーが発生しました。",
+    "loadpreviousmessages": "以前のメッセージを読み込み",
     "message": "メッセージ本文",
+    "messagenotsent": "メッセージは送信されませんでした。後で再び試みてください。",
     "messagepreferences": "メッセージプリファレンス",
     "messages": "メッセージ",
-    "newmessage": "新しいメッセージ",
+    "mustbeonlinetosendmessages": "メッセージを送信するにはオンラインでなければなりません。",
+    "newmessage": "新規メッセージ...",
+    "newmessages": "新規メッセージ...",
     "nomessages": "メッセージがありません。",
-    "nousersfound": "ユーザは見つかりませんでした。",
+    "nousersfound": "ユーザが見つかりません",
     "removecontact": "コンタクトから削除する",
+    "removecontactconfirm": "連絡先はあなたの連絡先リストから削除されます。",
     "send": "送信",
     "sendmessage": "メッセージを送信する",
-    "unblockcontact": "コンタクトの拒否を解除する"
+    "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/sr-cr.json b/www/addons/messages/lang/sr-cr.json
new file mode 100644
index 00000000000..e03e4624361
--- /dev/null
+++ b/www/addons/messages/lang/sr-cr.json
@@ -0,0 +1,23 @@
+{
+    "blockcontactconfirm": "Нећете више добијати поруке од ове особе.",
+    "contactlistempty": "Листа контаката је празна",
+    "contactname": "Име особе",
+    "errordeletemessage": "Грешка приликом брисања поруке.",
+    "errorwhileretrievingcontacts": "Грешка приликом преузимања контаката са сервера.",
+    "errorwhileretrievingdiscussions": "Грешка приликом преузимања дискусија са сервера.",
+    "errorwhileretrievingmessages": "Грешка приликом преузимања порука са сервера.",
+    "loadpreviousmessages": "Учитај претходне поруке",
+    "messagenotsent": "Порука није послата. Молимо, покушајте поново касније.",
+    "mustbeonlinetosendmessages": "Морате бити онлајн како бисте слали поруке",
+    "newmessage": "Нове поруке...",
+    "newmessages": "Нове поруке",
+    "nomessages": "Нема порука.",
+    "nousersfound": "Није пронађен ниједан корисник",
+    "removecontactconfirm": "Особа ће бити уклоњена са ваше листе контаката.",
+    "type_blocked": "Блокиран",
+    "type_offline": "Офлајн",
+    "type_online": "Онлајн",
+    "type_search": "Резултати претраге",
+    "type_strangers": "Други",
+    "warningmessagenotsent": "Није могуће послати поруку/е кориснику {{user}}. {{error}}"
+}
\ No newline at end of file
diff --git a/www/addons/messages/lang/sr-lt.json b/www/addons/messages/lang/sr-lt.json
new file mode 100644
index 00000000000..305b0160956
--- /dev/null
+++ b/www/addons/messages/lang/sr-lt.json
@@ -0,0 +1,23 @@
+{
+    "blockcontactconfirm": "Nećete više dobijati poruke od ove osobe.",
+    "contactlistempty": "Lista kontakata je prazna",
+    "contactname": "Ime osobe",
+    "errordeletemessage": "Greška prilikom brisanja poruke.",
+    "errorwhileretrievingcontacts": "Greška prilikom preuzimanja kontakata sa servera.",
+    "errorwhileretrievingdiscussions": "Greška prilikom preuzimanja diskusija sa servera.",
+    "errorwhileretrievingmessages": "Greška prilikom preuzimanja poruka sa servera.",
+    "loadpreviousmessages": "Učitaj prethodne poruke",
+    "messagenotsent": "Poruka nije poslata. Molimo, pokušajte ponovo kasnije.",
+    "mustbeonlinetosendmessages": "Morate biti onlajn kako biste slali poruke",
+    "newmessage": "Nove poruke...",
+    "newmessages": "Nove poruke",
+    "nomessages": "Nema poruka.",
+    "nousersfound": "Nije pronađen nijedan korisnik",
+    "removecontactconfirm": "Osoba će biti uklonjena sa vaše liste kontakata.",
+    "type_blocked": "Blokiran",
+    "type_offline": "Oflajn",
+    "type_online": "Onlajn",
+    "type_search": "Rezultati pretrage",
+    "type_strangers": "Drugi",
+    "warningmessagenotsent": "Nije moguće poslati poruku/e korisniku {{user}}. {{error}}"
+}
\ No newline at end of file
diff --git a/www/addons/messages/lang/uk.json b/www/addons/messages/lang/uk.json
index 21fa4dc7976..6fab9eec6d8 100644
--- a/www/addons/messages/lang/uk.json
+++ b/www/addons/messages/lang/uk.json
@@ -29,5 +29,5 @@
     "type_search": "Результати пошуку",
     "type_strangers": "Інші",
     "unblockcontact": "Розблокувати контакт",
-    "warningmessagenotsent": "Неможливо відправити повідомлення до  {{user}}. {{error}}"
+    "warningmessagenotsent": "Неможливо відправити повідомлення до {{user}}. {{error}}"
 }
\ 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 321937193aa..0303c8b0932 100644
--- a/www/addons/mod/assign/lang/el.json
+++ b/www/addons/mod/assign/lang/el.json
@@ -23,10 +23,12 @@
     "editsubmission": "Τροποποίηση της υποβολής μου",
     "erroreditpluginsnotsupported": "Δεν μπορείτε να προσθέσετε ή να επεξεργαστείτε μια υποβολή στην εφαρμογή επειδή ορισμένα plugins δεν υποστηρίζονται για επεξεργασία:",
     "errorshowinginformation": "Δεν μπορούν να εμφανιστούν οι πληροφορίες υποβολής",
+    "feedbacknotsupported": "Αυτό το σχόλιο δεν υποστηρίζεται από την εφαρμογή και μπορεί να μην περιέχει όλες τις πληροφορίες",
     "grade": "Βαθμός",
     "graded": "Βαθμολογήθηκε",
     "gradedby": "Βαθμολογήθηκε από",
     "gradedon": "Βαθμολογήθηκε στις",
+    "gradenotsynced": "Η βαθμολογία δεν συγχρονίστηκε",
     "gradingstatus": "Κατάσταση Βαθμολόγησης",
     "groupsubmissionsettings": "Ρυθμίσεις ομαδικής υποβολής",
     "latesubmissions": "Εκπρόθεσμες υποβολές",
diff --git a/www/addons/mod/assign/lang/es.json b/www/addons/mod/assign/lang/es.json
index 35e141f70c9..8b1583be23c 100644
--- a/www/addons/mod/assign/lang/es.json
+++ b/www/addons/mod/assign/lang/es.json
@@ -36,6 +36,7 @@
     "graded": "Calificado",
     "gradedby": "Calificado por",
     "gradedon": "Calificado sobre",
+    "gradenotsynced": "Calificación no sincronizada",
     "gradeoutof": "Calificación sobre {{$a}}",
     "gradingstatus": "Estado de la calificación",
     "groupsubmissionsettings": "Configuración de entrega por grupo",
diff --git a/www/addons/mod/assign/lang/fr.json b/www/addons/mod/assign/lang/fr.json
index 4dc3f9a1b2b..a381dffff5a 100644
--- a/www/addons/mod/assign/lang/fr.json
+++ b/www/addons/mod/assign/lang/fr.json
@@ -15,7 +15,7 @@
     "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",
+    "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}}.",
diff --git a/www/addons/mod/assign/lang/ja.json b/www/addons/mod/assign/lang/ja.json
index d7f86ec249e..7d36b430584 100644
--- a/www/addons/mod/assign/lang/ja.json
+++ b/www/addons/mod/assign/lang/ja.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,11 +28,15 @@
     "duedatereached": "この課題の提出期限を過ぎました。",
     "editingstatus": "編集ステータス",
     "editsubmission": "提出を編集する",
+    "erroreditpluginsnotsupported": "提出物の編集がサポートされていないプラグインがあるため、アプリから提出物の追加や編集ができませんでした。",
+    "errorshowinginformation": "提出物の情報を表示できません。",
     "extensionduedate": "延長提出期限",
+    "feedbacknotsupported": "このフィードバックはアプリでは未サポートのため、すべての情報が含まれていない可能性があります",
     "grade": "評点",
     "graded": "評定済み",
     "gradedby": "評定者",
     "gradedon": "評定日時",
+    "gradenotsynced": "評定が同期できませんでした",
     "gradeoutof": "{{$a}} 点中の評点",
     "gradingstatus": "評定ステータス",
     "groupsubmissionsettings": "グループ提出設定",
@@ -47,6 +55,7 @@
     "nomoresubmissionsaccepted": "延長を許可された参加者のみ許可されます。",
     "noonlinesubmissions": "この課題においてあなたがオンラインで提出するものはありません。",
     "nosubmission": "この課題に関して提出されているものはありません。",
+    "notallparticipantsareshown": "提出物のない参加者は表示されていません",
     "noteam": "どのグループのメンバーでもない",
     "notgraded": "未評定",
     "numberofdraftsubmissions": "下書き",
@@ -61,6 +70,7 @@
     "submission": "提出課題",
     "submissioneditable": "学生はこの提出を編集できます。",
     "submissionnoteditable": "学生はこの提出を編集できません。",
+    "submissionnotsupported": "この提出物はアプリでは未サポートのため、すべての情報が含まれていない可能性があります",
     "submissionslocked": "この課題は提出を受け付けていません。",
     "submissionstatus": "提出ステータス",
     "submissionstatus_": "提出なし",
@@ -80,5 +90,8 @@
     "ungroupedusers": "設定「提出にグループを必要とする」が有効にされているため、そして何名かのユーザがグループのメンバーではないため、または2つ以上のグループメンバーであるため、提出することはできません。",
     "unlimitedattempts": "無制限",
     "userswhoneedtosubmit": "提出が必要なユーザ: {{$a}}",
-    "viewsubmission": "提出を表示する"
+    "userwithid": "ID {{id}} を持つユーザ",
+    "viewsubmission": "提出を表示する",
+    "warningsubmissiongrademodified": "提出物の評定がサイト上で変更されました。",
+    "warningsubmissionmodified": "ユーザの提出物がサイト上で変更されました。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/sr-cr.json b/www/addons/mod/assign/lang/sr-cr.json
new file mode 100644
index 00000000000..653fd72673d
--- /dev/null
+++ b/www/addons/mod/assign/lang/sr-cr.json
@@ -0,0 +1,15 @@
+{
+    "acceptsubmissionstatement": "Молимо вас да прихватите изјаву о предаји рада.",
+    "cannoteditduetostatementsubmission": "Не можете да додате или мењате рад у апликацији јер нисмо могли да преузмемо са сајта изјаву о предаји рада.",
+    "cannotgradefromapp": "Апликације још увек не подржава неке методе оцењивања и оне не могу да се мењају.",
+    "cannotsubmitduetostatementsubmission": "Не можете да предате рад на оцењивање у апликацији јер нисмо могли да преузмемо са сајта изјаву о предаји рада.",
+    "erroreditpluginsnotsupported": "Не можете да додате или мењате рад у апликацији јер неки додаци немају подршку за уређивање:",
+    "errorshowinginformation": "Не можемо да прикажемо информације о предатом раду",
+    "feedbacknotsupported": "Аплликација не подржава ову повратну информацију. Могуће је да она не садржи све информације.",
+    "gradenotsynced": "Оцена није синхронизована",
+    "notallparticipantsareshown": "Учесници који нису предали рад се не приказују",
+    "submissionnotsupported": "Апликација не подржава овај предати рад. Могуће је да рад не садржи све информације.",
+    "userwithid": "Корисник са ID ознаком  {{id}}",
+    "warningsubmissiongrademodified": "Оцена предатог рада је измењена на сајту.",
+    "warningsubmissionmodified": "Предати рад корисника је измењен на сајту."
+}
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/sr-lt.json b/www/addons/mod/assign/lang/sr-lt.json
new file mode 100644
index 00000000000..fc825011df5
--- /dev/null
+++ b/www/addons/mod/assign/lang/sr-lt.json
@@ -0,0 +1,15 @@
+{
+    "acceptsubmissionstatement": "Molimo vas da prihvatite izjavu o predaji rada.",
+    "cannoteditduetostatementsubmission": "Ne možete da dodate ili menjate rad u aplikaciji jer nismo mogli da preuzmemo sa sajta izjavu o predaji rada.",
+    "cannotgradefromapp": "Aplikacije ne podržava neke metode ocenjivanja i one ne mogu da se menjaju.",
+    "cannotsubmitduetostatementsubmission": "Ne možete da predate rad na ocenjivanje u aplikaciji jer nismo mogli da preuzmemo sa sajta izjavu o predaji rada.",
+    "erroreditpluginsnotsupported": "Ne možete da dodate ili menjate rad u aplikaciji jer neki dodaci nemaju podršku za uređivanje:",
+    "errorshowinginformation": "Ne možemo da prikažemo informacije o predatom radu",
+    "feedbacknotsupported": "Apllikacija ne podržava ovu povratnu informaciju. Moguće je da ona ne sadrži sve informacije.",
+    "gradenotsynced": "Ocena nije sinhronizovana",
+    "notallparticipantsareshown": "Učesnici koji nisu predali rad se ne prikazuju",
+    "submissionnotsupported": "Aplikacija ne podržava ovaj predati rad. Moguće je da rad ne sadrži sve informacije.",
+    "userwithid": "Korisnik sa ID oznakom  {{id}}",
+    "warningsubmissiongrademodified": "Ocena predatog rada je izmenjena na sajtu.",
+    "warningsubmissionmodified": "Predati rad korisnika je izmenjen na sajtu."
+}
\ No newline at end of file
diff --git a/www/addons/mod/assign/lang/uk.json b/www/addons/mod/assign/lang/uk.json
index 2b97cdc9229..96c4002f16f 100644
--- a/www/addons/mod/assign/lang/uk.json
+++ b/www/addons/mod/assign/lang/uk.json
@@ -16,7 +16,7 @@
     "attemptsettings": "Налаштування спроби",
     "cannoteditduetostatementsubmission": "Ви не можете додати або змінити представлення в додатку, тому що ми не могли отримати заяву з сайту.",
     "cannotgradefromapp": "Деякі методи класифікації поки не підтримуються додатком і не можуть бути змінені.",
-    "cannotsubmitduetostatementsubmission": "Ви не можете подати для сортування в додатку, тому що ми не могли отримати заява представлення з сайту.",
+    "cannotsubmitduetostatementsubmission": "Ви не можете подати запит для сортування в додатку, тому що ми не могли отримати заява представлення з сайту.",
     "confirmsubmission": "Відправити вашу роботу на перевірку? Після цього ви не зможете робити в ній ніяких змін.",
     "currentattempt": "Це спроба {{$a}}.",
     "currentattemptof": "Це спроба {{$a.attemptnumber}} (дозволено спроб - {{$a.maxattempts}}).",
@@ -36,7 +36,7 @@
     "graded": "Оцінено",
     "gradedby": "Оцінив",
     "gradedon": "Оцінено на",
-    "gradenotsynced": "Оцінка не синхронізуються",
+    "gradenotsynced": "Оцінки не синхронізовані",
     "gradeoutof": "Оцінка (макс. {{$a}})",
     "gradingstatus": "Статус оцінення",
     "groupsubmissionsettings": "Налаштування групової здачі",
diff --git a/www/addons/mod/chat/lang/ja.json b/www/addons/mod/chat/lang/ja.json
index 052232c43bf..37dd5b0164d 100644
--- a/www/addons/mod/chat/lang/ja.json
+++ b/www/addons/mod/chat/lang/ja.json
@@ -3,10 +3,15 @@
     "currentusers": "現在のユーザ",
     "enterchat": "ここをクリックしてチャットルームに入室する",
     "entermessage": "あなたのメッセージを入力してください。",
-    "errorwhilesendingmessage": "メッセージの送信中にエラーが発生しました。後で再度お試しください。",
+    "errorwhileconnecting": "チャットに接続する際にエラーが発生しました。",
+    "errorwhilegettingchatdata": "チャットのデータを取得中にエラーが発生しました。",
+    "errorwhilegettingchatusers": "チャットのユーザを取得中にエラーが発生しました。",
+    "errorwhileretrievingmessages": "サーバからメッセージを取得中にエラーが発生しました。",
+    "errorwhilesendingmessage": "メッセージ送信中にエラーが発生しました。",
     "messagebeepsyou": "{{$a}} があなたにビープしました!",
     "messageenter": "このチャットに {{$a}} が入室しました。",
     "messageexit": "このチャットから {{$a}} が退室しました。",
+    "mustbeonlinetosendmessages": "メッセージを送信するにはオンラインでなければなりません。",
     "nomessages": "メッセージがありません。",
     "send": "送信",
     "sessionstart": "次のチャットセッションは {{$a.date}} に開始されます (現在から {{$a.fromnow}} 後)。",
diff --git a/www/addons/mod/chat/lang/sr-cr.json b/www/addons/mod/chat/lang/sr-cr.json
new file mode 100644
index 00000000000..1e36fd7d84d
--- /dev/null
+++ b/www/addons/mod/chat/lang/sr-cr.json
@@ -0,0 +1,8 @@
+{
+    "errorwhileconnecting": "Грешка приликом повезивања са причаоницом.",
+    "errorwhilegettingchatdata": "Грешка приликом преузимања података за 'Причаоницу'.",
+    "errorwhilegettingchatusers": "Грешка приликом преузимања корисника причаонице.",
+    "errorwhileretrievingmessages": "Грешка приликом преузимања порука са сервера.",
+    "errorwhilesendingmessage": "Грешка приликом слања поруке.",
+    "mustbeonlinetosendmessages": "Морате бити онлајн како бисте слали поруке."
+}
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/sr-lt.json b/www/addons/mod/chat/lang/sr-lt.json
new file mode 100644
index 00000000000..9f2850e8b5e
--- /dev/null
+++ b/www/addons/mod/chat/lang/sr-lt.json
@@ -0,0 +1,8 @@
+{
+    "errorwhileconnecting": "Greška prilikom povezivanja sa pričaonicom.",
+    "errorwhilegettingchatdata": "Greška prilikom preuzimanja podataka za 'Pričaonicu'.",
+    "errorwhilegettingchatusers": "Greška prilikom preuzimanja korisnika pričaonice.",
+    "errorwhileretrievingmessages": "Greška prilikom preuzimanja poruka sa servera.",
+    "errorwhilesendingmessage": "Greška prilikom slanja poruke.",
+    "mustbeonlinetosendmessages": "Morate biti onlajn kako biste slali poruke."
+}
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/uk.json b/www/addons/mod/chat/lang/uk.json
index 66503297072..ab756410d89 100644
--- a/www/addons/mod/chat/lang/uk.json
+++ b/www/addons/mod/chat/lang/uk.json
@@ -6,8 +6,8 @@
     "errorwhileconnecting": "Помилка при підключенні до чату.",
     "errorwhilegettingchatdata": "Помилка отримання даних чату.",
     "errorwhilegettingchatusers": "Помилка отримання користувачів чату.",
-    "errorwhileretrievingmessages": "Помилка отримання повідомлень з серверу",
-    "errorwhilesendingmessage": "Помилка відправки повідомлення",
+    "errorwhileretrievingmessages": "Помилка отримання повідомлень з серверу.",
+    "errorwhilesendingmessage": "Помилка відправки повідомлення.",
     "messagebeepsyou": "{{$a}} відправив Вам сигнал!",
     "messageenter": "{{$a}} з'явився в чаті",
     "messageexit": "{{$a}} пішов із чату",
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/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/ja.json b/www/addons/mod/choice/lang/ja.json
index 02afe740bcd..5f5b78343c7 100644
--- a/www/addons/mod/choice/lang/ja.json
+++ b/www/addons/mod/choice/lang/ja.json
@@ -1,16 +1,19 @@
 {
     "cannotsubmit": "申し訳ございません、あなたの投票送信時に問題が発生しました。再度お試しください。",
     "choiceoptions": "投票オプション",
+    "errorgetchoice": "選択データの取得中にエラーが発生しました。",
     "expired": "申し訳ございません、この活動は {{$a}} に終了しているため、これ以上利用することはできません。",
     "full": "(上限到達)",
     "noresultsviewable": "現在、投票結果は閲覧できません。",
     "notopenyet": "申し訳ございません、この活動は {{$a}} まで利用することができません。",
-    "numberofuser": "投票者数",
-    "numberofuserinpercentage": "投票者数 (%)",
+    "numberofuser": "参加者数",
+    "numberofuserinpercentage": "参加者の割合",
     "previewonly": "これはこの活動で利用可能なオプションのプレビューです。あなたの投票は {{$a}} まで送信することができません。",
     "removemychoice": "私の投票を削除する",
     "responses": "投票結果",
+    "responsesresultgraphdescription": "{{number}}% のユーザが選択肢: {{text}} を選択しました。",
     "responsesresultgraphheader": "グラフ表示",
+    "resultsnotsynced": "結果にあなたの最後のレスポンスが含まれていません。更新のため、同期を行ってください。",
     "savemychoice": "私の投票を保存する",
     "userchoosethisoption": "このオプションを選択したユーザ",
     "yourselection": "あなたの投票"
diff --git a/www/addons/mod/choice/lang/sr-cr.json b/www/addons/mod/choice/lang/sr-cr.json
new file mode 100644
index 00000000000..298eab2ca83
--- /dev/null
+++ b/www/addons/mod/choice/lang/sr-cr.json
@@ -0,0 +1,7 @@
+{
+    "errorgetchoice": "Грешка приликом преузимања података за 'Избор'",
+    "numberofuser": "Број учесника",
+    "numberofuserinpercentage": "Проценат учесника",
+    "responsesresultgraphdescription": "{{number}}% корисника је изабрало опцију: {{text}}.",
+    "resultsnotsynced": "Резултати не укључује ваш последњи одговор. Покрените синхронизацију како бисте их ажурирали."
+}
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/sr-lt.json b/www/addons/mod/choice/lang/sr-lt.json
new file mode 100644
index 00000000000..b1d8bf5a49d
--- /dev/null
+++ b/www/addons/mod/choice/lang/sr-lt.json
@@ -0,0 +1,7 @@
+{
+    "errorgetchoice": "Greška prilikom preuzimanja podataka za 'Izbor'",
+    "numberofuser": "Broj učesnika",
+    "numberofuserinpercentage": "Procenat učesnika",
+    "responsesresultgraphdescription": "{{number}}% korisnika je izabralo opciju: {{text}}.",
+    "resultsnotsynced": "Rezultati ne uključuje vaš poslednji odgovor. Pokrenite sinhronizaciju kako biste ih ažurirali."
+}
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/uk.json b/www/addons/mod/choice/lang/uk.json
index 3587cc22f86..7c22b1890c7 100644
--- a/www/addons/mod/choice/lang/uk.json
+++ b/www/addons/mod/choice/lang/uk.json
@@ -1,7 +1,7 @@
 {
     "cannotsubmit": "Вибачте, але трапилася проблема під час збереження вашого вибору. Повторіть, будь ласка, ще раз.",
     "choiceoptions": "Параметри вибору",
-    "errorgetchoice": "Помилка при отриманні даних вибору.",
+    "errorgetchoice": "Помилка при отриманні даних виборки.",
     "expired": "На жаль, ця діяльність закрита для {{$a}} та більше недоступна",
     "full": "(Все)",
     "noresultsviewable": "В даний час результати не можна побачити.",
diff --git a/www/addons/mod/feedback/lang/el.json b/www/addons/mod/feedback/lang/el.json
index 7dd8e2abab8..1d5dec70464 100644
--- a/www/addons/mod/feedback/lang/el.json
+++ b/www/addons/mod/feedback/lang/el.json
@@ -3,10 +3,12 @@
     "anonymous": "Ανώνυμα",
     "anonymous_entries": "Ανώνυμες καταχωρήσεις",
     "average": "Μέσος όρος",
+    "captchaofflinewarning": "Η ανατροφοδότηση με την χρήση captcha δεν μπορεί να ολοκληρωθεί εάν δεν έχει διαμορφωθεί, εάν βρίσκεστε εκτός λειτουργίας ή με ο server δεν λειτουργεί.",
     "complete_the_form": "Απαντήστε τις ερωτήσεις...",
     "completed_feedbacks": "Απαντήσεις που έχουν υποβληθεί",
     "continue_the_form": "Συνεχίστε τη φόρμα",
     "feedback_is_not_open": "Το σχόλιο δεν είναι ανοιχτό",
+    "feedback_submitted_offline": "Αυτή η ανατροφοδότηση έχει αποθηκευτεί για να υποβληθεί αργότερα.",
     "feedbackclose": "Κλείσε το σχόλιο στις",
     "feedbackopen": "Άνοιξε το σχόλιο στις",
     "mapcourses": "Αντιστοίχηση σχόλιου σε μαθήματα",
diff --git a/www/addons/mod/feedback/lang/es.json b/www/addons/mod/feedback/lang/es.json
index b0d70fa540b..d6fc51f295d 100644
--- a/www/addons/mod/feedback/lang/es.json
+++ b/www/addons/mod/feedback/lang/es.json
@@ -3,10 +3,12 @@
     "anonymous": "Anónima",
     "anonymous_entries": "Respuestas anónimas",
     "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 caído.",
     "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",
+    "feedback_submitted_offline": "Esta retroalimentación ha sido guardada para enviarse más tarde.",
     "feedbackclose": "Permitir respuestas a",
     "feedbackopen": "Permitir respuestas de",
     "mapcourses": "Asignar encuesta a cursos",
diff --git a/www/addons/mod/feedback/lang/fr.json b/www/addons/mod/feedback/lang/fr.json
index e043077cb6a..902851b6a51 100644
--- a/www/addons/mod/feedback/lang/fr.json
+++ b/www/addons/mod/feedback/lang/fr.json
@@ -3,10 +3,12 @@
     "anonymous": "Anonyme",
     "anonymous_entries": "Réponses anonymes ({{$a}})",
     "average": "Moyenne",
+    "captchaofflinewarning": "Le feedback avec captcha ne peut pas être terminé s'il n'est pas configuré, en mode hors ligne ou si le serveur est arrêté.",
     "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",
+    "feedback_submitted_offline": "Ce feedback a été enregistré pour être remis plus tard.",
     "feedbackclose": "Permettre les réponses jusqu'au",
     "feedbackopen": "Permettre les réponses dès le",
     "mapcourses": "Associer le feedback aux cours",
diff --git a/www/addons/mod/feedback/lang/ja.json b/www/addons/mod/feedback/lang/ja.json
index 63503d3cc28..cf75cb496e1 100644
--- a/www/addons/mod/feedback/lang/ja.json
+++ b/www/addons/mod/feedback/lang/ja.json
@@ -3,10 +3,12 @@
     "anonymous": "匿名",
     "anonymous_entries": "匿名エントリ ({{$a}})",
     "average": "平均",
+    "captchaofflinewarning": "Capchaつきのフィードバックは、未設定の場合、オフラインモードの場合、サーバがダウンしている場合には完了できません。",
     "complete_the_form": "質問に回答する ...",
     "completed_feedbacks": "送信済み回答",
     "continue_the_form": "フォームを続ける",
     "feedback_is_not_open": "フィードバックは利用できません。",
+    "feedback_submitted_offline": "このフィードバックを、あとで提出するために保存しました。",
     "feedbackclose": "フィードバック終了日時",
     "feedbackopen": "フィードバック開始日時",
     "mapcourses": "フィードバックをコースにマップする",
diff --git a/www/addons/mod/feedback/lang/sr-cr.json b/www/addons/mod/feedback/lang/sr-cr.json
new file mode 100644
index 00000000000..703d835b603
--- /dev/null
+++ b/www/addons/mod/feedback/lang/sr-cr.json
@@ -0,0 +1,4 @@
+{
+    "captchaofflinewarning": "Упитник са Captcha елементом не може да буде завршен ако није конфигурисан, ако сте у офлајн режиму или ако је сервер искључен.",
+    "feedback_submitted_offline": "Овај упитник је сачуван како би касније био предат."
+}
\ No newline at end of file
diff --git a/www/addons/mod/feedback/lang/sr-lt.json b/www/addons/mod/feedback/lang/sr-lt.json
new file mode 100644
index 00000000000..ceea89255f5
--- /dev/null
+++ b/www/addons/mod/feedback/lang/sr-lt.json
@@ -0,0 +1,4 @@
+{
+    "captchaofflinewarning": "Upitnik sa Captcha elementom ne može da bude završen ako nije konfigurisan, ako ste u oflajn režimu ili ako je server isključen.",
+    "feedback_submitted_offline": "Ovaj upitnik je sačuvan kako bi kasnije bio predat."
+}
\ 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 c53b3a994ed..2337bed4841 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/he.json b/www/addons/mod/folder/lang/he.json
index 1c2ec27977b..55811600621 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/ja.json b/www/addons/mod/folder/lang/ja.json
index 39c4d9fcfbd..61980e500fc 100644
--- a/www/addons/mod/folder/lang/ja.json
+++ b/www/addons/mod/folder/lang/ja.json
@@ -1,3 +1,4 @@
 {
-    "emptyfilelist": "表示するファイルはありません。"
+    "emptyfilelist": "表示するファイルがありません。",
+    "errorwhilegettingfolder": "フォルダのデータを取得中にエラーが発生しました。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/sr-cr.json b/www/addons/mod/folder/lang/sr-cr.json
new file mode 100644
index 00000000000..a65fb8697c7
--- /dev/null
+++ b/www/addons/mod/folder/lang/sr-cr.json
@@ -0,0 +1,4 @@
+{
+    "emptyfilelist": "Нема датотека за приказ.",
+    "errorwhilegettingfolder": "Грешка приликом преузимања података за 'Директоријум'"
+}
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/sr-lt.json b/www/addons/mod/folder/lang/sr-lt.json
new file mode 100644
index 00000000000..9bfdf403335
--- /dev/null
+++ b/www/addons/mod/folder/lang/sr-lt.json
@@ -0,0 +1,4 @@
+{
+    "emptyfilelist": "Nema datoteka za prikaz.",
+    "errorwhilegettingfolder": "Greška prilikom preuzimanja podataka za 'Direktorijum'"
+}
\ 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 28ec6cd8e8a..1357444e2a4 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/forum/lang/da.json b/www/addons/mod/forum/lang/da.json
index 38dca8ad7f1..bdbd7c0a872 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.",
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/ja.json b/www/addons/mod/forum/lang/ja.json
index c6861af9156..27252c4d033 100644
--- a/www/addons/mod/forum/lang/ja.json
+++ b/www/addons/mod/forum/lang/ja.json
@@ -10,15 +10,21 @@
     "discussionsubscription": "ディスカッション購読",
     "edit": "編集",
     "erroremptymessage": "投稿メッセージを空にすることはできません。",
-    "erroremptysubject": "投稿件名を空にすることはできません。",
+    "erroremptysubject": "投稿の件名は必須です",
+    "errorgetforum": "フォーラムのデータ取得中にエラーが発生しました。",
+    "errorgetgroups": "グループ設定の取得中にエラーが発生しました。",
     "forumnodiscussionsyet": "このフォーラムにはまだディスカッショントピックがありません",
     "group": "グループ",
     "message": "メッセージ",
     "modeflatnewestfirst": "返信を新しいものからフラット表示する",
     "modeflatoldestfirst": "返信を古いものからフラット表示する",
     "modenested": "返信をネスト表示する",
+    "numdiscussions": "ディスカッション数 {{numdiscussions}}",
+    "numreplies": "返信数 {{numreplies}}",
     "posttoforum": "フォーラムに投稿する",
     "re": "Re:",
+    "refreshdiscussions": "ディスカッションをリフレッシュ",
+    "refreshposts": "ディスカッション投稿をリフレッシュ",
     "reply": "返信",
     "subject": "件名",
     "unread": "未読",
diff --git a/www/addons/mod/forum/lang/sr-cr.json b/www/addons/mod/forum/lang/sr-cr.json
new file mode 100644
index 00000000000..4d04219d752
--- /dev/null
+++ b/www/addons/mod/forum/lang/sr-cr.json
@@ -0,0 +1,11 @@
+{
+    "erroremptysubject": "Тема поруке не може бити празна",
+    "errorgetforum": "Грешка приликом преузимања података за 'Форум'",
+    "errorgetgroups": "Грешка приликом преузимања подешавања група.",
+    "forumnodiscussionsyet": "Још нема тема за дискусију на овом форуму.",
+    "group": "Група",
+    "numdiscussions": "{{numdiscussions}} дискусије/а",
+    "numreplies": "{{numreplies}} одговора",
+    "refreshdiscussions": "Освежи дискусије",
+    "refreshposts": "Освежи постове"
+}
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/sr-lt.json b/www/addons/mod/forum/lang/sr-lt.json
new file mode 100644
index 00000000000..27882a3847b
--- /dev/null
+++ b/www/addons/mod/forum/lang/sr-lt.json
@@ -0,0 +1,11 @@
+{
+    "erroremptysubject": "Tema poruke ne može biti prazna",
+    "errorgetforum": "Greška prilikom preuzimanja podataka za 'Forum'",
+    "errorgetgroups": "Greška prilikom preuzimanja podešavanja grupa.",
+    "forumnodiscussionsyet": "Greška prilikom preuzimanja podešavanja grupa.",
+    "group": "Grupa",
+    "numdiscussions": "{{numdiscussions}} diskusije/a",
+    "numreplies": "{{numreplies}} odgovora",
+    "refreshdiscussions": "Osveži diskusije",
+    "refreshposts": "Osveži postove"
+}
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/da.json b/www/addons/mod/glossary/lang/da.json
index bd0f0d93d2e..40b07cf0bb0 100644
--- a/www/addons/mod/glossary/lang/da.json
+++ b/www/addons/mod/glossary/lang/da.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Tilføj badge til besked",
-    "browsemode": "Forhåndsvisning",
+    "browsemode": "Skim indlæg",
     "byalphabet": "Alfabetisk",
     "byauthor": "Grupper efter forfatter",
     "bynewestfirst": "Nyeste først",
diff --git a/www/addons/mod/glossary/lang/el.json b/www/addons/mod/glossary/lang/el.json
index c79bed26793..0bfce509423 100644
--- a/www/addons/mod/glossary/lang/el.json
+++ b/www/addons/mod/glossary/lang/el.json
@@ -3,11 +3,14 @@
     "browsemode": "Περιήγηση στις καταχωρήσεις",
     "byalphabet": "Αλφαβητικά",
     "byauthor": "Ομαδοποίηση ανά συγγραφέα",
+    "bycategory": "Ομαδοποίηση ανά κατηγορία",
     "bynewestfirst": "Νεότερα πρώτα",
     "byrecentlyupdated": "Ανανεώθηκαν πρόσφατα",
     "bysearch": "Αναζήτηση",
+    "cannoteditentry": "Δεν είναι δυνατή η επεξεργασία της καταχώρισης",
     "casesensitive": "Χρήση κανονικών εκφράσεων",
     "categories": "Κατηγορίες μαθημάτων",
+    "entriestobesynced": "Entries που πρέπει να συγχρονιστούν",
     "entrypendingapproval": "Εκκρεμεί η έγκριση για αυτή την καταχώρηση.",
     "errorloadingentries": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση των καταχωρήσεων.",
     "errorloadingentry": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση της καταχώρησης.",
diff --git a/www/addons/mod/glossary/lang/es.json b/www/addons/mod/glossary/lang/es.json
index 02d8e633d5c..4089c74aa49 100644
--- a/www/addons/mod/glossary/lang/es.json
+++ b/www/addons/mod/glossary/lang/es.json
@@ -3,11 +3,14 @@
     "browsemode": "Navegar por las entradas",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupado por autor",
+    "bycategory": "Agrupar por categoría",
     "bynewestfirst": "El más reciente primero",
     "byrecentlyupdated": "Actualizado recientemente",
     "bysearch": "Busca",
+    "cannoteditentry": "No se puede editar la entrada",
     "casesensitive": "Usar expresiones regulares",
     "categories": "Categorías",
+    "entriestobesynced": "Entradas pendientes de ser sincronizadas",
     "entrypendingapproval": "Esta entrada está pendiente de aprobación.",
     "errorloadingentries": "Ha ocurrido un error cargando las entradas.",
     "errorloadingentry": "Ha ocurrido un error cargando la entrada.",
diff --git a/www/addons/mod/glossary/lang/ja.json b/www/addons/mod/glossary/lang/ja.json
index b518d805074..395ba50cc3b 100644
--- a/www/addons/mod/glossary/lang/ja.json
+++ b/www/addons/mod/glossary/lang/ja.json
@@ -1,6 +1,20 @@
 {
     "attachment": "添付",
-    "browsemode": "プレビューモード",
+    "browsemode": "エントリをブラウズ",
+    "byalphabet": "アルファベット順",
+    "byauthor": "著者でグループ",
+    "bycategory": "カテゴリでグループ",
+    "bynewestfirst": "新規順",
+    "byrecentlyupdated": "最近の更新",
+    "bysearch": "検索",
+    "cannoteditentry": "エントリの編集ができませんでした",
     "casesensitive": "正規表現を使用する",
-    "categories": "コースカテゴリ"
+    "categories": "コースカテゴリ",
+    "entriestobesynced": "エントリの同期ができませんでした",
+    "entrypendingapproval": "このエントリは承認待ちです。",
+    "errorloadingentries": "エントリ読み込み中にエラーが発生しました。",
+    "errorloadingentry": "エントリ読み込み中にエラーが発生しました。",
+    "errorloadingglossary": "用語集を読み込み中にエラーが発生しました。",
+    "noentriesfound": "エントリが見つかりませんでした。",
+    "searchquery": "検索内容"
 }
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/sr-cr.json b/www/addons/mod/glossary/lang/sr-cr.json
new file mode 100644
index 00000000000..3b6a512513a
--- /dev/null
+++ b/www/addons/mod/glossary/lang/sr-cr.json
@@ -0,0 +1,17 @@
+{
+    "browsemode": "Прегледај појмове",
+    "byalphabet": "Азбучним редом",
+    "byauthor": "Групиши по аутору",
+    "bycategory": "Групиши по категорији",
+    "bynewestfirst": "Најновији прво",
+    "byrecentlyupdated": "Недавно ажурирани",
+    "bysearch": "Претражи",
+    "cannoteditentry": "Не можете да уређујете појам",
+    "entriestobesynced": "Појмови за синхронизацију",
+    "entrypendingapproval": "Овај појам чека одобрење.",
+    "errorloadingentries": "Дошло је до грешке приликом учитавања појмова.",
+    "errorloadingentry": "Дошло је до грешке приликом учитавања појма.",
+    "errorloadingglossary": "Дошло је до грешке приликом учитавања речника.",
+    "noentriesfound": "Није пронађен ниједан појам.",
+    "searchquery": "Упит за претрагу"
+}
\ No newline at end of file
diff --git a/www/addons/mod/glossary/lang/sr-lt.json b/www/addons/mod/glossary/lang/sr-lt.json
new file mode 100644
index 00000000000..fe27335b225
--- /dev/null
+++ b/www/addons/mod/glossary/lang/sr-lt.json
@@ -0,0 +1,17 @@
+{
+    "browsemode": "Pregledaj pojmove",
+    "byalphabet": "Abecednim redom",
+    "byauthor": "Grupiši po autoru",
+    "bycategory": "Grupiši po kategoriji",
+    "bynewestfirst": "Najnoviji prvo",
+    "byrecentlyupdated": "Nedavno ažurirani",
+    "bysearch": "Pretraži",
+    "cannoteditentry": "Ne možete da uređujete pojam",
+    "entriestobesynced": "Pojmovi za sinhronizaciju",
+    "entrypendingapproval": "Ovaj pojam čeka odobrenje.",
+    "errorloadingentries": "Došlo je do greške prilikom učitavanja pojmova.",
+    "errorloadingentry": "Došlo je do greške prilikom učitavanja pojma.",
+    "errorloadingglossary": "Došlo je do greške prilikom učitavanja rečnika.",
+    "noentriesfound": "Nije pronađen nijedan pojam.",
+    "searchquery": "Upit za pretragu"
+}
\ 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 5452c0da423..f3e1eeb10fc 100644
--- a/www/addons/mod/glossary/lang/uk.json
+++ b/www/addons/mod/glossary/lang/uk.json
@@ -5,9 +5,9 @@
     "byauthor": "Групувати за автором",
     "bycategory": "Групувати за категорією",
     "bynewestfirst": "Новіші перші",
-    "byrecentlyupdated": "Недавно оновлені",
+    "byrecentlyupdated": "Нещодавно оновлені",
     "bysearch": "Пошук",
-    "cannoteditentry": "Неможливо задагувати запис",
+    "cannoteditentry": "Неможливо редагувати запис",
     "casesensitive": "Використовувати регулярні вирази",
     "categories": "Категорії курсів",
     "entriestobesynced": "Записи будуть синхронізовані",
diff --git a/www/addons/mod/imscp/lang/ja.json b/www/addons/mod/imscp/lang/ja.json
index 66c407ae43e..5bd979018e4 100644
--- a/www/addons/mod/imscp/lang/ja.json
+++ b/www/addons/mod/imscp/lang/ja.json
@@ -1,3 +1,4 @@
 {
-    "deploymenterror": "コンテンツパッケージエラー!"
+    "deploymenterror": "コンテンツパッケージエラー!",
+    "showmoduledescription": "説明の表示"
 }
\ No newline at end of file
diff --git a/www/addons/mod/imscp/lang/sr-cr.json b/www/addons/mod/imscp/lang/sr-cr.json
new file mode 100644
index 00000000000..939547b3b5f
--- /dev/null
+++ b/www/addons/mod/imscp/lang/sr-cr.json
@@ -0,0 +1,3 @@
+{
+    "showmoduledescription": "Прикажи опис"
+}
\ No newline at end of file
diff --git a/www/addons/mod/imscp/lang/sr-lt.json b/www/addons/mod/imscp/lang/sr-lt.json
new file mode 100644
index 00000000000..8519e32307b
--- /dev/null
+++ b/www/addons/mod/imscp/lang/sr-lt.json
@@ -0,0 +1,3 @@
+{
+    "showmoduledescription": "Prikaži opis"
+}
\ 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 232aff3b2bf..7f0814d0381 100644
--- a/www/addons/mod/label/lang/he.json
+++ b/www/addons/mod/label/lang/he.json
@@ -1,3 +1,3 @@
 {
-    "label": "תווית לשאלה מותנית (באנגלית)"
+    "label": "תווית"
 }
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/sr-cr.json b/www/addons/mod/label/lang/sr-cr.json
new file mode 100644
index 00000000000..ee0697520d2
--- /dev/null
+++ b/www/addons/mod/label/lang/sr-cr.json
@@ -0,0 +1,3 @@
+{
+    "label": "Натпис"
+}
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/sr-lt.json b/www/addons/mod/label/lang/sr-lt.json
new file mode 100644
index 00000000000..c2a3f10a06e
--- /dev/null
+++ b/www/addons/mod/label/lang/sr-lt.json
@@ -0,0 +1,3 @@
+{
+    "label": "Natpis"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/el.json b/www/addons/mod/lesson/lang/el.json
index d2c0aa91741..bbb63a55b7d 100644
--- a/www/addons/mod/lesson/lang/el.json
+++ b/www/addons/mod/lesson/lang/el.json
@@ -19,6 +19,8 @@
     "emptypassword": "Ο κωδικός πρόσβασης δεν μπορεί να είναι κενός",
     "enterpassword": "Παρακαλώ εισάγετε τον κωδικό:",
     "eolstudentoutoftimenoanswers": "Δεν απαντήσατε καμία ερώτηση. Πήρατε 0 σε αυτή την ενότητα.",
+    "errorreviewretakenotlast": "Αυτή η προσπάθεια δεν μπορεί πλέον να αναθεωρηθεί επειδή μια άλλη προσπάθεια έχει ήδη ολοκληρωθεί.",
+    "finishretakeoffline": "Αυτή η προσπάθεια έχει ολοκληρωθεί εκτός σύνδεσης.",
     "firstwrong": "Δυστυχώς δεν μπορείτε να κερδίσετε αυτό το βαθμό γιατί η απάντησή σας ήταν λάθος. Θέλετε να συνεχίσετε να μαντεύετε, μόνο για τη χαρά της μάθησης (δεν θα λάβετε το βαθμολογικό μπόνους);",
     "grade": "Βαθμός",
     "highscore": "Υψηλός βαθμός",
@@ -49,6 +51,9 @@
     "rawgrade": "Βαθμός χωρίς επεξεργασία",
     "reports": "Αναφορές",
     "response": "Ανταπόκριση",
+    "retakefinishedinsync": "Μια προσπάθεια εκτός σύνδεσης συγχρονίστηκε. Θέλετε να την αναθεωρήσετε;",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
     "review": "Αναθεώρηση",
     "reviewlesson": "Αναθεώρηση ενότητας",
     "reviewquestionback": "Ναι, θα ήθελα να δοκιμάσω πάλι",
@@ -63,6 +68,7 @@
     "timeremaining": "Υπολοιπόμενος χρόνος",
     "timetaken": "Χρόνος που χρειάστηκε",
     "unseenpageinbranch": "Ερώτηση μέσα σε διακλάδωση που δεν εμφανίσθηκε",
+    "warningretakefinished": "Η προσπάθεια ολοκληρώθηκε στον ιστότοπο.",
     "welldone": "Μπράβο!",
     "youhaveseen": "Έχετε δει περισσότερες από μία σελίδες αυτής της ενότητας.<br />Θέλετε να ξεκινήσετε από την τελευταία σελίδα που είδατε;",
     "youranswer": "Η απάντησή σας",
diff --git a/www/addons/mod/lesson/lang/es.json b/www/addons/mod/lesson/lang/es.json
index 1b960b84214..2679c6f3f4c 100644
--- a/www/addons/mod/lesson/lang/es.json
+++ b/www/addons/mod/lesson/lang/es.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 ya que se ha terminado otro intento.",
     "finish": "Terminado",
+    "finishretakeoffline": "Este intento se ha terminado en fuera-de-línea.",
     "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",
@@ -55,6 +57,9 @@
     "rawgrade": "Calificación en bruto",
     "reports": "Informes",
     "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 se terminó 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/fr.json b/www/addons/mod/lesson/lang/fr.json
index 2b8652437b9..4c51fa118a7 100644
--- a/www/addons/mod/lesson/lang/fr.json
+++ b/www/addons/mod/lesson/lang/fr.json
@@ -21,7 +21,9 @@
     "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.",
+    "errorreviewretakenotlast": "Cette tentative ne peut plus être relue, car une autre tentative a été terminée.",
     "finish": "Terminer",
+    "finishretakeoffline": "Cette tentative a été terminée en mode hors ligne.",
     "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",
@@ -55,6 +57,9 @@
     "rawgrade": "Note brute",
     "reports": "Rapports",
     "response": "Feedback",
+    "retakefinishedinsync": "Une tentative hors ligne a été synchronisée. Voulez-vous la relire ?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
     "review": "Relecture",
     "reviewlesson": "Revoir la leçon",
     "reviewquestionback": "Oui, j'aimerais essayer à nouveau",
@@ -69,6 +74,7 @@
     "timeremaining": "Durée restante",
     "timetaken": "Durée utilisée",
     "unseenpageinbranch": "Question non vue au sein d'une page de contenu",
+    "warningretakefinished": "Cette tentative a été terminée sur la plateforme.",
     "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",
diff --git a/www/addons/mod/lesson/lang/ja.json b/www/addons/mod/lesson/lang/ja.json
index 18e3ade173c..14a3926d347 100644
--- a/www/addons/mod/lesson/lang/ja.json
+++ b/www/addons/mod/lesson/lang/ja.json
@@ -21,7 +21,9 @@
     "emptypassword": "パスワードは空白にできません。",
     "enterpassword": "パスワードを入力してください:",
     "eolstudentoutoftimenoanswers": "あなたはどの問題にも解答していません。このレッスンのあなたの評点は0点です。",
+    "errorreviewretakenotlast": "この回答は、別の回答が完了しているため評価できません。",
     "finish": "終了",
+    "finishretakeoffline": "この回答はオフライン状態で完了しました。",
     "firstwrong": "あなたの解答は正しくありません。問題を再度受験しますか?  (今から問題に正しく解答した場合、あなたの最終評点には加算されません)",
     "gotoendoflesson": "レッスンの最後に移動する",
     "grade": "評点",
@@ -55,6 +57,9 @@
     "rawgrade": "素点",
     "reports": "レポート",
     "response": "返答",
+    "retakefinishedinsync": "オフラインの回答が同期されました。評価しますか？",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
     "review": "レビュー",
     "reviewlesson": "レッスンをレビューする",
     "reviewquestionback": "はい、もう一度受験します",
@@ -69,6 +74,7 @@
     "timeremaining": "残り時間",
     "timetaken": "経過時間",
     "unseenpageinbranch": "コンテンツページ内の未閲覧の問題",
+    "warningretakefinished": "回答はサイト内で完了しました。",
     "welldone": "よくできました!",
     "youhaveseen": "あなたはすでにこのレッスンを2ページ以上表示しました。<br />あなたが表示した最後のページから始めますか?",
     "youranswer": "あなたの答え",
diff --git a/www/addons/mod/lesson/lang/sr-cr.json b/www/addons/mod/lesson/lang/sr-cr.json
new file mode 100644
index 00000000000..db28c42b19e
--- /dev/null
+++ b/www/addons/mod/lesson/lang/sr-cr.json
@@ -0,0 +1,8 @@
+{
+    "errorreviewretakenotlast": "Ова покушај не може више бити прегледан зато што је завршен други покушај.",
+    "finishretakeoffline": "Овај покушај је завршен у офлајн режиму.",
+    "retakefinishedinsync": "Офлајн покушај је синхронизован. Да ли желите да га прегледате?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
+    "warningretakefinished": "Покушај је завршен на сајту."
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/sr-lt.json b/www/addons/mod/lesson/lang/sr-lt.json
new file mode 100644
index 00000000000..da28ea0cf44
--- /dev/null
+++ b/www/addons/mod/lesson/lang/sr-lt.json
@@ -0,0 +1,8 @@
+{
+    "errorreviewretakenotlast": "Ova pokušaj ne može više biti pregledan zato što je završen drugi pokušaj.",
+    "finishretakeoffline": "Ovaj pokušaj je završen u oflajn režimu.",
+    "retakefinishedinsync": "Oflajn pokušaj je sinhronizovan. Da li želite da ga pregledate?",
+    "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
+    "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
+    "warningretakefinished": "Pokušaj je završen na sajtu."
+}
\ No newline at end of file
diff --git a/www/addons/mod/lesson/lang/uk.json b/www/addons/mod/lesson/lang/uk.json
index e6a5762d90d..43f68800251 100644
--- a/www/addons/mod/lesson/lang/uk.json
+++ b/www/addons/mod/lesson/lang/uk.json
@@ -21,7 +21,7 @@
     "emptypassword": "Пароль не може бути порожнім",
     "enterpassword": "Будь ласка, введіть пароль:",
     "eolstudentoutoftimenoanswers": "Ви не дали відповіді на жодне запитання. Ви отримуєте нуль за цей урок.",
-    "errorreviewretakenotlast": "Ця спроба не може бути переглянута більше, тому що ще одна спроба була закінчена.",
+    "errorreviewretakenotlast": "Ця спроба не може бути переглянута, тому що ще одна спроба була закінчена.",
     "finish": "Завершити",
     "finishretakeoffline": "Ця спроба була закінчена в автономному режимі.",
     "firstwrong": "На жаль, за неправильної відповіді Ви не можете отримати бал. Ви хочете продовжити вгадування в цілях навчання (але не в цілях отримання балів)?",
diff --git a/www/addons/mod/lti/lang/ja.json b/www/addons/mod/lti/lang/ja.json
new file mode 100644
index 00000000000..b3e5bba2e60
--- /dev/null
+++ b/www/addons/mod/lti/lang/ja.json
@@ -0,0 +1,5 @@
+{
+    "errorgetlti": "モジュールデータ取得中にエラーが発生しました。",
+    "errorinvalidlaunchurl": "起動するURLが不正です。",
+    "launchactivity": "アクティビティを起動"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lti/lang/sr-cr.json b/www/addons/mod/lti/lang/sr-cr.json
new file mode 100644
index 00000000000..6f616981561
--- /dev/null
+++ b/www/addons/mod/lti/lang/sr-cr.json
@@ -0,0 +1,5 @@
+{
+    "errorgetlti": "Грешка приликом преузимања података модула.",
+    "errorinvalidlaunchurl": "Иницијална URL адреса није исправна.",
+    "launchactivity": "Покрени активност"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lti/lang/sr-lt.json b/www/addons/mod/lti/lang/sr-lt.json
new file mode 100644
index 00000000000..0feaaf89a14
--- /dev/null
+++ b/www/addons/mod/lti/lang/sr-lt.json
@@ -0,0 +1,5 @@
+{
+    "errorgetlti": "Greška prilikom preuzimanja podataka modula.",
+    "errorinvalidlaunchurl": "Inicijalna URL adresa nije ispravna.",
+    "launchactivity": "Pokreni aktivnost"
+}
\ No newline at end of file
diff --git a/www/addons/mod/lti/lang/uk.json b/www/addons/mod/lti/lang/uk.json
index cc542981fd4..8569afbe6c1 100644
--- a/www/addons/mod/lti/lang/uk.json
+++ b/www/addons/mod/lti/lang/uk.json
@@ -1,5 +1,5 @@
 {
     "errorgetlti": "Помилка при отриманні даних модуля.",
-    "errorinvalidlaunchurl": "Запуск URL не є дійсним.",
+    "errorinvalidlaunchurl": "Цей URL не є дійсним.",
     "launchactivity": "Запуск діяльності"
 }
\ No newline at end of file
diff --git a/www/addons/mod/page/lang/ja.json b/www/addons/mod/page/lang/ja.json
index 0637a088a01..4084af15212 100644
--- a/www/addons/mod/page/lang/ja.json
+++ b/www/addons/mod/page/lang/ja.json
@@ -1 +1,3 @@
-[]
\ No newline at end of file
+{
+    "errorwhileloadingthepage": "ページ内容を読み込み中にエラーが発生しました。"
+}
\ No newline at end of file
diff --git a/www/addons/mod/page/lang/sr-cr.json b/www/addons/mod/page/lang/sr-cr.json
new file mode 100644
index 00000000000..bb2b30f0d8b
--- /dev/null
+++ b/www/addons/mod/page/lang/sr-cr.json
@@ -0,0 +1,3 @@
+{
+    "errorwhileloadingthepage": "Грешка приликом учитавања садржаја странице."
+}
\ No newline at end of file
diff --git a/www/addons/mod/page/lang/sr-lt.json b/www/addons/mod/page/lang/sr-lt.json
new file mode 100644
index 00000000000..683b241e992
--- /dev/null
+++ b/www/addons/mod/page/lang/sr-lt.json
@@ -0,0 +1,3 @@
+{
+    "errorwhileloadingthepage": "Greška prilikom učitavanja sadržaja stranice."
+}
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/ja.json b/www/addons/mod/quiz/lang/ja.json
index f7b4d3d133f..2fb91503783 100644
--- a/www/addons/mod/quiz/lang/ja.json
+++ b/www/addons/mod/quiz/lang/ja.json
@@ -4,26 +4,43 @@
     "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": "質問の読み込み中にエラーが発生しました。Webブラウザからこのクイズに回答してください。",
+    "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}}",
@@ -56,5 +73,8 @@
     "summaryofattempts": "あなたの前回の受験概要",
     "timeleft": "残り時間",
     "timetaken": "所要時間",
+    "warningattemptfinished": "オフラインの回答は、サイト上で完了していた、もしくは見当たらなかったため廃棄されました。",
+    "warningdatadiscarded": "質問文がオンラインで変更されたため、一部のオフライン回答が廃棄されました。",
+    "warningdatadiscardedfromfinished": "オフライン回答が廃棄されたため、回答が完了していません。回答内容を確認し、回答を再度提出してください。",
     "yourfinalgradeis": "あなたの小テスト最終評点は {{$a}} です。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/sr-cr.json b/www/addons/mod/quiz/lang/sr-cr.json
new file mode 100644
index 00000000000..f41594f4ad8
--- /dev/null
+++ b/www/addons/mod/quiz/lang/sr-cr.json
@@ -0,0 +1,22 @@
+{
+    "cannotsubmitquizdueto": "Овај покушај решавања теста не може да буде предат због следећих разлога:",
+    "confirmcontinueoffline": "Овај покушај није синхронизован од {{$a}}. Ако сте у међувремену овај покушај наставили  на неком другом уређају, постоји могућност да сте изгубили податке.",
+    "confirmleavequizonerror": "Дошло је до грешке приликом покушаја да се сачувају одговори. Да ли сте сигурни да желите да напустите тест?",
+    "errorbehaviournotsupported": "Овај тест не можете решавати у апликацији зато што она не подржава понашање питања:",
+    "errordownloading": "Грешка приликом преузимања неопходних података.",
+    "errorgetattempt": "Грешка приликом преузимања података о покушају решавања теста.",
+    "errorgetquestions": "Грешка приликом преузимања питања.",
+    "errorgetquiz": "Грешка приликом преузимања података о тесту.",
+    "errorparsequestions": "Дошло је до грешке приликом учитавања питања. Молимо, покушајте да решите овај тест у веб читачу.",
+    "errorquestionsnotsupported": "Овај тест се не може решавати у апликацији зато што садржи питања које апликација не подржава:",
+    "errorrulesnotsupported": "Овај тест се не може решавати у апликацији зато што садржи правила за приступ које апликација не подржава:",
+    "errorsaveattempt": "Дошло је до грешке приликом снимања података о покушају решавања теста.",
+    "errorsyncquiz": "Дошло је до грешке приликом синхронизације. Молимо, покушајте поново.",
+    "errorsyncquizblocked": "Овај тест сада не може бити синхронизован због другог процеса који је тренутно у току. Молимо, покушајте поново касније. Ако и даље будете имали проблема, покушајте да  покренете апликацију испочетка.",
+    "finishnotsynced": "Тест је завршен, али није синхронизован",
+    "hasdatatosync": "Овај тест има офлајн податке које треба синхронизовати.",
+    "opentoc": "Отвори навигациони мени.",
+    "warningattemptfinished": "Офлајн покушај је одбачен зато што је или завршен на сајту или није пронађен.",
+    "warningdatadiscarded": "Неки офлајн одговори су одбачени зато што су питања измењена онлајн.",
+    "warningdatadiscardedfromfinished": "Покушај решавања теста је није завршен зато што су неки офлајн одговори одбачени. Прегледајте своје одговоре, а затим поново пошаљите свој покушај."
+}
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/sr-lt.json b/www/addons/mod/quiz/lang/sr-lt.json
new file mode 100644
index 00000000000..a8ac15c303b
--- /dev/null
+++ b/www/addons/mod/quiz/lang/sr-lt.json
@@ -0,0 +1,22 @@
+{
+    "cannotsubmitquizdueto": "Ovaj pokušaj rešavanja testa ne može da bude predat zbog sledećih razloga:",
+    "confirmcontinueoffline": "Ovaj pokušaj nije sinhronizovan od {{$a}}. Ako ste u međuvremenu ovaj pokušaj nastavili  na nekom drugom uređaju, postoji mogućnost da ste izgubili podatke.",
+    "confirmleavequizonerror": "Došlo je do greške prilikom pokušaja da se sačuvaju odgovori. Da li ste sigurni da želite da napustite test?",
+    "errorbehaviournotsupported": "Ovaj test ne možete rešavati u aplikaciji zato što ona ne podržava ponašanje pitanja:",
+    "errordownloading": "Greška prilikom preuzimanja neophodnih podataka.",
+    "errorgetattempt": "Greška prilikom preuzimanja podataka o pokušaju rešavanja testa.",
+    "errorgetquestions": "Greška prilikom preuzimanja pitanja.",
+    "errorgetquiz": "Greška prilikom preuzimanja podataka o testu.",
+    "errorparsequestions": "Došlo je do greške prilikom učitavanja pitanja. Molimo, pokušajte da rešite ovaj test u veb čitaču.",
+    "errorquestionsnotsupported": "Ovaj test se ne može rešavati u aplikaciji zato što sadrži pitanja koje aplikacija ne podržava:",
+    "errorrulesnotsupported": "Ovaj test se ne može rešavati u aplikaciji zato što sadrži pravila za pristup koje aplikacija ne podržava:",
+    "errorsaveattempt": "Došlo je do greške prilikom snimanja podataka o pokušaju rešavanja testa.",
+    "errorsyncquiz": "Došlo je do greške prilikom sinhronizacije. Molimo, pokušajte ponovo.",
+    "errorsyncquizblocked": "Ovaj test sada ne može biti sinhronizovan zbog drugog procesa koji je trenutno u toku. Molimo, pokušajte ponovo kasnije. Ako i dalje budete imali problema, pokušajte da  pokrenete aplikaciju ispočetka.",
+    "finishnotsynced": "Test je završen, ali nije sinhronizovan",
+    "hasdatatosync": "Ovaj test ima oflajn podatke koje treba sinhronizovati.",
+    "opentoc": "Otvori navigacioni meni.",
+    "warningattemptfinished": "Oflajn pokušaj je odbačen zato što je ili završen na sajtu ili nije pronađen.",
+    "warningdatadiscarded": "Neki oflajn odgovori su odbačeni zato što su pitanja izmenjena onlajn.",
+    "warningdatadiscardedfromfinished": "Pokušaj rešavanja testa je nije završen zato što su neki oflajn odgovori odbačeni. Pregledajte svoje odgovore, a zatim ponovo pošaljite svoj pokušaj."
+}
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/uk.json b/www/addons/mod/quiz/lang/uk.json
index 3c6c7b28f67..33bfc0688f7 100644
--- a/www/addons/mod/quiz/lang/uk.json
+++ b/www/addons/mod/quiz/lang/uk.json
@@ -8,24 +8,24 @@
     "comment": "Коментар",
     "completedon": "Завершено",
     "confirmclose": "Ви вибрали закінчення тесту (даної спроби). Якщо ви це підтверджуєте, Ви більше не зможете змінювати ваші відповіді.",
-    "confirmcontinueoffline": "Ця спроба не була синхронізована, {{$a}}. Якщо ви продовжили цю спробу в іншому пристрої з тих пір, ви можете втратити дані.",
+    "confirmcontinueoffline": "Ця спроба не була синхронізована, {{$a}}. Якщо ви продовжили цю спробу на іншому пристрої, ви можете втратити дані.",
     "confirmleavequizonerror": "При збереженні відповідей сталася помилка. Ви впевнені, що хочете залишити тест?",
     "confirmstart": "Цей тест має обмеження в часі {{$a}}. Час почне відраховуватися з моменту, коли ви починаєте вашу спробу, і ви повинні будете закінчити вашу спробу допоки не спливе термін. Ви впевнені, що хочете почати зараз?",
     "confirmstartheader": "Тест з обмеженням в часі",
     "connectionerror": "Мережеве підключення втрачено. (Автозбереження не вдалося).\n\nЗапишіть відповіді введені на цій сторінці за останні кілька хвилин, потім спробуйте знову підключити.\n\nПісля того, як з'єднання буде відновлено, ваші відповіді мають бути збережені і це повідомлення зникне.",
     "continueattemptquiz": "Продовжити останню спробу",
     "continuepreview": "Продовжити останній перегляд",
-    "errorbehaviournotsupported": "Цей тест не може бути зроблений в додатку, тому що поведінка не підтримуються додатком:",
+    "errorbehaviournotsupported": "Цей тест не може бути зроблений в додатку, тому що не підтримується додатком:",
     "errordownloading": "Помилка при завантаженні потрібних даних.",
     "errorgetattempt": "Помилка при отриманні даних спроби.",
     "errorgetquestions": "Помилка отримання питань.",
     "errorgetquiz": "Помилка при отриманні даних тесту.",
-    "errorparsequestions": "Сталася помилка під час читання питання. Будь ласка, спроба цей тест в веб-браузері.",
+    "errorparsequestions": "Сталася помилка під час читання питання. Будь ласка, спробуйте цей тест в веб-браузері.",
     "errorquestionsnotsupported": "Цей тест не може бути вирішених в додатку, оскільки він може містити питання, які не підтримуються додатком:",
-    "errorrulesnotsupported": "Цей тест не може бути зроблений в додатку, оскільки він має правило доступу, що не підтримується додатком:",
+    "errorrulesnotsupported": "Цей тест не може бути зроблений в додатку, оскільки він має правила доступу, що не підтримується додатком:",
     "errorsaveattempt": "При збереженні даних спроби сталася помилка.",
     "errorsyncquiz": "Під час синхронізації сталася помилка. Будь ласка спробуйте ще раз.",
-    "errorsyncquizblocked": "Цей тест не може бути синхронізований прямо зараз через триваючий процес. Будь-ласка спробуйте пізніше. Якщо питання залишається невирішеним, спробуйте перезапустити програму.",
+    "errorsyncquizblocked": "Цей тест не може бути синхронізований прямо зараз через навантаження на сервер. Будь-ласка спробуйте пізніше. Якщо питання залишається невирішеним, спробуйте перезапустити програму.",
     "feedback": "Відгук",
     "finishattemptdots": "Завершити спробу...",
     "finishnotsynced": "Готово, але не синхронізовано",
diff --git a/www/addons/mod/resource/lang/ja.json b/www/addons/mod/resource/lang/ja.json
index 0637a088a01..8a0d7d9a02d 100644
--- a/www/addons/mod/resource/lang/ja.json
+++ b/www/addons/mod/resource/lang/ja.json
@@ -1 +1,4 @@
-[]
\ No newline at end of file
+{
+    "errorwhileloadingthecontent": "内容を読み込み中にエラーが発生しました。",
+    "openthefile": "ファイルを開く"
+}
\ No newline at end of file
diff --git a/www/addons/mod/resource/lang/sr-cr.json b/www/addons/mod/resource/lang/sr-cr.json
new file mode 100644
index 00000000000..260ac7e4935
--- /dev/null
+++ b/www/addons/mod/resource/lang/sr-cr.json
@@ -0,0 +1,4 @@
+{
+    "errorwhileloadingthecontent": "Грешка приликом учитавања садржаја.",
+    "openthefile": "Отвори датотеку"
+}
\ No newline at end of file
diff --git a/www/addons/mod/resource/lang/sr-lt.json b/www/addons/mod/resource/lang/sr-lt.json
new file mode 100644
index 00000000000..8120d454e8a
--- /dev/null
+++ b/www/addons/mod/resource/lang/sr-lt.json
@@ -0,0 +1,4 @@
+{
+    "errorwhileloadingthecontent": "Greška prilikom učitavanja sadržaja.",
+    "openthefile": "Otvori datoteku"
+}
\ 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..e5fbfbe4a46 100644
--- a/www/addons/mod/scorm/lang/el.json
+++ b/www/addons/mod/scorm/lang/el.json
@@ -46,5 +46,6 @@
     "scormstatusnotdownloaded": "Αυτό το SCORM δεν έχει κατέβει. Θα κατέβει αυτόματα όταν το ανοίξετε.",
     "scormstatusoutdated": "Αυτό το SCORM έχει τροποποιηθεί από την τελευταία λήψη. Θα κατέβει αυτόματα όταν το ανοίξετε.",
     "suspended": "Αναστέλλεται",
+    "warningofflinedatadeleted": "Ορισμένα δεδομένα εκτός σύνδεσης της προσπάθειας {{number}} διαγράφηκαν επειδή δεν ήταν δυνατή η δημιουργία νέας προσπάθειας.",
     "warningsynconlineincomplete": "Κάποιες προσπάθειες δεν μπόρεσαν να συγχρονιστούν με το site διότι η τελευταία online προσπάθεια δεν έχει ολοκληρωθεί. Παρακαλώ τελειώστε την 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..031b2f60a58 100644
--- a/www/addons/mod/scorm/lang/ja.json
+++ b/www/addons/mod/scorm/lang/ja.json
@@ -6,9 +6,19 @@
     "browse": "プレビュー",
     "browsed": "閲覧済み",
     "browsemode": "プレビューモード",
+    "cannotcalculategrade": "評定が計算できませんでした。",
     "completed": "完了",
     "contents": "コンテンツ",
+    "dataattemptshown": "このデータは回答番号 {{number}} に該当します。",
     "enter": "問題に入る",
+    "errorcreateofflineattempt": "新たなオフライン回答の作成中にエラーが発生しました。再度実行してください。",
+    "errordownloadscorm": "SCORM \"{{name}}\" のダウンロード中にエラーが発生しました。",
+    "errorgetscorm": "SCORMデータの取得中にエラーが発生しました。",
+    "errorinvalidversion": "申し訳ありません。アプリケーションはSCORM 1.2のみをサポートしています。",
+    "errornotdownloadable": "あなたのMoodleサイトではSCORMパッケージのダウンロードができません。Moodleサイト管理者に連絡してください。",
+    "errornovalidsco": "このSCORMはロードに必要な表示できるSCOがありません。",
+    "errorpackagefile": "申し訳ありません。アプリケーションはZIPパッケージのみをサポートしています。",
+    "errorsyncscorm": "同期中にエラーが発生しました。再度実行してください。",
     "exceededmaxattempts": "あなたは最大受験回数に達しました。",
     "failed": "不合格",
     "firstattempt": "最初の受験",
@@ -28,8 +38,14 @@
     "noattemptsmade": "あなたの受験回数",
     "normal": "ノーマル",
     "notattempted": "未受験",
+    "offlineattemptnote": "この回答には動悸されなかったデータがあります。",
+    "offlineattemptovermax": "受験可能回数を超えたため、この回答を送信できません。",
     "organizations": "組織",
     "passed": "合格",
     "reviewmode": "レビューモード",
-    "suspended": "一時停止"
+    "scormstatusnotdownloaded": "このSCORMはダウンロードされていません。これを開くときに、自動的にダウンロードされます。",
+    "scormstatusoutdated": "このSCORMは最後にダウンロードされた後に更新されています。開くときに、自動的に新しいものがダウンロードされます。",
+    "suspended": "一時停止",
+    "warningofflinedatadeleted": "回答番号 {{number}} を新しい回答として作成することができなかったため、オフラインデータの一部が消去されました。",
+    "warningsynconlineincomplete": "最終のオンライン回答が完了していないため、一部の回答が同期できませんでした。先にオンライン回答を完了してください。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/sr-cr.json b/www/addons/mod/scorm/lang/sr-cr.json
new file mode 100644
index 00000000000..481c70dc534
--- /dev/null
+++ b/www/addons/mod/scorm/lang/sr-cr.json
@@ -0,0 +1,18 @@
+{
+    "cannotcalculategrade": "Оцена не може да се израчуна.",
+    "dataattemptshown": "Ови подаци припадају покушају број {{number}}.",
+    "errorcreateofflineattempt": "Дошло је до грешке приликом покушаја креирања новог офлајн покушаја. Молимо, покушајте поново.",
+    "errordownloadscorm": "Грешка приликом преузимања SCORM пакета: \"{{name}}\".",
+    "errorgetscorm": "Грешка приликом преузимања података SCORM пакета.",
+    "errorinvalidversion": "Извините, апликација подржава само SCORM 1.2.",
+    "errornotdownloadable": "Преузимање SCORM пакета је онемогућено на вашем сајту. Молимо, обратите се администратору вашег Moodle сајта.",
+    "errornovalidsco": "Овај SCORM пакет нема видљив SCO који би био учитан.",
+    "errorpackagefile": "Извините, апликација подржава само ZIP архиве.",
+    "errorsyncscorm": "Дошло је до грешке приликом синхронизације. Молимо, покушајте поново.",
+    "offlineattemptnote": "Овај покушај има податке који нису синхронизован.",
+    "offlineattemptovermax": "Овај покушај не може бити послат зато што сте премашили максималан број дозвољених покушаја.",
+    "scormstatusnotdownloaded": "Овај SCORM пакет није преузет. Биће аутоматски преузет када га отворите.",
+    "scormstatusoutdated": "Овај SCORM пакет је мењан од последњег преузимања. Биће аутоматски преузет када га отворите.",
+    "warningofflinedatadeleted": "Неки офлајн подаци о покушају  {{number}} су обрисани зато што их није могуће креирати у новом покушају.",
+    "warningsynconlineincomplete": "Неки покушаји нису могли бити синхронизовани са сајтом зато што последњи онлине покушај није завршен. Молимо вас да прво завршите онлајн покушај."
+}
\ No newline at end of file
diff --git a/www/addons/mod/scorm/lang/sr-lt.json b/www/addons/mod/scorm/lang/sr-lt.json
new file mode 100644
index 00000000000..1e0cbfee595
--- /dev/null
+++ b/www/addons/mod/scorm/lang/sr-lt.json
@@ -0,0 +1,18 @@
+{
+    "cannotcalculategrade": "Ocena ne može da se izračuna.",
+    "dataattemptshown": "Ovi podaci pripadaju pokušaju broj {{number}}.",
+    "errorcreateofflineattempt": "Došlo je do greške prilikom pokušaja kreiranja novog oflajn pokušaja. Molimo, pokušajte ponovo.",
+    "errordownloadscorm": "Greška prilikom preuzimanja SCORM paketa: \"{{name}}\".",
+    "errorgetscorm": "Greška prilikom preuzimanja podataka SCORM paketa.",
+    "errorinvalidversion": "Izvinite, aplikacija podržava samo SCORM 1.2.",
+    "errornotdownloadable": "Preuzimanje SCORM paketa je onemogućeno na vašem sajtu. Molimo, obratite se administratoru vašeg Moodle sajta.",
+    "errornovalidsco": "Ovaj SCORM paket nema vidljiv SCO koji bi bio učitan.",
+    "errorpackagefile": "Izvinite, aplikacija podržava samo ZIP arhive.",
+    "errorsyncscorm": "Došlo je do greške prilikom sinhronizacije. Molimo, pokušajte ponovo.",
+    "offlineattemptnote": "Ovaj pokušaj ima podatke koji nisu sinhronizovan.",
+    "offlineattemptovermax": "Ovaj pokušaj ne može biti poslat zato što ste premašili maksimalan broj dozvoljenih pokušaja.",
+    "scormstatusnotdownloaded": "Ovaj SCORM paket nije preuzet. Biće automatski preuzet kada ga otvorite.",
+    "scormstatusoutdated": "Ovaj SCORM paket je menjan od poslednjeg preuzimanja. Biće automatski preuzet kada ga otvorite.",
+    "warningofflinedatadeleted": "Neki oflajn podaci o pokušaju  {{number}} su obrisani zato što ih nije moguće kreirati u novom pokušaju.",
+    "warningsynconlineincomplete": "Neki pokušaji nisu mogli biti sinhronizovani sa sajtom zato što poslednji online pokušaj nije završen. Molimo vas da prvo završite onlajn pokušaj."
+}
\ 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 47edde51210..dc0f5cb8a29 100644
--- a/www/addons/mod/scorm/lang/uk.json
+++ b/www/addons/mod/scorm/lang/uk.json
@@ -12,7 +12,7 @@
     "dataattemptshown": "Ці дані належать до спроби № {{number}}.",
     "enter": "Ввести",
     "errorcreateofflineattempt": "При створенні нового форуму сталася помилка. Будь ласка спробуйте ще раз.",
-    "errordownloadscorm": "Помилка завантаження  SCORM: \"{{name}}\".",
+    "errordownloadscorm": "Помилка завантаження SCORM: \"{{name}}\".",
     "errorgetscorm": "Помилка отримання SCORM-даних.",
     "errorinvalidversion": "На жаль, додаток підтримує тільки SCORM 1.2.",
     "errornotdownloadable": "Завантаження SCORM пакетів відключене у вашому сайті Moodle. Будь ласка, зверніться до адміністратора сайту Moodle.",
@@ -39,13 +39,13 @@
     "normal": "Нормальний",
     "notattempted": "Не було спроб",
     "offlineattemptnote": "Ця спроба має дані, що не були синхронізовані.",
-    "offlineattemptovermax": "Ця спроба не може бути відправлена, так як ви перевершили максимальну кількість спроб.",
+    "offlineattemptovermax": "Ця спроба не може бути відправлена, так як ви перевищили максимальну кількість спроб.",
     "organizations": "Організації",
     "passed": "Пропущено",
     "reviewmode": "Режим перегляду",
-    "scormstatusnotdownloaded": "Це SCORM не завантажується. Він буде автоматично завантажуватися при її відкритті.",
+    "scormstatusnotdownloaded": "Цей SCORM не завантажений. Він буде автоматично завантажуватися при його відкритті.",
     "scormstatusoutdated": "Цей SCORM був змінений з моменту останнього завантаження. Він буде автоматично завантажуватися при її відкритті.",
     "suspended": "Заблокований",
-    "warningofflinedatadeleted": "Деякі автономні дані про спробу № {{number}} були видалений, тому що він не може бути створений в новій спробі.",
+    "warningofflinedatadeleted": "Деякі автономні дані про спробу № {{number}} були видалені, тому що вони не можуть бути створені в новій спробі.",
     "warningsynconlineincomplete": "Деякі спроби не можуть бути синхронізовані з сайтом, тому що онлайн спроба не закінчена. Будь ласка закінчіть спробу онлайн спершу."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/ar.json b/www/addons/mod/survey/lang/ar.json
index 30dd1d2fed3..dd271b759c7 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..35fbcedcc0d 100644
--- a/www/addons/mod/survey/lang/ja.json
+++ b/www/addons/mod/survey/lang/ja.json
@@ -1,4 +1,6 @@
 {
+    "cannotsubmitsurvey": "申し訳ありません。あなたの調査提出で問題が発生しました。再度提出を実行してください。",
+    "errorgetsurvey": "調査データの取得中にエラーが発生しました。",
     "ifoundthat": "私は次のことを発見しました:",
     "ipreferthat": "私は次のことが好きです:",
     "responses": "回答",
diff --git a/www/addons/mod/survey/lang/sr-cr.json b/www/addons/mod/survey/lang/sr-cr.json
new file mode 100644
index 00000000000..81ed8c380d2
--- /dev/null
+++ b/www/addons/mod/survey/lang/sr-cr.json
@@ -0,0 +1,5 @@
+{
+    "cannotsubmitsurvey": "Нажалост, било је проблема са предајом вашег упитника. Молим вас, покушајте поново.",
+    "errorgetsurvey": "Грешка приликом преузимања података за 'Упитник' (Survey)",
+    "results": "Резултати"
+}
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/sr-lt.json b/www/addons/mod/survey/lang/sr-lt.json
new file mode 100644
index 00000000000..22342db7d8a
--- /dev/null
+++ b/www/addons/mod/survey/lang/sr-lt.json
@@ -0,0 +1,5 @@
+{
+    "cannotsubmitsurvey": "Nažalost, bilo je problema sa predajom vašeg upitnika. Molim vas, pokušajte ponovo.",
+    "errorgetsurvey": "Greška prilikom preuzimanja podataka za 'Upitnik' (Survey)",
+    "results": "Rezultati"
+}
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/uk.json b/www/addons/mod/survey/lang/uk.json
index 74dd0374658..c0e91783cb7 100644
--- a/www/addons/mod/survey/lang/uk.json
+++ b/www/addons/mod/survey/lang/uk.json
@@ -1,6 +1,6 @@
 {
-    "cannotsubmitsurvey": "На жаль, існує проблема представлення вашого обстеження. Будь ласка спробуйте ще раз.",
-    "errorgetsurvey": "Помилка при отриманні даних обстеження.",
+    "cannotsubmitsurvey": "На жаль, існує проблема вашого представлення. Будь ласка спробуйте ще раз.",
+    "errorgetsurvey": "Помилка при отриманні даних.",
     "ifoundthat": "Я довідався, що",
     "ipreferthat": "Я волію, щоб",
     "responses": "Відповіді",
diff --git a/www/addons/mod/url/lang/ja.json b/www/addons/mod/url/lang/ja.json
index 0637a088a01..350006f4a7f 100644
--- a/www/addons/mod/url/lang/ja.json
+++ b/www/addons/mod/url/lang/ja.json
@@ -1 +1,4 @@
-[]
\ No newline at end of file
+{
+    "accessurl": "URLへのアクセス",
+    "pointingtourl": "このリソースを示すURL"
+}
\ No newline at end of file
diff --git a/www/addons/mod/url/lang/sr-cr.json b/www/addons/mod/url/lang/sr-cr.json
new file mode 100644
index 00000000000..8559de48806
--- /dev/null
+++ b/www/addons/mod/url/lang/sr-cr.json
@@ -0,0 +1,4 @@
+{
+    "accessurl": "Приступи URL адреси",
+    "pointingtourl": "URL адреса са којом је овај ресурс повезан"
+}
\ No newline at end of file
diff --git a/www/addons/mod/url/lang/sr-lt.json b/www/addons/mod/url/lang/sr-lt.json
new file mode 100644
index 00000000000..a266fc49df5
--- /dev/null
+++ b/www/addons/mod/url/lang/sr-lt.json
@@ -0,0 +1,4 @@
+{
+    "accessurl": "Pristupi URL adresi",
+    "pointingtourl": "URL adresa sa kojom je ovaj resurs povezan"
+}
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/ja.json b/www/addons/mod/wiki/lang/ja.json
index fbfaad517e5..602d4646668 100644
--- a/www/addons/mod/wiki/lang/ja.json
+++ b/www/addons/mod/wiki/lang/ja.json
@@ -2,6 +2,9 @@
     "cannoteditpage": "あなたはこのページを編集できません。",
     "createpage": "ページを作成する",
     "editingpage": "このページ「 {{$a}} 」の編集",
+    "errorloadingpage": "ページの読み込み中にエラーが発生しました。",
+    "errornowikiavailable": "このwikiにはまだ内容がありません。",
+    "gowikihome": "Wikiのホームへ移動",
     "map": "マップ",
     "newpagehdr": "新しいページ",
     "newpagetitle": "新しいページタイトル",
@@ -10,5 +13,9 @@
     "page": "ページ",
     "pageexists": "このページはすでに存在します。",
     "pagename": "ページ名",
+    "subwiki": "サブwiki",
+    "titleshouldnotbeempty": "空のタイトルは受け付けられません",
+    "viewpage": "ページを表示",
+    "wikipage": "Wikiページ",
     "wrongversionlock": "あなたが編集している間、別のユーザがこのページを編集しました。そのため、あなたのコンテンツは古くなりました。"
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/sr-cr.json b/www/addons/mod/wiki/lang/sr-cr.json
new file mode 100644
index 00000000000..8a152b69a6d
--- /dev/null
+++ b/www/addons/mod/wiki/lang/sr-cr.json
@@ -0,0 +1,10 @@
+{
+    "errorloadingpage": "Дошло је до грешке приликом учитавања странице.",
+    "errornowikiavailable": "Овај вики још увек нема садржај.",
+    "gowikihome": "Иди на почетну страницу викија",
+    "page": "Страница",
+    "subwiki": "Подвики",
+    "titleshouldnotbeempty": "Наслов не би требало да буде празан",
+    "viewpage": "Погледај страницу",
+    "wikipage": "Вики страница"
+}
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/sr-lt.json b/www/addons/mod/wiki/lang/sr-lt.json
new file mode 100644
index 00000000000..e8ced77df30
--- /dev/null
+++ b/www/addons/mod/wiki/lang/sr-lt.json
@@ -0,0 +1,10 @@
+{
+    "errorloadingpage": "Došlo je do greške prilikom učitavanja stranice.",
+    "errornowikiavailable": "Ovaj viki još uvek nema sadržaj.",
+    "gowikihome": "Idi na početnu stranicu vikija",
+    "page": "Stranica",
+    "subwiki": "Podviki",
+    "titleshouldnotbeempty": "Naslov ne bi trebalo da bude prazan",
+    "viewpage": "Pogledaj stranicu",
+    "wikipage": "Viki stranica"
+}
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/uk.json b/www/addons/mod/wiki/lang/uk.json
index c19abe51cb9..cd89e56c9cc 100644
--- a/www/addons/mod/wiki/lang/uk.json
+++ b/www/addons/mod/wiki/lang/uk.json
@@ -13,7 +13,7 @@
     "page": "Сторінка",
     "pageexists": "Ця сторінка вже існує. Перенаправити до неї.",
     "pagename": "Назва сторінки",
-    "subwiki": "Сабвікі",
+    "subwiki": "Субвікі",
     "titleshouldnotbeempty": "Заголовок не може бути порожнім",
     "viewpage": "Переглянути сторінку",
     "wikipage": "Вікі-сторінка",
diff --git a/www/addons/notes/lang/ar.json b/www/addons/notes/lang/ar.json
index df8de0cf069..30b58e0c705 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/da.json b/www/addons/notes/lang/da.json
index cf35362b164..3dadb18f0eb 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": "Dine private kommentarer og noter",
+    "notes": "Noter",
     "personalnotes": "Personlige noter",
     "publishstate": "Sammenhæng",
     "sitenotes": "Webstedsnoter",
diff --git a/www/addons/notes/lang/he.json b/www/addons/notes/lang/he.json
index 2e3c5dd9644..416427b2dec 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/ja.json b/www/addons/notes/lang/ja.json
index 31c68f19f28..6b3304c8067 100644
--- a/www/addons/notes/lang/ja.json
+++ b/www/addons/notes/lang/ja.json
@@ -1,10 +1,13 @@
 {
-    "addnewnote": "新しいノートを追加する",
+    "addnewnote": "新しいノートを追加",
     "coursenotes": "コースノート",
-    "eventnotecreated": "ノートが作成されました。",
+    "eventnotecreated": "作成したノート",
+    "nonotes": "このタイプのノートはまだ存在しません",
     "note": "ノート",
-    "notes": "あなたの個人分析およびノート",
+    "notes": "ノート",
     "personalnotes": "パーソナルノート",
-    "publishstate": "コンテクスト",
-    "sitenotes": "サイトノート"
+    "publishstate": "コンテキスト",
+    "sitenotes": "サイトノート",
+    "userwithid": "ID {{id}} のユーザ",
+    "warningnotenotsent": "コース {{course}} にノートを追加することができません。 {{error}}"
 }
\ No newline at end of file
diff --git a/www/addons/notes/lang/sr-cr.json b/www/addons/notes/lang/sr-cr.json
new file mode 100644
index 00000000000..0690900c3c5
--- /dev/null
+++ b/www/addons/notes/lang/sr-cr.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/notes/lang/sr-lt.json b/www/addons/notes/lang/sr-lt.json
new file mode 100644
index 00000000000..d4a1ef87e7f
--- /dev/null
+++ b/www/addons/notes/lang/sr-lt.json
@@ -0,0 +1,13 @@
+{
+    "addnewnote": "Dodaj  novu belešku",
+    "coursenotes": "Beleške kursa",
+    "eventnotecreated": "Beleška kreirana",
+    "nonotes": "Još ne postoje beleške ovog tipa",
+    "note": "Beleška",
+    "notes": "Beleške",
+    "personalnotes": "Lične beleške",
+    "publishstate": "Kontekst",
+    "sitenotes": "Beleške sajta",
+    "userwithid": "Korisnik sa ID oznakom  {{id}}",
+    "warningnotenotsent": "Nije moguće dodati belešku/e kursu {{course}}. {{error}}"
+}
\ No newline at end of file
diff --git a/www/addons/notes/lang/uk.json b/www/addons/notes/lang/uk.json
index 8f58e17054e..8c815080c16 100644
--- a/www/addons/notes/lang/uk.json
+++ b/www/addons/notes/lang/uk.json
@@ -9,5 +9,5 @@
     "publishstate": "Контекст",
     "sitenotes": "Записки сайту",
     "userwithid": "Користувач з Id {{id}}",
-    "warningnotenotsent": "Неможливо додати записку до курсу{{course}}. {{error}}"
+    "warningnotenotsent": "Неможливо додати записку до курсу {{course}}. {{error}}"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/ar.json b/www/addons/notifications/lang/ar.json
index cab5daac101..edbc8f11446 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/da.json b/www/addons/notifications/lang/da.json
index 2e190040f35..56219f0789c 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": "Beskeder",
+    "notifications": "Underretninger",
     "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 6dc2a08c68c..b89ba1477d5 100644
--- a/www/addons/notifications/lang/de.json
+++ b/www/addons/notifications/lang/de.json
@@ -2,6 +2,6 @@
     "errorgetnotifications": "Fehler beim Laden der Mitteilungen",
     "notificationpreferences": "Systemmitteilungen",
     "notifications": "Systemmitteilungen",
-    "playsound": "Audio abspielen",
+    "playsound": "Sound abspielen",
     "therearentnotificationsyet": "Keine Mitteilungen"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/el.json b/www/addons/notifications/lang/el.json
index 287c60968cc..d5d645008b8 100644
--- a/www/addons/notifications/lang/el.json
+++ b/www/addons/notifications/lang/el.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "Σφάλμα κατά τη λήψη ειδοποιήσεων",
     "notificationpreferences": "Προτιμήσεις ειδοποιήσεων",
     "notifications": "Ειδοποιήσεις",
+    "playsound": "Αναπαραγωγή ήχου",
     "therearentnotificationsyet": "Δεν υπάρχουν ειδοποιήσεις"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/es.json b/www/addons/notifications/lang/es.json
index e73e272de69..db11ade05af 100644
--- a/www/addons/notifications/lang/es.json
+++ b/www/addons/notifications/lang/es.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "Error al obtener notificaciones",
     "notificationpreferences": "Preferencias de notificaciones",
     "notifications": "Notificaciones",
+    "playsound": "Reproducir sonido",
     "therearentnotificationsyet": "No hay notificaciones"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/fr.json b/www/addons/notifications/lang/fr.json
index edb4a631896..f5c2621dbba 100644
--- a/www/addons/notifications/lang/fr.json
+++ b/www/addons/notifications/lang/fr.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "Erreur lors de la récupération des notifications.",
     "notificationpreferences": "Préférences de notification",
     "notifications": "Notifications",
+    "playsound": "Jouer le son",
     "therearentnotificationsyet": "Aucune notification"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/he.json b/www/addons/notifications/lang/he.json
index 39e5a6ed7a5..1c1591b94ed 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/ja.json b/www/addons/notifications/lang/ja.json
index a253cfba0ae..22daa00358e 100644
--- a/www/addons/notifications/lang/ja.json
+++ b/www/addons/notifications/lang/ja.json
@@ -1,5 +1,7 @@
 {
-    "notificationpreferences": "通知プリファレンス",
+    "errorgetnotifications": "通知の取得中にエラーが発生しました。",
+    "notificationpreferences": "通知の設定",
     "notifications": "通知",
+    "playsound": "音を出力",
     "therearentnotificationsyet": "通知はありません"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/ru.json b/www/addons/notifications/lang/ru.json
index 46e6247828f..3bb79943f46 100644
--- a/www/addons/notifications/lang/ru.json
+++ b/www/addons/notifications/lang/ru.json
@@ -2,5 +2,6 @@
     "errorgetnotifications": "Ошибка получения уведомления",
     "notificationpreferences": "Настройка уведомлений",
     "notifications": "Уведомления",
+    "playsound": "Проигрывать звук",
     "therearentnotificationsyet": "Уведомлений нет"
 }
\ No newline at end of file
diff --git a/www/addons/notifications/lang/sr-cr.json b/www/addons/notifications/lang/sr-cr.json
new file mode 100644
index 00000000000..f45f0611020
--- /dev/null
+++ b/www/addons/notifications/lang/sr-cr.json
@@ -0,0 +1,7 @@
+{
+    "errorgetnotifications": "Грешка приликом преузимања обавештења",
+    "notificationpreferences": "Параметри обавештења",
+    "notifications": "Обавештења",
+    "playsound": "Репродукуј звук",
+    "therearentnotificationsyet": "Нема обавештења"
+}
\ No newline at end of file
diff --git a/www/addons/notifications/lang/sr-lt.json b/www/addons/notifications/lang/sr-lt.json
new file mode 100644
index 00000000000..74bfd3d17cb
--- /dev/null
+++ b/www/addons/notifications/lang/sr-lt.json
@@ -0,0 +1,7 @@
+{
+    "errorgetnotifications": "Greška prilikom preuzimanja obaveštenja",
+    "notificationpreferences": "Parametri obaveštenja",
+    "notifications": "Obaveštenja",
+    "playsound": "Reprodukuj zvuk",
+    "therearentnotificationsyet": "Nema obaveštenja"
+}
\ No newline at end of file
diff --git a/www/addons/participants/lang/ar.json b/www/addons/participants/lang/ar.json
index 91db007489d..8c013f870e2 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/ja.json b/www/addons/participants/lang/ja.json
index 8fbbcbb3976..3656df9f659 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/sr-cr.json b/www/addons/participants/lang/sr-cr.json
new file mode 100644
index 00000000000..5c5170c3c41
--- /dev/null
+++ b/www/addons/participants/lang/sr-cr.json
@@ -0,0 +1,4 @@
+{
+    "noparticipants": "Ниједан учесник није пронађен на овом курсу.",
+    "participants": "Учесници"
+}
\ No newline at end of file
diff --git a/www/addons/participants/lang/sr-lt.json b/www/addons/participants/lang/sr-lt.json
new file mode 100644
index 00000000000..090378abb39
--- /dev/null
+++ b/www/addons/participants/lang/sr-lt.json
@@ -0,0 +1,4 @@
+{
+    "noparticipants": "Nijedan učesnik nije pronađen na ovom kursu.",
+    "participants": "Učesnici"
+}
\ No newline at end of file
diff --git a/www/config.json b/www/config.json
index 7ce5ad6b66f..c280d2f83fd 100644
--- a/www/config.json
+++ b/www/config.json
@@ -6,7 +6,7 @@
     "versionname" : "3.3.0",
     "cache_expiration_time" : 300000,
     "default_lang" : "en",
-    "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" : "正體中文"},
+    "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", "lt" : "Lietuvių", "ja": "日本語","nl": "Nederlands", "pl": "Polski", "pt-br": "Português - Brasil", "pt": "Português - Portugal", "ro": "Română", "ru": "Русский", "sr-cr": "Српски", "sr-lt": "Srpski", "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/ja.json b/www/core/components/contentlinks/lang/ja.json
new file mode 100644
index 00000000000..625c4385040
--- /dev/null
+++ b/www/core/components/contentlinks/lang/ja.json
@@ -0,0 +1,7 @@
+{
+    "chooseaccount": "アカウントの選択",
+    "chooseaccounttoopenlink": "リンクを開くアカウントを選択してください。",
+    "confirmurlothersite": "このリンクは別のサイトに属しています。本当に開きますか？",
+    "errornoactions": "このリンクを実行するためのアクションが見つかりませんでした。",
+    "errornosites": "このリンクをもつサイトが見つかりませんでした。"
+}
\ No newline at end of file
diff --git a/www/core/components/contentlinks/lang/sr-cr.json b/www/core/components/contentlinks/lang/sr-cr.json
new file mode 100644
index 00000000000..9091dad7d56
--- /dev/null
+++ b/www/core/components/contentlinks/lang/sr-cr.json
@@ -0,0 +1,7 @@
+{
+    "chooseaccount": "Изабери налог",
+    "chooseaccounttoopenlink": "Изаберите налог са којим треба отворити линк.",
+    "confirmurlothersite": "Овај линк припада другом сајту. Да ли желите да га отворите?",
+    "errornoactions": "Није могуће пронаћи акцију коју треба извести са овим линком.",
+    "errornosites": "Није могуће пронаћи било који сајт који може изаћи на крај са овим линком."
+}
\ No newline at end of file
diff --git a/www/core/components/contentlinks/lang/sr-lt.json b/www/core/components/contentlinks/lang/sr-lt.json
new file mode 100644
index 00000000000..2d375d7a366
--- /dev/null
+++ b/www/core/components/contentlinks/lang/sr-lt.json
@@ -0,0 +1,7 @@
+{
+    "chooseaccount": "Izaberi nalog",
+    "chooseaccounttoopenlink": "Izaberite nalog sa kojim treba otvoriti link.",
+    "confirmurlothersite": "Ovaj link pripada drugom sajtu. Da li želite da ga otvorite?",
+    "errornoactions": "Nije moguće pronaći akciju koju treba izvesti sa ovim linkom.",
+    "errornosites": "Nije moguće pronaći bilo koji sajt koji može izaći na kraj sa ovim linkom."
+}
\ No newline at end of file
diff --git a/www/core/components/contentlinks/lang/uk.json b/www/core/components/contentlinks/lang/uk.json
index a759354d9f2..7ee18752677 100644
--- a/www/core/components/contentlinks/lang/uk.json
+++ b/www/core/components/contentlinks/lang/uk.json
@@ -2,6 +2,6 @@
     "chooseaccount": "Виберіть аккаунт",
     "chooseaccounttoopenlink": "Виберіть обліковий запис, щоб відкрити посилання.",
     "confirmurlothersite": "Це посилання відноситься до іншого місця. Ви хочете відкрити?",
-    "errornoactions": "Не вдалося знайти дію, яка виконує за цим посиланням.",
+    "errornoactions": "Не вдалося знайти дію, яка виконується за цим посиланням.",
     "errornosites": "Не вдалося знайти сайт, щоб впоратися з цим посиланням."
 }
\ 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 47a7f04e4bb..ab7fafab59b 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": "عرض الكل {{$a}}"
+    "showall": "عرض الكل"
 }
\ 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 2d70a448b4f..9242ee4ca2d 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 {{$a}}"
+    "showall": "Vis alt"
 }
\ 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..ee4ca9da68c 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -1,4 +1,5 @@
 {
+    "activitydisabled": "Ο οργανισμός σας απενεργοποίησε αυτήν την δραστηριότητα στην εφαρμογή για κινητά.",
     "activitynotyetviewableinapp": "Εργαζόμαστε για την υποστήριξη της δραστηριότητας {{$a}} .",
     "activitynotyetviewableremoteaddon": "Ο οργανισμός σας εγκατέστησε ένα plugin που δεν υποστηρίζεται ακόμη.",
     "activitynotyetviewablesiteupgradeneeded": "Η πλατφόρμα Moodle του οργανισμού σας πρέπει να αναβαθμιστεί.",
diff --git a/www/core/components/course/lang/es.json b/www/core/components/course/lang/es.json
index 40087d97665..f674129afed 100644
--- a/www/core/components/course/lang/es.json
+++ b/www/core/components/course/lang/es.json
@@ -1,4 +1,5 @@
 {
+    "activitydisabled": "Su  organización ha deshabilitado esta actividad en la aplicación móvil.",
     "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.",
diff --git a/www/core/components/course/lang/he.json b/www/core/components/course/lang/he.json
index 413e5343000..1789a2e476e 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": "תצוגת כל ה-{{$a}}"
+    "showall": "הראה הכל"
 }
\ 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 2e41ef36acc..2059fb9fb13 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": "すべての {{$a}} を表示する"
+    "showall": "すべて表示"
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/sr-cr.json b/www/core/components/course/lang/sr-cr.json
new file mode 100644
index 00000000000..3ee4f3ebe39
--- /dev/null
+++ b/www/core/components/course/lang/sr-cr.json
@@ -0,0 +1,20 @@
+{
+    "activitydisabled": "Ваша институција је онемогућила ову активност у мобилној апликацији.",
+    "activitynotyetviewableinapp": "Радимо на подршци за активност {{$a}}.",
+    "activitynotyetviewableremoteaddon": "Ваша институција је инсталирала додатак који још увек није подржан.",
+    "activitynotyetviewablesiteupgradeneeded": "Потребно је да се ажурира Moodle инсталација ваше институције.",
+    "allsections": "Све секције",
+    "askadmintosupport": "Обратите се администратору сајта и реците му да желите да користите ову активност са Moodle Mobile апликацијом.",
+    "confirmdeletemodulefiles": "Да ли сте сигурни да желите да избришете датотеке овог модула?",
+    "confirmdownload": "Намеравате да преузмете {{size}}. Да ли сте сигурни да желите да наставите?",
+    "confirmdownloadunknownsize": "Нисмо могли да израчунамо величину преузимање. Да ли сте сигурни да желите да преузмете?",
+    "confirmpartialdownloadsize": "Намеравате да преузмете <strong>најмање</strong> {{size}}. Да ли сте сигурни да желите да наставите?",
+    "contents": "Садржаји",
+    "couldnotloadsectioncontent": "Није могуће учитати садржај секције, покушајте поново касније.",
+    "couldnotloadsections": "Није могуће учитати секције, покушајте поново касније.",
+    "errordownloadingsection": "Грешка приликом преузимања секције.",
+    "errorgetmodule": "Грешка приликом преузимања података модула.",
+    "nocontentavailable": "Никакав садржај није доступан у овом тренутку.",
+    "showall": "Прикажи све",
+    "useactivityonbrowser": "Још увек можете да га користите помоћу веб читача вашег уређаја."
+}
\ No newline at end of file
diff --git a/www/core/components/course/lang/sr-lt.json b/www/core/components/course/lang/sr-lt.json
new file mode 100644
index 00000000000..97d89d52dc2
--- /dev/null
+++ b/www/core/components/course/lang/sr-lt.json
@@ -0,0 +1,20 @@
+{
+    "activitydisabled": "Vaša institucija je onemogućila ovu aktivnost u mobilnoj aplikaciji.",
+    "activitynotyetviewableinapp": "Radimo na podršci za aktivnost {{$a}}.",
+    "activitynotyetviewableremoteaddon": "Vaša institucija je instalirala dodatak koji još uvek nije podržan.",
+    "activitynotyetviewablesiteupgradeneeded": "Potrebno je da se ažurira Moodle instalacija vaše institucije.",
+    "allsections": "Sve sekcije",
+    "askadmintosupport": "Obratite se administratoru sajta i recite mu da želite da koristite ovu aktivnost sa Moodle Mobile aplikacijom.",
+    "confirmdeletemodulefiles": "Da li ste sigurni da želite da izbrišete datoteke ovog modula?",
+    "confirmdownload": "Nameravate da preuzmete {{size}}. Da li ste sigurni da želite da nastavite?",
+    "confirmdownloadunknownsize": "Nismo mogli da izračunamo veličinu preuzimanje. Da li ste sigurni da želite da preuzmete?",
+    "confirmpartialdownloadsize": "Nameravate da preuzmete <strong>najmanje</strong> {{size}}. Da li ste sigurni da želite da nastavite?",
+    "contents": "Sadržaji",
+    "couldnotloadsectioncontent": "Nije moguće učitati sadržaj sekcije, pokušajte ponovo kasnije.",
+    "couldnotloadsections": "Nije moguće učitati sekcije, pokušajte ponovo kasnije.",
+    "errordownloadingsection": "Greška prilikom preuzimanja sekcije.",
+    "errorgetmodule": "Greška prilikom preuzimanja podataka modula.",
+    "nocontentavailable": "Nikakav sadržaj nije dostupan u ovom trenutku.",
+    "showall": "Prikaži sve",
+    "useactivityonbrowser": "Još uvek možete da ga koristite pomoću veb čitača vašeg uređaja."
+}
\ 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 f1e7e1b958b..232aa47f117 100644
--- a/www/core/components/course/lang/uk.json
+++ b/www/core/components/course/lang/uk.json
@@ -1,10 +1,10 @@
 {
     "activitydisabled": "Ваша організація відключила цю активність в мобільному додатку.",
-    "activitynotyetviewableinapp": "Ми працюємо на підтримку {{$a}} діяльності.",
+    "activitynotyetviewableinapp": "Ми працюємо на підтримку діяльності {{$a}}.",
     "activitynotyetviewableremoteaddon": "Ваша організація встановила плагін, який ще не підтримується.",
-    "activitynotyetviewablesiteupgradeneeded": "Установка Moodle вашої організації повинна бути оновлена.",
+    "activitynotyetviewablesiteupgradeneeded": "Установка версія Moodle вашої організації повинна бути оновлена.",
     "allsections": "Всі секції",
-    "askadmintosupport": "Зверніться до адміністратора сайту і скажіть їм, що ви хочете використовувати цю діяльність з додатком Moodle Mobile.",
+    "askadmintosupport": "Зверніться до адміністратора сайту і скажіть, що ви хочете використовувати цю діяльність з додатком Moodle Mobile.",
     "confirmdeletemodulefiles": "Ви впевнені, що хочете видалити цей модуль?",
     "confirmdownload": "Ви збираєтеся завантажити {{size}}. Ви впевнені, що хочете продовжити?",
     "confirmdownloadunknownsize": "Ми не змогли розрахувати розмір файлу. Ви впевнені, що ви хочете завантажити?",
diff --git a/www/core/components/courses/lang/da.json b/www/core/components/courses/lang/da.json
index f5f007f4d13..506a637348d 100644
--- a/www/core/components/courses/lang/da.json
+++ b/www/core/components/courses/lang/da.json
@@ -11,12 +11,12 @@
     "filtermycourses": "Filtrer mit kursus",
     "frontpage": "Forside",
     "mycourses": "Mine kurser",
-    "nocourses": "Du er ikke tilmeldt nogen kurser.",
+    "nocourses": "Der er ingen kursusoplysninger at vise.",
     "nocoursesyet": "Der er ingen kurser i denne kategori",
-    "nosearchresults": "Der var ingen beskeder der opfyldte søgekriteriet",
+    "nosearchresults": "Din søgning gav ingen resultater",
     "notenroled": "Du er ikke tilmeldt dette kursus",
     "notenrollable": "Du kan ikke selv tilmelde dig dette kursus.",
-    "password": "Delt hemmelig streng",
+    "password": "Tilmeldingsnøgle",
     "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.",
diff --git a/www/core/components/courses/lang/el.json b/www/core/components/courses/lang/el.json
index def66c4256d..127c3fcdd83 100644
--- a/www/core/components/courses/lang/el.json
+++ b/www/core/components/courses/lang/el.json
@@ -1,10 +1,12 @@
 {
     "allowguests": "Σε αυτό το μάθημα επιτρέπονται και οι επισκέπτες",
     "availablecourses": "Διαθέσιμα Μαθήματα",
+    "cannotretrievemorecategories": "Δεν είναι δυνατή η ανάκτηση κατηγοριών μετά από το επίπεδο {{$a}}.",
     "categories": "Κατηγορίες μαθημάτων",
     "confirmselfenrol": "Είστε σίγουροι ότι θέλετε να εγγραφείτε σε αυτό το μάθημα;",
     "courses": "Μαθήματα",
     "enrolme": "Εγγραφή",
+    "errorloadcategories": "Παρουσιάστηκε σφάλμα κατά την φόρτωση των κατηγοριών.",
     "errorloadcourses": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση των μαθημάτων.",
     "errorsearching": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της αναζήτησης.",
     "errorselfenrol": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της αυτο-εγγραφής.",
diff --git a/www/core/components/courses/lang/es.json b/www/core/components/courses/lang/es.json
index c631db3a6aa..92337d9e248 100644
--- a/www/core/components/courses/lang/es.json
+++ b/www/core/components/courses/lang/es.json
@@ -1,10 +1,12 @@
 {
     "allowguests": "Este curso permite la entrada de invitados",
     "availablecourses": "Cursos disponibles",
+    "cannotretrievemorecategories": "No se pueden recuperar categorías más profundas que el nivel {{$a}}.",
     "categories": "Categorías",
     "confirmselfenrol": "¿Está seguro que desea auto-matricularse en este curso?",
     "courses": "Cursos",
     "enrolme": "Matricularme",
+    "errorloadcategories": "Ocurrió un error al cargar categorías.",
     "errorloadcourses": "Se ha producido un error cargando los cursos.",
     "errorsearching": "Se ha producido un error durante la búsqueda.",
     "errorselfenrol": "Se ha producido un error durante la auto-matriculación.",
diff --git a/www/core/components/courses/lang/ru.json b/www/core/components/courses/lang/ru.json
index 60a255745fb..03db819ba08 100644
--- a/www/core/components/courses/lang/ru.json
+++ b/www/core/components/courses/lang/ru.json
@@ -5,6 +5,7 @@
     "courses": "Курсы",
     "enrolme": "Записаться на курс",
     "errorloadcourses": "При загрузке курсов произошла ошибка.",
+    "filtermycourses": "Поиск моих курсов",
     "frontpage": "Главная страница",
     "mycourses": "Мои курсы",
     "nocourses": "Нет информации для отображения.",
diff --git a/www/core/components/courses/lang/sr-cr.json b/www/core/components/courses/lang/sr-cr.json
new file mode 100644
index 00000000000..a45b33d0d74
--- /dev/null
+++ b/www/core/components/courses/lang/sr-cr.json
@@ -0,0 +1,19 @@
+{
+    "cannotretrievemorecategories": "Категорије које су испод нивоа {{$a}} не могу се преузети.",
+    "confirmselfenrol": "Да ли сте сигурни да желите да се упишете на овај курс?",
+    "enrolme": "Упиши ме",
+    "errorloadcategories": "Дошло је до грешке приликом учитавања категорија.",
+    "errorloadcourses": "Дошло је до грешке приликом учитавања курсева.",
+    "errorsearching": "Дошло је до грешке приликом претраживања.",
+    "errorselfenrol": "Дошло је до грешке приликом покушаја самосталног уписа.",
+    "filtermycourses": "Филтрирај моје курсеве",
+    "frontpage": "Насловна страница",
+    "nocourses": "Нема информација о курсевима за приказ.",
+    "nosearchresults": "Није било резултата ваше претраге",
+    "notenroled": "Нисте уписани на овај курс",
+    "notenrollable": "Не можете сами да се упишете на овај курс.",
+    "password": "Приступна лозинка курса",
+    "searchcoursesadvice": "Можете користити дугме за претрагу курсева како бисте им приступили као гост или се уписали на курсеве који то допуштају.",
+    "selfenrolment": "Самостални упис",
+    "totalcoursesearchresults": "Укупно курсева: {{$a}}"
+}
\ No newline at end of file
diff --git a/www/core/components/courses/lang/sr-lt.json b/www/core/components/courses/lang/sr-lt.json
new file mode 100644
index 00000000000..65613c906bb
--- /dev/null
+++ b/www/core/components/courses/lang/sr-lt.json
@@ -0,0 +1,19 @@
+{
+    "cannotretrievemorecategories": "Kategorije koje su ispod nivoa {{$a}} ne mogu se preuzeti.",
+    "confirmselfenrol": "Da li ste sigurni da želite da se upišete na ovaj kurs?",
+    "enrolme": "Upiši me",
+    "errorloadcategories": "Došlo je do greške prilikom učitavanja kategorija.",
+    "errorloadcourses": "Došlo je do greške prilikom učitavanja kurseva.",
+    "errorsearching": "Došlo je do greške prilikom pretraživanja.",
+    "errorselfenrol": "Došlo je do greške prilikom pokušaja samostalnog upisa.",
+    "filtermycourses": "Filtriraj moje kurseve",
+    "frontpage": "Naslovna stranica",
+    "nocourses": "Nema informacija o kursevima za prikaz.",
+    "nosearchresults": "Nije bilo rezultata vaše pretrage",
+    "notenroled": "Niste upisani na ovaj kurs",
+    "notenrollable": "Ne možete sami da se upišete na ovaj kurs.",
+    "password": "Pristupna lozinka kursa",
+    "searchcoursesadvice": "Možete koristiti dugme za pretragu kurseva kako biste im pristupili kao gost ili se upisali na kurseve koji to dopuštaju.",
+    "selfenrolment": "Samostalni upis",
+    "totalcoursesearchresults": "Ukupno kurseva: {{$a}}"
+}
\ 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 2821e8d6a72..e21fe775615 100644
--- a/www/core/components/courses/lang/uk.json
+++ b/www/core/components/courses/lang/uk.json
@@ -18,10 +18,10 @@
     "nosearchresults": "Ніяких результатів пошуку",
     "notenroled": "Ви не зареєстровані в цьому курсі",
     "notenrollable": "Ви не можете зареєструвати себе в цьому курсі.",
-    "password": "ключ подачі заявок",
+    "password": "Ключ подачі заявок",
     "search": "Знайти",
     "searchcourses": "Пошук курсів",
-    "searchcoursesadvice": "Ви можете використовувати кнопку пошуку курсів, щоб отримати доступ в якості гостя або зареєструвати себе в курсах, які дозволяють їй.",
+    "searchcoursesadvice": "Ви можете використовувати кнопку пошуку курсів, щоб отримати доступ в якості гостя або зареєструвати себе в курсах, які дозволяють це.",
     "selfenrolment": "Самостійна реєстрація",
     "totalcoursesearchresults": "Всього курсів:  {{$a}}"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/ar.json b/www/core/components/fileuploader/lang/ar.json
index 68a20669859..3756250ce62 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": "خطاء في قراءة ملف \"{{$a}}\"",
+    "errorreadingfile": "خطأ في قراءة الملف",
     "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/da.json b/www/core/components/fileuploader/lang/da.json
index 7b7c0c77636..3fe2280526b 100644
--- a/www/core/components/fileuploader/lang/da.json
+++ b/www/core/components/fileuploader/lang/da.json
@@ -9,7 +9,7 @@
     "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 under læsning af filen \"{{$a}}\"",
+    "errorreadingfile": "Fejl ved læsning af fil.",
     "errorwhileuploading": "En fejl opstod under upload af filen.",
     "file": "Fil",
     "fileuploaded": "Filen er uploadet.",
@@ -17,6 +17,6 @@
     "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/fr.json b/www/core/components/fileuploader/lang/fr.json
index 68434825ec0..13eb0148fcf 100644
--- a/www/core/components/fileuploader/lang/fr.json
+++ b/www/core/components/fileuploader/lang/fr.json
@@ -15,7 +15,7 @@
     "file": "Fichier",
     "fileuploaded": "Le fichier a été déposé.",
     "maxbytesfile": "Le fichier {{$a.file}} est trop gros. La taille maximale permise est de {{$a.size}}.",
-    "photoalbums": "Albums de photos",
+    "photoalbums": "Albums photos",
     "readingfile": "Lecture du fichier",
     "selectafile": "Choisir un fichier",
     "uploadafile": "Déposer un fichier",
diff --git a/www/core/components/fileuploader/lang/he.json b/www/core/components/fileuploader/lang/he.json
index 62479a48162..b6dda48ad1e 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": "שגיאה בקריאת קובץ \"{{$a}}\"",
+    "errorreadingfile": "שגיאה בקריאת קובץ.",
     "errorwhileuploading": "התרחשה שגיאה בזמן הניסיון להעלות את הקובץ.",
     "file": "קובץ",
     "fileuploaded": "הקובץ הועלה בהצלחה.",
     "photoalbums": "אלבומי תמונות",
     "readingfile": "קורא קובץ",
-    "uploadafile": "העלאת קובץ",
-    "uploading": "מעלה את הקובץ...",
+    "uploadafile": "העלה קובץ",
+    "uploading": "מעלה קבצים",
     "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 afec789151e..86f29cfe14c 100644
--- a/www/core/components/fileuploader/lang/ja.json
+++ b/www/core/components/fileuploader/lang/ja.json
@@ -1,14 +1,14 @@
 {
-    "addfiletext": "ファイルを追加する",
+    "addfiletext": "ファイル追加",
     "confirmuploadfile": "{{$a}}をアップロードしようとしています。続けますか？",
     "errorcapturingaudio": "音声キャプチャーのエラー",
     "errorcapturingvideo": "ビデオキャプチャーのエラー",
-    "errorreadingfile": "ファイル「 {{$a}} 」の読み取り中にエラーが発生しました。",
+    "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/sr-cr.json b/www/core/components/fileuploader/lang/sr-cr.json
new file mode 100644
index 00000000000..74ec8641949
--- /dev/null
+++ b/www/core/components/fileuploader/lang/sr-cr.json
@@ -0,0 +1,25 @@
+{
+    "addfiletext": "Додај датотеку",
+    "audio": "Аудио",
+    "camera": "Камера",
+    "confirmuploadfile": "Намеравате да отпремите {{size}}. Да ли сте сигурни да желите да наставите?",
+    "confirmuploadunknownsize": "Нисмо могли да израчунамо величину датотека за отпремање. Да ли сте сигурни да желите да наставите?",
+    "errorcapturingaudio": "Грешка приликом снимања аудио записа.",
+    "errorcapturingimage": "Грешка приликом снимања слике.",
+    "errorcapturingvideo": "Грешка приликом снимања видео записа.",
+    "errorgettingimagealbum": "Грешка приликом преузимања слике из албума.",
+    "errormustbeonlinetoupload": "Морате бити онлајн како бисте отпремили датотеке.",
+    "errornoapp": "Немате инсталирану апликацију која може да изведе ову акцију.",
+    "errorreadingfile": "Грешка приликом учитавања датотеке.",
+    "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/sr-lt.json b/www/core/components/fileuploader/lang/sr-lt.json
new file mode 100644
index 00000000000..5da78d54b07
--- /dev/null
+++ b/www/core/components/fileuploader/lang/sr-lt.json
@@ -0,0 +1,25 @@
+{
+    "addfiletext": "Dodaj datoteku",
+    "audio": "Audio",
+    "camera": "Kamera",
+    "confirmuploadfile": "Nameravate da otpremite {{size}}. Da li ste sigurni da želite da nastavite?",
+    "confirmuploadunknownsize": "Nismo mogli da izračunamo veličinu datoteka za otpremanje. Da li ste sigurni da želite da nastavite?",
+    "errorcapturingaudio": "Greška prilikom snimanja audio zapisa.",
+    "errorcapturingimage": "Greška prilikom snimanja slike.",
+    "errorcapturingvideo": "Greška prilikom snimanja video zapisa.",
+    "errorgettingimagealbum": "Greška prilikom preuzimanja slike iz albuma.",
+    "errormustbeonlinetoupload": "Morate biti onlajn kako biste otpremili datoteke.",
+    "errornoapp": "Nemate instaliranu aplikaciju koja može da izvede ovu akciju.",
+    "errorreadingfile": "Greška prilikom učitavanja datoteke.",
+    "errorwhileuploading": "Došlo je do greške prilikom otpremanja datoteke.",
+    "file": "Датотека",
+    "fileuploaded": "Datoteka je uspešno otpremljena.",
+    "maxbytesfile": "Datoteka {{$a.file}} je prevelika. Maksimalna veličina koju možete da otpremite je {{$a.size}}.",
+    "photoalbums": "Foto album",
+    "readingfile": "Učitavanje datoteke",
+    "selectafile": "Izaberi datoteku",
+    "uploadafile": "Otpremi datoteku",
+    "uploading": "Otpremanje",
+    "uploadingperc": "Otpremanje: {{$a}}%",
+    "video": "Video"
+}
\ No newline at end of file
diff --git a/www/core/components/login/lang/da.json b/www/core/components/login/lang/da.json
index 71bccdcbe1d..73378e4f7a3 100644
--- a/www/core/components/login/lang/da.json
+++ b/www/core/components/login/lang/da.json
@@ -2,7 +2,7 @@
     "authenticating": "Godkender",
     "cancel": "Annuller",
     "confirmdeletesite": "Er du sikker på at du ønsker at slette websiden {{sitename}}?",
-    "connect": "Forbind",
+    "connect": "Tilslut!",
     "connecttomoodle": "Tilslut til Moodle",
     "createaccount": "Opret ny profil",
     "createuserandpass": "Vælg  brugernavn og adgangskode",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index e88b1eeed67..2c1061d3f43 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -20,7 +20,7 @@
     "firsttime": "Sind Sie zum ersten Mal auf dieser Webseite?",
     "getanothercaptcha": "Neues Captcha laden",
     "help": "Hilfe",
-    "helpmelogin": "<p>Die Moodle Mobile App funktioniert nur mit Websites, die speziell für den mobilen Zugriff freigegeben wurden.</p>\n<p>Alle Möglichkeiten finden Sie unter <a href=\"http://docs.moodle.org/de/Mobile_app\" target=\"_blank\">http://docs.moodle.org/de/Mobile_app</a>.</p>\n<p><br>Wenn Sie die App mit einer Demo-Website testen möchten, tragen Sie bitte <i>teacher</i> oder <i>student</i> in das Feld <i>URL der Website</i> ein. Tippen Sie dann auf die Taste <b>Verbinden</b>.</p>",
+    "helpmelogin": "<p>Es gibt viele tausend Moodle-Websites auf der Welt. Die mobile App funktioniert nur mit Websites, für die der mobile Zugriff freigegeben wurde.</p>\n<p>Alle Möglichkeiten finden Sie unter <a href=\"http://docs.moodle.org/de/Mobile_app\" target=\"_blank\">http://docs.moodle.org/de/Mobile_app</a>.</p>\n<p><br>Wenn Sie die App mit einer Demo-Website testen möchten, tragen Sie bitte <i>teacher</i> oder <i>student</i> in das Feld <i>URL der Website</i> ein. Tippen Sie dann auf die Taste <b>Verbinden</b>.</p>",
     "instructions": "Anleitung",
     "invalidaccount": "Prüfen Sie Ihre Anmeldedaten oder wenden Sie sich an den Administrator der Website.",
     "invaliddate": "Ungültiges Datum",
diff --git a/www/core/components/login/lang/el.json b/www/core/components/login/lang/el.json
index cb0a2b6fbae..ddfa99ae3f0 100644
--- a/www/core/components/login/lang/el.json
+++ b/www/core/components/login/lang/el.json
@@ -14,30 +14,64 @@
     "emailconfirmsent": "<p>Ένα email έχει σταλεί στη διεύθυνση σας <b>{{$a}}</b></p><p> Περιέχει εύκολες οδηγίες για να ολοκληρώσετε την εγγραφή σας. </p><p> Εάν συνεχίσετε να έχετε δυσκολίες επικοινωνήστε με το διαχειριστή του site.</p>",
     "emailnotmatch": "Οι διευθύνσεις email δεν ταιριάζουν",
     "enterthewordsabove": "Enter the words above",
+    "erroraccesscontrolalloworigin": "Η κλήση πολλαπλών προελεύσεων (Cross-Origin call) που προσπαθείτε να εκτελέσετε έχει απορριφθεί. Παρακαλώ ελέγξτε https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
     "errordeletesite": "Παρουσιάστηκε σφάλμα κατά τη διάρκεια της διαγραφής του site. Δοκιμάστε ξανά αργότερα.",
     "errorupdatesite": "Παρουσιάστηκε σφάλμα κατά την ενημέρωση του site token.",
     "firsttime": "Είναι η πρώτη σας φορά εδώ;",
     "getanothercaptcha": "Πάρε ένα άλλο CAPTCHA",
     "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>. </p>",
     "instructions": "Οδηγίες",
+    "invalidaccount": "Ελέγξτε τα στοιχεία σύνδεσης ή ζητήστε από τον διαχειριστή του ιστότοπού σας να ελέγξει τη διαμόρφωση του ιστότοπου.",
+    "invaliddate": "Η ημερομηνία δεν είναι σωστή",
     "invalidemail": "Εσφαλμένη διεύθυνση ηλεκτρονικού ταχυδρομείου",
+    "invalidmoodleversion": "Μη έγκυρη έκδοση Moodle. Η ελάχιστη απαιτούμενη έκδοση είναι η 2.4.",
+    "invalidsite": "Η διεύθυνση ιστότοπου δεν είναι έγκυρη.",
+    "invalidtime": "Μη έγκυρη ώρα",
     "invalidurl": "Το URL που εισαγάγατε δεν είναι έγκυρο",
+    "invalidvaluemax": "Η μεγαλύτερη τιμή είναι {{$a}}",
+    "invalidvaluemin": "Η μικρότερη τιμή είναι {{$a}}",
+    "localmobileunexpectedresponse": "Ο έλεγχος επιπρόσθετων λειτουργιών τη εφαρμοργής για κινητά Moodle επέστρεψε μια απροσδόκητη απόκριση, θα πιστοποιηθείτε χρησιμοποιώντας την τυπική υπηρεσία κινητής τηλεφωνίας.",
+    "loggedoutssodescription": "Πρέπει να επαληθεύσετε ξανά τον έλεγχο ταυτότητας. Θα πρέπει να συνδεθείτε στον ιστότοπο σε ένα παράθυρο του προγράμματος περιήγησης.",
     "login": "Είσοδος",
+    "loginbutton": "Σύνδεση",
+    "logininsiterequired": "Θα πρέπει να συνδεθείτε στον ιστότοπο σε ένα παράθυρο του προγράμματος περιήγησης.",
     "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": "Λείπει το επώνυμο",
+    "mobileservicesnotenabled": "Οι υπηρεσίες κινητής τηλεφωνίας δεν είναι ενεργοποιημένες στον ιστότοπό σας. Παρακαλούμε, επικοινωνήστε με τον διαχειριστή του ιστότοπου εάν πιστεύετε ότι η πρόσβαση στο κινητό θα πρέπει να είναι ενεργοποιημένη.",
     "newaccount": "Νέος λογαριασμός",
+    "newsitedescription": "Καταχωρίστε τη διεύθυνση URL του ιστότοπού σας Moodle. Σημειώστε ότι ενδέχεται να μην έχει ρυθμιστεί να λειτουργεί με αυτήν την εφαρμογή.",
+    "notloggedin": "Πρέπει να συνδεθείτε",
     "password": "Κωδικός",
+    "passwordrequired": "Απαιτείται κωδικός πρόσβασης",
     "policyaccept": "Καταλαβαίνω και συμφωνώ",
     "policyagree": "Πρέπει να συμφωνήσετε σε αυτήν την πολιτική για να συνεχίσετε στο ιστοχώρο. Συμφωνείτε;",
     "policyagreement": "Άδεια χρήσης του ιστοχώρου",
     "policyagreementclick": "Πατήστε εδώ για να διαβάσετε του όρους χρήσης",
     "potentialidps": "Συνδεθείτε χρησιμοποιώντας το λογαριασμό σας στο:",
+    "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": "Όνομα χρήστη",
-    "usernotaddederror": "Ο χρήστης \"{{$a}}\" δεν προστέθηκε - άγνωστο σφάλμα"
+    "usernamerequired": "Το όνομα χρήστη είναι απαραίτητο",
+    "usernotaddederror": "Ο χρήστης \"{{$a}}\" δεν προστέθηκε - άγνωστο σφάλμα",
+    "visitchangepassword": "Θέλετε να επισκεφτείτε τον ιστότοπο για να αλλάξετε τον κωδικό πρόσβασης;",
+    "webservicesnotenabled": "Οι υπηρεσίες Web δεν είναι ενεργοποιημένες στον ιστότοπό σας. Παρακαλούμε, επικοινωνήστε με τον διαχειριστή του δικτυακού σας τόπου για το Moodle εάν πιστεύετε ότι η πρόσβαση στο κινητό θα πρέπει να είναι ενεργοποιημένη."
 }
\ No newline at end of file
diff --git a/www/core/components/login/lang/es.json b/www/core/components/login/lang/es.json
index 652d4db8fef..db20e532710 100644
--- a/www/core/components/login/lang/es.json
+++ b/www/core/components/login/lang/es.json
@@ -32,6 +32,7 @@
     "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.",
+    "loggedoutssodescription": "Tiene que autenticarse nuevamente. Necesita acceder al sitio en una ventana del navegador.",
     "login": "Acceder",
     "loginbutton": "Acceder",
     "logininsiterequired": "Para autentificarse en el sitio se ha de abrir una ventana de navegador.",
@@ -62,6 +63,7 @@
     "signupplugindisabled": "{{$a}} no está habilitado",
     "siteaddress": "Dirección del sitio",
     "siteinmaintenance": "Su sitio está en modo mantenimiento",
+    "sitepolicynotagreederror": "No se aceptó la política del sitio.",
     "siteurl": "URL del sitio",
     "siteurlrequired": "La URL del sitio es obligatoria, por ejemplo <i>http://www.yourmoodlesite.es o  https://www.yourmoodlesite.org</i>",
     "startsignup": "Crear nueva cuenta",
diff --git a/www/core/components/login/lang/he.json b/www/core/components/login/lang/he.json
index 08820ee166c..6fdfc343515 100644
--- a/www/core/components/login/lang/he.json
+++ b/www/core/components/login/lang/he.json
@@ -2,7 +2,7 @@
     "authenticating": "מאמת נתונים",
     "cancel": "ביטול",
     "confirmdeletesite": "האם את/ה בטוח/ה שברצונך למחוק את האתר {{sitename}}?",
-    "connect": "חיבור",
+    "connect": "התחברות!",
     "connecttomoodle": "התחברות למוודל",
     "createaccount": "יצירת חשבון חדש",
     "createuserandpass": "הזנת שם־משתמש וסיסמה",
diff --git a/www/core/components/login/lang/ja.json b/www/core/components/login/lang/ja.json
index 6b0b86428d5..7dab53a83d0 100644
--- a/www/core/components/login/lang/ja.json
+++ b/www/core/components/login/lang/ja.json
@@ -17,6 +17,7 @@
     "invalidsite": "サイトURLが正しくありません。",
     "invalidurl": "無効なURLです。",
     "login": "ログイン",
+    "loginbutton": "ログイン",
     "logininsiterequired": "ブラウザウインドウからサイトにログインする必要があります。",
     "loginsteps": "このサイトにフルアクセスするため、あなたは最初にアカウントを作成する必要があります。",
     "missingemail": "メールアドレスが入力されていません。",
diff --git a/www/core/components/login/lang/sr-cr.json b/www/core/components/login/lang/sr-cr.json
new file mode 100644
index 00000000000..d4ba2b2f360
--- /dev/null
+++ b/www/core/components/login/lang/sr-cr.json
@@ -0,0 +1,49 @@
+{
+    "auth_email": "Самостална регистрација на основу е-адресе",
+    "authenticating": "Провера идентитета",
+    "checksiteversion": "Проверите да ли ваш сајт користи Moodle 2.4 или новију верзију.",
+    "confirmdeletesite": "Да ли сте сигурни да желите да обришете сајт {{sitename}}?",
+    "connect": "Повежите се!",
+    "connecttomoodle": "Повежите се са Moodleom",
+    "contactyouradministrator": "Обратите се администратору вашег сајта за даљу помоћ.",
+    "contactyouradministratorissue": "Замолите администратора да провери следећи проблем: {{$a}}",
+    "credentialsdescription": "За пријаву на систем унесите своје корисничко име и лозинку.",
+    "emailconfirmsent": "<p>Требало би да је послата порука на вашу е-адресу <b>{{$a}}</b></p><p>Порука садржи једноставна упутства о даљем поступку регистрације.</p><p>Ако и даље имате проблема, обратите се администратору сајта.</p>",
+    "emailnotmatch": "Адресе е-поште се не поклапају",
+    "erroraccesscontrolalloworigin": "Cross-Origin позив који покушавате да изведете је одбијен. Молимо, проверите https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
+    "errordeletesite": "Дошло је до грешке приликом брисања овог сајта. Молим, покушајте поново.",
+    "errorupdatesite": "Дошло је до грешке приликом ажурирању токена сајта.",
+    "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>teacher</i> или <i>student</i> у поље <i>Адреса сајта</i> и кликните на дугме <b>Повежи се!</b>.</p>",
+    "invalidaccount": "Проверите своје податке за пријаву или замолите вашег администратора да провери конфигурацију сајта.",
+    "invaliddate": "Неисправан датум",
+    "invalidmoodleversion": "Неисправна Moodle верзија. Неопходна је, минимално, верзија 2.4.",
+    "invalidsite": "URL адреса сајт није исправна.",
+    "invalidtime": "Неисправно време",
+    "invalidvaluemax": "Максимална вредност је {{$a}}",
+    "invalidvaluemin": "Минимална вредност је {{$a}}",
+    "localmobileunexpectedresponse": "Провера Moodle Mobile додатних функционалности вратила је неочекиван одговор. Ваш идентитет биће проверен помоћу стандардног мобилнog сервиса.",
+    "loggedoutssodescription": "Морате поново да потврдите свој идентитет. Потребно је да се пријавите на сајт у прозору веб читача.",
+    "loginbutton": "Пријава",
+    "logininsiterequired": "Потребно је да се пријавите на сајт у прозору веб читача.",
+    "mobileservicesnotenabled": "Мобилни сервиси нису омогућени на вашем сајту. Обратите се администратору вашег Moodle сајта ако мислите да мобилни приступ треба да буде омогућен.",
+    "newsitedescription": "Унесите  URL адресу вашег Moodle сајта. Имајте на уму да сајт можда није конфигурисан да ради са овом апликацијом.",
+    "notloggedin": "Морате бити пријављени.",
+    "passwordrequired": "Неопходна је лозинка",
+    "problemconnectingerror": "Имамо проблема да се повежемо са",
+    "problemconnectingerrorcontinue": "Добро проверите да ли сте правилно унели адресу и покушајте поново.",
+    "profileinvaliddata": "Неисправна вредност",
+    "recaptchachallengeimage": "reCAPTCHA слика",
+    "reconnect": "Повежите се поново",
+    "reconnectdescription": "Ваш токен за проверу идентитета је неисправан или је истекао. Морате поново да успоставите везу са сајтом.",
+    "reconnectssodescription": "Ваш токен за проверу идентитета је неисправан или је истекао. Морате поново да успоставите везу са сајтом. Потребно је да се пријавите на сајт у прозору веб читача.",
+    "signupplugindisabled": "{{$a}} није омогућен.",
+    "siteaddress": "Адреса сајта",
+    "siteinmaintenance": "Ваш сајт је у режиму одржавања",
+    "sitepolicynotagreederror": "Сагласност са политиком сајта није потврђена.",
+    "siteurl": "URL адреса сајта",
+    "siteurlrequired": "Неопходна је URL адреса, нпр. <i>http://www.yourmoodlesite.abc или https://www.yourmoodlesite.efg</i>",
+    "stillcantconnect": "Још увек не можете да се повежете?",
+    "usernamerequired": "Корисничко име је неопходно",
+    "visitchangepassword": "Да ли желите да посетите сајт како бисте променили лозинку?",
+    "webservicesnotenabled": "Веб сервиси нису омогућени на вашем сајту. Обратите се администратору вашег Moodle сајта ако мислите да мобилни приступ треба да буде омогућен."
+}
\ No newline at end of file
diff --git a/www/core/components/login/lang/sr-lt.json b/www/core/components/login/lang/sr-lt.json
new file mode 100644
index 00000000000..63bb0dd2d9f
--- /dev/null
+++ b/www/core/components/login/lang/sr-lt.json
@@ -0,0 +1,49 @@
+{
+    "auth_email": "Samostalna registracija na osnovu e-adrese",
+    "authenticating": "Provera identiteta",
+    "checksiteversion": "Proverite da li vaš sajt koristi Moodle 2.4 ili noviju verziju.",
+    "confirmdeletesite": "Da li ste sigurni da želite da obrišete sajt {{sitename}}?",
+    "connect": "Povežite se!",
+    "connecttomoodle": "Povežite se sa Moodleom",
+    "contactyouradministrator": "Obratite se administratoru vašeg sajta za dalju pomoć.",
+    "contactyouradministratorissue": "Zamolite administratora da proveri sledeći problem: {{$a}}",
+    "credentialsdescription": "Za prijavu na sistem unesite svoje korisničko ime i lozinku.",
+    "emailconfirmsent": "<p>Trebalo bi da je poslata poruka na vašu e-adresu <b>{{$a}}</b></p><p>Poruka sadrži jednostavna uputstva o daljem postupku registracije.</p><p>Ako i dalje imate problema, obratite se administratoru sajta.</p>",
+    "emailnotmatch": "Adrese e-pošte se ne poklapaju",
+    "erroraccesscontrolalloworigin": "Cross-Origin poziv koji pokušavate da izvedete je odbijen. Molimo, proverite https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
+    "errordeletesite": "Došlo je do greške prilikom brisanja ovog sajta. Molim, pokušajte ponovo.",
+    "errorupdatesite": "Došlo je do greške prilikom ažuriranju tokena sajta.",
+    "helpmelogin": "<p>Širom sveta postoji više hiljada Moodle sajtova. Ova aplikacija može se povezati samo sa Moodle sajtovima koji su namenski omogućili pristup aplikacijama za mobilne uređaje.</p><p>Ako ne možete da se povežete sa vašim Moodle sajtom potrebno je da se obratite Moodle administratoru sajta sa kojim želite da se povežete i da ga zamolite da pročita<a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a></p><p>Za testiranje aplikacije na Moodle demo sajtu unesite <i>teacher</i> ili <i>student</i> u polje <i>Adresa sajta</i> i kliknite na dugme <b>Poveži se!</b>.</p>",
+    "invalidaccount": "Proverite svoje podatke za prijavu ili zamolite vašeg administratora da proveri konfiguraciju sajta.",
+    "invaliddate": "Neispravan datum",
+    "invalidmoodleversion": "Neispravna Moodle verzija. Neophodna je, minimalno, verzija 2.4.",
+    "invalidsite": "URL adresa sajt nije ispravna.",
+    "invalidtime": "Neispravno vreme",
+    "invalidvaluemax": "Maksimalna vrednost je {{$a}}",
+    "invalidvaluemin": "Minimalna vrednost je {{$a}}",
+    "localmobileunexpectedresponse": "Provera Moodle Mobile dodatnih funkcionalnosti vratila je neočekivan odgovor. Vaš identitet biće proveren pomoću standardnog mobilnog servisa.",
+    "loggedoutssodescription": "Morate ponovo da potvrdite svoj identitet. Potrebno je da se prijavite na sajt u prozoru veb čitača.",
+    "loginbutton": "Prijava",
+    "logininsiterequired": "Potrebno je da se prijavite na sajt u prozoru veb čitača.",
+    "mobileservicesnotenabled": "Mobilni servisi nisu omogućeni na vašem sajtu. Obratite se administratoru vašeg Moodle sajta ako mislite da mobilni pristup treba da bude omogućen.",
+    "newsitedescription": "Unesite  URL adresu vašeg Moodle sajta. Imajte na umu da sajt možda nije konfigurisan da radi sa ovom aplikacijom.",
+    "notloggedin": "Morate biti prijavljeni.",
+    "passwordrequired": "Neophodna je lozinka",
+    "problemconnectingerror": "Imamo problema da se povežemo sa",
+    "problemconnectingerrorcontinue": "Dobro proverite da li ste pravilno uneli adresu i pokušajte ponovo.",
+    "profileinvaliddata": "Neispravna vrednost",
+    "recaptchachallengeimage": "reCAPTCHA slika",
+    "reconnect": "Povežite se ponovo",
+    "reconnectdescription": "Vaš token za proveru identiteta je neispravan ili je istekao. Morate ponovo da uspostavite vezu sa sajtom.",
+    "reconnectssodescription": "Vaš token za proveru identiteta je neispravan ili je istekao. Morate ponovo da uspostavite vezu sa sajtom. Potrebno je da se prijavite na sajt u prozoru veb čitača.",
+    "signupplugindisabled": "{{$a}} nije omogućen.",
+    "siteaddress": "Adresa sajta",
+    "siteinmaintenance": "Vaš sajt je u režimu održavanja",
+    "sitepolicynotagreederror": "Saglasnost sa politikom sajta nije potvrđena.",
+    "siteurl": "URL adresa sajta",
+    "siteurlrequired": "Neophodna je URL adresa, npr. <i>http://www.yourmoodlesite.abc ili https://www.yourmoodlesite.efg</i>",
+    "stillcantconnect": "Još uvek ne možete da se povežete?",
+    "usernamerequired": "Korisničko ime je neophodno",
+    "visitchangepassword": "Da li želite da posetite sajt kako biste promenili lozinku?",
+    "webservicesnotenabled": "Veb servisi nisu omogućeni na vašem sajtu. Obratite se administratoru vašeg Moodle sajta ako mislite da mobilni pristup treba da bude omogućen."
+}
\ No newline at end of file
diff --git a/www/core/components/login/lang/uk.json b/www/core/components/login/lang/uk.json
index eb2ed868ac3..1504411013a 100644
--- a/www/core/components/login/lang/uk.json
+++ b/www/core/components/login/lang/uk.json
@@ -1,11 +1,11 @@
 {
     "auth_email": "Email на основі самостійної реєстрації",
-    "authenticating": "Аутинтифікація",
+    "authenticating": "Аутентифікація",
     "cancel": "Скасувати",
     "checksiteversion": "Переконайтеся, що ваш сайт використовує Moodle 2.4 або більш пізньої версії.",
     "confirmdeletesite": "Видалити сайт {{sitename}}?",
     "connect": "З'єднано!",
-    "connecttomoodle": "Відключитись до Moodle",
+    "connecttomoodle": "Підключитись до Moodle",
     "contactyouradministrator": "Зверніться до адміністратора сайту для подальшої допомоги.",
     "contactyouradministratorissue": "Будь ласка, зверніться до адміністратора, щоб перевірити наступне питання: {{$a}}",
     "createaccount": "Створити запис",
@@ -14,18 +14,18 @@
     "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",
+    "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>",
+    "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 потрібно.",
+    "invalidmoodleversion": "Невірна версія Moodle. Мінімальна версія 2.4.",
     "invalidsite": "URL сайту недійсний.",
     "invalidtime": "Невірний час",
     "invalidurl": "Неправильний URL",
@@ -40,9 +40,9 @@
     "missingemail": "Не вказано адресу електронної пошти",
     "missingfirstname": "Не вказано ім'я",
     "missinglastname": "Не вказано прізвище",
-    "mobileservicesnotenabled": "Мобільні послуги не включені в вашому сайті. Будь ласка, зверніться до адміністратора вашого Moodle сайт, якщо ви вважаєте, мобільний доступ повинен бути включений.",
+    "mobileservicesnotenabled": "Мобільні послуги не включені в вашому сайті. Будь ласка, зверніться до адміністратора вашого Moodle сайт, якщо ви вважаєте, що мобільний доступ повинен бути включений.",
     "newaccount": "Новий обліковий запис",
-    "newsitedescription": "Будь ласка, введіть адресу вашого сайту Moodle. Зверніть увагу, що це не може бути налаштоване для роботи з цим додатком.",
+    "newsitedescription": "Будь ласка, введіть адресу вашого сайту Moodle. Зверніть увагу, що це може бути не налаштоване для роботи з цим додатком.",
     "notloggedin": "Ви повинні увійти в систему.",
     "password": "Відкритий ключ",
     "passwordrequired": "Пароль необхідний",
@@ -57,7 +57,7 @@
     "recaptchachallengeimage": "виклик reCAPTCHA",
     "reconnect": "Повторне з'єднання",
     "reconnectdescription": "Ваш маркер аутентифікації недійсний або закінчився, ви повинні підключитися до сайту.",
-    "reconnectssodescription": "Ваш маркер аутентифікації недійсний або закінчився, ви повинні підключитися до сайту. Вам необхідно увійти на сайт у вікні браузера.",
+    "reconnectssodescription": "Ваш маркер аутентифікації недійсний або закінчився, ви повинні перепідключитися до сайту. Вам необхідно увійти на сайт у вікні браузера.",
     "security_question": "Контрольне питання",
     "selectacountry": "Країна",
     "signupplugindisabled": "{{$a}} не доступно.",
@@ -67,11 +67,11 @@
     "siteurl": "URL сайту",
     "siteurlrequired": "URL сайту повинно бути схоже на <i>http://www.yourmoodlesite.abc or https://www.yourmoodlesite.efg</i>",
     "startsignup": "Створити новий обліковий запис",
-    "stillcantconnect": "До сих пір не можу підключитися?",
+    "stillcantconnect": "До сих пір не можете підключитися?",
     "supplyinfo": "Більше інформації",
     "username": "Ім’я входу",
     "usernamerequired": "Ім'я користувача необхідне",
     "usernotaddederror": "Користувач не доданий - помилка",
     "visitchangepassword": "Ви хочете відвідати сайт, щоб змінити пароль?",
-    "webservicesnotenabled": "Веб-служба не включені в вашому сайті. Будь ласка, зверніться до адміністратора вашого Moodle сайт, якщо ви вважаєте, мобільний доступ повинен бути включений."
+    "webservicesnotenabled": "Веб-служба не включені в вашому сайті. Будь ласка, зверніться до адміністратора вашого Moodle сайту, якщо ви вважаєте, що мобільний доступ повинен бути включений."
 }
\ 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..283d84af335 100644
--- a/www/core/components/question/lang/el.json
+++ b/www/core/components/question/lang/el.json
@@ -3,12 +3,17 @@
     "answersaved": "Η απάντηση αποθηκεύτηκε",
     "complete": "Ολοκλήρωση",
     "correct": "Σωστό",
+    "errorattachmentsnotsupported": "Η εφαρμογή δεν υποστηρίζει ακόμα την προσάρτηση αρχείων σε απαντήσεις.",
+    "errorinlinefilesnotsupported": "Η εφαρμογή δεν υποστηρίζει ακόμα την επεξεργασία αρχείων.",
+    "errorquestionnotsupported": "Αυτός ο τύπος ερωτήματος δεν υποστηρίζεται από την εφαρμογή: {{$a}}.",
     "feedback": "Ανάδραση",
+    "howtodraganddrop": "Πατήστε για να επιλέξετε και στη συνέχεια, πατήστε για να αφήσετε.",
     "incorrect": "Λάθος",
     "invalidanswer": "Ημιτελής απάντηση",
     "notanswered": "Δεν απαντήθηκε ακόμα",
     "notyetanswered": "Δεν έχει απαντηθεί ακόμα",
     "partiallycorrect": "Μερικώς σωστή",
+    "questionmessage": "Ερώτηση {{$a}}: {{$b}}",
     "questionno": "Ερώτηση {{$a}}",
-    "unknown": "Άγνωστο"
+    "unknown": "Δεν είναι δυνατός ο προσδιορισμός της κατάστασης"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/sr-cr.json b/www/core/components/question/lang/sr-cr.json
new file mode 100644
index 00000000000..ffe53b968b1
--- /dev/null
+++ b/www/core/components/question/lang/sr-cr.json
@@ -0,0 +1,8 @@
+{
+    "errorattachmentsnotsupported": "Апликација још увек не подржава могућност да се датотеке придруже уз одговоре.",
+    "errorinlinefilesnotsupported": "Апликација још увек не подржава уређивање унутар датотека.",
+    "errorquestionnotsupported": "Апликација не подржава овај тип питања: {{$a}}.",
+    "howtodraganddrop": "Додирните за избор, затим још једном за спуштање.",
+    "questionmessage": "Питање {{$a}}: {{$b}}",
+    "unknown": "Није могуће утврдити статус"
+}
\ No newline at end of file
diff --git a/www/core/components/question/lang/sr-lt.json b/www/core/components/question/lang/sr-lt.json
new file mode 100644
index 00000000000..938634ec0ad
--- /dev/null
+++ b/www/core/components/question/lang/sr-lt.json
@@ -0,0 +1,8 @@
+{
+    "errorattachmentsnotsupported": "Aplikacija još uvek ne podržava mogućnost da se datoteke pridruže uz odgovore.",
+    "errorinlinefilesnotsupported": "Aplikacija još uvek ne podržava uređivanje unutar datoteka.",
+    "errorquestionnotsupported": "Aplikacija ne podržava ovaj tip pitanja: {{$a}}.",
+    "howtodraganddrop": "Dodirnite za izbor, zatim još jednom za spuštanje.",
+    "questionmessage": "Pitanje {{$a}}: {{$b}}",
+    "unknown": "Nije moguće utvrditi status"
+}
\ 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 3ddcb4cabc4..a4c6af3fe0f 100644
--- a/www/core/components/question/lang/uk.json
+++ b/www/core/components/question/lang/uk.json
@@ -5,7 +5,7 @@
     "correct": "Правильно",
     "errorattachmentsnotsupported": "Додаток не підтримує прикріплення файлів відповідей",
     "errorinlinefilesnotsupported": "Додаток ще не підтримує редагування вбудованих файлів.",
-    "errorquestionnotsupported": "Цей тип питання не підтримує додатком: {{$a}}.",
+    "errorquestionnotsupported": "Цей тип питання не підтримується додатком: {{$a}}.",
     "feedback": "Відгук",
     "howtodraganddrop": "Натисніть, щоб вибрати і перемістить.",
     "incorrect": "Неправильно",
diff --git a/www/core/components/settings/lang/de.json b/www/core/components/settings/lang/de.json
index dc12fbcf598..ae82a9b0020 100644
--- a/www/core/components/settings/lang/de.json
+++ b/www/core/components/settings/lang/de.json
@@ -1,10 +1,10 @@
 {
-    "about": "Über diese App",
+    "about": "Über Moodle Mobile",
     "appready": "App nutzbar",
     "cacheexpirationtime": "Speicherdauer im Cache (Millisekunden)",
     "cannotsyncoffline": "Offline kann nicht synchronisiert werden.",
-    "cannotsyncwithoutwifi": "Die Daten wurden nicht synchronisiert, weil Ihre Einstellungen dies nur mit WLAN zulassen. Stellen Sie eine Verbindung zu einem WLAN her.",
-    "configuringnotifications": "Sie konfigurieren die Mitteilungen für '{{$a}}'.",
+    "cannotsyncwithoutwifi": "Die Daten wurden nicht synchronisiert, weil die Einstellungen dies nur mit WLAN zulassen. Stellen Sie eine WLAN-Verbindung her.",
+    "configuringnotifications": "Einstellungen für '{{$a}}'.",
     "cordovadevicemodel": "Cordova Device Model",
     "cordovadeviceosversion": "Cordova Device OS Version",
     "cordovadeviceplatform": "Cordova Device Platform",
@@ -14,7 +14,7 @@
     "currentlanguage": "Eingestellte Sprache",
     "deletesitefiles": "Möchten Sie wirklich alle von der Website '{{sitename}}' geladenen Dateien löschen?",
     "deletesitefilestitle": "Website-Dateien löschen",
-    "deviceinfo": "Geräteinfo",
+    "deviceinfo": "Geräteinformationen",
     "deviceos": "Geräte-OS",
     "devicewebworkers": "Device Web Workers unterstützt",
     "disableall": "Benachrichtungen ausschalten",
@@ -22,7 +22,7 @@
     "displayformat": "Bildschirmformat",
     "enabledebugging": "Debugging aktivieren",
     "enabledownloadsection": "Herunterladen von Abschnitten aktivieren",
-    "enabledownloadsectiondescription": "Deaktivieren Sie diese Option, wenn das Laden von Kursabschnitten im Online-Modus zu lange dauert.",
+    "enabledownloadsectiondescription": "Deaktivieren Sie diese Option, wenn das Laden von Abschnitten im Online-Modus zu lange dauert.",
     "enablerichtexteditor": "Texteditor aktivieren",
     "enablerichtexteditordescription": "Wenn diese Option aktiviert ist, wird an passenden Stellen ein Texteditor angezeigt.",
     "enablesyncwifi": "Nur mit WLAN synchronierieren",
@@ -40,7 +40,7 @@
     "navigatorlanguage": "Browsersprache",
     "navigatoruseragent": "Browserkennung (userAgent)",
     "networkstatus": "Internetverbindung",
-    "privacypolicy": "Selbstständigkeitserklärung",
+    "privacypolicy": "Datenschutzerklärung",
     "processorsettings": "Verarbeitungseinstellungen",
     "reportinbackground": "Fehler automatisch senden",
     "settings": "Einstellungen",
diff --git a/www/core/components/settings/lang/el.json b/www/core/components/settings/lang/el.json
index ded142e065b..cf6cad8002e 100644
--- a/www/core/components/settings/lang/el.json
+++ b/www/core/components/settings/lang/el.json
@@ -1,13 +1,58 @@
 {
+    "about": "Σχετικά",
+    "appready": "Η εφαρμογή είναι έτοιμη",
+    "cacheexpirationtime": "Χρόνος λήξης της προσωρινής μνήμης (miliseconds)",
+    "cannotsyncoffline": "Δεν είναι δυνατός ο συγχρονισμός εκτός σύνδεσης.",
+    "cannotsyncwithoutwifi": "Δεν μπορεί να γίνει συγχρονισμός, επειδή οι τρέχουσες ρυθμίσεις επιτρέπουν μόνο συγχρονισμό όταν είστε συνδεδεμένοι με Wi-Fi. Συνδεθείτε με ένα δίκτυο Wi-Fi.",
+    "configuringnotifications": "Ρυθμίζετε τις '{{$a}}' ειδοποιήσεις.",
+    "cordovadevicemodel": "Μοντέλο συσκευής Cordova",
+    "cordovadeviceosversion": "Cordova έκδοση συσκευής OS",
+    "cordovadeviceplatform": "Πλατφόρμα συσκευής Cordova",
+    "cordovadeviceuuid": "Cordova Device uuid",
+    "cordovaversion": "Έκδοση Cordova",
+    "credits": "Credits",
     "currentlanguage": "Επιλεγμένη γλώσσα",
+    "deletesitefiles": "Είστε βέβαιοι ότι θέλετε να διαγράψετε τα ληφθέντα αρχεία από τον ιστότοπο '{{sitename}}';",
+    "deletesitefilestitle": "Διαγραφή αρχείων ιστότοπου",
+    "deviceinfo": "Πληροφορίες συσκευές",
+    "deviceos": "Λειτουργικό σύστημα συσκευής",
+    "devicewebworkers": "Υποστηρίζονται οι συσκευές Web Workers",
     "disableall": "Προσωρινή απενεργοποίηση ειδοποιήσεων",
     "disabled": "Ανενεργό",
+    "displayformat": "Μορφή εμφάνισης",
+    "enabledebugging": "Ενεργοποίηση εντοπισμού σφαλμάτων",
+    "enabledownloadsection": "Ενεργοποιήστε τις ενότητες λήψης",
+    "enabledownloadsectiondescription": "Απενεργοποιήστε αυτήν την επιλογή για να επιταχύνετε τη φόρτωση των τμημάτων του μαθήματος.",
+    "enablerichtexteditor": "Ενεργοποιήστε τον επεξεργαστή εμπλουτισμένου κειμένου",
+    "enablerichtexteditordescription": "Εάν είναι ενεργοποιημένη, θα εμφανιστεί ένας επεξεργαστής εμπλουτισμένου κειμένου στα μέρη που το επιτρέπουν.",
+    "enablesyncwifi": "Να επιτρέπεται ο συγχρονισμός μόνο όταν είστε συνδεδεμένοι μέσω Wifi",
+    "errordeletesitefiles": "Σφάλμα κατά τη διαγραφή αρχείων ιστότοπου.",
+    "errorsyncsite": "Παρουσιάστηκε σφάλμα κατά το συγχρονισμό των δεδομένων ιστότοπου, ελέγξτε τη σύνδεση στο διαδίκτυο και δοκιμάστε ξανά.",
+    "estimatedfreespace": "Εκτιμώμενος ελεύθερος χώρος",
+    "filesystemroot": "Σύστημα αρχείων root",
     "general": "Γενικά",
     "language": "Γλώσσα",
     "license": "Άδεια GPL",
+    "localnotifavailable": "Διαθέσιμες τοπικές ειδοποιήσεις",
+    "locationhref": "Webview URL",
     "loggedin": "Συνδεδεμένος",
     "loggedoff": "Μη συνδεδεμένος",
+    "navigatorlanguage": "Γλώσσα πλοήγησης",
+    "navigatoruseragent": "Navigator userAgent",
+    "networkstatus": "Κατάσταση σύνδεσης στο Internet",
+    "privacypolicy": "Πολιτική απορρήτου",
+    "reportinbackground": "Αυτόματη αναφορά σφαλμάτων",
     "settings": "Ρυθμίσεις",
     "sites": "Δικτυακοί τόποι",
-    "total": "Συνολικά"
+    "spaceusage": "Χρήση χώρου",
+    "storagetype": "Τύπος αποθήκευσης",
+    "synchronization": "Συγχρονισμός",
+    "synchronizenow": "Συγχρονίστε τώρα",
+    "synchronizing": "Γίνεται συγχρονισμός",
+    "syncsettings": "Ρυθμίσεις συγχρονισμού",
+    "syncsitesuccess": "Τα δεδομένα ιστότοπου συγχρονίστηκαν και όλες οι προσωρινές μνήμες ακυρώθηκαν.",
+    "total": "Συνολικά",
+    "versioncode": "Κωδικός έκδοσης",
+    "versionname": "Όνομα έκδοσης",
+    "wificonnection": "Σύνδεση WiFi"
 }
\ No newline at end of file
diff --git a/www/core/components/settings/lang/es.json b/www/core/components/settings/lang/es.json
index f26bc88eda5..9e144842444 100644
--- a/www/core/components/settings/lang/es.json
+++ b/www/core/components/settings/lang/es.json
@@ -40,6 +40,7 @@
     "navigatorlanguage": "Lenguaje del navegador",
     "navigatoruseragent": "Agente de usuario del navegador",
     "networkstatus": "Estado de la conexión a internet",
+    "privacypolicy": "Política de privacidad.",
     "processorsettings": "Ajustes de procesador",
     "reportinbackground": "Informar de los errores automáticamente",
     "settings": "Configuración",
diff --git a/www/core/components/settings/lang/sr-cr.json b/www/core/components/settings/lang/sr-cr.json
new file mode 100644
index 00000000000..2001c299b89
--- /dev/null
+++ b/www/core/components/settings/lang/sr-cr.json
@@ -0,0 +1,47 @@
+{
+    "about": "О апликацији",
+    "appready": "Апликација спремна",
+    "cacheexpirationtime": "Време истека кеша (милисекунде)",
+    "cannotsyncoffline": "Офлајн синхронизација није могућа.",
+    "cannotsyncwithoutwifi": "Синхронизација није могућа зато што тренутна подешавања дозвољавају синхронизацију само када постоји веза са Wi-Fi мрежом. Повежите се на Wi-Fi мрежу.",
+    "configuringnotifications": "Конфигуришете '{{$a}}'  обавештења.",
+    "cordovadevicemodel": "Модел Cordova уређаја",
+    "cordovadeviceosversion": "Верзија оперативног система Cordova уређаја",
+    "cordovadeviceplatform": "Платформа Cordova уређаја",
+    "cordovadeviceuuid": "UUID Cordova уређаја",
+    "cordovaversion": "Cordova верзија",
+    "credits": "Заслуге",
+    "deletesitefiles": "Да ли сте сигурни да желите да обришете преузете датотеке са сајта '{{sitename}}'?",
+    "deletesitefilestitle": "Обриши датотеке сајта",
+    "deviceinfo": "Информације о уређају",
+    "deviceos": "Оперативни систем уређаја",
+    "devicewebworkers": "Web Workers уређаји подржани",
+    "displayformat": "Формат приказа",
+    "enabledebugging": "Омогући отклањање грешака",
+    "enabledownloadsection": "Омогући преузимање секција.",
+    "enabledownloadsectiondescription": "Онемогућите ову опцију како бисте убрзали учитавање секција курса.",
+    "enablerichtexteditor": "Омогући обогаћени едитор текста",
+    "enablerichtexteditordescription": "Ако је ова опција укључена обогаћени едитор текста биће приказан на местима која то дозвољавају.",
+    "enablesyncwifi": "Дозволите синхронизацију само када сте повезани на Wi-Fi мрежу.",
+    "errordeletesitefiles": "Грешка приликом брисања датотека сајта.",
+    "errorsyncsite": "Грешка приликом синхронизације података сајта. Молимо, проверите вашу интернет везу и покушајте поново.",
+    "estimatedfreespace": "Процењени слободан простора",
+    "filesystemroot": "Основни директоријум система датотека",
+    "localnotifavailable": "Локална обавештења доступна",
+    "locationhref": "Webview URL адреса",
+    "navigatorlanguage": "Језик навигатора",
+    "navigatoruseragent": "Кориснички агент навигатора",
+    "networkstatus": "Статус инернет везе",
+    "privacypolicy": "Политика приватности",
+    "reportinbackground": "Пријави грешке аутоматски",
+    "spaceusage": "Искориштеност простора",
+    "storagetype": "Тип складишта",
+    "synchronization": "Синхронизација",
+    "synchronizenow": "Синхронизуј сада",
+    "synchronizing": "Синхронизовање",
+    "syncsettings": "Подешавања синхронизације",
+    "syncsitesuccess": "Подаци сајтa су синхронизовани и сав кеш је поништен.",
+    "versioncode": "Верзија кôда",
+    "versionname": "Назив верзије",
+    "wificonnection": "WiFi веза"
+}
\ No newline at end of file
diff --git a/www/core/components/settings/lang/sr-lt.json b/www/core/components/settings/lang/sr-lt.json
new file mode 100644
index 00000000000..3dbe087bed0
--- /dev/null
+++ b/www/core/components/settings/lang/sr-lt.json
@@ -0,0 +1,47 @@
+{
+    "about": "O aplikaciji",
+    "appready": "Aplikacija spremna",
+    "cacheexpirationtime": "Vreme isteka keša (milisekunde)",
+    "cannotsyncoffline": "Oflajn sinhronizacija nije moguća.",
+    "cannotsyncwithoutwifi": "Sinhronizacija nije moguća zato što trenutna podešavanja dozvoljavaju sinhronizaciju samo kada postoji veza sa Wi-Fi mrežom. Povežite se na Wi-Fi mrežu.",
+    "configuringnotifications": "Konfigurišete '{{$a}}'  obaveštenja.",
+    "cordovadevicemodel": "Model Cordova uređaja",
+    "cordovadeviceosversion": "Verzija operativnog sistema Cordova uređaja",
+    "cordovadeviceplatform": "Platforma Cordova uređaja",
+    "cordovadeviceuuid": "UUID Cordova uređaja",
+    "cordovaversion": "Cordova verzija",
+    "credits": "Zasluge",
+    "deletesitefiles": "Da li ste sigurni da želite da obrišete preuzete datoteke sa sajta '{{sitename}}'?",
+    "deletesitefilestitle": "Obriši datoteke sajta",
+    "deviceinfo": "Informacija o uređaju",
+    "deviceos": "Operativni sistem uređaja",
+    "devicewebworkers": "Web Workers uređaji podržani",
+    "displayformat": "Format prikaza",
+    "enabledebugging": "Omogući otklanjanje grešaka",
+    "enabledownloadsection": "Omogući preuzimanje sekcija.",
+    "enabledownloadsectiondescription": "Onemogućite ovu opciju kako biste ubrzali učitavanje sekcija kursa.",
+    "enablerichtexteditor": "Omogući obogaćeni editor teksta",
+    "enablerichtexteditordescription": "Ako je ova opcija uključena obogaćeni editor teksta biće prikazan na mestima koja to dozvoljavaju.",
+    "enablesyncwifi": "Dozvolite sinhronizaciju samo kada ste povezani na Wi-Fi mrežu.",
+    "errordeletesitefiles": "Greška prilikom brisanja datoteka sajta.",
+    "errorsyncsite": "Greška prilikom sinhronizacije podataka sajta. Molimo, proverite vašu internet vezu i pokušajte ponovo.",
+    "estimatedfreespace": "Procenjeni slobodan prostora",
+    "filesystemroot": "Osnovni direktorijum sistema datoteka",
+    "localnotifavailable": "Lokalna obaveštenja dostupna",
+    "locationhref": "Webview URL adresa",
+    "navigatorlanguage": "Jezik navigatora",
+    "navigatoruseragent": "Korisnički agent navigatora",
+    "networkstatus": "Status inernet veze",
+    "privacypolicy": "Politika privatnosti",
+    "reportinbackground": "Prijavi greške automatski",
+    "spaceusage": "Iskorištenost prostora",
+    "storagetype": "Tip skladišta",
+    "synchronization": "Sinhronizacija",
+    "synchronizenow": "Sinhronizuj sada",
+    "synchronizing": "Sinhronizovanje",
+    "syncsettings": "Podešavanja sinhronizacije",
+    "syncsitesuccess": "Podaci sajta su sinhronizovani i sav keš je poništen.",
+    "versioncode": "Verzija kôda",
+    "versionname": "Naziv verzije",
+    "wificonnection": "WiFi veza"
+}
\ No newline at end of file
diff --git a/www/core/components/settings/lang/uk.json b/www/core/components/settings/lang/uk.json
index b918ac439dc..19e3c097dcc 100644
--- a/www/core/components/settings/lang/uk.json
+++ b/www/core/components/settings/lang/uk.json
@@ -1,11 +1,11 @@
 {
-    "about": "Про",
+    "about": "Про додаток",
     "appready": "Додаток готовий",
     "cacheexpirationtime": "Час закінчення кеша (мілісекунди)",
     "cannotsyncoffline": "Неможливо синхронізувати в автономному режимі.",
-    "cannotsyncwithoutwifi": "Неможливо синхронізувати, так як поточні настройки тільки дозволяють синхронізувати при підключенні до Wi-Fi. Підключіться до мережі Wi-Fi.",
-    "configuringnotifications": "Ви налаштовуєте '{{$a}}' повідомлення.",
-    "cordovadevicemodel": "Модель пристрою Кордова",
+    "cannotsyncwithoutwifi": "Неможливо синхронізувати, так як поточні налаштування тільки дозволяють синхронізуватись при підключенні до Wi-Fi. Підключіться до мережі Wi-Fi.",
+    "configuringnotifications": "Ви налаштовуєте '{{$a}}' сповіщення.",
+    "cordovadevicemodel": "Модель пристрою Cordova",
     "cordovadeviceosversion": "Cordova Device OS version",
     "cordovadeviceplatform": "Cordova Device platform",
     "cordovadeviceuuid": "Cordova Device uuid",
@@ -24,8 +24,8 @@
     "enabledownloadsection": "Увімкнути секцію завантаження",
     "enabledownloadsectiondescription": "Вимкніть цей параметр, щоб прискорити завантаження курсу секцій.",
     "enablerichtexteditor": "Включити редактор тексту",
-    "enablerichtexteditordescription": "Якщо цей параметр включений, розширений текстовий редактор буде показаний в тих місцях, які дозволяють їй.",
-    "enablesyncwifi": "Дозволити синхронізацію тільки тоді, коли на Wi-Fi",
+    "enablerichtexteditordescription": "Якщо цей параметр включений, розширений текстовий редактор буде показаний в тих місцях, які дозволяють це.",
+    "enablesyncwifi": "Тільки Wi-Fi синхронізація",
     "errordeletesitefiles": "Помилка видалення файлів сайту",
     "errorsyncsite": "Помилка синхронізації даних сайту, будь ласка, перевірте підключення до Інтернету і спробуйте ще раз.",
     "estimatedfreespace": "Розрахунковий вільний простір",
@@ -33,13 +33,13 @@
     "general": "Основне",
     "language": "Мова інтерфейсу",
     "license": "Ліцензія",
-    "localnotifavailable": "Локальні сповіщення доступні",
+    "localnotifavailable": "Доступні локальні сповіщення",
     "locationhref": "Webview URL",
     "loggedin": "В мережі",
     "loggedoff": "Поза мережею",
     "navigatorlanguage": "Мова навігації",
-    "navigatoruseragent": "Navigator userAgent",
-    "networkstatus": "Статут інтернет з'єднання",
+    "navigatoruseragent": "Навігаційний userAgent",
+    "networkstatus": "Статус інтернет з'єднання",
     "privacypolicy": "Політика конфіденційності",
     "reportinbackground": "Відправляти помилки автоматично",
     "settings": "Параметри завдання",
diff --git a/www/core/components/sharedfiles/lang/de.json b/www/core/components/sharedfiles/lang/de.json
index f682d1fb09c..6bbe564a7ac 100644
--- a/www/core/components/sharedfiles/lang/de.json
+++ b/www/core/components/sharedfiles/lang/de.json
@@ -2,10 +2,10 @@
     "chooseaccountstorefile": "Wählen Sie ein Nutzerkonto, um die Datei dort zu speichern.",
     "chooseactionrepeatedfile": "Eine Datei mit diesem Namen existiert bereits. Möchten Sie die vorhandene Datei ersetzen oder möchten Sie sie umbenennen in '{{$a}}'?",
     "errorreceivefilenosites": "Keine Websites gespeichert. Fügen Sie zuerst eine Website hinzu, bevor Sie eine Datei über die App freigeben.",
-    "nosharedfiles": "Keine freigegebenen Dateien für diese Website",
+    "nosharedfiles": "Keine geteilten 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",
-    "sharedfiles": "Freigegebene Dateien",
+    "sharedfiles": "Geteilte 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/el.json b/www/core/components/sharedfiles/lang/el.json
index 581cf18441d..d6eef40792d 100644
--- a/www/core/components/sharedfiles/lang/el.json
+++ b/www/core/components/sharedfiles/lang/el.json
@@ -1,4 +1,11 @@
 {
+    "chooseaccountstorefile": "Επιλέξτε ένα λογαριασμό για να αποθηκεύσετε το αρχείο.",
+    "chooseactionrepeatedfile": "Υπάρχει ήδη ένα αρχείο με αυτό το όνομα. Θέλετε να αντικαταστήσετε το υπάρχον αρχείο ή να το μετονομάσετε σε \"{{$a}}\";",
+    "errorreceivefilenosites": "Δεν υπάρχουν αποθηκευμένες τοποθεσίες. Προσθέστε έναν ιστότοπο προτού μοιραστείτε ένα αρχείο με την εφαρμογή.",
+    "nosharedfiles": "Δεν υπάρχουν αποθηκευμένα αρχεία σε αυτόν τον ιστότοπο.",
+    "nosharedfilestoupload": "Δεν έχετε αρχεία για μεταφόρτωση εδώ. Αν θέλετε να μεταφορτώσετε ένα αρχείο από άλλη εφαρμογή, εντοπίστε το αρχείο και κάντε κλικ στο κουμπί \"Άνοιγμα σε\".",
     "rename": "Μετονομασία",
-    "replace": "Αντικατάσταση"
+    "replace": "Αντικατάσταση",
+    "sharedfiles": "Κοινόχρηστα αρχεία",
+    "successstorefile": "Το αρχείο αποθηκεύτηκε με επιτυχία. Τώρα μπορείτε να επιλέξετε αυτό το αρχείο για να το ανεβάσετε στα ιδιωτικά αρχεία σας ή να το επισυνάψετε σε ορισμένες δραστηριότητες."
 }
\ No newline at end of file
diff --git a/www/core/components/sharedfiles/lang/fr.json b/www/core/components/sharedfiles/lang/fr.json
index 39b85fbf055..27784aa42fb 100644
--- a/www/core/components/sharedfiles/lang/fr.json
+++ b/www/core/components/sharedfiles/lang/fr.json
@@ -2,7 +2,7 @@
     "chooseaccountstorefile": "Veuillez choisir un compte dans lequel enregistrer le fichier.",
     "chooseactionrepeatedfile": "Un fichier de ce nom existe déjà. Voulez-vous remplacer le fichier existant ou le renommer en « {{$a}} »?",
     "errorreceivefilenosites": "Aucun site n'est enregistré. Veuillez ajouter un site avant de partager un site avec l'app.",
-    "nosharedfiles": "Il n'y a pas de fichier partagés sur ce site.",
+    "nosharedfiles": "Il n'y a pas de fichier partagé sur ce site.",
     "nosharedfilestoupload": "Il n'y a pas de fichier à déposer ici. Si vous voulez déposer un fichier à partir d'une autre app, localiser le fichier et tapoter « Ouvrir dans ».",
     "rename": "Renommer",
     "replace": "Remplacer",
diff --git a/www/core/components/sharedfiles/lang/sr-cr.json b/www/core/components/sharedfiles/lang/sr-cr.json
new file mode 100644
index 00000000000..3b9b852cf35
--- /dev/null
+++ b/www/core/components/sharedfiles/lang/sr-cr.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/sharedfiles/lang/sr-lt.json b/www/core/components/sharedfiles/lang/sr-lt.json
new file mode 100644
index 00000000000..796ef026796
--- /dev/null
+++ b/www/core/components/sharedfiles/lang/sr-lt.json
@@ -0,0 +1,11 @@
+{
+    "chooseaccountstorefile": "Izaberite nalog za čuvanje datoteke.",
+    "chooseactionrepeatedfile": "Već postoji datoteka sa ovim nazivom. Da li želite da zamenite postojeću datoteku ili da joj naziv promenite u \"{{$a}}\"?",
+    "errorreceivefilenosites": "Ne postoje memorisani sajtovi. Molimo, dodajte sajt pre nego što pokušate da podelite datoteke sa aplikacijom.",
+    "nosharedfiles": "Ne postoje deljene datoteke koje se nalaze na ovom sajtu.",
+    "nosharedfilestoupload": "Ovde nemate datoteke koje možete da otpremite. Ako želite da otpremite datoteku iz druge aplikacije, pronađite tu datoteku i kliknite na dugme 'Otvori u'.",
+    "rename": "Promeni naziv",
+    "replace": "Zameni",
+    "sharedfiles": "Deljene datoteke",
+    "successstorefile": "Datoteka je uspešno sačuvana. Sada možete da izaberete ovu datoteku da biste je otpremili među svoje privatne datoteke ili je pridružili nekoj aktivnosti."
+}
\ 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 79a0f6adb0d..79c72d2c731 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/el.json b/www/core/components/sidemenu/lang/el.json
index 46aa4595112..2e0168f9e01 100644
--- a/www/core/components/sidemenu/lang/el.json
+++ b/www/core/components/sidemenu/lang/el.json
@@ -1,5 +1,9 @@
 {
+    "appsettings": "Ρυθμίσεις εφαρμογής",
+    "changesite": "Αλλαγή ιστότοπου",
     "help": "Βοήθεια",
-    "logout": "Έξοδος",
-    "mycourses": "Τα μαθήματά μου"
+    "logout": "Αποσύνδεση",
+    "mycourses": "Τα μαθήματά μου",
+    "togglemenu": "Αλλαγή μενού",
+    "website": "Ιστότοπος"
 }
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/sr-cr.json b/www/core/components/sidemenu/lang/sr-cr.json
new file mode 100644
index 00000000000..8323e0aa5bd
--- /dev/null
+++ b/www/core/components/sidemenu/lang/sr-cr.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/sr-lt.json b/www/core/components/sidemenu/lang/sr-lt.json
new file mode 100644
index 00000000000..aa6e18a3722
--- /dev/null
+++ b/www/core/components/sidemenu/lang/sr-lt.json
@@ -0,0 +1,9 @@
+{
+    "appsettings": "Podešavanja aplikacije",
+    "changesite": "Promeni sajt",
+    "help": "Pomoć",
+    "logout": "Odjava",
+    "mycourses": "Moji kursevi",
+    "togglemenu": "Uključi/isključi meni",
+    "website": "Veb sajt"
+}
\ No newline at end of file
diff --git a/www/core/components/user/lang/ar.json b/www/core/components/user/lang/ar.json
index ee88dd1fe2f..33cf6dc0156 100644
--- a/www/core/components/user/lang/ar.json
+++ b/www/core/components/user/lang/ar.json
@@ -4,7 +4,7 @@
     "contact": "جهة اتصال",
     "country": "الدولة",
     "description": "الوصف",
-    "details": "تفاصيل متابعة اسكو",
+    "details": "التفاصيل",
     "editingteacher": "معلم",
     "email": "عنوان البريد الإلكتروني",
     "emailagain": "إعادة إدخال البريد الإلكتروني للتأكيد ",
@@ -15,7 +15,7 @@
     "manager": "مدير",
     "newpicture": "صورة شخصية جديدة",
     "phone1": "هاتف",
-    "phone2": "رقم الهاتف المحمول",
+    "phone2": "الجوال",
     "roles": "أدوار",
     "student": "طالب",
     "viewprofile": "عرض الحساب",
diff --git a/www/core/components/user/lang/da.json b/www/core/components/user/lang/da.json
index b55d48a20e1..507cc600278 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": "Introduktionstekst",
-    "details": "Følg detaljer",
+    "details": "Detaljer",
     "detailsnotavailable": "Denne brugers data er ikke tilgængelige for dig.",
     "editingteacher": "Lærer",
     "email": "E-mailadresse",
     "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/el.json b/www/core/components/user/lang/el.json
index f041ebc81a0..007097ea4bb 100644
--- a/www/core/components/user/lang/el.json
+++ b/www/core/components/user/lang/el.json
@@ -1,20 +1,26 @@
 {
     "address": "Διεύθυνση",
     "city": "Πόλη/χωριό",
+    "contact": "Επικοινωνία",
     "country": "Χώρα",
     "description": "Κείμενο εισαγωγής",
-    "details": "Παρακολούθηση λεπτομερειών",
+    "details": "Λεπτομέρειες",
+    "detailsnotavailable": "Λεπτομέρειες για αυτό τον χρήστη δεν είναι διαθέσιμες.",
+    "editingteacher": "Διδάσκων",
     "email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
     "emailagain": "Email (ξανά)",
     "firstname": "Όνομα",
     "interests": "Ενδιαφέροντα",
     "invaliduser": "Μη έγκυρος χρήστης",
     "lastname": "Επώνυμο",
+    "manager": "Διαχειριστής",
     "newpicture": "Νέα εικόνα",
     "phone1": "Τηλέφωνο",
-    "phone2": "Κινητό τηλέφωνο",
+    "phone2": "Κινητό",
     "roles": "Ρόλοι",
-    "student": "Φοιτητής",
+    "sendemail": "Email",
+    "student": "Μαθητής",
+    "teacher": "Διδάσκων χωρίς δικαιώματα αλλαγής",
     "viewprofile": "Επισκόπηση του προφίλ",
     "webpage": "Ιστοσελίδα"
 }
\ 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 a57e113d551..53dbd5e228c 100644
--- a/www/core/components/user/lang/es.json
+++ b/www/core/components/user/lang/es.json
@@ -18,6 +18,7 @@
     "phone1": "Teléfono",
     "phone2": "Móvil",
     "roles": "Roles",
+    "sendemail": "Correo electrónico",
     "student": "Estudiante",
     "teacher": "Profesor sin permiso de edición",
     "viewprofile": "Ver perfil",
diff --git a/www/core/components/user/lang/he.json b/www/core/components/user/lang/he.json
index a4891acf920..76f6e8d241e 100644
--- a/www/core/components/user/lang/he.json
+++ b/www/core/components/user/lang/he.json
@@ -1,22 +1,22 @@
 {
     "address": "כתובת",
     "city": "ישוב",
-    "contact": "ליצירת קשר",
+    "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/ja.json b/www/core/components/user/lang/ja.json
index ed89cc07550..1d661257fae 100644
--- a/www/core/components/user/lang/ja.json
+++ b/www/core/components/user/lang/ja.json
@@ -1,10 +1,10 @@
 {
     "address": "住所",
     "city": "都道府県",
-    "contact": "連絡先",
+    "contact": "コンタクト",
     "country": "国",
     "description": "説明",
-    "details": "トラック詳細",
+    "details": "詳細",
     "email": "メールアドレス",
     "emailagain": "メールアドレス (もう一度)",
     "firstname": "名",
diff --git a/www/core/components/user/lang/sr-cr.json b/www/core/components/user/lang/sr-cr.json
new file mode 100644
index 00000000000..8770ab16865
--- /dev/null
+++ b/www/core/components/user/lang/sr-cr.json
@@ -0,0 +1,12 @@
+{
+    "contact": "Контакт",
+    "details": "Подаци о кориснику",
+    "detailsnotavailable": "Подаци о овом кориснику вам нису доступни.",
+    "editingteacher": "Предавач",
+    "invaliduser": "Неисправан корисник.",
+    "manager": "Менаџер",
+    "phone2": "Мобилни",
+    "sendemail": "Е-пошта",
+    "student": "Полазник",
+    "teacher": "Предавач без уређивачких права"
+}
\ No newline at end of file
diff --git a/www/core/components/user/lang/sr-lt.json b/www/core/components/user/lang/sr-lt.json
new file mode 100644
index 00000000000..96a85eb0ff5
--- /dev/null
+++ b/www/core/components/user/lang/sr-lt.json
@@ -0,0 +1,12 @@
+{
+    "contact": "Kontakt",
+    "details": "Podaci o korisniku",
+    "detailsnotavailable": "Podaci o ovom korisniku vam nisu dostupni.",
+    "editingteacher": "Predavač",
+    "invaliduser": "Neispravan korisnik.",
+    "manager": "Menadžer",
+    "phone2": "Mobilni",
+    "sendemail": "E-pošta",
+    "student": "Polaznik",
+    "teacher": "Predavač bez uređivačkih prava"
+}
\ No newline at end of file
diff --git a/www/core/lang/ar.json b/www/core/lang/ar.json
index a16f56062b9..60af9e74633 100644
--- a/www/core/lang/ar.json
+++ b/www/core/lang/ar.json
@@ -103,7 +103,7 @@
     "required": "مفروض",
     "save": "حفظ",
     "search": "بحث",
-    "searching": "بحث في",
+    "searching": "يتم البحث",
     "searchresults": "نتائج البحث",
     "sec": "ثانية",
     "secs": "ثواني",
diff --git a/www/core/lang/da.json b/www/core/lang/da.json
index 847a8e2b5f1..fdb455e8fae 100644
--- a/www/core/lang/da.json
+++ b/www/core/lang/da.json
@@ -16,12 +16,12 @@
     "close": "Luk",
     "comments": "Dine kommentarer",
     "commentscount": "Kommentarer ({{$a}})",
-    "completion-alt-auto-fail": "Gennemført: {{$a}} (opnåede ikke beståelseskarakter)",
+    "completion-alt-auto-fail": "Gennemført: {{$a}} (bestod ikke)",
     "completion-alt-auto-n": "Ikke gennemført: {{$a}}",
-    "completion-alt-auto-pass": "Gennemført: {{$a}} (opnåede beståelseskarakter)",
+    "completion-alt-auto-pass": "Gennemført: {{$a}} (bestod)",
     "completion-alt-auto-y": "Gennemført: {{$a}}",
-    "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.",
+    "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.",
     "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?",
@@ -115,7 +115,7 @@
     "notice": "Bemærk",
     "now": "nu",
     "numwords": "{{$a}} ord",
-    "offline": "Der kræves ikke online-aflevering",
+    "offline": "Offline",
     "online": "Online",
     "openfullimage": "Klik her for at vise billedet i fuld størrelse.",
     "openinbrowser": "Åben i browser",
@@ -130,7 +130,7 @@
     "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øg i",
+    "searching": "Søger",
     "searchresults": "Søgeresultater",
     "sec": "sekunder",
     "secs": "sekunder",
@@ -147,7 +147,7 @@
     "sizetb": "TB",
     "start": "Start",
     "submit": "Gem",
-    "success": "Succes",
+    "success": "Succes!",
     "tablet": "Tablet",
     "teachers": "Undervisere",
     "time": "Tidspunkt",
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index 01ffb362a04..0a1f805526f 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -25,10 +25,12 @@
     "completion-alt-manual-y": "Ολοκληρώθηκε: {{$a}}. Επιλέξτε για να οριστεί ως μη ολοκληρωμένο.",
     "confirmcanceledit": "Είστε σίγουροι ότι θέλετε να αποχωρήσετε από αυτήν τη σελίδα; Όλες οι αλλαγές θα χαθούν.",
     "confirmdeletefile": "Είστε σίγουροι οτι θέλετε να διαγράψετε αυτό το αρχείο?",
+    "confirmloss": "Είστε σίγουροι? Όλες οι αλλαγές θα χαθούν.",
     "confirmopeninbrowser": "Θέλετε να το ανοίξετε στο πρόγραμμα περιήγησης;",
     "content": "Περιεχόμενο",
     "contenteditingsynced": "Το περιεχόμενο που επεξεργάζεστε έχει συγχρονιστεί.",
     "continue": "Συνέχεια",
+    "copiedtoclipboard": "Το κείμενο αντιγράφηκε στο πρόχειρο",
     "course": "Μάθημα",
     "coursedetails": "Λεπτομέρειες μαθήματος",
     "currentdevice": "Τρέχουσα συσκευή",
@@ -42,6 +44,7 @@
     "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",
@@ -51,6 +54,7 @@
     "download": "Μεταφόρτωση",
     "downloading": "Κατέβασμα",
     "edit": "Edit",
+    "emptysplit": "Αυτή η σελίδα θα εμφανιστεί κενή, εάν ο αριστερός πίνακας είναι κενός ή φορτώνεται.",
     "error": "Σφάλμα",
     "errorchangecompletion": "Παρουσιάστηκε σφάλμα κατά την αλλαγή της κατάστασης ολοκλήρωσης. Παρακαλώ προσπαθήστε ξανά.",
     "errordeletefile": "Σφάλμα κατά τη διαγραφή του αρχείου. Παρακαλώ προσπαθήστε ξανά.",
@@ -59,6 +63,7 @@
     "errorfileexistssamename": "Υπάρχει ήδη ένα αρχείο με αυτό το όνομα.",
     "errorinvalidform": "Η φόρμα περιέχει μη έγκυρα δεδομένα. Παρακαλούμε φροντίστε να συμπληρώσετε όλα τα απαιτούμενα πεδία και ότι τα δεδομένα είναι έγκυρα.",
     "errorinvalidresponse": "Ελήφθη μη έγκυρη απάντηση. Επικοινωνήστε με το διαχειριστή εάν το πρόβλημα επιμείνει.",
+    "errorloadingcontent": "Σφάλμα κατά τη φόρτωση περιεχομένου.",
     "erroropenfilenoapp": "Σφάλμα κατά το άνοιγμα του αρχείου: δεν βρέθηκε εφαρμογή για το άνοιγμα αυτού του είδους αρχεία.",
     "erroropenfilenoextension": "Σφάλμα κατά το άνοιγμα του αρχείου: το αρχείο δεν έχει επέκταση.",
     "erroropenpopup": "Αυτή η δραστηριότητα προσπαθεί να ανοίξει ένα αναδυόμενο παράθυρο. Αυτό δεν υποστηρίζεται σε αυτή την εφαρμογή.",
@@ -87,6 +92,7 @@
     "lastsync": "Τελευταίος συγχρονισμός",
     "listsep": ";",
     "loading": "Φορτώνει",
+    "loadmore": "Φόρτωση περισσότερων",
     "lostconnection": "Η σύνδεσή σας είναι άκυρη ή έχει λήξει. Πρέπει να ξανασυνδεθείτε στο site.",
     "maxsizeandattachments": "Μέγιστο μέγεθος για νέα αρχεία: {{$a.size}}, μέγιστος αριθμός συνημμένων: {{$a.attachments}}",
     "min": "λεπτό",
@@ -183,6 +189,8 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh oh!",
     "unexpectederror": "Απρόσμενο σφάλμα. Κλείστε και ανοίξτε ξανά την εφαρμογή για να προσπαθήσετε ξανά",
+    "unicodenotsupported": "Ορισμένα emojis δεν υποστηρίζονται σε αυτόν τον ιστότοπο. Αυτοί οι χαρακτήρες θα αφαιρεθούν κατά την αποστολή του μηνύματος.",
+    "unicodenotsupportedcleanerror": "Κενό κείμενο βρέθηκε κατά τον καθαρισμό χαρακτήρων Unicode.",
     "unknown": "Άγνωστο",
     "unlimited": "Χωρίς περιορισμό",
     "unzipping": "Αποσυμπίεση",
diff --git a/www/core/lang/es.json b/www/core/lang/es.json
index 708e85381b9..24c93e6d7bd 100644
--- a/www/core/lang/es.json
+++ b/www/core/lang/es.json
@@ -25,10 +25,12 @@
     "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á seguro? Se perderán todos los cambios.",
     "confirmopeninbrowser": "¿Quiere abrirlo en el navegador?",
     "content": "Contenido",
     "contenteditingsynced": "El contenido que está editando ha sido sincronizado.",
     "continue": "Continuar",
+    "copiedtoclipboard": "Texto copiado al portapapeles",
     "course": "Curso",
     "coursedetails": "Detalles del curso",
     "currentdevice": "Dispositivo actual",
@@ -42,6 +44,7 @@
     "description": "Descripción",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
+    "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
@@ -51,6 +54,7 @@
     "download": "Descargar",
     "downloading": "Descargando...",
     "edit": "Edición",
+    "emptysplit": "Esta página aparecerá en blanco si el panel izquierdo está vacío o si está cargando.",
     "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.",
@@ -59,6 +63,7 @@
     "errorfileexistssamename": "Ya existe un archivo con este nombre.",
     "errorinvalidform": "El formulario contiene datos inválidos. Por favor, asegúrese de rellenar todos los campos requeridos y que los datos son válidos.",
     "errorinvalidresponse": "Se ha recibido una respuesta no válida. Por favor contactar con el administrador de Moodle si el error persiste.",
+    "errorloadingcontent": "Error cargando contenido.",
     "erroropenfilenoapp": "Error durante la apertura del archivo: no se encontró ninguna aplicación capaz de abrir este tipo de archivo.",
     "erroropenfilenoextension": "Se ha producido un error abriendo el archivo: el archivo no tiene extensión.",
     "erroropenpopup": "Esta actividad está intentando abrir una ventana emergente. Esta aplicación no lo soporta.",
@@ -88,6 +93,7 @@
     "lastsync": "Última sincronización",
     "listsep": ";",
     "loading": "Cargando",
+    "loadmore": "Cargar más",
     "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",
@@ -185,6 +191,8 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "¡Oh oh!",
     "unexpectederror": "Error inesperado. Por favor cierre y vuelva a abrir la aplicación para intentarlo de nuevo",
+    "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",
     "unzipping": "Descomprimiendo",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index 6b59ade573d..e6a40702a51 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -45,6 +45,7 @@
     "description": "Description",
     "dfdaymonthyear": "DD-MM-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
+    "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "hh[:]mm",
@@ -54,6 +55,7 @@
     "download": "Télécharger",
     "downloading": "Téléchargement en cours",
     "edit": "Modifier",
+    "emptysplit": "Cette page paraîtra vide si le panneau de gauche est vide ou en cours de chargement.",
     "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.",
@@ -92,6 +94,7 @@
     "lastsync": "Dernière synchronisation",
     "listsep": ";",
     "loading": "Chargement",
+    "loadmore": "Charger plus",
     "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",
@@ -189,7 +192,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Aïe !",
     "unexpectederror": "Erreur inattendue. Veuillez fermer et rouvrir l'app pour continuer",
-    "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.",
+    "unicodenotsupported": "Certains emojis ne sont pas supportés sur ce site. Ils 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 d0306063c87..63788a56caf 100644
--- a/www/core/lang/he.json
+++ b/www/core/lang/he.json
@@ -14,12 +14,12 @@
     "close": "סגירה",
     "comments": "ההערות שלך",
     "commentscount": "({{$a}}) הערות",
-    "completion-alt-auto-fail": "הושלם: {{$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": "המשך",
@@ -105,8 +105,8 @@
     "notice": "לתשומת לב",
     "now": "עכשיו",
     "numwords": "{{$a}} מילים",
-    "offline": "לא נדרשות הגשות מקוונות",
-    "online": "מקוון",
+    "offline": "לא מחובר",
+    "online": "מחובר",
     "openfullimage": "יש להקליק כאן להצגת התמונה בגודל מלא",
     "openinbrowser": "תצוגה בדפדפן",
     "pagea": "עמוד {{$a}}",
@@ -125,7 +125,7 @@
     "secs": "שניות",
     "seemoredetail": "הקליקו כאן כדי לראות פרטים נוספים",
     "send": "שליחה",
-    "sending": "שולחים",
+    "sending": "שולח",
     "serverconnection": "שגיאה בהתחברות לשרת",
     "show": "הצגה",
     "site": "מערכת",
@@ -135,7 +135,7 @@
     "sizemb": "MB",
     "start": "התחלה",
     "submit": "שמירה",
-    "success": "הצלחה",
+    "success": "הצלחה!",
     "tablet": "טאבלט",
     "teachers": "מורים",
     "time": "זמן",
diff --git a/www/core/lang/ja.json b/www/core/lang/ja.json
index 72124e5922a..27ba12cde6a 100644
--- a/www/core/lang/ja.json
+++ b/www/core/lang/ja.json
@@ -1,56 +1,100 @@
 {
+    "accounts": "アカウント",
     "allparticipants": "すべての参加者",
+    "android": "Android",
     "areyousure": "本当によろしいですか?",
     "back": "戻る",
     "cancel": "キャンセル",
     "cannotconnect": "接続できません：正しいURLを入力しているか、サイトのMoodleが2.4以降であることを確認してください。",
+    "cannotdownloadfiles": "ダウンロードしようとしているファイルは、あなたのモバイルサービスでは無効になっています。あなたのサイト管理者に連絡してください。",
     "category": "カテゴリ",
     "choose": "選択",
     "choosedots": "選択 ...",
+    "clearsearch": "検索のクリア",
     "clicktohideshow": "展開または折りたたむにはここをクリックしてください。",
+    "clicktoseefull": "クリックで全てのコンテンツを見る",
     "close": "閉じる",
     "comments": "あなたのコメント",
     "commentscount": "コメント ({{$a}})",
-    "completion-alt-auto-fail": "完了: {{$a}} (合格点未到達)",
-    "completion-alt-auto-n": "未完了: {{$a}}",
-    "completion-alt-auto-pass": "完了: {{$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-manual-n": "未了: {{$a}}。選択して完了に変更してください。",
+    "completion-alt-manual-y": "完了: {{$a}}。選択して未了に変更してください。",
+    "confirmcanceledit": "本当にこのページを離れますか？　全ての変更が失われます。",
     "confirmdeletefile": "本当にこのファイルを削除してもよろしいですか?",
+    "confirmloss": "本当ですか？　すべての変更が失われます。",
+    "confirmopeninbrowser": "これをブラウザで開きますか？",
     "content": "コンテンツ",
+    "contenteditingsynced": "編集中のコンテンツが同期されました。",
     "continue": "続ける",
+    "copiedtoclipboard": "クリップボードにコピーされたテキスト",
     "course": "コース",
     "coursedetails": "コース詳細",
+    "currentdevice": "現在のデバイス",
+    "datastoredoffline": "送信できなかったため、データはデバイスに保存されました。後で自動的に送信されます。",
     "date": "日付",
     "day": "日",
     "days": "日",
     "decsep": ".",
     "defaultvalue": "デフォルト ({{$a}})",
     "delete": "削除",
-    "deleting": "削除中",
+    "deleting": "消去中",
     "description": "説明",
+    "dfdaymonthyear": "YYYY/MM/DD",
+    "dfdayweekmonth": "MMM月D日（ddd）",
+    "dffulldate": "YYYY年MMMM月D日（dddd） h[:]mm A",
+    "dflastweekdate": "ddd",
+    "dfmediumdate": "LLL",
+    "dftimedate": "h[:]mm A",
+    "discard": "無視",
+    "dismiss": "取消",
     "done": "完了",
     "download": "ダウンロード",
-    "downloading": "ダウンロード中 ...",
+    "downloading": "ダウンロード中",
     "edit": "編集",
+    "emptysplit": "左パネルが空またはロード中のため本ページは空白",
     "error": "エラー",
-    "errordownloading": "ファイルのダウンロードのエラー",
+    "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": "分",
@@ -68,6 +112,7 @@
     "mod_survey": "調査",
     "mod_wiki": "Wiki",
     "moduleintro": "説明",
+    "mygroups": "マイグループ",
     "name": "名称",
     "networkerrormsg": "ネットワークが無効もしくは機能していません",
     "never": "なし",
@@ -76,23 +121,33 @@
     "nocomments": "コメントなし",
     "nograde": "評点なし",
     "none": "なし",
-    "nopasswordchangeforced": "あなたはパスワードを変更せずに次へ進むことはできません。しかし、パスワードを変更するため利用できるページがありません。あなたのMoodle管理者にご連絡ください。",
+    "nopasswordchangeforced": "パスワードを変更するまで続きを実行できません。",
     "nopermissions": "申し訳ございません、現在、あなたは 「 {{$a}} 」を実行するためのパーミッションがありません。",
     "noresults": "該当データがありません。",
+    "notapplicable": "なし",
     "notice": "警告",
+    "notsent": "未送信",
     "now": "現在",
     "numwords": "{{$a}} 語",
-    "offline": "オンライン提出不要",
+    "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": "検索:",
+    "searching": "検索中",
     "searchresults": "検索結果",
     "sec": "秒",
     "secs": "秒",
@@ -101,21 +156,33 @@
     "sending": "送信中",
     "serverconnection": "サーバへの接続中にエラーが発生しました。",
     "show": "表示",
+    "showmore": "さらに表示...",
     "site": "サイト",
+    "sitemaintenance": "サイトがメンテナンス中のため、現在利用できません。",
     "sizeb": "バイト",
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "sizetb": "TB",
+    "sorry": "すみません...",
     "start": "開始",
     "submit": "送信",
-    "success": "成功",
+    "success": "成功!",
+    "tablet": "タブレット",
     "teachers": "教師",
+    "thereisdatatosync": "同期が必要なオフライン {{$a}} があります。",
     "time": "時間",
     "timesup": "時間終了!",
     "today": "本日",
+    "tryagain": "再実行",
+    "twoparagraphs": "{{p1}}<br><br>{{p2}}",
+    "uhoh": "おおっと!",
     "unexpectederror": "不明なエラー。アプリを閉じて再起動してみてください。",
-    "unknown": "不明",
+    "unicodenotsupported": "本サイトでは一部の絵文字がサポートされていません。それらは送信されたメッセージから削除されます。",
+    "unicodenotsupportedcleanerror": "Unicode文字をクリアする際に空のテキストがありました。",
+    "unknown": "不明な",
     "unlimited": "無制限",
+    "unzipping": "未展開の",
     "upgraderunning": "サイトはアップグレード中です。後ほどお試しください。",
     "userdeleted": "このユーザのアカウントは削除されました。",
     "userdetails": "ユーザ詳細",
@@ -123,6 +190,8 @@
     "users": "ユーザ",
     "view": "表示",
     "viewprofile": "プロファイルを表示する",
+    "whoops": "しまった！",
+    "windowsphone": "Windows Phone",
     "year": "年",
     "years": "年",
     "yes": "Yes"
diff --git a/www/core/lang/sr-cr.json b/www/core/lang/sr-cr.json
new file mode 100644
index 00000000000..68915a26c2f
--- /dev/null
+++ b/www/core/lang/sr-cr.json
@@ -0,0 +1,95 @@
+{
+    "accounts": "Налози",
+    "android": "Андроид",
+    "cannotconnect": "Није могуће успоставити везу. Проверите да ли сте унели исправну URL адресу и да ли ваш сајт користи Moodle 2.4 или новију верзију.",
+    "cannotdownloadfiles": "Преузимање датотека је онемогућено у подешавањима вашег мобилног сервиса. Обратите се администратору сајта.",
+    "clearsearch": "Обриши претрагу",
+    "clicktoseefull": "Кликните да бисте видели комплетан садржај.",
+    "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": "Да ли сте сигурни да желите да напустите ову страницу? Све промене ће бити изгубљене.",
+    "confirmloss": "Да ли сте сигурни? Све промене ће бити изгубљене.",
+    "confirmopeninbrowser": "Да ли желите да отворите у веб читачу?",
+    "contenteditingsynced": "Садржај који уређујете је синхронизован.",
+    "copiedtoclipboard": "Текст копиран у клипборд",
+    "currentdevice": "Тренутни уређај",
+    "datastoredoffline": "Подаци су сачувани у мобилном уређају, зато што не могу да се пошаљу. Аутоматски ће бити послати касније.",
+    "deleting": "Брисање",
+    "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": "Обустави",
+    "downloading": "Преузимање",
+    "emptysplit": "Ова страница ће се појавити празна уколико је леви панел празан или се учитава.",
+    "errorchangecompletion": "Дошло је до грешке приликом промене статуса завршетка. Молимо, покушајте поново.",
+    "errordeletefile": "Грешка приликом брисања датотеке. Молимо, покушајте поново.",
+    "errordownloading": "Грешка приликом преузимања датотеке.",
+    "errordownloadingsomefiles": "Грешка приликом преузимања датотека модула. Могуће је да неке датотеке недостају.",
+    "errorfileexistssamename": "Већ постоји датотека са овим називом.",
+    "errorinvalidform": "Образац садржи неисправне податке. Уверите се да сте попунили сва неопходна поља и да су подаци исправни.",
+    "errorinvalidresponse": "Примљен је неисправан одговор. Обратите се администратору вашег Moodle сајта ако се грешка понови.",
+    "errorloadingcontent": "Грешка при учитавању садржаја.",
+    "erroropenfilenoapp": "Грешка приликом отварања датотеке: није пронађена апликација која може да отвори овај тип датотеке.",
+    "erroropenfilenoextension": "Грешка приликом отварања датотеке: датотека нема екстензију.",
+    "erroropenpopup": "Ова активност покушава да отвори искачући прозор. Ова апликација то не подржава.",
+    "errorrenamefile": "Грешка приликом покушаја промене назива датотеке. Молимо, покушајте поново.",
+    "errorsync": "Дошло је до грешке приликом синхронизацији. Молимо, покушајте поново.",
+    "errorsyncblocked": "{{$a}} тренутно не може да се синхронизује због текућег процеса. Молимо, покушајте поново касније. Ако се проблем и даље буде постојао, покушајте поново да покренете апликацију.",
+    "filenameexist": "Назив датотеке већ постоји: {{$a}}",
+    "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "hasdatatosync": "{{$a}} има офлајн податке које треба синхронизовати.",
+    "humanreadablesize": "{{size}} {{unit}}",
+    "image": "Слика",
+    "imageviewer": "Приказивач слике",
+    "info": "Инфо",
+    "ios": "iOS",
+    "lastsync": "Последња синхронизација",
+    "loadmore": "Учитај још",
+    "lostconnection": "Ваш токен за потврду идентитета је неважећи или је истекао. Мораћете поново да успоставите везу са сајтом.",
+    "mygroups": "Моје групе",
+    "networkerrormsg": "Мрежа није укључена или не ради.",
+    "nopasswordchangeforced": "Не можете наставити без промене своје лозинке.",
+    "notapplicable": "n/a",
+    "notsent": "Није послато",
+    "offline": "Офлајн",
+    "online": "Онлајн",
+    "openfullimage": "Кликните овде да бисте приказали слику у пуној величини",
+    "openinbrowser": "Отвори у веб читачу",
+    "othergroups": "Друге групе",
+    "percentagenumber": "{{$a}}%",
+    "pulltorefresh": "Повуците за освежавање",
+    "redirectingtosite": "Бићете преусмерени на сајт.",
+    "requireduserdatamissing": "Овај корисник нема у свом профилу неке неопходне податке. Молимо вас, унесети ове податке у ваш Moodle и покушајте поново.<br>{{$a}}",
+    "retry": "Покушај поново",
+    "searching": "Претраживање",
+    "sending": "Слање",
+    "showmore": "Прикажи још...",
+    "sitemaintenance": "Сајт је у режиму одржавања и тренутно није доступан",
+    "sizetb": "TB",
+    "sorry": "Извините...",
+    "success": "Успешно!",
+    "tablet": "Таблет",
+    "thereisdatatosync": "Број офлајн податак које треба синхронизовати: {{$a}}",
+    "tryagain": "Покушај поново",
+    "twoparagraphs": "{{p1}}<br><br>{{p2}}",
+    "uhoh": "Ух!",
+    "unexpectederror": "Неочекивана грешка. Затворите и поново отворите апликацију како бисте покушали поново.",
+    "unicodenotsupported": "Неки емотикони нису подржани на овом сајту. Такви карактери ће бити уклоњени приликом слања поруке.",
+    "unicodenotsupportedcleanerror": "Приликом чишћења Unicode карактера пронађен је празан текст.",
+    "unknown": "Непознато",
+    "unzipping": "Распакивање",
+    "warningofflinedatadeleted": "Офлајн подаци компоненте {{component}} '{{name}}' су обрисани. {{error}}",
+    "whoops": "Упс!",
+    "whyisthishappening": "Зашто се ово дешава?",
+    "windowsphone": "Windows Phone",
+    "wsfunctionnotavailable": "Функција Webservice није доступна."
+}
\ No newline at end of file
diff --git a/www/core/lang/sr-lt.json b/www/core/lang/sr-lt.json
new file mode 100644
index 00000000000..efcfe49fee4
--- /dev/null
+++ b/www/core/lang/sr-lt.json
@@ -0,0 +1,95 @@
+{
+    "accounts": "Nalozi",
+    "android": "Android",
+    "cannotconnect": "Nije moguće uspostaviti vezu. Proverite da li ste uneli ispravnu URL adresu i da li vaš sajt koristi Moodle 2.4 ili noviju verziju.",
+    "cannotdownloadfiles": "Preuzimanje datoteka je onemogućeno u podešavanjima vašeg mobilnog servisa. Obratite se administratoru sajta.",
+    "clearsearch": "Obriši pretragu",
+    "clicktoseefull": "Kliknite da biste videli kompletan sadržaj.",
+    "commentsnotworking": "Komentari ne mogu da budu preuzeti",
+    "completion-alt-auto-fail": "Završeno: {{$a}} (nije postignuta prelazna ocena)",
+    "completion-alt-auto-n": "Nije završeno: {{$a}}",
+    "completion-alt-auto-pass": "Završeno: {{$a}} (postignuta prelazna ocena)",
+    "completion-alt-auto-y": "Završeno: {{$a}}",
+    "completion-alt-manual-n": "Nije završeno: {{$a}}. Izaberite da biste označili kao završeno.",
+    "completion-alt-manual-y": "Završeno: {{$a}}. Izaberite da biste označili kao nezavršeno.",
+    "confirmcanceledit": "Da li ste sigurni da želite da napustite ovu stranicu? Sve promene će biti izgubljene.",
+    "confirmloss": "Da li ste sigurni? Sve promene će biti izgubljene.",
+    "confirmopeninbrowser": "Da li želite da otvorite u veb čitaču?",
+    "contenteditingsynced": "Sadržaj koji uređujete je sinhronizovan.",
+    "copiedtoclipboard": "Tekst kopiran u klipbord",
+    "currentdevice": "Trenutni uređaj",
+    "datastoredoffline": "Podaci su sačuvani u mobilnom uređaju, zato što ne mogu da se pošalju. Automatski će biti poslati kasnije.",
+    "deleting": "Brisanje",
+    "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": "Odbaci",
+    "dismiss": "Obustavi",
+    "downloading": "Preuzimanje",
+    "emptysplit": "Ova stranica će se pojaviti prazna ukoliko je levi panel prazan ili se učitava.",
+    "errorchangecompletion": "Došlo je do greške prilikom promene statusa završetka. Molimo, pokušajte ponovo.",
+    "errordeletefile": "Greška prilikom brisanja datoteke. Molimo, pokušajte ponovo.",
+    "errordownloading": "Greška prilikom preuzimanja datoteke.",
+    "errordownloadingsomefiles": "Greška prilikom preuzimanja datoteka modula. Moguće je da neke datoteke nedostaju.",
+    "errorfileexistssamename": "Već postoji datoteka sa ovim nazivom.",
+    "errorinvalidform": "Obrazac sadrži neispravne podatke. Uverite se da ste popunili sva neophodna polja i da su podaci ispravni.",
+    "errorinvalidresponse": "Primljen je neispravan odgovor. Obratite se administratoru vašeg Moodle sajta ako se greška ponovi.",
+    "errorloadingcontent": "Greška pri učitavanju sadržaja.",
+    "erroropenfilenoapp": "Greška prilikom otvaranja datoteke: nije pronađena aplikacija koja može da otvori ovaj tip datoteke.",
+    "erroropenfilenoextension": "Greška prilikom otvaranja datoteke: datoteka nema ekstenziju.",
+    "erroropenpopup": "Ova aktivnost pokušava da otvori iskačući prozor. Ova aplikacija to ne podržava.",
+    "errorrenamefile": "Greška prilikom pokušaja promene naziva datoteke. Molimo, pokušajte ponovo.",
+    "errorsync": "Došlo je do greške prilikom sinhronizaciji. Molimo, pokušajte ponovo.",
+    "errorsyncblocked": "{{$a}} trenutno ne može da se sinhronizuje zbog tekućeg procesa. Molimo, pokušajte ponovo kasnije. Ako se problem i dalje bude postojao, pokušajte ponovo da pokrenete aplikaciju.",
+    "filenameexist": "Naziv datoteke već postoji: {{$a}}",
+    "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "hasdatatosync": "{{$a}} ima oflajn podatke koje treba sinhronizovati.",
+    "humanreadablesize": "{{size}} {{unit}}",
+    "image": "Slika",
+    "imageviewer": "Prikazivač slike",
+    "info": "Info",
+    "ios": "iOS",
+    "lastsync": "Poslednja sinhronizacija",
+    "loadmore": "Učitaj još",
+    "lostconnection": "Vaš token za potvrdu identiteta je nevažeći ili je istekao. Moraćete ponovo da uspostavite vezu sa sajtom.",
+    "mygroups": "Moje grupe",
+    "networkerrormsg": "Mreža nije uključena ili ne radi.",
+    "nopasswordchangeforced": "Ne možete nastaviti bez promene svoje lozinke.",
+    "notapplicable": "n/a",
+    "notsent": "Nije poslato",
+    "offline": "Oflajn",
+    "online": "Onlajn",
+    "openfullimage": "Kliknite ovde da biste prikazali sliku u punoj veličini",
+    "openinbrowser": "Otvori u veb čitaču",
+    "othergroups": "Druge grupe",
+    "percentagenumber": "{{$a}}%",
+    "pulltorefresh": "Povucite za osvežavanje",
+    "redirectingtosite": "Bićete preusmereni na sajt.",
+    "requireduserdatamissing": "Ovaj korisnik nema u svom profilu neke neophodne podatke. Molimo vas, uneseti ove podatke u vaš Moodle i pokušajte ponovo.<br>{{$a}}",
+    "retry": "Pokušaj ponovo",
+    "searching": "Pretraživanje",
+    "sending": "Slanje",
+    "showmore": "Prikaži još...",
+    "sitemaintenance": "Sajt je u režimu održavanja i trenutno nije dostupan",
+    "sizetb": "TB",
+    "sorry": "Izvinite...",
+    "success": "Uspešno!",
+    "tablet": "Tablet",
+    "thereisdatatosync": "Broj oflajn podatak koje treba sinhronizovati: {{$a}}",
+    "tryagain": "Pokušaj ponovo",
+    "twoparagraphs": "{{p1}}<br><br>{{p2}}",
+    "uhoh": "Uh!",
+    "unexpectederror": "Neočekivana greška. Zatvorite i ponovo otvorite aplikaciju kako biste pokušali ponovo.",
+    "unicodenotsupported": "Neki emotikoni nisu podržani na ovom sajtu. Takvi karakteri će biti uklonjeni prilikom slanja poruke.",
+    "unicodenotsupportedcleanerror": "Prilikom čišćenja Unicode karaktera pronađen je prazan tekst.",
+    "unknown": "Nepoznato",
+    "unzipping": "Raspakivanje",
+    "warningofflinedatadeleted": "Oflajn podaci komponente {{component}} '{{name}}' su obrisani. {{error}}",
+    "whoops": "Ups!",
+    "whyisthishappening": "Zašto se ovo dešava?",
+    "windowsphone": "Windows Phone",
+    "wsfunctionnotavailable": "Funkcija Webservice nije dostupna."
+}
\ No newline at end of file
diff --git a/www/core/lang/uk.json b/www/core/lang/uk.json
index 2586c68adc3..65399cfaf7e 100644
--- a/www/core/lang/uk.json
+++ b/www/core/lang/uk.json
@@ -1,12 +1,12 @@
 {
-    "accounts": "Акаунти",
+    "accounts": "Аккаунти",
     "allparticipants": "Усі учасники",
     "android": "Android",
     "areyousure": "Ви впевнені?",
     "back": "Назад",
     "cancel": "Скасувати",
-    "cannotconnect": "Неможливо з'єднатися: Переконайтеся, що ви ввели правильно URL і що сайт використовує Moodle 2.4 або більш пізньої версії.",
-    "cannotdownloadfiles": "Завантаження файлів відключена у вашій мобільній службі. Будь ласка, зверніться до адміністратора сайту.",
+    "cannotconnect": "Неможливо з'єднатися: Переконайтеся, що ви ввели правильний URL і що сайт використовує Moodle 2.4 або більш пізню версію.",
+    "cannotdownloadfiles": "Завантаження файлів відключено у вашій мобільній службі. Будь ласка, зверніться до адміністратора сайту.",
     "category": "Категорія",
     "choose": "Вибрати",
     "choosedots": "Вибрати...",
@@ -17,13 +17,13 @@
     "comments": "Ваші коментарі",
     "commentscount": "Коментарі ({{$a}})",
     "commentsnotworking": "Коментар не може бути відновлений",
-    "completion-alt-auto-fail": "Виконано: {{$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}}. Виберіть для відмічення як не завершене.",
-    "confirmcanceledit": "Ви впевнені, що хочете залишити цю сторінку? Всі зміни будуть втрачені.",
+    "completion-alt-manual-y": "Завершено {{$a}}. Виберіть для відмічення як незавершене.",
+    "confirmcanceledit": "Ви впевнені що хочете залишити цю сторінку? Всі зміни будуть втрачені.",
     "confirmdeletefile": "Ви впевнені, що хочете видалити цей файл?",
     "confirmloss": "Ви впевнені? Всі зміни будуть втрачені.",
     "confirmopeninbrowser": "Ви хочете відкрити в браузері?",
@@ -56,7 +56,7 @@
     "edit": "Редагувати",
     "emptysplit": "Ця сторінка буде виглядати порожньою, якщо ліва панель порожня або завантажується.",
     "error": "Помилка",
-    "errorchangecompletion": "При зміні стану завершення сталася помилка. Будь ласка спробуйте ще раз.",
+    "errorchangecompletion": "При зміні статусу завершення сталася помилка. Будь ласка спробуйте ще раз.",
     "errordeletefile": "Помилка видалення файлу. Будь ласка спробуйте ще раз.",
     "errordownloading": "Помилка завантаження файлу.",
     "errordownloadingsomefiles": "Помилка завантаження модуля файлів. Деякі файли можуть бути відсутні.",
@@ -69,7 +69,7 @@
     "erroropenpopup": "Ця діяльність намагається відкрити спливаюче вікно. Це не підтримується в цьому додатку.",
     "errorrenamefile": "Помилка перейменування файлу. Будь ласка спробуйте ще раз.",
     "errorsync": "Під час синхронізації сталася помилка. Будь ласка спробуйте ще раз.",
-    "errorsyncblocked": "Це {{$a}} не може бути синхронізований прямо зараз через триваючого процесу. Будь-ласка спробуйте пізніше. Якщо питання залишається невирішеним, спробуйте перезапустити програму.",
+    "errorsyncblocked": "{{$a}} не може бути синхронізований прямо зараз через навантаження на сервер. Будь-ласка спробуйте пізніше. Якщо питання залишається невирішеним, спробуйте перезапустити програму.",
     "filename": "Ім’я файлу",
     "filenameexist": "Файл вже існує: {{$a}}",
     "folder": "Тека",
@@ -93,7 +93,7 @@
     "lastsync": "Остання синхронізація",
     "listsep": ";",
     "loading": "Завантаження...",
-    "loadmore": "Завнтажити більше",
+    "loadmore": "Завантажити більше",
     "lostconnection": "Ваш маркер аутентифікації недійсний або закінчився, вам доведеться підключитися до сайту.",
     "maxsizeandattachments": "Макс. обсяг для нових файлів: {{$a.size}}, макс. кількість прикріплених файлів: {{$a.attachments}}",
     "min": "хв",
@@ -167,7 +167,7 @@
     "start": "Початок",
     "submit": "Прийняти",
     "success": "Успіх!",
-    "tablet": "пЛАНШЕТ",
+    "tablet": "Планшет",
     "teachers": "Викладачі",
     "thereisdatatosync": "Офлайн {{$a}} повинні бути синхронізовані.",
     "time": "Час",
@@ -177,7 +177,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Опана...",
     "unexpectederror": "Неочікувана помилка. Будь ласка, закрийте і знову відкрийте додаток, щоб спробувати ще раз",
-    "unicodenotsupported": "Деякі Emojis не підтримуються на цьому сайті. Такі символи будуть видалені, коли повідомлення було відправлено.",
+    "unicodenotsupported": "Деякі Emoji не підтримуються на цьому сайті. Такі символи будуть видалені, коли повідомлення буде відправлено.",
     "unicodenotsupportedcleanerror": "Порожній текст був знайдений при чищенні Unicode символів.",
     "unknown": "Невідомо",
     "unlimited": "Не обмежено",
@@ -188,7 +188,7 @@
     "users": "Користувачі",
     "view": "Перегляд",
     "viewprofile": "Переглянути профіль",
-    "warningofflinedatadeleted": "Offline дані  {{component}} '{{name}}' були видалений.  {{error}}",
+    "warningofflinedatadeleted": "Offline дані  {{component}} '{{name}}' були видалені.  {{error}}",
     "whoops": "Упс!",
     "whyisthishappening": "Чому це відбувається?",
     "windowsphone": "Windows Phone",

From 595bf3adf4fe7de7824b49203bc7ed5a7a2ef581 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Thu, 27 Jul 2017 00:07:50 +0200
Subject: [PATCH 091/118] MOBILE-2156 lang: Auto-translation

---
 www/addons/badges/lang/sr-cr.json             |  12 ++
 www/addons/badges/lang/sr-lt.json             |  12 ++
 www/addons/badges/lang/sv.json                |   2 +-
 www/addons/badges/lang/tr.json                |   2 +-
 www/addons/calendar/lang/ar.json              |   2 +-
 www/addons/calendar/lang/ca.json              |   2 +-
 www/addons/calendar/lang/cs.json              |   4 +-
 www/addons/calendar/lang/da.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/eu.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/it.json              |   2 +-
 www/addons/calendar/lang/ja.json              |   2 +-
 www/addons/calendar/lang/lt.json              |   2 +-
 www/addons/calendar/lang/nl.json              |   2 +-
 www/addons/calendar/lang/pl.json              |   2 +-
 www/addons/calendar/lang/pt-br.json           |   4 +-
 www/addons/calendar/lang/pt.json              |   2 +-
 www/addons/calendar/lang/ru.json              |   2 +-
 www/addons/calendar/lang/sr-cr.json           |   2 +-
 www/addons/calendar/lang/sr-lt.json           |   4 +-
 www/addons/calendar/lang/sv.json              |   2 +-
 www/addons/calendar/lang/uk.json              |   4 +-
 www/addons/calendar/lang/zh-cn.json           |   4 +-
 www/addons/calendar/lang/zh-tw.json           |   2 +-
 www/addons/competency/lang/ar.json            |   6 +-
 www/addons/competency/lang/bg.json            |   2 +-
 www/addons/competency/lang/ca.json            |  14 +-
 www/addons/competency/lang/cs.json            |  12 +-
 www/addons/competency/lang/da.json            |  12 +-
 www/addons/competency/lang/de.json            |  16 +--
 www/addons/competency/lang/el.json            |   4 +-
 www/addons/competency/lang/es-mx.json         |  14 +-
 www/addons/competency/lang/es.json            |  10 +-
 www/addons/competency/lang/eu.json            |  10 +-
 www/addons/competency/lang/fa.json            |  10 +-
 www/addons/competency/lang/fr.json            |  12 +-
 www/addons/competency/lang/he.json            |  14 +-
 www/addons/competency/lang/hu.json            |  12 +-
 www/addons/competency/lang/it.json            |  14 +-
 www/addons/competency/lang/ja.json            |  14 +-
 www/addons/competency/lang/lt.json            |  20 ++-
 www/addons/competency/lang/nl.json            |  12 +-
 www/addons/competency/lang/pl.json            |  10 +-
 www/addons/competency/lang/pt-br.json         |  12 +-
 www/addons/competency/lang/pt.json            |  14 +-
 www/addons/competency/lang/ro.json            |   4 +-
 www/addons/competency/lang/ru.json            |  14 +-
 www/addons/competency/lang/sr-cr.json         |  26 +++-
 www/addons/competency/lang/sr-lt.json         |  26 +++-
 www/addons/competency/lang/sv.json            |  14 +-
 www/addons/competency/lang/tr.json            |  12 +-
 www/addons/competency/lang/uk.json            |  18 +--
 www/addons/competency/lang/zh-cn.json         |   6 +-
 www/addons/competency/lang/zh-tw.json         |  14 +-
 www/addons/coursecompletion/lang/ar.json      |  20 +--
 www/addons/coursecompletion/lang/bg.json      |  10 +-
 www/addons/coursecompletion/lang/ca.json      |  18 +--
 www/addons/coursecompletion/lang/cs.json      |  26 ++--
 www/addons/coursecompletion/lang/da.json      |  28 ++--
 www/addons/coursecompletion/lang/de.json      |  24 ++--
 www/addons/coursecompletion/lang/el.json      |  14 +-
 www/addons/coursecompletion/lang/es-mx.json   |  26 ++--
 www/addons/coursecompletion/lang/es.json      |  10 +-
 www/addons/coursecompletion/lang/eu.json      |  14 +-
 www/addons/coursecompletion/lang/fa.json      |  10 +-
 www/addons/coursecompletion/lang/fr.json      |  10 +-
 www/addons/coursecompletion/lang/he.json      |  26 ++--
 www/addons/coursecompletion/lang/hu.json      |  10 +-
 www/addons/coursecompletion/lang/it.json      |  16 +--
 www/addons/coursecompletion/lang/ja.json      |  24 ++--
 www/addons/coursecompletion/lang/lt.json      |  22 +--
 www/addons/coursecompletion/lang/nl.json      |  20 +--
 www/addons/coursecompletion/lang/pl.json      |  12 +-
 www/addons/coursecompletion/lang/pt-br.json   |  24 ++--
 www/addons/coursecompletion/lang/pt.json      |  18 +--
 www/addons/coursecompletion/lang/ro.json      |  28 ++--
 www/addons/coursecompletion/lang/ru.json      |  26 ++--
 www/addons/coursecompletion/lang/sr-cr.json   |  14 +-
 www/addons/coursecompletion/lang/sr-lt.json   |  14 +-
 www/addons/coursecompletion/lang/sv.json      |  22 +--
 www/addons/coursecompletion/lang/tr.json      |  10 +-
 www/addons/coursecompletion/lang/uk.json      |  26 ++--
 www/addons/coursecompletion/lang/zh-cn.json   |  14 +-
 www/addons/coursecompletion/lang/zh-tw.json   |  28 ++--
 www/addons/files/lang/ar.json                 |   2 +-
 www/addons/files/lang/ca.json                 |   4 +-
 www/addons/files/lang/cs.json                 |   4 +-
 www/addons/files/lang/da.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                 |   4 +-
 www/addons/files/lang/eu.json                 |   4 +-
 www/addons/files/lang/fr.json                 |   4 +-
 www/addons/files/lang/he.json                 |   2 +-
 www/addons/files/lang/it.json                 |   4 +-
 www/addons/files/lang/ja.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                 |   6 +-
 www/addons/files/lang/ro.json                 |   4 +-
 www/addons/files/lang/ru.json                 |   2 +-
 www/addons/files/lang/sr-cr.json              |   7 +-
 www/addons/files/lang/sr-lt.json              |   7 +-
 www/addons/files/lang/uk.json                 |   4 +-
 www/addons/files/lang/zh-tw.json              |   4 +-
 www/addons/frontpage/lang/da.json             |   2 +-
 www/addons/frontpage/lang/eu.json             |   2 +-
 www/addons/frontpage/lang/sr-cr.json          |   4 +
 www/addons/frontpage/lang/sr-lt.json          |   4 +
 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/sr-cr.json             |   4 +
 www/addons/grades/lang/sr-lt.json             |   4 +
 www/addons/grades/lang/uk.json                |   2 +-
 www/addons/grades/lang/zh-tw.json             |   2 +-
 www/addons/messages/lang/ar.json              |   6 +-
 www/addons/messages/lang/bg.json              |   6 +-
 www/addons/messages/lang/ca.json              |   9 +-
 www/addons/messages/lang/cs.json              |  10 +-
 www/addons/messages/lang/da.json              |   8 +-
 www/addons/messages/lang/de.json              |   8 +-
 www/addons/messages/lang/el.json              |   8 +-
 www/addons/messages/lang/es-mx.json           |  10 +-
 www/addons/messages/lang/es.json              |   8 +-
 www/addons/messages/lang/eu.json              |   8 +-
 www/addons/messages/lang/fa.json              |   6 +-
 www/addons/messages/lang/fr.json              |  12 +-
 www/addons/messages/lang/he.json              |  14 +-
 www/addons/messages/lang/hu.json              |   6 +-
 www/addons/messages/lang/it.json              |  10 +-
 www/addons/messages/lang/ja.json              |   8 +-
 www/addons/messages/lang/lt.json              |  10 +-
 www/addons/messages/lang/nl.json              |   8 +-
 www/addons/messages/lang/pl.json              |   6 +-
 www/addons/messages/lang/pt-br.json           |   9 +-
 www/addons/messages/lang/pt.json              |   6 +-
 www/addons/messages/lang/ro.json              |   8 +-
 www/addons/messages/lang/ru.json              |   6 +-
 www/addons/messages/lang/sr-cr.json           |  15 +-
 www/addons/messages/lang/sr-lt.json           |  15 +-
 www/addons/messages/lang/sv.json              |  11 +-
 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           |  14 +-
 www/addons/mod/assign/lang/ca.json            |   2 +-
 www/addons/mod/assign/lang/de.json            |   2 +-
 www/addons/mod/assign/lang/el.json            |   1 +
 www/addons/mod/assign/lang/eu.json            |   2 +-
 www/addons/mod/assign/lang/fr.json            |   6 +-
 www/addons/mod/assign/lang/he.json            |   2 +-
 www/addons/mod/assign/lang/it.json            |   2 +-
 www/addons/mod/assign/lang/ja.json            |   2 +-
 www/addons/mod/assign/lang/nl.json            |   2 +-
 www/addons/mod/assign/lang/pt-br.json         |   6 +-
 www/addons/mod/assign/lang/pt.json            |   4 +-
 www/addons/mod/assign/lang/ro.json            |   2 +-
 www/addons/mod/assign/lang/sr-cr.json         |  82 +++++++++++
 www/addons/mod/assign/lang/sr-lt.json         |  82 +++++++++++
 www/addons/mod/assign/lang/sv.json            |   6 +-
 www/addons/mod/assign/lang/tr.json            |   2 +-
 www/addons/mod/assign/lang/zh-tw.json         |   2 +-
 www/addons/mod/chat/lang/cs.json              |   2 +-
 www/addons/mod/chat/lang/de.json              |   2 +-
 www/addons/mod/chat/lang/he.json              |   2 +-
 www/addons/mod/chat/lang/lt.json              |   2 +-
 www/addons/mod/chat/lang/pl.json              |   2 +-
 www/addons/mod/chat/lang/pt-br.json           |   2 +-
 www/addons/mod/chat/lang/sr-cr.json           |  13 +-
 www/addons/mod/chat/lang/sr-lt.json           |  13 +-
 www/addons/mod/chat/lang/sv.json              |   6 +-
 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/ja.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/ru.json            |   2 +-
 www/addons/mod/choice/lang/sr-cr.json         |  19 ++-
 www/addons/mod/choice/lang/sr-lt.json         |  19 ++-
 www/addons/mod/choice/lang/sv.json            |   6 +-
 www/addons/mod/choice/lang/uk.json            |   4 +-
 www/addons/mod/choice/lang/zh-tw.json         |   4 +-
 www/addons/mod/data/lang/ar.json              |  32 +++++
 www/addons/mod/data/lang/bg.json              |  36 +++++
 www/addons/mod/data/lang/ca.json              |  38 +++++
 www/addons/mod/data/lang/cs.json              |  38 +++++
 www/addons/mod/data/lang/da.json              |  38 +++++
 www/addons/mod/data/lang/de.json              |  38 +++++
 www/addons/mod/data/lang/el.json              |  32 +++++
 www/addons/mod/data/lang/es-mx.json           |  38 +++++
 www/addons/mod/data/lang/es.json              |  38 +++++
 www/addons/mod/data/lang/eu.json              |  38 +++++
 www/addons/mod/data/lang/fa.json              |  33 +++++
 www/addons/mod/data/lang/fr.json              |  38 +++++
 www/addons/mod/data/lang/he.json              |  38 +++++
 www/addons/mod/data/lang/hu.json              |  38 +++++
 www/addons/mod/data/lang/it.json              |  38 +++++
 www/addons/mod/data/lang/ja.json              |  38 +++++
 www/addons/mod/data/lang/lt.json              |  38 +++++
 www/addons/mod/data/lang/nl.json              |  38 +++++
 www/addons/mod/data/lang/pl.json              |  38 +++++
 www/addons/mod/data/lang/pt-br.json           |  38 +++++
 www/addons/mod/data/lang/pt.json              |  38 +++++
 www/addons/mod/data/lang/ro.json              |  37 +++++
 www/addons/mod/data/lang/ru.json              |  38 +++++
 www/addons/mod/data/lang/sr-cr.json           |  38 +++++
 www/addons/mod/data/lang/sr-lt.json           |  38 +++++
 www/addons/mod/data/lang/sv.json              |  34 +++++
 www/addons/mod/data/lang/tr.json              |  38 +++++
 www/addons/mod/data/lang/uk.json              |  38 +++++
 www/addons/mod/data/lang/zh-cn.json           |  37 +++++
 www/addons/mod/data/lang/zh-tw.json           |  38 +++++
 www/addons/mod/feedback/lang/cs.json          |   2 +-
 www/addons/mod/feedback/lang/da.json          |   2 +-
 www/addons/mod/feedback/lang/de.json          |   2 +-
 www/addons/mod/feedback/lang/es-mx.json       |   2 +-
 www/addons/mod/feedback/lang/eu.json          |   8 +-
 www/addons/mod/feedback/lang/fr.json          |   2 +-
 www/addons/mod/feedback/lang/he.json          |   2 +-
 www/addons/mod/feedback/lang/hu.json          |   2 +-
 www/addons/mod/feedback/lang/ja.json          |   2 +-
 www/addons/mod/feedback/lang/lt.json          |   2 +-
 www/addons/mod/feedback/lang/nl.json          |   2 +-
 www/addons/mod/feedback/lang/pt-br.json       |   7 +-
 www/addons/mod/feedback/lang/pt.json          |   4 +-
 www/addons/mod/feedback/lang/sr-cr.json       |  33 ++++-
 www/addons/mod/feedback/lang/sr-lt.json       |  33 ++++-
 www/addons/mod/feedback/lang/sv.json          |   2 +-
 www/addons/mod/feedback/lang/tr.json          |  12 +-
 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/ja.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/sr-cr.json         |   2 +-
 www/addons/mod/folder/lang/sr-lt.json         |   2 +-
 www/addons/mod/folder/lang/zh-tw.json         |   2 +-
 www/addons/mod/forum/lang/ca.json             |   1 +
 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             |   3 +-
 www/addons/mod/forum/lang/it.json             |   2 +-
 www/addons/mod/forum/lang/ja.json             |   4 +-
 www/addons/mod/forum/lang/lt.json             |   2 +-
 www/addons/mod/forum/lang/nl.json             |   2 +-
 www/addons/mod/forum/lang/pl.json             |   2 +-
 www/addons/mod/forum/lang/pt-br.json          |   4 +-
 www/addons/mod/forum/lang/ro.json             |   2 +-
 www/addons/mod/forum/lang/ru.json             |   2 +-
 www/addons/mod/forum/lang/sr-cr.json          |  25 +++-
 www/addons/mod/forum/lang/sr-lt.json          |  25 +++-
 www/addons/mod/forum/lang/sv.json             |   8 +-
 www/addons/mod/forum/lang/uk.json             |   2 +-
 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          |   8 +-
 www/addons/mod/glossary/lang/cs.json          |   8 +-
 www/addons/mod/glossary/lang/da.json          |   8 +-
 www/addons/mod/glossary/lang/de.json          |   8 +-
 www/addons/mod/glossary/lang/el.json          |   8 +-
 www/addons/mod/glossary/lang/es-mx.json       |   6 +-
 www/addons/mod/glossary/lang/es.json          |   6 +-
 www/addons/mod/glossary/lang/eu.json          |   8 +-
 www/addons/mod/glossary/lang/fa.json          |   6 +-
 www/addons/mod/glossary/lang/fr.json          |   8 +-
 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          |   8 +-
 www/addons/mod/glossary/lang/lt.json          |   8 +-
 www/addons/mod/glossary/lang/nl.json          |   8 +-
 www/addons/mod/glossary/lang/pl.json          |   6 +-
 www/addons/mod/glossary/lang/pt-br.json       |   8 +-
 www/addons/mod/glossary/lang/pt.json          |   8 +-
 www/addons/mod/glossary/lang/ro.json          |   8 +-
 www/addons/mod/glossary/lang/ru.json          |   6 +-
 www/addons/mod/glossary/lang/sr-cr.json       |   5 +-
 www/addons/mod/glossary/lang/sr-lt.json       |   5 +-
 www/addons/mod/glossary/lang/sv.json          |   8 +-
 www/addons/mod/glossary/lang/tr.json          |   6 +-
 www/addons/mod/glossary/lang/uk.json          |   8 +-
 www/addons/mod/glossary/lang/zh-cn.json       |   6 +-
 www/addons/mod/glossary/lang/zh-tw.json       |   8 +-
 www/addons/mod/label/lang/he.json             |   2 +-
 www/addons/mod/label/lang/lt.json             |   2 +-
 www/addons/mod/label/lang/ru.json             |   2 +-
 www/addons/mod/label/lang/uk.json             |   2 +-
 www/addons/mod/lesson/lang/ar.json            |   3 +-
 www/addons/mod/lesson/lang/bg.json            |   1 +
 www/addons/mod/lesson/lang/ca.json            |   1 +
 www/addons/mod/lesson/lang/cs.json            |   1 +
 www/addons/mod/lesson/lang/da.json            |   1 +
 www/addons/mod/lesson/lang/de.json            |   1 +
 www/addons/mod/lesson/lang/el.json            |   1 +
 www/addons/mod/lesson/lang/es-mx.json         |   1 +
 www/addons/mod/lesson/lang/es.json            |   1 +
 www/addons/mod/lesson/lang/eu.json            |   3 +-
 www/addons/mod/lesson/lang/fa.json            |   1 +
 www/addons/mod/lesson/lang/fr.json            |   3 +-
 www/addons/mod/lesson/lang/he.json            |   1 +
 www/addons/mod/lesson/lang/hu.json            |   1 +
 www/addons/mod/lesson/lang/it.json            |   1 +
 www/addons/mod/lesson/lang/ja.json            |  11 +-
 www/addons/mod/lesson/lang/lt.json            |   1 +
 www/addons/mod/lesson/lang/nl.json            |   1 +
 www/addons/mod/lesson/lang/pl.json            |   1 +
 www/addons/mod/lesson/lang/pt-br.json         |   1 +
 www/addons/mod/lesson/lang/pt.json            |   7 +-
 www/addons/mod/lesson/lang/ro.json            |   1 +
 www/addons/mod/lesson/lang/ru.json            |   1 +
 www/addons/mod/lesson/lang/sr-cr.json         |  78 ++++++++++-
 www/addons/mod/lesson/lang/sr-lt.json         |  78 ++++++++++-
 www/addons/mod/lesson/lang/sv.json            |   1 +
 www/addons/mod/lesson/lang/tr.json            |   1 +
 www/addons/mod/lesson/lang/uk.json            |   1 +
 www/addons/mod/lesson/lang/zh-cn.json         |   1 +
 www/addons/mod/lesson/lang/zh-tw.json         |   5 +-
 www/addons/mod/quiz/lang/ja.json              |   8 +-
 www/addons/mod/quiz/lang/lt.json              |   1 +
 www/addons/mod/quiz/lang/sr-cr.json           |  60 +++++++-
 www/addons/mod/quiz/lang/sr-lt.json           |  60 +++++++-
 www/addons/mod/quiz/lang/sv.json              |   2 +-
 www/addons/mod/scorm/lang/eu.json             |   2 +-
 www/addons/mod/scorm/lang/sr-cr.json          |  33 +++++
 www/addons/mod/scorm/lang/sr-lt.json          |  33 +++++
 www/addons/mod/scorm/lang/zh-tw.json          |  12 +-
 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/survey/lang/sr-cr.json         |   6 +-
 www/addons/mod/survey/lang/sr-lt.json         |   6 +-
 www/addons/mod/survey/lang/tr.json            |   2 +-
 www/addons/mod/survey/lang/zh-cn.json         |   2 +-
 www/addons/mod/survey/lang/zh-tw.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/sr-cr.json           |  15 +-
 www/addons/mod/wiki/lang/sr-lt.json           |  15 +-
 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/myoverview/lang/ca.json            |  19 ++-
 www/addons/myoverview/lang/da.json            |  18 ++-
 www/addons/myoverview/lang/de.json            |   2 +-
 www/addons/myoverview/lang/es.json            |   4 +-
 www/addons/myoverview/lang/eu.json            |  10 +-
 www/addons/myoverview/lang/fr.json            |   2 +-
 www/addons/myoverview/lang/he.json            |   4 +-
 www/addons/myoverview/lang/it.json            |  18 +--
 www/addons/myoverview/lang/ja.json            |   4 +-
 www/addons/myoverview/lang/lt.json            |  19 ++-
 www/addons/myoverview/lang/pl.json            |  19 ++-
 www/addons/myoverview/lang/pt-br.json         |  17 ++-
 www/addons/myoverview/lang/pt.json            |  17 ++-
 www/addons/myoverview/lang/ru.json            |  17 ++-
 www/addons/myoverview/lang/sr-cr.json         |  18 +++
 www/addons/myoverview/lang/sr-lt.json         |  18 +++
 www/addons/myoverview/lang/sv.json            |  17 ++-
 www/addons/myoverview/lang/uk.json            |  18 +++
 www/addons/myoverview/lang/zh-cn.json         |  19 ++-
 www/addons/myoverview/lang/zh-tw.json         |   2 +-
 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/ja.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/sr-cr.json              |   2 +-
 www/addons/notes/lang/sr-lt.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/ar.json         |   2 +-
 www/addons/notifications/lang/ca.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         |   4 +-
 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/ja.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         |   3 +-
 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/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/sr-cr.json       |   2 +-
 www/addons/participants/lang/sr-lt.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       |   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/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    |   4 +-
 www/core/components/course/lang/es.json       |   6 +-
 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/he.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       |   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/sr-cr.json    |   6 +-
 www/core/components/course/lang/sr-lt.json    |   6 +-
 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/ar.json      |  10 +-
 www/core/components/courses/lang/bg.json      |   8 +-
 www/core/components/courses/lang/ca.json      |  12 +-
 www/core/components/courses/lang/cs.json      |  14 +-
 www/core/components/courses/lang/da.json      |  12 +-
 www/core/components/courses/lang/de.json      |  14 +-
 www/core/components/courses/lang/el.json      |  12 +-
 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      |  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      |  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      |  14 +-
 www/core/components/courses/lang/ro.json      |  14 +-
 www/core/components/courses/lang/ru.json      |  12 +-
 www/core/components/courses/lang/sr-cr.json   |  14 +-
 www/core/components/courses/lang/sr-lt.json   |  14 +-
 www/core/components/courses/lang/sv.json      |  14 +-
 www/core/components/courses/lang/tr.json      |  12 +-
 www/core/components/courses/lang/uk.json      |  14 +-
 www/core/components/courses/lang/zh-cn.json   |   8 +-
 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 |   3 +-
 www/core/components/fileuploader/lang/fr.json |  10 +-
 www/core/components/fileuploader/lang/he.json |   8 +-
 www/core/components/fileuploader/lang/hu.json |   2 +-
 www/core/components/fileuploader/lang/it.json |  10 +-
 www/core/components/fileuploader/lang/ja.json |   8 +-
 www/core/components/fileuploader/lang/lt.json |   8 +-
 www/core/components/fileuploader/lang/nl.json |  12 +-
 www/core/components/fileuploader/lang/pl.json |   2 +-
 .../components/fileuploader/lang/pt-br.json   |  10 +-
 www/core/components/fileuploader/lang/pt.json |  10 +-
 www/core/components/fileuploader/lang/ro.json |   8 +-
 www/core/components/fileuploader/lang/ru.json |   8 +-
 .../components/fileuploader/lang/sr-cr.json   |  10 +-
 .../components/fileuploader/lang/sr-lt.json   |  10 +-
 www/core/components/fileuploader/lang/sv.json |   6 +-
 www/core/components/fileuploader/lang/tr.json |   6 +-
 www/core/components/fileuploader/lang/uk.json |   8 +-
 .../components/fileuploader/lang/zh-cn.json   |   4 +-
 .../components/fileuploader/lang/zh-tw.json   |  10 +-
 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/sr-cr.json    |  15 ++
 www/core/components/grades/lang/sr-lt.json    |  15 ++
 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        |   6 +-
 www/core/components/login/lang/ca.json        |   4 +-
 www/core/components/login/lang/cs.json        |  14 +-
 www/core/components/login/lang/da.json        |   8 +-
 www/core/components/login/lang/de.json        |   8 +-
 www/core/components/login/lang/el.json        |   8 +-
 www/core/components/login/lang/es-mx.json     |  12 +-
 www/core/components/login/lang/es.json        |   8 +-
 www/core/components/login/lang/eu.json        |  10 +-
 www/core/components/login/lang/fa.json        |   4 +-
 www/core/components/login/lang/fr.json        |  10 +-
 www/core/components/login/lang/he.json        |   8 +-
 www/core/components/login/lang/hu.json        |   8 +-
 www/core/components/login/lang/it.json        |   6 +-
 www/core/components/login/lang/ja.json        |   6 +-
 www/core/components/login/lang/lt.json        |  12 +-
 www/core/components/login/lang/nl.json        |  10 +-
 www/core/components/login/lang/pl.json        |   4 +-
 www/core/components/login/lang/pt-br.json     |  10 +-
 www/core/components/login/lang/pt.json        |  12 +-
 www/core/components/login/lang/ro.json        |   8 +-
 www/core/components/login/lang/ru.json        |  10 +-
 www/core/components/login/lang/sr-cr.json     |  32 ++++-
 www/core/components/login/lang/sr-lt.json     |  32 ++++-
 www/core/components/login/lang/sv.json        |  16 +--
 www/core/components/login/lang/tr.json        |   6 +-
 www/core/components/login/lang/uk.json        |  10 +-
 www/core/components/login/lang/zh-cn.json     |   6 +-
 www/core/components/login/lang/zh-tw.json     |  14 +-
 www/core/components/question/lang/ar.json     |  14 +-
 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     |  10 +-
 www/core/components/question/lang/de.json     |  10 +-
 www/core/components/question/lang/el.json     |   6 +-
 www/core/components/question/lang/es-mx.json  |  14 +-
 www/core/components/question/lang/es.json     |  14 +-
 www/core/components/question/lang/eu.json     |  10 +-
 www/core/components/question/lang/fa.json     |   8 +-
 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     |  14 +-
 www/core/components/question/lang/ja.json     |   8 +-
 www/core/components/question/lang/lt.json     |  16 +--
 www/core/components/question/lang/nl.json     |   8 +-
 www/core/components/question/lang/pl.json     |  10 +-
 www/core/components/question/lang/pt-br.json  |  14 +-
 www/core/components/question/lang/pt.json     |   8 +-
 www/core/components/question/lang/ro.json     |  10 +-
 www/core/components/question/lang/ru.json     |   6 +-
 www/core/components/question/lang/sr-cr.json  |  15 +-
 www/core/components/question/lang/sr-lt.json  |  15 +-
 www/core/components/question/lang/sv.json     |   6 +-
 www/core/components/question/lang/tr.json     |  10 +-
 www/core/components/question/lang/uk.json     |   6 +-
 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     |   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     |   9 +-
 www/core/components/settings/lang/de.json     |   8 +-
 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     |   8 +-
 www/core/components/settings/lang/fa.json     |   6 +-
 www/core/components/settings/lang/fr.json     |  10 +-
 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     |  10 +-
 www/core/components/settings/lang/pt-br.json  |   7 +-
 www/core/components/settings/lang/pt.json     |   6 +-
 www/core/components/settings/lang/ro.json     |   8 +-
 www/core/components/settings/lang/ru.json     |  13 +-
 www/core/components/settings/lang/sr-cr.json  |  12 ++
 www/core/components/settings/lang/sr-lt.json  |  12 ++
 www/core/components/settings/lang/sv.json     |  10 +-
 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/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 +-
 .../components/sharedfiles/lang/sr-cr.json    |   2 +-
 .../components/sharedfiles/lang/sr-lt.json    |   2 +-
 www/core/components/sharedfiles/lang/sv.json  |   2 +-
 www/core/components/sharedfiles/lang/tr.json  |   2 +-
 www/core/components/sharedfiles/lang/uk.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/de.json     |   2 +-
 www/core/components/sidemenu/lang/el.json     |   2 +-
 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/it.json     |   2 +-
 www/core/components/sidemenu/lang/lt.json     |   6 +-
 www/core/components/sidemenu/lang/nl.json     |   2 +-
 www/core/components/sidemenu/lang/pl.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/ar.json         |   8 +-
 www/core/components/user/lang/bg.json         |  10 +-
 www/core/components/user/lang/ca.json         |   8 +-
 www/core/components/user/lang/cs.json         |  10 +-
 www/core/components/user/lang/da.json         |  10 +-
 www/core/components/user/lang/de.json         |   8 +-
 www/core/components/user/lang/el.json         |  10 +-
 www/core/components/user/lang/es-mx.json      |  10 +-
 www/core/components/user/lang/es.json         |   6 +-
 www/core/components/user/lang/eu.json         |  10 +-
 www/core/components/user/lang/fa.json         |  10 +-
 www/core/components/user/lang/fr.json         |  10 +-
 www/core/components/user/lang/he.json         |  12 +-
 www/core/components/user/lang/hu.json         |   4 +-
 www/core/components/user/lang/it.json         |  10 +-
 www/core/components/user/lang/ja.json         |   6 +-
 www/core/components/user/lang/lt.json         |  12 +-
 www/core/components/user/lang/nl.json         |   8 +-
 www/core/components/user/lang/pl.json         |   4 +-
 www/core/components/user/lang/pt-br.json      |  10 +-
 www/core/components/user/lang/pt.json         |   4 +-
 www/core/components/user/lang/ro.json         |  10 +-
 www/core/components/user/lang/ru.json         |  10 +-
 www/core/components/user/lang/sr-cr.json      |  22 ++-
 www/core/components/user/lang/sr-lt.json      |  22 ++-
 www/core/components/user/lang/sv.json         |  12 +-
 www/core/components/user/lang/tr.json         |  12 +-
 www/core/components/user/lang/uk.json         |  10 +-
 www/core/components/user/lang/zh-cn.json      |   8 +-
 www/core/components/user/lang/zh-tw.json      |  12 +-
 www/core/lang/ar.json                         |  45 +++---
 www/core/lang/bg.json                         |  41 +++---
 www/core/lang/ca.json                         |  55 ++++----
 www/core/lang/cs.json                         |  67 ++++-----
 www/core/lang/da.json                         |  67 ++++-----
 www/core/lang/de.json                         |  67 ++++-----
 www/core/lang/el.json                         |  67 ++++-----
 www/core/lang/es-mx.json                      |  73 +++++-----
 www/core/lang/es.json                         |  59 ++++----
 www/core/lang/eu.json                         |  45 +++---
 www/core/lang/fa.json                         |  33 ++---
 www/core/lang/fr.json                         |  49 +++----
 www/core/lang/he.json                         |  69 +++++-----
 www/core/lang/hu.json                         |  53 +++----
 www/core/lang/it.json                         |  69 +++++-----
 www/core/lang/ja.json                         |  47 +++----
 www/core/lang/lt.json                         |  73 +++++-----
 www/core/lang/nl.json                         |  71 +++++-----
 www/core/lang/pl.json                         |  53 +++----
 www/core/lang/pt-br.json                      |  74 +++++-----
 www/core/lang/pt.json                         |  73 +++++-----
 www/core/lang/ro.json                         |  83 +++++------
 www/core/lang/ru.json                         |  50 +++----
 www/core/lang/sr-cr.json                      | 130 ++++++++++++++++--
 www/core/lang/sr-lt.json                      | 130 ++++++++++++++++--
 www/core/lang/sv.json                         |  67 ++++-----
 www/core/lang/tr.json                         |  53 +++----
 www/core/lang/uk.json                         |  75 +++++-----
 www/core/lang/zh-cn.json                      |  47 +++----
 www/core/lang/zh-tw.json                      |  75 +++++-----
 795 files changed, 5468 insertions(+), 2906 deletions(-)
 create mode 100644 www/addons/badges/lang/sr-cr.json
 create mode 100644 www/addons/badges/lang/sr-lt.json
 create mode 100644 www/addons/frontpage/lang/sr-cr.json
 create mode 100644 www/addons/frontpage/lang/sr-lt.json
 create mode 100644 www/addons/grades/lang/sr-cr.json
 create mode 100644 www/addons/grades/lang/sr-lt.json
 create mode 100644 www/addons/mod/data/lang/ar.json
 create mode 100644 www/addons/mod/data/lang/bg.json
 create mode 100644 www/addons/mod/data/lang/ca.json
 create mode 100644 www/addons/mod/data/lang/cs.json
 create mode 100644 www/addons/mod/data/lang/da.json
 create mode 100644 www/addons/mod/data/lang/de.json
 create mode 100644 www/addons/mod/data/lang/el.json
 create mode 100644 www/addons/mod/data/lang/es-mx.json
 create mode 100644 www/addons/mod/data/lang/es.json
 create mode 100644 www/addons/mod/data/lang/eu.json
 create mode 100644 www/addons/mod/data/lang/fa.json
 create mode 100644 www/addons/mod/data/lang/fr.json
 create mode 100644 www/addons/mod/data/lang/he.json
 create mode 100644 www/addons/mod/data/lang/hu.json
 create mode 100644 www/addons/mod/data/lang/it.json
 create mode 100644 www/addons/mod/data/lang/ja.json
 create mode 100644 www/addons/mod/data/lang/lt.json
 create mode 100644 www/addons/mod/data/lang/nl.json
 create mode 100644 www/addons/mod/data/lang/pl.json
 create mode 100644 www/addons/mod/data/lang/pt-br.json
 create mode 100644 www/addons/mod/data/lang/pt.json
 create mode 100644 www/addons/mod/data/lang/ro.json
 create mode 100644 www/addons/mod/data/lang/ru.json
 create mode 100644 www/addons/mod/data/lang/sr-cr.json
 create mode 100644 www/addons/mod/data/lang/sr-lt.json
 create mode 100644 www/addons/mod/data/lang/sv.json
 create mode 100644 www/addons/mod/data/lang/tr.json
 create mode 100644 www/addons/mod/data/lang/uk.json
 create mode 100644 www/addons/mod/data/lang/zh-cn.json
 create mode 100644 www/addons/mod/data/lang/zh-tw.json
 create mode 100644 www/addons/myoverview/lang/sr-cr.json
 create mode 100644 www/addons/myoverview/lang/sr-lt.json
 create mode 100644 www/addons/myoverview/lang/uk.json
 create mode 100644 www/core/components/grades/lang/sr-cr.json
 create mode 100644 www/core/components/grades/lang/sr-lt.json

diff --git a/www/addons/badges/lang/sr-cr.json b/www/addons/badges/lang/sr-cr.json
new file mode 100644
index 00000000000..dde1e852627
--- /dev/null
+++ b/www/addons/badges/lang/sr-cr.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/badges/lang/sr-lt.json b/www/addons/badges/lang/sr-lt.json
new file mode 100644
index 00000000000..7c2a996f0ba
--- /dev/null
+++ b/www/addons/badges/lang/sr-lt.json
@@ -0,0 +1,12 @@
+{
+    "badgedetails": "Podaci o bedžu",
+    "badges": "Bedževi",
+    "contact": "Kontakt",
+    "dateawarded": "Datum izdavanja",
+    "expirydate": "Datum isteka",
+    "issuancedetails": "Bedž ističe",
+    "issuerdetails": "Podaci o izdavaču",
+    "issuername": "Ime/naziv izdavača bedža",
+    "nobadges": "Nema dostupnih bedževa",
+    "recipientdetails": "Detalji o primaocu"
+}
\ No newline at end of file
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/badges/lang/tr.json b/www/addons/badges/lang/tr.json
index b540e7cabae..5c79f345058 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": "Rozetler",
+    "badges": "Nişanlar",
     "contact": "İletişim",
     "dateawarded": "Verilen tarih",
     "expirydate": "Bitiş Tarihi",
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/ca.json b/www/addons/calendar/lang/ca.json
index cc1ee634071..a2a8930c77d 100644
--- a/www/addons/calendar/lang/ca.json
+++ b/www/addons/calendar/lang/ca.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Hora de notificació per defecte",
     "errorloadevent": "S'ha produït un error carregant l'esdeveniment.",
     "errorloadevents": "S'ha produït un error carregant els esdeveniments.",
-    "noevents": "No hi ha cap esdeveniment",
+    "noevents": "Cap activitat venç properament",
     "notifications": "Notificacions"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/cs.json b/www/addons/calendar/lang/cs.json
index 93d27c11dce..5dca11fb0e2 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": "Informace"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/da.json b/www/addons/calendar/lang/da.json
index 6826baea7eb..9af5235a51d 100644
--- a/www/addons/calendar/lang/da.json
+++ b/www/addons/calendar/lang/da.json
@@ -2,6 +2,6 @@
     "calendarevents": "Kalenderbegivenheder",
     "errorloadevent": "Fejl ved indlæsning af begivenhed.",
     "errorloadevents": "Fejl ved indlæsning af begivenheder.",
-    "noevents": "Der er ingen begivenheder",
-    "notifications": "Notifikationer"
+    "noevents": "Ingen forestående aktiviteter",
+    "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 ee64dc04300..e38e81f16cd 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": "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 872b31813b4..d4be495ef94 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",
-    "notifications": "Notificaciones"
+    "noevents": "No hay actividades próximas pendientes",
+    "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 993aec44200..8149bc574d6 100644
--- a/www/addons/calendar/lang/es.json
+++ b/www/addons/calendar/lang/es.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Tiempo de notificación por defecto",
     "errorloadevent": "Error cargando el evento.",
     "errorloadevents": "Error cargando los eventos.",
-    "noevents": "No hay eventos",
-    "notifications": "Notificaciones"
+    "noevents": "No hay actividades próximas pendientes",
+    "notifications": "Avisos"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/eu.json b/www/addons/calendar/lang/eu.json
index 1158b9cd186..26477c604df 100644
--- a/www/addons/calendar/lang/eu.json
+++ b/www/addons/calendar/lang/eu.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Berezko jakinarazpen-ordua",
     "errorloadevent": "Errorea gertakaria kargatzean.",
     "errorloadevents": "Errorea gertakariak kargatzean.",
-    "noevents": "Ez dago ekitaldirik",
+    "noevents": "Ez dago jardueren muga-egunik laster",
     "notifications": "Jakinarazpenak"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/fa.json b/www/addons/calendar/lang/fa.json
index 109ac4e7ec6..76813733c1d 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..3702664d6e1 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/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 b6e5457e412..8bdfec3c217 100644
--- a/www/addons/calendar/lang/ja.json
+++ b/www/addons/calendar/lang/ja.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "デフォルト通知時間",
     "errorloadevent": "イベントの読み込み時にエラーがありました。",
     "errorloadevents": "イベントの読み込み時にエラーがありました。",
-    "noevents": "イベントはありません",
+    "noevents": "到来する活動期限はありません。",
     "notifications": "通知"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/lt.json b/www/addons/calendar/lang/lt.json
index 84444f84a30..38fab7b87a5 100644
--- a/www/addons/calendar/lang/lt.json
+++ b/www/addons/calendar/lang/lt.json
@@ -2,6 +2,6 @@
     "calendarevents": "Renginių kalendorius",
     "errorloadevent": "Klaida įkeliant renginį.",
     "errorloadevents": "Klaida įkeliant renginius.",
-    "noevents": "Renginių nėra",
+    "noevents": "Nėra numatytų artėjančių veiklų",
     "notifications": "Pranešimai"
 }
\ 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/pl.json b/www/addons/calendar/lang/pl.json
index 4116997d19c..4f391781a66 100644
--- a/www/addons/calendar/lang/pl.json
+++ b/www/addons/calendar/lang/pl.json
@@ -1,4 +1,4 @@
 {
-    "noevents": "Brak zdarzeń",
+    "noevents": "Brak nadchodzących terminów zadań",
     "notifications": "Powiadomienia"
 }
\ 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..f66b11184df 100644
--- a/www/addons/calendar/lang/pt-br.json
+++ b/www/addons/calendar/lang/pt-br.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Tempo de notificação padrão",
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
-    "noevents": "Sem eventos",
-    "notifications": "Notificação"
+    "noevents": "Não há atividades pendentes",
+    "notifications": "Avisos"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/pt.json b/www/addons/calendar/lang/pt.json
index 6cb58c20e8d..a65b11f461a 100644
--- a/www/addons/calendar/lang/pt.json
+++ b/www/addons/calendar/lang/pt.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Hora de notificação predefinida",
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
-    "noevents": "Sem eventos",
+    "noevents": "Nenhuma atividade programada",
     "notifications": "Notificações"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/ru.json b/www/addons/calendar/lang/ru.json
index 0d17cabd368..001aa958044 100644
--- a/www/addons/calendar/lang/ru.json
+++ b/www/addons/calendar/lang/ru.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Время уведомлений по умолчанию",
     "errorloadevent": "Ошибка при загрузке события",
     "errorloadevents": "Ошибка при загрузке событий",
-    "noevents": "Нет событий",
+    "noevents": "Нет предстоящих заданий",
     "notifications": "Уведомления"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sr-cr.json b/www/addons/calendar/lang/sr-cr.json
index dba4ebcd807..90d189510bd 100644
--- a/www/addons/calendar/lang/sr-cr.json
+++ b/www/addons/calendar/lang/sr-cr.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Подразумевано време за слање обавештења",
     "errorloadevent": "Грешка приликом учитавања догађаја.",
     "errorloadevents": "Грешка приликом учитавања догађаја.",
-    "noevents": "Нема догађаја",
+    "noevents": "Нема активности које се ускоро завршавају",
     "notifications": "Обавештења"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sr-lt.json b/www/addons/calendar/lang/sr-lt.json
index 7db382ef521..ef06104d1cf 100644
--- a/www/addons/calendar/lang/sr-lt.json
+++ b/www/addons/calendar/lang/sr-lt.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Podrazumevano vreme za slanje obaveštenja",
     "errorloadevent": "Greška prilikom učitavanja događaja.",
     "errorloadevents": "Greška prilikom učitavanja događaja.",
-    "noevents": "Nema događaja",
-    "notifications": "Nema događaja"
+    "noevents": "Nema aktivnosti koje se uskoro završavaju",
+    "notifications": "Obaveštenja"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sv.json b/www/addons/calendar/lang/sv.json
index d5ac5c127d0..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": "Notifikationer"
+    "notifications": "Administration"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/uk.json b/www/addons/calendar/lang/uk.json
index 2e0930c7034..e0b616f24a4 100644
--- a/www/addons/calendar/lang/uk.json
+++ b/www/addons/calendar/lang/uk.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/zh-cn.json b/www/addons/calendar/lang/zh-cn.json
index 5fc1088f46f..4afe676ce56 100644
--- a/www/addons/calendar/lang/zh-cn.json
+++ b/www/addons/calendar/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
-    "noevents": "没有事件",
-    "notifications": "通知"
+    "noevents": "没有即将到期的活动",
+    "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 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 5952485e905..79ce4fda7f6 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 3b3a332e5fb..37d407ff786 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 70962efd930..80f7da7b125 100644
--- a/www/addons/competency/lang/ca.json
+++ b/www/addons/competency/lang/ca.json
@@ -3,24 +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": "Venciment",
     "errornocompetenciesfound": "No s'han trobat competències",
     "evidence": "Evidència",
     "learningplancompetencies": "Competències del pla d'aprenentatge",
     "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.",
-    "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": "Estat de la insígnia",
+    "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 95324b05ccc..effff8797dc 100644
--- a/www/addons/competency/lang/cs.json
+++ b/www/addons/competency/lang/cs.json
@@ -5,24 +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": "Datum platnosti",
     "errornocompetenciesfound": "Nebyly nalezeny žádné kompetence",
     "evidence": "Evidence",
     "learningplancompetencies": "Kompetence studijního plánu",
     "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.",
-    "path": "Cesta",
+    "path": "Cesta:",
     "proficient": "Splněno",
-    "progress": "Pokrok studenta",
+    "progress": "Pokrok",
     "rating": "Hodnocení",
     "reviewstatus": "Stav revize",
-    "status": "Stav",
-    "template": "Šablona",
+    "status": "Stav odznaku",
+    "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 dfda559c46e..f139228f22e 100644
--- a/www/addons/competency/lang/da.json
+++ b/www/addons/competency/lang/da.json
@@ -4,20 +4,20 @@
     "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": "Forfaldsdato",
     "errornocompetenciesfound": "Ingen kompetencer fundet",
     "evidence": "Vidnesbyrd",
     "learningplancompetencies": "Læringsplankompetencer",
     "learningplans": "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": "Badgestatus",
+    "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 2c43a7fb415..77056f4c882 100644
--- a/www/addons/competency/lang/de.json
+++ b/www/addons/competency/lang/de.json
@@ -5,24 +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": "Fälligkeitsdatum",
+    "duedate": "Termin",
     "errornocompetenciesfound": "Keine Kompetenzen gefunden",
-    "evidence": "Evidenz",
+    "evidence": "Beleg",
     "learningplancompetencies": "Kompetenzen des Lernplans",
     "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.",
-    "path": "Pfad",
+    "path": "Pfad:",
     "proficient": "Erfahren",
-    "progress": "Bearbeitungsstand",
-    "rating": "Bewertung",
+    "progress": "Fortschritt",
+    "rating": "Wertung",
     "reviewstatus": "Überprüfungsstatus",
-    "status": "Status",
-    "template": "Vorlage",
+    "status": "Existierende Einschreibungen 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 3a61231a7af..940c9116122 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 276f784e4f3..f1a9d12780f 100644
--- a/www/addons/competency/lang/es-mx.json
+++ b/www/addons/competency/lang/es-mx.json
@@ -5,24 +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": "Vencimiento",
     "errornocompetenciesfound": "No se encontraron competencias",
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
     "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.",
-    "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": "Estatus de insignias",
+    "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 b87c3dda451..22b0ec02246 100644
--- a/www/addons/competency/lang/es.json
+++ b/www/addons/competency/lang/es.json
@@ -5,22 +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": "Vencimiento",
     "errornocompetenciesfound": "No se encontraron competencias",
     "evidence": "Evidencia",
     "learningplancompetencies": "Competencias del plan de aprendizaje",
     "learningplans": "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": "Estado de la insignia",
     "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 3b4e8511411..706620b8084 100644
--- a/www/addons/competency/lang/eu.json
+++ b/www/addons/competency/lang/eu.json
@@ -9,14 +9,14 @@
     "learningplans": "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": "Dominen egoera",
+    "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 7bec744c8a6..768c777500c 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 54703a62fc1..da75ef9eb86 100644
--- a/www/addons/competency/lang/fr.json
+++ b/www/addons/competency/lang/fr.json
@@ -5,24 +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",
     "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": "Statut du badge",
+    "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 ffae1727aab..0a89741eb32 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 101f0f9a6a0..eb64c67f47c 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": "A kitűző állapota",
+    "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 9c5d5159c01..a578afc6c20 100644
--- a/www/addons/competency/lang/it.json
+++ b/www/addons/competency/lang/it.json
@@ -5,24 +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 termine",
     "errornocompetenciesfound": "Non sono state trovate competenze",
-    "evidence": "Verifica",
+    "evidence": "Attestazione",
     "learningplancompetencies": "Competenze del piano di formazione",
     "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",
-    "path": "Percorso",
+    "path": "Percorso:",
     "proficient": "Esperto",
-    "progress": "Situazione dello studente",
+    "progress": "Avanzamento",
     "rating": "Valutazione",
     "reviewstatus": "Stato della revisione",
-    "status": "Stato",
-    "template": "Modello",
+    "status": "Stato badge",
+    "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 c2210f5308d..0e42d5d3584 100644
--- a/www/addons/competency/lang/ja.json
+++ b/www/addons/competency/lang/ja.json
@@ -5,24 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "このコース内でのコンピテンシー評定は学習プランに影響しません。",
     "coursecompetencyratingsarepushedtouserplans": "このコース内でのコンピテンシー評定は学習プラン内ですぐに更新されます。",
     "crossreferencedcompetencies": "クロスリファレンスコンピテンシー",
-    "duedate": "終了日時",
+    "duedate": "期限",
     "errornocompetenciesfound": "コンピテンシーが見つかりません",
     "evidence": "エビデンス",
     "learningplancompetencies": "学習プランコンピテンシー",
     "learningplans": "学習プラン",
     "myplans": "マイ学習プラン",
     "noactivities": "活動なし",
-    "nocompetencies": "コンピテンシーなし",
+    "nocompetencies": "このフレームワークにコンピテンシーは作成されていません。",
     "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 bfd76f8a42c..cc846b39a81 100644
--- a/www/addons/competency/lang/lt.json
+++ b/www/addons/competency/lang/lt.json
@@ -1,19 +1,25 @@
 {
-    "activities": "Veikla",
+    "activities": "Veiklos",
     "coursecompetencies": "Kurso kompetencijos",
     "coursecompetencyratingsarenotpushedtouserplans": "Kompetencijų reitingai šiame kurse neturi įtakos mokymosi planams.",
-    "duedate": "Data pristatymui",
+    "crossreferencedcompetencies": "Kryžminės kompetencijos",
+    "duedate": "Terminas",
     "errornocompetenciesfound": "Kompetencijų nerasta",
     "evidence": "Įrodymas",
     "learningplancompetencies": "Mokymosi plano kompetencijos",
     "learningplans": "Mokymosi planai",
     "myplans": "Mano mokymosi planai",
     "noactivities": "Nėra veiklų",
-    "nocompetencies": "Nėra kompetencijų",
+    "nocompetencies": "Šioje sistemoje nebuvo sukurta kompetencijų.",
+    "nocrossreferencedcompetencies": "Jokios kitos kompetencijos nebuvo susietos kryžmine nuoroda su šia kompetencija.",
+    "noevidence": "Nėra įrodymų",
     "noplanswerecreated": "Nebuvo sukurta mokymosi planų.",
     "path": "Kelias",
-    "progress": "Besimokančiojo pažanga",
-    "rating": "Vertinimas",
-    "status": "Būsena",
-    "template": "Šablonas"
+    "proficient": "Įgūdis",
+    "progress": "Progresas",
+    "rating": "Reitingas",
+    "reviewstatus": "Peržiūros būsena",
+    "status": "Pasiekimo būsena",
+    "template": "Mokymosi plano šablonas",
+    "xcompetenciesproficientoutofyincourse": "Įgijote {{$a.x}} iš {{$a.y}} kompetenciją šiame kurse."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/nl.json b/www/addons/competency/lang/nl.json
index 5dff19cfe87..b6e8ddd757e 100644
--- a/www/addons/competency/lang/nl.json
+++ b/www/addons/competency/lang/nl.json
@@ -5,24 +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": "Klaar tegen",
     "errornocompetenciesfound": "Geen competenties gevonden",
     "evidence": "Bewijs",
     "learningplancompetencies": "Studieplan competenties",
     "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",
-    "path": "Pad",
+    "path": "Pad:",
     "proficient": "Geslaagd",
-    "progress": "Vordering leerling",
+    "progress": "Vordering",
     "rating": "Beoordeling",
     "reviewstatus": "Beoordelingsstatus",
-    "status": "Status",
-    "template": "Sjabloon",
+    "status": "Badge status",
+    "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..f548cb4520d 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": "Status odznak",
+    "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 268860975f8..42b3ca47eb5 100644
--- a/www/addons/competency/lang/pt-br.json
+++ b/www/addons/competency/lang/pt-br.json
@@ -5,24 +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": "Data de encerramento",
     "errornocompetenciesfound": "Nenhuma competência encontrada",
     "evidence": "Evidência",
     "learningplancompetencies": "Competências do plano de aprendizagem",
     "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.",
-    "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": "Status do emblema",
+    "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 9acc0bd20d8..a4a75b2de01 100644
--- a/www/addons/competency/lang/pt.json
+++ b/www/addons/competency/lang/pt.json
@@ -5,24 +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 de fim",
     "errornocompetenciesfound": "Competências não encontradas",
-    "evidence": "Evidência",
+    "evidence": "Comprovativo",
     "learningplancompetencies": "Competências do plano de aprendizagem",
     "learningplans": "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": "Estado da Medalha",
+    "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..9dec53a5b19 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": "Status ecuson",
     "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 d268e9046ac..b4dd1160c36 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/sr-cr.json b/www/addons/competency/lang/sr-cr.json
index 7a73abc828d..c1e8de7be78 100644
--- a/www/addons/competency/lang/sr-cr.json
+++ b/www/addons/competency/lang/sr-cr.json
@@ -1,4 +1,28 @@
 {
+    "activities": "Активности",
+    "competenciesmostoftennotproficientincourse": "Компетенције које најчешће нису усавршене на овом курсу",
+    "coursecompetencies": "Компетенције курса",
+    "coursecompetencyratingsarenotpushedtouserplans": "Рангирање компетенција на овом курсу на утиче на планове учења.",
+    "coursecompetencyratingsarepushedtouserplans": "Рангирање компетенција на овом курсу се аутоматски ажурира у плановима учења.",
+    "crossreferencedcompetencies": "Унакрсно повезане компетенције",
+    "duedate": "Крајњи рок",
     "errornocompetenciesfound": "Није пронађена ниједна компетенција",
-    "nocompetencies": "Нема компетенција"
+    "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/competency/lang/sr-lt.json b/www/addons/competency/lang/sr-lt.json
index 31af28b95ea..443a40f4ff4 100644
--- a/www/addons/competency/lang/sr-lt.json
+++ b/www/addons/competency/lang/sr-lt.json
@@ -1,4 +1,28 @@
 {
+    "activities": "Aktivnosti",
+    "competenciesmostoftennotproficientincourse": "Kompetencije koje najčešće nisu usavršene na ovom kursu",
+    "coursecompetencies": "Kompetencije kursa",
+    "coursecompetencyratingsarenotpushedtouserplans": "Rangiranje kompetencija na ovom kursu na utiče na planove učenja.",
+    "coursecompetencyratingsarepushedtouserplans": "Rangiranje kompetencija na ovom kursu se automatski ažurira u planovima učenja.",
+    "crossreferencedcompetencies": "Unakrsno povezane kompetencije",
+    "duedate": "Krajnji rok",
     "errornocompetenciesfound": "Nije pronađena nijedna kompetencija",
-    "nocompetencies": "Nema kompetencija"
+    "evidence": "Dokaz",
+    "learningplancompetencies": "Kompetencije plana učenja",
+    "learningplans": "Planovi učenja",
+    "myplans": "Moji planovi učenja",
+    "noactivities": "Nema aktivnosti",
+    "nocompetencies": "Nijedna kompetencija nije kreirana u ovom okviru.",
+    "nocrossreferencedcompetencies": "Nijedna druga kompetencija nije unakrsno povezana sa ovom kompetencijom.",
+    "noevidence": "Nema dokaza",
+    "noplanswerecreated": "Nije kreiran nijedan plan učenja.",
+    "path": "Putanja",
+    "proficient": "Stručan",
+    "progress": "Napredovanje polaznika",
+    "rating": "Ocena",
+    "reviewstatus": "Pregledaj status",
+    "status": "Status",
+    "template": "Šablon",
+    "xcompetenciesproficientoutofy": "{{$a.x}} od {{$a.y}} kompetencija su na najvišem nivou stručnosti",
+    "xcompetenciesproficientoutofyincourse": "Stručni ste u {{$a.x}} od {{$a.y}} kompetencija na ovom kursu."
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/sv.json b/www/addons/competency/lang/sv.json
index a87634db442..15a7a9216ef 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 inskickningsdatum",
+    "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": "Status för märke",
+    "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 aaf5e15f532..4253ce29f6c 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": "Son teslim tarihi",
-    "evidence": "Kanıt",
+    "duedate": "Bitiş tarihi",
+    "evidence": "Öğrenme 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": "Öğrenci ilerlemesi",
+    "progress": "İlerleme",
     "rating": "Derecelendirme",
     "reviewstatus": "İnceleme durumu",
-    "status": "Durum",
-    "template": "Şablon",
+    "status": "Nişan Durumu",
+    "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/uk.json b/www/addons/competency/lang/uk.json
index d764c9bda7c..047fc924f5a 100644
--- a/www/addons/competency/lang/uk.json
+++ b/www/addons/competency/lang/uk.json
@@ -1,28 +1,28 @@
 {
-    "activities": "Види діяльності",
+    "activities": "Діяльності",
     "competenciesmostoftennotproficientincourse": "Компетентності, які найчастіше не досягаються у цьому курсі",
     "coursecompetencies": "Компетентності курсу",
     "coursecompetencyratingsarenotpushedtouserplans": "Оцінювання компетентностей цього курсу не впливають на навчальні плани",
     "coursecompetencyratingsarepushedtouserplans": "Оцінювання компетентностей цього курсу будуть зразу  передані в навчальні плани.",
     "crossreferencedcompetencies": "Пов'язані компетентності",
-    "duedate": "Кінцевий термін здачі",
+    "duedate": "Кінцевий термін",
     "errornocompetenciesfound": "Не знайдено компетенції",
-    "evidence": "Докази",
+    "evidence": "Підтвердження",
     "learningplancompetencies": "Компетентності навчального плану",
     "learningplans": "Навчальний план",
     "myplans": "Мої навчальні плани",
     "noactivities": "Жодної діяльності",
-    "nocompetencies": "Немає компетенції",
+    "nocompetencies": "Жодної компетентності не створено у цьому репозиторії",
     "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 e22e787d956..48f9fe6ae99 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 fe0b027bb70..90a00057bf4 100644
--- a/www/addons/competency/lang/zh-tw.json
+++ b/www/addons/competency/lang/zh-tw.json
@@ -5,24 +5,24 @@
     "coursecompetencyratingsarenotpushedtouserplans": "在這一課程的核心能力評等不會影響學習計畫",
     "coursecompetencyratingsarepushedtouserplans": "在這一課程的核心能力評等在學習計畫上會立即更新",
     "crossreferencedcompetencies": "交互參照的核心能力",
-    "duedate": "規定繳交時間",
+    "duedate": "到期日",
     "errornocompetenciesfound": "找不到能使用的功能",
     "evidence": "證據",
     "learningplancompetencies": "學習計畫核心能力",
     "learningplans": "學習計畫",
     "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..9069a17e684 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": "قيد الانتظار",
-    "required": "مطلوب",
+    "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..245ed87b13c 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..9a6429f37c6 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",
+    "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": "Compleció de curs",
     "criteria": "Criteris",
     "criteriagroup": "Grup de criteris",
-    "criteriarequiredall": "Calen tots els criteris del dessota",
-    "criteriarequiredany": "Cal qualsevol dels criteris del dessota",
-    "inprogress": "En curs",
+    "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 progrés",
     "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": "Estat de la insígnia",
     "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..2b2ffccd75f 100644
--- a/www/addons/coursecompletion/lang/cs.json
+++ b/www/addons/coursecompletion/lang/cs.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Absolvováno",
+    "complete": "Splněno",
     "completecourse": "Absolvovaný kurz",
-    "completed": "Splněno",
+    "completed": "Hhotovo",
     "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": "Vyžadováno",
+    "requiredcriteria": "Vyžadované podmínky",
     "requirement": "Požadavek",
-    "status": "Status",
-    "viewcoursereport": "Zobrazit sestavu kurzu"
+    "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 9d2cdeb93a0..825ffc76c20 100644
--- a/www/addons/coursecompletion/lang/da.json
+++ b/www/addons/coursecompletion/lang/da.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Fuldfør",
+    "complete": "Færdiggør",
     "completecourse": "Fuldfør kursus",
-    "completed": "Fuldført",
+    "completed": "Gennemført",
     "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",
-    "pending": "Afventer",
-    "required": "Krævet",
-    "requiredcriteria": "Krævet kriterie",
+    "coursecompletion": "Kursusgennemførelse",
+    "criteria": "Kriterie",
+    "criteriagroup": "Kriteriegruppe",
+    "criteriarequiredall": "Alle kriterier herunder er påkrævet",
+    "criteriarequiredany": "Et af kriterierne herunder er påkrævet",
+    "inprogress": "Igangværende",
+    "manualselfcompletion": "Manuel selvregistrering af gennemførelse",
+    "notyetstarted": "Ikke begyndt endnu",
+    "pending": "Behandles",
+    "required": "Påkrævet",
+    "requiredcriteria": "Påkrævede kriterier",
     "requirement": "Krav",
-    "status": "Status",
+    "status": "Badgestatus",
     "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..2ecdc1febf8 100644
--- a/www/addons/coursecompletion/lang/de.json
+++ b/www/addons/coursecompletion/lang/de.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Abschließen",
+    "complete": "Fertig",
     "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",
-    "required": "Notwendig",
-    "requiredcriteria": "Notwendige Kriterien",
+    "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",
     "requirement": "Anforderung",
-    "status": "Status",
-    "viewcoursereport": "Kursbericht anzeigen"
+    "status": "Existierende Einschreibungen 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 a6fb10fd47b..8ba062f3e82 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": "Μη αυτόματη ολοκλήρωση",
+    "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..40d6b0459ae 100644
--- a/www/addons/coursecompletion/lang/es-mx.json
+++ b/www/addons/coursecompletion/lang/es-mx.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completo",
+    "complete": "Completado",
     "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": "Finalización de 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",
     "pending": "Pendiente",
-    "required": "Requerido",
-    "requiredcriteria": "Criterio requerido",
+    "required": "Obligatorio",
+    "requiredcriteria": "Criterios necesarios",
     "requirement": "Requisito",
-    "status": "Estatus",
+    "status": "Estatus de insignias",
     "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..a061fa0356e 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",
+    "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": "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": "Estado de la insignia",
     "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..295f4ed6d7c 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": "Ezinbestekoa",
     "requiredcriteria": "Irizpidea behar da",
     "requirement": "Eskakizuna",
-    "status": "Egoera",
+    "status": "Dominen 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 b9ddd4aaa56..2f308382aff 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..e0290d8a8bb 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": "Achèvement du 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": "Statut",
-    "viewcoursereport": "Afficher le rapport du cours"
+    "status": "Statut du badge",
+    "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..021aaa2b398 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": "בהמתנה",
-    "required": "נדרש",
-    "requiredcriteria": "מדד־הערכה נדרש",
+    "coursecompletion": "השלמת הקורס",
+    "criteria": "תנאי",
+    "criteriagroup": "קבוצת תנאים",
+    "criteriarequiredall": "כל התנאים המצויינים מטה נדרשים",
+    "criteriarequiredany": "לפחות אחד מהתנאים המצויינים מטה נדרשים",
+    "inprogress": "בלמידה",
+    "manualselfcompletion": "השלמה עצמאית ידנית",
+    "notyetstarted": "עדיין לא התחיל",
+    "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 d07a78bbda4..361a4bf7069 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": "A kitűző állapota",
     "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..85d2a1d7320 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",
+    "completed": "Completata",
     "completiondate": "Data di completamento",
     "couldnotloadreport": "Non è stato possibile caricare il report di completamento del corso, per favore riporva.",
-    "coursecompletion": "Completamento del 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 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": "Stato badge",
+    "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 344ea673aea..df8a2b8634d 100644
--- a/www/addons/coursecompletion/lang/ja.json
+++ b/www/addons/coursecompletion/lang/ja.json
@@ -1,21 +1,21 @@
 {
-    "complete": "完了",
+    "complete": "詳細",
     "completecourse": "コース完了",
-    "completed": "完了しました",
+    "completed": "完了",
     "completiondate": "完了した日",
     "couldnotloadreport": "コース完了の読み込みができませんでした。後でもう一度試してください。",
-    "coursecompletion": "コース完了",
+    "coursecompletion": "ユーザはこのコースを完了する必要があります。",
     "criteria": "クライテリア",
     "criteriagroup": "クライテリアグループ",
-    "criteriarequiredall": "以下すべてのクライテリアが必要",
-    "criteriarequiredany": "以下のクライテリアいずれかが必要",
+    "criteriarequiredall": "下記のクライテリアすべてが必須である",
+    "criteriarequiredany": "下記いくつかのクライテリアが必須である",
     "inprogress": "進行中",
-    "manualselfcompletion": "手動自己完了",
-    "notyetstarted": "まだ開始されていない",
-    "pending": "保留中",
-    "required": "必要な",
-    "requiredcriteria": "必要なクライテリア",
+    "manualselfcompletion": "手動による自己完了",
+    "notyetstarted": "未開始",
+    "pending": "保留",
+    "required": "必須",
+    "requiredcriteria": "必須クライテリア",
     "requirement": "要求",
-    "status": "状態",
-    "viewcoursereport": "コースレポートを見る"
+    "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..e26747a5ead 100644
--- a/www/addons/coursecompletion/lang/lt.json
+++ b/www/addons/coursecompletion/lang/lt.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Visas",
+    "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": "Kursų užbaigimas",
+    "coursecompletion": "Kurso baigimas",
     "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": "Būtina",
+    "requiredcriteria": "Būtini kriterijai",
     "requirement": "Būtina sąlyga",
-    "status": "Būsena",
+    "status": "Pasiekimo 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 78f31da0ac9..e8fdb985c1f 100644
--- a/www/addons/coursecompletion/lang/nl.json
+++ b/www/addons/coursecompletion/lang/nl.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Voltooi",
+    "complete": "Voltooid",
     "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": "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",
-    "required": "Vereist",
+    "criteriarequiredany": "Al onderstaande criteria zijn vereist",
+    "inprogress": "Actief",
+    "manualselfcompletion": "Manueel voltooien",
+    "notyetstarted": "Nog niet begonnen",
+    "pending": "Bezig",
+    "required": "Verplicht",
     "requiredcriteria": "Vereiste criteria",
     "requirement": "Vereiste",
-    "status": "Status",
+    "status": "Badge 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 db69489a520..c5ffb7263b7 100644
--- a/www/addons/coursecompletion/lang/pl.json
+++ b/www/addons/coursecompletion/lang/pl.json
@@ -1,17 +1,17 @@
 {
-    "complete": "Pełna wersja",
-    "completed": "Ukończony",
-    "coursecompletion": "Ukończenie kursu",
+    "complete": "Zakończone",
+    "completed": "zakończony",
+    "coursecompletion": "Użytkownicy muszą ukończyć ten kurs.",
     "criteria": "Kryteria",
     "criteriagroup": "Grupa kryteriów",
     "criteriarequiredall": "Wszystkie poniższe kryteria są wymagane",
     "criteriarequiredany": "Wszystkie poniższe kryteria są wymagane",
-    "inprogress": "W toku",
+    "inprogress": "Aktualne",
     "manualselfcompletion": "Samodzielne oznaczenie ukończenia",
     "notyetstarted": "Jeszcze nie rozpoczęto",
-    "pending": "Oczekujący",
+    "pending": "Oczekujące",
     "required": "Wymagane",
     "requiredcriteria": "Wymagane kryteria",
-    "status": "Status",
+    "status": "Status odznak",
     "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..6ffa2866e22 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": "Andamento do 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",
-    "pending": "Pendente",
-    "required": "Necessário",
-    "requiredcriteria": "Critério necessário",
+    "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",
     "requirement": "Exigência",
-    "status": "Condição",
-    "viewcoursereport": "Ver relatório de curso"
+    "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 5f2bd4dc942..7de6a08cbaa 100644
--- a/www/addons/coursecompletion/lang/pt.json
+++ b/www/addons/coursecompletion/lang/pt.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Concluído",
+    "complete": "Completo",
     "completecourse": "Disciplina concluída",
-    "completed": "Concluído",
+    "completed": "Completou",
     "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": "Estado da Medalha",
     "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..7a195f67c33 100644
--- a/www/addons/coursecompletion/lang/ro.json
+++ b/www/addons/coursecompletion/lang/ro.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Complet",
+    "complete": "Finalizează",
     "completecourse": "Curs complet",
-    "completed": "Complet",
+    "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": "Completarea cursului",
+    "coursecompletion": "Absolvire 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": "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 dbd50c8ad09..1c6b6de220a 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/sr-cr.json b/www/addons/coursecompletion/lang/sr-cr.json
index 610e78602a3..26e18b26b42 100644
--- a/www/addons/coursecompletion/lang/sr-cr.json
+++ b/www/addons/coursecompletion/lang/sr-cr.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Заврши",
+    "complete": "Потпуно",
     "completecourse": "Заврши курс",
     "completed": "Завршено",
     "completiondate": "Датум завршетка",
     "couldnotloadreport": "Није могуће учитати извештај о завршетку курса. Молимо вас, покушајте поново касније.",
-    "coursecompletion": "Завршетак курса",
+    "coursecompletion": "Завршеност курса",
     "criteria": "Критеријуми",
     "criteriagroup": "Група критеријума",
     "criteriarequiredall": "Сви доле наведени критеријуми су неопходни",
     "criteriarequiredany": "Било који од доле наведених критеријума је неопходан",
     "inprogress": "У току",
     "manualselfcompletion": "Ручни самостални завршетак",
-    "notyetstarted": "Још није започето",
-    "pending": "На чекању",
-    "required": "Неопходно",
-    "requiredcriteria": "Неопходни критеријуми",
+    "notyetstarted": "Није још почео",
+    "pending": "Не чекању",
+    "required": "Обавезно",
+    "requiredcriteria": "Обавезни критеријуми",
     "requirement": "Услов",
-    "status": "Статус",
+    "status": "Статус беџа",
     "viewcoursereport": "Прикажи извештај са курса"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sr-lt.json b/www/addons/coursecompletion/lang/sr-lt.json
index 6553f9f3960..89da4bf9058 100644
--- a/www/addons/coursecompletion/lang/sr-lt.json
+++ b/www/addons/coursecompletion/lang/sr-lt.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Završi",
+    "complete": "Potpuno",
     "completecourse": "Završi kurs",
     "completed": "Završeno",
     "completiondate": "Datum završetka",
     "couldnotloadreport": "Nije moguće učitati izveštaj o završetku kursa. Molimo vas, pokušajte ponovo kasnije.",
-    "coursecompletion": "Završetak kursa",
+    "coursecompletion": "Završenost kursa",
     "criteria": "Kriterijumi",
     "criteriagroup": "Grupa kriterijuma",
     "criteriarequiredall": "Svi dole navedeni kriterijumi su neophodni",
     "criteriarequiredany": "Bilo koji od dole navedenih kriterijuma je neophodan",
     "inprogress": "U toku",
     "manualselfcompletion": "Ručni samostalni završetak",
-    "notyetstarted": "Još nije započeto",
-    "pending": "Na čekanju",
-    "required": "Neophodno",
-    "requiredcriteria": "Neophodni kriterijumi",
+    "notyetstarted": "Nije još počeo",
+    "pending": "Ne čekanju",
+    "required": "Obavezno",
+    "requiredcriteria": "Obavezni kriterijumi",
     "requirement": "Uslov",
-    "status": "Status",
+    "status": "Status bedža",
     "viewcoursereport": "Prikaži izveštaj sa kursa"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sv.json b/www/addons/coursecompletion/lang/sv.json
index 1a9665c3d8e..df193278ade 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": "Fullgörande 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",
     "pending": "Avvaktar",
     "required": "Obligatorisk",
-    "requiredcriteria": "Obligatorisk villkor",
+    "requiredcriteria": "Obligatoriskt kriterium",
     "requirement": "Krav",
-    "status": "Status",
+    "status": "Status för märke",
     "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 89efac25b4d..3aedfd0238d 100644
--- a/www/addons/coursecompletion/lang/tr.json
+++ b/www/addons/coursecompletion/lang/tr.json
@@ -1,17 +1,17 @@
 {
-    "complete": "Tamamlanmış",
-    "completed": "Bitirmeli",
-    "coursecompletion": "Ders tamamlama",
+    "complete": "Tamamlandı",
+    "completed": "Tamamlandı",
+    "coursecompletion": "Kurs 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 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": "Nişan Durumu",
     "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 790fda5169e..8078ba36f3d 100644
--- a/www/addons/coursecompletion/lang/uk.json
+++ b/www/addons/coursecompletion/lang/uk.json
@@ -1,21 +1,21 @@
 {
-    "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": "Статус",
+    "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 f46cbe0662d..eedfdd029f5 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 55f600fc398..2e6a01c0622 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": "以下任何條件都為必須",
-    "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 3521b2b6f32..2ab44cda49c 100644
--- a/www/addons/files/lang/ar.json
+++ b/www/addons/files/lang/ar.json
@@ -4,5 +4,5 @@
     "files": "ملفات",
     "privatefiles": "ملفات خاصة",
     "sitefiles": "ملفات الموقع",
-    "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 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/da.json b/www/addons/files/lang/da.json
index 1453d08f9f7..5f9d7d54b3b 100644
--- a/www/addons/files/lang/da.json
+++ b/www/addons/files/lang/da.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Bemærk venligst at din Moodleadministrator har deaktiveret download af filer. Du kan se filerne men ikke downloade dem.",
     "clicktoupload": "Klik på knappen nedenfor for at uploade filer til dine private filer.",
     "couldnotloadfiles": "Fillisten kunne ikke hentes",
-    "emptyfilelist": "Der er ingen filer at vise.",
+    "emptyfilelist": "Der er ingen filer at vise",
     "erroruploadnotworking": "Desværre er det p.t. ikke muligt at uploade filer til dit site.",
     "files": "Filer",
     "myprivatefilesdesc": "Filerne som er tilgængelige i dit private område på dette Moodlewebsted.",
     "privatefiles": "Private filer",
     "sitefiles": "Site filer",
     "sitefilesdesc": "De andre filer som er tilgængelige for dig på denne Moodlewebside.",
-    "uploadfiles": "Upload filer"
+    "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 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/es.json b/www/addons/files/lang/es.json
index d67044531b0..7521ea196f2 100644
--- a/www/addons/files/lang/es.json
+++ b/www/addons/files/lang/es.json
@@ -4,10 +4,10 @@
     "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": "Archivos",
+    "files": "Ficheros",
     "myprivatefilesdesc": "Los archivos que están disponibles en su área privada en este sitio Moodle.",
     "privatefiles": "Ficheros 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/eu.json b/www/addons/files/lang/eu.json
index 30106de97bd..4648a027001 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 fitxategirik erakusteko.",
+    "emptyfilelist": "Ez dago erakusteko fitxategirik",
     "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": "Igo fitxategiak"
+    "uploadfiles": "bidali feedback-fitxategiak"
 }
\ 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/he.json b/www/addons/files/lang/he.json
index 0ed31567503..6f612548ac8 100644
--- a/www/addons/files/lang/he.json
+++ b/www/addons/files/lang/he.json
@@ -2,7 +2,7 @@
     "admindisableddownload": "יש לשים לב כי מנהל/ת אתר המוודל שלך, ביטל/ה את אפשרות להורדת הקבצים. באפשרותך לעיין בקבצים אך לא להורידם.",
     "clicktoupload": "להעלאת הקבצים לקבצים הפרטיים שלך, יש להקליק על הכפתור למטה.",
     "couldnotloadfiles": "לא ניתן לטעון את רשימת הקבצים.",
-    "emptyfilelist": "אין קבצים להצגה.",
+    "emptyfilelist": "אין קבצים להציג",
     "files": "קבצים",
     "myprivatefilesdesc": "הקבצים הזמינים לך באזור הפרטי באתר מוודל זה.",
     "privatefiles": "הקבצים שלי",
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/ja.json b/www/addons/files/lang/ja.json
index de63504d659..648ed7d331a 100644
--- a/www/addons/files/lang/ja.json
+++ b/www/addons/files/lang/ja.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/lt.json b/www/addons/files/lang/lt.json
index 82157441c00..1e5b2c5b2f2 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 ką rodyti.",
+    "emptyfilelist": "Nėra rodytinų failų",
     "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": "Įkelti failus"
+    "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 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/pt.json b/www/addons/files/lang/pt.json
index 3e1ce1acbd4..aad6d0a66be 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": "Não há ficheiros",
+    "emptyfilelist": "Este repositório está vazio",
     "erroruploadnotworking": "Infelizmente não é possível carregar ficheiros para o seu site.",
-    "files": "Ficheiros",
+    "files": "Anexos",
     "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": "Carregar ficheiros"
+    "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 30500b91c47..d8113b20c3d 100644
--- a/www/addons/files/lang/ro.json
+++ b/www/addons/files/lang/ro.json
@@ -2,8 +2,8 @@
     "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.",
-    "files": "Fişiere",
+    "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şiere site",
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/sr-cr.json b/www/addons/files/lang/sr-cr.json
index 2faaa2353ae..8fad2e69c6e 100644
--- a/www/addons/files/lang/sr-cr.json
+++ b/www/addons/files/lang/sr-cr.json
@@ -2,9 +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/sr-lt.json b/www/addons/files/lang/sr-lt.json
index d847189a2dd..2375580de0e 100644
--- a/www/addons/files/lang/sr-lt.json
+++ b/www/addons/files/lang/sr-lt.json
@@ -2,9 +2,12 @@
     "admindisableddownload": "Imajte u vidu da je vaš Moodle administrator onemogućio preuzimanje datoteka. Datoteke možete da pregledate, ali ne i da ih preuzmete.",
     "clicktoupload": "Kliknite na donje dugme kako biste otpremili datoteke među svoje privatne datoteke.",
     "couldnotloadfiles": "Spisak datoteka ne može biti učitan.",
-    "emptyfilelist": "Nema datoteka za prikaz.",
+    "emptyfilelist": "Nema datoteka za prikaz",
     "erroruploadnotworking": "Nažalost, trenutno nije moguće otpremiti datoteke na vaš sajt.",
+    "files": "Datoteke",
     "myprivatefilesdesc": "Datoteke koje su dostupne u vašem privatnom prostoru na ovom Moodle sajtu.",
+    "privatefiles": "Privatne datoteke",
+    "sitefiles": "Datoteke sajta",
     "sitefilesdesc": "Ostale datoteke koje su dostupne na ovom Moodle sajtu.",
-    "uploadfiles": "Otpremi datoteke"
+    "uploadfiles": "Pošalji datoteke sa povratnim informacijama"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/uk.json b/www/addons/files/lang/uk.json
index 083a9f56194..4043adc3905 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 78c6090acee..7f0cc12450e 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/frontpage/lang/da.json b/www/addons/frontpage/lang/da.json
index 14f7474bfce..b3d549ab6ff 100644
--- a/www/addons/frontpage/lang/da.json
+++ b/www/addons/frontpage/lang/da.json
@@ -1,4 +1,4 @@
 {
     "sitehome": "Webstedets forside",
-    "sitenews": "Sitenyheder"
+    "sitenews": "Sitemeddelelser"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/eu.json b/www/addons/frontpage/lang/eu.json
index 2a21d6f7aa1..332c7d403ff 100644
--- a/www/addons/frontpage/lang/eu.json
+++ b/www/addons/frontpage/lang/eu.json
@@ -1,4 +1,4 @@
 {
     "sitehome": "Gunearen hasiera",
-    "sitenews": "Gunearen berriak"
+    "sitenews": "Guneko albisteak"
 }
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/sr-cr.json b/www/addons/frontpage/lang/sr-cr.json
new file mode 100644
index 00000000000..de1f7c9cbd7
--- /dev/null
+++ b/www/addons/frontpage/lang/sr-cr.json
@@ -0,0 +1,4 @@
+{
+    "sitehome": "Насловна страница сајта",
+    "sitenews": "Обавештења сајта"
+}
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/sr-lt.json b/www/addons/frontpage/lang/sr-lt.json
new file mode 100644
index 00000000000..685ff10dcef
--- /dev/null
+++ b/www/addons/frontpage/lang/sr-lt.json
@@ -0,0 +1,4 @@
+{
+    "sitehome": "Naslovna stranica sajta",
+    "sitenews": "Obaveštenja sajta"
+}
\ No newline at end of file
diff --git a/www/addons/grades/lang/bg.json b/www/addons/grades/lang/bg.json
index 49ff4539d55..02c842d1272 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 c1625a02671..5517b193e17 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 6c9c03151dd..fd0241c2bc7 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 37ee094566f..1c1ce861d2d 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": "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 63f5df64a1c..f6450d5c884 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 194c13b5f5a..883d830fb4f 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 risultati"
+    "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 c49db645dae..23abe78a3be 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 1b33ee8446a..a11f8e821e2 100644
--- a/www/addons/grades/lang/nl.json
+++ b/www/addons/grades/lang/nl.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Geen cijfers",
-    "viewgrades": "Bekijk de cijfers"
+    "viewgrades": "Bekijk cijfers"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/pl.json b/www/addons/grades/lang/pl.json
index b2abf06357d..0f2f359336e 100644
--- a/www/addons/grades/lang/pl.json
+++ b/www/addons/grades/lang/pl.json
@@ -1,4 +1,4 @@
 {
     "nogradesreturned": "Brak stopni",
-    "viewgrades": "Pokaż oceny"
+    "viewgrades": "Podgląd ocen"
 }
\ No newline at end of file
diff --git a/www/addons/grades/lang/ru.json b/www/addons/grades/lang/ru.json
index fac7633651b..733ed0c23e6 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/sr-cr.json b/www/addons/grades/lang/sr-cr.json
new file mode 100644
index 00000000000..88b8e81b468
--- /dev/null
+++ b/www/addons/grades/lang/sr-cr.json
@@ -0,0 +1,4 @@
+{
+    "nogradesreturned": "Нема добијених оцена",
+    "viewgrades": "Приказ оцена"
+}
\ No newline at end of file
diff --git a/www/addons/grades/lang/sr-lt.json b/www/addons/grades/lang/sr-lt.json
new file mode 100644
index 00000000000..bc161c7fd6e
--- /dev/null
+++ b/www/addons/grades/lang/sr-lt.json
@@ -0,0 +1,4 @@
+{
+    "nogradesreturned": "Nema dobijenih ocena",
+    "viewgrades": "Prikaz ocena"
+}
\ No newline at end of file
diff --git a/www/addons/grades/lang/uk.json b/www/addons/grades/lang/uk.json
index 86c7bf00584..32dd4de48eb 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 9a7313f470a..7dedc8d3d0c 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 afa651966c1..81750633333 100644
--- a/www/addons/messages/lang/ar.json
+++ b/www/addons/messages/lang/ar.json
@@ -10,10 +10,10 @@
     "messages": "رسائل",
     "mustbeonlinetosendmessages": "لابد أن تكون متصل بالأنترنت لكي ترسل أي رسائل",
     "newmessage": "رسالة جديدة",
-    "nomessages": "لا يوجد رسائل",
-    "nousersfound": "لا يوجد مستخدمين",
+    "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 857ae200454..1cf0cf2e3be 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 f4e5e0357b7..78d880054d7 100644
--- a/www/addons/messages/lang/ca.json
+++ b/www/addons/messages/lang/ca.json
@@ -13,17 +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",
+    "messagepreferences": "Preferències dels missatges",
     "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 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 fe2c22c0fc3..18c655d4826 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",
+    "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": "Odeslat zprávu",
+    "send": "Odeslat",
+    "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 0e63f8c9314..0449e80699a 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": "Beskedtekst",
+    "message": "Meddelelse",
     "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 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/de.json b/www/addons/messages/lang/de.json
index 1f91de7f2a3..6deac3f090b 100644
--- a/www/addons/messages/lang/de.json
+++ b/www/addons/messages/lang/de.json
@@ -2,7 +2,7 @@
     "addcontact": "Kontakt hinzufügen",
     "blockcontact": "Kontakt sperren",
     "blockcontactconfirm": "Sie beenden den Mitteilungsempfang von diesem Kontakt.",
-    "blocknoncontacts": "Weitere Personen sperren",
+    "blocknoncontacts": "Mitteilungen nur für Kontakte zulassen",
     "contactlistempty": "Die Kontaktliste ist leer.",
     "contactname": "Name",
     "contacts": "Kontakte",
@@ -15,13 +15,13 @@
     "loadpreviousmessages": "Vorherige Mitteilungen laden",
     "message": "Mitteilung",
     "messagenotsent": "Die Mitteilung wurde nicht gesendet. Versuchen Sie es später noch einmal.",
-    "messagepreferences": "Mitteilungen konfigurieren",
+    "messagepreferences": "Mitteilungen",
     "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 972f33b7539..714e6df2eb0 100644
--- a/www/addons/messages/lang/el.json
+++ b/www/addons/messages/lang/el.json
@@ -11,15 +11,15 @@
     "errorwhileretrievingdiscussions": "Σφάλμα κατά την ανάκτηση των συζητήσεων από το διακομιστή.",
     "errorwhileretrievingmessages": "Σφάλμα κατά την ανάκτηση των μηνυμάτων από το διακομιστή.",
     "loadpreviousmessages": "Φορτώστε τα προηγούμενα μηνύματα",
-    "message": "Σώμα μηνύματος",
+    "message": "Μήνυμα",
     "messagenotsent": "Το μήνυμα δεν στάλθηκε, δοκιμάστε ξανά αργότερα.",
     "messagepreferences": "Προτιμήσεις μηνύματος",
     "messages": "Μηνύματα",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
-    "newmessage": "Νέο μήνυμα...",
+    "newmessage": "Νέο μήνυμα",
     "newmessages": "Νέα μηνύματα",
-    "nomessages": "Κανένα μήνυμα.",
-    "nousersfound": "Δεν βρέθηκαν χρήστες",
+    "nomessages": "Δεν υπάρχουν ακόμα μηνύματα",
+    "nousersfound": "Δε βρέθηκαν χρήστες",
     "removecontact": "Αφαίρεσε την επαφή",
     "removecontactconfirm": "Η επαφή θα καταργηθεί από τη λίστα επαφών σας.",
     "send": "Αποστολή",
diff --git a/www/addons/messages/lang/es-mx.json b/www/addons/messages/lang/es-mx.json
index b7a7a579a99..da63ffaf879 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": "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",
+    "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 c2662e87fb9..351337a98eb 100644
--- a/www/addons/messages/lang/es.json
+++ b/www/addons/messages/lang/es.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": "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",
     "newmessages": "Nuevos mensajes",
-    "nomessages": "No hay mensajes en espera",
+    "nomessages": "Aún no hay mensajes",
     "nousersfound": "No se encuentran usuarios",
     "removecontact": "Eliminar contacto",
     "removecontactconfirm": "El contacto se eliminará de su lista de contactos.",
-    "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 ed18c8f0e65..0da6ce51bb0 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": "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 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 a6d80f69982..f5155644c97 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 159b6fe52a9..454057f6d63 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": "Corps du message",
+    "message": "Message",
     "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é",
+    "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",
+    "sendmessage": "Envoyer message personnel",
     "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 99fc18ee0ff..9cc287e1b26 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": "אין מסרים.",
-    "nousersfound": "לא נמצאו משתמשים",
+    "newmessage": "הודעה חדשה",
+    "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 324fe26fe60..af6e18a3d8a 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 törzsszövege",
+    "message": "Üzenet",
     "messagepreferences": "Üzenet beállításai",
     "messages": "Üzenetek",
     "newmessage": "Új üzenet",
-    "nomessages": "Még nincs üzenet",
+    "nomessages": "Nincs üzenet.",
     "nousersfound": "Nincs felhasználó",
     "removecontact": "Kapcsolat törlése",
-    "send": "Elküld",
+    "send": "küldés",
     "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 0762bb1d877..6acc19d9b7d 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": "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",
+    "newmessage": "Nuovo 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 ea482d4418d..da389c600e2 100644
--- a/www/addons/messages/lang/ja.json
+++ b/www/addons/messages/lang/ja.json
@@ -13,15 +13,15 @@
     "errorwhileretrievingdiscussions": "サーバからディスカッションを受信中にエラーが発生しました。",
     "errorwhileretrievingmessages": "サーバからメッセージを受信中にエラーが発生しました。",
     "loadpreviousmessages": "以前のメッセージを読み込み",
-    "message": "メッセージ本文",
+    "message": "メッセージ",
     "messagenotsent": "メッセージは送信されませんでした。後で再び試みてください。",
     "messagepreferences": "メッセージプリファレンス",
     "messages": "メッセージ",
     "mustbeonlinetosendmessages": "メッセージを送信するにはオンラインでなければなりません。",
-    "newmessage": "新規メッセージ...",
+    "newmessage": "新しいメッセージ",
     "newmessages": "新規メッセージ...",
-    "nomessages": "メッセージがありません。",
-    "nousersfound": "ユーザが見つかりません",
+    "nomessages": "メッセージはありません。",
+    "nousersfound": "ユーザは見つかりませんでした。",
     "removecontact": "コンタクトから削除する",
     "removecontactconfirm": "連絡先はあなたの連絡先リストから削除されます。",
     "send": "送信",
diff --git a/www/addons/messages/lang/lt.json b/www/addons/messages/lang/lt.json
index f63f91053b9..ba0d4980bbf 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": "Pranešimo tekstas",
+    "message": "Žinutės 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",
+    "newmessage": "Nauja žinutė",
+    "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 c0cb0d61bb3..36315f2cc2e 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": "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": "Nog geen berichten",
     "nousersfound": "Geen gebruikers gevonden",
     "removecontact": "Verwijder contactpersoon",
     "removecontactconfirm": "Contact zal verwijderd worden van je contactenlijst.",
-    "send": "Stuur",
+    "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 a0b20dc95eb..6cb4279d4f9 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": "Treść wiadomości",
+    "message": "Wiadomość",
     "messagepreferences": "Preferencje wiadomości",
     "messages": "Wiadomości",
     "newmessage": "Nowa wiadomość",
-    "nomessages": "Brak wiadomości",
+    "nomessages": "Brak oczekujących 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 b7c9da7e6a9..54c1e1b6e2c 100644
--- a/www/addons/messages/lang/pt-br.json
+++ b/www/addons/messages/lang/pt-br.json
@@ -13,17 +13,18 @@
     "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.",
+    "messagepreferences": "Preferências de mensagens",
     "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": "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 b9ae68508bd..0e8975e0f49 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": "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": "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 b519bbf378f..1ee83c12782 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": "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 a fost trimis încă niciun mesaj",
+    "nousersfound": "Nu s-au găsit utilizatori",
     "removecontact": "Şterge prieten din listă",
-    "send": "Trimis",
+    "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 be656eda0df..37c1774bd10 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": "Новое сообщение...",
+    "newmessage": "Новое сообщение",
     "newmessages": "Новые сообщения",
-    "nomessages": "Нет сообщений",
+    "nomessages": "Нет ни одного сообщения",
     "nousersfound": "Пользователи не найдены",
     "removecontact": "Удалить собеседника из моего списка",
     "send": "Отправить",
diff --git a/www/addons/messages/lang/sr-cr.json b/www/addons/messages/lang/sr-cr.json
index e03e4624361..fdd16352919 100644
--- a/www/addons/messages/lang/sr-cr.json
+++ b/www/addons/messages/lang/sr-cr.json
@@ -1,23 +1,34 @@
 {
+    "addcontact": "Додај контакт",
+    "blockcontact": "Блокирај контакт",
     "blockcontactconfirm": "Нећете више добијати поруке од ове особе.",
+    "blocknoncontacts": "Блокирај све нове поруке од корисника који нису на мојој листи контаката",
     "contactlistempty": "Листа контаката је празна",
     "contactname": "Име особе",
+    "contacts": "Контакти",
     "errordeletemessage": "Грешка приликом брисања поруке.",
     "errorwhileretrievingcontacts": "Грешка приликом преузимања контаката са сервера.",
     "errorwhileretrievingdiscussions": "Грешка приликом преузимања дискусија са сервера.",
     "errorwhileretrievingmessages": "Грешка приликом преузимања порука са сервера.",
     "loadpreviousmessages": "Учитај претходне поруке",
+    "message": "Тело поруке",
     "messagenotsent": "Порука није послата. Молимо, покушајте поново касније.",
+    "messagepreferences": "Параметри порука",
+    "messages": "Поруке",
     "mustbeonlinetosendmessages": "Морате бити онлајн како бисте слали поруке",
-    "newmessage": "Нове поруке...",
+    "newmessage": "Нова порука",
     "newmessages": "Нове поруке",
-    "nomessages": "Нема порука.",
+    "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/messages/lang/sr-lt.json b/www/addons/messages/lang/sr-lt.json
index 305b0160956..a5c218640e8 100644
--- a/www/addons/messages/lang/sr-lt.json
+++ b/www/addons/messages/lang/sr-lt.json
@@ -1,23 +1,34 @@
 {
+    "addcontact": "Dodaj kontakt",
+    "blockcontact": "Blokiraj kontakt",
     "blockcontactconfirm": "Nećete više dobijati poruke od ove osobe.",
+    "blocknoncontacts": "Blokiraj sve nove poruke od korisnika koji nisu na mojoj listi kontakata",
     "contactlistempty": "Lista kontakata je prazna",
     "contactname": "Ime osobe",
+    "contacts": "Kontakti",
     "errordeletemessage": "Greška prilikom brisanja poruke.",
     "errorwhileretrievingcontacts": "Greška prilikom preuzimanja kontakata sa servera.",
     "errorwhileretrievingdiscussions": "Greška prilikom preuzimanja diskusija sa servera.",
     "errorwhileretrievingmessages": "Greška prilikom preuzimanja poruka sa servera.",
     "loadpreviousmessages": "Učitaj prethodne poruke",
+    "message": "Telo poruke",
     "messagenotsent": "Poruka nije poslata. Molimo, pokušajte ponovo kasnije.",
+    "messagepreferences": "Parametri poruka",
+    "messages": "Poruke",
     "mustbeonlinetosendmessages": "Morate biti onlajn kako biste slali poruke",
-    "newmessage": "Nove poruke...",
+    "newmessage": "Nova poruka",
     "newmessages": "Nove poruke",
-    "nomessages": "Nema poruka.",
+    "nomessages": "Još nema poruka",
     "nousersfound": "Nije pronađen nijedan korisnik",
+    "removecontact": "Obriši kontakt",
     "removecontactconfirm": "Osoba će biti uklonjena sa vaše liste kontakata.",
+    "send": "Pošalji",
+    "sendmessage": "Pošalji poruku",
     "type_blocked": "Blokiran",
     "type_offline": "Oflajn",
     "type_online": "Onlajn",
     "type_search": "Rezultati pretrage",
     "type_strangers": "Drugi",
+    "unblockcontact": "Odblokiraj kontakt",
     "warningmessagenotsent": "Nije moguće poslati poruku/e korisniku {{user}}. {{error}}"
 }
\ No newline at end of file
diff --git a/www/addons/messages/lang/sv.json b/www/addons/messages/lang/sv.json
index 301b34c89a3..6a623453331 100644
--- a/www/addons/messages/lang/sv.json
+++ b/www/addons/messages/lang/sv.json
@@ -11,15 +11,16 @@
     "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.",
+    "messagepreferences": "Välj inställningar för meddelanden",
     "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 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 72ef991ede5..38d1a3b1e77 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 gövdesi",
+    "message": "Mesaj",
     "messagepreferences": "İleti tercihleri",
     "messages": "Mesajlar",
     "newmessage": "Yeni ileti",
-    "nomessages": "İleti 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 6fab9eec6d8..12fc1146ab9 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 38ed871a73d..fa7d759934b 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 34693107bc7..de4e6fccf0f 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": "沒有任何訊息.",
-    "nousersfound": "沒有使用者",
+    "newmessage": "新簡訊",
+    "nomessages": "尚無訊息",
+    "nousersfound": "找不到用戶",
     "removecontact": "刪除聯絡人",
-    "send": "傳送",
-    "sendmessage": "寄送訊息",
+    "send": "送出",
+    "sendmessage": "傳送簡訊",
     "type_blocked": "已停止",
     "type_offline": "離線",
     "type_online": "上線",
diff --git a/www/addons/mod/assign/lang/ca.json b/www/addons/mod/assign/lang/ca.json
index 9d246a7ff12..065ff663e07 100644
--- a/www/addons/mod/assign/lang/ca.json
+++ b/www/addons/mod/assign/lang/ca.json
@@ -32,7 +32,7 @@
     "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": "Qualifica",
+    "grade": "Qualificació",
     "graded": "Qualificada",
     "gradedby": "Qualificat per",
     "gradedon": "Qualificat el",
diff --git a/www/addons/mod/assign/lang/de.json b/www/addons/mod/assign/lang/de.json
index 802d7887f82..02ebc2a9649 100644
--- a/www/addons/mod/assign/lang/de.json
+++ b/www/addons/mod/assign/lang/de.json
@@ -32,7 +32,7 @@
     "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": "Relative Bewertung",
+    "grade": "Bewertung",
     "graded": "Bewertet",
     "gradedby": "Bewertet von",
     "gradedon": "Bewertet am",
diff --git a/www/addons/mod/assign/lang/el.json b/www/addons/mod/assign/lang/el.json
index 0303c8b0932..f05910d0dc3 100644
--- a/www/addons/mod/assign/lang/el.json
+++ b/www/addons/mod/assign/lang/el.json
@@ -34,6 +34,7 @@
     "latesubmissions": "Εκπρόθεσμες υποβολές",
     "noattempt": "Καμία προσπάθεια",
     "nomoresubmissionsaccepted": "Επιτρέπονται μόνο στους συμμετέχοντες που τους έχει χορηγηθεί παράταση",
+    "noonlinesubmissions": "Δεν απαιτείται κάποια υποβολή",
     "nosubmission": "Δεν έχει υποβληθεί τίποτα για την εργασία αυτή",
     "notallparticipantsareshown": "Συμμετέχοντες χωρίς υποβολές δεν προβάλλονται",
     "notgraded": "Χωρίς βαθμό",
diff --git a/www/addons/mod/assign/lang/eu.json b/www/addons/mod/assign/lang/eu.json
index 1b62e71067f..c5b7f53de20 100644
--- a/www/addons/mod/assign/lang/eu.json
+++ b/www/addons/mod/assign/lang/eu.json
@@ -32,7 +32,7 @@
     "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": "Nota",
+    "grade": "Kalifikazioa",
     "graded": "Kalifikatua",
     "gradedby": "Nork kalifikatua",
     "gradedon": "Noiz kalifikatua",
diff --git a/www/addons/mod/assign/lang/fr.json b/www/addons/mod/assign/lang/fr.json
index a381dffff5a..19cfc56bcaf 100644
--- a/www/addons/mod/assign/lang/fr.json
+++ b/www/addons/mod/assign/lang/fr.json
@@ -57,7 +57,7 @@
     "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 évalué",
     "numberofdraftsubmissions": "Brouillons",
     "numberofparticipants": "Participants",
     "numberofsubmissionsneedgrading": "Nécessitant évaluation",
@@ -76,10 +76,10 @@
     "submissionstatus_": "Pas de travail remis",
     "submissionstatus_draft": "Brouillon (non remis)",
     "submissionstatus_marked": "Noté",
-    "submissionstatus_new": "Aucun travail remis",
+    "submissionstatus_new": "Non remis",
     "submissionstatus_reopened": "Rouvert",
     "submissionstatus_submitted": "Remis pour évaluation",
-    "submissionstatusheading": "État du travail remis",
+    "submissionstatusheading": "Statut de remise",
     "submissionteam": "Groupe",
     "submitassignment": "Envoyer le devoir",
     "submitassignment_help": "Une fois ce devoir envoyé, vous ne pourrez plus y effectuer de modification.",
diff --git a/www/addons/mod/assign/lang/he.json b/www/addons/mod/assign/lang/he.json
index 634624ece1e..05f4ea2748c 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/it.json b/www/addons/mod/assign/lang/it.json
index efc338d796b..bfcebef051d 100644
--- a/www/addons/mod/assign/lang/it.json
+++ b/www/addons/mod/assign/lang/it.json
@@ -25,7 +25,7 @@
     "editingstatus": "Possibilità di modifica",
     "editsubmission": "Modifica consegna",
     "extensionduedate": "Data scadenza proroga",
-    "grade": "Punteggio",
+    "grade": "Valutazione",
     "graded": "Valutata",
     "gradedby": "Valutatore",
     "gradedon": "Data di valutazione",
diff --git a/www/addons/mod/assign/lang/ja.json b/www/addons/mod/assign/lang/ja.json
index 7d36b430584..4837351e4cc 100644
--- a/www/addons/mod/assign/lang/ja.json
+++ b/www/addons/mod/assign/lang/ja.json
@@ -32,7 +32,7 @@
     "errorshowinginformation": "提出物の情報を表示できません。",
     "extensionduedate": "延長提出期限",
     "feedbacknotsupported": "このフィードバックはアプリでは未サポートのため、すべての情報が含まれていない可能性があります",
-    "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-br.json b/www/addons/mod/assign/lang/pt-br.json
index 1b62b585379..f88df961a39 100644
--- a/www/addons/mod/assign/lang/pt-br.json
+++ b/www/addons/mod/assign/lang/pt-br.json
@@ -32,7 +32,7 @@
     "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": "Avaliação",
+    "grade": "Nota",
     "graded": "Avaliado",
     "gradedby": "Avaliado por",
     "gradedon": "Avaliado em",
@@ -42,7 +42,7 @@
     "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",
+    "latesubmissionsaccepted": "Permitido até {{$a}}",
     "markingworkflowstate": "Estado do fluxo de avaliação",
     "markingworkflowstateinmarking": "Em avaliação",
     "markingworkflowstateinreview": "Em revisão",
@@ -50,7 +50,7 @@
     "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.",
+    "multipleteams": "Membro de mais de um grupo",
     "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",
diff --git a/www/addons/mod/assign/lang/pt.json b/www/addons/mod/assign/lang/pt.json
index e2242d63f5e..f94e6cbb858 100644
--- a/www/addons/mod/assign/lang/pt.json
+++ b/www/addons/mod/assign/lang/pt.json
@@ -32,14 +32,14 @@
     "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",
     "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",
+    "groupsubmissionsettings": "Configurações das submissões em grupo",
     "hiddenuser": "Participante",
     "latesubmissions": "Submissões com atraso",
     "latesubmissionsaccepted": "Disponível até {{$a}}",
diff --git a/www/addons/mod/assign/lang/ro.json b/www/addons/mod/assign/lang/ro.json
index 00faa4cbbda..9e5786fe879 100644
--- a/www/addons/mod/assign/lang/ro.json
+++ b/www/addons/mod/assign/lang/ro.json
@@ -20,7 +20,7 @@
     "editingstatus": "Se editează statusul",
     "editsubmission": "Editare temă trimisă",
     "extensionduedate": "Termen de predare extins",
-    "grade": "Notează",
+    "grade": "Notă",
     "graded": "Notat",
     "gradedby": "Notat de",
     "gradedon": "Notat în data de",
diff --git a/www/addons/mod/assign/lang/sr-cr.json b/www/addons/mod/assign/lang/sr-cr.json
index 653fd72673d..3d0bf618245 100644
--- a/www/addons/mod/assign/lang/sr-cr.json
+++ b/www/addons/mod/assign/lang/sr-cr.json
@@ -1,15 +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": "Оцењено",
     "gradenotsynced": "Оцена није синхронизована",
+    "gradeoutof": "Оцена од {{$a}}",
+    "gradingstatus": "Статус оцењивања",
+    "groupsubmissionsettings": "Подешавања за групну предају рада",
+    "hiddenuser": "Учесник",
+    "latesubmissions": "Касно предати радови",
+    "latesubmissionsaccepted": "Дозвољено до {{$a}}",
+    "markingworkflowstate": "Стање тока оцењивања",
+    "markingworkflowstateinmarking": "Оцењује се",
+    "markingworkflowstateinreview": "На прегледу",
+    "markingworkflowstatenotmarked": "Није оцењено",
+    "markingworkflowstatereadyforrelease": "Спремно за објаву",
+    "markingworkflowstatereadyforreview": "Оцењивање завршено",
+    "markingworkflowstatereleased": "Објављено",
+    "multipleteams": "Члан више од једне групе",
+    "noattempt": "Нема покушаја",
+    "nomoresubmissionsaccepted": "Дозвољено само полазницима којима је одобрен продужетак",
+    "noonlinesubmissions": "Овај задатак не тражи од вас да било штa предате  онлајн",
+    "nosubmission": "За овај задатак још ништа није предато",
     "notallparticipantsareshown": "Учесници који нису предали рад се не приказују",
+    "noteam": "Није члан ниједне групе.",
+    "notgraded": "Није оцењено",
+    "numberofdraftsubmissions": "Нацрти",
+    "numberofparticipants": "Учесници",
+    "numberofsubmissionsneedgrading": "Тражи оцењивање",
+    "numberofsubmittedassignments": "Предато",
+    "numberofteams": "Групе",
+    "numwords": "{{$a}} реч(и)",
+    "outof": "{{$a.current}} од {{$a.total}}",
+    "overdue": "<font color=\"red\">Крајњи рок за предају рада је истекао пре: {{$a}}</font>",
+    "savechanges": "Сачувај промене",
+    "submission": "Предати рад",
+    "submissioneditable": "Полазници могу да уређују овај задатак",
+    "submissionnoteditable": "Полазници не могу да уређују овај задатак",
     "submissionnotsupported": "Апликација не подржава овај предати рад. Могуће је да рад не садржи све информације.",
+    "submissionslocked": "Овај задатак не прихвата предају радова",
+    "submissionstatus": "Статус предатог рада",
+    "submissionstatus_": "Нема предатих радова",
+    "submissionstatus_draft": "Нацрт рада (није предато)",
+    "submissionstatus_marked": "Оцењено",
+    "submissionstatus_new": "Нови предати рад",
+    "submissionstatus_reopened": "Поново отворено",
+    "submissionstatus_submitted": "Предато за оцењивање",
+    "submissionstatusheading": "Статус предатог рада",
+    "submissionteam": "Група",
+    "submitassignment": "Predaj rad",
+    "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/sr-lt.json b/www/addons/mod/assign/lang/sr-lt.json
index fc825011df5..ee08bd63383 100644
--- a/www/addons/mod/assign/lang/sr-lt.json
+++ b/www/addons/mod/assign/lang/sr-lt.json
@@ -1,15 +1,97 @@
 {
     "acceptsubmissionstatement": "Molimo vas da prihvatite izjavu o predaji rada.",
+    "addattempt": "Dozvoli drugi pokušaj",
+    "addnewattempt": "Dodaj novi pokušaj",
+    "addnewattemptfromprevious": "Dodaj novi pokušaj na osnovu prethodno predatog rada",
+    "addsubmission": "Dodaj rad",
+    "allowsubmissionsanddescriptionfromdatesummary": "Detaljnije informacije o zadatku i obrazac za predaju radova biće dostupni od <strong>{{$a}}</strong>",
+    "allowsubmissionsfromdate": "Dozvoli predaju od",
+    "allowsubmissionsfromdatesummary": "Ovaj zadatak će prihvatiti predaju rada od <strong>{{$a}}</strong>",
+    "applytoteam": "Primenite ocene i povratne informacije na celu grupu",
+    "assignmentisdue": "Krajnji rok za predaju je istekao",
+    "attemptnumber": "Broj pokušaja",
+    "attemptreopenmethod": "Ponovno otvaranje rada",
+    "attemptreopenmethod_manual": "Ručno",
+    "attemptreopenmethod_untilpass": "Automatski dok ne dobije prelaznu ocenu",
+    "attemptsettings": "Podešavanja pokušaja",
     "cannoteditduetostatementsubmission": "Ne možete da dodate ili menjate rad u aplikaciji jer nismo mogli da preuzmemo sa sajta izjavu o predaji rada.",
     "cannotgradefromapp": "Aplikacije ne podržava neke metode ocenjivanja i one ne mogu da se menjaju.",
     "cannotsubmitduetostatementsubmission": "Ne možete da predate rad na ocenjivanje u aplikaciji jer nismo mogli da preuzmemo sa sajta izjavu o predaji rada.",
+    "confirmsubmission": "Da li ste sigurni da želite da  predate svoj rad na ocenjivanje? Više nećete moći da ga menjate.",
+    "currentattempt": "Ovo je pokušaj {{$a}}.",
+    "currentattemptof": "Ovo je pokušaj {{$a.attemptnumber}} ( {{$a.maxattempts}} dozvoljena/ih pokušaja ).",
+    "currentgrade": "Trenutna ocena u knjizi ocena",
+    "cutoffdate": "Definitivni rok",
+    "defaultteam": "Podrazumevana grupa",
+    "duedate": "Krajnji rok",
+    "duedateno": "Nema krajnjeg roka",
+    "duedatereached": "Krajnji rok za ovaj zadatak je sada istekao",
+    "editingstatus": "Status uređivanja",
+    "editsubmission": "Uredi rad",
     "erroreditpluginsnotsupported": "Ne možete da dodate ili menjate rad u aplikaciji jer neki dodaci nemaju podršku za uređivanje:",
     "errorshowinginformation": "Ne možemo da prikažemo informacije o predatom radu",
+    "extensionduedate": "Produženi rok",
     "feedbacknotsupported": "Apllikacija ne podržava ovu povratnu informaciju. Moguće je da ona ne sadrži sve informacije.",
+    "grade": "Ocena",
+    "graded": "Ocenjeno",
+    "gradedby": "Ocenio/la",
+    "gradedon": "Ocenjeno",
     "gradenotsynced": "Ocena nije sinhronizovana",
+    "gradeoutof": "Ocena od {{$a}}",
+    "gradingstatus": "Status ocenjivanja",
+    "groupsubmissionsettings": "Podešavanja za grupnu predaju rada",
+    "hiddenuser": "Učesnik",
+    "latesubmissions": "Kasno predati radovi",
+    "latesubmissionsaccepted": "Dozvoljeno do {{$a}}",
+    "markingworkflowstate": "Stanje toka ocenjivanja",
+    "markingworkflowstateinmarking": "Ocenjuje se",
+    "markingworkflowstateinreview": "Na pregledu",
+    "markingworkflowstatenotmarked": "Nije ocenjeno",
+    "markingworkflowstatereadyforrelease": "Spremno za objavu",
+    "markingworkflowstatereadyforreview": "Ocenjivanje završeno",
+    "markingworkflowstatereleased": "Objavljeno",
+    "multipleteams": "Član više od jedne grupe",
+    "noattempt": "Nema pokušaja",
+    "nomoresubmissionsaccepted": "Dozvoljeno samo polaznicima kojima je odobren produžetak",
+    "noonlinesubmissions": "Ovaj zadatak ne traži od vas da bilo šta predate  onlajn",
+    "nosubmission": "Za ovaj zadatak još ništa nije predato",
     "notallparticipantsareshown": "Učesnici koji nisu predali rad se ne prikazuju",
+    "noteam": "Nije član nijedne grupe.",
+    "notgraded": "Nije ocenjeno",
+    "numberofdraftsubmissions": "Nacrti",
+    "numberofparticipants": "Učesnici",
+    "numberofsubmissionsneedgrading": "Traži ocenjivanje",
+    "numberofsubmittedassignments": "Predato",
+    "numberofteams": "Grupe",
+    "numwords": "{{$a}} reč(i)",
+    "outof": "{{$a.current}} od {{$a.total}}",
+    "overdue": "<font color=\"red\">Krajnji rok za predaju rada je istekao pre: {{$a}}</font>",
+    "savechanges": "Sačuvaj promene",
+    "submission": "Predati rad",
+    "submissioneditable": "Polaznici mogu da uređuju ovaj zadatak",
+    "submissionnoteditable": "Polaznici ne mogu da uređuju ovaj zadatak",
     "submissionnotsupported": "Aplikacija ne podržava ovaj predati rad. Moguće je da rad ne sadrži sve informacije.",
+    "submissionslocked": "Ovaj zadatak ne prihvata predaju radova",
+    "submissionstatus": "Status predatog rada",
+    "submissionstatus_": "Nema predatih radova",
+    "submissionstatus_draft": "Nacrt rada (nije predato)",
+    "submissionstatus_marked": "Ocenjeno",
+    "submissionstatus_new": "Novi predati rad",
+    "submissionstatus_reopened": "Ponovo otvoreno",
+    "submissionstatus_submitted": "Predato za ocenjivanje",
+    "submissionstatusheading": "Status predatog rada",
+    "submissionteam": "Grupa",
+    "submitassignment": "Predaj zadatak",
+    "submitassignment_help": "Onog trenutka kada predate ovaj rad više nećete moći da ga menjate.",
+    "submittedearly": "Zadatak je predat {{$a}} ranije",
+    "submittedlate": "Zadatak je predat {{$a}} kasnije",
+    "timemodified": "Poslednje izmene",
+    "timeremaining": "Preostalo vreme",
+    "ungroupedusers": "Podešavanje 'Neophodna je grupa za predaju rada' je omogućeno, ali neki korisnici nisu članovi nijedne grupe, ili su članovi više od jedne grupe, tako da ne mogu da predaju rad.",
+    "unlimitedattempts": "Neograničeno",
+    "userswhoneedtosubmit": "Korisnici koji treba da predaju rešenje: {{$a}}",
     "userwithid": "Korisnik sa ID oznakom  {{id}}",
+    "viewsubmission": "Pogledaj predati rad",
     "warningsubmissiongrademodified": "Ocena predatog rada je izmenjena na sajtu.",
     "warningsubmissionmodified": "Predati rad korisnika je izmenjen na sajtu."
 }
\ 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 674db970084..a4ffe14d1c8 100644
--- a/www/addons/mod/assign/lang/sv.json
+++ b/www/addons/mod/assign/lang/sv.json
@@ -13,7 +13,7 @@
     "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",
+    "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 ä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",
@@ -23,9 +23,9 @@
     "duedateno": "Inget stoppdatum/tid",
     "duedatereached": "Stoppdatum för denna inlämningsuppgift har nu passerat",
     "editingstatus": "Redigerar status",
-    "editsubmission": "Redigera min inskickade uppgiftslösning",
+    "editsubmission": "Redigera min inlämning",
     "extensionduedate": "Förlängning av stoppdatum",
-    "grade": "Betyg/omdöme",
+    "grade": "Betyg",
     "graded": "Betygssatt",
     "gradedby": "Betygssatt av",
     "gradedon": "Betygssatt den",
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/assign/lang/zh-tw.json b/www/addons/mod/assign/lang/zh-tw.json
index 94a6fc83415..674e767eebf 100644
--- a/www/addons/mod/assign/lang/zh-tw.json
+++ b/www/addons/mod/assign/lang/zh-tw.json
@@ -32,7 +32,7 @@
     "errorshowinginformation": "我們無法顯示提交資訊",
     "extensionduedate": "展延到期日",
     "feedbacknotsupported": "該應用程式不支援此回饋, 並且可能不包含所有資訊",
-    "grade": "分數",
+    "grade": "成績",
     "graded": "已評分",
     "gradedby": "已評分由",
     "gradedon": "評分標準",
diff --git a/www/addons/mod/chat/lang/cs.json b/www/addons/mod/chat/lang/cs.json
index 5a2dbd232b7..a0e6fc3cd3b 100644
--- a/www/addons/mod/chat/lang/cs.json
+++ b/www/addons/mod/chat/lang/cs.json
@@ -14,6 +14,6 @@
     "mustbeonlinetosendmessages": "Pro odesílání zpráv musíte být online",
     "nomessages": "Zatím žádné zprávy",
     "send": "Odeslat",
-    "sessionstart": "Další chatování začne v {{$a}}, (za {{$a.fromnow}})",
+    "sessionstart": "Další chatování začne v: {{$a.date}} (tj. za {{$a.fromnow}})",
     "talk": "Diskuse"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/de.json b/www/addons/mod/chat/lang/de.json
index 9f7bc7161e6..77a921dd9cc 100644
--- a/www/addons/mod/chat/lang/de.json
+++ b/www/addons/mod/chat/lang/de.json
@@ -14,6 +14,6 @@
     "mustbeonlinetosendmessages": "Sie müssen online sein, um Mitteilungen zu senden",
     "nomessages": "Keine Mitteilungen",
     "send": "Senden",
-    "sessionstart": "Nächster Chat beginnt am {{$a.date}}. ({{$a.fromnow}} von jetzt)",
+    "sessionstart": "Nächster Chat beginnt {{$a.date}}, (also in {{$a.fromnow}})",
     "talk": "Sprechen"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/he.json b/www/addons/mod/chat/lang/he.json
index 8cd72c5f92d..129855c2b7c 100644
--- a/www/addons/mod/chat/lang/he.json
+++ b/www/addons/mod/chat/lang/he.json
@@ -10,6 +10,6 @@
     "mustbeonlinetosendmessages": "עליך להיות מחובר בכדי לשלוח הודעות.",
     "nomessages": "אין הודעות עדיין",
     "send": "שליחה",
-    "sessionstart": "מפגש הרב-שיח הבא יתחיל ב: {{$a}}",
+    "sessionstart": "מפגש הרב-שיח הבא יתחיל ב: {{$a.date}}, ({{$a.fromnow}} מעכשיו)",
     "talk": "דברו"
 }
\ 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 0eb4caa16f1..b71c2b82006 100644
--- a/www/addons/mod/chat/lang/lt.json
+++ b/www/addons/mod/chat/lang/lt.json
@@ -14,6 +14,6 @@
     "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}}",
+    "sessionstart": "Kitas pokalbio seansas prasidės {{$a.date}},  ({{$a.fromnow}} nuo dabar)",
     "talk": "Kalbėti"
 }
\ 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..f8fbf09ec3f 100644
--- a/www/addons/mod/chat/lang/pl.json
+++ b/www/addons/mod/chat/lang/pl.json
@@ -9,6 +9,6 @@
     "messageexit": "{{$a}} opuścił czat",
     "nomessages": "Brak wiadomości",
     "send": "Wyślij",
-    "sessionstart": "Sesja czatu rozpocznie się za:  {$ a}}",
+    "sessionstart": "Sesja czatu rozpocznie się {{$a.date}}, za ({{$a.fromnow}}",
     "talk": "Dyskusja"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/pt-br.json b/www/addons/mod/chat/lang/pt-br.json
index 474fea465ec..eca3a53a9e6 100644
--- a/www/addons/mod/chat/lang/pt-br.json
+++ b/www/addons/mod/chat/lang/pt-br.json
@@ -14,6 +14,6 @@
     "mustbeonlinetosendmessages": "Você deve estar online para enviar mensagens",
     "nomessages": "Nenhuma mensagem ainda",
     "send": "Enviar",
-    "sessionstart": "A próxima sessão de chat irá começar em {{$a}}",
+    "sessionstart": "A próxima sessão de chat irá começar em {{$a.date}}, ({{$a.fromnow}} a partir de agora)",
     "talk": "Falar"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/sr-cr.json b/www/addons/mod/chat/lang/sr-cr.json
index 1e36fd7d84d..be3c293d91c 100644
--- a/www/addons/mod/chat/lang/sr-cr.json
+++ b/www/addons/mod/chat/lang/sr-cr.json
@@ -1,8 +1,19 @@
 {
+    "beep": "Звучни сигнал",
+    "currentusers": "Тренутни корисници",
+    "enterchat": "Кликните овде за улазак у причаоницу",
+    "entermessage": "Унесите вашу поруку",
     "errorwhileconnecting": "Грешка приликом повезивања са причаоницом.",
     "errorwhilegettingchatdata": "Грешка приликом преузимања података за 'Причаоницу'.",
     "errorwhilegettingchatusers": "Грешка приликом преузимања корисника причаонице.",
     "errorwhileretrievingmessages": "Грешка приликом преузимања порука са сервера.",
     "errorwhilesendingmessage": "Грешка приликом слања поруке.",
-    "mustbeonlinetosendmessages": "Морате бити онлајн како бисте слали поруке."
+    "messagebeepsyou": "{{$a}} вас је управо поздравио/ла звучним сигналом!",
+    "messageenter": "Учесник {{$a}} управо улази у причаоницу",
+    "messageexit": "Учесник {{$a}} управо напушта причаоницу",
+    "mustbeonlinetosendmessages": "Морате бити онлајн како бисте слали поруке.",
+    "nomessages": "Још нема порука",
+    "send": "Пошаљи",
+    "sessionstart": "Следећа сесија ће почети дана {{$a.date}}, ({{$a.fromnow}} од сада)",
+    "talk": "Причај"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/sr-lt.json b/www/addons/mod/chat/lang/sr-lt.json
index 9f2850e8b5e..dca8b6cbd39 100644
--- a/www/addons/mod/chat/lang/sr-lt.json
+++ b/www/addons/mod/chat/lang/sr-lt.json
@@ -1,8 +1,19 @@
 {
+    "beep": "Zvučni signal",
+    "currentusers": "Trenutni korisnici",
+    "enterchat": "Kliknite ovde za ulazak u pričaonicu",
+    "entermessage": "Unesite vašu poruku",
     "errorwhileconnecting": "Greška prilikom povezivanja sa pričaonicom.",
     "errorwhilegettingchatdata": "Greška prilikom preuzimanja podataka za 'Pričaonicu'.",
     "errorwhilegettingchatusers": "Greška prilikom preuzimanja korisnika pričaonice.",
     "errorwhileretrievingmessages": "Greška prilikom preuzimanja poruka sa servera.",
     "errorwhilesendingmessage": "Greška prilikom slanja poruke.",
-    "mustbeonlinetosendmessages": "Morate biti onlajn kako biste slali poruke."
+    "messagebeepsyou": "{{$a}} vas je upravo pozdravio/la zvučnim signalom!",
+    "messageenter": "Učesnik {{$a}} upravo ulazi u pričaonicu",
+    "messageexit": "Učesnik {{$a}} upravo napušta pričaonicu",
+    "mustbeonlinetosendmessages": "Morate biti onlajn kako biste slali poruke.",
+    "nomessages": "Još nema poruka",
+    "send": "Pošalji",
+    "sessionstart": "Sledeća sesija će početi dana {{$a.date}}, ({{$a.fromnow}} od sada)",
+    "talk": "Pričaj"
 }
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/sv.json b/www/addons/mod/chat/lang/sv.json
index cc26779e559..d5a2d85343a 100644
--- a/www/addons/mod/chat/lang/sv.json
+++ b/www/addons/mod/chat/lang/sv.json
@@ -1,14 +1,14 @@
 {
-    "beep": "pipsignal",
+    "beep": "Pipsignal",
     "currentusers": "Aktuella användare",
     "enterchat": "Klicka här för att gå in i direktsamtalet nu",
-    "entermessage": "Sriv ditt meddelande",
+    "entermessage": "Skriv ditt meddelande",
     "errorwhileconnecting": "Fel vid anslutning till chatten",
     "errorwhilegettingchatdata": "Fel vid vid hämtning av chattdata",
     "errorwhilegettingchatusers": "Fel vid vid hämtning av chattanvändare",
     "errorwhileretrievingmessages": "Fel vid hämtning av meddelanden från servern",
     "errorwhilesendingmessage": "Fel när meddelandet skickades",
-    "messagebeepsyou": "{{$a}} har just skickat en pipsignal till Dig",
+    "messagebeepsyou": "{{$a}} har just skickat en pipsignal till dig",
     "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",
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/ja.json b/www/addons/mod/choice/lang/ja.json
index 5f5b78343c7..a5fee422a43 100644
--- a/www/addons/mod/choice/lang/ja.json
+++ b/www/addons/mod/choice/lang/ja.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/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..e1220130458 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 respostas",
+    "numberofuserinpercentage": "Percentagem de respostas",
     "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/ru.json b/www/addons/mod/choice/lang/ru.json
index a8b13940e57..38f9cf75ee3 100644
--- a/www/addons/mod/choice/lang/ru.json
+++ b/www/addons/mod/choice/lang/ru.json
@@ -2,7 +2,7 @@
     "cannotsubmit": "Извините, возникла проблема при отправке Вашего ответа на опрос. Пожалуйста, повторите снова.",
     "choiceoptions": "Варианты ответа",
     "errorgetchoice": "Ошибка при получении данных выбора",
-    "expired": "Извините эта активность закрыта {{$a}} и более недоступна",
+    "expired": "Извините, этот элемент курса закрыт {{$a}} и более недоступен",
     "full": "(Заполнено)",
     "noresultsviewable": "Вы не можете в данный момент просматривать результаты опроса.",
     "notopenyet": "Извините, данное действие недоступно до {{$a}}",
diff --git a/www/addons/mod/choice/lang/sr-cr.json b/www/addons/mod/choice/lang/sr-cr.json
index 298eab2ca83..9a18723e91c 100644
--- a/www/addons/mod/choice/lang/sr-cr.json
+++ b/www/addons/mod/choice/lang/sr-cr.json
@@ -1,7 +1,20 @@
 {
+    "cannotsubmit": "Извините, дошло је до проблема приликом чувања одабраног одговора. Молимо покушајте поново.",
+    "choiceoptions": "Опције за избор",
     "errorgetchoice": "Грешка приликом преузимања података за 'Избор'",
-    "numberofuser": "Број учесника",
-    "numberofuserinpercentage": "Проценат учесника",
+    "expired": "Нажалост, ова активност је затворена дана {{$a}} и није више доступна",
+    "full": "(Попуњено)",
+    "noresultsviewable": "Резултати тренутно нису видљиви.",
+    "notopenyet": "Нажалост, ова активност није доступна до {{$a}}",
+    "numberofuser": "Број одговора",
+    "numberofuserinpercentage": "Проценат одговора",
+    "previewonly": "Ово је само приказ доступних опција за ову активност. Нећете бити у могућности да извршите одабир до {{$a}}.",
+    "removemychoice": "Уклони мој избор",
+    "responses": "Одговори",
     "responsesresultgraphdescription": "{{number}}% корисника је изабрало опцију: {{text}}.",
-    "resultsnotsynced": "Резултати не укључује ваш последњи одговор. Покрените синхронизацију како бисте их ажурирали."
+    "responsesresultgraphheader": "Графички приказ",
+    "resultsnotsynced": "Резултати не укључује ваш последњи одговор. Покрените синхронизацију како бисте их ажурирали.",
+    "savemychoice": "Сачувај мој избор",
+    "userchoosethisoption": "Корисници који су изабрали ову опцију",
+    "yourselection": "Ваш избор"
 }
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/sr-lt.json b/www/addons/mod/choice/lang/sr-lt.json
index b1d8bf5a49d..b9bfa00cb81 100644
--- a/www/addons/mod/choice/lang/sr-lt.json
+++ b/www/addons/mod/choice/lang/sr-lt.json
@@ -1,7 +1,20 @@
 {
+    "cannotsubmit": "Izvinite, došlo je do problema prilikom čuvanja odabranog odgovora. Molimo pokušajte ponovo.",
+    "choiceoptions": "Opcije za izbor",
     "errorgetchoice": "Greška prilikom preuzimanja podataka za 'Izbor'",
-    "numberofuser": "Broj učesnika",
-    "numberofuserinpercentage": "Procenat učesnika",
+    "expired": "Nažalost, ova aktivnost je zatvorena dana {{$a}} i nije više dostupna",
+    "full": "(Popunjeno)",
+    "noresultsviewable": "Rezultati trenutno nisu vidljivi.",
+    "notopenyet": "Nažalost, ova aktivnost nije dostupna do {{$a}}",
+    "numberofuser": "Broj odgovora",
+    "numberofuserinpercentage": "Procenat odgovora",
+    "previewonly": "Ovo je samo prikaz dostupnih opcija za ovu aktivnost. Nećete biti u mogućnosti da izvršite odabir do {{$a}}.",
+    "removemychoice": "Ukloni moj izbor",
+    "responses": "Odgovori",
     "responsesresultgraphdescription": "{{number}}% korisnika je izabralo opciju: {{text}}.",
-    "resultsnotsynced": "Rezultati ne uključuje vaš poslednji odgovor. Pokrenite sinhronizaciju kako biste ih ažurirali."
+    "responsesresultgraphheader": "Grafički prikaz",
+    "resultsnotsynced": "Rezultati ne uključuje vaš poslednji odgovor. Pokrenite sinhronizaciju kako biste ih ažurirali.",
+    "savemychoice": "Sačuvaj moj izbor",
+    "userchoosethisoption": "Korisnici koji su izabrali ovu opciju",
+    "yourselection": "Vaš izbor"
 }
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index 62217bdb227..f76c9f090e3 100644
--- a/www/addons/mod/choice/lang/sv.json
+++ b/www/addons/mod/choice/lang/sv.json
@@ -6,14 +6,14 @@
     "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",
     "responsesresultgraphdescription": "{{number}}% Av användarna valde alternativet: {{text}}",
     "responsesresultgraphheader": "Visa en graf",
     "savemychoice": "Spara min opinionsundersökning",
-    "userchoosethisoption": "Användaren väljer detta alternativ",
+    "userchoosethisoption": "Användare som valt detta alternativ",
     "yourselection": "Ditt urval"
 }
\ No newline at end of file
diff --git a/www/addons/mod/choice/lang/uk.json b/www/addons/mod/choice/lang/uk.json
index 7c22b1890c7..583a6f28d04 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 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/data/lang/ar.json b/www/addons/mod/data/lang/ar.json
new file mode 100644
index 00000000000..bb5d5765bd9
--- /dev/null
+++ b/www/addons/mod/data/lang/ar.json
@@ -0,0 +1,32 @@
+{
+    "addentries": "أضف مدخلات",
+    "advancedsearch": "بحث متقدم",
+    "alttext": "النص البديل",
+    "approve": "اسمح/وافق",
+    "approved": "تم الموافقة",
+    "ascending": "تصاعدي",
+    "authorfirstname": "الاسم الأول للكاتب",
+    "authorlastname": "الاسم الأخير للكاتب",
+    "confirmdeleterecord": "هل فعلا ترغب في حذف هذا السجل؟",
+    "descending": "تنازليا",
+    "emptyaddform": "لم تقم بتعبئة الحقول!",
+    "expired": "عذراً، تم إغلاق هذا النشاط في {{$a}} وهو غير متوفر الآن.",
+    "fields": "حقول",
+    "menuchoose": "اختار",
+    "more": "المزيد",
+    "nomatch": "لم يتم العثور على مدخلات مطابقة!",
+    "norecords": "لا يوجد مدخلات في قاعدة البيانات",
+    "notapproved": "لم يتم الموافقة على المدخل بعد",
+    "notopenyet": "عذراً، هذا النشاط لن يتاح حتى {{$a}}",
+    "numrecords": "{{$a}} سجلات",
+    "other": "اخر",
+    "recordapproved": "تم الموافقه على السجل",
+    "recorddeleted": "تم حذف السجل",
+    "resetsettings": "إعادة تعين الحقول",
+    "restore": "إسترجاع",
+    "search": "بحث",
+    "selectedrequired": "كل المختار مطلوب",
+    "timeadded": "وقت الإضافة",
+    "timemodified": "وقت التعديل",
+    "usedate": "تضمين في البحث"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/bg.json b/www/addons/mod/data/lang/bg.json
new file mode 100644
index 00000000000..6f8107d536b
--- /dev/null
+++ b/www/addons/mod/data/lang/bg.json
@@ -0,0 +1,36 @@
+{
+    "addentries": "Добавяне на записи",
+    "advancedsearch": "Разширено търсене",
+    "alttext": "Алтернативен текст",
+    "approve": "Одобрение",
+    "approved": "Одобрен",
+    "ascending": "По нарастване",
+    "authorfirstname": "Име на автора",
+    "authorlastname": "Презиме на автора",
+    "confirmdeleterecord": "Сигурни ли сте, че искате да изтриете това?",
+    "descending": "По намаляване",
+    "disapprove": "Отхвърляне на одобрение",
+    "emptyaddform": "Не сте попълнили никакви полета!",
+    "entrieslefttoadd": "Трябва да добавите още  {{$a.entriesleft}} записи, за да завършите тази дейност",
+    "entrieslefttoaddtoview": "Трябва да добавите още {{$a.entrieslefttoview}} записи преди да можете да видите записите на другите участници.",
+    "expired": "За съжаление тази дейност е затворена в {{$a}} и вече не е достъпна",
+    "fields": "Полета",
+    "menuchoose": "Изберете...",
+    "more": "Още",
+    "nomatch": "Не са намерени съответстващи записи!",
+    "norecords": "Няма записи в базата данни",
+    "notapproved": "Записът още не е качен",
+    "notopenyet": "За съжаление тази дейност не е достъпна от {{$a}}",
+    "numrecords": "{{$a}} записи",
+    "other": "Друго",
+    "recordapproved": "Записът качен",
+    "recorddeleted": "Записът изтрит",
+    "recorddisapproved": "Записът не е одобрен",
+    "resetsettings": "Нулиране на филтрите",
+    "restore": "Възстановяване",
+    "search": "Търсене",
+    "selectedrequired": "Всичко избрано се изисква",
+    "timeadded": "Време на добавяне",
+    "timemodified": "Време на промяна",
+    "usedate": "Включване в търсене."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/ca.json b/www/addons/mod/data/lang/ca.json
new file mode 100644
index 00000000000..4bfabe7bca6
--- /dev/null
+++ b/www/addons/mod/data/lang/ca.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Afegeix entrades",
+    "advancedsearch": "Cerca avançada",
+    "alttext": "Text alternatiu",
+    "approve": "Aprova",
+    "approved": "Acceptat",
+    "ascending": "Ascendent",
+    "authorfirstname": "Nom de l'autor/autora",
+    "authorlastname": "Cognoms de l'autor/autora",
+    "confirmdeleterecord": "Segur que voleu suprimir aquesta entrada?",
+    "descending": "Descendent",
+    "disapprove": "Desfés l'aprovació",
+    "emptyaddform": "No heu emplenat cap camp",
+    "entrieslefttoadd": "Heu d'afegir {{$a.entriesleft}} una entrada o més per completar aquesta activitat",
+    "entrieslefttoaddtoview": "Heu d'afegir {{$a.entrieslefttoview}} una entrada o més abans que pugueu veure les entrades d'altres participants",
+    "errormustsupplyvalue": "Cal que poseu un valor aquí.",
+    "expired": "Aquesta activitat es va tancar el dia {{$a}} i ja no està disponible",
+    "fields": "Camps",
+    "latlongboth": "Cal posar tant la latitud com la longitud.",
+    "menuchoose": "Trieu...",
+    "more": "Més",
+    "nomatch": "No s'han trobat entrades que coincideixin",
+    "norecords": "No hi ha entrades en la base de dades",
+    "notapproved": "L'entrada encara no està aprovada.",
+    "notopenyet": "Aquesta activitat no estarà disponible fins al dia {{$a}}",
+    "numrecords": "{{$a}} entrades",
+    "other": "Un altre",
+    "recordapproved": "S'ha aprovat l'entrada",
+    "recorddeleted": "S'ha suprimit l'entrada",
+    "recorddisapproved": "Entrada no aprovada",
+    "resetsettings": "Reinicialitza els filtres",
+    "restore": "Restaura",
+    "search": "Cerca",
+    "selectedrequired": "Cal que estigui tot seleccionat",
+    "timeadded": "Hora de la incorporació",
+    "timemodified": "Hora de la modificació",
+    "usedate": "Inclou en la cerca."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/cs.json b/www/addons/mod/data/lang/cs.json
new file mode 100644
index 00000000000..894d9e69c39
--- /dev/null
+++ b/www/addons/mod/data/lang/cs.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Přidat záznamy",
+    "advancedsearch": "Pokročilé vyhledávání",
+    "alttext": "Alternativní text",
+    "approve": "Schválit",
+    "approved": "Schváleno",
+    "ascending": "Vzestupně",
+    "authorfirstname": "Křestní jméno autora",
+    "authorlastname": "Příjmení autora",
+    "confirmdeleterecord": "Chcete skutečně odstranit tento záznam?",
+    "descending": "Sestupně",
+    "disapprove": "Odvolat schválení",
+    "emptyaddform": "Nevyplnili jste žádná pole!",
+    "entrieslefttoadd": "Ještě musíte vložit {{$a.entriesleft}} záznamů(-y), abyste dokončili tuto činnost",
+    "entrieslefttoaddtoview": "Ještě musíte vložit {{$a.entrieslefttoview}} záznamů(-y), než budete moci vidět záznamy ostatních účastníků.",
+    "errormustsupplyvalue": "Musí obsahovat nějakou hodnotu.",
+    "expired": "Tato činnost byla ukončena {{$a}} a není již nadále dostupná.",
+    "fields": "Pole",
+    "latlongboth": "Je požadována zeměpisná šířka i délka.",
+    "menuchoose": "Vybrat...",
+    "more": "Podrobněji",
+    "nomatch": "Nenalezeny žádné záznamy!",
+    "norecords": "Nejsou k dispozici žádné záznamy",
+    "notapproved": "Záznam není zatím schválen",
+    "notopenyet": "Tato činnost nebude dostupná až do {{$a}}",
+    "numrecords": "{{$a}} záznamů",
+    "other": "Jiné",
+    "recordapproved": "Záznam byl schválen",
+    "recorddeleted": "Záznam byl smazán",
+    "recorddisapproved": "Neschválený záznam",
+    "resetsettings": "Resetovat filtry",
+    "restore": "Obnovit",
+    "search": "Vyhledat",
+    "selectedrequired": "Všechna zvolená povinná",
+    "timeadded": "Čas vložení",
+    "timemodified": "Čas poslední úpravy",
+    "usedate": "Zahrnout do vyhledávání."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/da.json b/www/addons/mod/data/lang/da.json
new file mode 100644
index 00000000000..e1d919142bb
--- /dev/null
+++ b/www/addons/mod/data/lang/da.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Tilføj indlæg",
+    "advancedsearch": "Avanceret søgning",
+    "alttext": "Alternativ tekst",
+    "approve": "Godkend",
+    "approved": "Godkendt",
+    "ascending": "Stigende",
+    "authorfirstname": "Forfatterens fornavn",
+    "authorlastname": "Forfatterens efternavn",
+    "confirmdeleterecord": "Er du sikker på at du vil slette denne post?",
+    "descending": "Faldende",
+    "disapprove": "Fortryd godkendelse",
+    "emptyaddform": "Du udfyldte ingen felter!",
+    "entrieslefttoadd": "Du mangler at tilføje {{$a.entriesleft}} post(er) til denne database.",
+    "entrieslefttoaddtoview": "Du skal tilføje {{$a.entrieslefttoview}} post(er mere) til denne database før du kan se andre deltageres bidrag.",
+    "errormustsupplyvalue": "Du skal indsætte en værdi her.",
+    "expired": "Beklager, denne aktivitet lukkede {{$a}} og er ikke længere tilgængelig",
+    "fields": "Felter",
+    "latlongboth": "Skriv både bredde- og længdegrad",
+    "menuchoose": "Vælg...",
+    "more": "Flere",
+    "nomatch": "Ingen passende indlæg fundet",
+    "norecords": "Ingen indlæg i databasen",
+    "notapproved": "Posten er ikke godkendt endnu.",
+    "notopenyet": "Beklager, denne aktivitet er først tilgængelig {{$a}}",
+    "numrecords": "{{$a}} poster",
+    "other": "Anden",
+    "recordapproved": "Post godkendt",
+    "recorddeleted": "Posten er slettet",
+    "recorddisapproved": "Posten er ikke godkendt",
+    "resetsettings": "Nulstil filtre",
+    "restore": "Genopret",
+    "search": "Søg",
+    "selectedrequired": "Alle valgte er påkrævet",
+    "timeadded": "Tilføjet",
+    "timemodified": "Ændret",
+    "usedate": "Inkluder i søgning."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/de.json b/www/addons/mod/data/lang/de.json
new file mode 100644
index 00000000000..54878e639d4
--- /dev/null
+++ b/www/addons/mod/data/lang/de.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Einträge hinzufügen",
+    "advancedsearch": "Erweiterte Suche",
+    "alttext": "Alternativer Text",
+    "approve": "Zulassen",
+    "approved": "Bestätigt",
+    "ascending": "Aufsteigend",
+    "authorfirstname": "Vorname (Autor)",
+    "authorlastname": "Nachname (Autor)",
+    "confirmdeleterecord": "Möchten Sie diesen Datensatz wirklich in der Datenbank löschen?",
+    "descending": "Absteigend",
+    "disapprove": "Eintrag nicht freigegeben",
+    "emptyaddform": "Sie haben keine Einträge vorgenommen!",
+    "entrieslefttoadd": "Sie müssen {{$a.entriesleft}} (weitere) Einträge vornehmen, um diese Aktivität zu beenden.",
+    "entrieslefttoaddtoview": "Sie müssen {{$a.entrieslefttoview}} (weitere) Einträge vornehmen, bevor Sie andere Teilnehmerbeiträge betrachten können.",
+    "errormustsupplyvalue": "Sie müssen hier einen Wert eintragen.",
+    "expired": "Die Aktivität wurde am {{$a}} abgeschlossen und ist nicht weiter verfügbar.",
+    "fields": "Felder",
+    "latlongboth": "Längen- und Breitengrad müssen eingetragen werden.",
+    "menuchoose": "Auswählen ...",
+    "more": "Einzelansicht",
+    "nomatch": "Keine passenden Einträge gefunden",
+    "norecords": "Keine Einträge in der Datenbank",
+    "notapproved": "Der Eintrag wurde bisher nicht freigegeben",
+    "notopenyet": "Die Aktivität ist nicht verfügbar bis {{$a}}.",
+    "numrecords": "{{$a}} Datensätze",
+    "other": "Andere",
+    "recordapproved": "Datensatz wurde angenommen",
+    "recorddeleted": "Datensatz gelöscht",
+    "recorddisapproved": "Eintrag nicht freigegeben",
+    "resetsettings": "Filter zurücksetzen",
+    "restore": "Wiederherstellen",
+    "search": "Suche",
+    "selectedrequired": "Gesamte Auswahl ist erforderlich",
+    "timeadded": "Zeit erstellt",
+    "timemodified": "Zeit geändert",
+    "usedate": "In Suche einbeziehen"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/el.json b/www/addons/mod/data/lang/el.json
new file mode 100644
index 00000000000..16838aa7d78
--- /dev/null
+++ b/www/addons/mod/data/lang/el.json
@@ -0,0 +1,32 @@
+{
+    "addentries": "Προσθήκη καταχωρήσεων",
+    "advancedsearch": "Advanced search",
+    "alttext": "Εναλλακτικό κείμενο",
+    "approve": "Έγκριση",
+    "approved": "Εγκρίθηκε",
+    "ascending": "Αύξουσα",
+    "authorfirstname": "Όνομα συγγραφέα",
+    "authorlastname": "Επίθετο συγγραφέα",
+    "confirmdeleterecord": "Σίγουρα θέλετε να διαγραφεί αυτή η καταχώρηση;",
+    "descending": "Φθίνουσα",
+    "emptyaddform": "Δεν συμπληρώσατε κανένα από τα πεδία!",
+    "entrieslefttoadd": "Πρέπει να προσθέσετε {{$a.entriesleft}} περισσότερες καταχωρήσεις ώστε να ολοκληρώσετε αυτήν τη δραστηριότητα",
+    "entrieslefttoaddtoview": "Πρέπει να προσθέσετε {{$a.entrieslefttoview}} περισσότερες καταχωρήσεις πριν να μπορέσετε να δείτε τις καταχωρήσεις άλλων χρηστών.",
+    "expired": "Η δραστηριότητα αυτή έκλεισε στις {{$a}} και δεν είναι πλέον διαθέσιμη",
+    "fields": "Πεδία",
+    "menuchoose": "Επιλέξτε....",
+    "more": "Περισσότερα",
+    "nomatch": "Δεν βρέθηκαν καταχωρήσεις που να ταιριάζουν!",
+    "norecords": "Δεν υπάρχουν καταχωρήσεις στη βάση δεδομένων",
+    "notopenyet": "Συγνώμη, αυτή η δραστηριότητα δεν είναι διαθέσιμη μέχρι {{$a}}",
+    "numrecords": "{{$a}} καταχωρήσεις",
+    "other": "Άλλο",
+    "recordapproved": "Η καταχώρηση εγκρίθηκε",
+    "recorddeleted": "Η καταχώρηση διαγράφθηκε",
+    "resetsettings": "Επανορισμός φίλτρων",
+    "restore": "Επαναφορά",
+    "search": "Αναζήτηση",
+    "selectedrequired": "Απαιτούνται όλα τα επιλεγμένα",
+    "timeadded": "Προστέθηκε χρόνος",
+    "timemodified": "Ο χρόνος μεταβλήθηκε"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/es-mx.json b/www/addons/mod/data/lang/es-mx.json
new file mode 100644
index 00000000000..f7c26455a61
--- /dev/null
+++ b/www/addons/mod/data/lang/es-mx.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Añadir entradas",
+    "advancedsearch": "Búsqueda avanzada",
+    "alttext": "Texto alternativo",
+    "approve": "Aprobar",
+    "approved": "Aprobado",
+    "ascending": "Ascendente",
+    "authorfirstname": "Nombre del autor",
+    "authorlastname": "Apellidos del autor",
+    "confirmdeleterecord": "¿Está seguro de que desea eliminar esta entrada?",
+    "descending": "Descendente",
+    "disapprove": "Deshacer aprobación",
+    "emptyaddform": "¡No ha rellenado ningún campo!",
+    "entrieslefttoadd": "Debe añadir {{$a.entriesleft}} entrada(s) más antes de poder ver las entradas de otro participante.",
+    "entrieslefttoaddtoview": "Debe añadir {{$a.entrieslefttoview}} entrada(s) antes de poder ver las entradas de otros participantes.",
+    "errormustsupplyvalue": "Usted debe proporcionar un valor aquí.",
+    "expired": "Lo sentimos, esta actividad se cerró el {{$a}} y ya no está disponible",
+    "fields": "Campos",
+    "latlongboth": "Tanto la Latitud como la Longitud son necesarias.",
+    "menuchoose": "Seleccionar...",
+    "more": "Más",
+    "nomatch": "No se han encontrado entradas",
+    "norecords": "No entradas en la base de datos",
+    "notapproved": "La entrada aún no ha sido aprobada.",
+    "notopenyet": "Lo sentimos, esta actividad no está disponible hasta {{$a}}",
+    "numrecords": "{{$a}} entradas",
+    "other": "Otro",
+    "recordapproved": "Entrada aprobada",
+    "recorddeleted": "Entrada eliminada",
+    "recorddisapproved": "Entrada desaprobada",
+    "resetsettings": "Restablecer filtros",
+    "restore": "Restaurar",
+    "search": "Buscar",
+    "selectedrequired": "Se requieren todos los seleccionados",
+    "timeadded": "Tiempo añadido",
+    "timemodified": "Tiempo modificado",
+    "usedate": "Incluir en búsqueda."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/es.json b/www/addons/mod/data/lang/es.json
new file mode 100644
index 00000000000..832a1d7c511
--- /dev/null
+++ b/www/addons/mod/data/lang/es.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Añadir entradas",
+    "advancedsearch": "Búsqueda avanzada",
+    "alttext": "Texto alternativo",
+    "approve": "Aprobar",
+    "approved": "Aprobado",
+    "ascending": "Ascendente",
+    "authorfirstname": "Nombre del autor",
+    "authorlastname": "Apellido del autor",
+    "confirmdeleterecord": "¿Está seguro de que desea eliminar esta entrada?",
+    "descending": "Descendente",
+    "disapprove": "Desaprobar",
+    "emptyaddform": "¡No ha rellenado ningún campo!",
+    "entrieslefttoadd": "Debe agregar {{$a.entriesleft}} entrada(s) más para poder finalizar esta actividad",
+    "entrieslefttoaddtoview": "Debe añadir {{$a.entrieslefttoview}} entrada(s) antes de poder ver las entradas de otros participantes.",
+    "errormustsupplyvalue": "Debe proporcionar un valor aquí.",
+    "expired": "Lo sentimos, esta actividad se cerró el {{$a}} y ya no está disponible",
+    "fields": "Campos",
+    "latlongboth": "Tanto la latitud como la longitud son necesarias.",
+    "menuchoose": "Seleccionar...",
+    "more": "Más",
+    "nomatch": "No se han encontrado entradas",
+    "norecords": "No hay entradas en la base de datos",
+    "notapproved": "La entrada aún no ha sido aprobada.",
+    "notopenyet": "Lo sentimos, esta actividad no está disponible hasta {{$a}}",
+    "numrecords": "{{$a}} entradas",
+    "other": "Otro",
+    "recordapproved": "Entrada aprobada",
+    "recorddeleted": "Entrada eliminada",
+    "recorddisapproved": "Entrada desaprobada",
+    "resetsettings": "Restablecer filtros",
+    "restore": "Restaurar",
+    "search": "Buscar",
+    "selectedrequired": "Se requieren todos los seleccionados",
+    "timeadded": "Tiempo añadido",
+    "timemodified": "Tiempo modificado",
+    "usedate": "Incluir en la búsqueda"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/eu.json b/www/addons/mod/data/lang/eu.json
new file mode 100644
index 00000000000..d5e1d820eda
--- /dev/null
+++ b/www/addons/mod/data/lang/eu.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Gehitu sarrerak",
+    "advancedsearch": "Bilaketa aurreratua",
+    "alttext": "Ordezko testua",
+    "approve": "Onartu",
+    "approved": "Onartuta",
+    "ascending": "Goranzkoa",
+    "authorfirstname": "Egilearen izena",
+    "authorlastname": "Egilearen deitura",
+    "confirmdeleterecord": "Ziur al zaude sarrera hau ezabatu nahi duzula?",
+    "descending": "Beheranzkoa",
+    "disapprove": "Onarpena desegin",
+    "emptyaddform": "Ez duzu eremuren bat bete!",
+    "entrieslefttoadd": "{{$a.entriesleft}} sarrera gehiago gehitu behar dituzu jarduera hau osatzeko.",
+    "entrieslefttoaddtoview": "{{$a.entrieslefttoview}} sarrera gehiago gehitu behar dituzu beste partaideen sarrerak ikusi ahal izateko.",
+    "errormustsupplyvalue": "Hemen balio bat eman behar duzu.",
+    "expired": "Barkatu, jarduera hau {{$a}} datan itxi zen eta dagoeneko ez dago eskuragarri",
+    "fields": "Eremuak",
+    "latlongboth": "Latitudea eta longitudea beharrekoak dira.",
+    "menuchoose": "Aukeratu...",
+    "more": "Gehiago",
+    "nomatch": "Ez da sarrera egokirik aurkitu!",
+    "norecords": "Datu-basean sarrerarik ez",
+    "notapproved": "Sarrera ez da oraindik onartu",
+    "notopenyet": "Barkatu, jarduera hau ez dago eskuragarri {{$a}} arte",
+    "numrecords": "{{$a}} sarrera(k)",
+    "other": "Beste bat",
+    "recordapproved": "Sarrera onartu da",
+    "recorddeleted": "Sarrera ezabatu da",
+    "recorddisapproved": "Onartu gabeko sarrera",
+    "resetsettings": "Berrabiarazi iragazkiak",
+    "restore": "Berreskuratu",
+    "search": "Bilatu",
+    "selectedrequired": "Aukeratutako guztia beharrezkoa",
+    "timeadded": "Denbora gehituta",
+    "timemodified": "Denbora aldatuta",
+    "usedate": "Sartu bilaketan."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/fa.json b/www/addons/mod/data/lang/fa.json
new file mode 100644
index 00000000000..9d90d4bef82
--- /dev/null
+++ b/www/addons/mod/data/lang/fa.json
@@ -0,0 +1,33 @@
+{
+    "addentries": "داده‌هایی را اضافه کنید",
+    "advancedsearch": "جستجوی پیشرفته",
+    "alttext": "متن جایگزین",
+    "approve": "تایید",
+    "approved": "وضعیت تایید",
+    "ascending": "صعودی",
+    "authorfirstname": "نام وارد کننده",
+    "authorlastname": "نام خانوادگی وارد کننده",
+    "confirmdeleterecord": "آیا مطمئن هستید که می‌خواهید این مورد را حذف کنید؟",
+    "descending": "نزولی",
+    "emptyaddform": "شما هیچ فیلدی را پر نکردید!",
+    "entrieslefttoadd": "برای کامل کردن این فعالیت باید {{$a.entriesleft}} دادهٔ دیگر وارد کنید",
+    "entrieslefttoaddtoview": "باید {{$a.entrieslefttoview}} دادهٔ دیگر وارد کنید تا بتوانید داده‌های وارد شده توسط سایرین را ببینید.",
+    "expired": "متأسفیم، این فعالیت در {{$a}} بسته شد و دیگر در دسترس نیست",
+    "fields": "فیلدها",
+    "menuchoose": "انتخاب کنید...",
+    "more": "نمایش جزئیات",
+    "nomatch": "دادهٔ مطابقی پیدا نشد!",
+    "norecords": "بانک اطلاعاتی خالی است",
+    "notapproved": "دادهٔ ورودی هنوز تایید نشده است.",
+    "notopenyet": "با عرض پوزش، این فعالیت تا قبل از {{$a}} در دسترس نیست",
+    "numrecords": "{{$a}} دادهٔ ورودی",
+    "other": "غیره",
+    "recordapproved": "دادهٔ ورودی تایید شد",
+    "recorddeleted": "حذف شد",
+    "resetsettings": "بازنشانی فیلترها",
+    "restore": "بازیابی",
+    "search": "جستجو",
+    "selectedrequired": "تمامی گزینه‌های انتخاب شده لازم هستند",
+    "timeadded": "زمان اضافه شدن",
+    "timemodified": "زمان آخرین تغییر"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/fr.json b/www/addons/mod/data/lang/fr.json
new file mode 100644
index 00000000000..777e6974ade
--- /dev/null
+++ b/www/addons/mod/data/lang/fr.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Ajouter des fiches",
+    "advancedsearch": "Recherche avancée",
+    "alttext": "Texte alternatif",
+    "approve": "Approuver",
+    "approved": "Approuvé",
+    "ascending": "Ascendant",
+    "authorfirstname": "Prénom auteur",
+    "authorlastname": "Nom auteur",
+    "confirmdeleterecord": "Voulez-vous vraiment supprimer cette fiche ?",
+    "descending": "Descendant",
+    "disapprove": "Retirer l'approbation",
+    "emptyaddform": "Vous n'avez rempli aucun champ !",
+    "entrieslefttoadd": "Vous devez ajouter encore {{$a.entriesleft}} fiches pour terminer cette activité",
+    "entrieslefttoaddtoview": "Vous devez ajouter encore {{$a.entrieslefttoview}} fiches avant de pouvoir consulter les fiches des autres participants.",
+    "errormustsupplyvalue": "Veuillez renseigner une valeur.",
+    "expired": "Cette activité est fermée depuis {{$a}} et n'est plus disponible",
+    "fields": "Champs",
+    "latlongboth": "La latitude et la longitude sont requises.",
+    "menuchoose": "Sélectionner...",
+    "more": "Plus",
+    "nomatch": "Aucune fiche trouvée !",
+    "norecords": "Aucune fiche dans la base de données",
+    "notapproved": "La fiche n'est pas encore approuvée.",
+    "notopenyet": "Cette activité n'est pas disponible avant le {{$a}}",
+    "numrecords": "{{$a}} fiches",
+    "other": "Autre",
+    "recordapproved": "Fiche approuvée",
+    "recorddeleted": "Fiche supprimée",
+    "recorddisapproved": "Fiche désapprouvée",
+    "resetsettings": "Réinitialiser les filtres",
+    "restore": "Restauration",
+    "search": "Recherche",
+    "selectedrequired": "Toute la sélection requise",
+    "timeadded": "Date ajout",
+    "timemodified": "Date modification",
+    "usedate": "Inclure dans la recherche."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/he.json b/www/addons/mod/data/lang/he.json
new file mode 100644
index 00000000000..8ec3817a5c1
--- /dev/null
+++ b/www/addons/mod/data/lang/he.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "הוספת פריטים",
+    "advancedsearch": "חיפוש מורחב",
+    "alttext": "תוכן חלופי",
+    "approve": "אישור",
+    "approved": "מאושר",
+    "ascending": "בסדר עולה",
+    "authorfirstname": "שם פרטי של המחבר",
+    "authorlastname": "שם משפחה של המחבר",
+    "confirmdeleterecord": "האם למחוק את הפריט הזה?",
+    "descending": "בסדר יורד",
+    "disapprove": "ביטול האישור",
+    "emptyaddform": "לא מילאת אף שדה!",
+    "entrieslefttoadd": "יש להזין {{$a.entriesleft}} פריטים נוספים בכדי להשלים פעילות זו",
+    "entrieslefttoaddtoview": "יש להזין {{$a.entrieslefttoview}} פריטים נוספים בכדי לראות פריטים של משתתפים אחרים.",
+    "errormustsupplyvalue": "יש להזין ערך בשדה זה.",
+    "expired": "מצטערים, פעילות זו נסגרה ב {{$a}}  ואיננה זמינה יותר.",
+    "fields": "שדות",
+    "latlongboth": "נדרשים נתוני קו־רוחב וגם קו־אורך",
+    "menuchoose": "יש לבחור...",
+    "more": "עוד",
+    "nomatch": "לא נמצאו פריטים מתאימים!",
+    "norecords": "אין פריטים בבסיס הנתונים",
+    "notapproved": "הפריט עדיין לא אושר.",
+    "notopenyet": "מצטערים, פעילות זו איננה זמינה עד  {{$a}} .",
+    "numrecords": "{{$a}} פריטים",
+    "other": "אחר",
+    "recordapproved": "הפריט אושר",
+    "recorddeleted": "הפריט נמחק",
+    "recorddisapproved": "הפריט לא מאושר",
+    "resetsettings": "איפוס שדות",
+    "restore": "שחזור",
+    "search": "חיפוש",
+    "selectedrequired": "כל הנבחרים דרושים",
+    "timeadded": "זמן הוספה",
+    "timemodified": "זמן עדכון",
+    "usedate": "כלול בחיפוש"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/hu.json b/www/addons/mod/data/lang/hu.json
new file mode 100644
index 00000000000..bfca2794430
--- /dev/null
+++ b/www/addons/mod/data/lang/hu.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Bejegyzések hozzáadása",
+    "advancedsearch": "Részletes keresés",
+    "alttext": "Alternatív szöveg",
+    "approve": "Jóváhagy",
+    "approved": "Jóváhagyva",
+    "ascending": "Növekvő",
+    "authorfirstname": "Szerző keresztneve",
+    "authorlastname": "Szerző vezetékneve",
+    "confirmdeleterecord": "Biztosan törölni akarja ezt a bejegyzést?",
+    "descending": "Csökkenő",
+    "disapprove": "Jóváhagyás elvetése",
+    "emptyaddform": "Nem töltött ki egy mezőt sem!",
+    "entrieslefttoadd": "A tevékenység befejezéséhez {{$a.entriesleft}} további tételt kell hozzáadnia.",
+    "entrieslefttoaddtoview": "Még {{$a.entrieslefttoview}} bejegyzést kell hozzáadnia, mielőtt megtekintheti más résztvevők bejegyzéseit.",
+    "errormustsupplyvalue": "Itt egy értéket kell megadnia.",
+    "expired": "A tevékenység {{$a}} időpontban lezárult és már nem érhető el.",
+    "fields": "Mezők",
+    "latlongboth": "Mind a szélesség, mind a hosszúság kitöltendő.",
+    "menuchoose": "Választás...",
+    "more": "Tovább",
+    "nomatch": "Nincs egyező fogalom!",
+    "norecords": "Nincsenek bejegyzések az adatbázisban",
+    "notapproved": "A bejegyzés még nincs jóváhagyva.",
+    "notopenyet": "A tevékenység {{$a}} időpontig nem elérhető.",
+    "numrecords": "{{$a}} bejegyzés",
+    "other": "Más",
+    "recordapproved": "Bejegyzés jóváhagyva",
+    "recorddeleted": "Bejegyzés törölve",
+    "recorddisapproved": "Nem jóváhagyott fogalom",
+    "resetsettings": "Szűrők visszaállítása",
+    "restore": "Helyreállítás",
+    "search": "Keresés",
+    "selectedrequired": "Minden kiválasztott szükséges",
+    "timeadded": "Időpont hozzáadva",
+    "timemodified": "Időpont módosult",
+    "usedate": "Keresésben szerepeljen."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/it.json b/www/addons/mod/data/lang/it.json
new file mode 100644
index 00000000000..32e3bd0c051
--- /dev/null
+++ b/www/addons/mod/data/lang/it.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Aggiungi record",
+    "advancedsearch": "Ricerca avanzata",
+    "alttext": "Testo alternativo",
+    "approve": "Approva",
+    "approved": "Approvato",
+    "ascending": "Crescente",
+    "authorfirstname": "Nome autore",
+    "authorlastname": "Cognome autore",
+    "confirmdeleterecord": "Stai per eliminare questo record. Ne sei certo?",
+    "descending": "Decrescente",
+    "disapprove": "Disapprova",
+    "emptyaddform": "Non hai riempito nessun campo!",
+    "entrieslefttoadd": "Per poter visualizzare i record inseriti dagli altri partecipanti è necessario inserire altri {{$a.entriesleft}} record.",
+    "entrieslefttoaddtoview": "Devi aggiungere {{$a.entrieslefttoview}} altri record prima di poter vedere i record degli altri partecipanti.",
+    "errormustsupplyvalue": "Devi inserire un valore.",
+    "expired": "Spiacente, l'attività non è più disponibile poiché è stata chiusa il {{$a}} ",
+    "fields": "Campi",
+    "latlongboth": "Devi compilare sia la latitudine sia la longitudine.",
+    "menuchoose": "Scegli...",
+    "more": "Dettagli",
+    "nomatch": "Non è stato trovato nessun record che corrisponda!",
+    "norecords": "Nessun record è presente nel Database",
+    "notapproved": "Il record inserito è in attesa di essere approvato.",
+    "notopenyet": "Spiacente, questa attività non sarà disponibile prima del {{$a}}",
+    "numrecords": "{{$a}} record",
+    "other": "Altro",
+    "recordapproved": "Record approvati",
+    "recorddeleted": "Il record è stato eliminato",
+    "recorddisapproved": "Record disapprovato",
+    "resetsettings": "Reimposta filtri",
+    "restore": "Ripristino",
+    "search": "Cerca",
+    "selectedrequired": "Necessari tutti i selezionati",
+    "timeadded": "Data/ora inserimento",
+    "timemodified": "Data/ora modifica",
+    "usedate": "Includi nella ricerca."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/ja.json b/www/addons/mod/data/lang/ja.json
new file mode 100644
index 00000000000..9a3ae2261e4
--- /dev/null
+++ b/www/addons/mod/data/lang/ja.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "エントリを追加する",
+    "advancedsearch": "高度な検索",
+    "alttext": "代替テキスト",
+    "approve": "承認",
+    "approved": "承認日時",
+    "ascending": "昇順",
+    "authorfirstname": "著者の名",
+    "authorlastname": "著者の姓",
+    "confirmdeleterecord": "本当にこのエントリを削除してもよろしいですか?",
+    "descending": "降順",
+    "disapprove": "承認を取り消す",
+    "emptyaddform": "あなたはどのフィールドにも入力していません!",
+    "entrieslefttoadd": "この活動を完了するにはさらに {{$a.entriesleft}} 件以上のエントリを追加してください。",
+    "entrieslefttoaddtoview": "他の参加者のエントリを閲覧するにはさらに {{$a.entrieslefttoview}} 件以上のエントリを追加してください。",
+    "errormustsupplyvalue": "あなたはここで値を提供する必要があります。",
+    "expired": "申し訳ございません、この活動は {{$a}} に終了して利用することはできません。",
+    "fields": "フィールド",
+    "latlongboth": "緯度および経度の両方とも必須です。",
+    "menuchoose": "選択 ...",
+    "more": "詳細",
+    "nomatch": "該当するエントリが見つかりませんでした!",
+    "norecords": "データベースにエントリはありません。",
+    "notapproved": "エントリはまだ承認されていません。",
+    "notopenyet": "申し訳ございません、この活動は {{$a}} まで利用できません。",
+    "numrecords": "{{$a}} エントリ",
+    "other": "その他",
+    "recordapproved": "エントリが承認されました。",
+    "recorddeleted": "エントリが削除されました。",
+    "recorddisapproved": "エントリ未承認",
+    "resetsettings": "フィルタをリセットする",
+    "restore": "リストア",
+    "search": "検索",
+    "selectedrequired": "選択したすべてを含む",
+    "timeadded": "追加日時",
+    "timemodified": "修正日時",
+    "usedate": "検索に含む"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/lt.json b/www/addons/mod/data/lang/lt.json
new file mode 100644
index 00000000000..ea0077d0407
--- /dev/null
+++ b/www/addons/mod/data/lang/lt.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Įtraukti įrašus",
+    "advancedsearch": "Išplėstinė paieška",
+    "alttext": "Alternatyvusis tekstas",
+    "approve": "Patvirtinti",
+    "approved": "Patvirtinta",
+    "ascending": "Didėjimo tvarka",
+    "authorfirstname": "Autoriaus vardas",
+    "authorlastname": "Autoriaus pavardė",
+    "confirmdeleterecord": "Ar tikrai norite naikinti šį įrašą?",
+    "descending": "Mažėjimo tvarka",
+    "disapprove": "Atšaukti patvirtinimą",
+    "emptyaddform": "Neužpildėte jokių laukų!",
+    "entrieslefttoadd": "Turite įtraukti dar {{$a.entriesleft}} įrašus (-ų), kad galėtumėte užbaigti šią veiklą",
+    "entrieslefttoaddtoview": "Turite įtraukti dar {{$a.entrieslefttoview}} įrašus (-ų), kad galėtumėte peržiūrėti kitų dalyvių įrašus.",
+    "errormustsupplyvalue": "Privalote pateikti reikšmę čia.",
+    "expired": "Apgailestaujame, ši veikla uždaryta {{$a}} ir nebegalima",
+    "fields": "Laukai",
+    "latlongboth": "Abu, platuma ir ilguma, yra privalomi.",
+    "menuchoose": "Pasirinkite...",
+    "more": "Daugiau",
+    "nomatch": "Nerasta atitinkančių įrašų!",
+    "norecords": "Duomenų bazėje nėra įrašų",
+    "notapproved": "Įrašas dar nepatvirtintas.",
+    "notopenyet": "Apgailestaujame, ši veikla negalima iki {{$a}}",
+    "numrecords": "{{$a}} įrašai (-ų)",
+    "other": "Kita",
+    "recordapproved": "Įrašas patvirtintas",
+    "recorddeleted": "Įrašas panaikintas",
+    "recorddisapproved": "Įrašas nepatvirtintas",
+    "resetsettings": "Nustatyti filtrus iš naujo",
+    "restore": "Atkurti",
+    "search": "Ieškoti",
+    "selectedrequired": "Visi pasirinkti būtini",
+    "timeadded": "Įtraukimo laikas",
+    "timemodified": "Modifikavimo laikas",
+    "usedate": "Įtraukti į paiešką."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/nl.json b/www/addons/mod/data/lang/nl.json
new file mode 100644
index 00000000000..d4cbe01011f
--- /dev/null
+++ b/www/addons/mod/data/lang/nl.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Items goedkeuren",
+    "advancedsearch": "Geavanceerd zoeken",
+    "alttext": "Alternatieve tekst",
+    "approve": "Goedkeuren",
+    "approved": "Goedgekeurd",
+    "ascending": "Oplopend",
+    "authorfirstname": "Voornaam auteur",
+    "authorlastname": "Achternaam auteur",
+    "confirmdeleterecord": "Je gaat deze record verwijderen. Ben je zeker?",
+    "descending": "Aflopend",
+    "disapprove": "Verwerp",
+    "emptyaddform": "Je hebt geen velden ingevuld!",
+    "entrieslefttoadd": "Je moet {{$a.entriesleft}} meer item(s) ingeven voor je de items van anderen kunt zien.",
+    "entrieslefttoaddtoview": "je moet {{$a.entrieslefttoview}} items meer toevoegen voor je de items van anderen kan zien.",
+    "errormustsupplyvalue": "Je moet hier een waarde geven.",
+    "expired": "Deze activiteit is gesloten op {{$a}} en is niet langer beschikbaar",
+    "fields": "Velden",
+    "latlongboth": "Zowel de breedtegraad als de lengtegraad zijn vereist.",
+    "menuchoose": "Kies...",
+    "more": "Meer",
+    "nomatch": "Geen overeenkomende items gevonden",
+    "norecords": "Geen items in de databank",
+    "notapproved": "Item is nog niet goedgekeurd",
+    "notopenyet": "Deze actieviteit is niet beschikbaar tot {{$a}}",
+    "numrecords": "{{$a}} records",
+    "other": "Andere",
+    "recordapproved": "Item goedgekeurd",
+    "recorddeleted": "Record verwijderd",
+    "recorddisapproved": "Item verworpen",
+    "resetsettings": "Reset filters",
+    "restore": "Terugzetten",
+    "search": "Zoek",
+    "selectedrequired": "Alle geselecteerde vereist",
+    "timeadded": "Toegevoegd op",
+    "timemodified": "Gewijzigd op",
+    "usedate": "Ook zoeken"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/pl.json b/www/addons/mod/data/lang/pl.json
new file mode 100644
index 00000000000..9d0f4a0409b
--- /dev/null
+++ b/www/addons/mod/data/lang/pl.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Dodaj wpisy",
+    "advancedsearch": "Wyszukiwanie zaawansowane",
+    "alttext": "Alternatywny tekst",
+    "approve": "Zatwierdź",
+    "approved": "Zatwierdzony",
+    "ascending": "Rosnąco",
+    "authorfirstname": "Imię autora",
+    "authorlastname": "Nazwisko autora",
+    "confirmdeleterecord": "Na pewno chcesz usunąć ten wpis?",
+    "descending": "Malejąco",
+    "disapprove": "Cofnij zatwierdzenie",
+    "emptyaddform": "Nie wypełniłeś wszystkich pól",
+    "entrieslefttoadd": "Musisz dodać {{$a.entriesleft}} więcej wpisów, aby zakończyć tą aktywność",
+    "entrieslefttoaddtoview": "Musisz dodać {{$a.entrieslefttoview}} więcej wpisów, aby móc wyświetlać wpisy innych użytkowników.",
+    "errormustsupplyvalue": "Musisz podać wartość tutaj.",
+    "expired": "Niestety, ta aktywność została zamknięta {{$a}} i nie jest już dłużej dostępna",
+    "fields": "Pola",
+    "latlongboth": "Wymagana jest zarówno szerokość i długość geograficzna.",
+    "menuchoose": "Wybierz...",
+    "more": "Więcej",
+    "nomatch": "Żaden wpis nie został znaleziony.",
+    "norecords": "Brak wpisów w bazie danych",
+    "notapproved": "Wpis nie jest jeszcze zatwierdzony.",
+    "notopenyet": "Niestety, ta aktywność jest niedostępna aż do {{$a}}",
+    "numrecords": "{{$a}} wpisów",
+    "other": "Inne",
+    "recordapproved": "Wpis zatwierdzony",
+    "recorddeleted": "Wpis usunięty",
+    "recorddisapproved": "Wpis odrzucony",
+    "resetsettings": "Resetuj pola",
+    "restore": "Odtwórz",
+    "search": "Szukaj",
+    "selectedrequired": "Wszystkie zaznaczone są wymagane",
+    "timeadded": "Dodano czas",
+    "timemodified": "Zmodyfikowano czas",
+    "usedate": "Uwzględnij w wyszukiwaniu."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/pt-br.json b/www/addons/mod/data/lang/pt-br.json
new file mode 100644
index 00000000000..4b8d2b11374
--- /dev/null
+++ b/www/addons/mod/data/lang/pt-br.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Acrescentar itens",
+    "advancedsearch": "Busca avançada",
+    "alttext": "Texto alternativo",
+    "approve": "Aprovar",
+    "approved": "Aprovado",
+    "ascending": "Crescente",
+    "authorfirstname": "Nome do autor",
+    "authorlastname": "Sobrenome do autor",
+    "confirmdeleterecord": "Tem certeza que quer excluir este item?",
+    "descending": "Decrescente",
+    "disapprove": "Desfazer aprovação",
+    "emptyaddform": "Você não completou nenhum campo!",
+    "entrieslefttoadd": "Você precisa adicionar mais {{$a.entriesleft}} item(ns) para completar esta atividade",
+    "entrieslefttoaddtoview": "Você precisa adicionar mais {{$a.entrieslefttoview}} item(ns) antes de poder ver os itens dos outros participantes.",
+    "errormustsupplyvalue": "Você precisa fornecer um valor aqui.",
+    "expired": "Sinto muito, mas esta atividade foi fechada em {{$a}} e não está mais disponível",
+    "fields": "Campos",
+    "latlongboth": "Tanto a Latitude quanto a Longitude devem ser preenchidas.",
+    "menuchoose": "Selecionar...",
+    "more": "Mais",
+    "nomatch": "Nenhum item correspondente encontrado!",
+    "norecords": "Nenhum item na base de dados",
+    "notapproved": "O item ainda não foi aprovado.",
+    "notopenyet": "Desculpe, esta atividade não está disponível até {{$a}}",
+    "numrecords": "{{$a}} itens",
+    "other": "Outro",
+    "recordapproved": "Item aprovado",
+    "recorddeleted": "Item cancelado",
+    "recorddisapproved": "Entrada não aprovada",
+    "resetsettings": "Reconfigurar filtros",
+    "restore": "Restaurar",
+    "search": "Busca",
+    "selectedrequired": "Todos os itens selecionados são obrigatórios",
+    "timeadded": "Tempo adicionado",
+    "timemodified": "Tempo modificado",
+    "usedate": "Incluir na pesquisa."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/pt.json b/www/addons/mod/data/lang/pt.json
new file mode 100644
index 00000000000..8da56197e36
--- /dev/null
+++ b/www/addons/mod/data/lang/pt.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Adicionar registos",
+    "advancedsearch": "Pesquisa avançada",
+    "alttext": "Texto alternativo",
+    "approve": "Aprovar",
+    "approved": "Aprovado",
+    "ascending": "Ascendente",
+    "authorfirstname": "Primeiro nome do autor",
+    "authorlastname": "Apelido do autor",
+    "confirmdeleterecord": "Tem a certeza de que pretende apagar este registo?",
+    "descending": "Descendente",
+    "disapprove": "Anular aprovação",
+    "emptyaddform": "Não preencheu nenhum campo!",
+    "entrieslefttoadd": "Tem que adicionar mais {{$a.entriesleft}} registo(s) para completar esta atividade",
+    "entrieslefttoaddtoview": "Tem que adicionar mais {{$a.entrieslefttoview}} registos para conseguir visualizar as entradas dos outros participantes.",
+    "errormustsupplyvalue": "Indique aqui um valor.",
+    "expired": "A atividade terminou em <b>{{$a}}</b> e não se encontra disponível",
+    "fields": "Campos",
+    "latlongboth": "É necessário a latitude e a longitude.",
+    "menuchoose": "Selecione...",
+    "more": "Mais",
+    "nomatch": "Não foram encontrados registos correspondentes!",
+    "norecords": "Não existem registos na base de dados",
+    "notapproved": "O registo ainda não foi aprovado.",
+    "notopenyet": "A atividade apenas será disponibilizada em <b>{{$a}}</b>",
+    "numrecords": "<b>{{$a}}</b> registos",
+    "other": "Outro",
+    "recordapproved": "Registo aprovado",
+    "recorddeleted": "Registo apagado",
+    "recorddisapproved": "Entrada não aprovada",
+    "resetsettings": "Reiniciar filtros",
+    "restore": "Restaurar",
+    "search": "Pesquisar",
+    "selectedrequired": "Todos os selecionados são obrigatórios",
+    "timeadded": "Data de criação",
+    "timemodified": "Data da última edição",
+    "usedate": "Incluir na pesquisa."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/ro.json b/www/addons/mod/data/lang/ro.json
new file mode 100644
index 00000000000..0f73ca747ca
--- /dev/null
+++ b/www/addons/mod/data/lang/ro.json
@@ -0,0 +1,37 @@
+{
+    "addentries": "Adaugă articole",
+    "advancedsearch": "Căutare complexă",
+    "alttext": "Text alternativ",
+    "approve": "Aprobă",
+    "approved": "Aprobat",
+    "ascending": "Crescător",
+    "authorfirstname": "Prenume autor",
+    "authorlastname": "Nume autor",
+    "confirmdeleterecord": "Sunteţi sigur că doriţi să ştergeţi acest articol?",
+    "descending": "Descrescător",
+    "disapprove": "Anulați aprobarea",
+    "emptyaddform": "Nu aţi completat niciun câmp!",
+    "entrieslefttoadd": "Pentru a finaliza această activitate trebuie să mai adăugaţi {{$a.entriesleft}} more entry/entries articole",
+    "entrieslefttoaddtoview": "Pentru a vedea articolele postate de ceilalţi participanţi trebuie să mai adăugaţi {{$a.entrieslefttoview}} articole.",
+    "errormustsupplyvalue": "Trebuie să inserați o valoare aici.",
+    "expired": "Ne pare rău, activitatea s-a închis în {{$a}} și nu mai este disponibilă",
+    "fields": "Câmpuri",
+    "menuchoose": "Alegeţi...",
+    "more": "Detalii suplimentare",
+    "nomatch": "Nu s-au găsit articole care să corespundă criteriilor selectate!",
+    "norecords": "Nu s-au găsit articole în baza de date",
+    "notapproved": "Acest articol nu a fost încă aprobat.",
+    "notopenyet": "Ne pare rău, această activitate nu este disponibilă până în {{$a}}",
+    "numrecords": "{{$a}} articole",
+    "other": "Altele",
+    "recordapproved": "Articol aprobat",
+    "recorddeleted": "Articol şters",
+    "recorddisapproved": "Postare neaprobată",
+    "resetsettings": "Resetează filtre",
+    "restore": "Restaurează",
+    "search": "Căutare",
+    "selectedrequired": "Toate elementele selectate sunt obligatorii",
+    "timeadded": "Ora la care a fost adăugat",
+    "timemodified": "Ora la care a fost modificat",
+    "usedate": "Include în căutare"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/ru.json b/www/addons/mod/data/lang/ru.json
new file mode 100644
index 00000000000..5598d7b1238
--- /dev/null
+++ b/www/addons/mod/data/lang/ru.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Добавить записи",
+    "advancedsearch": "Расширенный поиск",
+    "alttext": "Альтернативный текст",
+    "approve": "Одобрить",
+    "approved": "Одобрено",
+    "ascending": "По возрастанию",
+    "authorfirstname": "Имя автора",
+    "authorlastname": "Фамилия автора",
+    "confirmdeleterecord": "Вы уверены, что хотите удалить эту запись?",
+    "descending": "По убыванию",
+    "disapprove": "Отменить одобрение",
+    "emptyaddform": "Вы не заполнили ни одного поля",
+    "entrieslefttoadd": "Чтобы просматривать записи других участников Вы должны добавить еще записи - ({{$a.entriesleft}})",
+    "entrieslefttoaddtoview": "Вы должны еще добавить записи ({{$a.entrieslefttoview}}), прежде чем сможете просматривать записи других участников.",
+    "errormustsupplyvalue": "Вы должны здесь указать значение.",
+    "expired": "К сожалению, эта база данных закрыта {{$a}} и больше не доступна",
+    "fields": "Поля",
+    "latlongboth": "Необходимо задать и широту, и долготу.",
+    "menuchoose": "Выбрать...",
+    "more": "Просмотр записи",
+    "nomatch": "Соответствующих записей не найдено!",
+    "norecords": "Нет записей в базе данных",
+    "notapproved": "Запись пока не одобрена.",
+    "notopenyet": "Извините, этот элемент курса не доступен до {{$a}}",
+    "numrecords": "<strong>{{$a}}</strong> записей",
+    "other": "Другое",
+    "recordapproved": "Запись одобрена",
+    "recorddeleted": "Запись удалена",
+    "recorddisapproved": "Снято одобрение записи",
+    "resetsettings": "Сбросить фильтры",
+    "restore": "Восстановить",
+    "search": "Поиск",
+    "selectedrequired": "Требуются все выбранные",
+    "timeadded": "Время добавления",
+    "timemodified": "Время изменения",
+    "usedate": "Включить в поиск"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/sr-cr.json b/www/addons/mod/data/lang/sr-cr.json
new file mode 100644
index 00000000000..6a73cae005c
--- /dev/null
+++ b/www/addons/mod/data/lang/sr-cr.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Додај уносе",
+    "advancedsearch": "Напредно претраживање",
+    "alttext": "Алтернативни текст",
+    "approve": "Одобри",
+    "approved": "Одобрено",
+    "ascending": "Растуће",
+    "authorfirstname": "Име аутора",
+    "authorlastname": "Презиме аутора",
+    "confirmdeleterecord": "Да ли сте сигурни да желите да обришете овај унос?",
+    "descending": "Опадајуће",
+    "disapprove": "Повуци одобрење",
+    "emptyaddform": "Нисте испунили ниједно поље!",
+    "entrieslefttoadd": "Морате да додате још {{$a.entriesleft}} унос(а) како бисте завршили ову активност",
+    "entrieslefttoaddtoview": "Морате да додате још {{$a.entrieslefttoview}} уноса пре него што будете могли да видите уносе других корисника.",
+    "errormustsupplyvalue": "Морате овде задати вредност.",
+    "expired": "Нажалост, ова активност је затворена {$}} и више није доступна",
+    "fields": "Поља",
+    "latlongboth": "Поља за географску ширина и дужина су обавезна.",
+    "menuchoose": "Изаберите...",
+    "more": "Још",
+    "nomatch": "Нема уноса који се поклапају!",
+    "norecords": "Нема уноса у бази података",
+    "notapproved": "Унос још није одобрен",
+    "notopenyet": "Нажалост, ова активност није доступна до {{$a}}",
+    "numrecords": "{{$a}} уноса",
+    "other": "Друго",
+    "recordapproved": "Унос је одобрен",
+    "recorddeleted": "Унос је обрисан",
+    "recorddisapproved": "Унос није одобрен",
+    "resetsettings": "Ресетуј филтере",
+    "restore": "Рестаурирање резервнe копијe",
+    "search": "Тражи",
+    "selectedrequired": "Све изабрано обавезно",
+    "timeadded": "Време додавања",
+    "timemodified": "Време измене",
+    "usedate": "Укључи у претраживање."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/sr-lt.json b/www/addons/mod/data/lang/sr-lt.json
new file mode 100644
index 00000000000..68b43ff3628
--- /dev/null
+++ b/www/addons/mod/data/lang/sr-lt.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Dodaj unose",
+    "advancedsearch": "Napredno pretraživanje",
+    "alttext": "Alternativni tekst",
+    "approve": "Odobri",
+    "approved": "Odobreno",
+    "ascending": "Rastuće",
+    "authorfirstname": "Ime autora",
+    "authorlastname": "Prezime autora",
+    "confirmdeleterecord": "Da li ste sigurni da želite da obrišete ovaj unos?",
+    "descending": "Opadajuće",
+    "disapprove": "Povuci odobrenje",
+    "emptyaddform": "Niste ispunili nijedno polje!",
+    "entrieslefttoadd": "Morate da dodate još {{$a.entriesleft}} unos(a) kako biste završili ovu aktivnost",
+    "entrieslefttoaddtoview": "Morate da dodate još {{$a.entrieslefttoview}} unosa pre nego što budete mogli da vidite unose drugih korisnika.",
+    "errormustsupplyvalue": "Morate ovde zadati vrednost.",
+    "expired": "Nažalost, ova aktivnost je zatvorena {$}} i više nije dostupna",
+    "fields": "Polja",
+    "latlongboth": "Polja za geografsku širina i dužina su obavezna.",
+    "menuchoose": "Izaberite...",
+    "more": "Još",
+    "nomatch": "Nema unosa koji se poklapaju!",
+    "norecords": "Nema unosa u bazi podataka",
+    "notapproved": "Unos još nije odobren",
+    "notopenyet": "Nažalost, ova aktivnost nije dostupna do {{$a}}",
+    "numrecords": "{{$a}} unosa",
+    "other": "Drugo",
+    "recordapproved": "Unos je odobren",
+    "recorddeleted": "Unos je obrisan",
+    "recorddisapproved": "Unos nije odobren",
+    "resetsettings": "Resetuj filtere",
+    "restore": "Restauriranje rezervne kopije",
+    "search": "Traži",
+    "selectedrequired": "Sve izabrano obavezno",
+    "timeadded": "Vreme dodavanja",
+    "timemodified": "Vreme izmene",
+    "usedate": "Uključi u pretraživanje."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/sv.json b/www/addons/mod/data/lang/sv.json
new file mode 100644
index 00000000000..9a13c464c2e
--- /dev/null
+++ b/www/addons/mod/data/lang/sv.json
@@ -0,0 +1,34 @@
+{
+    "addentries": "Lägg till bidrag",
+    "advancedsearch": "Avancerad sökning",
+    "alttext": "Alternativ text",
+    "approve": "Godkänn",
+    "approved": "Godkänd",
+    "ascending": "Stigande",
+    "authorfirstname": "Författarens förnamn",
+    "authorlastname": "Författarens efternamn",
+    "confirmdeleterecord": "Är Du säker på att du vill ta bort det här bidraget?",
+    "descending": "Fallande",
+    "emptyaddform": "Du fyllde inte i alla fält!",
+    "entrieslefttoadd": "Du måste lägga till {{$a.entriesleft}} fler bidrag för att fullfölja den här aktiviteten.",
+    "entrieslefttoaddtoview": "Du måste lägga till {{$a.entrieslefttoview}} fler bidrag innan du kan få se de andra deltagarnas bidrag.",
+    "expired": "Den här aktiviteten stängdes tyvärr den {{$a}} och är inte längre tillgänglig.",
+    "fields": "Fält",
+    "menuchoose": "Välj...",
+    "more": "Fler",
+    "nomatch": "Det gick inte att hitta några matchande bidrag!",
+    "norecords": "Det finns inga bidrag i databasen",
+    "notapproved": "Bidraget är inte godkänt än",
+    "notopenyet": "Den här aktiviteten är tyvärr inte tillgänglig förrän {$}}",
+    "numrecords": "{{$a}} bidrag",
+    "other": "Övrigt",
+    "recordapproved": "Bidraget har godkänts",
+    "recorddeleted": "Bidraget har tagits bort",
+    "resetsettings": "Filter för återställning",
+    "restore": "Återställ",
+    "search": "Sök",
+    "selectedrequired": "Alla de valda är obligatoriska",
+    "timeadded": "Tillagd när",
+    "timemodified": "Modifierad när",
+    "usedate": "Ta med i sökning"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/tr.json b/www/addons/mod/data/lang/tr.json
new file mode 100644
index 00000000000..6b427b298c4
--- /dev/null
+++ b/www/addons/mod/data/lang/tr.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Kayıtları ekle",
+    "advancedsearch": "Gelişmiş arama",
+    "alttext": "Alternatif metin",
+    "approve": "Onayla",
+    "approved": "Onaylandı",
+    "ascending": "Artan",
+    "authorfirstname": "Yazarın adı",
+    "authorlastname": "Yazarın soyadı",
+    "confirmdeleterecord": "Bu kaydı silmek istediğinizden emin misiniz?",
+    "descending": "Azalan",
+    "disapprove": "Onayı geri al",
+    "emptyaddform": "Hiçbir alanı doldurmadınız!",
+    "entrieslefttoadd": "Bu etkinliği bitirmek için {{$a.entriesleft}} kayıt daha eklemelisiniz.",
+    "entrieslefttoaddtoview": "Diğer katılımcıların kayıtlarını görebilmek için {{$a.entrieslefttoview}} kayıt daha eklemelisiniz.",
+    "errormustsupplyvalue": "Burada bir değer vermelisiniz.",
+    "expired": "Maalesef, bu etkinlik {{$a}} tarihinde kapandı ve artık mevcut değil",
+    "fields": "Alanlar",
+    "latlongboth": "Enlem ve boylam gereklidir.",
+    "menuchoose": "Seç...",
+    "more": "Dahası",
+    "nomatch": "Eşleşen kayıt bulunamadı!",
+    "norecords": "Veritabanında kayıt yok",
+    "notapproved": "Kayıt henüz onaylanmamış.",
+    "notopenyet": "Üzgünüz, bu etkinlik {{$a}} kadar kullanılamıyor",
+    "numrecords": "{{$a}} kayıt",
+    "other": "Diğer",
+    "recordapproved": "Kayıt onaylandı",
+    "recorddeleted": "Kayıt silindi",
+    "recorddisapproved": "Giriş onaylanmadı",
+    "resetsettings": "Alanları Temizle",
+    "restore": "Geri yükle",
+    "search": "Ara",
+    "selectedrequired": "Tüm seçililer gereklidir",
+    "timeadded": "Ekleme zamanı",
+    "timemodified": "Düzenleme zamanı",
+    "usedate": "Aramaya dahil et."
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/uk.json b/www/addons/mod/data/lang/uk.json
new file mode 100644
index 00000000000..ceb6004b6ca
--- /dev/null
+++ b/www/addons/mod/data/lang/uk.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "Додати записи",
+    "advancedsearch": "Розширений пошук",
+    "alttext": "Альтернативний текст",
+    "approve": "Прийняти",
+    "approved": "Прийнято",
+    "ascending": "за зростанням",
+    "authorfirstname": "Ім’я автора",
+    "authorlastname": "Прізвище автора",
+    "confirmdeleterecord": "Ви впевнені, що хочете видалити цей запис?",
+    "descending": "за спаданням",
+    "disapprove": "Скасувати схвалення",
+    "emptyaddform": "Ви не заповнили жодного поля!",
+    "entrieslefttoadd": "Вам потрібно додати більше чим {{$a}} записів перед тим, як ви зможете побачити записи інших учасників.",
+    "entrieslefttoaddtoview": "Ви повинні ввести більше чим {{$a.entrieslefttoview}} запис(ів) перед тим, як матимете змогу бачити записи інших.",
+    "errormustsupplyvalue": "Ви повинні тут вказати значення.",
+    "expired": "На жаль, ця діяльність закрита на {{$a}} і більше не доступна",
+    "fields": "Поля",
+    "latlongboth": "Широта і довгота є обов’язковими.",
+    "menuchoose": "Вибрати...",
+    "more": "Детальний перегляд...",
+    "nomatch": "Жодного запису не знайдено!",
+    "norecords": "Немає записів у базі даних",
+    "notapproved": "Запис ще не схвалено",
+    "notopenyet": "ця діяльність не доступна до {{$a}}",
+    "numrecords": "{{$a}} записів",
+    "other": "Інше",
+    "recordapproved": "Запис погоджено",
+    "recorddeleted": "Запис вилучено",
+    "recorddisapproved": "Запис не схвалено",
+    "resetsettings": "Скинути фільтри",
+    "restore": "Відновлення",
+    "search": "Пошук",
+    "selectedrequired": "Всі відібрані вимоги",
+    "timeadded": "Час введення",
+    "timemodified": "Час модифікації",
+    "usedate": "Включити в пошук"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/zh-cn.json b/www/addons/mod/data/lang/zh-cn.json
new file mode 100644
index 00000000000..071feda8d5d
--- /dev/null
+++ b/www/addons/mod/data/lang/zh-cn.json
@@ -0,0 +1,37 @@
+{
+    "addentries": "添加条目",
+    "advancedsearch": "高级搜索",
+    "alttext": "可替代文本",
+    "approve": "批准",
+    "approved": "许可",
+    "ascending": "升序",
+    "authorfirstname": "姓",
+    "authorlastname": "名",
+    "confirmdeleterecord": "您确定要删除这条记录？",
+    "descending": "降序",
+    "disapprove": "撤消审核",
+    "emptyaddform": "您未填写任何字段",
+    "entrieslefttoadd": "在完成此活动前，您还需添加 {{$a.entriesleft}} 条目",
+    "entrieslefttoaddtoview": "在查看其他参与者的条目前，您还需添加 {{$a.entrieslefttoview}} 条目",
+    "errormustsupplyvalue": "这儿你必须提供一个值。",
+    "expired": "对不起，这项活动截止于{{$a}}，不再有效",
+    "fields": "字段",
+    "menuchoose": "选择...",
+    "more": "更多",
+    "nomatch": "未找到匹配的条目",
+    "norecords": "数据库中无条目",
+    "notapproved": "条目尚未被核准。",
+    "notopenyet": "抱歉，此活动直到{{$a}}才可用",
+    "numrecords": "{{$a}} 条记录",
+    "other": "其他",
+    "recordapproved": "记录已核准",
+    "recorddeleted": "记录已删除",
+    "recorddisapproved": "不可进入",
+    "resetsettings": "重置字段",
+    "restore": "恢复",
+    "search": "搜索",
+    "selectedrequired": "全选",
+    "timeadded": "追加时间",
+    "timemodified": "编辑时间",
+    "usedate": "包含到搜索中。"
+}
\ No newline at end of file
diff --git a/www/addons/mod/data/lang/zh-tw.json b/www/addons/mod/data/lang/zh-tw.json
new file mode 100644
index 00000000000..0ca1685c558
--- /dev/null
+++ b/www/addons/mod/data/lang/zh-tw.json
@@ -0,0 +1,38 @@
+{
+    "addentries": "新增條目",
+    "advancedsearch": "進階搜尋",
+    "alttext": "替代文字",
+    "approve": "審核",
+    "approved": "已核准",
+    "ascending": "升冪",
+    "authorfirstname": "作者的名字",
+    "authorlastname": "作者的姓氏",
+    "confirmdeleterecord": "您確定要刪除這筆資料嗎？",
+    "descending": "降冪",
+    "disapprove": "取消核准",
+    "emptyaddform": "您沒有填入任何欄位！",
+    "entrieslefttoadd": "在您要瀏覽其他同學提供的資料前，您必須要再新增{{$a.entriesleft}} 筆資料。",
+    "entrieslefttoaddtoview": "您必須新增{{$a.entrieslefttoview}}筆以上資料，才能夠看到其他同學提供的資料。",
+    "errormustsupplyvalue": "這裡你必須提供一個數值。",
+    "expired": "抱歉，這活動已經在 {{$a}}關閉，已經無法使用。",
+    "fields": "欄位",
+    "latlongboth": "緯度和經度兩者都要填寫",
+    "menuchoose": "選擇...",
+    "more": "更多",
+    "nomatch": "找不到符合的資料！",
+    "norecords": "資料庫中沒有資料",
+    "notapproved": "資料尚未審核。",
+    "notopenyet": "抱歉，這一活動要等到{{$a}}才開始",
+    "numrecords": "{{$a}} 筆資料",
+    "other": "其他",
+    "recordapproved": "資料已審核",
+    "recorddeleted": "資料已刪除",
+    "recorddisapproved": "不可進入",
+    "resetsettings": "重設欄位",
+    "restore": "還原",
+    "search": "搜尋",
+    "selectedrequired": "所有必要的選擇",
+    "timeadded": "新增的時間",
+    "timemodified": "修改的時間",
+    "usedate": "包含在搜尋中"
+}
\ 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..af958dc96ff 100644
--- a/www/addons/mod/feedback/lang/cs.json
+++ b/www/addons/mod/feedback/lang/cs.json
@@ -6,7 +6,7 @@
     "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",
+    "continue_the_form": "Pokračovat v zodpovídání otázek ...",
     "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",
diff --git a/www/addons/mod/feedback/lang/da.json b/www/addons/mod/feedback/lang/da.json
index 55d1b3cd1ba..6147eb30f82 100644
--- a/www/addons/mod/feedback/lang/da.json
+++ b/www/addons/mod/feedback/lang/da.json
@@ -5,7 +5,7 @@
     "average": "Gennemsnit",
     "complete_the_form": "Svar på spørgsmålene...",
     "completed_feedbacks": "Afleverede svar",
-    "continue_the_form": "Fortsæt formularen",
+    "continue_the_form": "Fortsæt med at besvare spørgsmålene",
     "feedback_is_not_open": "Feedbacken er ikke åben",
     "feedbackclose": "Tillad svar til",
     "feedbackopen": "Tillad svar fra",
diff --git a/www/addons/mod/feedback/lang/de.json b/www/addons/mod/feedback/lang/de.json
index 7c665bbb337..6484534ca06 100644
--- a/www/addons/mod/feedback/lang/de.json
+++ b/www/addons/mod/feedback/lang/de.json
@@ -6,7 +6,7 @@
     "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",
+    "continue_the_form": "Beantwortung der Fragen 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",
diff --git a/www/addons/mod/feedback/lang/es-mx.json b/www/addons/mod/feedback/lang/es-mx.json
index 6c9cfa558f6..b09def04c16 100644
--- a/www/addons/mod/feedback/lang/es-mx.json
+++ b/www/addons/mod/feedback/lang/es-mx.json
@@ -6,7 +6,7 @@
     "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",
+    "continue_the_form": "Continuar contestando las preguntas...",
     "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",
diff --git a/www/addons/mod/feedback/lang/eu.json b/www/addons/mod/feedback/lang/eu.json
index 1f74e6b554e..b0a1488eb4f 100644
--- a/www/addons/mod/feedback/lang/eu.json
+++ b/www/addons/mod/feedback/lang/eu.json
@@ -9,8 +9,8 @@
     "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",
+    "feedbackclose": "Noiz arte baimendu erantzunak",
+    "feedbackopen": "Noiztik baimendu erantzunak",
     "mapcourses": "Esleitu feedback-a ikastaroetarako",
     "mode": "Modua",
     "next_page": "Hurrengo orria",
@@ -18,7 +18,7 @@
     "non_anonymous_entries": "Sarrera anonimorik ez ({{$a}})",
     "non_respondents_students": "Erantzun ez duten ikasleak ({{$a}})",
     "not_selected": "Aukeratu gabea",
-    "not_started": "hasi gabea",
+    "not_started": "Hasi gabea",
     "numberoutofrange": "Tartetik kanpoko zenbakia",
     "overview": "Ikuspegi orokorra",
     "page_after_submit": "Osaketa-mezua",
@@ -30,6 +30,6 @@
     "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/fr.json b/www/addons/mod/feedback/lang/fr.json
index 902851b6a51..26c4c2c0740 100644
--- a/www/addons/mod/feedback/lang/fr.json
+++ b/www/addons/mod/feedback/lang/fr.json
@@ -6,7 +6,7 @@
     "captchaofflinewarning": "Le feedback avec captcha ne peut pas être terminé s'il n'est pas configuré, en mode hors ligne ou si le serveur est arrêté.",
     "complete_the_form": "Répondre aux questions...",
     "completed_feedbacks": "Réponses envoyées",
-    "continue_the_form": "Continuer le formulaire",
+    "continue_the_form": "Continuer à répondre aux questions...",
     "feedback_is_not_open": "Le feedback n'est pas ouvert",
     "feedback_submitted_offline": "Ce feedback a été enregistré pour être remis plus tard.",
     "feedbackclose": "Permettre les réponses jusqu'au",
diff --git a/www/addons/mod/feedback/lang/he.json b/www/addons/mod/feedback/lang/he.json
index 52e5c8f67b8..d1cac22f250 100644
--- a/www/addons/mod/feedback/lang/he.json
+++ b/www/addons/mod/feedback/lang/he.json
@@ -1,7 +1,7 @@
 {
     "analysis": "ניתוח",
     "anonymous": "אנונימי",
-    "anonymous_entries": "משובים אנונימיים",
+    "anonymous_entries": "משובים אנונימיים ({{$a}})",
     "average": "ממוצע",
     "complete_the_form": "מענה על השאלות...",
     "completed_feedbacks": "תשובות אשר הוגשו",
diff --git a/www/addons/mod/feedback/lang/hu.json b/www/addons/mod/feedback/lang/hu.json
index 4c096d23974..40c06756007 100644
--- a/www/addons/mod/feedback/lang/hu.json
+++ b/www/addons/mod/feedback/lang/hu.json
@@ -5,7 +5,7 @@
     "average": "Átlag",
     "complete_the_form": "Válaszoljon a kérdésekre...",
     "completed_feedbacks": "Leadott válaszok",
-    "continue_the_form": "Űrlap folytatása",
+    "continue_the_form": "Kérdések megválaszolásának 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",
diff --git a/www/addons/mod/feedback/lang/ja.json b/www/addons/mod/feedback/lang/ja.json
index cf75cb496e1..1fa5c5c7b9a 100644
--- a/www/addons/mod/feedback/lang/ja.json
+++ b/www/addons/mod/feedback/lang/ja.json
@@ -6,7 +6,7 @@
     "captchaofflinewarning": "Capchaつきのフィードバックは、未設定の場合、オフラインモードの場合、サーバがダウンしている場合には完了できません。",
     "complete_the_form": "質問に回答する ...",
     "completed_feedbacks": "送信済み回答",
-    "continue_the_form": "フォームを続ける",
+    "continue_the_form": "質問への回答を続ける ...",
     "feedback_is_not_open": "フィードバックは利用できません。",
     "feedback_submitted_offline": "このフィードバックを、あとで提出するために保存しました。",
     "feedbackclose": "フィードバック終了日時",
diff --git a/www/addons/mod/feedback/lang/lt.json b/www/addons/mod/feedback/lang/lt.json
index dbe395c1dd6..e08688c5507 100644
--- a/www/addons/mod/feedback/lang/lt.json
+++ b/www/addons/mod/feedback/lang/lt.json
@@ -5,7 +5,7 @@
     "average": "Vidurkis",
     "complete_the_form": "Atsakyti klausimus...",
     "completed_feedbacks": "Pateikti atsakymai",
-    "continue_the_form": "Tęsti formą",
+    "continue_the_form": "Tęsti atsakymus į klausimus...",
     "feedback_is_not_open": "Atsiliepimas neatidarytas",
     "feedbackclose": "Uždaryti atsiliepimą",
     "feedbackopen": "Atidaryti atsiliepimą",
diff --git a/www/addons/mod/feedback/lang/nl.json b/www/addons/mod/feedback/lang/nl.json
index 92250c29608..32c689ca443 100644
--- a/www/addons/mod/feedback/lang/nl.json
+++ b/www/addons/mod/feedback/lang/nl.json
@@ -6,7 +6,7 @@
     "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",
+    "continue_the_form": "Ga verder met het beantwoorden van de vragen...",
     "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",
diff --git a/www/addons/mod/feedback/lang/pt-br.json b/www/addons/mod/feedback/lang/pt-br.json
index 98fb2ece613..bc007fed595 100644
--- a/www/addons/mod/feedback/lang/pt-br.json
+++ b/www/addons/mod/feedback/lang/pt-br.json
@@ -1,7 +1,7 @@
 {
     "analysis": "Análise",
     "anonymous": "Anônimo",
-    "anonymous_entries": "Entradas anônimas",
+    "anonymous_entries": "Entradas anônimas ({{$a}})",
     "average": "Média",
     "complete_the_form": "Responda as questões...",
     "completed_feedbacks": "Respostas submetidas",
@@ -13,10 +13,11 @@
     "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",
+    "non_anonymous_entries": "Entradas não anônimas ({{$a}})",
+    "non_respondents_students": "Estudantes não respondentes ({{$a}})",
     "not_selected": "Não selecionado",
     "not_started": "não iniciado",
+    "numberoutofrange": "Valor fora do intervalo",
     "overview": "Visão geral",
     "page_after_submit": "Mensagem de conclusão",
     "preview": "Previsão",
diff --git a/www/addons/mod/feedback/lang/pt.json b/www/addons/mod/feedback/lang/pt.json
index a6ba4bcbd66..23aced64222 100644
--- a/www/addons/mod/feedback/lang/pt.json
+++ b/www/addons/mod/feedback/lang/pt.json
@@ -6,7 +6,7 @@
     "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",
+    "continue_the_form": "Continuar a responder às perguntas...",
     "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é",
@@ -30,6 +30,6 @@
     "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/sr-cr.json b/www/addons/mod/feedback/lang/sr-cr.json
index 703d835b603..a1cdc9bcc78 100644
--- a/www/addons/mod/feedback/lang/sr-cr.json
+++ b/www/addons/mod/feedback/lang/sr-cr.json
@@ -1,4 +1,35 @@
 {
+    "analysis": "Анализа",
+    "anonymous": "Анонимни упитник",
+    "anonymous_entries": "Анонимни одговори ({{$a}})",
+    "average": "Просечно",
     "captchaofflinewarning": "Упитник са Captcha елементом не може да буде завршен ако није конфигурисан, ако сте у офлајн режиму или ако је сервер искључен.",
-    "feedback_submitted_offline": "Овај упитник је сачуван како би касније био предат."
+    "complete_the_form": "Одговори на питања...",
+    "completed_feedbacks": "Анализа одговорa",
+    "continue_the_form": "Настави са одговарањем на питања...",
+    "feedback_is_not_open": "Упитник није отворен",
+    "feedback_submitted_offline": "Овај упитник је сачуван како би касније био предат.",
+    "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/sr-lt.json b/www/addons/mod/feedback/lang/sr-lt.json
index ceea89255f5..8f2198ecfcc 100644
--- a/www/addons/mod/feedback/lang/sr-lt.json
+++ b/www/addons/mod/feedback/lang/sr-lt.json
@@ -1,4 +1,35 @@
 {
+    "analysis": "Analiza",
+    "anonymous": "Anonimni upitnik",
+    "anonymous_entries": "Anonimni odgovori ({{$a}})",
+    "average": "Prosečno",
     "captchaofflinewarning": "Upitnik sa Captcha elementom ne može da bude završen ako nije konfigurisan, ako ste u oflajn režimu ili ako je server isključen.",
-    "feedback_submitted_offline": "Ovaj upitnik je sačuvan kako bi kasnije bio predat."
+    "complete_the_form": "Odgovori na pitanja...",
+    "completed_feedbacks": "Analiza odgovora",
+    "continue_the_form": "Nastavi sa odgovaranjem na pitanja...",
+    "feedback_is_not_open": "Upitnik nije otvoren",
+    "feedback_submitted_offline": "Ovaj upitnik je sačuvan kako bi kasnije bio predat.",
+    "feedbackclose": "Upitnik dostupan do",
+    "feedbackopen": "Upitnik dostupan od",
+    "mapcourses": "Poveži upitnik sa kursevima",
+    "mode": "Vrsta upitnika",
+    "next_page": "Sledeća stranica",
+    "non_anonymous": "Ime korisnika biće zapisano i prikazano zajedno sa odgovorima",
+    "non_anonymous_entries": "Neanonimni odgovori ({{$a}})",
+    "non_respondents_students": "Polaznici koji nisu odgovorili na upitnik ({{$a}})",
+    "not_selected": "Nije izabrano",
+    "not_started": "Nije započeto",
+    "numberoutofrange": "Broj izvan opsega",
+    "overview": "Pregled",
+    "page_after_submit": "Poruka koja će biti prikazana korisniku nakon što popuni upitnik",
+    "preview": "Pregled",
+    "previous_page": "Prethodna stranica",
+    "questions": "Pitanja",
+    "response_nr": "Odgovor br.",
+    "responses": "Odgovori",
+    "save_entries": "Pošalji svoje odgovore",
+    "show_entries": "Prikaži odgovore",
+    "show_nonrespondents": "Prikaži korisnike koje nisu odgovorili na upitnik",
+    "started": "Započeto",
+    "this_feedback_is_already_submitted": "Već ste popunili ovaj upitnik."
 }
\ 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..b2b4102df5d 100644
--- a/www/addons/mod/feedback/lang/sv.json
+++ b/www/addons/mod/feedback/lang/sv.json
@@ -16,7 +16,7 @@
     "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",
+    "not_started": "Inte påbörjad",
     "overview": "Översikt",
     "page_after_submit": "Sida efter inskickning",
     "preview": "Förhandsgranska",
diff --git a/www/addons/mod/feedback/lang/tr.json b/www/addons/mod/feedback/lang/tr.json
index b1c57c37b04..e4720de3ad0 100644
--- a/www/addons/mod/feedback/lang/tr.json
+++ b/www/addons/mod/feedback/lang/tr.json
@@ -1,14 +1,14 @@
 {
     "analysis": "Analiz",
     "anonymous": "Anonim",
-    "anonymous_entries": "Anonim kayıtlar",
+    "anonymous_entries": "Anonim kayıtlar ({{$a}})",
     "average": "Ortalama",
     "complete_the_form": "Soruları cevaplayın...",
     "completed_feedbacks": "Gönderilen cevaplar",
-    "continue_the_form": "Devam et",
+    "continue_the_form": "Soruları cevaplamaya devam et...",
     "feedback_is_not_open": "Geribildirim açık değil",
-    "feedbackclose": "Geribildirimi kapat",
-    "feedbackopen": "Geribildirimi aç",
+    "feedbackclose": "Şuna yazılan cevaplara izin ver:",
+    "feedbackopen": "Şunlardan gelen cevaplara izin ver:",
     "mapcourses": "Geribildirimi derslere eşleştirin",
     "mode": "Mod",
     "next_page": "Sonraki sayfa",
@@ -19,11 +19,11 @@
     "not_started": "Başlatılmadı",
     "numberoutofrange": "Aralık dışı numara",
     "overview": "Gözat",
-    "page_after_submit": "Geribildirim doldurulduktan sonraki sayfa",
+    "page_after_submit": "Tamamlama bildirimi",
     "preview": "Önizleme",
     "previous_page": "Önceki sayfa",
     "questions": "Sorular",
-    "response_nr": "Yanıt No.",
+    "response_nr": "Yanıt numarası",
     "responses": "Yanıtlar",
     "save_entries": "Cevaplarınızı gönderin",
     "show_entries": "Yanıtları göster",
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/ja.json b/www/addons/mod/folder/lang/ja.json
index 61980e500fc..8634d70f046 100644
--- a/www/addons/mod/folder/lang/ja.json
+++ b/www/addons/mod/folder/lang/ja.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "表示するファイルがありません。",
+    "emptyfilelist": "表示するファイルはありません。",
     "errorwhilegettingfolder": "フォルダのデータを取得中にエラーが発生しました。"
 }
\ 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/sr-cr.json b/www/addons/mod/folder/lang/sr-cr.json
index a65fb8697c7..3ed8d5f00a0 100644
--- a/www/addons/mod/folder/lang/sr-cr.json
+++ b/www/addons/mod/folder/lang/sr-cr.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Нема датотека за приказ.",
+    "emptyfilelist": "Нема датотека за приказ",
     "errorwhilegettingfolder": "Грешка приликом преузимања података за 'Директоријум'"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/sr-lt.json b/www/addons/mod/folder/lang/sr-lt.json
index 9bfdf403335..847b0b05eff 100644
--- a/www/addons/mod/folder/lang/sr-lt.json
+++ b/www/addons/mod/folder/lang/sr-lt.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Nema datoteka za prikaz.",
+    "emptyfilelist": "Nema datoteka za prikaz",
     "errorwhilegettingfolder": "Greška prilikom preuzimanja podataka za 'Direktorijum'"
 }
\ 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/ca.json b/www/addons/mod/forum/lang/ca.json
index 5f1be9cd58c..42bf0d4d3d0 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",
+    "discussionlocked": "Aquest fil de debat ha finalitzat, així que no admet respostes.",
     "discussionpinned": "Fixat",
     "discussionsubscription": "Subscripció als debats",
     "edit": "Edita",
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..3b4e2e70b17 100644
--- a/www/addons/mod/forum/lang/he.json
+++ b/www/addons/mod/forum/lang/he.json
@@ -5,11 +5,12 @@
     "cannotcreatediscussion": "כשלון ביצירת דיון חדש.",
     "couldnotadd": "ההודעה שלך לא פורסמה עקב תקלה בלתי מזוהה",
     "discussion": "דיון",
+    "discussionlocked": "הדיון ננעל, כך שלא ניתן יותר להגיב אליו.",
     "discussionpinned": "בראש הרשימה",
     "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/ja.json b/www/addons/mod/forum/lang/ja.json
index 27252c4d033..c3c4562c07c 100644
--- a/www/addons/mod/forum/lang/ja.json
+++ b/www/addons/mod/forum/lang/ja.json
@@ -3,14 +3,14 @@
     "cannotadddiscussion": "このフォーラムにディスカッションを追加するにはグループのメンバーである必要があります。",
     "cannotadddiscussionall": "あなたにはすべての参加者のための新しいディスカッショントピックを追加するパーミッションがありません。",
     "cannotcreatediscussion": "新しいディスカッションを作成できませんでした。",
-    "couldnotadd": "不明なエラーのため、あなたの投稿を追加できませんでした。",
+    "couldnotadd": "不明なエラーのためあなたの投稿を追加できませんでした。",
     "discussion": "ディスカッション",
     "discussionlocked": "このディスカッションはロックされているため、あなたは返信することはできません。",
     "discussionpinned": "ピン留め",
     "discussionsubscription": "ディスカッション購読",
     "edit": "編集",
     "erroremptymessage": "投稿メッセージを空にすることはできません。",
-    "erroremptysubject": "投稿の件名は必須です",
+    "erroremptysubject": "投稿件名を空にすることはできません。",
     "errorgetforum": "フォーラムのデータ取得中にエラーが発生しました。",
     "errorgetgroups": "グループ設定の取得中にエラーが発生しました。",
     "forumnodiscussionsyet": "このフォーラムにはまだディスカッショントピックがありません",
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/pl.json b/www/addons/mod/forum/lang/pl.json
index 67a495dd1a6..0f761c4b8ec 100644
--- a/www/addons/mod/forum/lang/pl.json
+++ b/www/addons/mod/forum/lang/pl.json
@@ -7,7 +7,7 @@
     "discussion": "Temat",
     "discussionlocked": "Dyskusja została zablokowana, więc nie możesz już odpowiedzieć.",
     "discussionpinned": "Przypięta",
-    "discussionsubscription": "Subskrypcja dyskusja",
+    "discussionsubscription": "Subskrypcja dyskusji",
     "edit": "Edycja",
     "erroremptymessage": "Wiadomość nie może być pusta",
     "erroremptysubject": "Tytuł wpisu nie może być pusty.",
diff --git a/www/addons/mod/forum/lang/pt-br.json b/www/addons/mod/forum/lang/pt-br.json
index f7d9cf730e2..a4df46a5972 100644
--- a/www/addons/mod/forum/lang/pt-br.json
+++ b/www/addons/mod/forum/lang/pt-br.json
@@ -5,10 +5,12 @@
     "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",
+    "discussionlocked": "Esta discussão foi bloqueada e já não é possível responder a ela.",
+    "discussionpinned": "Destacado",
     "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 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/sr-cr.json b/www/addons/mod/forum/lang/sr-cr.json
index 4d04219d752..a29562d23f2 100644
--- a/www/addons/mod/forum/lang/sr-cr.json
+++ b/www/addons/mod/forum/lang/sr-cr.json
@@ -1,11 +1,32 @@
 {
-    "erroremptysubject": "Тема поруке не може бити празна",
+    "addanewdiscussion": "Додај нову тему за дискусију",
+    "cannotadddiscussion": "Додавање дискусије у оквиру овог форума захтева групно чланство.",
+    "cannotadddiscussionall": "Немате дозволу да додајете нову тему за дискусију за све учеснике.",
+    "cannotcreatediscussion": "Није било могуће отворити нову дискусију",
+    "couldnotadd": "Нажалост, није могуће додати Вашу поруку због непознате грешке",
+    "discussion": "Дискусија",
+    "discussionlocked": "Ова дискусија је закључана тако да више не можете одговарати на њој.",
+    "discussionpinned": "Фиксирана",
+    "discussionsubscription": "Претплата на дискусију",
+    "edit": "Уреди",
+    "erroremptymessage": "Тело поруке не може бити празно",
+    "erroremptysubject": "Тема (наслов) поруке не може бити празна",
     "errorgetforum": "Грешка приликом преузимања података за 'Форум'",
     "errorgetgroups": "Грешка приликом преузимања подешавања група.",
     "forumnodiscussionsyet": "Још нема тема за дискусију на овом форуму.",
     "group": "Група",
+    "message": "Порука",
+    "modeflatnewestfirst": "Приказ одговора, почевши прво с најновијим",
+    "modeflatoldestfirst": "Приказ одговора, почевши прво с најстаријим",
+    "modenested": "Приказ одговора у угнежђеној форми",
     "numdiscussions": "{{numdiscussions}} дискусије/а",
     "numreplies": "{{numreplies}} одговора",
+    "posttoforum": "Пошаљи поруку на форум",
+    "re": "Одговор:",
     "refreshdiscussions": "Освежи дискусије",
-    "refreshposts": "Освежи постове"
+    "refreshposts": "Освежи постове",
+    "reply": "Одговори",
+    "subject": "Тема",
+    "unread": "Непрочитано",
+    "unreadpostsnumber": "Број непрочитаних порука: {{$a}}"
 }
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/sr-lt.json b/www/addons/mod/forum/lang/sr-lt.json
index 27882a3847b..e655f26c3b4 100644
--- a/www/addons/mod/forum/lang/sr-lt.json
+++ b/www/addons/mod/forum/lang/sr-lt.json
@@ -1,11 +1,32 @@
 {
-    "erroremptysubject": "Tema poruke ne može biti prazna",
+    "addanewdiscussion": "Dodaj novu temu za diskusiju",
+    "cannotadddiscussion": "Dodavanje diskusije u okviru ovog foruma zahteva grupno članstvo.",
+    "cannotadddiscussionall": "Nemate dozvolu da dodajete novu temu za diskusiju za sve učesnike.",
+    "cannotcreatediscussion": "Nije bilo moguće otvoriti novu diskusiju",
+    "couldnotadd": "Nažalost, nije moguće dodati Vašu poruku zbog nepoznate greške",
+    "discussion": "Diskusija",
+    "discussionlocked": "Ova diskusija je zaključana tako da više ne možete odgovarati na njoj.",
+    "discussionpinned": "Fiksirana",
+    "discussionsubscription": "Pretplata na diskusiju",
+    "edit": "Uredi",
+    "erroremptymessage": "Telo poruke ne može biti prazno",
+    "erroremptysubject": "Tema (naslov) poruke ne može biti prazna",
     "errorgetforum": "Greška prilikom preuzimanja podataka za 'Forum'",
     "errorgetgroups": "Greška prilikom preuzimanja podešavanja grupa.",
     "forumnodiscussionsyet": "Greška prilikom preuzimanja podešavanja grupa.",
     "group": "Grupa",
+    "message": "Poruka",
+    "modeflatnewestfirst": "Prikaz odgovora, počevši prvo s najnovijim",
+    "modeflatoldestfirst": "Prikaz odgovora, počevši prvo s najstarijim",
+    "modenested": "Prikaz odgovora u ugnežđenoj formi",
     "numdiscussions": "{{numdiscussions}} diskusije/a",
     "numreplies": "{{numreplies}} odgovora",
+    "posttoforum": "Pošalji poruku na forum",
+    "re": "Odgovor:",
     "refreshdiscussions": "Osveži diskusije",
-    "refreshposts": "Osveži postove"
+    "refreshposts": "Osveži postove",
+    "reply": "Odgovori",
+    "subject": "Tema",
+    "unread": "Nepročitano",
+    "unreadpostsnumber": "Broj nepročitanih poruka: {{$a}}"
 }
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index 676e5ba9fa1..d8da791577b 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -3,12 +3,14 @@
     "cannotadddiscussion": "För att lägga till diskussionsämnen till det här forumet krävs det att man är medlem av en grupp.",
     "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.",
+    "couldnotadd": "Det gick inte att lägga till ditt inlägg på grund av okänt fel.",
     "discussion": "Diskussionsämne",
-    "discussionsubscription": "Diskussions prenumeration",
+    "discussionlocked": "Denna diskussion är stängd och du kan inte längre göra inlägg i den.",
+    "discussionpinned": "Fastnålad",
+    "discussionsubscription": "Prenumeration på diskussion",
     "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/uk.json b/www/addons/mod/forum/lang/uk.json
index 5fec7fdc11b..bf8cfd7742c 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 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 e92d720edeb..b52d6059283 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 dc6e44a0dcd..593e987ab1a 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 191d2db0090..2351376a71d 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": "Adjunta la insígnia al missatge",
+    "browsemode": "Mode exploració",
     "byalphabet": "Alfabèticament",
     "byauthor": "Agrupat per autor",
     "bycategory": "Agrupa per categoria",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Actualitzat recentment",
     "bysearch": "Cerca",
     "cannoteditentry": "No es pot editar l'entrada",
-    "casesensitive": "Utilitzeu expressions regulars",
-    "categories": "Categories de cursos",
+    "casesensitive": "Distingeix majúscules",
+    "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 3421f566a83..db30da2ce2e 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": "Prohlížení příspěvků",
+    "attachment": "Příloha",
+    "browsemode": "Režim náhledu",
     "byalphabet": "Abecedně",
     "byauthor": "Skupina podle autora",
     "bycategory": "Skupina podle kategorie",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Posledně aktualizované",
     "bysearch": "Hledat",
     "cannoteditentry": "Záznam nelze upravit",
-    "casesensitive": "Používat regulární výrazy",
-    "categories": "Kategorie kurzů",
+    "casesensitive": "Rozlišovat malá/VELKÁ",
+    "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 40b07cf0bb0..41338f8fc3e 100644
--- a/www/addons/mod/glossary/lang/da.json
+++ b/www/addons/mod/glossary/lang/da.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Tilføj badge til besked",
-    "browsemode": "Skim indlæg",
+    "attachment": "Bilag",
+    "browsemode": "Forhåndsvisning",
     "byalphabet": "Alfabetisk",
     "byauthor": "Grupper efter forfatter",
     "bynewestfirst": "Nyeste først",
     "byrecentlyupdated": "Senest opdateret",
     "bysearch": "Søg",
-    "casesensitive": "Brug regulære udtryk",
-    "categories": "Kursuskategorier",
+    "casesensitive": "Store og små bogstaver",
+    "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 6b5589a0b0c..c5afa42c3fc 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": "Einträge durchblättern",
+    "attachment": "Anhang",
+    "browsemode": "Vorschaumodus",
     "byalphabet": "Alphabetisch",
     "byauthor": "Nach Autor/in",
     "bycategory": "Nach Kategorie",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Gerade aktualisiert",
     "bysearch": "Suchen",
     "cannoteditentry": "Eintrag nicht bearbeitbar",
-    "casesensitive": "Reguläre Ausdrücke verwenden",
-    "categories": "Kursbereiche",
+    "casesensitive": "Groß-/Kleinschreibung",
+    "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 0bfce509423..0b1990425e5 100644
--- a/www/addons/mod/glossary/lang/el.json
+++ b/www/addons/mod/glossary/lang/el.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Συνημμένα",
-    "browsemode": "Περιήγηση στις καταχωρήσεις",
+    "attachment": "Επισυναπτόμενο",
+    "browsemode": "Φάση Προεπισκόπισης",
     "byalphabet": "Αλφαβητικά",
     "byauthor": "Ομαδοποίηση ανά συγγραφέα",
     "bycategory": "Ομαδοποίηση ανά κατηγορία",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Ανανεώθηκαν πρόσφατα",
     "bysearch": "Αναζήτηση",
     "cannoteditentry": "Δεν είναι δυνατή η επεξεργασία της καταχώρισης",
-    "casesensitive": "Χρήση κανονικών εκφράσεων",
-    "categories": "Κατηγορίες μαθημάτων",
+    "casesensitive": "Διάκριση μικρών/κεφαλαίων",
+    "categories": "Κατηγορίες",
     "entriestobesynced": "Entries που πρέπει να συγχρονιστούν",
     "entrypendingapproval": "Εκκρεμεί η έγκριση για αυτή την καταχώρηση.",
     "errorloadingentries": "Παρουσιάστηκε σφάλμα κατά τη φόρτωση των καταχωρήσεων.",
diff --git a/www/addons/mod/glossary/lang/es-mx.json b/www/addons/mod/glossary/lang/es-mx.json
index 158ea571325..f8b36fd05f5 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": "Anexar insignia al mensaje",
+    "browsemode": "Modo de presentación preliminar",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoría",
@@ -8,7 +8,7 @@
     "byrecentlyupdated": "Recientemente actualizado",
     "bysearch": "Buscar",
     "cannoteditentry": "No puede editarse entrada",
-    "casesensitive": "Usar expresiones regulares",
+    "casesensitive": "Diferencia entre MAYÚSCULAS y minúsculas",
     "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 4089c74aa49..6cbdcc4dc0e 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": "Adjuntar insignia al mensaje",
+    "browsemode": "Modo de presentación preliminar",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupado por autor",
     "bycategory": "Agrupar por categoría",
@@ -8,7 +8,7 @@
     "byrecentlyupdated": "Actualizado recientemente",
     "bysearch": "Busca",
     "cannoteditentry": "No se puede editar la entrada",
-    "casesensitive": "Usar expresiones regulares",
+    "casesensitive": "Diferencia entre mayúsculas y minúsculas",
     "categories": "Categorías",
     "entriestobesynced": "Entradas pendientes de ser sincronizadas",
     "entrypendingapproval": "Esta entrada está pendiente de aprobación.",
diff --git a/www/addons/mod/glossary/lang/eu.json b/www/addons/mod/glossary/lang/eu.json
index c6ab2a7e186..96f4a794e08 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": "Aztertu sarrerak",
+    "attachment": "Eranskina",
+    "browsemode": "Aurrebista-modua",
     "byalphabet": "Alfabetikoki",
     "byauthor": "Taldekatu egilearen arabera",
     "bycategory": "Taldekatu kategoriaren arabera",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Duela gutxi eguneratuak",
     "bysearch": "Bilatu",
     "cannoteditentry": "Ezin da sarrera editatu",
-    "casesensitive": "Erabil adierazpen erregularrak",
-    "categories": "Ikastaro-kategoriak",
+    "casesensitive": "Letra larriak eta xeheak bereiziz",
+    "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 637de884db4..8b6788b82aa 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 712afea4266..976057ed4e7 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": "Parcourir les articles",
+    "attachment": "Annexe",
+    "browsemode": "Mode prévisualisation",
     "byalphabet": "Alphabétiquement",
     "byauthor": "Grouper par auteur",
     "bycategory": "Grouper par catégorie",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Modifiés récemment",
     "bysearch": "Rechercher",
     "cannoteditentry": "Impossible de modifier l'article",
-    "casesensitive": "Utiliser les expressions régulières",
-    "categories": "Catégories de cours",
+    "casesensitive": "Casse des caractères",
+    "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 abad848638c..e4d971b4c35 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 acb16b009bd..c74a20c85ed 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": "Kitűző hozzákapcsolása az üzenethez",
     "browsemode": "Előzetes megtekintés üzemmódja",
-    "casesensitive": "Reguláris kifejezések használata",
-    "categories": "Kurzuskategóriák"
+    "casesensitive": "Kis-/nagybetű különböző",
+    "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 581b16835e1..aa1cfe7fe09 100644
--- a/www/addons/mod/glossary/lang/it.json
+++ b/www/addons/mod/glossary/lang/it.json
@@ -1,10 +1,10 @@
 {
-    "attachment": "Allega badge al messaggio",
+    "attachment": "Allegato",
     "browsemode": "Modalità anteprima",
     "byrecentlyupdated": "Aggiornati di recente",
     "bysearch": "Cerca",
-    "casesensitive": "Utilizza regular expression",
-    "categories": "Categorie di corso",
+    "casesensitive": "Rilevanza maiuscolo/minuscolo",
+    "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 395ba50cc3b..619f8f31178 100644
--- a/www/addons/mod/glossary/lang/ja.json
+++ b/www/addons/mod/glossary/lang/ja.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "添付",
-    "browsemode": "エントリをブラウズ",
+    "attachment": "メッセージにバッジを添付する",
+    "browsemode": "プレビューモード",
     "byalphabet": "アルファベット順",
     "byauthor": "著者でグループ",
     "bycategory": "カテゴリでグループ",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "最近の更新",
     "bysearch": "検索",
     "cannoteditentry": "エントリの編集ができませんでした",
-    "casesensitive": "正規表現を使用する",
-    "categories": "コースカテゴリ",
+    "casesensitive": "大文字小文字の区別",
+    "categories": "カテゴリ",
     "entriestobesynced": "エントリの同期ができませんでした",
     "entrypendingapproval": "このエントリは承認待ちです。",
     "errorloadingentries": "エントリ読み込み中にエラーが発生しました。",
diff --git a/www/addons/mod/glossary/lang/lt.json b/www/addons/mod/glossary/lang/lt.json
index 18f6cc6763e..23f3f7fe92b 100644
--- a/www/addons/mod/glossary/lang/lt.json
+++ b/www/addons/mod/glossary/lang/lt.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Prikabinti pasiekimą prie pranešimo",
-    "browsemode": "Peržiūrėti įrašus",
+    "attachment": "Priedas",
+    "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 7c06a87db9a..a7e834e6b2a 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": "Blader door items",
+    "attachment": "Bijlage",
+    "browsemode": "Probeermodus",
     "byalphabet": "Alfabetisch",
     "byauthor": "Groepeer per auteur",
     "bycategory": "Groepeer per categorie",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Onlangs gewijzigd",
     "bysearch": "Zoek",
     "cannoteditentry": "Kan item niet bewerken",
-    "casesensitive": "Regular expressions gebruiken",
-    "categories": "Cursuscategorieën",
+    "casesensitive": "Gevoeligheid voor hoofd/kleine letters",
+    "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 7effb708160..dc3225deb6a 100644
--- a/www/addons/mod/glossary/lang/pl.json
+++ b/www/addons/mod/glossary/lang/pl.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Dołącz odznakę do wiadomości",
+    "attachment": "Załącznik",
     "browsemode": "Tryb przeglądania",
-    "casesensitive": "Użyj wyrażeń regularnych",
-    "categories": "Kategorie kursów"
+    "casesensitive": "Uwzględnianie wielkości liter",
+    "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 7eeca932a54..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": "Anexar emblema à mensagem",
-    "browsemode": "Navegar nas entradas",
+    "attachment": "Anexo",
+    "browsemode": "Prévia",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoria",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Recentemente atualizados",
     "bysearch": "Pesquisa",
     "cannoteditentry": "Não é possível editar o item",
-    "casesensitive": "Usar expressões regulares",
-    "categories": "Categorias de Cursos",
+    "casesensitive": "Considerar diferenças entre maiúsculas e minúsculas",
+    "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 151febb1e95..c672ec0b9a3 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": "Ver entradas",
+    "attachment": "Anexo",
+    "browsemode": "Modo de pré-visualização",
     "byalphabet": "Alfabeticamente",
     "byauthor": "Agrupar por autor",
     "bycategory": "Agrupar por categoria",
@@ -8,8 +8,8 @@
     "byrecentlyupdated": "Recentemente atualizados",
     "bysearch": "Pesquisar",
     "cannoteditentry": "Não é possível editar a entrada",
-    "casesensitive": "Usar regular expressions",
-    "categories": "Categorias de disciplinas",
+    "casesensitive": "Respeitar maiúsculas/minúsculas",
+    "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 1711d27b159..697bdf70ba4 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": "Adaugă o etichetă mesajului",
+    "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": "Foloseşte Regular Expressions",
-    "categories": "Categorii de cursuri",
+    "casesensitive": "Senzitivitate caractere",
+    "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 05189841b97..487d64188b1 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/sr-cr.json b/www/addons/mod/glossary/lang/sr-cr.json
index 3b6a512513a..d816bfc641b 100644
--- a/www/addons/mod/glossary/lang/sr-cr.json
+++ b/www/addons/mod/glossary/lang/sr-cr.json
@@ -1,5 +1,6 @@
 {
-    "browsemode": "Прегледај појмове",
+    "attachment": "Прилог",
+    "browsemode": "Режим прегледа",
     "byalphabet": "Азбучним редом",
     "byauthor": "Групиши по аутору",
     "bycategory": "Групиши по категорији",
@@ -7,6 +8,8 @@
     "byrecentlyupdated": "Недавно ажурирани",
     "bysearch": "Претражи",
     "cannoteditentry": "Не можете да уређујете појам",
+    "casesensitive": "Користи регуларне изразе",
+    "categories": "Категорије курсева",
     "entriestobesynced": "Појмови за синхронизацију",
     "entrypendingapproval": "Овај појам чека одобрење.",
     "errorloadingentries": "Дошло је до грешке приликом учитавања појмова.",
diff --git a/www/addons/mod/glossary/lang/sr-lt.json b/www/addons/mod/glossary/lang/sr-lt.json
index fe27335b225..4ee4c923d4a 100644
--- a/www/addons/mod/glossary/lang/sr-lt.json
+++ b/www/addons/mod/glossary/lang/sr-lt.json
@@ -1,5 +1,6 @@
 {
-    "browsemode": "Pregledaj pojmove",
+    "attachment": "Prilog",
+    "browsemode": "Režim pregleda",
     "byalphabet": "Abecednim redom",
     "byauthor": "Grupiši po autoru",
     "bycategory": "Grupiši po kategoriji",
@@ -7,6 +8,8 @@
     "byrecentlyupdated": "Nedavno ažurirani",
     "bysearch": "Pretraži",
     "cannoteditentry": "Ne možete da uređujete pojam",
+    "casesensitive": "Koristi regularne izraze",
+    "categories": "Kategorije kurseva",
     "entriestobesynced": "Pojmovi za sinhronizaciju",
     "entrypendingapproval": "Ovaj pojam čeka odobrenje.",
     "errorloadingentries": "Došlo je do greške prilikom učitavanja pojmova.",
diff --git a/www/addons/mod/glossary/lang/sv.json b/www/addons/mod/glossary/lang/sv.json
index f9dc8d60f6a..3cfa169d56c 100644
--- a/www/addons/mod/glossary/lang/sv.json
+++ b/www/addons/mod/glossary/lang/sv.json
@@ -1,13 +1,13 @@
 {
-    "attachment": "Bifoga märke med meddelande",
-    "browsemode": "Bläddrar bland poster",
+    "attachment": "Bilaga",
+    "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": "Använd standarduttryck",
-    "categories": "Kurskategorier",
+    "casesensitive": "Stor eller liten bokstav gör  skillnad",
+    "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 ed836454608..6acccdba883 100644
--- a/www/addons/mod/glossary/lang/tr.json
+++ b/www/addons/mod/glossary/lang/tr.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Rozete mesaj ekle",
+    "attachment": "Dosya",
     "browsemode": "Önizleme Modu",
-    "casesensitive": "Düzenli İfadeleri Kullan",
-    "categories": "Ders Kategorileri"
+    "casesensitive": "Harf duyarlılığı",
+    "categories": "Kategoriler"
 }
\ 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 f3e1eeb10fc..a2186b273c3 100644
--- a/www/addons/mod/glossary/lang/uk.json
+++ b/www/addons/mod/glossary/lang/uk.json
@@ -1,6 +1,6 @@
 {
-    "attachment": "Долучення",
-    "browsemode": "Перегляд записів",
+    "attachment": "Прикріпити відзнаку до повідомлення",
+    "browsemode": "Режим перегляду",
     "byalphabet": "По алфавіту",
     "byauthor": "Групувати за автором",
     "bycategory": "Групувати за категорією",
@@ -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 761fdac404e..3af5cbb310e 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 d89166a41e8..b7204b9d753 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": "瀏覽條目",
+    "attachment": "附件",
+    "browsemode": "預覽模式",
     "byalphabet": "按字母順序排列",
     "byauthor": "以作者為分群",
     "bynewestfirst": "最新的優先",
     "byrecentlyupdated": "最近的更新",
     "bysearch": "搜尋",
-    "casesensitive": "區分大小寫",
-    "categories": "課程類別",
+    "casesensitive": "區分字母的大小寫",
+    "categories": "類別",
     "entrypendingapproval": "這個項目已被暫緩核可",
     "errorloadingentries": "載入項目時發生錯誤",
     "errorloadingentry": "載入項目時發生錯誤",
diff --git a/www/addons/mod/label/lang/he.json b/www/addons/mod/label/lang/he.json
index 7f0814d0381..232aff3b2bf 100644
--- a/www/addons/mod/label/lang/he.json
+++ b/www/addons/mod/label/lang/he.json
@@ -1,3 +1,3 @@
 {
-    "label": "תווית"
+    "label": "תווית לשאלה מותנית (באנגלית)"
 }
\ 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..8aba433e8cd 100644
--- a/www/addons/mod/label/lang/lt.json
+++ b/www/addons/mod/label/lang/lt.json
@@ -1,3 +1,3 @@
 {
-    "label": "Etiketė"
+    "label": "Žyma"
 }
\ 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..d174e316226 100644
--- a/www/addons/mod/label/lang/ru.json
+++ b/www/addons/mod/label/lang/ru.json
@@ -1,3 +1,3 @@
 {
-    "label": "Пояснение"
+    "label": "Отмечено"
 }
\ 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 f1dd990cbfb..dc1348438f8 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/lesson/lang/ar.json b/www/addons/mod/lesson/lang/ar.json
index e314397c4ae..4f326bb530d 100644
--- a/www/addons/mod/lesson/lang/ar.json
+++ b/www/addons/mod/lesson/lang/ar.json
@@ -1,5 +1,6 @@
 {
     "answer": "أجب",
+    "attempt": "محاولة:  {{$a}}",
     "averagescore": "متوسط الدرجة",
     "averagetime": "متوسط الوقت",
     "branchtable": "محتوى",
@@ -36,7 +37,7 @@
     "review": "مراجعة",
     "reviewlesson": "مراجعة الدرس",
     "reviewquestionback": "نعم، أرغب في المحاولة ثانياً",
-    "submit": "سلم",
+    "submit": "سلم/قدم",
     "thatsthecorrectanswer": "هذه إجابة صحيحة",
     "thatsthewronganswer": "هذه إجابة خاطئة",
     "timeremaining": "الزمن المتبقى",
diff --git a/www/addons/mod/lesson/lang/bg.json b/www/addons/mod/lesson/lang/bg.json
index a1b9df04b2a..599f091c09d 100644
--- a/www/addons/mod/lesson/lang/bg.json
+++ b/www/addons/mod/lesson/lang/bg.json
@@ -1,5 +1,6 @@
 {
     "answer": "Отговор",
+    "attempt": "{{$a}} опит",
     "attemptsremaining": "Имате оставащ(и) {{$a}} опит(a)",
     "averagescore": "Среден резултат",
     "averagetime": "Средно време",
diff --git a/www/addons/mod/lesson/lang/ca.json b/www/addons/mod/lesson/lang/ca.json
index ad28463c750..8978fa00b80 100644
--- a/www/addons/mod/lesson/lang/ca.json
+++ b/www/addons/mod/lesson/lang/ca.json
@@ -1,5 +1,6 @@
 {
     "answer": "Resposta",
+    "attempt": "Intent: {{$a}}",
     "attemptheader": "Intent",
     "attemptsremaining": "Us resten {{$a}} intents",
     "averagescore": "Puntuació mitjana",
diff --git a/www/addons/mod/lesson/lang/cs.json b/www/addons/mod/lesson/lang/cs.json
index c6b5605a360..9918f0689c7 100644
--- a/www/addons/mod/lesson/lang/cs.json
+++ b/www/addons/mod/lesson/lang/cs.json
@@ -1,5 +1,6 @@
 {
     "answer": "Odpověď",
+    "attempt": "Pokus: {{$a}}",
     "attemptheader": "Pokus",
     "attemptsremaining": "Zbývající počet pokusů: {{$a}}",
     "averagescore": "Průměrná známka",
diff --git a/www/addons/mod/lesson/lang/da.json b/www/addons/mod/lesson/lang/da.json
index d00ff2ab04e..54d6c8482c3 100644
--- a/www/addons/mod/lesson/lang/da.json
+++ b/www/addons/mod/lesson/lang/da.json
@@ -1,5 +1,6 @@
 {
     "answer": "Svar",
+    "attempt": "Forsøg: {{$a}}",
     "attemptheader": "Forsøg",
     "attemptsremaining": "Du har {{$a}} forsøg endnu",
     "averagescore": "Gennemsnitlig score",
diff --git a/www/addons/mod/lesson/lang/de.json b/www/addons/mod/lesson/lang/de.json
index 60f5cf0ae98..f3f317f9c91 100644
--- a/www/addons/mod/lesson/lang/de.json
+++ b/www/addons/mod/lesson/lang/de.json
@@ -1,5 +1,6 @@
 {
     "answer": "Antwort",
+    "attempt": "Versuch: {{$a}}",
     "attemptheader": "Versuch",
     "attemptsremaining": "Verbleibende Versuche: {{$a}}",
     "averagescore": "Durchschnittliche Bewertung",
diff --git a/www/addons/mod/lesson/lang/el.json b/www/addons/mod/lesson/lang/el.json
index bbb63a55b7d..cff02dafbf6 100644
--- a/www/addons/mod/lesson/lang/el.json
+++ b/www/addons/mod/lesson/lang/el.json
@@ -1,5 +1,6 @@
 {
     "answer": "Απάντηση",
+    "attempt": "Προσπάθεια: {{$a}}",
     "attemptsremaining": "Σας απομένουν {{$a}} προσπάθειες",
     "averagescore": "Μέσος βαθμός",
     "averagetime": "Μέσος χρόνος",
diff --git a/www/addons/mod/lesson/lang/es-mx.json b/www/addons/mod/lesson/lang/es-mx.json
index ead72ecbab5..073ea430c66 100644
--- a/www/addons/mod/lesson/lang/es-mx.json
+++ b/www/addons/mod/lesson/lang/es-mx.json
@@ -1,5 +1,6 @@
 {
     "answer": "Respuesta",
+    "attempt": "Intento: {{$a}}",
     "attemptheader": "Intento",
     "attemptsremaining": "Tiene {{$a}} intento(s) restante(s)",
     "averagescore": "Puntuación promedio",
diff --git a/www/addons/mod/lesson/lang/es.json b/www/addons/mod/lesson/lang/es.json
index 2679c6f3f4c..9c084627631 100644
--- a/www/addons/mod/lesson/lang/es.json
+++ b/www/addons/mod/lesson/lang/es.json
@@ -1,5 +1,6 @@
 {
     "answer": "Respuesta",
+    "attempt": "Intento: {{$a}}",
     "attemptheader": "Intento",
     "attemptsremaining": "Tiene {{$a}} intento(s) pendiente(s)",
     "averagescore": "Puntuación promedio",
diff --git a/www/addons/mod/lesson/lang/eu.json b/www/addons/mod/lesson/lang/eu.json
index eb0cc12c6b0..fac71d304b6 100644
--- a/www/addons/mod/lesson/lang/eu.json
+++ b/www/addons/mod/lesson/lang/eu.json
@@ -1,5 +1,6 @@
 {
     "answer": "Erantzuna",
+    "attempt": "Saiakera: {{$a}}",
     "attemptheader": "Saiakera",
     "attemptsremaining": "{{$a}} saiakera pendiente daukazu",
     "averagescore": "Batez besteko puntuazioa",
@@ -24,7 +25,7 @@
     "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).",
+    "firstwrong": "Zure erantzuna ez da zuzena izan. Berriz saiatu nahi al duzu? (Oraingoan ondo erantzunez gero ez da zure azken emaitzan zenbatuko).",
     "gotoendoflesson": "Joan ikasgaiaren amaierara",
     "grade": "Kalifikazioa",
     "highscore": "Puntuazio altua",
diff --git a/www/addons/mod/lesson/lang/fa.json b/www/addons/mod/lesson/lang/fa.json
index 79774430714..36d3d14fd74 100644
--- a/www/addons/mod/lesson/lang/fa.json
+++ b/www/addons/mod/lesson/lang/fa.json
@@ -1,5 +1,6 @@
 {
     "answer": "جواب",
+    "attempt": "تلاش: {{$a}}",
     "attemptsremaining": "می‌توانید {{$a}} بار دیگر تلاش کنید",
     "averagescore": "نمرهٔ میانگین",
     "averagetime": "زمان میانگین",
diff --git a/www/addons/mod/lesson/lang/fr.json b/www/addons/mod/lesson/lang/fr.json
index 4c51fa118a7..495601716fa 100644
--- a/www/addons/mod/lesson/lang/fr.json
+++ b/www/addons/mod/lesson/lang/fr.json
@@ -1,5 +1,6 @@
 {
     "answer": "Réponse",
+    "attempt": "Tentative : {{$a}}",
     "attemptheader": "Tentative",
     "attemptsremaining": "Il vous reste {{$a}} tentative(s)",
     "averagescore": "Note moyenne",
@@ -66,7 +67,7 @@
     "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.",
+    "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 qu'étudiant 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",
diff --git a/www/addons/mod/lesson/lang/he.json b/www/addons/mod/lesson/lang/he.json
index cc0a9600655..637604577d7 100644
--- a/www/addons/mod/lesson/lang/he.json
+++ b/www/addons/mod/lesson/lang/he.json
@@ -1,5 +1,6 @@
 {
     "answer": "תשובה",
+    "attempt": "ניסיון: {{$a}}",
     "attemptheader": "ניסיון",
     "attemptsremaining": "נשארו לך עוד {{$a}} ניסיונות",
     "averagescore": "תוצאה ממוצעת",
diff --git a/www/addons/mod/lesson/lang/hu.json b/www/addons/mod/lesson/lang/hu.json
index d46a7ad2909..4c2bb5a14a2 100644
--- a/www/addons/mod/lesson/lang/hu.json
+++ b/www/addons/mod/lesson/lang/hu.json
@@ -1,5 +1,6 @@
 {
     "answer": "Válasz",
+    "attempt": "Próbálkozás: {{$a}}",
     "attemptheader": "Próbálkozás",
     "attemptsremaining": "{{$a}} próbálkozása maradt",
     "averagescore": "Átlagpontszám",
diff --git a/www/addons/mod/lesson/lang/it.json b/www/addons/mod/lesson/lang/it.json
index de8299fe5af..3cd913414eb 100644
--- a/www/addons/mod/lesson/lang/it.json
+++ b/www/addons/mod/lesson/lang/it.json
@@ -1,5 +1,6 @@
 {
     "answer": "Risposta",
+    "attempt": "Tentativo: {{$a}}",
     "attemptheader": "Tentativo",
     "attemptsremaining": "Ti rimangono {{$a}} tentativo/i",
     "averagescore": "Punteggio medio",
diff --git a/www/addons/mod/lesson/lang/ja.json b/www/addons/mod/lesson/lang/ja.json
index 14a3926d347..786b3484757 100644
--- a/www/addons/mod/lesson/lang/ja.json
+++ b/www/addons/mod/lesson/lang/ja.json
@@ -1,5 +1,6 @@
 {
-    "answer": "答え/選択肢",
+    "answer": "答え",
+    "attempt": "受験: {{$a}}",
     "attemptheader": "受験",
     "attemptsremaining": "あなたには {{$a}} 回の受験回数が残っています。",
     "averagescore": "平均評点",
@@ -30,7 +31,7 @@
     "highscore": "最高評点",
     "hightime": "最長時間",
     "leftduringtimed": "あなたは制限時間のあるレッスンを途中で終了しました。<br />レッスンを再スタートするには「続ける」をクリックしてください。",
-    "leftduringtimednoretake": "あなたは制限時間のあるレッスンを途中で終了しました。<br />レッスンを再受験または継続は許可されていません。",
+    "leftduringtimednoretake": "あなたは制限時間のあるレッスンを途中で終了しました。<br />レッスンの再受験または継続は許可されていません。",
     "lessonmenu": "レッスンメニュー",
     "lessonstats": "レッスン統計",
     "linkedmedia": "リンクメディア",
@@ -38,10 +39,10 @@
     "lowscore": "最低評点",
     "lowtime": "最短時間",
     "maximumnumberofattemptsreached": "最大受験回数に達しました - 次のページに移動しています。",
-    "modattemptsnoteacher": "学生レビューは学生のみに表示されます。",
+    "modattemptsnoteacher": "学生レビューは学生にのみ表示されます。",
     "noanswer": "1つまたはそれ以上の問題が解答されていません。戻って解答を送信してください。",
     "nolessonattempts": "このレッスンは受験されていません。",
-    "nolessonattemptsgroup": "このレッスンの {{$a}} グループメンバーによる受験はありません。",
+    "nolessonattemptsgroup": "このレッスンでは {{$a}} グループメンバーによる受験はありません。",
     "notcompleted": "未了",
     "numberofcorrectanswers": "正解数: {{$a}}",
     "numberofpagesviewed": "解答済み問題数: {{$a}}",
@@ -67,7 +68,7 @@
     "secondpluswrong": "もう一度受験しますか?",
     "submit": "送信",
     "teacherjumpwarning": "このレッスンでは {{$a.cluster}} ジャンプまたは {{$a.unseen}} ジャンプが使用されています。代わりに「次のページ」へのジャンプが使用されます。これらのジャンプを確認するには学生としてログインしてください。",
-    "teacherongoingwarning": "進行中の評点は学生にのみ表示されます。進行中のスコアをテストするには学生としてログインしてください。",
+    "teacherongoingwarning": "進行中の評点は学生にのみ表示されます。進行中の評点をテストするには学生としてログインしてください。",
     "teachertimerwarning": "タイマーは学生に対してのみ作動します。タイマーをテストするには学生としてログインしてください。",
     "thatsthecorrectanswer": "正解です。",
     "thatsthewronganswer": "不正解です。",
diff --git a/www/addons/mod/lesson/lang/lt.json b/www/addons/mod/lesson/lang/lt.json
index e088a565222..d342ddcca33 100644
--- a/www/addons/mod/lesson/lang/lt.json
+++ b/www/addons/mod/lesson/lang/lt.json
@@ -1,5 +1,6 @@
 {
     "answer": "Atsakyti",
+    "attempt": "Bandymas: {{$a}}",
     "attemptheader": "Bandymas",
     "attemptsremaining": "Turite likusių bandymų: {{$a}}",
     "averagescore": "Vidutinis balas",
diff --git a/www/addons/mod/lesson/lang/nl.json b/www/addons/mod/lesson/lang/nl.json
index e2620a8cabf..9d533a812b8 100644
--- a/www/addons/mod/lesson/lang/nl.json
+++ b/www/addons/mod/lesson/lang/nl.json
@@ -1,5 +1,6 @@
 {
     "answer": "Antwoord",
+    "attempt": "Poging: {{$a}}",
     "attemptheader": "Poging",
     "attemptsremaining": "Je kan nog {{$a}} poging(en) doen",
     "averagescore": "Gemiddelde score",
diff --git a/www/addons/mod/lesson/lang/pl.json b/www/addons/mod/lesson/lang/pl.json
index c36b7ae91cf..410586113e2 100644
--- a/www/addons/mod/lesson/lang/pl.json
+++ b/www/addons/mod/lesson/lang/pl.json
@@ -1,5 +1,6 @@
 {
     "answer": "Odpowiedź",
+    "attempt": "Podejście: {{$a}}",
     "attemptheader": "Próba",
     "attemptsremaining": "Pozostało Ci {{$a}} podejść",
     "averagescore": "Średnia liczba punktów",
diff --git a/www/addons/mod/lesson/lang/pt-br.json b/www/addons/mod/lesson/lang/pt-br.json
index a50382f3902..613d8d5c741 100644
--- a/www/addons/mod/lesson/lang/pt-br.json
+++ b/www/addons/mod/lesson/lang/pt-br.json
@@ -1,5 +1,6 @@
 {
     "answer": "Resposta",
+    "attempt": "Tentativa: {{$a}}",
     "attemptheader": "Tentativa",
     "attemptsremaining": "Você tem ainda {{$a}} tentativas",
     "averagescore": "Pontuação média",
diff --git a/www/addons/mod/lesson/lang/pt.json b/www/addons/mod/lesson/lang/pt.json
index e236e65f35a..eab86d3e961 100644
--- a/www/addons/mod/lesson/lang/pt.json
+++ b/www/addons/mod/lesson/lang/pt.json
@@ -1,5 +1,6 @@
 {
     "answer": "Resposta",
+    "attempt": "Tentativa: {{$a}}",
     "attemptheader": "Tentativa",
     "attemptsremaining": "Ainda pode realizar {{$a}} tentativa(s)",
     "averagescore": "Pontuação média",
@@ -16,7 +17,7 @@
     "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}}.",
+    "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:",
@@ -66,11 +67,11 @@
     "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.",
+    "teacherjumpwarning": "Nesta lição, há páginas que seguem para {{$a.cluster}} ou para {{$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.",
+    "thatsthewronganswer": "A sua resposta <strong>não</strong> está correta.",
     "timeremaining": "Tempo restante",
     "timetaken": "Tempo usado",
     "unseenpageinbranch": "Pergunta não vista da sequência",
diff --git a/www/addons/mod/lesson/lang/ro.json b/www/addons/mod/lesson/lang/ro.json
index e921358830b..b13962e5dd6 100644
--- a/www/addons/mod/lesson/lang/ro.json
+++ b/www/addons/mod/lesson/lang/ro.json
@@ -1,5 +1,6 @@
 {
     "answer": "Răspuns",
+    "attempt": "Încercarea cu numărul: {{$a}}",
     "attemptheader": "Încercare",
     "attemptsremaining": "Mai aveţi {{$a}} încercări disponibile",
     "averagescore": "Punctaj mediu obţinut",
diff --git a/www/addons/mod/lesson/lang/ru.json b/www/addons/mod/lesson/lang/ru.json
index cdfe818e247..f8db842221a 100644
--- a/www/addons/mod/lesson/lang/ru.json
+++ b/www/addons/mod/lesson/lang/ru.json
@@ -1,5 +1,6 @@
 {
     "answer": "Ответ",
+    "attempt": "Попытка: {{$a}}",
     "attemptheader": "Попытка",
     "attemptsremaining": "У вас осталось {{$a}} попыток",
     "averagescore": "Средний балл",
diff --git a/www/addons/mod/lesson/lang/sr-cr.json b/www/addons/mod/lesson/lang/sr-cr.json
index db28c42b19e..fe5901ac751 100644
--- a/www/addons/mod/lesson/lang/sr-cr.json
+++ b/www/addons/mod/lesson/lang/sr-cr.json
@@ -1,8 +1,84 @@
 {
+    "answer": "Одговор",
+    "attempt": "Покушај: {{$a}}",
+    "attemptheader": "Покушај",
+    "attemptsremaining": "Број покушаја који вам је преостао: {{$a}}",
+    "averagescore": "Просечан број бодова",
+    "averagetime": "Просечно време",
+    "branchtable": "Садржај са гранањем",
+    "cannotfindattempt": "Грешка: није пронађен покушај",
+    "cannotfinduser": "Грешка: нису пронађени слогови у табели lesson_timer",
+    "clusterjump": "Још неприказано питање из групе питања",
+    "completed": "Завршено",
+    "congratulations": "Честитамо - стигли сте до краја лекције",
+    "continue": "Настави",
+    "continuetonextpage": "Идите на следећу страницу",
+    "defaultessayresponse": "Предавач ће оценити ваш есеј.",
+    "detailedstats": "Детаљна статистика",
+    "didnotanswerquestion": "Нисте одговорили на ово питање.",
+    "displayofgrade": "Приказ оцена (само за полазнике)",
+    "displayscorewithessays": "<p>Освојили сте {{$a.score}} од максималних {{$a.tempmaxgrade}} бодова за питања која се аутоматски оцењују.</p>\n<p>Ваш {{$a.essayquestions}} одговор на питања  у форми есеја биће ускоро прегледан и оцењен, а оцена ће касније бити додата<br />у ваш финални резултат.</p>\n<p>Ваша тренутна оцена без есеја је {{$a.score}} од {{$a.grade}}</p>",
+    "displayscorewithoutessays": "Ваш резултат је {{$a.score}} (од могућих {{$a.grade}}).",
+    "emptypassword": "Поље за лозинку не може бити празно",
+    "enterpassword": "Молимо унесите лозинку:",
+    "eolstudentoutoftimenoanswers": "Нисте одговорили ни на једно питање. Ваша оцена за ову лекцију је 0.",
     "errorreviewretakenotlast": "Ова покушај не може више бити прегледан зато што је завршен други покушај.",
+    "finish": "Заврши",
     "finishretakeoffline": "Овај покушај је завршен у офлајн режиму.",
+    "firstwrong": "Погрешно сте одговорили на питање. Да ли желите да покушате поново? (ако сада тачно одговорите на питање, то се неће рачунати у ваш коначан резултат.)",
+    "gotoendoflesson": "Иди на крај лекције",
+    "grade": "Оцена",
+    "highscore": "Најбољи резултат",
+    "hightime": "Најдуже време",
+    "leftduringtimed": "Напустили сте лекцију која је временски ограничена.<br />Притисните тастер за наставак да бисте погледали лекцију од почетка.",
+    "leftduringtimednoretake": "Напустили сте лекцију која је временски ограничена и није Вам <br /> дозвољено да наставите или почнете лекцију из почетка.",
+    "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}}",
-    "warningretakefinished": "Покушај је завршен на сајту."
+    "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/sr-lt.json b/www/addons/mod/lesson/lang/sr-lt.json
index da28ea0cf44..03505574aa4 100644
--- a/www/addons/mod/lesson/lang/sr-lt.json
+++ b/www/addons/mod/lesson/lang/sr-lt.json
@@ -1,8 +1,84 @@
 {
+    "answer": "Odgovor",
+    "attempt": "Pokušaj: {{$a}}",
+    "attemptheader": "Pokušaj",
+    "attemptsremaining": "Broj pokušaja koji vam je preostao: {{$a}}",
+    "averagescore": "Prosečan broj bodova",
+    "averagetime": "Prosečno vreme",
+    "branchtable": "Sadržaj sa grananjem",
+    "cannotfindattempt": "Greška: nije pronađen pokušaj",
+    "cannotfinduser": "Greška: nisu pronađeni slogovi u tabeli lesson_timer",
+    "clusterjump": "Još neprikazano pitanje iz grupe pitanja",
+    "completed": "Završeno",
+    "congratulations": "Čestitamo - stigli ste do kraja lekcije",
+    "continue": "Nastavi",
+    "continuetonextpage": "Idite na sledeću stranicu",
+    "defaultessayresponse": "Predavač će oceniti vaš esej.",
+    "detailedstats": "Detaljna statistika",
+    "didnotanswerquestion": "Niste odgovorili na ovo pitanje.",
+    "displayofgrade": "Prikaz ocena (samo za polaznike)",
+    "displayscorewithessays": "<p>Osvojili ste {{$a.score}} od maksimalnih {{$a.tempmaxgrade}} bodova za pitanja koja se automatski ocenjuju.</p>\n<p>Vaš {{$a.essayquestions}} odgovor na pitanja  u formi eseja biće uskoro pregledan i ocenjen, a ocena će kasnije biti dodata<br />u vaš finalni rezultat.</p>\n<p>Vaša trenutna ocena bez eseja je {{$a.score}} od {{$a.grade}}</p>",
+    "displayscorewithoutessays": "Vaš rezultat je {{$a.score}} (od mogućih {{$a.grade}}).",
+    "emptypassword": "Polje za lozinku ne može biti prazno",
+    "enterpassword": "Molimo unesite lozinku:",
+    "eolstudentoutoftimenoanswers": "Niste odgovorili ni na jedno pitanje. Vaša ocena za ovu lekciju je 0.",
     "errorreviewretakenotlast": "Ova pokušaj ne može više biti pregledan zato što je završen drugi pokušaj.",
+    "finish": "Završi",
     "finishretakeoffline": "Ovaj pokušaj je završen u oflajn režimu.",
+    "firstwrong": "Pogrešno ste odgovorili na pitanje. Da li želite da pokušate ponovo? (ako sada tačno odgovorite na pitanje, to se neće računati u vaš konačan rezultat.)",
+    "gotoendoflesson": "Idi na kraj lekcije",
+    "grade": "Ocena",
+    "highscore": "Najbolji rezultat",
+    "hightime": "Najduže vreme",
+    "leftduringtimed": "Napustili ste lekciju koja je vremenski ograničena.<br />Pritisnite taster za nastavak da biste pogledali lekciju od početka.",
+    "leftduringtimednoretake": "Napustili ste lekciju koja je vremenski ograničena i nije Vam <br /> dozvoljeno da nastavite ili počnete lekciju iz početka.",
+    "lessonmenu": "Meni lekcije",
+    "lessonstats": "Statistika lekcije",
+    "linkedmedia": "Povezani mediji",
+    "loginfail": "Pogrešna prijava, molimo pokušajte ponovo...",
+    "lowscore": "Naslabiji rezultat",
+    "lowtime": "Najkraće vreme",
+    "maximumnumberofattemptsreached": "Dostignut je maksimalan broj pokušaja - prelazi se na sledeću stranicu",
+    "modattemptsnoteacher": "Polaznički pregled funkcioniše samo za polaznike",
+    "noanswer": "Na jedno ili više pitanja nije dat odgovor. Molimo vratite se nazad i dajte svoj odgovor.",
+    "nolessonattempts": "Niko još nije pokušao da prođe kroz ovu lekciju.",
+    "nolessonattemptsgroup": "Nije bilo pokušaja za ovu lekciju od strane članova grupe  {{$a}}.",
+    "notcompleted": "Nije završeno",
+    "numberofcorrectanswers": "Broj tačnih odgovora: {{$a}}",
+    "numberofpagesviewed": "Broj pregledanih stranica: {{$a}}",
+    "numberofpagesviewednotice": "Broj pitanja na koje je dat odgovor: {{$a.nquestions}} (Trebalo bi ih biti bar {{$a.minquestions}})",
+    "ongoingcustom": "Do sada ste osvojili {{$a.score}} od maksimalno {{$a.currenthigh}} bodova.",
+    "ongoingnormal": "Tačno ste odgovorili na {{$a.correct}} od {{$a.viewed}} pitanja koja ste videli.",
+    "or": "ILI",
+    "overview": "Pregled",
+    "preview": "Pregled",
+    "progressbarteacherwarning2": "Nećete videti traku napredovanja zato što možete da uređujete ovu lekciju",
+    "progresscompleted": "Završili ste {{$a}}% lekcije",
+    "question": "Pitanje",
+    "rawgrade": "Neobrađena ocena",
+    "reports": "Izveštaji",
+    "response": "Povratne informacije",
     "retakefinishedinsync": "Oflajn pokušaj je sinhronizovan. Da li želite da ga pregledate?",
     "retakelabelfull": "{{retake}}: {{grade}} {{timestart}} ({{duration}})",
     "retakelabelshort": "{{retake}}: {{grade}} {{timestart}}",
-    "warningretakefinished": "Pokušaj je završen na sajtu."
+    "review": "Pregled",
+    "reviewlesson": "Pregled lekcije",
+    "reviewquestionback": "Da, voleo/la bih da ponovo pokušam",
+    "reviewquestioncontinue": "Ne, želim da pređem na sledeće pitanje",
+    "secondpluswrong": "Nije baš. Da li želite da pokušate ponovo?",
+    "submit": "Pošalji",
+    "teacherjumpwarning": "U ovoj lekciji se koriste {{$a.cluster}} ili {{$a.unseen}} prelaz između stranica. Prelaz \"Sledeća stranica\" će se koristiti umesto njih tokom ovog prikaza. Za testiranje ovih prelaza prijavite se na sistem u ulozi polaznika.",
+    "teacherongoingwarning": "Trenutni rezultat tokom pregleda lekcije se prikazuje samo polaznicima. Prijavite se na sistem u ulozi polaznika da biste testirali ovu mogućnost.",
+    "teachertimerwarning": "Merač vremena mogu da vide samo polaznici. Kako biste testirali merač vremena prijavite se na sistem u ulozi polaznika.",
+    "thatsthecorrectanswer": "Tačan odgovor",
+    "thatsthewronganswer": "Pogrešan odgovor",
+    "timeremaining": "Preostalo vreme",
+    "timetaken": "Potrošeno vreme",
+    "unseenpageinbranch": "Još neprikazano pitanje unutar strane sa sadržajem i grananjem",
+    "warningretakefinished": "Pokušaj je završen na sajtu.",
+    "welldone": "Bravo!",
+    "youhaveseen": "Već ste videli više od jedne stranice ove lekcije.<br /> Želite li početi od poslednje stranice koju ste videli?",
+    "youranswer": "Vaš odgovor",
+    "yourcurrentgradeisoutof": "Vaša trenutna ocena je {{$a.grade}} od mogućih {{$a.total}}",
+    "youshouldview": "Trebalo bi da odgovorite na barem: {{$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
index fe0a53b2702..747a688c78b 100644
--- a/www/addons/mod/lesson/lang/sv.json
+++ b/www/addons/mod/lesson/lang/sv.json
@@ -1,5 +1,6 @@
 {
     "answer": "Svar",
+    "attempt": "Försök: {{$a}}",
     "attemptsremaining": "Du har {{$a}} återstående försök",
     "averagescore": "Genomsnittsligt resultat",
     "averagetime": "Genomsnittslig tid",
diff --git a/www/addons/mod/lesson/lang/tr.json b/www/addons/mod/lesson/lang/tr.json
index 99d0bd338e2..7f50d81d9ea 100644
--- a/www/addons/mod/lesson/lang/tr.json
+++ b/www/addons/mod/lesson/lang/tr.json
@@ -1,5 +1,6 @@
 {
     "answer": "Cevap",
+    "attempt": "Uygulama: {{$a}}",
     "attemptheader": "Deneme(Teşebbüs)",
     "attemptsremaining": "{{$a}} uygulama hakkınız kaldı",
     "averagescore": "Ortalama not",
diff --git a/www/addons/mod/lesson/lang/uk.json b/www/addons/mod/lesson/lang/uk.json
index 43f68800251..64f4e4e242a 100644
--- a/www/addons/mod/lesson/lang/uk.json
+++ b/www/addons/mod/lesson/lang/uk.json
@@ -1,5 +1,6 @@
 {
     "answer": "Відповідь",
+    "attempt": "Спроба: {{$a}}",
     "attemptheader": "Спроба",
     "attemptsremaining": "У Вас залишилося {{$a}} спроб(и)",
     "averagescore": "Середній бал",
diff --git a/www/addons/mod/lesson/lang/zh-cn.json b/www/addons/mod/lesson/lang/zh-cn.json
index 3c06c89a713..1cb9bce4497 100644
--- a/www/addons/mod/lesson/lang/zh-cn.json
+++ b/www/addons/mod/lesson/lang/zh-cn.json
@@ -1,5 +1,6 @@
 {
     "answer": "答案",
+    "attempt": "尝试：{{$a}}",
     "attemptsremaining": "您还有{{$a}}次机会",
     "averagescore": "平均分",
     "averagetime": "平均耗时",
diff --git a/www/addons/mod/lesson/lang/zh-tw.json b/www/addons/mod/lesson/lang/zh-tw.json
index 42b9529905a..bcbb5ed10a1 100644
--- a/www/addons/mod/lesson/lang/zh-tw.json
+++ b/www/addons/mod/lesson/lang/zh-tw.json
@@ -1,5 +1,6 @@
 {
     "answer": "答案",
+    "attempt": "作答：{{$a}}",
     "attemptheader": "作答",
     "attemptsremaining": "您還有{{$a}}次作答機會",
     "averagescore": "平均分數",
@@ -35,7 +36,7 @@
     "loginfail": "登入錯誤，請重試",
     "lowscore": "最低分數",
     "lowtime": "最短時間",
-    "maximumnumberofattemptsreached": "達到嘗試次數上限 - 請進入下一頁",
+    "maximumnumberofattemptsreached": "已達到作答次的上限 - 將進入下一頁",
     "modattemptsnoteacher": "學生回顧功能只開放給學生們。",
     "noanswer": "有一個或以上的問題沒有回答。請回頭並提交一個答案。",
     "nolessonattempts": "這個課程還沒有人嘗試。",
@@ -47,7 +48,7 @@
     "ongoingcustom": "目前的{{$a.currenthigh}}分中，您已獲得{{$a.score}}分。",
     "ongoingnormal": "到目前為止的{{$a.viewed}}問題中，您答對了{{$a.correct}}題。",
     "or": "或",
-    "overview": "概要",
+    "overview": "綜覽",
     "preview": "預覽",
     "progressbarteacherwarning2": "你不能看到這進度列，因為你可以編輯這一編序學習。",
     "progresscompleted": "在這一編序學習，你已經完成{{$a}}%",
diff --git a/www/addons/mod/quiz/lang/ja.json b/www/addons/mod/quiz/lang/ja.json
index 2fb91503783..62382e648d4 100644
--- a/www/addons/mod/quiz/lang/ja.json
+++ b/www/addons/mod/quiz/lang/ja.json
@@ -7,14 +7,14 @@
     "cannotsubmitquizdueto": "このクイズの回答は、以下の理由で提出できませんでした：",
     "comment": "コメント",
     "completedon": "完了日時",
-    "confirmclose": "送信した場合、この受験に関して、これ以上あなたの答えを変更することはできません。",
+    "confirmclose": "送信した場合、あなたはこれ以上受験の答えを変更できないようになります。",
     "confirmcontinueoffline": "この回答は、理由「 {{$a}} 」により、同期できませんでした。もしあなたが別のデバイスで回答を続けていた場合、データが失われている可能性があります。",
     "confirmleavequizonerror": "回答の保存中にエラーが発生しました。クイズを終了してもよいですか？",
     "confirmstart": "この小テストには {{$a}} の時間制限があります。あなたが受験を開始した時点から時間が計測されます。あなたは有効期限前に送信する必要があります。今から開始してもよろしいですか?",
     "confirmstartheader": "時間制限小テスト",
-    "connectionerror": "ネットワークコネクションが切断されました (オートセーブ失敗)。\n\nこのページで入力した最後の数分間の解答をメモした後、再接続を試みてください。\n\n接続が再確立された場合、あなたの解答は保存され、このメッセージは表示されなくなります。",
+    "connectionerror": "ネットワークコネクションが切断されました (オートセーブ失敗)。\n\nこのページで入力した最後の数分間の解答をメモした後、再接続を試みてください。\n\n再度接続が確立された場合、あなたの解答は保存されこのメッセージは表示されなくなります。",
     "continueattemptquiz": "前回の受験を続ける",
-    "continuepreview": "前回受験のプレビューを続ける",
+    "continuepreview": "前回のプレビューを続ける",
     "errorbehaviournotsupported": "このクイズは、アプリでサポートされていない動作が含まれているため回答することができません。",
     "errordownloading": "必要なデータのダウンロード中にエラーが発生しました。",
     "errorgetattempt": "回答データの取得中にエラーが発生しました。",
@@ -46,7 +46,7 @@
     "outofshort": "{{$a.grade}} / {{$a.maxgrade}}",
     "overallfeedback": "全体のフィードバック",
     "overdue": "期限切れ",
-    "overduemustbesubmittedby": "この受験は制限時間を過ぎています。そして、すでに送信されている必要があります。あなたがこの小テストの評定を希望する場合、{{$a}} までに送信してください。それまでに送信しない場合、この受験の評点はカウントされません。",
+    "overduemustbesubmittedby": "この受験は制限時間を過ぎています。この受験はすでに送信されている必要があります。あなたがこの小テストの評定を希望する場合、{{$a}} までに送信してください。それまでに送信しない場合、この受験の評点はカウントされません。",
     "preview": "プレビュー",
     "previewquiznow": "小テストをプレビューする",
     "question": "問題",
diff --git a/www/addons/mod/quiz/lang/lt.json b/www/addons/mod/quiz/lang/lt.json
index 3d18000f600..0e24a274c6e 100644
--- a/www/addons/mod/quiz/lang/lt.json
+++ b/www/addons/mod/quiz/lang/lt.json
@@ -46,6 +46,7 @@
     "outofshort": "{{$a.grade}}/{{$a.maxgrade}}",
     "overallfeedback": "Bendras atsiliepimas",
     "overdue": "Uždelstas",
+    "overduemustbesubmittedby": "Šis bandymas jau pavėluotas. Jis jau turėjo būti pateiktas. Jei norite, kad šis testas būtų įvertintas, turite jį patvirtinti {{$a}}. Jei nepateiksite, tada balas šiam bandymui nebus skaičiuojamas.",
     "preview": "Peržiūra",
     "previewquiznow": "Peržiūrėti testą dabar",
     "question": "Klausimas",
diff --git a/www/addons/mod/quiz/lang/sr-cr.json b/www/addons/mod/quiz/lang/sr-cr.json
index f41594f4ad8..41be728b1ad 100644
--- a/www/addons/mod/quiz/lang/sr-cr.json
+++ b/www/addons/mod/quiz/lang/sr-cr.json
@@ -1,7 +1,20 @@
 {
+    "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": "Грешка приликом преузимања података о покушају решавања теста.",
@@ -13,10 +26,55 @@
     "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}}",
+    "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": "Офлајн покушај је одбачен зато што је или завршен на сајту или није пронађен.",
     "warningdatadiscarded": "Неки офлајн одговори су одбачени зато што су питања измењена онлајн.",
-    "warningdatadiscardedfromfinished": "Покушај решавања теста је није завршен зато што су неки офлајн одговори одбачени. Прегледајте своје одговоре, а затим поново пошаљите свој покушај."
+    "warningdatadiscardedfromfinished": "Покушај решавања теста је није завршен зато што су неки офлајн одговори одбачени. Прегледајте своје одговоре, а затим поново пошаљите свој покушај.",
+    "yourfinalgradeis": "Ваша коначна оцена на овом тесту је {{$a}}."
 }
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/sr-lt.json b/www/addons/mod/quiz/lang/sr-lt.json
index a8ac15c303b..0bff65e68b6 100644
--- a/www/addons/mod/quiz/lang/sr-lt.json
+++ b/www/addons/mod/quiz/lang/sr-lt.json
@@ -1,7 +1,20 @@
 {
+    "attemptfirst": "Prvi pokušaj",
+    "attemptlast": "Poslednji pokušaj",
+    "attemptnumber": "Pokušaj",
+    "attemptquiznow": "Započni test",
+    "attemptstate": "Stanje",
     "cannotsubmitquizdueto": "Ovaj pokušaj rešavanja testa ne može da bude predat zbog sledećih razloga:",
+    "comment": "Komentar",
+    "completedon": "Završeno dana",
+    "confirmclose": "Kada predate test nećete više biti u mogućnosti da menjate svoje odgovore.",
     "confirmcontinueoffline": "Ovaj pokušaj nije sinhronizovan od {{$a}}. Ako ste u međuvremenu ovaj pokušaj nastavili  na nekom drugom uređaju, postoji mogućnost da ste izgubili podatke.",
     "confirmleavequizonerror": "Došlo je do greške prilikom pokušaja da se sačuvaju odgovori. Da li ste sigurni da želite da napustite test?",
+    "confirmstart": "Test ima vremensko ograničenje ({{$a}}). Vreme će se odbrojavati od momenta početka pokušaja i morate predati svoje odgovore pre nego što istekne. Da li ste sigurni da sada želite da započnete rešavanje testa?",
+    "confirmstartheader": "Vremenski ograničen test",
+    "connectionerror": "Mrežna veza je izgubljena. (Automatsko čuvanje nije uspelo).\n\nZapišite sve odgovora unetih na ovoj stranici u poslednjih nekoliko minuta, a zatim pokušajte ponovo da se povežete.\n\nKada se veza ponovo uspostavi vaši odgovori bi trebalo da budu sačuvani a ova poruka će nestati.",
+    "continueattemptquiz": "Nastavite poslednji pokušaj",
+    "continuepreview": "Nastavi poslednji pregled",
     "errorbehaviournotsupported": "Ovaj test ne možete rešavati u aplikaciji zato što ona ne podržava ponašanje pitanja:",
     "errordownloading": "Greška prilikom preuzimanja neophodnih podataka.",
     "errorgetattempt": "Greška prilikom preuzimanja podataka o pokušaju rešavanja testa.",
@@ -13,10 +26,55 @@
     "errorsaveattempt": "Došlo je do greške prilikom snimanja podataka o pokušaju rešavanja testa.",
     "errorsyncquiz": "Došlo je do greške prilikom sinhronizacije. Molimo, pokušajte ponovo.",
     "errorsyncquizblocked": "Ovaj test sada ne može biti sinhronizovan zbog drugog procesa koji je trenutno u toku. Molimo, pokušajte ponovo kasnije. Ako i dalje budete imali problema, pokušajte da  pokrenete aplikaciju ispočetka.",
+    "feedback": "Povratne informacije",
+    "finishattemptdots": "Završi pokušaj...",
     "finishnotsynced": "Test je završen, ali nije sinhronizovan",
+    "grade": "Ocena",
+    "gradeaverage": "Prosečna ocena",
+    "gradehighest": "Najviša ocena",
+    "grademethod": "Metod ocenjivanja",
+    "gradesofar": "{{$a.method}}: {{$a.mygrade}} / {{$a.quizgrade}}.",
     "hasdatatosync": "Ovaj test ima oflajn podatke koje treba sinhronizovati.",
+    "marks": "Ocene",
+    "mustbesubmittedby": "Ovaj pokušaj mora biti predat do {{$a}}.",
+    "noquestions": "Nijedno pitanje još nije dodato",
+    "noreviewattempt": "Nije Vam dozvoljeno da pregledate ovaj pokušaj",
+    "notyetgraded": "Još nije ocenjeno",
     "opentoc": "Otvori navigacioni meni.",
+    "outof": "{{$a.grade}} od {{$a.maxgrade}}",
+    "outofpercent": "{{$a.grade}} od {{$a.maxgrade}}",
+    "outofshort": "{{$a.grade}}/{{$a.maxgrade}}",
+    "overallfeedback": "Sveobuhvatne povratne informacije",
+    "overdue": "Zakasneli",
+    "overduemustbesubmittedby": "Vreme za ovaj pokušaj rešavanje testa je isteklo. Pokušaj je već trebalo predati. Ako želite da ovaj test bude ocenjen morate ga predati do {{$a}}. Ako to ne uradite do navedenog roka, ocene za ovaj pokušaj se neće računati.",
+    "preview": "Pregled",
+    "previewquiznow": "Pregledaj test sada",
+    "question": "Pitanje",
+    "quizpassword": "Lozinka testa",
+    "reattemptquiz": "Ponovni pokušaj rešavanja testa",
+    "requirepasswordmessage": "Da biste pristupili rešavanju ovog testa morate znati lozinku testa",
+    "returnattempt": "Povratak na pokušaj",
+    "review": "Pregled",
+    "reviewofattempt": "Pregled pokušaja {{$a}}",
+    "reviewofpreview": "Pregled prikaza",
+    "showall": "Prikaži sva pitanja na jednoj stranici",
+    "showeachpage": "Prikaži jednu po jednu stranicu",
+    "startattempt": "Započni pokušaj rešavanja",
+    "startedon": "Započeto",
+    "stateabandoned": "Nikad predato",
+    "statefinished": "Završeno",
+    "statefinisheddetails": "Predato {{$a}}",
+    "stateinprogress": "U toku",
+    "stateoverdue": "Zakasnela predaja",
+    "stateoverduedetails": "Mora se predati do {{$a}}",
+    "status": "Status",
+    "submitallandfinish": "Predaj sve odgovore i završi test",
+    "summaryofattempt": "Rezime pokušaja",
+    "summaryofattempts": "Rezime vaših prethodnih pokušaja",
+    "timeleft": "Preostalo vreme",
+    "timetaken": "Utrošeno vreme",
     "warningattemptfinished": "Oflajn pokušaj je odbačen zato što je ili završen na sajtu ili nije pronađen.",
     "warningdatadiscarded": "Neki oflajn odgovori su odbačeni zato što su pitanja izmenjena onlajn.",
-    "warningdatadiscardedfromfinished": "Pokušaj rešavanja testa je nije završen zato što su neki oflajn odgovori odbačeni. Pregledajte svoje odgovore, a zatim ponovo pošaljite svoj pokušaj."
+    "warningdatadiscardedfromfinished": "Pokušaj rešavanja testa je nije završen zato što su neki oflajn odgovori odbačeni. Pregledajte svoje odgovore, a zatim ponovo pošaljite svoj pokušaj.",
+    "yourfinalgradeis": "Vaša konačna ocena na ovom testu je {{$a}}."
 }
\ No newline at end of file
diff --git a/www/addons/mod/quiz/lang/sv.json b/www/addons/mod/quiz/lang/sv.json
index cb771aab8be..f330a8a5999 100644
--- a/www/addons/mod/quiz/lang/sv.json
+++ b/www/addons/mod/quiz/lang/sv.json
@@ -6,7 +6,7 @@
     "attemptstate": "Tillstånd",
     "comment": "Kommentar",
     "completedon": "Fullgjord den",
-    "confirmclose": "Du håller på att avsluta det här försöket. När Du väl har avslutat försöket kommer Du inte längre att kunna ändra Dina svar.",
+    "confirmclose": "dDu håller på att avsluta det här försöket. När du väl har avslutat försöket kommer du inte längre att kunna ändra dina svar.",
     "connectionerror": "Nätverksanslutning förlorade (autospara misslyckades).\n\nAnteckna alla svar som angavs på webbplatsen de sista minuterna på papper, försöka sedan att återansluta.\n\nNär anslutningen har återupprättats, bör dina svar sparas och detta meddelande kommer att försvinna.",
     "continueattemptquiz": "Fortsätt med det senaste försöket",
     "continuepreview": "Fortsätt med den senaste förhandsgranskningen",
diff --git a/www/addons/mod/scorm/lang/eu.json b/www/addons/mod/scorm/lang/eu.json
index d6315ef6681..cb26ace868a 100644
--- a/www/addons/mod/scorm/lang/eu.json
+++ b/www/addons/mod/scorm/lang/eu.json
@@ -20,7 +20,7 @@
     "errorpackagefile": "Barkatu, aplikazioak ZIP paketeak besterik ez du onartzen.",
     "errorsyncscorm": "Errorea gertatu da sinkronizatzean. Mesedez, saiatu berriz.",
     "exceededmaxattempts": "Gehienezko saiakera-kopurua egin duzu.",
-    "failed": "Errorea",
+    "failed": "Gainditu gabea",
     "firstattempt": "Lehenengo saiakera",
     "gradeaverage": "Batez besteko kalifikazioa",
     "gradeforattempt": "Saikerarako kalifikazioa",
diff --git a/www/addons/mod/scorm/lang/sr-cr.json b/www/addons/mod/scorm/lang/sr-cr.json
index 481c70dc534..e35b5f6a6b6 100644
--- a/www/addons/mod/scorm/lang/sr-cr.json
+++ b/www/addons/mod/scorm/lang/sr-cr.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,33 @@
     "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/sr-lt.json b/www/addons/mod/scorm/lang/sr-lt.json
index 1e0cbfee595..7f75f400c9b 100644
--- a/www/addons/mod/scorm/lang/sr-lt.json
+++ b/www/addons/mod/scorm/lang/sr-lt.json
@@ -1,6 +1,16 @@
 {
+    "asset": "Element",
+    "assetlaunched": "Element - Pregledano",
+    "attempts": "Pokušaji",
+    "averageattempt": "Prosečni broj pokušaja",
+    "browse": "Pregled",
+    "browsed": "Pretraženo",
+    "browsemode": "Režim pregleda",
     "cannotcalculategrade": "Ocena ne može da se izračuna.",
+    "completed": "Završeno",
+    "contents": "Sadržaj",
     "dataattemptshown": "Ovi podaci pripadaju pokušaju broj {{number}}.",
+    "enter": "Uđi",
     "errorcreateofflineattempt": "Došlo je do greške prilikom pokušaja kreiranja novog oflajn pokušaja. Molimo, pokušajte ponovo.",
     "errordownloadscorm": "Greška prilikom preuzimanja SCORM paketa: \"{{name}}\".",
     "errorgetscorm": "Greška prilikom preuzimanja podataka SCORM paketa.",
@@ -9,10 +19,33 @@
     "errornovalidsco": "Ovaj SCORM paket nema vidljiv SCO koji bi bio učitan.",
     "errorpackagefile": "Izvinite, aplikacija podržava samo ZIP arhive.",
     "errorsyncscorm": "Došlo je do greške prilikom sinhronizacije. Molimo, pokušajte ponovo.",
+    "exceededmaxattempts": "Dostigli ste maksimalan broj pokušaja",
+    "failed": "Nije uspelo",
+    "firstattempt": "Prvi pokušaj",
+    "gradeaverage": "Prosečna ocena",
+    "gradeforattempt": "Ocena za pokušaj",
+    "gradehighest": "Najviša ocena",
+    "grademethod": "Metod ocenjivanja",
+    "gradereported": "Izveštaj o ocenama",
+    "gradescoes": "Objekti za učenje",
+    "gradesum": "Konačna ocena",
+    "highestattempt": "Najbolji pokušaj",
+    "incomplete": "Nepotpuno",
+    "lastattempt": "Poslednji završeni pokušaj",
+    "mode": "Režim rada",
+    "newattempt": "Počni novi pokušaj",
+    "noattemptsallowed": "Broj dozvoljenih pokušaja",
+    "noattemptsmade": "Broj pokušaja koji ste imali",
+    "normal": "Normalno",
+    "notattempted": "Nije pokušavano",
     "offlineattemptnote": "Ovaj pokušaj ima podatke koji nisu sinhronizovan.",
     "offlineattemptovermax": "Ovaj pokušaj ne može biti poslat zato što ste premašili maksimalan broj dozvoljenih pokušaja.",
+    "organizations": "Organizacije",
+    "passed": "Položeno",
+    "reviewmode": "Režim prikaza",
     "scormstatusnotdownloaded": "Ovaj SCORM paket nije preuzet. Biće automatski preuzet kada ga otvorite.",
     "scormstatusoutdated": "Ovaj SCORM paket je menjan od poslednjeg preuzimanja. Biće automatski preuzet kada ga otvorite.",
+    "suspended": "Suspendovano",
     "warningofflinedatadeleted": "Neki oflajn podaci o pokušaju  {{number}} su obrisani zato što ih nije moguće kreirati u novom pokušaju.",
     "warningsynconlineincomplete": "Neki pokušaji nisu mogli biti sinhronizovani sa sajtom zato što poslednji online pokušaj nije završen. Molimo vas da prvo završite onlajn pokušaj."
 }
\ 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..c46213ad3fa 100644
--- a/www/addons/mod/scorm/lang/zh-tw.json
+++ b/www/addons/mod/scorm/lang/zh-tw.json
@@ -21,23 +21,23 @@
     "errorsyncscorm": "同步時發生錯誤. 請再試一次.",
     "exceededmaxattempts": "你已經達到最大的作答次數",
     "failed": "失敗",
-    "firstattempt": "第一次使用",
+    "firstattempt": "第一次作答",
     "gradeaverage": "平均成績",
     "gradeforattempt": "作答次的分數",
     "gradehighest": "最高成績",
-    "grademethod": "評分方式",
+    "grademethod": "成績採計方式",
     "gradereported": "成績報告",
     "gradescoes": "學習目標",
     "gradesum": "加總",
-    "highestattempt": "最高使用次數",
+    "highestattempt": "最高作答次數",
     "incomplete": "不完整",
     "lastattempt": "最後完成的作答次",
     "mode": "模式",
-    "newattempt": "開始新的使用",
+    "newattempt": "開始一個新的作答次",
     "noattemptsallowed": "允許作答的次數",
     "noattemptsmade": "你已經作答的次數",
     "normal": "一般",
-    "notattempted": "未嘗試",
+    "notattempted": "尚未作答",
     "offlineattemptnote": "此嘗試包含尚未同步的資料.",
     "offlineattemptovermax": "無法發送此嘗試, 因為您超過了最大嘗試次數.",
     "organizations": "組織",
@@ -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/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 35fbcedcc0d..6e207332222 100644
--- a/www/addons/mod/survey/lang/ja.json
+++ b/www/addons/mod/survey/lang/ja.json
@@ -4,6 +4,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/survey/lang/sr-cr.json b/www/addons/mod/survey/lang/sr-cr.json
index 81ed8c380d2..b09d2613a67 100644
--- a/www/addons/mod/survey/lang/sr-cr.json
+++ b/www/addons/mod/survey/lang/sr-cr.json
@@ -1,5 +1,9 @@
 {
     "cannotsubmitsurvey": "Нажалост, било је проблема са предајом вашег упитника. Молим вас, покушајте поново.",
     "errorgetsurvey": "Грешка приликом преузимања података за 'Упитник' (Survey)",
-    "results": "Резултати"
+    "ifoundthat": "Открио/ла сам да",
+    "ipreferthat": "Преферирам",
+    "responses": "Одговори",
+    "results": "Резултати",
+    "surveycompletednograph": "Испунили сте анкету."
 }
\ No newline at end of file
diff --git a/www/addons/mod/survey/lang/sr-lt.json b/www/addons/mod/survey/lang/sr-lt.json
index 22342db7d8a..7e1fed7f8d7 100644
--- a/www/addons/mod/survey/lang/sr-lt.json
+++ b/www/addons/mod/survey/lang/sr-lt.json
@@ -1,5 +1,9 @@
 {
     "cannotsubmitsurvey": "Nažalost, bilo je problema sa predajom vašeg upitnika. Molim vas, pokušajte ponovo.",
     "errorgetsurvey": "Greška prilikom preuzimanja podataka za 'Upitnik' (Survey)",
-    "results": "Rezultati"
+    "ifoundthat": "Otkrio/la sam da",
+    "ipreferthat": "Preferiram",
+    "responses": "Odgovori",
+    "results": "Rezultati",
+    "surveycompletednograph": "Ispunili ste anketu."
 }
\ 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 f42edcb4d3f..471798df02c 100644
--- a/www/addons/mod/survey/lang/tr.json
+++ b/www/addons/mod/survey/lang/tr.json
@@ -2,6 +2,6 @@
     "ifoundthat": "Gerçekte olan",
     "ipreferthat": "İstediğim",
     "responses": "Yanıtlar",
-    "results": "Sonuç",
+    "results": "Sonuçlar",
     "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 912d8caa96b..7ef142e9e7a 100644
--- a/www/addons/mod/survey/lang/zh-cn.json
+++ b/www/addons/mod/survey/lang/zh-cn.json
@@ -2,5 +2,5 @@
     "ifoundthat": "我发现",
     "ipreferthat": "我希望的是",
     "responses": "回复",
-    "results": "投票结果"
+    "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..924e0d4c800 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/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 602d4646668..6d79d901d29 100644
--- a/www/addons/mod/wiki/lang/ja.json
+++ b/www/addons/mod/wiki/lang/ja.json
@@ -10,7 +10,7 @@
     "newpagetitle": "新しいページタイトル",
     "nocontent": "このページにはコンテンツがありません。",
     "notingroup": "グループ外",
-    "page": "ページ",
+    "page": "ページ: {{$a}}",
     "pageexists": "このページはすでに存在します。",
     "pagename": "ページ名",
     "subwiki": "サブwiki",
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/sr-cr.json b/www/addons/mod/wiki/lang/sr-cr.json
index 8a152b69a6d..8213c338216 100644
--- a/www/addons/mod/wiki/lang/sr-cr.json
+++ b/www/addons/mod/wiki/lang/sr-cr.json
@@ -1,10 +1,21 @@
 {
+    "cannoteditpage": "Не можете да уређујете ову страницу.",
+    "createpage": "Креирај страницу",
+    "editingpage": "Уређивање ове странице '{{$a}}'",
     "errorloadingpage": "Дошло је до грешке приликом учитавања странице.",
     "errornowikiavailable": "Овај вики још увек нема садржај.",
     "gowikihome": "Иди на почетну страницу викија",
-    "page": "Страница",
+    "map": "Мапа",
+    "newpagehdr": "Нова страница",
+    "newpagetitle": "Наслов нове странице",
+    "nocontent": "На овој страници нема садржаја",
+    "notingroup": "Није у групи",
+    "page": "Страница: {{$a}}",
+    "pageexists": "Ова страница већ постоји.",
+    "pagename": "Назив странице",
     "subwiki": "Подвики",
     "titleshouldnotbeempty": "Наслов не би требало да буде празан",
     "viewpage": "Погледај страницу",
-    "wikipage": "Вики страница"
+    "wikipage": "Вики страница",
+    "wrongversionlock": "Други корисник је уређивао ову страницу у исто време када и ви. Ваш садржај је застарео."
 }
\ No newline at end of file
diff --git a/www/addons/mod/wiki/lang/sr-lt.json b/www/addons/mod/wiki/lang/sr-lt.json
index e8ced77df30..9b1e7853897 100644
--- a/www/addons/mod/wiki/lang/sr-lt.json
+++ b/www/addons/mod/wiki/lang/sr-lt.json
@@ -1,10 +1,21 @@
 {
+    "cannoteditpage": "Ne možete da uređujete ovu stranicu.",
+    "createpage": "Kreiraj stranicu",
+    "editingpage": "Uređivanje ove stranice '{{$a}}'",
     "errorloadingpage": "Došlo je do greške prilikom učitavanja stranice.",
     "errornowikiavailable": "Ovaj viki još uvek nema sadržaj.",
     "gowikihome": "Idi na početnu stranicu vikija",
-    "page": "Stranica",
+    "map": "Mapa",
+    "newpagehdr": "Nova stranica",
+    "newpagetitle": "Naslov nove stranice",
+    "nocontent": "Na ovoj stranici nema sadržaja",
+    "notingroup": "Nije u grupi",
+    "page": "Stranica: {{$a}}",
+    "pageexists": "Ova stranica već postoji.",
+    "pagename": "Naziv stranice",
     "subwiki": "Podviki",
     "titleshouldnotbeempty": "Naslov ne bi trebalo da bude prazan",
     "viewpage": "Pogledaj stranicu",
-    "wikipage": "Viki stranica"
+    "wikipage": "Viki stranica",
+    "wrongversionlock": "Drugi korisnik je uređivao ovu stranicu u isto vreme kada i vi. Vaš sadržaj je zastareo."
 }
\ No newline at end of file
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/uk.json b/www/addons/mod/wiki/lang/uk.json
index cd89e56c9cc..7e2a88dd8db 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": "Сторінка",
+    "page": "Сторінка: {{$a}}",
     "pageexists": "Ця сторінка вже існує. Перенаправити до неї.",
     "pagename": "Назва сторінки",
     "subwiki": "Субвікі",
diff --git a/www/addons/mod/wiki/lang/zh-cn.json b/www/addons/mod/wiki/lang/zh-cn.json
index 1eb2563a117..28e5c1b23ad 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": "页面",
     "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..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": "分頁",
+    "page": "頁",
     "pageexists": "這頁面已經存在。",
     "pagename": "頁面名稱",
     "subwiki": "Subwiki",
diff --git a/www/addons/myoverview/lang/ca.json b/www/addons/myoverview/lang/ca.json
index 6f57cd536b3..7d74942e12e 100644
--- a/www/addons/myoverview/lang/ca.json
+++ b/www/addons/myoverview/lang/ca.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "En curs",
-    "nocourses": "No hi ha informació de cursos per mostrar.",
-    "pluginname": "Nom del connector de repositori"
+    "future": "Futurs",
+    "inprogress": "En progrés",
+    "morecourses": "Més cursos",
+    "next30days": "Propers 30 dies",
+    "next7days": "Propers 7 dies",
+    "nocourses": "Cap curs",
+    "nocoursesfuture": "Cap curs futur",
+    "nocoursesinprogress": "Cap curs en progrés",
+    "nocoursespast": "Cap curs passat",
+    "noevents": "Cap activitat venç properament",
+    "past": "Passats",
+    "pluginname": "Resum del curs",
+    "recentlyoverdue": "Vençuda recentment",
+    "sortbycourses": "Ordena per cursos",
+    "sortbydates": "Ordena per dates",
+    "timeline": "Línia de temps"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/da.json b/www/addons/myoverview/lang/da.json
index 6b0e076a3e8..93f96452658 100644
--- a/www/addons/myoverview/lang/da.json
+++ b/www/addons/myoverview/lang/da.json
@@ -1,5 +1,17 @@
 {
-    "inprogress": "Igangværende",
-    "nocourses": "Du er ikke tilmeldt nogen kurser.",
-    "pluginname": "Navn på filarkiv-plugin"
+    "future": "Fremtidige",
+    "inprogress": "I gang",
+    "morecourses": "Flere kurser",
+    "next30days": "Næste 30 dage",
+    "next7days": "Næste 7 dage",
+    "nocourses": "Ingen kurser",
+    "nocoursesfuture": "Ingen fremtidige kurser",
+    "nocoursesinprogress": "Ingen igangværende kurser",
+    "nocoursespast": "Ingen tidligere kurser",
+    "noevents": "Ingen forestående aktiviteter",
+    "past": "Tidligere",
+    "pluginname": "Kursusoversigt",
+    "sortbycourses": "Sorter efter kurser",
+    "sortbydates": "Sorter efter dato",
+    "timeline": "Tidslinje"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/de.json b/www/addons/myoverview/lang/de.json
index 5eeb1d65140..48617009585 100644
--- a/www/addons/myoverview/lang/de.json
+++ b/www/addons/myoverview/lang/de.json
@@ -14,5 +14,5 @@
     "recentlyoverdue": "Kürzlich überfällig",
     "sortbycourses": "Nach Kurs sortieren",
     "sortbydates": "Nach Datum sortieren",
-    "timeline": "Timeline"
+    "timeline": "Zeitleiste"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/es.json b/www/addons/myoverview/lang/es.json
index b796e0b88b4..44a7a41e6f1 100644
--- a/www/addons/myoverview/lang/es.json
+++ b/www/addons/myoverview/lang/es.json
@@ -1,5 +1,5 @@
 {
-    "future": "Futuro",
+    "future": "Futuros",
     "inprogress": "En progreso",
     "morecourses": "Más cursos",
     "next30days": "Próximos 30 días",
@@ -9,7 +9,7 @@
     "nocoursesinprogress": "Sin cursos en progreso",
     "nocoursespast": "Sin cursos pasados",
     "noevents": "No hay actividades próximas pendientes",
-    "past": "Pasado",
+    "past": "Pasados",
     "pluginname": "Vista general de curso",
     "recentlyoverdue": "Recientemente vencidas",
     "sortbycourses": "Ordenar por curso",
diff --git a/www/addons/myoverview/lang/eu.json b/www/addons/myoverview/lang/eu.json
index 63ad1570d13..75bf1d67080 100644
--- a/www/addons/myoverview/lang/eu.json
+++ b/www/addons/myoverview/lang/eu.json
@@ -6,13 +6,13 @@
     "next7days": "Datozen 7 egunetan",
     "nocourses": "Ez dago ikastarorik",
     "nocoursesfuture": "Ez dago ikastarorik etorkizunean",
-    "nocoursesinprogress": "",
+    "nocoursesinprogress": "Ez dago martxan dagoen ikastarorik",
     "nocoursespast": "Ez dago ikastarorik iraganean",
-    "noevents": "",
+    "noevents": "Ez dago jardueren muga-egunik laster",
     "past": "Iragana",
-    "pluginname": "",
-    "recentlyoverdue": "",
+    "pluginname": "Ikuspegi orokorra",
+    "recentlyoverdue": "Orain dela gutxi iragotako muga-egunak",
     "sortbycourses": "Ordenatu ikastaroen arabera",
     "sortbydates": "Ordenatu dataren arabera",
-    "timeline": ""
+    "timeline": "Kronologia"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/fr.json b/www/addons/myoverview/lang/fr.json
index 266d636a4b5..2a74ad739d4 100644
--- a/www/addons/myoverview/lang/fr.json
+++ b/www/addons/myoverview/lang/fr.json
@@ -10,7 +10,7 @@
     "nocoursespast": "Pas de cours dans le passé",
     "noevents": "Aucune activité",
     "past": "Passé",
-    "pluginname": "Vue d'ensemble du cours",
+    "pluginname": "Vue d'ensemble des cours",
     "recentlyoverdue": "Récemment en retard",
     "sortbycourses": "Tri par cours",
     "sortbydates": "Tri par date",
diff --git a/www/addons/myoverview/lang/he.json b/www/addons/myoverview/lang/he.json
index 2c8bcae7be2..d0b13672129 100644
--- a/www/addons/myoverview/lang/he.json
+++ b/www/addons/myoverview/lang/he.json
@@ -1,7 +1,7 @@
 {
     "future": "עתידי",
     "inprogress": "בלמידה",
-    "morecourses": "",
+    "morecourses": "קורסים נוספים",
     "next30days": "ב 30 הימים הבאים",
     "next7days": "ב 7 הימים הבאים",
     "nocourses": "טרם נרשמתם לקורס כלשהו",
@@ -10,7 +10,7 @@
     "nocoursespast": "אינכם רשומים לקורס אשר הסתיימו",
     "noevents": "לא קיימות פעילויות עתידיות להן מועד הגשה",
     "past": "עבר",
-    "pluginname": "עדכונים בקורסים שלי",
+    "pluginname": "סקירה כללית",
     "recentlyoverdue": "מועד־ההגשה עבר, לאחרונה",
     "sortbycourses": "מיון לפי שמות קורסים",
     "sortbydates": "מיון לפי תאריכים",
diff --git a/www/addons/myoverview/lang/it.json b/www/addons/myoverview/lang/it.json
index 3e157ff6e5c..cca29fb3c13 100644
--- a/www/addons/myoverview/lang/it.json
+++ b/www/addons/myoverview/lang/it.json
@@ -1,17 +1,17 @@
 {
-    "future": "",
-    "inprogress": "",
-    "morecourses": "",
-    "next30days": "",
-    "next7days": "",
+    "future": "Prossimi",
+    "inprogress": "In svolgimento",
+    "morecourses": "Altri corsi",
+    "next30days": "Prossimi 30 giorni",
+    "next7days": "Prossimi 7 giorni",
     "nocourses": "Non ci sono corsi",
-    "nocoursesfuture": "",
+    "nocoursesfuture": "Non ci sono corsi di prossima attivazione",
     "nocoursesinprogress": "Non ci sono corsi in svolgimento",
-    "nocoursespast": "",
+    "nocoursespast": "Non ci sono corsi conclusi",
     "noevents": "Non ci sono attività da svolgere",
-    "past": "",
+    "past": "Conclusi",
     "pluginname": "Panoramica corsi",
-    "recentlyoverdue": "",
+    "recentlyoverdue": "Scadute di recente",
     "sortbycourses": "Ordina per corso",
     "sortbydates": "Ordina per data",
     "timeline": "Cronologia"
diff --git a/www/addons/myoverview/lang/ja.json b/www/addons/myoverview/lang/ja.json
index 3671d43e7ee..af5dc09b17a 100644
--- a/www/addons/myoverview/lang/ja.json
+++ b/www/addons/myoverview/lang/ja.json
@@ -1,11 +1,11 @@
 {
-    "future": "今後",
+    "future": "未来",
     "inprogress": "進行中",
     "morecourses": "コースをさらに",
     "next30days": "次の30日",
     "next7days": "次の7日",
     "nocourses": "コースなし",
-    "nocoursesfuture": "今後のコースはありません。",
+    "nocoursesfuture": "未来のコースはありません。",
     "nocoursesinprogress": "進行中のコースはありません。",
     "nocoursespast": "過去のコースはありません。",
     "noevents": "到来する活動期限はありません。",
diff --git a/www/addons/myoverview/lang/lt.json b/www/addons/myoverview/lang/lt.json
index cba79f81ce3..c7d17b3aea6 100644
--- a/www/addons/myoverview/lang/lt.json
+++ b/www/addons/myoverview/lang/lt.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "Nebaigta",
-    "nocourses": "Nėra rodytinos kursų informacijos",
-    "pluginname": "Saugyklos priedo pavadinimas"
+    "future": "Būsimi",
+    "inprogress": "Vykstantys",
+    "morecourses": "Daugiau kursų",
+    "next30days": "Kitas 30 dienų",
+    "next7days": "Kitas 7 dienas",
+    "nocourses": "Nėra kursų",
+    "nocoursesfuture": "Nėra būsimų kursų",
+    "nocoursesinprogress": "Nėra vykstančių kursų",
+    "nocoursespast": "Nėra pasibaigusių kursų",
+    "noevents": "Nėra numatytų artėjančių veiklų",
+    "past": "Pasibaigę",
+    "pluginname": "Kursų apžvalga",
+    "recentlyoverdue": "Neseniai pavėluotas",
+    "sortbycourses": "Rūšiuoti pagal kursus",
+    "sortbydates": "Rūšiuoti pagal datą",
+    "timeline": "Laiko skalė"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/pl.json b/www/addons/myoverview/lang/pl.json
index 08052becbb2..26323a8f098 100644
--- a/www/addons/myoverview/lang/pl.json
+++ b/www/addons/myoverview/lang/pl.json
@@ -1,5 +1,18 @@
 {
-    "inprogress": "W toku",
-    "nocourses": "Nie ma informacji do pokazania",
-    "pluginname": "Nazwa wtyczki repozytorium"
+    "future": "Nadchodzące",
+    "inprogress": "Aktualne",
+    "morecourses": "Więcej kursów",
+    "next30days": "Następne 30 dni",
+    "next7days": "Następne 7 dni",
+    "nocourses": "Brak kursów",
+    "nocoursesfuture": "Brak nadchodzących kursów",
+    "nocoursesinprogress": "Brak aktualnych kursów",
+    "nocoursespast": "Brak zakończonych kursów",
+    "noevents": "Brak nadchodzących terminów zadań",
+    "past": "Zakończone",
+    "pluginname": "Przegląd kursu",
+    "recentlyoverdue": "Obecnie opóźnione",
+    "sortbycourses": "Sortuj wg kursów",
+    "sortbydates": "Sortuj wg dat",
+    "timeline": "Porządek chronologiczny"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/pt-br.json b/www/addons/myoverview/lang/pt-br.json
index c02df1adb37..f768881904f 100644
--- a/www/addons/myoverview/lang/pt-br.json
+++ b/www/addons/myoverview/lang/pt-br.json
@@ -1,5 +1,18 @@
 {
+    "future": "Não iniciados",
     "inprogress": "Em andamento",
-    "nocourses": "Nenhuma informação disponível sobre o curso.",
-    "pluginname": "Nome do plugin de repositório"
+    "morecourses": "Mais cursos",
+    "next30days": "Próximos 30 dias",
+    "next7days": "Próximos 7 dias",
+    "nocourses": "Não há cursos",
+    "nocoursesfuture": "Não há cursos não iniciados",
+    "nocoursesinprogress": "Não há cursos em andamento",
+    "nocoursespast": "Não há cursos encerrados",
+    "noevents": "Não há atividades pendentes",
+    "past": "Encerrados",
+    "pluginname": "Resumo dos cursos",
+    "recentlyoverdue": "Atividades atrasadas",
+    "sortbycourses": "Ordenar por cursos",
+    "sortbydates": "Ordenar por data",
+    "timeline": "Linha do tempo"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/pt.json b/www/addons/myoverview/lang/pt.json
index b019a3830aa..1c084d2e2f3 100644
--- a/www/addons/myoverview/lang/pt.json
+++ b/www/addons/myoverview/lang/pt.json
@@ -1,5 +1,18 @@
 {
+    "future": "Futuro",
     "inprogress": "Em progresso",
-    "nocourses": "Sem informação das suas disciplinas para mostrar.",
-    "pluginname": "Nome do módulo de repositório"
+    "morecourses": "Mais disciplinas",
+    "next30days": "Próximos 30 dias",
+    "next7days": "Próximos 7 dias",
+    "nocourses": "Sem disciplinas",
+    "nocoursesfuture": "Nenhuma disciplina a começar",
+    "nocoursesinprogress": "Nenhuma disciplina a decorrer",
+    "nocoursespast": "Nenhuma disciplina terminada",
+    "noevents": "Nenhuma atividade programada",
+    "past": "Passado",
+    "pluginname": "Vista geral",
+    "recentlyoverdue": "Terminadas recentemente",
+    "sortbycourses": "Ordenar por disciplinas",
+    "sortbydates": "Ordenar por datas",
+    "timeline": "Cronograma"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/ru.json b/www/addons/myoverview/lang/ru.json
index fbfa8f8a870..1a29c7d620b 100644
--- a/www/addons/myoverview/lang/ru.json
+++ b/www/addons/myoverview/lang/ru.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/sr-cr.json b/www/addons/myoverview/lang/sr-cr.json
new file mode 100644
index 00000000000..218f9ebde77
--- /dev/null
+++ b/www/addons/myoverview/lang/sr-cr.json
@@ -0,0 +1,18 @@
+{
+    "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/sr-lt.json b/www/addons/myoverview/lang/sr-lt.json
new file mode 100644
index 00000000000..953d764faa8
--- /dev/null
+++ b/www/addons/myoverview/lang/sr-lt.json
@@ -0,0 +1,18 @@
+{
+    "future": "Budući",
+    "inprogress": "U toku",
+    "morecourses": "Više kurseva",
+    "next30days": "Sledećih 30 dana",
+    "next7days": "Sledećih 7 dana",
+    "nocourses": "Nema kurseva",
+    "nocoursesfuture": "Nema budućih kurseva",
+    "nocoursesinprogress": "Nema kurseva koji su toku",
+    "nocoursespast": "Nema prošlih kurseva",
+    "noevents": "Nema aktivnosti koje se uskoro završavaju",
+    "past": "Prošli",
+    "pluginname": "Pregled kurseva",
+    "recentlyoverdue": "Nedavno završene aktivnosti",
+    "sortbycourses": "Sortiraj po kursevima",
+    "sortbydates": "Sortiraju po datumima",
+    "timeline": "Vremenski raspored"
+}
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/sv.json b/www/addons/myoverview/lang/sv.json
index 977e7631d0d..004122c5c20 100644
--- a/www/addons/myoverview/lang/sv.json
+++ b/www/addons/myoverview/lang/sv.json
@@ -1,5 +1,16 @@
 {
-    "inprogress": "Pågår",
-    "nocourses": "Det finns ingen kursinformation att visa.",
-    "pluginname": "Namn  på plugin-program för arkiv"
+    "future": "Kommande",
+    "inprogress": "Pågående",
+    "morecourses": "Fler kurser",
+    "next30days": "30 dagar framåt",
+    "next7days": "7 dagar framåt",
+    "nocourses": "Inga kurser",
+    "nocoursesfuture": "Inga kommande kurser",
+    "nocoursesinprogress": "Inga pågående kurser",
+    "nocoursespast": "Inga tidigare kurser",
+    "past": "Tidigare",
+    "pluginname": "Kursöversikt",
+    "sortbycourses": "Sortera efter kurser",
+    "sortbydates": "Sortera efter datum",
+    "timeline": "Tidslinje"
 }
\ No newline at end of file
diff --git a/www/addons/myoverview/lang/uk.json b/www/addons/myoverview/lang/uk.json
new file mode 100644
index 00000000000..1b4fb0f4e46
--- /dev/null
+++ b/www/addons/myoverview/lang/uk.json
@@ -0,0 +1,18 @@
+{
+    "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/zh-cn.json b/www/addons/myoverview/lang/zh-cn.json
index ce98820d486..0694737081f 100644
--- a/www/addons/myoverview/lang/zh-cn.json
+++ b/www/addons/myoverview/lang/zh-cn.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/myoverview/lang/zh-tw.json b/www/addons/myoverview/lang/zh-tw.json
index 18cfa0860fc..16d60ff4766 100644
--- a/www/addons/myoverview/lang/zh-tw.json
+++ b/www/addons/myoverview/lang/zh-tw.json
@@ -11,7 +11,7 @@
     "noevents": "沒有即將到期的活動",
     "past": "過去",
     "pluginname": "課程概觀",
-    "recentlyoverdue": "",
+    "recentlyoverdue": "最近逾期的",
     "sortbycourses": "依課程排序",
     "sortbydates": "依日期排序",
     "timeline": "時間軸"
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/ja.json b/www/addons/notes/lang/ja.json
index 6b3304c8067..ae48a7ac252 100644
--- a/www/addons/notes/lang/ja.json
+++ b/www/addons/notes/lang/ja.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "作成したノート",
     "nonotes": "このタイプのノートはまだ存在しません",
     "note": "ノート",
-    "notes": "ノート",
+    "notes": "あなたの個人分析およびノート",
     "personalnotes": "パーソナルノート",
     "publishstate": "コンテキスト",
     "sitenotes": "サイトノート",
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/sr-cr.json b/www/addons/notes/lang/sr-cr.json
index 0690900c3c5..afe5cd9b24d 100644
--- a/www/addons/notes/lang/sr-cr.json
+++ b/www/addons/notes/lang/sr-cr.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Белешка креирана",
     "nonotes": "Још не постоје белешке овог типа",
     "note": "Белешка",
-    "notes": "Белешке",
+    "notes": "Ваше приватне анализе и белешке",
     "personalnotes": "Личне белешке",
     "publishstate": "Контекст",
     "sitenotes": "Белешке сајта",
diff --git a/www/addons/notes/lang/sr-lt.json b/www/addons/notes/lang/sr-lt.json
index d4a1ef87e7f..11b505f9b4b 100644
--- a/www/addons/notes/lang/sr-lt.json
+++ b/www/addons/notes/lang/sr-lt.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Beleška kreirana",
     "nonotes": "Još ne postoje beleške ovog tipa",
     "note": "Beleška",
-    "notes": "Beleške",
+    "notes": "Vaše privatne analize i beleške",
     "personalnotes": "Lične beleške",
     "publishstate": "Kontekst",
     "sitenotes": "Beleške sajta",
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
index 8c815080c16..9c2ba1ac6bb 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 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/ca.json b/www/addons/notifications/lang/ca.json
index 324cd60ecdb..077c0e53ffd 100644
--- a/www/addons/notifications/lang/ca.json
+++ b/www/addons/notifications/lang/ca.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "S'ha produït un error carregant les notificacions",
-    "notificationpreferences": "Preferències de notificació",
+    "notificationpreferences": "Preferències de les notificacions",
     "notifications": "Notificacions",
     "playsound": "Reprodueix el so",
     "therearentnotificationsyet": "No hi ha notificacions"
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 b89ba1477d5..115925c10ca 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",
+    "notifications": "Mitteilungen",
     "playsound": "Sound 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 db11ade05af..1049b40c7a5 100644
--- a/www/addons/notifications/lang/es.json
+++ b/www/addons/notifications/lang/es.json
@@ -1,7 +1,7 @@
 {
     "errorgetnotifications": "Error al obtener notificaciones",
-    "notificationpreferences": "Preferencias de notificaciones",
-    "notifications": "Notificaciones",
+    "notificationpreferences": "Preferencias de notificación",
+    "notifications": "Avisos",
     "playsound": "Reproducir sonido",
     "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 256b8e1fe3e..2363a8e19af 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",
     "playsound": "Erreproduzitu soinua",
     "therearentnotificationsyet": "Ez dago jakinarazpenik"
diff --git a/www/addons/notifications/lang/fa.json b/www/addons/notifications/lang/fa.json
index dcfecb86fba..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 1c1591b94ed..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/ja.json b/www/addons/notifications/lang/ja.json
index 22daa00358e..8c6ea812ddf 100644
--- a/www/addons/notifications/lang/ja.json
+++ b/www/addons/notifications/lang/ja.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "通知の取得中にエラーが発生しました。",
-    "notificationpreferences": "通知の設定",
+    "notificationpreferences": "通知プリファレンス",
     "notifications": "通知",
     "playsound": "音を出力",
     "therearentnotificationsyet": "通知はありません"
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 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..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ência de notificações",
-    "notifications": "Notificação",
+    "notificationpreferences": "Preferências de notificação",
+    "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 2aa4e69322a..ce4f0ccc515 100644
--- a/www/addons/notifications/lang/sv.json
+++ b/www/addons/notifications/lang/sv.json
@@ -1,5 +1,6 @@
 {
     "errorgetnotifications": "Fel att få meddelanden",
-    "notifications": "Meddelanden",
+    "notificationpreferences": "Välj inställningar för notiser",
+    "notifications": "Administration",
     "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 c3d124173af..791d1338ac3 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 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/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..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 3c6638a3af7..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 per aquest curs",
+    "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 2092b03a730..311ee521366 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": "Pro tento kurz nenalezen žá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..343c2a2709e 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/innen für diesen Kurs 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..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 para 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/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..0a84454d0c0 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 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 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 3656df9f659..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/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..33b07998414 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 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 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..e54b7e5dc2c 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 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 e7a2e39536f..5fa07c6b1a2 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 para esta disciplina",
+    "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/sr-cr.json b/www/addons/participants/lang/sr-cr.json
index 5c5170c3c41..2c8a28575f0 100644
--- a/www/addons/participants/lang/sr-cr.json
+++ b/www/addons/participants/lang/sr-cr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Ниједан учесник није пронађен на овом курсу.",
+    "noparticipants": "Није пронађен ни један учесник на овом курсу",
     "participants": "Учесници"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/sr-lt.json b/www/addons/participants/lang/sr-lt.json
index 090378abb39..eba071633fd 100644
--- a/www/addons/participants/lang/sr-lt.json
+++ b/www/addons/participants/lang/sr-lt.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nijedan učesnik nije pronađen na ovom kursu.",
+    "noparticipants": "Nije pronađen ni jedan učesnik na ovom kursu",
     "participants": "Učesnici"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/sv.json b/www/addons/participants/lang/sv.json
index ab7780c8f28..27833cf5412 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 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 05e3c834e4a..9532bf04f39 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": "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 2a8bcb3747e..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 f2ce4c8e36a..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 f2aba39a343..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 ab7fafab59b..47a7f04e4bb 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": "عرض الكل {{$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 370471981b9..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 4d5f44fc1cc..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-ho tot",
+    "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 e8cac178795..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še",
+    "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 9242ee4ca2d..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 alt"
+    "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 16ab12b9912..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": "Alles 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 ee4ca9da68c..abc9558d36b 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -17,5 +17,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 1745ce4e20a..225893e56e3 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 {{$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 f674129afed..b17f87a0442 100644
--- a/www/core/components/course/lang/es.json
+++ b/www/core/components/course/lang/es.json
@@ -9,14 +9,14 @@
     "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": "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.",
-    "hiddenfromstudents": "Oculto de estudiantes",
+    "hiddenfromstudents": "No mostrado a los estudiantes",
     "nocontentavailable": "No hay contenido disponible en este momento.",
     "overriddennotice": "La calificación final de esta actividad ha sido ajustada manualmente.",
-    "showall": "Mostrar todo",
+    "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 c42572550ec..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": "Erakutsi denak",
+    "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 cb91088f8e6..5000e3146db 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": "نمایش همه {{$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 fa5ca9f7fb7..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": "Tout afficher",
+    "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 1789a2e476e..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/it.json b/www/core/components/course/lang/it.json
index 2f6968177c8..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 tutto"
+    "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 2059fb9fb13..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": "すべて表示"
+    "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 d348b5e7c7f..39c1c02b24e 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": "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.",
@@ -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",
+    "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 e341c7adfe2..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",
+    "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/pt-br.json b/www/core/components/course/lang/pt-br.json
index e95b7c4187c..8a77246be40 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 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 7ac9f081fbd..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 todos",
+    "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 2069aa89421..8db8d4081f2 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": "Arată tot"
+    "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 6a0a1c3f43a..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/sr-cr.json b/www/core/components/course/lang/sr-cr.json
index 3ee4f3ebe39..15ed523e7b2 100644
--- a/www/core/components/course/lang/sr-cr.json
+++ b/www/core/components/course/lang/sr-cr.json
@@ -9,12 +9,14 @@
     "confirmdownload": "Намеравате да преузмете {{size}}. Да ли сте сигурни да желите да наставите?",
     "confirmdownloadunknownsize": "Нисмо могли да израчунамо величину преузимање. Да ли сте сигурни да желите да преузмете?",
     "confirmpartialdownloadsize": "Намеравате да преузмете <strong>најмање</strong> {{size}}. Да ли сте сигурни да желите да наставите?",
-    "contents": "Садржаји",
+    "contents": "Садржај",
     "couldnotloadsectioncontent": "Није могуће учитати садржај секције, покушајте поново касније.",
     "couldnotloadsections": "Није могуће учитати секције, покушајте поново касније.",
     "errordownloadingsection": "Грешка приликом преузимања секције.",
     "errorgetmodule": "Грешка приликом преузимања података модула.",
+    "hiddenfromstudents": "Сакривено од полазника",
     "nocontentavailable": "Никакав садржај није доступан у овом тренутку.",
-    "showall": "Прикажи све",
+    "overriddennotice": "Ваша завршна оцена за ову активност је ручно подешена",
+    "showall": "Прикажи свих {{$a}}",
     "useactivityonbrowser": "Још увек можете да га користите помоћу веб читача вашег уређаја."
 }
\ No newline at end of file
diff --git a/www/core/components/course/lang/sr-lt.json b/www/core/components/course/lang/sr-lt.json
index 97d89d52dc2..a1522ae721c 100644
--- a/www/core/components/course/lang/sr-lt.json
+++ b/www/core/components/course/lang/sr-lt.json
@@ -9,12 +9,14 @@
     "confirmdownload": "Nameravate da preuzmete {{size}}. Da li ste sigurni da želite da nastavite?",
     "confirmdownloadunknownsize": "Nismo mogli da izračunamo veličinu preuzimanje. Da li ste sigurni da želite da preuzmete?",
     "confirmpartialdownloadsize": "Nameravate da preuzmete <strong>najmanje</strong> {{size}}. Da li ste sigurni da želite da nastavite?",
-    "contents": "Sadržaji",
+    "contents": "Sadržaj",
     "couldnotloadsectioncontent": "Nije moguće učitati sadržaj sekcije, pokušajte ponovo kasnije.",
     "couldnotloadsections": "Nije moguće učitati sekcije, pokušajte ponovo kasnije.",
     "errordownloadingsection": "Greška prilikom preuzimanja sekcije.",
     "errorgetmodule": "Greška prilikom preuzimanja podataka modula.",
+    "hiddenfromstudents": "Sakriveno od polaznika",
     "nocontentavailable": "Nikakav sadržaj nije dostupan u ovom trenutku.",
-    "showall": "Prikaži sve",
+    "overriddennotice": "Vaša završna ocena za ovu aktivnost je ručno podešena",
+    "showall": "Prikaži svih {{$a}}",
     "useactivityonbrowser": "Još uvek možete da ga koristite pomoću veb čitača vašeg uređaja."
 }
\ 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..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"
+    "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 027484a1cc3..f3d9b003fd5 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": "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 232aa47f117..faf2b294bc7 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": "Показати все",
+    "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 c60b61bdc0b..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 c9c97c2ef45..10ecfebf0bf 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": "顯示全部",
+    "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 f96af19297b..ac8c6650a59 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 704b295e74a..1ef954e47fd 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 dc6c6af16fd..739d5c8e7fd 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": "No hi ha informació de cursos per mostrar.",
     "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": "La cerca no ha obtingut resultats",
+    "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 10ad53dc40c..59626b53315 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,13 +13,13 @@
     "filtermycourses": "Filtrovat mé kurzy",
     "frontpage": "Titulní stránka",
     "mycourses": "Moje kurzy",
-    "nocourses": "O kurzu nejsou žádné informace.",
+    "nocourses": "Žádné dostupné informace o kurzech",
     "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": "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": "Klíč zápisu",
-    "search": "Hledat",
+    "password": "Heslo",
+    "search": "Vyhledat",
     "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 506a637348d..7c3706806c8 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": "Du er ikke tilmeldt nogen kurser.",
     "nocoursesyet": "Der er ingen kurser i denne kategori",
-    "nosearchresults": "Din søgning gav 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": "Tilmeldingsnøgle",
-    "search": "Søg",
-    "searchcourses": "Søg efter kurser",
+    "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..861a406fe43 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 Kursinformationen",
     "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": "Kennwort",
+    "search": "Suche",
     "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 127c3fcdd83..819d0105246 100644
--- a/www/core/components/courses/lang/el.json
+++ b/www/core/components/courses/lang/el.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": "Δεν βρέθηκαν αποτελέσματα",
-    "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..ff09fef87cc 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": "No hay información del curso para mostrar.",
     "nocoursesyet": "No hay cursos en esta categoría",
-    "nosearchresults": "No hubo resultados de su búsqueda",
+    "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": "Clave de inscripción",
-    "search": "Buscar",
+    "password": "Contraseña",
+    "search": "Búsqueda",
     "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 92337d9e248..71e6707f3a3 100644
--- a/www/core/components/courses/lang/es.json
+++ b/www/core/components/courses/lang/es.json
@@ -13,13 +13,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": "La búsqueda no produjo 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": "Búsqueda",
     "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 9a58ba8bf36..a0adcc52721 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 ikastaroei buruzko informaziorik",
     "nocoursesyet": "Ez dago ikastarorik kategoria honetan",
-    "nosearchresults": "Ez da emaitzik aurkitu zure bilaketarentzat",
+    "nosearchresults": "Zure bilaketak du ezer topatu",
     "notenroled": "Ez zaude matrikulatuta ikastaro honetan",
     "notenrollable": "Ezin duzu zeure burua matrikulatu ikastaro honetan.",
-    "password": "Matrikulazio-giltza",
-    "search": "Bilatu",
-    "searchcourses": "Bilatu Ikastaroak",
+    "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 72a50f444ca..3462880e955 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 1861d031977..abc9016dbc1 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": "Aucune information de cours à afficher.",
     "nocoursesyet": "Il n'y a pas encore de cours",
-    "nosearchresults": "Votre recherche n'a donné 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": "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 abb5cf53a41..888922a2943 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": "סיסמה (secret)",
-    "search": "חיפוש",
+    "password": "סיסמה",
+    "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 7348fc46578..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": "Megosztott titkos jel",
-    "search": "Keresés",
-    "searchcourses": "Kurzusok keresése"
+    "password": "Jelszó",
+    "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..72658419e6d 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 sono presenti informazioni sui corsi.",
     "nocoursesyet": "Questa categoria non ha corsi",
-    "nosearchresults": "La ricerca non ha prodotto risultati",
+    "nosearchresults": "La tua ricerca non ha prodotto risultati",
     "notenroled": "Non sei iscritto in questo corso",
     "notenrollable": "Non puoi iscriverti al corso.",
-    "password": "Chiave di iscrizione",
-    "search": "Cerca",
+    "password": "Password",
+    "search": "Ricerca",
     "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 32d5b81c2c9..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": "あなたの検索の該当データは見つかりませんでした。",
+    "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 cc7eb529a53..0e4e851ca1a 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": "Nėra rodytinos kursų informacijos",
     "nocoursesyet": "Nėra šios kategorijos kursų",
-    "nosearchresults": "Paieškos rezultatų nėra",
-    "notenroled": "Nesate įrašytas į šį kursą",
+    "nosearchresults": "Nėra jūsų paieškos 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..7d30698aa76 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 cursusinformatie",
     "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 9831e317b6a..1f508177b96 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": "żadnego kursu",
     "nocoursesyet": "Brak kursów w tej kategorii",
-    "nosearchresults": "Brak rezultatów wyszukiwania",
+    "nosearchresults": "Brak wyników",
     "notenroled": "Nie jesteś zapisany w tym kursie",
-    "password": "Wspólne tajne hasło",
-    "search": "Wyszukaj",
-    "searchcourses": "Przeszukaj kursy"
+    "password": "Hasło",
+    "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 759c80f03a6..72ba27ea998 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": "Nenhuma informação disponível sobre o curso.",
     "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 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": "Chave de inscrição",
-    "search": "Buscar",
+    "password": "Senha",
+    "search": "Busca",
     "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 6cf8a068032..e4f8484550e 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,13 +13,13 @@
     "filtermycourses": "Filtrar as minhas disciplinas",
     "frontpage": "Página principal do site",
     "mycourses": "As minhas disciplinas",
-    "nocourses": "Sem informações das disciplinas para mostrar",
+    "nocourses": "Sem informação das suas 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": "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 de inscrição",
-    "search": "Procurar",
+    "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",
diff --git a/www/core/components/courses/lang/ro.json b/www/core/components/courses/lang/ro.json
index d2e6db9c9e2..64ab3e14670 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": "Nicio informație legată de cursuri este disponibilă",
     "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": "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": "Parola de înregistrare",
-    "search": "Caută",
+    "password": "Parolă",
+    "search": "Căutați",
     "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 03db819ba08..214add26e59 100644
--- a/www/core/components/courses/lang/ru.json
+++ b/www/core/components/courses/lang/ru.json
@@ -1,18 +1,18 @@
 {
     "allowguests": "Курс доступен гостю",
     "availablecourses": "Доступные курсы",
-    "categories": "Категории курсов",
+    "categories": "Категории",
     "courses": "Курсы",
     "enrolme": "Записаться на курс",
     "errorloadcourses": "При загрузке курсов произошла ошибка.",
     "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/sr-cr.json b/www/core/components/courses/lang/sr-cr.json
index a45b33d0d74..53f58f1e921 100644
--- a/www/core/components/courses/lang/sr-cr.json
+++ b/www/core/components/courses/lang/sr-cr.json
@@ -1,6 +1,10 @@
 {
+    "allowguests": "Приступ курсу је дозвољен гостима",
+    "availablecourses": "Доступни курсеви",
     "cannotretrievemorecategories": "Категорије које су испод нивоа {{$a}} не могу се преузети.",
+    "categories": "Категорије курсева",
     "confirmselfenrol": "Да ли сте сигурни да желите да се упишете на овај курс?",
+    "courses": "Курсеви",
     "enrolme": "Упиши ме",
     "errorloadcategories": "Дошло је до грешке приликом учитавања категорија.",
     "errorloadcourses": "Дошло је до грешке приликом учитавања курсева.",
@@ -8,11 +12,15 @@
     "errorselfenrol": "Дошло је до грешке приликом покушаја самосталног уписа.",
     "filtermycourses": "Филтрирај моје курсеве",
     "frontpage": "Насловна страница",
-    "nocourses": "Нема информација о курсевима за приказ.",
-    "nosearchresults": "Није било резултата ваше претраге",
+    "mycourses": "Моји курсеви",
+    "nocourses": "Нема информација о курсу за приказ.",
+    "nocoursesyet": "Нема курсева у овој категорији",
+    "nosearchresults": "Ваша претрага није дала резултате",
     "notenroled": "Нисте уписани на овај курс",
     "notenrollable": "Не можете сами да се упишете на овај курс.",
-    "password": "Приступна лозинка курса",
+    "password": "Лозинка",
+    "search": "Претрага",
+    "searchcourses": "Претражи курсеве",
     "searchcoursesadvice": "Можете користити дугме за претрагу курсева како бисте им приступили као гост или се уписали на курсеве који то допуштају.",
     "selfenrolment": "Самостални упис",
     "totalcoursesearchresults": "Укупно курсева: {{$a}}"
diff --git a/www/core/components/courses/lang/sr-lt.json b/www/core/components/courses/lang/sr-lt.json
index 65613c906bb..154bd44b629 100644
--- a/www/core/components/courses/lang/sr-lt.json
+++ b/www/core/components/courses/lang/sr-lt.json
@@ -1,6 +1,10 @@
 {
+    "allowguests": "Pristup kursu je dozvoljen gostima",
+    "availablecourses": "Dostupni kursevi",
     "cannotretrievemorecategories": "Kategorije koje su ispod nivoa {{$a}} ne mogu se preuzeti.",
+    "categories": "Kategorije kurseva",
     "confirmselfenrol": "Da li ste sigurni da želite da se upišete na ovaj kurs?",
+    "courses": "Kursevi",
     "enrolme": "Upiši me",
     "errorloadcategories": "Došlo je do greške prilikom učitavanja kategorija.",
     "errorloadcourses": "Došlo je do greške prilikom učitavanja kurseva.",
@@ -8,11 +12,15 @@
     "errorselfenrol": "Došlo je do greške prilikom pokušaja samostalnog upisa.",
     "filtermycourses": "Filtriraj moje kurseve",
     "frontpage": "Naslovna stranica",
-    "nocourses": "Nema informacija o kursevima za prikaz.",
-    "nosearchresults": "Nije bilo rezultata vaše pretrage",
+    "mycourses": "Moji kursevi",
+    "nocourses": "Nema informacija o kursu koje bi se mogle prikazati.",
+    "nocoursesyet": "Nema kurseva u ovoj kategoriji",
+    "nosearchresults": "Vaša pretraga nije dala rezultate",
     "notenroled": "Niste upisani na ovaj kurs",
     "notenrollable": "Ne možete sami da se upišete na ovaj kurs.",
-    "password": "Pristupna lozinka kursa",
+    "password": "Lozinka",
+    "search": "Pretraga",
+    "searchcourses": "Pretraži kurseve",
     "searchcoursesadvice": "Možete koristiti dugme za pretragu kurseva kako biste im pristupili kao gost ili se upisali na kurseve koji to dopuštaju.",
     "selfenrolment": "Samostalni upis",
     "totalcoursesearchresults": "Ukupno kurseva: {{$a}}"
diff --git a/www/core/components/courses/lang/sv.json b/www/core/components/courses/lang/sv.json
index f7b7aea83fe..2906fc39e80 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 ingen kursinformation att visa.",
     "nocoursesyet": "Inga kurser i denna kategori",
-    "nosearchresults": "Inga sökningsresultat",
-    "notenroled": "Du är inte registrerad i kursen",
+    "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": "Kursnyckel",
-    "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 59192e73b8d..10cfff494c7 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": "Ders Kategorileri",
+    "categories": "Kategoriler",
     "courses": "Dersler",
     "enrolme": "Beni kaydet",
     "frontpage": "Ön sayfa",
     "mycourses": "Derslerim",
-    "nocourses": "Gösterilecek ders bilgisi yok",
+    "nocourses": "Ders yok",
     "nocoursesyet": "Bu kategoride ders yok",
-    "nosearchresults": "Aramanızla ilgili sonuç yok",
+    "nosearchresults": "Sonuç yok",
     "notenroled": "Bu derse kayıtlı değilsiniz",
-    "password": "Şifre",
-    "search": "Ara",
-    "searchcourses": "Dersleri ara"
+    "password": "Kayıt anahtarı",
+    "search": "Arama...",
+    "searchcourses": "Kursları 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 e21fe775615..8c07d6d8e74 100644
--- a/www/core/components/courses/lang/uk.json
+++ b/www/core/components/courses/lang/uk.json
@@ -2,10 +2,10 @@
     "allowguests": "Дозволено гостьовий доступ до курсу",
     "availablecourses": "Доступні курси",
     "cannotretrievemorecategories": "Категорії глибші, ніж рівень {{$a}} не можуть бути відновлені.",
-    "categories": "Категорії курсів",
+    "categories": "Категорії",
     "confirmselfenrol": "Ви впевнені, що хочете зареєструвати себе в цьому курсі?",
     "courses": "Курси",
-    "enrolme": "Відрахувати мене",
+    "enrolme": "Зареєструвати мене",
     "errorloadcategories": "Сталася помилка під час завантаження категорій.",
     "errorloadcourses": "Сталася помилка під час завантаження курсів.",
     "errorsearching": "Під час пошуку сталася помилка.",
@@ -13,13 +13,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/zh-cn.json b/www/core/components/courses/lang/zh-cn.json
index 8428ade7a27..3ab280913aa 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 eb2fde191e0..e718ad5dc31 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..912a2980157 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..9d95e088674 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..260d49f2008 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": "Fitxer",
     "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..9bbe338c058 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": "Odevzdat soubor(y)",
     "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..dc1027bb59f 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": "Filafleveringer",
     "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..deb3a49511c 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": "Dateiabgabe",
     "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..935202c4c47 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..17b65540fd6 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": "Envíos de archivo",
     "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..395013fec2f 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 enviados",
     "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..695c4b4155e 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": "Fitxategi-bidalketak",
     "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..31e7cb2c536 100644
--- a/www/core/components/fileuploader/lang/fa.json
+++ b/www/core/components/fileuploader/lang/fa.json
@@ -1,10 +1,11 @@
 {
+    "addfiletext": "اضافه‌کردن فایل",
     "confirmuploadfile": "شما در آستانهٔ ارسال {{size}} هستید. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "confirmuploadunknownsize": "ما نتوانستیم حجم ارسال را محاسبه کنیم. آیا مطمئنید که می‌خواهید ادامه دهید؟",
     "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 13eb0148fcf..5f5d1b86bda 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": "Remises de fichiers",
     "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 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..f217f7b9441 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 cf59fdef06f..a78f133d773 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": "Állomány",
+    "file": "Leadás állományban",
     "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 a6eac6c923f..1803ccc8b64 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": "Consegna file",
     "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 86f29cfe14c..07f74ac15b3 100644
--- a/www/core/components/fileuploader/lang/ja.json
+++ b/www/core/components/fileuploader/lang/ja.json
@@ -1,14 +1,14 @@
 {
-    "addfiletext": "ファイル追加",
+    "addfiletext": "ファイルを追加する",
     "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..5ba8dca7c4f 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": "Failų pateikimai",
     "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..6f8c6a9ce35 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": "Ingestuurde bestanden",
     "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 1f23867319a..e56bf5f0ccd 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": "Plik",
+    "file": "Przesyłane pliki",
     "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 f9a5cffca49..49699661be6 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": "Envio de arquivos",
     "fileuploaded": "Arquivo enviado",
-    "maxbytesfile": "O arquivo {{$a.file}} é muito grande. O tamanho máximo que você pode enviar é {{$a.size}}.",
+    "maxbytesfile": "O arquivo {{$a.file}} é muito grande. Apenas pode carregar arquivos com um tamanho máximo de {{$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..85ca6b926ab 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": "Submissão de ficheiros",
     "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..74a44c21314 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ş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": "Î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..1a99421f194 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/sr-cr.json b/www/core/components/fileuploader/lang/sr-cr.json
index 74ec8641949..1a2a53dbd8f 100644
--- a/www/core/components/fileuploader/lang/sr-cr.json
+++ b/www/core/components/fileuploader/lang/sr-cr.json
@@ -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": "Отпремање",
+    "uploadafile": "Постављање датотеке",
+    "uploading": "Постављање...",
     "uploadingperc": "Отпремање: {{$a}}%",
     "video": "Видео"
 }
\ No newline at end of file
diff --git a/www/core/components/fileuploader/lang/sr-lt.json b/www/core/components/fileuploader/lang/sr-lt.json
index 5da78d54b07..3425c337e0c 100644
--- a/www/core/components/fileuploader/lang/sr-lt.json
+++ b/www/core/components/fileuploader/lang/sr-lt.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Greška prilikom preuzimanja slike iz albuma.",
     "errormustbeonlinetoupload": "Morate biti onlajn kako biste otpremili datoteke.",
     "errornoapp": "Nemate instaliranu aplikaciju koja može da izvede ovu akciju.",
-    "errorreadingfile": "Greška prilikom učitavanja datoteke.",
+    "errorreadingfile": "Greška pri čitanju datoteke \"{{$a}}\"",
     "errorwhileuploading": "Došlo je do greške prilikom otpremanja datoteke.",
-    "file": "Датотека",
+    "file": "Datoteka",
     "fileuploaded": "Datoteka je uspešno otpremljena.",
-    "maxbytesfile": "Datoteka {{$a.file}} je prevelika. Maksimalna veličina koju možete da otpremite je {{$a.size}}.",
+    "maxbytesfile": "Datoteka {{$a.file}} je prevelika. Maksimalna veličina datoteke koju možete postaviti je {{$a.size}}.",
     "photoalbums": "Foto album",
     "readingfile": "Učitavanje datoteke",
     "selectafile": "Izaberi datoteku",
-    "uploadafile": "Otpremi datoteku",
-    "uploading": "Otpremanje",
+    "uploadafile": "Postavljanje datoteke",
+    "uploading": "Postavljanje...",
     "uploadingperc": "Otpremanje: {{$a}}%",
     "video": "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..5842440a4d5 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": "Filinlämningar",
     "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 23b8bac2bd4..fe46cee9296 100644
--- a/www/core/components/fileuploader/lang/tr.json
+++ b/www/core/components/fileuploader/lang/tr.json
@@ -3,10 +3,10 @@
     "errorcapturingaudio": "Ses kayıt hatası",
     "errorcapturingvideo": "Video kayıt hatası",
     "errorreadingfile": "\"{{$a}}\" dosyasını okurken hata oluştu",
-    "file": "Dosya",
+    "file": "Dosya gönderimleri",
     "fileuploaded": "Dosya başarıyla yüklendi",
-    "maxbytesfile": "Dosya {{$a.file}} çok büyük. Yüklediğiniz maksimum boyutu {{$a.size}} olduğunu.",
+    "maxbytesfile": "{{$a.file}} dosyasının boyutu çok büyük. En fazla {{$a.size}} MB büyüklüğünde dosya yükleyebilirsiniz.",
     "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 74292f36a85..f6be6aa599c 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": "Помилка читання файлу.",
+    "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/fileuploader/lang/zh-cn.json b/www/core/components/fileuploader/lang/zh-cn.json
index db4fec8b382..4c8d2fd2755 100644
--- a/www/core/components/fileuploader/lang/zh-cn.json
+++ b/www/core/components/fileuploader/lang/zh-cn.json
@@ -4,11 +4,11 @@
     "errorcapturingaudio": "捕捉音频时出错。",
     "errorcapturingvideo": "捕捉视频时出错。",
     "errorreadingfile": "在读取文件“{{$a}}”时发生错误",
-    "file": "文件",
+    "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..a43c998d59d 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 006afcb0ff9..7d384426017 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 ad342e2276c..2f83353a5e8 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 d83a599cc60..7848c0d6909 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": "Qualifica",
+    "grade": "Qualificació",
     "grades": "Qualificacions",
     "itemname": "Nom de l'element",
     "lettergrade": "Qualificació per lletres",
     "nooutcome": "Sense competències",
     "percentage": "Percentatge",
     "range": "Gamma",
-    "rank": "Rang",
+    "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 cd3f92e83b2..c81a87bd9eb 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": "Komentář",
+    "feedback": "Hodnocení",
     "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": "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 ce5cab367fe..517d42331d7 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": "Tilbagemelding",
+    "feedback": "Feedback",
     "grade": "Karakter",
     "grades": "Karakterer",
     "itemname": "Elementnavn",
@@ -10,6 +10,6 @@
     "nooutcome": "Intet slutresultat",
     "percentage": "Procentdel",
     "range": "Opstilling",
-    "rank": "Rank",
+    "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 1f965bf6662..49bc672f741 100644
--- a/www/core/components/grades/lang/de.json
+++ b/www/core/components/grades/lang/de.json
@@ -1,9 +1,9 @@
 {
-    "average": "Mittelwert",
+    "average": "Durchschnitt",
     "badgrade": "Ungültige Bewertung",
     "contributiontocoursetotal": "Beiträge zum Kurs insgesamt",
-    "feedback": "Rückmeldung",
-    "grade": "Relative Bewertung",
+    "feedback": "Feedback",
+    "grade": "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 8192b0ab2e2..26376ac35e5 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 34e8b41f166..ca04dc39133 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": "Comentario de retroalimentación",
+    "feedback": "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 164f2dd4f66..63344ded652 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": "Comentario",
+    "feedback": "Retroalimentación",
     "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 f71b3afe9f7..1037527dadf 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": "Nota",
+    "grade": "Kalifikazioa",
     "grades": "Kalifikazioak",
     "itemname": "Elementuaren izena",
     "lettergrade": "Letren bidezko kalifikazioa",
     "nooutcome": "Ez dago ikas-emaitzarik",
     "percentage": "Portzentajea",
     "range": "Ibiltartea",
-    "rank": "Bitartea",
+    "rank": "Sailkapena",
     "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 f71923977d3..2093690bad2 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 8991bf5655c..dc227165d43 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": "Commento",
-    "grade": "Punteggio",
+    "feedback": "Feedback",
+    "grade": "Valutazione",
     "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 2bed54f329a..bfa3698fe22 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 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 4a3ec60edd4..a4266d2d6f4 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": "Cijfer",
+    "grade": "Beoordeling",
     "grades": "Cijfers",
     "itemname": "Itemnaam",
     "lettergrade": "Letterbeoordeling",
     "nooutcome": "Geen competentie",
     "percentage": "Percentage",
     "range": "Marge",
-    "rank": "Rangschikking",
+    "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 e0e72a5b70e..44e378ae1b1 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": "Oceny",
+    "grades": "Stopnie",
     "itemname": "Nazwa pozycji",
     "lettergrade": "Nazwy ocen",
     "nooutcome": "Brak efektu kształcenia",
     "percentage": "Procentowo",
     "range": "Zakres",
-    "rank": "Pozycja",
+    "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 22749a08522..d489ce5db62 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": "Comentários",
-    "grade": "Avaliação",
+    "feedback": "Feedback",
+    "grade": "Nota",
     "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 3dc103cd4b6..e0d486df8e3 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": "Comentários",
-    "grade": "Avaliação",
-    "grades": "Pauta",
+    "feedback": "Feedback",
+    "grade": "Nota",
+    "grades": "Notas",
     "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 03c1080cff7..f0ab52efac5 100644
--- a/www/core/components/grades/lang/ro.json
+++ b/www/core/components/grades/lang/ro.json
@@ -1,9 +1,9 @@
 {
-    "average": "Medie",
+    "average": "Media",
     "badgrade": "Nota furnizată nu este corectă",
     "contributiontocoursetotal": "Contribuția la totalul cursului",
     "feedback": "Feedback",
-    "grade": "Notează",
+    "grade": "Notă",
     "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 f1f6126713c..05c8c10d084 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/sr-cr.json b/www/core/components/grades/lang/sr-cr.json
new file mode 100644
index 00000000000..dba951d9477
--- /dev/null
+++ b/www/core/components/grades/lang/sr-cr.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/sr-lt.json b/www/core/components/grades/lang/sr-lt.json
new file mode 100644
index 00000000000..88e41afc3cb
--- /dev/null
+++ b/www/core/components/grades/lang/sr-lt.json
@@ -0,0 +1,15 @@
+{
+    "average": "Prosečno",
+    "badgrade": "Data ocena je neispravna",
+    "contributiontocoursetotal": "Doprinos ukupnoj oceni na kursu",
+    "feedback": "Povratne informacije",
+    "grade": "Ocena",
+    "grades": "Ocene",
+    "itemname": "Naziv stavke",
+    "lettergrade": "Slovna ocena",
+    "nooutcome": "Bez ishoda učenja",
+    "percentage": "Procenat",
+    "range": "Opseg",
+    "rank": "Rang",
+    "weight": "Ponder"
+}
\ 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 45d3e21b56d..7593dadca0f 100644
--- a/www/core/components/grades/lang/sv.json
+++ b/www/core/components/grades/lang/sv.json
@@ -1,15 +1,15 @@
 {
-    "average": "Medel",
+    "average": "Medelvärde",
     "badgrade": "Det betyg som har avgivits är ogiltigt",
     "contributiontocoursetotal": "Bidrag till totalen för kursen",
     "feedback": "Återkoppling",
-    "grade": "Betyg/omdöme",
-    "grades": "Betyg",
+    "grade": "Betyg",
+    "grades": "Betyg/omdömen",
     "itemname": "Namn på komponent",
     "lettergrade": "Bokstavsbetyg/omdöme",
     "nooutcome": "Inget resultat",
     "percentage": "Procenttal",
     "range": "Omfång",
-    "rank": "Rangordna",
+    "rank": "Ranking",
     "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 b50d05f02ad..a604f01f390 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": "Geri bildirim",
-    "grade": "Not",
-    "grades": "Notlar",
+    "feedback": "Geribildirim",
+    "grade": "Başarı notu",
+    "grades": "Başarı 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 90a3c3ea978..ae349f2a21c 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 9a3d42259f1..acd9a162913 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 ad4dc4b8ff6..e108db854ad 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 e58f7ef0a9d..a94d3680494 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 42351bce95a..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": "За пълен достъп до този сайт трябва първо да си създадете профил.",
@@ -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 d14a659e218..30577d6307d 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": "L'URL no és vàlid",
+    "invalidurl": "L'URL que heu introduït 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": "Clau d'inscripció",
+    "password": "Contrasenya",
     "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 8b4a2c704cd..05d01526f05 100644
--- a/www/core/components/login/lang/cs.json
+++ b/www/core/components/login/lang/cs.json
@@ -1,17 +1,17 @@
 {
     "auth_email": "Registrace na základě e-mailu",
     "authenticating": "Autentizace",
-    "cancel": "Přerušit",
+    "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",
@@ -19,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í.",
@@ -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": "Neplatná URL",
+    "invalidurl": "Použité URL není platné",
     "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": "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": "Sdílené heslo",
+    "password": "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 73378e4f7a3..2814f984626 100644
--- a/www/core/components/login/lang/da.json
+++ b/www/core/components/login/lang/da.json
@@ -2,7 +2,7 @@
     "authenticating": "Godkender",
     "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",
@@ -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",
+    "invalidurl": "Den URL, du har skrevet, er ikke korrekt",
     "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",
+    "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.",
@@ -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": "Delt hemmelig streng",
+    "password": "Adgangskode",
     "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 2c1061d3f43..deda25e1172 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",
@@ -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",
+    "invalidurl": "Die eingegebene URL ist nicht gültig.",
     "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.",
@@ -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": "Kennwort",
+    "password": "Öffentliches 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 ddfa99ae3f0..6ed49de1648 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": "Σύνδεση!",
@@ -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",
     "erroraccesscontrolalloworigin": "Η κλήση πολλαπλών προελεύσεων (Cross-Origin call) που προσπαθείτε να εκτελέσετε έχει απορριφθεί. Παρακαλώ ελέγξτε https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -28,7 +28,7 @@
     "invalidmoodleversion": "Μη έγκυρη έκδοση Moodle. Η ελάχιστη απαιτούμενη έκδοση είναι η 2.4.",
     "invalidsite": "Η διεύθυνση ιστότοπου δεν είναι έγκυρη.",
     "invalidtime": "Μη έγκυρη ώρα",
-    "invalidurl": "Το URL που εισαγάγατε δεν είναι έγκυρο",
+    "invalidurl": "Μη έγκυρο URL",
     "invalidvaluemax": "Η μεγαλύτερη τιμή είναι {{$a}}",
     "invalidvaluemin": "Η μικρότερη τιμή είναι {{$a}}",
     "localmobileunexpectedresponse": "Ο έλεγχος επιπρόσθετων λειτουργιών τη εφαρμοργής για κινητά Moodle επέστρεψε μια απροσδόκητη απόκριση, θα πιστοποιηθείτε χρησιμοποιώντας την τυπική υπηρεσία κινητής τηλεφωνίας.",
@@ -44,7 +44,7 @@
     "newaccount": "Νέος λογαριασμός",
     "newsitedescription": "Καταχωρίστε τη διεύθυνση URL του ιστότοπού σας Moodle. Σημειώστε ότι ενδέχεται να μην έχει ρυθμιστεί να λειτουργεί με αυτήν την εφαρμογή.",
     "notloggedin": "Πρέπει να συνδεθείτε",
-    "password": "Κωδικός",
+    "password": "Κωδικός πρόσβασης",
     "passwordrequired": "Απαιτείται κωδικός πρόσβασης",
     "policyaccept": "Καταλαβαίνω και συμφωνώ",
     "policyagree": "Πρέπει να συμφωνήσετε σε αυτήν την πολιτική για να συνεχίσετε στο ιστοχώρο. Συμφωνείτε;",
diff --git a/www/core/components/login/lang/es-mx.json b/www/core/components/login/lang/es-mx.json
index 6bf776afc12..858db740994 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",
@@ -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": "URL no válida",
+    "invalidurl": "La URL introducida no es 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",
+    "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.",
@@ -44,13 +44,13 @@
     "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": "Secreto Compartido",
+    "password": "Contraseña",
     "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?",
     "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:",
+    "potentialidps": "Ingrese usando su cuenta en:",
     "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 db20e532710..2bf64c84d37 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>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",
@@ -28,12 +28,12 @@
     "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": "La URL introducida no es 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.",
     "loggedoutssodescription": "Tiene que autenticarse nuevamente. Necesita acceder al sitio en una ventana del navegador.",
-    "login": "Acceder",
+    "login": "Acceder con su cuenta",
     "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>",
@@ -44,7 +44,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": "Clave de matriculación",
+    "password": "Contraseña",
     "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 61b1d730666..d8feb394e24 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>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",
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "Moodle bertsio baliogabea. Gutxieneko bertsioa hurrengoa da:",
     "invalidsite": "Guneko URLa ez da zuzena",
     "invalidtime": "Ordu baliogabea",
-    "invalidurl": "URL baliogabea",
+    "invalidurl": "Sartu duzun URL-a ez da onargarria",
     "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",
+    "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>",
@@ -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": "Partekatutako sekretua",
+    "password": "Pasahitza",
     "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 742e9639285..ede4296c505 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 091525791f0..631db476ebc 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",
@@ -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 non valide",
+    "invalidurl": "L'URL que vous venez de saisir n'est pas 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.",
@@ -44,7 +44,7 @@
     "newaccount": "Nouveau compte",
     "newsitedescription": "Veuillez saisir l'URL de votre plateforme Moodle.",
     "notloggedin": "Vous devez être connecté.",
-    "password": "Secret partagé",
+    "password": "Mot de passe",
     "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 6fdfc343515..9d40a0cfdfa 100644
--- a/www/core/components/login/lang/he.json
+++ b/www/core/components/login/lang/he.json
@@ -2,7 +2,7 @@
     "authenticating": "מאמת נתונים",
     "cancel": "ביטול",
     "confirmdeletesite": "האם את/ה בטוח/ה שברצונך למחוק את האתר {{sitename}}?",
-    "connect": "התחברות!",
+    "connect": "חיבור",
     "connecttomoodle": "התחברות למוודל",
     "createaccount": "יצירת חשבון חדש",
     "createuserandpass": "הזנת שם־משתמש וסיסמה",
@@ -20,8 +20,8 @@
     "invalidemail": "כתובת דואר אלקטרוני לא תקפה",
     "invalidmoodleversion": "גרסת מוודל לא תקינה. נדרשת גרסה 2.4 ומעלה.",
     "invalidsite": "כתובת האתר אינה תקינה.",
-    "invalidurl": "URL לא חוקי",
-    "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": "סיסמה (secret)",
+    "password": "סיסמה",
     "passwordrequired": "דרושה סיסמה",
     "policyaccept": "אני מבין ומסכים",
     "policyagree": "הינך חייב לאשר את מדיניות זו על מנת להמשיך להשתמש באתר זה. האם אתה מסכים?",
diff --git a/www/core/components/login/lang/hu.json b/www/core/components/login/lang/hu.json
index c5c7c062990..0a23a2b4fce 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": "A megadott URL nem érvényes",
+    "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",
@@ -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": "Megosztott titkos jel",
+    "password": "Jelszó",
     "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 7cec597a221..bea999f99be 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",
@@ -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": "L'URL non è valido",
+    "invalidurl": "L'URL inserito 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": "Password",
+    "password": "Shared Secret",
     "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 7dab53a83d0..dcc69fa6709 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": "あなたのアカウントにログインする:",
     "loginbutton": "ログイン",
     "logininsiterequired": "ブラウザウインドウからサイトにログインする必要があります。",
     "loginsteps": "このサイトにフルアクセスするため、あなたは最初にアカウントを作成する必要があります。",
@@ -25,7 +25,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 f5e96ef8b35..d591b88110a 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": "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į",
     "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",
@@ -19,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.",
@@ -28,14 +28,14 @@
     "invalidmoodleversion": "Negaliojanti Moodle versija. Turi būt ne senesnė nei 2.4.",
     "invalidsite": "URL adresas netinkamas.",
     "invalidtime": "Netinkamas laikas",
-    "invalidurl": "Klaidingas URL",
+    "invalidurl": "Jūsų ką tik įvestas URL yra neleistinas",
     "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>",
+    "loginsteps": "Jei norite gauti visą prieigą prie svetainės, turite pirmiausiai sukurti savo paskyrą.",
     "missingemail": "Nėra el. pašto adreso",
     "missingfirstname": "Nėra pavadinimo",
     "missinglastname": "Nėra pavardės",
@@ -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": "Bendra paslaptis",
+    "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?",
diff --git a/www/core/components/login/lang/nl.json b/www/core/components/login/lang/nl.json
index c0cf35dece7..0ce52512c27 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",
@@ -28,12 +28,12 @@
     "invalidmoodleversion": "Ongeldige Moodleversie. De vereiste minimumversie is:",
     "invalidsite": "Deze site-URL is niet geldig.",
     "invalidtime": "Ongeldige tijd",
-    "invalidurl": "Ongeldige url",
+    "invalidurl": "De URL die je net gaf is niet geldig",
     "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 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": "Gedeeld geheim",
+    "password": "Wachtwoord",
     "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 b4472737bff..3fbd9ef1040 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": "URL właśnie wprowadzony nie jest poprawny",
     "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": "Wspólne tajne hasło",
+    "password": "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 e46b244e75a..0fbd58b4cce 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",
@@ -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",
+    "invalidurl": "A URL inserida não é vá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": "Acessar",
+    "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.",
@@ -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": "Segredo compartilhado",
+    "password": "Senha",
     "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 80424147ec3..9faa9559aea 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>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",
@@ -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": "URL inválido",
+    "invalidurl": "O URL que introduziu não é vá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": "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 partilhada",
+    "password": "Senha",
     "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": "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 7eac7e64d7d..3ee06d65b14 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": "Conectare!",
+    "connect": "Conectează",
     "connecttomoodle": "Conectare la Moodle",
     "createaccount": "Creează noul meu cont",
     "createuserandpass": "Alege un nume de utilizator şi o parolă",
@@ -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 incorect",
+    "invalidurl": "URL-ul pe care l-aţi introdus nu este corect",
     "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": "Cheie înscriere",
+    "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?",
@@ -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": "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 cb180bd40f9..5581e5945d2 100644
--- a/www/core/components/login/lang/ru.json
+++ b/www/core/components/login/lang/ru.json
@@ -1,8 +1,8 @@
 {
     "authenticating": "Аутентификация",
-    "cancel": "Отмена",
+    "cancel": "Отменить",
     "confirmdeletesite": "Вы уверены, что хотите удалить сайт {{sitename}}?",
-    "connect": "Подключено!",
+    "connect": "Подключить",
     "connecttomoodle": "Подключение к Moodle",
     "createaccount": "Сохранить",
     "createuserandpass": "Выберите имя пользователя и пароль",
@@ -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": "Вы указали некорректный адрес",
     "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/sr-cr.json b/www/core/components/login/lang/sr-cr.json
index d4ba2b2f360..02536b4de35 100644
--- a/www/core/components/login/lang/sr-cr.json
+++ b/www/core/components/login/lang/sr-cr.json
@@ -1,34 +1,56 @@
 {
     "auth_email": "Самостална регистрација на основу е-адресе",
     "authenticating": "Провера идентитета",
+    "cancel": "Одустани",
     "checksiteversion": "Проверите да ли ваш сајт користи Moodle 2.4 или новију верзију.",
     "confirmdeletesite": "Да ли сте сигурни да желите да обришете сајт {{sitename}}?",
-    "connect": "Повежите се!",
+    "connect": "Успостави везу",
     "connecttomoodle": "Повежите се са Moodleom",
     "contactyouradministrator": "Обратите се администратору вашег сајта за даљу помоћ.",
     "contactyouradministratorissue": "Замолите администратора да провери следећи проблем: {{$a}}",
+    "createaccount": "Креирај мој нови кориснички налог",
+    "createuserandpass": "Изаберите своје корисничко име и лозинку за приступ систему",
     "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",
     "errordeletesite": "Дошло је до грешке приликом брисања овог сајта. Молим, покушајте поново.",
     "errorupdatesite": "Дошло је до грешке приликом ажурирању токена сајта.",
+    "firsttime": "Да ли сте овде први пут?",
+    "getanothercaptcha": "Преузмите други CAPTCHА",
+    "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>teacher</i> или <i>student</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 додатних функционалности вратила је неочекиван одговор. Ваш идентитет биће проверен помоћу стандардног мобилнog сервиса.",
     "loggedoutssodescription": "Морате поново да потврдите свој идентитет. Потребно је да се пријавите на сајт у прозору веб читача.",
+    "login": "Пријава",
     "loginbutton": "Пријава",
     "logininsiterequired": "Потребно је да се пријавите на сајт у прозору веб читача.",
+    "loginsteps": "Како бисте имали пуни приступ овом сајту морате креирати кориснички налог.",
+    "missingemail": "Недостаје адреса е-поште",
+    "missingfirstname": "Недостаје име",
+    "missinglastname": "Недостаје презиме",
     "mobileservicesnotenabled": "Мобилни сервиси нису омогућени на вашем сајту. Обратите се администратору вашег Moodle сајта ако мислите да мобилни приступ треба да буде омогућен.",
+    "newaccount": "Нови кориснички налог",
     "newsitedescription": "Унесите  URL адресу вашег Moodle сајта. Имајте на уму да сајт можда није конфигурисан да ради са овом апликацијом.",
     "notloggedin": "Морате бити пријављени.",
+    "password": "Лозинка",
     "passwordrequired": "Неопходна је лозинка",
+    "policyaccept": "Разумем и пристајем",
+    "policyagree": "Да би сте наставили коришћење овог сајта морате се сложити са правилима коришћења. Да ли се слажете?",
+    "policyagreement": "Сагласност са правилником о коришћењу сајта",
+    "policyagreementclick": "Линк ка правилнику о коришћењу сајта",
+    "potentialidps": "Пријавите се користећи свој налог на:",
     "problemconnectingerror": "Имамо проблема да се повежемо са",
     "problemconnectingerrorcontinue": "Добро проверите да ли сте правилно унели адресу и покушајте поново.",
     "profileinvaliddata": "Неисправна вредност",
@@ -36,14 +58,20 @@
     "reconnect": "Повежите се поново",
     "reconnectdescription": "Ваш токен за проверу идентитета је неисправан или је истекао. Морате поново да успоставите везу са сајтом.",
     "reconnectssodescription": "Ваш токен за проверу идентитета је неисправан или је истекао. Морате поново да успоставите везу са сајтом. Потребно је да се пријавите на сајт у прозору веб читача.",
+    "security_question": "Безбедносно питање",
+    "selectacountry": "Изабери државу",
     "signupplugindisabled": "{{$a}} није омогућен.",
     "siteaddress": "Адреса сајта",
     "siteinmaintenance": "Ваш сајт је у режиму одржавања",
     "sitepolicynotagreederror": "Сагласност са политиком сајта није потврђена.",
     "siteurl": "URL адреса сајта",
     "siteurlrequired": "Неопходна је URL адреса, нпр. <i>http://www.yourmoodlesite.abc или 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/login/lang/sr-lt.json b/www/core/components/login/lang/sr-lt.json
index 63bb0dd2d9f..c6c52fd2e54 100644
--- a/www/core/components/login/lang/sr-lt.json
+++ b/www/core/components/login/lang/sr-lt.json
@@ -1,34 +1,56 @@
 {
     "auth_email": "Samostalna registracija na osnovu e-adrese",
     "authenticating": "Provera identiteta",
+    "cancel": "Odustani",
     "checksiteversion": "Proverite da li vaš sajt koristi Moodle 2.4 ili noviju verziju.",
     "confirmdeletesite": "Da li ste sigurni da želite da obrišete sajt {{sitename}}?",
-    "connect": "Povežite se!",
+    "connect": "Uspostavi vezu",
     "connecttomoodle": "Povežite se sa Moodleom",
     "contactyouradministrator": "Obratite se administratoru vašeg sajta za dalju pomoć.",
     "contactyouradministratorissue": "Zamolite administratora da proveri sledeći problem: {{$a}}",
+    "createaccount": "Kreiraj moj novi korisnički nalog",
+    "createuserandpass": "Izaberite svoje korisničko ime i lozinku za pristup sistemu",
     "credentialsdescription": "Za prijavu na sistem unesite svoje korisničko ime i lozinku.",
-    "emailconfirmsent": "<p>Trebalo bi da je poslata poruka na vašu e-adresu <b>{{$a}}</b></p><p>Poruka sadrži jednostavna uputstva o daljem postupku registracije.</p><p>Ako i dalje imate problema, obratite se administratoru sajta.</p>",
+    "emailconfirmsent": "<p>Trebalo bi da je poslata e-poruka na vašu adresu <b>{{$a}}</b></p>\n<p>Poruka sadrži jednostavna uputstva o daljem postupku registracije.</p>\n<p>Ako i dalje imate problema, kontaktirajte administratora.</p>",
     "emailnotmatch": "Adrese e-pošte se ne poklapaju",
+    "enterthewordsabove": "Unesite reč iznad",
     "erroraccesscontrolalloworigin": "Cross-Origin poziv koji pokušavate da izvedete je odbijen. Molimo, proverite https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
     "errordeletesite": "Došlo je do greške prilikom brisanja ovog sajta. Molim, pokušajte ponovo.",
     "errorupdatesite": "Došlo je do greške prilikom ažuriranju tokena sajta.",
+    "firsttime": "Da li ste ovde prvi put?",
+    "getanothercaptcha": "Preuzmite drugi CAPTCHA",
+    "help": "Pomoć",
     "helpmelogin": "<p>Širom sveta postoji više hiljada Moodle sajtova. Ova aplikacija može se povezati samo sa Moodle sajtovima koji su namenski omogućili pristup aplikacijama za mobilne uređaje.</p><p>Ako ne možete da se povežete sa vašim Moodle sajtom potrebno je da se obratite Moodle administratoru sajta sa kojim želite da se povežete i da ga zamolite da pročita<a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a></p><p>Za testiranje aplikacije na Moodle demo sajtu unesite <i>teacher</i> ili <i>student</i> u polje <i>Adresa sajta</i> i kliknite na dugme <b>Poveži se!</b>.</p>",
+    "instructions": "Uputstva",
     "invalidaccount": "Proverite svoje podatke za prijavu ili zamolite vašeg administratora da proveri konfiguraciju sajta.",
     "invaliddate": "Neispravan datum",
+    "invalidemail": "Neispravna adresa elektronske pošte",
     "invalidmoodleversion": "Neispravna Moodle verzija. Neophodna je, minimalno, verzija 2.4.",
     "invalidsite": "URL adresa sajt nije ispravna.",
     "invalidtime": "Neispravno vreme",
+    "invalidurl": "Neispravan url",
     "invalidvaluemax": "Maksimalna vrednost je {{$a}}",
     "invalidvaluemin": "Minimalna vrednost je {{$a}}",
     "localmobileunexpectedresponse": "Provera Moodle Mobile dodatnih funkcionalnosti vratila je neočekivan odgovor. Vaš identitet biće proveren pomoću standardnog mobilnog servisa.",
     "loggedoutssodescription": "Morate ponovo da potvrdite svoj identitet. Potrebno je da se prijavite na sajt u prozoru veb čitača.",
+    "login": "Prijava",
     "loginbutton": "Prijava",
     "logininsiterequired": "Potrebno je da se prijavite na sajt u prozoru veb čitača.",
+    "loginsteps": "Kako biste imali puni pristup ovom sajtu morate kreirati korisnički nalog.",
+    "missingemail": "Nedostaje adresa e-pošte",
+    "missingfirstname": "Nedostaje ime",
+    "missinglastname": "Nedostaje prezime",
     "mobileservicesnotenabled": "Mobilni servisi nisu omogućeni na vašem sajtu. Obratite se administratoru vašeg Moodle sajta ako mislite da mobilni pristup treba da bude omogućen.",
+    "newaccount": "Novi korisnički nalog",
     "newsitedescription": "Unesite  URL adresu vašeg Moodle sajta. Imajte na umu da sajt možda nije konfigurisan da radi sa ovom aplikacijom.",
     "notloggedin": "Morate biti prijavljeni.",
+    "password": "Lozinka",
     "passwordrequired": "Neophodna je lozinka",
+    "policyaccept": "Razumem i pristajem",
+    "policyagree": "Da bi ste nastavili korišćenje ovog sajta morate se složiti sa pravilima korišćenja. Da li se slažete?",
+    "policyagreement": "Saglasnost sa pravilnikom o korišćenju sajta",
+    "policyagreementclick": "Link ka pravilniku o korišćenju sajta",
+    "potentialidps": "Prijavite se koristeći svoj nalog na:",
     "problemconnectingerror": "Imamo problema da se povežemo sa",
     "problemconnectingerrorcontinue": "Dobro proverite da li ste pravilno uneli adresu i pokušajte ponovo.",
     "profileinvaliddata": "Neispravna vrednost",
@@ -36,14 +58,20 @@
     "reconnect": "Povežite se ponovo",
     "reconnectdescription": "Vaš token za proveru identiteta je neispravan ili je istekao. Morate ponovo da uspostavite vezu sa sajtom.",
     "reconnectssodescription": "Vaš token za proveru identiteta je neispravan ili je istekao. Morate ponovo da uspostavite vezu sa sajtom. Potrebno je da se prijavite na sajt u prozoru veb čitača.",
+    "security_question": "Bezbednosno pitanje",
+    "selectacountry": "Izaberi državu",
     "signupplugindisabled": "{{$a}} nije omogućen.",
     "siteaddress": "Adresa sajta",
     "siteinmaintenance": "Vaš sajt je u režimu održavanja",
     "sitepolicynotagreederror": "Saglasnost sa politikom sajta nije potvrđena.",
     "siteurl": "URL adresa sajta",
     "siteurlrequired": "Neophodna je URL adresa, npr. <i>http://www.yourmoodlesite.abc ili https://www.yourmoodlesite.efg</i>",
+    "startsignup": "Kreiraj novi nalog",
     "stillcantconnect": "Još uvek ne možete da se povežete?",
+    "supplyinfo": "Više detalja",
+    "username": "Korisničko ime",
     "usernamerequired": "Korisničko ime je neophodno",
+    "usernotaddederror": "Korisnik nije dodat - greška",
     "visitchangepassword": "Da li želite da posetite sajt kako biste promenili lozinku?",
     "webservicesnotenabled": "Veb servisi nisu omogućeni na vašem sajtu. Obratite se administratoru vašeg Moodle sajta ako mislite da mobilni pristup treba da bude omogućen."
 }
\ No newline at end of file
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index b4041bf5a3d..87c32b79e13 100644
--- a/www/core/components/login/lang/sv.json
+++ b/www/core/components/login/lang/sv.json
@@ -2,16 +2,16 @@
     "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.",
     "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>",
+    "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",
     "errordeletesite": "Ett fel inträffade vid borttagning av denna webbsida. Var god försök igen.",
     "errorupdatesite": "Ett fel inträffade vid uppdatering av webbplatsens token.",
-    "firsttime": "Är det första gången Du är här?",
+    "firsttime": "Är det första gången du är här?",
     "getanothercaptcha": "Skaffa en  CAPTCHA till",
     "help": "Hjälp",
     "helpmelogin": "<p> För att logga in måste du kontrollera att: </ p> 1. Moodle webbplats är version 2.4 eller högre <br /> 2. Moodle administratören har aktiverat Mobil åtkomst <br... /> <br /> <p> För att testa appen på en Moodle demo site skriv <i> lärare </ i> eller <i> elev </ i> i <i>  i fält för Användarnamn </ i>och klicka på <b> Lägg till knapp </ b>. </ p> <a href='http://docs.moodle.org/en/Mobile_app' target='_blank'> Besök Moodle webbplats för mer detaljerad Moodle information och hjälp. </ a> </ p>",
@@ -20,12 +20,12 @@
     "invalidemail": "Ogiltig e-postadress",
     "invalidmoodleversion": "Ogiltig Moodle version. Lägsta version som krävs är",
     "invalidsite": "Den webbadress är ogiltig.",
-    "invalidurl": "Ogiltig url",
+    "invalidurl": "Den URL som du just matade in är inte giltig",
     "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!",
+    "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!",
     "missingemail": "E-postadress saknas",
     "missingfirstname": "Förnamn saknas",
     "missinglastname": "Efternamn saknas",
@@ -33,10 +33,10 @@
     "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": "Kursnyckel",
     "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?",
+    "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å:",
diff --git a/www/core/components/login/lang/tr.json b/www/core/components/login/lang/tr.json
index 46bf85328fd..f038892a59f 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",
-    "login": "Giriş yap",
+    "invalidurl": "Girdiğiniz URL geçerli değil",
+    "login": "Giriş",
     "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": "Şifre",
+    "password": "Kayıt anahtarı",
     "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 1504411013a..ea30adb385f 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": "<p>Лист повинен бути відправлений на Вашу електронну адресу в <b>{{$a}}</b></p><p>Він містить прості інструкції для завершення реєстрації.</p><p>Якщо ви продовжуєте зазнавати труднощів, зверніться до адміністратора сайту.</p>",
+    "emailconfirmsent": "На зазначену Вами адресу електронної пошти (<b>{{$a}}</b>) було відправлено листа з інструкціями із завершення реєстрації. Якщо у Вас з'являться проблеми з реєстрацією, зв'яжіться з адміністратором сайту.",
     "emailnotmatch": "Email не співпадають",
     "enterthewordsabove": "Введіть символи, які бачите вище",
     "erroraccesscontrolalloworigin": "Cross-Origin дзвінок був відхилений. Будь ласка, перевірте https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
@@ -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 64f858f8e48..c52e6caccd2 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地址没填",
@@ -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 bb2823d16de..3065f563403 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> <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",
@@ -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": "無效的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>",
@@ -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 b9b6af53575..f2bdf1cf476 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 f375fb3b363..332093fefd8 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 bbc66f32d73..ff6940799c5 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": "Splněno",
-    "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": "Hodnocení",
     "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 843f20d8b39..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": "Tilbagemelding",
+    "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 283d84af335..13546545b41 100644
--- a/www/core/components/question/lang/el.json
+++ b/www/core/components/question/lang/el.json
@@ -6,14 +6,14 @@
     "errorattachmentsnotsupported": "Η εφαρμογή δεν υποστηρίζει ακόμα την προσάρτηση αρχείων σε απαντήσεις.",
     "errorinlinefilesnotsupported": "Η εφαρμογή δεν υποστηρίζει ακόμα την επεξεργασία αρχείων.",
     "errorquestionnotsupported": "Αυτός ο τύπος ερωτήματος δεν υποστηρίζεται από την εφαρμογή: {{$a}}.",
-    "feedback": "Ανάδραση",
+    "feedback": "Επανατροφοδότηση",
     "howtodraganddrop": "Πατήστε για να επιλέξετε και στη συνέχεια, πατήστε για να αφήσετε.",
     "incorrect": "Λάθος",
     "invalidanswer": "Ημιτελής απάντηση",
-    "notanswered": "Δεν απαντήθηκε ακόμα",
+    "notanswered": "Δεν απαντήθηκε",
     "notyetanswered": "Δεν έχει απαντηθεί ακόμα",
     "partiallycorrect": "Μερικώς σωστή",
     "questionmessage": "Ερώτηση {{$a}}: {{$b}}",
     "questionno": "Ερώτηση {{$a}}",
-    "unknown": "Δεν είναι δυνατός ο προσδιορισμός της κατάστασης"
+    "unknown": "Άγνωστο"
 }
\ 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 c9008738aea..f304a7602ec 100644
--- a/www/core/components/question/lang/es-mx.json
+++ b/www/core/components/question/lang/es-mx.json
@@ -1,21 +1,21 @@
 {
     "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}}.",
-    "feedback": "Comentario de retroalimentación",
+    "feedback": "Retroalimentación",
     "howtodraganddrop": "Tocar para seleccionar y tocar para soltar",
     "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 d42f0b106e2..eca0b6c7e61 100644
--- a/www/core/components/question/lang/es.json
+++ b/www/core/components/question/lang/es.json
@@ -1,21 +1,21 @@
 {
     "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}}.",
-    "feedback": "Comentario",
+    "feedback": "Retroalimentación",
     "howtodraganddrop": "Tocar para seleccionar y tocar para soltar.",
     "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 bf1d5eba5a2..64e56570cf2 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 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..2d12cd98d1f 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 364ddbf3b09..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",
-    "feedback": "Commento",
-    "incorrect": "Sbagliato",
+    "correct": "Risposta corretta",
+    "feedback": "Feedback",
+    "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 4e598e09955..fc31749789f 100644
--- a/www/core/components/question/lang/lt.json
+++ b/www/core/components/question/lang/lt.json
@@ -1,21 +1,21 @@
 {
-    "answer": "Atsakyti",
+    "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 4f7986546d1..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": "Comentários",
+    "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 abe2dc4c3bd..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",
+    "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/sr-cr.json b/www/core/components/question/lang/sr-cr.json
index ffe53b968b1..eb8373f0d60 100644
--- a/www/core/components/question/lang/sr-cr.json
+++ b/www/core/components/question/lang/sr-cr.json
@@ -1,8 +1,21 @@
 {
+    "answer": "Одговор",
+    "answersaved": "Одговор је сачуван",
+    "complete": "Потпуно",
+    "correct": "Тачно",
     "errorattachmentsnotsupported": "Апликација још увек не подржава могућност да се датотеке придруже уз одговоре.",
     "errorinlinefilesnotsupported": "Апликација још увек не подржава уређивање унутар датотека.",
     "errorquestionnotsupported": "Апликација не подржава овај тип питања: {{$a}}.",
+    "feedback": "Повратне информације",
     "howtodraganddrop": "Додирните за избор, затим још једном за спуштање.",
+    "incorrect": "Нетачно",
+    "information": "Информација",
+    "invalidanswer": "Непотпун одговор",
+    "notanswered": "Још нису одговорили",
+    "notyetanswered": "Није још одговорено",
+    "partiallycorrect": "Делимично тачно",
     "questionmessage": "Питање {{$a}}: {{$b}}",
-    "unknown": "Није могуће утврдити статус"
+    "questionno": "Питање {{$a}}",
+    "requiresgrading": "Захтева оцењивање",
+    "unknown": "Непознато"
 }
\ No newline at end of file
diff --git a/www/core/components/question/lang/sr-lt.json b/www/core/components/question/lang/sr-lt.json
index 938634ec0ad..cd455cf48ae 100644
--- a/www/core/components/question/lang/sr-lt.json
+++ b/www/core/components/question/lang/sr-lt.json
@@ -1,8 +1,21 @@
 {
+    "answer": "Odgovor",
+    "answersaved": "Odgovor je sačuvan",
+    "complete": "Potpuno",
+    "correct": "Tačno",
     "errorattachmentsnotsupported": "Aplikacija još uvek ne podržava mogućnost da se datoteke pridruže uz odgovore.",
     "errorinlinefilesnotsupported": "Aplikacija još uvek ne podržava uređivanje unutar datoteka.",
     "errorquestionnotsupported": "Aplikacija ne podržava ovaj tip pitanja: {{$a}}.",
+    "feedback": "Povratne informacije",
     "howtodraganddrop": "Dodirnite za izbor, zatim još jednom za spuštanje.",
+    "incorrect": "Netačno",
+    "information": "Informacija",
+    "invalidanswer": "Nepotpun odgovor",
+    "notanswered": "Još nisu odgovorili",
+    "notyetanswered": "Nije još odgovoreno",
+    "partiallycorrect": "Delimično tačno",
     "questionmessage": "Pitanje {{$a}}: {{$b}}",
-    "unknown": "Nije moguće utvrditi status"
+    "questionno": "Pitanje {{$a}}",
+    "requiresgrading": "Zahteva ocenjivanje",
+    "unknown": "Nepoznato"
 }
\ No newline at end of file
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 6de0e3edb23..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": "Geri bildirim",
+    "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/uk.json b/www/core/components/question/lang/uk.json
index a4c6af3fe0f..c883b7f6b21 100644
--- a/www/core/components/question/lang/uk.json
+++ b/www/core/components/question/lang/uk.json
@@ -6,16 +6,16 @@
     "errorattachmentsnotsupported": "Додаток не підтримує прикріплення файлів відповідей",
     "errorinlinefilesnotsupported": "Додаток ще не підтримує редагування вбудованих файлів.",
     "errorquestionnotsupported": "Цей тип питання не підтримується додатком: {{$a}}.",
-    "feedback": "Відгук",
+    "feedback": "Коментар",
     "howtodraganddrop": "Натисніть, щоб вибрати і перемістить.",
     "incorrect": "Неправильно",
     "information": "Інформація",
     "invalidanswer": "Неповна відповідь",
-    "notanswered": "Відповіді ще не було",
+    "notanswered": "Відповіді не було",
     "notyetanswered": "Відповіді ще не було",
     "partiallycorrect": "Частково правильно",
     "questionmessage": "Питання {{$a}}: {{$b}}",
     "questionno": "Питання {{$a}}",
     "requiresgrading": "Потрібно оцінити",
-    "unknown": "Неможливо визначити статус"
+    "unknown": "Невідоме"
 }
\ No newline at end of file
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 fae7dd88622..0f8555c7b08 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 9ac4a91d33b..4713f2eaf86 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 66977c70db9..a57b970ccac 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": "Inhabilitat",
+    "disabled": "La missatgeria està inhabilitada en aquest lloc",
     "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": "General",
+    "general": "Dades generals",
     "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": "Configuració",
+    "settings": "Paràmetres",
     "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 b9c0291c9ee..2d3d282ff2e 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": "Vypnuto",
+    "disabled": "Zakázáno",
     "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á nastavení",
+    "general": "Obecně",
     "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í úkolu",
+    "settings": "Nastavení",
     "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 d2ec20f3074..1ac0fb41308 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": "Beskedsystemet er deaktiveret",
+    "disabled": "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": "Generelt",
+    "general": "Generelle data",
     "language": "Sprog",
     "license": "Licens",
     "localnotifavailable": "Lokale meddelelser tilgængelige",
@@ -32,8 +32,9 @@
     "navigatorlanguage": "Navigatorsprog",
     "navigatoruseragent": "Navigator userAgent",
     "networkstatus": "Status for internetforbindelse",
+    "processorsettings": "Processorindstillinger",
     "reportinbackground": "Anmeld fejl automatisk",
-    "settings": "Opgaveindstillinger",
+    "settings": "Indstillinger",
     "sites": "Websteder",
     "spaceusage": "Pladsforbrug",
     "storagetype": "Lagertype",
@@ -42,7 +43,7 @@
     "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 ae82a9b0020..ee00cd09e80 100644
--- a/www/core/components/settings/lang/de.json
+++ b/www/core/components/settings/lang/de.json
@@ -17,8 +17,8 @@
     "deviceinfo": "Geräteinformationen",
     "deviceos": "Geräte-OS",
     "devicewebworkers": "Device Web Workers unterstützt",
-    "disableall": "Benachrichtungen ausschalten",
-    "disabled": "Deaktiviert",
+    "disableall": "Systemmitteilungen deaktivieren",
+    "disabled": "Die Mitteilungen sind für diese Website 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": "Grundeinträge",
+    "general": "Allgemeines",
     "language": "Sprache",
     "license": "Lizenz",
     "localnotifavailable": "Lokale Mitteilungen verfügbar",
@@ -52,7 +52,7 @@
     "synchronizing": "Synchronisieren ...",
     "syncsettings": "Synchronisieren",
     "syncsitesuccess": "Die Daten wurden synchronisiert.",
-    "total": "Insgesamt",
+    "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 cf6cad8002e..bb83893b28f 100644
--- a/www/core/components/settings/lang/el.json
+++ b/www/core/components/settings/lang/el.json
@@ -18,7 +18,7 @@
     "deviceos": "Λειτουργικό σύστημα συσκευής",
     "devicewebworkers": "Υποστηρίζονται οι συσκευές Web Workers",
     "disableall": "Προσωρινή απενεργοποίηση ειδοποιήσεων",
-    "disabled": "Ανενεργό",
+    "disabled": "Απενεργοποιημένο",
     "displayformat": "Μορφή εμφάνισης",
     "enabledebugging": "Ενεργοποίηση εντοπισμού σφαλμάτων",
     "enabledownloadsection": "Ενεργοποιήστε τις ενότητες λήψης",
@@ -30,7 +30,7 @@
     "errorsyncsite": "Παρουσιάστηκε σφάλμα κατά το συγχρονισμό των δεδομένων ιστότοπου, ελέγξτε τη σύνδεση στο διαδίκτυο και δοκιμάστε ξανά.",
     "estimatedfreespace": "Εκτιμώμενος ελεύθερος χώρος",
     "filesystemroot": "Σύστημα αρχείων root",
-    "general": "Γενικά",
+    "general": "Γενικά δεδομένα",
     "language": "Γλώσσα",
     "license": "Άδεια GPL",
     "localnotifavailable": "Διαθέσιμες τοπικές ειδοποιήσεις",
@@ -51,7 +51,7 @@
     "synchronizing": "Γίνεται συγχρονισμός",
     "syncsettings": "Ρυθμίσεις συγχρονισμού",
     "syncsitesuccess": "Τα δεδομένα ιστότοπου συγχρονίστηκαν και όλες οι προσωρινές μνήμες ακυρώθηκαν.",
-    "total": "Συνολικά",
+    "total": "Συνολικό",
     "versioncode": "Κωδικός έκδοσης",
     "versionname": "Όνομα έκδοσης",
     "wificonnection": "Σύνδεση WiFi"
diff --git a/www/core/components/settings/lang/es-mx.json b/www/core/components/settings/lang/es-mx.json
index 970bc7fb067..44e2c3879b8 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": "Deshabilitado",
+    "disabled": "La mensajería está deshabilitada en este sitio",
     "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": "General",
+    "general": "Datos generales",
     "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": "Configuración",
+    "settings": "Parámetros de la tarea",
     "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 9e144842444..7d88421e720 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": "Deshabilitado",
+    "disabled": "Desactivado",
     "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": "General",
+    "general": "Datos generales",
     "language": "Idioma",
     "license": "Licencia",
     "localnotifavailable": "Notificaciones locales disponibles",
@@ -43,7 +43,7 @@
     "privacypolicy": "Política de privacidad.",
     "processorsettings": "Ajustes de procesador",
     "reportinbackground": "Informar de los errores automáticamente",
-    "settings": "Configuración",
+    "settings": "Parámetros de la tarea",
     "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 15413f586dc..c63efde543b 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": "Mezularitza desgaituta dago gune honetan",
+    "disabled": "Desgaituta",
     "displayformat": "Erakusteko modua",
     "enabledebugging": "Gaitu arazketa",
     "enabledownloadsection": "Gaitu gaien deskarga",
@@ -30,20 +30,20 @@
     "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": "Online",
-    "loggedoff": "Ez dago online",
+    "loggedoff": "Lineaz kanpo",
     "navigatorlanguage": "Nabigatzailearen hizkuntza",
     "navigatoruseragent": "Nabigatzailearen userAgent-a",
     "networkstatus": "Internet konexioaren egoera",
     "privacypolicy": "Pribatutasun politika.",
     "processorsettings": "Prozesadorearen ezarpenak",
     "reportinbackground": "Erroreak automatikoki jakinarazi",
-    "settings": "Zereginaren ezarpenak",
+    "settings": "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 b0048cdfb24..338c8808fb7 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 5346109b332..81af1469a83 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ée",
+    "disabled": "Désactivé",
     "displayformat": "Format d'affichage",
     "enabledebugging": "Activer débogage",
     "enabledownloadsection": "Activer le téléchargement des sections",
@@ -30,20 +30,20 @@
     "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": "Hors ligne",
+    "loggedin": "En ligne",
+    "loggedoff": "Hors ligne",
     "navigatorlanguage": "Langue du navigateur",
     "navigatoruseragent": "UserAgent du navigateur",
     "networkstatus": "Statut de la connexion internet",
     "privacypolicy": "Politique de confidentialité",
     "processorsettings": "Réglage du processus d'envoi de messages",
     "reportinbackground": "Annoncer les erreurs automatiquement",
-    "settings": "Paramètres",
+    "settings": "Réglages",
     "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 85b2267e3b5..4b431f585e1 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 3def7a650fc..dabf3467e9f 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": "Ezen a portálon az üzenetküldés ki van kapcsolva",
+    "disabled": "Kikapcsolva",
     "enabledebugging": "Hibakeresés bekapcsolása",
     "estimatedfreespace": "Becsült szabad tárhely",
-    "general": "Általános",
+    "general": "Általános adatok",
     "language": "Nyelv",
-    "license": "Licenc",
+    "license": "Engedély:",
     "loggedin": "Bejelentkezve:",
     "loggedoff": "Kijelentkezve",
     "processorsettings": "Feldolgozó beállításai",
-    "settings": "Feladat beállításai",
+    "settings": "Beállítások",
     "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 72440991f47..e659bf2f70e 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": "In questo sito il messaging è disabilitato",
+    "disabled": "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": "Generale",
+    "general": "Dati generali",
     "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 compito",
+    "settings": "Impostazioni",
     "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 b410de256b4..d5905770aad 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 d2474dd8a26..79f4bc7a512 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šjungtas",
+    "disabled": "Išjungta",
     "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": "Bendra",
+    "general": "Bendrieji duomenys",
     "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": "Užduoties nuostatos",
+    "settings": "Parametrai",
     "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 622189c6fe3..19bfb28d023 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": "De berichtenservice is uitgeschakeld op deze site",
+    "disabled": "Uitgeschakeld",
     "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": "Algemeen",
+    "general": "Algemene gegevens",
     "language": "Taal",
     "license": "Licentie",
     "localnotifavailable": "Lokale meldingen beschikbaar",
@@ -43,7 +43,7 @@
     "privacypolicy": "Privacy-beleid",
     "processorsettings": "Processor instellingen",
     "reportinbackground": "Fouten automatisch rapporteren",
-    "settings": "Opdracht instellingen",
+    "settings": "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 3fcc31d278d..dcb9cd0ddb3 100644
--- a/www/core/components/settings/lang/pl.json
+++ b/www/core/components/settings/lang/pl.json
@@ -3,17 +3,17 @@
     "cacheexpirationtime": "Czas wygasania pamięci podręcznej (milisekundy)",
     "currentlanguage": "Aktualny język",
     "deletesitefiles": "Czy na pewno chcesz usunąć pliki pobrane z tej strony?",
-    "disableall": "Tymczasowo wyłącz powiadomienia",
-    "disabled": "Wyłączony",
+    "disableall": "Wyłącz powiadomienia",
+    "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",
     "loggedoff": "Nie zalogowany",
-    "settings": "Ustawienia zadania",
+    "settings": "Ustawienia",
     "sites": "Serwisy",
     "spaceusage": "Użyta przestrzeń",
-    "total": "Razem"
+    "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 adf77cf5dfd..28da97a0787 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": "Desativar",
+    "disabled": "Desabilitado",
     "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": "Geral",
+    "general": "Dados Gerais",
     "language": "Idioma",
     "license": "Licença",
     "localnotifavailable": "Notificações locais disponíveis",
@@ -41,8 +41,9 @@
     "navigatoruseragent": "Navegador userAgent",
     "networkstatus": "O status da conexão Internet",
     "privacypolicy": "Política de privacidade",
+    "processorsettings": "Configurações do processador",
     "reportinbackground": "Relatar erros automaticamente",
-    "settings": "Configurações da tarefa",
+    "settings": "Configurações",
     "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 c9a0b3b0f7f..80e93eb0408 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": "Desativar",
+    "disabled": "Desativado",
     "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": "Geral",
+    "general": "Dados gerais",
     "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": "Configurações",
+    "settings": "Configurações do trabalho",
     "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 fb34938dfd3..c241401f584 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": "Schimbul de mesaje este dezactivat pe acest site",
+    "disabled": "Dezactivat",
     "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": "General",
+    "general": "Informaţii generale",
     "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ările sarcinii de lucru",
+    "settings": "Setări",
     "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 28769d7118a..21d2ac333cf 100644
--- a/www/core/components/settings/lang/ru.json
+++ b/www/core/components/settings/lang/ru.json
@@ -6,8 +6,8 @@
     "currentlanguage": "Выбранный язык",
     "deletesitefiles": "Вы уверены, что хотите удалить файлы, скачанные с сайта «{{sitename}}»?",
     "deletesitefilestitle": "Удалить файлы сайта",
-    "disableall": "Временно отключить уведомления",
-    "disabled": "Выключить",
+    "disableall": "Отключить уведомления",
+    "disabled": "Отключено",
     "enabledebugging": "Включить отладку",
     "enabledownloadsection": "Показать материалы, доступные для скачивания",
     "enablerichtexteditor": "Включить текстовый редактор",
@@ -16,18 +16,19 @@
     "errordeletesitefiles": "Ошибка при удалении файлов сайта",
     "errorsyncsite": "Ошибка синхронизации данных сайта. Проверьте интернет-соединение и повторите попытку.",
     "estimatedfreespace": "Ориентировочное свободное место",
-    "general": "Основные",
+    "general": "Общие",
     "language": "Язык",
-    "license": "Лицензия",
+    "license": "Лицензия:",
     "loggedin": "На сайте",
     "loggedoff": "Вне сайта",
+    "processorsettings": "Настройки способа доставки сообщений",
     "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/sr-cr.json b/www/core/components/settings/lang/sr-cr.json
index 2001c299b89..e7f83e5471d 100644
--- a/www/core/components/settings/lang/sr-cr.json
+++ b/www/core/components/settings/lang/sr-cr.json
@@ -11,11 +11,14 @@
     "cordovadeviceuuid": "UUID Cordova уређаја",
     "cordovaversion": "Cordova верзија",
     "credits": "Заслуге",
+    "currentlanguage": "Тренутно важећи језик",
     "deletesitefiles": "Да ли сте сигурни да желите да обришете преузете датотеке са сајта '{{sitename}}'?",
     "deletesitefilestitle": "Обриши датотеке сајта",
     "deviceinfo": "Информације о уређају",
     "deviceos": "Оперативни систем уређаја",
     "devicewebworkers": "Web Workers уређаји подржани",
+    "disableall": "Онемогући обавештења",
+    "disabled": "Онемогућено",
     "displayformat": "Формат приказа",
     "enabledebugging": "Омогући отклањање грешака",
     "enabledownloadsection": "Омогући преузимање секција.",
@@ -27,13 +30,21 @@
     "errorsyncsite": "Грешка приликом синхронизације података сајта. Молимо, проверите вашу интернет везу и покушајте поново.",
     "estimatedfreespace": "Процењени слободан простора",
     "filesystemroot": "Основни директоријум система датотека",
+    "general": "Опште",
+    "language": "Језик",
+    "license": "Лиценца",
     "localnotifavailable": "Локална обавештења доступна",
     "locationhref": "Webview URL адреса",
+    "loggedin": "Онлајн",
+    "loggedoff": "Офлајн",
     "navigatorlanguage": "Језик навигатора",
     "navigatoruseragent": "Кориснички агент навигатора",
     "networkstatus": "Статус инернет везе",
     "privacypolicy": "Политика приватности",
+    "processorsettings": "Подешавања процесора",
     "reportinbackground": "Пријави грешке аутоматски",
+    "settings": "Подешавања",
+    "sites": "Сајтови",
     "spaceusage": "Искориштеност простора",
     "storagetype": "Тип складишта",
     "synchronization": "Синхронизација",
@@ -41,6 +52,7 @@
     "synchronizing": "Синхронизовање",
     "syncsettings": "Подешавања синхронизације",
     "syncsitesuccess": "Подаци сајтa су синхронизовани и сав кеш је поништен.",
+    "total": "Укупно",
     "versioncode": "Верзија кôда",
     "versionname": "Назив верзије",
     "wificonnection": "WiFi веза"
diff --git a/www/core/components/settings/lang/sr-lt.json b/www/core/components/settings/lang/sr-lt.json
index 3dbe087bed0..d3fb7c76e35 100644
--- a/www/core/components/settings/lang/sr-lt.json
+++ b/www/core/components/settings/lang/sr-lt.json
@@ -11,11 +11,14 @@
     "cordovadeviceuuid": "UUID Cordova uređaja",
     "cordovaversion": "Cordova verzija",
     "credits": "Zasluge",
+    "currentlanguage": "Trenutno važeći jezik",
     "deletesitefiles": "Da li ste sigurni da želite da obrišete preuzete datoteke sa sajta '{{sitename}}'?",
     "deletesitefilestitle": "Obriši datoteke sajta",
     "deviceinfo": "Informacija o uređaju",
     "deviceos": "Operativni sistem uređaja",
     "devicewebworkers": "Web Workers uređaji podržani",
+    "disableall": "Onemogući obaveštenja",
+    "disabled": "Onemogućeno",
     "displayformat": "Format prikaza",
     "enabledebugging": "Omogući otklanjanje grešaka",
     "enabledownloadsection": "Omogući preuzimanje sekcija.",
@@ -27,13 +30,21 @@
     "errorsyncsite": "Greška prilikom sinhronizacije podataka sajta. Molimo, proverite vašu internet vezu i pokušajte ponovo.",
     "estimatedfreespace": "Procenjeni slobodan prostora",
     "filesystemroot": "Osnovni direktorijum sistema datoteka",
+    "general": "Opšte",
+    "language": "Jezik",
+    "license": "Licenca",
     "localnotifavailable": "Lokalna obaveštenja dostupna",
     "locationhref": "Webview URL adresa",
+    "loggedin": "Onlajn",
+    "loggedoff": "Oflajn",
     "navigatorlanguage": "Jezik navigatora",
     "navigatoruseragent": "Korisnički agent navigatora",
     "networkstatus": "Status inernet veze",
     "privacypolicy": "Politika privatnosti",
+    "processorsettings": "Podešavanja procesora",
     "reportinbackground": "Prijavi greške automatski",
+    "settings": "Podešavanja",
+    "sites": "Sajtovi",
     "spaceusage": "Iskorištenost prostora",
     "storagetype": "Tip skladišta",
     "synchronization": "Sinhronizacija",
@@ -41,6 +52,7 @@
     "synchronizing": "Sinhronizovanje",
     "syncsettings": "Podešavanja sinhronizacije",
     "syncsitesuccess": "Podaci sajta su sinhronizovani i sav keš je poništen.",
+    "total": "Ukupno",
     "versioncode": "Verzija kôda",
     "versionname": "Naziv verzije",
     "wificonnection": "WiFi veza"
diff --git a/www/core/components/settings/lang/sv.json b/www/core/components/settings/lang/sv.json
index 6e667ace444..9daf57979e3 100644
--- a/www/core/components/settings/lang/sv.json
+++ b/www/core/components/settings/lang/sv.json
@@ -14,8 +14,8 @@
     "deviceinfo": "Info mobil enhet",
     "deviceos": "Mobil enhet operativsystem",
     "devicewebworkers": "Enheten stödjer Web Workers",
-    "disableall": "Tillfälligt inaktivera meddelanden",
-    "disabled": "Avaktiverat",
+    "disableall": "Tillfälligt inaktivera notiser",
+    "disabled": "Avaktiverad",
     "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änt",
+    "general": "Allmänna data",
     "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 för inlämningsuppgift",
+    "settings": "Inställningar",
     "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": "Totalt",
+    "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 c6f1ea3ec9b..efbef267550 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": "Devre dışı bırakıldı",
+    "disabled": "Mesajlaşma bu sitede etkinleştirilmemiş",
     "enabledebugging": "Hata ayıklamayı etkinleştir",
     "estimatedfreespace": "Tahmini boş alan",
-    "general": "Genel",
+    "general": "Genel veri",
     "language": "Dil",
     "license": "Lisans",
     "loggedin": "Çevrimiçi",
     "loggedoff": "Çevrim içi değil",
     "processorsettings": "İşlemci ayarları",
-    "settings": "Ödev ayarları",
+    "settings": "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 19e3c097dcc..52526da3482 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 0ae3d4ba30e..01c03d8e577 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 d63c5c6e165..0c793832389 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 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 6bbe564a7ac..aef668fe00a 100644
--- a/www/core/components/sharedfiles/lang/de.json
+++ b/www/core/components/sharedfiles/lang/de.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Keine geteilten 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": "Geteilte 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/sr-cr.json b/www/core/components/sharedfiles/lang/sr-cr.json
index 3b9b852cf35..f341d57f6b1 100644
--- a/www/core/components/sharedfiles/lang/sr-cr.json
+++ b/www/core/components/sharedfiles/lang/sr-cr.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "Не постоје меморисани сајтови. Молимо, додајте сајт пре него што покушате да поделите датотеке са апликацијом.",
     "nosharedfiles": "Не постоје дељене датотеке које се налазе на овом сајту.",
     "nosharedfilestoupload": "Овде немате датотеке које можете да отпремите. Ако желите да отпремите датотеку из друге апликације, пронађите ту датотеку и кликните на дугме 'Отвори у'.",
-    "rename": "Промени назив",
+    "rename": "Преименовање",
     "replace": "Замени",
     "sharedfiles": "Дељене датотеке",
     "successstorefile": "Датотека је успешно сачувана. Сада можете да изаберете ову датотеку да бисте је отпремили међу своје приватне датотеке или је придружили некој активности."
diff --git a/www/core/components/sharedfiles/lang/sr-lt.json b/www/core/components/sharedfiles/lang/sr-lt.json
index 796ef026796..2615dbff4fb 100644
--- a/www/core/components/sharedfiles/lang/sr-lt.json
+++ b/www/core/components/sharedfiles/lang/sr-lt.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "Ne postoje memorisani sajtovi. Molimo, dodajte sajt pre nego što pokušate da podelite datoteke sa aplikacijom.",
     "nosharedfiles": "Ne postoje deljene datoteke koje se nalaze na ovom sajtu.",
     "nosharedfilestoupload": "Ovde nemate datoteke koje možete da otpremite. Ako želite da otpremite datoteku iz druge aplikacije, pronađite tu datoteku i kliknite na dugme 'Otvori u'.",
-    "rename": "Promeni naziv",
+    "rename": "Preimenovanje",
     "replace": "Zameni",
     "sharedfiles": "Deljene datoteke",
     "successstorefile": "Datoteka je uspešno sačuvana. Sada možete da izaberete ovu datoteku da biste je otpremili među svoje privatne datoteke ili je pridružili nekoj aktivnosti."
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/uk.json b/www/core/components/sharedfiles/lang/uk.json
index 6a2a6c61255..f16da3ef448 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 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..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": "Desconnecta",
+    "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 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/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/el.json b/www/core/components/sidemenu/lang/el.json
index 2e0168f9e01..114771adbff 100644
--- a/www/core/components/sidemenu/lang/el.json
+++ b/www/core/components/sidemenu/lang/el.json
@@ -2,7 +2,7 @@
     "appsettings": "Ρυθμίσεις εφαρμογής",
     "changesite": "Αλλαγή ιστότοπου",
     "help": "Βοήθεια",
-    "logout": "Αποσύνδεση",
+    "logout": "Έξοδος",
     "mycourses": "Τα μαθήματά μου",
     "togglemenu": "Αλλαγή μενού",
     "website": "Ιστότοπος"
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/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 0f0cb015df4..4f3f66ea9f3 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": "Pagalba",
-    "logout": "Pakeisti svetainę",
-    "mycourses": "Mano mokymo programos",
+    "help": "Žinynas",
+    "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..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": "Afmelden",
+    "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 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/pt.json b/www/core/components/sidemenu/lang/pt.json
index f972c409f74..479ba8e4f48 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": "Terminar sessão",
+    "logout": "Sair",
     "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 ea5d1d106e0..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": "Schimbați siteul",
+    "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/uk.json b/www/core/components/sidemenu/lang/uk.json
index 2442161b325..21328fec9b5 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 ea6cd6e91e1..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 412f2616441..e157aab2b0e 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 33cf6dc0156..c2213eb9c76 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": "الوصف",
-    "details": "التفاصيل",
+    "description": "نص المقدمة",
+    "details": "تفاصيل متابعة اسكو",
     "editingteacher": "معلم",
-    "email": "عنوان البريد الإلكتروني",
+    "email": "بريد الإلكتروني",
     "emailagain": "إعادة إدخال البريد الإلكتروني للتأكيد ",
     "firstname": "الاسم الأول",
     "interests": "اهتمامات",
@@ -15,7 +15,7 @@
     "manager": "مدير",
     "newpicture": "صورة شخصية جديدة",
     "phone1": "هاتف",
-    "phone2": "الجوال",
+    "phone2": "رقم الهاتف المحمول",
     "roles": "أدوار",
     "student": "طالب",
     "viewprofile": "عرض الحساب",
diff --git a/www/core/components/user/lang/bg.json b/www/core/components/user/lang/bg.json
index 6141ac3935c..022f6afb2b1 100644
--- a/www/core/components/user/lang/bg.json
+++ b/www/core/components/user/lang/bg.json
@@ -1,22 +1,22 @@
 {
     "address": "Адрес",
     "city": "Град/село",
-    "contact": "Контакти",
+    "contact": "Контакт",
     "country": "Държава",
-    "description": "Въвеждащ текст",
+    "description": "Описание",
     "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/ca.json b/www/core/components/user/lang/ca.json
index 94d4813e716..a5f782e392b 100644
--- a/www/core/components/user/lang/ca.json
+++ b/www/core/components/user/lang/ca.json
@@ -4,19 +4,19 @@
     "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": "Adreça electrònica",
+    "email": "Correu electrònic",
     "emailagain": "Correu electrònic (una altra vegada)",
     "firstname": "Nom",
     "interests": "Interessos",
     "invaliduser": "L'usuari no és vàlid",
     "lastname": "Cognoms",
     "manager": "Gestor",
-    "newpicture": "Nova imatge",
+    "newpicture": "Imatge nova",
     "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 c0978326868..5533c565060 100644
--- a/www/core/components/user/lang/cs.json
+++ b/www/core/components/user/lang/cs.json
@@ -3,20 +3,20 @@
     "city": "Město/obec",
     "contact": "Kontakt",
     "country": "Země",
-    "description": "Úvodní text",
-    "details": "Detaily",
+    "description": "Popis",
+    "details": "Podrobnosti o průchodu",
     "detailsnotavailable": "Podrobnosti o tomto uživateli nejsou k dispozici.",
     "editingteacher": "Učitel",
-    "email": "E-mailová adresa",
+    "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/da.json b/www/core/components/user/lang/da.json
index 507cc600278..102926802a6 100644
--- a/www/core/components/user/lang/da.json
+++ b/www/core/components/user/lang/da.json
@@ -3,15 +3,15 @@
     "city": "By",
     "contact": "Kontakt",
     "country": "Land",
-    "description": "Introduktionstekst",
-    "details": "Detaljer",
+    "description": "Beskrivelse",
+    "details": "Følg detaljer",
     "detailsnotavailable": "Denne brugers data er ikke tilgængelige for dig.",
     "editingteacher": "Lærer",
-    "email": "E-mailadresse",
+    "email": "E-mail",
     "emailagain": "E-mail (igen)",
     "firstname": "Fornavn",
     "interests": "Interesser",
-    "invaliduser": "Ugyldig bruger.",
+    "invaliduser": "Ugyldig bruger",
     "lastname": "Efternavn",
     "manager": "Manager",
     "newpicture": "Nyt billede",
@@ -20,6 +20,6 @@
     "roles": "Roller",
     "student": "Studerende",
     "teacher": "Medlærer",
-    "viewprofile": "Vis Profil",
+    "viewprofile": "Vis profil",
     "webpage": "Webside"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/de.json b/www/core/components/user/lang/de.json
index aaf288443b2..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-Adresse",
+    "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/el.json b/www/core/components/user/lang/el.json
index 007097ea4bb..2b3c68364dd 100644
--- a/www/core/components/user/lang/el.json
+++ b/www/core/components/user/lang/el.json
@@ -3,11 +3,11 @@
     "city": "Πόλη/χωριό",
     "contact": "Επικοινωνία",
     "country": "Χώρα",
-    "description": "Κείμενο εισαγωγής",
-    "details": "Λεπτομέρειες",
+    "description": "Περιγραφή",
+    "details": "Παρακολούθηση λεπτομερειών",
     "detailsnotavailable": "Λεπτομέρειες για αυτό τον χρήστη δεν είναι διαθέσιμες.",
     "editingteacher": "Διδάσκων",
-    "email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
+    "email": "Ηλεκτρονικό Ταχυδρομείο",
     "emailagain": "Email (ξανά)",
     "firstname": "Όνομα",
     "interests": "Ενδιαφέροντα",
@@ -16,10 +16,10 @@
     "manager": "Διαχειριστής",
     "newpicture": "Νέα εικόνα",
     "phone1": "Τηλέφωνο",
-    "phone2": "Κινητό",
+    "phone2": "Κινητό τηλέφωνο",
     "roles": "Ρόλοι",
     "sendemail": "Email",
-    "student": "Μαθητής",
+    "student": "Φοιτητής",
     "teacher": "Διδάσκων χωρίς δικαιώματα αλλαγής",
     "viewprofile": "Επισκόπηση του προφίλ",
     "webpage": "Ιστοσελίδα"
diff --git a/www/core/components/user/lang/es-mx.json b/www/core/components/user/lang/es-mx.json
index f04ee84c54c..dabd4a46d5b 100644
--- a/www/core/components/user/lang/es-mx.json
+++ b/www/core/components/user/lang/es-mx.json
@@ -3,20 +3,20 @@
     "city": "Ciudad",
     "contact": "Contacto",
     "country": "País",
-    "description": "Descripción -",
-    "details": "Detalles",
+    "description": "Descripción",
+    "details": "Detalles del seguimiento",
     "detailsnotavailable": "Los detalles de este usuario no están disponibles para Usted.",
     "editingteacher": "Profesor",
-    "email": "Dirección Email",
+    "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/es.json b/www/core/components/user/lang/es.json
index 53dbd5e228c..3839cc05d90 100644
--- a/www/core/components/user/lang/es.json
+++ b/www/core/components/user/lang/es.json
@@ -4,10 +4,10 @@
     "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": "Dirección de correo",
+    "email": "Email",
     "emailagain": "Correo (de nuevo)",
     "firstname": "Nombre",
     "interests": "Intereses",
@@ -16,7 +16,7 @@
     "manager": "Gestor",
     "newpicture": "Imagen nueva",
     "phone1": "Teléfono",
-    "phone2": "Móvil",
+    "phone2": "Teléfono móvil",
     "roles": "Roles",
     "sendemail": "Correo electrónico",
     "student": "Estudiante",
diff --git a/www/core/components/user/lang/eu.json b/www/core/components/user/lang/eu.json
index 346af5911ec..032d503d7e7 100644
--- a/www/core/components/user/lang/eu.json
+++ b/www/core/components/user/lang/eu.json
@@ -2,21 +2,21 @@
     "address": "Helbidea",
     "city": "Hiria/Herria",
     "contact": "Kontaktua",
-    "country": "Herria",
+    "country": "Herrialdea",
     "description": "Deskribapena",
-    "details": "Xehetasunak",
+    "details": "Pistaren zehaztasunak",
     "detailsnotavailable": "Erabiltzaile honen xehetasunak ez daude zuretzat eskuragarri",
     "editingteacher": "Irakaslea",
-    "email": "E-posta helbidea",
+    "email": "E-posta",
     "emailagain": "E-posta (berriro)",
     "firstname": "Izena",
     "interests": "Interesguneak",
-    "invaliduser": "Erabiltzailea ez da zuzena.",
+    "invaliduser": "Erabiltzaile baliogabea",
     "lastname": "Deitura",
     "manager": "Kudeatzailea",
     "newpicture": "Irudi berria",
     "phone1": "Telefonoa",
-    "phone2": "Sakelekoa",
+    "phone2": "Telefono mugikorra",
     "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 23611349635..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": "مخاطب",
+    "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 75c5058d2bf..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": "Adresse de courriel",
+    "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/he.json b/www/core/components/user/lang/he.json
index 76f6e8d241e..212f9bb5b8a 100644
--- a/www/core/components/user/lang/he.json
+++ b/www/core/components/user/lang/he.json
@@ -1,22 +1,22 @@
 {
     "address": "כתובת",
     "city": "ישוב",
-    "contact": "צור קשר",
+    "contact": "ליצירת קשר",
     "country": "ארץ",
-    "description": "תיאור",
-    "details": "פרטים",
+    "description": "הנחיה למטלה",
+    "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/hu.json b/www/core/components/user/lang/hu.json
index de2880aacb9..ea3235ea2d0 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": "Bevezető szöveg",
+    "description": "Leírás",
     "details": "SCO nyomon követésének részletei",
-    "email": "E-mail cím",
+    "email": "E-mail",
     "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 bdbd8e8b4ec..9aa43cad4d0 100644
--- a/www/core/components/user/lang/it.json
+++ b/www/core/components/user/lang/it.json
@@ -3,20 +3,20 @@
     "city": "Città /Località",
     "contact": "Contatto",
     "country": "Nazione",
-    "description": "Commento",
-    "details": "Dettagli",
+    "description": "Descrizione",
+    "details": "Dettagli tracciamento",
     "detailsnotavailable": "Non puoi visualizzare i dettagli di questo utente.",
     "editingteacher": "Docente",
-    "email": "Indirizzo email",
+    "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/ja.json b/www/core/components/user/lang/ja.json
index 1d661257fae..a07f54c15b6 100644
--- a/www/core/components/user/lang/ja.json
+++ b/www/core/components/user/lang/ja.json
@@ -1,11 +1,11 @@
 {
     "address": "住所",
     "city": "都道府県",
-    "contact": "コンタクト",
+    "contact": "連絡先",
     "country": "国",
     "description": "説明",
-    "details": "詳細",
-    "email": "メールアドレス",
+    "details": "トラック詳細",
+    "email": "メール",
     "emailagain": "メールアドレス (もう一度)",
     "firstname": "名",
     "interests": "興味のあること",
diff --git a/www/core/components/user/lang/lt.json b/www/core/components/user/lang/lt.json
index 794c12956b1..5b7c9101b18 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": "Įžangos tekstas",
+    "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 9e9b2898795..040c2592de8 100644
--- a/www/core/components/user/lang/nl.json
+++ b/www/core/components/user/lang/nl.json
@@ -3,15 +3,15 @@
     "city": "Plaats",
     "contact": "Contact",
     "country": "Land",
-    "description": "Inleidende tekst",
-    "details": "Details",
+    "description": "Beschrijving",
+    "details": "SCO opvolgdetails",
     "detailsnotavailable": "Je kunt de details voor deze gebruiker niet bekijken.",
     "editingteacher": "Leraar",
-    "email": "E-mailadres",
+    "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/pl.json b/www/core/components/user/lang/pl.json
index 36dbf206198..e81808a5344 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": "Wstęp",
+    "description": "Opis",
     "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 7ab46d831a7..e212093a063 100644
--- a/www/core/components/user/lang/pt-br.json
+++ b/www/core/components/user/lang/pt-br.json
@@ -3,20 +3,20 @@
     "city": "Cidade/Município",
     "contact": "Contato",
     "country": "País",
-    "description": "Texto do link",
-    "details": "Detalhes",
+    "description": "Descrição",
+    "details": "Detalhes do registro",
     "detailsnotavailable": "Os detalhes desse usuário não estão disponíveis para você.",
     "editingteacher": "Professor",
-    "email": "Endereço de email",
+    "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/pt.json b/www/core/components/user/lang/pt.json
index dd9f07a9a2c..7b0f3e6910f 100644
--- a/www/core/components/user/lang/pt.json
+++ b/www/core/components/user/lang/pt.json
@@ -4,10 +4,10 @@
     "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": "Endereço de e-mail",
+    "email": "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 5e7dcf168ec..b6929b4f310 100644
--- a/www/core/components/user/lang/ro.json
+++ b/www/core/components/user/lang/ro.json
@@ -3,22 +3,22 @@
     "city": "Oraş/localitate",
     "contact": "Contact",
     "country": "Ţara",
-    "description": "Text introductiv",
-    "details": "Detalii",
+    "description": "Descriere",
+    "details": "Detalii înregistrare activitate",
     "detailsnotavailable": "Detaliile acestui utilizator nu vă sunt disponibile.",
     "editingteacher": "Profesor",
-    "email": "Adresă email",
+    "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": "Pagină Web"
diff --git a/www/core/components/user/lang/ru.json b/www/core/components/user/lang/ru.json
index 33bd27a775e..eec8fc8030f 100644
--- a/www/core/components/user/lang/ru.json
+++ b/www/core/components/user/lang/ru.json
@@ -3,20 +3,20 @@
     "city": "Город",
     "contact": "Контакты",
     "country": "Страна",
-    "description": "Вступление",
-    "details": "Подробнее",
+    "description": "Описание",
+    "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/sr-cr.json b/www/core/components/user/lang/sr-cr.json
index 8770ab16865..c97c7534c91 100644
--- a/www/core/components/user/lang/sr-cr.json
+++ b/www/core/components/user/lang/sr-cr.json
@@ -1,12 +1,26 @@
 {
+    "address": "Адреса",
+    "city": "Место",
     "contact": "Контакт",
-    "details": "Подаци о кориснику",
+    "country": "Држава",
+    "description": "Опис",
+    "details": "Прати детаље",
     "detailsnotavailable": "Подаци о овом кориснику вам нису доступни.",
     "editingteacher": "Предавач",
-    "invaliduser": "Неисправан корисник.",
+    "email": "Адреса е-поште",
+    "emailagain": "Адреса е-поште (поново)",
+    "firstname": "Име",
+    "interests": "Интересовања",
+    "invaliduser": "Неисправан корисник",
+    "lastname": "Презиме",
     "manager": "Менаџер",
-    "phone2": "Мобилни",
+    "newpicture": "Нова слика",
+    "phone1": "Телефон",
+    "phone2": "Мобилни телефон",
+    "roles": "Улоге",
     "sendemail": "Е-пошта",
     "student": "Полазник",
-    "teacher": "Предавач без уређивачких права"
+    "teacher": "Предавач без уређивачких права",
+    "viewprofile": "Прегледај профил",
+    "webpage": "Веб страница"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/sr-lt.json b/www/core/components/user/lang/sr-lt.json
index 96a85eb0ff5..97e30a4e4c8 100644
--- a/www/core/components/user/lang/sr-lt.json
+++ b/www/core/components/user/lang/sr-lt.json
@@ -1,12 +1,26 @@
 {
+    "address": "Adresa",
+    "city": "Mesto",
     "contact": "Kontakt",
-    "details": "Podaci o korisniku",
+    "country": "Država",
+    "description": "Opis",
+    "details": "Prati detalje",
     "detailsnotavailable": "Podaci o ovom korisniku vam nisu dostupni.",
     "editingteacher": "Predavač",
-    "invaliduser": "Neispravan korisnik.",
+    "email": "Adresa e-pošte",
+    "emailagain": "Adresa e-pošte (ponovo)",
+    "firstname": "Ime",
+    "interests": "Interesovanja",
+    "invaliduser": "Neispravan korisnik",
+    "lastname": "Prezime",
     "manager": "Menadžer",
-    "phone2": "Mobilni",
+    "newpicture": "Nova slika",
+    "phone1": "Telefon",
+    "phone2": "Mobilni telefon",
+    "roles": "Uloge",
     "sendemail": "E-pošta",
     "student": "Polaznik",
-    "teacher": "Predavač bez uređivačkih prava"
+    "teacher": "Predavač bez uređivačkih prava",
+    "viewprofile": "Pregledaj profil",
+    "webpage": "Web stranica"
 }
\ No newline at end of file
diff --git a/www/core/components/user/lang/sv.json b/www/core/components/user/lang/sv.json
index 19f29bc1d7f..94ca7299b23 100644
--- a/www/core/components/user/lang/sv.json
+++ b/www/core/components/user/lang/sv.json
@@ -3,22 +3,22 @@
     "city": "Stad/ort",
     "contact": "Kontakt",
     "country": "Land",
-    "description": "Introduktion",
-    "details": "Detaljer",
+    "description": "Beskrivning",
+    "details": "Detaljerad SCO spårning",
     "detailsnotavailable": "Detaljerna till denna användare är inte tillgängliga för dig.",
     "editingteacher": "Lärare",
-    "email": "E-postadress",
+    "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 7dc39a77eef..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": "Tanıtım metni",
-    "details": "Detaylar",
+    "description": "Açıklama",
+    "details": "İzleme ayrıntıları",
     "editingteacher": "Öğretmen",
-    "email": "E-posta adresi",
+    "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
index 4e829c3f276..94b6b0bd9ad 100644
--- a/www/core/components/user/lang/uk.json
+++ b/www/core/components/user/lang/uk.json
@@ -3,20 +3,20 @@
     "city": "Місто",
     "contact": "Контакт",
     "country": "Країна",
-    "description": "Текст вступу",
-    "details": "Деталі",
+    "description": "Опис",
+    "details": "Деталі запису",
     "detailsnotavailable": "Деталі цього користувача вам не доступні",
     "editingteacher": "Вчитель",
-    "email": "Електронна пошта",
+    "email": "Ел.пошта",
     "emailagain": "Електронна пошта (повторно)",
     "firstname": "Ім'я",
     "interests": "Інтереси",
-    "invaliduser": "Невірний користувач.",
+    "invaliduser": "Неправильний користувач",
     "lastname": "Прізвище",
     "manager": "Менеджер",
     "newpicture": "Новий малюнок",
     "phone1": "Телефон",
-    "phone2": "Mobile",
+    "phone2": "Мобільний телефон",
     "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 a1d49df5eb3..f1e99807e98 100644
--- a/www/core/components/user/lang/zh-cn.json
+++ b/www/core/components/user/lang/zh-cn.json
@@ -1,11 +1,11 @@
 {
     "address": "地址",
     "city": "市/县",
-    "contact": "联系方式",
+    "contact": "联系",
     "country": "国家和地区",
-    "description": "简要描述",
-    "details": "详情",
-    "email": "Email地址",
+    "description": "描述",
+    "details": "查看详情",
+    "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 d54e254418d..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": "連絡人",
+    "contact": "聯絡",
     "country": "國家",
-    "description": "簡介文字",
-    "details": "明細",
+    "description": "說明",
+    "details": "SCO 追蹤細節",
     "detailsnotavailable": "這個使用者的詳細資料無法提供給您",
     "editingteacher": "教師",
-    "email": "電子郵件信箱",
+    "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 60af9e74633..8bd2f54a65c 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,32 @@
     "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": "ميغا بايب",
+    "sortby": "إفرز بـ",
     "start": "إبداء",
-    "submit": "سلم",
+    "submit": "سلم/قدم",
     "success": "نجاح",
     "teachers": "معلمون",
-    "time": "وقت",
+    "time": "الوقت",
     "timesup": "انتهى الوقت!",
     "today": "اليوم",
     "unexpectederror": "خطأ غير متوقع. الرجاء الإغلاق وإعادة فتح التطبيق للمحاولة مرة أخرى",
@@ -131,7 +132,7 @@
     "userdeleted": "تم حذف اشتراك هذا المستخدم",
     "userdetails": "تفاصيل المستخدم",
     "users": "المستخدمون",
-    "view": "معاينه",
+    "view": "استعراض",
     "viewprofile": "عرض الحساب",
     "year": "سنة",
     "years": "سنوات",
diff --git a/www/core/lang/bg.json b/www/core/lang/bg.json
index 1365af87752..980a09a4cc1 100644
--- a/www/core/lang/bg.json
+++ b/www/core/lang/bg.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "Всички участници",
     "areyousure": "Сигурни ли сте?",
-    "back": "Обратно",
+    "back": "&laquo; Обратно",
     "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,32 +92,33 @@
     "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",
     "sizekb": "KB",
     "sizemb": "MB",
     "sizetb": "ТБ",
+    "sortby": "Нареждане по",
     "start": "Започване",
-    "submit": "Изпълняване",
+    "submit": "Качване",
     "success": "Успешно",
     "time": "Време",
     "timesup": "Времето изтече!",
@@ -128,7 +129,7 @@
     "userdeleted": "Тази потребителска регистрация е изтрита",
     "userdetails": "Информация за потребителя",
     "users": "Потребители",
-    "view": "Преглед",
+    "view": "Изглед",
     "viewprofile": "Разглеждане на профила",
     "whoops": "Опс!",
     "years": "години",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index 3c4bb775308..11c1effe7d2 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": "&laquo; 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,7 +13,7 @@
     "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}})",
     "commentsnotworking": "No s'han pogut recuperar els comentaris",
@@ -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",
@@ -51,11 +51,11 @@
     "discard": "Descarta",
     "dismiss": "Ignora",
     "done": "Fet",
-    "download": "Baixa",
+    "download": "Descarrega",
     "downloading": "S'està descarregant",
     "edit": "Edita",
     "emptysplit": "Aquesta pàgina estarà buida si el panell esquerre està buit o s'està carregant.",
-    "error": "Error",
+    "error": "S'ha produït un 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ó",
@@ -95,8 +95,8 @@
     "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": "minut",
+    "maxsizeandattachments": "Mida màxima dels fitxers nous: {{$a.size}}, màxim d'adjuncions: {{$a.attachments}}",
+    "min": "Puntuació mínima",
     "mins": "minuts",
     "mod_assign": "Tasca",
     "mod_assignment": "Tasca",
@@ -126,15 +126,15 @@
     "mod_workshop": "Taller",
     "moduleintro": "Descripció",
     "mygroups": "Els meus grups",
-    "name": "Nom",
+    "name": "Nombre",
     "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",
@@ -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",
@@ -151,24 +151,24 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telèfon",
     "pictureof": "Imatge {{$a}}",
-    "previous": "Anterior",
+    "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": "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": "Mostrar",
+    "show": "Mostra",
     "showmore": "Mostra'n més...",
     "site": "Lloc",
     "sitemaintenance": "S'estan executant tasques de manteniment i el lloc no està disponible",
@@ -178,13 +178,14 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Ho sentim...",
+    "sortby": "Ordena per",
     "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",
@@ -198,16 +199,16 @@
     "unzipping": "S'està descomprimint",
     "upgraderunning": "El lloc s'està actualitzant. Proveu-ho més tard.",
     "userdeleted": "S'ha suprimit aquest compte d'usuari",
-    "userdetails": "Més detall",
+    "userdetails": "Més dades de l'usuari",
     "users": "Usuaris",
-    "view": "Visualització",
+    "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 188f6b3b442..5418ade47f0 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",
-    "cancel": "Přerušit",
+    "back": "&laquo; Zpět",
+    "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.",
     "category": "Kategorie",
@@ -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",
-    "comments": "Váš komentář",
+    "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,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": "den",
-    "days": "dnů",
+    "day": "Dnů",
+    "days": "Dnů",
     "decsep": ",",
     "defaultvalue": "Výchozí  ({{$a}})",
     "delete": "Odstranit",
     "deleting": "Odstraňování",
-    "description": "Úvodní text",
+    "description": "Popis",
     "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": "Stáhnout",
+    "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": "Chyba",
+    "error": "Vyskytla se 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": "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": "Načítá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": "min.",
+    "min": "Minimální skóre",
     "mins": "min.",
     "mod_assign": "Úkol",
     "mod_assignment": "Úkol",
@@ -127,23 +127,23 @@
     "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": "Nic",
+    "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",
     "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": "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": "Vyhledat",
+    "searching": "Hledat v",
     "searchresults": "Výsledky hledání",
     "sec": "sek.",
     "secs": "sekund",
     "seemoredetail": "Více podrobností...",
-    "send": "odeslat",
-    "sending": "Odeslání",
+    "send": "Odeslat",
+    "sending": "Odesílání",
     "serverconnection": "Chyba spojení se serverem",
-    "show": "Zobrazit",
+    "show": "Ukázat",
     "showmore": "Zobrazit více...",
     "site": "Stránky",
     "sitemaintenance": "Na webu probíhá údržba a aktuálně není k dispozici",
@@ -179,9 +179,10 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Promiňte...",
+    "sortby": "Třídit podle",
     "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.",
@@ -202,14 +203,14 @@
     "userdetails": "Detaily uživatele",
     "usernotfullysetup": "Uživatel není plně nastaven",
     "users": "Uživatelé",
-    "view": "Zobrazit",
+    "view": "Zobrazení",
     "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",
+    "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 fdb455e8fae..72894fffc8c 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": "&laquo; 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,14 +14,14 @@
     "clicktohideshow": "Klik for at udvide eller folde sammen",
     "clicktoseefull": "Klik for at se alt indhold.",
     "close": "Luk",
-    "comments": "Dine kommentarer",
+    "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?",
@@ -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",
-    "days": "dage",
+    "day": "Dag(e)",
+    "days": "Dage",
     "decsep": ",",
     "delete": "Slet",
     "deleting": "Sletter",
-    "description": "Introduktionstekst",
+    "description": "Beskrivelse",
     "done": "Færdig",
-    "download": "Download",
+    "download": "Klik for at downloade den eksporterede kategorifil",
     "downloading": "Downloader",
     "edit": "Rediger",
-    "error": "Fejl",
+    "error": "Fejl opstået",
     "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": "Info",
     "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": "Minimum point",
     "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.",
@@ -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,34 +123,35 @@
     "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ø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",
     "site": "Websted",
     "sizeb": "bytes",
-    "sizegb": "Gb",
-    "sizekb": "Kb",
-    "sizemb": "Mb",
+    "sizegb": "GB",
+    "sizekb": "KB",
+    "sizemb": "MB",
     "sizetb": "TB",
+    "sortby": "Sorter efter",
     "start": "Start",
-    "submit": "Gem",
-    "success": "Succes!",
+    "submit": "Send",
+    "success": "Succes",
     "tablet": "Tablet",
-    "teachers": "Undervisere",
-    "time": "Tidspunkt",
+    "teachers": "Lærere",
+    "time": "Tid",
     "timesup": "Tiden er gået!",
     "today": "I dag",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
@@ -163,11 +164,11 @@
     "userdetails": "Brugeroplysninger",
     "users": "Brugere",
     "view": "Vis",
-    "viewprofile": "Vis Profil",
+    "viewprofile": "Vis profil",
     "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 211871a577b..8ed54a59912 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",
     "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": "Kategorie",
+    "category": "Kursbereich",
     "choose": "Auswahl",
     "choosedots": "Auswählen...",
     "clearsearch": "Suche löschen",
     "clicktohideshow": "Zum Erweitern oder Zusammenfassen klicken",
     "clicktoseefull": "Tippen zum Anzeigen aller Inhalte",
-    "close": "Schließen",
-    "comments": "Ihr Feedback",
+    "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",
@@ -52,11 +52,11 @@
     "discard": "Verwerfen",
     "dismiss": "Abbrechen",
     "done": "Erledigt",
-    "download": "Herunterladen",
+    "download": "Download",
     "downloading": "Herunterladen ...",
     "edit": "Bearbeiten",
     "emptysplit": "Diese Seite ist leer, wenn das linke Panel leer ist oder noch geladen wird.",
-    "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",
@@ -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": "Wird geladen",
+    "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": "Minute",
+    "min": "Niedrigste Punktzahl",
     "mins": "Minuten",
     "mod_assign": "Aufgabe",
     "mod_assignment": "Aufgabe",
@@ -132,10 +132,10 @@
     "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": "Kein",
+    "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",
@@ -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,24 +152,24 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Nutzerbild {{$a}}",
-    "previous": "Zurück",
+    "previous": "Letzter Zustand",
     "pulltorefresh": "Zum Aktualisieren runterziehen",
     "redirectingtosite": "Sie werden zur Website weitergeleitet.",
-    "refresh": "Aktualisieren",
-    "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": "Suche",
+    "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": "Anzeigen",
+    "show": "Zeigen",
     "showmore": "Mehr anzeigen ...",
     "site": "Website",
     "sitemaintenance": "Wartungsmodus: Die Website ist im Moment nicht erreichbar!",
@@ -179,9 +179,10 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Sorry ...",
+    "sortby": "Sortiert nach",
     "start": "Start",
-    "submit": "Speichern",
-    "success": "Fertig!",
+    "submit": "Übertragen",
+    "success": "erfolgreich",
     "tablet": "Tablet",
     "teachers": "Trainer/innen",
     "thereisdatatosync": "Die Offline-Daten {{$a}} müssen synchronisiert werden.",
@@ -202,14 +203,14 @@
     "userdetails": "Mehr Details",
     "usernotfullysetup": "Nutzerkonto unvollständig",
     "users": "Nutzer/innen",
-    "view": "Zum Kurs",
+    "view": "Anzeigen",
     "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",
+    "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 0a1f805526f..f9e97706e12 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -3,26 +3,26 @@
     "allparticipants": "Όλοι οι συμμετέχοντες",
     "android": "Android",
     "areyousure": "Είστε σίγουρος ;",
-    "back": "Πίσω",
-    "cancel": "Άκυρο",
+    "back": "&lt; Επιστροφή",
+    "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": "Ολοκληρώθηκε: {{$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": "Είστε σίγουροι οτι θέλετε να διαγράψετε αυτό το αρχείο?",
     "confirmloss": "Είστε σίγουροι? Όλες οι αλλαγές θα χαθούν.",
@@ -37,11 +37,11 @@
     "datastoredoffline": "Τα δεδομένα αποθηκεύονται στη συσκευή, διότι δεν μπορούν να σταλούν. Θα αποσταλούν αυτόματα αργότερα.",
     "date": "Ημερομηνία",
     "day": "ημέρα",
-    "days": "ημέρες",
+    "days": "Ημέρες",
     "decsep": ",",
     "delete": "Διαγραφή",
-    "deleting": "Γίνεται διαγραφή",
-    "description": "Κείμενο εισαγωγής",
+    "deleting": "Διαγραφή",
+    "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": "Edit",
+    "edit": "Επεξεργασία ",
     "emptysplit": "Αυτή η σελίδα θα εμφανιστεί κενή, εάν ο αριστερός πίνακας είναι κενός ή φορτώνεται.",
-    "error": "Σφάλμα",
+    "error": "Συνέβη κάποιο σφάλμα",
     "errorchangecompletion": "Παρουσιάστηκε σφάλμα κατά την αλλαγή της κατάστασης ολοκλήρωσης. Παρακαλώ προσπαθήστε ξανά.",
     "errordeletefile": "Σφάλμα κατά τη διαγραφή του αρχείου. Παρακαλώ προσπαθήστε ξανά.",
     "errordownloading": "Σφάλμα στο κατέβασμα του αρχείου.",
@@ -91,11 +91,11 @@
     "lastmodified": "Τελευταία τροποποίηση",
     "lastsync": "Τελευταίος συγχρονισμός",
     "listsep": ";",
-    "loading": "Φορτώνει",
+    "loading": "Φόρτωση...",
     "loadmore": "Φόρτωση περισσότερων",
     "lostconnection": "Η σύνδεσή σας είναι άκυρη ή έχει λήξει. Πρέπει να ξανασυνδεθείτε στο site.",
     "maxsizeandattachments": "Μέγιστο μέγεθος για νέα αρχεία: {{$a.size}}, μέγιστος αριθμός συνημμένων: {{$a.attachments}}",
-    "min": "λεπτό",
+    "min": "Ελάχιστος βαθμός",
     "mins": "λεπτά",
     "mod_assign": "Εργασία",
     "mod_assignment": "Εργασία",
@@ -128,12 +128,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",
@@ -141,7 +141,7 @@
     "notsent": "Δεν εστάλη",
     "now": "τώρα",
     "numwords": "{{$a}} λέξεις",
-    "offline": "Εκτός σύνδεσης",
+    "offline": "Δεν απαιτείται διαδικτυακή υποβολή",
     "online": "Συνδεδεμένος",
     "openfullimage": "Πατήστε εδώ για να δείτε την εικόνα σε πλήρες μέγεθος",
     "openinbrowser": "Ανοίξτε στον περιηγητή.",
@@ -150,7 +150,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Τηλέφωνο",
     "pictureof": "Φωτογραφία {{$a}}",
-    "previous": "Προηγούμενο",
+    "previous": "Προηγούμενη κατάσταση",
     "pulltorefresh": "Τραβήξτε προς τα κάτω για ανανέωση",
     "redirectingtosite": "Θα μεταφερθείτε στο site.",
     "refresh": "Ανανέωση",
@@ -158,15 +158,15 @@
     "requireduserdatamissing": "Αυτός ο χρήστης δεν έχει συμπληρωμένα κάποια απαιτούμενα στοιχεία του προφίλ του. Συμπληρώστε τα δεδομένα στο Moodle σας και προσπαθήστε ξανά.<br>{{$a}}",
     "retry": "Προσπαθήστε ξανά",
     "save": "Αποθήκευση",
-    "search": "Αναζήτηση",
-    "searching": "Αναζήτηση",
-    "searchresults": "Αποτελέσματα αναζήτησης",
+    "search": "Έρευνα",
+    "searching": "Αναζήτηση σε",
+    "searchresults": "Αναζήτηση στα αποτελέσματα",
     "sec": "δευτερόλεπτο",
     "secs": "δευτερόλεπτα",
     "seemoredetail": "Κάντε κλικ εδώ για να δείτε περισσότερες λεπτομέρειες",
     "send": "Αποστολή",
-    "sending": "Αποστολή",
-    "show": "Προβολή",
+    "sending": "Αποστέλλεται",
+    "show": "Εμφάνιση",
     "showmore": "Περισσότερα...",
     "site": "ιστοχώρος",
     "sitemaintenance": "Η ιστοσελίδα είναι υπό συντήρηση και δεν είναι άμεσα διαθέσιμη",
@@ -176,13 +176,14 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Λυπάμαι...",
+    "sortby": "Ταξινόμηση κατά",
     "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 0ed3bc93f3a..6a7fba5bd32 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": "&laquo; 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,16 +13,16 @@
     "clearsearch": "Limpiar búsqueda",
     "clicktohideshow": "Clic para expandir o colapsar",
     "clicktoseefull": "Hacer click para ver los contenidos completos.",
-    "close": "Cerrar",
-    "comments": "Sus comentarios",
+    "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,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",
-    "days": "días",
+    "day": "Día(s)",
+    "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": "Descargar",
+    "download": "Haga clic para descargar el archivo de categorías exportadas",
     "downloading": "Descargando",
-    "edit": "Edición",
+    "edit": "Editar",
     "emptysplit": "Esta página aparecerá en blanco si el panel izquierdo está vacío o si está cargando.",
-    "error": "Error",
+    "error": "Ocurrió un 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 modificación",
+    "lastmodified": "Última modicficació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": "minutos",
+    "min": "Puntuación mínima",
     "mins": "minutos",
     "mod_assign": "Tarea",
     "mod_assignment": "Tarea",
@@ -130,21 +130,21 @@
     "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",
-    "none": "Ninguno/a",
-    "nopasswordchangeforced": "Usted no puede proceder sin cambiar su contraseña.",
+    "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.",
     "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": "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",
     "othergroups": "Otros grupos",
@@ -152,21 +152,21 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Teléfono",
     "pictureof": "Imagen de {{$a}}",
-    "previous": "Anterior",
+    "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": "Buscar",
-    "searching": "Buscando",
-    "searchresults": "Resultados de la búsqueda",
+    "search": "Búsqueda",
+    "searching": "Buscar en",
+    "searchresults": "Resultado",
     "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",
@@ -179,13 +179,14 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Lo siento...",
+    "sortby": "Ordenar por",
     "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",
@@ -202,14 +203,14 @@
     "userdetails": "Detalles de usuario",
     "usernotfullysetup": "Usuario no cnfigurado completamente",
     "users": "Usuarios",
-    "view": "Vista",
+    "view": "Ver",
     "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",
+    "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 24c93e6d7bd..d5b97d822ac 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": "&laquo; 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",
-    "comments": "Sus comentarios",
+    "close": "Cerrar vista previa",
+    "comments": "Comentarios",
     "commentscount": "Comentarios ({{$a}})",
     "commentsnotworking": "No pueden recuperarse comentarios",
     "completion-alt-auto-fail": "Finalizado {{$a}} (no ha alcanzado la calificación de aprobado)",
@@ -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": ",",
-    "delete": "Eliminar",
-    "deleting": "Borrando",
+    "delete": "Borrar",
+    "deleting": "Eliminando",
     "description": "Descripción",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -51,11 +51,11 @@
     "discard": "Descartar",
     "dismiss": "Descartar",
     "done": "Hecho",
-    "download": "Descargar",
+    "download": "Haga clic para descargar el archivo de categorías exportadas",
     "downloading": "Descargando...",
-    "edit": "Edición",
+    "edit": "Editar",
     "emptysplit": "Esta página aparecerá en blanco si el panel izquierdo está vacío o si está cargando.",
-    "error": "Error",
+    "error": "Se produjo un 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",
@@ -86,17 +86,17 @@
     "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...",
     "loadmore": "Cargar más",
     "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": "Calificación mínima",
     "mins": "minutos",
     "mod_assign": "Tarea",
     "mod_assignment": "Tarea",
@@ -129,21 +129,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",
-    "none": "Ninguna",
-    "nopasswordchangeforced": "No puede continuar sin cambiar su contraseña.",
+    "nograde": "Sin calificación",
+    "none": "Ninguno",
+    "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",
@@ -151,21 +151,21 @@
     "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": "Búsqueda",
+    "searching": "Buscar en",
+    "searchresults": "Resultado",
     "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,13 +178,14 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Disculpe...",
+    "sortby": "Ordenar por",
     "start": "Inicio",
     "submit": "Enviar",
     "success": "Éxito",
     "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,14 +201,14 @@
     "userdeleted": "Esta cuenta se ha cancelado",
     "userdetails": "Detalles de usuario",
     "users": "Usuarios",
-    "view": "Vista",
+    "view": "Ver",
     "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",
+    "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 d7c8d3dd593..747bcfe3930 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": "« 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,8 +13,8 @@
     "clearsearch": "Bilaketa garbia",
     "clicktohideshow": "Sakatu zabaltzeko edo tolesteko",
     "clicktoseefull": "Klik egin eduki guztiak ikusteko.",
-    "close": "Itxi",
-    "comments": "Zure iruzkinak",
+    "close": "Leihoa itxi",
+    "comments": "Iruzkinak",
     "commentscount": "Iruzkinak: ({{$a}})",
     "commentsnotworking": "Iruzkinak ezin izan dira atzitu",
     "completion-alt-auto-fail": "Osatuta: {{$a}} (ez dute gutxieneko kalifikazioa lortu)",
@@ -36,8 +36,8 @@
     "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",
@@ -51,11 +51,11 @@
     "discard": "Baztertu",
     "dismiss": "Baztertu",
     "done": "Eginda",
-    "download": "Jaitsi",
+    "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": "Errorea",
+    "error": "Errorea gertatu da",
     "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": "Kargatzen",
+    "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": "minutu",
+    "min": "Gutxieneko puntuazioa",
     "mins": "minutu",
     "mod_assign": "Zeregina",
     "mod_assignment": "Zeregina",
@@ -129,12 +129,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,8 +142,8 @@
     "notsent": "Bidali gabea",
     "now": "orain",
     "numwords": "{{$a}} hitz",
-    "offline": "Lineaz kanpo",
-    "online": "On-line",
+    "offline": "Ez du online bidalketarik eskatzen",
+    "online": "Online",
     "openfullimage": "Klik egin hemen irudia jatorrizko tamainan ikusteko",
     "openinbrowser": "Ireki nabigatzailean",
     "othergroups": "Beste taldeak",
@@ -151,21 +151,21 @@
     "percentagenumber": "%{{$a}}",
     "phone": "Telefonoa",
     "pictureof": "{{$a}}-ren irudia",
-    "previous": "Aurrekoa",
+    "previous": "Aurreko egoera",
     "pulltorefresh": "Sakatu freskatzeko",
     "redirectingtosite": "Gunera berbideratua izango zara.",
     "refresh": "Freskatu",
-    "required": "Beharrezkoa",
+    "required": "Ezinbestekoa",
     "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": "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",
@@ -178,13 +178,14 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Barkatu...",
+    "sortby": "Zeren arabera ordenatu",
     "start": "Hasiera",
     "submit": "Bidali",
     "success": "Ondo!",
     "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",
@@ -207,7 +208,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 0d4d923b0cc..1be357dd50d 100644
--- a/www/core/lang/fa.json
+++ b/www/core/lang/fa.json
@@ -1,15 +1,15 @@
 {
     "allparticipants": "همهٔ اعضاء",
     "areyousure": "آیا مطمئن هستید؟",
-    "back": "بازگشت",
+    "back": "&raquo; بازگشت",
     "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": "نمایش",
@@ -112,8 +112,9 @@
     "sizekb": "کیلوبایت",
     "sizemb": "مگابایت",
     "sorry": "متاسفیم...",
+    "sortby": "مرتب شدن بر اساس",
     "start": "آغاز",
-    "submit": "ارائه",
+    "submit": "ارسال",
     "success": "موفق",
     "teachers": "استاد",
     "time": "زمان",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index e6a40702a51..35acf20efac 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",
+    "back": "&laquo; 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",
-    "comments": "Vos commentaires",
+    "close": "Fermer la prévisualisation",
+    "comments": "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,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",
@@ -52,11 +52,11 @@
     "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",
     "emptysplit": "Cette page paraîtra vide si le panneau de gauche est vide ou en cours de chargement.",
-    "error": "Erreur",
+    "error": "Une erreur 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.",
@@ -87,17 +87,17 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Image",
     "imageviewer": "Lecteur d'images",
-    "info": "Info",
+    "info": "Information",
     "ios": "iOS",
     "labelsep": "&nbsp;",
-    "lastmodified": "Modifié le",
+    "lastmodified": "Dernière modification",
     "lastsync": "Dernière synchronisation",
     "listsep": ";",
-    "loading": "Chargement",
+    "loading": "Chargement...",
     "loadmore": "Charger plus",
     "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": "Score minimum",
     "mins": "min",
     "mod_assign": "Devoir",
     "mod_assignment": "Devoir",
@@ -130,20 +130,20 @@
     "name": "Nom",
     "networkerrormsg": "Réseau désactivé ou en panne.",
     "never": "Jamais",
-    "next": "Suivant",
+    "next": "Suite",
     "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": "Aucun travail à remettre requis",
     "online": "En ligne",
     "openfullimage": "Cliquer ici pour afficher l'image en pleine grandeur",
     "openinbrowser": "Ouvrir dans le navigateur",
@@ -152,7 +152,7 @@
     "percentagenumber": "{{$a}} %",
     "phone": "Téléphone",
     "pictureof": "Avatar {{$a}}",
-    "previous": "Précédent",
+    "previous": "État précédent",
     "pulltorefresh": "Tirer pour actualiser",
     "redirectingtosite": "Vous allez être redirigé vers le site.",
     "refresh": "Actualiser",
@@ -160,8 +160,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": "Rechercher",
-    "searching": "Recherche",
+    "search": "Recherche",
+    "searching": "Rechercher dans",
     "searchresults": "Résultats de la recherche",
     "sec": "s",
     "secs": "s",
@@ -179,13 +179,14 @@
     "sizemb": "Mo",
     "sizetb": "To",
     "sorry": "Désolé...",
+    "sortby": "Trier par",
     "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",
@@ -202,14 +203,14 @@
     "userdetails": "Informations détaillées",
     "usernotfullysetup": "Utilisateur pas complètement défini",
     "users": "Utilisateurs",
-    "view": "Affichage",
+    "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 63788a56caf..bbc7b0ed56f 100644
--- a/www/core/lang/he.json
+++ b/www/core/lang/he.json
@@ -2,7 +2,7 @@
     "allparticipants": "כל המשתתפים",
     "android": "אנדרואיד",
     "areyousure": "האם את/ה בטוח/ה?",
-    "back": "חזרה",
+    "back": "&laquo; חזרה\n",
     "cancel": "ביטול",
     "cannotconnect": "אין אפשרות להתחבר: אנא ודא כי הזנת נכון את כתובת האתר ושהאתר הוא בגרסה 2.4 ומעלה.",
     "cannotdownloadfiles": "הורדת קבצים אינה מאופשרת במכשירים ניידים. יש לפנות למנהל/ת האתר להפעלת אפשרות זו.",
@@ -11,35 +11,35 @@
     "choosedots": "בחירה...",
     "clearsearch": "איפוס חיפוש",
     "clicktohideshow": "הקש להרחבה או לצמצום",
-    "close": "סגירה",
-    "comments": "ההערות שלך",
+    "close": "סגירת חלון",
+    "comments": "הערות",
     "commentscount": "({{$a}}) הערות",
-    "completion-alt-auto-fail": "הושלם: {{$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": "מטלה",
@@ -90,52 +90,53 @@
     "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": "לא מחובר",
-    "online": "מחובר",
+    "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": "שליחה",
-    "sending": "שולח",
+    "send": "לשלוח",
+    "sending": "שולחים",
     "serverconnection": "שגיאה בהתחברות לשרת",
-    "show": "הצגה",
+    "show": "תצוגה",
     "site": "מערכת",
     "sizeb": "בתים",
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "sortby": "מיון לפי",
     "start": "התחלה",
-    "submit": "שמירה",
-    "success": "הצלחה!",
+    "submit": "הגש",
+    "success": "הצלחה",
     "tablet": "טאבלט",
     "teachers": "מורים",
     "time": "זמן",
@@ -148,10 +149,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 6376ed158d7..ab3c5d03b06 100644
--- a/www/core/lang/hu.json
+++ b/www/core/lang/hu.json
@@ -1,15 +1,15 @@
 {
     "allparticipants": "Összes résztvevő",
     "areyousure": "Biztos?",
-    "back": "Vissza",
-    "cancel": "Mégse",
+    "back": "&laquo; Vissza",
+    "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",
     "choosedots": "Választás...",
     "clicktohideshow": "Kattintson a kibontáshoz vagy a becsukáshoz.",
-    "close": "Bezárás",
-    "comments": "Megjegyzései",
+    "close": "Ablak bezárása",
+    "comments": "Megjegyzések",
     "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}}",
@@ -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": "Bevezető szöveg",
+    "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": "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": "Információk",
     "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": "Min. pontszám",
     "mins": "perc",
     "mod_assign": "Feladat",
     "mod_chat": "Csevegés",
@@ -68,44 +68,45 @@
     "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": "Következő",
+    "next": "Tovább",
     "no": "Nem",
-    "nocomments": "Nincs megjegyzés.",
-    "nograde": "Nincs pont",
-    "none": "Nincs",
+    "nocomments": "Nincs megjegyzés",
+    "nograde": "Nincs osztályzat",
+    "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",
-    "searching": "Hol keres?",
+    "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": "Megjelenítés",
+    "show": "Mutat",
     "site": "Portál",
     "sizeb": "bájt",
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "sortby": "Rendezési szempont",
     "start": "Kezdés",
     "submit": "Leadás",
     "success": "Sikerült",
@@ -121,9 +122,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 fca22023ba9..df7d689b127 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": "&laquo; Back",
     "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",
-    "comments": "I tuoi commenti",
+    "close": "Chiudi finestra",
+    "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?",
@@ -30,22 +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",
-    "description": "Commento",
+    "deleting": "Eliminazione",
+    "description": "Descrizione",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
     "done": "Fatto",
-    "download": "Download",
+    "download": "Scarica",
     "downloading": "Scaricamento in corso",
     "edit": "Modifica",
-    "error": "Errore",
+    "error": "Si è verificato un 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": "Informazioni",
+    "info": "Informazione",
     "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": "min.",
+    "min": "Punteggio minimo",
     "mins": "min.",
     "mod_assign": "Compito",
     "mod_assignment": "Compito",
@@ -109,13 +109,13 @@
     "mod_workshop": "Workshop",
     "moduleintro": "Descrizione",
     "mygroups": "I miei gruppi",
-    "name": "Titolo",
+    "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}})",
@@ -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,21 +133,21 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefono",
     "pictureof": "Immagine {{$a}}",
-    "previous": "Precedente",
+    "previous": "Stato precedente",
     "pulltorefresh": "Trascina per aggiornare",
     "refresh": "Aggiorna",
-    "required": "La risposta è obbligatoria",
+    "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": "Ricerca",
+    "searching": "Cerca in",
+    "searchresults": "Risultati delle ricerche",
     "sec": "secondo",
     "secs": "secondi",
     "seemoredetail": "Clicca qui per ulteriori dettagli",
-    "send": "invia",
-    "sending": "Invio in c orso",
+    "send": "Invia",
+    "sending": "Invio in corso",
     "serverconnection": "Si è verificato un errore durante la connessione al server",
     "show": "Visualizza",
     "site": "Sito",
@@ -156,12 +156,13 @@
     "sizekb": "KB",
     "sizemb": "MB",
     "sizetb": "TB",
+    "sortby": "Ordina per",
     "start": "Apertura",
     "submit": "Invia",
-    "success": "OK!",
+    "success": "Operazione eseguita con successo",
     "tablet": "Tablet",
     "teachers": "Docenti",
-    "time": "Data/Ora",
+    "time": "Tempo",
     "timesup": "Tempo scaduto!",
     "today": "Oggi",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
@@ -179,7 +180,7 @@
     "whoops": "Oops!",
     "windowsphone": "Windows Phone",
     "wsfunctionnotavailable": "La funzione webservice non è disponibile.",
-    "year": "anno",
+    "year": "Anni",
     "years": "anni",
-    "yes": "Sì"
+    "yes": "Si"
 }
\ No newline at end of file
diff --git a/www/core/lang/ja.json b/www/core/lang/ja.json
index 27ba12cde6a..8bc1a53581f 100644
--- a/www/core/lang/ja.json
+++ b/www/core/lang/ja.json
@@ -3,7 +3,7 @@
     "allparticipants": "すべての参加者",
     "android": "Android",
     "areyousure": "本当によろしいですか?",
-    "back": "戻る",
+    "back": "&laquo; 戻る",
     "cancel": "キャンセル",
     "cannotconnect": "接続できません：正しいURLを入力しているか、サイトのMoodleが2.4以降であることを確認してください。",
     "cannotdownloadfiles": "ダウンロードしようとしているファイルは、あなたのモバイルサービスでは無効になっています。あなたのサイト管理者に連絡してください。",
@@ -13,16 +13,16 @@
     "clearsearch": "検索のクリア",
     "clicktohideshow": "展開または折りたたむにはここをクリックしてください。",
     "clicktoseefull": "クリックで全てのコンテンツを見る",
-    "close": "閉じる",
-    "comments": "あなたのコメント",
+    "close": "ウィンドウを閉じる",
+    "comments": "コメント",
     "commentscount": "コメント ({{$a}})",
     "commentsnotworking": "コメントが取得できませんでした",
-    "completion-alt-auto-fail": "完了: {{$a}} （合格点に達していない）",
-    "completion-alt-auto-n": "未了: {{$a}}",
-    "completion-alt-auto-pass": "完了: {{$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}}。選択して未了に変更してください。",
+    "completion-alt-manual-n": "未完了: {{$a}} 完了マークするには選択してください。",
+    "completion-alt-manual-y": "完了: {{$a}} 未完了マークするには選択してください。",
     "confirmcanceledit": "本当にこのページを離れますか？　全ての変更が失われます。",
     "confirmdeletefile": "本当にこのファイルを削除してもよろしいですか?",
     "confirmloss": "本当ですか？　すべての変更が失われます。",
@@ -41,7 +41,7 @@
     "decsep": ".",
     "defaultvalue": "デフォルト ({{$a}})",
     "delete": "削除",
-    "deleting": "消去中",
+    "deleting": "削除",
     "description": "説明",
     "dfdaymonthyear": "YYYY/MM/DD",
     "dfdayweekmonth": "MMM月D日（ddd）",
@@ -52,11 +52,11 @@
     "discard": "無視",
     "dismiss": "取消",
     "done": "完了",
-    "download": "ダウンロード",
+    "download": "エクスポートしたカテゴリファイルをダウンロードする",
     "downloading": "ダウンロード中",
     "edit": "編集",
     "emptysplit": "左パネルが空またはロード中のため本ページは空白",
-    "error": "エラー",
+    "error": "エラーが発生しました。",
     "errorchangecompletion": "完了状態の変更中にエラーが発生しました。再度実行してください。",
     "errordeletefile": "ファイル消去中にエラーが発生しました。再度実行してください。",
     "errordownloading": "ファイルダウンロードのエラー",
@@ -87,17 +87,17 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "画像",
     "imageviewer": "画像ビューア",
-    "info": "情報",
+    "info": "インフォメーション",
     "ios": "iOS",
     "labelsep": ":",
     "lastmodified": "最終更新日時",
     "lastsync": "最後の同期",
     "listsep": ",",
-    "loading": "読み込み",
+    "loading": "読み込み中 ...",
     "loadmore": "続きを読み込む",
     "lostconnection": "あなたのトークンが無効になったため、再接続に必要な情報がサーバにはありません。",
     "maxsizeandattachments": "新しいファイルの最大サイズ: {{$a.size}} / 最大添付: {{$a.attachments}}",
-    "min": "分",
+    "min": "最小評点",
     "mins": "分",
     "mod_assign": "課題",
     "mod_chat": "チャット",
@@ -116,12 +116,12 @@
     "name": "名称",
     "networkerrormsg": "ネットワークが無効もしくは機能していません",
     "never": "なし",
-    "next": "次へ",
+    "next": "続ける",
     "no": "No",
-    "nocomments": "コメントなし",
+    "nocomments": "コメントはありません。",
     "nograde": "評点なし",
     "none": "なし",
-    "nopasswordchangeforced": "パスワードを変更するまで続きを実行できません。",
+    "nopasswordchangeforced": "あなたはパスワードを変更せずに次へ進むことはできません。しかし、パスワードを変更するため利用できるページがありません。あなたのMoodle管理者にご連絡ください。",
     "nopermissions": "申し訳ございません、現在、あなたは 「 {{$a}} 」を実行するためのパーミッションがありません。",
     "noresults": "該当データがありません。",
     "notapplicable": "なし",
@@ -129,7 +129,7 @@
     "notsent": "未送信",
     "now": "現在",
     "numwords": "{{$a}} 語",
-    "offline": "オフライン",
+    "offline": "オンライン提出不要",
     "online": "オンライン",
     "openfullimage": "クリックしてフルサイズの画像を表示",
     "openinbrowser": "ブラウザで開く",
@@ -138,7 +138,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "電話",
     "pictureof": "画像 {{$a}}",
-    "previous": "前へ",
+    "previous": "前の状態に戻す",
     "pulltorefresh": "引いて更新",
     "redirectingtosite": "サイトにリダイレクトされます。",
     "refresh": "リフレッシュ",
@@ -146,8 +146,8 @@
     "requireduserdatamissing": "このユーザは必須のプロフィールデータが欠けています。Moodleでデータを補い、再度開いてください。<br>{{$a}}",
     "retry": "再実行",
     "save": "保存",
-    "search": "検索",
-    "searching": "検索中",
+    "search": "検索 ...",
+    "searching": "検索:",
     "searchresults": "検索結果",
     "sec": "秒",
     "secs": "秒",
@@ -165,9 +165,10 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "すみません...",
+    "sortby": "並べ替え",
     "start": "開始",
     "submit": "送信",
-    "success": "成功!",
+    "success": "成功",
     "tablet": "タブレット",
     "teachers": "教師",
     "thereisdatatosync": "同期が必要なオフライン {{$a}} があります。",
@@ -180,7 +181,7 @@
     "unexpectederror": "不明なエラー。アプリを閉じて再起動してみてください。",
     "unicodenotsupported": "本サイトでは一部の絵文字がサポートされていません。それらは送信されたメッセージから削除されます。",
     "unicodenotsupportedcleanerror": "Unicode文字をクリアする際に空のテキストがありました。",
-    "unknown": "不明な",
+    "unknown": "不明",
     "unlimited": "無制限",
     "unzipping": "未展開の",
     "upgraderunning": "サイトはアップグレード中です。後ほどお試しください。",
diff --git a/www/core/lang/lt.json b/www/core/lang/lt.json
index 599e752d69d..6a86388bca6 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": "&laquo; Atgal",
     "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",
-    "comments": "Jūsų komentarai",
+    "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": "Įžangos tekstas",
     "dfdaymonthyear": "MM-DD-MMMM",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -48,10 +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",
-    "error": "Klaida",
+    "error": "Įvyko 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": "Žinynas",
+    "help": "Pagalba",
     "hide": "Slėpti",
     "hour": "valanda",
     "hours": "valandos",
@@ -84,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": "Mažiausias balas",
     "mins": "min.",
     "mod_assign": "Užduotis",
     "mod_assignment": "Užduotis",
@@ -120,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",
-    "none": "Nei vienas",
-    "nopasswordchangeforced": "Nepakeitus slaptažodžio, negalima tęsti.",
+    "nocomments": "Nėra komentarų",
+    "nograde": "Nėra įvertinimų.",
+    "none": "Nėra",
+    "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",
@@ -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": "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š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",
@@ -172,9 +172,10 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Atsiprašome...",
+    "sortby": "Rūšiuoti pagal",
     "start": "Pradėti",
     "submit": "Pateikti",
-    "success": "Sėkmė!",
+    "success": "Sėkmingai",
     "tablet": "Planšetė",
     "teachers": "Dėstytojai",
     "thereisdatatosync": "Neprijungtas {{$a}}, kad sinchronizuotų.",
@@ -185,7 +186,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.",
@@ -199,7 +200,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 59efdc360b6..4193e16acd3 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",
+    "back": "&laquo; 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,36 +13,36 @@
     "clearsearch": "Zoekresultaten leegmaken",
     "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": "Jouw commentaar",
     "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.",
-    "description": "Inleidende tekst",
+    "deleting": "Verwijderen",
+    "description": "Beschrijving",
     "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": "Download",
+    "download": "Klik om het bestand met de geëxporteerde categorie te downloaden",
     "downloading": "Downloaden",
-    "edit": "Wijzig",
+    "edit": "Bewerk",
     "emptysplit": "Deze pagina zal leeg verschijnen als het linker paneel leeg of aan het laden is.",
-    "error": "Fout",
+    "error": "Er is een fout opgetreden",
     "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": "Laatste wijziging",
+    "lastmodified": "Laatst gewijzigd",
     "lastsync": "Laatste synchronisatie",
     "listsep": ";",
-    "loading": "Aan het laden",
+    "loading": "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": "minuut",
+    "min": "Minimumscore",
     "mins": "minuten",
     "mod_assign": "Opdracht",
     "mod_assignment": "Opdracht",
@@ -130,20 +130,20 @@
     "name": "Naam",
     "networkerrormsg": "Netwerk niet ingeschakeld of werkt niet.",
     "never": "Nooit",
-    "next": "VolgendeAdm",
+    "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",
     "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",
+    "previous": "Vorige status",
     "pulltorefresh": "Slepen om te verversen",
     "redirectingtosite": "Je wordt doorgestuurd naar de site.",
     "refresh": "Vernieuw",
-    "required": "Verplicht",
+    "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": "Zoek in",
     "searchresults": "Zoekresultaten",
     "sec": "seconde",
     "secs": "seconden",
     "seemoredetail": "Klik hier om meer details te zien",
-    "send": "Stuur",
-    "sending": "Sturen",
+    "send": "stuur",
+    "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,9 +179,10 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Sorry...",
+    "sortby": "Sorteer volgens",
     "start": "Start",
-    "submit": "Insturen",
-    "success": "Gelukt!",
+    "submit": "Verstuur",
+    "success": "Succes",
     "tablet": "Tablet",
     "teachers": "leraren",
     "thereisdatatosync": "Er zijn offline {{$a}} die moeten worden gesynchroniseerd.",
@@ -202,7 +203,7 @@
     "userdetails": "Gebruikersdetails",
     "usernotfullysetup": "Gebruiker niet volledig ingesteld",
     "users": "Gebruikers",
-    "view": "Bekijken",
+    "view": "Bekijk",
     "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 d01910cc16c..2074cef52c4 100644
--- a/www/core/lang/pl.json
+++ b/www/core/lang/pl.json
@@ -1,15 +1,15 @@
 {
     "allparticipants": "Wszyscy uczestnicy",
     "areyousure": "Jesteś pewien?",
-    "back": "Wstecz",
+    "back": "&laquo; Powrót",
     "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",
-    "comments": "Twój komentarz",
+    "close": "Zamknij okno",
+    "comments": "Komentarze",
     "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ń",
-    "days": "dni",
+    "date": "data",
+    "day": "Dzień/dni",
+    "days": "Dni",
     "decsep": ",",
     "delete": "Usuń",
     "deleting": "Usuwanie",
-    "description": "Wstęp",
+    "description": "Opis",
     "done": "Wykonane",
-    "download": "Pobierz",
+    "download": "Ściągnij",
     "downloading": "Pobieranie ...",
-    "edit": "Modyfikuj",
-    "error": "Błąd",
+    "edit": "Edytuj",
+    "error": "Wystąpił 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": "Ładuję ...",
     "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": "Min punkty",
     "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": "Dalej",
+    "next": "Następny",
     "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": "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",
-    "searching": "Szukaj w",
-    "searchresults": "Wyniki wyszukiwania",
+    "search": "Szukaj",
+    "searching": "Wyszukiwanie w ...",
+    "searchresults": "Szukaj w rezultatach",
     "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ż",
@@ -104,8 +104,9 @@
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "sortby": "Posortuj według",
     "start": "Rozpocznij",
-    "submit": "Prześlij",
+    "submit": "Zatwierdź",
     "success": "Gotowe",
     "teachers": "Prowadzący",
     "time": "Czas",
@@ -118,9 +119,9 @@
     "userdeleted": "To konto użytkownika zostało usunięte",
     "userdetails": "Szczegóły użytkownika",
     "users": "Użytkownicy",
-    "view": "Wejście",
+    "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 a461e54702c..7f18ff238b8 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": "&laquo; 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,16 +13,16 @@
     "clearsearch": "Limpar busca",
     "clicktohideshow": "Clique para expandir ou contrair",
     "clicktoseefull": "Clique para ver o conteúdo completo.",
-    "close": "Fechar",
-    "comments": "Seus comentários",
+    "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,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",
-    "days": "dias",
+    "day": "Dia(s)",
+    "days": "Dias",
     "decsep": ",",
-    "delete": "Cancelar",
+    "delete": "Excluir",
     "deleting": "Excluindo",
-    "description": "Texto do link",
+    "description": "Descrição",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dflastweekdate": "ddd",
@@ -50,10 +50,10 @@
     "discard": "Descartar",
     "dismiss": "Dispersar",
     "done": "Feito",
-    "download": "Download",
+    "download": "Baixar",
     "downloading": "Baixando",
     "edit": "Editar",
-    "error": "Erro",
+    "error": "Ocorreu um 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 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": "Pontuação mínima",
     "mins": "minutos",
     "mod_assign": "Tarefa",
     "mod_assignment": "Tarefa",
@@ -126,21 +126,21 @@
     "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",
+    "noresults": "Sem resultados",
     "notapplicable": "n/a",
     "notice": "Notar",
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavras",
-    "offline": "Offline",
-    "online": "Online",
+    "offline": "Não há envios online solicitados",
+    "online": "Conectado",
     "openfullimage": "Clique aqui para exibir a imagem no tamanho completo",
     "openinbrowser": "Abrir no navegador",
     "othergroups": "Outros grupos",
@@ -148,24 +148,24 @@
     "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": "Exigido",
     "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": "Gravar",
-    "search": "Buscar",
-    "searching": "Procurando",
+    "save": "Salvar",
+    "search": "Busca",
+    "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": "Mostrar",
+    "show": "Exibir",
     "showmore": "Exibir mais...",
     "site": "Site",
     "sitemaintenance": "Os site está em manutenção e atualmente não está disponível",
@@ -175,13 +175,14 @@
     "sizemb": "Mb",
     "sizetb": "TB",
     "sorry": "Desculpe...",
+    "sortby": "Ordenar por",
     "start": "Início",
     "submit": "Enviar",
-    "success": "Sucesso!",
+    "success": "Sucesso",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline para ser sincronizados.",
-    "time": "Hora",
+    "time": "Duração",
     "timesup": "Acabou o tempo de duração!",
     "today": "Hoje",
     "tryagain": "Tente de novo",
@@ -196,15 +197,16 @@
     "upgraderunning": "O site está sendo atualizado, por favor, tente novamente mais tarde.",
     "userdeleted": "Esta conta de usuário foi cancelada",
     "userdetails": "Detalhes do usuário",
+    "usernotfullysetup": "O usuário não está totalmente configurado",
     "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 8914e8b66a2..73eb3906a63 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",
+    "back": "&laquo; 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,16 +13,16 @@
     "clearsearch": "Limpar pesquisa",
     "clicktohideshow": "Clique para expandir ou contrair",
     "clicktoseefull": "Clique para ver todos os conteúdos.",
-    "close": "Fechar",
-    "comments": "Os seus comentários",
+    "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: {{$a}} (não atingiu nota de aprovação)",
+    "completion-alt-auto-n": "Não concluída: {{$a}}",
+    "completion-alt-auto-pass": "Concluída: {{$a}} (atingiu nota de aprovação)",
+    "completion-alt-auto-y": "Concluída: {{$a}}",
+    "completion-alt-manual-n": "Não concluída: {{$a}}. 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",
@@ -51,11 +51,11 @@
     "discard": "Descartar",
     "dismiss": "Dispensar",
     "done": "Concluído",
-    "download": "Descarregar",
+    "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": "Erro",
+    "error": "Ocorreu um 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çõ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...",
     "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": "minuto",
+    "min": "Pontuação mínima",
     "mins": "minutos",
     "mod_assign": "Trabalho",
     "mod_assignment": "Trabalho",
@@ -126,15 +126,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",
@@ -142,8 +142,8 @@
     "notsent": "Não enviado",
     "now": "agora",
     "numwords": "{{$a}} palavra(s)",
-    "offline": "Offline",
-    "online": "Online",
+    "offline": "Não é necessário submeter nada online",
+    "online": "Inativo",
     "openfullimage": "Clique aqui para exibir a imagem em tamanho real",
     "openinbrowser": "Abrir no navegador",
     "othergroups": "Outros grupos",
@@ -151,17 +151,17 @@
     "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",
-    "required": "Resposta obrigatória",
+    "required": "Obrigatório",
     "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": "Gravar",
-    "search": "Procurar",
-    "searching": "A procurar",
-    "searchresults": "Procurar resultados",
+    "save": "Guardar",
+    "search": "Pesquisa",
+    "searching": "Pesquisar em",
+    "searchresults": "Resultados da procura",
     "sec": "segundo",
     "secs": "segundos",
     "seemoredetail": "Clique aqui para ver mais detalhes",
@@ -178,13 +178,14 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "Desculpe...",
+    "sortby": "Ordenar por",
     "start": "Iniciar",
-    "submit": "Enviar",
-    "success": "Sucesso!",
+    "submit": "Submeter",
+    "success": "Operação realizada com sucesso!",
     "tablet": "Tablet",
     "teachers": "Professores",
     "thereisdatatosync": "Existem {{$a}} offline que têm de ser sincronizados.",
-    "time": "Hora",
+    "time": "Tempo",
     "timesup": "O tempo terminou!",
     "today": "Hoje",
     "tryagain": "Tente novamente",
@@ -193,7 +194,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",
+    "unknown": "Desconhecido(a)",
     "unlimited": "Ilimitado(a)",
     "unzipping": "A descomprimir",
     "upgraderunning": "O site está em processo de atualização, por favor, tente novamente mais tarde.",
@@ -208,7 +209,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 68b050e23b9..6cbdac71897 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": "&laquo; Î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,37 +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",
-    "comments": "Comentariile dumneavoastră",
+    "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",
-    "description": "Text introductiv",
+    "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ă",
-    "error": "Eroare",
+    "edit": "Editare",
+    "error": "A apărut o 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": "Ultima modificare",
+    "lastmodified": "Modificat ultima dată",
     "lastsync": "Ultima sincronizare",
     "listsep": ";",
-    "loading": "Se încarcă",
+    "loading": "Încărcare ...",
     "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": "Punctaj minim",
     "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": "Următorul",
+    "next": "Înainte",
     "no": "Nu",
-    "nocomments": "Nu sunt comentarii",
-    "nograde": "Nicio notă",
-    "none": "nici unul",
+    "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",
     "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,34 +124,35 @@
     "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": "Salvare",
-    "search": "Caută",
-    "searching": "Căutare",
-    "searchresults": "Rezultate căutare",
+    "save": "Salvează",
+    "search": "Căutați",
+    "searching": "Căutare în",
+    "searchresults": "Rezultatele căutării",
     "sec": "sec",
     "secs": "secs",
     "seemoredetail": "Apasă aici pentru mai multe detalii",
-    "send": "Trimis",
+    "send": "trimis",
     "sending": "Se trimite",
     "serverconnection": "Eroare la conectarea la server",
-    "show": "Afişare",
+    "show": "Afișați",
     "site": "Site",
     "sizeb": "bytes",
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
     "sizetb": "TB",
+    "sortby": "Sortează după",
     "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}}",
@@ -168,7 +169,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 e9f8b22367f..8c1e361e574 100644
--- a/www/core/lang/ru.json
+++ b/www/core/lang/ru.json
@@ -2,8 +2,8 @@
     "allparticipants": "Все участники",
     "android": "Android",
     "areyousure": "Вы уверены?",
-    "back": "Назад",
-    "cancel": "Отмена",
+    "back": "&laquo; Назад",
+    "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": "сек.",
@@ -130,6 +130,7 @@
     "sizekb": "Кбайт",
     "sizemb": "Мбайт",
     "sizetb": "Тб",
+    "sortby": "Сортировать по",
     "start": "Начало",
     "submit": "Отправить",
     "success": "Успешно",
@@ -143,11 +144,12 @@
     "upgraderunning": "Сайт обновляется, повторите попытку позже.",
     "userdeleted": "Учетная запись пользователя была удалена",
     "userdetails": "Подробная информация о пользователе",
+    "usernotfullysetup": "Пользователь не полностью настроен",
     "users": "Пользователи",
     "view": "Просмотр",
     "viewprofile": "Просмотр профиля",
     "whoops": "Ой!",
-    "year": "г.",
+    "year": "Год(ы)",
     "years": "г.",
     "yes": "Да"
 }
\ No newline at end of file
diff --git a/www/core/lang/sr-cr.json b/www/core/lang/sr-cr.json
index 68915a26c2f..7f2925b317f 100644
--- a/www/core/lang/sr-cr.json
+++ b/www/core/lang/sr-cr.json
@@ -1,25 +1,47 @@
 {
     "accounts": "Налози",
+    "allparticipants": "Сви учесници",
     "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-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}}. Изабери да би означио као незавршено.",
     "confirmcanceledit": "Да ли сте сигурни да желите да напустите ову страницу? Све промене ће бити изгубљене.",
+    "confirmdeletefile": "Да ли сте сигурни да желите да обришете ову датотетеку?",
     "confirmloss": "Да ли сте сигурни? Све промене ће бити изгубљене.",
     "confirmopeninbrowser": "Да ли желите да отворите у веб читачу?",
+    "content": "Садржај",
     "contenteditingsynced": "Садржај који уређујете је синхронизован.",
+    "continue": "Настави",
     "copiedtoclipboard": "Текст копиран у клипборд",
+    "course": "Курс",
+    "coursedetails": "Подаци о курсeвима",
     "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",
@@ -28,8 +50,12 @@
     "dftimedate": "h[:]mm A",
     "discard": "Одбаци",
     "dismiss": "Обустави",
+    "done": "Урађено",
+    "download": "Преузми",
     "downloading": "Преузимање",
+    "edit": "Уреди",
     "emptysplit": "Ова страница ће се појавити празна уколико је леви панел празан или се учитава.",
+    "error": "Грешка",
     "errorchangecompletion": "Дошло је до грешке приликом промене статуса завршетка. Молимо, покушајте поново.",
     "errordeletefile": "Грешка приликом брисања датотеке. Молимо, покушајте поново.",
     "errordownloading": "Грешка приликом преузимања датотеке.",
@@ -44,41 +70,110 @@
     "errorrenamefile": "Грешка приликом покушаја промене назива датотеке. Молимо, покушајте поново.",
     "errorsync": "Дошло је до грешке приликом синхронизацији. Молимо, покушајте поново.",
     "errorsyncblocked": "{{$a}} тренутно не може да се синхронизује због текућег процеса. Молимо, покушајте поново касније. Ако се проблем и даље буде постојао, покушајте поново да покренете апликацију.",
+    "filename": "Име датотеке",
     "filenameexist": "Назив датотеке већ постоји: {{$a}}",
+    "folder": "Директоријум",
+    "forcepasswordchangenotice": "Морате променити своју лозинку да бисте наставили",
+    "fulllistofcourses": "Сви курсеви",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Одвојене групе",
+    "groupsvisible": "Видљиве групе",
     "hasdatatosync": "{{$a}} има офлајн податке које треба синхронизовати.",
+    "help": "Помоћ",
+    "hide": "Сакриј",
+    "hour": "h",
+    "hours": "сат/а/и",
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Слика",
     "imageviewer": "Приказивач слике",
-    "info": "Инфо",
+    "info": "Информација",
     "ios": "iOS",
+    "labelsep": ":",
+    "lastmodified": "Последња измена",
     "lastsync": "Последња синхронизација",
+    "listsep": ";",
+    "loading": "Учитавање",
     "loadmore": "Учитај још",
     "lostconnection": "Ваш токен за потврду идентитета је неважећи или је истекао. Мораћете поново да успоставите везу са сајтом.",
+    "maxsizeandattachments": "Максимална величина за нове датотеке: {{$a.size}}, макисималан број прилога: {{$a.attachments}}",
+    "min": "min",
+    "mins": "min",
+    "mod_assign": "Задатак",
+    "mod_chat": "Причаоница",
+    "mod_choice": "Избор",
+    "mod_data": "База података",
+    "mod_feedback": "Упитник (Feedback)",
+    "mod_forum": "Форум",
+    "mod_lesson": "Лекција",
+    "mod_lti": "Екстерни алат",
+    "mod_quiz": "Тест",
+    "mod_scorm": "SCORM пакет",
+    "mod_survey": "Упитник (Survey)",
+    "mod_wiki": "Wiki",
+    "moduleintro": "Опис",
     "mygroups": "Моје групе",
+    "name": "Име",
     "networkerrormsg": "Мрежа није укључена или не ради.",
-    "nopasswordchangeforced": "Не можете наставити без промене своје лозинке.",
+    "never": "Никад",
+    "next": "Следећи",
+    "no": "Не",
+    "nocomments": "Нема коментара",
+    "nograde": "Нема оцене",
+    "none": "Ниједан",
+    "nopasswordchangeforced": "Нисте у могућности да наставите даље без промене корисничког имена, међутим не постоји расположива страница за промену. Молимо контактирајте Moodle администратора.",
+    "nopermissions": "Жао нам је, али тренутно немате дозволу да то радите ({{$a}})",
+    "noresults": "Нема резултата",
     "notapplicable": "n/a",
+    "notice": "Напомена",
     "notsent": "Није послато",
-    "offline": "Офлајн",
-    "online": "Онлајн",
+    "now": "сада",
+    "numwords": "{{$a}} реч(и)",
+    "offline": "Не тражи се онлајн предаја рада",
+    "online": "Online",
     "openfullimage": "Кликните овде да бисте приказали слику у пуној величини",
     "openinbrowser": "Отвори у веб читачу",
     "othergroups": "Друге групе",
+    "pagea": "Страница {{$a}}",
     "percentagenumber": "{{$a}}%",
+    "phone": "Телефон",
+    "pictureof": "Слика {{$a}}",
+    "previous": "Претходни",
     "pulltorefresh": "Повуците за освежавање",
     "redirectingtosite": "Бићете преусмерени на сајт.",
+    "refresh": "Освежи",
+    "required": "Обавезно",
     "requireduserdatamissing": "Овај корисник нема у свом профилу неке неопходне податке. Молимо вас, унесети ове податке у ваш Moodle и покушајте поново.<br>{{$a}}",
     "retry": "Покушај поново",
-    "searching": "Претраживање",
-    "sending": "Слање",
+    "save": "Сачувај",
+    "search": "Претрага",
+    "searching": "Претражи у",
+    "searchresults": "Резултати претраге",
+    "sec": "сек",
+    "secs": "s",
+    "seemoredetail": "Кликните овде за више детеља",
+    "send": "Пошаљи",
+    "sending": "Шаље се",
+    "serverconnection": "Грешка у повезивању са сервером",
+    "show": "Прикажи",
     "showmore": "Прикажи још...",
+    "site": "Сајт",
     "sitemaintenance": "Сајт је у режиму одржавања и тренутно није доступан",
+    "sizeb": "бајта",
+    "sizegb": "Gb",
+    "sizekb": "Kb",
+    "sizemb": "Mb",
     "sizetb": "TB",
     "sorry": "Извините...",
-    "success": "Успешно!",
+    "sortby": "Сортирај по",
+    "start": "Почетак",
+    "submit": "Проследи",
+    "success": "Успешно",
     "tablet": "Таблет",
+    "teachers": "Предавачи",
     "thereisdatatosync": "Број офлајн податак које треба синхронизовати: {{$a}}",
+    "time": "Време",
+    "timesup": "Време је истекло!",
+    "today": "Данас",
     "tryagain": "Покушај поново",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Ух!",
@@ -86,10 +181,21 @@
     "unicodenotsupported": "Неки емотикони нису подржани на овом сајту. Такви карактери ће бити уклоњени приликом слања поруке.",
     "unicodenotsupportedcleanerror": "Приликом чишћења Unicode карактера пронађен је празан текст.",
     "unknown": "Непознато",
+    "unlimited": "Неограничено",
     "unzipping": "Распакивање",
+    "upgraderunning": "Сајт се ажурира, молимо покушајте касније",
+    "userdeleted": "Овај кориснички налог је обрисан",
+    "userdetails": "Детаљи о кориснику",
+    "usernotfullysetup": "Корисник није у потпуности подешен",
+    "users": "Корисници",
+    "view": "Приказ",
+    "viewprofile": "Прегледај профил",
     "warningofflinedatadeleted": "Офлајн подаци компоненте {{component}} '{{name}}' су обрисани. {{error}}",
     "whoops": "Упс!",
     "whyisthishappening": "Зашто се ово дешава?",
     "windowsphone": "Windows Phone",
-    "wsfunctionnotavailable": "Функција Webservice није доступна."
+    "wsfunctionnotavailable": "Функција Webservice није доступна.",
+    "year": "година",
+    "years": "година",
+    "yes": "Да"
 }
\ No newline at end of file
diff --git a/www/core/lang/sr-lt.json b/www/core/lang/sr-lt.json
index efcfe49fee4..311b111ce0c 100644
--- a/www/core/lang/sr-lt.json
+++ b/www/core/lang/sr-lt.json
@@ -1,25 +1,47 @@
 {
     "accounts": "Nalozi",
+    "allparticipants": "Svi učesnici",
     "android": "Android",
+    "areyousure": "Da li ste sigurni?",
+    "back": "Nazad",
+    "cancel": "Odustani",
     "cannotconnect": "Nije moguće uspostaviti vezu. Proverite da li ste uneli ispravnu URL adresu i da li vaš sajt koristi Moodle 2.4 ili noviju verziju.",
     "cannotdownloadfiles": "Preuzimanje datoteka je onemogućeno u podešavanjima vašeg mobilnog servisa. Obratite se administratoru sajta.",
+    "category": "Kategorija",
+    "choose": "Izaberi",
+    "choosedots": "Izaberi...",
     "clearsearch": "Obriši pretragu",
+    "clicktohideshow": "Kliknite da biste raširili ili skupili",
     "clicktoseefull": "Kliknite da biste videli kompletan sadržaj.",
+    "close": "Zatvori",
+    "comments": "Komentari",
+    "commentscount": "Komentari ({{$a}})",
     "commentsnotworking": "Komentari ne mogu da budu preuzeti",
-    "completion-alt-auto-fail": "Završeno: {{$a}} (nije postignuta prelazna ocena)",
+    "completion-alt-auto-fail": "Završeno: {{$a}} (nije postigao/la prelaznu ocenu)",
     "completion-alt-auto-n": "Nije završeno: {{$a}}",
-    "completion-alt-auto-pass": "Završeno: {{$a}} (postignuta prelazna ocena)",
+    "completion-alt-auto-pass": "Završeno: {{$a}} (postigao/la prelaznu ocenu)",
     "completion-alt-auto-y": "Završeno: {{$a}}",
-    "completion-alt-manual-n": "Nije završeno: {{$a}}. Izaberite da biste označili kao završeno.",
-    "completion-alt-manual-y": "Završeno: {{$a}}. Izaberite da biste označili kao nezavršeno.",
+    "completion-alt-manual-n": "Nije završeno: {{$a}}. Izaberi da bi označio kao završeno",
+    "completion-alt-manual-y": "Završeno: {{$a}}. Izaberi da bi označio kao nezavršeno.",
     "confirmcanceledit": "Da li ste sigurni da želite da napustite ovu stranicu? Sve promene će biti izgubljene.",
+    "confirmdeletefile": "Da li ste sigurni da želite da obrišete ovu datoteteku?",
     "confirmloss": "Da li ste sigurni? Sve promene će biti izgubljene.",
     "confirmopeninbrowser": "Da li želite da otvorite u veb čitaču?",
+    "content": "Sadržaj",
     "contenteditingsynced": "Sadržaj koji uređujete je sinhronizovan.",
+    "continue": "Nastavi",
     "copiedtoclipboard": "Tekst kopiran u klipbord",
+    "course": "Kurs",
+    "coursedetails": "Podaci o kursevima",
     "currentdevice": "Trenutni uređaj",
     "datastoredoffline": "Podaci su sačuvani u mobilnom uređaju, zato što ne mogu da se pošalju. Automatski će biti poslati kasnije.",
+    "date": "Datum",
+    "day": "dan",
+    "days": "dan/a",
+    "decsep": ",",
+    "delete": "Obriši",
     "deleting": "Brisanje",
+    "description": "Opis",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
     "dffulldate": "dddd, D MMMM YYYY h[:]mm A",
@@ -28,8 +50,12 @@
     "dftimedate": "h[:]mm A",
     "discard": "Odbaci",
     "dismiss": "Obustavi",
+    "done": "Urađeno",
+    "download": "Preuzmi",
     "downloading": "Preuzimanje",
+    "edit": "Uredi",
     "emptysplit": "Ova stranica će se pojaviti prazna ukoliko je levi panel prazan ili se učitava.",
+    "error": "Greška",
     "errorchangecompletion": "Došlo je do greške prilikom promene statusa završetka. Molimo, pokušajte ponovo.",
     "errordeletefile": "Greška prilikom brisanja datoteke. Molimo, pokušajte ponovo.",
     "errordownloading": "Greška prilikom preuzimanja datoteke.",
@@ -44,41 +70,110 @@
     "errorrenamefile": "Greška prilikom pokušaja promene naziva datoteke. Molimo, pokušajte ponovo.",
     "errorsync": "Došlo je do greške prilikom sinhronizaciji. Molimo, pokušajte ponovo.",
     "errorsyncblocked": "{{$a}} trenutno ne može da se sinhronizuje zbog tekućeg procesa. Molimo, pokušajte ponovo kasnije. Ako se problem i dalje bude postojao, pokušajte ponovo da pokrenete aplikaciju.",
+    "filename": "Ime datoteke",
     "filenameexist": "Naziv datoteke već postoji: {{$a}}",
+    "folder": "Direktorijum",
+    "forcepasswordchangenotice": "Morate promeniti svoju lozinku da biste nastavili",
+    "fulllistofcourses": "Svi kursevi",
     "fullnameandsitename": "{{fullname}} ({{sitename}})",
+    "groupsseparate": "Odvojene grupe",
+    "groupsvisible": "Vidljive grupe",
     "hasdatatosync": "{{$a}} ima oflajn podatke koje treba sinhronizovati.",
+    "help": "Pomoć",
+    "hide": "Sakrij",
+    "hour": "h",
+    "hours": "sat/a/i",
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Slika",
     "imageviewer": "Prikazivač slike",
-    "info": "Info",
+    "info": "Informacija",
     "ios": "iOS",
+    "labelsep": ":",
+    "lastmodified": "Poslednja izmena",
     "lastsync": "Poslednja sinhronizacija",
+    "listsep": ";",
+    "loading": "Učitavanje",
     "loadmore": "Učitaj još",
     "lostconnection": "Vaš token za potvrdu identiteta je nevažeći ili je istekao. Moraćete ponovo da uspostavite vezu sa sajtom.",
+    "maxsizeandattachments": "Maksimalna veličina za nove datoteke: {{$a.size}}, makisimalan broj priloga: {{$a.attachments}}",
+    "min": "min",
+    "mins": "min",
+    "mod_assign": "Zadatak",
+    "mod_chat": "Pričaonica",
+    "mod_choice": "Izbor",
+    "mod_data": "Baza podataka",
+    "mod_feedback": "Upitnik (Feedback)",
+    "mod_forum": "Forum",
+    "mod_lesson": "Lekcija",
+    "mod_lti": "Eksterni alat",
+    "mod_quiz": "Test",
+    "mod_scorm": "SCORM paket",
+    "mod_survey": "Upitnik (Survey)",
+    "mod_wiki": "Wiki",
+    "moduleintro": "Opis",
     "mygroups": "Moje grupe",
+    "name": "Ime",
     "networkerrormsg": "Mreža nije uključena ili ne radi.",
-    "nopasswordchangeforced": "Ne možete nastaviti bez promene svoje lozinke.",
+    "never": "Nikad",
+    "next": "Sledeći",
+    "no": "Ne",
+    "nocomments": "Nema komentara",
+    "nograde": "Nema ocene",
+    "none": "Nijedan",
+    "nopasswordchangeforced": "Niste u mogućnosti da nastavite dalje bez promene korisničkog imena, međutim ne postoji raspoloživa stranica za promenu. Molimo kontaktirajte Moodle administratora.",
+    "nopermissions": "Žao nam je, ali trenutno nemate dozvolu da to radite ({{$a}})",
+    "noresults": "Nema rezultata",
     "notapplicable": "n/a",
+    "notice": "Napomena",
     "notsent": "Nije poslato",
-    "offline": "Oflajn",
-    "online": "Onlajn",
+    "now": "sada",
+    "numwords": "{{$a}} reč(i)",
+    "offline": "Ne traži se onlajn predaja rada",
+    "online": "Online",
     "openfullimage": "Kliknite ovde da biste prikazali sliku u punoj veličini",
     "openinbrowser": "Otvori u veb čitaču",
     "othergroups": "Druge grupe",
+    "pagea": "Stranica {{$a}}",
     "percentagenumber": "{{$a}}%",
+    "phone": "Telefon",
+    "pictureof": "Slika {{$a}}",
+    "previous": "Prethodni",
     "pulltorefresh": "Povucite za osvežavanje",
     "redirectingtosite": "Bićete preusmereni na sajt.",
+    "refresh": "Osveži",
+    "required": "Obavezno",
     "requireduserdatamissing": "Ovaj korisnik nema u svom profilu neke neophodne podatke. Molimo vas, uneseti ove podatke u vaš Moodle i pokušajte ponovo.<br>{{$a}}",
     "retry": "Pokušaj ponovo",
-    "searching": "Pretraživanje",
-    "sending": "Slanje",
+    "save": "Sačuvaj",
+    "search": "Pretraga",
+    "searching": "Pretraži u",
+    "searchresults": "Rezultati pretrage",
+    "sec": "sek",
+    "secs": "s",
+    "seemoredetail": "Kliknite ovde za više detelja",
+    "send": "Pošalji",
+    "sending": "Šalje se",
+    "serverconnection": "Greška u povezivanju sa serverom",
+    "show": "Prikaži",
     "showmore": "Prikaži još...",
+    "site": "Sajt",
     "sitemaintenance": "Sajt je u režimu održavanja i trenutno nije dostupan",
+    "sizeb": "bajta",
+    "sizegb": "Gb",
+    "sizekb": "Kb",
+    "sizemb": "Mb",
     "sizetb": "TB",
     "sorry": "Izvinite...",
-    "success": "Uspešno!",
+    "sortby": "Sortiraj po",
+    "start": "Početak",
+    "submit": "Prosledi",
+    "success": "Uspešno",
     "tablet": "Tablet",
+    "teachers": "Predavači",
     "thereisdatatosync": "Broj oflajn podatak koje treba sinhronizovati: {{$a}}",
+    "time": "Vreme",
+    "timesup": "Vreme je isteklo!",
+    "today": "Danas",
     "tryagain": "Pokušaj ponovo",
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "Uh!",
@@ -86,10 +181,21 @@
     "unicodenotsupported": "Neki emotikoni nisu podržani na ovom sajtu. Takvi karakteri će biti uklonjeni prilikom slanja poruke.",
     "unicodenotsupportedcleanerror": "Prilikom čišćenja Unicode karaktera pronađen je prazan tekst.",
     "unknown": "Nepoznato",
+    "unlimited": "Neograničeno",
     "unzipping": "Raspakivanje",
+    "upgraderunning": "Sajt se ažurira, molimo pokušajte kasnije",
+    "userdeleted": "Ovaj korisnički nalog je obrisan",
+    "userdetails": "Detalji o korisniku",
+    "usernotfullysetup": "Korisnik nije u potpunosti podešen",
+    "users": "Korisnici",
+    "view": "Prikaz",
+    "viewprofile": "Pregledaj profil",
     "warningofflinedatadeleted": "Oflajn podaci komponente {{component}} '{{name}}' su obrisani. {{error}}",
     "whoops": "Ups!",
     "whyisthishappening": "Zašto se ovo dešava?",
     "windowsphone": "Windows Phone",
-    "wsfunctionnotavailable": "Funkcija Webservice nije dostupna."
+    "wsfunctionnotavailable": "Funkcija Webservice nije dostupna.",
+    "year": "godina",
+    "years": "godina",
+    "yes": "Da"
 }
\ No newline at end of file
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index cfb7c45efd3..47effc624e5 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": "&laquo; 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,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",
-    "comments": "Dina kommentarer",
+    "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,21 +28,21 @@
     "course": "Kurs",
     "coursedetails": "Kursinformation",
     "date": "Datum",
-    "day": "dag",
-    "days": "dagar",
+    "day": "Dag(ar)",
+    "days": "Dagar",
     "decsep": ",",
     "delete": "Ta bort",
-    "deleting": "ta bort",
-    "description": "Introduktion",
+    "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",
-    "error": "Fel",
+    "error": "Det uppstod ett 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 .",
@@ -52,7 +52,7 @@
     "erroropenpopup": "Aktiviteten försöker öppna en popup . Detta stöds inte i den här appen.",
     "filename": "Filnamn",
     "folder": "Katalog",
-    "forcepasswordchangenotice": "Du måste använda Ditt lösenord för att kunna fortsätta.",
+    "forcepasswordchangenotice": "Du måste använda ditt lösenord för att kunna fortsätta.",
     "fulllistofcourses": "Alla kurser",
     "groupsseparate": "Olika grupper",
     "groupsvisible": "Synliga grupper",
@@ -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": "minut",
+    "min": "Min resultat",
     "mins": "minuter",
     "mod_assign": "Uppgift",
     "mod_assignment": "Uppgift",
@@ -105,20 +105,20 @@
     "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.",
+    "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",
     "numwords": "{{$a}} ord",
-    "offline": "Offline",
-    "online": "Online",
+    "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",
     "othergroups": "Andra grupper",
@@ -126,19 +126,19 @@
     "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ö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",
@@ -148,9 +148,10 @@
     "sizekb": "Kb",
     "sizemb": "Mb",
     "sizetb": "Tb",
+    "sortby": "Sortera enligt",
     "start": "Starta",
-    "submit": "Skicka in",
-    "success": "Succé!",
+    "submit": "Skicka",
+    "success": "Framgång",
     "tablet": "Tablet",
     "teachers": "Distanslärare/<br />handledare/<br />coacher",
     "time": "Tid",
@@ -170,7 +171,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 295d277a503..a77ce3dff24 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": "Geri",
+    "back": "&laquo; 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": "Kapat",
-    "comments": "Yorumlarınız",
+    "close": "Pencereyi kapat",
+    "comments": "Yorumlar",
     "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",
+    "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": "Tanıtım metni",
+    "description": "Açıklama",
     "done": "Tamamlandı",
-    "download": "İndir",
+    "download": "Verilen kategori dosyasını indirin",
     "downloading": "İndiriliyor...",
-    "edit": "Düzelt",
-    "error": "Hata",
+    "edit": "Düzenle ",
+    "error": "Hata oluştu",
     "errordownloading": "Dosya indirmede  hata",
     "filename": "Dosya adı",
     "folder": "Klasör",
@@ -53,13 +53,13 @@
     "info": "Bilgi",
     "ios": "İOS",
     "labelsep": ":",
-    "lastmodified": "En son değiştirme",
+    "lastmodified": "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": "dk",
+    "min": "Min puan",
     "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": "Hiçbir zaman",
-    "next": "Sonraki",
+    "never": "Asla",
+    "next": "Devam et",
     "no": "Hayır",
-    "nocomments": "Yorum yok",
-    "nograde": "Not yok",
-    "none": "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}}",
     "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",
+    "previous": "Önceki durum",
     "refresh": "Yenile",
     "required": "Gerekli",
     "save": "Kaydet",
-    "search": "Ara",
-    "searching": "Aranıyor",
+    "search": "Arama...",
+    "searching": "Aranan",
     "searchresults": "Arama sonuçları",
     "sec": "sn",
     "secs": "sn",
@@ -130,12 +130,13 @@
     "sizekb": "KB",
     "sizemb": "MB",
     "sorry": "Üzgünüz...",
+    "sortby": "Sıralama ölçütü",
     "start": "Başla",
     "submit": "Gönder",
     "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",
@@ -146,9 +147,9 @@
     "userdetails": "Kullanıcı ayrıntıları",
     "usernotfullysetup": "Kullanıcı tam kurulum yapmadı",
     "users": "Kullanıcılar",
-    "view": "Görüntüle",
+    "view": "Görünüm",
     "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 65399cfaf7e..a316e7e3686 100644
--- a/www/core/lang/uk.json
+++ b/www/core/lang/uk.json
@@ -3,7 +3,7 @@
     "allparticipants": "Усі учасники",
     "android": "Android",
     "areyousure": "Ви впевнені?",
-    "back": "Назад",
+    "back": "&laquo; Назад",
     "cancel": "Скасувати",
     "cannotconnect": "Неможливо з'єднатися: Переконайтеся, що ви ввели правильний URL і що сайт використовує Moodle 2.4 або більш пізню версію.",
     "cannotdownloadfiles": "Завантаження файлів відключено у вашій мобільній службі. Будь ласка, зверніться до адміністратора сайту.",
@@ -13,16 +13,16 @@
     "clearsearch": "Очистити пошук",
     "clicktohideshow": "Натисніть, щоб розгорнути або згорнути",
     "clicktoseefull": "Натисніть, щоб побачити весь вміст.",
-    "close": "Закрити",
-    "comments": "Ваші коментарі",
+    "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": "Виконано: {{$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": "Ви впевнені? Всі зміни будуть втрачені.",
@@ -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": "Помилка завантаження файлу.",
@@ -86,17 +86,17 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Зображення",
     "imageviewer": "Переглядач зображень",
-    "info": "Інфо",
+    "info": "Інформація",
     "ios": "iOS",
     "labelsep": ":",
-    "lastmodified": "Остання зміна",
+    "lastmodified": "Востаннє змінено",
     "lastsync": "Остання синхронізація",
     "listsep": ";",
     "loading": "Завантаження...",
     "loadmore": "Завантажити більше",
     "lostconnection": "Ваш маркер аутентифікації недійсний або закінчився, вам доведеться підключитися до сайту.",
     "maxsizeandattachments": "Макс. обсяг для нових файлів: {{$a.size}}, макс. кількість прикріплених файлів: {{$a.attachments}}",
-    "min": "хв",
+    "min": "Мін.оцінка",
     "mins": "хв",
     "mod_assign": "Завдання",
     "mod_chat": "Чат",
@@ -112,24 +112,24 @@
     "mod_wiki": "Вікі",
     "moduleintro": "Опис",
     "mygroups": "Мої групи",
-    "name": "Ім'я",
+    "name": "Назва",
     "networkerrormsg": "Мережа не включена або не працює.",
     "never": "Ніколи",
-    "next": "Далі",
+    "next": "Вперед",
     "no": "Ні",
-    "nocomments": "Немає коментарів",
-    "nograde": "Без оцінки",
-    "none": "Не вибрано",
-    "nopasswordchangeforced": "Ви не можете продовжити без зміни пароля.",
+    "nocomments": "Коментарів немає",
+    "nograde": "Немає оцінки.",
+    "none": "Немає",
+    "nopasswordchangeforced": "Ви не можете перейти не змінивши ваш пароль, але не вказано ніякої сторінки для цього процесу. Будь ласка, зверніться до вашого Адміністратора.",
     "nopermissions": "Вибачте, але ваші поточні права не дозволяють вам цього робити ({{$a}})",
-    "noresults": "Без результатів",
+    "noresults": "Результат відсутній",
     "notapplicable": "n/a",
     "notice": "Помітити",
     "notsent": "Не відправлено",
     "now": "зараз",
     "numwords": "{{$a}} слів",
-    "offline": "Offline",
-    "online": "Online",
+    "offline": "Не потрібно здавати в онлайні",
+    "online": "В мережі",
     "openfullimage": "Натисніть тут, щоб побачити зображення в повному розмірі",
     "openinbrowser": "Відкрити у браузері",
     "othergroups": "Інші групи",
@@ -137,22 +137,22 @@
     "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": "Відіслати",
-    "sending": "Відправка",
+    "send": "надіслати",
+    "sending": "Відсилання",
     "serverconnection": "Помилка з’єднання з сервером",
     "show": "Показати",
     "showmore": "Показати більше",
@@ -164,9 +164,10 @@
     "sizemb": "Мб",
     "sizetb": "TB",
     "sorry": "Вибачте...",
+    "sortby": "Сортувати за",
     "start": "Початок",
-    "submit": "Прийняти",
-    "success": "Успіх!",
+    "submit": "Надіслати",
+    "success": "Успішно",
     "tablet": "Планшет",
     "teachers": "Викладачі",
     "thereisdatatosync": "Офлайн {{$a}} повинні бути синхронізовані.",
@@ -179,7 +180,7 @@
     "unexpectederror": "Неочікувана помилка. Будь ласка, закрийте і знову відкрийте додаток, щоб спробувати ще раз",
     "unicodenotsupported": "Деякі Emoji не підтримуються на цьому сайті. Такі символи будуть видалені, коли повідомлення буде відправлено.",
     "unicodenotsupportedcleanerror": "Порожній текст був знайдений при чищенні Unicode символів.",
-    "unknown": "Невідомо",
+    "unknown": "Невідоме",
     "unlimited": "Не обмежено",
     "unzipping": "Розпакування",
     "upgraderunning": "Сайт оновлюється, повторіть спробу пізніше.",
@@ -193,7 +194,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 61789cfd747..ca7d8d0dfac 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": "秒",
@@ -104,11 +104,12 @@
     "sizegb": "GB",
     "sizekb": "KB",
     "sizemb": "MB",
+    "sortby": "排序",
     "start": "开始",
     "submit": "提交",
     "success": "成功",
     "teachers": "教师",
-    "time": "用时",
+    "time": "时间",
     "timesup": "时间到！",
     "today": "今天",
     "unexpectederror": "意外出错。请关闭并重新打开APP再试一次",
@@ -118,7 +119,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 d0608dfbea4..198c9b7eeb7 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": "評論",
+    "close": "關閉視窗",
+    "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,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,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",
@@ -137,8 +137,8 @@
     "notsent": "沒有傳送",
     "now": "現在",
     "numwords": "{{$a}}字數",
-    "offline": "離線",
-    "online": "上線",
+    "offline": "不需要線上繳交",
+    "online": "在線上",
     "openfullimage": "點擊這裡以圖像原尺寸顯示",
     "openinbrowser": "以瀏覽器開啟",
     "othergroups": "其他群組",
@@ -146,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": "顯示更多...",
@@ -173,9 +173,10 @@
     "sizemb": "MB",
     "sizetb": "TB",
     "sorry": "抱歉...",
+    "sortby": "排序依據",
     "start": "開始",
-    "submit": "提交",
-    "success": "成功!",
+    "submit": "送出",
+    "success": "成功",
     "tablet": "平板",
     "teachers": "教師",
     "thereisdatatosync": "有離線的{{$ a}}要同步",
@@ -186,7 +187,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "噢哦!",
     "unexpectederror": "無法預期的錯誤. 請關閉並重新開啟應用程式, 再試一次.",
-    "unknown": "未知",
+    "unknown": "未知的",
     "unlimited": "無限制",
     "unzipping": "解壓縮中",
     "upgraderunning": "網站正在升級中，請稍後再試。",
@@ -194,7 +195,7 @@
     "userdetails": "用戶的詳細資料",
     "usernotfullysetup": "用戶沒有完全設定好",
     "users": "用戶",
-    "view": "瀏覽",
+    "view": "檢視",
     "viewprofile": "瀏覽個人資料",
     "warningofflinedatadeleted": "離線資料 {{component}} '{{name}}' 已被刪除. {{error}}",
     "whoops": "糟糕!",

From d338285531076ee4bc7a03951b6043d687652309 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Thu, 27 Jul 2017 00:12:22 +0200
Subject: [PATCH 092/118] MOBILE-2156 lang: Re-sync with amos for new languages

---
 www/addons/calendar/lang/ar.json              |  2 +-
 www/addons/calendar/lang/cs.json              |  4 +--
 www/addons/calendar/lang/da.json              |  4 +--
 www/addons/calendar/lang/de.json              |  4 +--
 www/addons/calendar/lang/es.json              |  4 +--
 www/addons/calendar/lang/eu.json              |  2 +-
 www/addons/calendar/lang/fr.json              |  2 +-
 www/addons/calendar/lang/he.json              |  4 +--
 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/ru.json              |  2 +-
 www/addons/calendar/lang/sr-cr.json           |  2 +-
 www/addons/calendar/lang/sr-lt.json           |  4 +--
 www/addons/calendar/lang/sv.json              |  2 +-
 www/addons/calendar/lang/uk.json              |  4 +--
 www/addons/competency/lang/cs.json            |  2 +-
 www/addons/competency/lang/da.json            |  2 +-
 www/addons/competency/lang/de.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/ja.json            |  2 +-
 www/addons/competency/lang/nl.json            |  2 +-
 www/addons/competency/lang/sr-cr.json         |  2 +-
 www/addons/competency/lang/sr-lt.json         |  2 +-
 www/addons/competency/lang/uk.json            |  2 +-
 www/addons/coursecompletion/lang/ar.json      | 20 ++++++-------
 www/addons/coursecompletion/lang/cs.json      | 26 ++++++++---------
 www/addons/coursecompletion/lang/da.json      | 28 +++++++++----------
 www/addons/coursecompletion/lang/de.json      | 24 ++++++++--------
 www/addons/coursecompletion/lang/el.json      | 14 +++++-----
 www/addons/coursecompletion/lang/es.json      | 10 +++----
 www/addons/coursecompletion/lang/eu.json      | 14 +++++-----
 www/addons/coursecompletion/lang/fr.json      | 10 +++----
 www/addons/coursecompletion/lang/he.json      | 26 ++++++++---------
 www/addons/coursecompletion/lang/it.json      | 16 +++++------
 www/addons/coursecompletion/lang/ja.json      | 24 ++++++++--------
 www/addons/coursecompletion/lang/nl.json      | 20 ++++++-------
 www/addons/coursecompletion/lang/ru.json      | 26 ++++++++---------
 www/addons/coursecompletion/lang/sr-cr.json   | 14 +++++-----
 www/addons/coursecompletion/lang/sr-lt.json   | 14 +++++-----
 www/addons/coursecompletion/lang/sv.json      | 22 +++++++--------
 www/addons/coursecompletion/lang/uk.json      | 26 ++++++++---------
 www/addons/files/lang/ar.json                 |  2 +-
 www/addons/files/lang/cs.json                 |  4 +--
 www/addons/files/lang/da.json                 |  4 +--
 www/addons/files/lang/de.json                 |  4 +--
 www/addons/files/lang/el.json                 |  2 +-
 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/he.json                 |  2 +-
 www/addons/files/lang/it.json                 |  4 +--
 www/addons/files/lang/ja.json                 |  4 +--
 www/addons/files/lang/nl.json                 |  4 +--
 www/addons/files/lang/ru.json                 |  2 +-
 www/addons/files/lang/sr-cr.json              |  4 +--
 www/addons/files/lang/sr-lt.json              |  4 +--
 www/addons/files/lang/uk.json                 |  4 +--
 www/addons/messages/lang/ar.json              |  4 +--
 www/addons/messages/lang/cs.json              |  6 ++--
 www/addons/messages/lang/da.json              |  4 +--
 www/addons/messages/lang/de.json              |  4 +--
 www/addons/messages/lang/el.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/he.json              |  6 ++--
 www/addons/messages/lang/it.json              |  6 ++--
 www/addons/messages/lang/ja.json              |  6 ++--
 www/addons/messages/lang/nl.json              |  4 +--
 www/addons/messages/lang/ru.json              |  4 +--
 www/addons/messages/lang/sr-cr.json           |  4 +--
 www/addons/messages/lang/sr-lt.json           |  4 +--
 www/addons/messages/lang/sv.json              |  6 ++--
 www/addons/messages/lang/uk.json              |  2 +-
 www/addons/mod/choice/lang/ar.json            |  2 +-
 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.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/ja.json            |  4 +--
 www/addons/mod/choice/lang/nl.json            |  4 +--
 www/addons/mod/choice/lang/sr-cr.json         |  4 +--
 www/addons/mod/choice/lang/sr-lt.json         |  4 +--
 www/addons/mod/choice/lang/sv.json            |  4 +--
 www/addons/mod/choice/lang/uk.json            |  4 +--
 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/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/ja.json            |  2 +-
 www/addons/mod/folder/lang/nl.json            |  2 +-
 www/addons/mod/folder/lang/sr-cr.json         |  2 +-
 www/addons/mod/folder/lang/sr-lt.json         |  2 +-
 www/addons/mod/forum/lang/da.json             |  2 +-
 www/addons/mod/forum/lang/de.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/ja.json             |  2 +-
 www/addons/mod/forum/lang/nl.json             |  2 +-
 www/addons/mod/forum/lang/ru.json             |  2 +-
 www/addons/mod/forum/lang/sr-cr.json          |  2 +-
 www/addons/mod/forum/lang/sr-lt.json          |  2 +-
 www/addons/mod/forum/lang/sv.json             |  2 +-
 www/addons/mod/forum/lang/uk.json             |  2 +-
 www/addons/mod/glossary/lang/cs.json          |  2 +-
 www/addons/mod/glossary/lang/da.json          |  2 +-
 www/addons/mod/glossary/lang/de.json          |  2 +-
 www/addons/mod/glossary/lang/el.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/ja.json          |  2 +-
 www/addons/mod/glossary/lang/nl.json          |  2 +-
 www/addons/mod/glossary/lang/sr-cr.json       |  2 +-
 www/addons/mod/glossary/lang/sr-lt.json       |  2 +-
 www/addons/mod/glossary/lang/sv.json          |  2 +-
 www/addons/mod/glossary/lang/uk.json          |  2 +-
 www/addons/mod/label/lang/he.json             |  2 +-
 www/addons/mod/label/lang/ru.json             |  2 +-
 www/addons/mod/label/lang/uk.json             |  2 +-
 www/addons/mod/survey/lang/ar.json            |  2 +-
 www/addons/mod/survey/lang/ja.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              |  2 +-
 www/addons/mod/wiki/lang/es.json              |  2 +-
 www/addons/mod/wiki/lang/eu.json              |  2 +-
 www/addons/mod/wiki/lang/fr.json              |  2 +-
 www/addons/mod/wiki/lang/ja.json              |  2 +-
 www/addons/mod/wiki/lang/nl.json              |  2 +-
 www/addons/mod/wiki/lang/ru.json              |  2 +-
 www/addons/mod/wiki/lang/sr-cr.json           |  2 +-
 www/addons/mod/wiki/lang/sr-lt.json           |  2 +-
 www/addons/mod/wiki/lang/uk.json              |  2 +-
 www/addons/notes/lang/ar.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/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/ja.json                 |  2 +-
 www/addons/notes/lang/nl.json                 |  2 +-
 www/addons/notes/lang/ru.json                 |  2 +-
 www/addons/notes/lang/sr-cr.json              |  2 +-
 www/addons/notes/lang/sr-lt.json              |  2 +-
 www/addons/notes/lang/sv.json                 |  2 +-
 www/addons/notes/lang/uk.json                 |  2 +-
 www/addons/notifications/lang/ar.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.json         |  4 +--
 www/addons/notifications/lang/eu.json         |  2 +-
 www/addons/notifications/lang/he.json         |  2 +-
 www/addons/notifications/lang/ja.json         |  2 +-
 www/addons/notifications/lang/nl.json         |  2 +-
 www/addons/notifications/lang/sv.json         |  2 +-
 www/addons/notifications/lang/uk.json         |  2 +-
 www/addons/participants/lang/ar.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.json          |  2 +-
 www/addons/participants/lang/eu.json          |  2 +-
 www/addons/participants/lang/fr.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/sr-cr.json       |  2 +-
 www/addons/participants/lang/sr-lt.json       |  2 +-
 www/addons/participants/lang/sv.json          |  2 +-
 www/addons/participants/lang/uk.json          |  2 +-
 www/core/components/course/lang/ar.json       |  4 +--
 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.json       |  4 +--
 www/core/components/course/lang/eu.json       |  2 +-
 www/core/components/course/lang/fr.json       |  2 +-
 www/core/components/course/lang/he.json       |  2 +-
 www/core/components/course/lang/it.json       |  2 +-
 www/core/components/course/lang/ja.json       |  2 +-
 www/core/components/course/lang/nl.json       |  2 +-
 www/core/components/course/lang/ru.json       |  2 +-
 www/core/components/course/lang/sr-cr.json    |  4 +--
 www/core/components/course/lang/sr-lt.json    |  4 +--
 www/core/components/course/lang/sv.json       |  2 +-
 www/core/components/course/lang/uk.json       |  4 +--
 www/core/components/courses/lang/cs.json      | 10 +++----
 www/core/components/courses/lang/da.json      |  6 ++--
 www/core/components/courses/lang/de.json      | 10 +++----
 www/core/components/courses/lang/el.json      |  8 +++---
 www/core/components/courses/lang/es.json      |  8 +++---
 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/nl.json      | 10 +++----
 www/core/components/courses/lang/sr-cr.json   |  6 ++--
 www/core/components/courses/lang/sr-lt.json   |  6 ++--
 www/core/components/courses/lang/sv.json      | 10 +++----
 www/core/components/courses/lang/uk.json      | 10 +++----
 www/core/components/fileuploader/lang/ar.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 +++---
 www/core/components/fileuploader/lang/es.json |  6 ++--
 www/core/components/fileuploader/lang/eu.json |  8 +++---
 www/core/components/fileuploader/lang/fr.json | 10 +++----
 www/core/components/fileuploader/lang/he.json |  8 +++---
 www/core/components/fileuploader/lang/it.json | 10 +++----
 www/core/components/fileuploader/lang/ja.json |  8 +++---
 www/core/components/fileuploader/lang/nl.json | 12 ++++----
 www/core/components/fileuploader/lang/ru.json |  8 +++---
 .../components/fileuploader/lang/sr-cr.json   | 10 +++----
 .../components/fileuploader/lang/sr-lt.json   | 10 +++----
 www/core/components/fileuploader/lang/sv.json |  6 ++--
 www/core/components/fileuploader/lang/uk.json |  8 +++---
 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.json        |  2 +-
 www/core/components/login/lang/eu.json        |  4 +--
 www/core/components/login/lang/fr.json        |  4 +--
 www/core/components/login/lang/he.json        |  2 +-
 www/core/components/login/lang/it.json        |  2 +-
 www/core/components/login/lang/nl.json        |  4 +--
 www/core/components/login/lang/ru.json        |  2 +-
 www/core/components/login/lang/sr-cr.json     |  4 +--
 www/core/components/login/lang/sr-lt.json     |  4 +--
 www/core/components/login/lang/sv.json        |  2 +-
 www/core/components/login/lang/uk.json        |  4 +--
 www/core/components/question/lang/cs.json     |  2 +-
 www/core/components/question/lang/de.json     |  2 +-
 www/core/components/question/lang/el.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/nl.json     |  2 +-
 www/core/components/question/lang/sr-cr.json  |  2 +-
 www/core/components/question/lang/sr-lt.json  |  2 +-
 www/core/components/question/lang/uk.json     |  2 +-
 www/core/components/sharedfiles/lang/cs.json  |  2 +-
 www/core/components/sharedfiles/lang/de.json  |  2 +-
 www/core/components/sharedfiles/lang/eu.json  |  2 +-
 .../components/sharedfiles/lang/sr-cr.json    |  2 +-
 .../components/sharedfiles/lang/sr-lt.json    |  2 +-
 www/core/components/sharedfiles/lang/uk.json  |  2 +-
 www/core/components/sidemenu/lang/ar.json     |  4 +--
 www/core/components/sidemenu/lang/cs.json     |  4 +--
 www/core/components/sidemenu/lang/de.json     |  2 +-
 www/core/components/sidemenu/lang/el.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/nl.json     |  2 +-
 www/core/components/sidemenu/lang/ru.json     |  2 +-
 www/core/components/sidemenu/lang/uk.json     |  2 +-
 www/core/components/user/lang/ar.json         |  4 +--
 www/core/components/user/lang/cs.json         |  6 ++--
 www/core/components/user/lang/da.json         |  4 +--
 www/core/components/user/lang/de.json         |  6 ++--
 www/core/components/user/lang/el.json         |  6 ++--
 www/core/components/user/lang/es.json         |  4 +--
 www/core/components/user/lang/eu.json         |  6 ++--
 www/core/components/user/lang/fr.json         |  8 +++---
 www/core/components/user/lang/he.json         |  8 +++---
 www/core/components/user/lang/it.json         |  6 ++--
 www/core/components/user/lang/ja.json         |  4 +--
 www/core/components/user/lang/nl.json         |  4 +--
 www/core/components/user/lang/ru.json         |  6 ++--
 www/core/components/user/lang/sr-cr.json      |  6 ++--
 www/core/components/user/lang/sr-lt.json      |  6 ++--
 www/core/components/user/lang/sv.json         |  8 +++---
 www/core/components/user/lang/uk.json         |  6 ++--
 www/core/lang/ar.json                         |  2 +-
 www/core/lang/cs.json                         | 16 +++++------
 www/core/lang/da.json                         | 16 +++++------
 www/core/lang/de.json                         | 22 +++++++--------
 www/core/lang/el.json                         | 24 ++++++++--------
 www/core/lang/es.json                         | 12 ++++----
 www/core/lang/eu.json                         |  8 +++---
 www/core/lang/fr.json                         | 12 ++++----
 www/core/lang/he.json                         | 16 +++++------
 www/core/lang/it.json                         | 24 ++++++++--------
 www/core/lang/ja.json                         | 24 ++++++++--------
 www/core/lang/nl.json                         | 22 +++++++--------
 www/core/lang/sr-cr.json                      | 22 +++++++--------
 www/core/lang/sr-lt.json                      | 22 +++++++--------
 www/core/lang/sv.json                         | 22 +++++++--------
 www/core/lang/uk.json                         | 28 +++++++++----------
 311 files changed, 789 insertions(+), 789 deletions(-)

diff --git a/www/addons/calendar/lang/ar.json b/www/addons/calendar/lang/ar.json
index 9bece3c914d..23e2ee91b94 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 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/da.json b/www/addons/calendar/lang/da.json
index 9af5235a51d..6826baea7eb 100644
--- a/www/addons/calendar/lang/da.json
+++ b/www/addons/calendar/lang/da.json
@@ -2,6 +2,6 @@
     "calendarevents": "Kalenderbegivenheder",
     "errorloadevent": "Fejl ved indlæsning af begivenhed.",
     "errorloadevents": "Fejl ved indlæsning af begivenheder.",
-    "noevents": "Ingen forestående aktiviteter",
-    "notifications": "Beskeder"
+    "noevents": "Der er ingen begivenheder",
+    "notifications": "Notifikationer"
 }
\ 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.json b/www/addons/calendar/lang/es.json
index 8149bc574d6..993aec44200 100644
--- a/www/addons/calendar/lang/es.json
+++ b/www/addons/calendar/lang/es.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Tiempo de notificación por defecto",
     "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/eu.json b/www/addons/calendar/lang/eu.json
index 26477c604df..1158b9cd186 100644
--- a/www/addons/calendar/lang/eu.json
+++ b/www/addons/calendar/lang/eu.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Berezko jakinarazpen-ordua",
     "errorloadevent": "Errorea gertakaria kargatzean.",
     "errorloadevents": "Errorea gertakariak kargatzean.",
-    "noevents": "Ez dago jardueren muga-egunik laster",
+    "noevents": "Ez dago ekitaldirik",
     "notifications": "Jakinarazpenak"
 }
\ 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/he.json b/www/addons/calendar/lang/he.json
index 3702664d6e1..368fb1895c4 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/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/ja.json b/www/addons/calendar/lang/ja.json
index 8bdfec3c217..b6e5457e412 100644
--- a/www/addons/calendar/lang/ja.json
+++ b/www/addons/calendar/lang/ja.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "デフォルト通知時間",
     "errorloadevent": "イベントの読み込み時にエラーがありました。",
     "errorloadevents": "イベントの読み込み時にエラーがありました。",
-    "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 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/ru.json b/www/addons/calendar/lang/ru.json
index 001aa958044..0d17cabd368 100644
--- a/www/addons/calendar/lang/ru.json
+++ b/www/addons/calendar/lang/ru.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Время уведомлений по умолчанию",
     "errorloadevent": "Ошибка при загрузке события",
     "errorloadevents": "Ошибка при загрузке событий",
-    "noevents": "Нет предстоящих заданий",
+    "noevents": "Нет событий",
     "notifications": "Уведомления"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sr-cr.json b/www/addons/calendar/lang/sr-cr.json
index 90d189510bd..dba4ebcd807 100644
--- a/www/addons/calendar/lang/sr-cr.json
+++ b/www/addons/calendar/lang/sr-cr.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Подразумевано време за слање обавештења",
     "errorloadevent": "Грешка приликом учитавања догађаја.",
     "errorloadevents": "Грешка приликом учитавања догађаја.",
-    "noevents": "Нема активности које се ускоро завршавају",
+    "noevents": "Нема догађаја",
     "notifications": "Обавештења"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/sr-lt.json b/www/addons/calendar/lang/sr-lt.json
index ef06104d1cf..7db382ef521 100644
--- a/www/addons/calendar/lang/sr-lt.json
+++ b/www/addons/calendar/lang/sr-lt.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Podrazumevano vreme za slanje obaveštenja",
     "errorloadevent": "Greška prilikom učitavanja događaja.",
     "errorloadevents": "Greška prilikom učitavanja događaja.",
-    "noevents": "Nema aktivnosti koje se uskoro završavaju",
-    "notifications": "Obaveštenja"
+    "noevents": "Nema događaja",
+    "notifications": "Nema događaja"
 }
\ 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 e0b616f24a4..2e0930c7034 100644
--- a/www/addons/calendar/lang/uk.json
+++ b/www/addons/calendar/lang/uk.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Час сповіщень за-замовчуванням",
     "errorloadevent": "Помилка завантаження події.",
     "errorloadevents": "Помилка завантаження подій.",
-    "noevents": "Наразі, заплановані активності відсутні",
-    "notifications": "Повідомлення"
+    "noevents": "Немає подій",
+    "notifications": "Сповіщення"
 }
\ No newline at end of file
diff --git a/www/addons/competency/lang/cs.json b/www/addons/competency/lang/cs.json
index effff8797dc..c935260c6c1 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/da.json b/www/addons/competency/lang/da.json
index f139228f22e..454bb170072 100644
--- a/www/addons/competency/lang/da.json
+++ b/www/addons/competency/lang/da.json
@@ -11,7 +11,7 @@
     "learningplans": "Læringsplaner",
     "myplans": "Mine læringsplaner",
     "noactivities": "Ingen aktiviteter",
-    "nocompetencies": "Ingen kompetencer er oprettet i denne ramme.",
+    "nocompetencies": "Ingen kompetencer",
     "nocrossreferencedcompetencies": "Ingen andre kompetencer er krydsrefereret til denne kompetence.",
     "noevidence": "Ingen vidnesbyrd",
     "noplanswerecreated": "Der blev ikke oprettet nogen læringsplaner.",
diff --git a/www/addons/competency/lang/de.json b/www/addons/competency/lang/de.json
index 77056f4c882..30b34122700 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.json b/www/addons/competency/lang/es.json
index 22b0ec02246..e6a18fa8d33 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 706620b8084..b039b18b496 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 da75ef9eb86..e6510df8b0b 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 a578afc6c20..d9cf5441319 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/ja.json b/www/addons/competency/lang/ja.json
index 0e42d5d3584..d959d9ab61a 100644
--- a/www/addons/competency/lang/ja.json
+++ b/www/addons/competency/lang/ja.json
@@ -12,7 +12,7 @@
     "learningplans": "学習プラン",
     "myplans": "マイ学習プラン",
     "noactivities": "活動なし",
-    "nocompetencies": "このフレームワークにコンピテンシーは作成されていません。",
+    "nocompetencies": "コンピテンシーなし",
     "nocrossreferencedcompetencies": "このコンピテンシーに相互参照されている他のコンピテンシーはありません。",
     "noevidence": "エビデンスなし",
     "noplanswerecreated": "学習プランは作成されませんでした。",
diff --git a/www/addons/competency/lang/nl.json b/www/addons/competency/lang/nl.json
index b6e8ddd757e..f03e99ab177 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/sr-cr.json b/www/addons/competency/lang/sr-cr.json
index c1e8de7be78..d9f5a2c019b 100644
--- a/www/addons/competency/lang/sr-cr.json
+++ b/www/addons/competency/lang/sr-cr.json
@@ -12,7 +12,7 @@
     "learningplans": "Планови учења",
     "myplans": "Моји планови учења",
     "noactivities": "Нема активности",
-    "nocompetencies": "Ниједна компетенција није креирана у овом оквиру.",
+    "nocompetencies": "Нема компетенција",
     "nocrossreferencedcompetencies": "Ниједна друга компетенција није унакрсно повезана са овом компетенцијом.",
     "noevidence": "Нема доказа",
     "noplanswerecreated": "Није креиран ниједан план учења.",
diff --git a/www/addons/competency/lang/sr-lt.json b/www/addons/competency/lang/sr-lt.json
index 443a40f4ff4..2a3c179861a 100644
--- a/www/addons/competency/lang/sr-lt.json
+++ b/www/addons/competency/lang/sr-lt.json
@@ -12,7 +12,7 @@
     "learningplans": "Planovi učenja",
     "myplans": "Moji planovi učenja",
     "noactivities": "Nema aktivnosti",
-    "nocompetencies": "Nijedna kompetencija nije kreirana u ovom okviru.",
+    "nocompetencies": "Nema kompetencija",
     "nocrossreferencedcompetencies": "Nijedna druga kompetencija nije unakrsno povezana sa ovom kompetencijom.",
     "noevidence": "Nema dokaza",
     "noplanswerecreated": "Nije kreiran nijedan plan učenja.",
diff --git a/www/addons/competency/lang/uk.json b/www/addons/competency/lang/uk.json
index 047fc924f5a..376f4e9d48f 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/coursecompletion/lang/ar.json b/www/addons/coursecompletion/lang/ar.json
index 9069a17e684..f88bc955bca 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": "معلق",
-    "required": "مفروض",
+    "pending": "قيد الانتظار",
+    "required": "مطلوب",
     "requiredcriteria": "المعايير المطلوبة",
     "requirement": "المتطلبات",
-    "status": "الوضع",
+    "status": "الحالة",
     "viewcoursereport": "عرض تقرير المقرر"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/cs.json b/www/addons/coursecompletion/lang/cs.json
index 2b2ffccd75f..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": "Hhotovo",
+    "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": "Vyžadováno",
-    "requiredcriteria": "Vyžadované podmínky",
+    "pending": "Čeká",
+    "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/da.json b/www/addons/coursecompletion/lang/da.json
index 825ffc76c20..9d2cdeb93a0 100644
--- a/www/addons/coursecompletion/lang/da.json
+++ b/www/addons/coursecompletion/lang/da.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Færdiggør",
+    "complete": "Fuldfør",
     "completecourse": "Fuldfør kursus",
-    "completed": "Gennemført",
+    "completed": "Fuldført",
     "completiondate": "Afslutningsdato",
     "couldnotloadreport": "Kunne ikke indlæse rapporten vedrørende  kursusfuldførelse, prøv igen senere.",
-    "coursecompletion": "Kursusgennemførelse",
-    "criteria": "Kriterie",
-    "criteriagroup": "Kriteriegruppe",
-    "criteriarequiredall": "Alle kriterier herunder er påkrævet",
-    "criteriarequiredany": "Et af kriterierne herunder er påkrævet",
-    "inprogress": "Igangværende",
-    "manualselfcompletion": "Manuel selvregistrering af gennemførelse",
-    "notyetstarted": "Ikke begyndt endnu",
-    "pending": "Behandles",
-    "required": "Påkrævet",
-    "requiredcriteria": "Påkrævede kriterier",
+    "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",
+    "pending": "Afventer",
+    "required": "Krævet",
+    "requiredcriteria": "Krævet kriterie",
     "requirement": "Krav",
-    "status": "Badgestatus",
+    "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 2ecdc1febf8..7125646d332 100644
--- a/www/addons/coursecompletion/lang/de.json
+++ b/www/addons/coursecompletion/lang/de.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Fertig",
+    "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": "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": "Existierende Einschreibungen 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 8ba062f3e82..a6fb10fd47b 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": "Χειροκίνητη αυτό-ολοκλήρωση",
+    "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.json b/www/addons/coursecompletion/lang/es.json
index a061fa0356e..89ef5e6ecd0 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": "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": "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": "Estado de la insignia",
+    "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 295f4ed6d7c..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": "Ezinbestekoa",
+    "pending": "Egin gabe",
+    "required": "Beharrezkoa",
     "requiredcriteria": "Irizpidea behar da",
     "requirement": "Eskakizuna",
-    "status": "Dominen egoera",
+    "status": "Egoera",
     "viewcoursereport": "Ikastaroaren txostena ikusi"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/fr.json b/www/addons/coursecompletion/lang/fr.json
index e0290d8a8bb..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 du badge",
-    "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/he.json b/www/addons/coursecompletion/lang/he.json
index 021aaa2b398..dca12273f76 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": "בתהליך למידה",
-    "required": "דרוש",
-    "requiredcriteria": "תנאי נדרש",
+    "coursecompletion": "השלמת קורס",
+    "criteria": "מדד־הערכה",
+    "criteriagroup": "קבוצת מדדיי־הערכה",
+    "criteriarequiredall": "כל מדדיי־הערכה להלן נדרשים",
+    "criteriarequiredany": "אחד ממדדיי־הערכה להלן נדרש",
+    "inprogress": "בתהליך",
+    "manualselfcompletion": "הזנת השלמה עצמית",
+    "notyetstarted": "עדיין לא החל",
+    "pending": "בהמתנה",
+    "required": "נדרש",
+    "requiredcriteria": "מדד־הערכה נדרש",
     "requirement": "דרישה",
-    "status": "סטטוס ההישג",
+    "status": "מצב",
     "viewcoursereport": "צפיה בדוח הקורס"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/it.json b/www/addons/coursecompletion/lang/it.json
index 85d2a1d7320..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": "Obbligatorio",
+    "required": "Da soddisfare",
     "requiredcriteria": "Criteri da soddisfare",
     "requirement": "Requisito",
-    "status": "Stato badge",
-    "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/ja.json b/www/addons/coursecompletion/lang/ja.json
index df8a2b8634d..344ea673aea 100644
--- a/www/addons/coursecompletion/lang/ja.json
+++ b/www/addons/coursecompletion/lang/ja.json
@@ -1,21 +1,21 @@
 {
-    "complete": "詳細",
+    "complete": "完了",
     "completecourse": "コース完了",
-    "completed": "完了",
+    "completed": "完了しました",
     "completiondate": "完了した日",
     "couldnotloadreport": "コース完了の読み込みができませんでした。後でもう一度試してください。",
-    "coursecompletion": "ユーザはこのコースを完了する必要があります。",
+    "coursecompletion": "コース完了",
     "criteria": "クライテリア",
     "criteriagroup": "クライテリアグループ",
-    "criteriarequiredall": "下記のクライテリアすべてが必須である",
-    "criteriarequiredany": "下記いくつかのクライテリアが必須である",
+    "criteriarequiredall": "以下すべてのクライテリアが必要",
+    "criteriarequiredany": "以下のクライテリアいずれかが必要",
     "inprogress": "進行中",
-    "manualselfcompletion": "手動による自己完了",
-    "notyetstarted": "未開始",
-    "pending": "保留",
-    "required": "必須",
-    "requiredcriteria": "必須クライテリア",
+    "manualselfcompletion": "手動自己完了",
+    "notyetstarted": "まだ開始されていない",
+    "pending": "保留中",
+    "required": "必要な",
+    "requiredcriteria": "必要なクライテリア",
     "requirement": "要求",
-    "status": "ステータス",
-    "viewcoursereport": "コースレポートを表示する"
+    "status": "状態",
+    "viewcoursereport": "コースレポートを見る"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/nl.json b/www/addons/coursecompletion/lang/nl.json
index e8fdb985c1f..78f31da0ac9 100644
--- a/www/addons/coursecompletion/lang/nl.json
+++ b/www/addons/coursecompletion/lang/nl.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Voltooid",
+    "complete": "Voltooi",
     "completecourse": "Voltooi cursus",
-    "completed": "Volledig",
+    "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",
-    "inprogress": "Actief",
-    "manualselfcompletion": "Manueel voltooien",
-    "notyetstarted": "Nog niet begonnen",
-    "pending": "Bezig",
-    "required": "Verplicht",
+    "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": "Badge status",
+    "status": "Status",
     "viewcoursereport": "Bekijk cursusrapport"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/ru.json b/www/addons/coursecompletion/lang/ru.json
index 1c6b6de220a..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/sr-cr.json b/www/addons/coursecompletion/lang/sr-cr.json
index 26e18b26b42..610e78602a3 100644
--- a/www/addons/coursecompletion/lang/sr-cr.json
+++ b/www/addons/coursecompletion/lang/sr-cr.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Потпуно",
+    "complete": "Заврши",
     "completecourse": "Заврши курс",
     "completed": "Завршено",
     "completiondate": "Датум завршетка",
     "couldnotloadreport": "Није могуће учитати извештај о завршетку курса. Молимо вас, покушајте поново касније.",
-    "coursecompletion": "Завршеност курса",
+    "coursecompletion": "Завршетак курса",
     "criteria": "Критеријуми",
     "criteriagroup": "Група критеријума",
     "criteriarequiredall": "Сви доле наведени критеријуми су неопходни",
     "criteriarequiredany": "Било који од доле наведених критеријума је неопходан",
     "inprogress": "У току",
     "manualselfcompletion": "Ручни самостални завршетак",
-    "notyetstarted": "Није још почео",
-    "pending": "Не чекању",
-    "required": "Обавезно",
-    "requiredcriteria": "Обавезни критеријуми",
+    "notyetstarted": "Још није започето",
+    "pending": "На чекању",
+    "required": "Неопходно",
+    "requiredcriteria": "Неопходни критеријуми",
     "requirement": "Услов",
-    "status": "Статус беџа",
+    "status": "Статус",
     "viewcoursereport": "Прикажи извештај са курса"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sr-lt.json b/www/addons/coursecompletion/lang/sr-lt.json
index 89da4bf9058..6553f9f3960 100644
--- a/www/addons/coursecompletion/lang/sr-lt.json
+++ b/www/addons/coursecompletion/lang/sr-lt.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Potpuno",
+    "complete": "Završi",
     "completecourse": "Završi kurs",
     "completed": "Završeno",
     "completiondate": "Datum završetka",
     "couldnotloadreport": "Nije moguće učitati izveštaj o završetku kursa. Molimo vas, pokušajte ponovo kasnije.",
-    "coursecompletion": "Završenost kursa",
+    "coursecompletion": "Završetak kursa",
     "criteria": "Kriterijumi",
     "criteriagroup": "Grupa kriterijuma",
     "criteriarequiredall": "Svi dole navedeni kriterijumi su neophodni",
     "criteriarequiredany": "Bilo koji od dole navedenih kriterijuma je neophodan",
     "inprogress": "U toku",
     "manualselfcompletion": "Ručni samostalni završetak",
-    "notyetstarted": "Nije još počeo",
-    "pending": "Ne čekanju",
-    "required": "Obavezno",
-    "requiredcriteria": "Obavezni kriterijumi",
+    "notyetstarted": "Još nije započeto",
+    "pending": "Na čekanju",
+    "required": "Neophodno",
+    "requiredcriteria": "Neophodni kriterijumi",
     "requirement": "Uslov",
-    "status": "Status bedža",
+    "status": "Status",
     "viewcoursereport": "Prikaži izveštaj sa kursa"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/sv.json b/www/addons/coursecompletion/lang/sv.json
index df193278ade..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": "Fullgörande 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",
+    "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": "Status för märke",
+    "status": "Status",
     "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
index 8078ba36f3d..790fda5169e 100644
--- a/www/addons/coursecompletion/lang/uk.json
+++ b/www/addons/coursecompletion/lang/uk.json
@@ -1,21 +1,21 @@
 {
-    "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": "Статус відзнаки",
+    "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 2ab44cda49c..3521b2b6f32 100644
--- a/www/addons/files/lang/ar.json
+++ b/www/addons/files/lang/ar.json
@@ -4,5 +4,5 @@
     "files": "ملفات",
     "privatefiles": "ملفات خاصة",
     "sitefiles": "ملفات الموقع",
-    "uploadfiles": "إرسل ملفات التغذية الراجعة"
+    "uploadfiles": "رفع ملفات"
 }
\ 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/da.json b/www/addons/files/lang/da.json
index 5f9d7d54b3b..1453d08f9f7 100644
--- a/www/addons/files/lang/da.json
+++ b/www/addons/files/lang/da.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Bemærk venligst at din Moodleadministrator har deaktiveret download af filer. Du kan se filerne men ikke downloade dem.",
     "clicktoupload": "Klik på knappen nedenfor for at uploade filer til dine private filer.",
     "couldnotloadfiles": "Fillisten kunne ikke hentes",
-    "emptyfilelist": "Der er ingen filer at vise",
+    "emptyfilelist": "Der er ingen filer at vise.",
     "erroruploadnotworking": "Desværre er det p.t. ikke muligt at uploade filer til dit site.",
     "files": "Filer",
     "myprivatefilesdesc": "Filerne som er tilgængelige i dit private område på dette Moodlewebsted.",
     "privatefiles": "Private filer",
     "sitefiles": "Site filer",
     "sitefilesdesc": "De andre filer som er tilgængelige for dig på denne Moodlewebside.",
-    "uploadfiles": "Send feedbackfiler"
+    "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 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.json b/www/addons/files/lang/es.json
index 7521ea196f2..cca19793086 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/he.json b/www/addons/files/lang/he.json
index 6f612548ac8..0ed31567503 100644
--- a/www/addons/files/lang/he.json
+++ b/www/addons/files/lang/he.json
@@ -2,7 +2,7 @@
     "admindisableddownload": "יש לשים לב כי מנהל/ת אתר המוודל שלך, ביטל/ה את אפשרות להורדת הקבצים. באפשרותך לעיין בקבצים אך לא להורידם.",
     "clicktoupload": "להעלאת הקבצים לקבצים הפרטיים שלך, יש להקליק על הכפתור למטה.",
     "couldnotloadfiles": "לא ניתן לטעון את רשימת הקבצים.",
-    "emptyfilelist": "אין קבצים להציג",
+    "emptyfilelist": "אין קבצים להצגה.",
     "files": "קבצים",
     "myprivatefilesdesc": "הקבצים הזמינים לך באזור הפרטי באתר מוודל זה.",
     "privatefiles": "הקבצים שלי",
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/ja.json b/www/addons/files/lang/ja.json
index 648ed7d331a..de63504d659 100644
--- a/www/addons/files/lang/ja.json
+++ b/www/addons/files/lang/ja.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/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/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/sr-cr.json b/www/addons/files/lang/sr-cr.json
index 8fad2e69c6e..7e6b552125d 100644
--- a/www/addons/files/lang/sr-cr.json
+++ b/www/addons/files/lang/sr-cr.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/sr-lt.json b/www/addons/files/lang/sr-lt.json
index 2375580de0e..8779139baab 100644
--- a/www/addons/files/lang/sr-lt.json
+++ b/www/addons/files/lang/sr-lt.json
@@ -2,12 +2,12 @@
     "admindisableddownload": "Imajte u vidu da je vaš Moodle administrator onemogućio preuzimanje datoteka. Datoteke možete da pregledate, ali ne i da ih preuzmete.",
     "clicktoupload": "Kliknite na donje dugme kako biste otpremili datoteke među svoje privatne datoteke.",
     "couldnotloadfiles": "Spisak datoteka ne može biti učitan.",
-    "emptyfilelist": "Nema datoteka za prikaz",
+    "emptyfilelist": "Nema datoteka za prikaz.",
     "erroruploadnotworking": "Nažalost, trenutno nije moguće otpremiti datoteke na vaš sajt.",
     "files": "Datoteke",
     "myprivatefilesdesc": "Datoteke koje su dostupne u vašem privatnom prostoru na ovom Moodle sajtu.",
     "privatefiles": "Privatne datoteke",
     "sitefiles": "Datoteke sajta",
     "sitefilesdesc": "Ostale datoteke koje su dostupne na ovom Moodle sajtu.",
-    "uploadfiles": "Pošalji datoteke sa povratnim informacijama"
+    "uploadfiles": "Otpremi datoteke"
 }
\ No newline at end of file
diff --git a/www/addons/files/lang/uk.json b/www/addons/files/lang/uk.json
index 4043adc3905..083a9f56194 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/messages/lang/ar.json b/www/addons/messages/lang/ar.json
index 81750633333..5d656811d75 100644
--- a/www/addons/messages/lang/ar.json
+++ b/www/addons/messages/lang/ar.json
@@ -10,8 +10,8 @@
     "messages": "رسائل",
     "mustbeonlinetosendmessages": "لابد أن تكون متصل بالأنترنت لكي ترسل أي رسائل",
     "newmessage": "رسالة جديدة",
-    "nomessages": "لا توجد رسائل بعد",
-    "nousersfound": "لا يوجد مستخدمون",
+    "nomessages": "لا يوجد رسائل",
+    "nousersfound": "لا يوجد مستخدمين",
     "removecontact": "ازل عنوان الاتصال",
     "send": "إرسال",
     "sendmessage": "إرسل رسالة",
diff --git a/www/addons/messages/lang/cs.json b/www/addons/messages/lang/cs.json
index 18c655d4826..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": "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/da.json b/www/addons/messages/lang/da.json
index 0449e80699a..c05ede1157e 100644
--- a/www/addons/messages/lang/da.json
+++ b/www/addons/messages/lang/da.json
@@ -16,8 +16,8 @@
     "messagepreferences": "Indstillinger for beskeder",
     "messages": "Beskeder",
     "mustbeonlinetosendmessages": "Du skal være online for at sende beskeder",
-    "newmessage": "Ny besked",
-    "nomessages": "Ingen beskeder endnu",
+    "newmessage": "Ny besked...",
+    "nomessages": "Ingen besked.",
     "nousersfound": "Ingen brugere fundet",
     "removecontact": "Fjern kontakt",
     "send": "Send",
diff --git a/www/addons/messages/lang/de.json b/www/addons/messages/lang/de.json
index 6deac3f090b..6a5fde2d14d 100644
--- a/www/addons/messages/lang/de.json
+++ b/www/addons/messages/lang/de.json
@@ -18,10 +18,10 @@
     "messagepreferences": "Mitteilungen",
     "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 714e6df2eb0..894c8fd4a8c 100644
--- a/www/addons/messages/lang/el.json
+++ b/www/addons/messages/lang/el.json
@@ -16,10 +16,10 @@
     "messagepreferences": "Προτιμήσεις μηνύματος",
     "messages": "Μηνύματα",
     "mustbeonlinetosendmessages": "Πρέπει να είστε συνδεδεμένοι για να στείλετε μηνύματα",
-    "newmessage": "Νέο μήνυμα",
+    "newmessage": "Νέο μήνυμα...",
     "newmessages": "Νέα μηνύματα",
-    "nomessages": "Δεν υπάρχουν ακόμα μηνύματα",
-    "nousersfound": "Δε βρέθηκαν χρήστες",
+    "nomessages": "Κανένα μήνυμα.",
+    "nousersfound": "Δεν βρέθηκαν χρήστες",
     "removecontact": "Αφαίρεσε την επαφή",
     "removecontactconfirm": "Η επαφή θα καταργηθεί από τη λίστα επαφών σας.",
     "send": "Αποστολή",
diff --git a/www/addons/messages/lang/es.json b/www/addons/messages/lang/es.json
index 351337a98eb..129117cec61 100644
--- a/www/addons/messages/lang/es.json
+++ b/www/addons/messages/lang/es.json
@@ -18,9 +18,9 @@
     "messagepreferences": "Preferencias de mensajes",
     "messages": "Mensajes",
     "mustbeonlinetosendmessages": "Debe conectarse para enviar mensajes",
-    "newmessage": "Nuevo mensaje",
+    "newmessage": "Nuevo mensaje...",
     "newmessages": "Nuevos mensajes",
-    "nomessages": "Aún no hay mensajes",
+    "nomessages": "No hay mensajes en espera",
     "nousersfound": "No se encuentran usuarios",
     "removecontact": "Eliminar contacto",
     "removecontactconfirm": "El contacto se eliminará de su lista de contactos.",
diff --git a/www/addons/messages/lang/eu.json b/www/addons/messages/lang/eu.json
index 0da6ce51bb0..7b4d166b262 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 454057f6d63..90f17d9f58f 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": "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/he.json b/www/addons/messages/lang/he.json
index 9cc287e1b26..b0db251c2c8 100644
--- a/www/addons/messages/lang/he.json
+++ b/www/addons/messages/lang/he.json
@@ -15,9 +15,9 @@
     "messagepreferences": "העדפות מסרים",
     "messages": "מסרים",
     "mustbeonlinetosendmessages": "עליך להיות מחובר/ת בכדי לשלוח מסר.",
-    "newmessage": "הודעה חדשה",
-    "nomessages": "אין הודעות עדיין",
-    "nousersfound": "לתשומת-לב",
+    "newmessage": "מסר חדש...",
+    "nomessages": "אין מסרים.",
+    "nousersfound": "לא נמצאו משתמשים",
     "removecontact": "הסרת איש הקשר",
     "send": "לשלוח",
     "sendmessage": "שליחת מסר",
diff --git a/www/addons/messages/lang/it.json b/www/addons/messages/lang/it.json
index 6acc19d9b7d..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": "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/ja.json b/www/addons/messages/lang/ja.json
index da389c600e2..ab1c8913529 100644
--- a/www/addons/messages/lang/ja.json
+++ b/www/addons/messages/lang/ja.json
@@ -18,10 +18,10 @@
     "messagepreferences": "メッセージプリファレンス",
     "messages": "メッセージ",
     "mustbeonlinetosendmessages": "メッセージを送信するにはオンラインでなければなりません。",
-    "newmessage": "新しいメッセージ",
+    "newmessage": "新規メッセージ...",
     "newmessages": "新規メッセージ...",
-    "nomessages": "メッセージはありません。",
-    "nousersfound": "ユーザは見つかりませんでした。",
+    "nomessages": "メッセージがありません。",
+    "nousersfound": "ユーザが見つかりません",
     "removecontact": "コンタクトから削除する",
     "removecontactconfirm": "連絡先はあなたの連絡先リストから削除されます。",
     "send": "送信",
diff --git a/www/addons/messages/lang/nl.json b/www/addons/messages/lang/nl.json
index 36315f2cc2e..c8e2675c258 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/ru.json b/www/addons/messages/lang/ru.json
index 37c1774bd10..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/sr-cr.json b/www/addons/messages/lang/sr-cr.json
index fdd16352919..18a467fa43c 100644
--- a/www/addons/messages/lang/sr-cr.json
+++ b/www/addons/messages/lang/sr-cr.json
@@ -16,9 +16,9 @@
     "messagepreferences": "Параметри порука",
     "messages": "Поруке",
     "mustbeonlinetosendmessages": "Морате бити онлајн како бисте слали поруке",
-    "newmessage": "Нова порука",
+    "newmessage": "Нове поруке...",
     "newmessages": "Нове поруке",
-    "nomessages": "Још нема порука",
+    "nomessages": "Нема порука.",
     "nousersfound": "Није пронађен ниједан корисник",
     "removecontact": "Обриши контакт",
     "removecontactconfirm": "Особа ће бити уклоњена са ваше листе контаката.",
diff --git a/www/addons/messages/lang/sr-lt.json b/www/addons/messages/lang/sr-lt.json
index a5c218640e8..3d5a353c5f5 100644
--- a/www/addons/messages/lang/sr-lt.json
+++ b/www/addons/messages/lang/sr-lt.json
@@ -16,9 +16,9 @@
     "messagepreferences": "Parametri poruka",
     "messages": "Poruke",
     "mustbeonlinetosendmessages": "Morate biti onlajn kako biste slali poruke",
-    "newmessage": "Nova poruka",
+    "newmessage": "Nove poruke...",
     "newmessages": "Nove poruke",
-    "nomessages": "Još nema poruka",
+    "nomessages": "Nema poruka.",
     "nousersfound": "Nije pronađen nijedan korisnik",
     "removecontact": "Obriši kontakt",
     "removecontactconfirm": "Osoba će biti uklonjena sa vaše liste kontakata.",
diff --git a/www/addons/messages/lang/sv.json b/www/addons/messages/lang/sv.json
index 6a623453331..d17bc0228ef 100644
--- a/www/addons/messages/lang/sv.json
+++ b/www/addons/messages/lang/sv.json
@@ -16,9 +16,9 @@
     "messagepreferences": "Välj inställningar för meddelanden",
     "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/uk.json b/www/addons/messages/lang/uk.json
index 12fc1146ab9..10cf5c336d1 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/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/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.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/ja.json b/www/addons/mod/choice/lang/ja.json
index a5fee422a43..5f5b78343c7 100644
--- a/www/addons/mod/choice/lang/ja.json
+++ b/www/addons/mod/choice/lang/ja.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/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/sr-cr.json b/www/addons/mod/choice/lang/sr-cr.json
index 9a18723e91c..10465df2265 100644
--- a/www/addons/mod/choice/lang/sr-cr.json
+++ b/www/addons/mod/choice/lang/sr-cr.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/sr-lt.json b/www/addons/mod/choice/lang/sr-lt.json
index b9bfa00cb81..7fc4232b84d 100644
--- a/www/addons/mod/choice/lang/sr-lt.json
+++ b/www/addons/mod/choice/lang/sr-lt.json
@@ -6,8 +6,8 @@
     "full": "(Popunjeno)",
     "noresultsviewable": "Rezultati trenutno nisu vidljivi.",
     "notopenyet": "Nažalost, ova aktivnost nije dostupna do {{$a}}",
-    "numberofuser": "Broj odgovora",
-    "numberofuserinpercentage": "Procenat odgovora",
+    "numberofuser": "Broj učesnika",
+    "numberofuserinpercentage": "Procenat učesnika",
     "previewonly": "Ovo je samo prikaz dostupnih opcija za ovu aktivnost. Nećete biti u mogućnosti da izvršite odabir do {{$a}}.",
     "removemychoice": "Ukloni moj izbor",
     "responses": "Odgovori",
diff --git a/www/addons/mod/choice/lang/sv.json b/www/addons/mod/choice/lang/sv.json
index f76c9f090e3..9b79b1cc765 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 583a6f28d04..7c22b1890c7 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/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/da.json b/www/addons/mod/folder/lang/da.json
index c53b3a994ed..2337bed4841 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 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/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/he.json b/www/addons/mod/folder/lang/he.json
index 1c2ec27977b..55811600621 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 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/ja.json b/www/addons/mod/folder/lang/ja.json
index 8634d70f046..61980e500fc 100644
--- a/www/addons/mod/folder/lang/ja.json
+++ b/www/addons/mod/folder/lang/ja.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "表示するファイルはありません。",
+    "emptyfilelist": "表示するファイルがありません。",
     "errorwhilegettingfolder": "フォルダのデータを取得中にエラーが発生しました。"
 }
\ 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/sr-cr.json b/www/addons/mod/folder/lang/sr-cr.json
index 3ed8d5f00a0..a65fb8697c7 100644
--- a/www/addons/mod/folder/lang/sr-cr.json
+++ b/www/addons/mod/folder/lang/sr-cr.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Нема датотека за приказ",
+    "emptyfilelist": "Нема датотека за приказ.",
     "errorwhilegettingfolder": "Грешка приликом преузимања података за 'Директоријум'"
 }
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/sr-lt.json b/www/addons/mod/folder/lang/sr-lt.json
index 847b0b05eff..9bfdf403335 100644
--- a/www/addons/mod/folder/lang/sr-lt.json
+++ b/www/addons/mod/folder/lang/sr-lt.json
@@ -1,4 +1,4 @@
 {
-    "emptyfilelist": "Nema datoteka za prikaz",
+    "emptyfilelist": "Nema datoteka za prikaz.",
     "errorwhilegettingfolder": "Greška prilikom preuzimanja podataka za 'Direktorijum'"
 }
\ 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 38dca8ad7f1..bdbd7c0a872 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.",
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/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/he.json b/www/addons/mod/forum/lang/he.json
index 3b4e2e70b17..21f3b132b0c 100644
--- a/www/addons/mod/forum/lang/he.json
+++ b/www/addons/mod/forum/lang/he.json
@@ -10,7 +10,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/ja.json b/www/addons/mod/forum/lang/ja.json
index c3c4562c07c..df4dba7bc16 100644
--- a/www/addons/mod/forum/lang/ja.json
+++ b/www/addons/mod/forum/lang/ja.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "ディスカッション購読",
     "edit": "編集",
     "erroremptymessage": "投稿メッセージを空にすることはできません。",
-    "erroremptysubject": "投稿件名を空にすることはできません。",
+    "erroremptysubject": "投稿の件名は必須です",
     "errorgetforum": "フォーラムのデータ取得中にエラーが発生しました。",
     "errorgetgroups": "グループ設定の取得中にエラーが発生しました。",
     "forumnodiscussionsyet": "このフォーラムにはまだディスカッショントピックがありません",
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/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/sr-cr.json b/www/addons/mod/forum/lang/sr-cr.json
index a29562d23f2..0b8b9f761b2 100644
--- a/www/addons/mod/forum/lang/sr-cr.json
+++ b/www/addons/mod/forum/lang/sr-cr.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Претплата на дискусију",
     "edit": "Уреди",
     "erroremptymessage": "Тело поруке не може бити празно",
-    "erroremptysubject": "Тема (наслов) поруке не може бити празна",
+    "erroremptysubject": "Тема поруке не може бити празна",
     "errorgetforum": "Грешка приликом преузимања података за 'Форум'",
     "errorgetgroups": "Грешка приликом преузимања подешавања група.",
     "forumnodiscussionsyet": "Још нема тема за дискусију на овом форуму.",
diff --git a/www/addons/mod/forum/lang/sr-lt.json b/www/addons/mod/forum/lang/sr-lt.json
index e655f26c3b4..c71aef2a6fc 100644
--- a/www/addons/mod/forum/lang/sr-lt.json
+++ b/www/addons/mod/forum/lang/sr-lt.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Pretplata na diskusiju",
     "edit": "Uredi",
     "erroremptymessage": "Telo poruke ne može biti prazno",
-    "erroremptysubject": "Tema (naslov) poruke ne može biti prazna",
+    "erroremptysubject": "Tema poruke ne može biti prazna",
     "errorgetforum": "Greška prilikom preuzimanja podataka za 'Forum'",
     "errorgetgroups": "Greška prilikom preuzimanja podešavanja grupa.",
     "forumnodiscussionsyet": "Greška prilikom preuzimanja podešavanja grupa.",
diff --git a/www/addons/mod/forum/lang/sv.json b/www/addons/mod/forum/lang/sv.json
index d8da791577b..41354d355f0 100644
--- a/www/addons/mod/forum/lang/sv.json
+++ b/www/addons/mod/forum/lang/sv.json
@@ -10,7 +10,7 @@
     "discussionsubscription": "Prenumeration på diskussion",
     "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/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/da.json b/www/addons/mod/glossary/lang/da.json
index 41338f8fc3e..2e7da2ee000 100644
--- a/www/addons/mod/glossary/lang/da.json
+++ b/www/addons/mod/glossary/lang/da.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Bilag",
-    "browsemode": "Forhåndsvisning",
+    "browsemode": "Skim indlæg",
     "byalphabet": "Alfabetisk",
     "byauthor": "Grupper efter forfatter",
     "bynewestfirst": "Nyeste først",
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 0b1990425e5..6a40931cf03 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": "Ομαδοποίηση ανά συγγραφέα",
     "bycategory": "Ομαδοποίηση ανά κατηγορία",
diff --git a/www/addons/mod/glossary/lang/es.json b/www/addons/mod/glossary/lang/es.json
index 6cbdcc4dc0e..ba144c727bc 100644
--- a/www/addons/mod/glossary/lang/es.json
+++ b/www/addons/mod/glossary/lang/es.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Adjuntar insignia al mensaje",
-    "browsemode": "Modo de presentación preliminar",
+    "browsemode": "Navegar por las entradas",
     "byalphabet": "Alfabéticamente",
     "byauthor": "Agrupado por autor",
     "bycategory": "Agrupar por categoría",
diff --git a/www/addons/mod/glossary/lang/eu.json b/www/addons/mod/glossary/lang/eu.json
index 96f4a794e08..5aa5b982604 100644
--- a/www/addons/mod/glossary/lang/eu.json
+++ b/www/addons/mod/glossary/lang/eu.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Eranskina",
-    "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 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/ja.json b/www/addons/mod/glossary/lang/ja.json
index 619f8f31178..b68170abdd2 100644
--- a/www/addons/mod/glossary/lang/ja.json
+++ b/www/addons/mod/glossary/lang/ja.json
@@ -1,6 +1,6 @@
 {
     "attachment": "メッセージにバッジを添付する",
-    "browsemode": "プレビューモード",
+    "browsemode": "エントリをブラウズ",
     "byalphabet": "アルファベット順",
     "byauthor": "著者でグループ",
     "bycategory": "カテゴリでグループ",
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/sr-cr.json b/www/addons/mod/glossary/lang/sr-cr.json
index d816bfc641b..79d5aec0558 100644
--- a/www/addons/mod/glossary/lang/sr-cr.json
+++ b/www/addons/mod/glossary/lang/sr-cr.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Прилог",
-    "browsemode": "Режим прегледа",
+    "browsemode": "Прегледај појмове",
     "byalphabet": "Азбучним редом",
     "byauthor": "Групиши по аутору",
     "bycategory": "Групиши по категорији",
diff --git a/www/addons/mod/glossary/lang/sr-lt.json b/www/addons/mod/glossary/lang/sr-lt.json
index 4ee4c923d4a..4edfb5a1f41 100644
--- a/www/addons/mod/glossary/lang/sr-lt.json
+++ b/www/addons/mod/glossary/lang/sr-lt.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Prilog",
-    "browsemode": "Režim pregleda",
+    "browsemode": "Pregledaj pojmove",
     "byalphabet": "Abecednim redom",
     "byauthor": "Grupiši po autoru",
     "bycategory": "Grupiši po kategoriji",
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/glossary/lang/uk.json b/www/addons/mod/glossary/lang/uk.json
index a2186b273c3..fecbe90319d 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/label/lang/he.json b/www/addons/mod/label/lang/he.json
index 232aff3b2bf..7f0814d0381 100644
--- a/www/addons/mod/label/lang/he.json
+++ b/www/addons/mod/label/lang/he.json
@@ -1,3 +1,3 @@
 {
-    "label": "תווית לשאלה מותנית (באנגלית)"
+    "label": "תווית"
 }
\ 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 d174e316226..974254476a8 100644
--- a/www/addons/mod/label/lang/ru.json
+++ b/www/addons/mod/label/lang/ru.json
@@ -1,3 +1,3 @@
 {
-    "label": "Отмечено"
+    "label": "Пояснение"
 }
\ 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/ar.json b/www/addons/mod/survey/lang/ar.json
index 30dd1d2fed3..dd271b759c7 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 6e207332222..35fbcedcc0d 100644
--- a/www/addons/mod/survey/lang/ja.json
+++ b/www/addons/mod/survey/lang/ja.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/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..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.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/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/ja.json b/www/addons/mod/wiki/lang/ja.json
index 6d79d901d29..602d4646668 100644
--- a/www/addons/mod/wiki/lang/ja.json
+++ b/www/addons/mod/wiki/lang/ja.json
@@ -10,7 +10,7 @@
     "newpagetitle": "新しいページタイトル",
     "nocontent": "このページにはコンテンツがありません。",
     "notingroup": "グループ外",
-    "page": "ページ: {{$a}}",
+    "page": "ページ",
     "pageexists": "このページはすでに存在します。",
     "pagename": "ページ名",
     "subwiki": "サブ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/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/sr-cr.json b/www/addons/mod/wiki/lang/sr-cr.json
index 8213c338216..9620e198c9d 100644
--- a/www/addons/mod/wiki/lang/sr-cr.json
+++ b/www/addons/mod/wiki/lang/sr-cr.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Наслов нове странице",
     "nocontent": "На овој страници нема садржаја",
     "notingroup": "Није у групи",
-    "page": "Страница: {{$a}}",
+    "page": "Страница",
     "pageexists": "Ова страница већ постоји.",
     "pagename": "Назив странице",
     "subwiki": "Подвики",
diff --git a/www/addons/mod/wiki/lang/sr-lt.json b/www/addons/mod/wiki/lang/sr-lt.json
index 9b1e7853897..11efcb2e226 100644
--- a/www/addons/mod/wiki/lang/sr-lt.json
+++ b/www/addons/mod/wiki/lang/sr-lt.json
@@ -10,7 +10,7 @@
     "newpagetitle": "Naslov nove stranice",
     "nocontent": "Na ovoj stranici nema sadržaja",
     "notingroup": "Nije u grupi",
-    "page": "Stranica: {{$a}}",
+    "page": "Stranica",
     "pageexists": "Ova stranica već postoji.",
     "pagename": "Naziv stranice",
     "subwiki": "Podviki",
diff --git a/www/addons/mod/wiki/lang/uk.json b/www/addons/mod/wiki/lang/uk.json
index 7e2a88dd8db..cd89e56c9cc 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/notes/lang/ar.json b/www/addons/notes/lang/ar.json
index df8de0cf069..30b58e0c705 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/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/da.json b/www/addons/notes/lang/da.json
index cf35362b164..3dadb18f0eb 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": "Dine private kommentarer og noter",
+    "notes": "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 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/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/he.json b/www/addons/notes/lang/he.json
index 2e3c5dd9644..416427b2dec 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 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/ja.json b/www/addons/notes/lang/ja.json
index ae48a7ac252..6b3304c8067 100644
--- a/www/addons/notes/lang/ja.json
+++ b/www/addons/notes/lang/ja.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "作成したノート",
     "nonotes": "このタイプのノートはまだ存在しません",
     "note": "ノート",
-    "notes": "あなたの個人分析およびノート",
+    "notes": "ノート",
     "personalnotes": "パーソナルノート",
     "publishstate": "コンテキスト",
     "sitenotes": "サイトノート",
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/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/sr-cr.json b/www/addons/notes/lang/sr-cr.json
index afe5cd9b24d..0690900c3c5 100644
--- a/www/addons/notes/lang/sr-cr.json
+++ b/www/addons/notes/lang/sr-cr.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Белешка креирана",
     "nonotes": "Још не постоје белешке овог типа",
     "note": "Белешка",
-    "notes": "Ваше приватне анализе и белешке",
+    "notes": "Белешке",
     "personalnotes": "Личне белешке",
     "publishstate": "Контекст",
     "sitenotes": "Белешке сајта",
diff --git a/www/addons/notes/lang/sr-lt.json b/www/addons/notes/lang/sr-lt.json
index 11b505f9b4b..d4a1ef87e7f 100644
--- a/www/addons/notes/lang/sr-lt.json
+++ b/www/addons/notes/lang/sr-lt.json
@@ -4,7 +4,7 @@
     "eventnotecreated": "Beleška kreirana",
     "nonotes": "Još ne postoje beleške ovog tipa",
     "note": "Beleška",
-    "notes": "Vaše privatne analize i beleške",
+    "notes": "Beleške",
     "personalnotes": "Lične beleške",
     "publishstate": "Kontekst",
     "sitenotes": "Beleške sajta",
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 9c2ba1ac6bb..8c815080c16 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/notifications/lang/ar.json b/www/addons/notifications/lang/ar.json
index cab5daac101..edbc8f11446 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/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/da.json b/www/addons/notifications/lang/da.json
index 2e190040f35..56219f0789c 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": "Beskeder",
+    "notifications": "Underretninger",
     "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 115925c10ca..b89ba1477d5 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": "Mitteilungen",
+    "notifications": "Systemmitteilungen",
     "playsound": "Sound abspielen",
     "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 1049b40c7a5..db11ade05af 100644
--- a/www/addons/notifications/lang/es.json
+++ b/www/addons/notifications/lang/es.json
@@ -1,7 +1,7 @@
 {
     "errorgetnotifications": "Error al obtener notificaciones",
-    "notificationpreferences": "Preferencias de notificación",
-    "notifications": "Avisos",
+    "notificationpreferences": "Preferencias de notificaciones",
+    "notifications": "Notificaciones",
     "playsound": "Reproducir sonido",
     "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/he.json b/www/addons/notifications/lang/he.json
index 39e5a6ed7a5..1c1591b94ed 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/ja.json b/www/addons/notifications/lang/ja.json
index 8c6ea812ddf..22daa00358e 100644
--- a/www/addons/notifications/lang/ja.json
+++ b/www/addons/notifications/lang/ja.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "通知の取得中にエラーが発生しました。",
-    "notificationpreferences": "通知プリファレンス",
+    "notificationpreferences": "通知の設定",
     "notifications": "通知",
     "playsound": "音を出力",
     "therearentnotificationsyet": "通知はありません"
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/sv.json b/www/addons/notifications/lang/sv.json
index ce4f0ccc515..8029962c563 100644
--- a/www/addons/notifications/lang/sv.json
+++ b/www/addons/notifications/lang/sv.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "Fel att få meddelanden",
     "notificationpreferences": "Välj inställningar för notiser",
-    "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/participants/lang/ar.json b/www/addons/participants/lang/ar.json
index 91db007489d..8c013f870e2 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/cs.json b/www/addons/participants/lang/cs.json
index 311ee521366..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",
-    "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/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 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.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/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/ja.json b/www/addons/participants/lang/ja.json
index 8fbbcbb3976..3656df9f659 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 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/sr-cr.json b/www/addons/participants/lang/sr-cr.json
index 2c8a28575f0..5c5170c3c41 100644
--- a/www/addons/participants/lang/sr-cr.json
+++ b/www/addons/participants/lang/sr-cr.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Није пронађен ни један учесник на овом курсу",
+    "noparticipants": "Ниједан учесник није пронађен на овом курсу.",
     "participants": "Учесници"
 }
\ No newline at end of file
diff --git a/www/addons/participants/lang/sr-lt.json b/www/addons/participants/lang/sr-lt.json
index eba071633fd..090378abb39 100644
--- a/www/addons/participants/lang/sr-lt.json
+++ b/www/addons/participants/lang/sr-lt.json
@@ -1,4 +1,4 @@
 {
-    "noparticipants": "Nije pronađen ni jedan učesnik na ovom kursu",
+    "noparticipants": "Nijedan učesnik nije pronađen na ovom kursu.",
     "participants": "Učesnici"
 }
\ 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/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/core/components/course/lang/ar.json b/www/core/components/course/lang/ar.json
index 47a7f04e4bb..ab7fafab59b 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": "عرض الكل {{$a}}"
+    "showall": "عرض الكل"
 }
\ 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/da.json b/www/core/components/course/lang/da.json
index 2d70a448b4f..9242ee4ca2d 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 {{$a}}"
+    "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 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 abc9558d36b..ee4ca9da68c 100644
--- a/www/core/components/course/lang/el.json
+++ b/www/core/components/course/lang/el.json
@@ -17,5 +17,5 @@
     "hiddenfromstudents": "Κρυμμένο από τους σπουδαστές",
     "nocontentavailable": "Δεν υπάρχει περιεχόμενο διαθέσιμο αυτή τη στιγμή.",
     "overriddennotice": "Ο τελικός βαθμός από αυτή τη δραστηριότητα ρυθμίστηκε χειροκίνητα.",
-    "showall": "Προβολή όλων {{$a}}"
+    "showall": "Προβολή όλων"
 }
\ 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 b17f87a0442..140acb12ae9 100644
--- a/www/core/components/course/lang/es.json
+++ b/www/core/components/course/lang/es.json
@@ -9,7 +9,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.",
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "No mostrado a los 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/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/he.json b/www/core/components/course/lang/he.json
index 413e5343000..1789a2e476e 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": "תצוגת כל ה-{{$a}}"
+    "showall": "הראה הכל"
 }
\ 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/ja.json b/www/core/components/course/lang/ja.json
index 2e41ef36acc..2059fb9fb13 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": "すべての {{$a}} を表示する"
+    "showall": "すべて表示"
 }
\ 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/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/sr-cr.json b/www/core/components/course/lang/sr-cr.json
index 15ed523e7b2..40ab9bef16c 100644
--- a/www/core/components/course/lang/sr-cr.json
+++ b/www/core/components/course/lang/sr-cr.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/sr-lt.json b/www/core/components/course/lang/sr-lt.json
index a1522ae721c..744f10eb4f0 100644
--- a/www/core/components/course/lang/sr-lt.json
+++ b/www/core/components/course/lang/sr-lt.json
@@ -9,7 +9,7 @@
     "confirmdownload": "Nameravate da preuzmete {{size}}. Da li ste sigurni da želite da nastavite?",
     "confirmdownloadunknownsize": "Nismo mogli da izračunamo veličinu preuzimanje. Da li ste sigurni da želite da preuzmete?",
     "confirmpartialdownloadsize": "Nameravate da preuzmete <strong>najmanje</strong> {{size}}. Da li ste sigurni da želite da nastavite?",
-    "contents": "Sadržaj",
+    "contents": "Sadržaji",
     "couldnotloadsectioncontent": "Nije moguće učitati sadržaj sekcije, pokušajte ponovo kasnije.",
     "couldnotloadsections": "Nije moguće učitati sekcije, pokušajte ponovo kasnije.",
     "errordownloadingsection": "Greška prilikom preuzimanja sekcije.",
@@ -17,6 +17,6 @@
     "hiddenfromstudents": "Sakriveno od polaznika",
     "nocontentavailable": "Nikakav sadržaj nije dostupan u ovom trenutku.",
     "overriddennotice": "Vaša završna ocena za ovu aktivnost je ručno podešena",
-    "showall": "Prikaži svih {{$a}}",
+    "showall": "Prikaži sve",
     "useactivityonbrowser": "Još uvek možete da ga koristite pomoću veb čitača vašeg uređaja."
 }
\ 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/uk.json b/www/core/components/course/lang/uk.json
index faf2b294bc7..232aa47f117 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/courses/lang/cs.json b/www/core/components/courses/lang/cs.json
index 59626b53315..3edb8f247c1 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é 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": "Heslo",
+    "password": "Klíč zápisu",
     "search": "Vyhledat",
     "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/da.json b/www/core/components/courses/lang/da.json
index 7c3706806c8..d55c5eb24b7 100644
--- a/www/core/components/courses/lang/da.json
+++ b/www/core/components/courses/lang/da.json
@@ -11,12 +11,12 @@
     "filtermycourses": "Filtrer mit kursus",
     "frontpage": "Forside",
     "mycourses": "Mine kurser",
-    "nocourses": "Du er ikke tilmeldt nogen kurser.",
+    "nocourses": "Der er ingen kursusoplysninger at vise.",
     "nocoursesyet": "Der er ingen kurser i denne kategori",
-    "nosearchresults": "Der var ingen beskeder der opfyldte søgekriteriet",
+    "nosearchresults": "Din søgning gav ingen resultater",
     "notenroled": "Du er ikke tilmeldt dette kursus",
     "notenrollable": "Du kan ikke selv tilmelde dig dette kursus.",
-    "password": "Adgangskode",
+    "password": "Tilmeldingsnøgle",
     "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.",
diff --git a/www/core/components/courses/lang/de.json b/www/core/components/courses/lang/de.json
index 861a406fe43..25280c83d2e 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 Kursinformationen",
+    "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": "Kennwort",
+    "password": "Einschreibeschlüssel",
     "search": "Suche",
     "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 819d0105246..e662603390c 100644
--- a/www/core/components/courses/lang/el.json
+++ b/www/core/components/courses/lang/el.json
@@ -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/es.json b/www/core/components/courses/lang/es.json
index 71e6707f3a3..07e585e13d0 100644
--- a/www/core/components/courses/lang/es.json
+++ b/www/core/components/courses/lang/es.json
@@ -13,12 +13,12 @@
     "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": "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": "Contraseña",
+    "password": "Clave",
     "search": "Búsqueda",
     "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 a0adcc52721..b5c88bc0330 100644
--- a/www/core/components/courses/lang/eu.json
+++ b/www/core/components/courses/lang/eu.json
@@ -5,7 +5,7 @@
     "categories": "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": "Pasahitza",
+    "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 abc9016dbc1..703265270ca 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": "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 72658419e6d..f0f3a476b70 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": "Ricerca",
     "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 7d30698aa76..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 cursusinformatie",
+    "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/sr-cr.json b/www/core/components/courses/lang/sr-cr.json
index 53f58f1e921..12cd32f1434 100644
--- a/www/core/components/courses/lang/sr-cr.json
+++ b/www/core/components/courses/lang/sr-cr.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Филтрирај моје курсеве",
     "frontpage": "Насловна страница",
     "mycourses": "Моји курсеви",
-    "nocourses": "Нема информација о курсу за приказ.",
+    "nocourses": "Нема информација о курсевима за приказ.",
     "nocoursesyet": "Нема курсева у овој категорији",
-    "nosearchresults": "Ваша претрага није дала резултате",
+    "nosearchresults": "Није било резултата ваше претраге",
     "notenroled": "Нисте уписани на овај курс",
     "notenrollable": "Не можете сами да се упишете на овај курс.",
-    "password": "Лозинка",
+    "password": "Приступна лозинка курса",
     "search": "Претрага",
     "searchcourses": "Претражи курсеве",
     "searchcoursesadvice": "Можете користити дугме за претрагу курсева како бисте им приступили као гост или се уписали на курсеве који то допуштају.",
diff --git a/www/core/components/courses/lang/sr-lt.json b/www/core/components/courses/lang/sr-lt.json
index 154bd44b629..9a1e41e0d6d 100644
--- a/www/core/components/courses/lang/sr-lt.json
+++ b/www/core/components/courses/lang/sr-lt.json
@@ -13,12 +13,12 @@
     "filtermycourses": "Filtriraj moje kurseve",
     "frontpage": "Naslovna stranica",
     "mycourses": "Moji kursevi",
-    "nocourses": "Nema informacija o kursu koje bi se mogle prikazati.",
+    "nocourses": "Nema informacija o kursevima za prikaz.",
     "nocoursesyet": "Nema kurseva u ovoj kategoriji",
-    "nosearchresults": "Vaša pretraga nije dala rezultate",
+    "nosearchresults": "Nije bilo rezultata vaše pretrage",
     "notenroled": "Niste upisani na ovaj kurs",
     "notenrollable": "Ne možete sami da se upišete na ovaj kurs.",
-    "password": "Lozinka",
+    "password": "Pristupna lozinka kursa",
     "search": "Pretraga",
     "searchcourses": "Pretraži kurseve",
     "searchcoursesadvice": "Možete koristiti dugme za pretragu kurseva kako biste im pristupili kao gost ili se upisali na kurseve koji to dopuštaju.",
diff --git a/www/core/components/courses/lang/sv.json b/www/core/components/courses/lang/sv.json
index 2906fc39e80..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 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 8c07d6d8e74..33b4e8511f2 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/fileuploader/lang/ar.json b/www/core/components/fileuploader/lang/ar.json
index 912a2980157..3756250ce62 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": "خطاء في قراءة ملف \"{{$a}}\"",
-    "file": "تم تسليم الملف بنجاح",
+    "errorreadingfile": "خطأ في قراءة الملف",
+    "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/cs.json b/www/core/components/fileuploader/lang/cs.json
index 9bbe338c058..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": "Odevzdat soubor(y)",
+    "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/da.json b/www/core/components/fileuploader/lang/da.json
index dc1027bb59f..3fe2280526b 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 under læsning af filen \"{{$a}}\"",
+    "errorreadingfile": "Fejl ved læsning af fil.",
     "errorwhileuploading": "En fejl opstod under upload af filen.",
-    "file": "Filafleveringer",
+    "file": "Fil",
     "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 deb3a49511c..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": "Dateiabgabe",
+    "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 935202c4c47..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.json b/www/core/components/fileuploader/lang/es.json
index 395013fec2f..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?",
@@ -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": "Archivos enviados",
+    "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",
     "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 695c4b4155e..8d5ff8b0cef 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 \"{{$a}}\" fitxategia irakurtzean",
+    "errorreadingfile": "Errorea fitxategia irakurtzean.",
     "errorwhileuploading": "Errorea gertatu da fitxategia igotzean.",
-    "file": "Fitxategi-bidalketak",
+    "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",
     "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 5f5d1b86bda..13eb0148fcf 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": "Remises de fichiers",
+    "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 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/he.json b/www/core/components/fileuploader/lang/he.json
index f217f7b9441..b6dda48ad1e 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": "שגיאה בקריאת קובץ \"{{$a}}\"",
+    "errorreadingfile": "שגיאה בקריאת קובץ.",
     "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/it.json b/www/core/components/fileuploader/lang/it.json
index 1803ccc8b64..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": "Consegna 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/ja.json b/www/core/components/fileuploader/lang/ja.json
index 07f74ac15b3..86f29cfe14c 100644
--- a/www/core/components/fileuploader/lang/ja.json
+++ b/www/core/components/fileuploader/lang/ja.json
@@ -1,14 +1,14 @@
 {
-    "addfiletext": "ファイルを追加する",
+    "addfiletext": "ファイル追加",
     "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/nl.json b/www/core/components/fileuploader/lang/nl.json
index 6f8c6a9ce35..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": "Ingestuurde bestanden",
+    "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/ru.json b/www/core/components/fileuploader/lang/ru.json
index 1a99421f194..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/sr-cr.json b/www/core/components/fileuploader/lang/sr-cr.json
index 1a2a53dbd8f..74ec8641949 100644
--- a/www/core/components/fileuploader/lang/sr-cr.json
+++ b/www/core/components/fileuploader/lang/sr-cr.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Грешка приликом преузимања слике из албума.",
     "errormustbeonlinetoupload": "Морате бити онлајн како бисте отпремили датотеке.",
     "errornoapp": "Немате инсталирану апликацију која може да изведе ову акцију.",
-    "errorreadingfile": "Грешка при читању датотеке \"{{$a}}\"",
+    "errorreadingfile": "Грешка приликом учитавања датотеке.",
     "errorwhileuploading": "Дошло је до грешке приликом отпремања датотеке.",
-    "file": "Предате датотеке",
+    "file": "Датотека",
     "fileuploaded": "Датотека је успешно отпремљена.",
-    "maxbytesfile": "Датотека {{$a.file}} је превелика. Максимална величина датотеке коју можете поставити је {{$a.size}}.",
+    "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/sr-lt.json b/www/core/components/fileuploader/lang/sr-lt.json
index 3425c337e0c..5da78d54b07 100644
--- a/www/core/components/fileuploader/lang/sr-lt.json
+++ b/www/core/components/fileuploader/lang/sr-lt.json
@@ -10,16 +10,16 @@
     "errorgettingimagealbum": "Greška prilikom preuzimanja slike iz albuma.",
     "errormustbeonlinetoupload": "Morate biti onlajn kako biste otpremili datoteke.",
     "errornoapp": "Nemate instaliranu aplikaciju koja može da izvede ovu akciju.",
-    "errorreadingfile": "Greška pri čitanju datoteke \"{{$a}}\"",
+    "errorreadingfile": "Greška prilikom učitavanja datoteke.",
     "errorwhileuploading": "Došlo je do greške prilikom otpremanja datoteke.",
-    "file": "Datoteka",
+    "file": "Датотека",
     "fileuploaded": "Datoteka je uspešno otpremljena.",
-    "maxbytesfile": "Datoteka {{$a.file}} je prevelika. Maksimalna veličina datoteke koju možete postaviti je {{$a.size}}.",
+    "maxbytesfile": "Datoteka {{$a.file}} je prevelika. Maksimalna veličina koju možete da otpremite je {{$a.size}}.",
     "photoalbums": "Foto album",
     "readingfile": "Učitavanje datoteke",
     "selectafile": "Izaberi datoteku",
-    "uploadafile": "Postavljanje datoteke",
-    "uploading": "Postavljanje...",
+    "uploadafile": "Otpremi datoteku",
+    "uploading": "Otpremanje",
     "uploadingperc": "Otpremanje: {{$a}}%",
     "video": "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 5842440a4d5..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": "Filinlämningar",
+    "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/uk.json b/www/core/components/fileuploader/lang/uk.json
index f6be6aa599c..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": "Завантаження файлу",
+    "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/cs.json b/www/core/components/login/lang/cs.json
index 05d01526f05..be81328f5eb 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/da.json b/www/core/components/login/lang/da.json
index 2814f984626..3422796cb2b 100644
--- a/www/core/components/login/lang/da.json
+++ b/www/core/components/login/lang/da.json
@@ -2,7 +2,7 @@
     "authenticating": "Godkender",
     "cancel": "Annuller",
     "confirmdeletesite": "Er du sikker på at du ønsker at slette websiden {{sitename}}?",
-    "connect": "Forbind",
+    "connect": "Tilslut!",
     "connecttomoodle": "Tilslut til Moodle",
     "createaccount": "Opret ny profil",
     "createuserandpass": "Vælg  brugernavn og adgangskode",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index deda25e1172..a4a0ede5015 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 6ed49de1648..171e2d567ae 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",
     "erroraccesscontrolalloworigin": "Η κλήση πολλαπλών προελεύσεων (Cross-Origin call) που προσπαθείτε να εκτελέσετε έχει απορριφθεί. Παρακαλώ ελέγξτε 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 2bf64c84d37..55002468575 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 d8feb394e24..8d949589d7b 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 631db476ebc..503d86ff74d 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/he.json b/www/core/components/login/lang/he.json
index 9d40a0cfdfa..ea395994ef0 100644
--- a/www/core/components/login/lang/he.json
+++ b/www/core/components/login/lang/he.json
@@ -2,7 +2,7 @@
     "authenticating": "מאמת נתונים",
     "cancel": "ביטול",
     "confirmdeletesite": "האם את/ה בטוח/ה שברצונך למחוק את האתר {{sitename}}?",
-    "connect": "חיבור",
+    "connect": "התחברות!",
     "connecttomoodle": "התחברות למוודל",
     "createaccount": "יצירת חשבון חדש",
     "createuserandpass": "הזנת שם־משתמש וסיסמה",
diff --git a/www/core/components/login/lang/it.json b/www/core/components/login/lang/it.json
index bea999f99be..a5d397edeb6 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 0ce52512c27..3df19ef3dd5 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/ru.json b/www/core/components/login/lang/ru.json
index 5581e5945d2..549581702a7 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/sr-cr.json b/www/core/components/login/lang/sr-cr.json
index 02536b4de35..8cb06921b18 100644
--- a/www/core/components/login/lang/sr-cr.json
+++ b/www/core/components/login/lang/sr-cr.json
@@ -4,14 +4,14 @@
     "cancel": "Одустани",
     "checksiteversion": "Проверите да ли ваш сајт користи Moodle 2.4 или новију верзију.",
     "confirmdeletesite": "Да ли сте сигурни да желите да обришете сајт {{sitename}}?",
-    "connect": "Успостави везу",
+    "connect": "Повежите се!",
     "connecttomoodle": "Повежите се са Moodleom",
     "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/login/lang/sr-lt.json b/www/core/components/login/lang/sr-lt.json
index c6c52fd2e54..337bb4983ae 100644
--- a/www/core/components/login/lang/sr-lt.json
+++ b/www/core/components/login/lang/sr-lt.json
@@ -4,14 +4,14 @@
     "cancel": "Odustani",
     "checksiteversion": "Proverite da li vaš sajt koristi Moodle 2.4 ili noviju verziju.",
     "confirmdeletesite": "Da li ste sigurni da želite da obrišete sajt {{sitename}}?",
-    "connect": "Uspostavi vezu",
+    "connect": "Povežite se!",
     "connecttomoodle": "Povežite se sa Moodleom",
     "contactyouradministrator": "Obratite se administratoru vašeg sajta za dalju pomoć.",
     "contactyouradministratorissue": "Zamolite administratora da proveri sledeći problem: {{$a}}",
     "createaccount": "Kreiraj moj novi korisnički nalog",
     "createuserandpass": "Izaberite svoje korisničko ime i lozinku za pristup sistemu",
     "credentialsdescription": "Za prijavu na sistem unesite svoje korisničko ime i lozinku.",
-    "emailconfirmsent": "<p>Trebalo bi da je poslata e-poruka na vašu adresu <b>{{$a}}</b></p>\n<p>Poruka sadrži jednostavna uputstva o daljem postupku registracije.</p>\n<p>Ako i dalje imate problema, kontaktirajte administratora.</p>",
+    "emailconfirmsent": "<p>Trebalo bi da je poslata poruka na vašu e-adresu <b>{{$a}}</b></p><p>Poruka sadrži jednostavna uputstva o daljem postupku registracije.</p><p>Ako i dalje imate problema, obratite se administratoru sajta.</p>",
     "emailnotmatch": "Adrese e-pošte se ne poklapaju",
     "enterthewordsabove": "Unesite reč iznad",
     "erroraccesscontrolalloworigin": "Cross-Origin poziv koji pokušavate da izvedete je odbijen. Molimo, proverite https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index 87c32b79e13..dbd8ed5a7a2 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 ea30adb385f..3288bf24510 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/question/lang/cs.json b/www/core/components/question/lang/cs.json
index ff6940799c5..f9f9a4b0557 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/el.json b/www/core/components/question/lang/el.json
index 13546545b41..b8f5de69e9c 100644
--- a/www/core/components/question/lang/el.json
+++ b/www/core/components/question/lang/el.json
@@ -15,5 +15,5 @@
     "partiallycorrect": "Μερικώς σωστή",
     "questionmessage": "Ερώτηση {{$a}}: {{$b}}",
     "questionno": "Ερώτηση {{$a}}",
-    "unknown": "Άγνωστο"
+    "unknown": "Δεν είναι δυνατός ο προσδιορισμός της κατάστασης"
 }
\ 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 eca0b6c7e61..7ea9607d522 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 01be6f02930..75d807d6c04 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 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/sr-cr.json b/www/core/components/question/lang/sr-cr.json
index eb8373f0d60..b541c6bb2fe 100644
--- a/www/core/components/question/lang/sr-cr.json
+++ b/www/core/components/question/lang/sr-cr.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/sr-lt.json b/www/core/components/question/lang/sr-lt.json
index cd455cf48ae..fe47446c308 100644
--- a/www/core/components/question/lang/sr-lt.json
+++ b/www/core/components/question/lang/sr-lt.json
@@ -17,5 +17,5 @@
     "questionmessage": "Pitanje {{$a}}: {{$b}}",
     "questionno": "Pitanje {{$a}}",
     "requiresgrading": "Zahteva ocenjivanje",
-    "unknown": "Nepoznato"
+    "unknown": "Nije moguće utvrditi status"
 }
\ 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 c883b7f6b21..f83c00f0b3f 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/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 aef668fe00a..6bbe564a7ac 100644
--- a/www/core/components/sharedfiles/lang/de.json
+++ b/www/core/components/sharedfiles/lang/de.json
@@ -5,7 +5,7 @@
     "nosharedfiles": "Keine geteilten 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": "Geteilte 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/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/sr-cr.json b/www/core/components/sharedfiles/lang/sr-cr.json
index f341d57f6b1..3b9b852cf35 100644
--- a/www/core/components/sharedfiles/lang/sr-cr.json
+++ b/www/core/components/sharedfiles/lang/sr-cr.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "Не постоје меморисани сајтови. Молимо, додајте сајт пре него што покушате да поделите датотеке са апликацијом.",
     "nosharedfiles": "Не постоје дељене датотеке које се налазе на овом сајту.",
     "nosharedfilestoupload": "Овде немате датотеке које можете да отпремите. Ако желите да отпремите датотеку из друге апликације, пронађите ту датотеку и кликните на дугме 'Отвори у'.",
-    "rename": "Преименовање",
+    "rename": "Промени назив",
     "replace": "Замени",
     "sharedfiles": "Дељене датотеке",
     "successstorefile": "Датотека је успешно сачувана. Сада можете да изаберете ову датотеку да бисте је отпремили међу своје приватне датотеке или је придружили некој активности."
diff --git a/www/core/components/sharedfiles/lang/sr-lt.json b/www/core/components/sharedfiles/lang/sr-lt.json
index 2615dbff4fb..796ef026796 100644
--- a/www/core/components/sharedfiles/lang/sr-lt.json
+++ b/www/core/components/sharedfiles/lang/sr-lt.json
@@ -4,7 +4,7 @@
     "errorreceivefilenosites": "Ne postoje memorisani sajtovi. Molimo, dodajte sajt pre nego što pokušate da podelite datoteke sa aplikacijom.",
     "nosharedfiles": "Ne postoje deljene datoteke koje se nalaze na ovom sajtu.",
     "nosharedfilestoupload": "Ovde nemate datoteke koje možete da otpremite. Ako želite da otpremite datoteku iz druge aplikacije, pronađite tu datoteku i kliknite na dugme 'Otvori u'.",
-    "rename": "Preimenovanje",
+    "rename": "Promeni naziv",
     "replace": "Zameni",
     "sharedfiles": "Deljene datoteke",
     "successstorefile": "Datoteka je uspešno sačuvana. Sada možete da izaberete ovu datoteku da biste je otpremili među svoje privatne datoteke ili je pridružili nekoj aktivnosti."
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/sidemenu/lang/ar.json b/www/core/components/sidemenu/lang/ar.json
index 79a0f6adb0d..79c72d2c731 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/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/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/el.json b/www/core/components/sidemenu/lang/el.json
index 114771adbff..2e0168f9e01 100644
--- a/www/core/components/sidemenu/lang/el.json
+++ b/www/core/components/sidemenu/lang/el.json
@@ -2,7 +2,7 @@
     "appsettings": "Ρυθμίσεις εφαρμογής",
     "changesite": "Αλλαγή ιστότοπου",
     "help": "Βοήθεια",
-    "logout": "Έξοδος",
+    "logout": "Αποσύνδεση",
     "mycourses": "Τα μαθήματά μου",
     "togglemenu": "Αλλαγή μενού",
     "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 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/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/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/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/user/lang/ar.json b/www/core/components/user/lang/ar.json
index c2213eb9c76..a22b70dffda 100644
--- a/www/core/components/user/lang/ar.json
+++ b/www/core/components/user/lang/ar.json
@@ -4,7 +4,7 @@
     "contact": "جهة اتصال",
     "country": "الدولة",
     "description": "نص المقدمة",
-    "details": "تفاصيل متابعة اسكو",
+    "details": "التفاصيل",
     "editingteacher": "معلم",
     "email": "بريد الإلكتروني",
     "emailagain": "إعادة إدخال البريد الإلكتروني للتأكيد ",
@@ -15,7 +15,7 @@
     "manager": "مدير",
     "newpicture": "صورة شخصية جديدة",
     "phone1": "هاتف",
-    "phone2": "رقم الهاتف المحمول",
+    "phone2": "الجوال",
     "roles": "أدوار",
     "student": "طالب",
     "viewprofile": "عرض الحساب",
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/da.json b/www/core/components/user/lang/da.json
index 102926802a6..934282c82cc 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": "Følg detaljer",
+    "details": "Detaljer",
     "detailsnotavailable": "Denne brugers data er ikke tilgængelige for dig.",
     "editingteacher": "Lærer",
     "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 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/el.json b/www/core/components/user/lang/el.json
index 2b3c68364dd..b3f61aab273 100644
--- a/www/core/components/user/lang/el.json
+++ b/www/core/components/user/lang/el.json
@@ -4,7 +4,7 @@
     "contact": "Επικοινωνία",
     "country": "Χώρα",
     "description": "Περιγραφή",
-    "details": "Παρακολούθηση λεπτομερειών",
+    "details": "Λεπτομέρειες",
     "detailsnotavailable": "Λεπτομέρειες για αυτό τον χρήστη δεν είναι διαθέσιμες.",
     "editingteacher": "Διδάσκων",
     "email": "Ηλεκτρονικό Ταχυδρομείο",
@@ -16,10 +16,10 @@
     "manager": "Διαχειριστής",
     "newpicture": "Νέα εικόνα",
     "phone1": "Τηλέφωνο",
-    "phone2": "Κινητό τηλέφωνο",
+    "phone2": "Κινητό",
     "roles": "Ρόλοι",
     "sendemail": "Email",
-    "student": "Φοιτητής",
+    "student": "Μαθητής",
     "teacher": "Διδάσκων χωρίς δικαιώματα αλλαγής",
     "viewprofile": "Επισκόπηση του προφίλ",
     "webpage": "Ιστοσελίδα"
diff --git a/www/core/components/user/lang/es.json b/www/core/components/user/lang/es.json
index 3839cc05d90..42dfd84651d 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": "Email",
@@ -16,7 +16,7 @@
     "manager": "Gestor",
     "newpicture": "Imagen nueva",
     "phone1": "Teléfono",
-    "phone2": "Teléfono móvil",
+    "phone2": "Móvil",
     "roles": "Roles",
     "sendemail": "Correo electrónico",
     "student": "Estudiante",
diff --git a/www/core/components/user/lang/eu.json b/www/core/components/user/lang/eu.json
index 032d503d7e7..c0d05d48750 100644
--- a/www/core/components/user/lang/eu.json
+++ b/www/core/components/user/lang/eu.json
@@ -4,19 +4,19 @@
     "contact": "Kontaktua",
     "country": "Herrialdea",
     "description": "Deskribapena",
-    "details": "Pistaren zehaztasunak",
+    "details": "Xehetasunak",
     "detailsnotavailable": "Erabiltzaile honen xehetasunak ez daude zuretzat eskuragarri",
     "editingteacher": "Irakaslea",
     "email": "E-posta",
     "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/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/he.json b/www/core/components/user/lang/he.json
index 212f9bb5b8a..6eb90b319d2 100644
--- a/www/core/components/user/lang/he.json
+++ b/www/core/components/user/lang/he.json
@@ -1,22 +1,22 @@
 {
     "address": "כתובת",
     "city": "ישוב",
-    "contact": "ליצירת קשר",
+    "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/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/ja.json b/www/core/components/user/lang/ja.json
index a07f54c15b6..7b191daf6d3 100644
--- a/www/core/components/user/lang/ja.json
+++ b/www/core/components/user/lang/ja.json
@@ -1,10 +1,10 @@
 {
     "address": "住所",
     "city": "都道府県",
-    "contact": "連絡先",
+    "contact": "コンタクト",
     "country": "国",
     "description": "説明",
-    "details": "トラック詳細",
+    "details": "詳細",
     "email": "メール",
     "emailagain": "メールアドレス (もう一度)",
     "firstname": "名",
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/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/sr-cr.json b/www/core/components/user/lang/sr-cr.json
index c97c7534c91..d9c657dc5ac 100644
--- a/www/core/components/user/lang/sr-cr.json
+++ b/www/core/components/user/lang/sr-cr.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": "Улоге",
     "sendemail": "Е-пошта",
     "student": "Полазник",
diff --git a/www/core/components/user/lang/sr-lt.json b/www/core/components/user/lang/sr-lt.json
index 97e30a4e4c8..6f944737893 100644
--- a/www/core/components/user/lang/sr-lt.json
+++ b/www/core/components/user/lang/sr-lt.json
@@ -4,19 +4,19 @@
     "contact": "Kontakt",
     "country": "Država",
     "description": "Opis",
-    "details": "Prati detalje",
+    "details": "Podaci o korisniku",
     "detailsnotavailable": "Podaci o ovom korisniku vam nisu dostupni.",
     "editingteacher": "Predavač",
     "email": "Adresa e-pošte",
     "emailagain": "Adresa e-pošte (ponovo)",
     "firstname": "Ime",
     "interests": "Interesovanja",
-    "invaliduser": "Neispravan korisnik",
+    "invaliduser": "Neispravan korisnik.",
     "lastname": "Prezime",
     "manager": "Menadžer",
     "newpicture": "Nova slika",
     "phone1": "Telefon",
-    "phone2": "Mobilni telefon",
+    "phone2": "Mobilni",
     "roles": "Uloge",
     "sendemail": "E-pošta",
     "student": "Polaznik",
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/uk.json b/www/core/components/user/lang/uk.json
index 94b6b0bd9ad..dc4c1e7d015 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/lang/ar.json b/www/core/lang/ar.json
index 8bd2f54a65c..cdd15900df0 100644
--- a/www/core/lang/ar.json
+++ b/www/core/lang/ar.json
@@ -103,7 +103,7 @@
     "required": "مطلوب",
     "save": "حفظ",
     "search": "بحث",
-    "searching": "بحث في",
+    "searching": "يتم البحث",
     "searchresults": "نتائج البحث",
     "sec": "ثانية",
     "secs": "ثواني",
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index 5418ade47f0..6ac7d06210e 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é.",
@@ -87,7 +87,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Obrázek",
     "imageviewer": "Prohlížeč obrázků",
-    "info": "Info",
+    "info": "Informace",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Naposledy změněno",
@@ -135,7 +135,7 @@
     "nocomments": "Nejsou žádné komentáře",
     "nograde": "Žádné hodnocení.",
     "none": "Nic",
-    "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",
@@ -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": "Vyhledat",
-    "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": "Ukázat",
     "showmore": "Zobrazit více...",
@@ -182,7 +182,7 @@
     "sortby": "Třídit podle",
     "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/da.json b/www/core/lang/da.json
index 72894fffc8c..a81cfdb8695 100644
--- a/www/core/lang/da.json
+++ b/www/core/lang/da.json
@@ -16,12 +16,12 @@
     "close": "Luk",
     "comments": "Kommentarer",
     "commentscount": "Kommentarer ({{$a}})",
-    "completion-alt-auto-fail": "Gennemført: {{$a}} (opnåede ikke beståelseskarakter)",
+    "completion-alt-auto-fail": "Gennemført: {{$a}} (bestod ikke)",
     "completion-alt-auto-n": "Ikke gennemført: {{$a}}",
-    "completion-alt-auto-pass": "Gennemført: {{$a}} (opnåede beståelseskarakter)",
+    "completion-alt-auto-pass": "Gennemført: {{$a}} (bestod)",
     "completion-alt-auto-y": "Gennemført: {{$a}}",
-    "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.",
+    "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.",
     "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?",
@@ -62,7 +62,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Billede",
     "imageviewer": "Billedfremviser",
-    "info": "Info",
+    "info": "Information",
     "ios": "iOS",
     "labelsep": ":",
     "lastmodified": "Senest ændret",
@@ -115,7 +115,7 @@
     "notice": "Bemærk",
     "now": "nu",
     "numwords": "{{$a}} ord",
-    "offline": "Der kræves ikke online-aflevering",
+    "offline": "Offline",
     "online": "Online",
     "openfullimage": "Klik her for at vise billedet i fuld størrelse.",
     "openinbrowser": "Åben i browser",
@@ -130,7 +130,7 @@
     "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øg i",
+    "searching": "Søger",
     "searchresults": "Søgeresultater",
     "sec": "sekunder",
     "secs": "sekunder",
@@ -148,7 +148,7 @@
     "sortby": "Sorter efter",
     "start": "Start",
     "submit": "Send",
-    "success": "Succes",
+    "success": "Succes!",
     "tablet": "Tablet",
     "teachers": "Lærere",
     "time": "Tid",
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index 8ed54a59912..ecccdb261e4 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,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": "Keine Kommentare",
     "nograde": "Keine Bewertung.",
     "none": "Kein",
-    "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": "Sichern",
     "search": "Suche",
-    "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 ...",
@@ -182,7 +182,7 @@
     "sortby": "Sortiert nach",
     "start": "Start",
     "submit": "Übertragen",
-    "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 f9e97706e12..c5cae2c9145 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": "Είστε σίγουροι οτι θέλετε να διαγράψετε αυτό το αρχείο?",
     "confirmloss": "Είστε σίγουροι? Όλες οι αλλαγές θα χαθούν.",
@@ -40,7 +40,7 @@
     "days": "Ημέρες",
     "decsep": ",",
     "delete": "Διαγραφή",
-    "deleting": "Διαγραφή",
+    "deleting": "Γίνεται διαγραφή",
     "description": "Περιγραφή",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -133,7 +133,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",
@@ -141,7 +141,7 @@
     "notsent": "Δεν εστάλη",
     "now": "τώρα",
     "numwords": "{{$a}} λέξεις",
-    "offline": "Δεν απαιτείται διαδικτυακή υποβολή",
+    "offline": "Εκτός σύνδεσης",
     "online": "Συνδεδεμένος",
     "openfullimage": "Πατήστε εδώ για να δείτε την εικόνα σε πλήρες μέγεθος",
     "openinbrowser": "Ανοίξτε στον περιηγητή.",
@@ -159,13 +159,13 @@
     "retry": "Προσπαθήστε ξανά",
     "save": "Αποθήκευση",
     "search": "Έρευνα",
-    "searching": "Αναζήτηση σε",
+    "searching": "Αναζήτηση",
     "searchresults": "Αναζήτηση στα αποτελέσματα",
     "sec": "δευτερόλεπτο",
     "secs": "δευτερόλεπτα",
     "seemoredetail": "Κάντε κλικ εδώ για να δείτε περισσότερες λεπτομέρειες",
     "send": "Αποστολή",
-    "sending": "Αποστέλλεται",
+    "sending": "Αποστολή",
     "show": "Εμφάνιση",
     "showmore": "Περισσότερα...",
     "site": "ιστοχώρος",
@@ -179,7 +179,7 @@
     "sortby": "Ταξινόμηση κατά",
     "start": "Αρχή",
     "submit": "Υποβολή",
-    "success": "Επιτυχία",
+    "success": "Επιτυχία!",
     "tablet": "Tablet",
     "teachers": "Καθηγητές",
     "thereisdatatosync": "Υπάρχουν εκτός σύνδεσης {{$a}} για συγχρονισμό.",
diff --git a/www/core/lang/es.json b/www/core/lang/es.json
index d5b97d822ac..eac73c2ea02 100644
--- a/www/core/lang/es.json
+++ b/www/core/lang/es.json
@@ -40,7 +40,7 @@
     "days": "Días",
     "decsep": ",",
     "delete": "Borrar",
-    "deleting": "Eliminando",
+    "deleting": "Borrando",
     "description": "Descripción",
     "dfdaymonthyear": "MM-DD-YYYY",
     "dfdayweekmonth": "ddd, D MMM",
@@ -86,7 +86,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagen",
     "imageviewer": "Visor de imágenes",
-    "info": "Info",
+    "info": "Información",
     "ios": "iOs",
     "labelsep": ":",
     "lastmodified": "Última modificación",
@@ -134,7 +134,7 @@
     "nocomments": "No hay comentarios",
     "nograde": "Sin calificación",
     "none": "Ninguno",
-    "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": "Sin resultados",
     "notapplicable": "n/a",
@@ -142,8 +142,8 @@
     "notsent": "No enviado",
     "now": "ahora",
     "numwords": "{{$a}} palabras",
-    "offline": "Fuera de línea",
-    "online": "En línea",
+    "offline": "No se requieren entregas online",
+    "online": "Conectado",
     "openfullimage": "Haga clic aquí para ver la imagen a tamaño completo",
     "openinbrowser": "Abrir en el navegador",
     "othergroups": "Otros grupos",
@@ -160,7 +160,7 @@
     "retry": "Reintentar",
     "save": "Guardar",
     "search": "Búsqueda",
-    "searching": "Buscar en",
+    "searching": "Buscando",
     "searchresults": "Resultado",
     "sec": "segundos",
     "secs": "segundos",
diff --git a/www/core/lang/eu.json b/www/core/lang/eu.json
index 747bcfe3930..399292e7c4b 100644
--- a/www/core/lang/eu.json
+++ b/www/core/lang/eu.json
@@ -134,7 +134,7 @@
     "nocomments": "Ez dago iruzkinik",
     "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 35acf20efac..b3cee4e200c 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",
@@ -87,7 +87,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Image",
     "imageviewer": "Lecteur d'images",
-    "info": "Information",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": "&nbsp;",
     "lastmodified": "Dernière modification",
@@ -135,7 +135,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",
@@ -143,7 +143,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",
@@ -161,7 +161,7 @@
     "retry": "Essayer à nouveau",
     "save": "Enregistrer",
     "search": "Recherche",
-    "searching": "Rechercher dans",
+    "searching": "Recherche",
     "searchresults": "Résultats de la recherche",
     "sec": "s",
     "secs": "s",
@@ -182,7 +182,7 @@
     "sortby": "Trier par",
     "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/he.json b/www/core/lang/he.json
index bbc7b0ed56f..7672a3ed83c 100644
--- a/www/core/lang/he.json
+++ b/www/core/lang/he.json
@@ -14,12 +14,12 @@
     "close": "סגירת חלון",
     "comments": "הערות",
     "commentscount": "({{$a}}) הערות",
-    "completion-alt-auto-fail": "הושלם: {{$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": "המשך",
@@ -105,8 +105,8 @@
     "notice": "לתשומת לב",
     "now": "עכשיו",
     "numwords": "{{$a}} מילים",
-    "offline": "לא נדרשות הגשות מקוונות",
-    "online": "מקוון",
+    "offline": "לא מחובר",
+    "online": "מחובר",
     "openfullimage": "יש להקליק כאן להצגת התמונה בגודל מלא",
     "openinbrowser": "תצוגה בדפדפן",
     "pagea": "עמוד {{$a}}",
@@ -125,7 +125,7 @@
     "secs": "שניות",
     "seemoredetail": "הקליקו כאן כדי לראות פרטים נוספים",
     "send": "לשלוח",
-    "sending": "שולחים",
+    "sending": "שולח",
     "serverconnection": "שגיאה בהתחברות לשרת",
     "show": "תצוגה",
     "site": "מערכת",
@@ -136,7 +136,7 @@
     "sortby": "מיון לפי",
     "start": "התחלה",
     "submit": "הגש",
-    "success": "הצלחה",
+    "success": "הצלחה!",
     "tablet": "טאבלט",
     "teachers": "מורים",
     "time": "זמן",
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index df7d689b127..b09cf8ff07a 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": "Informazione",
+    "info": "Informazioni",
     "ios": "iOS",
     "labelsep": ": ",
     "lastmodified": "Ultima modifica",
@@ -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": "Ricerca",
-    "searching": "Cerca 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",
@@ -159,7 +159,7 @@
     "sortby": "Ordina per",
     "start": "Apertura",
     "submit": "Invia",
-    "success": "Operazione eseguita con successo",
+    "success": "OK!",
     "tablet": "Tablet",
     "teachers": "Docenti",
     "time": "Tempo",
diff --git a/www/core/lang/ja.json b/www/core/lang/ja.json
index 8bc1a53581f..3a3aed50aec 100644
--- a/www/core/lang/ja.json
+++ b/www/core/lang/ja.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-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-manual-n": "未了: {{$a}}。選択して完了に変更してください。",
+    "completion-alt-manual-y": "完了: {{$a}}。選択して未了に変更してください。",
     "confirmcanceledit": "本当にこのページを離れますか？　全ての変更が失われます。",
     "confirmdeletefile": "本当にこのファイルを削除してもよろしいですか?",
     "confirmloss": "本当ですか？　すべての変更が失われます。",
@@ -41,7 +41,7 @@
     "decsep": ".",
     "defaultvalue": "デフォルト ({{$a}})",
     "delete": "削除",
-    "deleting": "削除",
+    "deleting": "消去中",
     "description": "説明",
     "dfdaymonthyear": "YYYY/MM/DD",
     "dfdayweekmonth": "MMM月D日（ddd）",
@@ -87,7 +87,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "画像",
     "imageviewer": "画像ビューア",
-    "info": "インフォメーション",
+    "info": "情報",
     "ios": "iOS",
     "labelsep": ":",
     "lastmodified": "最終更新日時",
@@ -121,7 +121,7 @@
     "nocomments": "コメントはありません。",
     "nograde": "評点なし",
     "none": "なし",
-    "nopasswordchangeforced": "あなたはパスワードを変更せずに次へ進むことはできません。しかし、パスワードを変更するため利用できるページがありません。あなたのMoodle管理者にご連絡ください。",
+    "nopasswordchangeforced": "パスワードを変更するまで続きを実行できません。",
     "nopermissions": "申し訳ございません、現在、あなたは 「 {{$a}} 」を実行するためのパーミッションがありません。",
     "noresults": "該当データがありません。",
     "notapplicable": "なし",
@@ -129,7 +129,7 @@
     "notsent": "未送信",
     "now": "現在",
     "numwords": "{{$a}} 語",
-    "offline": "オンライン提出不要",
+    "offline": "オフライン",
     "online": "オンライン",
     "openfullimage": "クリックしてフルサイズの画像を表示",
     "openinbrowser": "ブラウザで開く",
@@ -147,7 +147,7 @@
     "retry": "再実行",
     "save": "保存",
     "search": "検索 ...",
-    "searching": "検索:",
+    "searching": "検索中",
     "searchresults": "検索結果",
     "sec": "秒",
     "secs": "秒",
@@ -168,7 +168,7 @@
     "sortby": "並べ替え",
     "start": "開始",
     "submit": "送信",
-    "success": "成功",
+    "success": "成功!",
     "tablet": "タブレット",
     "teachers": "教師",
     "thereisdatatosync": "同期が必要なオフライン {{$a}} があります。",
@@ -181,7 +181,7 @@
     "unexpectederror": "不明なエラー。アプリを閉じて再起動してみてください。",
     "unicodenotsupported": "本サイトでは一部の絵文字がサポートされていません。それらは送信されたメッセージから削除されます。",
     "unicodenotsupportedcleanerror": "Unicode文字をクリアする際に空のテキストがありました。",
-    "unknown": "不明",
+    "unknown": "不明な",
     "unlimited": "無制限",
     "unzipping": "未展開の",
     "upgraderunning": "サイトはアップグレード中です。後ほどお試しください。",
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index 4193e16acd3..bb80cd061e0 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -17,12 +17,12 @@
     "comments": "Jouw commentaar",
     "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": "Beschrijving",
     "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": "Laatst gewijzigd",
@@ -135,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",
@@ -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": "Zoeken...",
-    "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": "Laat zien",
     "showmore": "Toon meer...",
@@ -182,7 +182,7 @@
     "sortby": "Sorteer volgens",
     "start": "Start",
     "submit": "Verstuur",
-    "success": "Succes",
+    "success": "Gelukt!",
     "tablet": "Tablet",
     "teachers": "leraren",
     "thereisdatatosync": "Er zijn offline {{$a}} die moeten worden gesynchroniseerd.",
diff --git a/www/core/lang/sr-cr.json b/www/core/lang/sr-cr.json
index 7f2925b317f..ac8fa8b0c9b 100644
--- a/www/core/lang/sr-cr.json
+++ b/www/core/lang/sr-cr.json
@@ -17,12 +17,12 @@
     "comments": "Коментари",
     "commentscount": "Коментари ({{$a}})",
     "commentsnotworking": "Коментари не могу да буду преузети",
-    "completion-alt-auto-fail": "Завршено: {{$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}}. Изаберите да бисте означили као незавршено.",
     "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": "Нисте у могућности да наставите даље без промене корисничког имена, међутим не постоји расположива страница за промену. Молимо контактирајте Moodle администратора.",
+    "nopasswordchangeforced": "Не можете наставити без промене своје лозинке.",
     "nopermissions": "Жао нам је, али тренутно немате дозволу да то радите ({{$a}})",
     "noresults": "Нема резултата",
     "notapplicable": "n/a",
@@ -128,8 +128,8 @@
     "notsent": "Није послато",
     "now": "сада",
     "numwords": "{{$a}} реч(и)",
-    "offline": "Не тражи се онлајн предаја рада",
-    "online": "Online",
+    "offline": "Офлајн",
+    "online": "Онлајн",
     "openfullimage": "Кликните овде да бисте приказали слику у пуној величини",
     "openinbrowser": "Отвори у веб читачу",
     "othergroups": "Друге групе",
@@ -146,13 +146,13 @@
     "retry": "Покушај поново",
     "save": "Сачувај",
     "search": "Претрага",
-    "searching": "Претражи у",
+    "searching": "Претраживање",
     "searchresults": "Резултати претраге",
     "sec": "сек",
     "secs": "s",
     "seemoredetail": "Кликните овде за више детеља",
     "send": "Пошаљи",
-    "sending": "Шаље се",
+    "sending": "Слање",
     "serverconnection": "Грешка у повезивању са сервером",
     "show": "Прикажи",
     "showmore": "Прикажи још...",
@@ -167,7 +167,7 @@
     "sortby": "Сортирај по",
     "start": "Почетак",
     "submit": "Проследи",
-    "success": "Успешно",
+    "success": "Успешно!",
     "tablet": "Таблет",
     "teachers": "Предавачи",
     "thereisdatatosync": "Број офлајн податак које треба синхронизовати: {{$a}}",
diff --git a/www/core/lang/sr-lt.json b/www/core/lang/sr-lt.json
index 311b111ce0c..d622c1ce0a9 100644
--- a/www/core/lang/sr-lt.json
+++ b/www/core/lang/sr-lt.json
@@ -17,12 +17,12 @@
     "comments": "Komentari",
     "commentscount": "Komentari ({{$a}})",
     "commentsnotworking": "Komentari ne mogu da budu preuzeti",
-    "completion-alt-auto-fail": "Završeno: {{$a}} (nije postigao/la prelaznu ocenu)",
+    "completion-alt-auto-fail": "Završeno: {{$a}} (nije postignuta prelazna ocena)",
     "completion-alt-auto-n": "Nije završeno: {{$a}}",
-    "completion-alt-auto-pass": "Završeno: {{$a}} (postigao/la prelaznu ocenu)",
+    "completion-alt-auto-pass": "Završeno: {{$a}} (postignuta prelazna ocena)",
     "completion-alt-auto-y": "Završeno: {{$a}}",
-    "completion-alt-manual-n": "Nije završeno: {{$a}}. Izaberi da bi označio kao završeno",
-    "completion-alt-manual-y": "Završeno: {{$a}}. Izaberi da bi označio kao nezavršeno.",
+    "completion-alt-manual-n": "Nije završeno: {{$a}}. Izaberite da biste označili kao završeno.",
+    "completion-alt-manual-y": "Završeno: {{$a}}. Izaberite da biste označili kao nezavršeno.",
     "confirmcanceledit": "Da li ste sigurni da želite da napustite ovu stranicu? Sve promene će biti izgubljene.",
     "confirmdeletefile": "Da li ste sigurni da želite da obrišete ovu datoteteku?",
     "confirmloss": "Da li ste sigurni? Sve promene će biti izgubljene.",
@@ -86,7 +86,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Slika",
     "imageviewer": "Prikazivač slike",
-    "info": "Informacija",
+    "info": "Info",
     "ios": "iOS",
     "labelsep": ":",
     "lastmodified": "Poslednja izmena",
@@ -120,7 +120,7 @@
     "nocomments": "Nema komentara",
     "nograde": "Nema ocene",
     "none": "Nijedan",
-    "nopasswordchangeforced": "Niste u mogućnosti da nastavite dalje bez promene korisničkog imena, međutim ne postoji raspoloživa stranica za promenu. Molimo kontaktirajte Moodle administratora.",
+    "nopasswordchangeforced": "Ne možete nastaviti bez promene svoje lozinke.",
     "nopermissions": "Žao nam je, ali trenutno nemate dozvolu da to radite ({{$a}})",
     "noresults": "Nema rezultata",
     "notapplicable": "n/a",
@@ -128,8 +128,8 @@
     "notsent": "Nije poslato",
     "now": "sada",
     "numwords": "{{$a}} reč(i)",
-    "offline": "Ne traži se onlajn predaja rada",
-    "online": "Online",
+    "offline": "Oflajn",
+    "online": "Onlajn",
     "openfullimage": "Kliknite ovde da biste prikazali sliku u punoj veličini",
     "openinbrowser": "Otvori u veb čitaču",
     "othergroups": "Druge grupe",
@@ -146,13 +146,13 @@
     "retry": "Pokušaj ponovo",
     "save": "Sačuvaj",
     "search": "Pretraga",
-    "searching": "Pretraži u",
+    "searching": "Pretraživanje",
     "searchresults": "Rezultati pretrage",
     "sec": "sek",
     "secs": "s",
     "seemoredetail": "Kliknite ovde za više detelja",
     "send": "Pošalji",
-    "sending": "Šalje se",
+    "sending": "Slanje",
     "serverconnection": "Greška u povezivanju sa serverom",
     "show": "Prikaži",
     "showmore": "Prikaži još...",
@@ -167,7 +167,7 @@
     "sortby": "Sortiraj po",
     "start": "Početak",
     "submit": "Prosledi",
-    "success": "Uspešno",
+    "success": "Uspešno!",
     "tablet": "Tablet",
     "teachers": "Predavači",
     "thereisdatatosync": "Broj oflajn podatak koje treba sinhronizovati: {{$a}}",
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index 47effc624e5..abbe11de849 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",
@@ -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",
@@ -151,7 +151,7 @@
     "sortby": "Sortera enligt",
     "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/uk.json b/www/core/lang/uk.json
index a316e7e3686..8fa63c712a4 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": "Показати більше",
@@ -167,7 +167,7 @@
     "sortby": "Сортувати за",
     "start": "Початок",
     "submit": "Надіслати",
-    "success": "Успішно",
+    "success": "Успіх!",
     "tablet": "Планшет",
     "teachers": "Викладачі",
     "thereisdatatosync": "Офлайн {{$a}} повинні бути синхронізовані.",
@@ -180,7 +180,7 @@
     "unexpectederror": "Неочікувана помилка. Будь ласка, закрийте і знову відкрийте додаток, щоб спробувати ще раз",
     "unicodenotsupported": "Деякі Emoji не підтримуються на цьому сайті. Такі символи будуть видалені, коли повідомлення буде відправлено.",
     "unicodenotsupportedcleanerror": "Порожній текст був знайдений при чищенні Unicode символів.",
-    "unknown": "Невідоме",
+    "unknown": "Невідомо",
     "unlimited": "Не обмежено",
     "unzipping": "Розпакування",
     "upgraderunning": "Сайт оновлюється, повторіть спробу пізніше.",

From 74a9f3ebfe761657b7574abccaf48874fcc26b67 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jul 2017 08:20:58 +0200
Subject: [PATCH 093/118] MOBILE-2178 database: Allow managing own entries

---
 www/addons/mod/data/lang/en.json          | 1 -
 www/addons/mod/data/services/helper.js    | 2 +-
 www/addons/mod/data/templates/action.html | 2 +-
 www/core/lang/en.json                     | 1 +
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/addons/mod/data/lang/en.json b/www/addons/mod/data/lang/en.json
index b1931a4b23f..8ad92b9ec45 100644
--- a/www/addons/mod/data/lang/en.json
+++ b/www/addons/mod/data/lang/en.json
@@ -33,7 +33,6 @@
     "recorddeleted": "Entry deleted",
     "recorddisapproved": "Entry unapproved",
     "resetsettings": "Reset filters",
-    "restore": "Restore",
     "search": "Search",
     "selectedrequired": "All selected required",
     "timeadded": "Time added",
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 53666cb89e1..84b84d359c2 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -101,7 +101,7 @@ angular.module('mm.addons.mod_data')
         replacements.timeadded = true;
         replacements.timemodified = true;
 
-        replacements.edit = accessInfo.canmanageentries || (accessInfo.inreadonlyperiod && record.canmanageentry);
+        replacements.edit = record.canmanageentry; // This already checks capabilities and readonly period.
         replacements.delete = replacements.edit;
         replacements.approve = database.approval && accessInfo.canapprove && !record.approved;
         replacements.disapprove = database.approval && accessInfo.canapprove && record.approved;
diff --git a/www/addons/mod/data/templates/action.html b/www/addons/mod/data/templates/action.html
index 91581409647..1675b58fe80 100644
--- a/www/addons/mod/data/templates/action.html
+++ b/www/addons/mod/data/templates/action.html
@@ -1,7 +1,7 @@
 <a ng-if="action == 'more'" class="button button-icon icon ion-ios-search-strong" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&rid={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.more' | translate }}"></a>
 <a ng-if="action == 'edit'" class="button button-icon icon ion-gear-b" ng-href="{{url}}/mod/data/edit.php?d={{entry.dataid}}&rid={{entry.id}}" mm-link capture-link="true" title="{{ 'mm.core.edit' | translate }}"></a>
 <a ng-if="action == 'delete' && !entry.deleted" class="button button-icon icon ion-trash-a" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&delete={{entry.id}}" mm-link capture-link="true" title="{{ 'mm.core.delete' | translate }}"></a>
-<a ng-if="action == 'delete' && entry.deleted" class="button button-icon icon ion-reply" ng-click="undoDelete()" mm-link capture-link="true" title="{{ 'mma.mod_data.restore' | translate }}"></a>
+<a ng-if="action == 'delete' && entry.deleted" class="button button-icon icon ion-reply" ng-click="undoDelete()" mm-link capture-link="true" title="{{ 'mm.core.restore' | translate }}"></a>
 <a ng-if="action == 'approve'" class="button button-icon icon ion-thumbsup" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&approve={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.approve' | translate }}"></a>
 <a ng-if="action == 'disapprove'" class="button button-icon icon ion-minus-circled" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&disapprove={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.disapprove' | translate }}"></a>
 
diff --git a/www/core/lang/en.json b/www/core/lang/en.json
index d48edfa86b1..783417f3a48 100644
--- a/www/core/lang/en.json
+++ b/www/core/lang/en.json
@@ -163,6 +163,7 @@
     "refresh": "Refresh",
     "required": "Required",
     "requireduserdatamissing": "This user lacks some required profile data. Please, fill this data in your Moodle and try again.<br>{{$a}}",
+    "restore": "Restore",
     "retry": "Retry",
     "save": "Save",
     "search": " Search...",

From 876bcd7b893657dce983e3ddf118fe1a576da3c7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jul 2017 08:44:34 +0200
Subject: [PATCH 094/118] MOBILE-2178 database: Fix cache presets in search
 entries

---
 www/addons/mod/data/services/data.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 58096d51985..a4bdbc3c841 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -798,8 +798,8 @@ angular.module('mm.addons.mod_data')
                     perpage: perPage || mmaModDataPerPage
                 },
                 preSets = {
-                    getCache: 0,
-                    saveCache: 1,
+                    getFromCache: 0,
+                    saveToCache: 1,
                     emergencyCache: 1
                 };
 

From 736a8be7ff596915bde9b13ccf27ef2dcbef94d7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jul 2017 09:02:32 +0200
Subject: [PATCH 095/118] MOBILE-2178 lesson: Change lesson string

---
 www/addons/mod/lesson/lang/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/addons/mod/lesson/lang/en.json b/www/addons/mod/lesson/lang/en.json
index 92a9bb049b6..f9425621099 100644
--- a/www/addons/mod/lesson/lang/en.json
+++ b/www/addons/mod/lesson/lang/en.json
@@ -22,7 +22,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.",
+    "errorprefetchrandombranch": "This lesson contains a jump to a random content page. It can't be attempted in the app until it has been started in a web browser.",
     "errorreviewretakenotlast": "This attempt can no longer be reviewed because another attempt has been finished.",
     "finish": "Finish",
     "finishretakeoffline": "This attempt was finished offline.",

From 253e957afc5ddde54a4667b1ade39251378a82c8 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jul 2017 10:31:54 +0200
Subject: [PATCH 096/118] MOBILE-2178 database: Remove 'fields' from offline
 storage indexes

Storing an array of objects in an index makes the app crash in iOS
---
 www/addons/mod/data/services/data_offline.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/www/addons/mod/data/services/data_offline.js b/www/addons/mod/data/services/data_offline.js
index 7a16d8d1755..4cab769cdf0 100644
--- a/www/addons/mod/data/services/data_offline.js
+++ b/www/addons/mod/data/services/data_offline.js
@@ -37,9 +37,6 @@ angular.module('mm.addons.mod_data')
                 {
                     name: 'entryid'
                 },
-                {
-                    name: 'fields'
-                },
                 {
                     name: 'timemodified'
                 },

From 3fab7f5e4a5400888f5894c8f985f89cd5ebf575 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jul 2017 10:32:22 +0200
Subject: [PATCH 097/118] MOBILE-2178 database: Prefetch getFields WS call

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

diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index a4bdbc3c841..c2de10b9f0f 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -829,11 +829,13 @@ angular.module('mm.addons.mod_data')
      * @module mm.addons.mod_data
      * @ngdoc method
      * @name $mmaModData#getFields
-     * @param   {Number}    dataId          Data ID.
-     * @param   {String}    [siteId]        Site ID. If not defined, current site.
-     * @return  {Promise}                   Promise resolved when the database is retrieved.
+     * @param  {Number} dataId         Data ID.
+     * @param  {Boolean} [forceCache]  True to always get the value from cache, false otherwise. Default false.
+     * @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 fields are retrieved.
      */
-    self.getFields = function(dataId, siteId) {
+    self.getFields = function(dataId, forceCache, ignoreCache, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                     databaseid: dataId
@@ -842,6 +844,13 @@ angular.module('mm.addons.mod_data')
                     cacheKey: getFieldsCacheKey(dataId)
                 };
 
+            if (forceCache) {
+                preSets.omitExpires = true;
+            } else if (ignoreCache) {
+                preSets.getFromCache = 0;
+                preSets.emergencyCache = 0;
+            }
+
             return site.read('mod_data_get_fields', params, preSets).then(function(response) {
                 if (response && response.fields) {
                     return response.fields;
diff --git a/www/addons/mod/data/services/prefetch_handler.js b/www/addons/mod/data/services/prefetch_handler.js
index 493a2723e16..e7956f1a06f 100644
--- a/www/addons/mod/data/services/prefetch_handler.js
+++ b/www/addons/mod/data/services/prefetch_handler.js
@@ -323,6 +323,8 @@ angular.module('mm.addons.mod_data')
             var database = info.database,
                 promises = [];
 
+            promises.push($mmaModData.getFields(database.id, false, true, siteId));
+
             promises.push($mmFilepool.addFilesToQueueByUrl(siteId, info.files, self.component, module.id));
 
             angular.forEach(info.groups, function(group) {

From b1225c34ebcee15fc801e46e872f1c0fa78074fd Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jul 2017 11:08:31 +0200
Subject: [PATCH 098/118] MOBILE-2178 database: Allow viewing offline entries

---
 www/addons/mod/data/controllers/edit.js  | 26 +-------------
 www/addons/mod/data/controllers/entry.js |  2 +-
 www/addons/mod/data/services/helper.js   | 44 +++++++++++++++++++++++-
 3 files changed, 45 insertions(+), 27 deletions(-)

diff --git a/www/addons/mod/data/controllers/edit.js b/www/addons/mod/data/controllers/edit.js
index afb0eb308f0..90bec456681 100644
--- a/www/addons/mod/data/controllers/edit.js
+++ b/www/addons/mod/data/controllers/edit.js
@@ -87,31 +87,7 @@ angular.module('mm.addons.mod_data')
                 $scope.fields[field.id] = field;
             });
 
-            if (entryId > 0) {
-                return $mmaModData.getEntry(data.id, entryId);
-            }
-
-            for (var x in offlineActions) {
-                if (offlineActions[x].action == 'add') {
-                    offlineEntry = offlineActions[x];
-
-                    var siteInfo = $mmSite.getInfo(),
-                        entryData = {
-                            id: offlineEntry.entryid,
-                            canmanageentry: true,
-                            approved: !data.approval || data.manageapproved,
-                            dataid: offlineEntry.dataid,
-                            groupid: offlineEntry.groupid,
-                            timecreated: -offlineEntry.entryid,
-                            timemodified: -offlineEntry.entryid,
-                            userid: siteInfo.userid,
-                            fullname: siteInfo.fullname,
-                            contents: {}
-                        };
-
-                    return {entry: entryData};
-                }
-            }
+            return $mmaModDataHelper.getEntry(data, entryId, offlineActions);
         }).then(function(entryData) {
             if (entryData) {
                 entry = entryData.entry;
diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index d63244fe152..82731060624 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -87,7 +87,7 @@ angular.module('mm.addons.mod_data')
                     $scope.fields[field.id] = field;
                 });
 
-                return $mmaModData.getEntry(data.id, entryId);
+                return $mmaModDataHelper.getEntry(data, entryId, offlineActions);
             });
         }).then(function(entry) {
             entry = entry.entry;
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 84b84d359c2..e0c89e45707 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
  * @name $mmaModDataHelper
  */
 .factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q, mmaModDataComponent, $mmFileUploader, $mmSite,
-        $mmaModDataOffline, $mmFS, $mmFileUploaderHelper) {
+        $mmaModDataOffline, $mmFS, $mmFileUploaderHelper, $mmSitesManager) {
 
     var self = {
             searchOther: {
@@ -660,6 +660,48 @@ angular.module('mm.addons.mod_data')
         });
     };
 
+    /**
+     * Get an online or offline entry.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataHelper#getEntry
+     * @param  {Object} data             Database.
+     * @param  {Number} entryId          Entry ID.
+     * @param  {Object} [offlineActions] Offline data with the actions done. Required for offline entries.
+     * @param  {String} [siteId]         Site ID. If not defined, current site.
+     * @return {Promise}                 Promise resolved with the entry.
+     */
+    self.getEntry = function(data, entryId, offlineActions, siteId) {
+        if (entryId > 0) {
+            // It's an online entry, get it from WS.
+            return $mmaModData.getEntry(data.id, entryId, siteId);
+        }
+
+        // It's an offline entry, search it in the offline actions.
+        return $mmSitesManager.getSite(siteId).then(function(site) {
+            for (var x in offlineActions) {
+                if (offlineActions[x].action == 'add') {
+                    var offlineEntry = offlineActions[x],
+                        siteInfo = site.getInfo(),
+                        entryData = {
+                            id: offlineEntry.entryid,
+                            canmanageentry: true,
+                            approved: !data.approval || data.manageapproved,
+                            dataid: offlineEntry.dataid,
+                            groupid: offlineEntry.groupid,
+                            timecreated: -offlineEntry.entryid,
+                            timemodified: -offlineEntry.entryid,
+                            userid: siteInfo.userid,
+                            fullname: siteInfo.fullname,
+                            contents: {}
+                        };
+
+                    return {entry: entryData};
+                }
+            }
+        });
+    };
 
     return self;
 });

From 99a47b87b69cedc9ff55dbaa65624e1b0670b7d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jul 2017 08:13:15 -0400
Subject: [PATCH 099/118] MOBILE-2178 database: Case insensitive match
 replacing action templates

---
 www/addons/mod/data/services/helper.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index e0c89e45707..437cc323324 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -55,7 +55,7 @@ angular.module('mm.addons.mod_data')
         angular.forEach(fields, function(field) {
             replace = "[[" + field.name + "]]";
             replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-            replace = new RegExp(replace, 'g');
+            replace = new RegExp(replace, 'gi');
 
             // Replace field by a generic directive.
             render = '<mma-mod-data-field mode="'+mode+'" field="fields['+ field.id + ']" value="entries['+ entryId +'].contents['+ field.id + ']" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
@@ -63,7 +63,7 @@ angular.module('mm.addons.mod_data')
         });
 
         angular.forEach(actions, function(enabled, action) {
-            replace = new RegExp("##" + action + "##", 'g');
+            replace = new RegExp("##" + action + "##", 'gi');
             if (enabled) {
                 if (action == "moreurl") {
                     // Render more url directly because it can be part of an HTML attribute.
@@ -196,7 +196,7 @@ angular.module('mm.addons.mod_data')
         angular.forEach(fields, function(field) {
             replace = "[[" + field.name + "]]";
             replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-            replace = new RegExp(replace, 'g');
+            replace = new RegExp(replace, 'gi');
 
             // Replace field by a generic directive.
             var render = '<mma-mod-data-field mode="search" field="fields['+ field.id + ']"></mma-mod-data-field>';
@@ -205,7 +205,7 @@ angular.module('mm.addons.mod_data')
 
         // Not pluginable other search elements.
         angular.forEach(self.searchOther, function(field, name) {
-            replace = new RegExp("##" + field + "##", 'g');
+            replace = new RegExp("##" + field + "##", 'gi');
 
             // Replace field by the text input.
             var render = '<input type="text" name="' + name + '" placeholder="{{ \'mma.mod_data.author' + field + '\' | translate }}">';
@@ -315,7 +315,7 @@ angular.module('mm.addons.mod_data')
         angular.forEach(fields, function(field) {
             replace = "[[" + field.name + "]]";
             replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-            replace = new RegExp(replace, 'g');
+            replace = new RegExp(replace, 'gi');
 
             // Replace field by a generic directive.
             var render = '<mma-mod-data-field mode="edit" field="fields['+ field.id + ']" value="entry.contents['+ field.id + ']" database="data" error="errors['+ field.id + ']"></mma-mod-data-field>';
@@ -324,7 +324,7 @@ angular.module('mm.addons.mod_data')
             // Replace the field id tag.
             replace = "[[" + field.name + "#id]]";
             replace = replace.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-            replace = new RegExp(replace, 'g');
+            replace = new RegExp(replace, 'gi');
 
             template = template.replace(replace, 'field_'+ field.id);
         });

From 754ba55dbebcb77d4aeb3c6dca44937326632157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jul 2017 08:23:17 -0400
Subject: [PATCH 100/118] MOBILE-2178 database: Fix url field type on show mode

---
 www/addons/mod/data/fields/url/template.html | 2 +-
 www/addons/mod/data/scss/styles.scss         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/data/fields/url/template.html b/www/addons/mod/data/fields/url/template.html
index e313e99289b..a49c0438d7b 100644
--- a/www/addons/mod/data/fields/url/template.html
+++ b/www/addons/mod/data/fields/url/template.html
@@ -1,3 +1,3 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <input ng-if="mode != 'show'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
-<mm-format-text ng-if="mode == 'show'" watch="true"><a ng-href="text">{{text}}</a></mm-format-text>
\ No newline at end of file
+<a ng-if="mode == 'show'" ng-href="{{text}}">{{field.name}}</a>
\ No newline at end of file
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index bad4851771e..a45596daa7d 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -103,6 +103,7 @@
     width: 100%;
     margin: -1px;
     border: 1px solid $gray;
+    overflow: hidden;
   }
 
   .item-checkbox {

From 4dbd06a7400fd421ac2464e443d8be1b6962cf63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jul 2017 08:52:50 -0400
Subject: [PATCH 101/118]  MOBILE-2178 formattext: Get video data from
 data-setup-lazy attribute

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

diff --git a/www/core/directives/formattext.js b/www/core/directives/formattext.js
index 4c43b72edc3..9e1556e1f97 100644
--- a/www/core/directives/formattext.js
+++ b/www/core/directives/formattext.js
@@ -342,7 +342,7 @@ angular.module('mm.core')
             return;
         }
 
-        var data = JSON.parse(el.getAttribute('data-setup') || '{}'),
+        var data = JSON.parse(el.getAttribute('data-setup') || el.getAttribute('data-setup-lazy') || '{}'),
             youtubeId = data.techOrder && data.techOrder[0] && data.techOrder[0] == 'youtube' && data.sources && data.sources[0] &&
                 data.sources[0].src && youtubeGetId(data.sources[0].src);
 

From c9949839ec2afc7a5872dd6e853817b0d214ce64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Thu, 27 Jul 2017 09:06:38 -0400
Subject: [PATCH 102/118] MOBILE-2178 database: Do not allow to edit a deleted
 offline entry

---
 www/addons/mod/data/services/helper.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 437cc323324..8fe80e34b4f 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -101,10 +101,10 @@ angular.module('mm.addons.mod_data')
         replacements.timeadded = true;
         replacements.timemodified = true;
 
-        replacements.edit = record.canmanageentry; // This already checks capabilities and readonly period.
-        replacements.delete = replacements.edit;
-        replacements.approve = database.approval && accessInfo.canapprove && !record.approved;
-        replacements.disapprove = database.approval && accessInfo.canapprove && record.approved;
+        replacements.edit = record.canmanageentry && !record.deleted; // This already checks capabilities and readonly period.
+        replacements.delete = record.canmanageentry;
+        replacements.approve = database.approval && accessInfo.canapprove && !record.approved && !record.deleted;
+        replacements.disapprove = database.approval && accessInfo.canapprove && record.approved && !record.deleted;
 
         replacements.approvalstatus = database.approval;
         replacements.comments = database.comments;

From 57fec3f3d6d5fec62641bc30c4156b03c63837c7 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jul 2017 13:02:56 +0200
Subject: [PATCH 103/118] MOBILE-2178 database: Update fields data when PTR

---
 .../mod/data/fields/checkbox/directive.js     |  7 +-
 .../mod/data/fields/checkbox/template.html    |  2 +-
 www/addons/mod/data/fields/date/directive.js  |  7 +-
 www/addons/mod/data/fields/date/template.html |  2 +-
 www/addons/mod/data/fields/file/directive.js  | 33 +++++--
 .../mod/data/fields/latlong/directive.js      | 38 +++++----
 .../mod/data/fields/latlong/template.html     |  4 +-
 www/addons/mod/data/fields/menu/directive.js  |  1 -
 www/addons/mod/data/fields/menu/template.html |  2 +-
 .../mod/data/fields/multimenu/directive.js    |  7 +-
 .../mod/data/fields/multimenu/template.html   |  2 +-
 .../mod/data/fields/number/directive.js       |  4 -
 .../mod/data/fields/number/template.html      |  2 +-
 .../mod/data/fields/picture/directive.js      | 85 ++++++++++++-------
 .../mod/data/fields/radiobutton/directive.js  |  1 -
 .../mod/data/fields/radiobutton/template.html |  2 +-
 www/addons/mod/data/fields/text/directive.js  |  4 -
 www/addons/mod/data/fields/text/template.html |  2 +-
 .../mod/data/fields/textarea/directive.js     | 27 +++---
 .../mod/data/fields/textarea/template.html    |  2 +-
 www/addons/mod/data/fields/url/directive.js   |  4 -
 www/addons/mod/data/fields/url/template.html  |  2 +-
 22 files changed, 142 insertions(+), 98 deletions(-)

diff --git a/www/addons/mod/data/fields/checkbox/directive.js b/www/addons/mod/data/fields/checkbox/directive.js
index 9615d28647c..16e95b2ca4e 100644
--- a/www/addons/mod/data/fields/checkbox/directive.js
+++ b/www/addons/mod/data/fields/checkbox/directive.js
@@ -14,6 +14,12 @@
 
 angular.module('mm.addons.mod_data')
 
+.filter('mmaModDataFieldCheckboxFormat', function() {
+    return function(text) {
+        return text.split("##").join("<br>");
+    };
+})
+
 /**
  * Directive to render data checkbox field.
  *
@@ -29,7 +35,6 @@ angular.module('mm.addons.mod_data')
         link: function(scope) {
             scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
             if (scope.mode == 'show') {
-                scope.text = scope.value && scope.value.content ? scope.value.content.split("##").join("<br>") : "";
                 return;
             }
 
diff --git a/www/addons/mod/data/fields/checkbox/template.html b/www/addons/mod/data/fields/checkbox/template.html
index 04ab7849e15..82c3ac440c3 100644
--- a/www/addons/mod/data/fields/checkbox/template.html
+++ b/www/addons/mod/data/fields/checkbox/template.html
@@ -4,4 +4,4 @@
     <ion-checkbox ng-repeat="option in options" name="f_{{field.id}}" ng-value="option" ng-model="values[option]">{{ option }}</ion-checkbox>
     <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
 </ion-list>
-<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
+<mm-format-text ng-if="mode == 'show' && value && value.content" watch="true">{{ value.content | mmaModDataFieldCheckboxFormat }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/date/directive.js b/www/addons/mod/data/fields/date/directive.js
index 859ed4c1064..9626c53b9f0 100644
--- a/www/addons/mod/data/fields/date/directive.js
+++ b/www/addons/mod/data/fields/date/directive.js
@@ -14,6 +14,12 @@
 
 angular.module('mm.addons.mod_data')
 
+.filter('mmaModDataFieldDateFormat', function() {
+    return function(text) {
+        return text * 1000;
+    };
+})
+
 /**
  * Directive to render data date field.
  *
@@ -29,7 +35,6 @@ angular.module('mm.addons.mod_data')
         link: function(scope) {
             scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
             if (scope.mode == 'show') {
-                scope.text = scope.value ? scope.value.content * 1000 : "";
                 return;
             }
 
diff --git a/www/addons/mod/data/fields/date/template.html b/www/addons/mod/data/fields/date/template.html
index e9bac5373f2..783d1fc842b 100644
--- a/www/addons/mod/data/fields/date/template.html
+++ b/www/addons/mod/data/fields/date/template.html
@@ -2,4 +2,4 @@
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input ng-if="mode != 'show'" type="date" placeholder="{{ 'mm.core.date' | translate }}" name="f_{{field.id}}" ng-disabled="!enable && mode == 'search'" ng-model="val"> <!-- Use ng-model because iOS doesn't seem to like ng-value. -->
 <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_z" ng-model="enable" ng-value="1">{{ 'mma.mod_data.usedate' | translate }}</ion-checkbox>
-<mm-format-text ng-if="mode == 'show'" watch="true">{{ text | mmFormatDate:"dfdaymonthyear" }}</mm-format-text>
\ No newline at end of file
+<mm-format-text ng-if="mode == 'show' && value && value.content" watch="true">{{ value.content | mmaModDataFieldDateFormat | mmFormatDate:"dfdaymonthyear" }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/file/directive.js b/www/addons/mod/data/fields/file/directive.js
index 149b59fcce7..238d362ce52 100644
--- a/www/addons/mod/data/fields/file/directive.js
+++ b/www/addons/mod/data/fields/file/directive.js
@@ -22,6 +22,24 @@ angular.module('mm.addons.mod_data')
  * @name mmaModDataFieldFile
  */
 .directive('mmaModDataFieldFile', function($mmFileSession, mmaModDataComponent) {
+
+    /**
+     * Get the files from the input value.
+     *
+     * @param  {Object} value Input value.
+     * @return {Object[]}     List of files.
+     */
+    function getFiles(value) {
+        var files = (value && value.files) || [];
+
+        // Reduce to first element.
+        if (files.length > 0) {
+            files = [files[0]];
+        }
+
+        return files;
+    }
+
     return {
         restrict: 'A',
         priority: 100,
@@ -32,14 +50,15 @@ angular.module('mm.addons.mod_data')
                 scope.component = mmaModDataComponent;
                 scope.componentId = scope.database.coursemodule;
 
-                scope.files = (scope.value && scope.value.files) || [];
-
-                // Reduce to first element.
-                if (scope.files.length > 0) {
-                    scope.files = [scope.files[0]];
-                }
+                if (scope.mode == 'show') {
+                    // Displaying the list of files, watch the value to update the list if it changes.
+                    scope.$watch('value', function(newValue) {
+                        scope.files = getFiles(newValue);
+                    });
+                } else {
+                    // Edit mode, the list shouldn't change so there is no need to watch it.
+                    scope.files = getFiles(scope.value);
 
-                if (scope.mode == 'edit') {
                     scope.maxSizeBytes = parseInt(scope.field.param3, 10);
                     $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
                 }
diff --git a/www/addons/mod/data/fields/latlong/directive.js b/www/addons/mod/data/fields/latlong/directive.js
index 0f214ac81d0..9d3bf66b413 100644
--- a/www/addons/mod/data/fields/latlong/directive.js
+++ b/www/addons/mod/data/fields/latlong/directive.js
@@ -14,6 +14,25 @@
 
 angular.module('mm.addons.mod_data')
 
+.filter('mmaModDataFieldLatLongFormat', function() {
+    return function(value) {
+        var north = (value && parseFloat(value.content)) || "",
+            east = (value && parseFloat(value.content1)) || "";
+
+        if (north !== '' || east !== '') {
+            north = north ? north.toFixed(4) : '0.0000';
+            east = east ? east.toFixed(4) : '0.0000';
+
+            var latitude = north < 0 ? -north + '°S' : north + '°N',
+                longitude = east < 0 ? -east + '°W' : east + '°E',
+                link = ionic.Platform.isAndroid() ? 'geo:' + north + ',' + east :
+                            'http://maps.apple.com/?ll=' + north + ',' + east + '&near=' + north + ',' + east;
+
+            return '<a href="' + link + '">' + latitude + ' ' + longitude + '</a>';
+        }
+    };
+})
+
 /**
  * Directive to render data latlong field.
  *
@@ -29,22 +48,9 @@ angular.module('mm.addons.mod_data')
         link: function(scope) {
             scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
             if (scope.value) {
-                scope.north = (scope.value && parseFloat(scope.value.content)) || "";
-                scope.east = (scope.value && parseFloat(scope.value.content1)) || "";
-
-                if (scope.mode == 'show') {
-                    if (scope.north != "" || scope.east != "") {
-                        scope.north = scope.north ? parseFloat(scope.north).toFixed(4) : '0.0000';
-                        scope.east = scope.east ? parseFloat(scope.east).toFixed(4) : '0.0000';
-                        scope.latitude = scope.north < 0 ? -scope.north + '°S' : scope.north + '°N';
-                        scope.longitude = scope.east < 0 ? -scope.east + '°W' : scope.east + '°E';
-
-                        if (ionic.Platform.isIOS()) {
-                            scope.link = "http://maps.apple.com/?ll=" + scope.north + "," + scope.east + "&near=" + scope.north + "," + scope.east;
-                        } else {
-                            scope.link = "geo:"+scope.north+","+scope.east;
-                        }
-                    }
+                if (scope.mode == 'edit') {
+                    scope.north = (scope.value && parseFloat(scope.value.content)) || "";
+                    scope.east = (scope.value && parseFloat(scope.value.content1)) || "";
                 }
             }
         }
diff --git a/www/addons/mod/data/fields/latlong/template.html b/www/addons/mod/data/fields/latlong/template.html
index 545ed0137b5..5f0383efcde 100644
--- a/www/addons/mod/data/fields/latlong/template.html
+++ b/www/addons/mod/data/fields/latlong/template.html
@@ -10,6 +10,4 @@
     <span class="placeholder-icon">°E</span>
 </label>
 
-<a ng-href="{{link}}" ng-if="mode == 'show' && latitude">
-    {{latitude}} {{longitude}}
-</label>
+<span ng-if="mode == 'show' && value" ng-bind-html="value | mmaModDataFieldLatLongFormat"></span>
diff --git a/www/addons/mod/data/fields/menu/directive.js b/www/addons/mod/data/fields/menu/directive.js
index fb046e29fa4..d4d6bcbbd4d 100644
--- a/www/addons/mod/data/fields/menu/directive.js
+++ b/www/addons/mod/data/fields/menu/directive.js
@@ -29,7 +29,6 @@ angular.module('mm.addons.mod_data')
         link: function(scope) {
             scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
             if (scope.mode == 'show') {
-                scope.text = scope.value ? scope.value.content : "";
                 return;
             }
 
diff --git a/www/addons/mod/data/fields/menu/template.html b/www/addons/mod/data/fields/menu/template.html
index 38a0de74239..0966a1b3f34 100644
--- a/www/addons/mod/data/fields/menu/template.html
+++ b/www/addons/mod/data/fields/menu/template.html
@@ -6,4 +6,4 @@
         <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
     </select>
 </div>
-<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
+<mm-format-text ng-if="mode == 'show' && value && value.content" watch="true">{{ value.content }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/multimenu/directive.js b/www/addons/mod/data/fields/multimenu/directive.js
index 2c03ba665bb..612b71d7f7b 100644
--- a/www/addons/mod/data/fields/multimenu/directive.js
+++ b/www/addons/mod/data/fields/multimenu/directive.js
@@ -14,6 +14,12 @@
 
 angular.module('mm.addons.mod_data')
 
+.filter('mmaModDataFieldMultimenuFormat', function() {
+    return function(text) {
+        return text.split("##").join("<br>");
+    };
+})
+
 /**
  * Directive to render data multimenu field.
  *
@@ -29,7 +35,6 @@ angular.module('mm.addons.mod_data')
         link: function(scope) {
             scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
             if (scope.mode == 'show') {
-                scope.text = scope.value && scope.value.content ? scope.value.content.split("##").join("<br>") : "";
                 return;
             }
 
diff --git a/www/addons/mod/data/fields/multimenu/template.html b/www/addons/mod/data/fields/multimenu/template.html
index d5ff2a43fb2..bae95d7a2ce 100644
--- a/www/addons/mod/data/fields/multimenu/template.html
+++ b/www/addons/mod/data/fields/multimenu/template.html
@@ -2,4 +2,4 @@
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <mm-multiple-select ng-if="mode != 'show'" title="{{field.name}}" name="f_{{field.id}}" options="options"></mm-multiple-select>
 <ion-checkbox ng-if="mode == 'search'" name="f_{{field.id}}_allreq" ng-value="1">{{ 'mma.mod_data.selectedrequired' | translate }}</ion-checkbox>
-<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
+<mm-format-text ng-if="mode == 'show' && value && value.content" watch="true">{{ value.content | mmaModDataFieldMultimenuFormat }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/number/directive.js b/www/addons/mod/data/fields/number/directive.js
index 7b0708dc79a..b3dcb81413d 100644
--- a/www/addons/mod/data/fields/number/directive.js
+++ b/www/addons/mod/data/fields/number/directive.js
@@ -28,10 +28,6 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/number/template.html',
         link: function(scope) {
             scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
-            if (scope.mode == 'show') {
-                scope.text = scope.value ? scope.value.content : "";
-                return;
-            }
 
             if (scope.mode == 'edit' && scope.value) {
                 scope.val = scope.value && parseFloat(scope.value.content);
diff --git a/www/addons/mod/data/fields/number/template.html b/www/addons/mod/data/fields/number/template.html
index ee80050dfb6..4f1dd5780ab 100644
--- a/www/addons/mod/data/fields/number/template.html
+++ b/www/addons/mod/data/fields/number/template.html
@@ -1,4 +1,4 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input ng-if="mode != 'show'" type="number" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
-<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
+<mm-format-text ng-if="mode == 'show' && value && value.content" watch="true">{{ value.content }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/picture/directive.js b/www/addons/mod/data/fields/picture/directive.js
index 7c81317bfa2..cf5a0419f5b 100644
--- a/www/addons/mod/data/fields/picture/directive.js
+++ b/www/addons/mod/data/fields/picture/directive.js
@@ -33,49 +33,68 @@ angular.module('mm.addons.mod_data')
         return false;
     }
 
+    /**
+     * Given an input value, extract the image files and all the required data.
+     *
+     * @param  {Object} scope Directive's scope.
+     * @param  {Object} value Field value.
+     * @return {Void}
+     */
+    function treatFiles(scope, value) {
+        var files = value && value.files || [];
+
+        // Get image or thumb.
+        if (files.length > 0) {
+            var filenameSeek = scope.mode == 'list' ? 'thumb_' + value.content : value.content;
+            scope.image = findFile(files, filenameSeek);
+
+            if (!scope.image && scope.mode == 'list') {
+                scope.image = findFile(files, value.content);
+            }
+
+            scope.files = [scope.image];
+        } else {
+            scope.image = false;
+            scope.files = [];
+        }
+
+        if (scope.mode == 'edit') {
+            scope.maxSizeBytes = parseInt(scope.field.param3, 10);
+            $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
+            scope.alttext = (value && value.content1) || "";
+        } else {
+            scope.entryId = (value && value.recordid) || false;
+            scope.title = (value && value.content1) || "";
+            scope.imageUrl = false;
+            if (scope.image) {
+                if (scope.image.offline) {
+                    scope.imageUrl = (scope.image && scope.image.toURL()) || false;
+                } else {
+                    scope.imageUrl = (scope.image && scope.image.fileurl) || false;
+                }
+            }
+            scope.width  = scope.field.param1 || "";
+            scope.height = scope.field.param2 || "";
+        }
+    }
+
     return {
         restrict: 'A',
         priority: 100,
         templateUrl: 'addons/mod/data/fields/picture/template.html',
         link: function(scope) {
             if (scope.mode != 'search') {
-                var files = scope.value && scope.value.files || [];
-
                 scope.component = mmaModDataComponent;
                 scope.componentId = scope.database.coursemodule;
 
-                // Get image or thumb.
-                if (files.length > 0) {
-                    var filenameSeek = scope.mode == 'list' ? 'thumb_' + scope.value.content : scope.value.content;
-                    scope.image = findFile(files, filenameSeek);
-
-                    if (!scope.image && scope.mode == 'list') {
-                        scope.image = findFile(files, scope.value.content);
-                    }
-
-                    scope.files = [scope.image];
-                } else {
-                    scope.image = false;
-                    scope.files = [];
-                }
-
-                if (scope.mode == 'edit') {
-                    scope.maxSizeBytes = parseInt(scope.field.param3, 10);
-                    $mmFileSession.setFiles(mmaModDataComponent, scope.database.id + '_' + scope.field.id, scope.files);
-                    scope.alttext = (scope.value && scope.value.content1) || "";
+                if (scope.mode == 'show') {
+                    // Displaying the list of files, watch the value to update the list if it changes.
+                    scope.$watch('value', function(newValue) {
+                        treatFiles(scope, newValue);
+                    });
                 } else {
-                    scope.entryId = (scope.value && scope.value.recordid) || false;
-                    scope.title = (scope.value && scope.value.content1) || "";
-                    scope.imageUrl = false;
-                    if (scope.image) {
-                        if (scope.image.offline) {
-                            scope.imageUrl = (scope.image && scope.image.toURL()) || false;
-                        } else {
-                            scope.imageUrl = (scope.image && scope.image.fileurl) || false;
-                        }
-                    }
-                    scope.width  = scope.field.param1 || "";
-                    scope.height = scope.field.param2 || "";
+                    // Edit mode, the list shouldn't change so there is no need to watch it.
+                    treatFiles(scope, scope.value);
                 }
             }
         }
diff --git a/www/addons/mod/data/fields/radiobutton/directive.js b/www/addons/mod/data/fields/radiobutton/directive.js
index 4d33daace68..86eaf2bd78f 100644
--- a/www/addons/mod/data/fields/radiobutton/directive.js
+++ b/www/addons/mod/data/fields/radiobutton/directive.js
@@ -29,7 +29,6 @@ angular.module('mm.addons.mod_data')
         link: function(scope) {
             scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
             if (scope.mode == 'show') {
-                scope.text = scope.value ? scope.value.content : "";
                 return;
             }
 
diff --git a/www/addons/mod/data/fields/radiobutton/template.html b/www/addons/mod/data/fields/radiobutton/template.html
index 38a0de74239..0966a1b3f34 100644
--- a/www/addons/mod/data/fields/radiobutton/template.html
+++ b/www/addons/mod/data/fields/radiobutton/template.html
@@ -6,4 +6,4 @@
         <option ng-repeat="option in options" value="{{option}}">{{ option }}</option>
     </select>
 </div>
-<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
+<mm-format-text ng-if="mode == 'show' && value && value.content" watch="true">{{ value.content }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/text/directive.js b/www/addons/mod/data/fields/text/directive.js
index dc6352f4a16..18bdb2c3362 100644
--- a/www/addons/mod/data/fields/text/directive.js
+++ b/www/addons/mod/data/fields/text/directive.js
@@ -28,10 +28,6 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/text/template.html',
         link: function(scope) {
             scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
-            if (scope.mode == 'show') {
-                scope.text = scope.value ? scope.value.content : "";
-                return;
-            }
 
             if (scope.mode == 'edit' && scope.value) {
                 scope.val = scope.value.content;
diff --git a/www/addons/mod/data/fields/text/template.html b/www/addons/mod/data/fields/text/template.html
index 926a77c56c0..3fe5aa19cba 100644
--- a/www/addons/mod/data/fields/text/template.html
+++ b/www/addons/mod/data/fields/text/template.html
@@ -1,4 +1,4 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <span class="assertive mm-data-error" ng-if="error && mode == 'edit'">{{ error }}</span>
 <input ng-if="mode != 'show'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
-<mm-format-text ng-if="mode == 'show'" watch="true">{{ text }}</mm-format-text>
\ No newline at end of file
+<mm-format-text ng-if="mode == 'show' && value && value.content" watch="true">{{ value.content }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/textarea/directive.js b/www/addons/mod/data/fields/textarea/directive.js
index 58edaf071c7..66662e9d2ad 100644
--- a/www/addons/mod/data/fields/textarea/directive.js
+++ b/www/addons/mod/data/fields/textarea/directive.js
@@ -14,6 +14,13 @@
 
 angular.module('mm.addons.mod_data')
 
+.filter('mmaModDataFieldTextareaFormat', function($mmText) {
+    return function(value) {
+        var files = (value && value.files) || [];
+        return value ? $mmText.replacePluginfileUrls(value.content, files) : '';
+    };
+})
+
 /**
  * Directive to render data textarea field.
  *
@@ -21,7 +28,7 @@ angular.module('mm.addons.mod_data')
  * @ngdoc directive
  * @name mmaModDataFieldTextarea
  */
-.directive('mmaModDataFieldTextarea', function($mmUtil, $mmText, mmaModDataComponent) {
+.directive('mmaModDataFieldTextarea', function($mmText, mmaModDataComponent) {
     return {
         restrict: 'A',
         priority: 100,
@@ -31,24 +38,18 @@ angular.module('mm.addons.mod_data')
             if (scope.mode == 'show') {
                 scope.component = mmaModDataComponent;
                 scope.componentId = scope.database.coursemodule;
-
-                var files = (scope.value && scope.value.files) || [];
-
-                scope.text = scope.value ? $mmText.replacePluginfileUrls(scope.value.content, files) : "";
                 return;
             }
 
             // Check if rich text editor is enabled.
             if (scope.mode == 'edit') {
-                $mmUtil.isRichTextEditorEnabled().then(function(enabled) {
-                    var files = (scope.value && scope.value.files) || [],
-                        text = scope.value ? $mmText.replacePluginfileUrls(scope.value.content, files) : "";
+                var files = (scope.value && scope.value.files) || [],
+                    text = scope.value ? $mmText.replacePluginfileUrls(scope.value.content, files) : "";
 
-                    // Get the text.
-                    scope.model = {
-                        text: text
-                    };
-                });
+                // Get the text.
+                scope.model = {
+                    text: text
+                };
 
                 scope.firstRender = function() {
                     if (!scope.value) {
diff --git a/www/addons/mod/data/fields/textarea/template.html b/www/addons/mod/data/fields/textarea/template.html
index f3623b92ab7..4260325d1a6 100644
--- a/www/addons/mod/data/fields/textarea/template.html
+++ b/www/addons/mod/data/fields/textarea/template.html
@@ -4,4 +4,4 @@
 <div ng-if="mode == 'edit'" class="item item-text-wrap mm-item-has-rich-text-editor">
     <mm-rich-text-editor model="model" placeholder="{{ field.name }}" name="f_{{field.id}}" component="{{component}}" component-id="{{componentId}}" first-render="firstRender()"></mm-rich-text-editor>
 </div>
-<mm-format-text ng-if="mode == 'show'" watch="true" component="{{component}}" component-id="{{componentId}}">{{ text }}</mm-format-text>
\ No newline at end of file
+<mm-format-text ng-if="mode == 'show' && value" watch="true" component="{{component}}" component-id="{{componentId}}">{{ value | mmaModDataFieldTextareaFormat }}</mm-format-text>
\ No newline at end of file
diff --git a/www/addons/mod/data/fields/url/directive.js b/www/addons/mod/data/fields/url/directive.js
index e621cbe2e3f..5306dbd9904 100644
--- a/www/addons/mod/data/fields/url/directive.js
+++ b/www/addons/mod/data/fields/url/directive.js
@@ -28,10 +28,6 @@ angular.module('mm.addons.mod_data')
         templateUrl: 'addons/mod/data/fields/url/template.html',
         link: function(scope) {
             scope.mode = scope.mode == 'list' ? 'show' : scope.mode;
-            if (scope.mode == 'show') {
-                scope.text = scope.value ? scope.value.content : "";
-                return;
-            }
 
             if (scope.mode == 'edit' && scope.value) {
                 scope.val = scope.value.content;
diff --git a/www/addons/mod/data/fields/url/template.html b/www/addons/mod/data/fields/url/template.html
index a49c0438d7b..1a97133288e 100644
--- a/www/addons/mod/data/fields/url/template.html
+++ b/www/addons/mod/data/fields/url/template.html
@@ -1,3 +1,3 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <input ng-if="mode != 'show'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
-<a ng-if="mode == 'show'" ng-href="{{text}}">{{field.name}}</a>
\ No newline at end of file
+<a ng-if="mode == 'show' && value && value.content" ng-href="{{value.content}}">{{field.name}}</a>

From c698bd67f06a3c00f71780419797ace843b163b1 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jul 2017 13:21:46 +0200
Subject: [PATCH 104/118] MOBILE-2178 database: Allow editing offline entries
 in offline

---
 www/addons/mod/data/services/data.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index c2de10b9f0f..5454e64c275 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -680,7 +680,11 @@ angular.module('mm.addons.mod_data')
         }).then(function() {
             if (justAdded) {
                 // The field was added offline, add again and stop.
-                return self.addEntry(dataId, entryId, courseId, contents, groupId, fields, siteId, forceOffline);
+                return self.addEntry(dataId, entryId, courseId, contents, groupId, fields, siteId, forceOffline)
+                        .then(function(result) {
+                    result.updated = true;
+                    return result;
+                });
             }
 
             if (!$mmApp.isOnline() || forceOffline) {

From 7f34948e0ed5ed6deae669c305fc9e54c78f1dde Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Thu, 27 Jul 2017 15:38:15 +0200
Subject: [PATCH 105/118] MOBILE-2178 database: Fix sync errors and autom sync
 detection

---
 www/addons/mod/data/controllers/entry.js     |  6 ++--
 www/addons/mod/data/controllers/index.js     |  2 +-
 www/addons/mod/data/services/data_offline.js | 23 +++++++++++++-
 www/addons/mod/data/services/data_sync.js    | 33 +++++++++++---------
 4 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index 82731060624..be4b8fdea49 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -214,13 +214,15 @@ angular.module('mm.addons.mod_data')
 
     // Refresh entry on sync.
     syncObserver = $mmEvents.on(mmaModDataEventAutomSynced, function(eventData) {
-        if (eventData.entryid == entryId && data.id == eventData.dataid && $mmSite.getId() == eventData.siteid) {
+        if ((eventData.entryid == entryId || eventData.offlineentryid == entryId) && data.id == eventData.dataid &&
+                $mmSite.getId() == eventData.siteid) {
             if (eventData.deleted) {
                 // If deleted, go back.
                 $ionicHistory.goBack();
             } else {
+                entryId = eventData.entryid;
                 $scope.databaseLoaded = false;
-                return fetchEntryData(true);
+                fetchEntryData(true);
             }
         }
     });
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index d131c30e69e..168499440ce 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -439,7 +439,7 @@ angular.module('mm.addons.mod_data')
         // Update just when all database is synced.
         if (data.id == eventData.dataid && siteId == eventData.siteid && typeof eventData.entryid == "undefined") {
             $scope.databaseLoaded = false;
-            return fetchDatabaseData(true);
+            fetchDatabaseData(true);
         }
     });
 
diff --git a/www/addons/mod/data/services/data_offline.js b/www/addons/mod/data/services/data_offline.js
index 4cab769cdf0..916a46ae8cc 100644
--- a/www/addons/mod/data/services/data_offline.js
+++ b/www/addons/mod/data/services/data_offline.js
@@ -62,6 +62,27 @@ angular.module('mm.addons.mod_data')
 
     var self = {};
 
+    /**
+     * Delete all the actions of an entry.
+     *
+     * @module mm.addons.mod_data
+     * @ngdoc method
+     * @name $mmaModDataOffline#deleteAllEntryActions
+     * @param  {Number} dataId   Database ID.
+     * @param  {Number} entryId  Database entry ID.
+     * @param  {String} [siteId] Site ID. If not defined, current site.
+     * @return {Promise}         Promise resolved if deleted, rejected if failure.
+     */
+    self.deleteAllEntryActions = function(dataId, entryId, siteId) {
+        return self.getEntryActions(dataId, entryId, siteId).then(function(actions) {
+            var promises = [];
+            angular.forEach(actions, function(action) {
+                promises.push(self.deleteEntry(dataId, entryId, action.action, siteId));
+            });
+            return $q.all(promises);
+        });
+    };
+
     /**
      * Delete an stored entry.
      *
@@ -122,7 +143,7 @@ angular.module('mm.addons.mod_data')
      * @param  {Number} dataId      Database ID.
      * @param  {String} entryId     Database entry Id.
      * @param  {String} [siteId]    Site ID. If not defined, current site.
-     * @return {Promise}            Promise resolved with entry.
+     * @return {Promise}            Promise resolved with entry actions.
      */
     self.getEntryActions = function(dataId, entryId, siteId) {
         return $mmSitesManager.getSite(siteId).then(function(site) {
diff --git a/www/addons/mod/data/services/data_sync.js b/www/addons/mod/data/services/data_sync.js
index 20300452faa..5618175fa6c 100644
--- a/www/addons/mod/data/services/data_sync.js
+++ b/www/addons/mod/data/services/data_sync.js
@@ -188,7 +188,7 @@ angular.module('mm.addons.mod_data')
                 });
 
                 angular.forEach(offlineEntries, function(entryActions) {
-                    promises.push(syncEntry(data, entryActions, result.warnings, siteId));
+                    promises.push(syncEntry(data, entryActions, result, siteId));
                 });
 
                 return $q.all(promises);
@@ -216,16 +216,17 @@ angular.module('mm.addons.mod_data')
     /**
      * Synchronize an entry.
      *
-     * @param  {Object}   data          Database.
-     * @param  {Object}   entryActions  Entry actions.
-     * @param  {Object[]} warnings      List of warnings.
-     * @param  {String}   [siteId]      Site ID. If not defined, current site.
-     * @return {Promise}                Promise resolved if success, rejected otherwise.
+     * @param  {Object} data          Database.
+     * @param  {Object} entryActions  Entry actions.
+     * @param  {Object} result        Object with the result of the sync.
+     * @param  {String} [siteId]      Site ID. If not defined, current site.
+     * @return {Promise}              Promise resolved if success, rejected otherwise.
      */
-    function syncEntry(data, entryActions, warnings, siteId) {
+    function syncEntry(data, entryActions, result, siteId) {
         var discardError,
             timePromise,
             entryId = 0,
+            offlineId,
             deleted = false,
             promises = [];
 
@@ -237,20 +238,22 @@ angular.module('mm.addons.mod_data')
         entryId = entryActions[0].entryid;
 
         if (entryId > 0) {
-            timePromise = $mmaModData.getEntry(data.id, entryActions[0].entryid, siteId).then(function(entry) {
+            timePromise = $mmaModData.getEntry(data.id, entryId, siteId).then(function(entry) {
                 return entry.entry.timemodified;
             }).catch(function() {
                 return -1;
             });
         } else {
+            offlineId = entryId;
             timePromise = $q.when(0);
         }
 
         return timePromise.then(function(timemodified) {
             if (timemodified < 0 || timemodified >= entryActions[0].timemodified) {
                 // The entry was not found in Moodle or the entry has been modified, discard the action.
+                result.updated = true;
                 discardError = $translate.instant('mma.mod_data.warningsubmissionmodified');
-                return;
+                return $mmaModDataOffline.deleteAllEntryActions(data.id, entryId, siteId);
             }
 
             angular.forEach(entryActions, function(action) {
@@ -310,6 +313,7 @@ angular.module('mm.addons.mod_data')
                     }
                 }).then(function() {
                     // Delete the offline data.
+                    result.updated = true;
                     return $mmaModDataOffline.deleteEntry(action.dataid, action.entryid, action.action, siteId);
                 }));
             });
@@ -323,17 +327,18 @@ angular.module('mm.addons.mod_data')
                     error: discardError
                 });
 
-                if (warnings.indexOf(message) == -1) {
-                    warnings.push(message);
+                if (result.warnings.indexOf(message) == -1) {
+                    result.warnings.push(message);
                 }
             }
 
             // Sync done. Send event.
             $mmEvents.trigger(mmaModDataEventAutomSynced, {
                 siteid: siteId,
-                dataid: action.dataid,
-                entryid: action.entryid,
-                warnings: warnings,
+                dataid: data.id,
+                entryid: entryId,
+                offlineentryid: offlineId,
+                warnings: result.warnings,
                 deleted: deleted
             });
         });

From cf352f71e1dfb1d07fdde33cc3b875857a2dc83f Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Thu, 27 Jul 2017 17:30:17 +0200
Subject: [PATCH 106/118] MOBILE-2178 release: Delete unused old language files

---
 www/addons/calendar/lang/es_mx.json          |  3 ---
 www/addons/calendar/lang/pt_br.json          |  4 ----
 www/addons/calendar/lang/zh_cn.json          |  4 ----
 www/addons/calendar/lang/zh_tw.json          |  3 ---
 www/addons/frontpage/lang/es_mx.json         |  3 ---
 www/addons/frontpage/lang/pt_br.json         |  3 ---
 www/addons/frontpage/lang/zh_cn.json         |  3 ---
 www/addons/frontpage/lang/zh_tw.json         |  3 ---
 www/addons/messages/lang/es_mx.json          | 13 ------------
 www/addons/messages/lang/pt_br.json          | 13 ------------
 www/addons/messages/lang/zh_cn.json          | 13 ------------
 www/addons/messages/lang/zh_tw.json          | 13 ------------
 www/addons/mod/assign/lang/es_mx.json        | 10 ----------
 www/addons/mod/assign/lang/pt_br.json        | 10 ----------
 www/addons/mod/assign/lang/zh_cn.json        | 10 ----------
 www/addons/mod/assign/lang/zh_tw.json        | 10 ----------
 www/addons/mod/book/lang/es_mx.json          |  3 ---
 www/addons/mod/book/lang/pt_br.json          |  3 ---
 www/addons/mod/book/lang/zh_cn.json          |  3 ---
 www/addons/mod/book/lang/zh_tw.json          |  3 ---
 www/addons/mod/chat/lang/es_mx.json          | 13 ------------
 www/addons/mod/chat/lang/pt_br.json          | 13 ------------
 www/addons/mod/chat/lang/zh_cn.json          | 13 ------------
 www/addons/mod/chat/lang/zh_tw.json          | 13 ------------
 www/addons/mod/folder/lang/es_mx.json        |  3 ---
 www/addons/mod/folder/lang/pt_br.json        |  3 ---
 www/addons/mod/folder/lang/zh_cn.json        |  3 ---
 www/addons/mod/folder/lang/zh_tw.json        |  3 ---
 www/addons/mod/forum/lang/es_mx.json         |  1 -
 www/addons/mod/forum/lang/pt_br.json         |  3 ---
 www/addons/mod/forum/lang/zh_cn.json         |  3 ---
 www/addons/mod/forum/lang/zh_tw.json         |  3 ---
 www/addons/mod/imscp/lang/es_mx.json         |  3 ---
 www/addons/mod/imscp/lang/pt_br.json         |  3 ---
 www/addons/mod/imscp/lang/zh_cn.json         |  3 ---
 www/addons/mod/imscp/lang/zh_tw.json         |  3 ---
 www/addons/mod/label/lang/es_mx.json         |  3 ---
 www/addons/mod/label/lang/pt_br.json         |  3 ---
 www/addons/mod/label/lang/zh_cn.json         |  3 ---
 www/addons/mod/label/lang/zh_tw.json         |  3 ---
 www/addons/mod/page/lang/es_mx.json          |  1 -
 www/addons/mod/page/lang/pt_br.json          |  1 -
 www/addons/mod/page/lang/zh_cn.json          |  1 -
 www/addons/mod/page/lang/zh_tw.json          |  1 -
 www/addons/mod/resource/lang/es_mx.json      |  1 -
 www/addons/mod/resource/lang/pt_br.json      |  1 -
 www/addons/mod/resource/lang/zh_cn.json      |  1 -
 www/addons/mod/resource/lang/zh_tw.json      |  1 -
 www/addons/mod/url/lang/es_mx.json           |  1 -
 www/addons/mod/url/lang/pt_br.json           |  1 -
 www/addons/mod/url/lang/zh_cn.json           |  1 -
 www/addons/mod/url/lang/zh_tw.json           |  1 -
 www/addons/notes/lang/es_mx.json             |  9 ---------
 www/addons/notes/lang/pt_br.json             |  9 ---------
 www/addons/notes/lang/zh_cn.json             |  9 ---------
 www/addons/notes/lang/zh_tw.json             |  9 ---------
 www/addons/notifications/lang/es_mx.json     |  4 ----
 www/addons/notifications/lang/pt_br.json     |  4 ----
 www/addons/notifications/lang/zh_cn.json     |  4 ----
 www/addons/notifications/lang/zh_tw.json     |  4 ----
 www/addons/participants/lang/cs.json         |  4 ----
 www/addons/participants/lang/es_mx.json      |  3 ---
 www/addons/participants/lang/it.json         |  4 ----
 www/addons/participants/lang/pt_br.json      |  3 ---
 www/addons/participants/lang/zh_cn.json      |  3 ---
 www/addons/participants/lang/zh_tw.json      |  3 ---
 www/core/components/course/lang/es_mx.json   |  4 ----
 www/core/components/course/lang/pt_br.json   |  4 ----
 www/core/components/course/lang/zh_cn.json   |  4 ----
 www/core/components/course/lang/zh_tw.json   |  4 ----
 www/core/components/courses/lang/es_mx.json  |  5 -----
 www/core/components/courses/lang/pt_br.json  |  5 -----
 www/core/components/courses/lang/zh_cn.json  |  5 -----
 www/core/components/courses/lang/zh_tw.json  |  5 -----
 www/core/components/grades/lang/es_mx.json   | 12 -----------
 www/core/components/grades/lang/pt_br.json   | 13 ------------
 www/core/components/grades/lang/zh_cn.json   | 13 ------------
 www/core/components/grades/lang/zh_tw.json   | 12 -----------
 www/core/components/login/lang/es_mx.json    | 21 --------------------
 www/core/components/login/lang/pt_br.json    | 21 --------------------
 www/core/components/login/lang/zh_cn.json    | 21 --------------------
 www/core/components/login/lang/zh_tw.json    | 21 --------------------
 www/core/components/settings/lang/es_mx.json | 15 --------------
 www/core/components/settings/lang/pt_br.json | 15 --------------
 www/core/components/settings/lang/zh_cn.json | 15 --------------
 www/core/components/settings/lang/zh_tw.json | 15 --------------
 www/core/components/sidemenu/lang/es_mx.json |  6 ------
 www/core/components/sidemenu/lang/pt_br.json |  6 ------
 www/core/components/sidemenu/lang/zh_cn.json |  6 ------
 www/core/components/sidemenu/lang/zh_tw.json |  6 ------
 www/core/components/user/lang/es_mx.json     | 17 ----------------
 www/core/components/user/lang/pt_br.json     | 17 ----------------
 www/core/components/user/lang/zh_cn.json     | 17 ----------------
 www/core/components/user/lang/zh_tw.json     | 17 ----------------
 94 files changed, 634 deletions(-)
 delete mode 100644 www/addons/calendar/lang/es_mx.json
 delete mode 100644 www/addons/calendar/lang/pt_br.json
 delete mode 100644 www/addons/calendar/lang/zh_cn.json
 delete mode 100644 www/addons/calendar/lang/zh_tw.json
 delete mode 100644 www/addons/frontpage/lang/es_mx.json
 delete mode 100644 www/addons/frontpage/lang/pt_br.json
 delete mode 100644 www/addons/frontpage/lang/zh_cn.json
 delete mode 100644 www/addons/frontpage/lang/zh_tw.json
 delete mode 100644 www/addons/messages/lang/es_mx.json
 delete mode 100644 www/addons/messages/lang/pt_br.json
 delete mode 100644 www/addons/messages/lang/zh_cn.json
 delete mode 100644 www/addons/messages/lang/zh_tw.json
 delete mode 100644 www/addons/mod/assign/lang/es_mx.json
 delete mode 100644 www/addons/mod/assign/lang/pt_br.json
 delete mode 100644 www/addons/mod/assign/lang/zh_cn.json
 delete mode 100644 www/addons/mod/assign/lang/zh_tw.json
 delete mode 100644 www/addons/mod/book/lang/es_mx.json
 delete mode 100644 www/addons/mod/book/lang/pt_br.json
 delete mode 100644 www/addons/mod/book/lang/zh_cn.json
 delete mode 100644 www/addons/mod/book/lang/zh_tw.json
 delete mode 100644 www/addons/mod/chat/lang/es_mx.json
 delete mode 100644 www/addons/mod/chat/lang/pt_br.json
 delete mode 100644 www/addons/mod/chat/lang/zh_cn.json
 delete mode 100644 www/addons/mod/chat/lang/zh_tw.json
 delete mode 100644 www/addons/mod/folder/lang/es_mx.json
 delete mode 100644 www/addons/mod/folder/lang/pt_br.json
 delete mode 100644 www/addons/mod/folder/lang/zh_cn.json
 delete mode 100644 www/addons/mod/folder/lang/zh_tw.json
 delete mode 100644 www/addons/mod/forum/lang/es_mx.json
 delete mode 100644 www/addons/mod/forum/lang/pt_br.json
 delete mode 100644 www/addons/mod/forum/lang/zh_cn.json
 delete mode 100644 www/addons/mod/forum/lang/zh_tw.json
 delete mode 100644 www/addons/mod/imscp/lang/es_mx.json
 delete mode 100644 www/addons/mod/imscp/lang/pt_br.json
 delete mode 100644 www/addons/mod/imscp/lang/zh_cn.json
 delete mode 100644 www/addons/mod/imscp/lang/zh_tw.json
 delete mode 100644 www/addons/mod/label/lang/es_mx.json
 delete mode 100644 www/addons/mod/label/lang/pt_br.json
 delete mode 100644 www/addons/mod/label/lang/zh_cn.json
 delete mode 100644 www/addons/mod/label/lang/zh_tw.json
 delete mode 100644 www/addons/mod/page/lang/es_mx.json
 delete mode 100644 www/addons/mod/page/lang/pt_br.json
 delete mode 100644 www/addons/mod/page/lang/zh_cn.json
 delete mode 100644 www/addons/mod/page/lang/zh_tw.json
 delete mode 100644 www/addons/mod/resource/lang/es_mx.json
 delete mode 100644 www/addons/mod/resource/lang/pt_br.json
 delete mode 100644 www/addons/mod/resource/lang/zh_cn.json
 delete mode 100644 www/addons/mod/resource/lang/zh_tw.json
 delete mode 100644 www/addons/mod/url/lang/es_mx.json
 delete mode 100644 www/addons/mod/url/lang/pt_br.json
 delete mode 100644 www/addons/mod/url/lang/zh_cn.json
 delete mode 100644 www/addons/mod/url/lang/zh_tw.json
 delete mode 100644 www/addons/notes/lang/es_mx.json
 delete mode 100644 www/addons/notes/lang/pt_br.json
 delete mode 100644 www/addons/notes/lang/zh_cn.json
 delete mode 100644 www/addons/notes/lang/zh_tw.json
 delete mode 100644 www/addons/notifications/lang/es_mx.json
 delete mode 100644 www/addons/notifications/lang/pt_br.json
 delete mode 100644 www/addons/notifications/lang/zh_cn.json
 delete mode 100644 www/addons/notifications/lang/zh_tw.json
 delete mode 100644 www/addons/participants/lang/cs.json
 delete mode 100644 www/addons/participants/lang/es_mx.json
 delete mode 100644 www/addons/participants/lang/it.json
 delete mode 100644 www/addons/participants/lang/pt_br.json
 delete mode 100644 www/addons/participants/lang/zh_cn.json
 delete mode 100644 www/addons/participants/lang/zh_tw.json
 delete mode 100644 www/core/components/course/lang/es_mx.json
 delete mode 100644 www/core/components/course/lang/pt_br.json
 delete mode 100644 www/core/components/course/lang/zh_cn.json
 delete mode 100644 www/core/components/course/lang/zh_tw.json
 delete mode 100644 www/core/components/courses/lang/es_mx.json
 delete mode 100644 www/core/components/courses/lang/pt_br.json
 delete mode 100644 www/core/components/courses/lang/zh_cn.json
 delete mode 100644 www/core/components/courses/lang/zh_tw.json
 delete mode 100644 www/core/components/grades/lang/es_mx.json
 delete mode 100644 www/core/components/grades/lang/pt_br.json
 delete mode 100644 www/core/components/grades/lang/zh_cn.json
 delete mode 100644 www/core/components/grades/lang/zh_tw.json
 delete mode 100644 www/core/components/login/lang/es_mx.json
 delete mode 100644 www/core/components/login/lang/pt_br.json
 delete mode 100644 www/core/components/login/lang/zh_cn.json
 delete mode 100644 www/core/components/login/lang/zh_tw.json
 delete mode 100644 www/core/components/settings/lang/es_mx.json
 delete mode 100644 www/core/components/settings/lang/pt_br.json
 delete mode 100644 www/core/components/settings/lang/zh_cn.json
 delete mode 100644 www/core/components/settings/lang/zh_tw.json
 delete mode 100644 www/core/components/sidemenu/lang/es_mx.json
 delete mode 100644 www/core/components/sidemenu/lang/pt_br.json
 delete mode 100644 www/core/components/sidemenu/lang/zh_cn.json
 delete mode 100644 www/core/components/sidemenu/lang/zh_tw.json
 delete mode 100644 www/core/components/user/lang/es_mx.json
 delete mode 100644 www/core/components/user/lang/pt_br.json
 delete mode 100644 www/core/components/user/lang/zh_cn.json
 delete mode 100644 www/core/components/user/lang/zh_tw.json

diff --git a/www/addons/calendar/lang/es_mx.json b/www/addons/calendar/lang/es_mx.json
deleted file mode 100644
index 43fb72dee96..00000000000
--- a/www/addons/calendar/lang/es_mx.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "notifications": "Notificaciones"
-}
\ No newline at end of file
diff --git a/www/addons/calendar/lang/pt_br.json b/www/addons/calendar/lang/pt_br.json
deleted file mode 100644
index 3037d7d8cf5..00000000000
--- a/www/addons/calendar/lang/pt_br.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "noevents": "Sem eventos",
-    "notifications": "Notificação"
-}
\ No newline at end of file
diff --git a/www/addons/calendar/lang/zh_cn.json b/www/addons/calendar/lang/zh_cn.json
deleted file mode 100644
index 5fc1088f46f..00000000000
--- a/www/addons/calendar/lang/zh_cn.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "noevents": "没有事件",
-    "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
deleted file mode 100644
index 24e3b1a572b..00000000000
--- a/www/addons/calendar/lang/zh_tw.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "notifications": "通知"
-}
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/es_mx.json b/www/addons/frontpage/lang/es_mx.json
deleted file mode 100644
index 30cd142b296..00000000000
--- a/www/addons/frontpage/lang/es_mx.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "sitehome": "Portada"
-}
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/pt_br.json b/www/addons/frontpage/lang/pt_br.json
deleted file mode 100644
index 107c32efb31..00000000000
--- a/www/addons/frontpage/lang/pt_br.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "sitehome": "Página principal"
-}
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/zh_cn.json b/www/addons/frontpage/lang/zh_cn.json
deleted file mode 100644
index 20eac284d87..00000000000
--- a/www/addons/frontpage/lang/zh_cn.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "sitehome": "首页"
-}
\ No newline at end of file
diff --git a/www/addons/frontpage/lang/zh_tw.json b/www/addons/frontpage/lang/zh_tw.json
deleted file mode 100644
index 6bff0d94024..00000000000
--- a/www/addons/frontpage/lang/zh_tw.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "sitehome": "首頁"
-}
\ No newline at end of file
diff --git a/www/addons/messages/lang/es_mx.json b/www/addons/messages/lang/es_mx.json
deleted file mode 100644
index 8de8efc8eff..00000000000
--- a/www/addons/messages/lang/es_mx.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "addcontact": "Añadir como contacto",
-    "blockcontact": "Bloquear contacto",
-    "contactlistempty": "La lista de contactos está vacía",
-    "contactname": "Nombre del contacto",
-    "contacts": "Contactos",
-    "messages": "mi Messenger",
-    "nomessages": "No hay mensajes en espera",
-    "removecontact": "Eliminar contacto",
-    "send": "Enviar",
-    "sendmessage": "Enviar un mensaje",
-    "unblockcontact": "Desbloquear contacto"
-}
\ No newline at end of file
diff --git a/www/addons/messages/lang/pt_br.json b/www/addons/messages/lang/pt_br.json
deleted file mode 100644
index fb4e3394639..00000000000
--- a/www/addons/messages/lang/pt_br.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "addcontact": "Adicionar como contato",
-    "blockcontact": "Bloquear contato",
-    "contactlistempty": "Lista de contatos vazia",
-    "contactname": "Nome para contato",
-    "contacts": "Contatos",
-    "messages": "Mensagens",
-    "nomessages": "Não há mensagens pendentes",
-    "removecontact": "Remover contato",
-    "send": "Enviar",
-    "sendmessage": "Envie uma mensagem",
-    "unblockcontact": "Desbloquear contato"
-}
\ No newline at end of file
diff --git a/www/addons/messages/lang/zh_cn.json b/www/addons/messages/lang/zh_cn.json
deleted file mode 100644
index 708e5a301b9..00000000000
--- a/www/addons/messages/lang/zh_cn.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "addcontact": "添加为联系人",
-    "blockcontact": "屏蔽联系人",
-    "contactlistempty": "您的联系人名单是空的",
-    "contactname": "联系人",
-    "contacts": "联系人",
-    "messages": "消息",
-    "nomessages": "没有新消息",
-    "removecontact": "删除联系人",
-    "send": "发送",
-    "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
deleted file mode 100644
index b86c20e0f95..00000000000
--- a/www/addons/messages/lang/zh_tw.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "addcontact": "加入通訊錄",
-    "blockcontact": "封鎖聯絡人",
-    "contactlistempty": "您的通訊錄是空的",
-    "contactname": "聯絡人姓名",
-    "contacts": "通訊錄",
-    "messages": "我的簡訊",
-    "nomessages": "沒有待處理的簡訊",
-    "removecontact": "刪除聯絡人",
-    "send": "傳送",
-    "sendmessage": "傳送訊息",
-    "unblockcontact": "不再封鎖聯絡"
-}
\ 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
deleted file mode 100644
index 5e29ef33e38..00000000000
--- a/www/addons/mod/assign/lang/es_mx.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "addsubmission": "Añadir envío",
-    "allowsubmissionsfromdate": "Permitir envíos desde",
-    "attemptnumber": "Número de intento",
-    "cutoffdate": "Fecha de corte",
-    "duedate": "Fecha de entrega",
-    "duedateno": "No hay fecha de entrega",
-    "submissions": "Entregas",
-    "viewsubmission": "Ver entrega"
-}
\ 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
deleted file mode 100644
index ebcaf06b692..00000000000
--- a/www/addons/mod/assign/lang/pt_br.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "addsubmission": "Adicionar tarefa",
-    "allowsubmissionsfromdate": "Permite envios a partir de",
-    "attemptnumber": "Número da tentativa",
-    "cutoffdate": "Data limite",
-    "duedate": "Data de entrega",
-    "duedateno": "Nenhuma data de entrega",
-    "submissions": "Tarefas enviadas",
-    "viewsubmission": "Ver envio"
-}
\ 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
deleted file mode 100644
index 59341a88ccf..00000000000
--- a/www/addons/mod/assign/lang/zh_cn.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "addsubmission": "添加提交",
-    "allowsubmissionsfromdate": "开启时间",
-    "attemptnumber": "作业提交次数",
-    "cutoffdate": "提交截止时间",
-    "duedate": "截止时间",
-    "duedateno": "无截止时间",
-    "submissions": "提交信息",
-    "viewsubmission": "查看提交"
-}
\ 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
deleted file mode 100644
index 16a48d2186a..00000000000
--- a/www/addons/mod/assign/lang/zh_tw.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "addsubmission": "繳交作業",
-    "allowsubmissionsfromdate": "開始繳交時間",
-    "attemptnumber": "作業提交次數",
-    "cutoffdate": "拒收作業時間",
-    "duedate": "規定繳交時間",
-    "duedateno": "沒有規定繳交時間",
-    "submissions": "繳交",
-    "viewsubmission": "檢視繳交的作業"
-}
\ No newline at end of file
diff --git a/www/addons/mod/book/lang/es_mx.json b/www/addons/mod/book/lang/es_mx.json
deleted file mode 100644
index d5d45d924a2..00000000000
--- a/www/addons/mod/book/lang/es_mx.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "errorchapter": "Error al leer capítulo del libro."
-}
\ No newline at end of file
diff --git a/www/addons/mod/book/lang/pt_br.json b/www/addons/mod/book/lang/pt_br.json
deleted file mode 100644
index 4c5835d59ae..00000000000
--- a/www/addons/mod/book/lang/pt_br.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "errorchapter": "Erro ao ler capítulo de livro."
-}
\ No newline at end of file
diff --git a/www/addons/mod/book/lang/zh_cn.json b/www/addons/mod/book/lang/zh_cn.json
deleted file mode 100644
index 52b287ee7da..00000000000
--- a/www/addons/mod/book/lang/zh_cn.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "errorchapter": "读取图书章节发生错误。"
-}
\ No newline at end of file
diff --git a/www/addons/mod/book/lang/zh_tw.json b/www/addons/mod/book/lang/zh_tw.json
deleted file mode 100644
index 32642d09bd0..00000000000
--- a/www/addons/mod/book/lang/zh_tw.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "errorchapter": "讀取章節發生錯誤"
-}
\ 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
deleted file mode 100644
index d3e0fbd4d66..00000000000
--- a/www/addons/mod/chat/lang/es_mx.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "beep": "Bip",
-    "currentusers": "Usuarios",
-    "enterchat": "Entrar a la sala",
-    "entermessage": "Escriba su mensaje",
-    "messagebeepsyou": "{{$a}} le acaba de enviar un beep",
-    "messageenter": "{{$a}} entró a la sala",
-    "messageexit": "{{$a}} salió de la sala",
-    "nomessages": "Aún no hay mensajes",
-    "send": "Enviar",
-    "sessionstart": "La siguiente sesión de chat comenzará en: {{$a}}",
-    "talk": "Charla"
-}
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/pt_br.json b/www/addons/mod/chat/lang/pt_br.json
deleted file mode 100644
index af36af4277c..00000000000
--- a/www/addons/mod/chat/lang/pt_br.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "beep": "Bip",
-    "currentusers": "Usuários atuais",
-    "enterchat": "Clique aqui para entrar no chat agora",
-    "entermessage": "Digite sua mensagem",
-    "messagebeepsyou": "{{$a}} está bipando você!",
-    "messageenter": "{{$a}} entrou no chat",
-    "messageexit": "{{$a}} abandonou este chat",
-    "nomessages": "Nenhuma mensagem ainda",
-    "send": "Enviar",
-    "sessionstart": "A próxima sessão de chat irá começar em {{$a}}",
-    "talk": "Falar"
-}
\ 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
deleted file mode 100644
index b8c1f9af432..00000000000
--- a/www/addons/mod/chat/lang/zh_cn.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "beep": "呼叫",
-    "currentusers": "当前用户",
-    "enterchat": "进入聊天室",
-    "entermessage": "输入您的信息",
-    "messagebeepsyou": "{{$a}}刚刚呼叫您！",
-    "messageenter": "{{$a}}刚刚进入聊天室",
-    "messageexit": "{{$a}}已退出聊天室",
-    "nomessages": "无消息",
-    "send": "发送",
-    "sessionstart": "聊天会话开始时间：{{$a}}",
-    "talk": "交谈"
-}
\ No newline at end of file
diff --git a/www/addons/mod/chat/lang/zh_tw.json b/www/addons/mod/chat/lang/zh_tw.json
deleted file mode 100644
index 511cfbb8352..00000000000
--- a/www/addons/mod/chat/lang/zh_tw.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "beep": "呼叫",
-    "currentusers": "當前用戶",
-    "enterchat": "點選這裡進入聊天室",
-    "entermessage": "輸入您的訊息",
-    "messagebeepsyou": "{{$a}} 呼叫您",
-    "messageenter": "{{$a}} 剛加入這次聊天",
-    "messageexit": "{{$a}} 已退出這次聊天",
-    "nomessages": "尚無訊息",
-    "send": "傳送",
-    "sessionstart": "下一個對話時段將開始於：{{$a}}",
-    "talk": "交談"
-}
\ 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
deleted file mode 100644
index 3a342984727..00000000000
--- a/www/addons/mod/folder/lang/es_mx.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "emptyfilelist": "No hay archivos que mostrar"
-}
\ 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
deleted file mode 100644
index 0821fd73ad7..00000000000
--- a/www/addons/mod/folder/lang/pt_br.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "emptyfilelist": "Não há arquivos para exibir"
-}
\ No newline at end of file
diff --git a/www/addons/mod/folder/lang/zh_cn.json b/www/addons/mod/folder/lang/zh_cn.json
deleted file mode 100644
index edc8a70a528..00000000000
--- a/www/addons/mod/folder/lang/zh_cn.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "emptyfilelist": "没有可显示的文件"
-}
\ 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
deleted file mode 100644
index c53d23b870f..00000000000
--- a/www/addons/mod/folder/lang/zh_tw.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "emptyfilelist": "沒有可以顯示的檔案"
-}
\ 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
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/forum/lang/es_mx.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/pt_br.json b/www/addons/mod/forum/lang/pt_br.json
deleted file mode 100644
index 9f3e79857ff..00000000000
--- a/www/addons/mod/forum/lang/pt_br.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "forumnodiscussionsyet": "Não existem tópicos neste fórum ainda"
-}
\ 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
deleted file mode 100644
index 266cde0a80d..00000000000
--- a/www/addons/mod/forum/lang/zh_cn.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "forumnodiscussionsyet": "此论坛中还没有讨论话题"
-}
\ No newline at end of file
diff --git a/www/addons/mod/forum/lang/zh_tw.json b/www/addons/mod/forum/lang/zh_tw.json
deleted file mode 100644
index 21e18ea567e..00000000000
--- a/www/addons/mod/forum/lang/zh_tw.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "forumnodiscussionsyet": "這個討論區還沒有討論主題"
-}
\ No newline at end of file
diff --git a/www/addons/mod/imscp/lang/es_mx.json b/www/addons/mod/imscp/lang/es_mx.json
deleted file mode 100644
index 175d34d526d..00000000000
--- a/www/addons/mod/imscp/lang/es_mx.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "deploymenterror": "¡Error en paquete de contenidos!"
-}
\ No newline at end of file
diff --git a/www/addons/mod/imscp/lang/pt_br.json b/www/addons/mod/imscp/lang/pt_br.json
deleted file mode 100644
index cb7e6aec6a1..00000000000
--- a/www/addons/mod/imscp/lang/pt_br.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "deploymenterror": "Erro no conte"
-}
\ No newline at end of file
diff --git a/www/addons/mod/imscp/lang/zh_cn.json b/www/addons/mod/imscp/lang/zh_cn.json
deleted file mode 100644
index 29923d4664e..00000000000
--- a/www/addons/mod/imscp/lang/zh_cn.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "deploymenterror": "内容包有错！"
-}
\ No newline at end of file
diff --git a/www/addons/mod/imscp/lang/zh_tw.json b/www/addons/mod/imscp/lang/zh_tw.json
deleted file mode 100644
index f2f35ec5337..00000000000
--- a/www/addons/mod/imscp/lang/zh_tw.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "deploymenterror": "內容包有錯誤！"
-}
\ 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
deleted file mode 100644
index 129eb9e3838..00000000000
--- a/www/addons/mod/label/lang/es_mx.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "label": "Etiqueta"
-}
\ 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
deleted file mode 100644
index fdfc1ff9392..00000000000
--- a/www/addons/mod/label/lang/pt_br.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "label": "Rótulo"
-}
\ No newline at end of file
diff --git a/www/addons/mod/label/lang/zh_cn.json b/www/addons/mod/label/lang/zh_cn.json
deleted file mode 100644
index 4bbc4110d7a..00000000000
--- a/www/addons/mod/label/lang/zh_cn.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "label": "标签"
-}
\ 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
deleted file mode 100644
index c1a016fd047..00000000000
--- a/www/addons/mod/label/lang/zh_tw.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "label": "標籤"
-}
\ No newline at end of file
diff --git a/www/addons/mod/page/lang/es_mx.json b/www/addons/mod/page/lang/es_mx.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/page/lang/es_mx.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/page/lang/pt_br.json b/www/addons/mod/page/lang/pt_br.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/page/lang/pt_br.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/page/lang/zh_cn.json b/www/addons/mod/page/lang/zh_cn.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/page/lang/zh_cn.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/page/lang/zh_tw.json b/www/addons/mod/page/lang/zh_tw.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/page/lang/zh_tw.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/resource/lang/es_mx.json b/www/addons/mod/resource/lang/es_mx.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/resource/lang/es_mx.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/resource/lang/pt_br.json b/www/addons/mod/resource/lang/pt_br.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/resource/lang/pt_br.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/resource/lang/zh_cn.json b/www/addons/mod/resource/lang/zh_cn.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/resource/lang/zh_cn.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/resource/lang/zh_tw.json b/www/addons/mod/resource/lang/zh_tw.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/resource/lang/zh_tw.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/url/lang/es_mx.json b/www/addons/mod/url/lang/es_mx.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/url/lang/es_mx.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/url/lang/pt_br.json b/www/addons/mod/url/lang/pt_br.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/url/lang/pt_br.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/url/lang/zh_cn.json b/www/addons/mod/url/lang/zh_cn.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/url/lang/zh_cn.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/mod/url/lang/zh_tw.json b/www/addons/mod/url/lang/zh_tw.json
deleted file mode 100644
index 0637a088a01..00000000000
--- a/www/addons/mod/url/lang/zh_tw.json
+++ /dev/null
@@ -1 +0,0 @@
-[]
\ No newline at end of file
diff --git a/www/addons/notes/lang/es_mx.json b/www/addons/notes/lang/es_mx.json
deleted file mode 100644
index 0eb20a78105..00000000000
--- a/www/addons/notes/lang/es_mx.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "addnewnote": "Añadir una nota nueva",
-    "coursenotes": "Notas del curso",
-    "eventnotecreated": "Nota creada",
-    "note": "Nota",
-    "personalnotes": "Notas personales",
-    "publishstate": "Contexto",
-    "sitenotes": "Notas del sitio"
-}
\ No newline at end of file
diff --git a/www/addons/notes/lang/pt_br.json b/www/addons/notes/lang/pt_br.json
deleted file mode 100644
index 3d49facd550..00000000000
--- a/www/addons/notes/lang/pt_br.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "addnewnote": "Escrever uma nova anotação",
-    "coursenotes": "Anotações do Curso",
-    "eventnotecreated": "Anotação criada",
-    "note": "Anotação",
-    "personalnotes": "Anotações individuais",
-    "publishstate": "Estado",
-    "sitenotes": "Anotações do site"
-}
\ No newline at end of file
diff --git a/www/addons/notes/lang/zh_cn.json b/www/addons/notes/lang/zh_cn.json
deleted file mode 100644
index 786909fa20c..00000000000
--- a/www/addons/notes/lang/zh_cn.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "addnewnote": "添加新备注",
-    "coursenotes": "课程备注",
-    "eventnotecreated": "创建了笔记",
-    "note": "备注",
-    "personalnotes": "私人备注",
-    "publishstate": "上下文",
-    "sitenotes": "全站备注"
-}
\ No newline at end of file
diff --git a/www/addons/notes/lang/zh_tw.json b/www/addons/notes/lang/zh_tw.json
deleted file mode 100644
index 2b90c1325c7..00000000000
--- a/www/addons/notes/lang/zh_tw.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "addnewnote": "添加一筆新註記",
-    "coursenotes": "課程註記",
-    "eventnotecreated": "已建立註記",
-    "note": "註記",
-    "personalnotes": "個人的註記",
-    "publishstate": "使用的情境",
-    "sitenotes": "網站註記"
-}
\ No newline at end of file
diff --git a/www/addons/notifications/lang/es_mx.json b/www/addons/notifications/lang/es_mx.json
deleted file mode 100644
index 80b4b5e0dbc..00000000000
--- a/www/addons/notifications/lang/es_mx.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "notifications": "Notificaciones",
-    "therearentnotificationsyet": "No hay notificaciones"
-}
\ No newline at end of file
diff --git a/www/addons/notifications/lang/pt_br.json b/www/addons/notifications/lang/pt_br.json
deleted file mode 100644
index 3913f917f41..00000000000
--- a/www/addons/notifications/lang/pt_br.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "notifications": "Notificação",
-    "therearentnotificationsyet": "Não há notificações"
-}
\ No newline at end of file
diff --git a/www/addons/notifications/lang/zh_cn.json b/www/addons/notifications/lang/zh_cn.json
deleted file mode 100644
index 7d236d7f15d..00000000000
--- a/www/addons/notifications/lang/zh_cn.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "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
deleted file mode 100644
index 957a61b5db7..00000000000
--- a/www/addons/notifications/lang/zh_tw.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "notifications": "通知",
-    "therearentnotificationsyet": "沒有通知訊息"
-}
\ No newline at end of file
diff --git a/www/addons/participants/lang/cs.json b/www/addons/participants/lang/cs.json
deleted file mode 100644
index 2092b03a730..00000000000
--- a/www/addons/participants/lang/cs.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "noparticipants": "Pro tento kurz nenalezeni účastníci",
-    "participants": "Účastníci"
-}
\ No newline at end of file
diff --git a/www/addons/participants/lang/es_mx.json b/www/addons/participants/lang/es_mx.json
deleted file mode 100644
index 9ec3327c06d..00000000000
--- a/www/addons/participants/lang/es_mx.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "participants": "Participantes"
-}
\ No newline at end of file
diff --git a/www/addons/participants/lang/it.json b/www/addons/participants/lang/it.json
deleted file mode 100644
index 0d16202be57..00000000000
--- a/www/addons/participants/lang/it.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "noparticipants": "In questo corso non sono stati trovati partecipanti",
-    "participants": "Partecipanti"
-}
\ No newline at end of file
diff --git a/www/addons/participants/lang/pt_br.json b/www/addons/participants/lang/pt_br.json
deleted file mode 100644
index 9ec3327c06d..00000000000
--- a/www/addons/participants/lang/pt_br.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "participants": "Participantes"
-}
\ No newline at end of file
diff --git a/www/addons/participants/lang/zh_cn.json b/www/addons/participants/lang/zh_cn.json
deleted file mode 100644
index 36c81dc05e0..00000000000
--- a/www/addons/participants/lang/zh_cn.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "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
deleted file mode 100644
index 64c7fde824b..00000000000
--- a/www/addons/participants/lang/zh_tw.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "participants": "參與者"
-}
\ 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
deleted file mode 100644
index 174565e66ba..00000000000
--- a/www/core/components/course/lang/es_mx.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "contents": "Contenidos",
-    "showall": "Mostrar todo"
-}
\ 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
deleted file mode 100644
index ff9e75afa9c..00000000000
--- a/www/core/components/course/lang/pt_br.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "contents": "Conteúdos",
-    "showall": "Mostrar todos"
-}
\ 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
deleted file mode 100644
index 4e4dcf0c8d2..00000000000
--- a/www/core/components/course/lang/zh_cn.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "contents": "内容",
-    "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
deleted file mode 100644
index 378159a75b6..00000000000
--- a/www/core/components/course/lang/zh_tw.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "contents": "內容",
-    "showall": "顯示全部"
-}
\ No newline at end of file
diff --git a/www/core/components/courses/lang/es_mx.json b/www/core/components/courses/lang/es_mx.json
deleted file mode 100644
index d2a05393d10..00000000000
--- a/www/core/components/courses/lang/es_mx.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "filter": "Filtro",
-    "frontpage": "Portada",
-    "mycourses": "Mis cursos"
-}
\ 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
deleted file mode 100644
index 91cd85aa064..00000000000
--- a/www/core/components/courses/lang/pt_br.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "filter": "Filtrar",
-    "frontpage": "Página principal",
-    "mycourses": "Meus cursos"
-}
\ 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
deleted file mode 100644
index cc50f82219a..00000000000
--- a/www/core/components/courses/lang/zh_cn.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "filter": "过滤器",
-    "frontpage": "首页",
-    "mycourses": "我的课程"
-}
\ 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
deleted file mode 100644
index b682781fb0c..00000000000
--- a/www/core/components/courses/lang/zh_tw.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "filter": "過濾器",
-    "frontpage": "首頁",
-    "mycourses": "我的課程"
-}
\ No newline at end of file
diff --git a/www/core/components/grades/lang/es_mx.json b/www/core/components/grades/lang/es_mx.json
deleted file mode 100644
index fcf81895629..00000000000
--- a/www/core/components/grades/lang/es_mx.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "average": "Promedio",
-    "feedback": "Retroalimentación",
-    "grade": "Calificación",
-    "grades": "Calificaciones",
-    "itemname": "Nombre del ítem",
-    "lettergrade": "Calificación por letra",
-    "percentage": "Porcentaje",
-    "range": "Rango",
-    "rank": "Rango",
-    "weight": "Peso"
-}
\ 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
deleted file mode 100644
index 13ebd263418..00000000000
--- a/www/core/components/grades/lang/pt_br.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "average": "Média",
-    "contributiontocoursetotal": "Contribuição ao total do curso",
-    "feedback": "Feedback",
-    "grade": "Notas",
-    "grades": "Notas",
-    "itemname": "Item de nota",
-    "lettergrade": "Nota letra",
-    "percentage": "Porcentagem",
-    "range": "Range",
-    "rank": "Posição",
-    "weight": "Peso"
-}
\ 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
deleted file mode 100644
index 83d3c3b88be..00000000000
--- a/www/core/components/grades/lang/zh_cn.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "average": "平均",
-    "contributiontocoursetotal": "贡献课程总数",
-    "feedback": "反馈",
-    "grade": "成绩",
-    "grades": "成绩",
-    "itemname": "评分项",
-    "lettergrade": "字母评分",
-    "percentage": "百分比",
-    "range": "范围",
-    "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
deleted file mode 100644
index bd929c3fda5..00000000000
--- a/www/core/components/grades/lang/zh_tw.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "average": "平均",
-    "feedback": "回饋",
-    "grade": "成績",
-    "grades": "成績",
-    "itemname": "成績項名稱",
-    "lettergrade": "文字等第",
-    "percentage": "百分比",
-    "range": "範圍",
-    "rank": "排名",
-    "weight": "加權"
-}
\ 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
deleted file mode 100644
index 2b074964071..00000000000
--- a/www/core/components/login/lang/es_mx.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "authenticating": "Autenticando",
-    "cancel": "Cancelar",
-    "connect": "Conectar",
-    "help": "Ayuda",
-    "helpmelogin": "<p>Existen varios miles de sitios Moodle en el mundo. Esta App solamente puede conectarse a sitios Moodle que hayan habilitado específicamente el acceso por Mobile App.</p><p>Si Usted no puede conectarse a su sitio Moodle, entonces Usted necesita contactar a un administrador de Moodle en el lugar en donde Usted quiere conectarse y pedirle que lea <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a></p><p>Para probar la App en un sitio Demo de Moodle escriba  <i>teacher</i> o <i>student</i> en el campo de  <i>URL del sitio </iy elija el  <b>botón para Añadir</b>.</p>",
-    "invalidaccount": "Por favor, verifique sus datos de acceso, o consulte con el administrador para revisar la configuración del sitio.",
-    "invalidmoodleversion": "Versión de Moodle inválida. La versión mínima requerida es:",
-    "invalidsite": "La URL del sitio es inválida.",
-    "login": "Ingresar",
-    "logininsiterequired": "Usted necesita ingresar al sitio con una ventana del navegador.",
-    "mobileservicesnotenabled": "Los servicios móviles no están habilitados en su sitio. Por favor, contacte a su administrador del sitio Moodle si Usted piensa que se debería habilitar el acceso por dispositivos móviles.",
-    "password": "Contraseña",
-    "passwordrequired": "Contraseña obligatoria",
-    "siteinmaintenance": "Su sitio está en modo de mantenimiento",
-    "siteurl": "URL del sitio",
-    "siteurlrequired": "La URL del sitio es obligatoria, por ejemplo <i>http://www.yourmoodlesite.es o  https://www.yourmoodlesite.org</i>",
-    "username": "Nombre de usuario",
-    "usernamerequired": "Nombre de usuario obligatorio",
-    "webservicesnotenabled": "Los servicios web no están habilitados en su sitio. Por favor, contacte a su administrador del sitio Moodle si Usted piensa que se debería habilitar el acceso por dispositivos móviles."
-}
\ No newline at end of file
diff --git a/www/core/components/login/lang/pt_br.json b/www/core/components/login/lang/pt_br.json
deleted file mode 100644
index 0ea1899f488..00000000000
--- a/www/core/components/login/lang/pt_br.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "authenticating": "Autenticação",
-    "cancel": "Cancelar",
-    "connect": "Conectar",
-    "help": "Ajuda",
-    "helpmelogin": "<p>Existem milhares de sites usando Moodle no mundo. Este aplicativo somente pode conectar com um Moodle se este foi especialmente configurado para permitir o acesso móvel. </p>\nSe não conseguir se conectar com o seu Moodle, vai precisar entrar em contato com a administradora do seu Moodle e pedir ela acessar  <a href=\"http://docs.moodle.org/en/Mobile_app\" target=\"_blank\">http://docs.moodle.org/en/Mobile_app</a></p>\n<p>Para testar o aplicativo em um site Moodle demo, digite <i>teacher</i>  ou <i>estudent</i> no campo <i>Usuário</i> e clique no botão <b>Adicionar</b>.</p>",
-    "invalidaccount": "Por favor, verifique os detalhes de seu Usuário ou peça ao administrador do site para verificar a configuração do site.",
-    "invalidmoodleversion": "Versão do Moodle inválida. A versão mínima requerida é:",
-    "invalidsite": "A URL do siteé inválida.",
-    "login": "Acessar",
-    "logininsiterequired": "É preciso logar no site num navegador.",
-    "mobileservicesnotenabled": "Os serviços móveis não estão habilitados no seu Moodle. Por favor contate a administradora do seu Moodle se achar que o acesso móvel deveria estar habilitado",
-    "password": "Senha",
-    "passwordrequired": "Senha necessária",
-    "siteinmaintenance": "O site está em modo de manutenção",
-    "siteurl": "URL do site",
-    "siteurlrequired": "URL do site é obrigatória, por exemplo  <i>http://www.yourmoodlesite.abc ou https://www.yourmoodlesite.efg</i>",
-    "username": "Nome de Usuário",
-    "usernamerequired": "Nome de usuário exigido",
-    "webservicesnotenabled": "Web Services não estão ativados em seu site. Por favor, contate a administradora do seu Moodle se você achar que o acesso móvel deve ser ativado."
-}
\ No newline at end of file
diff --git a/www/core/components/login/lang/zh_cn.json b/www/core/components/login/lang/zh_cn.json
deleted file mode 100644
index f7c4ce0fbbf..00000000000
--- a/www/core/components/login/lang/zh_cn.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "authenticating": "验证中",
-    "cancel": "取消",
-    "connect": "连接",
-    "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>",
-    "invalidaccount": "请检查您的登录信息，或请您的网站管理员检查网站设置。",
-    "invalidmoodleversion": "无效的Moodle版本。最低版本要求是：",
-    "invalidsite": "网站URL是无效的。",
-    "login": "登录",
-    "logininsiterequired": "您需要在浏览器窗口中登录该站点。",
-    "mobileservicesnotenabled": "您的站点没有启用移动服务，如果您觉得有必要开启移动接入功能，请与站点管理员联系。",
-    "password": "密码",
-    "passwordrequired": "需要密码",
-    "siteinmaintenance": "您的站点正使用维护模式",
-    "siteurl": "站点 URL",
-    "siteurlrequired": "需要填写站点URL，比如<i>http://www.yourmoodlesite.abc 或https://www.yourmoodlesite.efg</i>",
-    "username": "用户名",
-    "usernamerequired": "用户名必填",
-    "webservicesnotenabled": "您的站点未开启网络服务。如果您觉得应当启用移动接入功能，请与站点管理员联系。"
-}
\ No newline at end of file
diff --git a/www/core/components/login/lang/zh_tw.json b/www/core/components/login/lang/zh_tw.json
deleted file mode 100644
index 4b4a2e8a1c9..00000000000
--- a/www/core/components/login/lang/zh_tw.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "authenticating": "認證中",
-    "cancel": "取消",
-    "connect": "連結",
-    "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>",
-    "invalidaccount": "請檢查您的登人資料或請您的網站管理員檢查網站設定。",
-    "invalidmoodleversion": "無效的Moodle版本。至少需要的版本是：",
-    "invalidsite": "這網站網址無效。",
-    "login": "登入",
-    "logininsiterequired": "您的Moodle網站強制您以系統瀏覽器開啟。將開啟新瀏覽器，並重新導向這Moodle網站。",
-    "mobileservicesnotenabled": "您的網站並未啟用行動服務。如果您想使用此功能，請連絡您的Moodle網站管理員。",
-    "password": "密碼",
-    "passwordrequired": "需要密碼",
-    "siteinmaintenance": "您的網站處於維護模式",
-    "siteurl": "網站網址",
-    "siteurlrequired": "需要網站網址，例如<i>http://www.yourmoodle.tw</i>",
-    "username": "帳號",
-    "usernamerequired": "需要帳號",
-    "webservicesnotenabled": "您的網站沒有啟用Web服務。如果您想用行動裝置連線，請聯繫您的Moodle網站管理員。"
-}
\ 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
deleted file mode 100644
index 5d713111ec6..00000000000
--- a/www/core/components/settings/lang/es_mx.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "about": "Acerca",
-    "cacheexpirationtime": "Tiempo de caducidad del caché (mili segundos)",
-    "deletesitefiles": "¿Está seguro de que desea borrar todos los archivos descargados de este sitio?",
-    "development": "Desarrollo",
-    "enabledebugging": "Activar modo depuración (debug)",
-    "estimatedfreespace": "Espacio libre (estimado)",
-    "general": "General",
-    "language": "Idioma",
-    "license": "Licencia",
-    "settings": "Ajustes",
-    "spaceusage": "Espacio",
-    "success": "Éxito",
-    "total": "Total"
-}
\ 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
deleted file mode 100644
index e5f10026fb4..00000000000
--- a/www/core/components/settings/lang/pt_br.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "about": "Sobre",
-    "cacheexpirationtime": "Tempo de expiração do cache (milisegundos)",
-    "deletesitefiles": "Tem certeza que deseja deletar os arquivos baixados a partir deste site?",
-    "development": "Desenvolvimento",
-    "enabledebugging": "Ativar a depuração",
-    "estimatedfreespace": "Espaço livre estimado",
-    "general": "Geral",
-    "language": "Idioma",
-    "license": "Licença",
-    "settings": "Configurações",
-    "spaceusage": "Uso do espaço",
-    "success": "Sucesso",
-    "total": "Total"
-}
\ No newline at end of file
diff --git a/www/core/components/settings/lang/zh_cn.json b/www/core/components/settings/lang/zh_cn.json
deleted file mode 100644
index 77ecdafdca6..00000000000
--- a/www/core/components/settings/lang/zh_cn.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "about": "关于",
-    "cacheexpirationtime": "缓存过期时间（毫秒）",
-    "deletesitefiles": "您确定要删除从本站下载的文件？",
-    "development": "开发",
-    "enabledebugging": "启用调试功能",
-    "estimatedfreespace": "估计的可用空间",
-    "general": "常规",
-    "language": "语言",
-    "license": "许可",
-    "settings": "设置",
-    "spaceusage": "空间使用情况",
-    "success": "成功",
-    "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
deleted file mode 100644
index 47eb50a9521..00000000000
--- a/www/core/components/settings/lang/zh_tw.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "about": "關於",
-    "cacheexpirationtime": "快取到期時間(毫秒)",
-    "deletesitefiles": "您確定您想由此位置刪除已下載檔案?",
-    "development": "開發",
-    "enabledebugging": "啟用除錯",
-    "estimatedfreespace": "估計尚餘空間",
-    "general": "一般",
-    "language": "語言",
-    "license": "授權",
-    "settings": "設定",
-    "spaceusage": "使用空間",
-    "success": "成功",
-    "total": "總計"
-}
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/es_mx.json b/www/core/components/sidemenu/lang/es_mx.json
deleted file mode 100644
index eebe619eeba..00000000000
--- a/www/core/components/sidemenu/lang/es_mx.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "help": "Ayuda",
-    "changesite": "Salir",
-    "mycourses": "Mis cursos",
-    "website": "Página web"
-}
\ No newline at end of file
diff --git a/www/core/components/sidemenu/lang/pt_br.json b/www/core/components/sidemenu/lang/pt_br.json
deleted file mode 100644
index 63423de66e4..00000000000
--- a/www/core/components/sidemenu/lang/pt_br.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "help": "Ajuda",
-    "changesite": "Sair",
-    "mycourses": "Meus cursos",
-    "website": "Site"
-}
\ 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
deleted file mode 100644
index d1edbf326e5..00000000000
--- a/www/core/components/sidemenu/lang/zh_cn.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "help": "帮助",
-    "changesite": "注销",
-    "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
deleted file mode 100644
index 6d6578b1638..00000000000
--- a/www/core/components/sidemenu/lang/zh_tw.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "help": "協助",
-    "changesite": "登出",
-    "mycourses": "我的課程",
-    "website": "網站"
-}
\ No newline at end of file
diff --git a/www/core/components/user/lang/es_mx.json b/www/core/components/user/lang/es_mx.json
deleted file mode 100644
index 3c101e861d8..00000000000
--- a/www/core/components/user/lang/es_mx.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "address": "Dirección",
-    "city": "Ciudad",
-    "contact": "Contacto",
-    "country": "País",
-    "description": "Descripción",
-    "details": "Detalles",
-    "email": "Email",
-    "interests": "Intereses",
-    "invaliduser": "Usuario no válido",
-    "manager": "Mánager",
-    "phone1": "Teléfono",
-    "phone2": "Móvil",
-    "roles": "Roles",
-    "student": "Estudiante",
-    "webpage": "Página web"
-}
\ No newline at end of file
diff --git a/www/core/components/user/lang/pt_br.json b/www/core/components/user/lang/pt_br.json
deleted file mode 100644
index 379cccabd73..00000000000
--- a/www/core/components/user/lang/pt_br.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "address": "Endereço",
-    "city": "Cidade",
-    "contact": "Contato",
-    "country": "País",
-    "description": "Descrição",
-    "details": "Detalhes",
-    "email": "Email",
-    "interests": "Interesses",
-    "invaliduser": "Usuário inválido",
-    "manager": "Gerente",
-    "phone1": "Telefone",
-    "phone2": "Celular",
-    "roles": "Papéis",
-    "student": "Estudante",
-    "webpage": "Página web"
-}
\ 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
deleted file mode 100644
index cd89bebc64e..00000000000
--- a/www/core/components/user/lang/zh_cn.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "address": "地址",
-    "city": "城市",
-    "contact": "联系方式",
-    "country": "国家",
-    "description": "描述",
-    "details": "详情",
-    "email": "Email",
-    "interests": "兴趣",
-    "invaliduser": "无效的用户",
-    "manager": "管理员",
-    "phone1": "电话",
-    "phone2": "手机",
-    "roles": "角色",
-    "student": "学生",
-    "webpage": "网页"
-}
\ No newline at end of file
diff --git a/www/core/components/user/lang/zh_tw.json b/www/core/components/user/lang/zh_tw.json
deleted file mode 100644
index 5a45095611c..00000000000
--- a/www/core/components/user/lang/zh_tw.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "address": "住址",
-    "city": "城市",
-    "contact": "連絡人",
-    "country": "國家",
-    "description": "描述",
-    "details": "明細",
-    "email": "電子郵件",
-    "interests": "興趣",
-    "invaliduser": "無效的用戶",
-    "manager": "管理員",
-    "phone1": "電話",
-    "phone2": "行動",
-    "roles": "角色",
-    "student": "學生",
-    "webpage": "網頁"
-}
\ No newline at end of file

From 46dac078d6bd36f084fdaea03ce8af3c628dd08e Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Thu, 27 Jul 2017 18:20:00 +0200
Subject: [PATCH 107/118] MOBILE-2178 release: Auto-translate strings

---
 www/addons/mod/data/lang/ar.json          | 1 -
 www/addons/mod/data/lang/bg.json          | 1 -
 www/addons/mod/data/lang/ca.json          | 1 -
 www/addons/mod/data/lang/cs.json          | 1 -
 www/addons/mod/data/lang/da.json          | 1 -
 www/addons/mod/data/lang/de.json          | 1 -
 www/addons/mod/data/lang/el.json          | 1 -
 www/addons/mod/data/lang/es-mx.json       | 1 -
 www/addons/mod/data/lang/es.json          | 1 -
 www/addons/mod/data/lang/eu.json          | 1 -
 www/addons/mod/data/lang/fa.json          | 1 -
 www/addons/mod/data/lang/fr.json          | 1 -
 www/addons/mod/data/lang/he.json          | 1 -
 www/addons/mod/data/lang/hu.json          | 1 -
 www/addons/mod/data/lang/it.json          | 1 -
 www/addons/mod/data/lang/ja.json          | 1 -
 www/addons/mod/data/lang/lt.json          | 1 -
 www/addons/mod/data/lang/nl.json          | 1 -
 www/addons/mod/data/lang/pl.json          | 1 -
 www/addons/mod/data/lang/pt-br.json       | 1 -
 www/addons/mod/data/lang/pt.json          | 1 -
 www/addons/mod/data/lang/ro.json          | 1 -
 www/addons/mod/data/lang/ru.json          | 1 -
 www/addons/mod/data/lang/sr-cr.json       | 1 -
 www/addons/mod/data/lang/sr-lt.json       | 1 -
 www/addons/mod/data/lang/sv.json          | 1 -
 www/addons/mod/data/lang/tr.json          | 1 -
 www/addons/mod/data/lang/uk.json          | 1 -
 www/addons/mod/data/lang/zh-cn.json       | 1 -
 www/addons/mod/data/lang/zh-tw.json       | 1 -
 www/core/components/login/lang/ar.json    | 2 +-
 www/core/components/login/lang/bg.json    | 2 +-
 www/core/components/login/lang/cs.json    | 2 +-
 www/core/components/login/lang/da.json    | 2 +-
 www/core/components/login/lang/de.json    | 4 ++--
 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    | 2 +-
 www/core/components/login/lang/fr.json    | 2 +-
 www/core/components/login/lang/he.json    | 2 +-
 www/core/components/login/lang/hu.json    | 2 +-
 www/core/components/login/lang/it.json    | 2 +-
 www/core/components/login/lang/ja.json    | 2 +-
 www/core/components/login/lang/nl.json    | 2 +-
 www/core/components/login/lang/pt-br.json | 2 +-
 www/core/components/login/lang/pt.json    | 2 +-
 www/core/components/login/lang/sv.json    | 4 ++--
 www/core/components/login/lang/tr.json    | 4 ++--
 www/core/components/login/lang/zh-cn.json | 2 +-
 www/core/components/login/lang/zh-tw.json | 2 +-
 www/core/lang/ar.json                     | 2 +-
 www/core/lang/bg.json                     | 2 +-
 www/core/lang/ca.json                     | 2 +-
 www/core/lang/cs.json                     | 2 +-
 www/core/lang/da.json                     | 2 +-
 www/core/lang/de.json                     | 2 +-
 www/core/lang/el.json                     | 2 +-
 www/core/lang/es-mx.json                  | 2 +-
 www/core/lang/es.json                     | 2 +-
 www/core/lang/eu.json                     | 2 +-
 www/core/lang/fa.json                     | 2 +-
 www/core/lang/fr.json                     | 2 +-
 www/core/lang/he.json                     | 2 +-
 www/core/lang/hu.json                     | 2 +-
 www/core/lang/it.json                     | 2 +-
 www/core/lang/ja.json                     | 2 +-
 www/core/lang/lt.json                     | 2 +-
 www/core/lang/nl.json                     | 2 +-
 www/core/lang/pl.json                     | 2 +-
 www/core/lang/pt-br.json                  | 2 +-
 www/core/lang/pt.json                     | 2 +-
 www/core/lang/ro.json                     | 2 +-
 www/core/lang/ru.json                     | 2 +-
 www/core/lang/sv.json                     | 2 +-
 www/core/lang/tr.json                     | 2 +-
 www/core/lang/uk.json                     | 2 +-
 www/core/lang/zh-cn.json                  | 2 +-
 www/core/lang/zh-tw.json                  | 2 +-
 79 files changed, 52 insertions(+), 82 deletions(-)

diff --git a/www/addons/mod/data/lang/ar.json b/www/addons/mod/data/lang/ar.json
index bb5d5765bd9..241c0dfb51c 100644
--- a/www/addons/mod/data/lang/ar.json
+++ b/www/addons/mod/data/lang/ar.json
@@ -23,7 +23,6 @@
     "recordapproved": "تم الموافقه على السجل",
     "recorddeleted": "تم حذف السجل",
     "resetsettings": "إعادة تعين الحقول",
-    "restore": "إسترجاع",
     "search": "بحث",
     "selectedrequired": "كل المختار مطلوب",
     "timeadded": "وقت الإضافة",
diff --git a/www/addons/mod/data/lang/bg.json b/www/addons/mod/data/lang/bg.json
index 6f8107d536b..2210bbfe18e 100644
--- a/www/addons/mod/data/lang/bg.json
+++ b/www/addons/mod/data/lang/bg.json
@@ -27,7 +27,6 @@
     "recorddeleted": "Записът изтрит",
     "recorddisapproved": "Записът не е одобрен",
     "resetsettings": "Нулиране на филтрите",
-    "restore": "Възстановяване",
     "search": "Търсене",
     "selectedrequired": "Всичко избрано се изисква",
     "timeadded": "Време на добавяне",
diff --git a/www/addons/mod/data/lang/ca.json b/www/addons/mod/data/lang/ca.json
index 4bfabe7bca6..fc0c0d549bd 100644
--- a/www/addons/mod/data/lang/ca.json
+++ b/www/addons/mod/data/lang/ca.json
@@ -29,7 +29,6 @@
     "recorddeleted": "S'ha suprimit l'entrada",
     "recorddisapproved": "Entrada no aprovada",
     "resetsettings": "Reinicialitza els filtres",
-    "restore": "Restaura",
     "search": "Cerca",
     "selectedrequired": "Cal que estigui tot seleccionat",
     "timeadded": "Hora de la incorporació",
diff --git a/www/addons/mod/data/lang/cs.json b/www/addons/mod/data/lang/cs.json
index 894d9e69c39..8430a087b16 100644
--- a/www/addons/mod/data/lang/cs.json
+++ b/www/addons/mod/data/lang/cs.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Záznam byl smazán",
     "recorddisapproved": "Neschválený záznam",
     "resetsettings": "Resetovat filtry",
-    "restore": "Obnovit",
     "search": "Vyhledat",
     "selectedrequired": "Všechna zvolená povinná",
     "timeadded": "Čas vložení",
diff --git a/www/addons/mod/data/lang/da.json b/www/addons/mod/data/lang/da.json
index e1d919142bb..6509111b86e 100644
--- a/www/addons/mod/data/lang/da.json
+++ b/www/addons/mod/data/lang/da.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Posten er slettet",
     "recorddisapproved": "Posten er ikke godkendt",
     "resetsettings": "Nulstil filtre",
-    "restore": "Genopret",
     "search": "Søg",
     "selectedrequired": "Alle valgte er påkrævet",
     "timeadded": "Tilføjet",
diff --git a/www/addons/mod/data/lang/de.json b/www/addons/mod/data/lang/de.json
index 54878e639d4..47de37fa0c4 100644
--- a/www/addons/mod/data/lang/de.json
+++ b/www/addons/mod/data/lang/de.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Datensatz gelöscht",
     "recorddisapproved": "Eintrag nicht freigegeben",
     "resetsettings": "Filter zurücksetzen",
-    "restore": "Wiederherstellen",
     "search": "Suche",
     "selectedrequired": "Gesamte Auswahl ist erforderlich",
     "timeadded": "Zeit erstellt",
diff --git a/www/addons/mod/data/lang/el.json b/www/addons/mod/data/lang/el.json
index 16838aa7d78..8afbe5fdcc4 100644
--- a/www/addons/mod/data/lang/el.json
+++ b/www/addons/mod/data/lang/el.json
@@ -24,7 +24,6 @@
     "recordapproved": "Η καταχώρηση εγκρίθηκε",
     "recorddeleted": "Η καταχώρηση διαγράφθηκε",
     "resetsettings": "Επανορισμός φίλτρων",
-    "restore": "Επαναφορά",
     "search": "Αναζήτηση",
     "selectedrequired": "Απαιτούνται όλα τα επιλεγμένα",
     "timeadded": "Προστέθηκε χρόνος",
diff --git a/www/addons/mod/data/lang/es-mx.json b/www/addons/mod/data/lang/es-mx.json
index f7c26455a61..dc1cd76ec53 100644
--- a/www/addons/mod/data/lang/es-mx.json
+++ b/www/addons/mod/data/lang/es-mx.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Entrada eliminada",
     "recorddisapproved": "Entrada desaprobada",
     "resetsettings": "Restablecer filtros",
-    "restore": "Restaurar",
     "search": "Buscar",
     "selectedrequired": "Se requieren todos los seleccionados",
     "timeadded": "Tiempo añadido",
diff --git a/www/addons/mod/data/lang/es.json b/www/addons/mod/data/lang/es.json
index 832a1d7c511..f03697158fa 100644
--- a/www/addons/mod/data/lang/es.json
+++ b/www/addons/mod/data/lang/es.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Entrada eliminada",
     "recorddisapproved": "Entrada desaprobada",
     "resetsettings": "Restablecer filtros",
-    "restore": "Restaurar",
     "search": "Buscar",
     "selectedrequired": "Se requieren todos los seleccionados",
     "timeadded": "Tiempo añadido",
diff --git a/www/addons/mod/data/lang/eu.json b/www/addons/mod/data/lang/eu.json
index d5e1d820eda..e7e02cdd912 100644
--- a/www/addons/mod/data/lang/eu.json
+++ b/www/addons/mod/data/lang/eu.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Sarrera ezabatu da",
     "recorddisapproved": "Onartu gabeko sarrera",
     "resetsettings": "Berrabiarazi iragazkiak",
-    "restore": "Berreskuratu",
     "search": "Bilatu",
     "selectedrequired": "Aukeratutako guztia beharrezkoa",
     "timeadded": "Denbora gehituta",
diff --git a/www/addons/mod/data/lang/fa.json b/www/addons/mod/data/lang/fa.json
index 9d90d4bef82..c6a248a09b0 100644
--- a/www/addons/mod/data/lang/fa.json
+++ b/www/addons/mod/data/lang/fa.json
@@ -25,7 +25,6 @@
     "recordapproved": "دادهٔ ورودی تایید شد",
     "recorddeleted": "حذف شد",
     "resetsettings": "بازنشانی فیلترها",
-    "restore": "بازیابی",
     "search": "جستجو",
     "selectedrequired": "تمامی گزینه‌های انتخاب شده لازم هستند",
     "timeadded": "زمان اضافه شدن",
diff --git a/www/addons/mod/data/lang/fr.json b/www/addons/mod/data/lang/fr.json
index 777e6974ade..0646a2b15e6 100644
--- a/www/addons/mod/data/lang/fr.json
+++ b/www/addons/mod/data/lang/fr.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Fiche supprimée",
     "recorddisapproved": "Fiche désapprouvée",
     "resetsettings": "Réinitialiser les filtres",
-    "restore": "Restauration",
     "search": "Recherche",
     "selectedrequired": "Toute la sélection requise",
     "timeadded": "Date ajout",
diff --git a/www/addons/mod/data/lang/he.json b/www/addons/mod/data/lang/he.json
index 8ec3817a5c1..e3495248234 100644
--- a/www/addons/mod/data/lang/he.json
+++ b/www/addons/mod/data/lang/he.json
@@ -29,7 +29,6 @@
     "recorddeleted": "הפריט נמחק",
     "recorddisapproved": "הפריט לא מאושר",
     "resetsettings": "איפוס שדות",
-    "restore": "שחזור",
     "search": "חיפוש",
     "selectedrequired": "כל הנבחרים דרושים",
     "timeadded": "זמן הוספה",
diff --git a/www/addons/mod/data/lang/hu.json b/www/addons/mod/data/lang/hu.json
index bfca2794430..a42ee251c97 100644
--- a/www/addons/mod/data/lang/hu.json
+++ b/www/addons/mod/data/lang/hu.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Bejegyzés törölve",
     "recorddisapproved": "Nem jóváhagyott fogalom",
     "resetsettings": "Szűrők visszaállítása",
-    "restore": "Helyreállítás",
     "search": "Keresés",
     "selectedrequired": "Minden kiválasztott szükséges",
     "timeadded": "Időpont hozzáadva",
diff --git a/www/addons/mod/data/lang/it.json b/www/addons/mod/data/lang/it.json
index 32e3bd0c051..81aa26d1e83 100644
--- a/www/addons/mod/data/lang/it.json
+++ b/www/addons/mod/data/lang/it.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Il record è stato eliminato",
     "recorddisapproved": "Record disapprovato",
     "resetsettings": "Reimposta filtri",
-    "restore": "Ripristino",
     "search": "Cerca",
     "selectedrequired": "Necessari tutti i selezionati",
     "timeadded": "Data/ora inserimento",
diff --git a/www/addons/mod/data/lang/ja.json b/www/addons/mod/data/lang/ja.json
index 9a3ae2261e4..a779faabe27 100644
--- a/www/addons/mod/data/lang/ja.json
+++ b/www/addons/mod/data/lang/ja.json
@@ -29,7 +29,6 @@
     "recorddeleted": "エントリが削除されました。",
     "recorddisapproved": "エントリ未承認",
     "resetsettings": "フィルタをリセットする",
-    "restore": "リストア",
     "search": "検索",
     "selectedrequired": "選択したすべてを含む",
     "timeadded": "追加日時",
diff --git a/www/addons/mod/data/lang/lt.json b/www/addons/mod/data/lang/lt.json
index ea0077d0407..1c83b6faf07 100644
--- a/www/addons/mod/data/lang/lt.json
+++ b/www/addons/mod/data/lang/lt.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Įrašas panaikintas",
     "recorddisapproved": "Įrašas nepatvirtintas",
     "resetsettings": "Nustatyti filtrus iš naujo",
-    "restore": "Atkurti",
     "search": "Ieškoti",
     "selectedrequired": "Visi pasirinkti būtini",
     "timeadded": "Įtraukimo laikas",
diff --git a/www/addons/mod/data/lang/nl.json b/www/addons/mod/data/lang/nl.json
index d4cbe01011f..0b0fd8fdb7b 100644
--- a/www/addons/mod/data/lang/nl.json
+++ b/www/addons/mod/data/lang/nl.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Record verwijderd",
     "recorddisapproved": "Item verworpen",
     "resetsettings": "Reset filters",
-    "restore": "Terugzetten",
     "search": "Zoek",
     "selectedrequired": "Alle geselecteerde vereist",
     "timeadded": "Toegevoegd op",
diff --git a/www/addons/mod/data/lang/pl.json b/www/addons/mod/data/lang/pl.json
index 9d0f4a0409b..3d8d44e49c3 100644
--- a/www/addons/mod/data/lang/pl.json
+++ b/www/addons/mod/data/lang/pl.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Wpis usunięty",
     "recorddisapproved": "Wpis odrzucony",
     "resetsettings": "Resetuj pola",
-    "restore": "Odtwórz",
     "search": "Szukaj",
     "selectedrequired": "Wszystkie zaznaczone są wymagane",
     "timeadded": "Dodano czas",
diff --git a/www/addons/mod/data/lang/pt-br.json b/www/addons/mod/data/lang/pt-br.json
index 4b8d2b11374..6574d31f4c8 100644
--- a/www/addons/mod/data/lang/pt-br.json
+++ b/www/addons/mod/data/lang/pt-br.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Item cancelado",
     "recorddisapproved": "Entrada não aprovada",
     "resetsettings": "Reconfigurar filtros",
-    "restore": "Restaurar",
     "search": "Busca",
     "selectedrequired": "Todos os itens selecionados são obrigatórios",
     "timeadded": "Tempo adicionado",
diff --git a/www/addons/mod/data/lang/pt.json b/www/addons/mod/data/lang/pt.json
index 8da56197e36..fe1adf4e1cb 100644
--- a/www/addons/mod/data/lang/pt.json
+++ b/www/addons/mod/data/lang/pt.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Registo apagado",
     "recorddisapproved": "Entrada não aprovada",
     "resetsettings": "Reiniciar filtros",
-    "restore": "Restaurar",
     "search": "Pesquisar",
     "selectedrequired": "Todos os selecionados são obrigatórios",
     "timeadded": "Data de criação",
diff --git a/www/addons/mod/data/lang/ro.json b/www/addons/mod/data/lang/ro.json
index 0f73ca747ca..76ddb872d74 100644
--- a/www/addons/mod/data/lang/ro.json
+++ b/www/addons/mod/data/lang/ro.json
@@ -28,7 +28,6 @@
     "recorddeleted": "Articol şters",
     "recorddisapproved": "Postare neaprobată",
     "resetsettings": "Resetează filtre",
-    "restore": "Restaurează",
     "search": "Căutare",
     "selectedrequired": "Toate elementele selectate sunt obligatorii",
     "timeadded": "Ora la care a fost adăugat",
diff --git a/www/addons/mod/data/lang/ru.json b/www/addons/mod/data/lang/ru.json
index 5598d7b1238..260f25ebd98 100644
--- a/www/addons/mod/data/lang/ru.json
+++ b/www/addons/mod/data/lang/ru.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Запись удалена",
     "recorddisapproved": "Снято одобрение записи",
     "resetsettings": "Сбросить фильтры",
-    "restore": "Восстановить",
     "search": "Поиск",
     "selectedrequired": "Требуются все выбранные",
     "timeadded": "Время добавления",
diff --git a/www/addons/mod/data/lang/sr-cr.json b/www/addons/mod/data/lang/sr-cr.json
index 6a73cae005c..b85aeb9798a 100644
--- a/www/addons/mod/data/lang/sr-cr.json
+++ b/www/addons/mod/data/lang/sr-cr.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Унос је обрисан",
     "recorddisapproved": "Унос није одобрен",
     "resetsettings": "Ресетуј филтере",
-    "restore": "Рестаурирање резервнe копијe",
     "search": "Тражи",
     "selectedrequired": "Све изабрано обавезно",
     "timeadded": "Време додавања",
diff --git a/www/addons/mod/data/lang/sr-lt.json b/www/addons/mod/data/lang/sr-lt.json
index 68b43ff3628..954c9f4bb36 100644
--- a/www/addons/mod/data/lang/sr-lt.json
+++ b/www/addons/mod/data/lang/sr-lt.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Unos je obrisan",
     "recorddisapproved": "Unos nije odobren",
     "resetsettings": "Resetuj filtere",
-    "restore": "Restauriranje rezervne kopije",
     "search": "Traži",
     "selectedrequired": "Sve izabrano obavezno",
     "timeadded": "Vreme dodavanja",
diff --git a/www/addons/mod/data/lang/sv.json b/www/addons/mod/data/lang/sv.json
index 9a13c464c2e..a99d7225328 100644
--- a/www/addons/mod/data/lang/sv.json
+++ b/www/addons/mod/data/lang/sv.json
@@ -25,7 +25,6 @@
     "recordapproved": "Bidraget har godkänts",
     "recorddeleted": "Bidraget har tagits bort",
     "resetsettings": "Filter för återställning",
-    "restore": "Återställ",
     "search": "Sök",
     "selectedrequired": "Alla de valda är obligatoriska",
     "timeadded": "Tillagd när",
diff --git a/www/addons/mod/data/lang/tr.json b/www/addons/mod/data/lang/tr.json
index 6b427b298c4..c250d4477cb 100644
--- a/www/addons/mod/data/lang/tr.json
+++ b/www/addons/mod/data/lang/tr.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Kayıt silindi",
     "recorddisapproved": "Giriş onaylanmadı",
     "resetsettings": "Alanları Temizle",
-    "restore": "Geri yükle",
     "search": "Ara",
     "selectedrequired": "Tüm seçililer gereklidir",
     "timeadded": "Ekleme zamanı",
diff --git a/www/addons/mod/data/lang/uk.json b/www/addons/mod/data/lang/uk.json
index ceb6004b6ca..5221866c401 100644
--- a/www/addons/mod/data/lang/uk.json
+++ b/www/addons/mod/data/lang/uk.json
@@ -29,7 +29,6 @@
     "recorddeleted": "Запис вилучено",
     "recorddisapproved": "Запис не схвалено",
     "resetsettings": "Скинути фільтри",
-    "restore": "Відновлення",
     "search": "Пошук",
     "selectedrequired": "Всі відібрані вимоги",
     "timeadded": "Час введення",
diff --git a/www/addons/mod/data/lang/zh-cn.json b/www/addons/mod/data/lang/zh-cn.json
index 071feda8d5d..6ee9c6d0542 100644
--- a/www/addons/mod/data/lang/zh-cn.json
+++ b/www/addons/mod/data/lang/zh-cn.json
@@ -28,7 +28,6 @@
     "recorddeleted": "记录已删除",
     "recorddisapproved": "不可进入",
     "resetsettings": "重置字段",
-    "restore": "恢复",
     "search": "搜索",
     "selectedrequired": "全选",
     "timeadded": "追加时间",
diff --git a/www/addons/mod/data/lang/zh-tw.json b/www/addons/mod/data/lang/zh-tw.json
index 0ca1685c558..7ccf7b95f73 100644
--- a/www/addons/mod/data/lang/zh-tw.json
+++ b/www/addons/mod/data/lang/zh-tw.json
@@ -29,7 +29,6 @@
     "recorddeleted": "資料已刪除",
     "recorddisapproved": "不可進入",
     "resetsettings": "重設欄位",
-    "restore": "還原",
     "search": "搜尋",
     "selectedrequired": "所有必要的選擇",
     "timeadded": "新增的時間",
diff --git a/www/core/components/login/lang/ar.json b/www/core/components/login/lang/ar.json
index a94d3680494..7dcb9e22afa 100644
--- a/www/core/components/login/lang/ar.json
+++ b/www/core/components/login/lang/ar.json
@@ -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..c21497bd5f6 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": "За пълен достъп до този сайт трябва първо да си създадете профил.",
diff --git a/www/core/components/login/lang/cs.json b/www/core/components/login/lang/cs.json
index be81328f5eb..e6b11b3d959 100644
--- a/www/core/components/login/lang/cs.json
+++ b/www/core/components/login/lang/cs.json
@@ -33,7 +33,7 @@
     "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.",
diff --git a/www/core/components/login/lang/da.json b/www/core/components/login/lang/da.json
index 3422796cb2b..ba85230503e 100644
--- a/www/core/components/login/lang/da.json
+++ b/www/core/components/login/lang/da.json
@@ -23,7 +23,7 @@
     "invalidsite": "Denne webadresse er ugyldig.",
     "invalidurl": "Den URL, du har skrevet, er ikke korrekt",
     "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.",
diff --git a/www/core/components/login/lang/de.json b/www/core/components/login/lang/de.json
index a4a0ede5015..bd82889ef7c 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -33,7 +33,7 @@
     "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": "Öffentliches Kennwort",
+    "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/es-mx.json b/www/core/components/login/lang/es-mx.json
index 858db740994..bdb60787d92 100644
--- a/www/core/components/login/lang/es-mx.json
+++ b/www/core/components/login/lang/es-mx.json
@@ -33,7 +33,7 @@
     "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.",
diff --git a/www/core/components/login/lang/es.json b/www/core/components/login/lang/es.json
index 55002468575..65a96778338 100644
--- a/www/core/components/login/lang/es.json
+++ b/www/core/components/login/lang/es.json
@@ -33,7 +33,7 @@
     "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.",
     "loggedoutssodescription": "Tiene que autenticarse nuevamente. Necesita acceder al sitio en una ventana del navegador.",
-    "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>",
diff --git a/www/core/components/login/lang/eu.json b/www/core/components/login/lang/eu.json
index 8d949589d7b..c2a9af12681 100644
--- a/www/core/components/login/lang/eu.json
+++ b/www/core/components/login/lang/eu.json
@@ -33,7 +33,7 @@
     "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>",
diff --git a/www/core/components/login/lang/fa.json b/www/core/components/login/lang/fa.json
index ede4296c505..e5cd574fd10 100644
--- a/www/core/components/login/lang/fa.json
+++ b/www/core/components/login/lang/fa.json
@@ -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 503d86ff74d..c13712a0f07 100644
--- a/www/core/components/login/lang/fr.json
+++ b/www/core/components/login/lang/fr.json
@@ -33,7 +33,7 @@
     "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.",
diff --git a/www/core/components/login/lang/he.json b/www/core/components/login/lang/he.json
index ea395994ef0..2c5cbdf946a 100644
--- a/www/core/components/login/lang/he.json
+++ b/www/core/components/login/lang/he.json
@@ -21,7 +21,7 @@
     "invalidmoodleversion": "גרסת מוודל לא תקינה. נדרשת גרסה 2.4 ומעלה.",
     "invalidsite": "כתובת האתר אינה תקינה.",
     "invalidurl": "כתובת ה-URL (אינטרנט) שהזנת כרגע לא תקפה.",
-    "login": "התחברות לחשבונך",
+    "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 0a23a2b4fce..03351032c9f 100644
--- a/www/core/components/login/lang/hu.json
+++ b/www/core/components/login/lang/hu.json
@@ -16,7 +16,7 @@
     "invalidmoodleversion": "Érvénytelen Moodle-verzió. A minimális verziószám a 2.4.",
     "invalidsite": "A portál-URL nem érvényes.",
     "invalidurl": "A megadott URL nem érvényes",
-    "login": "Lépjen be fiókjába",
+    "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",
diff --git a/www/core/components/login/lang/it.json b/www/core/components/login/lang/it.json
index a5d397edeb6..bc68e3db17c 100644
--- a/www/core/components/login/lang/it.json
+++ b/www/core/components/login/lang/it.json
@@ -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": "Shared Secret",
+    "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 dcc69fa6709..33dced4b80e 100644
--- a/www/core/components/login/lang/ja.json
+++ b/www/core/components/login/lang/ja.json
@@ -16,7 +16,7 @@
     "invalidmoodleversion": "Moodleのバージョンが古すぎます。少なくともこれより新しいMoodleである必要があります：",
     "invalidsite": "サイトURLが正しくありません。",
     "invalidurl": "あなたが入力したURLは正しくありません。",
-    "login": "あなたのアカウントにログインする:",
+    "login": "ログイン",
     "loginbutton": "ログイン",
     "logininsiterequired": "ブラウザウインドウからサイトにログインする必要があります。",
     "loginsteps": "このサイトにフルアクセスするため、あなたは最初にアカウントを作成する必要があります。",
diff --git a/www/core/components/login/lang/nl.json b/www/core/components/login/lang/nl.json
index 3df19ef3dd5..d8dae79b1fe 100644
--- a/www/core/components/login/lang/nl.json
+++ b/www/core/components/login/lang/nl.json
@@ -33,7 +33,7 @@
     "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.",
diff --git a/www/core/components/login/lang/pt-br.json b/www/core/components/login/lang/pt-br.json
index 0fbd58b4cce..739bc3eb83d 100644
--- a/www/core/components/login/lang/pt-br.json
+++ b/www/core/components/login/lang/pt-br.json
@@ -33,7 +33,7 @@
     "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.",
diff --git a/www/core/components/login/lang/pt.json b/www/core/components/login/lang/pt.json
index 9faa9559aea..a218e010b94 100644
--- a/www/core/components/login/lang/pt.json
+++ b/www/core/components/login/lang/pt.json
@@ -33,7 +33,7 @@
     "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.",
diff --git a/www/core/components/login/lang/sv.json b/www/core/components/login/lang/sv.json
index dbd8ed5a7a2..94336186f13 100644
--- a/www/core/components/login/lang/sv.json
+++ b/www/core/components/login/lang/sv.json
@@ -22,7 +22,7 @@
     "invalidsite": "Den webbadress är ogiltig.",
     "invalidurl": "Den URL som du just matade in är inte giltig",
     "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": "Kursnyckel",
+    "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 f038892a59f..e417e613e87 100644
--- a/www/core/components/login/lang/tr.json
+++ b/www/core/components/login/lang/tr.json
@@ -18,7 +18,7 @@
     "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": "Girdiğiniz URL geçerli değil",
-    "login": "Giriş",
+    "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": "Kayıt anahtarı",
+    "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/zh-cn.json b/www/core/components/login/lang/zh-cn.json
index c52e6caccd2..7c5cb7f013d 100644
--- a/www/core/components/login/lang/zh-cn.json
+++ b/www/core/components/login/lang/zh-cn.json
@@ -16,7 +16,7 @@
     "invalidmoodleversion": "无效的Moodle版本。最低版本要求是：",
     "invalidsite": "网站URL是无效的。",
     "invalidurl": "您刚刚输入的 URL 不合法",
-    "login": "登录您的账号",
+    "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 3065f563403..654cba89766 100644
--- a/www/core/components/login/lang/zh-tw.json
+++ b/www/core/components/login/lang/zh-tw.json
@@ -32,7 +32,7 @@
     "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>",
diff --git a/www/core/lang/ar.json b/www/core/lang/ar.json
index cdd15900df0..f8500db1399 100644
--- a/www/core/lang/ar.json
+++ b/www/core/lang/ar.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "كل المشاركين",
     "areyousure": "هل انت متأكد؟",
-    "back": "رجوع",
+    "back": "العودة",
     "cancel": "ألغي",
     "cannotconnect": "لا يمكن الاتصال: تحقق من أنك كتبت عنوان URL بشكل صحيح وأنك تستخدم موقع موودل 2.4 أو أحدث.",
     "category": "فئة",
diff --git a/www/core/lang/bg.json b/www/core/lang/bg.json
index 980a09a4cc1..ed2182d2b21 100644
--- a/www/core/lang/bg.json
+++ b/www/core/lang/bg.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "Всички участници",
     "areyousure": "Сигурни ли сте?",
-    "back": "&laquo; Обратно",
+    "back": "Обратно",
     "cancel": "Отказване",
     "cannotconnect": "Не става свързване: Проверете дали написахте правилно адреса и дали сайтът използва Moodle версия 2.4 или по-нова.",
     "category": "Категория",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index 11c1effe7d2..ccc449aef4c 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": "&laquo; Enrere",
+    "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.",
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index 6ac7d06210e..f43346b1255 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": "&laquo; Zpět",
+    "back": "Zpět",
     "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.",
diff --git a/www/core/lang/da.json b/www/core/lang/da.json
index a81cfdb8695..f3f98b8acbb 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": "&laquo; Tilbage",
+    "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.",
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index ecccdb261e4..99401c583d7 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -3,7 +3,7 @@
     "allparticipants": "Alle Teilnehmer/innen",
     "android": "Android",
     "areyousure": "Sind Sie sicher?",
-    "back": "« Zurück",
+    "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.",
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index c5cae2c9145..09a4738dde3 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -3,7 +3,7 @@
     "allparticipants": "Όλοι οι συμμετέχοντες",
     "android": "Android",
     "areyousure": "Είστε σίγουρος ;",
-    "back": "&lt; Επιστροφή",
+    "back": "Πίσω",
     "cancel": "Ακύρωση",
     "cannotconnect": "Δεν είναι δυνατή η σύνδεση: Βεβαιωθείτε ότι έχετε πληκτρολογήσει σωστά τη διεύθυνση URL και ότι το site σας χρησιμοποιεί το Moodle 2.4 ή νεότερη έκδοση.",
     "cannotdownloadfiles": "Το κατέβασμα αρχείων είναι απενεργοποιημένο. Παρακαλώ, επικοινωνήστε με το διαχειριστή του site σας.",
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index 6a7fba5bd32..541896c8613 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": "&laquo; Atrás",
+    "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.",
diff --git a/www/core/lang/es.json b/www/core/lang/es.json
index eac73c2ea02..f46bf4c1915 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": "&laquo; Atrás",
+    "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.",
diff --git a/www/core/lang/eu.json b/www/core/lang/eu.json
index 399292e7c4b..64a96e6e58e 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": "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.",
diff --git a/www/core/lang/fa.json b/www/core/lang/fa.json
index 1be357dd50d..b76dc72cc48 100644
--- a/www/core/lang/fa.json
+++ b/www/core/lang/fa.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "همهٔ اعضاء",
     "areyousure": "آیا مطمئن هستید؟",
-    "back": "&raquo; بازگشت",
+    "back": "بازگشت",
     "cancel": "انصراف",
     "cannotconnect": "اتصال به سایت ممکن نبود. بررسی کنید که نشانی سایت را درست وارد کرده باشید و اینکه سایت شما از مودل ۲٫۴ یا جدیدتر استفاده کند.",
     "category": "دسته",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index b3cee4e200c..2605de7b114 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": "&laquo; Retour",
+    "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.",
diff --git a/www/core/lang/he.json b/www/core/lang/he.json
index 7672a3ed83c..0c54986a098 100644
--- a/www/core/lang/he.json
+++ b/www/core/lang/he.json
@@ -2,7 +2,7 @@
     "allparticipants": "כל המשתתפים",
     "android": "אנדרואיד",
     "areyousure": "האם את/ה בטוח/ה?",
-    "back": "&laquo; חזרה\n",
+    "back": "חזרה",
     "cancel": "ביטול",
     "cannotconnect": "אין אפשרות להתחבר: אנא ודא כי הזנת נכון את כתובת האתר ושהאתר הוא בגרסה 2.4 ומעלה.",
     "cannotdownloadfiles": "הורדת קבצים אינה מאופשרת במכשירים ניידים. יש לפנות למנהל/ת האתר להפעלת אפשרות זו.",
diff --git a/www/core/lang/hu.json b/www/core/lang/hu.json
index ab3c5d03b06..a2db374e12b 100644
--- a/www/core/lang/hu.json
+++ b/www/core/lang/hu.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "Összes résztvevő",
     "areyousure": "Biztos?",
-    "back": "&laquo; Vissza",
+    "back": "Vissza",
     "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",
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index b09cf8ff07a..1ab08758210 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": "&laquo; Back",
+    "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.",
diff --git a/www/core/lang/ja.json b/www/core/lang/ja.json
index 3a3aed50aec..7c3934c1c38 100644
--- a/www/core/lang/ja.json
+++ b/www/core/lang/ja.json
@@ -3,7 +3,7 @@
     "allparticipants": "すべての参加者",
     "android": "Android",
     "areyousure": "本当によろしいですか?",
-    "back": "&laquo; 戻る",
+    "back": "戻る",
     "cancel": "キャンセル",
     "cannotconnect": "接続できません：正しいURLを入力しているか、サイトのMoodleが2.4以降であることを確認してください。",
     "cannotdownloadfiles": "ダウンロードしようとしているファイルは、あなたのモバイルサービスでは無効になっています。あなたのサイト管理者に連絡してください。",
diff --git a/www/core/lang/lt.json b/www/core/lang/lt.json
index 6a86388bca6..2246e0b4405 100644
--- a/www/core/lang/lt.json
+++ b/www/core/lang/lt.json
@@ -3,7 +3,7 @@
     "allparticipants": "Visi dalyviai",
     "android": "Android",
     "areyousure": "Ar Jūs tikras?",
-    "back": "&laquo; Atgal",
+    "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.",
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index bb80cd061e0..30bbaafe113 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": "&laquo; Terug",
+    "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.",
diff --git a/www/core/lang/pl.json b/www/core/lang/pl.json
index 2074cef52c4..6529c2a0ea7 100644
--- a/www/core/lang/pl.json
+++ b/www/core/lang/pl.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "Wszyscy uczestnicy",
     "areyousure": "Jesteś pewien?",
-    "back": "&laquo; Powrót",
+    "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",
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index 7f18ff238b8..8776c6c504d 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": "&laquo; Voltar",
+    "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.",
diff --git a/www/core/lang/pt.json b/www/core/lang/pt.json
index 73eb3906a63..477b29aee06 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": "&laquo; Voltar",
+    "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.",
diff --git a/www/core/lang/ro.json b/www/core/lang/ro.json
index 6cbdac71897..c160b4b4196 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": "&laquo; Înapoi",
+    "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.",
diff --git a/www/core/lang/ru.json b/www/core/lang/ru.json
index 8c1e361e574..437ec3ce5dc 100644
--- a/www/core/lang/ru.json
+++ b/www/core/lang/ru.json
@@ -2,7 +2,7 @@
     "allparticipants": "Все участники",
     "android": "Android",
     "areyousure": "Вы уверены?",
-    "back": "&laquo; Назад",
+    "back": "Назад",
     "cancel": "Отменить",
     "cannotconnect": "Не удается подключиться: убедитесь, что Вы ввели правильный URL-адрес и что сайт использует Moodle 2.4 или более поздней версии.",
     "cannotdownloadfiles": "Скачивание файла отключено для мобильных служб. Пожалуйста, свяжитесь с администратором сайта.",
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index abbe11de849..ff3dd964b43 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": "&laquo; Tillbaka",
+    "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.",
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index a77ce3dff24..abf9c0a88d4 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": "&laquo; Geri",
+    "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",
diff --git a/www/core/lang/uk.json b/www/core/lang/uk.json
index 8fa63c712a4..d252f7e6d40 100644
--- a/www/core/lang/uk.json
+++ b/www/core/lang/uk.json
@@ -3,7 +3,7 @@
     "allparticipants": "Усі учасники",
     "android": "Android",
     "areyousure": "Ви впевнені?",
-    "back": "&laquo; Назад",
+    "back": "Назад",
     "cancel": "Скасувати",
     "cannotconnect": "Неможливо з'єднатися: Переконайтеся, що ви ввели правильний URL і що сайт використовує Moodle 2.4 або більш пізню версію.",
     "cannotdownloadfiles": "Завантаження файлів відключено у вашій мобільній службі. Будь ласка, зверніться до адміністратора сайту.",
diff --git a/www/core/lang/zh-cn.json b/www/core/lang/zh-cn.json
index ca7d8d0dfac..30daa5f4231 100644
--- a/www/core/lang/zh-cn.json
+++ b/www/core/lang/zh-cn.json
@@ -1,7 +1,7 @@
 {
     "allparticipants": "所有成员",
     "areyousure": "你确定吗？",
-    "back": "« 返回",
+    "back": "返回",
     "cancel": "取消",
     "cannotconnect": "无法连接：请确认您已经正确输入网址，并且您的网站使用了Moodle 2.4或更高版本。",
     "category": "类别",
diff --git a/www/core/lang/zh-tw.json b/www/core/lang/zh-tw.json
index 198c9b7eeb7..5144e85b257 100644
--- a/www/core/lang/zh-tw.json
+++ b/www/core/lang/zh-tw.json
@@ -3,7 +3,7 @@
     "allparticipants": "所有參與者",
     "android": "安卓",
     "areyousure": "你確定嗎？",
-    "back": "« 回頭",
+    "back": "返回",
     "cancel": "取消",
     "cannotconnect": "無法連接：請確認您輸入之網址正確，且您的位置使用的是Moodle2.4版或更新版本。",
     "cannotdownloadfiles": "在您的行動服務中禁用檔案下載. 請與您的網站管理員聯繫.",

From fb0357cabfbd79bf5436768cc6d6f4ea13fb013d Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Thu, 27 Jul 2017 18:23:52 +0200
Subject: [PATCH 108/118] MOBILE-2178 release: Auto-translated strings

---
 www/addons/calendar/lang/ca.json              |  2 +-
 www/addons/calendar/lang/es-mx.json           |  4 +--
 www/addons/calendar/lang/lt.json              |  2 +-
 www/addons/calendar/lang/pt.json              |  2 +-
 www/addons/calendar/lang/zh-cn.json           |  4 +--
 www/addons/calendar/lang/zh-tw.json           |  2 +-
 www/addons/competency/lang/ca.json            |  2 +-
 www/addons/competency/lang/es-mx.json         |  2 +-
 www/addons/competency/lang/lt.json            |  2 +-
 www/addons/competency/lang/pt.json            |  2 +-
 www/addons/competency/lang/zh-tw.json         |  2 +-
 www/addons/coursecompletion/lang/ca.json      | 18 ++++++------
 www/addons/coursecompletion/lang/es-mx.json   | 26 ++++++++---------
 www/addons/coursecompletion/lang/lt.json      | 22 +++++++--------
 www/addons/coursecompletion/lang/pt.json      | 18 ++++++------
 www/addons/coursecompletion/lang/zh-tw.json   | 28 +++++++++----------
 www/addons/files/lang/ca.json                 |  4 +--
 www/addons/files/lang/de.json                 |  6 ++--
 www/addons/files/lang/es-mx.json              |  4 +--
 www/addons/files/lang/lt.json                 |  4 +--
 www/addons/files/lang/pt.json                 |  4 +--
 www/addons/files/lang/zh-tw.json              |  4 +--
 www/addons/messages/lang/es-mx.json           |  2 +-
 www/addons/messages/lang/lt.json              |  2 +-
 www/addons/messages/lang/zh-tw.json           |  2 +-
 www/addons/mod/data/lang/de.json              |  2 ++
 www/addons/mod/data/lang/es-mx.json           |  2 ++
 www/addons/mod/data/lang/nl.json              |  2 ++
 www/addons/mod/data/lang/sr-cr.json           |  2 ++
 www/addons/mod/data/lang/sr-lt.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/es-mx.json         |  2 +-
 www/addons/mod/folder/lang/lt.json            |  2 +-
 www/addons/mod/folder/lang/pt.json            |  2 +-
 www/addons/mod/folder/lang/zh-tw.json         |  2 +-
 www/addons/mod/forum/lang/zh-tw.json          |  2 +-
 www/addons/mod/glossary/lang/ca.json          |  2 +-
 www/addons/mod/glossary/lang/es-mx.json       |  2 +-
 www/addons/mod/glossary/lang/lt.json          |  2 +-
 www/addons/mod/glossary/lang/pt.json          |  2 +-
 www/addons/mod/glossary/lang/zh-tw.json       |  2 +-
 www/addons/mod/label/lang/lt.json             |  2 +-
 www/addons/mod/lesson/lang/de.json            |  1 +
 www/addons/mod/lesson/lang/es-mx.json         |  7 +++--
 www/addons/mod/lesson/lang/nl.json            |  3 +-
 www/addons/mod/lesson/lang/sr-cr.json         |  3 +-
 www/addons/mod/lesson/lang/sr-lt.json         |  3 +-
 www/addons/mod/survey/lang/zh-tw.json         |  2 +-
 www/addons/mod/wiki/lang/ca.json              |  2 +-
 www/addons/mod/wiki/lang/es-mx.json           |  2 +-
 www/addons/mod/wiki/lang/lt.json              |  2 +-
 www/addons/mod/wiki/lang/pt.json              |  2 +-
 www/addons/mod/wiki/lang/tr.json              |  2 +-
 www/addons/mod/wiki/lang/zh-tw.json           |  2 +-
 www/addons/notes/lang/ca.json                 |  2 +-
 www/addons/notes/lang/es-mx.json              |  2 +-
 www/addons/notes/lang/lt.json                 |  2 +-
 www/addons/notes/lang/pt.json                 |  2 +-
 www/addons/notes/lang/zh-tw.json              |  2 +-
 www/addons/notifications/lang/ca.json         |  2 +-
 www/addons/notifications/lang/es-mx.json      |  2 +-
 www/addons/notifications/lang/lt.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          |  4 +++
 www/addons/participants/lang/es-mx.json       |  2 +-
 www/addons/participants/lang/it.json          |  4 +++
 www/addons/participants/lang/lt.json          |  2 +-
 www/addons/participants/lang/pt.json          |  4 +--
 www/addons/participants/lang/tr.json          |  2 +-
 www/addons/participants/lang/zh-cn.json       |  2 +-
 www/addons/participants/lang/zh-tw.json       |  4 +--
 www/core/components/course/lang/ca.json       |  2 +-
 www/core/components/course/lang/es-mx.json    |  4 +--
 www/core/components/course/lang/lt.json       |  4 +--
 www/core/components/course/lang/pt.json       |  2 +-
 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    |  4 +--
 www/core/components/courses/lang/ca.json      |  6 ++--
 www/core/components/courses/lang/es-mx.json   |  6 ++--
 www/core/components/courses/lang/lt.json      |  8 +++---
 www/core/components/courses/lang/pt.json      |  8 +++---
 www/core/components/courses/lang/zh-tw.json   |  8 +++---
 www/core/components/fileuploader/lang/ca.json |  8 +++---
 .../components/fileuploader/lang/es-mx.json   |  8 +++---
 www/core/components/fileuploader/lang/lt.json |  8 +++---
 www/core/components/fileuploader/lang/pt.json | 10 +++----
 www/core/components/fileuploader/lang/tr.json |  2 +-
 .../components/fileuploader/lang/zh-cn.json   |  2 +-
 .../components/fileuploader/lang/zh-tw.json   | 10 +++----
 www/core/components/login/lang/de.json        |  2 +-
 www/core/components/login/lang/es-mx.json     |  4 +--
 www/core/components/login/lang/lt.json        |  4 +--
 www/core/components/login/lang/pt.json        |  4 +--
 www/core/components/login/lang/zh-tw.json     |  4 +--
 www/core/components/question/lang/ca.json     |  2 +-
 www/core/components/question/lang/es-mx.json  |  2 +-
 www/core/components/question/lang/lt.json     |  2 +-
 www/core/components/question/lang/pt.json     |  2 +-
 www/core/components/question/lang/zh-tw.json  |  2 +-
 www/core/components/settings/lang/de.json     |  4 +--
 www/core/components/sharedfiles/lang/ca.json  |  2 +-
 www/core/components/sharedfiles/lang/de.json  |  4 +--
 .../components/sharedfiles/lang/es-mx.json    |  2 +-
 www/core/components/sharedfiles/lang/lt.json  |  4 +--
 www/core/components/sharedfiles/lang/pt.json  |  2 +-
 www/core/components/sharedfiles/lang/tr.json  |  2 +-
 .../components/sharedfiles/lang/zh-tw.json    |  4 +--
 www/core/components/sidemenu/lang/ca.json     |  2 +-
 www/core/components/sidemenu/lang/de.json     |  2 +-
 www/core/components/sidemenu/lang/es-mx.json  |  2 +-
 www/core/components/sidemenu/lang/lt.json     |  6 ++--
 www/core/components/sidemenu/lang/pt.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  |  4 +--
 www/core/components/user/lang/ca.json         |  2 +-
 www/core/components/user/lang/es-mx.json      |  4 +--
 www/core/components/user/lang/lt.json         |  6 ++--
 www/core/components/user/lang/pt.json         |  2 +-
 www/core/components/user/lang/tr.json         |  6 ++--
 www/core/components/user/lang/zh-cn.json      |  4 +--
 www/core/components/user/lang/zh-tw.json      |  6 ++--
 www/core/lang/ca.json                         | 10 +++----
 www/core/lang/de.json                         |  9 ++++--
 www/core/lang/es-mx.json                      | 17 +++++++----
 www/core/lang/lt.json                         | 10 +++----
 www/core/lang/nl.json                         |  7 ++++-
 www/core/lang/pt.json                         | 12 ++++----
 www/core/lang/sr-cr.json                      |  7 ++++-
 www/core/lang/sr-lt.json                      |  7 ++++-
 www/core/lang/tr.json                         |  4 +--
 www/core/lang/zh-tw.json                      | 14 +++++-----
 138 files changed, 321 insertions(+), 273 deletions(-)
 create mode 100644 www/addons/participants/lang/cs.json
 create mode 100644 www/addons/participants/lang/it.json

diff --git a/www/addons/calendar/lang/ca.json b/www/addons/calendar/lang/ca.json
index a2a8930c77d..cc1ee634071 100644
--- a/www/addons/calendar/lang/ca.json
+++ b/www/addons/calendar/lang/ca.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Hora de notificació per defecte",
     "errorloadevent": "S'ha produït un error carregant l'esdeveniment.",
     "errorloadevents": "S'ha produït un error carregant els esdeveniments.",
-    "noevents": "Cap activitat venç properament",
+    "noevents": "No hi ha cap esdeveniment",
     "notifications": "Notificacions"
 }
\ 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/lt.json b/www/addons/calendar/lang/lt.json
index 38fab7b87a5..84444f84a30 100644
--- a/www/addons/calendar/lang/lt.json
+++ b/www/addons/calendar/lang/lt.json
@@ -2,6 +2,6 @@
     "calendarevents": "Renginių kalendorius",
     "errorloadevent": "Klaida įkeliant renginį.",
     "errorloadevents": "Klaida įkeliant renginius.",
-    "noevents": "Nėra numatytų artėjančių veiklų",
+    "noevents": "Renginių nėra",
     "notifications": "Pranešimai"
 }
\ No newline at end of file
diff --git a/www/addons/calendar/lang/pt.json b/www/addons/calendar/lang/pt.json
index a65b11f461a..6cb58c20e8d 100644
--- a/www/addons/calendar/lang/pt.json
+++ b/www/addons/calendar/lang/pt.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Hora de notificação predefinida",
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
-    "noevents": "Nenhuma atividade programada",
+    "noevents": "Sem eventos",
     "notifications": "Notificações"
 }
\ 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 4afe676ce56..5fc1088f46f 100644
--- a/www/addons/calendar/lang/zh-cn.json
+++ b/www/addons/calendar/lang/zh-cn.json
@@ -1,4 +1,4 @@
 {
-    "noevents": "没有即将到期的活动",
-    "notifications": "通告"
+    "noevents": "没有事件",
+    "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 80f7da7b125..60ba1a02774 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/es-mx.json b/www/addons/competency/lang/es-mx.json
index f1a9d12780f..89fed0897ca 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/lt.json b/www/addons/competency/lang/lt.json
index cc846b39a81..e7f4c88b879 100644
--- a/www/addons/competency/lang/lt.json
+++ b/www/addons/competency/lang/lt.json
@@ -10,7 +10,7 @@
     "learningplans": "Mokymosi planai",
     "myplans": "Mano mokymosi planai",
     "noactivities": "Nėra veiklų",
-    "nocompetencies": "Šioje sistemoje nebuvo sukurta kompetencijų.",
+    "nocompetencies": "Nėra kompetencijų",
     "nocrossreferencedcompetencies": "Jokios kitos kompetencijos nebuvo susietos kryžmine nuoroda su šia kompetencija.",
     "noevidence": "Nėra įrodymų",
     "noplanswerecreated": "Nebuvo sukurta mokymosi planų.",
diff --git a/www/addons/competency/lang/pt.json b/www/addons/competency/lang/pt.json
index a4a75b2de01..f8d90d2f944 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/zh-tw.json b/www/addons/competency/lang/zh-tw.json
index 90a00057bf4..9106adffc4f 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 9a6429f37c6..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",
+    "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ó de 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ó",
-    "inprogress": "En progrés",
+    "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": "Estat de la insígnia",
+    "status": "Estat",
     "viewcoursereport": "Visualitza l'informe del curs"
 }
\ 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 40d6b0459ae..0252ef2ea82 100644
--- a/www/addons/coursecompletion/lang/es-mx.json
+++ b/www/addons/coursecompletion/lang/es-mx.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completado",
+    "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": "Finalización de 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",
+    "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": "Obligatorio",
-    "requiredcriteria": "Criterios necesarios",
+    "required": "Requerido",
+    "requiredcriteria": "Criterio requerido",
     "requirement": "Requisito",
-    "status": "Estatus de insignias",
+    "status": "Estatus",
     "viewcoursereport": "Ver reporte del curso"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/lt.json b/www/addons/coursecompletion/lang/lt.json
index e26747a5ead..c6813474cf2 100644
--- a/www/addons/coursecompletion/lang/lt.json
+++ b/www/addons/coursecompletion/lang/lt.json
@@ -1,21 +1,21 @@
 {
-    "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": "Kurso baigimas",
+    "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",
-    "manualselfcompletion": "Savas užbaigimas neautomatiniu būdu",
-    "notyetstarted": "Dar nepradėta",
+    "criteriarequiredall": "Visi žemiau esantys kriterijai yra privalomi",
+    "criteriarequiredany": "Kiekvienas kriterijus, esantis žemiau, yra privalomas",
+    "inprogress": "Nebaigta",
+    "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": "Pasiekimo būsena",
+    "status": "Būsena",
     "viewcoursereport": "Peržiūrėti kursų ataskaitą"
 }
\ No newline at end of file
diff --git a/www/addons/coursecompletion/lang/pt.json b/www/addons/coursecompletion/lang/pt.json
index 7de6a08cbaa..5f2bd4dc942 100644
--- a/www/addons/coursecompletion/lang/pt.json
+++ b/www/addons/coursecompletion/lang/pt.json
@@ -1,21 +1,21 @@
 {
-    "complete": "Completo",
+    "complete": "Concluído",
     "completecourse": "Disciplina concluída",
-    "completed": "Completou",
+    "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",
-    "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": "Obrigatório",
-    "requiredcriteria": "Critério obrigatório",
+    "required": "Exigido",
+    "requiredcriteria": "Critério exigido",
     "requirement": "Requisito",
-    "status": "Estado da Medalha",
+    "status": "Estado",
     "viewcoursereport": "Ver relatório da disciplina"
 }
\ 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 2e6a01c0622..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": "必須滿足以下任一條件",
-    "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/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/de.json b/www/addons/files/lang/de.json
index 39a046af215..337b5b880d1 100644
--- a/www/addons/files/lang/de.json
+++ b/www/addons/files/lang/de.json
@@ -1,11 +1,11 @@
 {
     "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.",
+    "clicktoupload": "Tippen Sie auf die Taste, um Dateien in den Bereich 'Meine Dateien' hochzuladen.",
+    "couldnotloadfiles": "Die Liste der Dateien konnte nicht geladen werden.",
     "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.",
+    "myprivatefilesdesc": "Dateien, die in Ihrem persönlichen Bereich auf dieser Website liegen.",
     "privatefiles": "Meine Dateien",
     "sitefiles": "Dateien",
     "sitefilesdesc": "Weitere Dateien, die für Sie in anderen Bereichen der Website verfügbar sind.",
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/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/pt.json b/www/addons/files/lang/pt.json
index aad6d0a66be..e37a1840902 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": "Anexos",
     "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/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/es-mx.json b/www/addons/messages/lang/es-mx.json
index da63ffaf879..666045c556a 100644
--- a/www/addons/messages/lang/es-mx.json
+++ b/www/addons/messages/lang/es-mx.json
@@ -21,7 +21,7 @@
     "newmessage": "Nuevo mensaje",
     "newmessages": "Nuevos mensajes",
     "nomessages": "Aún no hay mensajes",
-    "nousersfound": "No se encuentran usuarios",
+    "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/lt.json b/www/addons/messages/lang/lt.json
index ba0d4980bbf..99ebd5052e4 100644
--- a/www/addons/messages/lang/lt.json
+++ b/www/addons/messages/lang/lt.json
@@ -16,7 +16,7 @@
     "mustbeonlinetosendmessages": "Norėdamas išsiųsti žinutę, turite prisijungti",
     "newmessage": "Nauja žinutė",
     "nomessages": "Žinučių dar nėra",
-    "nousersfound": "Nerasta naudotojų",
+    "nousersfound": "Vartotojas nerastas",
     "removecontact": "Pašalinti kontaktą",
     "send": "Siųsti",
     "sendmessage": "Siųsti žinutę",
diff --git a/www/addons/messages/lang/zh-tw.json b/www/addons/messages/lang/zh-tw.json
index de4e6fccf0f..60b1bfa8db2 100644
--- a/www/addons/messages/lang/zh-tw.json
+++ b/www/addons/messages/lang/zh-tw.json
@@ -18,7 +18,7 @@
     "mustbeonlinetosendmessages": "您必須上線才能發送訊息",
     "newmessage": "新簡訊",
     "nomessages": "尚無訊息",
-    "nousersfound": "找不到用戶",
+    "nousersfound": "沒有使用者",
     "removecontact": "刪除聯絡人",
     "send": "送出",
     "sendmessage": "傳送簡訊",
diff --git a/www/addons/mod/data/lang/de.json b/www/addons/mod/data/lang/de.json
index 47de37fa0c4..f9e7fff488f 100644
--- a/www/addons/mod/data/lang/de.json
+++ b/www/addons/mod/data/lang/de.json
@@ -13,6 +13,8 @@
     "emptyaddform": "Sie haben keine Einträge vorgenommen!",
     "entrieslefttoadd": "Sie müssen {{$a.entriesleft}} (weitere) Einträge vornehmen, um diese Aktivität zu beenden.",
     "entrieslefttoaddtoview": "Sie müssen {{$a.entrieslefttoview}} (weitere) Einträge vornehmen, bevor Sie andere Teilnehmerbeiträge betrachten können.",
+    "errorapproving": "Fehler beim Freigeben bzw. Ablehnen des Eintrags",
+    "errordeleting": "Fehler beim Löschen des Eintrags",
     "errormustsupplyvalue": "Sie müssen hier einen Wert eintragen.",
     "expired": "Die Aktivität wurde am {{$a}} abgeschlossen und ist nicht weiter verfügbar.",
     "fields": "Felder",
diff --git a/www/addons/mod/data/lang/es-mx.json b/www/addons/mod/data/lang/es-mx.json
index dc1cd76ec53..44cb6f922de 100644
--- a/www/addons/mod/data/lang/es-mx.json
+++ b/www/addons/mod/data/lang/es-mx.json
@@ -13,6 +13,8 @@
     "emptyaddform": "¡No ha rellenado ningún campo!",
     "entrieslefttoadd": "Debe añadir {{$a.entriesleft}} entrada(s) más antes de poder ver las entradas de otro participante.",
     "entrieslefttoaddtoview": "Debe añadir {{$a.entrieslefttoview}} entrada(s) antes de poder ver las entradas de otros participantes.",
+    "errorapproving": "Error al aprobar o des_aprobar una entrada.",
+    "errordeleting": "Error al eliminar la entrada.",
     "errormustsupplyvalue": "Usted debe proporcionar un valor aquí.",
     "expired": "Lo sentimos, esta actividad se cerró el {{$a}} y ya no está disponible",
     "fields": "Campos",
diff --git a/www/addons/mod/data/lang/nl.json b/www/addons/mod/data/lang/nl.json
index 0b0fd8fdb7b..deb0be88f87 100644
--- a/www/addons/mod/data/lang/nl.json
+++ b/www/addons/mod/data/lang/nl.json
@@ -13,6 +13,8 @@
     "emptyaddform": "Je hebt geen velden ingevuld!",
     "entrieslefttoadd": "Je moet {{$a.entriesleft}} meer item(s) ingeven voor je de items van anderen kunt zien.",
     "entrieslefttoaddtoview": "je moet {{$a.entrieslefttoview}} items meer toevoegen voor je de items van anderen kan zien.",
+    "errorapproving": "Fout bij het goedkeuren of verwerpen van het nieuwe item.",
+    "errordeleting": "Fout bij het verwijderen van het item.",
     "errormustsupplyvalue": "Je moet hier een waarde geven.",
     "expired": "Deze activiteit is gesloten op {{$a}} en is niet langer beschikbaar",
     "fields": "Velden",
diff --git a/www/addons/mod/data/lang/sr-cr.json b/www/addons/mod/data/lang/sr-cr.json
index b85aeb9798a..a8ce67ae329 100644
--- a/www/addons/mod/data/lang/sr-cr.json
+++ b/www/addons/mod/data/lang/sr-cr.json
@@ -13,6 +13,8 @@
     "emptyaddform": "Нисте испунили ниједно поље!",
     "entrieslefttoadd": "Морате да додате још {{$a.entriesleft}} унос(а) како бисте завршили ову активност",
     "entrieslefttoaddtoview": "Морате да додате још {{$a.entrieslefttoview}} уноса пре него што будете могли да видите уносе других корисника.",
+    "errorapproving": "Грешка приликом одобравања или неодобравања уноса.",
+    "errordeleting": "Грешка приликом брисања уноса.",
     "errormustsupplyvalue": "Морате овде задати вредност.",
     "expired": "Нажалост, ова активност је затворена {$}} и више није доступна",
     "fields": "Поља",
diff --git a/www/addons/mod/data/lang/sr-lt.json b/www/addons/mod/data/lang/sr-lt.json
index 954c9f4bb36..01163f8f244 100644
--- a/www/addons/mod/data/lang/sr-lt.json
+++ b/www/addons/mod/data/lang/sr-lt.json
@@ -13,6 +13,8 @@
     "emptyaddform": "Niste ispunili nijedno polje!",
     "entrieslefttoadd": "Morate da dodate još {{$a.entriesleft}} unos(a) kako biste završili ovu aktivnost",
     "entrieslefttoaddtoview": "Morate da dodate još {{$a.entrieslefttoview}} unosa pre nego što budete mogli da vidite unose drugih korisnika.",
+    "errorapproving": "Greška prilikom odobravanja ili neodobravanja unosa.",
+    "errordeleting": "Greška prilikom brisanja unosa.",
     "errormustsupplyvalue": "Morate ovde zadati vrednost.",
     "expired": "Nažalost, ova aktivnost je zatvorena {$}} i više nije dostupna",
     "fields": "Polja",
diff --git a/www/addons/mod/feedback/lang/de.json b/www/addons/mod/feedback/lang/de.json
index 6484534ca06..4bb27721583 100644
--- a/www/addons/mod/feedback/lang/de.json
+++ b/www/addons/mod/feedback/lang/de.json
@@ -3,7 +3,7 @@
     "anonymous": "Anonym",
     "anonymous_entries": "Anonyme Einträge ({{$a}})",
     "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.",
+    "captchaofflinewarning": "Ein Feedback mit Captcha kann nicht offline beendet werden. Captcha funktioniert nur, wenn der Server antwortet.",
     "complete_the_form": "Formular ausfüllen...",
     "completed_feedbacks": "Ausgefüllte Feedbacks",
     "continue_the_form": "Beantwortung der Fragen fortsetzen ...",
diff --git a/www/addons/mod/feedback/lang/es-mx.json b/www/addons/mod/feedback/lang/es-mx.json
index b09def04c16..48c0b709868 100644
--- a/www/addons/mod/feedback/lang/es-mx.json
+++ b/www/addons/mod/feedback/lang/es-mx.json
@@ -3,7 +3,7 @@
     "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.",
+    "captchaofflinewarning": "La retroalimentación con captcha no puede ser completada fuera-de-línea, o si no está configurada, o con el servidor tirado.",
     "complete_the_form": "Responda a las preguntas...",
     "completed_feedbacks": "Respuestas enviadas",
     "continue_the_form": "Continuar contestando las preguntas...",
diff --git a/www/addons/mod/feedback/lang/nl.json b/www/addons/mod/feedback/lang/nl.json
index 32c689ca443..46203a58213 100644
--- a/www/addons/mod/feedback/lang/nl.json
+++ b/www/addons/mod/feedback/lang/nl.json
@@ -3,7 +3,7 @@
     "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.",
+    "captchaofflinewarning": "Feedback met captcha kan niet offline voltooid worden of wanneer dat niet geconfigureerd is of wanneer de server onbereikbaar is.",
     "complete_the_form": "Beantwoord de vragen...",
     "completed_feedbacks": "Ingevulde antwoorden",
     "continue_the_form": "Ga verder met het beantwoorden van de vragen...",
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/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/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/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/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/zh-tw.json b/www/addons/mod/forum/lang/zh-tw.json
index 81db9790069..6a91914a48c 100644
--- a/www/addons/mod/forum/lang/zh-tw.json
+++ b/www/addons/mod/forum/lang/zh-tw.json
@@ -14,7 +14,7 @@
     "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 2351376a71d..f5a0cfc5ded 100644
--- a/www/addons/mod/glossary/lang/ca.json
+++ b/www/addons/mod/glossary/lang/ca.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Adjunta la insígnia al missatge",
-    "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/es-mx.json b/www/addons/mod/glossary/lang/es-mx.json
index f8b36fd05f5..8cb29128da9 100644
--- a/www/addons/mod/glossary/lang/es-mx.json
+++ b/www/addons/mod/glossary/lang/es-mx.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anexar insignia al mensaje",
-    "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/lt.json b/www/addons/mod/glossary/lang/lt.json
index 23f3f7fe92b..016538035b9 100644
--- a/www/addons/mod/glossary/lang/lt.json
+++ b/www/addons/mod/glossary/lang/lt.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Priedas",
-    "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/pt.json b/www/addons/mod/glossary/lang/pt.json
index c672ec0b9a3..6887c9ff44c 100644
--- a/www/addons/mod/glossary/lang/pt.json
+++ b/www/addons/mod/glossary/lang/pt.json
@@ -1,6 +1,6 @@
 {
     "attachment": "Anexo",
-    "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/zh-tw.json b/www/addons/mod/glossary/lang/zh-tw.json
index b7204b9d753..8c24d72719a 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/lesson/lang/de.json b/www/addons/mod/lesson/lang/de.json
index f3f317f9c91..dd4695db26b 100644
--- a/www/addons/mod/lesson/lang/de.json
+++ b/www/addons/mod/lesson/lang/de.json
@@ -22,6 +22,7 @@
     "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.",
+    "errorprefetchrandombranch": "Diese Lektion enthält einen Sprung zu einer zufälligen Seite. Sie kann nicht in der App versucht werden, ohne im Web begonnen zu sein.",
     "errorreviewretakenotlast": "Dieser Versuch kann nicht erneut angesehen werden, weil ein weiterer Versuch beendet wurde.",
     "finish": "Fertigstellen",
     "finishretakeoffline": "Dieser Versuch wurde offline beendet.",
diff --git a/www/addons/mod/lesson/lang/es-mx.json b/www/addons/mod/lesson/lang/es-mx.json
index 073ea430c66..b45c0a2544c 100644
--- a/www/addons/mod/lesson/lang/es-mx.json
+++ b/www/addons/mod/lesson/lang/es-mx.json
@@ -22,9 +22,10 @@
     "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.",
+    "errorprefetchrandombranch": "Esta lección contiene un salto hacia una página aleatoria de contenido; no puede ser intentada en la App hasta que haya sido comenzada en web.",
+    "errorreviewretakenotlast": "Este intento ya 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.",
+    "finishretakeoffline": "Este intento fue terminado 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",
@@ -75,7 +76,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.",
+    "warningretakefinished": "Este intento fue terminado en el sitio web.",
     "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 9d533a812b8..1dfe7b3bc47 100644
--- a/www/addons/mod/lesson/lang/nl.json
+++ b/www/addons/mod/lesson/lang/nl.json
@@ -22,9 +22,10 @@
     "emptypassword": "Wachtwoord kan niet leeg zijn",
     "enterpassword": "Geef het wachtwoord:",
     "eolstudentoutoftimenoanswers": "Je hebt geen enkele vraag beantwoord. Je hebt een 0 voor deze les",
+    "errorprefetchrandombranch": "Deze les bevat een sprong naar een willekeurige inhoudspagina. De les kan niet gestart worden in de app zonder dat die gestart is op het web.",
     "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",
+    "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",
diff --git a/www/addons/mod/lesson/lang/sr-cr.json b/www/addons/mod/lesson/lang/sr-cr.json
index fe5901ac751..a09a8dc2437 100644
--- a/www/addons/mod/lesson/lang/sr-cr.json
+++ b/www/addons/mod/lesson/lang/sr-cr.json
@@ -22,6 +22,7 @@
     "emptypassword": "Поље за лозинку не може бити празно",
     "enterpassword": "Молимо унесите лозинку:",
     "eolstudentoutoftimenoanswers": "Нисте одговорили ни на једно питање. Ваша оцена за ову лекцију је 0.",
+    "errorprefetchrandombranch": "Ова лекција садржи прелаз на наусимично одабрану страницу са садржајем, па је није могуће урадити у апликацији док се не покрене на веб сајту.",
     "errorreviewretakenotlast": "Ова покушај не може више бити прегледан зато што је завршен други покушај.",
     "finish": "Заврши",
     "finishretakeoffline": "Овај покушај је завршен у офлајн режиму.",
@@ -75,7 +76,7 @@
     "timeremaining": "Преостало време",
     "timetaken": "Потрошено време",
     "unseenpageinbranch": "Још неприказано питање унутар стране са садржајем и гранањем",
-    "warningretakefinished": "Покушај је завршен на сајту.",
+    "warningretakefinished": "Покушај је завршен на веб сајту.",
     "welldone": "Браво!",
     "youhaveseen": "Већ сте видели више од једне странице ове лекције.<br /> Желите ли почети од последње странице коју сте видели?",
     "youranswer": "Ваш одговор",
diff --git a/www/addons/mod/lesson/lang/sr-lt.json b/www/addons/mod/lesson/lang/sr-lt.json
index 03505574aa4..a98cc2242e1 100644
--- a/www/addons/mod/lesson/lang/sr-lt.json
+++ b/www/addons/mod/lesson/lang/sr-lt.json
@@ -22,6 +22,7 @@
     "emptypassword": "Polje za lozinku ne može biti prazno",
     "enterpassword": "Molimo unesite lozinku:",
     "eolstudentoutoftimenoanswers": "Niste odgovorili ni na jedno pitanje. Vaša ocena za ovu lekciju je 0.",
+    "errorprefetchrandombranch": "Ova lekcija sadrži prelaz na nausimično odabranu stranicu sa sadržajem, pa je nije moguće uraditi u aplikaciji dok se ne pokrene na veb sajtu.",
     "errorreviewretakenotlast": "Ova pokušaj ne može više biti pregledan zato što je završen drugi pokušaj.",
     "finish": "Završi",
     "finishretakeoffline": "Ovaj pokušaj je završen u oflajn režimu.",
@@ -75,7 +76,7 @@
     "timeremaining": "Preostalo vreme",
     "timetaken": "Potrošeno vreme",
     "unseenpageinbranch": "Još neprikazano pitanje unutar strane sa sadržajem i grananjem",
-    "warningretakefinished": "Pokušaj je završen na sajtu.",
+    "warningretakefinished": "Pokušaj je završen na veb sajtu.",
     "welldone": "Bravo!",
     "youhaveseen": "Već ste videli više od jedne stranice ove lekcije.<br /> Želite li početi od poslednje stranice koju ste videli?",
     "youranswer": "Vaš odgovor",
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/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/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/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/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/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/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/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/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/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/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/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/ca.json b/www/addons/notifications/lang/ca.json
index 077c0e53ffd..324cd60ecdb 100644
--- a/www/addons/notifications/lang/ca.json
+++ b/www/addons/notifications/lang/ca.json
@@ -1,6 +1,6 @@
 {
     "errorgetnotifications": "S'ha produït un error carregant les notificacions",
-    "notificationpreferences": "Preferències de les notificacions",
+    "notificationpreferences": "Preferències de notificació",
     "notifications": "Notificacions",
     "playsound": "Reprodueix el so",
     "therearentnotificationsyet": "No hi ha notificacions"
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/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/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
new file mode 100644
index 00000000000..2092b03a730
--- /dev/null
+++ b/www/addons/participants/lang/cs.json
@@ -0,0 +1,4 @@
+{
+    "noparticipants": "Pro tento kurz nenalezeni účastníci",
+    "participants": "Účastníci"
+}
\ 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/it.json b/www/addons/participants/lang/it.json
new file mode 100644
index 00000000000..0d16202be57
--- /dev/null
+++ b/www/addons/participants/lang/it.json
@@ -0,0 +1,4 @@
+{
+    "noparticipants": "In questo corso non sono stati trovati partecipanti",
+    "participants": "Partecipanti"
+}
\ 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/pt.json b/www/addons/participants/lang/pt.json
index 5fa07c6b1a2..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",
-    "participants": "Utilizadores"
+    "noparticipants": "Nenhum participante encontrado nesta disciplina",
+    "participants": "Participantes"
 }
\ 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/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/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/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/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/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/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/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 739d5c8e7fd..20ba97b397c 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ó 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",
+    "nosearchresults": "No hi ha resultats per la vostra cerca",
     "notenroled": "No us heu 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/es-mx.json b/www/core/components/courses/lang/es-mx.json
index ff09fef87cc..f01124ceca1 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": "Contraseña",
+    "password": "Clave de inscripción",
     "search": "Búsqueda",
     "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/lt.json b/www/core/components/courses/lang/lt.json
index 0e4e851ca1a..976ffd32237 100644
--- a/www/core/components/courses/lang/lt.json
+++ b/www/core/components/courses/lang/lt.json
@@ -4,19 +4,19 @@
     "categories": "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ų",
+    "nosearchresults": "Paieškos rezultatų nėra",
     "notenroled": "Nesate įsiregistravęs kaip šių kursų besimokantysis",
     "notenrollable": "Negalite įrašyti savęs į šį kursą.",
-    "password": "Slaptažodis",
+    "password": "Įrašymo raktas",
     "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.",
diff --git a/www/core/components/courses/lang/pt.json b/www/core/components/courses/lang/pt.json
index e4f8484550e..7379099e810 100644
--- a/www/core/components/courses/lang/pt.json
+++ b/www/core/components/courses/lang/pt.json
@@ -5,7 +5,7 @@
     "categories": "Categorias",
     "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",
+    "nosearchresults": "Não foram encontrados resultados na sua pesquisa",
     "notenroled": "Não está inscrito como aluno nesta disciplina",
     "notenrollable": "Não se pode inscrever nesta disciplina.",
-    "password": "Senha",
+    "password": "Senha de inscrição",
     "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.",
diff --git a/www/core/components/courses/lang/zh-tw.json b/www/core/components/courses/lang/zh-tw.json
index e718ad5dc31..69f2bba6433 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": "您的搜尋沒有結果",
+    "nosearchresults": "您的搜索沒有任何結果.",
     "notenroled": "您沒有加入此課程",
     "notenrollable": "您無法註冊本課程.",
-    "password": "密碼",
+    "password": "註冊碼",
     "search": "搜尋中...",
     "searchcourses": "搜尋課程",
     "searchcoursesadvice": "您可以使用搜尋課程按鈕以訪客身份登入, 或在允許它的課程中註冊",
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/es-mx.json b/www/core/components/fileuploader/lang/es-mx.json
index 17b65540fd6..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": "Envíos de 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/lt.json b/www/core/components/fileuploader/lang/lt.json
index 5ba8dca7c4f..30641efcee0 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": "Įvyko klaida skaitant failą {{$a}}",
+    "errorreadingfile": "Klaida nuskaitant failą.",
     "errorwhileuploading": "Klaida įkeliant failą.",
-    "file": "Failų pateikimai",
+    "file": "Failas",
     "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": "Į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/pt.json b/www/core/components/fileuploader/lang/pt.json
index 85ca6b926ab..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": "Submissão de ficheiros",
+    "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/tr.json b/www/core/components/fileuploader/lang/tr.json
index fe46cee9296..e08f35d4b08 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": "{{$a.file}} dosyasının boyutu çok büyük. En fazla {{$a.size}} MB büyüklüğünde dosya yükleyebilirsiniz.",
     "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 4c8d2fd2755..822f2a56862 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 a43c998d59d..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": "提交檔案",
+    "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/de.json b/www/core/components/login/lang/de.json
index bd82889ef7c..ca4835372f7 100644
--- a/www/core/components/login/lang/de.json
+++ b/www/core/components/login/lang/de.json
@@ -2,7 +2,7 @@
     "auth_email": "E-Mail-Registrierung",
     "authenticating": "Authentifizieren ...",
     "cancel": "Abbrechen",
-    "checksiteversion": "Prüfen Sie, ob Ihre Website mindestens Moodle 2.4 verwendet.",
+    "checksiteversion": "Prüfen Sie, ob die Website mindestens Moodle 2.4 verwendet.",
     "confirmdeletesite": "Möchten Sie '{{sitename}}' wirklich aus der Liste löschen?",
     "connect": "Verbinden",
     "connecttomoodle": "Website verbinden",
diff --git a/www/core/components/login/lang/es-mx.json b/www/core/components/login/lang/es-mx.json
index bdb60787d92..9533fe383b8 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/lt.json b/www/core/components/login/lang/lt.json
index d591b88110a..f1c04c57d49 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/pt.json b/www/core/components/login/lang/pt.json
index a218e010b94..e7d8c53e078 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/zh-tw.json b/www/core/components/login/lang/zh-tw.json
index 654cba89766..110d8e28784 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 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/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/lt.json b/www/core/components/question/lang/lt.json
index fc31749789f..3a47ab0fc41 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/pt.json b/www/core/components/question/lang/pt.json
index f0f684b92dd..f00329c4791 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/zh-tw.json b/www/core/components/question/lang/zh-tw.json
index 98bad903e59..f7fe56dce37 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/settings/lang/de.json b/www/core/components/settings/lang/de.json
index ee00cd09e80..e02a3a9c1f1 100644
--- a/www/core/components/settings/lang/de.json
+++ b/www/core/components/settings/lang/de.json
@@ -13,7 +13,7 @@
     "credits": "Mitwirkende",
     "currentlanguage": "Eingestellte Sprache",
     "deletesitefiles": "Möchten Sie wirklich alle von der Website '{{sitename}}' geladenen Dateien löschen?",
-    "deletesitefilestitle": "Website-Dateien löschen",
+    "deletesitefilestitle": "Dateien löschen",
     "deviceinfo": "Geräteinformationen",
     "deviceos": "Geräte-OS",
     "devicewebworkers": "Device Web Workers unterstützt",
@@ -26,7 +26,7 @@
     "enablerichtexteditor": "Texteditor aktivieren",
     "enablerichtexteditordescription": "Wenn diese Option aktiviert ist, wird an passenden Stellen ein Texteditor angezeigt.",
     "enablesyncwifi": "Nur mit WLAN synchronierieren",
-    "errordeletesitefiles": "Fehler beim Löschen der Website-Dateien",
+    "errordeletesitefiles": "Fehler beim Löschen der Dateien",
     "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)",
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/de.json b/www/core/components/sharedfiles/lang/de.json
index 6bbe564a7ac..0284aaba1ae 100644
--- a/www/core/components/sharedfiles/lang/de.json
+++ b/www/core/components/sharedfiles/lang/de.json
@@ -3,9 +3,9 @@
     "chooseactionrepeatedfile": "Eine Datei mit diesem Namen existiert bereits. Möchten Sie die vorhandene Datei ersetzen oder möchten Sie sie umbenennen in '{{$a}}'?",
     "errorreceivefilenosites": "Keine Websites gespeichert. Fügen Sie zuerst eine Website hinzu, bevor Sie eine Datei über die App freigeben.",
     "nosharedfiles": "Keine geteilten 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'.",
+    "nosharedfilestoupload": "Sie haben hier noch keine Datei zum Hochladen. 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",
     "sharedfiles": "Geteilte Dateien",
-    "successstorefile": "Die Datei wurde gespeichert. Sie können die Datei verwenden, um Sie in 'Meine Dateien' hochzuladen oder bei Aktivitäten anzuhängen."
+    "successstorefile": "Die Datei wurde gespeichert. Sie können die Datei in den Bereich 'Meine Dateien' hochladen oder bei Aktivitäten anhä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/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/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/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/de.json b/www/core/components/sidemenu/lang/de.json
index 0ed4e3b6221..4f3285f040c 100644
--- a/www/core/components/sidemenu/lang/de.json
+++ b/www/core/components/sidemenu/lang/de.json
@@ -5,5 +5,5 @@
     "logout": "Abmelden",
     "mycourses": "Meine Kurse",
     "togglemenu": "Menü umschalten",
-    "website": "Website"
+    "website": "Website im Browser"
 }
\ No newline at end of file
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/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/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/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/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/ca.json b/www/core/components/user/lang/ca.json
index a5f782e392b..fe01cc4b106 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",
diff --git a/www/core/components/user/lang/es-mx.json b/www/core/components/user/lang/es-mx.json
index dabd4a46d5b..4a165259a1c 100644
--- a/www/core/components/user/lang/es-mx.json
+++ b/www/core/components/user/lang/es-mx.json
@@ -4,14 +4,14 @@
     "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",
diff --git a/www/core/components/user/lang/lt.json b/www/core/components/user/lang/lt.json
index 5b7c9101b18..2f4a8565e55 100644
--- a/www/core/components/user/lang/lt.json
+++ b/www/core/components/user/lang/lt.json
@@ -1,17 +1,17 @@
 {
     "address": "Adresas",
     "city": "Miestas / miestelis",
-    "contact": "Kontaktas",
+    "contact": "Kontaktai",
     "country": "Šalis",
     "description": "Įžangos tekstas",
-    "details": "Sekimo išsami informacija",
+    "details": "Detalės",
     "detailsnotavailable": "Šio vartotojo duomenys jums nepasiekiami.",
     "editingteacher": "Dėstytojas",
     "email": "El. laiškas",
     "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",
diff --git a/www/core/components/user/lang/pt.json b/www/core/components/user/lang/pt.json
index 7b0f3e6910f..21a6936bf0c 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": "E-mail",
diff --git a/www/core/components/user/lang/tr.json b/www/core/components/user/lang/tr.json
index 0415b166cdc..49ebb7e3098 100644
--- a/www/core/components/user/lang/tr.json
+++ b/www/core/components/user/lang/tr.json
@@ -1,16 +1,16 @@
 {
     "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",
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/components/user/lang/zh-tw.json b/www/core/components/user/lang/zh-tw.json
index bb119de2d5b..36c566c489c 100644
--- a/www/core/components/user/lang/zh-tw.json
+++ b/www/core/components/user/lang/zh-tw.json
@@ -1,17 +1,17 @@
 {
     "address": "地址",
     "city": "縣/市",
-    "contact": "聯絡",
+    "contact": "連絡人",
     "country": "國家",
     "description": "說明",
-    "details": "SCO 追蹤細節",
+    "details": "明細",
     "detailsnotavailable": "這個使用者的詳細資料無法提供給您",
     "editingteacher": "教師",
     "email": "電子郵件",
     "emailagain": "電子郵件(再次確認)",
     "firstname": "名字",
     "interests": "興趣",
-    "invaliduser": "無效的用戶",
+    "invaliduser": "無效的使用者",
     "lastname": "姓氏",
     "manager": "管理者",
     "newpicture": "新照片",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index ccc449aef4c..3dda981a8e4 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": "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",
@@ -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",
@@ -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/de.json b/www/core/lang/de.json
index 99401c583d7..95f5238af2c 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -7,6 +7,10 @@
     "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.",
+    "captureaudio": "Audio aufnehmen",
+    "capturedimage": "Foto aufgenommen.",
+    "captureimage": "Foto aufnehmen",
+    "capturevideo": "Video aufnehmen",
     "category": "Kursbereich",
     "choose": "Auswahl",
     "choosedots": "Auswählen...",
@@ -90,8 +94,9 @@
     "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
+    "lastdownloaded": "Zuletzt heruntergeladen",
     "lastmodified": "Zuletzt geändert",
-    "lastsync": "Letztes Synchronisieren",
+    "lastsync": "Zuletzt synchronisiert",
     "listsep": ";",
     "loading": "Wird geladen...",
     "loadmore": "Mehr laden",
@@ -128,7 +133,7 @@
     "moduleintro": "Beschreibung",
     "mygroups": "Meine Gruppen",
     "name": "Name",
-    "networkerrormsg": "Kein Netzwerk",
+    "networkerrormsg": "Problem mit der Verbindung. Prüfen Sie die Verbindung und versuchen Sie es noch einmal.",
     "never": "Nie",
     "next": "Weiter",
     "no": "Nein",
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index 541896c8613..d701e3c7b2a 100644
--- a/www/core/lang/es-mx.json
+++ b/www/core/lang/es-mx.json
@@ -7,6 +7,10 @@
     "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.",
+    "captureaudio": "Grabar audio",
+    "capturedimage": "Foto tomada.",
+    "captureimage": "Tomar foto",
+    "capturevideo": "Grabar video",
     "category": "Categoría",
     "choose": "Elegir",
     "choosedots": "Elegir...",
@@ -87,9 +91,10 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagen",
     "imageviewer": "Visor de imágenes",
-    "info": "Info",
+    "info": "Información",
     "ios": "iOS",
     "labelsep": ":",
+    "lastdownloaded": "Última descarga",
     "lastmodified": "Última modicficación",
     "lastsync": "Última sincronzación",
     "listsep": ";",
@@ -128,14 +133,14 @@
     "moduleintro": "Descripción",
     "mygroups": "Mis grupos",
     "name": "Nombre",
-    "networkerrormsg": "Red no disponible o no funcionando.",
+    "networkerrormsg": "Hubo un problema para conectarse al sitio. Por favor revise su conexión e inténtelo nuevamente.",
     "never": "Nunca",
     "next": "Continuar",
     "no": "No",
     "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.",
@@ -143,8 +148,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 +166,7 @@
     "retry": "Reintentar",
     "save": "Guardar",
     "search": "Búsqueda",
-    "searching": "Buscar en",
+    "searching": "Buscando",
     "searchresults": "Resultado",
     "sec": "segundos",
     "secs": "segundos",
diff --git a/www/core/lang/lt.json b/www/core/lang/lt.json
index 2246e0b4405..dc367aa81da 100644
--- a/www/core/lang/lt.json
+++ b/www/core/lang/lt.json
@@ -38,7 +38,7 @@
     "days": "Dienos",
     "decsep": ".",
     "delete": "Pašalinti",
-    "deleting": "Naikinama",
+    "deleting": "Trinama",
     "description": "Įžangos tekstas",
     "dfdaymonthyear": "MM-DD-MMMM",
     "dfdayweekmonth": "ddd, D MMM",
@@ -128,7 +128,7 @@
     "nocomments": "Nėra komentarų",
     "nograde": "Nėra įvertinimų.",
     "none": "Nėra",
-    "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": "Išsaugoti",
     "search": "Paieška",
-    "searching": "Ieškoti",
+    "searching": "Ieškoma",
     "searchresults": "Ieškos rezultatai",
     "sec": "sek.",
     "secs": "sek.",
@@ -186,7 +186,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 30bbaafe113..d2f51f30b51 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -7,6 +7,10 @@
     "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.",
+    "captureaudio": "Audio opnemen",
+    "capturedimage": "Foto genomen.",
+    "captureimage": "Maak foto",
+    "capturevideo": "Film opnemen",
     "category": "Categorie",
     "choose": "Kies",
     "choosedots": "Kies...",
@@ -90,6 +94,7 @@
     "info": "Info",
     "ios": "iOS",
     "labelsep": ": ",
+    "lastdownloaded": "Laatste download",
     "lastmodified": "Laatst gewijzigd",
     "lastsync": "Laatste synchronisatie",
     "listsep": ";",
@@ -128,7 +133,7 @@
     "moduleintro": "Beschrijving",
     "mygroups": "Mijn groepen",
     "name": "Naam",
-    "networkerrormsg": "Netwerk niet ingeschakeld of werkt niet.",
+    "networkerrormsg": "Er was een probleem met het verbinden met de site. Controleer je verbinding en probeer opnieuw.",
     "never": "Nooit",
     "next": "Volgende",
     "no": "Nee",
diff --git a/www/core/lang/pt.json b/www/core/lang/pt.json
index 477b29aee06..bc73453706a 100644
--- a/www/core/lang/pt.json
+++ b/www/core/lang/pt.json
@@ -86,7 +86,7 @@
     "humanreadablesize": "{{size}} {{unit}}",
     "image": "Imagem",
     "imageviewer": "Visualizador de imagens",
-    "info": "Informação",
+    "info": "Informações",
     "ios": "iOS",
     "labelsep": ":&nbsp;",
     "lastmodified": "Modificado pela última vez:",
@@ -134,7 +134,7 @@
     "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.",
+    "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": "Guardar",
     "search": "Pesquisa",
-    "searching": "Pesquisar em",
+    "searching": "A procurar",
     "searchresults": "Resultados da procura",
     "sec": "segundo",
     "secs": "segundos",
@@ -194,7 +194,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/sr-cr.json b/www/core/lang/sr-cr.json
index ac8fa8b0c9b..eb73433f6fe 100644
--- a/www/core/lang/sr-cr.json
+++ b/www/core/lang/sr-cr.json
@@ -7,6 +7,10 @@
     "cancel": "Одустани",
     "cannotconnect": "Није могуће успоставити везу. Проверите да ли сте унели исправну URL адресу и да ли ваш сајт користи Moodle 2.4 или новију верзију.",
     "cannotdownloadfiles": "Преузимање датотека је онемогућено у подешавањима вашег мобилног сервиса. Обратите се администратору сајта.",
+    "captureaudio": "Сними аудио",
+    "capturedimage": "Снимљена слика",
+    "captureimage": "Усликај",
+    "capturevideo": "Сними видео",
     "category": "Категорија",
     "choose": "Изабери",
     "choosedots": "Изабери...",
@@ -89,6 +93,7 @@
     "info": "Инфо",
     "ios": "iOS",
     "labelsep": ":",
+    "lastdownloaded": "Последњи пут преузето",
     "lastmodified": "Последња измена",
     "lastsync": "Последња синхронизација",
     "listsep": ";",
@@ -113,7 +118,7 @@
     "moduleintro": "Опис",
     "mygroups": "Моје групе",
     "name": "Име",
-    "networkerrormsg": "Мрежа није укључена или не ради.",
+    "networkerrormsg": "Било је проблема са повезивањем на сајт. Проверите везу и покушајте поново.",
     "never": "Никад",
     "next": "Следећи",
     "no": "Не",
diff --git a/www/core/lang/sr-lt.json b/www/core/lang/sr-lt.json
index d622c1ce0a9..a35a6e51d90 100644
--- a/www/core/lang/sr-lt.json
+++ b/www/core/lang/sr-lt.json
@@ -7,6 +7,10 @@
     "cancel": "Odustani",
     "cannotconnect": "Nije moguće uspostaviti vezu. Proverite da li ste uneli ispravnu URL adresu i da li vaš sajt koristi Moodle 2.4 ili noviju verziju.",
     "cannotdownloadfiles": "Preuzimanje datoteka je onemogućeno u podešavanjima vašeg mobilnog servisa. Obratite se administratoru sajta.",
+    "captureaudio": "Snimi audio",
+    "capturedimage": "Snimljena slika",
+    "captureimage": "Uslikaj",
+    "capturevideo": "Snimi video",
     "category": "Kategorija",
     "choose": "Izaberi",
     "choosedots": "Izaberi...",
@@ -89,6 +93,7 @@
     "info": "Info",
     "ios": "iOS",
     "labelsep": ":",
+    "lastdownloaded": "Poslednji put preuzeto",
     "lastmodified": "Poslednja izmena",
     "lastsync": "Poslednja sinhronizacija",
     "listsep": ";",
@@ -113,7 +118,7 @@
     "moduleintro": "Opis",
     "mygroups": "Moje grupe",
     "name": "Ime",
-    "networkerrormsg": "Mreža nije uključena ili ne radi.",
+    "networkerrormsg": "Bilo je problema sa povezivanjem na sajt. Proverite vezu i pokušajte ponovo.",
     "never": "Nikad",
     "next": "Sledeći",
     "no": "Ne",
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index abf9c0a88d4..bf24a08c858 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": "Arama...",
-    "searching": "Aranan",
+    "searching": "Aranıyor",
     "searchresults": "Arama sonuçları",
     "sec": "sn",
     "secs": "sn",
diff --git a/www/core/lang/zh-tw.json b/www/core/lang/zh-tw.json
index 5144e85b257..50105704266 100644
--- a/www/core/lang/zh-tw.json
+++ b/www/core/lang/zh-tw.json
@@ -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": "顯示更多...",
@@ -187,7 +187,7 @@
     "twoparagraphs": "{{p1}}<br><br>{{p2}}",
     "uhoh": "噢哦!",
     "unexpectederror": "無法預期的錯誤. 請關閉並重新開啟應用程式, 再試一次.",
-    "unknown": "未知的",
+    "unknown": "未知",
     "unlimited": "無限制",
     "unzipping": "解壓縮中",
     "upgraderunning": "網站正在升級中，請稍後再試。",

From d1d53d1912c96e909a3b7841e0c793c81fd72f12 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 28 Jul 2017 08:49:42 +0200
Subject: [PATCH 109/118] MOBILE-2178 database: Show offline new entries if no
 online

---
 www/addons/mod/data/controllers/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 168499440ce..16d48783748 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -191,7 +191,7 @@ angular.module('mm.addons.mod_data')
             }
         }).then(function(entries) {
             var numEntries = (entries && entries.entries && entries.entries.length) || 0;
-            $scope.isEmpty = !numEntries && Object.keys($scope.offlineActions).length <= 0;
+            $scope.isEmpty = !numEntries && !Object.keys($scope.offlineActions).length && !Object.keys($scope.offlineEntries).length;
             $scope.hasNextPage = numEntries >= mmaModDataPerPage && (($scope.search.page + 1) * mmaModDataPerPage) < entries.totalcount;
             $scope.entriesRendered = "";
 

From 8222b41ab6f5017b6ed66559ab76afacede67477 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 28 Jul 2017 12:06:42 +0200
Subject: [PATCH 110/118] MOBILE-2178 ionic: Fix keyboard hiding deep input
 elements

---
 www/core/main.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/www/core/main.js b/www/core/main.js
index 289fb5aef6c..7889fd96dfa 100644
--- a/www/core/main.js
+++ b/www/core/main.js
@@ -287,11 +287,12 @@ angular.module('mm.core', ['pascalprecht.translate'])
             }
         });
 
-        if (!$mmApp.isDevice()) {
-            // Re-define getParentOrSelfWithClass to change the default value of the depth param.
-            // This is to allow scrolling with trackpad when hovering deep elements.
-            var originalFunction = ionic.DomUtil.getParentOrSelfWithClass;
-            ionic.DomUtil.getParentOrSelfWithClass = function(e, className, depth) {
+        // In desktop, re-define getParentOrSelfWithClass to allow scrolling with trackpad when hovering deep elements.
+        // In iOS, re-define getParentWithClass to prevent the keyboard to hide deep input elements.
+        var fnName = !$mmApp.isDevice() ? 'getParentOrSelfWithClass' : (ionic.Platform.isIOS() ? 'getParentWithClass' : '');
+        if (fnName) {
+            var originalFunction = ionic.DomUtil[fnName];
+            ionic.DomUtil[fnName] = function(e, className, depth) {
                 depth = depth || 20;
                 return originalFunction(e, className, depth);
             };

From b02a850f218452e14d26551f7ca7a0583fc57804 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 28 Jul 2017 12:54:24 +0200
Subject: [PATCH 111/118] MOBILE-2178 database: Show comments in single view

---
 www/addons/mod/data/controllers/entry.js          | 1 +
 www/addons/mod/data/directives/action.js          | 3 ++-
 www/addons/mod/data/services/helper.js            | 6 ++++--
 www/addons/mod/data/templates/action.html         | 2 +-
 www/addons/mod/data/templates/entry.html          | 1 +
 www/core/components/comments/services/comments.js | 4 ++--
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index be4b8fdea49..5d2f448722a 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -109,6 +109,7 @@ angular.module('mm.addons.mod_data')
             var actions = $mmaModDataHelper.getActions(data, access, $scope.entry);
 
             $scope.entryRendered = $mmaModDataHelper.displayShowFields(data.singletemplate, $scope.fields, entryId, 'show', actions);
+            $scope.showComments = actions.comments;
 
             return $mmaModDataHelper.getPageInfoByEntry(data.id, entryId, $scope.selectedGroup).then(function(result) {
                 $scope.previousId = result.previousId;
diff --git a/www/addons/mod/data/directives/action.js b/www/addons/mod/data/directives/action.js
index c934ee8d8c8..747edede8f9 100644
--- a/www/addons/mod/data/directives/action.js
+++ b/www/addons/mod/data/directives/action.js
@@ -28,7 +28,8 @@ angular.module('mm.addons.mod_data')
         scope: {
             action: '@',
             database: '=',
-            entry: '=?'
+            entry: '=?',
+            mode: '@'
         },
         templateUrl: 'addons/mod/data/templates/action.html',
         link: function(scope) {
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 437cc323324..606c63d591c 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -58,7 +58,8 @@ angular.module('mm.addons.mod_data')
             replace = new RegExp(replace, 'gi');
 
             // Replace field by a generic directive.
-            render = '<mma-mod-data-field mode="'+mode+'" field="fields['+ field.id + ']" value="entries['+ entryId +'].contents['+ field.id + ']" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
+            render = '<mma-mod-data-field field="fields['+ field.id + ']" value="entries['+ entryId +'].contents['+ field.id +
+                        ']" mode="'+mode+'" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
             template = template.replace(replace, render);
         });
 
@@ -69,7 +70,8 @@ angular.module('mm.addons.mod_data')
                     // Render more url directly because it can be part of an HTML attribute.
                     render = $mmSite.getURL() + '/mod/data/view.php?d={{data.id}}&rid=' + entryId;
                 } else {
-                    render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +']" database="data"></mma-mod-data-action>';
+                    render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +
+                                ']" mode="'+mode+'" database="data"></mma-mod-data-action>';
                 }
                 template = template.replace(replace, render);
             } else {
diff --git a/www/addons/mod/data/templates/action.html b/www/addons/mod/data/templates/action.html
index 1675b58fe80..e0e34ec144e 100644
--- a/www/addons/mod/data/templates/action.html
+++ b/www/addons/mod/data/templates/action.html
@@ -5,7 +5,7 @@
 <a ng-if="action == 'approve'" class="button button-icon icon ion-thumbsup" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&approve={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.approve' | translate }}"></a>
 <a ng-if="action == 'disapprove'" class="button button-icon icon ion-minus-circled" ng-href="{{url}}/mod/data/view.php?d={{entry.dataid}}&disapprove={{entry.id}}" mm-link capture-link="true" title="{{ 'mma.mod_data.disapprove' | translate }}"></a>
 
-<mm-comments ng-if="action == 'comments'" context-level="module" instance-id="{{database.coursemodule}}" component="mod_data" item-id="{{entry.id}}" area="database_entry"></mm-comments>
+<mm-comments ng-if="action == 'comments' && mode == 'list'" context-level="module" instance-id="{{database.coursemodule}}" component="mod_data" item-id="{{entry.id}}" area="database_entry"></mm-comments>
 
 <span ng-if="action == 'moreurl'">{{url}}/mod/data/view.php?d={{entry.dataid}}&amp;rid={{entry.id}}</span>
 <span ng-if="action == 'timeadded'">{{ entry.timecreated * 1000 |  mmFormatDate:"dffulldate" }}</span>
diff --git a/www/addons/mod/data/templates/entry.html b/www/addons/mod/data/templates/entry.html
index e24fee064a2..65dd300b012 100644
--- a/www/addons/mod/data/templates/entry.html
+++ b/www/addons/mod/data/templates/entry.html
@@ -30,6 +30,7 @@
                     {{ entryRendered }}
                 </mm-format-text>
             </div>
+            <mm-comments class="item" ng-if="showComments" context-level="module" instance-id="{{data.coursemodule}}" component="mod_data" item-id="{{entry.id}}" area="database_entry"></mm-comments>
             <div ng-if="previousId || nextId" class="item item-text-wrap row-buttons responsive-sm">
                 <button ng-if="previousId" class="button button-block icon-left ion-chevron-left" ng-click="gotoEntry(previousId)">
                     {{ 'mm.core.previous' | translate }}
diff --git a/www/core/components/comments/services/comments.js b/www/core/components/comments/services/comments.js
index b8569dfd6ee..c5c0f945b0a 100644
--- a/www/core/components/comments/services/comments.js
+++ b/www/core/components/comments/services/comments.js
@@ -75,9 +75,9 @@ angular.module('mm.core.comments')
         return $mmSitesManager.getSite(siteId).then(function(site) {
             var params = {
                 "contextlevel": contextLevel,
-                "instanceid": instanceId,
+                "instanceid": parseInt(instanceId, 10),
                 "component": component,
-                "itemid": itemId
+                "itemid": parseInt(itemId, 10)
             },
             preSets = {};
 

From 99d401200262ccbc80a70889ab78ad5d84e6cebc Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 28 Jul 2017 13:40:36 +0200
Subject: [PATCH 112/118] MOBILE-2178 database: Fix clicking links

---
 www/addons/mod/data/fields/url/template.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/addons/mod/data/fields/url/template.html b/www/addons/mod/data/fields/url/template.html
index 1a97133288e..cd181b6fd86 100644
--- a/www/addons/mod/data/fields/url/template.html
+++ b/www/addons/mod/data/fields/url/template.html
@@ -1,3 +1,3 @@
 <span ng-if="mode == 'edit'" mm-mark-required="{{field.required}}"></span>
 <input ng-if="mode != 'show'" type="text" placeholder="{{field.name}}" name="f_{{field.id}}" ng-model="val">
-<a ng-if="mode == 'show' && value && value.content" ng-href="{{value.content}}">{{field.name}}</a>
+<a ng-if="mode == 'show' && value && value.content" ng-href="{{value.content}}" mm-link capture-link="true">{{field.name}}</a>

From 7dd7efc9a8a862db7bd884edd1ec8ac738373ea0 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 28 Jul 2017 13:55:50 +0200
Subject: [PATCH 113/118] MOBILE-2178 database: Fix prefetch intro files

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

diff --git a/www/addons/mod/data/services/prefetch_handler.js b/www/addons/mod/data/services/prefetch_handler.js
index e7956f1a06f..bdcf40f3a66 100644
--- a/www/addons/mod/data/services/prefetch_handler.js
+++ b/www/addons/mod/data/services/prefetch_handler.js
@@ -81,7 +81,7 @@ angular.module('mm.addons.mod_data')
             files = [];
 
         return $mmaModData.getDatabase(courseId, module.id, siteId, forceCache).then(function(data) {
-            files = self.getIntroFilesFromInstance(module, database);
+            files = self.getIntroFilesFromInstance(module, data);
 
             database = data;
             return $mmGroups.getActivityGroupInfo(module.id, false, undefined, siteId).then(function(groupInfo) {

From 6ebd806abb77d122b9fc9e8d3539d3fb264ee7f9 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 28 Jul 2017 14:45:10 +0200
Subject: [PATCH 114/118] MOBILE-2178 database: Don't use directive for
 approvalstatus action

---
 www/addons/mod/data/controllers/entry.js  |  3 ++-
 www/addons/mod/data/controllers/index.js  |  2 +-
 www/addons/mod/data/services/helper.js    | 18 ++++++++++--------
 www/addons/mod/data/templates/action.html |  6 ------
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/www/addons/mod/data/controllers/entry.js b/www/addons/mod/data/controllers/entry.js
index 5d2f448722a..156098179ec 100644
--- a/www/addons/mod/data/controllers/entry.js
+++ b/www/addons/mod/data/controllers/entry.js
@@ -108,7 +108,8 @@ angular.module('mm.addons.mod_data')
 
             var actions = $mmaModDataHelper.getActions(data, access, $scope.entry);
 
-            $scope.entryRendered = $mmaModDataHelper.displayShowFields(data.singletemplate, $scope.fields, entryId, 'show', actions);
+            $scope.entryRendered = $mmaModDataHelper.displayShowFields(data.singletemplate, $scope.fields,
+                    $scope.entry, 'show', actions);
             $scope.showComments = actions.comments;
 
             return $mmaModDataHelper.getPageInfoByEntry(data.id, entryId, $scope.selectedGroup).then(function(result) {
diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index 16d48783748..e192479714e 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -254,7 +254,7 @@ angular.module('mm.addons.mod_data')
 
                         var actions = $mmaModDataHelper.getActions(data, $scope.access, entry);
 
-                        entriesHTML += $mmaModDataHelper.displayShowFields(data.listtemplate, $scope.fields, entry.id, 'list', actions);
+                        entriesHTML += $mmaModDataHelper.displayShowFields(data.listtemplate, $scope.fields, entry, 'list', actions);
                     });
                     entriesHTML += data.listtemplatefooter;
 
diff --git a/www/addons/mod/data/services/helper.js b/www/addons/mod/data/services/helper.js
index 606c63d591c..0bb1c466418 100644
--- a/www/addons/mod/data/services/helper.js
+++ b/www/addons/mod/data/services/helper.js
@@ -22,7 +22,7 @@ angular.module('mm.addons.mod_data')
  * @name $mmaModDataHelper
  */
 .factory('$mmaModDataHelper', function($mmaModData, $mmaModDataFieldsDelegate, $q, mmaModDataComponent, $mmFileUploader, $mmSite,
-        $mmaModDataOffline, $mmFS, $mmFileUploaderHelper, $mmSitesManager) {
+        $mmaModDataOffline, $mmFS, $mmFileUploaderHelper, $mmSitesManager, $translate) {
 
     var self = {
             searchOther: {
@@ -39,12 +39,12 @@ angular.module('mm.addons.mod_data')
      * @name $mmaModDataHelper#displayShowFields
      * @param {String} template   Template HMTL.
      * @param {Array}  fields     Fields that defines every content in the entry.
-     * @param {Number} entryId    Entry ID.
+     * @param {Object} entry      Entry.
      * @param {String} mode       Mode list or show.
      * @param {Object} actions    Actions that can be performed to the record.
      * @return {String}           Generated HTML.
      */
-    self.displayShowFields = function(template, fields, entryId, mode, actions) {
+    self.displayShowFields = function(template, fields, entry, mode, actions) {
         if (!template) {
             return "";
         }
@@ -58,19 +58,21 @@ angular.module('mm.addons.mod_data')
             replace = new RegExp(replace, 'gi');
 
             // Replace field by a generic directive.
-            render = '<mma-mod-data-field field="fields['+ field.id + ']" value="entries['+ entryId +'].contents['+ field.id +
-                        ']" mode="'+mode+'" database="data" view-action="gotoEntry('+ entryId +')"></mma-mod-data-field>';
+            render = '<mma-mod-data-field field="fields['+ field.id + ']" value="entries['+ entry.id +'].contents['+ field.id +
+                        ']" mode="'+mode+'" database="data" view-action="gotoEntry('+ entry.id +')"></mma-mod-data-field>';
             template = template.replace(replace, render);
         });
 
         angular.forEach(actions, function(enabled, action) {
             replace = new RegExp("##" + action + "##", 'gi');
             if (enabled) {
-                if (action == "moreurl") {
+                if (action == 'moreurl') {
                     // Render more url directly because it can be part of an HTML attribute.
-                    render = $mmSite.getURL() + '/mod/data/view.php?d={{data.id}}&rid=' + entryId;
+                    render = $mmSite.getURL() + '/mod/data/view.php?d={{data.id}}&rid=' + entry.id;
+                } else if (action == 'approvalstatus') {
+                    render = $translate.instant('mma.mod_data.' + (entry.approved ? 'approved' : 'notapproved'));
                 } else {
-                    render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entryId +
+                    render = '<mma-mod-data-action action="' + action + '" entry="entries['+ entry.id +
                                 ']" mode="'+mode+'" database="data"></mma-mod-data-action>';
                 }
                 template = template.replace(replace, render);
diff --git a/www/addons/mod/data/templates/action.html b/www/addons/mod/data/templates/action.html
index e0e34ec144e..8c111539f47 100644
--- a/www/addons/mod/data/templates/action.html
+++ b/www/addons/mod/data/templates/action.html
@@ -7,15 +7,9 @@
 
 <mm-comments ng-if="action == 'comments' && mode == 'list'" context-level="module" instance-id="{{database.coursemodule}}" component="mod_data" item-id="{{entry.id}}" area="database_entry"></mm-comments>
 
-<span ng-if="action == 'moreurl'">{{url}}/mod/data/view.php?d={{entry.dataid}}&amp;rid={{entry.id}}</span>
 <span ng-if="action == 'timeadded'">{{ entry.timecreated * 1000 |  mmFormatDate:"dffulldate" }}</span>
 <span ng-if="action == 'timemodified'">{{ entry.timemodified * 1000 |  mmFormatDate:"dffulldate" }}</span>
 
-<span ng-if="action == 'approvalstatus'">
-    <span ng-if="entry.approved">{{ 'mma.mod_data.approved' | translate }}</span>
-    <span ng-if="!entry.approved">{{ 'mma.mod_data.notapproved' | translate }}</span>
-</span>
-
 <a ng-if="action == 'userpicture'" mm-user-link courseid="{{database.courseid}}" userid="{{entry.userid}}" title="{{entry.fullname}}">
     <img ng-if="userpicture" ng-src="{{userpicture}}" class="avatar-round" alt="{{ 'mm.core.pictureof' | translate:{$a: entry.fullname} }}" role="presentation" mm-external-content>
     <img ng-if="!userpicture" class="avatar-round" src="img/user-avatar.png" alt="{{ 'mm.core.pictureof' | translate:{$a: entry.fullname} }}" role="presentation">

From 3f554c35bb509acda247516d6decc5d4d292c8c5 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Fri, 28 Jul 2017 14:50:32 +0200
Subject: [PATCH 115/118] MOBILE-2178 database: Use DESC order by default

---
 www/addons/mod/data/controllers/index.js | 4 ++--
 www/addons/mod/data/scss/styles.scss     | 2 +-
 www/addons/mod/data/services/data.js     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/addons/mod/data/controllers/index.js b/www/addons/mod/data/controllers/index.js
index e192479714e..65a1ea09c17 100644
--- a/www/addons/mod/data/controllers/index.js
+++ b/www/addons/mod/data/controllers/index.js
@@ -48,7 +48,7 @@ angular.module('mm.addons.mod_data')
 
     $scope.search = {
         sortBy: "0",
-        sortDirection: "ASC",
+        sortDirection: "DESC",
         page: 0,
         text: "",
         searching: false,
@@ -386,7 +386,7 @@ angular.module('mm.addons.mod_data')
     // Reset all search filters and closes the modal.
     $scope.searchReset = function() {
         $scope.search.sortBy = "0";
-        $scope.search.sortDirection = "ASC";
+        $scope.search.sortDirection = "DESC";
         $scope.search.text = "";
         $scope.search.advanced = {};
         $scope.search.searchingAdvanced = false;
diff --git a/www/addons/mod/data/scss/styles.scss b/www/addons/mod/data/scss/styles.scss
index a45596daa7d..4fcffde0547 100644
--- a/www/addons/mod/data/scss/styles.scss
+++ b/www/addons/mod/data/scss/styles.scss
@@ -25,7 +25,7 @@
     padding: 0;
   }
 
-  td {
+  td, th {
     @extend .col;
   }
 }
diff --git a/www/addons/mod/data/services/data.js b/www/addons/mod/data/services/data.js
index 5454e64c275..29e819afac1 100644
--- a/www/addons/mod/data/services/data.js
+++ b/www/addons/mod/data/services/data.js
@@ -315,7 +315,7 @@ angular.module('mm.addons.mod_data')
                     perpage: perPage || mmaModDataPerPage,
                     groupid: groupId || 0,
                     sort: sort || "0",
-                    order: order || "ASC"
+                    order: order || "DESC"
                 },
                 preSets = {
                     cacheKey: getEntriesCacheKey(dataId, groupId)

From de32b32da4b27f093497d38e8f6226097699bec3 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Fri, 28 Jul 2017 15:32:30 +0200
Subject: [PATCH 116/118] MOBILE-2178 release: Automatic translation

---
 www/core/lang/ar.json    | 4 ++--
 www/core/lang/bg.json    | 4 ++--
 www/core/lang/ca.json    | 4 ++--
 www/core/lang/cs.json    | 4 ++--
 www/core/lang/da.json    | 4 ++--
 www/core/lang/de.json    | 4 ++--
 www/core/lang/el.json    | 4 ++--
 www/core/lang/es-mx.json | 4 ++--
 www/core/lang/es.json    | 4 ++--
 www/core/lang/eu.json    | 4 ++--
 www/core/lang/fa.json    | 4 ++--
 www/core/lang/fr.json    | 4 ++--
 www/core/lang/he.json    | 4 ++--
 www/core/lang/hu.json    | 4 ++--
 www/core/lang/it.json    | 4 ++--
 www/core/lang/ja.json    | 4 ++--
 www/core/lang/lt.json    | 4 ++--
 www/core/lang/nl.json    | 4 ++--
 www/core/lang/pl.json    | 4 ++--
 www/core/lang/pt-br.json | 4 ++--
 www/core/lang/pt.json    | 4 ++--
 www/core/lang/ro.json    | 4 ++--
 www/core/lang/ru.json    | 4 ++--
 www/core/lang/sv.json    | 4 ++--
 www/core/lang/tr.json    | 4 ++--
 www/core/lang/uk.json    | 4 ++--
 www/core/lang/zh-cn.json | 4 ++--
 www/core/lang/zh-tw.json | 4 ++--
 28 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/www/core/lang/ar.json b/www/core/lang/ar.json
index f8500db1399..aae0e45feee 100644
--- a/www/core/lang/ar.json
+++ b/www/core/lang/ar.json
@@ -29,7 +29,7 @@
     "deleting": "حذف",
     "description": "نص المقدمة",
     "done": "تم",
-    "download": "تنزيل",
+    "download": "تحميل",
     "downloading": "يتم التنزيل",
     "edit": "تحرير",
     "error": "حصل خطاء",
@@ -97,7 +97,7 @@
     "pagea": "صفحة {{$a}}",
     "phone": "هاتف",
     "pictureof": "صورة {{$a}}",
-    "previous": "الوضع السابق",
+    "previous": "السابق",
     "pulltorefresh": "اسحب للأسفل ليتم التحديث",
     "refresh": "تنشيط",
     "required": "مطلوب",
diff --git a/www/core/lang/bg.json b/www/core/lang/bg.json
index ed2182d2b21..76bce7bff1a 100644
--- a/www/core/lang/bg.json
+++ b/www/core/lang/bg.json
@@ -27,7 +27,7 @@
     "deleting": "Изтриване",
     "description": "Описание",
     "done": "Извършено",
-    "download": "Щракнете за да изтеглите експортирания файл с категории",
+    "download": "Изтегляне",
     "downloading": "Изтегляне",
     "edit": "Редактиране",
     "error": "Възникна непозната грешка!",
@@ -96,7 +96,7 @@
     "online": "Онлайн",
     "phone": "Телефон",
     "pictureof": "Снимка на {{$a}}",
-    "previous": "Предишна",
+    "previous": "Обратно",
     "pulltorefresh": "",
     "refresh": "Опресняване",
     "required": "Задължителен",
diff --git a/www/core/lang/ca.json b/www/core/lang/ca.json
index 3dda981a8e4..21fd84a95a3 100644
--- a/www/core/lang/ca.json
+++ b/www/core/lang/ca.json
@@ -51,7 +51,7 @@
     "discard": "Descarta",
     "dismiss": "Ignora",
     "done": "Fet",
-    "download": "Descarrega",
+    "download": "Baixa",
     "downloading": "S'està descarregant",
     "edit": "Edita",
     "emptysplit": "Aquesta pàgina estarà buida si el panell esquerre està buit o s'està carregant.",
@@ -151,7 +151,7 @@
     "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",
diff --git a/www/core/lang/cs.json b/www/core/lang/cs.json
index f43346b1255..704e5887bf2 100644
--- a/www/core/lang/cs.json
+++ b/www/core/lang/cs.json
@@ -52,7 +52,7 @@
     "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á.",
@@ -152,7 +152,7 @@
     "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",
diff --git a/www/core/lang/da.json b/www/core/lang/da.json
index f3f98b8acbb..849e6a2f3a0 100644
--- a/www/core/lang/da.json
+++ b/www/core/lang/da.json
@@ -38,7 +38,7 @@
     "deleting": "Sletter",
     "description": "Beskrivelse",
     "done": "Færdig",
-    "download": "Klik for at downloade den eksporterede kategorifil",
+    "download": "Download",
     "downloading": "Downloader",
     "edit": "Rediger",
     "error": "Fejl opstået",
@@ -123,7 +123,7 @@
     "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",
diff --git a/www/core/lang/de.json b/www/core/lang/de.json
index 95f5238af2c..59516edcac7 100644
--- a/www/core/lang/de.json
+++ b/www/core/lang/de.json
@@ -56,7 +56,7 @@
     "discard": "Verwerfen",
     "dismiss": "Abbrechen",
     "done": "Erledigt",
-    "download": "Download",
+    "download": "Herunterladen",
     "downloading": "Herunterladen ...",
     "edit": "Bearbeiten",
     "emptysplit": "Diese Seite ist leer, wenn das linke Panel leer ist oder noch geladen wird.",
@@ -157,7 +157,7 @@
     "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",
diff --git a/www/core/lang/el.json b/www/core/lang/el.json
index 09a4738dde3..a442a65b656 100644
--- a/www/core/lang/el.json
+++ b/www/core/lang/el.json
@@ -51,7 +51,7 @@
     "discard": "Απόρριψη",
     "dismiss": "Απόρριψη",
     "done": "Ολοκληρώθηκε",
-    "download": "Κατέβασμα",
+    "download": "Μεταφόρτωση",
     "downloading": "Κατέβασμα",
     "edit": "Επεξεργασία ",
     "emptysplit": "Αυτή η σελίδα θα εμφανιστεί κενή, εάν ο αριστερός πίνακας είναι κενός ή φορτώνεται.",
@@ -150,7 +150,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Τηλέφωνο",
     "pictureof": "Φωτογραφία {{$a}}",
-    "previous": "Προηγούμενη κατάσταση",
+    "previous": "Προηγούμενο",
     "pulltorefresh": "Τραβήξτε προς τα κάτω για ανανέωση",
     "redirectingtosite": "Θα μεταφερθείτε στο site.",
     "refresh": "Ανανέωση",
diff --git a/www/core/lang/es-mx.json b/www/core/lang/es-mx.json
index d701e3c7b2a..662830dfc48 100644
--- a/www/core/lang/es-mx.json
+++ b/www/core/lang/es-mx.json
@@ -56,7 +56,7 @@
     "discard": "Descartar",
     "dismiss": "Descartar",
     "done": "Hecho",
-    "download": "Haga clic para descargar el archivo de categorías exportadas",
+    "download": "Descargar",
     "downloading": "Descargando",
     "edit": "Editar",
     "emptysplit": "Esta página aparecerá en blanco si el panel izquierdo está vacío o si está cargando.",
@@ -157,7 +157,7 @@
     "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",
diff --git a/www/core/lang/es.json b/www/core/lang/es.json
index f46bf4c1915..33d6d69cde8 100644
--- a/www/core/lang/es.json
+++ b/www/core/lang/es.json
@@ -51,7 +51,7 @@
     "discard": "Descartar",
     "dismiss": "Descartar",
     "done": "Hecho",
-    "download": "Haga clic para descargar el archivo de categorías exportadas",
+    "download": "Descargar",
     "downloading": "Descargando...",
     "edit": "Editar",
     "emptysplit": "Esta página aparecerá en blanco si el panel izquierdo está vacío o si está cargando.",
@@ -151,7 +151,7 @@
     "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",
diff --git a/www/core/lang/eu.json b/www/core/lang/eu.json
index 64a96e6e58e..e89366b2e26 100644
--- a/www/core/lang/eu.json
+++ b/www/core/lang/eu.json
@@ -51,7 +51,7 @@
     "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.",
@@ -151,7 +151,7 @@
     "percentagenumber": "%{{$a}}",
     "phone": "Telefonoa",
     "pictureof": "{{$a}}-ren irudia",
-    "previous": "Aurreko egoera",
+    "previous": "Aurrekoa",
     "pulltorefresh": "Sakatu freskatzeko",
     "redirectingtosite": "Gunera berbideratua izango zara.",
     "refresh": "Freskatu",
diff --git a/www/core/lang/fa.json b/www/core/lang/fa.json
index b76dc72cc48..80f79164356 100644
--- a/www/core/lang/fa.json
+++ b/www/core/lang/fa.json
@@ -34,7 +34,7 @@
     "deleting": "در حال حذف",
     "description": "توصیف",
     "done": "پر کرده است",
-    "download": "دریافت فایل",
+    "download": "دریافت",
     "edit": "ویرایش",
     "error": "خطا رخ داد",
     "errordownloading": "خطا در دانلود فایل",
@@ -90,7 +90,7 @@
     "pagea": "صفحه {{$a}}",
     "phone": "تلفن",
     "pictureof": "عکس {{$a}}",
-    "previous": "حالت قبلی",
+    "previous": "قبلی",
     "pulltorefresh": "برای تازه‌سازی بکشید",
     "refresh": "تازه‌سازی",
     "required": "الزامی بودن",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index 2605de7b114..72df1da4a3d 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -52,7 +52,7 @@
     "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",
     "emptysplit": "Cette page paraîtra vide si le panneau de gauche est vide ou en cours de chargement.",
@@ -152,7 +152,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",
diff --git a/www/core/lang/he.json b/www/core/lang/he.json
index 0c54986a098..abb00055b11 100644
--- a/www/core/lang/he.json
+++ b/www/core/lang/he.json
@@ -36,7 +36,7 @@
     "dflastweekdate": "dddd",
     "dftimedate": "hh[:]mm",
     "done": "גמור",
-    "download": "יש להקליק להורדת קובץ הקטגוריות שיוצא",
+    "download": "הורדה",
     "downloading": "מוריד",
     "edit": "עריכה",
     "error": "שגיאה התרחשה",
@@ -112,7 +112,7 @@
     "pagea": "עמוד {{$a}}",
     "phone": "טלפון",
     "pictureof": "תמונה של {{$a}}",
-    "previous": "מצב קודם",
+    "previous": "קודם",
     "pulltorefresh": "משיכה לרענון",
     "refresh": "רענון",
     "required": "נדרש",
diff --git a/www/core/lang/hu.json b/www/core/lang/hu.json
index a2db374e12b..3ae8c76a690 100644
--- a/www/core/lang/hu.json
+++ b/www/core/lang/hu.json
@@ -31,7 +31,7 @@
     "deleting": "Törlés",
     "description": "Leírás",
     "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": "Hiba történt.",
@@ -87,7 +87,7 @@
     "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",
diff --git a/www/core/lang/it.json b/www/core/lang/it.json
index 1ab08758210..08162d7a645 100644
--- a/www/core/lang/it.json
+++ b/www/core/lang/it.json
@@ -42,7 +42,7 @@
     "dfmediumdate": "LLL",
     "dftimedate": "h[:]mm A",
     "done": "Fatto",
-    "download": "Scarica",
+    "download": "Download",
     "downloading": "Scaricamento in corso",
     "edit": "Modifica",
     "error": "Si è verificato un errore",
@@ -133,7 +133,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefono",
     "pictureof": "Immagine {{$a}}",
-    "previous": "Stato precedente",
+    "previous": "Precedente",
     "pulltorefresh": "Trascina per aggiornare",
     "refresh": "Aggiorna",
     "required": "Obbligatorio",
diff --git a/www/core/lang/ja.json b/www/core/lang/ja.json
index 7c3934c1c38..09c885988cd 100644
--- a/www/core/lang/ja.json
+++ b/www/core/lang/ja.json
@@ -52,7 +52,7 @@
     "discard": "無視",
     "dismiss": "取消",
     "done": "完了",
-    "download": "エクスポートしたカテゴリファイルをダウンロードする",
+    "download": "ダウンロード",
     "downloading": "ダウンロード中",
     "edit": "編集",
     "emptysplit": "左パネルが空またはロード中のため本ページは空白",
@@ -138,7 +138,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "電話",
     "pictureof": "画像 {{$a}}",
-    "previous": "前の状態に戻す",
+    "previous": "前へ",
     "pulltorefresh": "引いて更新",
     "redirectingtosite": "サイトにリダイレクトされます。",
     "refresh": "リフレッシュ",
diff --git a/www/core/lang/lt.json b/www/core/lang/lt.json
index dc367aa81da..8b5aff4a572 100644
--- a/www/core/lang/lt.json
+++ b/www/core/lang/lt.json
@@ -48,7 +48,7 @@
     "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 klaida",
@@ -145,7 +145,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefonas",
     "pictureof": "{{$a}} paveikslėlis",
-    "previous": "Ankstesnė būsena",
+    "previous": "Ankstesnis",
     "pulltorefresh": "Atnaujinti",
     "redirectingtosite": "Būsite nukreiptas į svetainę.",
     "refresh": "Atnaujinti",
diff --git a/www/core/lang/nl.json b/www/core/lang/nl.json
index d2f51f30b51..5bffa08b133 100644
--- a/www/core/lang/nl.json
+++ b/www/core/lang/nl.json
@@ -56,7 +56,7 @@
     "discard": "Verwerpen",
     "dismiss": "Verwijderen",
     "done": "Voltooid",
-    "download": "Klik om het bestand met de geëxporteerde categorie te downloaden",
+    "download": "Download",
     "downloading": "Downloaden",
     "edit": "Bewerk",
     "emptysplit": "Deze pagina zal leeg verschijnen als het linker paneel leeg of aan het laden is.",
@@ -157,7 +157,7 @@
     "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",
diff --git a/www/core/lang/pl.json b/www/core/lang/pl.json
index 6529c2a0ea7..29222edf577 100644
--- a/www/core/lang/pl.json
+++ b/www/core/lang/pl.json
@@ -30,7 +30,7 @@
     "deleting": "Usuwanie",
     "description": "Opis",
     "done": "Wykonane",
-    "download": "Ściągnij",
+    "download": "Pobierz",
     "downloading": "Pobieranie ...",
     "edit": "Edytuj",
     "error": "Wystąpił błąd",
@@ -85,7 +85,7 @@
     "pagea": "Strona {{$a}}",
     "phone": "Telefon",
     "pictureof": "Obraz {{$a}}",
-    "previous": "Poprzedni stan",
+    "previous": "Poprzedni",
     "refresh": "Odswież",
     "required": "Wymagane",
     "save": "Zapisz",
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index 8776c6c504d..675961be3ef 100644
--- a/www/core/lang/pt-br.json
+++ b/www/core/lang/pt-br.json
@@ -50,7 +50,7 @@
     "discard": "Descartar",
     "dismiss": "Dispersar",
     "done": "Feito",
-    "download": "Baixar",
+    "download": "Download",
     "downloading": "Baixando",
     "edit": "Editar",
     "error": "Ocorreu um erro",
@@ -148,7 +148,7 @@
     "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",
diff --git a/www/core/lang/pt.json b/www/core/lang/pt.json
index bc73453706a..035b58a0bc3 100644
--- a/www/core/lang/pt.json
+++ b/www/core/lang/pt.json
@@ -51,7 +51,7 @@
     "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.",
@@ -151,7 +151,7 @@
     "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",
diff --git a/www/core/lang/ro.json b/www/core/lang/ro.json
index c160b4b4196..2d0e704da7e 100644
--- a/www/core/lang/ro.json
+++ b/www/core/lang/ro.json
@@ -39,7 +39,7 @@
     "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",
@@ -124,7 +124,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Imaginea {{$a}}",
-    "previous": "Status anterior",
+    "previous": "Precedent",
     "pulltorefresh": "Trageți în jos pentru actualizare",
     "refresh": "Actualizați",
     "required": "Necesar",
diff --git a/www/core/lang/ru.json b/www/core/lang/ru.json
index 437ec3ce5dc..b66086f9a2f 100644
--- a/www/core/lang/ru.json
+++ b/www/core/lang/ru.json
@@ -35,7 +35,7 @@
     "deleting": "Удаление",
     "description": "Описание",
     "done": "Завершено",
-    "download": "Нажмите «Продолжить», чтобы загрузить файл экспортируемой категории.",
+    "download": "Скачать",
     "downloading": "Загрузка",
     "edit": "Редактировать",
     "error": "Произошла ошибка",
@@ -108,7 +108,7 @@
     "pagea": "Страница {{$a}}",
     "phone": "Телефон",
     "pictureof": "Изображение пользователя {{$a}}",
-    "previous": "Предыдущее состояние",
+    "previous": "Назад",
     "pulltorefresh": "Потяните, чтобы обновить",
     "refresh": "Обновить",
     "required": "Обязательный",
diff --git a/www/core/lang/sv.json b/www/core/lang/sv.json
index ff3dd964b43..7224d074468 100644
--- a/www/core/lang/sv.json
+++ b/www/core/lang/sv.json
@@ -39,7 +39,7 @@
     "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 uppstod ett fel",
@@ -126,7 +126,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Telefon",
     "pictureof": "Bild av {{$a}}",
-    "previous": "Föregående status",
+    "previous": "Tidigare",
     "pulltorefresh": "Dra för att uppdatera",
     "refresh": "Återställ",
     "required": "Obligatorisk",
diff --git a/www/core/lang/tr.json b/www/core/lang/tr.json
index bf24a08c858..d9ffd4eeb3e 100644
--- a/www/core/lang/tr.json
+++ b/www/core/lang/tr.json
@@ -34,7 +34,7 @@
     "deleting": "Siliniyor",
     "description": "Açıklama",
     "done": "Tamamlandı",
-    "download": "Verilen kategori dosyasını indirin",
+    "download": "İndir",
     "downloading": "İndiriliyor...",
     "edit": "Düzenle ",
     "error": "Hata oluştu",
@@ -109,7 +109,7 @@
     "pagea": "Sayfa {{$a}}",
     "phone": "Telefon",
     "pictureof": "{{$a}} 'ın resmi",
-    "previous": "Önceki durum",
+    "previous": "Önceki",
     "refresh": "Yenile",
     "required": "Gerekli",
     "save": "Kaydet",
diff --git a/www/core/lang/uk.json b/www/core/lang/uk.json
index d252f7e6d40..cfce433c7de 100644
--- a/www/core/lang/uk.json
+++ b/www/core/lang/uk.json
@@ -51,7 +51,7 @@
     "discard": "Скинути",
     "dismiss": "Відхилити",
     "done": "Зроблено",
-    "download": "Натисніть для збереження файлу експорту на своєму комп'ютері.",
+    "download": "Завантажити",
     "downloading": "Завантаження",
     "edit": "Редагувати",
     "emptysplit": "Ця сторінка буде виглядати порожньою, якщо ліва панель порожня або завантажується.",
@@ -137,7 +137,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "Телефон",
     "pictureof": "Фото {{$a}}",
-    "previous": "Попередній стан",
+    "previous": "Назад",
     "pulltorefresh": "Потягніть щоб оновити",
     "redirectingtosite": "Ви будете перенаправлені на сайт.",
     "refresh": "Оновити",
diff --git a/www/core/lang/zh-cn.json b/www/core/lang/zh-cn.json
index 30daa5f4231..8009b06ed9f 100644
--- a/www/core/lang/zh-cn.json
+++ b/www/core/lang/zh-cn.json
@@ -30,7 +30,7 @@
     "deleting": "删除中",
     "description": "描述",
     "done": "完成",
-    "download": "点击下载已导出的分类文件",
+    "download": "下载",
     "edit": "编辑",
     "error": "发生了错误",
     "errordownloading": "下载文件时出错",
@@ -85,7 +85,7 @@
     "pagea": "页码 {{$a}}",
     "phone": "电话",
     "pictureof": "{{$a}}的头像",
-    "previous": "以前状态",
+    "previous": "向前",
     "refresh": "刷新",
     "required": "必须回答",
     "save": "保存",
diff --git a/www/core/lang/zh-tw.json b/www/core/lang/zh-tw.json
index 50105704266..a7cb5cac958 100644
--- a/www/core/lang/zh-tw.json
+++ b/www/core/lang/zh-tw.json
@@ -49,7 +49,7 @@
     "discard": "捨棄",
     "dismiss": "除去",
     "done": "完成",
-    "download": "點選可下載匯出的類別檔案",
+    "download": "下載",
     "downloading": "下載中",
     "edit": "編輯",
     "error": "發生錯誤",
@@ -146,7 +146,7 @@
     "percentagenumber": "{{$a}}%",
     "phone": "電話",
     "pictureof": "{{$a}}的相片",
-    "previous": "先前的狀態",
+    "previous": "向前",
     "pulltorefresh": "拖曳更新",
     "redirectingtosite": "您將被重定向到網站.",
     "refresh": "重新整理",

From 3e69bb50d1228b03e705a603dde71a7cb00c00ed Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Fri, 28 Jul 2017 15:34:10 +0200
Subject: [PATCH 117/118] MOBILE-2178 release: Sync languages with AMOS

---
 www/addons/calendar/lang/pt-br.json           |  4 ++--
 www/addons/competency/lang/pt-br.json         |  2 +-
 www/addons/coursecompletion/lang/pt-br.json   | 24 +++++++++----------
 www/addons/files/lang/pt-br.json              |  4 ++--
 www/addons/mod/data/lang/fr.json              |  2 ++
 www/addons/mod/feedback/lang/fr.json          |  2 +-
 www/addons/mod/folder/lang/pt-br.json         |  2 +-
 www/addons/mod/glossary/lang/pt-br.json       |  2 +-
 www/addons/mod/lesson/lang/fr.json            |  5 ++--
 www/addons/mod/wiki/lang/pt-br.json           |  2 +-
 www/addons/notes/lang/pt-br.json              |  2 +-
 www/addons/notifications/lang/de.json         |  2 +-
 www/addons/notifications/lang/pt-br.json      |  4 ++--
 www/addons/participants/lang/pt-br.json       |  2 +-
 www/core/components/course/lang/pt-br.json    |  4 ++--
 www/core/components/courses/lang/pt-br.json   |  6 ++---
 .../components/fileuploader/lang/pt-br.json   | 10 ++++----
 www/core/components/login/lang/pt-br.json     |  4 ++--
 www/core/components/question/lang/pt-br.json  |  2 +-
 www/core/components/user/lang/pt-br.json      |  4 ++--
 www/core/lang/fr.json                         |  7 +++++-
 www/core/lang/pt-br.json                      | 10 ++++----
 22 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/www/addons/calendar/lang/pt-br.json b/www/addons/calendar/lang/pt-br.json
index f66b11184df..b348e89bed4 100644
--- a/www/addons/calendar/lang/pt-br.json
+++ b/www/addons/calendar/lang/pt-br.json
@@ -3,6 +3,6 @@
     "defaultnotificationtime": "Tempo de notificação padrão",
     "errorloadevent": "Erro ao carregar evento.",
     "errorloadevents": "Erro ao carregar eventos.",
-    "noevents": "Não há atividades pendentes",
-    "notifications": "Avisos"
+    "noevents": "Sem eventos",
+    "notifications": "Notificação"
 }
\ 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 42b3ca47eb5..dc30bfcf0d3 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/pt-br.json b/www/addons/coursecompletion/lang/pt-br.json
index 6ffa2866e22..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": "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/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/mod/data/lang/fr.json b/www/addons/mod/data/lang/fr.json
index 0646a2b15e6..d9c3b73be8e 100644
--- a/www/addons/mod/data/lang/fr.json
+++ b/www/addons/mod/data/lang/fr.json
@@ -13,6 +13,8 @@
     "emptyaddform": "Vous n'avez rempli aucun champ !",
     "entrieslefttoadd": "Vous devez ajouter encore {{$a.entriesleft}} fiches pour terminer cette activité",
     "entrieslefttoaddtoview": "Vous devez ajouter encore {{$a.entrieslefttoview}} fiches avant de pouvoir consulter les fiches des autres participants.",
+    "errorapproving": "Erreur lors de l'approbation ou de la désapprobation de la fiche.",
+    "errordeleting": "Erreur lors de suppression de la fiche.",
     "errormustsupplyvalue": "Veuillez renseigner une valeur.",
     "expired": "Cette activité est fermée depuis {{$a}} et n'est plus disponible",
     "fields": "Champs",
diff --git a/www/addons/mod/feedback/lang/fr.json b/www/addons/mod/feedback/lang/fr.json
index 26c4c2c0740..032ec9ba573 100644
--- a/www/addons/mod/feedback/lang/fr.json
+++ b/www/addons/mod/feedback/lang/fr.json
@@ -3,7 +3,7 @@
     "anonymous": "Anonyme",
     "anonymous_entries": "Réponses anonymes ({{$a}})",
     "average": "Moyenne",
-    "captchaofflinewarning": "Le feedback avec captcha ne peut pas être terminé s'il n'est pas configuré, en mode hors ligne ou si le serveur est arrêté.",
+    "captchaofflinewarning": "Le feedback avec captcha ne peut pas être terminé hors ligne, ou s'il n'est pas configuré, ou si le serveur est arrêté.",
     "complete_the_form": "Répondre aux questions...",
     "completed_feedbacks": "Réponses envoyées",
     "continue_the_form": "Continuer à répondre aux questions...",
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/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/lesson/lang/fr.json b/www/addons/mod/lesson/lang/fr.json
index 495601716fa..538cdcf99bb 100644
--- a/www/addons/mod/lesson/lang/fr.json
+++ b/www/addons/mod/lesson/lang/fr.json
@@ -22,9 +22,10 @@
     "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.",
+    "errorprefetchrandombranch": "Cette leçon comporte un saut vers une page aléatoire. Elle ne peut être effectuée dans l'app avant d'avoir été commencée dans un navigateur.",
     "errorreviewretakenotlast": "Cette tentative ne peut plus être relue, car une autre tentative a été terminée.",
     "finish": "Terminer",
-    "finishretakeoffline": "Cette tentative a été terminée en mode hors ligne.",
+    "finishretakeoffline": "Cette tentative a été terminée hors ligne.",
     "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",
@@ -75,7 +76,7 @@
     "timeremaining": "Durée restante",
     "timetaken": "Durée utilisée",
     "unseenpageinbranch": "Question non vue au sein d'une page de contenu",
-    "warningretakefinished": "Cette tentative a été terminée sur la plateforme.",
+    "warningretakefinished": "Cette tentative a été terminée dans un navigateur.",
     "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",
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/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/notifications/lang/de.json b/www/addons/notifications/lang/de.json
index b89ba1477d5..4175d5121e3 100644
--- a/www/addons/notifications/lang/de.json
+++ b/www/addons/notifications/lang/de.json
@@ -2,6 +2,6 @@
     "errorgetnotifications": "Fehler beim Laden der Mitteilungen",
     "notificationpreferences": "Systemmitteilungen",
     "notifications": "Systemmitteilungen",
-    "playsound": "Sound abspielen",
+    "playsound": "Signalton abspielen",
     "therearentnotificationsyet": "Keine Mitteilungen"
 }
\ 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 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/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/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/courses/lang/pt-br.json b/www/core/components/courses/lang/pt-br.json
index 72ba27ea998..d5becaf9a2e 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",
+    "nosearchresults": "Não foram encontrados resultados da sua pesquisa",
     "notenroled": "Você não está inscrito como estudante neste curso",
     "notenrollable": "Você não pode inscrever-se neste curso.",
-    "password": "Senha",
+    "password": "Chave de inscrição",
     "search": "Busca",
     "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/fileuploader/lang/pt-br.json b/www/core/components/fileuploader/lang/pt-br.json
index 49699661be6..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": "Envio de arquivos",
+    "file": "Arquivo",
     "fileuploaded": "Arquivo enviado",
-    "maxbytesfile": "O arquivo {{$a.file}} é muito grande. Apenas pode carregar arquivos com um tamanho máximo de {{$a.size}}.",
+    "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/login/lang/pt-br.json b/www/core/components/login/lang/pt-br.json
index 739bc3eb83d..5433d7bf34f 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/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/user/lang/pt-br.json b/www/core/components/user/lang/pt-br.json
index e212093a063..acd7aa18a73 100644
--- a/www/core/components/user/lang/pt-br.json
+++ b/www/core/components/user/lang/pt-br.json
@@ -4,14 +4,14 @@
     "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",
diff --git a/www/core/lang/fr.json b/www/core/lang/fr.json
index 72df1da4a3d..a9abbd16cc9 100644
--- a/www/core/lang/fr.json
+++ b/www/core/lang/fr.json
@@ -7,6 +7,10 @@
     "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.",
+    "captureaudio": "Enregistrer un son",
+    "capturedimage": "Photo prise",
+    "captureimage": "Prendre une photo",
+    "capturevideo": "Enregistrer une vidéo",
     "category": "Catégorie",
     "choose": "Choisir",
     "choosedots": "Choisir...",
@@ -90,6 +94,7 @@
     "info": "Info",
     "ios": "iOS",
     "labelsep": "&nbsp;",
+    "lastdownloaded": "Dernier téléchargement",
     "lastmodified": "Dernière modification",
     "lastsync": "Dernière synchronisation",
     "listsep": ";",
@@ -128,7 +133,7 @@
     "moduleintro": "Description",
     "mygroups": "Mes groupes",
     "name": "Nom",
-    "networkerrormsg": "Réseau désactivé ou en panne.",
+    "networkerrormsg": "Un problème est survenu lors de la connexion au site. Veuillez vérifier votre connexion et essayer à nouveau.",
     "never": "Jamais",
     "next": "Suite",
     "no": "Non",
diff --git a/www/core/lang/pt-br.json b/www/core/lang/pt-br.json
index 675961be3ef..97ffa6a7ca0 100644
--- a/www/core/lang/pt-br.json
+++ b/www/core/lang/pt-br.json
@@ -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 modificação",
@@ -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": "Sem resultados",
     "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": "Salvar",
     "search": "Busca",
-    "searching": "Buscar em",
+    "searching": "Procurando",
     "searchresults": "Resultados da busca",
     "sec": "segundo",
     "secs": "segundos",

From 1c1bad59722bf1f1a4717a44e69d5ceb00c2de47 Mon Sep 17 00:00:00 2001
From: Juan Leyva <juanleyvadelgado@gmail.com>
Date: Fri, 28 Jul 2017 15:35:52 +0200
Subject: [PATCH 118/118] MOBILE-2178 release: Bump version numbers

---
 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 dcf510ffbd7..b25195875f3 100644
--- a/config.xml
+++ b/config.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.moodle.moodlemobile" version="3.3.0">
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0" id="com.moodle.moodlemobile" version="3.3.1">
     <name>Moodle Mobile</name>
     <description>
         Moodle Mobile official app
diff --git a/www/config.json b/www/config.json
index c280d2f83fd..9a558ca27cb 100644
--- a/www/config.json
+++ b/www/config.json
@@ -2,8 +2,8 @@
     "app_id" : "com.moodle.moodlemobile",
     "appname": "Moodle Mobile",
     "desktopappname": "Moodle Desktop",
-    "versioncode" : "2018",
-    "versionname" : "3.3.0",
+    "versioncode" : "2019",
+    "versionname" : "3.3.1",
     "cache_expiration_time" : 300000,
     "default_lang" : "en",
     "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", "lt" : "Lietuvių", "ja": "日本語","nl": "Nederlands", "pl": "Polski", "pt-br": "Português - Brasil", "pt": "Português - Portugal", "ro": "Română", "ru": "Русский", "sr-cr": "Српски", "sr-lt": "Srpski", "sv": "Svenska", "tr" : "Türkçe", "uk" : "Українська", "zh-cn" : "简体中文", "zh-tw" : "正體中文"},
diff --git a/www/errorreport.js b/www/errorreport.js
index e1301956fd9..5b16567c8a5 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.3.0 (2018)',
+var appVersion = '3.3.1 (2019)',
     reportInBackgroundName = 'mmCoreReportInBackground',
     errors = [],
     ignoredFiles = ['www/index.html#/site/mod_page', 'www/index.html#/site/mod_resource', 'www/index.html#/site/mm_course-section'],