From 793db8f21a55e798ba955dc2a6560187c7fb9b25 Mon Sep 17 00:00:00 2001 From: Yee Cheng Chin Date: Tue, 7 Mar 2023 16:14:09 -0800 Subject: [PATCH] Fix MacVim localized intro text, and don't hide the `:h version9` prompt The Chinese alignment was slightly wrong when `columns` is even numbered. Add an additional space to make sure it will line up right. Also, for Spanish, just fix up the text to fit how the other intro help texts look. Also, don't hide the `:help version9` prompt in intro. For some reason MacVim hides that prompt and shows the `:help macvim` prompt instead which makes no sense. Just show both. Fix #1380 --- src/po/es.po | 2 +- src/po/zh_CN.UTF-8.po | 2 +- src/po/zh_CN.cp936.po | 2 +- src/po/zh_CN.po | 2 +- src/po/zh_TW.UTF-8.po | 2 +- src/po/zh_TW.po | 2 +- src/version.c | 3 +-- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/po/es.po b/src/po/es.po index 5b9475a679..fd4f73c8f6 100644 --- a/src/po/es.po +++ b/src/po/es.po @@ -3700,7 +3700,7 @@ msgstr "escriba :help o para obtener ayuda " # MacVim only msgid "type :help macvim for MacVim help " -msgstr " escriba «:help macvim» para obtener ayuda para MacVim" +msgstr "escriba :help macvim para obtener ayuda para MacVim" msgid "type :help version9 for version info" msgstr "escriba :help version9 para obtener información de la versión" diff --git a/src/po/zh_CN.UTF-8.po b/src/po/zh_CN.UTF-8.po index c6622e25c7..533de9edf1 100644 --- a/src/po/zh_CN.UTF-8.po +++ b/src/po/zh_CN.UTF-8.po @@ -3561,7 +3561,7 @@ msgstr "输入 :help 或 查看在线帮助 " # MacVim only msgid "type :help macvim for MacVim help " -msgstr " 输入 :help macvim 查看 MacVim 的在线帮助" +msgstr " 输入 :help macvim 查看 MacVim 的在线帮助" msgid "type :help version9 for version info" msgstr "输入 :help version9 查看版本信息 " diff --git a/src/po/zh_CN.cp936.po b/src/po/zh_CN.cp936.po index 8caadcb250..91d03fbc68 100644 --- a/src/po/zh_CN.cp936.po +++ b/src/po/zh_CN.cp936.po @@ -3561,7 +3561,7 @@ msgstr " # MacVim only msgid "type :help macvim for MacVim help " -msgstr " :help macvim 鿴 MacVim ߰" +msgstr " :help macvim 鿴 MacVim ߰" msgid "type :help version9 for version info" msgstr " :help version9 鿴汾Ϣ " diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po index 1798e7cfda..2a1e487a74 100644 --- a/src/po/zh_CN.po +++ b/src/po/zh_CN.po @@ -3561,7 +3561,7 @@ msgstr " # MacVim only msgid "type :help macvim for MacVim help " -msgstr " :help macvim 鿴 MacVim ߰" +msgstr " :help macvim 鿴 MacVim ߰" msgid "type :help version9 for version info" msgstr " :help version9 鿴汾Ϣ " diff --git a/src/po/zh_TW.UTF-8.po b/src/po/zh_TW.UTF-8.po index 02285ce6d8..dd82a55bee 100644 --- a/src/po/zh_TW.UTF-8.po +++ b/src/po/zh_TW.UTF-8.po @@ -4799,7 +4799,7 @@ msgstr "線上說明請輸入 :help " # MacVim only msgid "type :help macvim for MacVim help " -msgstr "MacVim 線上說明請輸入 :help " +msgstr "MacVim 線上說明請輸入 :help " msgid "type :help version9 for version info" msgstr "新版本資訊請輸入 :help version9" diff --git a/src/po/zh_TW.po b/src/po/zh_TW.po index 417bd13e77..0a0369e8c5 100644 --- a/src/po/zh_TW.po +++ b/src/po/zh_TW.po @@ -4792,7 +4792,7 @@ msgstr " # MacVim only msgid "type :help macvim for MacVim help " -msgstr "MacVim uWпJ :help " +msgstr "MacVim uWпJ :help " msgid "type :help version9 for version info" msgstr "sTпJ :help version9" diff --git a/src/version.c b/src/version.c index 9081329bb7..6aeb49ab8d 100644 --- a/src/version.c +++ b/src/version.c @@ -3933,11 +3933,10 @@ intro_message( "", N_("type :q to exit "), N_("type :help or for on-line help"), + N_("type :help version9 for version info"), #ifdef FEAT_GUI_MACVIM // TODO: Don't steal the show from version8 help? N_("type :help macvim for MacVim help "), -#else - N_("type :help version9 for version info"), #endif NULL, "",