Blind sql injection fixes (#3284)

Currently translated at 10.2% (12 of 117 strings)

Translation: opensourcepos/items
Translate-URL: https://translate.opensourcepos.org/projects/opensourcepos/items/ro/

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,71 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '21 12 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitignore

@@ -13,6 +13,7 @@ generate_langauges.php
 dist/
 docs/
 public/bower_components
+npm_modules
 *.patch
 patches/
 translations/

.travis.yml

@@ -7,6 +7,11 @@ branches:
 services:
   - docker
 before_install:
+  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+  - sudo apt-get update
+  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
+  - docker --version
   - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
   - sudo mv docker-compose /usr/local/bin
@@ -16,20 +21,20 @@ script:
   - docker run --rm -v $(pwd):/app jekkos/composer composer install
   - docker run --rm -v $(pwd):/app jekkos/composer php bin/install.php translations develop
   - sed -i "s/'\(dev\)'/'$rev'/g" application/config/config.php
-  - docker run --rm -it -v $(pwd):/app -w /app digitallyseamless/nodejs-bower-grunt
+  - docker run --rm -it -v $(pwd):/app -w /app opensourcepos/node-grunt-bower
     sh -c "npm install && bower install && grunt package"
   - docker build . --target ospos -t ospos
   - docker-compose -f docker-compose.test.yml up --abort-on-container-exit
 env:
   global:
-  - DOCKER_COMPOSE_VERSION=1.21.1
+  - DOCKER_COMPOSE_VERSION=1.29.1
   - TAG=$(echo ${TRAVIS_BRANCH} | sed s/feature\\///)
+  - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD` 
 after_success:
   - docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" && docker tag "ospos:latest"
     "jekkos/opensourcepos:$TAG" && docker push "jekkos/opensourcepos:$TAG"
 before_deploy:
   - version=$(grep application_version application/config/config.php | sed "s/.*=\s'\(.*\)';/\1/g")
-  - date=`date +%Y%m%d%H%M%S` && branch=${TRAVIS_BRANCH} && rev=`git rev-parse --short=6 HEAD` 
   - TRAVIS_TAG=$(echo $branch.$version)
   - git tag -f "$branch.$version"
   - sudo mv dist/opensourcepos.zip "dist/opensourcepos.$branch.$version.zip"

Dockerfile

@@ -10,7 +10,6 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 RUN a2enmod rewrite
 RUN docker-php-ext-install mysqli bcmath intl gd
 RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini
-RUN echo -e “$(hostname -i)\t$(hostname) $(hostname).localhost” >> /etc/hosts
 
 WORKDIR /app
 COPY . /app

Gruntfile.js

@@ -58,10 +58,55 @@ module.exports = function(grunt) {
 				}
 			}
 		},
+		copy: {
+			themes: {
+				files: [
+					{
+						expand: true,
+						cwd: 'node_modules/bootstrap-5/dist/css',
+						src: ['bootstrap.css', 'bootstrap.min.css'],
+						dest: 'public/dist/bootswatch-5/bootstrap/',
+						filter: 'isFile'
+					},
+					{
+						expand: true,
+						cwd: 'node_modules/bootswatch-5/dist',
+						src: ['**/bootstrap.css', '**/bootstrap.min.css'],
+						dest: 'public/dist/bootswatch-5/',
+						filter: 'isFile'
+					}
+				],
+			},
+			licenses: {
+				files: [{
+					expand: true,
+					src: 'LICENSE',
+					dest: 'public/license/',
+					filter: 'isFile',},
+					{
+						expand: true,
+						cwd: 'node_modules/bootstrap-5',
+						src: 'LICENSE',
+						dest: 'public/license/',
+						rename: function(dest, src) { return dest + src.replace('LICENSE', 'bootstrap-5.license'); },
+						filter: 'isFile'
+					},
+					{
+						expand: true,
+						cwd: 'node_modules/bootswatch-5',
+						src: 'LICENSE',
+						dest: 'public/license/',
+						rename: function(dest, src) { return dest + src.replace('LICENSE', 'bootswatch-5.license'); },
+						filter: 'isFile'
+					},
+				],
+			},
+		},
 		cssmin: {
 			target: {
 				files: {
-					'public/dist/<%= pkg.name %>.min.css': ['tmp/opensourcepos_bower.css', 'public/css/*.css', '!public/css/login.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/darkly.css']
+					'public/dist/<%= pkg.name %>.min.css': ['tmp/opensourcepos_bower.css', 'public/css/*.css', '!public/css/login.css', '!public/css/login.min.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/darkly.css'],
+					'public/css/login.min.css': ['public/css/login.css']
 				}
 			}
 		},
@@ -71,7 +116,7 @@ module.exports = function(grunt) {
 					separator: ';'
 				},
 				files: {
-					'tmp/<%= pkg.name %>.js': ['tmp/opensourcepos_bower.js', 'public/js/jquery*', 'public/js/*.js']
+					'tmp/<%= pkg.name %>.js': ['public/dist/jquery/jquery.js', 'tmp/opensourcepos_bower.js', 'public/js/*.js']
 				}
 			},
 			sql: {
@@ -114,7 +159,7 @@ module.exports = function(grunt) {
 					closeTag: '<!-- end css template tags -->',
 					ignorePath: '../../../public/'
 				},
-				src: ['public/css/*.css', '!public/css/login.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/darkly.css'],
+				src: ['public/css/*.css', '!public/css/login.css', '!public/css/login.min.css', '!public/css/invoice_email.css', '!public/css/barcode_font.css', '!public/css/darkly.css'],
 				dest: 'application/views/partial/header.php',
 			},
 			mincss_header: {
@@ -135,7 +180,7 @@ module.exports = function(grunt) {
 					closeTag: '<!-- end css template tags -->',
 					ignorePath: '../../public/'
 				},
-				src: ['public/css/login.css'],
+				src: 'public/css/login.min.css',
 				dest: 'application/views/login.php'
 			},
 			js: {
@@ -145,7 +190,7 @@ module.exports = function(grunt) {
 					closeTag: '<!-- end js template tags -->',
 					ignorePath: '../../../public/'
 				},
-				src: ['public/js/jquery*', 'public/js/*.js'],
+				src: ['public/dist/bootstrap/js/*.min.js', 'public/js/jquery*', 'public/js/*.js'],
 				dest: 'application/views/partial/header.php'
 			},
 			minjs: {
@@ -159,18 +204,6 @@ module.exports = function(grunt) {
 				dest: 'application/views/partial/header.php'
 			}
 		},
-		mochaWebdriver: {
-			options: {
-				timeout: 1000 * 60 * 3
-			},
-			test : {
-				options: {
-					usePhantom: true,
-					usePromises: true
-				},
-				src: ['test/**/*.js']
-			}
-		},
 		watch: {
 			files: ['<%= jshint.files %>'],
 			tasks: ['jshint']
@@ -222,15 +255,6 @@ module.exports = function(grunt) {
 				}
 			}
 		},
-		apigen: {
-			generate:{
-				options: {
-					apigenPath: 'vendor/bin/',
-					source: 'application',
-					destination: 'docs'
-				}
-			}
-		},
 		compress: {
 			main: {
 				options: {
@@ -247,6 +271,8 @@ module.exports = function(grunt) {
 							'!/public/images/menubar/png/',
 							'!/public/dist/bootswatch/',
 							'/public/dist/bootswatch/*/*.css',
+							'!/public/dist/bootswatch-5/',
+							'/public/dist/bootswatch-5/*/*.css',
 							'database/**',
 							'*.txt',
 							'*.md',
@@ -264,16 +290,13 @@ module.exports = function(grunt) {
 	});
 
 	require('load-grunt-tasks')(grunt);
-	grunt.loadNpmTasks('grunt-mocha-webdriver');
 	grunt.loadNpmTasks('grunt-composer');
-	grunt.loadNpmTasks('grunt-apigen');
 	grunt.loadNpmTasks('grunt-contrib-compress');
 
-	grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
+	grunt.registerTask('default', ['wiredep', 'bower_concat', 'bowercopy', 'copy', 'concat', 'uglify', 'cssmin', 'tags', 'cachebreaker']);
 	grunt.registerTask('update', ['composer:update', 'bower:update']);
 	grunt.registerTask('genlicense', ['clean:license', 'license', 'bower-licensechecker']);
 	grunt.registerTask('package', ['default', 'compress']);
 	grunt.registerTask('packages', ['composer:update']);
-	grunt.registerTask('gendocs', ['apigen:generate']);
 
 };

LICENSE

@@ -26,12 +26,12 @@ Copyright (c) 2013 Ramel
 Copyright (c) 2012-2014 pappastech
 Copyright (c) 2012 Alain
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
@@ -40,13 +40,12 @@ You cannot claim copyright or ownership of the Software.
 
 Versions ≥ 3.3.2:
 
-Footer signatures "© 2010 - 2021 · opensourcepos.org · 3.3.3 - 6909c8" 
+Footer signatures "© 2010 - 2021 · opensourcepos.org · 3.3.3 - 6909c8"
 In the format of: "© 2010 - Current Year · opensourcepos.org · Version - Commit"
 
 and/or 
 
 "· opensourcepos.org ·"
-
 with version, hash and URL link to the official website of the project MUST BE RETAINED, 
 MUST BE VISIBLE IN EVERY PAGE and CANNOT BE MODIFIED.
 
@@ -61,9 +60,10 @@ and/or
 with version, hash and URL link to the original distribution of the code MUST BE RETAINED, 
 MUST BE VISIBLE IN EVERY PAGE and CANNOT BE MODIFIED.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.

SECURITY.md

@@ -0,0 +1,27 @@
+<!-- START doctoc generated TOC please keep comment here to allow auto update -->
+<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
+
+
+- [Security Policy](#security-policy)
+  - [Supported Versions](#supported-versions)
+  - [Reporting a Vulnerability](#reporting-a-vulnerability)
+
+<!-- END doctoc generated TOC please keep comment here to allow auto update -->
+
+# Security Policy
+
+## Supported Versions
+
+We release patches for security vulnerabilities. Which versions are eligible
+receiving such patches depend on the CVSS v3.0 Rating:
+
+| CVSS v3.0 | Supported Versions                                 |
+| --------- | -------------------------------------------------- |
+| 7.3       | 3.5.5                                              |
+
+## Reporting a Vulnerability
+
+Please report (suspected) security vulnerabilities to
+**[jekkos](mailto:jekkos@opensourcepos.org)**. You will receive a response from
+us within 48 hours. If the issue is confirmed, we will release a patch as soon
+as possible depending on complexity but historically within a few days.

WHATS_NEW.txt

@@ -1,3 +1,18 @@
+Version 3.3.5
+-------------
++ Translation updates (Romanian, Ukranian, Vietnamese, Thai, Polish, Swedish, Portugese, Arabic, French, Chinese, Dutch, Tamil, Turkish, Spanish)
++ New login page restyle
++ Partial BS5 upgrade
++ Username verification fix on employee insert/update
++ Minor report fixes
++ Attribute encoding fix
++ Grunt/CI updates
++ Database and performance optimizations
++ CSV item import improvements
++ Fix decimal render
++ Translation fallback in other languages than english
++ Fixes for docker to make it run on Windows
+
 Version 3.3.4
 -------------
 + Translation updates (Hungarian, Indonesian, Bosnian, Ukranian, Vietnamese, Spanish)

application/config/config.php

@@ -8,7 +8,7 @@
 | 
 | 
 */ 
-$config['application_version'] = '3.4.0-dev';
+$config['application_version'] = '3.3.5';
 
 /* 
 |-------------------------------------------------------------------------- 

application/config/constants.php

@@ -110,6 +110,7 @@ define('ITEM', 0);
 define('ITEM_KIT', 1);
 define('ITEM_AMOUNT_ENTRY', 2);
 define('ITEM_TEMP', 3);
+define('NEW_ITEM', -1);
 
 define('PRINT_ALL', 0);
 define('PRINT_PRICED', 1);

application/controllers/Attributes.php

@@ -1,6 +1,6 @@
 <?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 
-require_once("Secure_Controller.php");
+require_once('Secure_Controller.php');
 
 class Attributes extends Secure_Controller
 {
@@ -24,16 +24,16 @@ class Attributes extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? definition.definition_name : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$attributes = $this->Attribute->search($search, $limit, $offset, $sort, $order);
 		$total_rows = $this->Attribute->get_found_rows($search);
 
-		$data_rows = array();
+		$data_rows = [];
 		foreach($attributes->result() as $attribute)
 		{
-			$attribute->definition_flags = $this->_get_attributes($attribute->definition_flags);
+			$attribute->definition_flags = $this->get_attributes($attribute->definition_flags);
 			$data_rows[] = get_attribute_definition_data_row($attribute, $this);
 		}
 
@@ -42,16 +42,24 @@ class Attributes extends Secure_Controller
 		echo json_encode(array('total' => $total_rows, 'rows' => $data_rows));
 	}
 
-	public function save_attribute_value($attribute_value)
+	public function save_attribute_value()
 	{
-		$success = $this->Attribute->save_value(urldecode($attribute_value), $this->input->post('definition_id'), $this->input->post('item_id'), $this->input->post('attribute_id'));
+		$success = $this->Attribute->save_value(
+			$this->input->post('attribute_value'),
+			$this->input->post('definition_id'),
+			$this->input->post('item_id'),
+			$this->input->post('attribute_id')
+		);
 
 		echo json_encode(array('success' => $success != 0));
 	}
 
-	public function delete_attribute_value($attribute_value)
+	public function delete_attribute_value()
 	{
-		$success = $this->Attribute->delete_value($attribute_value, $this->input->post('definition_id'));
+		$success = $this->Attribute->delete_value(
+			$this->input->post('attribute_value'),
+			$this->input->post('definition_id')
+		);
 
 		echo json_encode(array('success' => $success));
 	}
@@ -60,7 +68,7 @@ class Attributes extends Secure_Controller
 	{
 		$definition_flags = 0;
 
-		$flags = (empty($this->input->post('definition_flags'))) ? array() : $this->input->post('definition_flags');
+		$flags = (empty($this->input->post('definition_flags'))) ? [] : $this->input->post('definition_flags');
 
 		foreach($flags as $flag)
 		{
@@ -121,15 +129,15 @@ class Attributes extends Secure_Controller
 	public function get_row($row_id)
 	{
 		$attribute_definition_info = $this->Attribute->get_info($row_id);
-		$attribute_definition_info->definition_flags = $this->_get_attributes($attribute_definition_info->definition_flags);
+		$attribute_definition_info->definition_flags = $this->get_attributes($attribute_definition_info->definition_flags);
 		$data_row = $this->xss_clean(get_attribute_definition_data_row($attribute_definition_info));
 
 		echo json_encode($data_row);
 	}
 
-	private function _get_attributes($definition_flags = 0)
+	private function get_attributes($definition_flags = 0)
 	{
-		$definition_flag_names = array();
+		$definition_flag_names = [];
 		foreach (Attribute::get_definition_flags() as $id => $term)
 		{
 			if ($id & $definition_flags)
@@ -155,11 +163,11 @@ class Attributes extends Secure_Controller
 		$data['definition_info'] = $info;
 
 		$show_all = Attribute::SHOW_IN_ITEMS | Attribute::SHOW_IN_RECEIVINGS | Attribute::SHOW_IN_SALES;
-		$data['definition_flags'] = $this->_get_attributes($show_all);
+		$data['definition_flags'] = $this->get_attributes($show_all);
 		$selected_flags = $info->definition_flags === '' ? $show_all : $info->definition_flags;
-		$data['selected_definition_flags'] = $this->_get_attributes($selected_flags);
+		$data['selected_definition_flags'] = $this->get_attributes($selected_flags);
 
-		$this->load->view("attributes/form", $data);
+		$this->load->view('attributes/form', $data);
 	}
 
 	public function delete_value($attribute_id)
@@ -181,4 +189,4 @@ class Attributes extends Secure_Controller
 			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('attributes_definition_cannot_be_deleted')));
 		}
 	}
-}
+}

application/controllers/Cashups.php

@@ -25,7 +25,7 @@ class Cashups extends Secure_Controller
 		$search   = $this->input->get('search');
 		$limit    = $this->input->get('limit');
 		$offset   = $this->input->get('offset');
-		$sort     = $this->input->get('sort');
+		$sort     = $this->input->post('sort') === NULL ? 'cashup_id' : $this->db->escape($this->input->get('sort'));
 		$order    = $this->input->get('order');
 		$filters  = array(
 					 'start_date' => $this->input->get('start_date'),

application/controllers/Config.php

@@ -184,7 +184,7 @@ class Config extends Secure_Controller
 			if($dirinfo->isDir() && !$dirinfo->isDot() && $dirinfo->getFileName() != 'fonts')
 			{
 				$file = $this->xss_clean($dirinfo->getFileName());
-				$themes[$file] = $file;
+				$themes[$file] = ucfirst($file);
 			}
 		}
 
@@ -283,6 +283,7 @@ class Config extends Secure_Controller
 	{
 		$batch_save_data = array(
 			'theme' => $this->input->post('theme'),
+			'login_form' => $this->input->post('login_form'),
 			'default_sales_discount_type' => $this->input->post('default_sales_discount_type') != NULL,
 			'default_sales_discount' => $this->input->post('default_sales_discount'),
 			'default_receivings_discount_type' => $this->input->post('default_receivings_discount_type') != NULL,

application/controllers/Customers.php

@@ -58,7 +58,7 @@ class Customers extends Persons
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? LAST_NAME : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$customers = $this->Customer->search($search, $limit, $offset, $sort, $order);

application/controllers/Employees.php

@@ -17,7 +17,7 @@ class Employees extends Persons
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort = $this->input->post('sort') === NULL ? LAST_NAME : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$employees = $this->Employee->search($search, $limit, $offset, $sort, $order);
@@ -60,6 +60,7 @@ class Employees extends Persons
 			$person_info->$property = $this->xss_clean($value);
 		}
 		$data['person_info'] = $person_info;
+		$data['employee_id'] = $employee_id;
 
 		$modules = array();
 		foreach($this->Module->get_all_modules()->result() as $module)
@@ -190,5 +191,11 @@ class Employees extends Persons
 			echo json_encode(array('success' => FALSE, 'message' => $this->lang->line('employees_cannot_be_deleted')));
 		}
 	}
+
+	public function check_username($employee_id)
+	{
+		$exists = $this->Employee->username_exists($employee_id, $this->input->get('username'));
+		echo !$exists ? 'true' : 'false';
+	}
 }
 ?>

application/controllers/Expenses.php

@@ -30,7 +30,7 @@ class Expenses extends Secure_Controller
 		$search   = $this->input->get('search');
 		$limit    = $this->input->get('limit');
 		$offset   = $this->input->get('offset');
-		$sort     = $this->input->get('sort');
+		$sort     = $this->input->post('sort') === NULL ? 'expense_id' : $this->db->escape($this->input->get('sort'));
 		$order    = $this->input->get('order');
 		$filters  = array(
 					 'start_date' => $this->input->get('start_date'),

application/controllers/Expenses_categories.php

@@ -24,7 +24,7 @@ class Expenses_categories extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort = $this->input->post('sort') === NULL ? 'category_name' : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$expense_categories = $this->Expense_category->search($search, $limit, $offset, $sort, $order);

application/controllers/Giftcards.php

@@ -24,7 +24,7 @@ class Giftcards extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? 'giftcard_number' : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$giftcards = $this->Giftcard->search($search, $limit, $offset, $sort, $order);

application/controllers/Item_kits.php

@@ -59,7 +59,7 @@ class Item_kits extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? NAME : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$item_kits = $this->Item_kit->search($search, $limit, $offset, $sort, $order);

application/controllers/Reports.php

@@ -230,6 +230,7 @@ class Reports extends Secure_Controller
 		{
 			$tabular_data[] = $this->xss_clean(array(
 				'item_name' => $row['name'],
+				'category' => $row['category'],
 				'unit_price' => $row['unit_price'],
 				'quantity' => to_quantity_decimals($row['quantity_purchased']),
 				'subtotal' => to_currency($row['subtotal']),

application/controllers/Sales.php

@@ -54,10 +54,10 @@ class Sales extends Secure_Controller
 	public function search()
 	{
 		$search = $this->input->get('search');
-		$limit = $this->input->get('limit');
+		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort = $this->input->get('sort');
-		$order = $this->input->get('order');
+		$sort   = $this->input->post('sort') === NULL ? 'sales.sale_time' : $this->db->escape($this->input->get('sort'));
+		$order  = $this->input->get('order');
 
 		$filters = array('sale_type' => 'all',
 						 'location_id' => 'all',

application/controllers/Suppliers.php

@@ -35,7 +35,7 @@ class Suppliers extends Persons
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? LAST_NAME : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$suppliers = $this->Supplier->search($search, $limit, $offset, $sort, $order);

application/controllers/Tax_categories.php

@@ -25,7 +25,7 @@ class Tax_categories extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? 'tax_category' : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$tax_categories = $this->Tax_category->search($search, $limit, $offset, $sort, $order);

application/controllers/Tax_codes.php

@@ -29,7 +29,7 @@ class Tax_codes extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? 'tax_code_name' : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$tax_codes = $this->Tax_code->search($search, $limit, $offset, $sort, $order);

application/controllers/Tax_jurisdictions.php

@@ -25,7 +25,7 @@ class Tax_jurisdictions extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit  = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort   = $this->input->get('sort');
+		$sort   = $this->input->post('sort') === NULL ? 'jurisdiction_name' : $this->db->escape($this->input->get('sort'));
 		$order  = $this->input->get('order');
 
 		$tax_jurisdictions = $this->Tax_jurisdiction->search($search, $limit, $offset, $sort, $order);

application/controllers/Taxes.php

@@ -57,7 +57,7 @@ class Taxes extends Secure_Controller
 		$search = $this->input->get('search');
 		$limit = $this->input->get('limit');
 		$offset = $this->input->get('offset');
-		$sort = $this->input->get('sort');
+		$sort  = $this->input->post('sort') === NULL ? 'tax_code_name' : $this->db->escape($this->input->get('sort'));
 		$order = $this->input->get('order');
 
 		$tax_rates = $this->Tax->search($search, $limit, $offset, $sort, $order);

application/core/MY_Lang.php

@@ -10,10 +10,17 @@ class MY_Lang extends CI_Lang
             $CI->config->set_item('language', $idiom);
             $loaded = $this->is_loaded;
             $this->is_loaded = array();
-                
+
             foreach($loaded as $file)
             {
-                $this->load(strtr($file, '', '_lang.php'));
+                $filename = strtr($file, '', '_lang.php');
+                $this->load($filename, 'english');
+                $array = $this->load($filename, $idiom, TRUE);
+                foreach($array as $lang_key => $lang_value) {
+                    if ($lang_value != '') {
+                        $this->language[$lang_key] = $lang_value;
+                    }
+                }
             }
         }
     }

application/helpers/importfile_helper.php

@@ -1,30 +1,20 @@
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');
 
-/**
- * Generates the header content for the import_items.csv file
- *
- * @return	string						Comma separated headers for the CSV file
- */
 function generate_import_items_csv($stock_locations,$attributes)
 {
-	$csv_headers = pack("CCC",0xef,0xbb,0xbf);	//Encode the Byte-Order Mark (BOM) so that UTF-8 File headers display properly in Microsoft Excel
-	$csv_headers .= 'Barcode,"Item Name",Category,"Supplier ID","Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",item_image,HSN';
+	$csv_headers = pack('CCC',0xef,0xbb,0xbf);	//Encode the Byte-Order Mark (BOM) so that UTF-8 File headers display properly in Microsoft Excel
+	$csv_headers .= 'Id,Barcode,"Item Name",Category,"Supplier ID","Cost Price","Unit Price","Tax 1 Name","Tax 1 Percent","Tax 2 Name","Tax 2 Percent","Reorder Level",Description,"Allow Alt Description","Item has Serial Number",Image,HSN';
 	$csv_headers .= generate_stock_location_headers($stock_locations);
 	$csv_headers .= generate_attribute_headers($attributes);
 
 	return $csv_headers;
 }
 
-/**
- * Generates a list of stock location names as a string
- *
- * @return string					Comma-separated list of stock location names
- */
 function generate_stock_location_headers($locations)
 {
-	$location_headers = "";
+	$location_headers = '';
 
-	foreach($locations as $location_id => $location_name)
+	foreach($locations as $location_name)
 	{
 		$location_headers .= ',"location_' . $location_name . '"';
 	}
@@ -32,14 +22,9 @@ function generate_stock_location_headers($locations)
 	return $location_headers;
 }
 
-/**
- * Generates a list of attribute names as a string
- *
- * @return string					Comma-separated list of attribute names
- */
 function generate_attribute_headers($attribute_names)
 {
-	$attribute_headers = "";
+	$attribute_headers = '';
 	unset($attribute_names[-1]);
 
 	foreach($attribute_names as $attribute_name)
@@ -50,61 +35,59 @@ function generate_attribute_headers($attribute_names)
 	return $attribute_headers;
 }
 
-/**
- * Read the contents of a given CSV formatted file into a two-dimensional array
- *
- * @param	string				$file_name	Name of the file to read.
- * @return	boolean|array[][]				two-dimensional array with the file contents or FALSE on failure.
- */
 function get_csv_file($file_name)
 {
-	ini_set("auto_detect_line_endings", true);
+//TODO: current implementation reads the entire file in.  This is memory intensive for large files.
+//We may want to rework the CSV import feature to read the file in chunks, process it and continue.
+//It must be done in a way that does not significantly negatively affect performance.
+	ini_set('auto_detect_line_endings', true);
+
+	$csv_rows = FALSE;
 
 	if(($csv_file = fopen($file_name,'r')) !== FALSE)
 	{
+		$CI =& get_instance();
+		$CI->load->helper('security');
+
+		$csv_rows = [];
+
 		//Skip Byte-Order Mark
 		if(bom_exists($csv_file) === TRUE)
 		{
 			fseek($csv_file, 3);
 		}
 
-		while (($data = fgetcsv($csv_file)) !== FALSE)
+		$headers = fgetcsv($csv_file);
+
+		while(($row = fgetcsv($csv_file)) !== FALSE)
 		{
-		//Skip empty lines
-			if(array(null) !== $data)
+			//Skip empty lines
+			if($row !== array(null))
 			{
-				$line_array[] = $data;
+				$csv_rows[] = array_combine($headers, $CI->security->xss_clean($row));
 			}
 		}
-	}
-	else
-	{
-		return FALSE;
+
+		fclose($csv_file);
 	}
 
-	return $line_array;
+	return $csv_rows;
 }
 
-/**
- * Checks the first three characters of a file for the Byte-Order Mark then returns the file position to the first character.
- *
- * @param	object $file_handle	File handle to check
- * @return	bool				Returns TRUE if the BOM exists and FALSE otherwise.
- */
 function bom_exists(&$file_handle)
 {
-	$str = fread($file_handle,3);
+	$result		= FALSE;
+	$candidate	= fread($file_handle, 3);
+
 	rewind($file_handle);
 
-	$bom = pack("CCC", 0xef, 0xbb, 0xbf);
+	$bom = pack('CCC', 0xef, 0xbb, 0xbf);
 
-	if (0 === strncmp($str, $bom, 3))
+	if (0 === strncmp($candidate, $bom, 3))
 	{
-		return TRUE;
-	}
-	else
-	{
-		return FALSE;
+		$result = TRUE;
 	}
+
+	return $result;
 }
 ?>

application/helpers/locale_helper.php

@@ -249,7 +249,7 @@ function get_payment_options()
 	$config = get_instance()->config;
 	$lang = get_instance()->lang;
 
-	$payments = array();
+	$payments = [];
 
 
 	if($config->item('payment_options_order') == 'debitcreditcash')
@@ -388,7 +388,7 @@ function to_quantity_decimals($number)
 	return to_decimals($number, 'quantity_decimals');
 }
 
-function to_decimals($number, $decimals=NULL, $type=\NumberFormatter::DECIMAL)
+function to_decimals($number, $decimals = NULL, $type=\NumberFormatter::DECIMAL)
 {
 	// ignore empty strings and return
 	// NOTE: do not change it to empty otherwise tables will show a 0 with no decimal nor currency symbol
@@ -424,7 +424,6 @@ function parse_tax($number)
 function parse_decimals($number, $decimals = NULL)
 {
 	// ignore empty strings and return
-
 	if(empty($number))
 	{
 		return $number;
@@ -442,7 +441,7 @@ function parse_decimals($number, $decimals = NULL)
 
 	$config = get_instance()->config;
 
-	if($decimals == NULL)
+	if($decimals === NULL)
 	{
 		$decimals = $config->item('currency_decimals');
 	}
@@ -600,12 +599,13 @@ function dateformat_bootstrap($php_format)
 
 function valid_date($date)
 {
-	return preg_match('/^([0-9]{2,4})-([0-1][0-9])-([0-3][0-9])(?:( [0-2][0-9]):([0-5][0-9]):([0-5][0-9]))?$/', $date);
+	$config = get_instance()->Appconfig;
+	return (DateTime::createFromFormat($config->get('dateformat'), $date));
 }
 
 function valid_decimal($decimal)
 {
-	return preg_match('/^(\d*\.)?\d+$/', $decimal);
+	return (preg_match('/^(\d*\.)?\d+$/', $decimal) === 1);
 }
 
 ?>

application/hooks/load_config.php

@@ -26,8 +26,8 @@ function load_config()
         $CI->config->set_item('language_code', 'en-US');
     }
 
-    _load_language_files($CI, '../vendor/codeigniter/framework/system/language', current_language());
-    _load_language_files($CI, '../application/language', current_language_code());
+    _load_language_files($CI, '../vendor/codeigniter/framework/system/language', current_language(), FALSE);
+    _load_language_files($CI, '../application/language', current_language_code(), TRUE);
 
     //Set timezone from config database
     if($CI->config->item('timezone'))
@@ -46,16 +46,33 @@ function load_config()
  * @param $CI
  * @param $path
  * @param $language
+ * @param $fallback
  */
-function _load_language_files($CI, $path, $language)
+function _load_language_files($CI, $path, $language, $fallback)
 {
     $map = directory_map($path . DIRECTORY_SEPARATOR . $language);
 
     foreach($map as $file)
 	{
+
         if(!is_array($file) && substr(strrchr($file, '.'), 1) == 'php')
 		{
-            $CI->lang->load(strtr($file, '', '_lang.php'), $language);
+            $filename = strtr($file, '', '_lang.php');
+            if ($fallback) {
+                $CI->lang->load($filename, 'en-US');
+
+                $array = $CI->lang->load($filename, $language, TRUE);
+                foreach($array as $lang_key => $lang_value) {
+                    if ($lang_value !== '') {
+                        $CI->lang->language[$lang_key] = $lang_value;
+                    }
+                }
+            }
+            else
+            {
+                $CI->lang->load($filename, $language);
+            }
+
         }
     }
 }

application/language/ar-EG/common_lang.php

@@ -28,6 +28,7 @@ $lang["common_gender"] = "النوع";
 $lang["common_gender_female"] = "أنثى";
 $lang["common_gender_male"] = "ذكر";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "كود";
 $lang["common_import"] = "استيراد";
 $lang["common_import_change_file"] = "تغيير";
@@ -41,6 +42,8 @@ $lang["common_last_name_required"] = "الاسم الأخير مطلوب.";
 $lang["common_last_page"] = "الأخيرة";
 $lang["common_learn_about_project"] = "للتعرف على أخر المعلومات حول المشروع.";
 $lang["common_list_of"] = "قائمة بـ";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "خروج";
 $lang["common_migration_needed"] = "سيبدأ ترحيل قاعدة البيانات إلى ٪1 بعد تسجيل الدخول.";
 $lang["common_new"] = "جديد";
@@ -61,6 +64,8 @@ $lang["common_return_policy"] = "سياسة الاسترجاع";
 $lang["common_search"] = "بحث";
 $lang["common_search_options"] = "خيارات البحث";
 $lang["common_searched_for"] = "بحث عن";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "المحافظة";
 $lang["common_submit"] = "حفظ";
 $lang["common_total_spent"] = "مجموع الصرف";

application/language/ar-EG/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "1 مايو";
 $lang["config_financial_year_nov"] = "1 نوفمبر";
 $lang["config_financial_year_oct"] = "1 أكتوبر";
 $lang["config_financial_year_sep"] = "1 سبتمبر";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "صفحة تسجيل الدخول ريكابتشا";
 $lang["config_gcaptcha_secret_key"] = "مفتاح السرية ريكابتشا";
 $lang["config_gcaptcha_secret_key_required"] = "مفتاح السرية ريكابتشا هو حقل مطلوب";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "تشمل الدعم لرمز نظام منسق";
 $lang["config_info"] = "معلومات";
 $lang["config_info_configuration"] = "معلومات الشركة";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "التكامل";
 $lang["config_integrations_configuration"] = "تكامل";
 $lang["config_invoice"] = "الفاتورة";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "معلومات التهيئة الإقليمية"
 $lang["config_location"] = "المخزون";
 $lang["config_location_configuration"] = "أماكن المخزون";
 $lang["config_location_info"] = "معلومات تهيئة الأماكن";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.";
 $lang["config_mailchimp"] = "mailchimp ميل تشامب";
 $lang["config_mailchimp_api_key"] = "mailchimp مفتاح";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "العلامة العشرية للضريبة";
 $lang["config_tax_id"] = "الرقم الضريبي";
 $lang["config_tax_included"] = "شامل الضريبة";
 $lang["config_theme"] = "السمة";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "فاصل الاف";
 $lang["config_timezone"] = "المنطقة الزمنية";
 $lang["config_timezone_error"] = "";

application/language/ar-EG/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "رمز التحقق غير صحيح.";
 $lang["login_invalid_installation"] = "يوجد مشكلة بالتنصيب, الرجاء التحقق من ملف php.ini.";
 $lang["login_invalid_username_and_password"] = "اسم مستخدم/كلمة سر غير صحيح.";
 $lang["login_login"] = "دخول";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "كلمة السر";
 $lang["login_username"] = "اسم المستخدم";
+$lang["login_welcome"] = "";

application/language/ar-EG/sales_lang.php

@@ -10,6 +10,7 @@ $lang["sales_amount_tendered"] = "المبلغ المدفوع";
 $lang["sales_authorized_signature"] = "توقيع معتمد";
 $lang["sales_cancel_sale"] = "الغاء عملية البيع";
 $lang["sales_cash"] = "نقدى";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "ايداع نقدي";
 $lang["sales_cash_filter"] = "نقدى";
 $lang["sales_change_due"] = "الباقى";

application/language/ar-LB/common_lang.php

@@ -28,6 +28,7 @@ $lang["common_gender"] = "النوع";
 $lang["common_gender_female"] = "أنثى";
 $lang["common_gender_male"] = "ذكر";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "كود";
 $lang["common_import"] = "استيراد";
 $lang["common_import_change_file"] = "تغيير";
@@ -41,6 +42,8 @@ $lang["common_last_name_required"] = "الاسم الأخير مطلوب.";
 $lang["common_last_page"] = "الأخيرة";
 $lang["common_learn_about_project"] = "للتعرف على أخر المعلومات حول المشروع.";
 $lang["common_list_of"] = "قائمة بـ";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "خروج";
 $lang["common_migration_needed"] = "سيبدأ ترحيل قاعدة البيانات إلى ٪1 بعد تسجيل الدخول.";
 $lang["common_new"] = "جديد";
@@ -61,6 +64,8 @@ $lang["common_return_policy"] = "سياسة الاسترجاع";
 $lang["common_search"] = "بحث";
 $lang["common_search_options"] = "خيارات البحث";
 $lang["common_searched_for"] = "بحث عن";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "المحافظة";
 $lang["common_submit"] = "حفظ";
 $lang["common_total_spent"] = "مجموع الصرف";

application/language/ar-LB/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "1 مايو";
 $lang["config_financial_year_nov"] = "1 نوفمبر";
 $lang["config_financial_year_oct"] = "1 أكتوبر";
 $lang["config_financial_year_sep"] = "1 سبتمبر";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "صفحة تسجيل الدخول ريكابتشا";
 $lang["config_gcaptcha_secret_key"] = "مفتاح السرية ريكابتشا";
 $lang["config_gcaptcha_secret_key_required"] = "مفتاح السرية ريكابتشا هو حقل مطلوب";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "تشمل الدعم لرمز نظام منسق";
 $lang["config_info"] = "معلومات";
 $lang["config_info_configuration"] = "معلومات الشركة";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "التكامل";
 $lang["config_integrations_configuration"] = "تكامل";
 $lang["config_invoice"] = "الفاتورة";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "معلومات التهيئة الإقليمية"
 $lang["config_location"] = "المخزون";
 $lang["config_location_configuration"] = "أماكن المخزون";
 $lang["config_location_info"] = "معلومات تهيئة الأماكن";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "هل تريد عمل نسخة إحتياطية قبل الخروج؟ اضغط [نعم] لعمل النسخة أو [الغاء] للخروج.";
 $lang["config_mailchimp"] = "mailchimp ميل تشامب";
 $lang["config_mailchimp_api_key"] = "mailchimp مفتاح";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "العلامة العشرية للضريبة";
 $lang["config_tax_id"] = "الرقم الضريبي";
 $lang["config_tax_included"] = "شامل الضريبة";
 $lang["config_theme"] = "السمة";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "فاصل الاف";
 $lang["config_timezone"] = "المنطقة الزمنية";
 $lang["config_timezone_error"] = "";

application/language/ar-LB/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "رمز التحقق غير صحيح.";
 $lang["login_invalid_installation"] = "يوجد مشكلة بالتنصيب, الرجاء التحقق من ملف php.ini.";
 $lang["login_invalid_username_and_password"] = "اسم مستخدم/كلمة سر غير صحيح.";
 $lang["login_login"] = "دخول";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "كلمة السر";
 $lang["login_username"] = "اسم المستخدم";
+$lang["login_welcome"] = "";

application/language/ar-LB/sales_lang.php

@@ -10,10 +10,11 @@ $lang["sales_amount_tendered"] = "المبلغ المدفوع";
 $lang["sales_authorized_signature"] = "توقيع معتمد";
 $lang["sales_cancel_sale"] = "الغاء عملية البيع";
 $lang["sales_cash"] = "نقدى";
+$lang["sales_cash_adjustment"] = "تعديل الدفع";
 $lang["sales_cash_deposit"] = "ايداع نقدي";
 $lang["sales_cash_filter"] = "نقدى";
 $lang["sales_change_due"] = "الباقى";
-$lang["sales_change_price"] = "";
+$lang["sales_change_price"] = "تغيير سعر البيع";
 $lang["sales_check"] = "شيك";
 $lang["sales_check_balance"] = "تذكير بموعد الشيك";
 $lang["sales_check_filter"] = "شيك";
@@ -25,13 +26,13 @@ $lang["sales_confirm_delete"] = "هل تريد حذف عمليات البيع ا
 $lang["sales_confirm_restore"] = "هل انت متاكد من استعادة عملية البيع؟";
 $lang["sales_credit"] = "بطاقة إئتمانية";
 $lang["sales_credit_deposit"] = "ايداع ببطاقة ائتمان";
-$lang["sales_credit_filter"] = "";
+$lang["sales_credit_filter"] = "بطاقة بنكية";
 $lang["sales_customer"] = "العميل";
 $lang["sales_customer_address"] = "العنوان";
 $lang["sales_customer_discount"] = "الخصم";
 $lang["sales_customer_email"] = "البريد الإلكترونى";
 $lang["sales_customer_location"] = "المكان";
-$lang["sales_customer_mailchimp_status"] = "حالة ميل تشيمب";
+$lang["sales_customer_mailchimp_status"] = "حالة بريد ميل تشيمب";
 $lang["sales_customer_optional"] = "(مطلوب للدفعات المستحقة)";
 $lang["sales_customer_required"] = "(اجباري)";
 $lang["sales_customer_total"] = "المجموع";
@@ -53,26 +54,26 @@ $lang["sales_discount_included"] = "% خصم";
 $lang["sales_discount_short"] = "%";
 $lang["sales_due"] = "مستحق";
 $lang["sales_due_filter"] = "مستحق";
-$lang["sales_edit"] = "تحرير";
-$lang["sales_edit_item"] = "تحرير صنف";
-$lang["sales_edit_sale"] = "تحرير عملية بيع";
+$lang["sales_edit"] = "تعديل";
+$lang["sales_edit_item"] = "تعديل مادة";
+$lang["sales_edit_sale"] = "تعديل عملية بيع";
 $lang["sales_email_receipt"] = "إرسال الايصال بالبريد الالكترونى";
 $lang["sales_employee"] = "الموظف";
 $lang["sales_entry"] = "ادخال";
-$lang["sales_error_editing_item"] = "خطاء فى تحرير الصنف";
-$lang["sales_find_or_scan_item"] = "بحث/مسح باركود صنف";
-$lang["sales_find_or_scan_item_or_receipt"] = "بحث/مسح باركود صنف أو ايصال";
+$lang["sales_error_editing_item"] = "خطاء فى تعديل المادة";
+$lang["sales_find_or_scan_item"] = "بحث/مسح باركود المادة";
+$lang["sales_find_or_scan_item_or_receipt"] = "بحث/مسح باركود المادة أو الايصال";
 $lang["sales_giftcard"] = "بطاقة هدية";
 $lang["sales_giftcard_balance"] = "رصيد بطاقة الهدية";
 $lang["sales_giftcard_number"] = "رقم بطاقة الهدية";
-$lang["sales_group_by_category"] = "تصفية حسب الفئة";
-$lang["sales_group_by_type"] = "تجميع حسب النوع";
+$lang["sales_group_by_category"] = "ترتيب حسب الفئة";
+$lang["sales_group_by_type"] = "ترتيب حسب النوع";
 $lang["sales_hsn"] = "رمز نظام منسق";
-$lang["sales_id"] = "كود عملية البيع";
+$lang["sales_id"] = "رقم عملية البيع";
 $lang["sales_include_prices"] = "يشمل الاسعار؟";
 $lang["sales_invoice"] = "فاتورة";
 $lang["sales_invoice_confirm"] = "هذه الفاتورة سوف ترسل إلى";
-$lang["sales_invoice_enable"] = "إنشاء فاتورة";
+$lang["sales_invoice_enable"] = "رقم فاتورة";
 $lang["sales_invoice_filter"] = "الفواتير";
 $lang["sales_invoice_no_email"] = "هذا العميل ليس لدية بريد الكترونى صالح.";
 $lang["sales_invoice_number"] = "فاتورة رقم #";
@@ -85,32 +86,32 @@ $lang["sales_invoice_type_invoice"] = "الفاتورة (invoice.php)";
 $lang["sales_invoice_type_tax_invoice"] = "الفاتورة الضريبية (tax_invoice.php)";
 $lang["sales_invoice_unsent"] = "فشل إرسال الفاتورة إلى";
 $lang["sales_invoice_update"] = "إعادة العد";
-$lang["sales_item_insufficient_of_stock"] = "لايوجد مخزون كافى من الصنف.";
-$lang["sales_item_name"] = "اسم الصنف";
-$lang["sales_item_number"] = "صنف #";
-$lang["sales_item_out_of_stock"] = "لايوجد مخزون من الصنف.";
+$lang["sales_item_insufficient_of_stock"] = "لايوجد مخزون كافى من المادة.";
+$lang["sales_item_name"] = "اسم المادة";
+$lang["sales_item_number"] = "مادة رقم #";
+$lang["sales_item_out_of_stock"] = "لايوجد مخزون من المادة.";
 $lang["sales_mode"] = "وضع التسجيل";
 $lang["sales_must_enter_numeric"] = "يجب إدخال رقم للمبلغ الفعلى المدفوع.";
-$lang["sales_must_enter_numeric_giftcard"] = "رقم بطاقة الهدية يجب أن يكون رقم.";
+$lang["sales_must_enter_numeric_giftcard"] = "رمز بطاقة الهدية يجب أن يكتون ارقام فقط.";
 $lang["sales_new_customer"] = "عميل جديد";
-$lang["sales_new_item"] = "صنف جديد";
+$lang["sales_new_item"] = "مادة جديدة";
 $lang["sales_no_description"] = "بدون وصف";
 $lang["sales_no_filter"] = "الكل";
-$lang["sales_no_items_in_cart"] = "لايوجد أصناف فى السلة.";
+$lang["sales_no_items_in_cart"] = "لايوجد اي مادة فى السلة.";
 $lang["sales_no_sales_to_display"] = "لاتوجد عمليات بيع لعرضها.";
 $lang["sales_none_selected"] = "لم تقم بإختيار أى عمليات بيع لحذفها.";
 $lang["sales_nontaxed_ind"] = "";
-$lang["sales_not_authorized"] = "هذه العملية لا يمكن فعلها لعدم تخويلك.";
+$lang["sales_not_authorized"] = "ليس لديك صلاحية.";
 $lang["sales_one_or_multiple"] = "عمليات بيع";
 $lang["sales_payment"] = "طريقة الدفع";
-$lang["sales_payment_amount"] = "المبلغ";
+$lang["sales_payment_amount"] = "القيمة";
 $lang["sales_payment_not_cover_total"] = "المبلغ المدفوع لايغطى المبلغ الإجمالى.";
 $lang["sales_payment_type"] = "طريقة";
 $lang["sales_payments_total"] = "إجمالى المدفوعات";
 $lang["sales_price"] = "السعر";
 $lang["sales_print_after_sale"] = "اطبع بعد عملية البيع";
 $lang["sales_quantity"] = "الكمية";
-$lang["sales_quantity_less_than_reorder_level"] = "تحذير: الكمية/العدد المطلوب غير متوفر لهذا الصنف.";
+$lang["sales_quantity_less_than_reorder_level"] = "تحذير: الكمية أقل من الحد المطلوب لهذه المادة.";
 $lang["sales_quantity_less_than_zero"] = "تحذير! الكمية المطلوبة غير كافية، بإمكانك إتمام عملية البيع ، لكن تحقق من مخزنك.";
 $lang["sales_quantity_of_items"] = "عدد ال 1% من الاصناف";
 $lang["sales_quote"] = "عرض اسعار";
@@ -123,10 +124,10 @@ $lang["sales_receipt_no_email"] = "هذا العميل ليس له اي بريد
 $lang["sales_receipt_number"] = "إيصال بيع";
 $lang["sales_receipt_sent"] = "تم إرسال الإيصال إلى";
 $lang["sales_receipt_unsent"] = "فشل إرسال الإيصال إلى";
-$lang["sales_refund"] = "";
-$lang["sales_register"] = "مسجل المبيعات";
+$lang["sales_refund"] = "نوع/سبب الاسترجاع";
+$lang["sales_register"] = "سجل المبيعات";
 $lang["sales_remove_customer"] = "حذف عميل";
-$lang["sales_return"] = "إرتجاع";
+$lang["sales_return"] = "إسترجاع";
 $lang["sales_rewards"] = "نقاط المكافئة";
 $lang["sales_rewards_balance"] = "رصيد نقاط المكافئة";
 $lang["sales_sale"] = "بيع";
@@ -145,7 +146,7 @@ $lang["sales_show_receipt"] = "عرض الإيصال";
 $lang["sales_start_typing_customer_name"] = "ابداء بكتابة اسم العميل...";
 $lang["sales_start_typing_item_name"] = "ابداء بكتابة اسم أو مسح باركود الصنف...";
 $lang["sales_stock"] = "المخزن";
-$lang["sales_stock_location"] = "مكان المخزون";
+$lang["sales_stock_location"] = "موقع التخزين";
 $lang["sales_sub_total"] = "المجموع الفرعي";
 $lang["sales_successfully_deleted"] = "لقد تم الحذف بنجاح";
 $lang["sales_successfully_restored"] = "لقد تمت عملية الاستعادة بنجاح";

application/language/az-AZ/common_lang.php

@@ -28,6 +28,7 @@ $lang["common_gender"] = "Cins";
 $lang["common_gender_female"] = "Q";
 $lang["common_gender_male"] = "K";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "ID";
 $lang["common_import"] = "Daxil et";
 $lang["common_import_change_file"] = "Dəyiş";
@@ -41,6 +42,8 @@ $lang["common_last_name_required"] = "Soyad tələb olunur.";
 $lang["common_last_page"] = "Son";
 $lang["common_learn_about_project"] = "Proyekt haqqında ən son məlumatı öyrənmək.";
 $lang["common_list_of"] = "Siyahısı";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Çıxış";
 $lang["common_migration_needed"] = "Girişdən sonra bazaya %1 köçməsi başlayacaq.";
 $lang["common_new"] = "Yenisi";
@@ -61,6 +64,8 @@ $lang["common_return_policy"] = "Qaytarma siyasəti";
 $lang["common_search"] = "Axtarış";
 $lang["common_search_options"] = "Axtarış variantları";
 $lang["common_searched_for"] = "Axtarıldı";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "Əyalət";
 $lang["common_submit"] = "Təsdiqlə";
 $lang["common_total_spent"] = "Ümumi xərc";

application/language/az-AZ/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "1 May";
 $lang["config_financial_year_nov"] = "1 Noyabr";
 $lang["config_financial_year_oct"] = "1 Oktyabr";
 $lang["config_financial_year_sep"] = "1 Sentyabr";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "Giriş Səyfəsi reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Gizli Açarı";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Gizli Açar olan sahə boş qala bilməz";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "Şəkil yükləmə məhdudiyyətləri";
 $lang["config_include_hsn"] = "HSN Kodlarına dəstək verin";
 $lang["config_info"] = "Məlumat";
 $lang["config_info_configuration"] = "Dükan İnformasiyası";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "İnteqrasiya";
 $lang["config_integrations_configuration"] = "Üçüncü tərəf inteqrasiya";
 $lang["config_invoice"] = "Faktura";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "Lokallaşdırma Konfiqurasiya Məlumatı";
 $lang["config_location"] = "Fond";
 $lang["config_location_configuration"] = "Anbar Yerləri";
 $lang["config_location_info"] = "Yer Konfiqurasiya Məlumatı";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "Çıxışdan əvvəl məlumatlari ehtiyat bazasına köçürmək istəyirsinizmi? Çıxış üçün Bekap və ya [Ləğv] üçün [OK]' düyməsinə basın.";
 $lang["config_mailchimp"] = "Mailçimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Açarı";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "Vaxt";
 $lang["config_tax_id"] = "Vergi İD";
 $lang["config_tax_included"] = "Vergi Daxildir";
 $lang["config_theme"] = "Vebsayt";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "Minliklər Ayıran";
 $lang["config_timezone"] = "Vaxt Zonası";
 $lang["config_timezone_error"] = "OSPOS Saat qurşağı Yerli saat qurşağınızdan fərqlidir.";

application/language/az-AZ/item_kits_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["item_kits_add_item"] = "Mal Əlavə Etmək";
 $lang["item_kits_all"] = "Hamısı";
 $lang["item_kits_cannot_be_deleted"] = "Dəst Mal (lar) silinə bilməz.";

application/language/az-AZ/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "Yanlış, Mən robot deyiləm.";
 $lang["login_invalid_installation"] = "Quraşdırma düzgün deyil, php.ini faylını yoxlayın.";
 $lang["login_invalid_username_and_password"] = "Ad və ya şifrə səhvdir.";
 $lang["login_login"] = "Giriş";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "Şifrə";
 $lang["login_username"] = "İstifadəçi";
+$lang["login_welcome"] = "";

application/language/az-AZ/sales_lang.php

@@ -10,6 +10,7 @@ $lang["sales_amount_tendered"] = "Ödənilən məbləğ";
 $lang["sales_authorized_signature"] = "Səlahiyyətli İmza";
 $lang["sales_cancel_sale"] = "İmtina";
 $lang["sales_cash"] = "Nəğd pullar";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "Nağd depozit";
 $lang["sales_cash_filter"] = "Nəğd Pul";
 $lang["sales_change_due"] = "Qalıq";

application/language/bg/bootstrap_tables_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["tables_all"] = "Всичко/и";
 $lang["tables_columns"] = "Колони";
 $lang["tables_hide_show_pagination"] = "Скриване / Показване на страници";

application/language/bg/common_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["common_address_1"] = "Адрес 1";
 $lang["common_address_2"] = "Адрес 2";
 $lang["common_city"] = "Град";
@@ -27,6 +28,7 @@ $lang["common_gender"] = "Пол";
 $lang["common_gender_female"] = "Ж";
 $lang["common_gender_male"] = "М";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "Номер";
 $lang["common_import"] = "Внос";
 $lang["common_import_change_file"] = "Промяна";
@@ -40,6 +42,8 @@ $lang["common_last_name_required"] = "Фамилия е задължително
 $lang["common_last_page"] = "Последна";
 $lang["common_learn_about_project"] = "за да научите най-новата информация за проекта.";
 $lang["common_list_of"] = "Списък с";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Излизане от профила";
 $lang["common_migration_needed"] = "Мигриране на база данни ще започне след влизане.";
 $lang["common_new"] = "Нов";
@@ -60,6 +64,8 @@ $lang["common_return_policy"] = "Условия за връщане";
 $lang["common_search"] = "Търсене";
 $lang["common_search_options"] = "Опции за търсене";
 $lang["common_searched_for"] = "Търсене за";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "Щат";
 $lang["common_submit"] = "Изпращане";
 $lang["common_total_spent"] = "Общо изразходвани";

application/language/bg/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "1st of May";
 $lang["config_financial_year_nov"] = "1st of November";
 $lang["config_financial_year_oct"] = "1st of October";
 $lang["config_financial_year_sep"] = "1st of September";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "Login Page reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "";
 $lang["config_info"] = "Information";
 $lang["config_info_configuration"] = "Store Information";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "";
 $lang["config_integrations_configuration"] = "";
 $lang["config_invoice"] = "Invoice";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "Localization Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.";
 $lang["config_mailchimp"] = "Mailchimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Key";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
 $lang["config_tax_id"] = "";
 $lang["config_tax_included"] = "Tax Included";
 $lang["config_theme"] = "Theme";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";
 $lang["config_timezone_error"] = "";

application/language/bg/customers_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["customers_account_number"] = "Сметка #";
 $lang["customers_account_number_duplicate"] = "Номерът на сметката вече е в базата данни.";
 $lang["customers_available_points"] = "Налични точки";

application/language/bg/login_lang.php

@@ -1,9 +1,13 @@
-<?php
+<?php 
+
 $lang["login_gcaptcha"] = "Не съм робот.";
 $lang["login_go"] = "Go";
 $lang["login_invalid_gcaptcha"] = "Invalid I'm not a robot.";
 $lang["login_invalid_installation"] = "The installation is not correct, check your php.ini file.";
 $lang["login_invalid_username_and_password"] = "Invalid Username or Password.";
 $lang["login_login"] = "Login";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "Password";
 $lang["login_username"] = "Username";
+$lang["login_welcome"] = "";

application/language/bg/sales_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["customers_available_points"] = "Налични точки";
 $lang["rewards_package"] = "Награди";
 $lang["rewards_remaining_balance"] = "Оставащата стойност на точките за награда е ";
@@ -9,6 +10,7 @@ $lang["sales_amount_tendered"] = "Предоставена сума";
 $lang["sales_authorized_signature"] = "Оторизиран подпис";
 $lang["sales_cancel_sale"] = "Отказ";
 $lang["sales_cash"] = "В брой";
+$lang["sales_cash_adjustment"] = "Корекция на пари в брой";
 $lang["sales_cash_deposit"] = "Депозит в брой";
 $lang["sales_cash_filter"] = "В брой";
 $lang["sales_change_due"] = "Промяна на дължимото";
@@ -178,4 +180,3 @@ $lang["sales_work_order_number"] = "Номер работна поръчка";
 $lang["sales_work_order_number_duplicate"] = "Номерът на работната поръчка трябва да е уникален.";
 $lang["sales_work_order_sent"] = "Работната поръчка е изпратена до";
 $lang["sales_work_order_unsent"] = "Работната поръчка не бе изпратена до";
-$lang["sales_cash_adjustment"] = "Корекция на пари в брой";

application/language/bs-BA/common_lang.php

@@ -28,6 +28,7 @@ $lang["common_gender"] = "Pol";
 $lang["common_gender_female"] = "Ž";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "Id";
 $lang["common_import"] = "Uvoz";
 $lang["common_import_change_file"] = "Promjena";
@@ -41,6 +42,8 @@ $lang["common_last_name_required"] = "Prezime je obavezno";
 $lang["common_last_page"] = "Poslednja";
 $lang["common_learn_about_project"] = "da biste saznali najnovije informacije o projektu";
 $lang["common_list_of"] = "Lista";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Odjava";
 $lang["common_migration_needed"] = "Premještanje baze podataka na %1 počinje nakon prijave.";
 $lang["common_new"] = "Novi";
@@ -61,6 +64,8 @@ $lang["common_return_policy"] = "Povratna informacija";
 $lang["common_search"] = "Traži";
 $lang["common_search_options"] = "Opcije pretrage";
 $lang["common_searched_for"] = "Traženo";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "Entitet";
 $lang["common_submit"] = "Prihvati";
 $lang["common_total_spent"] = "Ukupno potrošeno";

application/language/bs-BA/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "1. Maj";
 $lang["config_financial_year_nov"] = "1. Novembar";
 $lang["config_financial_year_oct"] = "1. Oktobar";
 $lang["config_financial_year_sep"] = "1. Septembar";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "Stranica za prijavu reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA tajni ključ";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA tajni ključ je obavezno polje";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "Ograničenja za učitavanje slike";
 $lang["config_include_hsn"] = "Uključite podršku za HSN kodove";
 $lang["config_info"] = "Informacije";
 $lang["config_info_configuration"] = "Info o web trgovini";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "Integracije";
 $lang["config_integrations_configuration"] = "Integracije trećih strana";
 $lang["config_invoice"] = "Faktura";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "Info o lokalnoj konfiguraciji";
 $lang["config_location"] = "Skladište";
 $lang["config_location_configuration"] = "Lokacije skladišta";
 $lang["config_location_info"] = "Informacije o konfiguraciji lokacije";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "Zar ne želite da napravite rezervnu kopiju prije odjave? Kliknite [OK] za sigurnosnu kopiju, [Cancel] da biste se odjavili.";
 $lang["config_mailchimp"] = "Mailchimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API ključ";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "Poreske decimale";
 $lang["config_tax_id"] = "Poreska identifikacija";
 $lang["config_tax_included"] = "Uključen porez";
 $lang["config_theme"] = "Tema";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "Separator za hiljade";
 $lang["config_timezone"] = "Vremenska zona";
 $lang["config_timezone_error"] = "Vremenska zona OSPOS razlikuje se od vaše lokalne vremenske zone.";

application/language/bs-BA/customers_lang.php

@@ -12,6 +12,10 @@ $lang["customers_confirm_delete"] = "Želite li izbrisati izabranog kupca?";
 $lang["customers_confirm_restore"] = "Da li ste sigurni da želite da povratite izabranog kupca?";
 $lang["customers_consent"] = "Pristanak na registraciju";
 $lang["customers_consent_required"] = "Prihvatanje registracije je obavezno polje.";
+$lang["customers_csv_import_failed"] = "Greška kod uvoza iz CSV-a";
+$lang["customers_csv_import_nodata_wrongformat"] = "Vaša učitana datoteka nema podataka ili je pogrešnog formata";
+$lang["customers_csv_import_partially_failed"] = "Većina kupaca je uvezena. Ali neki nisu, evo liste";
+$lang["customers_csv_import_success"] = "Uvoz kupaca je uspješan";
 $lang["customers_customer"] = "Kupac";
 $lang["customers_date"] = "Datum";
 $lang["customers_discount"] = "Popust";
@@ -21,10 +25,6 @@ $lang["customers_discount_type"] = "Tip popusta";
 $lang["customers_email_duplicate"] = "E-mail adresa već postoji u bazi podataka.";
 $lang["customers_employee"] = "Zaposlenik";
 $lang["customers_error_adding_updating"] = "Greška kod dodavanja/ažuriranja kupca";
-$lang["customers_csv_import_failed"] = "Greška kod uvoza iz CSV-a";
-$lang["customers_csv_import_nodata_wrongformat"] = "Vaša učitana datoteka nema podataka ili je pogrešnog formata";
-$lang["customers_csv_import_partially_failed"] = "Većina kupaca je uvezena. Ali neki nisu, evo liste";
-$lang["customers_csv_import_success"] = "Uvoz kupaca je uspješan";
 $lang["customers_import_items_csv"] = "Uvezi kupce iz CSV datoteke";
 $lang["customers_mailchimp_activity_click"] = "Klik na e-mail";
 $lang["customers_mailchimp_activity_lastopen"] = "Zadnji otvoreni e-mail";

application/language/bs-BA/items_lang.php

@@ -42,8 +42,8 @@ $lang["items_image"] = "Slika";
 $lang["items_import_items_csv"] = "Uvezi artikle iz CSV datoteke";
 $lang["items_info_provided_by"] = "Informacije pruža";
 $lang["items_inventory"] = "Zaliha";
-$lang["items_inventory_comments"] = "Komentari";
 $lang["items_inventory_CSV_import_quantity"] = "Količina uvezena iz CSV-a";
+$lang["items_inventory_comments"] = "Komentari";
 $lang["items_inventory_data_tracking"] = "Praćenje podataka zalihe";
 $lang["items_inventory_date"] = "Datum";
 $lang["items_inventory_employee"] = "Zaposlenik";

application/language/bs-BA/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "Pogrešno ja nisam robot.";
 $lang["login_invalid_installation"] = "Instalacija nije ispravna, provjerite vašu php.ini datoteku.";
 $lang["login_invalid_username_and_password"] = "Pogrešno korisničko ime ili lozinka";
 $lang["login_login"] = "Prijava";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "Lozinka";
 $lang["login_username"] = "Korisničko ime";
+$lang["login_welcome"] = "";

application/language/bs-BA/sales_lang.php

@@ -10,6 +10,7 @@ $lang["sales_amount_tendered"] = "Ponuđeni iznos";
 $lang["sales_authorized_signature"] = "Ovlašćeni potpis";
 $lang["sales_cancel_sale"] = "Otkaži";
 $lang["sales_cash"] = "Gotovina";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "Polog gotovine";
 $lang["sales_cash_filter"] = "Gotovina";
 $lang["sales_change_due"] = "Kusur";

application/language/cs/common_lang.php

@@ -28,6 +28,7 @@ $lang["common_gender"] = "Pohlaví";
 $lang["common_gender_female"] = "Ž";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "Id";
 $lang["common_import"] = "Import";
 $lang["common_import_change_file"] = "Změnit";
@@ -41,6 +42,8 @@ $lang["common_last_name_required"] = "Příjmení je vyžadováno.";
 $lang["common_last_page"] = "Poslední";
 $lang["common_learn_about_project"] = "pro získání dalších informací k projektu.";
 $lang["common_list_of"] = "Seznam";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Odhlásit";
 $lang["common_migration_needed"] = "";
 $lang["common_new"] = "Nový";
@@ -61,6 +64,8 @@ $lang["common_return_policy"] = "Podmínky pro vrácení";
 $lang["common_search"] = "Hledat";
 $lang["common_search_options"] = "Volby pro hledání";
 $lang["common_searched_for"] = "Hledat";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "Stát";
 $lang["common_submit"] = "Odeslat";
 $lang["common_total_spent"] = "Celkem utraceno";

application/language/cs/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "";
 $lang["config_financial_year_nov"] = "";
 $lang["config_financial_year_oct"] = "";
 $lang["config_financial_year_sep"] = "";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "";
 $lang["config_gcaptcha_secret_key"] = "";
 $lang["config_gcaptcha_secret_key_required"] = "";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "";
 $lang["config_info"] = "";
 $lang["config_info_configuration"] = "";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "";
 $lang["config_integrations_configuration"] = "";
 $lang["config_invoice"] = "";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "";
 $lang["config_location"] = "";
 $lang["config_location_configuration"] = "";
 $lang["config_location_info"] = "";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "";
 $lang["config_mailchimp"] = "";
 $lang["config_mailchimp_api_key"] = "";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "";
 $lang["config_tax_id"] = "";
 $lang["config_tax_included"] = "";
 $lang["config_theme"] = "";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "";
 $lang["config_timezone"] = "";
 $lang["config_timezone_error"] = "";

application/language/cs/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "Špatné zadání.";
 $lang["login_invalid_installation"] = "Instalace není v pořádku, zkontrolujte soubor php.ini.";
 $lang["login_invalid_username_and_password"] = "Neplatné jméno nebo heslo.";
 $lang["login_login"] = "Login";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "Heslo";
 $lang["login_username"] = "Uživatelské jméno";
+$lang["login_welcome"] = "";

application/language/cs/sales_lang.php

@@ -10,6 +10,7 @@ $lang["sales_amount_tendered"] = "Uhrazeno";
 $lang["sales_authorized_signature"] = "";
 $lang["sales_cancel_sale"] = "Zrušit";
 $lang["sales_cash"] = "Hotovost";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "";
 $lang["sales_cash_filter"] = "Hotově";
 $lang["sales_change_due"] = "Zbývá";

application/language/da/common_lang.php

@@ -28,6 +28,7 @@ $lang["common_gender"] = "Køn";
 $lang["common_gender_female"] = "Kvinde";
 $lang["common_gender_male"] = "Mand";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "Id";
 $lang["common_import"] = "Import";
 $lang["common_import_change_file"] = "Skift";
@@ -41,6 +42,8 @@ $lang["common_last_name_required"] = "Efternavn er et obligatorisk felt.";
 $lang["common_last_page"] = "Sidste";
 $lang["common_learn_about_project"] = "for at lære det seneste information om projektet.";
 $lang["common_list_of"] = "Liste af";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Log ud";
 $lang["common_migration_needed"] = "En database migration til %1 vil starte efter du er logget ind.";
 $lang["common_new"] = "Ny";
@@ -61,6 +64,8 @@ $lang["common_return_policy"] = "Returpolitik";
 $lang["common_search"] = "Søg";
 $lang["common_search_options"] = "Søgeindstillinger";
 $lang["common_searched_for"] = "Søgt efter";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "Stat";
 $lang["common_submit"] = "Indsend";
 $lang["common_total_spent"] = "Samlet brugt";

application/language/da/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "1st of May";
 $lang["config_financial_year_nov"] = "1st of November";
 $lang["config_financial_year_oct"] = "1st of October";
 $lang["config_financial_year_sep"] = "1st of September";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "Login Page reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "Include Support for HSN Codes";
 $lang["config_info"] = "Information";
 $lang["config_info_configuration"] = "Store Information";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "Integrations";
 $lang["config_integrations_configuration"] = "Third Party Integrations";
 $lang["config_invoice"] = "Invoice";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "Localization Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.";
 $lang["config_mailchimp"] = "Mailchimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Key";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
 $lang["config_tax_id"] = "Tax Id";
 $lang["config_tax_included"] = "Tax Included";
 $lang["config_theme"] = "Theme";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";
 $lang["config_timezone_error"] = "";

application/language/da/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "";
 $lang["login_invalid_installation"] = "";
 $lang["login_invalid_username_and_password"] = "";
 $lang["login_login"] = "";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "";
 $lang["login_username"] = "";
+$lang["login_welcome"] = "";

application/language/da/sales_lang.php

@@ -10,6 +10,7 @@ $lang["sales_amount_tendered"] = "";
 $lang["sales_authorized_signature"] = "";
 $lang["sales_cancel_sale"] = "";
 $lang["sales_cash"] = "";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "";
 $lang["sales_cash_filter"] = "";
 $lang["sales_change_due"] = "";

application/language/de-CH/common_lang.php

@@ -28,6 +28,7 @@ $lang["common_gender"] = "Geschlecht";
 $lang["common_gender_female"] = "F";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "Id";
 $lang["common_import"] = "Import";
 $lang["common_import_change_file"] = "Change";
@@ -41,6 +42,8 @@ $lang["common_last_name_required"] = "Nachname ist erforderlich";
 $lang["common_last_page"] = "Letzte";
 $lang["common_learn_about_project"] = "für neueste Nachrichten zum Projekt";
 $lang["common_list_of"] = "Liste von";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Logout";
 $lang["common_migration_needed"] = "";
 $lang["common_new"] = "Neu";
@@ -61,6 +64,8 @@ $lang["common_return_policy"] = "Rücknahmepolitik";
 $lang["common_search"] = "Suche";
 $lang["common_search_options"] = "Suchkriterien";
 $lang["common_searched_for"] = "Gescuht nach";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "BL/Kanton";
 $lang["common_submit"] = "Senden";
 $lang["common_total_spent"] = "";

application/language/de-CH/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "";
 $lang["config_financial_year_nov"] = "";
 $lang["config_financial_year_oct"] = "";
 $lang["config_financial_year_sep"] = "";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "";
 $lang["config_gcaptcha_secret_key"] = "";
 $lang["config_gcaptcha_secret_key_required"] = "";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "";
 $lang["config_info"] = "Instellungen";
 $lang["config_info_configuration"] = "Instellungen";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "";
 $lang["config_integrations_configuration"] = "";
 $lang["config_invoice"] = "Rechnungs";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "Info Länderkonfiguration";
 $lang["config_location"] = "Lagerort";
 $lang["config_location_configuration"] = "Lagerort";
 $lang["config_location_info"] = "Lagerort-Information";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "Wollen Sie eine Sicherung machen vor dem Beenden? Klicke [OK] für Sicherung";
 $lang["config_mailchimp"] = "";
 $lang["config_mailchimp_api_key"] = "";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
 $lang["config_tax_id"] = "";
 $lang["config_tax_included"] = "MWSt inbegriffen";
 $lang["config_theme"] = "Design";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "Tausendertrennzeichen";
 $lang["config_timezone"] = "Zeitzone";
 $lang["config_timezone_error"] = "";

application/language/de-CH/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "";
 $lang["login_invalid_installation"] = "";
 $lang["login_invalid_username_and_password"] = "Ungültiger Benutzername/Passwort";
 $lang["login_login"] = "Login";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "Passwort";
 $lang["login_username"] = "Benutzername";
+$lang["login_welcome"] = "";

application/language/de-CH/sales_lang.php

@@ -10,6 +10,7 @@ $lang["sales_amount_tendered"] = "Erhalten";
 $lang["sales_authorized_signature"] = "";
 $lang["sales_cancel_sale"] = "Annullieren";
 $lang["sales_cash"] = "Bar";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "";
 $lang["sales_cash_filter"] = "Bar";
 $lang["sales_change_due"] = "Wechselgeld";

application/language/de/common_lang.php

@@ -28,6 +28,7 @@ $lang["common_gender"] = "Geschlecht";
 $lang["common_gender_female"] = "W";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "ID";
 $lang["common_import"] = "Import";
 $lang["common_import_change_file"] = "Ändern";
@@ -41,6 +42,8 @@ $lang["common_last_name_required"] = "Nachname ist erforderlich.";
 $lang["common_last_page"] = "Letzte";
 $lang["common_learn_about_project"] = "für neueste Nachrichten zum Projekt.";
 $lang["common_list_of"] = "Liste von";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Ausloggen";
 $lang["common_migration_needed"] = "Eine Datenbankmigration auf %1 wird nach der Anmeldung gestartet.";
 $lang["common_new"] = "Neu";
@@ -61,6 +64,8 @@ $lang["common_return_policy"] = "Rücknahmeerklärung";
 $lang["common_search"] = "Suche";
 $lang["common_search_options"] = "Suchkriterien";
 $lang["common_searched_for"] = "Gescuht nach";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "BL/Kanton";
 $lang["common_submit"] = "Senden";
 $lang["common_total_spent"] = "Gesamtausgaben";

application/language/de/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "1. Mai";
 $lang["config_financial_year_nov"] = "1. November";
 $lang["config_financial_year_oct"] = "1. Oktober";
 $lang["config_financial_year_sep"] = "1. September";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "Login reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA: Geheimer Schlüssel";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key wird benötigt";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "Unterstützung für HSN-Codes einbinden";
 $lang["config_info"] = "Informationen";
 $lang["config_info_configuration"] = "Generelle Einstellungen";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "Integrationen";
 $lang["config_integrations_configuration"] = "Drittanbieter Integrationen";
 $lang["config_invoice"] = "Rechnungs";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "Info Länderkonfiguration";
 $lang["config_location"] = "Lagerort";
 $lang["config_location_configuration"] = "Lagerort";
 $lang["config_location_info"] = "Lagerort-Information";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "Wollen Sie vor dem Beenden eine Sicherung erstellen? Klicke [OK] für Sicherung.";
 $lang["config_mailchimp"] = "Mailchimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Schlüssel";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "Steuer Dezimalstellen";
 $lang["config_tax_id"] = "Steuer ID";
 $lang["config_tax_included"] = "MWSt inbegriffen";
 $lang["config_theme"] = "Design";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "Tausendertrennzeichen";
 $lang["config_timezone"] = "Zeitzone";
 $lang["config_timezone_error"] = "";

application/language/de/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "Ich bin kein Roboter ist ungültig.";
 $lang["login_invalid_installation"] = "Die Installation ist nicht korrekt, überprüfen Sie Ihre php.ini-Datei.";
 $lang["login_invalid_username_and_password"] = "Ungültiger Benutzername oder Passwort.";
 $lang["login_login"] = "Login";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "Passwort";
 $lang["login_username"] = "Benutzername";
+$lang["login_welcome"] = "";

application/language/de/sales_lang.php

@@ -10,6 +10,7 @@ $lang["sales_amount_tendered"] = "Erhalten";
 $lang["sales_authorized_signature"] = "Unterschrift";
 $lang["sales_cancel_sale"] = "Annullieren";
 $lang["sales_cash"] = "Bar";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "Bareinzahlung";
 $lang["sales_cash_filter"] = "Bar";
 $lang["sales_change_due"] = "Wechselgeld";

application/language/el/common_lang.php

@@ -28,6 +28,7 @@ $lang["common_gender"] = "Φύλο";
 $lang["common_gender_female"] = "Θ";
 $lang["common_gender_male"] = "Α";
 $lang["common_gender_undefined"] = "";
+$lang["common_icon"] = "";
 $lang["common_id"] = "Id";
 $lang["common_import"] = "Εισαγωγή";
 $lang["common_import_change_file"] = "Αλλαγή";
@@ -41,6 +42,8 @@ $lang["common_last_name_required"] = "Το Επίθετο απαιτείται."
 $lang["common_last_page"] = "Τελευταίο";
 $lang["common_learn_about_project"] = "ώστε να ενημερωθείτε για τις τελευταίες πληροφορίες του έργου.";
 $lang["common_list_of"] = "Λίστα από";
+$lang["common_logo"] = "";
+$lang["common_logo_mark"] = "";
 $lang["common_logout"] = "Έξοδος";
 $lang["common_migration_needed"] = "Η ενσωμάτωση της βάσης δεδομένων σε %1 θα ξεκινήσει μετά την είσοδο.";
 $lang["common_new"] = "Νέο";
@@ -61,6 +64,8 @@ $lang["common_return_policy"] = "Πολιτική Επιστροφών";
 $lang["common_search"] = "Αναζήτηση";
 $lang["common_search_options"] = "Επιλογές αναζήτησης";
 $lang["common_searched_for"] = "Αναζητήσατε για";
+$lang["common_software_short"] = "";
+$lang["common_software_title"] = "";
 $lang["common_state"] = "Περιοχή/Νομός";
 $lang["common_submit"] = "Καταχώριση";
 $lang["common_total_spent"] = "Σύνολο εξόδων";

application/language/el/config_lang.php

@@ -127,6 +127,7 @@ $lang["config_financial_year_may"] = "";
 $lang["config_financial_year_nov"] = "";
 $lang["config_financial_year_oct"] = "";
 $lang["config_financial_year_sep"] = "";
+$lang["config_floating_labels"] = "";
 $lang["config_gcaptcha_enable"] = "";
 $lang["config_gcaptcha_secret_key"] = "";
 $lang["config_gcaptcha_secret_key_required"] = "";
@@ -146,6 +147,7 @@ $lang["config_image_restrictions"] = "";
 $lang["config_include_hsn"] = "";
 $lang["config_info"] = "";
 $lang["config_info_configuration"] = "";
+$lang["config_input_groups"] = "";
 $lang["config_integrations"] = "";
 $lang["config_integrations_configuration"] = "";
 $lang["config_invoice"] = "";
@@ -175,6 +177,7 @@ $lang["config_locale_info"] = "";
 $lang["config_location"] = "";
 $lang["config_location_configuration"] = "";
 $lang["config_location_info"] = "";
+$lang["config_login_form"] = "";
 $lang["config_logout"] = "";
 $lang["config_mailchimp"] = "";
 $lang["config_mailchimp_api_key"] = "";
@@ -289,6 +292,7 @@ $lang["config_tax_decimals"] = "";
 $lang["config_tax_id"] = "";
 $lang["config_tax_included"] = "";
 $lang["config_theme"] = "";
+$lang["config_theme_preview"] = "";
 $lang["config_thousands_separator"] = "";
 $lang["config_timezone"] = "";
 $lang["config_timezone_error"] = "";

application/language/el/login_lang.php

@@ -6,5 +6,8 @@ $lang["login_invalid_gcaptcha"] = "";
 $lang["login_invalid_installation"] = "";
 $lang["login_invalid_username_and_password"] = "";
 $lang["login_login"] = "";
+$lang["login_logout"] = "";
+$lang["login_migration_needed"] = "";
 $lang["login_password"] = "";
 $lang["login_username"] = "";
+$lang["login_welcome"] = "";

application/language/el/sales_lang.php

@@ -10,6 +10,7 @@ $lang["sales_amount_tendered"] = "Ποσό Είσπραξης";
 $lang["sales_authorized_signature"] = "Εγκεκριμένη Υπογραφή";
 $lang["sales_cancel_sale"] = "Ακύρωση";
 $lang["sales_cash"] = "Μετρητά";
+$lang["sales_cash_adjustment"] = "";
 $lang["sales_cash_deposit"] = "Προκαταβολή Μετρητών";
 $lang["sales_cash_filter"] = "Μετρητά";
 $lang["sales_change_due"] = "Ποσό Επιστροφής";

application/language/en-GB/common_lang.php

@@ -27,7 +27,8 @@ $lang["common_gender"] = "Gender";
 $lang["common_gender_female"] = "F";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
-$lang["common_id"] = "Id";
+$lang["common_icon"] = "Icon";
+$lang["common_id"] = "ID";
 $lang["common_import"] = "Import";
 $lang["common_import_change_file"] = "Change";
 $lang["common_import_csv"] = "CSV Import";
@@ -40,6 +41,8 @@ $lang["common_last_name_required"] = "Last Name is a required field";
 $lang["common_last_page"] = "Last";
 $lang["common_learn_about_project"] = "to learn the latest information about the project";
 $lang["common_list_of"] = "List of";
+$lang["common_logo"] = "Logo";
+$lang["common_logo_mark"] = "Mark";
 $lang["common_logout"] = "Logout";
 $lang["common_migration_needed"] = "A database migration to %1 will start after login";
 $lang["common_new"] = "New";
@@ -60,6 +63,8 @@ $lang["common_return_policy"] = "Return Policy";
 $lang["common_search"] = "Search";
 $lang["common_search_options"] = "Search options";
 $lang["common_searched_for"] = "Searched for";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Open Source Point of Sale";
 $lang["common_state"] = "County";
 $lang["common_submit"] = "Submit";
 $lang["common_total_spent"] = "Total Spent";

application/language/en-GB/config_lang.php

@@ -126,6 +126,7 @@ $lang["config_financial_year_may"] = "1st of May";
 $lang["config_financial_year_nov"] = "1st of November";
 $lang["config_financial_year_oct"] = "1st of October";
 $lang["config_financial_year_sep"] = "1st of September";
+$lang["config_floating_labels"] = "Floating Labels";
 $lang["config_gcaptcha_enable"] = "Login Page reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
@@ -145,6 +146,7 @@ $lang["config_image_restrictions"] = "Image Upload Restrictions";
 $lang["config_include_hsn"] = "Include Support for HSN Codes";
 $lang["config_info"] = "Information";
 $lang["config_info_configuration"] = "Shop Information";
+$lang["config_input_groups"] = "Input Groups";
 $lang["config_integrations"] = "Integrations";
 $lang["config_integrations_configuration"] = "Third Party Integrations";
 $lang["config_invoice"] = "Invoice";
@@ -174,6 +176,7 @@ $lang["config_locale_info"] = "Localisation Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
+$lang["config_login_form"] = "Login Form Style";
 $lang["config_logout"] = "Don't you want to make a backup before logging out? Click [OK] to backup, [Cancel] to logout";
 $lang["config_mailchimp"] = "MailChimp";
 $lang["config_mailchimp_api_key"] = "MailChimp API Key";
@@ -288,6 +291,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
 $lang["config_tax_id"] = "Tax Id";
 $lang["config_tax_included"] = "Tax Included";
 $lang["config_theme"] = "Theme";
+$lang["config_theme_preview"] = "Preview Theme:";
 $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";
 $lang["config_timezone_error"] = "OSPOS Timezone is Different from your Local Timezone.";

application/language/en-GB/customers_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["customers_account_number"] = "Account #";
 $lang["customers_account_number_duplicate"] = "Account Number is already present in the database";
 $lang["customers_available_points"] = "Available points";

application/language/en-GB/employees_lang.php

@@ -8,6 +8,7 @@ $lang["employees_confirm_restore"] = "Are you sure you want to restore the selec
 $lang["employees_current_password"] = "Current Password";
 $lang["employees_current_password_invalid"] = "Current Password is invalid";
 $lang["employees_employee"] = "Employee";
+$lang["employees_username_duplicate"] = "Employee username is already in use. Please choose another one.";
 $lang["employees_error_adding_updating"] = "Employee add or update failed";
 $lang["employees_error_deleting_demo_admin"] = "You cannot delete the demo admin user";
 $lang["employees_error_updating_demo_admin"] = "You cannot change the demo admin user";

application/language/en-GB/expenses_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["expenses_add_item"] = "Add Expense";
 $lang["expenses_amount"] = "Amount";
 $lang["expenses_amount_number"] = "Amount must be a number";

application/language/en-GB/item_kits_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["item_kits_add_item"] = "Add Item";
 $lang["item_kits_all"] = "All";
 $lang["item_kits_cannot_be_deleted"] = "Item Kit(s) delete failed";

application/language/en-GB/login_lang.php

@@ -1,10 +1,12 @@
-<?php 
-
+<?php
 $lang["login_gcaptcha"] = "I'm not a robot";
 $lang["login_go"] = "Go";
-$lang["login_invalid_gcaptcha"] = "Invalid I'm not a robot";
+$lang["login_invalid_gcaptcha"] = "Please verify that you are not a robot.";
 $lang["login_invalid_installation"] = "The installation is not correct, check your php.ini file";
-$lang["login_invalid_username_and_password"] = "Invalid Username or Password";
+$lang["login_invalid_username_and_password"] = "Invalid username and/or password.";
 $lang["login_login"] = "Login";
+$lang["login_logout"] = "Logout";
+$lang["login_migration_needed"] = "A database migration to %1 will start after login.";
 $lang["login_password"] = "Password";
 $lang["login_username"] = "Username";
+$lang["login_welcome"] = "Welcome to %1!";

application/language/en-GB/sales_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["customers_available_points"] = "Available Points";
 $lang["rewards_package"] = "Rewards";
 $lang["rewards_remaining_balance"] = "Reward Points remaining value is ";

application/language/en-US/common_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["common_address_1"] = "Address 1";
 $lang["common_address_2"] = "Address 2";
 $lang["common_city"] = "City";
@@ -27,7 +28,8 @@ $lang["common_gender"] = "Gender";
 $lang["common_gender_female"] = "F";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
-$lang["common_id"] = "Id";
+$lang["common_icon"] = "Icon";
+$lang["common_id"] = "ID";
 $lang["common_import"] = "Import";
 $lang["common_import_change_file"] = "Change";
 $lang["common_import_csv"] = "CSV Import";
@@ -40,8 +42,10 @@ $lang["common_last_name_required"] = "Last Name is a required field.";
 $lang["common_last_page"] = "Last";
 $lang["common_learn_about_project"] = "to learn the latest information about the project.";
 $lang["common_list_of"] = "List of";
-$lang["common_logout"] = "Logout";
-$lang["common_migration_needed"] = "A database migration to %1 will start after login.";
+$lang["common_logo"] = "Logo";
+$lang["common_logo_mark"] = "Mark";
+$lang["common_logout"] = "";
+$lang["common_migration_needed"] = "";
 $lang["common_new"] = "New";
 $lang["common_no"] = "";
 $lang["common_no_persons_to_display"] = "There are no people to display.";
@@ -60,6 +64,8 @@ $lang["common_return_policy"] = "Return Policy";
 $lang["common_search"] = "Search";
 $lang["common_search_options"] = "Search options";
 $lang["common_searched_for"] = "Searched for";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Open Source Point of Sale";
 $lang["common_state"] = "State";
 $lang["common_submit"] = "Submit";
 $lang["common_total_spent"] = "Total Spent";

application/language/en-US/config_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["config_address"] = "Company Address";
 $lang["config_address_required"] = "Company address is a required field.";
 $lang["config_all_set"] = "All file permissions are set correctly!";
@@ -126,6 +127,7 @@ $lang["config_financial_year_may"] = "1st of May";
 $lang["config_financial_year_nov"] = "1st of November";
 $lang["config_financial_year_oct"] = "1st of October";
 $lang["config_financial_year_sep"] = "1st of September";
+$lang["config_floating_labels"] = "Floating Labels";
 $lang["config_gcaptcha_enable"] = "Login Page reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
@@ -145,6 +147,7 @@ $lang["config_image_restrictions"] = "Image Upload Restrictions";
 $lang["config_include_hsn"] = "Include Support for HSN Codes";
 $lang["config_info"] = "Information";
 $lang["config_info_configuration"] = "Store Information";
+$lang["config_input_groups"] = "Input Groups";
 $lang["config_integrations"] = "Integrations";
 $lang["config_integrations_configuration"] = "Third Party Integrations";
 $lang["config_invoice"] = "Invoice";
@@ -174,6 +177,7 @@ $lang["config_locale_info"] = "Localization Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
+$lang["config_login_form"] = "Login Form Style";
 $lang["config_logout"] = "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.";
 $lang["config_mailchimp"] = "MailChimp";
 $lang["config_mailchimp_api_key"] = "MailChimp API Key";
@@ -288,6 +292,7 @@ $lang["config_tax_decimals"] = "Tax Decimals";
 $lang["config_tax_id"] = "Tax Id";
 $lang["config_tax_included"] = "Tax Included";
 $lang["config_theme"] = "Theme";
+$lang["config_theme_preview"] = "Preview Theme:";
 $lang["config_thousands_separator"] = "Thousands Separator";
 $lang["config_timezone"] = "Timezone";
 $lang["config_timezone_error"] = "OSPOS Timezone is Different from your Local Timezone.";

application/language/en-US/customers_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["customers_account_number"] = "Account #";
 $lang["customers_account_number_duplicate"] = "Account Number is already present in the database.";
 $lang["customers_available_points"] = "Available Points";

application/language/en-US/employees_lang.php

@@ -8,6 +8,7 @@ $lang["employees_confirm_restore"] = "Are you sure you want to restore selected
 $lang["employees_current_password"] = "Current Password";
 $lang["employees_current_password_invalid"] = "Current Password is invalid.";
 $lang["employees_employee"] = "Employee";
+$lang["employees_username_duplicate"] = "Employee username is already in use. Please choose another one.";
 $lang["employees_error_adding_updating"] = "Employee add or update failed.";
 $lang["employees_error_deleting_demo_admin"] = "You can not delete the demo admin user.";
 $lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user.";

application/language/en-US/expenses_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["expenses_add_item"] = "Add Expense";
 $lang["expenses_amount"] = "Amount";
 $lang["expenses_amount_number"] = "Amount must be a number";

application/language/en-US/items_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["items_add_minus"] = "Inventory to add or subtract.";
 $lang["items_allow_alt_description"] = "Allow Alternate Description";
 $lang["items_amount_entry"] = "Amount Entry";

application/language/en-US/login_lang.php

@@ -2,9 +2,12 @@
 
 $lang["login_gcaptcha"] = "I'm not a robot.";
 $lang["login_go"] = "Go";
-$lang["login_invalid_gcaptcha"] = "Invalid I'm not a robot.";
+$lang["login_invalid_gcaptcha"] = "Please verify that you are not a robot.";
 $lang["login_invalid_installation"] = "The installation is not correct, check your php.ini file.";
-$lang["login_invalid_username_and_password"] = "Invalid Username or Password.";
+$lang["login_invalid_username_and_password"] = "Invalid username and/or password.";
 $lang["login_login"] = "Login";
+$lang["login_logout"] = "Logout";
+$lang["login_migration_needed"] = "A database migration to %1 will start after login.";
 $lang["login_password"] = "Password";
 $lang["login_username"] = "Username";
+$lang["login_welcome"] = "Welcome to %1!";

application/language/en-US/sales_lang.php

@@ -1,4 +1,5 @@
-<?php
+<?php 
+
 $lang["customers_available_points"] = "Available Points";
 $lang["rewards_package"] = "Rewards";
 $lang["rewards_remaining_balance"] = "Reward Points remaining value is ";

application/language/es/attributes_lang.php

@@ -1,9 +1,10 @@
-<?php
+<?php 
+
 $lang["attributes_attribute_value_invalid_chars"] = "El valor del atributo no puede contener ':' o '|'";
 $lang["attributes_confirm_delete"] = "¿Está seguro de que desea borrar los atributos seleccionados?";
 $lang["attributes_confirm_restore"] = "¿Está seguro de que desea restaurar los atributos seleccionados?";
 $lang["attributes_definition_cannot_be_deleted"] = "No se han podido borrar los atributos seleccionados";
-$lang["attributes_definition_error_adding_updating"] = "El atributo %1 no pudo ser agregado o actualizado. Por favor compruebe el registro de errores.";
+$lang["attributes_definition_error_adding_updating"] = "El atributo %1 no pudo ser agregado o actulizado. Por favor, compruebe el registro de errores.";
 $lang["attributes_definition_flags"] = "Visibilidad del atributo";
 $lang["attributes_definition_group"] = "Grupo";
 $lang["attributes_definition_id"] = "Id";

application/language/es/bootstrap_tables_lang.php

@@ -1,9 +1,9 @@
 <?php
-$lang["tables_all"] = "Todos";
+$lang["tables_all"] = "Todas";
 $lang["tables_columns"] = "Columnas";
 $lang["tables_hide_show_pagination"] = "Ocultar/Mostrar paginación";
 $lang["tables_loading"] = "Por favor espere...";
-$lang["tables_page_from_to"] = "Mostrando desde {0} hasta {1} de {2} resultados";
-$lang["tables_refresh"] = "Actualizar";
+$lang["tables_page_from_to"] = "Mostrando desde {0} hasta {1} - En total {2} resultados";
+$lang["tables_refresh"] = "Refrescar";
 $lang["tables_rows_per_page"] = "{0} resultados por página";
 $lang["tables_toggle"] = "Ocultar/Mostrar";

application/language/es/cashups_lang.php

@@ -8,8 +8,8 @@ $lang["cashups_close_employee"] = "Cerrado por";
 $lang["cashups_closed_amount_card"] = "Tarjetas";
 $lang["cashups_closed_amount_cash"] = "Efectivo Final";
 $lang["cashups_closed_amount_check"] = "Cheques";
-$lang["cashups_closed_amount_due"] = "Deudado";
-$lang["cashups_closed_amount_total"] = "Total";
+$lang["cashups_closed_amount_due"] = "Cobros pendientes";
+$lang["cashups_closed_amount_total"] = "Balance Total";
 $lang["cashups_closed_date"] = "Fecha de Cierre";
 $lang["cashups_confirm_delete"] = "¿Estás seguro de que quieres borrar el Turno seleccionado?";
 $lang["cashups_confirm_restore"] = "¿Está seguro de que desea restaurar los Turnos seleccionados?";
@@ -23,7 +23,7 @@ $lang["cashups_is_deleted"] = "Borrado";
 $lang["cashups_new"] = "Nuevo Turno";
 $lang["cashups_no_cashups_to_display"] = "No hay Turnos para mostrar";
 $lang["cashups_none_selected"] = "No ha seleccionado ningún Turno";
-$lang["cashups_note"] = "Notas";
+$lang["cashups_note"] = "Nota de pago";
 $lang["cashups_one_or_multiple"] = "Turno(s)";
 $lang["cashups_open_amount_cash"] = "Efectivo Inicial";
 $lang["cashups_open_date"] = "Fecha de Apertura";
@@ -33,5 +33,16 @@ $lang["cashups_successful_adding"] = "Turno agregado con éxito";
 $lang["cashups_successful_deleted"] = "Turno borrado con éxito";
 $lang["cashups_successful_updating"] = "Turno actualizado con éxito";
 $lang["cashups_total"] = "Total";
-$lang["cashups_transfer_amount_cash"] = "Entrada/Salida de Efectivo";
+$lang["cashups_transfer_amount_cash"] = "Salida/Entrada de Efectivo";
 $lang["cashups_update"] = "Actualizar Turno";
+$lang["cashups_warning"] = "No enviar a menos que sea Abierto o Cerrado en el día";
+$lang['cashups_transfer_amount_cash'] = "Entrada/Salida de Efectivo";
+$lang['cashups_transfer_amount_cash_minus'] = "Convertir en Efectivo = -";
+$lang["cashups_info_employee"] = "Empleado Información de Efectivo";
+$lang["cashups_giftcard"] = "Tarjetas de Regalo de Efectivo";
+$lang["cashups_enable_expected"] = "Mostrar Ventas";
+$lang["cashups_closed_amount_giftcard"] = "Tarjetas de Regalo";
+$lang["cashups_confirm_submit"] = "¿Está seguro que desea enviar este efectivo? La jornada estará cerrada.";
+$lang["cashups_cash_difference"] = "Diferencia de Efectivo: ";
+$lang["cashups_cancel_cashups_enter"] = "Pulse Aceptar para enviar o haga clic en Cancelar para continuar editando";
+$lang["cashups_cancel_cashups"] = "Cancelar";

application/language/es/common_lang.php

@@ -7,16 +7,16 @@ $lang["common_comments"] = "Comentarios";
 $lang["common_common"] = "Común";
 $lang["common_confirm_search"] = "Has seleccionado una o más filas. Éstas no estarán seleccionadas después de tu búsqueda. ¿Seguro(a) que quieres hacer esta búsqueda?";
 $lang["common_copyrights"] = "© 2010 - %1";
-$lang["common_correct_errors"] = "Por favor corrija los errores identificados antes de guardar";
+$lang["common_correct_errors"] = "Por favor, corrija los errores identificados antes de guardar";
 $lang["common_country"] = "País";
 $lang["common_date"] = "Fecha";
 $lang["common_delete"] = "Borrar";
-$lang["common_det"] = "Detalles";
+$lang["common_det"] = "detalles";
 $lang["common_download_import_template"] = "Descargar Plantilla de Importación de CSV (CSV)";
-$lang["common_edit"] = "Editar";
+$lang["common_edit"] = "editar";
 $lang["common_email"] = "Email";
 $lang["common_email_invalid_format"] = "El correo-e no está en el formato requerido.";
-$lang["common_export_csv"] = "Exportar CSV";
+$lang["common_export_csv"] = "Reporte en CSV";
 $lang["common_export_csv_no"] = "No";
 $lang["common_export_csv_yes"] = "Si";
 $lang["common_fields_required_message"] = "Los campos en rojo son requeridos";
@@ -27,11 +27,12 @@ $lang["common_gender"] = "Género";
 $lang["common_gender_female"] = "F";
 $lang["common_gender_male"] = "M";
 $lang["common_gender_undefined"] = "";
-$lang["common_id"] = "Id";
+$lang["common_icon"] = "Icono";
+$lang["common_id"] = "Identificación";
 $lang["common_import"] = "Importar";
 $lang["common_import_change_file"] = "Cambiar";
 $lang["common_import_csv"] = "Importar CSV";
-$lang["common_import_full_path"] = "Se requiere la ruta completa del archivo CSV";
+$lang["common_import_full_path"] = "La ruta completa al archivo CSV es requerida";
 $lang["common_import_remove_file"] = "Quitar";
 $lang["common_import_select_file"] = "Selecciona archivo";
 $lang["common_inv"] = "Inv";
@@ -40,7 +41,9 @@ $lang["common_last_name_required"] = "Apellidos es un campo requerido.";
 $lang["common_last_page"] = "Ultima";
 $lang["common_learn_about_project"] = "para leer la información más reciente acerca del proyecto.";
 $lang["common_list_of"] = "Lista de";
-$lang["common_logout"] = "Salir";
+$lang["common_logo"] = "Logotipo";
+$lang["common_logo_mark"] = "Marca";
+$lang["common_logout"] = "Cerrar sesión";
 $lang["common_migration_needed"] = "La migración de la base de datos hacia %1 comenzará después de iniciar sesión.";
 $lang["common_new"] = "Nuevo";
 $lang["common_no"] = "";
@@ -60,6 +63,8 @@ $lang["common_return_policy"] = "Política de Devolución";
 $lang["common_search"] = "Buscar";
 $lang["common_search_options"] = "Opciones de búsqueda";
 $lang["common_searched_for"] = "Buscado";
+$lang["common_software_short"] = "OSPOS";
+$lang["common_software_title"] = "Punto de Venta Open Source";
 $lang["common_state"] = "Estado";
 $lang["common_submit"] = "Enviar";
 $lang["common_total_spent"] = "Total gastado";
@@ -67,7 +72,40 @@ $lang["common_unknown"] = "Desconocido";
 $lang["common_view_recent_sales"] = "Ver Ventas Recientes";
 $lang["common_website"] = "opensourcepos.org";
 $lang["common_welcome"] = "Bienvenido(a)";
-$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. Haz click en algún módulo para empezar.";
+$lang["common_welcome_message"] = "Bienvenido(a) a OSPOS. Haz click en algún módulo, para empezar.";
 $lang["common_yes"] = "";
 $lang["common_you_are_using_ospos"] = "Estás usando Open Source Point Of Sale Versión";
 $lang["common_zip"] = "Código Postal";
+$lang["commom_carrier"] = "Operadores
+
+AT&T
+@txt.att.net
+
+Boost Mobile\t
+@smsmyboostmobile.com
+
+Cricket\t
+@sms.cricketwireless.net
+
+Sprint\t
+@messaging.sprintpcs.com
+
+T-Mobile
+@tmomail.net
+
+U.S. Cellular\t
+@email.uscc.net
+
+Verizon\t
+@vtext.com
+
+Virgin Mobile\t
+@vmobl.com";
+$lang["common_position"] = "Posición";
+$lang["common_people"] = "Personas";
+$lang["common_manager"] = "Administrador";
+$lang["common_fields_required_message_unique"] = "Los campos en rojo son obligatorios y deben ser únicos";
+$lang["common_dashboard"] = "Tablero";
+$lang["common_color"] = "Colores del tema";
+$lang["common_clerk"] = "Empleado";
+$lang["common_admin"] = "Administrador";

application/language/es/config_lang.php

@@ -17,7 +17,7 @@ $lang["config_barcode_generate_if_empty"] = "Generar si esta vacio.";
 $lang["config_barcode_height"] = "Alto (px)";
 $lang["config_barcode_id"] = "Id/Artículo";
 $lang["config_barcode_info"] = "Información de Configuración de Código de Barras";
-$lang["config_barcode_layout"] = "Presentación  Código Barras";
+$lang["config_barcode_layout"] = "Diseño Código de Barras";
 $lang["config_barcode_name"] = "Nombre";
 $lang["config_barcode_number"] = "UPC/EAN/ISBN";
 $lang["config_barcode_number_in_row"] = "Número en la línea";
@@ -26,14 +26,14 @@ $lang["config_barcode_page_width"] = "Mostrar ancho de página";
 $lang["config_barcode_price"] = "Precio";
 $lang["config_barcode_second_row"] = "Fila 2";
 $lang["config_barcode_third_row"] = "Fila 3";
-$lang["config_barcode_tooltip"] = "Cuidado: esta característica puede causar duplicados ser importados o creados. No lo use si no quiere códigos de barras duplicadas.";
+$lang["config_barcode_tooltip"] = "Cuidado: esta característica puede causar duplicados ser importados o creados, No lo use si no quiere códigos de barras duplicadas.";
 $lang["config_barcode_type"] = "Tipo de Código de Barra";
 $lang["config_barcode_width"] = "Ancho (px)";
 $lang["config_bottom"] = "Abajo";
-$lang["config_cash_decimals"] = "Decimales del efectivo";
+$lang["config_cash_decimals"] = "Decimales del Efectivo";
 $lang["config_cash_decimals_tooltip"] = "Si los decimales del efectivo y del tipo de moneda son los mismos no habrá redondeo de los pagos en efectivo.";
-$lang["config_cash_rounding"] = "Redondeo de efectivo";
-$lang["config_category_dropdown"] = "";
+$lang["config_cash_rounding"] = "Redondeo del Efectivo";
+$lang["config_category_dropdown"] = "Mostrar Categoria como desplegable";
 $lang["config_center"] = "Centro";
 $lang["config_comma"] = "coma";
 $lang["config_company"] = "Nombre del Comercio";
@@ -43,16 +43,16 @@ $lang["config_company_remove_image"] = "Quitar Imagen";
 $lang["config_company_required"] = "Nombre del Comercio es requerido";
 $lang["config_company_select_image"] = "Seleccionar Imagen";
 $lang["config_company_website_url"] = "Sitio Web no es una URL estándar (http://...).";
-$lang["config_country_codes"] = "Codigo de pais";
+$lang["config_country_codes"] = "Código de País";
 $lang["config_country_codes_tooltip"] = "Lista de codigo de paises separado por coma para busqueda de direcciones.";
 $lang["config_currency_code"] = "Código de Moneda";
-$lang["config_currency_decimals"] = "Decimales de moneda";
-$lang["config_currency_symbol"] = "Símbolo de moneda";
-$lang["config_customer_reward"] = "Premio";
+$lang["config_currency_decimals"] = "Decimales del tipo de moneda";
+$lang["config_currency_symbol"] = "Símbolo de la moneda";
+$lang["config_customer_reward"] = "Cat. de Cliente";
 $lang["config_customer_reward_duplicate"] = "La recompensa debe ser única.";
-$lang["config_customer_reward_enable"] = "Activar los premios para los consumidores";
-$lang["config_customer_reward_invalid_chars"] = "El nombre del premio no puede contener el carácter '_'";
-$lang["config_customer_reward_required"] = "El premio es un campo obligatorio";
+$lang["config_customer_reward_enable"] = "Activar recompenza para clientes";
+$lang["config_customer_reward_invalid_chars"] = "El nombre de la recompenza no puede contener el carácter '_'";
+$lang["config_customer_reward_required"] = "El nombre es un campo obligatorio";
 $lang["config_customer_sales_tax_support"] = "Habilitar la gestión de impuestos en las ventas a clientes";
 $lang["config_date_or_time_format"] = "Filtro de fecha y hora";
 $lang["config_datetimeformat"] = "Formato de fecha y hora";
@@ -73,7 +73,7 @@ $lang["config_default_item_columns"] = "Columnas de Productos Visibles por Defec
 $lang["config_default_origin_tax_code"] = "Código de impuesto por defecto";
 $lang["config_default_receivings_discount"] = "Descuento por Defecto para Recibos";
 $lang["config_default_receivings_discount_number"] = "El Descuento por Defecto Para Los Recibos Debe Ser Un Número.";
-$lang["config_default_receivings_discount_required"] = "El Descuento Predeterminado para los Recibos  es un campo obligatorio.";
+$lang["config_default_receivings_discount_required"] = "El Descuento Predeterminado para los Recibos es un campo obligatorio.";
 $lang["config_default_sales_discount"] = "Descuento Predeterminado para Ventas";
 $lang["config_default_sales_discount_number"] = "Descuento en ventas predeterminado debe ser un número.";
 $lang["config_default_sales_discount_required"] = "Descuento en ventas predeterminado es requerido.";
@@ -95,7 +95,7 @@ $lang["config_dinner_table_enable"] = "Activar Mesa de Restaurante";
 $lang["config_dinner_table_invalid_chars"] = "El nombre de la mesa no puede contener '_'.";
 $lang["config_dinner_table_required"] = "La mesa es un campo obligatorio.";
 $lang["config_dot"] = "punto";
-$lang["config_email"] = "Correo-e";
+$lang["config_email"] = "E-mail";
 $lang["config_email_configuration"] = "Configuracion de correo";
 $lang["config_email_mailpath"] = "Ruta a Sendmail";
 $lang["config_email_protocol"] = "Protocolo";
@@ -126,6 +126,7 @@ $lang["config_financial_year_may"] = "1º de Mayo";
 $lang["config_financial_year_nov"] = "1º de Noviembre";
 $lang["config_financial_year_oct"] = "1º de Octubre";
 $lang["config_financial_year_sep"] = "1º de Septiembre";
+$lang["config_floating_labels"] = "Etiquetas flotantes";
 $lang["config_gcaptcha_enable"] = "Inicio de sesión con reCAPTCHA";
 $lang["config_gcaptcha_secret_key"] = "Llave secreta reCAPTCHA";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key es requerida si se usa";
@@ -145,6 +146,7 @@ $lang["config_image_restrictions"] = "Restricciones de carga de imágenes";
 $lang["config_include_hsn"] = "Incluir Soporte para Códigos HSN";
 $lang["config_info"] = "Información";
 $lang["config_info_configuration"] = "Información del Comercio";
+$lang["config_input_groups"] = "Introducir Grupos";
 $lang["config_integrations"] = "Componentes Integrados";
 $lang["config_integrations_configuration"] = "Componentes de Terceros Integrados";
 $lang["config_invoice"] = "Factura";
@@ -154,8 +156,8 @@ $lang["config_invoice_email_message"] = "Plantilla de Factura por Email";
 $lang["config_invoice_enable"] = "Activar Facturación";
 $lang["config_invoice_printer"] = "Impresora Facturadora";
 $lang["config_invoice_type"] = "Tipo de Factura";
-$lang["config_is_readable"] = "";
-$lang["config_is_writable"] = "es grabable, pero los permisos son superiores a 750.";
+$lang["config_is_readable"] = "es legible, pero los permisos de lectura son incorrectos. Pongalos en 640 o 660 cargue nuevamente.";
+$lang["config_is_writable"] = "es escribible, pero los permisos de escritura son incorrectos. Pongalos en 750 y recargue la página de nuevo.";
 $lang["config_jsprintsetup_required"] = "Advertencia!Esta funcionalidad desactivada solo funciona con el addon jsPrintSetup de FireFox instalado. Guardar de todas formas?";
 $lang["config_language"] = "Idioma";
 $lang["config_last_used_invoice_number"] = "Último numero de factura utilizado";
@@ -174,15 +176,16 @@ $lang["config_locale_info"] = "Informacion de la configuracion de la zona";
 $lang["config_location"] = "Inventario";
 $lang["config_location_configuration"] = "Ubicación de Inventario";
 $lang["config_location_info"] = "Información de Configuración de Ubicación";
+$lang["config_login_form"] = "Estilo del formulario de inicio de sesión";
 $lang["config_logout"] = "Desea hacer un respaldo antes de salir? Pulsa [OK] para respaldar o [Cancelar] para salir.";
-$lang["config_mailchimp"] = "Correo Chimp";
-$lang["config_mailchimp_api_key"] = "Clave de la API Mailchimp";
+$lang["config_mailchimp"] = "Correo MailChimp";
+$lang["config_mailchimp_api_key"] = "Clave API de Mailchimp";
 $lang["config_mailchimp_configuration"] = "Configuración de Mailchimp";
 $lang["config_mailchimp_key_successfully"] = "Clave API correcta.";
 $lang["config_mailchimp_key_unsuccessfully"] = "Clave API incorrecta.";
 $lang["config_mailchimp_lists"] = "Lista(s) de Mailchimp";
 $lang["config_mailchimp_tooltip"] = "Haga clic en el icono de una clave de API.";
-$lang["config_message"] = "Mensaje";
+$lang["config_message"] = "Mensajes SMS";
 $lang["config_message_configuration"] = "Configuracion del mensaje";
 $lang["config_msg_msg"] = "Texto del mensaje guardado";
 $lang["config_msg_msg_placeholder"] = "Si desea usar un formato de SMS guarde su mensaje aquí, en caso contrario deje en blanco.";
@@ -201,18 +204,18 @@ $lang["config_number_locale"] = "Localización";
 $lang["config_number_locale_invalid"] = "Localización ingresada invalida. Revisa el link en el tooltip para encontrar informacion.";
 $lang["config_number_locale_required"] = "Numero localizacion es un campo requerido.";
 $lang["config_number_locale_tooltip"] = "Encontrar una zonificacion adecuada en este enlace.";
-$lang["config_os_timezone"] = "";
+$lang["config_os_timezone"] = "Zona Horaria Local:";
 $lang["config_ospos_info"] = "Información de la Instalación OSPOS";
 $lang["config_payment_options_order"] = "Orden de opciones de pago";
-$lang["config_perm_risk"] = "Permisos superiores a 750 dejan este software en riesgo.";
-$lang["config_phone"] = "Teléfono del Comercio";
+$lang["config_perm_risk"] = "Los permisos incorrectos dejan a este software en riesgo.";
+$lang["config_phone"] = "Teléfono comercial";
 $lang["config_phone_required"] = "Teléfono del Comercio es requerido.";
 $lang["config_print_bottom_margin"] = "Margen Inferior";
 $lang["config_print_bottom_margin_number"] = "Margen Inferior debe ser un número.";
 $lang["config_print_bottom_margin_required"] = "Margen Inferior es requerido.";
-$lang["config_print_delay_autoreturn"] = "Devolver automatico a Vender";
-$lang["config_print_delay_autoreturn_number"] = "Tiempo espera para Devolver a la venta es requerido.";
-$lang["config_print_delay_autoreturn_required"] = "Tiempo espera Devolver a la Venta debe ser numero.";
+$lang["config_print_delay_autoreturn"] = "Regresar automaticamente a Vender";
+$lang["config_print_delay_autoreturn_number"] = "Tiempo espera requerido para regresar a ventas.";
+$lang["config_print_delay_autoreturn_required"] = "El tiempo espera debe ser numérico.";
 $lang["config_print_footer"] = "Imprimir el pie de página del navegador";
 $lang["config_print_header"] = "Imprimir el encabezado del navegador";
 $lang["config_print_left_margin"] = "Margen Izquierdo";
@@ -229,7 +232,7 @@ $lang["config_print_silently"] = "Mostrar configuracion pre- impresión";
 $lang["config_print_top_margin"] = "Margen Superior";
 $lang["config_print_top_margin_number"] = "Margen Superior debe ser un número.";
 $lang["config_print_top_margin_required"] = "Margen Superior es requerido.";
-$lang["config_quantity_decimals"] = "Cantidad de decimales";
+$lang["config_quantity_decimals"] = "Decimales de Cantidades";
 $lang["config_quote_default_comments"] = "Comentario inicial de cotizaciones";
 $lang["config_receipt"] = "Recibo";
 $lang["config_receipt_configuration"] = "Parámetros de Impresión";
@@ -247,13 +250,13 @@ $lang["config_receipt_show_tax_ind"] = "Mostrar indicador de impuestos";
 $lang["config_receipt_show_taxes"] = "Mostrar impuestos";
 $lang["config_receipt_show_total_discount"] = "Mostrar Descuento Total";
 $lang["config_receipt_template"] = "Formato de recibo";
-$lang["config_receiving_calculate_average_price"] = "Cal. precio prom. (Recepción)";
+$lang["config_receiving_calculate_average_price"] = "Cambiar precio de coste. (Recepción)";
 $lang["config_recv_invoice_format"] = "Formato de Factura de Recepción";
 $lang["config_register_mode_default"] = "Modo de registro por defecto";
-$lang["config_report_an_issue"] = "";
-$lang["config_return_policy_required"] = "Política de Devolución es requerida.";
-$lang["config_reward"] = "Premio";
-$lang["config_reward_configuration"] = "Configuración de premios";
+$lang["config_report_an_issue"] = "Informe de algún problema";
+$lang["config_return_policy_required"] = "Política de Devolución requerida.";
+$lang["config_reward"] = "Recompenzas";
+$lang["config_reward_configuration"] = "Configuración de Recompenzas";
 $lang["config_right"] = "Derecha";
 $lang["config_sales_invoice_format"] = "Formato de Facturas de Venta";
 $lang["config_sales_quote_format"] = "Formato de presupuesto de las ventas";
@@ -272,12 +275,12 @@ $lang["config_suggestions_first_column"] = "Columna 1";
 $lang["config_suggestions_layout"] = "Sugerencias de búsqueda";
 $lang["config_suggestions_second_column"] = "Columna 2";
 $lang["config_suggestions_third_column"] = "Columna 3";
-$lang["config_system_conf"] = "Setup & Conf";
+$lang["config_system_conf"] = "Sistema OSPOS";
 $lang["config_system_info"] = "System Info";
 $lang["config_table"] = "Mesa";
 $lang["config_table_configuration"] = "Configuración de Mesa";
 $lang["config_takings_printer"] = "Impresión de retenciones";
-$lang["config_tax"] = "Imp";
+$lang["config_tax"] = "Impuestos";
 $lang["config_tax_category"] = "Categoría impuesto";
 $lang["config_tax_category_duplicate"] = "Categoría de impuesto ingresada ya existe.";
 $lang["config_tax_category_invalid_chars"] = "Categoría de impuesto ingresada es invalida.";
@@ -288,12 +291,38 @@ $lang["config_tax_decimals"] = "Decimales de impuestos";
 $lang["config_tax_id"] = "Identificador del Impuesto";
 $lang["config_tax_included"] = "Impuestos incluidos";
 $lang["config_theme"] = "Tema";
+$lang["config_theme_preview"] = "Vista Previa del Tema:";
 $lang["config_thousands_separator"] = "Separador de miles";
 $lang["config_timezone"] = "Zona Horaria";
-$lang["config_timezone_error"] = "";
+$lang["config_timezone_error"] = "La zona horaria de OSPOS es diferente de tu zona horaria local.";
 $lang["config_top"] = "Arriba";
 $lang["config_use_destination_based_tax"] = "Usar Impuesto Basado en Destino";
-$lang["config_user_timezone"] = "";
+$lang["config_user_timezone"] = "Zona Horaria OSPOS:";
 $lang["config_website"] = "Sitio Web";
 $lang["config_work_order_enable"] = "Soporte Ordenes de Trabajo";
 $lang["config_work_order_format"] = "Formato Ordenes de trabajo";
+$lang['config_wholesale_markup'] = "Marcado al por mayor";
+$lang["config_suggestions_fifth_column"] = "Columna 5";
+$lang["config_suggestions_fourth_column"] = "Columna 4";
+$lang["config_show_due_enable"] = "Mostrar vencimientos de clientes";
+$lang["config_service_charge"] = "Costo de Servicio";
+$lang["config_receipt_category"] = "Recibo con categoría";
+$lang["config_item_markup"] = "Marcado de Artículo";
+$lang['config_enable_avatar_tooltip'] = "Habilitar Avatares para que se muestren en el menú desplegable Categorías y Registrarse ";
+$lang['config_enable_avatar'] = "Habilitar Avatar";
+$lang['config_enable_right_bar_tooltip'] = "Cambiar la barra lateral de izquierda a derecha ";
+$lang['config_enable_right_bar'] = " Habilitar la barra lateral derecha";
+$lang['config_enable_new_look'] = "Habilitar nueva apariencia";
+$lang["config_enable_dropdown_tooltip"] = "No podrá agregar nuevas categorías si esto está marcado";
+$lang["config_default_tax_rate_3"] = "Tasa de Impuestos 3";
+$lang["config_current_employee_only"] = "Mostrar registro sólo del empleado actual";
+$lang["config_company_avatar"] = "Avatar de Empleado";
+$lang["config_change_apperance_tooltip"] = "Cambiar Aspecto de OSPOS";
+$lang["config_quick_cash_enable"] = "Activar Botones de Efectivo";
+$lang["config_cash_button_6"] = "Botón 6";
+$lang["config_cash_button_5"] = "Botón 5";
+$lang["config_cash_button_4"] = "Botón 4";
+$lang["config_cash_button_3"] = "Botón 3";
+$lang["config_cash_button_2"] = "Botón 2";
+$lang["config_cash_button_1"] = "Botón 1";
+$lang["config_cash_button"] = "Botones de Efectivo Rápido";

application/language/es/customers_lang.php

@@ -1,8 +1,7 @@
-<?php 
-
+<?php
 $lang["customers_account_number"] = "Cuenta #";
 $lang["customers_account_number_duplicate"] = "Este número de cuenta ya esta en la base de datos.";
-$lang["customers_available_points"] = "Puntos disponibles";
+$lang["customers_available_points"] = "Puntos Disponibles";
 $lang["customers_average"] = "Gasto promedio";
 $lang["customers_avg_discount"] = "Descuento promedio";
 $lang["customers_basic_information"] = "Información";
@@ -32,7 +31,7 @@ $lang["customers_mailchimp_activity_open"] = "Correo abierto";
 $lang["customers_mailchimp_activity_total"] = "Correo enviado";
 $lang["customers_mailchimp_activity_unopen"] = "Correo sin abrir";
 $lang["customers_mailchimp_email_client"] = "Correo del cliente";
-$lang["customers_mailchimp_info"] = "Mail chimp";
+$lang["customers_mailchimp_info"] = "Correo Mailchimp";
 $lang["customers_mailchimp_member_rating"] = "Porcentaje";
 $lang["customers_mailchimp_status"] = "Estado";
 $lang["customers_mailchimp_vip"] = "VIP";
@@ -52,3 +51,4 @@ $lang["customers_taxable"] = "Gravable";
 $lang["customers_total"] = "Total";
 $lang["customers_update"] = "Actualizar Cliente";
 $lang["rewards_package"] = "Paquete de premios";
+$lang["customers_available_points_value"] = "Puntos Disponibles";

application/language/es/employees_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["employees_basic_information"] = "Información Básica de Empleados";
 $lang["employees_cannot_be_deleted"] = "No se pudieron borrar empleados. Uno o más empleados tiene ventas procesadas o estás tratando de borrarte a tí mismo(a).";
 $lang["employees_change_password"] = "Cambiar Contraseña";
@@ -35,3 +34,9 @@ $lang["employees_update"] = "Actualizar Empleado";
 $lang["employees_username"] = "Usuario";
 $lang["employees_username_minlength"] = "El nombre de usuario debe ser por lo menos, 5 caracteres.";
 $lang["employees_username_required"] = "Nombre de usuario es requerido.";
+$lang["employees_manager"] = "Encargado";
+$lang["employees_username_duplicate"] = "Nombre de Usuario de Empleado yá está en uso. Por favor escoja otro.";
+$lang["employees_commission"] = "Tasa de Comisión";
+$lang["employees_clerk"] = "Empleado";
+$lang["employees_change_employee"] = "Cambio de Empleado";
+$lang["employees_administrator"] = "Administrador";

application/language/es/expenses_lang.php

@@ -1,5 +1,4 @@
-<?php 
-
+<?php
 $lang["expenses_add_item"] = "Agregar Gasto";
 $lang["expenses_amount"] = "Monto";
 $lang["expenses_amount_number"] = "Monto debe ser numerico";
@@ -12,8 +11,8 @@ $lang["expenses_categories_name"] = "Categoria";
 $lang["expenses_category_required"] = "categoria es un campo requerido";
 $lang["expenses_check"] = "Cheque";
 $lang["expenses_check_filter"] = "Cheque";
-$lang["expenses_confirm_delete"] = "¿Esta seguro de querer borrar los gastos seleccionados?";
-$lang["expenses_confirm_restore"] = "¿Esta seguro de querer recuperar los gastos seleccionados?";
+$lang["expenses_confirm_delete"] = "¿Esta seguro que quiere borrar (el)los gasto(s) seleccionado(s)?";
+$lang["expenses_confirm_restore"] = "¿Está seguro que quiere restaurar (el)los gasto(s) seleccionado(s)?";
 $lang["expenses_credit"] = "Tarjeta Credito";
 $lang["expenses_credit_filter"] = "Tarjeta Credito";
 $lang["expenses_date"] = "Fecha";
@@ -44,3 +43,6 @@ $lang["expenses_supplier_name"] = "Proveedor";
 $lang["expenses_supplier_tax_code"] = "Codigo Imp";
 $lang["expenses_tax_amount"] = "Imp";
 $lang["expenses_update"] = "Actualizar Gasto";
+$lang["expenses_tax_amount_number"] = "Número de Importe de Impuestos";
+$lang["expenses_new_supplier"] = "Nuevo Proveedor";
+$lang["expenses_ip_address"] = "Dirección IP";