Commit Graph

113 Commits

Author SHA1 Message Date
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
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 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
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
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
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
Tobias Diekershoff 283524d990 DE: update to the strings 2012-06-03 17:33:28 +02:00
Tobias Diekershoff be64437b14 DE: update to the strings and some mail templates 2012-05-22 12:17:01 +02:00
Tobias Diekershoff 68dc7c3568 DE strings 2012-05-15 10:44:01 +02:00
Tobias Diekershoff d2c2063084 DE update for the strings 2012-05-08 09:56:05 +02:00
Tobias Diekershoff 22c8fe46a5 DE strings 2012-05-04 07:30:49 +02:00
Tobias Diekershoff f08dc392df DE update to the strings 2012-04-30 08:39:12 +02:00
Tobias Diekershoff af7abcea27 DE strings, correction of a typo 2012-04-23 20:55:48 +02:00
Tobias Diekershoff 9434b447f3 DE strings update 2012-04-22 13:13:27 +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
Tobias Diekershoff dbff4252d4 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-17 18:07:20 +02:00
Tobias Diekershoff 757e3429ac update to the German string files 2012-04-17 18:06:28 +02:00
tommy tomson b30c761aae diabook-themes: removed fpostit due to security issues and small fix in german translation 2012-04-17 16:15:49 +02:00
tommy tomson b5c164bf2f diabook-themes: css-fixes 2012-04-15 19:58:26 +02:00
Simon L'nu 6278b2a923 string fix: typo. slow down scroll to top in dispys
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-04-14 16:24:35 -04:00
Tobias Hößl e1c43c1c1c Incorrect tranlation (one negation too much) 2012-04-10 20:43:31 +00:00
Alexander Kampmann 1370ba5d16 Merge branch 'master' of https://github.com/friendica/friendica 2012-04-09 14:28:21 +02:00