Merge branch 'master' into feat/config

# Conflicts:
#	server.dev/src/index.js
#	server/src/helpers/server.helpers.mjs
#	src/data/config/config.ets2.json
#	src/plugins/app.plugin.js

README.md

@@ -3,7 +3,7 @@
 [![CodeFactor](https://www.codefactor.io/repository/github/jagfx/ets2-dashboard-skin/badge)](https://www.codefactor.io/repository/github/jagfx/ets2-dashboard-skin/overview)
 [![GitHub Version](https://img.shields.io/github/v/release/JAGFx/ets2-dashboard-skin?style=flat-square)](https://github.com/JAGFx/ets2-dashboard-skin/releases/latest)
 [![GitHub Milestone](https://img.shields.io/github/milestones/progress/JAGFx/ets2-dashboard-skin/8?style=flat-square)](https://github.com/JAGFx/ets2-dashboard-skin/issues?q=is%3Aopen+is%3Aissue+milestone%3A1.6)
-[![GitHub Commit since](https://img.shields.io/github/commits-since/JAGFx/ets2-dashboard-skin/v1.6.6?style=flat-square)](https://github.com/JAGFx/ets2-dashboard-skin/releases)
+[![GitHub Commit since](https://img.shields.io/github/commits-since/JAGFx/ets2-dashboard-skin/v1.6.7?style=flat-square)](https://github.com/JAGFx/ets2-dashboard-skin/releases)
 [![GitHub Release Download](https://img.shields.io/github/downloads/JAGFx/ets2-dashboard-skin/total?style=flat-square)](https://github.com/JAGFx/ets2-dashboard-skin/releases/latest)
 [![Github Licence](https://img.shields.io/github/license/JAGFx/ets2-dashboard-skin?style=flat-square)](https://github.com/JAGFx/ets2-dashboard-skin/blob/master/README.md)
 [![GitHub Release Date](https://img.shields.io/github/release-date/JAGFx/ets2-dashboard-skin?style=flat-square)](https://github.com/JAGFx/ets2-dashboard-skin/releases/latest)
@@ -66,6 +66,7 @@ Available locales:
 - Chinese (cn_CN) - Thanks to [dreamstar-2020](https://github.com/dreamstar-2020)
 - English (en_EN)
 - French (fr_FR)
+- Russian (ru_RU) - Thanks to [Jonny_Bro](https://github.com/JonnyBro)
 
 ## Requirements
 
@@ -116,10 +117,16 @@ And that's it :D
 
 > Tip: You can save a shortcut on your home screen to use it as an app like.
 
+If you want to use another port, change it on the configuration file.
+
 ## Breaking change
 
 See the [BREAKING_CHANGES.md](doc/BREAKING_CHANGES.md) readme
 
+## Translation change
+
+See the [TRANSLATION_CHANGES.md](doc/TRANSLATION_CHANGES.md) readme
+
 ## Know issues
 
 If you found an issue, please see the [KNOW_ISSUES.md](doc/KNOW_ISSUES.md). Your issue may be already known.

doc/CONFIG_SETTINGS.md

@@ -26,6 +26,14 @@ You can find common elements, and skin config.
         </td>
         <td>15</td>
     </tr>
+    <tr>
+        <td>general_port</td>
+        <td>Port</td>
+        <td>
+            N/A
+        </td>
+        <td>3000</td>
+    </tr>
     <tr>
         <td>general_skin_on_load</td>
         <td>Default skin loaded</td>
@@ -675,6 +683,17 @@ You can find common elements, and skin config.
         </td>
         <td>false</td>
     </tr>
+    <tr>
+        <td>jagfx_elements_right_map</td>
+        <td>Display map</td>
+        <td>
+            <ul>
+                <li>true</li>
+                <li>false</li>
+            </ul>
+        </td>
+        <td>false</td>
+    </tr>
 
 </table>
 

doc/FEATURES.md

@@ -158,12 +158,13 @@ Currently, these locales are available:
 
 ### Add a new language
 
-The translations files was stored on `src/translations/` folder.
+The translations files was stored in `src/translations/` folder.
 
-All translations files are in YAML format. The key are the English version and the value are your locale.
+All translations files are in YAML format. The key is the English version and the value is your locale.
 
 If you want to contribute and add a new language: 
 
+- Check changes in [TRANSLATION_CHANGES.md](TRANSLATION_CHANGES.md)
 - Get the base file `src/translations/fr-FR.yaml`
 - Translate all values
 - Rename your file with the locale code like `fr_FR.yaml` and place on the `src/translations/` folder

doc/TRANSLATION_CHANGES.md

@@ -0,0 +1,8 @@
+# Translation changes
+
+## From v1.6.7
+
+### Added
+
+- Port
+- Port used by the server