Steffen Schaumburg
							
						 
					 | 
					
						
						
						
						
							
						
						
							28dead2905
							
						
					 | 
					
						
						
							
							Merge branch 'next'
						
						
						
						
						
						
						
						Conflicts:
	pyfpdb/Configuration.py
	pyfpdb/locale/de/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/es/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/fpdb-de_DE.po
	pyfpdb/locale/fpdb-en_GB.pot
	pyfpdb/locale/fpdb-es_ES.po
	pyfpdb/locale/fpdb-fr_FR.po
	pyfpdb/locale/fpdb-hu_HU.po
	pyfpdb/locale/fpdb-it_IT.po
	pyfpdb/locale/fpdb-pl_PL.po
	pyfpdb/locale/fpdb-pt_BR.po
	pyfpdb/locale/fpdb-ru_RU.po
	pyfpdb/locale/fpdb-zh_CN.po
	pyfpdb/locale/fr/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/hu/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/it/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/pl/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/pt/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/ru/LC_MESSAGES/fpdb.mo
	pyfpdb/locale/zh/LC_MESSAGES/fpdb.mo 
						
					 | 
					
						2011-04-10 19:14:20 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steffen Schaumburg
							
						 
					 | 
					
						
						
						
						
							
						
						
							81f1b67f5c
							
						
					 | 
					
						
						
							
							update version string to 0.23, update l10n files
						
						
						
						
						
					 | 
					
						2011-04-10 18:48:04 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steffen Schaumburg
							
						 
					 | 
					
						
						
						
						
							
						
						
							e23200e13d
							
						
					 | 
					
						
						
							
							download all translations from transifex, update l10n files
						
						
						
						
						
					 | 
					
						2011-04-10 08:59:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steffen Schaumburg
							
						 
					 | 
					
						
						
						
						
							
						
						
							6fbdcaa592
							
						
					 | 
					
						
						
							
							updated mo files
						
						
						
						
						
					 | 
					
						2011-04-07 15:22:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steffen Schaumburg
							
						 
					 | 
					
						
						
						
						
							
						
						
							b33584c63d
							
						
					 | 
					
						
						
							
							Merge branch 'master' into next
						
						
						
						
						
						
						
						update l10n files 
						
					 | 
					
						2011-04-07 10:58:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steffen Schaumburg
							
						 
					 | 
					
						
						
						
						
							
						
						
							d8d9f3a1fc
							
						
					 | 
					
						
						
							
							finish french translation - thanks very much to Wedges
						
						
						
						
						
					 | 
					
						2011-04-07 10:51:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steffen Schaumburg
							
						 
					 | 
					
						
						
						
						
							
						
						
							24e23b6b4f
							
						
					 | 
					
						
						
							
							string fix, updated german translation and l10n files
						
						
						
						
						
					 | 
					
						2011-04-07 06:00:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Steffen Schaumburg
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3ea457f4c
							
						
					 | 
					
						
						
							
							add first bits of portugese (brazil) and chinese (simplified) translation - thanks very much to pkpkpkdo and jipeng!
						
						
						
						
						
					 | 
					
						2011-04-06 23:58:36 +02:00 | 
					
					
						
						
							
							
							
						
					 |