Merge remote-tracking branch 'origin/hikari' into hikari

Author: Ghost-chu

addon/bluemap/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.github.BlueMap-Minecraft</groupId>
             <artifactId>BlueMapAPI</artifactId>
-            <version>v2.4.0</version>
+            <version>2.5.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

compatibility/towny/pom.xml

@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.palmergames.bukkit.towny</groupId>
             <artifactId>towny</artifactId>
-            <version>0.98.6.20</version>
+            <version>0.98.6.23</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

crowdin/lang/ru-RU/example.yml

@@ -1,3 +1,3 @@
 example1:
   example2:
-    test: "Это тестовый файл для проверки REST ответа от функции распределения Crowdin. Пожалуйста, проигнорируйте этот файл!"
+    test: "Это тестовый файл для проверки REST ответа от функции распределения Crowdin. Пожалуйста, проигнорируйте его!"

crowdin/lang/ru-RU/messages.yml

@@ -767,8 +767,8 @@ addon:
         {
            "embed":
              {
-               "title": ":outbox_tray: Somebody bought items from shop",
-               "description": "The player %%purchase.name%% bought x%%purchase.amount%% %%shop.item.name%% from your shop.",
+               "title": ":outbox_tray: Кто-то купил предметы из вашего магазина",
+               "description": "Игрок %%purchase.name%% купил x%%purchase.amount%% %%shop.item.name%% из вашего магазина.",
                "color": 52084,
                "author": {
                    "name": "QuickShop-Hikari",
@@ -781,37 +781,37 @@ addon:
                    "url": ""
                },
                "footer": {
-                   "text": "QuickShop-Hikari Discord Notification",
+                   "text": "Уведомление QuickShop-Hikari Discord",
                    "icon_url": ""
                },
                "fields": [
                    {
-                       "name": "Shop",
+                       "name": "Магазин",
                        "value": "%%shop.display-name%%",
                        "inline": false
                    },
                    {
-                       "name": "Purchaser",
+                       "name": "Покупатель",
                        "value": "%%purchase.name%%",
                        "inline": true
                    },
                    {
-                       "name": "Item",
+                       "name": "Предмет",
                        "value": "%%shop.item.name%%",
                        "inline": true
                    },
                    {
-                       "name": "Amount",
+                       "name": "Количество",
                        "value": "%%purchase.amount%%(x%%shop.stacking-amount%%)",
                        "inline": true
                    },
                    {
-                       "name": "Your earn",
+                       "name": "Ваш заработок",
                        "value": "%%purchase.balance-formatted%%",
                        "inline": true
                    },
                    {
-                       "name": "Taxes",
+                       "name": "Налоги",
                        "value": "%%purchase.taxes-formatted%%",
                        "inline": true
                    }

crowdin/lang/zh-CN/messages.yml

@@ -167,8 +167,8 @@ unknown-player: <red>目标玩家不存在，请检查你输入的玩家名字
 player-offline: "<red>目标玩家目前处于离线状态。"
 player-profile-format: "<aqua>{0}</aqua><gold>(<yellow>{1}</yellow>)</gold>"
 shop-type:
-  selling: "SELLING"
-  buying: "BUYING"
+  selling: "出售"
+  buying: "收购"
 language:
   qa-issues: '<yellow>质量问题：<aqua>{0}%'
   code: '<yellow>代码： <gold>{0}'
@@ -242,10 +242,10 @@ no-double-chests: <red>你没有权限创建大箱子商店。
 price-too-cheap: <red>价格必须大于<yellow>${0}
 shop-not-exist: <red>这里没有商店
 bad-command-usage: <red>错误的命令参数！
-cleanghost-warning: <yellow>This command will purge <red>all</red> shops if the shop is corrupted, was created in not allowed worlds, is selling/buying not allowed items or <red><bold>EXISTS IN A UNLOADED WORLD</bold></red>. Make sure to create a full backup of your shop data first and use <aqua>/qs cleanghost confirm</aqua> to continue.
-cleanghost-starting: <green>Starting to check for ghost shops (missing container blocks). All non-existing shops will be removed...
-cleanghost-deleting: <yellow>Found a corrupted shop <aqua>{0}</aqua> because {1}, mark it to delete...
-cleanghost-deleted: <green>Total <yellow>{0}</yellow> shops have been deleted.
+cleanghost-warning: <yellow>这个命令将清理<red>所有</red>在不允许创建商店的世界的、出售/购买不允许的物品的，以及 <red><bold>所有在服务器没有加载的世界</bold></red>的商店， 请在确保您的商店数据备份完整后使用 <aqua>/qs cleanghost confirm </aqua>来继续。
+cleanghost-starting: <green>开始检查幽灵商店(缺少容器方块)。所有不存在的商店将被移除...
+cleanghost-deleting: <yellow>发现一个损坏的商店 <aqua>{0}</aqua> 因为 {1}, 标记它删除...
+cleanghost-deleted: <green>总计 <yellow>{0}</yellow> 家商店已被删除。
 shop-purchase-cancelled: <red>您取消了交易操作。
 bypassing-lock: <red>你绕过了QuickShop的锁！
 bungee-cross-server-msg: '<yellow>QuickShop跨服信息: <green>{0}'
@@ -647,8 +647,8 @@ tag-query-no-tag: "<red>该商店没有标签"
 tag-query-shops: "<green>此标签包含 <yellow>{0}</yellow> 商店："
 tag-query-shops-listing: "<yellow> - <aqua>{0}</aqua>"
 batch-operations-based-on-tags-no-failure: "<green>成功批量处理 <yellow>{0}</yellow> 个商店"
-batch-operations-based-on-tags-have-failure: "<yellow>Total <yellow>{0}</yellow> shops in batch processing successfully completed, but <red>{1}</red> requests not completed."
-batch-operations-based-on-tags-have-failure-with-reason: "<yellow>Total <yellow>{0}</yellow> shops in batch processing successfully completed, but <red>{1}</red> requests not completed. Reason: <gold>{2}</gold>"
+batch-operations-based-on-tags-have-failure: "<yellow>总 <yellow>{0}</yellow> 商店在批处理中成功完成，但是 <red>{1}</red> 请求未完成。"
+batch-operations-based-on-tags-have-failure-with-reason: "<yellow>总 <yellow>{0}</yellow> 商店在批处理中成功完成，但是 <red>{1}</red> 请求未完成。原因： <gold>{2}</gold>"
 batch-operations-based-on-tags-have-failure-error-messages-may-appears-above: "<gray>错误消息将在聊天中的此消息上方发送给您。"
 addon:
   towny:
@@ -1343,27 +1343,27 @@ addon:
     success-setup: "<green>该商店的限制设置已成功保存"
     trade-limit-reached-cancel-reason: "<red>达到了这个商店的交易限制"
   dynmap:
-    markerset-title: "QuickShop-Hikari Shops"
-    marker-name: "{0} @ {2} @ {3} for x{4} @ {5}"
+    markerset-title: "QuickShop-Hikari 商店"
+    marker-name: "{0} @ {2} @ {3} x{4} @ {5}"
     marker-description: |
-      Name: {0}
-      Owner: {1}
-      Item: {2}
-      Price: {3} for x{4} item(s)
-      Type: {5}
-      Unlimited: {6}
-      Location: {7}
+      名称: {0}
+      所有者: {1}
+      物品: {2}
+      价格: {3} 个{4} 物品
+      类型: {5}
+      无限模式: {6}
+      位置: {7}
   bluemap:
-    markerset-title: "QuickShop-Hikari Shops"
-    marker-name: "{0} @ {2} @ {3} for x{4} @ {5}"
+    markerset-title: "QuickShop-Hikari 商店"
+    marker-name: "{0} @ {2} @ {3} x{4} @ {5}"
     marker-description: |
-      Name: {0}
-      Owner: {1}
-      Item: {2}
-      Price: {3} for x{4} item(s)
-      Type: {5}
-      Unlimited: {6}
-      Location: {7}
+      名称: {0}
+      所有者: {1}
+      物品: {2}
+      价格: {3} 个{4} 物品
+      类型: {5}
+      无限模式: {6}
+      位置: {7}
 suite:
   dynmap:
     title: "{0} - {1} - {2}"

crowdin/lang/zh-TW/messages.yml

@@ -3,7 +3,7 @@ fee-charged-for-price-change: <green>你花費了 <red>{0}</red> 修改商店定
 not-allowed-to-create: <red>你無法在此建立商店。
 disabled-in-this-world: <red>該世界已停用 QuickShop
 how-much-to-trade-for: <green>請在聊天室中輸入你想買賣 <yellow>{1} 個 {0} <green>的價格。
-client-language-changed: <green>QuickShop 偵測到你的客戶端語言已切換，我們現在為你切換為 {0}。
+client-language-changed: <green>QuickShop 偵測到你的用戶端語言已切換，我們現在為你切換為 {0}。
 shops-backingup: 正在把商店資料備份到資料庫……
 _comment: 你好翻譯者！假若你正在從 Github 或其他代管平台編輯，你應該前往 https://crowdin.com/project/quickshop-hikari 進行翻譯。
 unlimited-shop-owner-changed: <yellow>該無限商店的店主已經修改成 {0}。
@@ -480,7 +480,7 @@ chest-was-removed: <red>儲物箱已被移除。
 you-cant-afford-to-buy: <red>商品價格是 {0} ，但是你只有 {1}。
 shops-removed-in-world: <yellow>世界 <aqua>{1} <yellow>總共有 <aqua>{0} <yellow>個商店被刪除。
 display-turn-off: <green>成功地關閉商店懸浮物顯示。
-client-language-unsupported: <yellow>QuickShop 不支援你的客戶端語言，我們現在還原為 {0}……
+client-language-unsupported: <yellow>QuickShop 不支援你的用戶端語言，我們現在將它還原為 {0}。
 language-version: '63'
 not-managed-shop: <red>你沒有管理該商店的權限
 shop-cannot-trade-when-freezing: <red>你不能與這間商店交易，因為它已被凍結。

quickshop-common/pom.xml

@@ -87,7 +87,7 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
             <scope>compile</scope>
-            <version>1.22</version>
+            <version>1.23.0</version>
         </dependency>
     </dependencies>