1
0
Fork 0
Commit graph

311 commits

Author SHA1 Message Date
Alexander Kampmann
70709a8825 Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
	view/de/strings.php
2012-03-14 12:57:35 +01:00
1e37477fdc German translation 2012-03-10 10:36:20 +01:00
Alexander Kampmann
b2df1205ef merged 2012-03-07 12:06:09 +01:00
Alexander Kampmann
fbc017cdba added test blueprints, fixed? encoding issues 2012-03-05 22:22:10 +01:00
9d885c4801 german strings as of 28th Feb from transilex 2012-03-03 12:17:32 +01:00
2081e6d507 some revision to the German strings 2012-02-26 17:12:14 +01:00
0877fbb42a German strings 2012-02-26 15:41:27 +01:00
friendica
58a9c652de Merge pull request from annando/master
New HTML to BBCode converter, changes to BBCode, nginx support, ...
2012-02-22 20:21:05 -08:00
Michael
e34a648cad German translation more gender friendly. Some more logging in poller.php 2012-02-22 15:20:49 +01:00
Abinoam P. Marques Jr
d89a0449d0 htconfig.tpl - Friendika -> Friendica 2012-02-20 19:47:44 -03:00
652622894f de strings 2012-02-16 11:55:52 +01:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
40edcec06f German translation 2012-01-13 15:14:40 +01:00
zottel
bd3dee43c1 New German translations 2012-01-10 08:13:30 -08:00
23n
0077997eb6 Update view/de/strings.php 2012-01-04 07:05:44 +01:00
f29507cdba translation of email templates 2011-12-26 09:16:33 +01:00
f1b7ce6ef4 translation of email template 2011-12-26 09:08:32 +01:00
02af9cd3b2 translation of the email template 2011-12-26 09:05:02 +01:00
friendica
01cae9a50a remove all plugins from default config 2011-12-12 16:28:33 -08:00
friendica
b795ce4fe7 little stuff - name change, live updates, new network types 2011-11-23 23:17:26 -08:00
4f555212a1 German strings 2011-11-22 16:48:53 +01:00
6cf5da1e4b update to the German strings 2011-09-29 09:03:06 +02:00
Friendika
c63adcfae0 bug multiple definition of string_plural_form function when changing languages 2011-09-21 07:09:37 -07:00
Erkan Yilmaz
463a136c15 typo in German admin log page 2011-09-02 10:17:17 +02:00
9cd28af4e8 fixed a missing string in DE 2011-08-23 06:32:21 +02:00
bea02876eb update DE strings 2011-08-18 10:05:33 +02:00
e2873e542b fixed some typos 2011-08-09 16:19:39 +02:00
97b2c56c98 update of the German localization 2011-08-09 15:57:08 +02:00
Friendika
2d2b500639 input the admin email address during install/setup. 2011-07-07 19:12:35 -07:00
f0c5a1b21b typo and wording for the German language files 2011-06-20 09:47:42 +02:00
bda839635c Update to the German language files 2011-06-01 18:34:49 +02:00
e9df9d22c0 typo 2011-05-25 19:51:36 +02:00
697e3464ab German translations 2011-05-25 13:36:12 +02:00
4a95b6361b new german strings 2011-05-25 13:34:57 +02:00
Chris Case
4cff911939 merged multipart email changes 2011-05-21 21:40:16 -07:00
Chris Case
11dd0c8571 html email updates 2011-05-21 19:23:56 -07:00
c533370873 spelling fix 2011-05-17 16:13:50 +02:00
7689d81d9a small changes to the new translations 2011-05-11 10:56:39 +02:00
5609353fc3 updated the German translation 2011-05-11 10:49:07 +02:00
Friendika
59fd70e568 issues with private photos - hitting internal size limits 2011-05-04 02:20:44 -07:00
e28f0fe016 Typo and updates 2011-04-13 13:26:08 +02:00
c4fe889713 Updates to the German strings 2011-04-08 10:36:58 +02:00
Friendika
e35a5bac55 the rest of the english html templates except for htconfig 2011-04-07 23:10:43 -07:00
Friendika
338ba48554 more templates 2011-04-07 18:00:35 -07:00
9f03e871a2 some more German translations 2011-04-07 20:50:19 +02:00
818af767f9 German translation updated 2011-04-07 20:17:30 +02:00
Friendika
4043ede080 more templates 2011-04-06 23:03:54 -07:00
Friendika
c32ed16303 more templates converted to string files 2011-04-06 22:42:08 -07:00
Friendika
8357c064ae remove obsolete template 2011-03-29 19:23:02 -07:00
Friendika
f1db34eebc more templates gone 2011-03-29 17:19:12 -07:00
Friendika
e1fd2ecb16 another template 2011-03-29 15:27:14 -07:00
Friendika
6a280c321d small wording change 2011-03-28 18:06:36 -07:00
Friendika
c4b292a4f1 account/profile/contacts export 2011-03-22 03:07:46 -07:00
Friendika
89977cd87c de keywords not saving 2011-03-21 23:54:03 -07:00
Friendika
94cbf3bb80 another template down 2011-03-21 04:10:08 -07:00
Friendika
798c83b6aa localise some more templates 2011-03-21 00:21:35 -07:00
Friendika
5f9f03daf7 simplify insecure network warning 2011-03-20 19:29:01 -07:00
Friendika
b7292bc673 user pref -> block remote wall posting 2011-03-20 17:54:50 -07:00
Friendika
334353e502 vorbis audio/video link buttons 2011-03-16 21:14:22 -07:00
Friendika
3f432a7b82 share,retweet,relay,forward, whatever 2011-03-16 19:36:59 -07:00
Friendika
f01538a54f content expiration 2011-03-15 17:31:49 -07:00
Friendika
7b92b42603 keywords split into public and private. Public will be used by the friend finder. 2011-03-14 00:28:49 -07:00
Friendika
0de88eb6b0 yet another template converted to language neutral format 2011-03-08 18:53:52 -08:00
Friendika
989b1b209e one more template free from translation, allow for later item editing within jot.tpl 2011-03-07 19:58:22 -08:00
Friendika
216f038456 icon changes, feed security improvements 2011-03-04 20:55:32 -08:00
Friendika
3c076b53fe use prepare_text instead of prepare_body 2011-03-03 23:13:16 -08:00
Friendika
15d3be18a9 use prepare_body for text preparation 2011-03-03 22:53:20 -08:00
2b2d43cce5 more strings translated to German 2011-02-27 10:24:34 +01:00
efbe8a46f6 some more translations into German 2011-02-27 10:13:57 +01:00
9d9efb2bee translated some more strings to German 2011-02-27 08:35:01 +01:00
Friendika
5641532936 yet another template 2011-02-24 02:46:06 -08:00
Friendika
c98ed12e10 generalise wallwall template and fix "via wall-to-wall" float 2011-02-24 02:32:46 -08:00
Friendika
a247a3cedb another template down 2011-02-23 20:43:22 -08:00
Friendika
15780914ec another template made language neutral 2011-02-23 19:30:57 -08:00
Friendika
f57f9852b1 pulled strings from one more template 2011-02-22 15:35:33 -08:00
Friendika
99eef96822 clear float after title for items having title 2011-02-21 20:28:29 -08:00
Friendika
d124c67322 remove note about accounts being hidden in register email 2011-02-21 18:32:26 -08:00
Friendika
079e63bba9 Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabrixxm-themetests 2011-02-21 13:27:03 -08:00
Friendika
0bf8e418a8 Merge branch 'chriscase-master'
Conflicts:
	mod/dfrn_notify.php
2011-02-17 14:05:51 -08:00
Chris Case
9e654f7e57 removed localized multipart email templates, now the multipart settings are configured directly in the code 2011-02-17 13:41:56 -08:00
Fabio Comuni
f5557763d2 Updates to theme dupuntozero 2011-02-17 17:29:29 +01:00
Friendika
67bb737aa1 broken image + linkify site link in body 2011-02-16 17:49:52 -08:00
Friendika
9f1f9da89b Merge branch 'chriscase-master' 2011-02-16 14:41:12 -08:00
Chris Case
5aa6bbbbc5 fixed encoding, i had been experimenting with different ones and forgot to change it back, now UTF-8 2011-02-16 08:05:54 -08:00
Chris Case
e56895123a changed message sending to use base64 encoding 2011-02-16 05:17:40 -08:00
Friendika
9f02057374 provide permalink for posts, include permalinks in feeds and imported from feeds 2011-02-16 02:07:11 -08:00
7a6174298b deleted the translated file of comment_item.tpl 2011-02-15 10:56:07 +01:00
afdfc725b8 some translations into German 2011-02-15 09:49:38 +01:00
Friendika
0e7b09b41c bug , strip HTML from pasted text in prv messages 2011-02-14 21:33:17 -08:00
Chris Case
94e0c3c970 fixed the charset on the html version of the message, overlooked this in the last commit, now uses utf-8 in the meta tag 2011-02-14 04:54:44 -08:00
Chris Case
5eebb373e5 revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it. Translated the french version of the private message template. 2011-02-14 03:59:54 -08:00
Friendika
5e02519a13 disable network toggles when ACL's are entered 2011-02-11 04:32:38 -08:00
Friendika
c16e86add8 toggles "post to facebook, post to twitter", etc. 2011-02-11 02:35:19 -08:00
Friendika
e06cd399b7 close tag on favicon link missing 2011-02-07 23:28:41 -08:00
Friendika
147d7f3bbf theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme.
Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update.
2011-02-06 15:50:50 -08:00
09af200bcc german choose existing pic for the avatar 2011-02-06 08:51:10 +01:00
dd3f21b98a Merge branch 'master' of git://github.com/friendika/friendika 2011-02-06 08:48:07 +01:00
acd5f49d43 wording 2011-02-04 21:56:43 +01:00
Fabio Comuni
fb7959cfc0 Add a link to user photos in Upload Profile Photo page 2011-02-04 10:30:56 +01:00
Friendika
e2c8bedfe5 allow changing album name in photo edit page 2011-02-03 15:13:38 -08:00
Friendika
a4cbdc2414 remove self 2011-02-03 03:58:47 -08:00
Friendika
01c83f0e93 Merge branch 'tobiasd-master' 2011-02-02 23:55:16 -08:00
5e73f9da86 double $ in de/strings.php corrected 2011-02-03 08:35:23 +01:00
Friendika
1558cd8085 Merge branch 'tobiasd-master' 2011-02-02 23:27:12 -08:00
Friendika
33b2490a91 Merge branch 'fabrixxm-master' 2011-02-02 23:24:04 -08:00
73c2ccbc78 updates to the German strings.php file 2011-02-03 08:17:07 +01:00
Friendika
2a4d1fa858 append jotplugin tools to current toolbar row 2011-02-02 23:07:01 -08:00
fabrixxm
670dba6666 update jot-headers 2011-02-01 18:52:16 +01:00
Friendika
837cce8a75 email cc recipients (front end) 2011-01-31 19:07:13 -08:00
Friendika
3eefe8b500 more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors 2011-01-30 19:38:03 -08:00
Friendika
d2dddd995a set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form. 2011-01-26 20:29:32 -08:00
Friendika
b4642ca650 search icons (?) 2011-01-26 14:25:36 -08:00
529b036dbe some more strings translated into German 2011-01-25 12:44:14 +01:00
43dc0b4280 updated profile_advanced.php from changes in view/en 2011-01-23 08:45:30 +01:00
96620520a8 wording in email template adjusted 2011-01-22 09:20:52 +01:00
3f847d5b0f variable name spelling mistake in template corrected 2011-01-21 14:55:03 +01:00
61f0a0d903 more strings 2011-01-21 13:18:51 +01:00
258c79ccd9 spelling ;-) 2011-01-21 13:01:19 +01:00
ac845a1d95 minor wordening 2011-01-21 12:59:51 +01:00
991185404c minor wording correction 2011-01-21 12:54:07 +01:00
734476c5e2 minor correction to profile_edit.tpl more strings 2011-01-21 12:46:33 +01:00
b23c941991 made this notification header consisten with the other 2011-01-21 12:34:25 +01:00
a2723f8206 minor thing with the strings 2011-01-21 12:19:57 +01:00
6a87fe4a0f german translation of registrations-top.tpl 2011-01-21 12:15:43 +01:00
55fb33d85d some more strings 2011-01-21 12:05:26 +01:00
c61defb2b0 german translation of install_db.tpl 2011-01-21 11:54:04 +01:00
ffdcbd798f german translation of jot.tpl 2011-01-21 11:48:42 +01:00
a3ef818d1d german translation of lostpass.tpl and lostpass_eml.tpl 2011-01-21 11:36:30 +01:00
c199309e7d german translation of netfriend.tpl 2011-01-21 11:12:50 +01:00
31ccd924f4 german translation of passchanged_eml.tpl pagetypes.tpl 2011-01-21 11:10:20 +01:00
5863199b8d german translation of the profile* files 2011-01-21 10:58:32 +01:00
57a1731678 german translation of pwdreset.tpl 2011-01-21 10:27:23 +01:00
38ede4f3be german translation of register-link.tpl 2011-01-21 10:24:18 +01:00
41bba5534e german translation of register_open_eml.tpl 2011-01-21 10:23:10 +01:00
10be4f6d29 german translation of register_verify_eml.tpl 2011-01-21 10:14:29 +01:00
d4496c5118 german translation of request_notify_eml.tpl 2011-01-21 10:03:51 +01:00
5b0db3d228 german translation of wallwall_item.tpl 2011-01-21 09:59:13 +01:00
ed37b1d166 german translation of settings_nick_set.tpl 2011-01-20 18:45:48 +01:00
b4049f67ea german translation of settings_nick_subdir.tpl 2011-01-20 18:21:32 +01:00
723aca6109 german translation of settings_nick_unset.tpl 2011-01-20 18:15:12 +01:00
76ed216aaa german translation of wall_item_drop.tpl 2011-01-20 18:01:04 +01:00
787496b7c2 german translation of settings.tpl 2011-01-20 16:43:59 +01:00
07db945921 german translation of wall_received_eml.tpl 2011-01-20 15:43:51 +01:00
b43ec25955 german translation mail_received_eml.tpl 2011-01-19 16:37:59 +01:00
ea010de863 german translation of like.tpl 2011-01-19 16:33:42 +01:00
ba9e85261b german translation of jot-header.tpl 2011-01-19 16:27:28 +01:00
387e1aefbc german translations of insecure_net.tpl intro_complete_eml.tpl and
intros-top.tpl
2011-01-19 16:21:41 +01:00
5702782caa german translation of friend_complete_eml.tpl 2011-01-19 15:45:55 +01:00
fcf1f573e8 german translation of group_new.tpl 2011-01-19 15:33:23 +01:00
990aafbfcf german translation of view/dev/group_edit.tpl 2011-01-19 15:32:19 +01:00
8a17ce6da1 added 2011-01-19 15:31:50 +01:00
468c182405 german translation view/de/follow_notify_eml.tpl 2011-01-18 13:44:46 +01:00
6c42edf351 german translation view/de/directory_header.tpl 2011-01-18 12:47:03 +01:00
11d95896f2 german translation of view/de/dfrn_req_confirm.tpl 2011-01-18 12:46:13 +01:00
f7b0a4569d german translation of view/de/cropbody.tpl 2011-01-18 12:44:28 +01:00
fe00d451a7 german translation of view/de/contact_edit.tpl 2011-01-18 11:40:27 +01:00
80e77516c8 german translation of cmnt_received_eml.tpl 2011-01-18 11:24:52 +01:00
0c77263a85 update to view/en placed into de 2011-01-18 11:18:23 +01:00
b5c9f80919 some more German translation 2011-01-15 21:13:42 +01:00
31d7973e7f some more German strings 2011-01-15 14:39:16 +01:00
a118f83ee2 initial stuff for the german translation 2011-01-14 10:28:19 +01:00