From ca6a0d527399dfdf16454dea074d0a4e7dd3e8a7 Mon Sep 17 00:00:00 2001
From: JustArchi <JustArchi@JustArchi.net>
Date: Sun, 9 Dec 2018 18:52:05 +0100
Subject: [PATCH] Translations update

---
 ASF-WebConfigGenerator                        |  2 +-
 ASF-ui                                        |  2 +-
 .../Localization/Strings.fr-FR.resx           | 19 +++++++++++++----
 .../Localization/Strings.ru-RU.resx           | 21 ++++++++++++++-----
 .../Localization/Strings.tr-TR.resx           | 19 +++++++++++++----
 .../Localization/Strings.zh-CN.resx           |  2 +-
 wiki                                          |  2 +-
 7 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/ASF-WebConfigGenerator b/ASF-WebConfigGenerator
index 459045169..5b987aabb 160000
--- a/ASF-WebConfigGenerator
+++ b/ASF-WebConfigGenerator
@@ -1 +1 @@
-Subproject commit 4590451699c992ce4d8ff162fbbd1817501fb981
+Subproject commit 5b987aabbc75328ab711ce56698a8a212bc0a318
diff --git a/ASF-ui b/ASF-ui
index 8020f5bc9..c79d333ff 160000
--- a/ASF-ui
+++ b/ASF-ui
@@ -1 +1 @@
-Subproject commit 8020f5bc92c5a856df466a71d3056f1e3d7d7643
+Subproject commit c79d333ff340dacd6c3321c22e7ea5ebd8cfaa99
diff --git a/ArchiSteamFarm/Localization/Strings.fr-FR.resx b/ArchiSteamFarm/Localization/Strings.fr-FR.resx
index 5c22508ce..f4c656eae 100644
--- a/ArchiSteamFarm/Localization/Strings.fr-FR.resx
+++ b/ArchiSteamFarm/Localization/Strings.fr-FR.resx
@@ -660,8 +660,19 @@ StackTrace :
     <value>Le bot a le niveau {0}.</value>
     <comment>{0} will be replaced by bot's level</comment>
   </data>
-  
-  
-  
-  
+  <data name="ActivelyMatchingItems" xml:space="preserve">
+    <value>En train de match des Items, round #{0}...</value>
+    <comment>{0} will be replaced by round number</comment>
+  </data>
+  <data name="DoneActivelyMatchingItems" xml:space="preserve">
+    <value>Fini de match des Items, round #{0}.</value>
+    <comment>{0} will be replaced by round number</comment>
+  </data>
+  <data name="ErrorAborted" xml:space="preserve">
+    <value>Annulé !</value>
+  </data>
+  <data name="ActivelyMatchingItemsRound" xml:space="preserve">
+    <value>{0} sets ont été matché pendant ce round.</value>
+    <comment>{0} will be replaced by number of sets traded</comment>
+  </data>
 </root>
diff --git a/ArchiSteamFarm/Localization/Strings.ru-RU.resx b/ArchiSteamFarm/Localization/Strings.ru-RU.resx
index 98a6d131c..d1909c708 100644
--- a/ArchiSteamFarm/Localization/Strings.ru-RU.resx
+++ b/ArchiSteamFarm/Localization/Strings.ru-RU.resx
@@ -643,7 +643,7 @@
     <comment>{0} will be replaced by trade's ID (number)</comment>
   </data>
   <data name="WarningWorkaroundTriggered" xml:space="preserve">
-    <value>Сработал обход ошибки {0}.</value>
+    <value>Сработал временный обход для ошибки {0}.</value>
     <comment>{0} will be replaced by the bug's name provided by ASF</comment>
   </data>
   <data name="TargetBotNotConnected" xml:space="preserve">
@@ -660,8 +660,19 @@
     <value>Уровень бота {0}.</value>
     <comment>{0} will be replaced by bot's level</comment>
   </data>
-  
-  
-  
-  
+  <data name="ActivelyMatchingItems" xml:space="preserve">
+    <value>Сопоставление предметов Steam, раунд #{0}...</value>
+    <comment>{0} will be replaced by round number</comment>
+  </data>
+  <data name="DoneActivelyMatchingItems" xml:space="preserve">
+    <value>Закончено сопоставление предметов Steam, раунд #{0}.</value>
+    <comment>{0} will be replaced by round number</comment>
+  </data>
+  <data name="ErrorAborted" xml:space="preserve">
+    <value>Прервано!</value>
+  </data>
+  <data name="ActivelyMatchingItemsRound" xml:space="preserve">
+    <value>Сопоставленно наборов в этом раунде: {0}.</value>
+    <comment>{0} will be replaced by number of sets traded</comment>
+  </data>
 </root>
diff --git a/ArchiSteamFarm/Localization/Strings.tr-TR.resx b/ArchiSteamFarm/Localization/Strings.tr-TR.resx
index a03e8e2b8..b30f72e19 100644
--- a/ArchiSteamFarm/Localization/Strings.tr-TR.resx
+++ b/ArchiSteamFarm/Localization/Strings.tr-TR.resx
@@ -660,8 +660,19 @@ Yığın izleme:
     <value>Bot seviyesi {0}.</value>
     <comment>{0} will be replaced by bot's level</comment>
   </data>
-  
-  
-  
-  
+  <data name="ActivelyMatchingItems" xml:space="preserve">
+    <value>Steam eşyaları eşleştiriliyor, tur #{0}...</value>
+    <comment>{0} will be replaced by round number</comment>
+  </data>
+  <data name="DoneActivelyMatchingItems" xml:space="preserve">
+    <value>Steam eşyalarını eşleştirme tamamlandı, tur #{0}.</value>
+    <comment>{0} will be replaced by round number</comment>
+  </data>
+  <data name="ErrorAborted" xml:space="preserve">
+    <value>İptal edildi!</value>
+  </data>
+  <data name="ActivelyMatchingItemsRound" xml:space="preserve">
+    <value>Bu turda {0} eşleşme oldu.</value>
+    <comment>{0} will be replaced by number of sets traded</comment>
+  </data>
 </root>
diff --git a/ArchiSteamFarm/Localization/Strings.zh-CN.resx b/ArchiSteamFarm/Localization/Strings.zh-CN.resx
index 98d3ad316..1f72e5d82 100644
--- a/ArchiSteamFarm/Localization/Strings.zh-CN.resx
+++ b/ArchiSteamFarm/Localization/Strings.zh-CN.resx
@@ -151,7 +151,7 @@
     <comment>{0} will be replaced by URL of the request</comment>
   </data>
   <data name="ErrorGlobalConfigNotLoaded" xml:space="preserve">
-    <value>全局配置无法加载，请确定 {0} 存在并且有效！如果您仍然有疑问请遵循 Wiki 的“初始设置”指南。</value>
+    <value>全局配置无法加载，请确定 {0} 存在并且有效！如果您仍然有疑问请遵循 Wiki 的安装指南。</value>
     <comment>{0} will be replaced by file's path</comment>
   </data>
   <data name="ErrorIsInvalid" xml:space="preserve">
diff --git a/wiki b/wiki
index 3b917073b..d70a14147 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 3b917073ba0467e58b092d38eaca4c676a061aac
+Subproject commit d70a141472263ea9c8f8b5c45eceb693a4493831