[tx-robot] updated from transifex

44 files changed, 4923 insertions, 3559 deletions

diff --git a/l10n/ach/news.po b/l10n/ach/news.po
index 109831ee2..750f40128 100644
--- a/l10n/ach/news.po
+++ b/l10n/ach/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Acoli (http://www.transifex.com/projects/p/owncloud/language/ach/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: ach\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/ady/news.po b/l10n/ady/news.po
index 2cf7f235d..d552367dd 100644
--- a/l10n/ady/news.po
+++ b/l10n/ady/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Adyghe (http://www.transifex.com/projects/p/owncloud/language/ady/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: ady\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/ak/news.po b/l10n/ak/news.po
index 43829700e..6292e5cf7 100644
--- a/l10n/ak/news.po
+++ b/l10n/ak/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Akan (http://www.transifex.com/projects/p/owncloud/language/ak/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: ak\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/am_ET/news.po b/l10n/am_ET/news.po
index 6430a66a6..804b1985e 100644
--- a/l10n/am_ET/news.po
+++ b/l10n/am_ET/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Amharic (Ethiopia) (http://www.transifex.com/projects/p/owncloud/language/am_ET/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: am_ET\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/bs.php b/l10n/bs.php
index 664cd24ae..466207931 100644
--- a/l10n/bs.php
+++ b/l10n/bs.php
@@ -1,13 +1,8 @@
 <?php $TRANSLATIONS = array(
-"News" => "Vijesti",
-"Address" => "Adresa",
-"Add" => "Dodaj",
-"New folder" => "Nova fascikla",
 "Folder" => "Fasikla",
-"Starred" => "Označeno",
-"Keep unread" => "Zadrži nepročitano",
-"Save" => "Spasi",
+"New folder" => "Nova fascikla",
 "Collapse" => "Proširi",
+"Rename folder" => "Preimenuj fasciklu",
 "Delete folder" => "Izbriši fasciklu",
-"Rename folder" => "Preimenuj fasciklu"
+"Starred" => "Označeno"
 );
diff --git a/l10n/bs/news.po b/l10n/bs/news.po
index edfa8badd..dafbda5bd 100644
--- a/l10n/bs/news.po
+++ b/l10n/bs/news.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-05 01:01-0400\n"
-"PO-Revision-Date: 2014-07-04 15:12+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Bosnian (http://www.transifex.com/projects/p/owncloud/language/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -18,202 +18,226 @@ msgstr ""
 "Language: bs\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
-msgstr "Vijesti"
+#: templates/part.content.php:36
+msgid "Keep article unread"
+msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
-msgstr "Adresa"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
+msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
-msgstr "Dodaj"
+#: templates/part.content.php:81
+msgid "Download"
+msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
-msgstr "Nova fascikla"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr "Fasikla"
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
+msgstr "Nova fascikla"
+
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
-msgstr "Označeno"
-
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
-msgstr "Zadrži nepročitano"
-
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
-msgstr "Spasi"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
+msgstr "Proširi"
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
-msgstr "Proširi"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
+msgstr "Preimenuj fasciklu"
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
+#: templates/part.navigation.folder.php:88
 msgid "Delete folder"
 msgstr "Izbriši fasciklu"
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
-msgstr "Preimenuj fasciklu"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
+msgstr "Označeno"
 
-#: templates/part.settings.php:13
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
+msgstr ""
+
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
+msgstr ""
+
+#: templates/part.settings.php:8
 msgid "Settings"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:13
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
+msgstr ""
+
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/ca@valencia/news.po b/l10n/ca@valencia/news.po
index 05934ad36..99b056092 100644
--- a/l10n/ca@valencia/news.po
+++ b/l10n/ca@valencia/news.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-31 01:01-0400\n"
-"PO-Revision-Date: 2012-08-26 23:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Catalan (Valencian) (http://www.transifex.com/projects/p/owncloud/language/ca@valencia/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: ca@valencia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/en@pirate/news.po b/l10n/en@pirate/news.po
index 0322da8b8..fb1b85da9 100644
--- a/l10n/en@pirate/news.po
+++ b/l10n/en@pirate/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Pirate English (http://www.transifex.com/projects/p/owncloud/language/en@pirate/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: en@pirate\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
+msgstr "Download"
+
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
-msgstr "Download"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
+msgstr ""
+
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
+msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/en_NZ/news.po b/l10n/en_NZ/news.po
index 7e7420a59..27d6ea90c 100644
--- a/l10n/en_NZ/news.po
+++ b/l10n/en_NZ/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: English (New Zealand) (http://www.transifex.com/projects/p/owncloud/language/en_NZ/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: en_NZ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/es_BO/news.po b/l10n/es_BO/news.po
index b13526bcd..e3a4b4e2c 100644
--- a/l10n/es_BO/news.po
+++ b/l10n/es_BO/news.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-17 01:01-0400\n"
-"PO-Revision-Date: 2012-08-26 23:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Bolivia) (http://www.transifex.com/projects/p/owncloud/language/es_BO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: es_BO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/es_CO/news.po b/l10n/es_CO/news.po
index 45a8942a2..23c5cc8ae 100644
--- a/l10n/es_CO/news.po
+++ b/l10n/es_CO/news.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:02-0400\n"
-"PO-Revision-Date: 2012-08-26 23:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/owncloud/language/es_CO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/es_CR/news.po b/l10n/es_CR/news.po
index eeffd4244..5c7b8b776 100644
--- a/l10n/es_CR/news.po
+++ b/l10n/es_CR/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Spanish (Costa Rica) (http://www.transifex.com/projects/p/owncloud/language/es_CR/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/es_EC/news.po b/l10n/es_EC/news.po
index 15568c444..6c9347cb7 100644
--- a/l10n/es_EC/news.po
+++ b/l10n/es_EC/news.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:02-0400\n"
-"PO-Revision-Date: 2012-08-26 23:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Ecuador) (http://www.transifex.com/projects/p/owncloud/language/es_EC/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: es_EC\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/es_PE/news.po b/l10n/es_PE/news.po
index 152590e15..5c33079d9 100644
--- a/l10n/es_PE/news.po
+++ b/l10n/es_PE/news.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:02-0400\n"
-"PO-Revision-Date: 2012-08-26 23:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Peru) (http://www.transifex.com/projects/p/owncloud/language/es_PE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: es_PE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/es_PY/news.po b/l10n/es_PY/news.po
index 4223ad026..2497120a5 100644
--- a/l10n/es_PY/news.po
+++ b/l10n/es_PY/news.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-20 01:01-0400\n"
-"PO-Revision-Date: 2012-08-26 23:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Paraguay) (http://www.transifex.com/projects/p/owncloud/language/es_PY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: es_PY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/es_US/news.po b/l10n/es_US/news.po
index 449fabf58..9a2dd265a 100644
--- a/l10n/es_US/news.po
+++ b/l10n/es_US/news.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-20 01:01-0400\n"
-"PO-Revision-Date: 2012-08-26 23:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (United States) (http://www.transifex.com/projects/p/owncloud/language/es_US/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: es_US\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/es_UY/news.po b/l10n/es_UY/news.po
index 899921809..a3a55426b 100644
--- a/l10n/es_UY/news.po
+++ b/l10n/es_UY/news.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-10 01:02-0400\n"
-"PO-Revision-Date: 2012-08-26 23:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Spanish (Uruguay) (http://www.transifex.com/projects/p/owncloud/language/es_UY/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: es_UY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/eu_ES.php b/l10n/eu_ES.php
index 70ecd7698..ae7db0ef0 100644
--- a/l10n/eu_ES.php
+++ b/l10n/eu_ES.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
 "Download" => "Deskargatu",
-"Cancel" => "Ezeztatu",
-"Save" => "Gorde",
 "Export" => "Esportazio"
 );
diff --git a/l10n/eu_ES/news.po b/l10n/eu_ES/news.po
index 50c4a2ed3..ba53f30cb 100644
--- a/l10n/eu_ES/news.po
+++ b/l10n/eu_ES/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-09 01:01-0400\n"
-"PO-Revision-Date: 2014-07-08 06:12+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Basque (Spain) (http://www.transifex.com/projects/p/owncloud/language/eu_ES/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
+msgstr "Deskargatu"
+
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
-msgstr "Deskargatu"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
+msgstr ""
+
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
+msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
-msgstr "Ezeztatu"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
+msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
-msgstr "Gorde"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
+msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:20
+msgid "Show unread articles"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
+msgstr ""
+
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
+msgstr ""
+
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr "Esportazio"
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/fr_CA/news.po b/l10n/fr_CA/news.po
index f3d76c285..d6f40ff47 100644
--- a/l10n/fr_CA/news.po
+++ b/l10n/fr_CA/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: French (Canada) (http://www.transifex.com/projects/p/owncloud/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/gu/news.po b/l10n/gu/news.po
new file mode 100644
index 000000000..79fe87b3f
--- /dev/null
+++ b/l10n/gu/news.po
@@ -0,0 +1,242 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Gujarati (http://www.transifex.com/projects/p/owncloud/language/gu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: service/feedservice.php:104
+msgid "Can not add feed: Exists already"
+msgstr ""
+
+#: service/feedservice.php:149
+msgid ""
+"Can not add feed: URL does not exist, SSL Certificate can not be validated "
+"or feed has invalid xml"
+msgstr ""
+
+#: service/feedservice.php:296
+msgid "Articles without feed"
+msgstr ""
+
+#: service/folderservice.php:56
+msgid "Can not add folder: Exists already"
+msgstr ""
+
+#: templates/part.content.php:3
+msgid "Add a feed"
+msgstr ""
+
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
+msgstr ""
+
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
+msgstr ""
+
+#: templates/part.content.php:33
+msgid "Star"
+msgstr ""
+
+#: templates/part.content.php:36
+msgid "Keep article unread"
+msgstr ""
+
+#: templates/part.content.php:42
+msgid "Open website"
+msgstr ""
+
+#: templates/part.content.php:65
+msgid "by"
+msgstr ""
+
+#: templates/part.content.php:66
+msgid "from"
+msgstr ""
+
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
+msgstr ""
+
+#: templates/part.content.php:81
+msgid "Download"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:27
+msgid "Folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
+msgid "Folder name"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
+msgstr ""
+
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
+msgstr ""
+
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
+msgstr ""
+
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
+msgstr ""
+
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
+msgstr ""
+
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
+msgstr ""
+
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
+msgstr ""
+
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
+msgstr ""
+
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
+msgstr ""
+
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
+msgstr ""
+
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
+msgstr ""
+
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
+msgstr ""
+
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
+msgstr ""
+
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
+msgstr ""
+
+#: templates/part.settings.php:8
+msgid "Settings"
+msgstr ""
+
+#: templates/part.settings.php:13
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
+msgstr ""
+
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
+msgstr ""
+
+#: templates/part.settings.php:40
+msgid "Subscriptions (OPML)"
+msgstr ""
+
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
+msgid "Import"
+msgstr ""
+
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
+msgid "Export"
+msgstr ""
+
+#: templates/part.settings.php:72
+msgid "Error when importing: file does not contain valid OPML"
+msgstr ""
+
+#: templates/part.settings.php:76
+msgid "Unread/Starred Articles"
+msgstr ""
+
+#: templates/part.settings.php:107
+msgid "Error when importing: file does not contain valid JSON"
+msgstr ""
diff --git a/l10n/hi_IN/news.po b/l10n/hi_IN/news.po
index 6e1e52cb1..3c34672be 100644
--- a/l10n/hi_IN/news.po
+++ b/l10n/hi_IN/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Hindi (India) (http://www.transifex.com/projects/p/owncloud/language/hi_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: hi_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/hy.php b/l10n/hy.php
index 4b003e1a7..6e91b81f0 100644
--- a/l10n/hy.php
+++ b/l10n/hy.php
@@ -1,4 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Download" => "Բեռնել",
-"Save" => "Պահպանել"
+"Download" => "Բեռնել"
 );
diff --git a/l10n/hy/news.po b/l10n/hy/news.po
index 2f265f2a7..5ef8d1cdf 100644
--- a/l10n/hy/news.po
+++ b/l10n/hy/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-05 01:01-0400\n"
-"PO-Revision-Date: 2014-07-04 15:12+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Armenian (http://www.transifex.com/projects/p/owncloud/language/hy/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
+msgstr "Բեռնել"
+
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
-msgstr "Բեռնել"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
+msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
-msgstr "Պահպանել"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
+msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.settings.php:13
+#: templates/part.settings.php:8
 msgid "Settings"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:13
+msgid "Compact view"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
+msgstr ""
+
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
+msgstr ""
+
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/io/news.po b/l10n/io/news.po
index cf397221f..42d6a7b29 100644
--- a/l10n/io/news.po
+++ b/l10n/io/news.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-29 01:01-0400\n"
-"PO-Revision-Date: 2012-08-26 23:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
 "Language-Team: Ido (http://www.transifex.com/projects/p/owncloud/language/io/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,203 +17,226 @@ msgstr ""
 "Language: io\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:69 templates/part.items.php:74
-#: templates/part.items.php:79
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:90
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/jv/news.po b/l10n/jv/news.po
index 59b37e2e3..ad2a663e0 100644
--- a/l10n/jv/news.po
+++ b/l10n/jv/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Javanese (http://www.transifex.com/projects/p/owncloud/language/jv/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: jv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
+msgstr "Njipuk"
+
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
-msgstr "Njipuk"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
+msgstr ""
+
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
+msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/ka.php b/l10n/ka.php
new file mode 100644
index 000000000..b286a7232
--- /dev/null
+++ b/l10n/ka.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Download" => "გადმოწერა"
+);
diff --git a/l10n/kn/news.po b/l10n/kn/news.po
index 919c284fe..345a37a61 100644
--- a/l10n/kn/news.po
+++ b/l10n/kn/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Kannada (http://www.transifex.com/projects/p/owncloud/language/kn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/mg/news.po b/l10n/mg/news.po
new file mode 100644
index 000000000..7acde7a26
--- /dev/null
+++ b/l10n/mg/news.po
@@ -0,0 +1,242 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: translations@owncloud.org\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
+"Last-Translator: I Robot\n"
+"Language-Team: Malagasy (http://www.transifex.com/projects/p/owncloud/language/mg/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: mg\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: service/feedservice.php:104
+msgid "Can not add feed: Exists already"
+msgstr ""
+
+#: service/feedservice.php:149
+msgid ""
+"Can not add feed: URL does not exist, SSL Certificate can not be validated "
+"or feed has invalid xml"
+msgstr ""
+
+#: service/feedservice.php:296
+msgid "Articles without feed"
+msgstr ""
+
+#: service/folderservice.php:56
+msgid "Can not add folder: Exists already"
+msgstr ""
+
+#: templates/part.content.php:3
+msgid "Add a feed"
+msgstr ""
+
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
+msgstr ""
+
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
+msgstr ""
+
+#: templates/part.content.php:33
+msgid "Star"
+msgstr ""
+
+#: templates/part.content.php:36
+msgid "Keep article unread"
+msgstr ""
+
+#: templates/part.content.php:42
+msgid "Open website"
+msgstr ""
+
+#: templates/part.content.php:65
+msgid "by"
+msgstr ""
+
+#: templates/part.content.php:66
+msgid "from"
+msgstr ""
+
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
+msgstr ""
+
+#: templates/part.content.php:81
+msgid "Download"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:27
+msgid "Folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
+msgid "Folder name"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
+msgstr ""
+
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
+msgstr ""
+
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
+msgstr ""
+
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
+msgstr ""
+
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
+msgstr ""
+
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
+msgstr ""
+
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
+msgstr ""
+
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
+msgstr ""
+
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
+msgstr ""
+
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
+msgstr ""
+
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
+msgstr ""
+
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
+msgstr ""
+
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
+msgstr ""
+
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
+msgstr ""
+
+#: templates/part.settings.php:8
+msgid "Settings"
+msgstr ""
+
+#: templates/part.settings.php:13
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
+msgstr ""
+
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
+msgstr ""
+
+#: templates/part.settings.php:40
+msgid "Subscriptions (OPML)"
+msgstr ""
+
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
+msgid "Import"
+msgstr ""
+
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
+msgid "Export"
+msgstr ""
+
+#: templates/part.settings.php:72
+msgid "Error when importing: file does not contain valid OPML"
+msgstr ""
+
+#: templates/part.settings.php:76
+msgid "Unread/Starred Articles"
+msgstr ""
+
+#: templates/part.settings.php:107
+msgid "Error when importing: file does not contain valid JSON"
+msgstr ""
diff --git a/l10n/ml/news.po b/l10n/ml/news.po
index ba23bdf0a..712e628f9 100644
--- a/l10n/ml/news.po
+++ b/l10n/ml/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/owncloud/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/ml_IN/news.po b/l10n/ml_IN/news.po
index f2fca7587..46fe07eaf 100644
--- a/l10n/ml_IN/news.po
+++ b/l10n/ml_IN/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/owncloud/language/ml_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: ml_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/mn/news.po b/l10n/mn/news.po
index eca20eded..039889d20 100644
--- a/l10n/mn/news.po
+++ b/l10n/mn/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Mongolian (http://www.transifex.com/projects/p/owncloud/language/mn/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/my_MM.php b/l10n/my_MM.php
index fda806177..d7bf8be06 100644
--- a/l10n/my_MM.php
+++ b/l10n/my_MM.php
@@ -1,5 +1,3 @@
 <?php $TRANSLATIONS = array(
-"Add" => "ပေါင်းထည့်",
-"Download" => "ဒေါင်းလုတ်",
-"Cancel" => "ပယ်ဖျက်မည်"
+"Download" => "ဒေါင်းလုတ်"
 );
diff --git a/l10n/my_MM/news.po b/l10n/my_MM/news.po
index 9fd2a69c5..aaec0a5cc 100644
--- a/l10n/my_MM/news.po
+++ b/l10n/my_MM/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-07-09 01:01-0400\n"
-"PO-Revision-Date: 2014-07-08 06:12+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/owncloud/language/my_MM/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: my_MM\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
-msgstr "ပေါင်းထည့်"
+#: templates/part.content.php:81
+msgid "Download"
+msgstr "ဒေါင်းလုတ်"
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
-msgstr "ဒေါင်းလုတ်"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
+msgstr ""
+
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
+msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
-msgstr "ပယ်ဖျက်မည်"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
+msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:20
+msgid "Show unread articles"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
+msgstr ""
+
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
+msgstr ""
+
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/nds/news.po b/l10n/nds/news.po
index 1e379d4f6..e142d4fc2 100644
--- a/l10n/nds/news.po
+++ b/l10n/nds/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Low German (http://www.transifex.com/projects/p/owncloud/language/nds/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: nds\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/ne/news.po b/l10n/ne/news.po
index 245b34175..0c9813af6 100644
--- a/l10n/ne/news.po
+++ b/l10n/ne/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Nepali (http://www.transifex.com/projects/p/owncloud/language/ne/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: ne\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/nqo/news.po b/l10n/nqo/news.po
index 7c224c7d7..3d5880941 100644
--- a/l10n/nqo/news.po
+++ b/l10n/nqo/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: N'ko (http://www.transifex.com/projects/p/owncloud/language/nqo/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: nqo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/or_IN/news.po b/l10n/or_IN/news.po
index 9c958834f..469f1d817 100644
--- a/l10n/or_IN/news.po
+++ b/l10n/or_IN/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Oriya (India) (http://www.transifex.com/projects/p/owncloud/language/or_IN/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: or_IN\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/su/news.po b/l10n/su/news.po
index ecf2277a5..43bdf1fc4 100644
--- a/l10n/su/news.po
+++ b/l10n/su/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Sundanese (http://www.transifex.com/projects/p/owncloud/language/su/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: su\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/sw_KE/news.po b/l10n/sw_KE/news.po
index 33961582f..dea7b93c6 100644
--- a/l10n/sw_KE/news.po
+++ b/l10n/sw_KE/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Swahili (Kenya) (http://www.transifex.com/projects/p/owncloud/language/sw_KE/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: sw_KE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/templates/news.pot b/l10n/templates/news.pot
index a9d5b77d1..52c131053 100644
--- a/l10n/templates/news.pot
+++ b/l10n/templates/news.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud news 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-08-26 01:01-0400\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\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"
@@ -17,202 +17,226 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: businesslayer/feedbusinesslayer.php:97
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:137
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:282
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:54
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/tzm/news.po b/l10n/tzm/news.po
index 3b41a0ba3..369037669 100644
--- a/l10n/tzm/news.po
+++ b/l10n/tzm/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Central Atlas Tamazight (http://www.transifex.com/projects/p/owncloud/language/tzm/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: tzm\n"
 "Plural-Forms: nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/ur/news.po b/l10n/ur/news.po
index d74bafe91..692f0df16 100644
--- a/l10n/ur/news.po
+++ b/l10n/ur/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Urdu (http://www.transifex.com/projects/p/owncloud/language/ur/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: ur\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""
diff --git a/l10n/uz/news.po b/l10n/uz/news.po
index ccfa07fe8..2316d7398 100644
--- a/l10n/uz/news.po
+++ b/l10n/uz/news.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-05-04 01:02-0400\n"
-"PO-Revision-Date: 2014-05-04 05:02+0000\n"
+"POT-Creation-Date: 2014-09-19 01:01-0400\n"
+"PO-Revision-Date: 2014-09-19 05:01+0000\n"
 "Last-Translator: I Robot\n"
 "Language-Team: Uzbek (http://www.transifex.com/projects/p/owncloud/language/uz/)\n"
 "MIME-Version: 1.0\n"
@@ -17,202 +17,226 @@ msgstr ""
 "Language: uz\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: businesslayer/feedbusinesslayer.php:95
+#: service/feedservice.php:104
 msgid "Can not add feed: Exists already"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:133
+#: service/feedservice.php:149
 msgid ""
 "Can not add feed: URL does not exist, SSL Certificate can not be validated "
 "or feed has invalid xml"
 msgstr ""
 
-#: businesslayer/feedbusinesslayer.php:278
+#: service/feedservice.php:296
 msgid "Articles without feed"
 msgstr ""
 
-#: businesslayer/folderbusinesslayer.php:52
+#: service/folderservice.php:56
 msgid "Can not add folder: Exists already"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid " "
+#: templates/part.content.php:3
+msgid "Add a feed"
 msgstr ""
 
-#: js/vendor/angular-ui/build/angular-ui.min.js:7
-msgid "_"
+#: templates/part.content.php:4
+msgid "There are no feeds yet. Go ahead and add some"
 msgstr ""
 
-#: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8
-msgid "status"
+#: templates/part.content.php:5
+msgid "Import feeds and articles"
 msgstr ""
 
-#: templates/main.php:32
-#, php-format
-msgid "Undo deletion of %s"
+#: templates/part.content.php:33
+msgid "Star"
 msgstr ""
 
-#: templates/main.php:36
-msgid "News"
+#: templates/part.content.php:36
+msgid "Keep article unread"
 msgstr ""
 
-#: templates/part.addnew.php:12
-msgid "Add Website"
+#: templates/part.content.php:42
+msgid "Open website"
 msgstr ""
 
-#: templates/part.addnew.php:19
-msgid "Error: address exists already!"
+#: templates/part.content.php:65
+msgid "by"
 msgstr ""
 
-#: templates/part.addnew.php:22
-msgid "Error: folder exists already"
+#: templates/part.content.php:66
+msgid "from"
 msgstr ""
 
-#: templates/part.addnew.php:29
-msgid "Address"
+#: templates/part.content.php:75
+msgid "Browser can not play media type"
 msgstr ""
 
-#: templates/part.addnew.php:32 templates/part.addnew.php:35
-msgid "Add"
+#: templates/part.content.php:81
+msgid "Download"
 msgstr ""
 
-#: templates/part.addnew.php:39 templates/part.addnew.php:46
-msgid "New folder"
+#: templates/part.navigation.addfeed.php:5
+#: templates/part.navigation.addfeed.php:58
+msgid "Subscribe"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:15
+msgid "Web address"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:22
+msgid "Feed exists already!"
 msgstr ""
 
-#: templates/part.addnew.php:40
+#: templates/part.navigation.addfeed.php:27
 msgid "Folder"
 msgstr ""
 
-#: templates/part.addnew.php:44
-msgid "Choose folder"
+#: templates/part.navigation.addfeed.php:31
+msgid "No folder"
+msgstr ""
+
+#: templates/part.navigation.addfeed.php:36
+msgid "New folder"
 msgstr ""
 
-#: templates/part.addnew.php:55
+#: templates/part.navigation.addfeed.php:44
+#: templates/part.navigation.addfolder.php:16
+#: templates/part.navigation.addfolder.php:17
 msgid "Folder name"
 msgstr ""
 
-#: templates/part.addnew.php:59
-msgid "Back to folder selection"
+#: templates/part.navigation.addfeed.php:51
+msgid "Go back"
 msgstr ""
 
-#: templates/part.addnew.php:63
-msgid "Create folder"
+#: templates/part.navigation.addfeed.php:55
+#: templates/part.navigation.addfolder.php:21
+#: templates/part.navigation.folder.php:52
+msgid "Folder exists already!"
 msgstr ""
 
-#: templates/part.feed.starred.php:11
-msgid "Starred"
+#: templates/part.navigation.addfolder.php:5
+msgid "New Folder"
 msgstr ""
 
-#: templates/part.feed.unread.php:11
-msgid "Unread articles"
+#: templates/part.navigation.addfolder.php:24
+msgid "Create"
 msgstr ""
 
-#: templates/part.feed.unread.php:18
-msgid "All articles"
+#: templates/part.navigation.feed.php:41
+msgid "Deleted feed"
+msgstr ""
+
+#: templates/part.navigation.feed.php:43
+msgid "Undo delete feed"
 msgstr ""
 
-#: templates/part.feed.unread.php:27 templates/part.listfeed.php:62
-#: templates/part.listfolder.php:55
-msgid "Mark read"
+#: templates/part.navigation.feed.php:56
+#: templates/part.navigation.folder.php:46
+msgid "Rename"
 msgstr ""
 
-#: templates/part.firstrun.php:2
-msgid "Welcome to the ownCloud News app!"
+#: templates/part.navigation.feed.php:69
+#: templates/part.navigation.folder.php:76
+msgid "Menu"
 msgstr ""
 
-#: templates/part.items.php:20
-msgid "read on website"
+#: templates/part.navigation.feed.php:78
+msgid "Rename feed"
 msgstr ""
 
-#: templates/part.items.php:40
-msgid "star"
+#: templates/part.navigation.feed.php:81
+msgid "Delete feed"
 msgstr ""
 
-#: templates/part.items.php:56
-msgid "from"
+#: templates/part.navigation.feed.php:84
+#: templates/part.navigation.folder.php:91
+#: templates/part.navigation.unreadfeed.php:28
+msgid "Read all"
 msgstr ""
 
-#: templates/part.items.php:61
-msgid "by"
+#: templates/part.navigation.feed.php:92
+#: templates/part.navigation.folder.php:102
+msgid "Dismiss"
 msgstr ""
 
-#: templates/part.items.php:68
-msgid "Download"
+#: templates/part.navigation.folder.php:20
+msgid "Collapse"
 msgstr ""
 
-#: templates/part.items.php:79
-msgid "Keep unread"
+#: templates/part.navigation.folder.php:26
+msgid "Deleted folder"
 msgstr ""
 
-#: templates/part.listfeed.php:22 templates/part.listfolder.php:19
-msgid "Cancel"
+#: templates/part.navigation.folder.php:28
+msgid "Undo delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:25 templates/part.listfolder.php:22
-msgid "Save"
+#: templates/part.navigation.folder.php:85
+msgid "Rename folder"
 msgstr ""
 
-#: templates/part.listfeed.php:50 templates/part.listfeed.php:74
-msgid "Delete website"
+#: templates/part.navigation.folder.php:88
+msgid "Delete folder"
 msgstr ""
 
-#: templates/part.listfeed.php:69
-msgid "Rename feed"
+#: templates/part.navigation.starredfeed.php:8
+msgid "Starred"
 msgstr ""
 
-#: templates/part.listfolder.php:15
-msgid "Collapse"
+#: templates/part.navigation.unreadfeed.php:8
+msgid "Unread articles"
 msgstr ""
 
-#: templates/part.listfolder.php:44 templates/part.listfolder.php:60
-msgid "Delete folder"
+#: templates/part.navigation.unreadfeed.php:12
+msgid "All articles"
 msgstr ""
 
-#: templates/part.listfolder.php:67
-msgid "Rename folder"
+#: templates/part.settings.php:8
+msgid "Settings"
 msgstr ""
 
 #: templates/part.settings.php:13
-msgid "Settings"
+msgid "Compact view"
+msgstr ""
+
+#: templates/part.settings.php:20
+msgid "Show unread articles"
+msgstr ""
+
+#: templates/part.settings.php:27
+msgid "Order by oldest first"
 msgstr ""
 
-#: templates/part.settings.php:15
-msgid "Use compact view"
+#: templates/part.settings.php:34
+msgid "Disable mark read during scrolling"
 msgstr ""
 
-#: templates/part.settings.php:17
+#: templates/part.settings.php:40
 msgid "Subscriptions (OPML)"
 msgstr ""
 
-#: templates/part.settings.php:21 templates/part.settings.php:24
-#: templates/part.settings.php:52 templates/part.settings.php:57
+#: templates/part.settings.php:47 templates/part.settings.php:52
+#: templates/part.settings.php:84 templates/part.settings.php:89
 msgid "Import"
 msgstr ""
 
-#: templates/part.settings.php:28 templates/part.settings.php:32
-#: templates/part.settings.php:36 templates/part.settings.php:38
-#: templates/part.settings.php:60 templates/part.settings.php:64
-#: templates/part.settings.php:68 templates/part.settings.php:70
+#: templates/part.settings.php:55 templates/part.settings.php:60
+#: templates/part.settings.php:65 templates/part.settings.php:68
+#: templates/part.settings.php:92 templates/part.settings.php:96
+#: templates/part.settings.php:100 templates/part.settings.php:103
 msgid "Export"
 msgstr ""
 
-#: templates/part.settings.php:42
+#: templates/part.settings.php:72
 msgid "Error when importing: file does not contain valid OPML"
 msgstr ""
 
-#: templates/part.settings.php:48
+#: templates/part.settings.php:76
 msgid "Unread/Starred Articles"
 msgstr ""
 
-#: templates/part.settings.php:74
+#: templates/part.settings.php:107
 msgid "Error when importing: file does not contain valid JSON"
 msgstr ""
-
-#: templates/part.showall.php:5
-msgid "Show read articles"
-msgstr ""
-
-#: templates/part.showall.php:11
-msgid "Hide read articles"
-msgstr ""