mirror of
https://github.com/fish-shell/fish-shell.git
synced 2026-05-30 03:01:15 -03:00
Rename process id -> process ID
This commit is contained in:
Johannes Altmanninger
@@ -42,6 +42,6 @@ The typical use is to run something, stop it with ctrl-z, and then continue it i
|
||||
|
||||
If only 123 and 789 exist, it will still background them and print an error about 456.
|
||||
|
||||
``bg 123 banana`` or ``bg banana 123`` will complain that "banana" is not a valid job specifier.
|
||||
``bg 123 banana`` or ``bg banana 123`` will complain that "banana" is not a valid process ID.
|
||||
|
||||
``bg %2`` will background job 2.
|
||||
|
||||
@@ -40,7 +40,7 @@ The following options are available:
|
||||
Run this function when the variable *VARIABLE_NAME* changes value. Note that :program:`fish` makes no guarantees on any particular timing or even that the function will be run for every single ``set``. Rather it will be run when the variable has been set at least once, possibly skipping some values or being run when the variable has been set to the same value (except for universal variables set in other shells - only changes in the value will be picked up for those).
|
||||
|
||||
**-j** *PID* or **--on-job-exit** *PID*
|
||||
Run this function when the job containing a child process with the given process identifier *PID* exits. Instead of a PID, the string 'caller' can be specified. This is only allowed when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution.
|
||||
Run this function when the job containing a child process with the given process ID *PID* exits. Instead of a PID, the string 'caller' can be specified. This is only allowed when in a command substitution, and will result in the handler being triggered by the exit of the job which created this command substitution.
|
||||
This will not trigger for :doc:`disowned <disown>` jobs.
|
||||
|
||||
**-p** *PID* or **--on-process-exit** *PID*
|
||||
|
||||
18
po/de.po
18
po/de.po
@@ -207,7 +207,7 @@ msgid "%s: %s: invalid mode name. See `help identifiers`\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: %s: invalid process id"
|
||||
msgid "%s: %s: invalid process ID"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -255,7 +255,7 @@ msgid "%s: '%s' is not a job\n"
|
||||
msgstr "%s: '%s' ist kein Job\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid job id\n"
|
||||
msgid "%s: '%s' is not a valid job ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -263,7 +263,7 @@ msgid "%s: '%s' is not a valid job specifier\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid process id\n"
|
||||
msgid "%s: '%s' is not a valid process ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -355,7 +355,7 @@ msgid "%s: Could not find '%s'\n"
|
||||
msgstr "%s: Konnte '%s' nicht finden\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Could not find a job with process id '%d'\n"
|
||||
msgid "%s: Could not find a job with process ID '%d'\n"
|
||||
msgstr "%s: Konnte keinen Job mit Prozess-ID '%d' finden\n"
|
||||
|
||||
#, c-format
|
||||
@@ -3370,7 +3370,7 @@ msgstr ""
|
||||
msgid "Show event handlers matching the given type"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show group id of job"
|
||||
msgid "Show group ID of job"
|
||||
msgstr "Gruppenkennung des Jobs anzeigen"
|
||||
|
||||
msgid "Show help"
|
||||
@@ -3394,7 +3394,7 @@ msgstr "Änderungsdatum anzeigen"
|
||||
msgid "Show seconds since the modification time"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show the process id of each process in the job"
|
||||
msgid "Show the process ID of each process in the job"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show unavailable key bindings/erase all bindings"
|
||||
@@ -38983,7 +38983,7 @@ msgstr ""
|
||||
msgid "Numeric UID for user"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric group id of file"
|
||||
msgid "Numeric group ID of file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric output"
|
||||
@@ -43867,7 +43867,7 @@ msgstr ""
|
||||
msgid "Print each row as it is received"
|
||||
msgstr ""
|
||||
|
||||
msgid "Print effective group id"
|
||||
msgid "Print effective group ID"
|
||||
msgstr "Effektive Gruppenkennung ausgeben"
|
||||
|
||||
msgid "Print effective user ID"
|
||||
@@ -52468,7 +52468,7 @@ msgstr ""
|
||||
msgid "Save the payload to a file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save the process id in file"
|
||||
msgid "Save the process ID in file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save this many versions"
|
||||
|
||||
22
po/en.po
22
po/en.po
@@ -205,7 +205,7 @@ msgid "%s: %s: invalid mode name. See `help identifiers`\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: %s: invalid process id"
|
||||
msgid "%s: %s: invalid process ID"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -253,7 +253,7 @@ msgid "%s: '%s' is not a job\n"
|
||||
msgstr "%s: “%s” is not a job\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid job id\n"
|
||||
msgid "%s: '%s' is not a valid job ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -261,7 +261,7 @@ msgid "%s: '%s' is not a valid job specifier\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid process id\n"
|
||||
msgid "%s: '%s' is not a valid process ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -353,7 +353,7 @@ msgid "%s: Could not find '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Could not find a job with process id '%d'\n"
|
||||
msgid "%s: Could not find a job with process ID '%d'\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -3368,8 +3368,8 @@ msgstr ""
|
||||
msgid "Show event handlers matching the given type"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show group id of job"
|
||||
msgstr "Show group id of job"
|
||||
msgid "Show group ID of job"
|
||||
msgstr "Show group ID of job"
|
||||
|
||||
msgid "Show help"
|
||||
msgstr ""
|
||||
@@ -3392,7 +3392,7 @@ msgstr "Show modification time"
|
||||
msgid "Show seconds since the modification time"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show the process id of each process in the job"
|
||||
msgid "Show the process ID of each process in the job"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show unavailable key bindings/erase all bindings"
|
||||
@@ -38981,7 +38981,7 @@ msgstr ""
|
||||
msgid "Numeric UID for user"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric group id of file"
|
||||
msgid "Numeric group ID of file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric output"
|
||||
@@ -43865,8 +43865,8 @@ msgstr ""
|
||||
msgid "Print each row as it is received"
|
||||
msgstr ""
|
||||
|
||||
msgid "Print effective group id"
|
||||
msgstr "Print effective group id"
|
||||
msgid "Print effective group ID"
|
||||
msgstr "Print effective group ID"
|
||||
|
||||
msgid "Print effective user ID"
|
||||
msgstr "Print effective user ID"
|
||||
@@ -52466,7 +52466,7 @@ msgstr ""
|
||||
msgid "Save the payload to a file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save the process id in file"
|
||||
msgid "Save the process ID in file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save this many versions"
|
||||
|
||||
20
po/fr.po
20
po/fr.po
@@ -306,7 +306,7 @@ msgid "%s: %s: invalid mode name. See `help identifiers`\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: %s: invalid process id"
|
||||
msgid "%s: %s: invalid process ID"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -354,7 +354,7 @@ msgid "%s: '%s' is not a job\n"
|
||||
msgstr "%s : '%s' n’est pas une tâche\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid job id\n"
|
||||
msgid "%s: '%s' is not a valid job ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -362,8 +362,8 @@ msgid "%s: '%s' is not a valid job specifier\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid process id\n"
|
||||
msgstr ""
|
||||
msgid "%s: '%s' is not a valid process ID\n"
|
||||
msgstr "%s : '%s' n'est pas un PID valide\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: --command cannot be combined with --position=command"
|
||||
@@ -454,7 +454,7 @@ msgid "%s: Could not find '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Could not find a job with process id '%d'\n"
|
||||
msgid "%s: Could not find a job with process ID '%d'\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -3469,7 +3469,7 @@ msgstr ""
|
||||
msgid "Show event handlers matching the given type"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show group id of job"
|
||||
msgid "Show group ID of job"
|
||||
msgstr "Afficher l’ID de groupe de la tâche"
|
||||
|
||||
msgid "Show help"
|
||||
@@ -3493,7 +3493,7 @@ msgstr "Afficher l’horodatage de modification"
|
||||
msgid "Show seconds since the modification time"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show the process id of each process in the job"
|
||||
msgid "Show the process ID of each process in the job"
|
||||
msgstr "Afficher le PID de tous les processus de la tâche"
|
||||
|
||||
msgid "Show unavailable key bindings/erase all bindings"
|
||||
@@ -39082,7 +39082,7 @@ msgstr ""
|
||||
msgid "Numeric UID for user"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric group id of file"
|
||||
msgid "Numeric group ID of file"
|
||||
msgstr "Le fichier a le groupe au GID spécifié en tant que groupe propriétaire"
|
||||
|
||||
msgid "Numeric output"
|
||||
@@ -43966,7 +43966,7 @@ msgstr ""
|
||||
msgid "Print each row as it is received"
|
||||
msgstr ""
|
||||
|
||||
msgid "Print effective group id"
|
||||
msgid "Print effective group ID"
|
||||
msgstr "Afficher le GID effectif"
|
||||
|
||||
msgid "Print effective user ID"
|
||||
@@ -52567,7 +52567,7 @@ msgstr ""
|
||||
msgid "Save the payload to a file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save the process id in file"
|
||||
msgid "Save the process ID in file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save this many versions"
|
||||
|
||||
18
po/pl.po
18
po/pl.po
@@ -201,7 +201,7 @@ msgid "%s: %s: invalid mode name. See `help identifiers`\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: %s: invalid process id"
|
||||
msgid "%s: %s: invalid process ID"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -249,7 +249,7 @@ msgid "%s: '%s' is not a job\n"
|
||||
msgstr "%s: '%s' nie jest zadaniem\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid job id\n"
|
||||
msgid "%s: '%s' is not a valid job ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -257,7 +257,7 @@ msgid "%s: '%s' is not a valid job specifier\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid process id\n"
|
||||
msgid "%s: '%s' is not a valid process ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -349,7 +349,7 @@ msgid "%s: Could not find '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Could not find a job with process id '%d'\n"
|
||||
msgid "%s: Could not find a job with process ID '%d'\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -3364,7 +3364,7 @@ msgstr ""
|
||||
msgid "Show event handlers matching the given type"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show group id of job"
|
||||
msgid "Show group ID of job"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show help"
|
||||
@@ -3388,7 +3388,7 @@ msgstr ""
|
||||
msgid "Show seconds since the modification time"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show the process id of each process in the job"
|
||||
msgid "Show the process ID of each process in the job"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show unavailable key bindings/erase all bindings"
|
||||
@@ -38977,7 +38977,7 @@ msgstr ""
|
||||
msgid "Numeric UID for user"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric group id of file"
|
||||
msgid "Numeric group ID of file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric output"
|
||||
@@ -43861,7 +43861,7 @@ msgstr ""
|
||||
msgid "Print each row as it is received"
|
||||
msgstr ""
|
||||
|
||||
msgid "Print effective group id"
|
||||
msgid "Print effective group ID"
|
||||
msgstr ""
|
||||
|
||||
msgid "Print effective user ID"
|
||||
@@ -52462,7 +52462,7 @@ msgstr ""
|
||||
msgid "Save the payload to a file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save the process id in file"
|
||||
msgid "Save the process ID in file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save this many versions"
|
||||
|
||||
26
po/pt_BR.po
26
po/pt_BR.po
@@ -206,7 +206,7 @@ msgid "%s: %s: invalid mode name. See `help identifiers`\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: %s: invalid process id"
|
||||
msgid "%s: %s: invalid process ID"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -254,16 +254,16 @@ msgid "%s: '%s' is not a job\n"
|
||||
msgstr "%s: “%s” não é uma tarefa\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid job id\n"
|
||||
msgid "%s: '%s' is not a valid job ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid job specifier\n"
|
||||
msgstr "%s: '%s' não é um identificador de tarefa válido\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid process id\n"
|
||||
msgstr ""
|
||||
msgid "%s: '%s' is not a valid process ID\n"
|
||||
msgstr "%s: '%s' não é um identificador de tarefa válido\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: --command cannot be combined with --position=command"
|
||||
@@ -354,7 +354,7 @@ msgid "%s: Could not find '%s'\n"
|
||||
msgstr "%s: Não foi possível encontrar '%s'\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Could not find a job with process id '%d'\n"
|
||||
msgid "%s: Could not find a job with process ID '%d'\n"
|
||||
msgstr "%s: Não foi possível encontrar uma tarefa com id de processo '%d'\n"
|
||||
|
||||
#, c-format
|
||||
@@ -3369,8 +3369,8 @@ msgstr ""
|
||||
msgid "Show event handlers matching the given type"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show group id of job"
|
||||
msgstr "Show group id of job"
|
||||
msgid "Show group ID of job"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show help"
|
||||
msgstr ""
|
||||
@@ -3393,7 +3393,7 @@ msgstr "Mostra horário de modificação"
|
||||
msgid "Show seconds since the modification time"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show the process id of each process in the job"
|
||||
msgid "Show the process ID of each process in the job"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show unavailable key bindings/erase all bindings"
|
||||
@@ -38982,7 +38982,7 @@ msgstr ""
|
||||
msgid "Numeric UID for user"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric group id of file"
|
||||
msgid "Numeric group ID of file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric output"
|
||||
@@ -43866,8 +43866,8 @@ msgstr ""
|
||||
msgid "Print each row as it is received"
|
||||
msgstr ""
|
||||
|
||||
msgid "Print effective group id"
|
||||
msgstr "Print effective group id"
|
||||
msgid "Print effective group ID"
|
||||
msgstr "Print effective group ID"
|
||||
|
||||
msgid "Print effective user ID"
|
||||
msgstr "Print effective user ID"
|
||||
@@ -52467,7 +52467,7 @@ msgstr ""
|
||||
msgid "Save the payload to a file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save the process id in file"
|
||||
msgid "Save the process ID in file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save this many versions"
|
||||
|
||||
30
po/sv.po
30
po/sv.po
@@ -202,7 +202,7 @@ msgid "%s: %s: invalid mode name. See `help identifiers`\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: %s: invalid process id"
|
||||
msgid "%s: %s: invalid process ID"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -250,7 +250,7 @@ msgid "%s: '%s' is not a job\n"
|
||||
msgstr "%s: '%s' är inte ett jobb\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid job id\n"
|
||||
msgid "%s: '%s' is not a valid job ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -258,7 +258,7 @@ msgid "%s: '%s' is not a valid job specifier\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid process id\n"
|
||||
msgid "%s: '%s' is not a valid process ID\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -350,7 +350,7 @@ msgid "%s: Could not find '%s'\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
msgid "%s: Could not find a job with process id '%d'\n"
|
||||
msgid "%s: Could not find a job with process ID '%d'\n"
|
||||
msgstr ""
|
||||
|
||||
#, c-format
|
||||
@@ -3365,8 +3365,8 @@ msgstr ""
|
||||
msgid "Show event handlers matching the given type"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show group id of job"
|
||||
msgstr "Visa grupp-id för jobb"
|
||||
msgid "Show group ID of job"
|
||||
msgstr "Visa grupp-ID för jobb"
|
||||
|
||||
msgid "Show help"
|
||||
msgstr ""
|
||||
@@ -3389,7 +3389,7 @@ msgstr "Visa ändringstid"
|
||||
msgid "Show seconds since the modification time"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show the process id of each process in the job"
|
||||
msgid "Show the process ID of each process in the job"
|
||||
msgstr ""
|
||||
|
||||
msgid "Show unavailable key bindings/erase all bindings"
|
||||
@@ -27171,7 +27171,7 @@ msgid "Force following parameters to be interpreted as user names"
|
||||
msgstr "Tvinga efterföljande parametrar att tolkas som användarnamn"
|
||||
|
||||
msgid "Force following parameters to be process ID's (The default)"
|
||||
msgstr "Tvinga efterföljande parametrar att tolkas som process-id (standard)"
|
||||
msgstr "Tvinga efterföljande parametrar att tolkas som process-ID (standard)"
|
||||
|
||||
msgid "Force format"
|
||||
msgstr ""
|
||||
@@ -37854,7 +37854,7 @@ msgid "Mojo that performs shading delegating to the Shader component"
|
||||
msgstr ""
|
||||
|
||||
msgid "Monitor PID"
|
||||
msgstr "Bevaka process-id"
|
||||
msgstr "Bevaka process-ID"
|
||||
|
||||
msgid "Monitor a directory"
|
||||
msgstr ""
|
||||
@@ -38978,7 +38978,7 @@ msgstr ""
|
||||
msgid "Numeric UID for user"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric group id of file"
|
||||
msgid "Numeric group ID of file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric output"
|
||||
@@ -43862,8 +43862,8 @@ msgstr ""
|
||||
msgid "Print each row as it is received"
|
||||
msgstr ""
|
||||
|
||||
msgid "Print effective group id"
|
||||
msgstr "Visa effektivt grupp-id"
|
||||
msgid "Print effective group ID"
|
||||
msgstr "Visa effektivt grupp-ID"
|
||||
|
||||
msgid "Print effective user ID"
|
||||
msgstr "Visa effektivt användar-id"
|
||||
@@ -52463,7 +52463,7 @@ msgstr ""
|
||||
msgid "Save the payload to a file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save the process id in file"
|
||||
msgid "Save the process ID in file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save this many versions"
|
||||
@@ -53241,7 +53241,7 @@ msgid "Select author id from a menu"
|
||||
msgstr ""
|
||||
|
||||
msgid "Select by PID"
|
||||
msgstr "Välj via process-id"
|
||||
msgstr "Välj via process-ID"
|
||||
|
||||
msgid "Select by command"
|
||||
msgstr "Välj via kommando"
|
||||
@@ -53253,7 +53253,7 @@ msgid "Select by jail (name or id)"
|
||||
msgstr ""
|
||||
|
||||
msgid "Select by parent PID"
|
||||
msgstr "Välj via förälders process-id"
|
||||
msgstr "Välj via förälders process-ID"
|
||||
|
||||
msgid "Select by session ID"
|
||||
msgstr "Välj via sessions-id"
|
||||
|
||||
18
po/zh_CN.po
18
po/zh_CN.po
@@ -228,7 +228,7 @@ msgid "%s: %s: invalid mode name. See `help identifiers`\n"
|
||||
msgstr "%s: %s: 无效模式名。参见 `help identifiers`\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: %s: invalid process id"
|
||||
msgid "%s: %s: invalid process ID"
|
||||
msgstr "%s: %s: 无效进程 ID"
|
||||
|
||||
#, c-format
|
||||
@@ -276,7 +276,7 @@ msgid "%s: '%s' is not a job\n"
|
||||
msgstr "%s: '%s' 不是一个作业\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid job id\n"
|
||||
msgid "%s: '%s' is not a valid job ID\n"
|
||||
msgstr "%s: '%s' 不是一个有效的作业 ID\n"
|
||||
|
||||
#, c-format
|
||||
@@ -284,7 +284,7 @@ msgid "%s: '%s' is not a valid job specifier\n"
|
||||
msgstr "%s: '%s' 不是有效的作业说明符\n"
|
||||
|
||||
#, c-format
|
||||
msgid "%s: '%s' is not a valid process id\n"
|
||||
msgid "%s: '%s' is not a valid process ID\n"
|
||||
msgstr "%s: '%s' 不是一个有效的进程 ID\n"
|
||||
|
||||
#, c-format
|
||||
@@ -376,7 +376,7 @@ msgid "%s: Could not find '%s'\n"
|
||||
msgstr "%s: 找不到 '%s'\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
msgid "%s: Could not find a job with process id '%d'\n"
|
||||
msgid "%s: Could not find a job with process ID '%d'\n"
|
||||
msgstr "%s: 无法找到进程 ID 为 '%d' 的作业\n"
|
||||
|
||||
#, fuzzy, c-format
|
||||
@@ -3397,7 +3397,7 @@ msgstr "显示事件处理程序"
|
||||
msgid "Show event handlers matching the given type"
|
||||
msgstr "显示匹配指定类型的事件处理程序"
|
||||
|
||||
msgid "Show group id of job"
|
||||
msgid "Show group ID of job"
|
||||
msgstr "显示作业的组 ID"
|
||||
|
||||
msgid "Show help"
|
||||
@@ -3421,7 +3421,7 @@ msgstr "显示修改时间"
|
||||
msgid "Show seconds since the modification time"
|
||||
msgstr "显示自修改时间以来的秒数"
|
||||
|
||||
msgid "Show the process id of each process in the job"
|
||||
msgid "Show the process ID of each process in the job"
|
||||
msgstr "显示作业中每个进程的进程 ID"
|
||||
|
||||
msgid "Show unavailable key bindings/erase all bindings"
|
||||
@@ -39010,7 +39010,7 @@ msgstr ""
|
||||
msgid "Numeric UID for user"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric group id of file"
|
||||
msgid "Numeric group ID of file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Numeric output"
|
||||
@@ -43894,7 +43894,7 @@ msgstr ""
|
||||
msgid "Print each row as it is received"
|
||||
msgstr ""
|
||||
|
||||
msgid "Print effective group id"
|
||||
msgid "Print effective group ID"
|
||||
msgstr ""
|
||||
|
||||
msgid "Print effective user ID"
|
||||
@@ -52495,7 +52495,7 @@ msgstr ""
|
||||
msgid "Save the payload to a file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save the process id in file"
|
||||
msgid "Save the process ID in file"
|
||||
msgstr ""
|
||||
|
||||
msgid "Save this many versions"
|
||||
|
||||
@@ -41,7 +41,7 @@ complete -c find -o empty -d "File is empty and is either a regular file or a di
|
||||
complete -c find -o executable -d "File is executable"
|
||||
complete -c find -o false -d "Always false"
|
||||
complete -c find -o fstype -d "File is on filesystem of specified type" -a "(__fish_print_filesystems)" -x
|
||||
complete -c find -o gid -d "Numeric group id of file" -x -a "(__fish_complete_group_ids)"
|
||||
complete -c find -o gid -d "Numeric group ID of file" -x -a "(__fish_complete_group_ids)"
|
||||
complete -c find -o group -d "Group name of file" -x -a "(__fish_complete_groups)"
|
||||
|
||||
complete -c find -o ilname -d "File is symlink matching specified case insensitive pattern" -x
|
||||
|
||||
@@ -1468,7 +1468,7 @@ complete -x -c git -n '__fish_git_using_command daemon' -l user-path -d 'Allow ~
|
||||
complete -f -c git -n '__fish_git_using_command daemon' -l verbose -d 'Log all details'
|
||||
complete -f -c git -n '__fish_git_using_command daemon' -l reuseaddr -d 'Reuse address when binding to listening server'
|
||||
complete -f -c git -n '__fish_git_using_command daemon' -l detach -d 'Detach from shell'
|
||||
complete -x -c git -n '__fish_git_using_command daemon' -l reuseaddr -d 'Save the process id in file'
|
||||
complete -x -c git -n '__fish_git_using_command daemon' -l reuseaddr -d 'Save the process ID in file'
|
||||
complete -x -c git -n '__fish_git_using_command daemon' -l user -d 'Change daemon\'s uid'
|
||||
complete -x -c git -n '__fish_git_using_command daemon' -l group -d 'Change daemon\'s gid'
|
||||
complete -x -c git -n '__fish_git_using_command daemon' -l enable -a 'upload-pack upload-archive receive-pack' -d 'Enable service'
|
||||
|
||||
@@ -4,7 +4,7 @@ if string match -eq 'GNU coreutils' (id --version 2>&1)
|
||||
complete id -s Z -l context -d "Print security context"
|
||||
complete id -s z -l zero -d "Delimit entries with NUL"
|
||||
complete id -s n -l name -d "Print name, not number"
|
||||
complete id -s g -l group -d "Print effective group id"
|
||||
complete id -s g -l group -d "Print effective group ID"
|
||||
complete id -s G -l groups -d "Print all group ids"
|
||||
complete id -s r -l real -d "Print real ID, not effective"
|
||||
complete id -s u -l user -d "Print effective user ID"
|
||||
@@ -24,7 +24,7 @@ else
|
||||
complete id -s F -d "Print full name of the user"
|
||||
complete id -s G -d "Print all group ids"
|
||||
complete id -s P -d "Print as passwd file entry"
|
||||
complete id -s g -d "Print effective group id"
|
||||
complete id -s g -d "Print effective group ID"
|
||||
complete id -s n -d "Print name, not number"
|
||||
complete id -s p -d "Human-readable output"
|
||||
complete id -s r -d "Print real ID, not effective"
|
||||
|
||||
@@ -548,8 +548,8 @@ function __fish_complete_ip
|
||||
attach "Attach process to network namespace" \
|
||||
delete "Delete network namespace" \
|
||||
set "Change network namespace attributes" \
|
||||
identify "Display network namespace for a process id" \
|
||||
pids "Display process ids of processes running in network namespace" \
|
||||
identify "Display network namespace for a process ID" \
|
||||
pids "Display process IDs of processes running in network namespace" \
|
||||
monitor "Report as network namespace names are added and deleted" \
|
||||
exec "Execute command in network namespace" \
|
||||
help "Display help" \
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
complete -c jobs -s h -l help -d 'Display help and exit'
|
||||
complete -c jobs -s p -l pid -d "Show the process id of each process in the job"
|
||||
complete -c jobs -s g -l group -d "Show group id of job"
|
||||
complete -c jobs -s p -l pid -d "Show the process ID of each process in the job"
|
||||
complete -c jobs -s g -l group -d "Show group ID of job"
|
||||
complete -c jobs -s c -l command -d "Show commandname of each job"
|
||||
complete -c jobs -s l -l last -d "Only show status for last job to be started"
|
||||
complete -c jobs -s q -l quiet -l query -d "Check if a job exists without output"
|
||||
|
||||
@@ -161,7 +161,7 @@ fn parse_cmd_opts(
|
||||
} else {
|
||||
let Ok(pid @ 0..) = fish_wcstoi(woptarg) else {
|
||||
streams.err.append(wgettext_fmt!(
|
||||
"%s: %s: invalid process id",
|
||||
"%s: %s: invalid process ID",
|
||||
cmd,
|
||||
woptarg
|
||||
));
|
||||
|
||||
@@ -22,7 +22,7 @@ enum JobsPrintMode {
|
||||
Default, // print lots of general info
|
||||
PrintPid, // print pid of each process in job
|
||||
PrintCommand, // print command name of each process in job
|
||||
PrintGroup, // print group id of job
|
||||
PrintGroup, // print group ID of job
|
||||
PrintNothing, // print nothing (exit status only)
|
||||
}
|
||||
|
||||
@@ -196,7 +196,7 @@ pub fn jobs(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui
|
||||
match fish_wcstoi(&arg[1..]).ok().filter(|&job_id| job_id >= 0) {
|
||||
None => {
|
||||
streams.err.append(wgettext_fmt!(
|
||||
"%s: '%s' is not a valid job id\n",
|
||||
"%s: '%s' is not a valid job ID\n",
|
||||
cmd,
|
||||
arg
|
||||
));
|
||||
@@ -217,7 +217,7 @@ pub fn jobs(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui
|
||||
match fish_wcstoi(arg).ok().and_then(Pid::new) {
|
||||
None => {
|
||||
streams.err.append(wgettext_fmt!(
|
||||
"%s: '%s' is not a valid process id\n",
|
||||
"%s: '%s' is not a valid process ID\n",
|
||||
cmd,
|
||||
arg
|
||||
));
|
||||
|
||||
@@ -86,7 +86,7 @@ fn from(value: $sub_type) -> Token {
|
||||
d // "-d", for directories
|
||||
e // "-e", for files that exist
|
||||
f // "-f", for for regular files
|
||||
G // "-G", for check effective group id
|
||||
G // "-G", for check effective group ID
|
||||
g // "-g", for set-group-id
|
||||
k // "-k", for sticky bit
|
||||
O // "-O", for check effective user id
|
||||
@@ -931,7 +931,7 @@ fn unary_primary_evaluate(
|
||||
StatPredicate::e => true,
|
||||
// "-f", for regular files
|
||||
StatPredicate::f => md.file_type().is_file(),
|
||||
// "-G", for check effective group id
|
||||
// "-G", for check effective group ID
|
||||
StatPredicate::G => md.gid() == crate::nix::getegid(),
|
||||
// "-g", for set-group-id
|
||||
StatPredicate::g => md.permissions().mode() & S_ISGID != 0,
|
||||
|
||||
@@ -199,7 +199,7 @@ pub fn wait(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui
|
||||
let mpid: i32 = fish_wcstoi(item).unwrap_or(-1);
|
||||
let Some(mpid) = Pid::new(mpid) else {
|
||||
streams.err.append(wgettext_fmt!(
|
||||
"%s: '%s' is not a valid process id\n",
|
||||
"%s: '%s' is not a valid process ID\n",
|
||||
cmd,
|
||||
item,
|
||||
));
|
||||
@@ -207,7 +207,7 @@ pub fn wait(parser: &Parser, streams: &mut IoStreams, argv: &mut [&wstr]) -> Bui
|
||||
};
|
||||
if !find_wait_handles(WaitHandleQuery::Pid(mpid), parser, &mut wait_handles) {
|
||||
streams.err.append(wgettext_fmt!(
|
||||
"%s: Could not find a job with process id '%d'\n",
|
||||
"%s: Could not find a job with process ID '%d'\n",
|
||||
cmd,
|
||||
mpid,
|
||||
));
|
||||
|
||||
@@ -20,7 +20,7 @@ pub struct Edit {
|
||||
pub replacement: WString,
|
||||
|
||||
/// edit_t is only for contiguous changes, so to restore a group of arbitrary changes to the
|
||||
/// command line we need to have a group id as forcibly coalescing changes is not enough.
|
||||
/// command line we need to have a group ID as forcibly coalescing changes is not enough.
|
||||
group_id: Option<usize>,
|
||||
}
|
||||
|
||||
@@ -170,7 +170,7 @@ pub fn push_edit(&mut self, mut edit: Edit, allow_coalesce: bool) {
|
||||
return; // nop
|
||||
}
|
||||
|
||||
// Assign a new group id or propagate the old one if we're in a logical grouping of edits
|
||||
// Assign a new group ID or propagate the old one if we're in a logical grouping of edits
|
||||
if self.edit_group_level.is_some() {
|
||||
edit.group_id = Some(self.edit_group_id);
|
||||
}
|
||||
@@ -273,7 +273,7 @@ pub fn begin_edit_group(&mut self) {
|
||||
self.undo_history.may_coalesce = false;
|
||||
// Indicate that future changes should be coalesced into the same edit if possible.
|
||||
self.undo_history.try_coalesce = true;
|
||||
// Assign a logical edit group id to future edits in this group
|
||||
// Assign a logical edit group ID to future edits in this group
|
||||
self.edit_group_id += 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
use std::sync::atomic::{AtomicI32, Ordering};
|
||||
use std::sync::{Arc, Mutex, OnceLock};
|
||||
|
||||
/// A job id, corresponding to what is printed by `jobs`. 1 is the first valid job id.
|
||||
/// A job ID, corresponding to what is printed by `jobs`. 1 is the first valid job ID.
|
||||
#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]
|
||||
#[repr(transparent)]
|
||||
pub struct JobId(NonZeroU32);
|
||||
@@ -53,7 +53,7 @@ fn to_arg(self) -> fish_printf::Arg<'a> {
|
||||
/// share the same job group.
|
||||
/// There is also a notion of a "internal" job group. Internal groups are used when executing a
|
||||
/// foreground function or block with no pipeline. These are not jobs as the user understands them -
|
||||
/// they do not consume a job id, they do not show up in job lists, and they do not have a pgid
|
||||
/// they do not consume a job ID, they do not show up in job lists, and they do not have a pgid
|
||||
/// because they contain no external procs. Note that `JobGroup` is intended to eventually be
|
||||
/// shared between threads, and so must be thread safe.
|
||||
#[derive(Debug)]
|
||||
@@ -76,8 +76,8 @@ pub struct JobGroup {
|
||||
pgid: OnceLock<Pid>,
|
||||
/// The original command which produced this job tree.
|
||||
pub command: WString,
|
||||
/// Our job id, if any. `None` here should evaluate to `-1` for ffi purposes.
|
||||
/// "Simple block" groups like function calls do not have a job id.
|
||||
/// Our job ID, if any. `None` here should evaluate to `-1` for ffi purposes.
|
||||
/// "Simple block" groups like function calls do not have a job ID.
|
||||
pub job_id: MaybeJobId,
|
||||
/// The signal causing the group to cancel or `0` if none.
|
||||
/// Not using an `Option<Signal>` to be able to atomically load/store to this field.
|
||||
@@ -111,7 +111,7 @@ pub fn set_is_foreground(&self, in_foreground: bool) {
|
||||
self.is_foreground.store(in_foreground);
|
||||
}
|
||||
|
||||
/// Returns whether we have valid job id. "Simple block" groups like function calls do not.
|
||||
/// Returns whether we have valid job ID. "Simple block" groups like function calls do not.
|
||||
pub fn has_job_id(&self) -> bool {
|
||||
self.job_id.is_some()
|
||||
}
|
||||
@@ -176,7 +176,7 @@ pub fn new(value: NonZeroU32) -> Self {
|
||||
fn acquire() -> JobId {
|
||||
let mut consumed_job_ids = CONSUMED_JOB_IDS.lock().expect("Poisoned mutex!");
|
||||
|
||||
// The new job id should be greater than the largest currently used id (#6053). The job ids
|
||||
// The new job ID should be greater than the largest currently used id (#6053). The job ids
|
||||
// in CONSUMED_JOB_IDS are sorted in ascending order, so we just have to check the last.
|
||||
let job_id = consumed_job_ids
|
||||
.last()
|
||||
@@ -204,9 +204,9 @@ fn next(&self) -> JobId {
|
||||
|
||||
impl JobGroup {
|
||||
pub fn new(command: WString, id: MaybeJobId, job_control: bool, wants_term: bool) -> Self {
|
||||
// We *can* have a job id without job control, but not the reverse.
|
||||
// We *can* have a job ID without job control, but not the reverse.
|
||||
if job_control {
|
||||
assert!(id.is_some(), "Cannot have job control without a job id!");
|
||||
assert!(id.is_some(), "Cannot have job control without a job ID!");
|
||||
}
|
||||
if wants_term {
|
||||
assert!(job_control, "Cannot take terminal without job control!");
|
||||
|
||||
@@ -249,7 +249,7 @@ pub struct ScopedData {
|
||||
/// Whether we are currently cleaning processes.
|
||||
pub is_cleaning_procs: bool,
|
||||
|
||||
/// The internal job id of the job being populated, or 0 if none.
|
||||
/// The internal job ID of the job being populated, or 0 if none.
|
||||
/// This supports the '--on-job-exit caller' feature.
|
||||
pub caller_id: u64, // TODO should be InternalJobId
|
||||
}
|
||||
@@ -1031,7 +1031,7 @@ pub fn job_promote_at(&self, job_pos: usize) {
|
||||
self.jobs_mut().rotate_left(job_pos);
|
||||
}
|
||||
|
||||
/// Return the job with the specified job id. If id is 0 or less, return the last job used.
|
||||
/// Return the job with the specified job ID. If id is 0 or less, return the last job used.
|
||||
pub fn job_with_id(&self, job_id: MaybeJobId) -> Option<JobRef> {
|
||||
for job in self.jobs().iter() {
|
||||
if job_id.is_none() || job_id == job.job_id() {
|
||||
|
||||
@@ -518,7 +518,7 @@ pub fn is_completed(&self) -> bool {
|
||||
}
|
||||
|
||||
/// Create a wait handle for the process.
|
||||
/// As a process does not know its job id, we pass it in.
|
||||
/// As a process does not know its job ID, we pass it in.
|
||||
/// Note this will return null if the process is not waitable (has no pid).
|
||||
pub fn make_wait_handle(&self, jid: InternalJobId) -> Option<WaitHandleRef> {
|
||||
let pid = self.pid()?;
|
||||
@@ -646,7 +646,7 @@ pub fn can_reap(&self, p: &Process) -> bool {
|
||||
}
|
||||
|
||||
/// Returns a truncated version of the job string. Used when a message has already been emitted
|
||||
/// containing the full job string and job id, but using the job id alone would be confusing
|
||||
/// containing the full job string and job ID, but using the job ID alone would be confusing
|
||||
/// due to reuse of freed job ids. Prevents overloading the debug comments with the full,
|
||||
/// untruncated job string when we don't care what the job is, only which of the currently
|
||||
/// running jobs it is.
|
||||
|
||||
@@ -13,7 +13,7 @@ pub struct WaitHandle {
|
||||
/// The pid of this process.
|
||||
pub pid: Pid,
|
||||
|
||||
/// The internal job id of the job which contained this process.
|
||||
/// The internal job ID of the job which contained this process.
|
||||
pub internal_job_id: InternalJobId,
|
||||
|
||||
/// The "base name" of this process.
|
||||
@@ -41,7 +41,7 @@ pub fn status(&self) -> Option<i32> {
|
||||
}
|
||||
|
||||
impl WaitHandle {
|
||||
/// Construct from a pid, job id, and base name.
|
||||
/// Construct from a pid, job ID, and base name.
|
||||
pub fn new(pid: Pid, internal_job_id: InternalJobId, base_name: WString) -> WaitHandleRef {
|
||||
Rc::new(WaitHandle {
|
||||
pid,
|
||||
|
||||
@@ -147,7 +147,7 @@ rm -r $tmpdir
|
||||
functions -e foo
|
||||
|
||||
function foo -p bar; end
|
||||
# CHECKERR: {{.*}}function.fish (line {{\d+}}): function: bar: invalid process id
|
||||
# CHECKERR: {{.*}}function.fish (line {{\d+}}): function: bar: invalid process ID
|
||||
# CHECKERR: function foo -p bar; end
|
||||
# CHECKERR: ^~~~~~~~~~~~~~~~~~~^
|
||||
|
||||
|
||||
@@ -58,14 +58,14 @@ echo $status
|
||||
jobs foo
|
||||
echo $status
|
||||
#CHECK: 2
|
||||
#CHECKERR: jobs: 'foo' is not a valid process id
|
||||
#CHECKERR: jobs: 'foo' is not a valid process ID
|
||||
jobs -q 1
|
||||
echo $status
|
||||
#CHECK: 1
|
||||
jobs -q foo
|
||||
echo $status
|
||||
#CHECK: 2
|
||||
#CHECKERR: jobs: 'foo' is not a valid process id
|
||||
#CHECKERR: jobs: 'foo' is not a valid process ID
|
||||
disown foo
|
||||
#CHECKERR: disown: 'foo' is not a valid job specifier
|
||||
disown (jobs -p)
|
||||
|
||||
@@ -116,9 +116,9 @@ expect_prompt()
|
||||
|
||||
# test error messages
|
||||
sendline("wait 0")
|
||||
expect_prompt("wait: '0' is not a valid process id")
|
||||
expect_prompt("wait: '0' is not a valid process ID")
|
||||
sendline("wait 1")
|
||||
expect_prompt("wait: Could not find a job with process id '1'")
|
||||
expect_prompt("wait: Could not find a job with process ID '1'")
|
||||
sendline("wait hoge")
|
||||
expect_prompt("wait: Could not find child processes with the name 'hoge'")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user