Regenerate templates.

1 files changed, 623 insertions, 605 deletions

diff --git a/messages.pot b/messages.pot
index 1f8595a6e..71c935447 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-21 23:29+0400\n"
+"POT-Creation-Date: 2013-03-24 13:50+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: backend.php:71
 msgid "Use default"
@@ -119,8 +120,8 @@ msgstr ""
 
 #: db-updater.php:94 db-updater.php:163 db-updater.php:176 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
-#: register.php:371 register.php:381 register.php:393
-#: classes/handler/public.php:610 classes/handler/public.php:698
+#: register.php:334 register.php:344 register.php:356
+#: classes/handler/public.php:612 classes/handler/public.php:700
 msgid "Return to Tiny Tiny RSS"
 msgstr ""
 
@@ -162,10 +163,11 @@ msgstr ""
 
 #: db-updater.php:158
 #, php-format
-msgid ""
-"Finished. Performed <b>%d</b> update(s) up to schema\n"
-"\t\t\tversion <b>%d</b>."
-msgstr ""
+msgid "Finished. Performed <b>%d</b> update up to schema version <b>%d</b>."
+msgid_plural ""
+"Finished. Performed <b>%d</b> updates up to schema version <b>%d</b>."
+msgstr[0] ""
+msgstr[1] ""
 
 #: db-updater.php:168
 msgid "Your database schema is from a newer version of Tiny Tiny RSS."
@@ -195,7 +197,7 @@ msgid ""
 msgstr ""
 
 #: errors.php:15
-msgid "Backend sanity check failed"
+msgid "Backend sanity check failed."
 msgstr ""
 
 #: errors.php:17
@@ -232,175 +234,174 @@ msgstr ""
 
 #: errors.php:31
 msgid ""
-"Your version of MySQL is not currently supported. Please see\n"
-"\t\tofficial site for more information."
+"Your version of MySQL is not currently supported. Please see official site "
+"for more information."
 msgstr ""
 
-#: errors.php:36
+#: errors.php:35
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: index.php:121 index.php:151 index.php:257 prefs.php:83
-#: classes/backend.php:5 classes/pref/labels.php:296
-#: classes/pref/filters.php:609 classes/pref/feeds.php:1296
+#: index.php:118 index.php:148 index.php:254 prefs.php:83
+#: classes/backend.php:5 classes/pref/filters.php:609
+#: classes/pref/labels.php:296 classes/pref/feeds.php:1296
 #: plugins/digest/digest_body.php:49 js/viewfeed.js:1205
 msgid "Loading, please wait..."
 msgstr ""
 
-#: index.php:131 index.php:203
+#: index.php:128 index.php:200
 msgid "Communication problem with server."
 msgstr ""
 
-#: index.php:137 index.php:211
+#: index.php:134 index.php:208
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
-#: index.php:165
+#: index.php:162
 msgid "Collapse feedlist"
 msgstr ""
 
-#: index.php:168
+#: index.php:165
 msgid "Show articles"
 msgstr ""
 
-#: index.php:171
+#: index.php:168
 msgid "Adaptive"
 msgstr ""
 
-#: index.php:172
+#: index.php:169
 msgid "All Articles"
 msgstr ""
 
-#: index.php:173 include/functions.php:1917 classes/feeds.php:106
+#: index.php:170 include/functions.php:1926 classes/feeds.php:106
 msgid "Starred"
 msgstr ""
 
-#: index.php:174 include/functions.php:1918 classes/feeds.php:107
+#: index.php:171 include/functions.php:1927 classes/feeds.php:107
 msgid "Published"
 msgstr ""
 
-#: index.php:175 classes/feeds.php:93 classes/feeds.php:105
+#: index.php:172 classes/feeds.php:93 classes/feeds.php:105
 msgid "Unread"
 msgstr ""
 
-#: index.php:176
+#: index.php:173
 msgid "Ignore Scoring"
 msgstr ""
 
-#: index.php:177
+#: index.php:174
 msgid "Updated"
 msgstr ""
 
-#: index.php:180
+#: index.php:177
 msgid "Sort articles"
 msgstr ""
 
-#: index.php:183
+#: index.php:180
 msgid "Default"
 msgstr ""
 
-#: index.php:184
+#: index.php:181
 msgid "Date"
 msgstr ""
 
-#: index.php:185 include/localized_schema.php:3
+#: index.php:182 include/localized_schema.php:3
 msgid "Title"
 msgstr ""
 
-#: index.php:186
+#: index.php:183
 msgid "Score"
 msgstr ""
 
-#: index.php:192 classes/pref/feeds.php:535 classes/pref/feeds.php:758
+#: index.php:189 classes/pref/feeds.php:535 classes/pref/feeds.php:758
 msgid "Update"
 msgstr ""
 
-#: index.php:196 index.php:226 include/functions.php:1908
+#: index.php:193 index.php:223 include/functions.php:1917
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:406 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
 msgid "Mark as read"
 msgstr ""
 
-#: index.php:216
+#: index.php:213
 msgid "Actions..."
 msgstr ""
 
-#: index.php:218
+#: index.php:215
 msgid "Preferences..."
 msgstr ""
 
-#: index.php:219
+#: index.php:216
 msgid "Search..."
 msgstr ""
 
-#: index.php:220
+#: index.php:217
 msgid "Feed actions:"
 msgstr ""
 
-#: index.php:221 classes/handler/public.php:540
+#: index.php:218 classes/handler/public.php:542
 msgid "Subscribe to feed..."
 msgstr ""
 
-#: index.php:222
+#: index.php:219
 msgid "Edit this feed..."
 msgstr ""
 
-#: index.php:223
+#: index.php:220
 msgid "Rescore feed"
 msgstr ""
 
-#: index.php:224 classes/pref/feeds.php:684 classes/pref/feeds.php:1269
+#: index.php:221 classes/pref/feeds.php:684 classes/pref/feeds.php:1269
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr ""
 
-#: index.php:225
+#: index.php:222
 msgid "All feeds:"
 msgstr ""
 
-#: index.php:227
+#: index.php:224
 msgid "(Un)hide read feeds"
 msgstr ""
 
-#: index.php:228
+#: index.php:225
 msgid "Other actions:"
 msgstr ""
 
-#: index.php:230
+#: index.php:227
 msgid "Switch to digest..."
 msgstr ""
 
-#: index.php:232
+#: index.php:229
 msgid "Show tag cloud..."
 msgstr ""
 
-#: index.php:234 include/functions.php:1894
+#: index.php:231 include/functions.php:1903
 msgid "Toggle widescreen mode"
 msgstr ""
 
-#: index.php:236
+#: index.php:233
 msgid "Select by tags..."
 msgstr ""
 
-#: index.php:237
+#: index.php:234
 msgid "Create label..."
 msgstr ""
 
-#: index.php:238
+#: index.php:235
 msgid "Create filter..."
 msgstr ""
 
-#: index.php:239
+#: index.php:236
 msgid "Keyboard shortcuts help"
 msgstr ""
 
-#: index.php:241 mobile/mobile-functions.php:69
-#: mobile/mobile-functions.php:244 plugins/digest/digest_body.php:63
+#: index.php:238 plugins/digest/digest_body.php:63
 msgid "Logout"
 msgstr ""
 
-#: prefs.php:26 prefs.php:103 include/functions.php:1920
+#: prefs.php:26 prefs.php:103 include/functions.php:1929
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr ""
@@ -422,8 +423,8 @@ msgstr ""
 msgid "Filters"
 msgstr ""
 
-#: prefs.php:112 mobile/mobile-functions.php:205 include/functions.php:1127
-#: include/functions.php:1748 classes/pref/labels.php:90
+#: prefs.php:112 include/functions.php:1136 include/functions.php:1757
+#: classes/pref/labels.php:90
 msgid "Labels"
 msgstr ""
 
@@ -431,7 +432,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: register.php:186 include/login_form.php:212
+#: register.php:186 include/login_form.php:228
 msgid "Create new account"
 msgstr ""
 
@@ -454,11 +455,11 @@ msgstr ""
 msgid "Check availability"
 msgstr ""
 
-#: register.php:226
+#: register.php:226 classes/handler/public.php:743
 msgid "Email:"
 msgstr ""
 
-#: register.php:229
+#: register.php:229 classes/handler/public.php:748
 msgid "How much is two plus two:"
 msgstr ""
 
@@ -478,11 +479,11 @@ msgstr ""
 msgid "Registration failed."
 msgstr ""
 
-#: register.php:368
+#: register.php:331
 msgid "Account created successfully."
 msgstr ""
 
-#: register.php:390
+#: register.php:353
 msgid "New user registrations are currently closed."
 msgstr ""
 
@@ -490,376 +491,309 @@ msgstr ""
 msgid "Tiny Tiny RSS data update script."
 msgstr ""
 
-#: mobile/login_form.php:28 include/login_form.php:209
-#: classes/handler/public.php:468
-msgid "Log in"
-msgstr ""
-
-#: mobile/login_form.php:40 include/login_form.php:169
-#: classes/handler/public.php:452
-msgid "Login:"
-msgstr ""
-
-#: mobile/login_form.php:45 include/login_form.php:178
-#: classes/handler/public.php:455
-msgid "Password:"
-msgstr ""
-
-#: mobile/login_form.php:52
-msgid "Open regular version"
-msgstr ""
-
-#: mobile/mobile-functions.php:68 mobile/mobile-functions.php:144
-#: mobile/mobile-functions.php:180 mobile/mobile-functions.php:207
-#: mobile/mobile-functions.php:243 mobile/mobile-functions.php:380
-#: mobile/prefs.php:19
-msgid "Home"
-msgstr ""
-
-#: mobile/mobile-functions.php:178 include/functions.php:1125
-#: include/functions.php:1746
-msgid "Special"
-msgstr ""
-
-#: mobile/mobile-functions.php:416
-msgid "Nothing found (click to reload feed)."
-msgstr ""
-
-#: mobile/prefs.php:24
-msgid "Enable categories"
-msgstr ""
-
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
-msgid "ON"
-msgstr ""
-
-#: mobile/prefs.php:25 mobile/prefs.php:30 mobile/prefs.php:36
-#: mobile/prefs.php:41 mobile/prefs.php:46 mobile/prefs.php:51
-msgid "OFF"
-msgstr ""
-
-#: mobile/prefs.php:29
-msgid "Browse categories like folders"
-msgstr ""
-
-#: mobile/prefs.php:35
-msgid "Show images in posts"
-msgstr ""
-
-#: mobile/prefs.php:40
-msgid "Hide read articles and feeds"
-msgstr ""
-
-#: mobile/prefs.php:45
-msgid "Sort feeds by unread count"
-msgstr ""
-
-#: mobile/prefs.php:50 include/localized_schema.php:45
-msgid "Reverse headline order (oldest first)"
-msgstr ""
-
-#: include/digest.php:131 include/functions.php:1136
-#: include/functions.php:1649 include/functions.php:1734
-#: include/functions.php:1756 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:109 include/functions.php:1145
+#: include/functions.php:1658 include/functions.php:1743
+#: include/functions.php:1765 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr ""
 
 #: include/feedbrowser.php:83
 #, php-format
-msgid "%d archived articles"
-msgstr ""
+msgid "%d archived article"
+msgid_plural "%d archived articles"
+msgstr[0] ""
+msgstr[1] ""
 
 #: include/feedbrowser.php:107
 msgid "No feeds found."
 msgstr ""
 
-#: include/functions.php:712
+#: include/functions.php:706
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: include/functions.php:1598 classes/dlg.php:369 classes/pref/filters.php:368
+#: include/functions.php:1134 include/functions.php:1755
+msgid "Special"
+msgstr ""
+
+#: include/functions.php:1607 classes/dlg.php:369 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr ""
 
-#: include/functions.php:1799
+#: include/functions.php:1808
 msgid "Starred articles"
 msgstr ""
 
-#: include/functions.php:1801
+#: include/functions.php:1810
 msgid "Published articles"
 msgstr ""
 
-#: include/functions.php:1803
+#: include/functions.php:1812
 msgid "Fresh articles"
 msgstr ""
 
-#: include/functions.php:1805 include/functions.php:1915
+#: include/functions.php:1814 include/functions.php:1924
 msgid "All articles"
 msgstr ""
 
-#: include/functions.php:1807
+#: include/functions.php:1816
 msgid "Archived articles"
 msgstr ""
 
-#: include/functions.php:1809
+#: include/functions.php:1818
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1871
+#: include/functions.php:1880
 msgid "Navigation"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1881
 msgid "Open next feed"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1882
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1874
+#: include/functions.php:1883
 msgid "Open next article"
 msgstr ""
 
-#: include/functions.php:1875
+#: include/functions.php:1884
 msgid "Open previous article"
 msgstr ""
 
-#: include/functions.php:1876
+#: include/functions.php:1885
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1877
+#: include/functions.php:1886
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1878
+#: include/functions.php:1887
 msgid "Show search dialog"
 msgstr ""
 
-#: include/functions.php:1879
+#: include/functions.php:1888
 msgid "Article"
 msgstr ""
 
-#: include/functions.php:1880
+#: include/functions.php:1889
 msgid "Toggle starred"
 msgstr ""
 
-#: include/functions.php:1881
+#: include/functions.php:1890
 msgid "Toggle published"
 msgstr ""
 
-#: include/functions.php:1882
+#: include/functions.php:1891
 msgid "Toggle unread"
 msgstr ""
 
-#: include/functions.php:1883
+#: include/functions.php:1892
 msgid "Edit tags"
 msgstr ""
 
-#: include/functions.php:1884
+#: include/functions.php:1893
 msgid "Dismiss selected"
 msgstr ""
 
-#: include/functions.php:1885
+#: include/functions.php:1894
 msgid "Dismiss read"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1895
 msgid "Open in new window"
 msgstr ""
 
-#: include/functions.php:1887 js/viewfeed.js:1842
+#: include/functions.php:1896 js/viewfeed.js:1844
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1888 js/viewfeed.js:1836
+#: include/functions.php:1897 js/viewfeed.js:1838
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1889
+#: include/functions.php:1898
 msgid "Scroll down"
 msgstr ""
 
-#: include/functions.php:1890
+#: include/functions.php:1899
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1891
+#: include/functions.php:1900
 msgid "Select article under cursor"
 msgstr ""
 
-#: include/functions.php:1892
+#: include/functions.php:1901
 msgid "Email article"
 msgstr ""
 
-#: include/functions.php:1893
+#: include/functions.php:1902
 msgid "Close/collapse article"
 msgstr ""
 
-#: include/functions.php:1895 plugins/embed_original/init.php:33
+#: include/functions.php:1904 plugins/embed_original/init.php:33
 msgid "Toggle embed original"
 msgstr ""
 
-#: include/functions.php:1896
+#: include/functions.php:1905
 msgid "Article selection"
 msgstr ""
 
-#: include/functions.php:1897
+#: include/functions.php:1906
 msgid "Select all articles"
 msgstr ""
 
-#: include/functions.php:1898
+#: include/functions.php:1907
 msgid "Select unread"
 msgstr ""
 
-#: include/functions.php:1899
+#: include/functions.php:1908
 msgid "Select starred"
 msgstr ""
 
-#: include/functions.php:1900
+#: include/functions.php:1909
 msgid "Select published"
 msgstr ""
 
-#: include/functions.php:1901
+#: include/functions.php:1910
 msgid "Invert selection"
 msgstr ""
 
-#: include/functions.php:1902
+#: include/functions.php:1911
 msgid "Deselect everything"
 msgstr ""
 
-#: include/functions.php:1903 classes/pref/feeds.php:488
+#: include/functions.php:1912 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr ""
 
-#: include/functions.php:1904
+#: include/functions.php:1913
 msgid "Refresh current feed"
 msgstr ""
 
-#: include/functions.php:1905
+#: include/functions.php:1914
 msgid "Un/hide read feeds"
 msgstr ""
 
-#: include/functions.php:1906 classes/pref/feeds.php:1240
+#: include/functions.php:1915 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr ""
 
-#: include/functions.php:1907 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1916 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr ""
 
-#: include/functions.php:1909
+#: include/functions.php:1918
 msgid "Reverse headlines"
 msgstr ""
 
-#: include/functions.php:1910
+#: include/functions.php:1919
 msgid "Debug feed update"
 msgstr ""
 
-#: include/functions.php:1911 js/FeedTree.js:178
+#: include/functions.php:1920 js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr ""
 
-#: include/functions.php:1912
+#: include/functions.php:1921
 msgid "Un/collapse current category"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1922
 msgid "Toggle combined mode"
 msgstr ""
 
-#: include/functions.php:1914
+#: include/functions.php:1923
 msgid "Go to"
 msgstr ""
 
-#: include/functions.php:1916
+#: include/functions.php:1925
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1919
+#: include/functions.php:1928
 msgid "Tag cloud"
 msgstr ""
 
-#: include/functions.php:1921
+#: include/functions.php:1930
 msgid "Other"
 msgstr ""
 
-#: include/functions.php:1922 classes/pref/labels.php:281
+#: include/functions.php:1931 classes/pref/labels.php:281
 msgid "Create label"
 msgstr ""
 
-#: include/functions.php:1923 classes/pref/filters.php:587
+#: include/functions.php:1932 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr ""
 
-#: include/functions.php:1924
+#: include/functions.php:1933
 msgid "Un/collapse sidebar"
 msgstr ""
 
-#: include/functions.php:1925
+#: include/functions.php:1934
 msgid "Show help dialog"
 msgstr ""
 
-#: include/functions.php:2406
+#: include/functions.php:2415
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2895 js/viewfeed.js:1929
+#: include/functions.php:2897 js/viewfeed.js:1931
 msgid "Click to play"
 msgstr ""
 
-#: include/functions.php:2896 js/viewfeed.js:1928
+#: include/functions.php:2898 js/viewfeed.js:1930
 msgid "Play"
 msgstr ""
 
-#: include/functions.php:3018
+#: include/functions.php:3015
 msgid " - "
 msgstr ""
 
-#: include/functions.php:3040 include/functions.php:3357 classes/rpc.php:360
+#: include/functions.php:3037 include/functions.php:3329 classes/rpc.php:360
 msgid "no tags"
 msgstr ""
 
-#: include/functions.php:3050 classes/feeds.php:650
+#: include/functions.php:3047 classes/feeds.php:649
 msgid "Edit tags for this article"
 msgstr ""
 
-#: include/functions.php:3079 classes/feeds.php:606
+#: include/functions.php:3076 classes/feeds.php:605
 msgid "Originally from:"
 msgstr ""
 
-#: include/functions.php:3092 classes/feeds.php:619 classes/pref/feeds.php:507
+#: include/functions.php:3089 classes/feeds.php:618 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr ""
 
-#: include/functions.php:3121
-msgid "Related"
-msgstr ""
-
-#: include/functions.php:3148 classes/dlg.php:43 classes/dlg.php:162
-#: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:506
-#: classes/dlg.php:541 classes/dlg.php:572 classes/dlg.php:606
-#: classes/dlg.php:618 classes/backend.php:105 classes/pref/users.php:106
-#: classes/pref/filters.php:108 classes/pref/feeds.php:1553
-#: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
-#: plugins/import_export/init.php:431 plugins/share/init.php:67
+#: include/functions.php:3120 classes/backend.php:105 classes/dlg.php:43
+#: classes/dlg.php:162 classes/dlg.php:185 classes/dlg.php:222
+#: classes/dlg.php:506 classes/dlg.php:541 classes/dlg.php:572
+#: classes/dlg.php:606 classes/dlg.php:618 classes/pref/filters.php:108
+#: classes/pref/feeds.php:1553 classes/pref/feeds.php:1624
+#: classes/pref/users.php:106 plugins/import_export/init.php:409
+#: plugins/import_export/init.php:433 plugins/share/init.php:67
 #: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr ""
 
-#: include/functions.php:3382
+#: include/functions.php:3354
 msgid "(edit note)"
 msgstr ""
 
-#: include/functions.php:3615
+#: include/functions.php:3587
 msgid "unknown type"
 msgstr ""
 
-#: include/functions.php:3671
+#: include/functions.php:3643
 msgid "Attachments"
 msgstr ""
 
@@ -896,7 +830,7 @@ msgstr ""
 msgid "Assign tags"
 msgstr ""
 
-#: include/localized_schema.php:14 js/viewfeed.js:1893
+#: include/localized_schema.php:14 js/viewfeed.js:1895
 msgid "Assign label"
 msgstr ""
 
@@ -1026,6 +960,10 @@ msgstr ""
 msgid "Sort feeds by unread articles count"
 msgstr ""
 
+#: include/localized_schema.php:45
+msgid "Reverse headline order (oldest first)"
+msgstr ""
+
 #: include/localized_schema.php:46
 msgid "Enable e-mail digest"
 msgstr ""
@@ -1102,112 +1040,62 @@ msgstr ""
 msgid "Assign articles to labels automatically"
 msgstr ""
 
-#: include/login_form.php:185 classes/handler/public.php:458
-msgid "Language:"
-msgstr ""
-
-#: include/login_form.php:193
-msgid "Profile:"
-msgstr ""
-
-#: include/login_form.php:197 classes/handler/public.php:212
-#: classes/rpc.php:64 classes/dlg.php:98
-msgid "Default profile"
-msgstr ""
-
-#: include/login_form.php:205
-msgid "Use less traffic"
-msgstr ""
-
-#: classes/article.php:25
-msgid "Article not found."
-msgstr ""
-
-#: classes/handler/public.php:393 plugins/bookmarklets/init.php:38
-msgid "Share with Tiny Tiny RSS"
-msgstr ""
-
-#: classes/handler/public.php:401
-msgid "Title:"
-msgstr ""
-
-#: classes/handler/public.php:403 classes/dlg.php:665
-#: classes/pref/feeds.php:505 classes/pref/feeds.php:734
-#: plugins/instances/init.php:215
-msgid "URL:"
-msgstr ""
-
-#: classes/handler/public.php:405
-msgid "Content:"
-msgstr ""
-
-#: classes/handler/public.php:407
-msgid "Labels:"
+#: include/login_form.php:183 classes/handler/public.php:454
+#: classes/handler/public.php:738
+msgid "Login:"
 msgstr ""
 
-#: classes/handler/public.php:426
-msgid "Shared article will appear in the Published feed."
+#: include/login_form.php:192 classes/handler/public.php:457
+msgid "Password:"
 msgstr ""
 
-#: classes/handler/public.php:428
-msgid "Share"
+#: include/login_form.php:197
+msgid "I forgot my password"
 msgstr ""
 
-#: classes/handler/public.php:429 classes/handler/public.php:471
-#: classes/dlg.php:296 classes/dlg.php:348 classes/dlg.php:408
-#: classes/dlg.php:439 classes/dlg.php:650 classes/dlg.php:700
-#: classes/dlg.php:749 classes/pref/users.php:194 classes/pref/labels.php:81
-#: classes/pref/filters.php:349 classes/pref/filters.php:729
-#: classes/pref/filters.php:798 classes/pref/filters.php:865
-#: classes/pref/feeds.php:701 classes/pref/feeds.php:849
-#: plugins/mail/init.php:131 plugins/note/init.php:55
-#: plugins/instances/init.php:251
-msgid "Cancel"
+#: include/login_form.php:201 classes/handler/public.php:460
+msgid "Language:"
 msgstr ""
 
-#: classes/handler/public.php:450
-msgid "Not logged in"
+#: include/login_form.php:209
+msgid "Profile:"
 msgstr ""
 
-#: classes/handler/public.php:510
-msgid "Incorrect username or password"
+#: include/login_form.php:213 classes/dlg.php:98
+#: classes/handler/public.php:214 classes/rpc.php:64
+msgid "Default profile"
 msgstr ""
 
-#: classes/handler/public.php:546 classes/handler/public.php:643
-#, php-format
-msgid "Already subscribed to <b>%s</b>."
+#: include/login_form.php:221
+msgid "Use less traffic"
 msgstr ""
 
-#: classes/handler/public.php:549 classes/handler/public.php:634
-#, php-format
-msgid "Subscribed to <b>%s</b>."
+#: include/login_form.php:225 classes/handler/public.php:470
+msgid "Log in"
 msgstr ""
 
-#: classes/handler/public.php:552 classes/handler/public.php:637
-#, php-format
-msgid "Could not subscribe to <b>%s</b>."
+#: classes/article.php:25
+msgid "Article not found."
 msgstr ""
 
-#: classes/handler/public.php:555 classes/handler/public.php:640
-#, php-format
-msgid "No feeds found in <b>%s</b>."
+#: classes/backend.php:34
+msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: classes/handler/public.php:558 classes/handler/public.php:646
-msgid "Multiple feed URLs found."
+#: classes/backend.php:57
+msgid "Shift"
 msgstr ""
 
-#: classes/handler/public.php:562 classes/handler/public.php:651
-#, php-format
-msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
+#: classes/backend.php:60
+msgid "Ctrl"
 msgstr ""
 
-#: classes/handler/public.php:580 classes/handler/public.php:669
-msgid "Subscribe to selected feed"
+#: classes/backend.php:84
+msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr ""
 
-#: classes/handler/public.php:605 classes/handler/public.php:693
-msgid "Edit subscription options"
+#: classes/backend.php:99
+msgid "Help topic not found."
 msgstr ""
 
 #: classes/dlg.php:22
@@ -1216,30 +1104,30 @@ msgid ""
 "preferences to see your new data."
 msgstr ""
 
-#: classes/dlg.php:55 classes/pref/users.php:378 classes/pref/labels.php:272
-#: classes/pref/filters.php:230 classes/pref/filters.php:277
-#: classes/pref/filters.php:578 classes/pref/filters.php:657
-#: classes/pref/filters.php:684 classes/pref/feeds.php:1228
+#: classes/dlg.php:55 classes/pref/filters.php:230
+#: classes/pref/filters.php:277 classes/pref/filters.php:578
+#: classes/pref/filters.php:657 classes/pref/filters.php:684
+#: classes/pref/labels.php:272 classes/pref/feeds.php:1228
 #: classes/pref/feeds.php:1498 classes/pref/feeds.php:1567
-#: plugins/instances/init.php:287
+#: classes/pref/users.php:360 plugins/instances/init.php:287
 msgid "Select"
 msgstr ""
 
-#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/users.php:381
-#: classes/pref/labels.php:275 classes/pref/filters.php:233
+#: classes/dlg.php:58 classes/feeds.php:92 classes/pref/filters.php:233
 #: classes/pref/filters.php:280 classes/pref/filters.php:581
 #: classes/pref/filters.php:660 classes/pref/filters.php:687
-#: classes/pref/feeds.php:1231 classes/pref/feeds.php:1501
-#: classes/pref/feeds.php:1570 plugins/instances/init.php:290
+#: classes/pref/labels.php:275 classes/pref/feeds.php:1231
+#: classes/pref/feeds.php:1501 classes/pref/feeds.php:1570
+#: classes/pref/users.php:363 plugins/instances/init.php:290
 msgid "All"
 msgstr ""
 
-#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/users.php:383
-#: classes/pref/labels.php:277 classes/pref/filters.php:235
+#: classes/dlg.php:60 classes/feeds.php:95 classes/pref/filters.php:235
 #: classes/pref/filters.php:282 classes/pref/filters.php:583
 #: classes/pref/filters.php:662 classes/pref/filters.php:689
-#: classes/pref/feeds.php:1233 classes/pref/feeds.php:1503
-#: classes/pref/feeds.php:1572 plugins/instances/init.php:292
+#: classes/pref/labels.php:277 classes/pref/feeds.php:1233
+#: classes/pref/feeds.php:1503 classes/pref/feeds.php:1572
+#: classes/pref/users.php:365 plugins/instances/init.php:292
 msgid "None"
 msgstr ""
 
@@ -1306,13 +1194,13 @@ msgstr ""
 msgid "Available feeds"
 msgstr ""
 
-#: classes/dlg.php:268 classes/pref/users.php:155 classes/pref/feeds.php:557
-#: classes/pref/feeds.php:783
+#: classes/dlg.php:268 classes/pref/feeds.php:557 classes/pref/feeds.php:783
+#: classes/pref/users.php:155
 msgid "Authentication"
 msgstr ""
 
-#: classes/dlg.php:272 classes/dlg.php:727 classes/pref/users.php:438
-#: classes/pref/feeds.php:563 classes/pref/feeds.php:787
+#: classes/dlg.php:272 classes/dlg.php:727 classes/pref/feeds.php:563
+#: classes/pref/feeds.php:787 classes/pref/users.php:420
 msgid "Login"
 msgstr ""
 
@@ -1333,8 +1221,20 @@ msgstr ""
 msgid "More feeds"
 msgstr ""
 
-#: classes/dlg.php:316 classes/dlg.php:407 classes/pref/users.php:368
-#: classes/pref/filters.php:574 classes/pref/feeds.php:1224 js/tt-rss.js:166
+#: classes/dlg.php:296 classes/dlg.php:348 classes/dlg.php:408
+#: classes/dlg.php:439 classes/dlg.php:650 classes/dlg.php:700
+#: classes/dlg.php:749 classes/handler/public.php:431
+#: classes/handler/public.php:473 classes/pref/filters.php:349
+#: classes/pref/filters.php:729 classes/pref/filters.php:798
+#: classes/pref/filters.php:865 classes/pref/labels.php:81
+#: classes/pref/feeds.php:701 classes/pref/feeds.php:849
+#: classes/pref/users.php:194 plugins/instances/init.php:251
+#: plugins/mail/init.php:131 plugins/note/init.php:55
+msgid "Cancel"
+msgstr ""
+
+#: classes/dlg.php:316 classes/dlg.php:407 classes/pref/filters.php:574
+#: classes/pref/feeds.php:1224 classes/pref/users.php:350 js/tt-rss.js:166
 msgid "Search"
 msgstr ""
 
@@ -1350,9 +1250,10 @@ msgstr ""
 msgid "limit:"
 msgstr ""
 
-#: classes/dlg.php:347 classes/pref/users.php:394 classes/pref/labels.php:284
-#: classes/pref/filters.php:339 classes/pref/filters.php:596
-#: classes/pref/feeds.php:674 plugins/instances/init.php:297
+#: classes/dlg.php:347 classes/pref/filters.php:339
+#: classes/pref/filters.php:596 classes/pref/labels.php:284
+#: classes/pref/feeds.php:674 classes/pref/users.php:376
+#: plugins/instances/init.php:297
 msgid "Remove"
 msgstr ""
 
@@ -1372,11 +1273,11 @@ msgstr ""
 msgid "Tags for this article (separated by commas):"
 msgstr ""
 
-#: classes/dlg.php:437 classes/dlg.php:648 classes/pref/users.php:192
-#: classes/pref/labels.php:79 classes/pref/filters.php:346
-#: classes/pref/feeds.php:700 classes/pref/feeds.php:846
-#: plugins/nsfw/init.php:86 plugins/note/init.php:53
-#: plugins/owncloud/init.php:62 plugins/instances/init.php:248
+#: classes/dlg.php:437 classes/dlg.php:648 classes/pref/filters.php:346
+#: classes/pref/labels.php:79 classes/pref/feeds.php:700
+#: classes/pref/feeds.php:846 classes/pref/users.php:192
+#: plugins/instances/init.php:248 plugins/note/init.php:53
+#: plugins/nsfw/init.php:86 plugins/owncloud/init.php:62
 msgid "Save"
 msgstr ""
 
@@ -1427,7 +1328,7 @@ msgid ""
 "php"
 msgstr ""
 
-#: classes/dlg.php:601 classes/pref/users.php:390
+#: classes/dlg.php:601 classes/pref/users.php:372
 msgid "Details"
 msgstr ""
 
@@ -1451,6 +1352,12 @@ msgstr ""
 msgid "Instance"
 msgstr ""
 
+#: classes/dlg.php:665 classes/handler/public.php:405
+#: classes/pref/feeds.php:505 classes/pref/feeds.php:734
+#: plugins/instances/init.php:215
+msgid "URL:"
+msgstr ""
+
 #: classes/dlg.php:668 plugins/instances/init.php:218
 #: plugins/instances/init.php:315
 msgid "Instance URL"
@@ -1535,8 +1442,8 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: classes/feeds.php:125 classes/feeds.php:130 plugins/mailto/init.php:28
-#: plugins/mail/init.php:28
+#: classes/feeds.php:125 classes/feeds.php:130 plugins/mail/init.php:28
+#: plugins/mailto/init.php:28
 msgid "Forward by email"
 msgstr ""
 
@@ -1544,263 +1451,200 @@ msgstr ""
 msgid "Feed:"
 msgstr ""
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:794
 msgid "Feed not found."
 msgstr ""
 
-#: classes/feeds.php:496
+#: classes/feeds.php:498
 msgid "mark as read"
 msgstr ""
 
-#: classes/feeds.php:551
+#: classes/feeds.php:550
 msgid "Collapse article"
 msgstr ""
 
-#: classes/feeds.php:696
+#: classes/feeds.php:695
 msgid "No unread articles found to display."
 msgstr ""
 
-#: classes/feeds.php:699
+#: classes/feeds.php:698
 msgid "No updated articles found to display."
 msgstr ""
 
-#: classes/feeds.php:702
+#: classes/feeds.php:701
 msgid "No starred articles found to display."
 msgstr ""
 
-#: classes/feeds.php:706
+#: classes/feeds.php:705
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: classes/feeds.php:708
+#: classes/feeds.php:707
 msgid "No articles found to display."
 msgstr ""
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:722 classes/feeds.php:910
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:732 classes/feeds.php:920
 msgid "Some feeds have update errors (click for details)"
 msgstr ""
 
-#: classes/feeds.php:894
+#: classes/feeds.php:900
 msgid "No feed selected."
 msgstr ""
 
-#: classes/backend.php:34
-msgid "Keyboard Shortcuts"
-msgstr ""
-
-#: classes/backend.php:57
-msgid "Shift"
+#: classes/handler/public.php:395 plugins/bookmarklets/init.php:38
+msgid "Share with Tiny Tiny RSS"
 msgstr ""
 
-#: classes/backend.php:60
-msgid "Ctrl"
+#: classes/handler/public.php:403
+msgid "Title:"
 msgstr ""
 
-#: classes/backend.php:84
-msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
+#: classes/handler/public.php:407
+msgid "Content:"
 msgstr ""
 
-#: classes/backend.php:99
-msgid "Help topic not found."
+#: classes/handler/public.php:409
+msgid "Labels:"
 msgstr ""
 
-#: classes/opml.php:28 classes/opml.php:33
-msgid "OPML Utility"
+#: classes/handler/public.php:428
+msgid "Shared article will appear in the Published feed."
 msgstr ""
 
-#: classes/opml.php:37
-msgid "Importing OPML..."
+#: classes/handler/public.php:430
+msgid "Share"
 msgstr ""
 
-#: classes/opml.php:41
-msgid "Return to preferences"
+#: classes/handler/public.php:452
+msgid "Not logged in"
 msgstr ""
 
-#: classes/opml.php:270
-#, php-format
-msgid "Adding feed: %s"
+#: classes/handler/public.php:512
+msgid "Incorrect username or password"
 msgstr ""
 
-#: classes/opml.php:281
+#: classes/handler/public.php:548 classes/handler/public.php:645
 #, php-format
-msgid "Duplicate feed: %s"
+msgid "Already subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/opml.php:295
+#: classes/handler/public.php:551 classes/handler/public.php:636
 #, php-format
-msgid "Adding label %s"
+msgid "Subscribed to <b>%s</b>."
 msgstr ""
 
-#: classes/opml.php:298
+#: classes/handler/public.php:554 classes/handler/public.php:639
 #, php-format
-msgid "Duplicate label: %s"
+msgid "Could not subscribe to <b>%s</b>."
 msgstr ""
 
-#: classes/opml.php:310
+#: classes/handler/public.php:557 classes/handler/public.php:642
 #, php-format
-msgid "Setting preference key %s to %s"
+msgid "No feeds found in <b>%s</b>."
 msgstr ""
 
-#: classes/opml.php:339
-msgid "Adding filter..."
+#: classes/handler/public.php:560 classes/handler/public.php:648
+msgid "Multiple feed URLs found."
 msgstr ""
 
-#: classes/opml.php:416
+#: classes/handler/public.php:564 classes/handler/public.php:653
 #, php-format
-msgid "Processing category: %s"
-msgstr ""
-
-#: classes/opml.php:468
-msgid "Error: please upload OPML file."
-msgstr ""
-
-#: classes/opml.php:475
-msgid "Error while parsing document."
-msgstr ""
-
-#: classes/pref/users.php:6 plugins/instances/init.php:157
-msgid "Your access level is insufficient to open this tab."
+msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr ""
 
-#: classes/pref/users.php:27
-msgid "User details"
+#: classes/handler/public.php:582 classes/handler/public.php:671
+msgid "Subscribe to selected feed"
 msgstr ""
 
-#: classes/pref/users.php:41
-msgid "User not found"
+#: classes/handler/public.php:607 classes/handler/public.php:695
+msgid "Edit subscription options"
 msgstr ""
 
-#: classes/pref/users.php:60 classes/pref/users.php:440
-msgid "Registered"
+#: classes/handler/public.php:724 classes/handler/public.php:753
+#: classes/pref/users.php:378
+msgid "Reset password"
 msgstr ""
 
-#: classes/pref/users.php:61
-msgid "Last logged in"
+#: classes/handler/public.php:764
+msgid "Some of the required form parameters are missing or incorrect."
 msgstr ""
 
-#: classes/pref/users.php:68
-msgid "Subscribed feeds count"
+#: classes/handler/public.php:766 classes/handler/public.php:782
+#: classes/handler/public.php:787
+msgid "Go back"
 msgstr ""
 
-#: classes/pref/users.php:72
-msgid "Subscribed feeds"
+#: classes/handler/public.php:778
+msgid "Completed."
 msgstr ""
 
-#: classes/pref/users.php:122
-msgid "User Editor"
+#: classes/handler/public.php:781
+msgid "Sorry, login and email combination not found."
 msgstr ""
 
-#: classes/pref/users.php:158
-msgid "Access level: "
+#: classes/handler/public.php:786
+msgid "Form secret key incorrect. Please enable cookies and try again."
 msgstr ""
 
-#: classes/pref/users.php:171
-msgid "Change password to"
+#: classes/opml.php:28 classes/opml.php:33
+msgid "OPML Utility"
 msgstr ""
 
-#: classes/pref/users.php:177 classes/pref/feeds.php:577
-#: classes/pref/feeds.php:799
-msgid "Options"
+#: classes/opml.php:37
+msgid "Importing OPML..."
 msgstr ""
 
-#: classes/pref/users.php:180
-msgid "E-mail: "
+#: classes/opml.php:41
+msgid "Return to preferences"
 msgstr ""
 
-#: classes/pref/users.php:258
+#: classes/opml.php:270
 #, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgid "Adding feed: %s"
 msgstr ""
 
-#: classes/pref/users.php:265
+#: classes/opml.php:281
 #, php-format
-msgid "Could not create user <b>%s</b>"
+msgid "Duplicate feed: %s"
 msgstr ""
 
-#: classes/pref/users.php:269
+#: classes/opml.php:295
 #, php-format
-msgid "User <b>%s</b> already exists."
+msgid "Adding label %s"
 msgstr ""
 
-#: classes/pref/users.php:292
+#: classes/opml.php:298
 #, php-format
-msgid ""
-"Changed password of user <b>%s</b>\n"
-"\t\t\t\t to <b>%s</b>"
+msgid "Duplicate label: %s"
 msgstr ""
 
-#: classes/pref/users.php:299
+#: classes/opml.php:310
 #, php-format
-msgid "Notifying <b>%s</b>."
-msgstr ""
-
-#: classes/pref/users.php:336
-msgid "[tt-rss] Password change notification"
-msgstr ""
-
-#: classes/pref/users.php:386
-msgid "Create user"
-msgstr ""
-
-#: classes/pref/users.php:392 classes/pref/filters.php:593
-#: plugins/instances/init.php:296
-msgid "Edit"
-msgstr ""
-
-#: classes/pref/users.php:396
-msgid "Reset password"
-msgstr ""
-
-#: classes/pref/users.php:439
-msgid "Access Level"
-msgstr ""
-
-#: classes/pref/users.php:441
-msgid "Last login"
-msgstr ""
-
-#: classes/pref/users.php:462 plugins/instances/init.php:337
-msgid "Click to edit"
-msgstr ""
-
-#: classes/pref/users.php:482
-msgid "No users defined."
-msgstr ""
-
-#: classes/pref/users.php:484
-msgid "No matching users found."
-msgstr ""
-
-#: classes/pref/labels.php:22
-msgid "Caption"
-msgstr ""
-
-#: classes/pref/labels.php:37
-msgid "Colors"
+msgid "Setting preference key %s to %s"
 msgstr ""
 
-#: classes/pref/labels.php:42
-msgid "Foreground:"
+#: classes/opml.php:339
+msgid "Adding filter..."
 msgstr ""
 
-#: classes/pref/labels.php:42
-msgid "Background:"
+#: classes/opml.php:416
+#, php-format
+msgid "Processing category: %s"
 msgstr ""
 
-#: classes/pref/labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
+#: classes/opml.php:468
+msgid "Error: please upload OPML file."
 msgstr ""
 
-#: classes/pref/labels.php:287
-msgid "Clear colors"
+#: classes/opml.php:475
+msgid "Error while parsing document."
 msgstr ""
 
 #: classes/pref/filters.php:57
@@ -1852,6 +1696,11 @@ msgstr ""
 msgid "Combine"
 msgstr ""
 
+#: classes/pref/filters.php:593 classes/pref/users.php:374
+#: plugins/instances/init.php:296
+msgid "Edit"
+msgstr ""
+
 #: classes/pref/filters.php:600 classes/pref/feeds.php:1283
 msgid "Rescore articles"
 msgstr ""
@@ -1893,6 +1742,31 @@ msgstr ""
 msgid "Add action"
 msgstr ""
 
+#: classes/pref/labels.php:22
+msgid "Caption"
+msgstr ""
+
+#: classes/pref/labels.php:37
+msgid "Colors"
+msgstr ""
+
+#: classes/pref/labels.php:42
+msgid "Foreground:"
+msgstr ""
+
+#: classes/pref/labels.php:42
+msgid "Background:"
+msgstr ""
+
+#: classes/pref/labels.php:232
+#, php-format
+msgid "Created label <b>%s</b>"
+msgstr ""
+
+#: classes/pref/labels.php:287
+msgid "Clear colors"
+msgstr ""
+
 #: classes/pref/prefs.php:17
 msgid "Old password cannot be blank."
 msgstr ""
@@ -2077,8 +1951,10 @@ msgstr ""
 #: classes/pref/feeds.php:217 classes/pref/feeds.php:223
 #: classes/pref/feeds.php:248
 #, php-format
-msgid "(%d feeds)"
-msgstr ""
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] ""
+msgstr[1] ""
 
 #: classes/pref/feeds.php:494
 msgid "Feed Title"
@@ -2094,6 +1970,11 @@ msgid ""
 "requires authentication, except for Twitter feeds."
 msgstr ""
 
+#: classes/pref/feeds.php:577 classes/pref/feeds.php:799
+#: classes/pref/users.php:177
+msgid "Options"
+msgstr ""
+
 #: classes/pref/feeds.php:589 classes/pref/feeds.php:803
 msgid "Hide from Popular feeds"
 msgstr ""
@@ -2302,89 +2183,113 @@ msgstr ""
 msgid "These feeds have not been updated because of errors:"
 msgstr ""
 
-#: plugins/pocket/init.php:30
-msgid "Pocket"
+#: classes/pref/users.php:6 plugins/instances/init.php:157
+msgid "Your access level is insufficient to open this tab."
 msgstr ""
 
-#: plugins/digest/digest_body.php:43
-msgid ""
-"Your browser doesn't support Javascript, which is required\n"
-"\t\t\tfor this application to function properly. Please check your\n"
-"\t\t\tbrowser settings."
+#: classes/pref/users.php:27
+msgid "User details"
 msgstr ""
 
-#: plugins/digest/digest_body.php:55
-msgid "Back to feeds"
+#: classes/pref/users.php:41
+msgid "User not found"
 msgstr ""
 
-#: plugins/digest/digest_body.php:60
-msgid "Hello,"
+#: classes/pref/users.php:60 classes/pref/users.php:422
+msgid "Registered"
 msgstr ""
 
-#: plugins/digest/digest_body.php:66
-msgid "Regular version"
+#: classes/pref/users.php:61
+msgid "Last logged in"
 msgstr ""
 
-#: plugins/close_button/init.php:24
-msgid "Close article"
+#: classes/pref/users.php:68
+msgid "Subscribed feeds count"
 msgstr ""
 
-#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
-msgid "Not work safe (click to toggle)"
+#: classes/pref/users.php:72
+msgid "Subscribed feeds"
 msgstr ""
 
-#: plugins/nsfw/init.php:53
-msgid "NSFW Plugin"
+#: classes/pref/users.php:122
+msgid "User Editor"
 msgstr ""
 
-#: plugins/nsfw/init.php:80
-msgid "Tags to consider NSFW (comma-separated)"
+#: classes/pref/users.php:158
+msgid "Access level: "
 msgstr ""
 
-#: plugins/nsfw/init.php:101
-msgid "Configuration saved."
+#: classes/pref/users.php:171
+msgid "Change password to"
 msgstr ""
 
-#: plugins/pinterest/init.php:29
-msgid "Pinterest"
+#: classes/pref/users.php:180
+msgid "E-mail: "
 msgstr ""
 
-#: plugins/auth_internal/init.php:62
-msgid "Please enter your one time password:"
+#: classes/pref/users.php:258
+#, php-format
+msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr ""
 
-#: plugins/auth_internal/init.php:185
-msgid "Password has been changed."
+#: classes/pref/users.php:265
+#, php-format
+msgid "Could not create user <b>%s</b>"
 msgstr ""
 
-#: plugins/auth_internal/init.php:187
-msgid "Old password is incorrect."
+#: classes/pref/users.php:269
+#, php-format
+msgid "User <b>%s</b> already exists."
 msgstr ""
 
-#: plugins/mailto/init.php:52 plugins/mailto/init.php:58
-#: plugins/mail/init.php:71 plugins/mail/init.php:77
-msgid "[Forwarded]"
+#: classes/pref/users.php:291
+#, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: plugins/mailto/init.php:52 plugins/mail/init.php:71
-msgid "Multiple articles"
+#: classes/pref/users.php:293
+#, php-format
+msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr ""
 
-#: plugins/mailto/init.php:74
-msgid "Clicking the following link to invoke your mail client:"
+#: classes/pref/users.php:317
+msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: plugins/mailto/init.php:78
-msgid "Forward selected article(s) by email."
+#: classes/pref/users.php:368
+msgid "Create user"
 msgstr ""
 
-#: plugins/mailto/init.php:81
-msgid ""
-"You should be able to edit the message before sending in your mail client."
+#: classes/pref/users.php:421
+msgid "Access Level"
 msgstr ""
 
-#: plugins/mailto/init.php:86
-msgid "Close this dialog"
+#: classes/pref/users.php:423
+msgid "Last login"
+msgstr ""
+
+#: classes/pref/users.php:444 plugins/instances/init.php:337
+msgid "Click to edit"
+msgstr ""
+
+#: classes/pref/users.php:464
+msgid "No users defined."
+msgstr ""
+
+#: classes/pref/users.php:466
+msgid "No matching users found."
+msgstr ""
+
+#: plugins/auth_internal/init.php:62
+msgid "Please enter your one time password:"
+msgstr ""
+
+#: plugins/auth_internal/init.php:185
+msgid "Password has been changed."
+msgstr ""
+
+#: plugins/auth_internal/init.php:187
+msgid "Old password is incorrect."
 msgstr ""
 
 #: plugins/bookmarklets/init.php:22
@@ -2410,6 +2315,53 @@ msgstr ""
 msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr ""
+
+#: plugins/digest/digest_body.php:43
+msgid ""
+"Your browser doesn't support Javascript, which is required\n"
+"\t\t\tfor this application to function properly. Please check your\n"
+"\t\t\tbrowser settings."
+msgstr ""
+
+#: plugins/digest/digest_body.php:55
+msgid "Back to feeds"
+msgstr ""
+
+#: plugins/digest/digest_body.php:60
+msgid "Hello,"
+msgstr ""
+
+#: plugins/digest/digest_body.php:66
+msgid "Regular version"
+msgstr ""
+
+#: plugins/example/init.php:38
+msgid "Example Pane"
+msgstr ""
+
+#: plugins/example/init.php:69
+msgid "Sample value"
+msgstr ""
+
+#: plugins/example/init.php:75
+msgid "Set value"
+msgstr ""
+
+#: plugins/flattr/init.php:30
+msgid "Flattr this article."
+msgstr ""
+
+#: plugins/googleplus/init.php:29
+msgid "Share on Google+"
+msgstr ""
+
+#: plugins/identica/init.php:29
+msgid "Share on identi.ca"
+msgstr ""
+
 #: plugins/import_export/init.php:64
 msgid "Import and export"
 msgstr ""
@@ -2441,25 +2393,80 @@ msgid "Could not import: unrecognized document format."
 msgstr ""
 
 #: plugins/import_export/init.php:385
-#, php-format
-msgid "Finished: %d articles processed, %d imported, %d feeds created."
+msgid "Finished: "
 msgstr ""
 
-#: plugins/import_export/init.php:391
+#: plugins/import_export/init.php:386
+#, php-format
+msgid "%d article processed, "
+msgid_plural "%d articles processed, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: plugins/import_export/init.php:387
+#, php-format
+msgid "%d imported, "
+msgid_plural "%d imported, "
+msgstr[0] ""
+msgstr[1] ""
+
+#: plugins/import_export/init.php:388
+#, php-format
+msgid "%d feed created."
+msgid_plural "%d feeds created."
+msgstr[0] ""
+msgstr[1] ""
+
+#: plugins/import_export/init.php:393
 msgid "Could not load XML document."
 msgstr ""
 
-#: plugins/import_export/init.php:403
+#: plugins/import_export/init.php:405
 msgid "Prepare data"
 msgstr ""
 
-#: plugins/import_export/init.php:424
+#: plugins/import_export/init.php:426
 #, php-format
 msgid ""
 "Could not upload file. You might need to adjust upload_max_filesize\n"
 "\t\t\t\tin PHP.ini (current value = %s)"
 msgstr ""
 
+#: plugins/instances/init.php:144
+msgid "Linked"
+msgstr ""
+
+#: plugins/instances/init.php:295
+msgid "Link instance"
+msgstr ""
+
+#: plugins/instances/init.php:307
+msgid ""
+"You can connect other instances of Tiny Tiny RSS to this one to share "
+"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+msgstr ""
+
+#: plugins/instances/init.php:317
+msgid "Last connected"
+msgstr ""
+
+#: plugins/instances/init.php:318
+msgid "Status"
+msgstr ""
+
+#: plugins/instances/init.php:319
+msgid "Stored feeds"
+msgstr ""
+
+#: plugins/mail/init.php:71 plugins/mail/init.php:77
+#: plugins/mailto/init.php:52 plugins/mailto/init.php:58
+msgid "[Forwarded]"
+msgstr ""
+
+#: plugins/mail/init.php:71 plugins/mailto/init.php:52
+msgid "Multiple articles"
+msgstr ""
+
 #: plugins/mail/init.php:92
 msgid "From:"
 msgstr ""
@@ -2476,62 +2483,61 @@ msgstr ""
 msgid "Send e-mail"
 msgstr ""
 
-#: plugins/note/init.php:28 plugins/note/note.js:11
-msgid "Edit article note"
+#: plugins/mailto/init.php:74
+msgid "Clicking the following link to invoke your mail client:"
 msgstr ""
 
-#: plugins/example/init.php:38
-msgid "Example Pane"
+#: plugins/mailto/init.php:78
+msgid "Forward selected article(s) by email."
 msgstr ""
 
-#: plugins/example/init.php:69
-msgid "Sample value"
+#: plugins/mailto/init.php:81
+msgid ""
+"You should be able to edit the message before sending in your mail client."
 msgstr ""
 
-#: plugins/example/init.php:75
-msgid "Set value"
+#: plugins/mailto/init.php:86
+msgid "Close this dialog"
 msgstr ""
 
-#: plugins/identica/init.php:29
-msgid "Share on identi.ca"
+#: plugins/note/init.php:28 plugins/note/note.js:11
+msgid "Edit article note"
 msgstr ""
 
-#: plugins/owncloud/init.php:35
-msgid "Owncloud"
+#: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
+msgid "Not work safe (click to toggle)"
 msgstr ""
 
-#: plugins/owncloud/init.php:59
-msgid "Owncloud url"
+#: plugins/nsfw/init.php:53
+msgid "NSFW Plugin"
 msgstr ""
 
-#: plugins/owncloud/init.php:74
-msgid "Bookmark on OwnCloud "
+#: plugins/nsfw/init.php:80
+msgid "Tags to consider NSFW (comma-separated)"
 msgstr ""
 
-#: plugins/instances/init.php:144
-msgid "Linked"
+#: plugins/nsfw/init.php:101
+msgid "Configuration saved."
 msgstr ""
 
-#: plugins/instances/init.php:295
-msgid "Link instance"
+#: plugins/owncloud/init.php:35
+msgid "Owncloud"
 msgstr ""
 
-#: plugins/instances/init.php:307
-msgid ""
-"You can connect other instances of Tiny Tiny RSS to this one to share "
-"Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#: plugins/owncloud/init.php:59
+msgid "Owncloud url"
 msgstr ""
 
-#: plugins/instances/init.php:317
-msgid "Last connected"
+#: plugins/owncloud/init.php:74
+msgid "Bookmark on OwnCloud "
 msgstr ""
 
-#: plugins/instances/init.php:318
-msgid "Status"
+#: plugins/pinterest/init.php:29
+msgid "Pinterest"
 msgstr ""
 
-#: plugins/instances/init.php:319
-msgid "Stored feeds"
+#: plugins/pocket/init.php:30
+msgid "Pocket"
 msgstr ""
 
 #: plugins/share/init.php:27
@@ -2542,12 +2548,8 @@ msgstr ""
 msgid "You can share this article by the following unique URL:"
 msgstr ""
 
-#: plugins/flattr/init.php:30
-msgid "Flattr this article."
-msgstr ""
-
-#: plugins/googleplus/init.php:29
-msgid "Share on Google+"
+#: plugins/tweet/init.php:29
+msgid "Share on Twitter"
 msgstr ""
 
 #: plugins/updater/init.php:295 plugins/updater/init.php:307
@@ -2573,15 +2575,11 @@ msgstr ""
 msgid "Start update"
 msgstr ""
 
-#: plugins/tweet/init.php:29
-msgid "Share on Twitter"
-msgstr ""
-
-#: js/feedlist.js:215
+#: js/feedlist.js:213
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: js/feedlist.js:417 js/feedlist.js:432 plugins/digest/digest.js:25
+#: js/feedlist.js:415 js/feedlist.js:430 plugins/digest/digest.js:25
 msgid "Mark all articles in %s as read?"
 msgstr ""
 
@@ -2655,57 +2653,57 @@ msgstr ""
 msgid "Create Filter"
 msgstr ""
 
-#: js/functions.js:1245
+#: js/functions.js:1256
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 
-#: js/functions.js:1266 js/tt-rss.js:369
+#: js/functions.js:1277 js/tt-rss.js:369
 msgid "Unsubscribe from %s?"
 msgstr ""
 
-#: js/functions.js:1375
+#: js/functions.js:1386
 msgid "Please enter category title:"
 msgstr ""
 
-#: js/functions.js:1406
+#: js/functions.js:1417
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:735
+#: js/functions.js:1608 js/tt-rss.js:350 js/tt-rss.js:735
 msgid "You can't edit this kind of feed."
 msgstr ""
 
-#: js/functions.js:1612
+#: js/functions.js:1623
 msgid "Edit Feed"
 msgstr ""
 
-#: js/functions.js:1650
+#: js/functions.js:1661
 msgid "More Feeds"
 msgstr ""
 
-#: js/functions.js:1711 js/functions.js:1821 js/prefs.js:397 js/prefs.js:427
+#: js/functions.js:1722 js/functions.js:1832 js/prefs.js:397 js/prefs.js:427
 #: js/prefs.js:459 js/prefs.js:642 js/prefs.js:662 js/prefs.js:1210
 #: js/prefs.js:1355
 msgid "No feeds are selected."
 msgstr ""
 
-#: js/functions.js:1753
+#: js/functions.js:1764
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: js/functions.js:1792
+#: js/functions.js:1803
 msgid "Feeds with update errors"
 msgstr ""
 
-#: js/functions.js:1803 js/prefs.js:1192
+#: js/functions.js:1814 js/prefs.js:1192
 msgid "Remove selected feeds?"
 msgstr ""
 
-#: js/functions.js:1904
+#: js/functions.js:1915
 msgid "Help"
 msgstr ""
 
@@ -2955,8 +2953,8 @@ msgstr ""
 
 #: js/viewfeed.js:688 js/viewfeed.js:716 js/viewfeed.js:743 js/viewfeed.js:805
 #: js/viewfeed.js:837 js/viewfeed.js:974 js/viewfeed.js:1017
-#: js/viewfeed.js:1067 js/viewfeed.js:2011 plugins/mailto/init.js:7
-#: plugins/mail/mail.js:7
+#: js/viewfeed.js:1067 js/viewfeed.js:2013 plugins/mail/mail.js:7
+#: plugins/mailto/init.js:7
 msgid "No articles are selected."
 msgstr ""
 
@@ -2965,24 +2963,34 @@ msgid "Mark all visible articles in %s as read?"
 msgstr ""
 
 #: js/viewfeed.js:982
-msgid "Delete %d selected articles in %s?"
-msgstr ""
+msgid "Delete %d selected article in %s?"
+msgid_plural "Delete %d selected articles in %s?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: js/viewfeed.js:984
-msgid "Delete %d selected articles?"
-msgstr ""
+msgid "Delete %d selected article?"
+msgid_plural "Delete %d selected articles?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: js/viewfeed.js:1026
-msgid "Archive %d selected articles in %s?"
-msgstr ""
+msgid "Archive %d selected article in %s?"
+msgid_plural "Archive %d selected articles in %s?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: js/viewfeed.js:1029
-msgid "Move %d archived articles back?"
-msgstr ""
+msgid "Move %d archived article back?"
+msgid_plural "Move %d archived articles back?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: js/viewfeed.js:1073
-msgid "Mark %d selected articles in %s as read?"
-msgstr ""
+msgid "Mark %d selected article in %s as read?"
+msgid_plural "Mark %d selected articles in %s as read?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: js/viewfeed.js:1097
 msgid "Edit article Tags"
@@ -2997,44 +3005,48 @@ msgid "No articles found to mark"
 msgstr ""
 
 #: js/viewfeed.js:1320
-msgid "Mark %d article(s) as read?"
-msgstr ""
+msgid "Mark %d article as read?"
+msgid_plural "Mark %d articles as read?"
+msgstr[0] ""
+msgstr[1] ""
 
-#: js/viewfeed.js:1822
+#: js/viewfeed.js:1824
 msgid "Open original article"
 msgstr ""
 
-#: js/viewfeed.js:1828
+#: js/viewfeed.js:1830
 msgid "Display article URL"
 msgstr ""
 
-#: js/viewfeed.js:1898
+#: js/viewfeed.js:1900
 msgid "Remove label"
 msgstr ""
 
-#: js/viewfeed.js:1922
+#: js/viewfeed.js:1924
 msgid "Playing..."
 msgstr ""
 
-#: js/viewfeed.js:1923
+#: js/viewfeed.js:1925
 msgid "Click to pause"
 msgstr ""
 
-#: js/viewfeed.js:1980
+#: js/viewfeed.js:1982
 msgid "Please enter new score for selected articles:"
 msgstr ""
 
-#: js/viewfeed.js:2022
+#: js/viewfeed.js:2024
 msgid "Please enter new score for this article:"
 msgstr ""
 
-#: js/viewfeed.js:2055
+#: js/viewfeed.js:2057
 msgid "Article URL:"
 msgstr ""
 
 #: plugins/digest/digest.js:71
-msgid "Mark %d displayed articles as read?"
-msgstr ""
+msgid "Mark %d displayed article as read?"
+msgid_plural "Mark %d displayed articles as read?"
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/digest/digest.js:289
 msgid "Error: unable to load article."
@@ -3046,7 +3058,9 @@ msgstr ""
 
 #: plugins/digest/digest.js:518
 msgid "%d more..."
-msgstr ""
+msgid_plural "%d more..."
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/digest/digest.js:525
 msgid "No unread feeds."
@@ -3060,19 +3074,19 @@ msgstr ""
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr ""
 
-#: plugins/mailto/init.js:21 plugins/mail/mail.js:21
-msgid "Forward article by email"
-msgstr ""
-
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr ""
 
 #: plugins/import_export/import_export.js:40
 msgid ""
+"Finished, exported %d article. You can download the data <a "
+"class='visibleLink' href='%u'>here</a>."
+msgid_plural ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
-msgstr ""
+msgstr[0] ""
+msgstr[1] ""
 
 #: plugins/import_export/import_export.js:93
 msgid "Data Import"
@@ -3102,6 +3116,10 @@ msgstr ""
 msgid "Please select only one instance."
 msgstr ""
 
+#: plugins/mail/mail.js:21 plugins/mailto/init.js:21
+msgid "Forward article by email"
+msgstr ""
+
 #: plugins/share/share.js:10
 msgid "Share article by URL"
 msgstr ""