diff --git a/.tx/config b/.tx/config
index 233dae8eb3ced4529b117124512648bf60934994..e409d1a4495c39117677a47eac5151fcec90f585 100644
--- a/.tx/config
+++ b/.tx/config
@@ -13,6 +13,7 @@ trans.da = l10n/da/core.po
 trans.de = l10n/de/core.po
 trans.el = l10n/el/core.po
 trans.es = l10n/es/core.po
+trans.et_EE = l10n/l10n/et_EE/core.po
 trans.fr = l10n/fr/core.po
 trans.id = l10n/id/core.po
 trans.it = l10n/it/core.po
@@ -23,6 +24,8 @@ trans.pl = l10n/pl/core.po
 trans.pt_BR = l10n/pt_BR/core.po
 trans.ro = l10n/ro/core.po
 trans.ru = l10n/ru/core.po
+trans.sr = l10n/sr/core.po
+trans.sr@latin = l10n/sr@latin/core.po
 trans.sv = l10n/sv/core.po
 trans.zh_CN = l10n/zh_CN/core.po
 
@@ -38,6 +41,7 @@ trans.da = l10n/da/settings.po
 trans.de = l10n/de/settings.po
 trans.el = l10n/el/settings.po
 trans.es = l10n/es/settings.po
+trans.et_EE = l10n/l10n/et_EE/settings.po
 trans.fr = l10n/fr/settings.po
 trans.id = l10n/id/settings.po
 trans.it = l10n/it/settings.po
@@ -48,6 +52,8 @@ trans.pl = l10n/pl/settings.po
 trans.pt_BR = l10n/pt_BR/settings.po
 trans.ro = l10n/ro/settings.po
 trans.ru = l10n/ru/settings.po
+trans.sr = l10n/sr/settings.po
+trans.sr@latin = l10n/sr@latin/settings.po
 trans.sv = l10n/sv/settings.po
 trans.zh_CN = l10n/zh_CN/settings.po
 
@@ -63,6 +69,7 @@ trans.da = l10n/da/files.po
 trans.de = l10n/de/files.po
 trans.el = l10n/el/files.po
 trans.es = l10n/es/files.po
+trans.et_EE = l10n/l10n/et_EE/files.po
 trans.fr = l10n/fr/files.po
 trans.id = l10n/id/files.po
 trans.it = l10n/it/files.po
@@ -73,6 +80,8 @@ trans.pl = l10n/pl/files.po
 trans.pt_BR = l10n/pt_BR/files.po
 trans.ro = l10n/ro/files.po
 trans.ru = l10n/ru/files.po
+trans.sr = l10n/sr/files.po
+trans.sr@latin = l10n/sr@latin/files.po
 trans.sv = l10n/sv/files.po
 trans.zh_CN = l10n/zh_CN/files.po
 
@@ -88,6 +97,7 @@ trans.da = l10n/da/media.po
 trans.de = l10n/de/media.po
 trans.el = l10n/el/media.po
 trans.es = l10n/es/media.po
+trans.et_EE = l10n/l10n/et_EE/media.po
 trans.fr = l10n/fr/media.po
 trans.id = l10n/id/media.po
 trans.it = l10n/it/media.po
@@ -98,6 +108,8 @@ trans.pl = l10n/pl/media.po
 trans.pt_BR = l10n/pt_BR/media.po
 trans.ro = l10n/ro/media.po
 trans.ru = l10n/ru/media.po
+trans.sr = l10n/sr/media.po
+trans.sr@latin = l10n/sr@latin/media.po
 trans.sv = l10n/sv/media.po
 trans.zh_CN = l10n/zh_CN/media.po
 
diff --git a/l10n/templates/calendar.pot b/l10n/templates/calendar.pot
index bf928ed73195347802e1bb4b4f527cdf0a0daef3..488757ca8898f59e552475992b18dc424379cdda 100644
--- a/l10n/templates/calendar.pot
+++ b/l10n/templates/calendar.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-03 15:07+0200\n"
+"POT-Creation-Date: 2011-09-03 15:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,210 +34,203 @@ msgstr ""
 msgid "Calendar"
 msgstr ""
 
-#: js/calendar.js:768 js/calendar.js:776
+#: js/calendar.js:746 js/calendar.js:754
 msgid "You can't open more than one dialog per site!"
 msgstr ""
 
-#: templates/calendar.php:2 templates/calendar.php:435
-#: templates/calendar.php:632
+#: templates/calendar.php:3
+msgid "All day"
+msgstr ""
+
+#: templates/calendar.php:32
 msgid "Sunday"
 msgstr ""
 
-#: templates/calendar.php:2 templates/calendar.php:429
-#: templates/calendar.php:626
+#: templates/calendar.php:32
 msgid "Monday"
 msgstr ""
 
-#: templates/calendar.php:2 templates/calendar.php:430
-#: templates/calendar.php:627
+#: templates/calendar.php:32
 msgid "Tuesday"
 msgstr ""
 
-#: templates/calendar.php:2 templates/calendar.php:431
-#: templates/calendar.php:628
+#: templates/calendar.php:32
 msgid "Wednesday"
 msgstr ""
 
-#: templates/calendar.php:2 templates/calendar.php:432
-#: templates/calendar.php:629
+#: templates/calendar.php:32
 msgid "Thursday"
 msgstr ""
 
-#: templates/calendar.php:2 templates/calendar.php:433
-#: templates/calendar.php:630
+#: templates/calendar.php:32
 msgid "Friday"
 msgstr ""
 
-#: templates/calendar.php:2 templates/calendar.php:434
-#: templates/calendar.php:631
+#: templates/calendar.php:32
 msgid "Saturday"
 msgstr ""
 
-#: templates/calendar.php:3
+#: templates/calendar.php:33
 msgid "Sun."
 msgstr ""
 
-#: templates/calendar.php:3
+#: templates/calendar.php:33
 msgid "Mon."
 msgstr ""
 
-#: templates/calendar.php:3
+#: templates/calendar.php:33
 msgid "Tue."
 msgstr ""
 
-#: templates/calendar.php:3
+#: templates/calendar.php:33
 msgid "Wed."
 msgstr ""
 
-#: templates/calendar.php:3
+#: templates/calendar.php:33
 msgid "Thu."
 msgstr ""
 
-#: templates/calendar.php:3
+#: templates/calendar.php:33
 msgid "Fri."
 msgstr ""
 
-#: templates/calendar.php:3
+#: templates/calendar.php:33
 msgid "Sat."
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "January"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "February"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "March"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "April"
 msgstr ""
 
-#: templates/calendar.php:4 templates/calendar.php:5
+#: templates/calendar.php:34 templates/calendar.php:35
 msgid "May"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "June"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "July"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "August"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "September"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "October"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "November"
 msgstr ""
 
-#: templates/calendar.php:4
+#: templates/calendar.php:34
 msgid "December"
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Jan."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Feb."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Mar."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Apr."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Jun."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Jul."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Aug."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Sep."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Oct."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Nov."
 msgstr ""
 
-#: templates/calendar.php:5
+#: templates/calendar.php:35
 msgid "Dec."
 msgstr ""
 
-#: templates/calendar.php:6
+#: templates/calendar.php:36 templates/calendar.php:111
+msgid "CW"
+msgstr ""
+
+#: templates/calendar.php:37
+msgid "CWs"
+msgstr ""
+
+#: templates/calendar.php:44
 msgid "Day"
 msgstr ""
 
-#: templates/calendar.php:7
+#: templates/calendar.php:45
 msgid "Week"
 msgstr ""
 
-#: templates/calendar.php:8
+#: templates/calendar.php:46
 msgid "Weeks"
 msgstr ""
 
-#: templates/calendar.php:9
+#: templates/calendar.php:47
 msgid "Month"
 msgstr ""
 
-#: templates/calendar.php:10
+#: templates/calendar.php:48
 msgid "Listview"
 msgstr ""
 
-#: templates/calendar.php:11
+#: templates/calendar.php:53
 msgid "Today"
 msgstr ""
 
-#: templates/calendar.php:12
+#: templates/calendar.php:54
 msgid "Calendars"
 msgstr ""
 
-#: templates/calendar.php:13 templates/calendar.php:428
-msgid "CW"
-msgstr ""
-
-#: templates/calendar.php:14
-msgid "CWs"
-msgstr ""
-
-#: templates/calendar.php:48 templates/calendar.php:160
+#: templates/calendar.php:71 templates/calendar.php:89
 msgid "Time"
 msgstr ""
 
-#: templates/calendar.php:54 templates/calendar.php:172
-msgid "All day"
-msgstr ""
-
-#: templates/calendar.php:910
+#: templates/calendar.php:162
 msgid "There was a fail, while parsing the file."
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 2fdab4a909a4f2d4ee3c28b2983a4c8c12e48907..73be6c3c7a7ca89ab8c8efc602ee4347211ed6db 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-03 15:07+0200\n"
+"POT-Creation-Date: 2011-09-03 15:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 101f0959522d0548c10b302a211303533ed1d964..ba57e4b575406229ab43383698a67b0379004602 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-03 15:07+0200\n"
+"POT-Creation-Date: 2011-09-03 15:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index 60f368f90f2a053a54362a5dbd1d227736b590da..d1a4dcc8f325e165f7c14c8d937eb8b6d515cf63 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-03 15:07+0200\n"
+"POT-Creation-Date: 2011-09-03 15:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 796f57c298e749743332f3dd2e0fa49275fd60f8..c39e0580ed69284962fdcf96d27cf26af86d4714 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-03 15:07+0200\n"
+"POT-Creation-Date: 2011-09-03 15:43+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index aa1d027cac003f3449043afc29a9f4d30f1392d0..d15146caf1f9244d223606a97993565e1f076bc3 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
 "POT-Creation-Date: 2011-09-03 15:07+0200\n"
-"PO-Revision-Date: 2011-09-03 13:07+0000\n"
+"PO-Revision-Date: 2011-09-03 13:09+0000\n"
 "Last-Translator: csslayer <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 6f165696d555623ee48f4d7eb1d7e6268924a566..f960000e2fc45393fb3199ad51e1fe9e07537282 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-09-03 15:05+0200\n"
-"PO-Revision-Date: 2011-09-03 13:03+0000\n"
+"POT-Creation-Date: 2011-09-03 15:07+0200\n"
+"PO-Revision-Date: 2011-09-03 13:29+0000\n"
 "Last-Translator: csslayer <wengxt@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/owncloud/team/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -71,7 +71,7 @@ msgstr "您使用了"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr "的空间,总计可用空间为"
+msgstr "的空间,总容量为"
 
 #: templates/personal.php:13
 msgid "Your password got changed"
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 4d1bddf7f1faaa5e35d46043ad181b8a89a2fdcb..dc9ffeafe7b9530561f9cc76a61b4b56d9255c0b 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -12,7 +12,7 @@
 "Go there manually." => "手动访问",
 "Answer" => "回答",
 "You use" => "您使用了",
-"of the available" => "的空间,总计可用空间为",
+"of the available" => "的空间,总容量为",
 "Your password got changed" => "密码已修改",
 "Unable to change your password" => "无法修改密码",
 "Current password" => "当前密码",
diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index c7f740ec13463403f5beb81ba132416d30489d8b..a928ca5b57ecf882a2834c63bc60bf292118aeb8 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -12,6 +12,7 @@ return array(
 'da'=>'Dansk',
 'nl'=>'Nederlands',
 'en'=>'English',
+'et_EE'=>'Eesti',
 'fr'=>'Francais',
 'de'=>'Deutsch',
 'el'=>'Ellinika',
@@ -23,6 +24,8 @@ return array(
 'pt_BR'=>'Portugues',
 'ro'=>'română',
 'ru'=>'Русский язык',
+'sr'=>'Српски',
+'sr@latin'=>'Srpski',
 'es'=>'Espanol',
 'sv'=>'Svenska'
 );