diff --git a/webui/locale/messages_en.po b/webui/locale/messages_en.po
index ee92df70..446bc80b 100644
--- a/webui/locale/messages_en.po
+++ b/webui/locale/messages_en.po
@@ -8,440 +8,1036 @@ msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
+"POT-Creation-Date: 2020-05-13 14:26+0000\n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:131
-msgid "Browse Host"
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:138
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:240
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:221
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:248
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:246
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:239
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:232
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:229
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:286
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:227
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:255
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:217
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:218
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:239
+#: src/main/java/com/muwire/webui/Util.java:33
+msgid "About Me"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:158
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:166
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:162
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:186
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:140
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:165
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:153
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:153
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:162
-#: src/main/java/com/muwire/webui/MuWireServlet.java:64
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:139
+msgid "This page shows information about your MuWire identity."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:184
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:175
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:194
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:190
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:183
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:178
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:183
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:216
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:181
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:161
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:185
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:171
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:172
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:183
+#: src/main/java/com/muwire/webui/MuWireServlet.java:56
 msgid "Welcome to MuWire"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:164
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:172
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:168
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:192
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:146
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:158
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:171
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:159
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:159
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:168
-#: src/main/java/com/muwire/webui/MuWireServlet.java:72
-msgid "MuWire requires JavaScript. Please enable JavaScript in your browser."
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:167
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:184
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:190
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:202
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:244
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:181
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:225
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:200
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:211
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:252
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:196
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:192
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:230
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:207
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:177
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:177
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:192
-#: src/main/java/com/muwire/webui/Util.java:34
-msgid "Browse"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:170
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:182
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:178
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:216
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:193
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:163
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:163
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:178
-#: src/main/java/com/muwire/webui/Util.java:89
-msgid "Status"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:172
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:184
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:180
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:218
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:195
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:165
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:165
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:180
-msgid "Connections"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:174
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:186
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:182
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:220
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:197
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:167
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:167
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:182
-msgid "Pages"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:176
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:188
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:233
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:141
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:184
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:222
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:199
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:169
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:169
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:184
-msgid "Downloads"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:178
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:190
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:186
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:224
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:201
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:171
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:171
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:141
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:186
-#: src/main/java/com/muwire/webui/Util.java:99
-msgid "Uploads"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:180
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:176
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:178
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:192
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:223
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:172
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:174
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:188
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:196
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:198
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:226
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:203
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:173
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:173
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:172
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:174
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:188
-#: src/main/java/com/muwire/webui/Util.java:79
-msgid "Search"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:182
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:194
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:190
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:228
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:128
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:205
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:228
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:175
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:175
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:190
-#: src/main/java/com/muwire/webui/Util.java:82
-msgid "Shared Files"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:186
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:198
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:267
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:194
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:232
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:209
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:179
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:179
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:194
-#: src/main/java/com/muwire/webui/Util.java:94
-msgid "Trust"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:188
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:200
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:196
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:234
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:211
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:181
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
-msgid "Users"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:190
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:202
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:198
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:236
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:213
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:128
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:183
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:183
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:198
-msgid "Subscriptions"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:192
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:140
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:204
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:200
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:238
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:215
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:185
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:185
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:200
-msgid "Configuration"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:194
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:206
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:202
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:240
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:217
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:187
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:187
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:202
-msgid "Settings"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:196
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:208
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:204
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:242
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:219
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:189
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:189
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:204
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:250
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:189
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:201
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:243
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:184
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:195
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:236
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:189
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:233
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:222
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:234
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:290
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:187
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:231
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:167
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:191
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:206
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:259
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:177
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:221
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:178
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:222
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:189
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:201
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:243
 msgid "Help"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:198
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:210
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:206
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:244
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:221
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:191
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:191
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:206
-msgid "User Guide"
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:194
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:185
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:204
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:200
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:193
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:188
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:193
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:226
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:191
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:171
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:183
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:195
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:181
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:182
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:193
+#: src/main/java/com/muwire/webui/MuWireServlet.java:64
+msgid "MuWire requires JavaScript. Please enable JavaScript in your browser."
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:200
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:212
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:208
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:246
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:223
-#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:193
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:193
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:208
-msgid "FAQ"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:202
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:214
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:210
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:248
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:225
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:198
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:200
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:218
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:199
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:226
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:204
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:206
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:224
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:265
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:197
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:199
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:217
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:210
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:207
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:230
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:232
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:264
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:205
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:233
 #: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:195
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:195
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:210
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:196
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:197
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:199
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:217
+#: src/main/java/com/muwire/webui/Util.java:113
+msgid "Search"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:204
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:210
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:203
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:236
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:203
+msgid "Enter keywords or file hash."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:208
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:189
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:216
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:214
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:207
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:200
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:197
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:254
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:195
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:223
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:185
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:186
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:207
+#: src/main/java/com/muwire/webui/Util.java:125
+msgid "Status"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:210
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:191
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:218
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:216
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:209
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:202
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:199
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:256
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:197
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:225
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:187
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:188
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:209
+msgid "Connections"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:212
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:193
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:220
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:218
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:211
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:204
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:201
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:258
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:199
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:227
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:189
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:190
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:211
+msgid "Pages"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:214
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:195
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:222
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:220
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:285
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:142
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:213
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:206
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:203
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:260
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:201
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:229
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:191
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:192
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:213
+msgid "Downloads"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:216
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:197
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:224
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:222
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:215
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:208
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:205
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:262
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:203
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:231
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:193
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:194
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:142
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:215
+#: src/main/java/com/muwire/webui/Util.java:141
+msgid "Uploads"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:220
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:201
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:228
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:226
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:219
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:212
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:209
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:266
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:207
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:128
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:235
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:268
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:197
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:219
+#: src/main/java/com/muwire/webui/Util.java:117
+msgid "Shared Files"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:222
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:203
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:209
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:230
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:228
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:221
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:214
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:211
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:268
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:209
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:237
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:199
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:221
+#: src/main/java/com/muwire/webui/Util.java:36
+msgid "Browse"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:224
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:205
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:232
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:230
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:223
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:131
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:216
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:213
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:270
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:211
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:239
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:201
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:202
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:223
+#: src/main/java/com/muwire/webui/Util.java:66
+msgid "Feeds"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:226
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:207
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:234
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:232
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:379
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:225
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:218
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:215
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:272
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:213
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:241
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:203
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:204
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:225
+#: src/main/java/com/muwire/webui/Util.java:133
+msgid "Trust"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:228
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:209
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:236
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:234
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:227
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:220
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:217
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:274
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:215
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:243
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:205
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:206
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:227
+msgid "Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:230
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:211
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:238
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:236
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:229
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:222
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:219
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:276
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:217
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:245
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:128
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:207
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:208
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:229
+msgid "Subscriptions"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:232
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:213
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:240
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:140
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:238
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:231
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:224
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:221
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:278
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:219
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:247
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:209
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:210
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:231
+msgid "Configuration"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:234
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:215
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:242
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:240
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:233
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:226
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:223
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:280
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:221
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:249
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:211
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:212
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:233
+msgid "Settings"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:236
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:131
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:217
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:244
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:242
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:235
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:228
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:225
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:282
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:223
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:251
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:213
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:214
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:235
+msgid "Advanced Sharing"
+msgstr ""
+
+#. alphabetical please
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:238
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:250
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:219
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:231
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:246
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:258
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:244
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:256
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:237
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:249
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:230
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:242
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:227
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:239
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:284
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:296
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:225
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:237
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:253
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:265
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:215
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:227
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:216
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:228
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:237
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:249
+#: src/main/java/com/muwire/webui/Util.java:32
 msgid "About"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:225
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:242
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:223
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:250
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:248
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:241
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:234
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:231
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:288
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:229
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:257
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:219
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:220
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:241
+#: src/main/java/com/muwire/webui/MuWireServlet.java:49
+msgid "MuWire"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:246
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:227
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:254
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:252
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:245
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:238
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:235
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:292
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:233
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:261
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:223
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:224
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:245
+msgid "User Guide"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:248
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:229
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:256
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:254
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:247
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:240
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:237
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:294
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:235
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:263
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:225
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:226
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:247
+msgid "FAQ"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:253
+msgid "MuWire ID"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:255
+#, java-format
+msgid "Your short MuWire ID: {0}"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:257
+msgid "Your full MuWire ID:"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:261
+msgid "Copy to clipboard"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:263
+msgid "Sign Tool"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:265
+msgid "Enter text to sign with your MuWire ID"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AboutMe_jsp.java:267
+msgid "Sign"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:132
+msgid "Use this page to configure advanced settings for each shared directory."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/AdvancedSharing_jsp.java:234
+msgid ""
+"Shared directories can be watched automatically or periodically.  Automatic "
+"watching is recommended, but may not work on some NAS devices."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:136
+msgid "Browse Host"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:137
+msgid "Use this page to browse the files shared by other MuWire users."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:207
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:191
+msgid "Enter a full MuWire ID"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:213
+msgid "Enter the full ID of a MuWire user to see what files they are sharing"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:141
+msgid "Use this page to change MuWire options."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:267
 msgid "Search in comments"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:229
-msgid "Allow browsing"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:235
-msgid "Download retry frequency (seconds)"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:239
-msgid "Directory for downloaded files"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:243
-msgid "Directory for incomplete files"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:247
-#: src/main/java/com/muwire/webui/Util.java:98
-msgid "Upload"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:249
-msgid "Total upload slots (-1 means unlimited)"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:253
-msgid "Upload slots per user (-1 means unlimited)"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:257
-#: src/main/java/com/muwire/webui/Util.java:83
-msgid "Sharing"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:259
-msgid "Share downloaded files"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:263
-msgid "Share hidden files"
-msgstr ""
-
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:269
-msgid "Allow only trusted connections"
+msgid ""
+"When searching the network, should MuWire search only file names or in the "
+"comments too?"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:273
-msgid "Search extra hop"
+msgid "Allow browsing"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:277
-msgid "Allow others to view my trust list"
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:275
+msgid "Allow other users to browse your shared files"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:279
+msgid "Allow tracking"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:281
-msgid "Trust list update frequency (hours)"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:285
-msgid "I2P Tunnels - Changes Require Plugin Restart"
+msgid "Allow trackers to track your shared files"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:287
-msgid "Inbound tunnel length"
+msgid "Download retry frequency (seconds)"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:291
-msgid "Inbound tunnel quantity"
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:289
+msgid ""
+"MuWire retries failed downloads automatically.  This value controls how "
+"often to retry."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:293
+msgid "Directory for downloaded files"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:295
-msgid "Outbound tunnel length"
+msgid ""
+"Where to save downloaded files. MuWire must be able to write to this "
+"location."
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:299
+msgid "Directory for incomplete files"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:301
+msgid ""
+"Where to store partial data of files which are currently being downloaded."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:305
+#: src/main/java/com/muwire/webui/Util.java:140
+msgid "Upload"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:307
+msgid "Total upload slots (-1 means unlimited)"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:309
+msgid "Maximum files to upload at once"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:313
+msgid "Upload slots per user (-1 means unlimited)"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:315
+msgid "Maximum files to upload to a single user at once"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:319
+#: src/main/java/com/muwire/webui/Util.java:118
+msgid "Sharing"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:321
+msgid "Share downloaded files"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:323
+msgid "Automatically share files you have downloaded with MuWire"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:327
+msgid "Share hidden files"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:329
+msgid "Share files marked as hidden by the operating system"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:333
+#: src/main/java/com/muwire/webui/Util.java:101
+msgid "Publishing"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:335
+msgid "Enable my feed"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:337
+msgid "Enable your personal file feed"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:341
+msgid "Advertise my feed in search results"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:343
+msgid "Allow other users to find your personal file feed"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:347
+#: src/main/java/com/muwire/webui/Util.java:98
+msgid "Publish shared files automatically"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:349
+msgid ""
+"All files you share in the future will be published to your feed "
+"automatically."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:353
+#: src/main/java/com/muwire/webui/Util.java:46
+msgid "Default settings for new feeds"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:355
+#: src/main/java/com/muwire/webui/Util.java:56
+msgid "Download published files automatically"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:357
+msgid "Download every file published to the given feed"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:361
+#: src/main/java/com/muwire/webui/Util.java:54
+msgid "Download each file sequentially"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:363
+msgid ""
+"Download files from this feed sequentially. This helps with previewing media "
+"files, but may reduce availability of the file for others."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:367
+#: src/main/java/com/muwire/webui/Util.java:65
+msgid "Feed update frequency (minutes)"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:369
+msgid "How often to check for updates to this feed"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:373
+#: src/main/java/com/muwire/webui/Util.java:91
+msgid "Number of items to keep on disk (-1 means unlimited)"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:375
+msgid ""
+"Only remember this many published items across restarts, unless you set the "
+"value to -1"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:381
+msgid "Allow only trusted connections"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:383
+msgid "Only connect to users you have marked as Trusted"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:387
+msgid "Search extra hop"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:389
+msgid ""
+"If only trusted connections are allowed, search only users that are directly "
+"connected to you. Use this setting to enable searches of additional users. "
+"It has no effect if untrusted connections are allowed."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:393
+msgid "Allow others to view my trust list"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:395
+msgid ""
+"Allow other MuWire users to see who you have marked as Trusted and Distrusted"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:399
+msgid "Trust list update frequency (hours)"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:401
+msgid ""
+"How often to check for updates to the trust lists you are subscribed to."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:405
+msgid "I2P Tunnels - Changes Require Plugin Restart"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:407
+msgid "Inbound tunnel length"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:411
+msgid "Inbound tunnel quantity"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:415
+msgid "Outbound tunnel length"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:419
 msgid "Outbound tunnel quantity"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:423
+#: src/main/java/com/muwire/webui/Util.java:112
 msgid "Save"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:213
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:143
+msgid ""
+"This page shows the files you are currently downloading from other MuWire "
+"users."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:252
 msgid "Download Details"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:215
+#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:254
 msgid "Click on a download to view details"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:141
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:132
+msgid ""
+"Every MuWire user can have a file feed to publish shared files of their "
+"choosing. You can subscribe to the feeds of other users. This is similar to "
+"following someone on a social network."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:134
+msgid ""
+"On this page you can view the file feeds of users you are subscribed to. You "
+"can configure each feed separately with various options, and you can "
+"download the published files."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:193
+#: src/main/java/com/muwire/webui/Util.java:127
+msgid "Subscribe"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/Feeds_jsp.java:197
+msgid ""
+"Enter the full ID of a MuWire user to see what files they have published to "
+"their feed"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:134
+msgid "File Details"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:135
+msgid "View details about the selected shared file here."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:242
+#: src/main/java/com/muwire/webui/Util.java:47
+#, java-format
+msgid "Details for {0}"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:244
+msgid "Search Hits"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:246
+msgid "Downloaders"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/FileDetails_jsp.java:248
+#: src/main/java/com/muwire/webui/Util.java:39
+msgid "Certificates"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:139
 msgid "Home"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:203
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:141
+msgid "Search for files shared by other MuWire users."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:142
+msgid "You can group the results by sender or by file."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:241
 msgid "Active Searches By Sender"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:205
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:243
 msgid "Group By File"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:209
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:247
 msgid "Active Searches By File"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:211
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:249
 msgid "Group By Sender"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:299
+#: src/main/java/com/muwire/webui/Util.java:107
 msgid "Results"
 msgstr ""
 
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:134
+#: src/main/java/com/muwire/webui/Util.java:87
+msgid "MuWire Status"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:135
+msgid "This page shows internal MuWire metrics."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:242
+#: src/main/java/com/muwire/webui/Util.java:79
+msgid "Incoming Connections"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:244
+#: src/main/java/com/muwire/webui/Util.java:92
+msgid "Outgoing Connections"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:246
+#: src/main/java/com/muwire/webui/Util.java:80
+msgid "Known Hosts"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:248
+#: src/main/java/com/muwire/webui/Util.java:63
+msgid "Failing Hosts"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:250
+#: src/main/java/com/muwire/webui/Util.java:75
+msgid "Hopeless Hosts"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/MuStatus_jsp.java:252
+#: src/main/java/com/muwire/webui/Util.java:130
+msgid "Times Browsed"
+msgstr ""
+
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:122
 msgid "Initial Setup"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:166
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:123
+msgid "Set up your MuWire nickname and download locations now."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:191
 msgid "Welcome to MuWire!  Please select a nickname and download locations"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:168
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:193
 msgid "These directories will be created if they do not already exist"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:170
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:195
 msgid "Nickname"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:172
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:197
 msgid "Directory for saving downloaded files"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:176
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:201
 msgid "Directory for storing incomplete files"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:180
-#: src/main/java/com/muwire/webui/Util.java:90
+#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:205
+#: src/main/java/com/muwire/webui/Util.java:126
 msgid "Submit"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:174
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:180
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:129
+msgid ""
+"Shared files are those files you decide to share with other MuWire users."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:130
+msgid "To share a file, enter its path in the box to the left."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:131
+msgid "You can view your shared files as a tree or as a table."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:132
+msgid ""
+"The \"Actions\" menu lets you perform various actions on the shared file."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:198
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:204
 msgid "Share"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:184
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:208
+msgid "Enter the full path for the file or folder to be shared."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:210
+#, java-format
+msgid ""
+"When sharing files on network drives (like a NAS) please visit {0}Advanced "
+"Sharing{1}"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:214
 msgid "View As Table"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:188
+#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:218
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustLists_jsp.java:129
+msgid "This page shows the trust lists of the users you have subscribed to."
 msgstr ""
 
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:89
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:96
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:98
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:100
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:129
+msgid "This page shows the users you have marked as Trusted or Distrusted."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:130
+msgid ""
+"You can subscribe to the trust lists of your Trusted users and see who they "
+"trust or distrust."
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:231
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:233
+msgid "Distrusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:143
+msgid ""
+"This page shows the files you are currently uploading to other MuWire users."
+msgstr ""
+
+#: src/main/java/com/muwire/webui/BrowseServlet.java:136
+#: src/main/java/com/muwire/webui/BrowseServlet.java:143
+#: src/main/java/com/muwire/webui/FeedServlet.java:115
+#: src/main/java/com/muwire/webui/FeedServlet.java:122
+msgid "Please enter a full MuWire ID"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:135
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:150
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:152
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:162
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:164
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:166
 msgid "Bad input"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:96
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:150
+#: src/main/java/com/muwire/webui/Util.java:88
+msgid "must be greater than zero"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:162
 #, java-format
 msgid "{0} does not exist"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:98
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:164
 #, java-format
 msgid "{0} is not a directory"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:100
+#: src/main/java/com/muwire/webui/ConfigurationServlet.java:166
 #, java-format
 msgid "{0} not writeable"
 msgstr ""
@@ -450,269 +1046,344 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/MuWireServlet.java:57
-msgid "MuWire"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/MuWireServlet.java:68
+#: src/main/java/com/muwire/webui/MuWireServlet.java:60
 msgid "MuWire is initializing, please wait"
 msgstr ""
 
+#: src/main/java/com/muwire/webui/SearchServlet.java:51
+msgid "Please enter a search keyword or hash"
+msgstr ""
+
 #: src/main/java/com/muwire/webui/TrustServlet.java:285
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Never"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/UploadServlet.java:92
-#: src/main/java/com/muwire/webui/Util.java:104
+#: src/main/java/com/muwire/webui/Util.java:146
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
 
-#. alphabetical please
-#: src/main/java/com/muwire/webui/Util.java:32
+#: src/main/java/com/muwire/webui/Util.java:34
 msgid "Actions"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:33
+#: src/main/java/com/muwire/webui/Util.java:35
 msgid "Active Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:35
+#: src/main/java/com/muwire/webui/Util.java:37
 msgid "Browsing"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:36
+#: src/main/java/com/muwire/webui/Util.java:38
 msgid "Cancel"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:37
-msgid "Certificates"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:38
+#: src/main/java/com/muwire/webui/Util.java:40
 msgid "Certified"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:39
+#: src/main/java/com/muwire/webui/Util.java:41
 msgid "Certify"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:40
+#: src/main/java/com/muwire/webui/Util.java:42
 msgid "Clear Finished"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:41
+#: src/main/java/com/muwire/webui/Util.java:43
 msgid "Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:42
-#, java-format
-msgid "Details for {0}"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Copy hash to clipboard"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
-msgid "Download"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:46
-msgid "Download Location"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
+msgid "Copy To Clipbaord"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+#, java-format
+msgid "Directory configuration for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
+msgid "Directory sync frequency (seconds, 0 means never)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Down"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Download"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Download Location"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
-msgid "Host"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:58
-msgid "Import"
+msgid "Downloaded Pieces"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:59
-msgid "Imported"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:60
-msgid "Known Sources"
+msgid "Downloading"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:61
-msgid "Last Updated"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:62
-msgid "Mark Distrusted"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:63
-msgid "Mark Neutral"
+msgid "ETA"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:64
-msgid "Mark Trusted"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:65
-msgid "Name"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:66
-msgid "Pause"
+#, java-format
+msgid "Feed configuration for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:67
-msgid "Piece Size"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:68
-msgid "Progress"
+msgid "Feed"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:69
-msgid "Query"
+msgid "File"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:70
-msgid "Reason"
+msgid "Files"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:71
-msgid "Refresh"
+msgid "Hash copied to clipboard"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:72
-msgid "Remote Pieces"
+msgid "Hashing"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:73
+msgid "Hide Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:74
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:76
+msgid "Host"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:77
+msgid "Import"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:78
+msgid "Imported"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:81
+msgid "Known Sources"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:82
+msgid "Last Updated"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:83
+msgid "Mark Distrusted"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:84
+msgid "Mark Neutral"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:85
+msgid "Mark Trusted"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:86
+msgid "Monitor directory for changes"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:89
+msgid "Name"
+msgstr ""
+
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:94
+msgid "Pause"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:95
+msgid "Piece Size"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:96
+msgid "Progress"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:97
+msgid "Publish"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Published"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:100
+msgid "Publisher"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:102
+msgid "Query"
+msgstr ""
+
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:104
+msgid "Reason"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "Refresh"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "Remote Pieces"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:108
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:109
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:110
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:111
 msgid "Retry"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:114
+msgid "Searcher"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:115
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:116
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:119
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:120
+msgid "Show Details"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:121
 msgid "Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:122
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:123
 msgid "Speed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:124
 msgid "State"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:91
-msgid "Subscribe"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:128
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:129
+msgid "Sync"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:131
+msgid "Timestamp"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:132
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
+#: src/main/java/com/muwire/webui/Util.java:134
+msgid "Trusted"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:135
 msgid "Trusted User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:96
+#: src/main/java/com/muwire/webui/Util.java:136
+msgid "Unpublish"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:137
 msgid "Unshare"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:97
+#: src/main/java/com/muwire/webui/Util.java:138
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:100
+#: src/main/java/com/muwire/webui/Util.java:139
+msgid "Update"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:142
 msgid "User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:101
+#: src/main/java/com/muwire/webui/Util.java:143
 msgid "View 1 Certificate"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:102
+#: src/main/java/com/muwire/webui/Util.java:144
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:145
 msgid "Your Trust"
 msgstr ""
diff --git a/webui/src/main/java/com/muwire/webui/BrowseServlet.java b/webui/src/main/java/com/muwire/webui/BrowseServlet.java
index a14ac408..2012b689 100644
--- a/webui/src/main/java/com/muwire/webui/BrowseServlet.java
+++ b/webui/src/main/java/com/muwire/webui/BrowseServlet.java
@@ -133,14 +133,14 @@ public class BrowseServlet extends HttpServlet {
         if (action.equals("browse")) {
             String personaB64 = req.getParameter("host");
             if (personaB64 == null) {
-                resp.sendError(403,Util._t("Please enter a full MuWire id"));
+                resp.sendError(403,Util._t("Please enter a full MuWire ID"));
                 return;
             }
             Persona host;
             try {
                 host = new Persona(new ByteArrayInputStream(Base64.decode(personaB64)));
             } catch (Exception bad) {
-                resp.sendError(403,Util._t("Please enter a full MuWire id"));
+                resp.sendError(403,Util._t("Please enter a full MuWire ID"));
                 return;
             }
             browseManager.browse(host);
diff --git a/webui/src/main/java/com/muwire/webui/FeedServlet.java b/webui/src/main/java/com/muwire/webui/FeedServlet.java
index 4cf0b7da..ae41f74f 100644
--- a/webui/src/main/java/com/muwire/webui/FeedServlet.java
+++ b/webui/src/main/java/com/muwire/webui/FeedServlet.java
@@ -112,14 +112,14 @@ public class FeedServlet extends HttpServlet {
         if (action.equals("subscribe")) {
             String personaB64 = req.getParameter("host");
             if (personaB64 == null) {
-                resp.sendError(403, Util._t("Please enter a full MuWire id"));
+                resp.sendError(403, Util._t("Please enter a full MuWire ID"));
                 return;
             }
             Persona host;
             try {
                 host = new Persona(new ByteArrayInputStream(Base64.decode(personaB64)));
             } catch (Exception bad) {
-                resp.sendError(403, Util._t("Please enter a full MuWire id"));
+                resp.sendError(403, Util._t("Please enter a full MuWire ID"));
                 return;
             }
             feedManager.subscribe(host);
diff --git a/webui/src/main/java/com/muwire/webui/Util.java b/webui/src/main/java/com/muwire/webui/Util.java
index 69c33ebc..e0d8f48d 100644
--- a/webui/src/main/java/com/muwire/webui/Util.java
+++ b/webui/src/main/java/com/muwire/webui/Util.java
@@ -33,7 +33,6 @@ public class Util {
         _x("About Me"),
         _x("Actions"),
         _x("Active Sources"),
-        _x("Auto-watch directory for changes using operating system"),
         _x("Browse"),
         _x("Browsing"),
         _x("Cancel"),
@@ -59,7 +58,6 @@ public class Util {
         _x("Downloaded Pieces"),
         _x("Downloader"),
         _x("Downloading"),
-        _x("Enter a full MuWire id"),
         _x("Enter Reason (Optional)"),
         _x("ETA"),
         _x("Failing Hosts"),
@@ -85,6 +83,7 @@ public class Util {
         _x("Mark Distrusted"),
         _x("Mark Neutral"),
         _x("Mark Trusted"),
+        _x("Monitor directory for changes"),
         _x("MuWire Status"),
         _x("must be greater than zero"),
         _x("Name"),
@@ -143,8 +142,6 @@ public class Util {
         _x("User"),
         _x("View 1 Certificate"),
         _x("View {0} Certificates"),
-        _x("Your full MuWire id is"),
-        _x("Your short MuWire id is {0}"),
         _x("Your Trust"),
         _x("{0}% of piece")
     };
diff --git a/webui/src/main/js/advancedSharing.js b/webui/src/main/js/advancedSharing.js
index d527bbf0..f7aac17f 100644
--- a/webui/src/main/js/advancedSharing.js
+++ b/webui/src/main/js/advancedSharing.js
@@ -104,7 +104,7 @@ function configure(path) {
 	html += "<table>"
 	
 	html += "<tr>"
-	html += "<td>" + _t("Auto-watch directory for changes using operating system") + "</td>"
+	html += "<td>" + _t("Monitor directory for changes") + "</td>"
 	html += "<td><p align='right'><input type='checkbox' name='autoWatch' value='true'"
 	if (dir.autoWatch == "true")
 		html += " checked "
diff --git a/webui/src/main/webapp/ConfigurationPage.jsp b/webui/src/main/webapp/ConfigurationPage.jsp
index 94fcea43..131459aa 100644
--- a/webui/src/main/webapp/ConfigurationPage.jsp
+++ b/webui/src/main/webapp/ConfigurationPage.jsp
@@ -57,7 +57,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 					<tr>
 						<td>
 							<div class="tooltip"><%=Util._t("Allow browsing")%>
-								<span class="tooltiptext"><%=Util._t("Allow other MuWire users to browse your shared files?")%></span>
+								<span class="tooltiptext"><%=Util._t("Allow other users to browse your shared files")%></span>
 							</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getBrowseFiles()) out.write("checked"); %> name="browseFiles" value="true"></p></td>
@@ -65,7 +65,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 					<tr>
 						<td>
 							<div class="tooltip"><%=Util._t("Allow tracking")%>
-								<span class="tooltiptext"><%=Util._t("Allow trackers to track your shared files?")%></span>
+								<span class="tooltiptext"><%=Util._t("Allow trackers to track your shared files")%></span>
 							</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAllowTracking()) out.write("checked"); %> name="allowTracking" value="true"></p></td>
@@ -84,7 +84,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 					</tr>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Directory for downloaded files")%>
-							<span class="tooltiptext"><%=Util._t("Where to save downloaded files.  MuWire must be able to write to this location")%></span>
+							<span class="tooltiptext"><%=Util._t("Where to save downloaded files. MuWire must be able to write to this location.")%></span>
 							</div>
 						</td>
 						<td><p align="right"><input type="text" size="30" name="downloadLocation" value="<%= core.getMuOptions().getDownloadLocation().getAbsoluteFile()%>"></p></td>
@@ -103,14 +103,14 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 				<table>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Total upload slots (-1 means unlimited)")%>
-							<span class="tooltiptext"><%=Util._t("How many files at most should MuWire upload at the same time")%></span>
+							<span class="tooltiptext"><%=Util._t("Maximum files to upload at once")%></span>
 							</div>
 						</td>
 						<td><p align="right"><input type="text" size="1" name="totalUploadSlots" class="right" value="<%= core.getMuOptions().getTotalUploadSlots() %>"></p></td>
 					</tr>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Upload slots per user (-1 means unlimited)")%>
-							<span class="tooltiptext"><%=Util._t("How many files should MuWire upload to any given user at the same time")%></span>
+							<span class="tooltiptext"><%=Util._t("Maximum files to upload to a single user at once")%></span>
 							</div>
 						</td>
 						<td><p align="right"><input type="text" size="1" name="uploadSlotsPerUser" class="right" value="<%= core.getMuOptions().getUploadSlotsPerUser() %>"></p></td>
@@ -122,14 +122,14 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 				<table>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Share downloaded files")%>
-							<span class="tooltiptext"><%=Util._t("Whether to automatically share files which you have downloaded with MuWire")%></span>
+							<span class="tooltiptext"><%=Util._t("Automatically share files you have downloaded with MuWire")%></span>
 							</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getShareDownloadedFiles()) out.write("checked"); %> name="shareDownloadedFiles" value="true"></p></td>
 					</tr>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Share hidden files")%>
-							<span class="tooltiptext"><%=Util._t("Should MuWire share files marked as Hidden by the operating system?")%></span>
+							<span class="tooltiptext"><%=Util._t("Share files marked as hidden by the operating system")%></span>
 							</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getShareHiddenFiles()) out.write("checked"); %> name="shareHiddenFiles" value="true"></p></td>
@@ -141,20 +141,20 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 				<table>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Enable my feed")%>
-							<span class="tooltiptext"><%=Util._t("Enable your personal file feed?")%></span></div>
+							<span class="tooltiptext"><%=Util._t("Enable your personal file feed")%></span></div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getFileFeed()) out.write("checked"); %> name="fileFeed" value="true"></p></td>
 					</tr>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Advertise my feed in search results")%>
-							<span class="tooltiptext"><%=Util._t("If this is enabled MuWire will let other users know about your personal file feed")%></span>
+							<span class="tooltiptext"><%=Util._t("Allow other users to find your personal file feed")%></span>
 						</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAdvertiseFeed()) out.write("checked"); %> name="advertiseFeed" value="true"></p></td>
 					</tr>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Publish shared files automatically")%>
-							<span class="tooltiptext"><%=Util._t("If enabled, all files you share in the future will be published to your feed automatically.")%></span>
+							<span class="tooltiptext"><%=Util._t("All files you share in the future will be published to your feed automatically.")%></span>
 						</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAutoPublishSharedFiles()) out.write("checked"); %> name="autoPublishSharedFiles" value="true"></p></td>
@@ -166,14 +166,14 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 				<table>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Download published files automatically")%>
-							<span class="tooltiptext"><%=Util._t("If enabled, MuWire will download every file published to the given feed")%></span>
+							<span class="tooltiptext"><%=Util._t("Download every file published to the given feed")%></span>
 						</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getDefaultFeedAutoDownload()) out.write("checked"); %> name="defaultFeedAutoDownload" value="true"></p></td>
 					</tr>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Download each file sequentially")%>
-							<span class="tooltiptext"><%=Util._t("Whether to download files from this feed sequentially.  This helps with previewing media files, but may reduce availability of the file for others.")%></span>
+							<span class="tooltiptext"><%=Util._t("Download files from this feed sequentially. This helps with previewing media files, but may reduce availability of the file for others.")%></span>
 						</div>
 						</td>
 						
@@ -188,7 +188,7 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 					</tr>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Number of items to keep on disk (-1 means unlimited)")%>
-							<span class="tooltiptext"><%=Util._t("MuWire will only remember this many published items across restarts, unless you set the value to -1")%></span>
+							<span class="tooltiptext"><%=Util._t("Only remember this many published items across restarts, unless you set the value to -1")%></span>
 						</div>
 						</td>
 						<td><p align="right"><input type="text" size="1" name="defaultFeedItemsToKeep" class="right" value="<%= core.getMuOptions().getDefaultFeedItemsToKeep() %>"></p></td>
@@ -200,21 +200,21 @@ Exception error = (Exception) application.getAttribute("MWConfigError");
 				<table>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Allow only trusted connections")%>
-							<span class="tooltiptext"><%=Util._t("If enabled, MuWire will only connect to users you have marked as Trusted")%></span>
+							<span class="tooltiptext"><%=Util._t("Only connect to users you have marked as Trusted")%></span>
 						</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (!core.getMuOptions().getAllowUntrusted()) out.write("checked"); %> name="allowUntrusted" value="true"></p></td>
 					</tr>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Search extra hop")%>
-							<span class="tooltiptext"><%=Util._t("If only trusted connections are allowed, MuWire will search only users that are directly connected to you.  Use this setting to search further out.  It has no effect if untrusted connections are allowed")%></span>
+							<span class="tooltiptext"><%=Util._t("If only trusted connections are allowed, search only users that are directly connected to you. Use this setting to enable searches of additional users. It has no effect if untrusted connections are allowed.")%></span>
 						</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getSearchExtraHop()) out.write("checked"); %> name="searchExtraHop" value="true"></p></td>
 					</tr>
 					<tr>
 						<td><div class="tooltip"><%=Util._t("Allow others to view my trust list")%>
-							<span class="tooltiptext"><%=Util._t("Whether to allow other MuWire users to see who you have marked as Trusted and Distrusted")%></span>
+							<span class="tooltiptext"><%=Util._t("Allow other MuWire users to see who you have marked as Trusted and Distrusted")%></span>
 						</div>
 						</td>
 						<td><p align="right"><input type="checkbox" <% if (core.getMuOptions().getAllowTrustLists()) out.write("checked"); %> name="allowTrustLists" value="true"></p></td>
diff --git a/webui/src/main/webapp/Feeds.jsp b/webui/src/main/webapp/Feeds.jsp
index 41da5aed..75b021fa 100644
--- a/webui/src/main/webapp/Feeds.jsp
+++ b/webui/src/main/webapp/Feeds.jsp
@@ -25,7 +25,7 @@ String helptext = Util._t("Every MuWire user can have a file feed to publish sha
 	    <aside>
 		<div class="menubox-divider"></div>
 		<div class="menubox">
-			<h2><%=Util._t("Enter a full MuWire id")%></h2>
+			<h2><%=Util._t("Enter a full MuWire ID")%></h2>
 			<form action="/MuWire/Feed" method="post">
 				<input type="text" name="host">
 				<input type="hidden" name="action" value="subscribe">