Alexander Kampmann
								
							 
						 | 
						
							
							
								
							
							
	355c42cb30
						 | 
						
							
							
								
								
								Merge branch 'master' of https://github.com/friendica/friendica
							
							
							
							
							
							
							
							Conflicts:
	include/config.php
	update.php 
							
						 | 
						
							2012-04-05 13:39:15 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	b795ce4fe7
						 | 
						
							
							
								
								
								little stuff - name change, live updates, new network types
							
							
							
							
							
						 | 
						
							2011-11-23 23:17:26 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabio Comuni
								
							 
						 | 
						
							
							
								
							
							
	4c2c14d34c
						 | 
						
							
							
								
								
								Update run_xgettext script and util/messages.po to use with transifex. Fix to po2php
							
							
							
							
							
						 | 
						
							2011-05-10 14:20:00 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Friendika
								
							 
						 | 
						
							
							
								
							
							
	4aa60a7aaf
						 | 
						
							
							
								
								
								oexchange
							
							
							
							
							
						 | 
						
							2011-03-29 21:59:28 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	ee065da57a
						 | 
						
							
							
								
								
								update sh script
							
							
							
							
							
						 | 
						
							2011-03-11 01:23:24 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	90eab0fbc3
						 | 
						
							
							
								
								
								extract string can update existing po file
							
							
							
							
							
						 | 
						
							2011-03-11 00:40:26 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	a44f5653bf
						 | 
						
							
							
								
								
								script sh to run xgettext on code and prepare messages.mo file
							
							
							
							
							
						 | 
						
							2011-03-11 00:20:03 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |