From 37793e6bfede95403c6cc0882de783ff77aa6adf Mon Sep 17 00:00:00 2001 From: Ricky Zhou Date: Mon, 3 Mar 2008 00:48:26 -0500 Subject: [PATCH] Fix some problems with extraction, dedent wasn't worth it. To test, set locale to "test" using either of the previously mentioned methods. --- fas/fas/group.py | 95 +++--- fas/fas/user.py | 99 +++--- fas/po/fas.pot | 569 ++++++++++++-------------------- fas/po/test/LC_MESSAGES/fas.po | 570 ++++++++++++--------------------- fas/pybabel.conf | 12 +- 5 files changed, 519 insertions(+), 826 deletions(-) diff --git a/fas/fas/group.py b/fas/fas/group.py index 9738768..8fc685b 100644 --- a/fas/fas/group.py +++ b/fas/fas/group.py @@ -8,8 +8,6 @@ from fas.auth import * from fas.user import KnownUser -from textwrap import dedent - import re class KnownGroup(validators.FancyValidator): @@ -152,7 +150,7 @@ class Group(controllers.Controller): @expose(template="fas.templates.group.new") def create(self, name, display_name, owner, group_type, needs_sponsor=0, user_can_remove=1, prerequisite='', joinmsg=''): '''Create a group''' - + groupname = name person = People.by_username(turbogears.identity.current.user_name) person_owner = People.by_username(owner) @@ -286,18 +284,19 @@ class Group(controllers.Controller): {'user': target.username, 'group': group.name}) else: import turbomail - + + # TODO: How do we handle gettext calls for these kinds of emails? # TODO: CC to right place, put a bit more thought into how to most elegantly do this message = turbomail.Message(config.get('accounts_mail'), '%s-sponsors@fedoraproject.org' % group.name, \ "Fedora '%(group)s' sponsor needed for %(user)s" % {'user': target.username, 'group': group.name}) url = config.get('base_url_filter.base_url') + turbogears.url('/group/edit/%s' % groupname) - message.plain = dedent(''' - Fedora user %(user)s, aka %(name)s <%(email)s> has requested - membership for %(applicant)s (%(applicant_name)s) in the %(group)s group and needs a sponsor. - - Please go to %(url)s to take action. - ''' % {'user': person.username, 'name': person.human_name, 'applicant': target.username, 'applicant_name': target.human_name, 'email': person.emails['primary'].email, 'url': url, 'group': group.name} ) + message.plain = _(''' +Fedora user %(user)s, aka %(name)s <%(email)s> has requested +membership for %(applicant)s (%(applicant_name)s) in the %(group)s group and needs a sponsor. + +Please go to %(url)s to take action. +''') % {'user': person.username, 'name': person.human_name, 'applicant': target.username, 'applicant_name': target.human_name, 'email': person.emails['primary'].email, 'url': url, 'group': group.name} turbomail.enqueue(message) turbogears.flash(_('%(user)s has applied to %(group)s!') % \ {'user': target.username, 'group': group.name}) @@ -328,13 +327,13 @@ class Group(controllers.Controller): else: import turbomail message = turbomail.Message(config.get('accounts_mail'), target.emails['primary'].email, "Your Fedora '%s' membership has been sponsored" % group.name) - message.plain = dedent(''' - %(name)s <%(email)s> has sponsored you for membership in the %(group)s - group of the Fedora account system. If applicable, this change should - propagate into the e-mail aliases and CVS repository within an hour. + message.plain = _(''' +%(name)s <%(email)s> has sponsored you for membership in the %(group)s +group of the Fedora account system. If applicable, this change should +propagate into the e-mail aliases and CVS repository within an hour. - %(joinmsg)s - ''') % {'group': group.name, 'name': person.human_name, 'email': person.emails['primary'].email, 'joinmsg': group.joinmsg} +%(joinmsg)s +''') % {'group': group.name, 'name': person.human_name, 'email': person.emails['primary'].email, 'joinmsg': group.joinmsg} turbomail.enqueue(message) turbogears.flash(_("'%s' has been sponsored!") % person.human_name) turbogears.redirect('/group/view/%s' % group.name) @@ -366,12 +365,12 @@ class Group(controllers.Controller): else: import turbomail message = turbomail.Message(config.get('accounts_mail'), target.emails['primary'].email, "Your Fedora '%s' membership has been removed" % group.name) - message.plain = dedent(''' - %(name)s <%(email)s> has removed you from the '%(group)s' - group of the Fedora Accounts System This change is effective - immediately for new operations, and should propagate into the e-mail - aliases within an hour. - ''') % {'group': group.name, 'name': person.human_name, 'email': person.emails['primary'].email} + message.plain = _(''' +%(name)s <%(email)s> has removed you from the '%(group)s' +group of the Fedora Accounts System This change is effective +immediately for new operations, and should propagate into the e-mail +aliases within an hour. +''') % {'group': group.name, 'name': person.human_name, 'email': person.emails['primary'].email} turbomail.enqueue(message) turbogears.flash(_('%(name)s has been removed from %(group)s!') % \ {'name': target.username, 'group': group.name}) @@ -408,12 +407,12 @@ class Group(controllers.Controller): # Should we make person.upgrade return this? role = PersonRoles.query.filter_by(group=group, member=target).one() status = role.role_type - message.plain = dedent(''' - %(name)s <%(email)s> has upgraded you to %(status)s status in the - '%(group)s' group of the Fedora Accounts System This change is - effective immediately for new operations, and should propagate - into the e-mail aliases within an hour. - ''') % {'group': group.name, 'name': person.human_name, 'email': person.emails['primary'].email, 'status': status} + message.plain = _(''' +%(name)s <%(email)s> has upgraded you to %(status)s status in the +'%(group)s' group of the Fedora Accounts System This change is +effective immediately for new operations, and should propagate +into the e-mail aliases within an hour. +''') % {'group': group.name, 'name': person.human_name, 'email': person.emails['primary'].email, 'status': status} turbomail.enqueue(message) turbogears.flash(_('%s has been upgraded!') % target.username) turbogears.redirect('/group/view/%s' % group.name) @@ -445,12 +444,12 @@ class Group(controllers.Controller): message = turbomail.Message(config.get('accounts_mail'), target.emails['primary'].email, "Your Fedora '%s' membership has been downgraded" % group.name) role = PersonRoles.query.filter_by(group=group, member=target).one() status = role.role_type - message.plain = dedent(''' - %(name)s <%(email)s> has downgraded you to %(status)s status in the - '%(group)s' group of the Fedora Accounts System This change is - effective immediately for new operations, and should propagate - into the e-mail aliases within an hour. - ''') % {'group': group.name, 'name': person.human_name, 'email': person.emails['primary'].email, 'status': status} + message.plain = _(''' +%(name)s <%(email)s> has downgraded you to %(status)s status in the +'%(group)s' group of the Fedora Accounts System This change is +effective immediately for new operations, and should propagate +into the e-mail aliases within an hour. +''') % {'group': group.name, 'name': person.human_name, 'email': person.emails['primary'].email, 'status': status} turbomail.enqueue(message) turbogears.flash(_('%s has been downgraded!') % target.username) turbogears.redirect('/group/view/%s' % group.name) @@ -495,22 +494,22 @@ class Group(controllers.Controller): if isApproved(person, group): message = turbomail.Message(person.emails['primary'].email, target, _('Come join The Fedora Project!')) - message.plain = _(dedent(''' - %(name)s <%(email)s> has invited you to join the Fedora - Project! We are a community of users and developers who produce a - complete operating system from entirely free and open source software - (FOSS). %(name)s thinks that you have knowledge and skills - that make you a great fit for the Fedora community, and that you might - be interested in contributing. + message.plain = _(''' +%(name)s <%(email)s> has invited you to join the Fedora +Project! We are a community of users and developers who produce a +complete operating system from entirely free and open source software +(FOSS). %(name)s thinks that you have knowledge and skills +that make you a great fit for the Fedora community, and that you might +be interested in contributing. - How could you team up with the Fedora community to use and develop your - skills? Check out http://fedoraproject.org/join-fedora for some ideas. - Our community is more than just software developers -- we also have a - place for you whether you're an artist, a web site builder, a writer, or - a people person. You'll grow and learn as you work on a team with other - very smart and talented people. +How could you team up with the Fedora community to use and develop your +skills? Check out http://fedoraproject.org/join-fedora for some ideas. +Our community is more than just software developers -- we also have a +place for you whether you're an artist, a web site builder, a writer, or +a people person. You'll grow and learn as you work on a team with other +very smart and talented people. - Fedora and FOSS are changing the world -- come be a part of it!''')) % {'name': person.human_name, 'email': person.emails['primary'].email} +Fedora and FOSS are changing the world -- come be a part of it!''') % {'name': person.human_name, 'email': person.emails['primary'].email} turbomail.enqueue(message) turbogears.flash(_('Message sent to: %s') % target) turbogears.redirect('/group/view/%s' % group.name) diff --git a/fas/fas/user.py b/fas/fas/user.py index 6f1f4cb..7aa259e 100644 --- a/fas/fas/user.py +++ b/fas/fas/user.py @@ -17,8 +17,6 @@ from fas.model import Log from fas.auth import * -from textwrap import dedent - from random import Random import sha from base64 import b64encode @@ -53,9 +51,9 @@ class UnknownUser(validators.FancyValidator): return except: raise validators.Invalid(_("Error: Could not create - '%s'") % value, value, state) - + raise validators.Invalid(_("'%s' already exists.") % value, value, state) - + class ValidUsername(validators.FancyValidator): '''Make sure that a username isn't blacklisted''' def _to_python(self, value, state): @@ -75,7 +73,7 @@ class UserSave(validators.Schema): #fedoraPersonBugzillaMail = validators.Email(strip=True, max=128) #fedoraPersonKeyId- Save this one for later :) postal_address = validators.String(max=512) - + class UserCreate(validators.Schema): username = validators.All( UnknownUser, @@ -103,7 +101,7 @@ class UserView(validators.Schema): class UserEdit(validators.Schema): targetname = KnownUser - + def generate_password(password=None, length=14): ''' Generate Password ''' secret = {} # contains both hash and password @@ -114,7 +112,7 @@ def generate_password(password=None, length=14): password = '' for i in xrange(length): password += random.choice(chars) - + secret['hash'] = crypt.crypt(password, "$1$%s" % generate_salt(8)) secret['pass'] = password @@ -243,7 +241,7 @@ class User(controllers.Controller): if people.count() < 0: turbogears.flash(_("No users found matching '%s'") % search) return dict(people=people, search=search) - + @expose(template='fas.templates.user.new') def new(self): if turbogears.identity.not_anonymous(): @@ -269,45 +267,44 @@ class User(controllers.Controller): person.emails['primary'] = PersonEmails(email=email, purpose='primary') newpass = generate_password() message = turbomail.Message(config.get('accounts_mail'), person.emails['primary'].email, _('Welcome to the Fedora Project!')) - message.plain = _(dedent(''' - You have created a new Fedora account! - Your new password is: %s + message.plain = _(''' +You have created a new Fedora account! +Your new password is: %s - Please go to https://admin.fedoraproject.org/fas/ to change it. +Please go to https://admin.fedoraproject.org/fas/ to change it. - Welcome to the Fedora Project. Now that you've signed up for an - account you're probably desperate to start contributing, and with that - in mind we hope this e-mail might guide you in the right direction to - make this process as easy as possible. - - Fedora is an exciting project with lots going on, and you can - contribute in a huge number of ways, using all sorts of different - skill sets. To find out about the different ways you can contribute to - Fedora, you can visit our join page which provides more information - about all the different roles we have available. - - http://fedoraproject.org/en/join-fedora - - If you already know how you want to contribute to Fedora, and have - found the group already working in the area you're interested in, then - there are a few more steps for you to get going. - - Foremost amongst these is to sign up for the team or project's mailing - list that you're interested in - and if you're interested in more than - one group's work, feel free to sign up for as many mailing lists as - you like! This is because mailing lists are where the majority of work - gets organised and tasks assigned, so to stay in the loop be sure to - keep up with the messages. - - Once this is done, it's probably wise to send a short introduction to - the list letting them know what experience you have and how you'd like - to help. From here, existing members of the team will help you to find - your feet as a Fedora contributor. - - And finally, from all of us here at the Fedora Project, we're looking - forward to working with you! +Welcome to the Fedora Project. Now that you've signed up for an +account you're probably desperate to start contributing, and with that +in mind we hope this e-mail might guide you in the right direction to +make this process as easy as possible. - ''') % newpass['pass']) +Fedora is an exciting project with lots going on, and you can +contribute in a huge number of ways, using all sorts of different +skill sets. To find out about the different ways you can contribute to +Fedora, you can visit our join page which provides more information +about all the different roles we have available. + +http://fedoraproject.org/en/join-fedora + +If you already know how you want to contribute to Fedora, and have +found the group already working in the area you're interested in, then +there are a few more steps for you to get going. + +Foremost amongst these is to sign up for the team or project's mailing +list that you're interested in - and if you're interested in more than +one group's work, feel free to sign up for as many mailing lists as +you like! This is because mailing lists are where the majority of work +gets organised and tasks assigned, so to stay in the loop be sure to +keep up with the messages. + +Once this is done, it's probably wise to send a short introduction to +the list letting them know what experience you have and how you'd like +to help. From here, existing members of the team will help you to find +your feet as a Fedora contributor. + +And finally, from all of us here at the Fedora Project, we're looking +forward to working with you! +''') % newpass['pass'] turbomail.enqueue(message) person.password = newpass['pass'] turbogears.flash(_('Your password has been emailed to you. Please log in with it and change your password')) @@ -350,7 +347,7 @@ class User(controllers.Controller): turbogears.flash(_('You are already logged in!')) turbogears.redirect('/user/view/%s' % turbogears.identity.current.user_name) return dict() - + @expose(template="fas.templates.user.resetpass") def sendpass(self, username, email, encrypted=False): import turbomail @@ -366,12 +363,12 @@ class User(controllers.Controller): return dict() newpass = generate_password() message = turbomail.Message(config.get('accounts_mail'), email, _('Fedora Project Password Reset')) - mail = _(dedent(''' - You have requested a password reset! - Your new password is: %s - - Please go to https://admin.fedoraproject.org/fas/ to change it. - ''')) % newpass['pass'] + mail = _(''' +You have requested a password reset! +Your new password is: %s + +Please go to https://admin.fedoraproject.org/fas/ to change it. +''') % newpass['pass'] if encrypted: # TODO: Move this out to a single function (same as # CLA one), think of how to make sure this doesn't get diff --git a/fas/po/fas.pot b/fas/po/fas.pot index 3ad7fbc..e77ce5a 100644 --- a/fas/po/fas.pot +++ b/fas/po/fas.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2008-03-02 23:25-0500\n" +"POT-Creation-Date: 2008-03-03 00:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -73,7 +73,7 @@ msgstr "" msgid "You have already signed the CLA." msgstr "" -#: fas/cla.py:100 fas/user.py:382 +#: fas/cla.py:100 fas/user.py:380 msgid "Your key could not be retrieved from subkeys.pgp.net" msgstr "" @@ -125,163 +125,236 @@ msgstr "" msgid "You have not agreed to the click-through CLA." msgstr "" -#: fas/controllers.py:72 +#: fas/controllers.py:84 #, python-format msgid "Welcome, %s" msgstr "" -#: fas/controllers.py:87 +#: fas/controllers.py:99 msgid "" "The credentials you supplied were not correct or did not grant access to " "this resource." msgstr "" -#: fas/controllers.py:90 +#: fas/controllers.py:102 msgid "You must provide your credentials before accessing this resource." msgstr "" -#: fas/controllers.py:93 +#: fas/controllers.py:105 msgid "Please log in." msgstr "" -#: fas/controllers.py:105 +#: fas/controllers.py:116 msgid "You have successfully logged out." msgstr "" -#: fas/group.py:23 +#: fas/group.py:21 #, python-format msgid "The group '%s' does not exist." msgstr "" -#: fas/group.py:35 +#: fas/group.py:33 #, python-format msgid "The group '%s' already exists." msgstr "" -#: fas/group.py:131 fas/group.py:469 +#: fas/group.py:129 fas/group.py:467 #, python-format msgid "You cannot view '%s'" msgstr "" -#: fas/group.py:145 fas/group.py:161 +#: fas/group.py:143 fas/group.py:159 msgid "Only FAS adminstrators can create groups." msgstr "" -#: fas/group.py:179 +#: fas/group.py:177 #, python-format msgid "The group: '%s' could not be created." msgstr "" -#: fas/group.py:189 +#: fas/group.py:187 #, python-format msgid "" "The group: '%(group)s' has been created, but '%(user)s' could not be " "added as a group administrator." msgstr "" -#: fas/group.py:191 +#: fas/group.py:189 #, python-format msgid "The group: '%s' has been created." msgstr "" -#: fas/group.py:206 fas/group.py:221 +#: fas/group.py:204 fas/group.py:219 #, python-format msgid "You cannot edit '%s'." msgstr "" -#: fas/group.py:238 +#: fas/group.py:236 msgid "The group details could not be saved." msgstr "" -#: fas/group.py:240 +#: fas/group.py:238 msgid "The group details have been saved." msgstr "" -#: fas/group.py:259 +#: fas/group.py:257 #, python-format msgid "No Groups found matching '%s'" msgstr "" -#: fas/group.py:285 +#: fas/group.py:283 #, python-format msgid "%(user)s has already applied to %(group)s!" msgstr "" -#: fas/group.py:302 +#: fas/group.py:293 +#, python-format +msgid "" +"\n" +"Fedora user %(user)s, aka %(name)s <%(email)s> has requested\n" +"membership for %(applicant)s (%(applicant_name)s) in the %(group)s group " +"and needs a sponsor.\n" +"\n" +"Please go to %(url)s to take action. \n" +msgstr "" + +#: fas/group.py:300 #, python-format msgid "%(user)s has applied to %(group)s!" msgstr "" -#: fas/group.py:319 +#: fas/group.py:317 #, python-format msgid "You cannot sponsor '%s'" msgstr "" -#: fas/group.py:326 +#: fas/group.py:324 #, python-format msgid "'%s' could not be sponsored!" msgstr "" -#: fas/group.py:339 +#: fas/group.py:329 +#, python-format +msgid "" +"\n" +"%(name)s <%(email)s> has sponsored you for membership in the %(group)s\n" +"group of the Fedora account system. If applicable, this change should\n" +"propagate into the e-mail aliases and CVS repository within an hour.\n" +"\n" +"%(joinmsg)s\n" +msgstr "" + +#: fas/group.py:337 #, python-format msgid "'%s' has been sponsored!" msgstr "" -#: fas/group.py:356 +#: fas/group.py:354 #, python-format msgid "You cannot remove '%s'." msgstr "" -#: fas/group.py:363 +#: fas/group.py:361 #, python-format msgid "%(name)s could not be removed from %(group)s!" msgstr "" -#: fas/group.py:376 +#: fas/group.py:367 +#, python-format +msgid "" +"\n" +"%(name)s <%(email)s> has removed you from the '%(group)s'\n" +"group of the Fedora Accounts System This change is effective\n" +"immediately for new operations, and should propagate into the e-mail\n" +"aliases within an hour.\n" +msgstr "" + +#: fas/group.py:374 #, python-format msgid "%(name)s has been removed from %(group)s!" msgstr "" -#: fas/group.py:393 +#: fas/group.py:391 #, python-format msgid "You cannot upgrade '%s'" msgstr "" -#: fas/group.py:403 +#: fas/group.py:401 #, python-format msgid "%(name)s could not be upgraded!" msgstr "" -#: fas/group.py:418 +#: fas/group.py:409 +#, python-format +msgid "" +"\n" +"%(name)s <%(email)s> has upgraded you to %(status)s status in the\n" +"'%(group)s' group of the Fedora Accounts System This change is\n" +"effective immediately for new operations, and should propagate\n" +"into the e-mail aliases within an hour.\n" +msgstr "" + +#: fas/group.py:416 #, python-format msgid "%s has been upgraded!" msgstr "" -#: fas/group.py:434 +#: fas/group.py:432 #, python-format msgid "You cannot downgrade '%s'" msgstr "" -#: fas/group.py:441 +#: fas/group.py:439 #, python-format msgid "%(username)s could not be downgraded!" msgstr "" -#: fas/group.py:455 +#: fas/group.py:446 +#, python-format +msgid "" +"\n" +"%(name)s <%(email)s> has downgraded you to %(status)s status in the\n" +"'%(group)s' group of the Fedora Accounts System This change is\n" +"effective immediately for new operations, and should propagate\n" +"into the e-mail aliases within an hour.\n" +msgstr "" + +#: fas/group.py:453 #, python-format msgid "%s has been downgraded!" msgstr "" -#: fas/group.py:497 +#: fas/group.py:495 msgid "Come join The Fedora Project!" msgstr "" -#: fas/group.py:515 +#: fas/group.py:496 +#, python-format +msgid "" +"\n" +"%(name)s <%(email)s> has invited you to join the Fedora\n" +"Project! We are a community of users and developers who produce a\n" +"complete operating system from entirely free and open source software\n" +"(FOSS). %(name)s thinks that you have knowledge and skills\n" +"that make you a great fit for the Fedora community, and that you might\n" +"be interested in contributing.\n" +"\n" +"How could you team up with the Fedora community to use and develop your\n" +"skills? Check out http://fedoraproject.org/join-fedora for some ideas.\n" +"Our community is more than just software developers -- we also have a\n" +"place for you whether you're an artist, a web site builder, a writer, or\n" +"a people person. You'll grow and learn as you work on a team with other\n" +"very smart and talented people.\n" +"\n" +"Fedora and FOSS are changing the world -- come be a part of it!" +msgstr "" + +#: fas/group.py:513 #, python-format msgid "Message sent to: %s" msgstr "" -#: fas/group.py:518 +#: fas/group.py:516 #, python-format msgid "You are not in the '%s' group." msgstr "" @@ -295,112 +368,160 @@ msgstr "" msgid "Loading: %(visitmod)s" msgstr "" -#: fas/user.py:35 +#: fas/user.py:33 #, python-format msgid "'%s' does not exist." msgstr "" -#: fas/user.py:43 +#: fas/user.py:41 msgid "To prevent email loops, your email address cannot be @fedoraproject.org." msgstr "" -#: fas/user.py:55 +#: fas/user.py:53 #, python-format msgid "Error: Could not create - '%s'" msgstr "" -#: fas/user.py:57 +#: fas/user.py:55 #, python-format msgid "'%s' already exists." msgstr "" -#: fas/user.py:66 +#: fas/user.py:64 #, python-format msgid "'%s' is an illegal username." msgstr "" -#: fas/user.py:198 +#: fas/user.py:196 #, python-format msgid "You cannot edit %s" msgstr "" -#: fas/user.py:213 +#: fas/user.py:211 #, python-format msgid "You do not have permission to edit '%s'" msgstr "" -#: fas/user.py:227 +#: fas/user.py:226 #, python-format msgid "Your account details could not be saved: %s" msgstr "" -#: fas/user.py:229 +#: fas/user.py:228 msgid "Your account details have been saved." msgstr "" -#: fas/user.py:243 +#: fas/user.py:242 #, python-format msgid "No users found matching '%s'" msgstr "" -#: fas/user.py:249 +#: fas/user.py:248 msgid "No need to sign up, you have an account!" msgstr "" -#: fas/user.py:270 +#: fas/user.py:269 msgid "Welcome to the Fedora Project!" msgstr "" -#: fas/user.py:271 -msgid "pass" +#: fas/user.py:270 +#, python-format +msgid "" +"\n" +"You have created a new Fedora account!\n" +"Your new password is: %s\n" +"\n" +"Please go to https://admin.fedoraproject.org/fas/ to change it.\n" +"\n" +"Welcome to the Fedora Project. Now that you've signed up for an\n" +"account you're probably desperate to start contributing, and with that\n" +"in mind we hope this e-mail might guide you in the right direction to\n" +"make this process as easy as possible.\n" +"\n" +"Fedora is an exciting project with lots going on, and you can\n" +"contribute in a huge number of ways, using all sorts of different\n" +"skill sets. To find out about the different ways you can contribute to\n" +"Fedora, you can visit our join page which provides more information\n" +"about all the different roles we have available.\n" +"\n" +"http://fedoraproject.org/en/join-fedora\n" +"\n" +"If you already know how you want to contribute to Fedora, and have\n" +"found the group already working in the area you're interested in, then\n" +"there are a few more steps for you to get going.\n" +"\n" +"Foremost amongst these is to sign up for the team or project's mailing\n" +"list that you're interested in - and if you're interested in more than\n" +"one group's work, feel free to sign up for as many mailing lists as\n" +"you like! This is because mailing lists are where the majority of work\n" +"gets organised and tasks assigned, so to stay in the loop be sure to\n" +"keep up with the messages.\n" +"\n" +"Once this is done, it's probably wise to send a short introduction to\n" +"the list letting them know what experience you have and how you'd like\n" +"to help. From here, existing members of the team will help you to find\n" +"your feet as a Fedora contributor.\n" +"\n" +"And finally, from all of us here at the Fedora Project, we're looking\n" +"forward to working with you!\n" msgstr "" -#: fas/user.py:312 +#: fas/user.py:310 msgid "" "Your password has been emailed to you. Please log in with it and change " "your password" msgstr "" -#: fas/user.py:315 +#: fas/user.py:313 #, python-format msgid "The username '%s' already Exists. Please choose a different username." msgstr "" -#: fas/user.py:340 +#: fas/user.py:338 msgid "Your password has been changed." msgstr "" -#: fas/user.py:343 +#: fas/user.py:341 msgid "Your password could not be changed." msgstr "" -#: fas/user.py:349 +#: fas/user.py:347 msgid "You are already logged in!" msgstr "" -#: fas/user.py:358 +#: fas/user.py:356 msgid "You are already logged in." msgstr "" -#: fas/user.py:364 +#: fas/user.py:362 msgid "username + email combo unknown." msgstr "" -#: fas/user.py:367 +#: fas/user.py:365 msgid "Fedora Project Password Reset" msgstr "" -#: fas/user.py:401 +#: fas/user.py:366 +#, python-format +msgid "" +"\n" +"You have requested a password reset!\n" +"Your new password is: %s\n" +"\n" +"Please go to https://admin.fedoraproject.org/fas/ to change it.\n" +msgstr "" + +#: fas/user.py:399 msgid "" "Your password reset email could not be encrypted. Your password has not " "been changed." msgstr "" -#: fas/user.py:408 +#: fas/user.py:406 msgid "Your new password has been emailed to you." msgstr "" -#: fas/user.py:410 +#: fas/user.py:408 msgid "Your password could not be reset." msgstr "" @@ -411,16 +532,6 @@ msgstr "" msgid "Fedora Accounts System" msgstr "" -#: fas/templates/error.html:8 fas/templates/login.html:8 -#: fas/templates/welcome.html:8 -msgid "" -"#content ul\n" -" {\n" -" list-style: square;\n" -" margin: 1ex 3ex;\n" -" }" -msgstr "" - #: fas/templates/error.html:17 msgid "Error!" msgstr "" @@ -497,7 +608,7 @@ msgstr "" msgid "My Account" msgstr "" -#: fas/templates/master.html:50 fas/templates/master.html:80 +#: fas/templates/master.html:50 fas/templates/master.html:87 msgid "Log Out" msgstr "" @@ -525,26 +636,34 @@ msgstr "" msgid "News" msgstr "" -#: fas/templates/master.html:76 -msgid "About" +#: fas/templates/master.html:69 +msgid "Locale:" msgstr "" -#: fas/templates/master.html:77 -msgid "Contact Us" -msgstr "" - -#: fas/templates/master.html:78 -msgid "Legal & Privacy" +#: fas/templates/master.html:71 +msgid "OK" msgstr "" #: fas/templates/master.html:83 +msgid "About" +msgstr "" + +#: fas/templates/master.html:84 +msgid "Contact Us" +msgstr "" + +#: fas/templates/master.html:85 +msgid "Legal & Privacy" +msgstr "" + +#: fas/templates/master.html:90 msgid "" "Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved. Please " "send any comments or corrections to the websites team." msgstr "" -#: fas/templates/master.html:86 +#: fas/templates/master.html:93 msgid "" "The Fedora Project is maintained and driven by the community and " "sponsored by Red Hat. This is a community maintained site. Red Hat is " @@ -569,182 +688,6 @@ msgstr "" msgid "Why Join?" msgstr "" -#: fas/templates/cla/cla.txt:1 -msgid "" -"The Fedora Project\n" -" Individual Contributor License Agreement (CLA)\n" -" http://www.fedora.redhat.com/licenses/\n" -"\n" -" Thank you for your interest in The Fedora Project (the\n" -" \"Project\"). In order to clarify the intellectual property license\n" -" granted with Contributions from any person or entity, Red hat,\n" -" Inc. (\"Red Hat\"), as maintainer of the Project, must have a\n" -" Contributor License Agreement (CLA) on file that has been signed\n" -" by each Contributor, indicating agreement to the license terms\n" -" below. This license is for Your protection as a Contributor as\n" -" well as the protection of the Project and its users; it does not\n" -" change your rights to use your own Contributions for any other\n" -" purpose.\n" -"\n" -" If you have not already done so, please complete an original signed\n" -" Agreement. Use black ink, and hand-print or type the items other than" -"\n" -" the signature. Send the completed Agreement to\n" -"\n" -"\t Fedora Project, c/o Red Hat, Inc.,\n" -"\t Attn: Legal Affairs\n" -"\t 1801 Varsity Drive\n" -"\t Raleigh, North Carolina, 27606 U.S.A.\n" -"\n" -" If necessary, you may send it by facsimile to the Project at\n" -" +1-919-754-3704 or e-mail a signed pdf copy of the document to\n" -" fedora-legal@redhat.com. Please read this document carefully before\n" -" signing and keep a copy for your records.\n" -"\n" -" Full name:" -msgstr "" - -#: fas/templates/cla/cla.txt:30 -msgid "E-Mail:" -msgstr "" - -#: fas/templates/cla/cla.txt:30 -msgid "Address:" -msgstr "" - -#: fas/templates/cla/cla.txt:32 -msgid "Telephone:" -msgstr "" - -#: fas/templates/cla/cla.txt:34 -#, python-format -msgid "" -"Facsimile: %(facsimile)s\n" -"\n" -" You and the Project hereby accept and agree to the following terms " -"and conditions:\n" -"\n" -" 1. Contributors and Contributions.\n" -"\n" -" A. The Project and any individual or legal entity that\n" -" voluntarily submits to the Project a Contribution are\n" -" collectively addressed herein as \"Contributors\". For legal\n" -" entities, the entity making a Contribution and all other\n" -" entities that control, are controlled by, or are under common\n" -" control with that entity are considered to be a single\n" -" Contributor. For the purposes of this definition, \"control\"\n" -" means (i) the power, direct or indirect, to cause the direction\n" -" or management of such entity, whether by contract or otherwise,\n" -" or (ii) ownership of fifty percent (50%) or more of the\n" -" outstanding shares, or (iii) beneficial ownership of such\n" -" entity.\n" -"\n" -" B. A \"Contribution\" is any original work, including any\n" -" modification or addition to an existing work, that has been\n" -" submitted for inclusion in, or documentation of, any of the\n" -" products owned or managed by the Project, where such work\n" -" originates from that particular Contributor or from some entity\n" -" acting on behalf of that Contributor.\n" -"\n" -" C. A Contribution is \"submitted\" when any form of electronic,\n" -" verbal, or written communication is sent to the Project,\n" -" including but not limited to communication on electronic\n" -" mailing lists, source code control systems, and issue tracking\n" -" systems that are managed by, or on behalf of, the Project for\n" -" the purpose of discussing or improving software or\n" -" documentation of the Project, but excluding communication that\n" -" is conspicuously marked or otherwise designated in writing by\n" -" you as \"Not a Contribution.\"\n" -"\n" -" D. Any Contribution submitted by you to the Project shall be\n" -" under the terms and conditions of this License, without any\n" -" additional terms or conditions, unless you explicitly state\n" -" otherwise in the submission.\n" -"\n" -" 2. Contributor Grant of License. You hereby grant to Red Hat,\n" -" Inc., on behalf of the Project, and to recipients of software\n" -" distributed by the Project:\n" -"\n" -" (a) a perpetual, non-exclusive, worldwide, fully paid-up,\n" -" royalty free, irrevocable copyright license to reproduce,\n" -" prepare derivative works of, publicly display, publicly\n" -" perform, sublicense, and distribute your Contribution and such\n" -" derivative works; and,\n" -"\n" -" (b) a perpetual, non-exclusive, worldwide, fully paid-up,\n" -" royalty free, irrevocable (subject to Section 3) patent license\n" -" to make, have made, use, offer to sell, sell, import, and\n" -" otherwise transfer your Contribution and derivative works\n" -" thereof, where such license applies only to those patent claims\n" -" licensable by you that are necessarily infringed by your\n" -" Contribution alone or by combination of your Contribution with\n" -" the work to which you submitted the Contribution. Except for\n" -" the license granted in this section, you reserve all right,\n" -" title and interest in and to your Contributions.\n" -"\n" -" 3. Reciprocity. As of the date any such litigation is filed, your\n" -" patent grant shall immediately terminate with respect to any\n" -" party that institutes patent litigation against you (including\n" -" a cross-claim or counterclaim in a lawsuit) alleging that your\n" -" Contribution, or the work to which you have contributed,\n" -" constitutes direct or contributory patent infringement.\n" -"\n" -" 4. You represent that you are legally entitled to grant the above\n" -" license. If your employer(s) has rights to intellectual\n" -" property that you create that includes your Contributions, you\n" -" represent that you have received permission to make\n" -" Contributions on behalf of that employer, that your employer\n" -" has waived such rights for your Contributions to the Project,\n" -" or that your employer has executed a separate Corporate CLA\n" -" with the Project.\n" -"\n" -" 5. You represent that each of your Contributions is your original\n" -" creation (see section 7 for submissions on behalf of others).\n" -" You represent that your Contribution submission(s) include\n" -" complete details of any third-party license or other\n" -" restriction (including, but not limited to, related copyright,\n" -" atents and trademarks) of which you are personally aware and\n" -" which are associated with any part of your Contribution.\n" -"\n" -" 6. You are not expected to provide support for your Contributions,\n" -" except to the extent you desire to provide support. You may\n" -" provide support for free, for a fee, or not at all. Your\n" -" Contributions are provided on an \"AS IS\" BASIS, WITHOUT\n" -" WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n" -" implied, including, without limitation, any warranties or\n" -" conditions of NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR\n" -" A PARTICULAR PURPOSE.\n" -"\n" -" 7. Should you wish to submit work that is not your original\n" -" creation, you may submit it to the Project separately from any\n" -" Contribution, identifying the complete details of its source\n" -" and of any license or other restriction (including, but not\n" -" limited to, related patents, trademarks, and license\n" -" agreements) of which you are personally aware, and\n" -" conspicuously marking the work as \"Submitted on behalf of a\n" -" third-party: [named here]\".\n" -"\n" -" 8. You agree to notify the Project of any facts or circumstances\n" -" of which you become aware that would make these representations\n" -" inaccurate in any respect.\n" -"\n" -" 9. The Project is under no obligations to accept and include every " -"contribution.\n" -"\n" -"\n" -" \n" -"\n" -"\n" -" If you agree to these terms and conditions, type \"I agree\" here: \n" -" Enter your full name here: \n" -" E-mail:" -msgstr "" - -#: fas/templates/cla/cla.txt:152 fas/templates/cla/click.html:18 -#: fas/templates/cla/view.html:23 -msgid "Date:" -msgstr "" - #: fas/templates/cla/click.html:11 fas/templates/cla/view.html:11 msgid "Contributor License Agreement" msgstr "" @@ -763,6 +706,10 @@ msgstr "" msgid "E-mail:" msgstr "" +#: fas/templates/cla/click.html:18 fas/templates/cla/view.html:23 +msgid "Date:" +msgstr "" + #: fas/templates/cla/click.html:19 fas/templates/cla/view.html:24 #: fas/templates/cla/view.html:38 msgid "Submit CLA" @@ -853,7 +800,7 @@ msgstr "" msgid "Group Join Message:" msgstr "" -#: fas/templates/group/edit.html:44 fas/templates/user/edit.html:63 +#: fas/templates/group/edit.html:44 fas/templates/user/edit.html:73 msgid "Save!" msgstr "" @@ -873,50 +820,10 @@ msgstr "" msgid "Subject:" msgstr "" -#: fas/templates/group/invite.html:16 -msgid "Invitation to join the Fedora Team!" -msgstr "" - #: fas/templates/group/invite.html:17 msgid "Message:" msgstr "" -#: fas/templates/group/invite.html:20 -msgid "" -"> has invited you to join the Fedora\n" -" Project! We are a community of users and developers who " -"produce a\n" -" complete operating system from entirely free and open source " -"software\n" -" (FOSS)." -msgstr "" - -#: fas/templates/group/invite.html:23 -msgid "" -"thinks that you have knowledge and skills\n" -" that make you a great fit for the Fedora community, and that " -"you might\n" -" be interested in contributing." -msgstr "" - -#: fas/templates/group/invite.html:27 -msgid "" -"How could you team up with the Fedora community to use and develop your\n" -" skills? Check out http://fedoraproject.org/join-fedora for " -"some ideas.\n" -" Our community is more than just software developers -- we also " -"have a\n" -" place for you whether you're an artist, a web site builder, a " -"writer, or\n" -" a people person. You'll grow and learn as you work on a team " -"with other\n" -" very smart and talented people." -msgstr "" - -#: fas/templates/group/invite.html:35 -msgid "Fedora and FOSS are changing the world -- come be a part of it!" -msgstr "" - #: fas/templates/group/invite.html:39 msgid "Send!" msgstr "" @@ -925,14 +832,6 @@ msgstr "" msgid "Groups List" msgstr "" -#: fas/templates/group/list.html:15 -msgid "Create New Group" -msgstr "" - -#: fas/templates/group/list.html:16 -msgid "Create Group" -msgstr "" - #: fas/templates/group/list.html:19 fas/templates/user/list.html:11 #, python-format msgid "List (%s)" @@ -1012,10 +911,6 @@ msgstr "" msgid "Remove me" msgstr "" -#: fas/templates/group/view.html:31 -msgid "Group Details" -msgstr "" - #: fas/templates/group/view.html:31 fas/templates/user/view.html:13 msgid "(edit)" msgstr "" @@ -1157,73 +1052,39 @@ msgstr "" msgid "Human Name" msgstr "" -#: fas/templates/user/edit.html:15 -msgid "" -"var hb1 = new HelpBalloon({dataURL: " -"'/fas/help/get_help/user_human_name'});" -msgstr "" - #: fas/templates/user/edit.html:19 msgid "Email" msgstr "" -#: fas/templates/user/edit.html:21 -msgid "" -"var hb2 = new HelpBalloon({dataURL: " -"'/fas/help/get_help/user_primary_email'});" -msgstr "" - #: fas/templates/user/edit.html:28 msgid "IRC Nick" msgstr "" -#: fas/templates/user/edit.html:30 -msgid "var hb3 = new HelpBalloon({dataURL: '/fas/help/get_help/user_ircnick'});" -msgstr "" - #: fas/templates/user/edit.html:33 msgid "PGP Key" msgstr "" -#: fas/templates/user/edit.html:35 -msgid "var hb4 = new HelpBalloon({dataURL: '/fas/help/get_help/user_gpg_keyid'});" -msgstr "" - #: fas/templates/user/edit.html:38 msgid "Telephone Number" msgstr "" -#: fas/templates/user/edit.html:40 -msgid "var hb5 = new HelpBalloon({dataURL: '/fas/help/get_help/user_telephone'});" -msgstr "" - #: fas/templates/user/edit.html:43 msgid "Postal Address" msgstr "" -#: fas/templates/user/edit.html:45 -msgid "" -"var hb6 = new HelpBalloon({dataURL: " -"'/fas/help/get_help/user_postal_address'});" -msgstr "" - #: fas/templates/user/edit.html:48 msgid "Time Zone" msgstr "" -#: fas/templates/user/edit.html:55 -msgid "var hb7 = new HelpBalloon({dataURL: '/fas/help/get_help/user_timezone'});" +#: fas/templates/user/edit.html:58 +msgid "Locale" msgstr "" -#: fas/templates/user/edit.html:58 +#: fas/templates/user/edit.html:68 msgid "Comments" msgstr "" -#: fas/templates/user/edit.html:60 -msgid "var hb8 = new HelpBalloon({dataURL: '/fas/help/get_help/user_comments'});" -msgstr "" - -#: fas/templates/user/edit.html:64 +#: fas/templates/user/edit.html:74 msgid "Cancel" msgstr "" @@ -1317,20 +1178,10 @@ msgstr "" msgid "Valid" msgstr "" -#: fas/templates/user/view.html:25 -msgid "(change)" -msgstr "" - #: fas/templates/user/view.html:26 msgid "Account Status:" msgstr "" -#: fas/templates/user/view.html:27 -msgid "" -"var hb1 = new HelpBalloon({dataURL: " -"'/fas/help/get_help/user_account_status'});" -msgstr "" - #: fas/templates/user/view.html:29 msgid "CLA:" msgstr "" @@ -1343,10 +1194,6 @@ msgstr "" msgid "Sign it!" msgstr "" -#: fas/templates/user/view.html:33 -msgid "var hb2 = new HelpBalloon({dataURL: '/fas/help/get_help/user_cla'});" -msgstr "" - #: fas/templates/user/view.html:36 msgid "Your Roles" msgstr "" diff --git a/fas/po/test/LC_MESSAGES/fas.po b/fas/po/test/LC_MESSAGES/fas.po index 039594c..6e99422 100644 --- a/fas/po/test/LC_MESSAGES/fas.po +++ b/fas/po/test/LC_MESSAGES/fas.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the PROJECT project. # FIRST AUTHOR , 2008. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2008-03-02 23:25-0500\n" +"POT-Creation-Date: 2008-03-03 00:46-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -72,7 +73,7 @@ msgstr "test" msgid "You have already signed the CLA." msgstr "test" -#: fas/cla.py:100 fas/user.py:382 +#: fas/cla.py:100 fas/user.py:380 msgid "Your key could not be retrieved from subkeys.pgp.net" msgstr "test" @@ -124,163 +125,236 @@ msgstr "test" msgid "You have not agreed to the click-through CLA." msgstr "test" -#: fas/controllers.py:72 +#: fas/controllers.py:84 #, python-format msgid "Welcome, %s" msgstr "test" -#: fas/controllers.py:87 +#: fas/controllers.py:99 msgid "test" "The credentials you supplied were not correct or did not grant access to " "this resource." msgstr "test" -#: fas/controllers.py:90 +#: fas/controllers.py:102 msgid "You must provide your credentials before accessing this resource." msgstr "test" -#: fas/controllers.py:93 +#: fas/controllers.py:105 msgid "Please log in." msgstr "test" -#: fas/controllers.py:105 +#: fas/controllers.py:116 msgid "You have successfully logged out." msgstr "test" -#: fas/group.py:23 +#: fas/group.py:21 #, python-format msgid "The group '%s' does not exist." msgstr "test" -#: fas/group.py:35 +#: fas/group.py:33 #, python-format msgid "The group '%s' already exists." msgstr "test" -#: fas/group.py:131 fas/group.py:469 +#: fas/group.py:129 fas/group.py:467 #, python-format msgid "You cannot view '%s'" msgstr "test" -#: fas/group.py:145 fas/group.py:161 +#: fas/group.py:143 fas/group.py:159 msgid "Only FAS adminstrators can create groups." msgstr "test" -#: fas/group.py:179 +#: fas/group.py:177 #, python-format msgid "The group: '%s' could not be created." msgstr "test" -#: fas/group.py:189 +#: fas/group.py:187 #, python-format msgid "test" "The group: '%(group)s' has been created, but '%(user)s' could not be " "added as a group administrator." msgstr "test" -#: fas/group.py:191 +#: fas/group.py:189 #, python-format msgid "The group: '%s' has been created." msgstr "test" -#: fas/group.py:206 fas/group.py:221 +#: fas/group.py:204 fas/group.py:219 #, python-format msgid "You cannot edit '%s'." msgstr "test" -#: fas/group.py:238 +#: fas/group.py:236 msgid "The group details could not be saved." msgstr "test" -#: fas/group.py:240 +#: fas/group.py:238 msgid "The group details have been saved." msgstr "test" -#: fas/group.py:259 +#: fas/group.py:257 #, python-format msgid "No Groups found matching '%s'" msgstr "test" -#: fas/group.py:285 +#: fas/group.py:283 #, python-format msgid "%(user)s has already applied to %(group)s!" msgstr "test" -#: fas/group.py:302 +#: fas/group.py:293 +#, python-format +msgid "test" +"\n" +"Fedora user %(user)s, aka %(name)s <%(email)s> has requested\n" +"membership for %(applicant)s (%(applicant_name)s) in the %(group)s group " +"and needs a sponsor.\n" +"\n" +"Please go to %(url)s to take action. \n" +msgstr "test" + +#: fas/group.py:300 #, python-format msgid "%(user)s has applied to %(group)s!" msgstr "test" -#: fas/group.py:319 +#: fas/group.py:317 #, python-format msgid "You cannot sponsor '%s'" msgstr "test" -#: fas/group.py:326 +#: fas/group.py:324 #, python-format msgid "'%s' could not be sponsored!" msgstr "test" -#: fas/group.py:339 +#: fas/group.py:329 +#, python-format +msgid "test" +"\n" +"%(name)s <%(email)s> has sponsored you for membership in the %(group)s\n" +"group of the Fedora account system. If applicable, this change should\n" +"propagate into the e-mail aliases and CVS repository within an hour.\n" +"\n" +"%(joinmsg)s\n" +msgstr "test" + +#: fas/group.py:337 #, python-format msgid "'%s' has been sponsored!" msgstr "test" -#: fas/group.py:356 +#: fas/group.py:354 #, python-format msgid "You cannot remove '%s'." msgstr "test" -#: fas/group.py:363 +#: fas/group.py:361 #, python-format msgid "%(name)s could not be removed from %(group)s!" msgstr "test" -#: fas/group.py:376 +#: fas/group.py:367 +#, python-format +msgid "test" +"\n" +"%(name)s <%(email)s> has removed you from the '%(group)s'\n" +"group of the Fedora Accounts System This change is effective\n" +"immediately for new operations, and should propagate into the e-mail\n" +"aliases within an hour.\n" +msgstr "test" + +#: fas/group.py:374 #, python-format msgid "%(name)s has been removed from %(group)s!" msgstr "test" -#: fas/group.py:393 +#: fas/group.py:391 #, python-format msgid "You cannot upgrade '%s'" msgstr "test" -#: fas/group.py:403 +#: fas/group.py:401 #, python-format msgid "%(name)s could not be upgraded!" msgstr "test" -#: fas/group.py:418 +#: fas/group.py:409 +#, python-format +msgid "test" +"\n" +"%(name)s <%(email)s> has upgraded you to %(status)s status in the\n" +"'%(group)s' group of the Fedora Accounts System This change is\n" +"effective immediately for new operations, and should propagate\n" +"into the e-mail aliases within an hour.\n" +msgstr "test" + +#: fas/group.py:416 #, python-format msgid "%s has been upgraded!" msgstr "test" -#: fas/group.py:434 +#: fas/group.py:432 #, python-format msgid "You cannot downgrade '%s'" msgstr "test" -#: fas/group.py:441 +#: fas/group.py:439 #, python-format msgid "%(username)s could not be downgraded!" msgstr "test" -#: fas/group.py:455 +#: fas/group.py:446 +#, python-format +msgid "test" +"\n" +"%(name)s <%(email)s> has downgraded you to %(status)s status in the\n" +"'%(group)s' group of the Fedora Accounts System This change is\n" +"effective immediately for new operations, and should propagate\n" +"into the e-mail aliases within an hour.\n" +msgstr "test" + +#: fas/group.py:453 #, python-format msgid "%s has been downgraded!" msgstr "test" -#: fas/group.py:497 +#: fas/group.py:495 msgid "Come join The Fedora Project!" msgstr "test" -#: fas/group.py:515 +#: fas/group.py:496 +#, python-format +msgid "test" +"\n" +"%(name)s <%(email)s> has invited you to join the Fedora\n" +"Project! We are a community of users and developers who produce a\n" +"complete operating system from entirely free and open source software\n" +"(FOSS). %(name)s thinks that you have knowledge and skills\n" +"that make you a great fit for the Fedora community, and that you might\n" +"be interested in contributing.\n" +"\n" +"How could you team up with the Fedora community to use and develop your\n" +"skills? Check out http://fedoraproject.org/join-fedora for some ideas.\n" +"Our community is more than just software developers -- we also have a\n" +"place for you whether you're an artist, a web site builder, a writer, or\n" +"a people person. You'll grow and learn as you work on a team with other\n" +"very smart and talented people.\n" +"\n" +"Fedora and FOSS are changing the world -- come be a part of it!" +msgstr "test" + +#: fas/group.py:513 #, python-format msgid "Message sent to: %s" msgstr "test" -#: fas/group.py:518 +#: fas/group.py:516 #, python-format msgid "You are not in the '%s' group." msgstr "test" @@ -294,112 +368,160 @@ msgstr "test" msgid "Loading: %(visitmod)s" msgstr "test" -#: fas/user.py:35 +#: fas/user.py:33 #, python-format msgid "'%s' does not exist." msgstr "test" -#: fas/user.py:43 +#: fas/user.py:41 msgid "To prevent email loops, your email address cannot be @fedoraproject.org." msgstr "test" -#: fas/user.py:55 +#: fas/user.py:53 #, python-format msgid "Error: Could not create - '%s'" msgstr "test" -#: fas/user.py:57 +#: fas/user.py:55 #, python-format msgid "'%s' already exists." msgstr "test" -#: fas/user.py:66 +#: fas/user.py:64 #, python-format msgid "'%s' is an illegal username." msgstr "test" -#: fas/user.py:198 +#: fas/user.py:196 #, python-format msgid "You cannot edit %s" msgstr "test" -#: fas/user.py:213 +#: fas/user.py:211 #, python-format msgid "You do not have permission to edit '%s'" msgstr "test" -#: fas/user.py:227 +#: fas/user.py:226 #, python-format msgid "Your account details could not be saved: %s" msgstr "test" -#: fas/user.py:229 +#: fas/user.py:228 msgid "Your account details have been saved." msgstr "test" -#: fas/user.py:243 +#: fas/user.py:242 #, python-format msgid "No users found matching '%s'" msgstr "test" -#: fas/user.py:249 +#: fas/user.py:248 msgid "No need to sign up, you have an account!" msgstr "test" -#: fas/user.py:270 +#: fas/user.py:269 msgid "Welcome to the Fedora Project!" msgstr "test" -#: fas/user.py:271 -msgid "pass" +#: fas/user.py:270 +#, python-format +msgid "test" +"\n" +"You have created a new Fedora account!\n" +"Your new password is: %s\n" +"\n" +"Please go to https://admin.fedoraproject.org/fas/ to change it.\n" +"\n" +"Welcome to the Fedora Project. Now that you've signed up for an\n" +"account you're probably desperate to start contributing, and with that\n" +"in mind we hope this e-mail might guide you in the right direction to\n" +"make this process as easy as possible.\n" +"\n" +"Fedora is an exciting project with lots going on, and you can\n" +"contribute in a huge number of ways, using all sorts of different\n" +"skill sets. To find out about the different ways you can contribute to\n" +"Fedora, you can visit our join page which provides more information\n" +"about all the different roles we have available.\n" +"\n" +"http://fedoraproject.org/en/join-fedora\n" +"\n" +"If you already know how you want to contribute to Fedora, and have\n" +"found the group already working in the area you're interested in, then\n" +"there are a few more steps for you to get going.\n" +"\n" +"Foremost amongst these is to sign up for the team or project's mailing\n" +"list that you're interested in - and if you're interested in more than\n" +"one group's work, feel free to sign up for as many mailing lists as\n" +"you like! This is because mailing lists are where the majority of work\n" +"gets organised and tasks assigned, so to stay in the loop be sure to\n" +"keep up with the messages.\n" +"\n" +"Once this is done, it's probably wise to send a short introduction to\n" +"the list letting them know what experience you have and how you'd like\n" +"to help. From here, existing members of the team will help you to find\n" +"your feet as a Fedora contributor.\n" +"\n" +"And finally, from all of us here at the Fedora Project, we're looking\n" +"forward to working with you!\n" msgstr "test" -#: fas/user.py:312 +#: fas/user.py:310 msgid "test" "Your password has been emailed to you. Please log in with it and change " "your password" msgstr "test" -#: fas/user.py:315 +#: fas/user.py:313 #, python-format msgid "The username '%s' already Exists. Please choose a different username." msgstr "test" -#: fas/user.py:340 +#: fas/user.py:338 msgid "Your password has been changed." msgstr "test" -#: fas/user.py:343 +#: fas/user.py:341 msgid "Your password could not be changed." msgstr "test" -#: fas/user.py:349 +#: fas/user.py:347 msgid "You are already logged in!" msgstr "test" -#: fas/user.py:358 +#: fas/user.py:356 msgid "You are already logged in." msgstr "test" -#: fas/user.py:364 +#: fas/user.py:362 msgid "username + email combo unknown." msgstr "test" -#: fas/user.py:367 +#: fas/user.py:365 msgid "Fedora Project Password Reset" msgstr "test" -#: fas/user.py:401 +#: fas/user.py:366 +#, python-format +msgid "test" +"\n" +"You have requested a password reset!\n" +"Your new password is: %s\n" +"\n" +"Please go to https://admin.fedoraproject.org/fas/ to change it.\n" +msgstr "test" + +#: fas/user.py:399 msgid "test" "Your password reset email could not be encrypted. Your password has not " "been changed." msgstr "test" -#: fas/user.py:408 +#: fas/user.py:406 msgid "Your new password has been emailed to you." msgstr "test" -#: fas/user.py:410 +#: fas/user.py:408 msgid "Your password could not be reset." msgstr "test" @@ -410,16 +532,6 @@ msgstr "test" msgid "Fedora Accounts System" msgstr "test" -#: fas/templates/error.html:8 fas/templates/login.html:8 -#: fas/templates/welcome.html:8 -msgid "test" -"#content ul\n" -" {\n" -" list-style: square;\n" -" margin: 1ex 3ex;\n" -" }" -msgstr "test" - #: fas/templates/error.html:17 msgid "Error!" msgstr "test" @@ -496,7 +608,7 @@ msgstr "test" msgid "My Account" msgstr "test" -#: fas/templates/master.html:50 fas/templates/master.html:80 +#: fas/templates/master.html:50 fas/templates/master.html:87 msgid "Log Out" msgstr "test" @@ -524,26 +636,34 @@ msgstr "test" msgid "News" msgstr "test" -#: fas/templates/master.html:76 -msgid "About" +#: fas/templates/master.html:69 +msgid "Locale:" msgstr "test" -#: fas/templates/master.html:77 -msgid "Contact Us" -msgstr "test" - -#: fas/templates/master.html:78 -msgid "Legal & Privacy" +#: fas/templates/master.html:71 +msgid "OK" msgstr "test" #: fas/templates/master.html:83 +msgid "About" +msgstr "test" + +#: fas/templates/master.html:84 +msgid "Contact Us" +msgstr "test" + +#: fas/templates/master.html:85 +msgid "Legal & Privacy" +msgstr "test" + +#: fas/templates/master.html:90 msgid "test" "Copyright © 2007 Red Hat, Inc. and others. All Rights Reserved. Please " "send any comments or corrections to the websites team." msgstr "test" -#: fas/templates/master.html:86 +#: fas/templates/master.html:93 msgid "test" "The Fedora Project is maintained and driven by the community and " "sponsored by Red Hat. This is a community maintained site. Red Hat is " @@ -568,182 +688,6 @@ msgstr "test" msgid "Why Join?" msgstr "test" -#: fas/templates/cla/cla.txt:1 -msgid "test" -"The Fedora Project\n" -" Individual Contributor License Agreement (CLA)\n" -" http://www.fedora.redhat.com/licenses/\n" -"\n" -" Thank you for your interest in The Fedora Project (the\n" -" \"Project\"). In order to clarify the intellectual property license\n" -" granted with Contributions from any person or entity, Red hat,\n" -" Inc. (\"Red Hat\"), as maintainer of the Project, must have a\n" -" Contributor License Agreement (CLA) on file that has been signed\n" -" by each Contributor, indicating agreement to the license terms\n" -" below. This license is for Your protection as a Contributor as\n" -" well as the protection of the Project and its users; it does not\n" -" change your rights to use your own Contributions for any other\n" -" purpose.\n" -"\n" -" If you have not already done so, please complete an original signed\n" -" Agreement. Use black ink, and hand-print or type the items other than" -"\n" -" the signature. Send the completed Agreement to\n" -"\n" -"\t Fedora Project, c/o Red Hat, Inc.,\n" -"\t Attn: Legal Affairs\n" -"\t 1801 Varsity Drive\n" -"\t Raleigh, North Carolina, 27606 U.S.A.\n" -"\n" -" If necessary, you may send it by facsimile to the Project at\n" -" +1-919-754-3704 or e-mail a signed pdf copy of the document to\n" -" fedora-legal@redhat.com. Please read this document carefully before\n" -" signing and keep a copy for your records.\n" -"\n" -" Full name:" -msgstr "test" - -#: fas/templates/cla/cla.txt:30 -msgid "E-Mail:" -msgstr "test" - -#: fas/templates/cla/cla.txt:30 -msgid "Address:" -msgstr "test" - -#: fas/templates/cla/cla.txt:32 -msgid "Telephone:" -msgstr "test" - -#: fas/templates/cla/cla.txt:34 -#, python-format -msgid "test" -"Facsimile: %(facsimile)s\n" -"\n" -" You and the Project hereby accept and agree to the following terms " -"and conditions:\n" -"\n" -" 1. Contributors and Contributions.\n" -"\n" -" A. The Project and any individual or legal entity that\n" -" voluntarily submits to the Project a Contribution are\n" -" collectively addressed herein as \"Contributors\". For legal\n" -" entities, the entity making a Contribution and all other\n" -" entities that control, are controlled by, or are under common\n" -" control with that entity are considered to be a single\n" -" Contributor. For the purposes of this definition, \"control\"\n" -" means (i) the power, direct or indirect, to cause the direction\n" -" or management of such entity, whether by contract or otherwise,\n" -" or (ii) ownership of fifty percent (50%) or more of the\n" -" outstanding shares, or (iii) beneficial ownership of such\n" -" entity.\n" -"\n" -" B. A \"Contribution\" is any original work, including any\n" -" modification or addition to an existing work, that has been\n" -" submitted for inclusion in, or documentation of, any of the\n" -" products owned or managed by the Project, where such work\n" -" originates from that particular Contributor or from some entity\n" -" acting on behalf of that Contributor.\n" -"\n" -" C. A Contribution is \"submitted\" when any form of electronic,\n" -" verbal, or written communication is sent to the Project,\n" -" including but not limited to communication on electronic\n" -" mailing lists, source code control systems, and issue tracking\n" -" systems that are managed by, or on behalf of, the Project for\n" -" the purpose of discussing or improving software or\n" -" documentation of the Project, but excluding communication that\n" -" is conspicuously marked or otherwise designated in writing by\n" -" you as \"Not a Contribution.\"\n" -"\n" -" D. Any Contribution submitted by you to the Project shall be\n" -" under the terms and conditions of this License, without any\n" -" additional terms or conditions, unless you explicitly state\n" -" otherwise in the submission.\n" -"\n" -" 2. Contributor Grant of License. You hereby grant to Red Hat,\n" -" Inc., on behalf of the Project, and to recipients of software\n" -" distributed by the Project:\n" -"\n" -" (a) a perpetual, non-exclusive, worldwide, fully paid-up,\n" -" royalty free, irrevocable copyright license to reproduce,\n" -" prepare derivative works of, publicly display, publicly\n" -" perform, sublicense, and distribute your Contribution and such\n" -" derivative works; and,\n" -"\n" -" (b) a perpetual, non-exclusive, worldwide, fully paid-up,\n" -" royalty free, irrevocable (subject to Section 3) patent license\n" -" to make, have made, use, offer to sell, sell, import, and\n" -" otherwise transfer your Contribution and derivative works\n" -" thereof, where such license applies only to those patent claims\n" -" licensable by you that are necessarily infringed by your\n" -" Contribution alone or by combination of your Contribution with\n" -" the work to which you submitted the Contribution. Except for\n" -" the license granted in this section, you reserve all right,\n" -" title and interest in and to your Contributions.\n" -"\n" -" 3. Reciprocity. As of the date any such litigation is filed, your\n" -" patent grant shall immediately terminate with respect to any\n" -" party that institutes patent litigation against you (including\n" -" a cross-claim or counterclaim in a lawsuit) alleging that your\n" -" Contribution, or the work to which you have contributed,\n" -" constitutes direct or contributory patent infringement.\n" -"\n" -" 4. You represent that you are legally entitled to grant the above\n" -" license. If your employer(s) has rights to intellectual\n" -" property that you create that includes your Contributions, you\n" -" represent that you have received permission to make\n" -" Contributions on behalf of that employer, that your employer\n" -" has waived such rights for your Contributions to the Project,\n" -" or that your employer has executed a separate Corporate CLA\n" -" with the Project.\n" -"\n" -" 5. You represent that each of your Contributions is your original\n" -" creation (see section 7 for submissions on behalf of others).\n" -" You represent that your Contribution submission(s) include\n" -" complete details of any third-party license or other\n" -" restriction (including, but not limited to, related copyright,\n" -" atents and trademarks) of which you are personally aware and\n" -" which are associated with any part of your Contribution.\n" -"\n" -" 6. You are not expected to provide support for your Contributions,\n" -" except to the extent you desire to provide support. You may\n" -" provide support for free, for a fee, or not at all. Your\n" -" Contributions are provided on an \"AS IS\" BASIS, WITHOUT\n" -" WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n" -" implied, including, without limitation, any warranties or\n" -" conditions of NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR\n" -" A PARTICULAR PURPOSE.\n" -"\n" -" 7. Should you wish to submit work that is not your original\n" -" creation, you may submit it to the Project separately from any\n" -" Contribution, identifying the complete details of its source\n" -" and of any license or other restriction (including, but not\n" -" limited to, related patents, trademarks, and license\n" -" agreements) of which you are personally aware, and\n" -" conspicuously marking the work as \"Submitted on behalf of a\n" -" third-party: [named here]\".\n" -"\n" -" 8. You agree to notify the Project of any facts or circumstances\n" -" of which you become aware that would make these representations\n" -" inaccurate in any respect.\n" -"\n" -" 9. The Project is under no obligations to accept and include every " -"contribution.\n" -"\n" -"\n" -" \n" -"\n" -"\n" -" If you agree to these terms and conditions, type \"I agree\" here: \n" -" Enter your full name here: \n" -" E-mail:" -msgstr "test" - -#: fas/templates/cla/cla.txt:152 fas/templates/cla/click.html:18 -#: fas/templates/cla/view.html:23 -msgid "Date:" -msgstr "test" - #: fas/templates/cla/click.html:11 fas/templates/cla/view.html:11 msgid "Contributor License Agreement" msgstr "test" @@ -762,6 +706,10 @@ msgstr "test" msgid "E-mail:" msgstr "test" +#: fas/templates/cla/click.html:18 fas/templates/cla/view.html:23 +msgid "Date:" +msgstr "test" + #: fas/templates/cla/click.html:19 fas/templates/cla/view.html:24 #: fas/templates/cla/view.html:38 msgid "Submit CLA" @@ -852,7 +800,7 @@ msgstr "test" msgid "Group Join Message:" msgstr "test" -#: fas/templates/group/edit.html:44 fas/templates/user/edit.html:63 +#: fas/templates/group/edit.html:44 fas/templates/user/edit.html:73 msgid "Save!" msgstr "test" @@ -872,50 +820,10 @@ msgstr "test" msgid "Subject:" msgstr "test" -#: fas/templates/group/invite.html:16 -msgid "Invitation to join the Fedora Team!" -msgstr "test" - #: fas/templates/group/invite.html:17 msgid "Message:" msgstr "test" -#: fas/templates/group/invite.html:20 -msgid "test" -"> has invited you to join the Fedora\n" -" Project! We are a community of users and developers who " -"produce a\n" -" complete operating system from entirely free and open source " -"software\n" -" (FOSS)." -msgstr "test" - -#: fas/templates/group/invite.html:23 -msgid "test" -"thinks that you have knowledge and skills\n" -" that make you a great fit for the Fedora community, and that " -"you might\n" -" be interested in contributing." -msgstr "test" - -#: fas/templates/group/invite.html:27 -msgid "test" -"How could you team up with the Fedora community to use and develop your\n" -" skills? Check out http://fedoraproject.org/join-fedora for " -"some ideas.\n" -" Our community is more than just software developers -- we also " -"have a\n" -" place for you whether you're an artist, a web site builder, a " -"writer, or\n" -" a people person. You'll grow and learn as you work on a team " -"with other\n" -" very smart and talented people." -msgstr "test" - -#: fas/templates/group/invite.html:35 -msgid "Fedora and FOSS are changing the world -- come be a part of it!" -msgstr "test" - #: fas/templates/group/invite.html:39 msgid "Send!" msgstr "test" @@ -924,14 +832,6 @@ msgstr "test" msgid "Groups List" msgstr "test" -#: fas/templates/group/list.html:15 -msgid "Create New Group" -msgstr "test" - -#: fas/templates/group/list.html:16 -msgid "Create Group" -msgstr "test" - #: fas/templates/group/list.html:19 fas/templates/user/list.html:11 #, python-format msgid "List (%s)" @@ -1011,10 +911,6 @@ msgstr "test" msgid "Remove me" msgstr "test" -#: fas/templates/group/view.html:31 -msgid "Group Details" -msgstr "test" - #: fas/templates/group/view.html:31 fas/templates/user/view.html:13 msgid "(edit)" msgstr "test" @@ -1156,73 +1052,39 @@ msgstr "test" msgid "Human Name" msgstr "test" -#: fas/templates/user/edit.html:15 -msgid "test" -"var hb1 = new HelpBalloon({dataURL: " -"'/fas/help/get_help/user_human_name'});" -msgstr "test" - #: fas/templates/user/edit.html:19 msgid "Email" msgstr "test" -#: fas/templates/user/edit.html:21 -msgid "test" -"var hb2 = new HelpBalloon({dataURL: " -"'/fas/help/get_help/user_primary_email'});" -msgstr "test" - #: fas/templates/user/edit.html:28 msgid "IRC Nick" msgstr "test" -#: fas/templates/user/edit.html:30 -msgid "var hb3 = new HelpBalloon({dataURL: '/fas/help/get_help/user_ircnick'});" -msgstr "test" - #: fas/templates/user/edit.html:33 msgid "PGP Key" msgstr "test" -#: fas/templates/user/edit.html:35 -msgid "var hb4 = new HelpBalloon({dataURL: '/fas/help/get_help/user_gpg_keyid'});" -msgstr "test" - #: fas/templates/user/edit.html:38 msgid "Telephone Number" msgstr "test" -#: fas/templates/user/edit.html:40 -msgid "var hb5 = new HelpBalloon({dataURL: '/fas/help/get_help/user_telephone'});" -msgstr "test" - #: fas/templates/user/edit.html:43 msgid "Postal Address" msgstr "test" -#: fas/templates/user/edit.html:45 -msgid "test" -"var hb6 = new HelpBalloon({dataURL: " -"'/fas/help/get_help/user_postal_address'});" -msgstr "test" - #: fas/templates/user/edit.html:48 msgid "Time Zone" msgstr "test" -#: fas/templates/user/edit.html:55 -msgid "var hb7 = new HelpBalloon({dataURL: '/fas/help/get_help/user_timezone'});" +#: fas/templates/user/edit.html:58 +msgid "Locale" msgstr "test" -#: fas/templates/user/edit.html:58 +#: fas/templates/user/edit.html:68 msgid "Comments" msgstr "test" -#: fas/templates/user/edit.html:60 -msgid "var hb8 = new HelpBalloon({dataURL: '/fas/help/get_help/user_comments'});" -msgstr "test" - -#: fas/templates/user/edit.html:64 +#: fas/templates/user/edit.html:74 msgid "Cancel" msgstr "test" @@ -1316,20 +1178,10 @@ msgstr "test" msgid "Valid" msgstr "test" -#: fas/templates/user/view.html:25 -msgid "(change)" -msgstr "test" - #: fas/templates/user/view.html:26 msgid "Account Status:" msgstr "test" -#: fas/templates/user/view.html:27 -msgid "test" -"var hb1 = new HelpBalloon({dataURL: " -"'/fas/help/get_help/user_account_status'});" -msgstr "test" - #: fas/templates/user/view.html:29 msgid "CLA:" msgstr "test" @@ -1342,10 +1194,6 @@ msgstr "test" msgid "Sign it!" msgstr "test" -#: fas/templates/user/view.html:33 -msgid "var hb2 = new HelpBalloon({dataURL: '/fas/help/get_help/user_cla'});" -msgstr "test" - #: fas/templates/user/view.html:36 msgid "Your Roles" msgstr "test" diff --git a/fas/pybabel.conf b/fas/pybabel.conf index e6b9ded..7c7997f 100644 --- a/fas/pybabel.conf +++ b/fas/pybabel.conf @@ -5,10 +5,12 @@ # Extraction from Genshi HTML and text templates [genshi: **/templates/**.html] -ignore_tags = script,style -include_attrs = alt title summary +extract_text = False +#ignore_tags = script,style +#include_attrs = alt title summary -[genshi: **/templates/**.txt] -template_class = genshi.template:TextTemplate -encoding = UTF-8 +#[genshi: **/templates/**.txt] +#template_class = genshi.template:TextTemplate +#extract_text = False +#encoding = UTF-8