Commit graph

237 commits

Author SHA1 Message Date
redmatrix
54e7d5d260 Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts:
	include/zot.php
	view/de/messages.po
	view/de/strings.php
2015-09-30 16:31:06 -07:00
zottel
b5f382f0ea update German strings 2015-09-30 14:05:10 +02:00
zottel
d66715648a update German strings 2015-09-30 14:01:21 +02: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
zottel
50de9325b6 update to German strings 2015-06-24 16:53:46 +02:00
redmatrix
0a644a2f41 Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
	mod/mitem.php
	view/de/messages.po
	view/de/strings.php
2015-05-10 13:26:44 -07:00
zottel
9ef31e0402 update to German strings 2015-05-08 14:55:52 +02:00
redmatrix
5b5f0666f9 second pass name change 2015-05-05 03:59:51 -07:00
redmatrix
a3c37f1458 first pass name change 2015-05-05 03:56:10 -07:00
zottel
08a4c714db update to German strings 2015-02-27 11:02:07 +01:00
zottel
2cd705a1b5 update to German translations 2015-02-19 12:43:42 +01:00
marijus
c826f005e4 fix /view/de/lostpass_eml.tpl 2015-01-28 10:44:48 +01:00
zottel
becb6bf226 update to German strings 2014-11-24 11:58:47 +01:00
zottel
a22ba7629b update to German strings 2014-11-07 22:19:17 +01:00
zottel
53ee9f664f update to German strings 2014-10-23 13:59:49 +02:00
zottel
8fe0fbf6fe more updates to German strings plus email templates 2014-10-10 14:54:41 +02:00
zottel
2790d9f146 remove unused email template files 2014-10-10 11:42:46 +02:00
zottel
3a90d037f9 update to German strings 2014-10-10 09:41:14 +02:00
zottel
948b76232f update to German translations 2014-08-11 11:48:02 +02:00
zottel
d91eee759f update to German translations 2014-08-08 16:46:29 +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
sasiflo
9f54a8f96b Hope I have repaired the channel admin page.
Channel blocking and deleting was copied from user actions. This was not
done to an end. Hope what I do is enough to enable channel blocking and
deleting the correct way.

On deletion all entities that belong to the channel are deleted. But the
channel itself is just marked as deleted. Do not really understand why
it is done this way.
2014-04-06 00:34:52 +02:00
Tobias Diekershoff
65d5fae324 DE: update to the strings 2014-02-22 14:10:21 +01:00
tony baldwin
9715176a56 s/View remote profiles as webpages/Do not view remote profiles in
frames/g
2014-02-19 22:56:52 -05:00
Tobias Diekershoff
06680e504a DE: update to the strings 2014-02-16 08:18:43 +01:00
Tobias Diekershoff
8ffd076884 DE: update to the strings 2014-02-12 09:01:42 +01:00
Tobias Diekershoff
7ff2c018c5 DE: update to the strings 2014-02-04 07:50:32 +01:00
Tobias Diekershoff
88f25191e0 DE: update to the strings 2014-01-25 07:28:30 +01:00
Tobias Diekershoff
87b99be785 DE: update to the strings 2014-01-13 07:28:16 +01:00
Tobias Diekershoff
79f002d943 DE: update to the strings 2013-12-23 13:33:31 +01:00
Tobias Diekershoff
8df66b8365 DE: update to the strings 2013-12-06 09:08:10 +01:00
Tobias Diekershoff
91b06b67a6 DE: update to the strings 2013-12-02 09:24:24 +01:00
friendica
8a75e92020 rev update and de string fix 2013-11-03 00:38:11 -07:00
maase2
06128b56d2 Update messages.po
Fix missing blank
2013-11-02 15:21:46 +01:00
Tobias Diekershoff
cdddef8c7b DE: update to the strings (for real) 2013-10-10 14:02:36 +02:00
Tobias Diekershoff
d95a8e123f DE: update to the strings 2013-10-10 13:51:25 +02:00
Oliver
6b095f7b23 Post = Beitrag 2013-10-02 19:35:22 +02:00
Tobias Diekershoff
27331160f4 DE: Initial Red translation 2013-10-02 07:20:39 +02: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
Tobias Diekershoff
c2842efd3f [DE] strings 2012-06-19 08:44:11 +02:00
zottel
6a95d483c7 A few corrections in German translations. 2012-06-07 01:43:32 +02:00
Tobias Diekershoff
c7b1b4b752 DE: update for the strings 2012-06-05 11:42:57 +02:00