1
0
mirror of https://github.com/systemd/systemd synced 2026-03-20 03:54:45 +01:00

Compare commits

..

4 Commits

Author SHA1 Message Date
Guiorgy
f5530c10b8
Support Bash completions for short option group in journalctl (#40214)
Currently, the Bash completions for journalctl tries to match the
previous word _**exactly**_, which leads to the following issue:
`journalctl -u dock` correctly auto completes to `journalctl -u
docker.service`, but `journalctl -eu` provides no completions at all,
which is a shame since I never use the `-u` option alone (almost always
`-eu` or `-efu`, I wish the `-e` option was the default but I digress).

The proposed solution is to assume words that start with only a single
dash and consist of only letters are short option groups and handle them
as if the previous word was the short option using the last character,
e.g. `-efu` -> `-u`.
2025-12-31 14:58:58 +00:00
kiamvdd
506b790d71 Add Lenovo Y50-70 touchpad to 60-evdev.hwdb 2025-12-31 14:56:48 +00:00
smosia
4a0743e398 hwdb: touchpad config for Apple MacbookPro12,1 Early 2015 2025-12-31 14:55:43 +00:00
Zongyuan He
8560f41192 po: Translated using Weblate (Chinese (Simplified) (zh_CN))
Currently translated at 100.0% (264 of 264 strings)

Co-authored-by: Zongyuan He <lovenemesis@gmail.com>
Translate-URL: https://translate.fedoraproject.org/projects/systemd/main/zh_CN/
Translation: systemd/main
2025-12-31 22:02:35 +09:00
3 changed files with 26 additions and 4 deletions

View File

@ -132,6 +132,13 @@ evdev:input:b0003v05ACp025B*
EVDEV_ABS_35=::94
EVDEV_ABS_36=::92
# MacbookPro12,1 (unibody, Early 2015)
evdev:input:b0003v05ACp0273*
EVDEV_ABS_00=::97
EVDEV_ABS_01=::92
EVDEV_ABS_35=::97
EVDEV_ABS_36=::92
# MacBook8,1 (2015), MacBook9,1 (2016), MacBook10,1 (2017)
evdev:name:Apple SPI Touchpad:dmi:*:svnAppleInc.:pnMacBook8,1:*
evdev:name:Apple SPI Touchpad:dmi:*:svnAppleInc.:pnMacBook9,1:*
@ -697,6 +704,13 @@ evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoideapadY700-14ISK:*
EVDEV_ABS_35=::27
EVDEV_ABS_36=::29
#Lenovo Y50-70
evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoY50-70**
EVDEV_ABS_00=164:3918:37
EVDEV_ABS_01=120:1935:26
EVDEV_ABS_35=164:3918:37
EVDEV_ABS_36=120:1935:26
# Lenovo Ideapad 310S-14ISK
evdev:name:AlpsPS/2 ALPS GlidePoint:dmi:*svnLENOVO:*pvrLenovoideapad310S-14ISK:*
EVDEV_ABS_00=113:3960:37

View File

@ -11,12 +11,13 @@
# z z <3397542367@qq.com>, 2025.
# Hang Li <dabao1955@163.com>, 2025.
# Jesse Guo <jesseguotech@outlook.com>, 2025.
# Zongyuan He <lovenemesis@gmail.com>, 2025.
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2025-11-26 01:17+0000\n"
"PO-Revision-Date: 2025-11-26 09:52+0000\n"
"Last-Translator: lumingzh <lumingzh@qq.com>\n"
"PO-Revision-Date: 2025-12-31 07:58+0000\n"
"Last-Translator: Zongyuan He <lovenemesis@gmail.com>\n"
"Language-Team: Chinese (Simplified) <https://translate.fedoraproject.org/"
"projects/systemd/main/zh_CN/>\n"
"Language: zh_CN\n"
@ -24,7 +25,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 5.14.3\n"
"X-Generator: Weblate 5.15.1\n"
#: src/core/org.freedesktop.systemd1.policy.in:22
msgid "Send passphrase back to system"
@ -101,7 +102,7 @@ msgstr "核验家区域的凭证"
#: src/home/org.freedesktop.home1.policy:34
msgid ""
"Authentication is required to check credentials against a user's home area."
msgstr "针对用户的家区域核验凭证需要身份认证。"
msgstr "需要身份验证方可将凭证与用户的主目录区域进行比对。"
#: src/home/org.freedesktop.home1.policy:43
msgid "Update a home area"

View File

@ -65,6 +65,13 @@ _journalctl() {
return 0
fi
# If the previous word looks like a short options group,
# handle it as if it were just the last short option.
# e.g. "-aefu" -> "-u"
if [[ "$prev" =~ ^-[a-zA-Z]{2,}$ ]]; then
prev="-${prev:(-1)}"
fi
if __contains_word "$prev" ${OPTS[ARG]} ${OPTS[ARGUNKNOWN]}; then
case $prev in
--boot|-b)