Commit graph

627 commits

Author SHA1 Message Date
Friendika
1bba63fb60 Merge branch 'erikl-master'
Conflicts:
	view/sv/settings.tpl
2011-04-04 15:46:33 -07:00
Friendika
a0d2747d52 Merge branch 'master' of https://github.com/erikl/friendika into erikl-master 2011-04-04 15:43:54 -07:00
erik
3e4e017ffd Edited view/sv/pagetypes.tpl via GitHub 2011-04-04 13:22:55 -07:00
erik
0de12cd297 Edited view/sv/strings.php via GitHub 2011-04-04 12:51:58 -07:00
Fabio Comuni
92156cd840 Merge remote-tracking branch 'friendika-master/master' into iconpopup 2011-04-04 09:31:12 +02:00
Fabio Comuni
b48e82d12a put popupmenu above all 2011-04-04 09:28:19 +02:00
erik
b2f6bf7c38 Edited view/sv/strings.php via GitHub 2011-04-03 06:01:56 -07:00
erik
89103c99ef Edited view/sv/strings.php via GitHub 2011-04-01 11:33:46 -07:00
Fabio Comuni
8fbc606616 popup styles to loozah theme 2011-03-31 17:02:13 +02:00
Fabio Comuni
fe67c346e5 Moved popup logic in boot.php, added 'item_photo_menu' hook 2011-03-31 16:52:51 +02:00
Friendika
08032e0453 change language dynamically - bound to F8 key 2011-03-31 04:57:31 -07:00
Fabio Comuni
3f94721d62 first work 2011-03-30 17:10:14 +02:00
Olivier Migeot
ddf13d8c97 Some corrections to PO workflow, and integrated latest templates "stringization" for french. 2011-03-30 16:46:22 +02:00
Friendika
4aa60a7aaf oexchange 2011-03-29 21:59:28 -07:00
Friendika
8357c064ae remove obsolete template 2011-03-29 19:23:02 -07:00
Friendika
066bdca30d optionally set article title 2011-03-29 18:57:26 -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
erik
2f48135b71 Edited view/sv/settings.tpl via GitHub 2011-03-29 11:42:04 -07:00
erik
80e3241bc1 Edited view/sv/profile_edit.tpl via GitHub 2011-03-29 11:24:07 -07:00
erik
47169d71fd Edited view/sv/settings.tpl via GitHub 2011-03-29 11:19:49 -07:00
erik
a406534c00 Edited view/sv/register_open_eml.tpl via GitHub 2011-03-29 11:10:25 -07:00
fabrixxm
341a6f90ec Updated IT strings 2011-03-29 18:05:24 +02:00
fabrixxm
6631bc64d3 Merge remote-tracking branch 'friendika/master' 2011-03-29 18:00:19 +02:00
Friendika
6a280c321d small wording change 2011-03-28 18:06:36 -07:00
fabrixxm
2a23147042 Updated IT strings 2011-03-28 21:19:27 +02:00
Olivier Migeot
3b709a074a French translation considered done, yet not fully tested. 2011-03-28 19:59:16 +02:00
Olivier Migeot
581349de59 Some more templates for french translation 2011-03-28 14:31:57 +02:00
Olivier Migeot
10d44f2bb9 More french templates (except emails, everything should be ok now) 2011-03-28 13:59:05 +02:00
Olivier Migeot
c8fb1008f5 Some more templates translated to french. 2011-03-28 13:50:56 +02:00
Olivier Migeot
da546588db Merge remote branch 'mike/master' 2011-03-28 12:11:10 +02:00
Friendika
1f6c6c466a author collapse: close off before pagination 2011-03-28 00:49:20 -07:00
erik
4068a21b37 Edited view/sv/register_verify_eml.tpl via GitHub 2011-03-26 03:11:41 -07:00
erik
17b4f9f8a7 Edited view/sv/register_verify_eml.tpl via GitHub 2011-03-26 03:09:00 -07:00
Tobias Diekershoff
9808b0378d fixed wrong colors for links 2011-03-25 13:03:30 +01:00
Friendika
067626380d Merge branch 'erikl-master'
Conflicts:
	view/sv/insecure_net.tpl
	view/sv/jot-header.tpl
	view/sv/msg-header.tpl
	view/sv/profile_edit.tpl
	view/sv/profile_tabs.tpl
	view/sv/strings.php
2011-03-24 04:36:53 -07:00
Friendika
ba99ce3d0a Merge branch 'master' of https://github.com/erikl/friendika into erikl-master 2011-03-24 04:06:01 -07:00
Friendika
51447932f7 link same as visited 2011-03-24 01:16:14 -07:00
Friendika
f0bd849555 Merge branch 'fabrixxm-master' 2011-03-23 14:32:23 -07:00
Fabio Comuni
1f1fe4d5be Merge branch 'master' of github.com:fabrixxm/friendika 2011-03-23 14:04:35 +01:00
Fabio Comuni
4a14269349 Added plural string for contact block 2011-03-23 13:58:46 +01:00
erik
af12c696cb Edited view/sv/strings.php via GitHub 2011-03-22 14:12:33 -07:00
erik
eb02adb163 Edited view/sv/wall_received_eml.tpl via GitHub 2011-03-22 12:22:25 -07:00
erik
93b1f32170 Edited view/sv/settings_nick_unset.tpl via GitHub 2011-03-22 12:21:15 -07:00
erik
0353b36f5d Edited view/sv/settings_nick_subdir.tpl via GitHub 2011-03-22 12:19:04 -07:00
erik
42a5eb5d9b Edited view/sv/settings_nick_set.tpl via GitHub 2011-03-22 12:18:09 -07:00
erik
b57b89516f Edited view/sv/settings.tpl via GitHub 2011-03-22 12:17:25 -07:00
erik
fe7e6ad064 Edited view/sv/request_notify_eml.tpl via GitHub 2011-03-22 12:14:59 -07:00
erik
250d467f33 Edited view/sv/registrations.tpl via GitHub 2011-03-22 12:13:15 -07:00
erik
8c245a5d2f Edited view/sv/registrations-top.tpl via GitHub 2011-03-22 12:12:23 -07:00