| 
							
						 | 
						
							
							
								
							
							
	9aa1e22047
						 | 
						
							
							
								
								
								CS update to the strings
							
							
							
							
							
						 | 
						
							2015-08-30 07:24:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	a3cd16bd9f
						 | 
						
							
							
								
								
								remove localized htconfig templates
							
							
							
							
							
						 | 
						
							2015-06-23 12:35:51 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	bfcd3bbc9e
						 | 
						
							
							
								
								
								CS update to the strings
							
							
							
							
							
						 | 
						
							2015-05-27 09:58:20 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	60a17ef88e
						 | 
						
							
							
								
								
								CS update of the strings
							
							
							
							
							
						 | 
						
							2015-04-14 13:40:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	52549dae7b
						 | 
						
							
							
								
								
								CS update to the strings
							
							
							
							
							
						 | 
						
							2015-04-07 09:00:12 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	e3b6770ad4
						 | 
						
							
							
								
								
								CS, ZH-CN: update to the strings
							
							
							
							
							
						 | 
						
							2015-02-12 07:59:21 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4e4702fb8b
						 | 
						
							
							
								
								
								CS, IT: update to the strings
							
							
							
							
							
						 | 
						
							2015-02-09 19:53:35 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	898d4b2a62
						 | 
						
							
							
								
								
								CS update to the strings
							
							
							
							
							
						 | 
						
							2015-02-09 07:57:03 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5aba3abfc1
						 | 
						
							
							
								
								
								CS DE FR: update to the strings
							
							
							
							
							
						 | 
						
							2015-02-05 11:06:23 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5cb3a0fced
						 | 
						
							
							
								
								
								CS update to the strings
							
							
							
							
							
						 | 
						
							2015-01-25 08:21:55 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	74be3ac543
						 | 
						
							
							
								
								
								updating core translations from transifex
							
							
							
							
							
						 | 
						
							2014-09-28 15:04:54 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	f6cebf607f
						 | 
						
							
							
								
								
								remove unneeded htconfig templates
							
							
							
							
							
						 | 
						
							2014-09-20 12:14:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	f6cfdf4af1
						 | 
						
							
							
								
								
								remove uneeded email templates
							
							
							
							
							
						 | 
						
							2014-09-20 12:10:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	d2afb263ae
						 | 
						
							
							
								
								
								Set internal PuSH server as default
							
							
							
							
							
						 | 
						
							2014-09-20 12:08:10 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	21b1e09fad
						 | 
						
							
							
								
								
								Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup
							
							
							
							
							
						 | 
						
							2014-09-07 14:28:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	a8c90155f8
						 | 
						
							
							
								
								
								db update mail via notification()
							
							
							
							
							
							
							
							remove last template 
							
						 | 
						
							2014-09-07 14:23:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	5861bdd6e9
						 | 
						
							
							
								
								
								registration request as system notification
							
							
							
							
							
							
							
							kill the template
send email to all admins 
							
						 | 
						
							2014-09-07 13:55:02 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	a5df9b8b5d
						 | 
						
							
							
								
								
								Somebody stop me! (not really..)
							
							
							
							
							
						 | 
						
							2014-09-07 12:35:08 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	5997fb19ee
						 | 
						
							
							
								
								
								More template gore!
							
							
							
							
							
						 | 
						
							2014-09-07 12:29:13 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	803854738b
						 | 
						
							
							
								
								
								another massacre of templates
							
							
							
							
							
						 | 
						
							2014-09-07 11:48:23 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	9a0c37eb47
						 | 
						
							
							
								
								
								new password mail via notification()
							
							
							
							
							
							
							
							new include/text.php::deindent() function
remove unused templates 
							
						 | 
						
							2014-09-07 11:20:06 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	d85bdd8fb0
						 | 
						
							
							
								
								
								lost password verification mail via notification()
							
							
							
							
							
						 | 
						
							2014-09-07 10:27:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	0e628f840f
						 | 
						
							
							
								
								
								send ostatus follow/share notifications via notification()
							
							
							
							
							
							
							
							remove unused templates 
							
						 | 
						
							2014-09-06 18:15:18 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	1bdddebd44
						 | 
						
							
							
								
								
								connection confirm notification mail via notification()
							
							
							
							
							
							
							
							remove unused email templates
add a check for unexpected reponse from server 
							
						 | 
						
							2014-09-06 17:28:46 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4aa2ae488b
						 | 
						
							
							
								
								
								Merge pull request #1102 from tobiasd/newstrings20140906a
							
							
							
							
							
							
							
							updating message.po and string.php 
							
						 | 
						
							2014-09-06 12:20:42 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	582b90613b
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2014-09-06 12:05:25 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									hauke
								
							 
						 | 
						
							
							
								
							
							
	191595766d
						 | 
						
							
							
								
								
								removed old comment that is no longer true
							
							
							
							
							
						 | 
						
							2014-09-06 00:14:25 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	13d578234d
						 | 
						
							
							
								
								
								small update to the CS and DE strings
							
							
							
							
							
						 | 
						
							2014-05-17 14:49:05 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	b1b6fa21fa
						 | 
						
							
							
								
								
								FR + CS: register_adminadd template from transifex
							
							
							
							
							
						 | 
						
							2014-05-17 08:50:39 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	801d0a85f9
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2014-05-17 08:48:29 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c732cefcfd
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2014-04-30 17:01:27 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	fb0c522b50
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2014-01-07 08:32:26 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	825ecad89d
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2013-11-08 19:43:03 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	790257c6c2
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-28 14:36:21 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	4b02e11eeb
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2013-06-16 14:49:04 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	ca623641ca
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2013-05-25 07:29:24 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	f07df4f667
						 | 
						
							
							
								
								
								merge
							
							
							
							
							
						 | 
						
							2013-03-02 15:46:54 -08:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	c43ff35fe7
						 | 
						
							
							
								
								
								newline at end of header
							
							
							
							
							
						 | 
						
							2013-01-11 10:00:10 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	1656c63a55
						 | 
						
							
							
								
								
								add warning message about automatically generated templates
							
							
							
							
							
						 | 
						
							2013-01-11 09:57:11 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	e09c31b627
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2013-01-05 09:29:26 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Zach Prezkuta
								
							 
						 | 
						
							
							
								
							
							
	96ed0a7791
						 | 
						
							
							
								
								
								Implement Smarty3
							
							
							
							
							
						 | 
						
							2012-12-22 12:57:29 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5cedd3430f
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2012-12-21 13:10:03 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Fabrixxm
								
							 
						 | 
						
							
							
								
							
							
	7093c1b9f6
						 | 
						
							
							
								
								
								update all languages strings.php
							
							
							
							
							
						 | 
						
							2012-11-13 10:13:28 -05:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c88e7d75c0
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2012-11-11 10:55:47 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	298aeb5bf5
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2012-10-20 12:57:34 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									friendica
								
							 
						 | 
						
							
							
								
							
							
	2347a4326c
						 | 
						
							
							
								
								
								get rid of 'Friendika'
							
							
							
							
							
						 | 
						
							2012-10-18 21:51:45 -07:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	c0c8869f89
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2012-10-09 08:23:52 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	65b52878c4
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2012-10-03 09:00:59 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
								
							
							
	5fb4ca346b
						 | 
						
							
							
								
								
								CS: update to the strings
							
							
							
							
							
						 | 
						
							2012-09-27 06:27:06 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									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 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |