Zach Copley
|
b7d0746694
|
Merge branch '0.9.x' into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/emailsettings.php
actions/hostmeta.php
actions/imsettings.php
actions/login.php
actions/profilesettings.php
actions/showgroup.php
actions/smssettings.php
actions/urlsettings.php
actions/userauthorization.php
actions/userdesignsettings.php
classes/Memcached_DataObject.php
index.php
lib/accountsettingsaction.php
lib/action.php
lib/common.php
lib/connectsettingsaction.php
lib/designsettings.php
lib/personalgroupnav.php
lib/profileaction.php
lib/userprofile.php
plugins/ClientSideShorten/ClientSideShortenPlugin.php
plugins/Facebook/FBConnectSettings.php
plugins/Facebook/FacebookPlugin.php
plugins/NewMenu/NewMenuPlugin.php
plugins/NewMenu/newmenu.css
|
2011-02-28 15:39:43 -08:00 |
|
Siebrand Mazeland
|
e6e402cefd
|
Localisation updates from http://translatewiki.net.
|
2011-01-29 23:10:15 +01:00 |
|
Brion Vibber
|
e79034e163
|
Merge branch '0.9.x' into 1.0.x
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
|
2010-12-16 15:56:19 -08:00 |
|
Siebrand Mazeland
|
cf824621b9
|
Localisation updates from http://translatewiki.net.
|
2010-12-16 16:30:30 +01:00 |
|
Brion Vibber
|
b26eccf33c
|
Merge branch '0.9.x' into 1.0.x
|
2010-10-28 16:26:34 -07:00 |
|
Siebrand Mazeland
|
7a564276a9
|
Localisation updates from http://translatewiki.net.
|
2010-10-28 01:58:43 +02:00 |
|
Brion Vibber
|
3593f3f132
|
Merge branch '0.9.x' into 1.0.x
|
2010-10-19 15:18:07 -07:00 |
|
Siebrand Mazeland
|
e6df1b19df
|
Localisation updates from http://translatewiki.net
|
2010-10-18 22:03:29 +02:00 |
|
Brion Vibber
|
5f81f6119b
|
Merge branch '0.9.x' into 1.0.x
|
2010-10-12 16:33:36 -07:00 |
|
Siebrand Mazeland
|
5215423ea9
|
Localisation updates from http://translatewiki.net.
|
2010-10-09 16:15:48 +02:00 |
|
Brion Vibber
|
59119482ca
|
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
|
2010-10-04 12:54:36 -07:00 |
|
Siebrand Mazeland
|
458512aafd
|
Localisation updates from http://translatewiki.net
|
2010-10-03 22:46:38 +02:00 |
|
Siebrand Mazeland
|
08054e85fe
|
Localisation updates from http://translatewiki.net.
|
2010-10-01 22:34:59 +02:00 |
|
Siebrand Mazeland
|
ec7ab3af4d
|
Localisation updates from http://translatewiki.net
* first export of L10n for languages other than English. Could use some testing/QA.
|
2010-09-28 01:09:29 +02:00 |
|
Siebrand Mazeland
|
870be512d2
|
Update POT files for plugins.
|
2010-09-23 00:37:16 +02:00 |
|
Siebrand Mazeland
|
500f8e5a87
|
* i18n/L10n updates.
* remove superfluous whitespace.
|
2010-09-20 20:54:30 +02:00 |
|
Siebrand Mazeland
|
8dafb4c612
|
Add pot files.
|
2010-09-19 00:26:47 +02:00 |
|
Brion Vibber
|
95b534c5ce
|
Move standalone plugin files into subdirectories so they can have locale data, etc added to them at leisure.
|
2010-09-15 14:10:18 -07:00 |
|