Hi! Bug 614231 reported an incorrect English sentence in users-admin: "An user" should really be "A user". I'm attaching a patch that should fix this without breaking translations, to get this fixed for 2.30.1. Is that OK?
Regards
>From f03a897bed5baaa5c7c3e017b75bf6022885f408 Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat <nalimi...@club.fr> Date: Sun, 4 Apr 2010 16:16:51 +0200 Subject: [PATCH] Bug 614231 - Fix incorrect expression "An user" Change to "A user". Update PO files to avoid breaking translations. Fix a comment by the way. --- interfaces/users.ui | 2 +- po/af.po | 2 +- po/ar.po | 2 +- po/ast.po | 2 +- po/be.po | 2 +- po/bg.po | 2 +- po/bn.po | 2 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 4 ++-- po/es.po | 2 +- po/et.po | 2 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 2 +- po/gl.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ko.po | 2 +- po/lt.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/pa.po | 2 +- po/pl.po | 2 +- po/pt.po | 2 +- po/pt_BR.po | 2 +- po/ro.po | 2 +- po/ru.po | 2 +- po/sl.po | 2 +- po/sr.po | 2 +- po/s...@latin.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/uk.po | 2 +- po/zh_CN.po | 2 +- po/zh_HK.po | 2 +- po/zh_TW.po | 2 +- src/users/user-settings.c | 2 +- 41 files changed, 42 insertions(+), 42 deletions(-) diff --git a/interfaces/users.ui b/interfaces/users.ui index f073da0..ba280c4 100644 --- a/interfaces/users.ui +++ b/interfaces/users.ui @@ -2495,7 +2495,7 @@ <object class="GtkLabel" id="user_new_login_used_notice"> <property name="xalign">0</property> <property name="yalign">0</property> - <property name="label" translatable="yes">An user with such a name already exists. Please choose a different short name for the new user.</property> + <property name="label" translatable="yes">A user with such a name already exists. Please choose a different short name for the new user.</property> <property name="wrap">True</property> </object> <packing> diff --git a/po/af.po b/po/af.po index 2fb24da..6a8b051 100644 --- a/po/af.po +++ b/po/af.po @@ -463,7 +463,7 @@ msgstr "Gevorderd" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "'n Gebruiker met só 'n naam bestaan reeds. Kies asseblief 'n ander kort naam " diff --git a/po/ar.po b/po/ar.po index a665c93..a32d08a 100644 --- a/po/ar.po +++ b/po/ar.po @@ -467,7 +467,7 @@ msgstr "متقدّم" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "يوجد بالفعل مستخدم بهذا الاسم. من فضلك اختر اسما قصيرا آخر للمستخدم الجديد." diff --git a/po/ast.po b/po/ast.po index 323117e..82e26d5 100644 --- a/po/ast.po +++ b/po/ast.po @@ -463,7 +463,7 @@ msgid "Advanced" msgstr "Avanzáu" #: ../interfaces/users.ui.h:11 -msgid "An user with such a name already exists. Please choose a different short name for the new user." +msgid "A user with such a name already exists. Please choose a different short name for the new user." msgstr "" #: ../interfaces/users.ui.h:12 diff --git a/po/be.po b/po/be.po index 2e8a2f1..e0dc796 100644 --- a/po/be.po +++ b/po/be.po @@ -465,7 +465,7 @@ msgstr "Дадаткова" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Карыстальнік з гэткім імем ужо існуе. Абярыце іншае імя для новага " diff --git a/po/bg.po b/po/bg.po index 1367e21..db5aa00 100644 --- a/po/bg.po +++ b/po/bg.po @@ -468,7 +468,7 @@ msgstr "Допълнителни" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Вече съществува потребител с такова име. Изберете различно име за новия " diff --git a/po/bn.po b/po/bn.po index 4be8027..5e4e112 100644 --- a/po/bn.po +++ b/po/bn.po @@ -476,7 +476,7 @@ msgstr "উন্নত" # Translated by sadia #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "এই নামে একজন ব্যবহারকারী ইতিমধ্যেই বিদ্যমান। অনুগ্রহ করে নতুন ব্যবহারকারীর জন্য ভিন্ন " diff --git a/po/ca.po b/po/ca.po index 564320d..28a7ef5 100644 --- a/po/ca.po +++ b/po/ca.po @@ -468,7 +468,7 @@ msgstr "Avançat" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Ja existeix un usuari amb aquest nom. Trieu un altre nom curt per a l'usuari " diff --git a/po/cs.po b/po/cs.po index 2573b2c..8bbd70e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -468,7 +468,7 @@ msgstr "Pokročilé" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Uživatel s takovýmto jménem již existuje. Zvolte prosím pro nového uživatele " diff --git a/po/da.po b/po/da.po index c6031b5..ad681b7 100644 --- a/po/da.po +++ b/po/da.po @@ -495,7 +495,7 @@ msgstr "Avanceret" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Der findes allerede en bruger med dette brugernavn. Vælg venligst et andet, " diff --git a/po/de.po b/po/de.po index 9539e5a..8262275 100644 --- a/po/de.po +++ b/po/de.po @@ -476,7 +476,7 @@ msgstr "Erweitert" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Ein Benutzer dieses Namens existiert bereits. Bitte wählen Sie einen anderen " diff --git a/po/el.po b/po/el.po index c91b76e..bd68d60 100644 --- a/po/el.po +++ b/po/el.po @@ -511,7 +511,7 @@ msgstr "Για προχωρημένους" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Υπάρχει ήδη ένας χρήστης με αυτό το όνομα, Παρακαλώ επιλέξτε διαφορετικό " diff --git a/po/en_GB.po b/po/en_GB.po index 8400c53..3b445c0 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -462,10 +462,10 @@ msgstr "Advanced" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." #: ../interfaces/users.ui.h:12 diff --git a/po/es.po b/po/es.po index 21e5788..82713f4 100644 --- a/po/es.po +++ b/po/es.po @@ -473,7 +473,7 @@ msgstr "Avanzado" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Ya existe un usuario con ese nombre. Elija un identificador numérico " diff --git a/po/et.po b/po/et.po index 07470da..486cd14 100644 --- a/po/et.po +++ b/po/et.po @@ -358,7 +358,7 @@ msgid "Advanced" msgstr "Laiendatud" msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Sellise nimega kasutaja on juba olemas. Palun vali uue kasutaja kontole mõni " diff --git a/po/eu.po b/po/eu.po index e1ede01..3c93b53 100644 --- a/po/eu.po +++ b/po/eu.po @@ -466,7 +466,7 @@ msgstr "Aurreratua" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Izen berdineko erabiltzaile bat badago lehendik ere. Aukeratu beste izen " diff --git a/po/fi.po b/po/fi.po index c0ed2df..3d4c0d1 100644 --- a/po/fi.po +++ b/po/fi.po @@ -463,7 +463,7 @@ msgstr "Lisäasetukset" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Toisella käyttäjällä on jo sama käyttäjätunnus. Valitse toinen " diff --git a/po/fr.po b/po/fr.po index 38e9147..c729366 100644 --- a/po/fr.po +++ b/po/fr.po @@ -474,7 +474,7 @@ msgstr "Avancé" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Un utilisateur avec le même nom existe déjà. Choisissez un nom court " diff --git a/po/gl.po b/po/gl.po index ef2977d..1f1d85a 100644 --- a/po/gl.po +++ b/po/gl.po @@ -474,7 +474,7 @@ msgstr "Avanzado" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Un usuario para o cal un nome xa existe. Escolla un nome curto diferente " diff --git a/po/hu.po b/po/hu.po index 38f2200..db8fdf7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -464,7 +464,7 @@ msgstr "Speciális" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "A megadott felhasználónév már létezik. Válasszon másik rövid " diff --git a/po/it.po b/po/it.po index 46f49df..99d94f3 100644 --- a/po/it.po +++ b/po/it.po @@ -467,7 +467,7 @@ msgstr "Avanzate" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Un utente con tale nome esiste già. Scegliere un differente nome corto per " diff --git a/po/ko.po b/po/ko.po index 7f4aebb..1b470ea 100644 --- a/po/ko.po +++ b/po/ko.po @@ -458,7 +458,7 @@ msgstr "고급" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "해당 이름의 사용자가 이미 있습니다. 다른 짧은 이름을 사용하십시오." diff --git a/po/lt.po b/po/lt.po index 36e03eb..3505b57 100644 --- a/po/lt.po +++ b/po/lt.po @@ -464,7 +464,7 @@ msgstr "Papildomi" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Naudotojas tokiu vardu jau yra. Pasirinkite kitą trumpą vardą naujam " diff --git a/po/ms.po b/po/ms.po index 2de7058..60c36d2 100644 --- a/po/ms.po +++ b/po/ms.po @@ -496,7 +496,7 @@ msgstr "Lanjutan" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" diff --git a/po/nb.po b/po/nb.po index ce133fe..52e4c35 100644 --- a/po/nb.po +++ b/po/nb.po @@ -458,7 +458,7 @@ msgstr "Avansert" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Det finnes allerede en bruker med dette navnet. Vennligst velg et annet " diff --git a/po/pa.po b/po/pa.po index c6eb778..30f73ae 100644 --- a/po/pa.po +++ b/po/pa.po @@ -462,7 +462,7 @@ msgstr "ਤਕਨੀਕੀ" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "ਇੰਝ ਦੇ ਨਾਂ ਨਾਲ ਯੂਜ਼ਰ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ। ਨਵੇਂ ਯੂਜ਼ਰ ਲਈ ਵੱਖਰਾ ਛੋਟਾ ਨਾਂ ਚੁਣੋ ਜੀ।" diff --git a/po/pl.po b/po/pl.po index 0c5f285..2c56c58 100644 --- a/po/pl.po +++ b/po/pl.po @@ -470,7 +470,7 @@ msgstr "Zaawansowane" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Użytkownik o tej nazwie już istnieje. Proszę wybrać inną krótką nazwę dla " diff --git a/po/pt.po b/po/pt.po index 84ef5d4..e1c6220 100644 --- a/po/pt.po +++ b/po/pt.po @@ -463,7 +463,7 @@ msgstr "Avançado" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Já existe um utilizador com esse nome. Seleccione um nome abreviado " diff --git a/po/pt_BR.po b/po/pt_BR.po index 89f99b6..49daec3 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -474,7 +474,7 @@ msgstr "Avançado" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Já existe um usuário com este nome. Favor escolher um nome diferente para o " diff --git a/po/ro.po b/po/ro.po index 2fd167a..49b6701 100644 --- a/po/ro.po +++ b/po/ro.po @@ -464,7 +464,7 @@ msgid "Advanced" msgstr "Avansate" #: ../interfaces/users.ui.h:11 -msgid "An user with such a name already exists. Please choose a different short name for the new user." +msgid "A user with such a name already exists. Please choose a different short name for the new user." msgstr "Există deja un utilizator cu acest nume. Alegeți un alt nume scurt pentru noul utilizator." #: ../interfaces/users.ui.h:12 diff --git a/po/ru.po b/po/ru.po index dbc170a..bbc462d 100644 --- a/po/ru.po +++ b/po/ru.po @@ -469,7 +469,7 @@ msgstr "Дополнительно" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Пользователь с таким именем уже существует. Выберите другое имя для нового " diff --git a/po/sl.po b/po/sl.po index 65ac7a5..97a1101 100644 --- a/po/sl.po +++ b/po/sl.po @@ -464,7 +464,7 @@ msgid "Advanced" msgstr "Napredno" #: ../interfaces/users.ui.h:11 -msgid "An user with such a name already exists. Please choose a different short name for the new user." +msgid "A user with such a name already exists. Please choose a different short name for the new user." msgstr "Uporabnik s tem imenom že obstaja. Izberite novo ime za novega uporabnika." #: ../interfaces/users.ui.h:12 diff --git a/po/sr.po b/po/sr.po index 420a57a..8b04c68 100644 --- a/po/sr.po +++ b/po/sr.po @@ -470,7 +470,7 @@ msgstr "Напредно" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Корисник са тим именом већ постоји. Изаберите неко друго, кратко име за " diff --git a/po/s...@latin.po b/po/s...@latin.po index d4406f1..1c42bd0 100644 --- a/po/s...@latin.po +++ b/po/s...@latin.po @@ -470,7 +470,7 @@ msgstr "Napredno" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Korisnik sa tim imenom već postoji. Izaberite neko drugo, kratko ime za " diff --git a/po/sv.po b/po/sv.po index 65ac381..c607056 100644 --- a/po/sv.po +++ b/po/sv.po @@ -462,7 +462,7 @@ msgid "Advanced" msgstr "Avancerat" #: ../interfaces/users.ui.h:11 -msgid "An user with such a name already exists. Please choose a different short name for the new user." +msgid "A user with such a name already exists. Please choose a different short name for the new user." msgstr "En användare med ett sådant namn finns redan. Välj ett annat kortnamn för den nya användaren." #: ../interfaces/users.ui.h:12 diff --git a/po/ta.po b/po/ta.po index 6fcb570..9c04c2b 100644 --- a/po/ta.po +++ b/po/ta.po @@ -467,7 +467,7 @@ msgstr "மேம்பட்ட" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "இந்த பெயர் ஏற்கெனெவே உள்ளது. தயவு செய்து புதிய பயனருக்கு வேறு சுருக்கப்பெயரை " diff --git a/po/uk.po b/po/uk.po index d47621d..b3cff44 100644 --- a/po/uk.po +++ b/po/uk.po @@ -459,7 +459,7 @@ msgstr "Додатково" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "" "Користувач з таким ім'ям вже існує. Вкажіть інше коротке ім'я для нового " diff --git a/po/zh_CN.po b/po/zh_CN.po index 94d63aa..0238e67 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -462,7 +462,7 @@ msgstr "高级" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "使用此用户名的用户已经存在。请为新用户选择一个不同的短名称。" diff --git a/po/zh_HK.po b/po/zh_HK.po index bed4d00..5b4bd35 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -462,7 +462,7 @@ msgstr "進階" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "已經有同樣名稱的使用者存在。請為新的使用者選擇不同的短式名稱。" diff --git a/po/zh_TW.po b/po/zh_TW.po index c85eeab..8de4f89 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -462,7 +462,7 @@ msgstr "進階" #: ../interfaces/users.ui.h:11 msgid "" -"An user with such a name already exists. Please choose a different short " +"A user with such a name already exists. Please choose a different short " "name for the new user." msgstr "已經有同樣名稱的使用者存在。請為新的使用者選擇不同的短式名稱。" diff --git a/src/users/user-settings.c b/src/users/user-settings.c index e3863de..5d4a8fc 100644 --- a/src/users/user-settings.c +++ b/src/users/user-settings.c @@ -144,7 +144,7 @@ check_user_delete (OobsUser *user) g_object_unref (admin_group); g_list_free (admin_users); - /* Home flag is used to remove home when deleting an user */ + /* Home flag is used to remove home when deleting a user */ if (response == GTK_RESPONSE_YES) oobs_user_set_home_flags (user, OOBS_USER_REMOVE_HOME); else -- 1.7.0
_______________________________________________ gnome-i18n mailing list gnome-i18n@gnome.org http://mail.gnome.org/mailman/listinfo/gnome-i18n