Commit graph

63 commits

Author SHA1 Message Date
jeroenpraat
2b0b03eebc Fix ffsapi for non-English languages (or better when 's was used in the strings) - Update nl+es 2015-11-08 00:04:02 +01:00
redmatrix
77a03e376c Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/photo/photo_driver.php
	include/text.php
	mod/post.php
2015-11-03 20:46:47 -08:00
jeroenpraat
3262d819de update srings nl+es, wrapper-styled 1 tpl-file, more finetuning bluegrid schema. 2015-10-31 22:34:59 +01:00
jeroenpraat
52120b367a Update nl+es 2015-10-31 21:07:57 +01:00
jeroenpraat
6cb7afcbc0 es+nl strings 2015-10-26 16:35:44 +01:00
redmatrix
ea37882b95 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	install/schema_mysql.sql
	install/schema_postgres.sql
	install/update.php
	mod/zfinger.php
2015-10-19 16:18:04 -07:00
jeroenpraat
6eaf35a142 Update es+nl 2015-10-18 19:09:38 +02:00
jeroenpraat
52f3d6722d Update nl+es 2015-10-18 16:45:11 +02:00
jeroenpraat
43eefb5929 update es + nl strings 2015-10-13 00:43:23 +02:00
jeroenpraat
f5fe37ab09 Updated Spanish strings 2015-10-05 16:53:43 +02:00
jeroenpraat
8f7dd2f858 Final Spanish strings for Redmatrix 2015-10-05 16:50:59 +02:00
jeroenpraat
392ee70fd5 Updated Spanish and Dutch language strings 2015-10-03 15:38:40 +02:00
redmatrix
55b530f0fd Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	util/messages.po
2015-09-27 17:00:41 -07:00
redmatrix
cd2b811555 move string files to hmessages.po and hstrings.php for hubzilla to avoid endless merge conflicts. 2015-09-26 23:44:30 -07:00
jeroenpraat
49000dadda Another Spanish update 2015-09-25 21:25:42 +02:00
redmatrix
74827133b2 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	util/messages.po
2015-09-18 22:46:21 -07:00
jeroenpraat
582607c0f0 Another (hopefully final) Spanish update 2015-09-17 16:28:31 +02:00
redmatrix
30351f5ade Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-09-14 21:35:30 -07:00
jeroenpraat
31db5078c1 Small update Spanish strings 2015-09-14 16:36:06 +02:00
redmatrix
922d2165b3 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
2015-09-10 16:51:22 -07:00
jeroenpraat
672143d3a2 update Spanish strings 2015-09-10 13:18:24 +02:00
redmatrix
d7089ab471 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/identity.php
	install/update.php
	util/messages.po
	view/nl/messages.po
2015-08-31 21:00:28 -07:00
jeroenpraat
60ac0cef5c Removed redmatrix.nl as a fallback server (directory mode to normal) + update strings ES 2015-08-29 17:21:20 +02:00
jeroenpraat
8db5d3ba5c Update es and nl strings 2015-08-28 14:13:13 +02:00
redmatrix
eac9c8a7e6 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	install/update.php
	util/messages.po
2015-08-23 20:23:55 -07:00
jeroenpraat
957abf1c1b Final (temporary I suppose) Spanish string update 2015-08-22 16:29:34 +02:00
redmatrix
8fc321ca62 Merge https://github.com/redmatrix/redmatrix into pending_merge 2015-08-20 16:52:56 -07:00
jeroenpraat
20fc4ee021 Another Spanish strings update 2015-08-20 20:57:08 +02:00
redmatrix
30fd17c58d Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	view/nl/messages.po
2015-08-17 16:14:15 -07:00
jeroenpraat
d88c25c982 Final Spanish strings for now 2015-08-17 22:21:55 +02:00
redmatrix
18bc12c21c Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	util/messages.po
2015-08-14 22:24:15 -07:00
jeroenpraat
7a8d0a03f6 update spanish 2015-08-14 15:57:05 +02:00
redmatrix
f88dc84091 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	view/es/htconfig.tpl
	view/es/update_fail_eml.tpl
2015-08-12 20:36:32 -07:00
jeroenpraat
3099562a21 Some corrections of Spanish strings. 2015-08-12 20:52:46 +02:00
jeroenpraat
4c2bbe3c41 Thanks to Manuel. Updated Spanish to 100 procent. 2015-08-12 15:11:04 +02:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
friendica
e006658b01 raise the default upload limit for the application. We eliminated this in English long ago, but several of the translated htconfig files still have the old limit. 2015-03-01 19:14:59 -08:00
zottel
2790d9f146 remove unused email template files 2014-10-10 11:42:46 +02:00
friendica
71ded9388b missing paren 2014-05-13 02:17:17 -07:00
friendica
8c948f4bbe forbid redefinition of language plural_select function 2014-05-13 02:10:06 -07:00
Thomas Willingham
33ff5b3a9b Clean up legacy smarty3 2014-04-19 13:59:12 +01:00
friendica
99252d65bf reset email templates to English 2013-06-16 16:49:46 -07:00
friendica
488714290f global rename viewcontacts to viewconnections 2013-02-19 03:00:29 -08:00
Zach Prezkuta
690e278d95 add newline at end of header 2013-01-11 10:00:26 -07:00
Zach Prezkuta
34dc11d68e add warning messae about automatically generated templates 2013-01-11 09:57:23 -07:00
Zach Prezkuta
ddb2a8c23a add Smarty templates for international templates 2013-01-10 21:24:10 -07:00
friendica
2cd9994904 use a single language config until all the new options are in place 2012-10-17 18:53:18 -07:00
friendica
059a14fefc relocate register policy setting in language htconfig templates 2012-10-07 10:38:23 +11: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