From 855bd270bd9cbbdc7349f8e2ac58323ad5a1d93c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= <niklas.laxstrom@gmail.com>
Date: Mon, 11 Jan 2016 08:28:02 +0100
Subject: [PATCH] Localisation updates from https://translatewiki.net.

---
 src/locales/fr.json  | 15 ++++++++-------
 src/locales/lki.json |  5 +++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/locales/fr.json b/src/locales/fr.json
index 11f7c1b30..1bf680fd9 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -19,21 +19,22 @@
 			"Maxim21",
 			"Boniface",
 			"Macofe",
-			"Framafan"
+			"Framafan",
+			"Fylip22"
 		]
 	},
 	"index.newPad": "Nouveau pad",
 	"index.createOpenPad": "ou créer/ouvrir un pad intitulé :",
-	"pad.toolbar.bold.title": "Gras (Ctrl-B)",
-	"pad.toolbar.italic.title": "Italique (Ctrl-I)",
-	"pad.toolbar.underline.title": "Souligné (Ctrl-U)",
+	"pad.toolbar.bold.title": "Gras (Ctrl+B)",
+	"pad.toolbar.italic.title": "Italique (Ctrl+I)",
+	"pad.toolbar.underline.title": "Souligné (Ctrl+U)",
 	"pad.toolbar.strikethrough.title": "Barré (Ctrl+5)",
 	"pad.toolbar.ol.title": "Liste ordonnée (Ctrl+Shift+N)",
 	"pad.toolbar.ul.title": "Liste non ordonnée (Ctrl+Shift+L)",
 	"pad.toolbar.indent.title": "Indenter (TAB)",
 	"pad.toolbar.unindent.title": "Désindenter (Maj+TAB)",
-	"pad.toolbar.undo.title": "Annuler (Ctrl-Z)",
-	"pad.toolbar.redo.title": "Rétablir (Ctrl-Y)",
+	"pad.toolbar.undo.title": "Annuler (Ctrl+Z)",
+	"pad.toolbar.redo.title": "Rétablir (Ctrl+Y)",
 	"pad.toolbar.clearAuthorship.title": "Effacer les couleurs identifiant les auteurs (Ctrl+Shift+C)",
 	"pad.toolbar.import_export.title": "Importer/Exporter de/vers un format de fichier différent",
 	"pad.toolbar.timeslider.title": "Historique dynamique",
@@ -50,7 +51,7 @@
 	"pad.wrongPassword": "Votre mot de passe est incorrect",
 	"pad.settings.padSettings": "Paramètres du pad",
 	"pad.settings.myView": "Ma vue",
-	"pad.settings.stickychat": "Toujours afficher le chat",
+	"pad.settings.stickychat": "Toujours afficher le tchat",
 	"pad.settings.chatandusers": "Afficher la discussion et les utilisateurs",
 	"pad.settings.colorcheck": "Couleurs d’identification",
 	"pad.settings.linenocheck": "Numéros de lignes",
diff --git a/src/locales/lki.json b/src/locales/lki.json
index 83101eba5..2f2ff27a1 100644
--- a/src/locales/lki.json
+++ b/src/locales/lki.json
@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"Hosseinblue",
-			"Arash71"
+			"Arash71",
+			"Lakzon"
 		]
 	},
 	"index.newPad": "تازۀpad",
@@ -24,7 +25,7 @@
 	"pad.toolbar.settings.title": "تنظیمۀل",
 	"pad.toolbar.embed.title": "بۀشاکردن ؤ نیائن(اشتراک ونشاندن)ئۀ نؤم سایت",
 	"pad.toolbar.showusers.title": "نیشان دائن کاربر ئۀ نؤم ئئ\npad",
-	"pad.colorpicker.save": "ذخیرۀ",
+	"pad.colorpicker.save": "هیشتن(ذخیره)",
 	"pad.colorpicker.cancel": "ئآهووسانن/لغو",
 	"pad.loading": "...(loading)بارنیائن",
 	"pad.noCookie": "کوکی یافت نشد. لطفاً اجازهٔ اجرای کوکی در مروگرتان را بدهید!",