diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-04-14 10:37:40 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-04-21 16:58:04 +0200 |
| commit | 38b38500c6011d6bc59171ee23d92fba46bd131e (patch) | |
| tree | afdb5bd5328ead493714c9a713a268f31cd122c0 | |
| parent | debf2ddd2880e020070a9108925c4e42a7295d7f (diff) | |
| download | systemd-38b38500c6011d6bc59171ee23d92fba46bd131e.tar.gz | |
tree-wide: use "hostname" spelling everywhere
It's not that I think that "hostname" is vastly superior to "host name". Quite
the opposite — the difference is small, and in some context the two-word version
does fit better. But in the tree, there are ~200 occurrences of the first, and
>1600 of the other, and consistent spelling is more important than any particular
spelling choice.
56 files changed, 206 insertions, 206 deletions
@@ -2032,7 +2032,7 @@ CHANGES WITH 239: lookup is likely to trigger nss-ldap which in turn might use NSS to ask systemd-resolved for hostname lookups. This will hence result in a deadlock: a user name lookup in order to start - systemd-resolved.service will result in a host name lookup for which + systemd-resolved.service will result in a hostname lookup for which systemd-resolved.service needs to be started already. There are multiple ways to work around this problem: pre-allocate the "systemd-resolve" user on such systems, so that nss-ldap won't be @@ -3001,7 +3001,7 @@ CHANGES WITH 235: A/AAAA resource record for the "_gateway" hostname, pointing to the current default IP gateway. Previously it did that for the "gateway" name, hampering adoption, as some distributions wanted to leave that - host name open for local use. The old behaviour may still be + hostname open for local use. The old behaviour may still be requested at build time. * systemd-networkd's [Address] section in .network files gained a new @@ -4342,7 +4342,7 @@ CHANGES WITH 230: again don't consider turning this on in your stable, LTS or production release just yet. (Note that you have to enable nss-resolve in /etc/nsswitch.conf, to actually use systemd-resolved - and its DNSSEC mode for host name resolution from local + and its DNSSEC mode for hostname resolution from local applications.) * systemd-resolve conveniently resolves DANE records with the --tlsa @@ -6160,14 +6160,14 @@ CHANGES WITH 218: for a unit, as declared in the (usually vendor-supplied) system preset files. - * nss-myhostname will now resolve the single-label host name + * nss-myhostname will now resolve the single-label hostname "gateway" to the locally configured default IP routing gateways, ordered by their metrics. This assigns a stable name to the used gateways, regardless which ones are currently configured. Note that the name will only be resolved after all other name sources (if nss-myhostname is configured properly) and should hence not negatively impact - systems that use the single-label host name "gateway" in + systems that use the single-label hostname "gateway" in other contexts. * systemd-inhibit now allows filtering by mode when listing @@ -7595,7 +7595,7 @@ CHANGES WITH 210: reported by uname()'s "machine" field. * systemd-networkd now supports matching on the system - virtualization, architecture, kernel command line, host name + virtualization, architecture, kernel command line, hostname and machine ID. * logind is now a lot more aggressive when suspending the @@ -7913,12 +7913,12 @@ CHANGES WITH 209: example, a line that creates /run/nologin). * A new API "sd-resolve.h" has been added which provides a simple - asynchronous wrapper around glibc NSS host name resolution + asynchronous wrapper around glibc NSS hostname resolution calls, such as getaddrinfo(). In contrast to glibc's getaddrinfo_a(), it does not use signals. In contrast to most other asynchronous name resolution libraries, this one does not reimplement DNS, but reuses NSS, so that alternate - host name resolution systems continue to work, such as mDNS, + hostname resolution systems continue to work, such as mDNS, LDAP, etc. This API is based on libasyncns, but it has been cleaned up for inclusion in systemd. @@ -9702,7 +9702,7 @@ CHANGES WITH 190: when he over-mounts a non-empty directory. * There are new specifiers that are resolved in unit files, - for the host name (%H), the machine ID (%m) and the boot ID + for the hostname (%H), the machine ID (%m) and the boot ID (%b). Contributions from: Allin Cottrell, Auke Kok, Brandon Philips, @@ -1165,7 +1165,7 @@ Features: a carrier is lost on a link. It should be removed instantly. - expose in the API the following bits: - option 15, domain name and/or option 119, search list - - option 12, host name and/or option 81, fqdn + - option 12, hostname and/or option 81, fqdn - option 123, 144, geolocation - option 252, configure http proxy (PAC/wpad) - provide a way to define a per-network interface default metric value diff --git a/docs/CODING_STYLE.md b/docs/CODING_STYLE.md index c8ca8bfefc..12a0c993fc 100644 --- a/docs/CODING_STYLE.md +++ b/docs/CODING_STYLE.md @@ -424,7 +424,7 @@ layout: default ## Deadlocks -- Do not issue NSS requests (that includes user name and host name lookups) +- Do not issue NSS requests (that includes user name and hostname lookups) from PID 1 as this might trigger deadlocks when those lookups involve synchronously talking to services that we would need to start up. diff --git a/man/hostnamectl.xml b/man/hostnamectl.xml index 03293382e6..7ca62f4810 100644 --- a/man/hostnamectl.xml +++ b/man/hostnamectl.xml @@ -57,7 +57,7 @@ <para>Use <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry> - to initialize the system host name for mounted (but not booted) + to initialize the system hostname for mounted (but not booted) system images.</para> </refsect1> @@ -84,7 +84,7 @@ simplified in regards to the character set used before the latter are updated. This is done by removing special characters and spaces. This ensures that the pretty and the static hostname are always closely related while still following the validity rules of the specific name. This simplification of the hostname string is not done - if only the transient and/or static host names are set, and the pretty host name is left untouched.</para> + if only the transient and/or static hostnames are set, and the pretty hostname is left untouched.</para> <para>Pass the empty string <literal></literal> as the hostname to reset the selected hostnames to their default diff --git a/man/machine-info.xml b/man/machine-info.xml index 4fb27abe0a..7a0a396a1e 100644 --- a/man/machine-info.xml +++ b/man/machine-info.xml @@ -70,7 +70,7 @@ <literal>Lennart's Computer</literal> an Internet hostname of <literal>lennarts-computer</literal> might be a good choice. If this parameter is not set, an application should fall back - to the Internet host name for presentation + to the Internet hostname for presentation purposes.</para></listitem> </varlistentry> diff --git a/man/machinectl.xml b/man/machinectl.xml index c211ca02a9..e903eca721 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -56,7 +56,7 @@ </itemizedlist> <para>Machines are identified by names that follow the same rules - as UNIX and DNS host names. For details, see below.</para> + as UNIX and DNS hostnames. For details, see below.</para> <para>Machines are instantiated from disk or file system images that frequently — but not necessarily — carry the same name as machines running @@ -383,7 +383,7 @@ image is optimized for file systems that support copy-on-write, and might not be efficient on others, due to file system limitations.</para> - <para>Note that this command leaves host name, machine ID and + <para>Note that this command leaves hostname, machine ID and all other settings that could identify the instance unmodified. The original image and the cloned copy will hence share these credentials, and it might be necessary to manually @@ -851,7 +851,7 @@ <para>The <command>machinectl</command> tool operates on machines and images whose names must be chosen following strict - rules. Machine names must be suitable for use as host names + rules. Machine names must be suitable for use as hostnames following a conservative subset of DNS and UNIX/Linux semantics. Specifically, they must consist of one or more non-empty label strings, separated by dots. No leading or trailing diff --git a/man/nss-resolve.xml b/man/nss-resolve.xml index cc33b2c082..8bc75b1316 100644 --- a/man/nss-resolve.xml +++ b/man/nss-resolve.xml @@ -29,7 +29,7 @@ <title>Description</title> <para><command>nss-resolve</command> is a plug-in module for the GNU Name Service Switch (NSS) functionality of the - GNU C Library (<command>glibc</command>) enabling it to resolve host names via the + GNU C Library (<command>glibc</command>) enabling it to resolve hostnames via the <citerefentry><refentrytitle>systemd-resolved</refentrytitle><manvolnum>8</manvolnum></citerefentry> local network name resolution service. It replaces the <command>nss-dns</command> plug-in module that traditionally resolves hostnames via DNS.</para> diff --git a/man/org.freedesktop.resolve1.xml b/man/org.freedesktop.resolve1.xml index ad7b6e20fb..912f73677c 100644 --- a/man/org.freedesktop.resolve1.xml +++ b/man/org.freedesktop.resolve1.xml @@ -394,7 +394,7 @@ node /org/freedesktop/resolve1 { default LLMNR setting is used. If <literal>yes</literal>, LLMNR is used for resolution of single-label names and the local hostname is registered on all local LANs for LLMNR resolution by peers. If <literal>no</literal>, LLMNR is turned off fully on this interface. If <literal>resolve</literal>, LLMNR - is only enabled for resolving names, but the local host name is not registered for other peers to + is only enabled for resolving names, but the local hostname is not registered for other peers to use.</para> <para>Similarly, the <function>SetLinkMulticastDNS()</function> method enables or disables MulticastDNS diff --git a/man/resolvectl.xml b/man/resolvectl.xml index cc04994594..e2d00b9cf0 100644 --- a/man/resolvectl.xml +++ b/man/resolvectl.xml @@ -45,7 +45,7 @@ interface the data was discovered. It also contains information on whether the information could be authenticated. All data for which local DNSSEC validation succeeds is considered authenticated. Moreover all data originating from local, trusted sources is also reported authenticated, including resolution of the local host - name, the <literal>localhost</literal> host name or all data from <filename>/etc/hosts</filename>.</para> + name, the <literal>localhost</literal> hostname or all data from <filename>/etc/hosts</filename>.</para> </refsect1> <refsect1> diff --git a/man/resolved.conf.xml b/man/resolved.conf.xml index 81d156b8e3..9be41baaa5 100644 --- a/man/resolved.conf.xml +++ b/man/resolved.conf.xml @@ -68,7 +68,7 @@ <varlistentry> <term><varname>Domains=</varname></term> <listitem><para>A space-separated list of domains. These domains are used as search suffixes when resolving - single-label host names (domain names which contain no dot), in order to qualify them into fully-qualified + single-label hostnames (domain names which contain no dot), in order to qualify them into fully-qualified domain names (FQDNs). Search domains are strictly processed in the order they are specified, until the name with the suffix appended is found. For compatibility reasons, if this setting is not specified, the search domains listed in <filename>/etc/resolv.conf</filename> are used instead, if that file exists and any domains diff --git a/man/systemd-firstboot.xml b/man/systemd-firstboot.xml index 560649f22c..0eb212341f 100644 --- a/man/systemd-firstboot.xml +++ b/man/systemd-firstboot.xml @@ -54,7 +54,7 @@ <listitem><para>The system time zone</para></listitem> - <listitem><para>The system host name</para></listitem> + <listitem><para>The system hostname</para></listitem> <listitem><para>The machine ID of the system</para></listitem> @@ -133,7 +133,7 @@ <term><option>--hostname=<replaceable>HOSTNAME</replaceable></option></term> <listitem><para>Sets the system hostname. The argument should - be a host name, compatible with DNS. This controls the + be a hostname, compatible with DNS. This controls the <citerefentry><refentrytitle>hostname</refentrytitle><manvolnum>5</manvolnum></citerefentry> configuration file.</para></listitem> </varlistentry> diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index b269b99170..577ae097c9 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -238,7 +238,7 @@ all subdirectories and subvolumes below it, but excluding any sub-mounts. May not be specified together with <option>--image=</option> or <option>--ephemeral</option>.</para> - <para>Note that this switch leaves host name, machine ID and + <para>Note that this switch leaves hostname, machine ID and all other settings that could identify the instance unmodified.</para></listitem> </varlistentry> @@ -250,7 +250,7 @@ <listitem><para>If specified, the container is run with a temporary snapshot of its file system that is removed immediately when the container terminates. May not be specified together with <option>--template=</option>.</para> - <para>Note that this switch leaves host name, machine ID and all other settings that could identify + <para>Note that this switch leaves hostname, machine ID and all other settings that could identify the instance unmodified. Please note that — as with <option>--template=</option> — taking the temporary snapshot is more efficient on file systems that support subvolume snapshots or 'reflinks' natively (<literal>btrfs</literal> or new <literal>xfs</literal>) than on more traditional file diff --git a/man/systemd-resolved.service.xml b/man/systemd-resolved.service.xml index a30c5f72b8..2aa5fec218 100644 --- a/man/systemd-resolved.service.xml +++ b/man/systemd-resolved.service.xml @@ -53,7 +53,7 @@ (<citerefentry project='man-pages'><refentrytitle>nss</refentrytitle><manvolnum>5</manvolnum></citerefentry>). Usage of the glibc NSS module <citerefentry><refentrytitle>nss-resolve</refentrytitle><manvolnum>8</manvolnum></citerefentry> is - required in order to allow glibc's NSS resolver functions to resolve host names via + required in order to allow glibc's NSS resolver functions to resolve hostnames via <command>systemd-resolved</command>.</para></listitem> <listitem><para>Additionally, <command>systemd-resolved</command> provides a local DNS stub listener on @@ -120,8 +120,8 @@ <listitem><para>Single-label names are routed to all local interfaces capable of IP multicasting, using the LLMNR protocol. Lookups for IPv4 addresses are only sent via LLMNR on IPv4, and lookups for IPv6 - addresses are only sent via LLMNR on IPv6. Lookups for the locally configured host name and the - <literal>_gateway</literal> host name are never routed to LLMNR.</para></listitem> + addresses are only sent via LLMNR on IPv6. Lookups for the locally configured hostname and the + <literal>_gateway</literal> hostname are never routed to LLMNR.</para></listitem> <listitem><para>Multi-label names with the domain suffix <literal>.local</literal> are routed to all local interfaces capable of IP multicasting, using the MulticastDNS protocol. As with LLMNR IPv4 diff --git a/man/systemd.network.xml b/man/systemd.network.xml index 75a581816d..98de000ac3 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -441,7 +441,7 @@ <literal>nearest-bridge</literal>, <literal>non-tpmr-bridge</literal> and <literal>customer-bridge</literal>. Defaults to false, which turns off LLDP packet emission. If not false, a short LLDP packet with information about the local system is sent out in regular intervals on the - link. The LLDP packet will contain information about the local host name, the local machine ID (as stored + link. The LLDP packet will contain information about the local hostname, the local machine ID (as stored in <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>) and the local interface name, as well as the pretty hostname of the system (as set in <citerefentry><refentrytitle>machine-info</refentrytitle><manvolnum>5</manvolnum></citerefentry>). LLDP @@ -521,12 +521,12 @@ this link. Each item in the list should be a domain name, optionally prefixed with a tilde (<literal>~</literal>). The domains with the prefix are called "routing-only domains". The domains without the prefix are called "search domains" and are first used as search suffixes for - extending single-label host names (host names containing no dots) to become fully qualified - domain names (FQDNs). If a single-label host name is resolved on this interface, each of the + extending single-label hostnames (hostnames containing no dots) to become fully qualified + domain names (FQDNs). If a single-label hostname is resolved on this interface, each of the specified search domains are appended to it in turn, converting it into a fully qualified domain name, until one of them may be successfully resolved.</para> - <para>Both "search" and "routing-only" domains are used for routing of DNS queries: look-ups for host names + <para>Both "search" and "routing-only" domains are used for routing of DNS queries: look-ups for hostnames ending in those domains (hence also single label names, if any "search domains" are listed), are routed to the DNS servers configured for this interface. The domain routing logic is particularly useful on multi-homed hosts with DNS servers serving particular private DNS zones on each interface.</para> @@ -1470,7 +1470,7 @@ false.</para> <para>It is recommended to enable this option only on trusted networks, as setting this affects resolution - of all host names, in particular of single-label names. It is generally safer to use the supplied domain + of all hostnames, in particular of single-label names. It is generally safer to use the supplied domain only as routing domain, rather than as search domain, in order to not have it affect local resolution of single-label names.</para> @@ -1779,7 +1779,7 @@ <literal>~</literal>. Defaults to false.</para> <para>It is recommended to enable this option only on trusted networks, as setting this affects resolution - of all host names, in particular of single-label names. It is generally safer to use the supplied domain + of all hostnames, in particular of single-label names. It is generally safer to use the supplied domain only as routing domain, rather than as search domain, in order to not have it affect local resolution of single-label names.</para> diff --git a/meson_options.txt b/meson_options.txt index 3526645a59..104a7ea043 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -289,7 +289,7 @@ option('libcryptsetup', type : 'combo', choices : ['auto', 'true', 'false'], option('libcurl', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libcurl support') option('idn', type : 'boolean', - description : 'use IDN when printing host names') + description : 'use IDN when printing hostnames') option('libidn2', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libidn2 support') option('libidn', type : 'combo', choices : ['auto', 'true', 'false'], @@ -70,21 +70,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Неабходна аўтэнтыфікацыя для перачытання стану systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Усталяваць імя вузла" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Неабходна аўтэнтыфікацыя для ўсталявання імя вузла." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Усталяваць статычнае імя вузла" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Неабходна аўтэнтыфікацыя для ўсталявання як статычнага так і прыгожага імя " "вузла." diff --git a/po/be@latin.po b/po/be@latin.po index bbd9223b74..1ce3efa8f5 100644 --- a/po/be@latin.po +++ b/po/be@latin.po @@ -70,21 +70,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Nieabchodna aŭtentyfikacyja dlia pieračytannia stanu systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Ustaliavać imia vuzla" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia imia vuzla." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Ustaliavać statyčnaje imia vuzla" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Nieabchodna aŭtentyfikacyja dlia ŭstaliavannia jak statyčnaha tak i " "pryhožaha imia vuzla." @@ -69,21 +69,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "За презареждане на състоянието на systemd е необходима идентификация." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Задаване на име на машината" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "За задаване на име на локалната машина е необходима идентификация." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Задаване на статично име на машината" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "За задаване на статично име на локалната машина е необходима идентификация." @@ -73,21 +73,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Es requereix autenticació per tornar a carregar l'estat de systemd." #: src/hostname/org.freedesktop.hostname1.policy:22 -msgid "Set host name" +msgid "Set hostname" msgstr "Estableix el nom d'amfitrió" #: src/hostname/org.freedesktop.hostname1.policy:23 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Es requereix autenticació per establir el nom d'amfitrió local." #: src/hostname/org.freedesktop.hostname1.policy:32 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Estableix el nom d'amfitrió estàtic" #: src/hostname/org.freedesktop.hostname1.policy:33 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Es requereix autenticació per establir el nom d'amfitrió local configurat " "estàticament, així com el nom bonic d'amfitrió." @@ -120,21 +120,21 @@ msgid "" msgstr "Pro změnu hesla domovského adresáře uživatele je vyžadováno ověření." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Nastavit název stroje" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Pro nastavení lokálního názvu stroje je vyžadováno ověření." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Nastavit statický název stroje" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Pro nastavení staticky konfigurovaného názvu lokálního stroje, stejně tak " "pro změnu uživatelsky přívětivého jména je vyžadováno ověření." @@ -66,21 +66,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Autentificering er nødvendig for at genindlæse systemd tilstanden." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Sæt værtsnavn" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Autentificering er nødvendig for at sætte værtsnavn." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Sæt statisk værstnavn" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Autentificering er nødvendig for at sætte det statisk konfigurerede lokale " "værtsnavn, lige så vel som det pæne værtsnavn." @@ -71,21 +71,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Legitimierung ist zum erneuten Laden des systemd-Zustands notwendig." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Rechnername festlegen" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Legitimierung ist zum Festlegen des lokalen Rechnernamens notwendig" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Statischen Rechnernamen festlegen" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Authentifizierung ist erforderlich, um den statisch geänderten, lokalen " "Rechnernamen, sowie den beschönigten Rechnernamen festzulegen." @@ -76,21 +76,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Απαιτείται πιστοποίηση για να ορίσετε την ώρα του συστήματος." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Ορισμός ονόματος οικοδεσπότη" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Απαιτείται πιστοποίηση για να ορίσετε τοπικά όνομα οικοδεσπότη." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Ορισμός στατικού ονόματος οικοδεσπότη" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Απαιτείται πιστοποίηση για να ορίσετε το στατικά ρυθμισμένο όνομα τοπικού " "οικοδεσπότη, καθώς και το pretty όνομα οικοδεσπότη." @@ -71,21 +71,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Se requiere autenticación para recargar el estado de systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Establecer el nombre del equipo" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Se requiere autenticación para establecer el nombre del equipo local." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Establecer nombre estático del equipo" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Se requiere autenticación para establecer el nombre estático de equipo " "local, así como el nombre visible del equipo." @@ -125,21 +125,21 @@ msgstr "" "d'un utilisateur." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Définir le nom d'hôte" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Authentification requise pour définir le nom d'hôte local." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Définir le nom d'hôte statique" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Authentification requise pour définir le nom d'hôte local de manière " "statique, tout comme le nom d'hôte familier." @@ -70,21 +70,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Requírese autenticación para recargar o estado de systemd." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Estabelecer o nome do equipo" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Requírese autenticación para estabelecer o nome local do equiupo." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Estabelecer o nome do equipo estático" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Requírese autenticación para estabelecer de forma o nome do equipo local " "estabelecido de forma estática, así como o nome do equipo lexíbel por " @@ -118,21 +118,21 @@ msgid "" msgstr "Potrebna je ovjera za promjenu lozinke osobnog prostora korisnika." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Postavi naziv računala" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Potrebna je ovjera za postavljanje naziva lokalnog računala." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Postavi nepromjenjivi naziv račumala" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Potrebna je ovjera za postavljenje nepromjenjivog naziva lokalnog računala, " "kao i prijatnog naziva računala." @@ -71,21 +71,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Hitelesítés szükséges a systemd állapotának újratöltéséhez." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Gépnév beállítása" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Hitelesítés szükséges a helyi gépnév beállításához." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Statikus gépnév beállítása" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Hitelesítés szükséges a statikusan megadott helyi gépnév, valamint a szép " "gépnév beállításához." @@ -66,21 +66,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Otentikasi diperlukan untuk memuat ulang keadaan systemd." #: src/hostname/org.freedesktop.hostname1.policy:22 -msgid "Set host name" +msgid "Set hostname" msgstr "Setel nama host" #: src/hostname/org.freedesktop.hostname1.policy:23 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Otentikasi diperlukan untuk menata nama host lokal." #: src/hostname/org.freedesktop.hostname1.policy:32 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Setel nama host statik" #: src/hostname/org.freedesktop.hostname1.policy:33 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Otentikasi diperlukan untuk menata nama host lokal yang dikonfigurasi " "statik, maupun nama host cantik." @@ -124,21 +124,21 @@ msgstr "" "dell'utente." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Configura il nome host" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Autenticazione richiesta per configurare il nome host locale." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Configura il nome host statico" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Autenticazione richiesta per configurare staticamente il nome host locale e " "il nome host descrittivo." @@ -110,21 +110,21 @@ msgid "Authentication is required to change the password of a user's home area." msgstr "ユーザのホーム領域のパスワードを変更するには認証が必要です。" #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "ホスト名の設定" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "ホスト名を設定するには認証が必要です。" #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "静的なホスト名の設定" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "静的なホスト名を設定するには認証が必要です。" #: src/hostname/org.freedesktop.hostname1.policy:41 @@ -66,21 +66,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "systemd 상태를 다시 불러오려면 인증이 필요합니다." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "호스트 이름 설정" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "로컬 호스트 이름을 설정하려면 인증이 필요합니다." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "정적 호스트 이름 설정" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "로컬 호스트 이름을 모양새를 갖춘 호스트 이름 처럼 정적으로 설정하려면 인증" "이 필요합니다." @@ -68,22 +68,22 @@ msgid "Authentication is required to reload the systemd state." msgstr "Norint iš naujo įkelti systemd būseną, reikia patvirtinti tapatybę." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Nustatyti serverio pavadinimą" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "" "Norint nustatyti vietinio serverio pavadinimą, reikia nustatyti tapatybę." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Nustatyti statinį serverio pavadinimą" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Norint nustatyti statiškai sukonfigūruotą serverio pavadinimą, o taip pat " "lengvai įsimenamą serverio pavadinimą, reikia nustatyti tapatybę." @@ -130,21 +130,21 @@ msgstr "" "użytkownika." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Ustawienie nazwy komputera" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Wymagane jest uwierzytelnienie, aby ustawić nazwę lokalnego komputera." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Ustawienie statycznej nazwy komputera" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Wymagane jest uwierzytelnienie, aby ustawić statycznie skonfigurowaną nazwę " "lokalnego komputera, a także jego nazwę czytelną dla człowieka." diff --git a/po/pt_BR.po b/po/pt_BR.po index 06706fe8fc..09964a1296 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -74,21 +74,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "É necessária autenticação para recarregar o estado do sistema." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Definir nome de máquina" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "É necessária autenticação para definir nome de máquina local." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Definir nome estático de máquina" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "É necessária autenticação para definir o nome de máquina local configurado " "estaticamente, assim como o nome apresentável de máquina." @@ -73,21 +73,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Autentificarea este necesară pentru a reîncărca starea systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Stabilește numele de server" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Autentificarea este necesară pentru a stabili numele de server local." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Stabilește numele de server static" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Autentificarea este necesara pentru a stabili numele de server static " "configurat local, precum și numele lung de server." @@ -134,21 +134,21 @@ msgstr "" " пройти аутентификацию." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Настроить имя компьютера" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Чтобы настроить имя компьютера, необходимо пройти аутентификацию." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Настроить статическое имя компьютера" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Чтобы настроить статическое имя компьютера, а также его «красивое» имя, " "необходимо пройти аутентификацию." @@ -72,21 +72,21 @@ msgstr "" "Vyžaduje sa overenie totožnosti na znovu načítanie stavu systému systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Nastavenie názvu hostiteľa" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Vyžaduje sa overenie totožnosti na nastavenie názvu hostiteľa." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Nastavenie nemenného názvu hostiteľa" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Vyžaduje sa overenie totožnosti na nastavenie pevne určeného názvu miestneho " "hostiteľa, známeho ako zrozumiteľný názov hostiteľa." @@ -72,21 +72,21 @@ msgstr "" "Потребно је да се идентификујете да бисте поново учитали стање систем-деа." #: src/hostname/org.freedesktop.hostname1.policy.in:22 -msgid "Set host name" +msgid "Set hostname" msgstr "Постави назив машине" #: src/hostname/org.freedesktop.hostname1.policy.in:23 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Потребно је да се идентификујете да бисте поставили назив машине." #: src/hostname/org.freedesktop.hostname1.policy.in:32 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Постави статички назив машине" #: src/hostname/org.freedesktop.hostname1.policy.in:33 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Потребно је да се идентификујете да бисте поставили статички назив машине и " "да бисте поставили леп назив машине." @@ -68,21 +68,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "Autentisering krävs för att läsa om tillståndet för systemd." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "Ange värdnamn" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Autentisering krävs för att ställa in lokalt värdnamn." #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Ange statiskt värdnamn" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Autentisering krävs för att ställa in det statiskt konfigurerade lokala " "värdnamnet såväl som det stiliga värdnamnet." @@ -70,21 +70,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "systemd durumunu yeniden yüklemek kimlik doğrulaması gerektiriyor." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Makine adını ayarla" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Yerel makine adını ayarlamak kimlik doğrulaması gerektiriyor." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Statik makine adı ayarla" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Statik olarak yapılandırılmış konak makine adını ve yerel makine adını " "ayarlamak kimlik doğrulaması gerektiriyor." @@ -126,21 +126,21 @@ msgstr "" "розпізнавання." #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "Встановити назву вузла" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "Потрібна автентифікація, щоб встановити назву локального вузла." #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "Встановити статичну назву вузла" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "" "Потрібна автентифікація, щоб вказати статично налаштовану назву локального " "вузла, так само й форматовану." diff --git a/po/zh_CN.po b/po/zh_CN.po index 7196cc50bf..2655f62c69 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -64,15 +64,15 @@ msgid "Authentication is required to reload the systemd state." msgstr "重新载入 systemd 状态需要认证。" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:1 -msgid "Set host name" +msgid "Set hostname" msgstr "设置主机名" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:2 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "设置本地主机名需要认证。" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:3 -msgid "Set static host name" +msgid "Set static hostname" msgstr "设置静态主机名" # For pretty hostname, the zh_CN/zh_TW translation should be discussed again. @@ -81,8 +81,8 @@ msgstr "设置静态主机名" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:4 #, fuzzy msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "设置静态本地主机名或美观主机名需要认证。" #: ../src/hostname/org.freedesktop.hostname1.policy.in.h:5 diff --git a/po/zh_TW.po b/po/zh_TW.po index d14a338e5c..ac6cd99efa 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -62,21 +62,21 @@ msgid "Authentication is required to reload the systemd state." msgstr "重新載入 systemd 狀態需要驗證。" #: src/hostname/org.freedesktop.hostname1.policy:20 -msgid "Set host name" +msgid "Set hostname" msgstr "設定主機名稱" #: src/hostname/org.freedesktop.hostname1.policy:21 -msgid "Authentication is required to set the local host name." +msgid "Authentication is required to set the local hostname." msgstr "設定主機名稱需要驗證。" #: src/hostname/org.freedesktop.hostname1.policy:30 -msgid "Set static host name" +msgid "Set static hostname" msgstr "設定靜態主機名稱" #: src/hostname/org.freedesktop.hostname1.policy:31 msgid "" -"Authentication is required to set the statically configured local host name, " -"as well as the pretty host name." +"Authentication is required to set the statically configured local hostname, " +"as well as the pretty hostname." msgstr "設定靜態預先設定或 pretty 本地主機名稱需要身份驗證。" #: src/hostname/org.freedesktop.hostname1.policy:41 diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c index 7bc2e3f370..8932c552c8 100644 --- a/src/basic/hostname-util.c +++ b/src/basic/hostname-util.c @@ -21,7 +21,7 @@ bool hostname_is_set(void) { if (isempty(u.nodename)) return false; - /* This is the built-in kernel default host name */ + /* This is the built-in kernel default hostname */ if (streq(u.nodename, "(none)")) return false; @@ -77,7 +77,7 @@ bool valid_ldh_char(char c) { } /** - * Check if s looks like a valid host name or FQDN. This does not do + * Check if s looks like a valid hostname or FQDN. This does not do * full DNS validation, but only checks if the name is composed of * allowed characters and the length is not above the maximum allowed * by Linux (c.f. dns_name_is_valid()). Trailing dot is allowed if diff --git a/src/core/unit-printf.c b/src/core/unit-printf.c index 2daaaf9971..7507479ce2 100644 --- a/src/core/unit-printf.c +++ b/src/core/unit-printf.c @@ -186,7 +186,7 @@ int unit_name_printf(const Unit *u, const char* format, char **ret) { * %u: the username of the running user * * %m: the machine ID of the running system - * %H: the host name of the running system + * %H: the hostname of the running system * %b: the boot ID of the running system */ diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 901fbf0815..488e87beae 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -691,7 +691,7 @@ static int help(void) { " --locale-messages=LOCALE Set message locale (LC_MESSAGES=)\n" " --keymap=KEYMAP Set keymap\n" " --timezone=TIMEZONE Set timezone\n" - " --hostname=NAME Set host name\n" + " --hostname=NAME Set hostname\n" " --machine-ID=ID Set machine ID\n" " --root-password=PASSWORD Set root password\n" " --root-password-file=FILE Set root password from file\n" diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c index 66af1c0b5c..448492bb8d 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c @@ -280,7 +280,7 @@ static int context_update_kernel_hostname(Context *c) { if (hostname_is_useful(static_hn)) hn = static_hn; - /* ... the transient host name, (ie: DHCP) comes next ... */ + /* ... the transient hostname, (ie: DHCP) comes next ... */ else if (!isempty(c->data[PROP_HOSTNAME])) hn = c->data[PROP_HOSTNAME]; @@ -454,11 +454,11 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error * r = context_update_kernel_hostname(c); if (r < 0) { - log_error_errno(r, "Failed to set host name: %m"); + log_error_errno(r, "Failed to set hostname: %m"); return sd_bus_error_set_errnof(error, r, "Failed to set hostname: %m"); } - log_info("Changed host name to '%s'", strna(c->data[PROP_HOSTNAME])); + log_info("Changed hostname to '%s'", strna(c->data[PROP_HOSTNAME])); (void) sd_bus_emit_properties_changed(sd_bus_message_get_bus(m), "/org/freedesktop/hostname1", "org.freedesktop.hostname1", "Hostname", NULL); @@ -506,17 +506,17 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ r = context_update_kernel_hostname(c); if (r < 0) { - log_error_errno(r, "Failed to set host name: %m"); + log_error_errno(r, "Failed to set hostname: %m"); return sd_bus_error_set_errnof(error, r, "Failed to set hostname: %m"); } r = context_write_data_static_hostname(c); if (r < 0) { - log_error_errno(r, "Failed to write static host name: %m"); + log_error_errno(r, "Failed to write static hostname: %m"); return sd_bus_error_set_errnof(error, r, "Failed to set static hostname: %m"); } - log_info("Changed static host name to '%s'", strna(c->data[PROP_STATIC_HOSTNAME])); + log_info("Changed static hostname to '%s'", strna(c->data[PROP_STATIC_HOSTNAME])); (void) sd_bus_emit_properties_changed(sd_bus_message_get_bus(m), "/org/freedesktop/hostname1", "org.freedesktop.hostname1", "StaticHostname", NULL); @@ -547,7 +547,7 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (prop == PROP_ICON_NAME && !filename_is_valid(name)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid icon name '%s'", name); if (prop == PROP_PRETTY_HOSTNAME && string_has_cc(name, NULL)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid pretty host name '%s'", name); + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid pretty hostname '%s'", name); if (prop == PROP_CHASSIS && !valid_chassis(name)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid chassis '%s'", name); if (prop == PROP_DEPLOYMENT && !valid_deployment(name)) @@ -585,7 +585,7 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess } log_info("Changed %s to '%s'", - prop == PROP_PRETTY_HOSTNAME ? "pretty host name" : + prop == PROP_PRETTY_HOSTNAME ? "pretty hostname" : prop == PROP_DEPLOYMENT ? "deployment" : prop == PROP_LOCATION ? "location" : prop == PROP_CHASSIS ? "chassis" : "icon name", strna(c->data[prop])); diff --git a/src/hostname/org.freedesktop.hostname1.policy b/src/hostname/org.freedesktop.hostname1.policy index 5bedc0b694..5969a82b29 100644 --- a/src/hostname/org.freedesktop.hostname1.policy +++ b/src/hostname/org.freedesktop.hostname1.policy @@ -17,8 +17,8 @@ <vendor_url>http://www.freedesktop.org/wiki/Software/systemd</vendor_url> <action id="org.freedesktop.hostname1.set-hostname"> - <description gettext-domain="systemd">Set host name</description> - <message gettext-domain="systemd">Authentication is required to set the local host name.</message> + <description gettext-domain="systemd">Set hostname</description> + <message gettext-domain="systemd">Authentication is required to set the local hostname.</message> <defaults> <allow_any>auth_admin_keep</allow_any> <allow_inactive>auth_admin_keep</allow_inactive> @@ -27,8 +27,8 @@ </action> <action id="org.freedesktop.hostname1.set-static-hostname"> - <description gettext-domain="systemd">Set static host name</description> - <message gettext-domain="systemd">Authentication is required to set the statically configured local host name, as well as the pretty host name.</message> + <description gettext-domain="systemd">Set static hostname</description> + <message gettext-domain="systemd">Authentication is required to set the statically configured local hostname, as well as the pretty hostname.</message> <defaults> <allow_any>auth_admin_keep</allow_any> <allow_inactive>auth_admin_keep</allow_inactive> diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 64cb3279f6..6bf6869543 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -1746,7 +1746,7 @@ static int server_open_hostname(Server *s) { r = sd_event_source_set_priority(s->hostname_event_source, SD_EVENT_PRIORITY_IMPORTANT-10); if (r < 0) - return log_error_errno(r, "Failed to adjust priority of host name event source: %m"); + return log_error_errno(r, "Failed to adjust priority of hostname event source: %m"); return 0; } diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index 5154af2304..39e6ac1d6a 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -683,7 +683,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void case SD_DHCP_OPTION_HOST_NAME: r = lease_parse_domain(option, len, &lease->hostname); if (r < 0) { - log_debug_errno(r, "Failed to parse host name, ignoring: %m"); + log_debug_errno(r, "Failed to parse hostname, ignoring: %m"); return 0; } diff --git a/src/nss-myhostname/nss-myhostname.c b/src/nss-myhostname/nss-myhostname.c index 8c16b7f360..9aa6debc16 100644 --- a/src/nss-myhostname/nss-myhostname.c +++ b/src/nss-myhostname/nss-myhostname.c @@ -77,7 +77,7 @@ enum nss_status _nss_myhostname_gethostbyname4_r( return NSS_STATUS_TRYAGAIN; } - /* We respond to our local host name, our hostname suffixed with a single dot. */ + /* We respond to our local hostname, our hostname suffixed with a single dot. */ if (!streq(name, hn) && !streq_ptr(startswith(name, hn), ".")) goto not_found; diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index badb0ee739..8517e662d0 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -1115,7 +1115,7 @@ static void bus_method_resolve_service_complete(DnsQuery *q) { if (has_root_domain && found <= 0) { /* If there's exactly one SRV RR and it uses - * the root domain as host name, then the + * the root domain as hostname, then the * service is explicitly not offered on the * domain. Report this as a recognizable * error. See RFC 2782, Section "Usage diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c index c2839d425a..2cb06c098d 100644 --- a/src/resolve/resolved-etc-hosts.c +++ b/src/resolve/resolved-etc-hosts.c @@ -100,7 +100,7 @@ static int parse_line(EtcHosts *hosts, unsigned nr, const char *line) { r = extract_first_word(&line, &name, NULL, EXTRACT_RELAX); if (r < 0) - return log_error_errno(r, "/etc/hosts:%u: couldn't extract host name: %m", nr); + return log_error_errno(r, "/etc/hosts:%u: couldn't extract hostname: %m", nr); if (r == 0) break; @@ -162,7 +162,7 @@ static int parse_line(EtcHosts *hosts, unsigned nr, const char *line) { } if (!found) - log_warning("/etc/hosts:%u: line is missing any host names", nr); + log_warning("/etc/hosts:%u: line is missing any hostnames", nr); return 0; } diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index 94590e3038..0b510b10f6 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -341,7 +341,7 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char p = h; r = dns_label_unescape(&p, label, sizeof label, 0); if (r < 0) - return log_error_errno(r, "Failed to unescape host name: %m"); + return log_error_errno(r, "Failed to unescape hostname: %m"); if (r == 0) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Couldn't find a single label in hostname."); @@ -371,7 +371,7 @@ static int determine_hostname(char **full_hostname, char **llmnr_hostname, char r = dns_label_escape_new(decoded, r, &n); if (r < 0) - return log_error_errno(r, "Failed to escape host name: %m"); + return log_error_errno(r, "Failed to escape hostname: %m"); if (is_localhost(n)) return log_debug_errno(SYNTHETIC_ERRNO(EINVAL), @@ -411,7 +411,7 @@ static int make_fallback_hostnames(char **full_hostname, char **llmnr_hostname, p = fallback_hostname(); r = dns_label_unescape(&p, label, sizeof label, 0); if (r < 0) - return log_error_errno(r, "Failed to unescape fallback host name: %m"); + return log_error_errno(r, "Failed to unescape fallback hostname: %m"); assert(r > 0); /* The fallback hostname must have at least one label */ diff --git a/src/shared/install-printf.c b/src/shared/install-printf.c index 2061384afe..03184cf7e2 100644 --- a/src/shared/install-printf.c +++ b/src/shared/install-printf.c @@ -115,7 +115,7 @@ int install_full_printf(const UnitFileInstallInfo *i, const char *format, char * * %U the UID of the running user * %u the username of running user * %m the machine ID of the running system - * %H the host name of the running system + * %H the hostname of the running system * %b the boot ID of the running system * %v `uname -r` of the running system */ |