Commit graph

11 commits

Author SHA1 Message Date
friendica
f07df4f667 merge 2013-03-02 15:46:54 -08:00
Tobias Diekershoff
3eeee2525c CA: update to the strings 2013-02-11 06:21:10 +01: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
Zach Prezkuta
96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
Fabrixxm
7093c1b9f6 update all languages strings.php 2012-11-13 10:13:28 -05:00
friendica
2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
Tobias Diekershoff
1880ad40d9 CA: update to the strings 2012-09-27 06:30:37 +02:00
Simon L'nu
311f39f12f fix silly abandonded typo. shouldn't affect translations
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-18 06:10:34 -04: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
friendica
af9f7da449 catalan translation 2012-03-08 16:29:22 -08:00