Merge branch 'release/0.2.3'
* release/0.2.3: bump version number update german translation Replace public-facing "DD" with "Debian Member"
This commit is contained in:
		
						commit
						ef301ee107
					
				
					 6 changed files with 7 additions and 8 deletions
				
			
		| 
						 | 
					@ -1,7 +1,7 @@
 | 
				
			||||||
2012-01-07  Jan Dittberner  <jan@dittberner.info>
 | 
					2012-01-07  Jan Dittberner  <jan@dittberner.info>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	* rename Debian Developer to Debian Member, change URL to
 | 
						* rename Debian Developer to Debian Member, change URL to
 | 
				
			||||||
  	  portfolio.debian.net
 | 
						  portfolio.debian.net
 | 
				
			||||||
	* PEP-8 compliance
 | 
						* PEP-8 compliance
 | 
				
			||||||
 | 
					
 | 
				
			||||||
2011-03-06  Jan Dittberner  <jan@dittberner.info>
 | 
					2011-03-06  Jan Dittberner  <jan@dittberner.info>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -353,7 +353,7 @@ msgid "JSON"
 | 
				
			||||||
msgstr ""
 | 
					msgstr ""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: ddportfolioservice/templates/showform.mako:161
 | 
					#: ddportfolioservice/templates/showform.mako:161
 | 
				
			||||||
msgid "Build DD Portfolio URLs"
 | 
					msgid "Build Debian Member Portfolio URLs"
 | 
				
			||||||
msgstr ""
 | 
					msgstr ""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: ddportfolioservice/templates/showurls.mako:24
 | 
					#: ddportfolioservice/templates/showurls.mako:24
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
										
											Binary file not shown.
										
									
								
							| 
						 | 
					@ -9,7 +9,7 @@ msgstr ""
 | 
				
			||||||
"Project-Id-Version: ddportfolioservice 0.2.1\n"
 | 
					"Project-Id-Version: ddportfolioservice 0.2.1\n"
 | 
				
			||||||
"Report-Msgid-Bugs-To: jan@dittberner.info\n"
 | 
					"Report-Msgid-Bugs-To: jan@dittberner.info\n"
 | 
				
			||||||
"POT-Creation-Date: 2009-01-20 23:13+0100\n"
 | 
					"POT-Creation-Date: 2009-01-20 23:13+0100\n"
 | 
				
			||||||
"PO-Revision-Date: 2012-01-07 01:16+0100\n"
 | 
					"PO-Revision-Date: 2012-01-07 16:37+0100\n"
 | 
				
			||||||
"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 | 
					"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 | 
				
			||||||
"Language-Team: de <de@li.org>\n"
 | 
					"Language-Team: de <de@li.org>\n"
 | 
				
			||||||
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 | 
					"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 | 
				
			||||||
| 
						 | 
					@ -27,7 +27,6 @@ msgid "Debian Member's Package Overview"
 | 
				
			||||||
msgstr "Paketübersicht des Debian-Mitglieds"
 | 
					msgstr "Paketübersicht des Debian-Mitglieds"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: ddportfolioservice/controllers/ddportfolio.py:43
 | 
					#: ddportfolioservice/controllers/ddportfolio.py:43
 | 
				
			||||||
#| addresses"
 | 
					 | 
				
			||||||
msgid ""
 | 
					msgid ""
 | 
				
			||||||
"Debian Member's Package Overview\n"
 | 
					"Debian Member's Package Overview\n"
 | 
				
			||||||
"... showing all email addresses"
 | 
					"... showing all email addresses"
 | 
				
			||||||
| 
						 | 
					@ -383,8 +382,8 @@ msgid "JSON"
 | 
				
			||||||
msgstr "JSON"
 | 
					msgstr "JSON"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: ddportfolioservice/templates/showform.mako:161
 | 
					#: ddportfolioservice/templates/showform.mako:161
 | 
				
			||||||
msgid "Build DD Portfolio URLs"
 | 
					msgid "Build Debian Member Portfolio URLs"
 | 
				
			||||||
msgstr "Debian-Entwicklerportfolio-URLs bauen"
 | 
					msgstr "Debian-Mitgliedsportfolio-URLs bauen"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#: ddportfolioservice/templates/showurls.mako:24
 | 
					#: ddportfolioservice/templates/showurls.mako:24
 | 
				
			||||||
msgid "Your personal links"
 | 
					msgid "Your personal links"
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -158,7 +158,7 @@ ${h.form(h.url(action='urllist', controller='ddportfolio'), method='get')}
 | 
				
			||||||
    checked=(request.params.get('mode',
 | 
					    checked=(request.params.get('mode',
 | 
				
			||||||
    'html') == 'html'))} ${_('JSON')} ${h.radio('mode',
 | 
					    'html') == 'html'))} ${_('JSON')} ${h.radio('mode',
 | 
				
			||||||
    'json', checked=(request.params.get('mode', 'html') == 'json'))}<br />
 | 
					    'json', checked=(request.params.get('mode', 'html') == 'json'))}<br />
 | 
				
			||||||
    ${h.submit('submit', value=_('Build DD Portfolio URLs'))}
 | 
					    ${h.submit('submit', value=_('Build Debian Member Portfolio URLs'))}
 | 
				
			||||||
  </div>
 | 
					  </div>
 | 
				
			||||||
</fieldset>
 | 
					</fieldset>
 | 
				
			||||||
${h.end_form()}
 | 
					${h.end_form()}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										2
									
								
								setup.py
									
										
									
									
									
								
							
							
						
						
									
										2
									
								
								setup.py
									
										
									
									
									
								
							| 
						 | 
					@ -29,7 +29,7 @@ except ImportError:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
setup(
 | 
					setup(
 | 
				
			||||||
    name='ddportfolioservice',
 | 
					    name='ddportfolioservice',
 | 
				
			||||||
    version='0.2.2',
 | 
					    version='0.2.3',
 | 
				
			||||||
    description='service to create DDPortfolio URLs',
 | 
					    description='service to create DDPortfolio URLs',
 | 
				
			||||||
    long_description="""This is a service implementation that
 | 
					    long_description="""This is a service implementation that
 | 
				
			||||||
returns a set of personalized URLs as outlined in
 | 
					returns a set of personalized URLs as outlined in
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue