From 18143cd767955a75b652ca21a810efd73698ca10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 26 Feb 2020 11:11:57 +0100 Subject: [PATCH] tree-wide: s/home/home area/g "home" is okay-ish in English, but rather awkward in many other languages. For example, even before this change, in fr.po we had "un espace personnel" as the translation everywhere. Let's use a less overloaded term. Fixes #14789. --- po/cs.po | 24 ++++++++++++------------ po/fr.po | 24 ++++++++++++------------ po/ja.po | 24 ++++++++++++------------ po/pl.po | 24 ++++++++++++------------ po/uk.po | 24 ++++++++++++------------ src/home/home-util.c | 4 ++-- src/home/homectl.c | 10 +++++----- src/home/homed-home.h | 2 +- src/home/homed-manager-bus.c | 4 ++-- src/home/org.freedesktop.home1.policy | 24 ++++++++++++------------ 10 files changed, 82 insertions(+), 82 deletions(-) diff --git a/po/cs.po b/po/cs.po index 010452653b..bf94f16913 100644 --- a/po/cs.po +++ b/po/cs.po @@ -67,55 +67,55 @@ msgid "Authentication is required to reload the systemd state." msgstr "Pro opětovné načtení stavu systemd je vyžadováno ověření." #: src/home/org.freedesktop.home1.policy:13 -msgid "Create a home" +msgid "Create a home area" msgstr "Vytvořit domovský adresář" #: src/home/org.freedesktop.home1.policy:14 -msgid "Authentication is required for creating a user's home." +msgid "Authentication is required for creating a user's home area." msgstr "Pro vytvoření domovského adresáře uživatele je vyžadováno ověření." #: src/home/org.freedesktop.home1.policy:23 -msgid "Remove a home" +msgid "Remove a home area" msgstr "Odebrat domovský adresář" #: src/home/org.freedesktop.home1.policy:24 -msgid "Authentication is required for removing a user's home." +msgid "Authentication is required for removing a user's home area." msgstr "Pro odebrání domovského adresáře uživatele je vyžadováno ověření." #: src/home/org.freedesktop.home1.policy:33 -msgid "Check credentials of a home" +msgid "Check credentials of a home area" msgstr "Zkontrolovat pověření domovského adresáře" #: src/home/org.freedesktop.home1.policy:34 msgid "" -"Authentication is required for checking credentials against a user's home." +"Authentication is required for checking credentials against a user's home area." msgstr "" "Pro kontrolu pověření proti domovskému adresáři uživatele je vyžadováno " "ověření." #: src/home/org.freedesktop.home1.policy:43 -msgid "Update a home" +msgid "Update a home area" msgstr "Aktualizovat domovský adresář" #: src/home/org.freedesktop.home1.policy:44 -msgid "Authentication is required for updating a user's home." +msgid "Authentication is required for updating a user's home area." msgstr "Pro aktualizaci domovského adresáře uživatele je vyžadováno ověření." #: src/home/org.freedesktop.home1.policy:53 -msgid "Resize a home" +msgid "Resize a home area" msgstr "Změnit velikost domovského adresáře" #: src/home/org.freedesktop.home1.policy:54 -msgid "Authentication is required for resizing a user's home." +msgid "Authentication is required for resizing a user's home area." msgstr "" "Pro změnu velikosti domovského adresáře uživatele je vyžadováno ověření." #: src/home/org.freedesktop.home1.policy:63 -msgid "Change password of a home" +msgid "Change password of a home area" msgstr "Změnit heslo domovského adresáře" #: src/home/org.freedesktop.home1.policy:64 -msgid "Authentication is required for changing the password of a user's home." +msgid "Authentication is required for changing the password of a user's home area." msgstr "Pro změnu hesla domovského adresáře uživatele je vyžadováno ověření." #: src/hostname/org.freedesktop.hostname1.policy:20 diff --git a/po/fr.po b/po/fr.po index d256c844ab..f7614f0ae3 100644 --- a/po/fr.po +++ b/po/fr.po @@ -68,58 +68,58 @@ msgid "Authentication is required to reload the systemd state." msgstr "Authentification requise pour recharger l'état de systemd" #: src/home/org.freedesktop.home1.policy:13 -msgid "Create a home" +msgid "Create a home area" msgstr "Créer un espace personnel" #: src/home/org.freedesktop.home1.policy:14 -msgid "Authentication is required for creating a user's home." +msgid "Authentication is required for creating a user's home area." msgstr "" "Authentification requise pour créer l'espace personnel d'un utilisateur." #: src/home/org.freedesktop.home1.policy:23 -msgid "Remove a home" +msgid "Remove a home area" msgstr "Retirer un espace personnel" #: src/home/org.freedesktop.home1.policy:24 -msgid "Authentication is required for removing a user's home." +msgid "Authentication is required for removing a user's home area." msgstr "" "Authentification requise pour retirer l'espace personnel d'un utilisateur." #: src/home/org.freedesktop.home1.policy:33 -msgid "Check credentials of a home" +msgid "Check credentials of a home area" msgstr "Vérifier les identifiants d'un espace personnel" #: src/home/org.freedesktop.home1.policy:34 msgid "" -"Authentication is required for checking credentials against a user's home." +"Authentication is required for checking credentials against a user's home area." msgstr "" "Authentification requise pour vérifier les identifiants de l'espace " "personnel d'un utilisateur." #: src/home/org.freedesktop.home1.policy:43 -msgid "Update a home" +msgid "Update a home area" msgstr "Mettre à jour un espace personnel" #: src/home/org.freedesktop.home1.policy:44 -msgid "Authentication is required for updating a user's home." +msgid "Authentication is required for updating a user's home area." msgstr "" "Authentification requise pour mettre à jour l'espace personnel d'un " "utilisateur." #: src/home/org.freedesktop.home1.policy:53 -msgid "Resize a home" +msgid "Resize a home area" msgstr "Retailler un espace personnel" #: src/home/org.freedesktop.home1.policy:54 -msgid "Authentication is required for resizing a user's home." +msgid "Authentication is required for resizing a user's home area." msgstr "Authentification requise pour retailler un espace personnel." #: src/home/org.freedesktop.home1.policy:63 -msgid "Change password of a home" +msgid "Change password of a home area" msgstr "Changer le mot de passe d'un espace personnel" #: src/home/org.freedesktop.home1.policy:64 -msgid "Authentication is required for changing the password of a user's home." +msgid "Authentication is required for changing the password of a user's home area." msgstr "" "Authentification requise pour changer le mot de passe de l'espace personnel " "d'un utilisateur." diff --git a/po/ja.po b/po/ja.po index 63a96c1238..a491e52f97 100644 --- a/po/ja.po +++ b/po/ja.po @@ -61,52 +61,52 @@ msgid "Authentication is required to reload the systemd state." msgstr "systemdの状態を再読込するには認証が必要です。" #: src/home/org.freedesktop.home1.policy:13 -msgid "Create a home" +msgid "Create a home area" msgstr "ホームディレクトリの作成" #: src/home/org.freedesktop.home1.policy:14 -msgid "Authentication is required for creating a user's home." +msgid "Authentication is required for creating a user's home area." msgstr "ユーザのホームディレクトリを作成するには認証が必要です。" #: src/home/org.freedesktop.home1.policy:23 -msgid "Remove a home" +msgid "Remove a home area" msgstr "ホームディレクトリの削除" #: src/home/org.freedesktop.home1.policy:24 -msgid "Authentication is required for removing a user's home." +msgid "Authentication is required for removing a user's home area." msgstr "ユーザのホームディレクトリの削除には認証が必要です。" #: src/home/org.freedesktop.home1.policy:33 -msgid "Check credentials of a home" +msgid "Check credentials of a home area" msgstr "ホームディレクトリの認証情報の確認" #: src/home/org.freedesktop.home1.policy:34 msgid "" -"Authentication is required for checking credentials against a user's home." +"Authentication is required for checking credentials against a user's home area." msgstr "ユーザのホームディレクトリに対する認証情報の確認には認証が必要です。" #: src/home/org.freedesktop.home1.policy:43 -msgid "Update a home" +msgid "Update a home area" msgstr "ホームディレクトリの更新" #: src/home/org.freedesktop.home1.policy:44 -msgid "Authentication is required for updating a user's home." +msgid "Authentication is required for updating a user's home area." msgstr "ユーザのホームディレクトリの更新には認証が必要です。" #: src/home/org.freedesktop.home1.policy:53 -msgid "Resize a home" +msgid "Resize a home area" msgstr "ホームディレクトリのサイズ変更" #: src/home/org.freedesktop.home1.policy:54 -msgid "Authentication is required for resizing a user's home." +msgid "Authentication is required for resizing a user's home area." msgstr "ユーザのホームディレクトリのサイズ変更には認証が必要です。" #: src/home/org.freedesktop.home1.policy:63 -msgid "Change password of a home" +msgid "Change password of a home area" msgstr "ホームディレクトリのパスワード変更" #: src/home/org.freedesktop.home1.policy:64 -msgid "Authentication is required for changing the password of a user's home." +msgid "Authentication is required for changing the password of a user's home area." msgstr "ユーザのホームディレクトリのパスワードを変更するには認証が必要です。" #: src/hostname/org.freedesktop.hostname1.policy:20 diff --git a/po/pl.po b/po/pl.po index 4a0ff5af36..baf0d62d10 100644 --- a/po/pl.po +++ b/po/pl.po @@ -70,58 +70,58 @@ msgid "Authentication is required to reload the systemd state." msgstr "Wymagane jest uwierzytelnienie, aby ponownie wczytać stan systemd." #: src/home/org.freedesktop.home1.policy:13 -msgid "Create a home" +msgid "Create a home area" msgstr "Utworzenie katalogu domowego" #: src/home/org.freedesktop.home1.policy:14 -msgid "Authentication is required for creating a user's home." +msgid "Authentication is required for creating a user's home area." msgstr "" "Wymagane jest uwierzytelnienie, aby utworzyć katalog domowy użytkownika." #: src/home/org.freedesktop.home1.policy:23 -msgid "Remove a home" +msgid "Remove a home area" msgstr "Usunięcie katalogu domowego" #: src/home/org.freedesktop.home1.policy:24 -msgid "Authentication is required for removing a user's home." +msgid "Authentication is required for removing a user's home area." msgstr "Wymagane jest uwierzytelnienie, aby usunąć katalog domowy użytkownika." #: src/home/org.freedesktop.home1.policy:33 -msgid "Check credentials of a home" +msgid "Check credentials of a home area" msgstr "Sprawdzenie danych uwierzytelniających katalogu domowego" #: src/home/org.freedesktop.home1.policy:34 msgid "" -"Authentication is required for checking credentials against a user's home." +"Authentication is required for checking credentials against a user's home area." msgstr "" "Wymagane jest uwierzytelnienie, aby sprawdzić dane uwierzytelniające " "katalogu domowego użytkownika." #: src/home/org.freedesktop.home1.policy:43 -msgid "Update a home" +msgid "Update a home area" msgstr "Aktualizacja katalogu domowego" #: src/home/org.freedesktop.home1.policy:44 -msgid "Authentication is required for updating a user's home." +msgid "Authentication is required for updating a user's home area." msgstr "" "Wymagane jest uwierzytelnienie, aby zaktualizować katalog domowy użytkownika." #: src/home/org.freedesktop.home1.policy:53 -msgid "Resize a home" +msgid "Resize a home area" msgstr "Zmiana rozmiaru katalogu domowego" #: src/home/org.freedesktop.home1.policy:54 -msgid "Authentication is required for resizing a user's home." +msgid "Authentication is required for resizing a user's home area." msgstr "" "Wymagane jest uwierzytelnienie, aby zmienić rozmiar katalogu domowego " "użytkownika." #: src/home/org.freedesktop.home1.policy:63 -msgid "Change password of a home" +msgid "Change password of a home area" msgstr "Zmiana hasła katalogu domowego" #: src/home/org.freedesktop.home1.policy:64 -msgid "Authentication is required for changing the password of a user's home." +msgid "Authentication is required for changing the password of a user's home area." msgstr "" "Wymagane jest uwierzytelnienie, aby zmienić hasło katalogu domowego " "użytkownika." diff --git a/po/uk.po b/po/uk.po index 54ea464b66..5c37521d91 100644 --- a/po/uk.po +++ b/po/uk.po @@ -71,55 +71,55 @@ msgid "Authentication is required to reload the systemd state." msgstr "Потрібна автентифікація, щоб перезапустити стан системи." #: src/home/org.freedesktop.home1.policy:13 -msgid "Create a home" +msgid "Create a home area" msgstr "Створення домашньої теки" #: src/home/org.freedesktop.home1.policy:14 -msgid "Authentication is required for creating a user's home." +msgid "Authentication is required for creating a user's home area." msgstr "Для створення домашньої теки користувача слід пройти розпізнавання." #: src/home/org.freedesktop.home1.policy:23 -msgid "Remove a home" +msgid "Remove a home area" msgstr "Вилучення домашньої теки" #: src/home/org.freedesktop.home1.policy:24 -msgid "Authentication is required for removing a user's home." +msgid "Authentication is required for removing a user's home area." msgstr "Для вилучення домашньої теки користувача слід пройти розпізнавання." #: src/home/org.freedesktop.home1.policy:33 -msgid "Check credentials of a home" +msgid "Check credentials of a home area" msgstr "Перевірка реєстраційних даних для доступу до домашньої теки" #: src/home/org.freedesktop.home1.policy:34 msgid "" -"Authentication is required for checking credentials against a user's home." +"Authentication is required for checking credentials against a user's home area." msgstr "" "Для перевірки реєстраційних даних для доступу до домашньої теки користувача" " слід пройти розпізнавання." #: src/home/org.freedesktop.home1.policy:43 -msgid "Update a home" +msgid "Update a home area" msgstr "Оновлення домашньої теки" #: src/home/org.freedesktop.home1.policy:44 -msgid "Authentication is required for updating a user's home." +msgid "Authentication is required for updating a user's home area." msgstr "Для оновлення домашньої теки користувача слід пройти розпізнавання." #: src/home/org.freedesktop.home1.policy:53 -msgid "Resize a home" +msgid "Resize a home area" msgstr "Зміна розмірів домашньої теки" #: src/home/org.freedesktop.home1.policy:54 -msgid "Authentication is required for resizing a user's home." +msgid "Authentication is required for resizing a user's home area." msgstr "" "Для зміни розмірів домашньої теки користувача слід пройти розпізнавання." #: src/home/org.freedesktop.home1.policy:63 -msgid "Change password of a home" +msgid "Change password of a home area" msgstr "Зміна пароля до домашньої теки" #: src/home/org.freedesktop.home1.policy:64 -msgid "Authentication is required for changing the password of a user's home." +msgid "Authentication is required for changing the password of a user's home area." msgstr "" "Для зміни пароля для доступу до домашньої теки користувача слід пройти" " розпізнавання." diff --git a/src/home/home-util.c b/src/home/home-util.c index 82c50a6b51..132e54b39b 100644 --- a/src/home/home-util.c +++ b/src/home/home-util.c @@ -12,8 +12,8 @@ bool suitable_user_name(const char *name) { - /* Checks whether the specified name is suitable for management via homed. Note that client-side we - * usually validate with the simple valid_user_group_name(), while server-side we are a bit more + /* Checks whether the specified name is suitable for management via home aread. Note that client-side + * we usually validate with the simple valid_user_group_name(), while server-side we are a bit more * restrictive, so that we can change the rules server-side without having to update things * client-side too. */ diff --git a/src/home/homectl.c b/src/home/homectl.c index 19d69c4721..d35034ac08 100644 --- a/src/home/homectl.c +++ b/src/home/homectl.c @@ -2268,11 +2268,11 @@ static int help(int argc, char *argv[], void *userdata) { " deactivate USER… Deactivate home\n" " inspect USER… Inspect home\n" " authenticate USER… Authenticate home\n" - " create USER Create a home\n" - " remove USER… Remove a home\n" - " update USER Update a home\n" - " passwd USER Change password of a home\n" - " resize USER SIZE Resize a home\n" + " create USER Create a home area\n" + " remove USER… Remove a home area\n" + " update USER Update a home area\n" + " passwd USER Change password of a home area\n" + " resize USER SIZE Resize a home area\n" " lock USER… Temporarily lock an active home\n" " unlock USER… Unlock a temporarily locked home\n" " lock-all Lock all suitable homes\n" diff --git a/src/home/homed-home.h b/src/home/homed-home.h index c75b06722c..ec7966fb14 100644 --- a/src/home/homed-home.h +++ b/src/home/homed-home.h @@ -100,7 +100,7 @@ struct Home { /* Stores the raw, plaintext passwords, but only for short periods of time */ UserRecord *secret; - /* When we create a home and that fails, we should possibly unregister the record altogether + /* When we create a home area and that fails, we should possibly unregister the record altogether * again, which is remembered in this boolean. */ bool unregister_on_failure; diff --git a/src/home/homed-manager-bus.c b/src/home/homed-manager-bus.c index e1d6a996ec..a6b30d961f 100644 --- a/src/home/homed-manager-bus.c +++ b/src/home/homed-manager-bus.c @@ -611,8 +611,8 @@ const sd_bus_vtable manager_vtable[] = { SD_BUS_METHOD("GetUserRecordByUID", "u", "sbo", method_get_user_record_by_uid, SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_SENSITIVE), SD_BUS_METHOD("ListHomes", NULL, "a(susussso)", method_list_homes, SD_BUS_VTABLE_UNPRIVILEGED), - /* The following methods directly execute an operation on a home, without ref-counting, queing or - * anything, and are accessible through homectl. */ + /* The following methods directly execute an operation on a home area, without ref-counting, queing + * or anything, and are accessible through homectl. */ SD_BUS_METHOD("ActivateHome", "ss", NULL, method_activate_home, SD_BUS_VTABLE_SENSITIVE), SD_BUS_METHOD("DeactivateHome", "s", NULL, method_deactivate_home, 0), SD_BUS_METHOD("RegisterHome", "s", NULL, method_register_home, SD_BUS_VTABLE_UNPRIVILEGED), /* Add JSON record to homed, but don't create actual $HOME */ diff --git a/src/home/org.freedesktop.home1.policy b/src/home/org.freedesktop.home1.policy index 66ef8e0e9d..b78d1df77d 100644 --- a/src/home/org.freedesktop.home1.policy +++ b/src/home/org.freedesktop.home1.policy @@ -10,8 +10,8 @@ http://www.freedesktop.org/wiki/Software/systemd - Create a home - Authentication is required for creating a user's home. + Create a home area + Authentication is required for creating a user's home area. auth_admin_keep auth_admin_keep @@ -20,8 +20,8 @@ - Remove a home - Authentication is required for removing a user's home. + Remove a home area + Authentication is required for removing a user's home area. auth_admin_keep auth_admin_keep @@ -30,8 +30,8 @@ - Check credentials of a home - Authentication is required for checking credentials against a user's home. + Check credentials of a home area + Authentication is required for checking credentials against a user's home area. auth_admin_keep auth_admin_keep @@ -40,8 +40,8 @@ - Update a home - Authentication is required for updating a user's home. + Update a home area + Authentication is required for updating a user's home area. auth_admin_keep auth_admin_keep @@ -50,8 +50,8 @@ - Resize a home - Authentication is required for resizing a user's home. + Resize a home area + Authentication is required for resizing a user's home area. auth_admin_keep auth_admin_keep @@ -60,8 +60,8 @@ - Change password of a home - Authentication is required for changing the password of a user's home. + Change password of a home area + Authentication is required for changing the password of a user's home area. auth_admin_keep auth_admin_keep