harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,387 Commits 6 Branches 36 Tags 152 MiB
bbcc9fe8d8
Commit Graph

78 Commits

Author SHA1 Message Date
harukin
bbcc9fe8d8 Revert "Merge branch 'develop' into 'origin'" 
This reverts commit e1922bd555.
 2019-12-29 13:55:08 +09:00
harukin
d9a0382539 edit translation 2019-02-11 17:15:48 +09:00
jeroenpraat
0799a0a3be Spanish and Dutch strings + fix es>es-es link 2016-03-07 20:29:14 +01:00
Einer von Vielen
f510cd3111 . 2016-01-13 23:46:31 +01:00
redmatrix
f4d47f825d revert lost link 2016-01-10 20:38:47 -08:00
Einer von Vielen
51f34b6b07 indexed 2016-01-10 18:24:15 +01:00
jeroenpraat
7d5e066056 After reading and talking with experts I came to the conclusion that es-es and es-419 (and such) dont differ that much. Latin-American Spanish (es-419) is a good idea, but we are not in a rush. So linked es to es-es. That's the proper way to do. See also https://github.com/redmatrix/hubzilla/issues/234#issuecomment-167117960 2015-12-24 15:29:52 +01:00
jeroenpraat
ba920260b8 reverted my previous commit. this is going to be fixed remotely upstream. Meanwhile es points to .es-419. See https://github.com/redmatrix/hubzilla/issues/234#issuecomment-166961958. 2015-12-23 19:18:46 +01:00
jeroenpraat
2988d96cf0 Spanish language codes. See issue #234 2015-12-23 16:41:22 +01:00
jeroenpraat
4dff54bcb8 update es+nl strings 2015-12-22 19:29:52 +01:00
jeroenpraat
04d3ac9aaf es+nl strings update 2015-12-12 17:01:43 +01:00
jeroenpraat
96d94551f9 update es+nl 2015-12-07 21:10:36 +01:00
jeroenpraat
bc0e415926 es+nl and bluegrid update 2015-12-03 00:01:51 +01:00
jeroenpraat
d3bef2adc3 update es+nl 2015-11-20 15:18:51 +01:00
jeroenpraat
def5edf93c nl+es and some other bits 2015-11-14 20:43:34 +01:00
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