summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/README.md2
-rw-r--r--docs/release-notes.md2
-rw-r--r--src/SMAPI.Installer/unix-launcher.sh10
-rw-r--r--src/SMAPI/i18n/ru.json3
-rw-r--r--src/SMAPI/i18n/tr.json3
-rw-r--r--src/SMAPI/i18n/zh.json3
6 files changed, 21 insertions, 2 deletions
diff --git a/docs/README.md b/docs/README.md
index ddde6b09..d675b742 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -63,7 +63,7 @@ contributing translations.
locale | status
---------- | :----------------
default | ✓ [fully translated](../src/SMAPI/i18n/default.json)
-Chinese | ❑ not translated
+Chinese | ✓ [fully translated](../src/SMAPI/i18n/zh.json)
French | ❑ not translated
German | ✓ [fully translated](../src/SMAPI/i18n/de.json)
Hungarian | ❑ not translated
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 4234223c..fde74d9d 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,6 +5,7 @@
* For the web UI:
* If a log can't be uploaded to Pastebin (e.g. due to rate limits), it'll be uploaded to Amazon S3 instead. Logs uploaded to S3 will expire after one month.
+ * Updated translations. Thanks to feathershine (added Chinese)!
## 3.0
Released 26 November 2019 for Stardew Valley 1.4.
@@ -85,6 +86,7 @@ For modders:
* Update checks are now faster in some cases.
* Updated mod compatibility list.
* Updated SMAPI/game version map.
+ * Updated translations. Thanks to eren-kemer (added German)!
* Fixes:
* Fixed some assets not updated when you switch language to English.
* Fixed lag in some cases due to incorrect asset caching when playing in non-English.
diff --git a/src/SMAPI.Installer/unix-launcher.sh b/src/SMAPI.Installer/unix-launcher.sh
index f81828f0..bebba9fe 100644
--- a/src/SMAPI.Installer/unix-launcher.sh
+++ b/src/SMAPI.Installer/unix-launcher.sh
@@ -62,7 +62,7 @@ else
fi
# select terminal (prefer $TERMINAL for overrides and testing, then xterm for best compatibility, then known supported terminals)
- for terminal in "$TERMINAL" xterm gnome-terminal kitty terminator xfce4-terminal konsole terminal termite x-terminal-emulator; do
+ for terminal in "$TERMINAL" xterm gnome-terminal kitty terminator xfce4-terminal konsole terminal termite alacritty x-terminal-emulator; do
if $COMMAND "$terminal" 2>/dev/null; then
# Find the true shell behind x-terminal-emulator
if [ "$(basename "$(readlink -f $(which "$terminal"))")" != "x-terminal-emulator" ]; then
@@ -100,6 +100,14 @@ else
# Kitty overrides the TERM varible unless you set it explicitly
kitty -o term=xterm $LAUNCHER
;;
+ alacritty)
+ # Alacritty doesn't like the double quotes or the variable
+ if [ "$ARCH" == "x86_64" ]; then
+ alacritty -e sh -c 'TERM=xterm ./StardewModdingAPI.bin.x86_64 $*'
+ else
+ alacritty -e sh -c 'TERM=xterm ./StardewModdingAPI.bin.x86 $*'
+ fi
+ ;;
xterm|xfce4-terminal|gnome-terminal|terminal|termite)
$LAUNCHTERM -e "sh -c 'TERM=xterm $LAUNCHER'"
;;
diff --git a/src/SMAPI/i18n/ru.json b/src/SMAPI/i18n/ru.json
new file mode 100644
index 00000000..a6a242fa
--- /dev/null
+++ b/src/SMAPI/i18n/ru.json
@@ -0,0 +1,3 @@
+{
+ "warn.invalid-content-removed": "Недопустимое содержимое было удалено, чтобы предотвратить сбой (см. информацию в консоли SMAPI)"
+}
diff --git a/src/SMAPI/i18n/tr.json b/src/SMAPI/i18n/tr.json
new file mode 100644
index 00000000..34229f2b
--- /dev/null
+++ b/src/SMAPI/i18n/tr.json
@@ -0,0 +1,3 @@
+{
+ "warn.invalid-content-removed": "Yanlış paketlenmiş bir içerik, oyunun çökmemesi için yüklenmedi (SMAPI konsol penceresinde detaylı bilgi mevcut)."
+}
diff --git a/src/SMAPI/i18n/zh.json b/src/SMAPI/i18n/zh.json
new file mode 100644
index 00000000..bbd6a574
--- /dev/null
+++ b/src/SMAPI/i18n/zh.json
@@ -0,0 +1,3 @@
+{
+ "warn.invalid-content-removed": "非法内容已移除以防游戏闪退(查看SMAPI控制台获得更多信息)"
+}