prevent duplicate feed subscriptions

Introduce persister that uses a directory structure

.dockerignore

@@ -0,0 +1,12 @@
+# Dot directories
+.gradle/
+.idea/
+.git/
+
+# Build directories
+build/
+**/build/
+
+# We execute COPY . .
+# Modifying these files would unnecessarily invalidate the build context
+Dockerfile

Dockerfile

@@ -0,0 +1,64 @@
+FROM jlesage/baseimage-gui:alpine-3.10-glibc
+
+# Docker image version is provided via build arg.
+ARG DOCKER_IMAGE_VERSION=unknown
+
+# JDK version
+ARG JDK=11
+
+# Important directories
+ARG TMP_DIR=/muwire-tmp
+ENV APP_HOME=/muwire
+
+# Define working directory.
+WORKDIR $TMP_DIR
+
+# Put sources into dir
+COPY . .
+
+# Install final dependencies
+RUN add-pkg openjdk${JDK}-jre
+
+# Build and untar in future distribution dir
+RUN add-pkg --virtual openjdk${JDK}-jdk \
+        && ./gradlew --no-daemon clean assemble \
+        && mkdir -p ${APP_HOME} \
+        # Extract to ${APP_HOME and ignore the first dir
+        # First dir in tar is the "MuWire-<version>"
+        && tar -C ${APP_HOME} --strip 1 -xvf gui/build/distributions/MuWire*.tar \
+        # Cleanup
+        && rm -rf "${TMP_DIR}" /root/.gradle /root/.java \
+        && del-pkg openjdk${JDK}-jdk
+
+WORKDIR ${APP_HOME}
+
+# Maximize only the main/initial window.
+RUN \
+    sed-patch 's/<application type="normal">/<application type="normal" title="MuWire">/' \
+        /etc/xdg/openbox/rc.xml
+
+# Generate and install favicons.
+RUN \
+    APP_ICON_URL=https://github.com/zlatinb/muwire/raw/master/gui/griffon-app/resources/MuWire-128x128.png && \
+    install_app_icon.sh "$APP_ICON_URL"
+
+# Add files.
+COPY docker/rootfs/ /
+
+# Set environment variables.
+ENV APP_NAME="MuWire" \
+    S6_KILL_GRACETIME=8000
+
+# Define mountable directories.
+VOLUME ["$APP_HOME/.MuWire"]
+VOLUME ["/incompletes"]
+VOLUME ["/output"]
+
+
+# Metadata.
+LABEL \
+      org.label-schema.name="muwire" \
+      org.label-schema.description="Docker container for MuWire" \
+      org.label-schema.version="$DOCKER_IMAGE_VERSION" \
+      org.label-schema.vcs-url="https://github.com/zlatinb/muwire" \
+      org.label-schema.schema-version="1.0"

README.md

@@ -2,11 +2,11 @@
 
 MuWire is an easy to use file-sharing program which offers anonymity using [I2P technology](http://geti2p.net).  It works on any platform Java works on, including Windows,MacOS,Linux.
 
-It is inspired by the LimeWire Gnutella client and developped by a former LimeWire developer.
+The current stable release - 0.6.8 is avaiable for download at https://muwire.com.  The latest plugin build and instructions how to install the plugin are available inside I2P at http://muwire.i2p.  
 
-The current stable release - 0.6.7 is avaiable for download at https://muwire.com.  You can find technical documentation in the [doc] folder.  Also check out the [Wiki] for various documentation.
+You can find technical documentation in the [doc] folder.  Also check out the [Wiki] for various other documentation.
 
-### Building
+## Building
 
 You need JDK 9 or newer.  After installing that and setting up the appropriate paths, just type
 
@@ -21,7 +21,7 @@ If you want to run the unit tests, type
 
 If you want to build binary bundles that do not depend on Java or I2P, see the [muwire-pkg] project
 
-### Running the GUI
+## Running the GUI
 
 Type
 ```
@@ -32,27 +32,24 @@ If you have an I2P router running on the same machine that is all you need to do
 
 [Default I2CP port]\: `7654`
 
-### Running the CLI
+## Running the CLI
 
 Look inside `cli-lanterna/build/distributions`.  Untar/unzip one of the `shadow` files and then run the jar contained inside by typing `java -jar cli-lanterna-x.y.z-all.jar` in a terminal.  The CLI will ask you about the router host and port on startup, no need to edit any files.  However, the CLI does not have an options window yet, so if you need to change any options you will need to edit the configuration files.  The CLI options are documented here [cli options]
 
 The CLI is under active development and doesn't have all the features of the GUI.
 
-### Running the Web UI / Plugin
+## Running the Web UI / Plugin
 
-There is a Web-based UI under development.  It is intended to be run as a plugin to the Java I2P router.  To build it, do the following:
-1. Check out the Java I2P code from here [I2P Github]
-2. Build it using `ant clean pkg`
-3. Create a directory under the MuWire source tree called `i2pjars` and copy all jars from the i2p `pkg-temp/lib` directory there.
-4. Un-comment the `webui` and `plug` projects in MuWire's `settings.gradle`.  (By default those are commented out)
-5. Edit `gradle.properties` to change the signer.  You need to sign your plugin for the I2P router to load it.  More information TODO
-6. Run `./gradlew -PbuildNumber=<integer> assemble`
-7. If all goes well, there will be a file `plug/build/MuWire.su3`.  Install that file from the I2P router console.
+There is a Web-based UI under development.  It is intended to be run as a plugin to the Java I2P router.  Instructions how to build it are available at the wiki [Plugin] page.
 
-### Translations
+## Docker
+
+MuWire is available as a Docker image.  For more information see the [Docker] page.
+
+## Translations
 If you want to help translate MuWire, instructions are on the wiki https://github.com/zlatinb/muwire/wiki/Translate
 
-### GPG Fingerprint
+## GPG Fingerprint
 
 ```
 471B 9FD4 5517 A5ED 101F  C57D A728 3207 2D52 5E41
@@ -67,3 +64,6 @@ You can find the full key at https://keybase.io/zlatinb
 [muwire-pkg]: https://github.com/zlatinb/muwire-pkg 
 [cli options]: https://github.com/zlatinb/muwire/wiki/CLI-Configuration-Options
 [I2P Github]: https://github.com/i2p/i2p.i2p
+[Plugin]: https://github.com/zlatinb/muwire/wiki/Plugin
+[Docker]: https://github.com/zlatinb/muwire/wiki/Docker
+[jlesage/docker-baseimage-gui]: https://github.com/jlesage/docker-baseimage-gui

TODO.md

@@ -1,8 +1,6 @@
 # TODO List
 
-Not in any particular order yet
-
-### Big Items
+### Network
 
 ##### Bloom Filters
 
@@ -12,15 +10,34 @@ This reduces query traffic by not sending last hop queries to peers that definit
 
 This helps with scalability
 
-##### Web UI, REST Interface, etc.
+### Core
 
-Basically any non-gui non-cli user interface
-
-##### Metadata editing and search
-
-To enable parsing of metadata from known file types and the user editing it or adding manual metadata
-
-### Small Items
-
-* Wrapper of some kind for in-place upgrades
+* Metadata parsing and search
 * Automatic adjustment of number of I2P tunnels
+* Persist trust immediately
+* Check if user-selected download and incomplete locations exist and are writeable
+* Enum i18n
+* Ability to share trust list only with trusted users
+* Confidential files visible only to certain users
+* Public Feed feature
+
+### Chat
+* echo "unknown/innappropriate command" in the console
+* break up lines on CR/LF, send multiple messages
+* Style timestamps and persona names
+* enforce # in room names or ignore it
+* auto-create/join channel on server start
+* jump from notification window to room with message
+
+### Swing GUI
+* I2P Status panel - display message when connected to external router
+* Search box - left identation
+
+### Web UI/Plugin
+* HTML 5 media players
+* Remove versions from jar names
+* Security: POST nonces, CSP headers
+* Upload files from browser to plugin via drag-and-drop
+* Check permissions, display better errors when sharing local folders
+
+ 

build.gradle

@@ -2,7 +2,9 @@ subprojects {
     apply plugin: 'groovy'
 
     dependencies {
-        compile 'org.codehaus.groovy:groovy-all:2.4.15'
+        compile 'org.codehaus.groovy:groovy:2.4.15'
+        compile 'org.codehaus.groovy:groovy-jsr223:2.4.15'
+        compile 'org.codehaus.groovy:groovy-json:2.4.15'
     }
 
     compileGroovy {

cli-lanterna/src/main/groovy/com/muwire/clilanterna/CliLanterna.groovy

@@ -32,7 +32,7 @@ import com.muwire.core.UILoadedEvent
 import com.muwire.core.files.AllFilesLoadedEvent
 
 class CliLanterna {
-    private static final String MW_VERSION = "0.6.8"
+    private static final String MW_VERSION = "0.6.10"
     
     private static volatile Core core
     

cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesModel.groovy

@@ -3,6 +3,7 @@ package com.muwire.clilanterna
 import com.googlecode.lanterna.gui2.TextGUIThread
 import com.googlecode.lanterna.gui2.table.TableModel
 import com.muwire.core.Core
+import com.muwire.core.InfoHash
 import com.muwire.core.SharedFile
 import com.muwire.core.files.AllFilesLoadedEvent
 import com.muwire.core.files.DirectoryWatchedEvent
@@ -72,7 +73,7 @@ class FilesModel {
         sharedFiles.each { 
             long size = it.getCachedLength()
             boolean comment = it.comment != null
-            boolean certified = core.certificateManager.hasLocalCertificate(it.getInfoHash())
+            boolean certified = core.certificateManager.hasLocalCertificate(new InfoHash(it.getRoot()))
             String hits = String.valueOf(it.getHits())
             String downloaders = String.valueOf(it.getDownloaders().size())
             model.addRow(new SharedFileWrapper(it), DataHelper.formatSize2(size, false)+"B", comment, certified, hits, downloaders)

cli-lanterna/src/main/groovy/com/muwire/clilanterna/FilesView.groovy

@@ -21,7 +21,6 @@ import com.muwire.core.filecert.UICreateCertificateEvent
 import com.muwire.core.files.DirectoryUnsharedEvent
 import com.muwire.core.files.FileSharedEvent
 import com.muwire.core.files.FileUnsharedEvent
-import com.muwire.core.files.UIPersistFilesEvent
 
 class FilesView extends BasicWindow {
     private final FilesModel model
@@ -84,7 +83,6 @@ class FilesView extends BasicWindow {
         
         Button unshareButton = new Button("Unshare", {
             core.eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
-            core.eventBus.publish(new UIPersistFilesEvent())
             MessageDialog.showMessageDialog(textGUI, "File Unshared", "Unshared "+sf.getFile().getName(), MessageDialogButton.OK)
         } )
         Button addCommentButton = new Button("Add Comment", {

core/src/main/groovy/com/muwire/core/Core.groovy

@@ -1,5 +1,8 @@
 package com.muwire.core
 
+import com.muwire.core.files.PersisterDoneEvent
+import com.muwire.core.files.PersisterFolderService
+
 import java.nio.charset.StandardCharsets
 import java.util.concurrent.atomic.AtomicBoolean
 
@@ -29,9 +32,18 @@ import com.muwire.core.filecert.CertificateManager
 import com.muwire.core.filecert.UICreateCertificateEvent
 import com.muwire.core.filecert.UIFetchCertificatesEvent
 import com.muwire.core.filecert.UIImportCertificateEvent
+import com.muwire.core.filefeeds.FeedClient
+import com.muwire.core.filefeeds.FeedFetchEvent
+import com.muwire.core.filefeeds.FeedItemFetchedEvent
+import com.muwire.core.filefeeds.FeedManager
+import com.muwire.core.filefeeds.UIDownloadFeedItemEvent
+import com.muwire.core.filefeeds.UIFilePublishedEvent
+import com.muwire.core.filefeeds.UIFeedConfigurationEvent
+import com.muwire.core.filefeeds.UIFeedDeletedEvent
+import com.muwire.core.filefeeds.UIFeedUpdateEvent
+import com.muwire.core.filefeeds.UIFileUnpublishedEvent
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHashedEvent
-import com.muwire.core.files.FileHashingEvent
 import com.muwire.core.files.FileHasher
 import com.muwire.core.files.FileLoadedEvent
 import com.muwire.core.files.FileManager
@@ -41,7 +53,7 @@ import com.muwire.core.files.HasherService
 import com.muwire.core.files.PersisterService
 import com.muwire.core.files.SideCarFileEvent
 import com.muwire.core.files.UICommentEvent
-import com.muwire.core.files.UIPersistFilesEvent
+
 import com.muwire.core.files.AllFilesLoadedEvent
 import com.muwire.core.files.DirectoryUnsharedEvent
 import com.muwire.core.files.DirectoryWatchedEvent
@@ -74,10 +86,8 @@ import net.i2p.client.I2PClientFactory
 import net.i2p.client.I2PSession
 import net.i2p.client.streaming.I2PSocketManager
 import net.i2p.client.streaming.I2PSocketManagerFactory
-import net.i2p.client.streaming.I2PSocketOptions
 import net.i2p.client.streaming.I2PSocketManager.DisconnectListener
 import net.i2p.crypto.DSAEngine
-import net.i2p.crypto.SigType
 import net.i2p.data.Destination
 import net.i2p.data.PrivateKey
 import net.i2p.data.Signature
@@ -100,6 +110,7 @@ public class Core {
     final TrustService trustService
     final TrustSubscriber trustSubscriber
     private final PersisterService persisterService
+    private final PersisterFolderService persisterFolderService
     private final HostCache hostCache
     private final ConnectionManager connectionManager
     private final CacheClient cacheClient
@@ -115,6 +126,8 @@ public class Core {
     final CertificateManager certificateManager
     final ChatServer chatServer
     final ChatManager chatManager
+    final FeedManager feedManager
+    private final FeedClient feedClient
 
     private final Router router
 
@@ -128,23 +141,23 @@ public class Core {
         this.muOptions = props
 
         i2pOptions = new Properties()
-        def i2pOptionsFile = new File(home,"i2p.properties")
+        // Read defaults
+        def defaultI2PFile = getClass()
+                .getClassLoader().getResource("defaults/i2p.properties");
+        defaultI2PFile.withInputStream { i2pOptions.load(it) }
+
+        def i2pOptionsFile = new File(home, "i2p.properties")
         if (i2pOptionsFile.exists()) {
             i2pOptionsFile.withInputStream { i2pOptions.load(it) }
 
             if (!i2pOptions.containsKey("inbound.nickname"))
                 i2pOptions["inbound.nickname"] = "MuWire"
-                if (!i2pOptions.containsKey("outbound.nickname"))
-                    i2pOptions["outbound.nickname"] = "MuWire"
-        } else {
-            i2pOptions["inbound.nickname"] = "MuWire"
-            i2pOptions["outbound.nickname"] = "MuWire"
-            i2pOptions["inbound.length"] = "3"
-            i2pOptions["inbound.quantity"] = "4"
-            i2pOptions["outbound.length"] = "3"
-            i2pOptions["outbound.quantity"] = "4"
-            i2pOptions["i2cp.tcp.host"] = "127.0.0.1"
-            i2pOptions["i2cp.tcp.port"] = "7654"
+            if (!i2pOptions.containsKey("outbound.nickname"))
+                i2pOptions["outbound.nickname"] = "MuWire"
+        }
+        if (!(i2pOptions.hasProperty("i2np.ntcp.port")
+                && i2pOptions.hasProperty("i2np.udp.port")
+        )) {
             Random r = new Random()
             int port = r.nextInt(60000) + 4000
             i2pOptions["i2np.ntcp.port"] = String.valueOf(port)
@@ -193,7 +206,7 @@ public class Core {
         // options like tunnel length and quantity
         I2PSocketManager socketManager
         keyDat.withInputStream {
-            socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
+            socketManager = new I2PSocketManagerFactory().createDisconnectedManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
         }
         socketManager.getDefaultOptions().setReadTimeout(60000)
         socketManager.getDefaultOptions().setConnectTimeout(30000)
@@ -259,7 +272,17 @@ public class Core {
         log.info "initializing persistence service"
         persisterService = new PersisterService(new File(home, "files.json"), eventBus, 60000, fileManager)
         eventBus.register(UILoadedEvent.class, persisterService)
-        eventBus.register(UIPersistFilesEvent.class, persisterService)
+
+        log.info "initializing folder persistence service"
+        persisterFolderService = new PersisterFolderService(this, new File(home, "files"), eventBus)
+        eventBus.register(PersisterDoneEvent.class, persisterFolderService)
+        eventBus.register(FileDownloadedEvent.class, persisterFolderService)
+        eventBus.register(FileLoadedEvent.class, persisterFolderService)
+        eventBus.register(FileHashedEvent.class, persisterFolderService)
+        eventBus.register(FileUnsharedEvent.class, persisterFolderService)
+        eventBus.register(UICommentEvent.class, persisterFolderService)
+        eventBus.register(UIFilePublishedEvent.class, persisterFolderService)
+        eventBus.register(UIFileUnpublishedEvent.class, persisterFolderService)
 
         log.info("initializing host cache")
         File hostStorage = new File(home, "hosts.json")
@@ -279,10 +302,13 @@ public class Core {
         log.info("initializing cache client")
         cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)
 
+        if (!props.plugin) {
         log.info("initializing update client")
-        updateClient = new UpdateClient(eventBus, i2pSession, myVersion, props, fileManager, me, spk)
-        eventBus.register(FileDownloadedEvent.class, updateClient)
-        eventBus.register(UIResultBatchEvent.class, updateClient)
+            updateClient = new UpdateClient(eventBus, i2pSession, myVersion, props, fileManager, me, spk)
+            eventBus.register(FileDownloadedEvent.class, updateClient)
+            eventBus.register(UIResultBatchEvent.class, updateClient)
+        } else
+            log.info("running as plugin, not initializing update client")
 
         log.info("initializing connector")
         I2PConnector i2pConnector = new I2PConnector(socketManager)
@@ -299,6 +325,19 @@ public class Core {
             register(TrustEvent.class, chatServer)
         }
         
+        log.info("initializing feed manager")
+        feedManager = new FeedManager(eventBus, home)
+        eventBus.with { 
+            register(FeedItemFetchedEvent.class, feedManager)
+            register(FeedFetchEvent.class, feedManager)
+            register(UIFeedConfigurationEvent.class, feedManager)
+            register(UIFeedDeletedEvent.class, feedManager)
+        }
+        
+        log.info("initializing feed client")
+        feedClient = new FeedClient(i2pConnector, eventBus, me, feedManager)
+        eventBus.register(UIFeedUpdateEvent.class, feedClient)
+        
         log.info "initializing results sender"
         ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me, props, certificateManager, chatServer)
 
@@ -310,6 +349,7 @@ public class Core {
         log.info("initializing download manager")
         downloadManager = new DownloadManager(eventBus, trustService, meshManager, props, i2pConnector, home, me)
         eventBus.register(UIDownloadEvent.class, downloadManager)
+        eventBus.register(UIDownloadFeedItemEvent.class, downloadManager)
         eventBus.register(UILoadedEvent.class, downloadManager)
         eventBus.register(FileDownloadedEvent.class, downloadManager)
         eventBus.register(UIDownloadCancelledEvent.class, downloadManager)
@@ -318,7 +358,7 @@ public class Core {
         eventBus.register(UIDownloadResumedEvent.class, downloadManager)
 
         log.info("initializing upload manager")
-        uploadManager = new UploadManager(eventBus, fileManager, meshManager, downloadManager, props)
+        uploadManager = new UploadManager(eventBus, fileManager, meshManager, downloadManager, persisterFolderService, props)
 
         log.info("initializing connection establisher")
         connectionEstablisher = new ConnectionEstablisher(eventBus, i2pConnector, props, connectionManager, hostCache)
@@ -368,6 +408,7 @@ public class Core {
     }
 
     public void startServices() {
+        i2pSession.connect()
         hasherService.start()
         trustService.start()
         trustService.waitForLoad()
@@ -377,7 +418,9 @@ public class Core {
         connectionAcceptor.start()
         connectionEstablisher.start()
         hostCache.waitForLoad()
-        updateClient.start()
+        updateClient?.start()
+        feedManager.start()
+        feedClient.start()
     }
 
     public void shutdown() {
@@ -387,12 +430,16 @@ public class Core {
         }
         log.info("saving settings")
         saveMuSettings()
+        log.info("shutting down host cache")
+        hostCache.stop()
         log.info("shutting down trust subscriber")
         trustSubscriber.stop()
         log.info("shutting down trust service")
         trustService.stop()
         log.info("shutting down persister service")
         persisterService.stop()
+        log.info("shutting down persisterFolder service")
+        persisterFolderService.stop()
         log.info("shutting down download manager")
         downloadManager.shutdown()
         log.info("shutting down connection acceptor")
@@ -407,6 +454,10 @@ public class Core {
         chatServer.stop()
         log.info("shutting down chat manager")
         chatManager.shutdown()
+        log.info("shutting down feed manager")
+        feedManager.stop()
+        log.info("shutting down feed client")
+        feedClient.stop()
         log.info("shutting down connection manager")
         connectionManager.shutdown()
         log.info("killing i2p session")
@@ -454,7 +505,7 @@ public class Core {
             }
         }
 
-        Core core = new Core(props, home, "0.6.8")
+        Core core = new Core(props, home, "0.6.10")
         core.startServices()
 
         // ... at the end, sleep or execute script

core/src/main/groovy/com/muwire/core/MuWireSettings.groovy

@@ -31,6 +31,16 @@ class MuWireSettings {
     boolean shareHiddenFiles
     boolean searchComments
     boolean browseFiles
+    
+    boolean fileFeed
+    boolean advertiseFeed
+    boolean autoPublishSharedFiles
+    boolean defaultFeedAutoDownload
+    int defaultFeedUpdateInterval
+    int defaultFeedItemsToKeep
+    boolean defaultFeedSequential
+    
+    
     boolean startChatServer
     int maxChatConnections
     boolean advertiseChat
@@ -41,6 +51,7 @@ class MuWireSettings {
     int meshExpiration
     int speedSmoothSeconds
     boolean embeddedRouter
+    boolean plugin
     int inBw, outBw
     Set<String> watchedKeywords
     Set<String> watchedRegexes
@@ -76,10 +87,21 @@ class MuWireSettings {
         hostRejectInterval = Integer.valueOf(props.getProperty("hostRejectInterval", "1"))
         meshExpiration = Integer.valueOf(props.getProperty("meshExpiration","60"))
         embeddedRouter = Boolean.valueOf(props.getProperty("embeddedRouter","false"))
+        plugin = Boolean.valueOf(props.getProperty("plugin","false"))
         inBw = Integer.valueOf(props.getProperty("inBw","256"))
         outBw = Integer.valueOf(props.getProperty("outBw","128"))
         searchComments = Boolean.valueOf(props.getProperty("searchComments","true"))
         browseFiles = Boolean.valueOf(props.getProperty("browseFiles","true"))
+        
+        // feed settings
+        fileFeed = Boolean.valueOf(props.getProperty("fileFeed","true"))
+        advertiseFeed = Boolean.valueOf(props.getProperty("advertiseFeed","true"))
+        autoPublishSharedFiles = Boolean.valueOf(props.getProperty("autoPublishSharedFiles", "false"))
+        defaultFeedAutoDownload = Boolean.valueOf(props.getProperty("defaultFeedAutoDownload", "false"))
+        defaultFeedItemsToKeep = Integer.valueOf(props.getProperty("defaultFeedItemsToKeep", "1000"))
+        defaultFeedSequential = Boolean.valueOf(props.getProperty("defaultFeedSequential", "false"))
+        defaultFeedUpdateInterval = Integer.valueOf(props.getProperty("defaultFeedUpdateInterval", "60"))
+        
         speedSmoothSeconds = Integer.valueOf(props.getProperty("speedSmoothSeconds","60"))
         totalUploadSlots = Integer.valueOf(props.getProperty("totalUploadSlots","-1"))
         uploadSlotsPerUser = Integer.valueOf(props.getProperty("uploadSlotsPerUser","-1"))
@@ -130,10 +152,21 @@ class MuWireSettings {
         props.setProperty("hostRejectInterval", String.valueOf(hostRejectInterval))
         props.setProperty("meshExpiration", String.valueOf(meshExpiration))
         props.setProperty("embeddedRouter", String.valueOf(embeddedRouter))
+        props.setProperty("plugin", String.valueOf(plugin))
         props.setProperty("inBw", String.valueOf(inBw))
         props.setProperty("outBw", String.valueOf(outBw))
         props.setProperty("searchComments", String.valueOf(searchComments))
         props.setProperty("browseFiles", String.valueOf(browseFiles))
+        
+        // feed settings
+        props.setProperty("fileFeed", String.valueOf(fileFeed))
+        props.setProperty("advertiseFeed", String.valueOf(advertiseFeed))
+        props.setProperty("autoPublishSharedFiles", String.valueOf(autoPublishSharedFiles))
+        props.setProperty("defaultFeedAutoDownload", String.valueOf(defaultFeedAutoDownload))
+        props.setProperty("defaultFeedItemsToKeep", String.valueOf(defaultFeedItemsToKeep))
+        props.setProperty("defaultFeedSequential", String.valueOf(defaultFeedSequential))
+        props.setProperty("defaultFeedUpdateInterval", String.valueOf(defaultFeedUpdateInterval))
+        
         props.setProperty("speedSmoothSeconds", String.valueOf(speedSmoothSeconds))
         props.setProperty("totalUploadSlots", String.valueOf(totalUploadSlots))
         props.setProperty("uploadSlotsPerUser", String.valueOf(uploadSlotsPerUser))

core/src/main/groovy/com/muwire/core/connection/Connection.groovy

@@ -255,7 +255,6 @@ abstract class Connection implements Closeable {
             return
         }
         
-        // TODO: make this mandatory at some point
         byte[] sig2 = null        
         long queryTime = 0
         if (search.sig2 != null) {
@@ -278,8 +277,10 @@ abstract class Connection implements Closeable {
                     return
                 }
             }
-        } else
+        } else {
             log.info("no extended signature in query")
+            return
+        }
 
         SearchEvent searchEvent = new SearchEvent(searchTerms : search.keywords,
                                             searchHash : infohash,

core/src/main/groovy/com/muwire/core/connection/ConnectionAcceptor.groovy

@@ -15,9 +15,11 @@ import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 import com.muwire.core.MuWireSettings
 import com.muwire.core.Persona
+import com.muwire.core.SharedFile
 import com.muwire.core.chat.ChatServer
 import com.muwire.core.filecert.Certificate
 import com.muwire.core.filecert.CertificateManager
+import com.muwire.core.filefeeds.FeedItems
 import com.muwire.core.files.FileManager
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.trust.TrustLevel
@@ -161,6 +163,9 @@ class ConnectionAcceptor {
                 case (byte)'I':
                     processIRC(e)
                     break
+                case (byte)'F':
+                    processFEED(e)
+                    break
                 default:
                     throw new Exception("Invalid read $read")
             }
@@ -310,6 +315,9 @@ class ConnectionAcceptor {
             boolean chat = false
             if (headers.containsKey('Chat'))
                 chat = Boolean.parseBoolean(headers['Chat'])
+            boolean feed = false
+            if (headers.containsKey('Feed'))
+                feed = Boolean.parseBoolean(headers['Feed'])
                 
             byte [] personaBytes = Base64.decode(headers['Sender'])
             Persona sender = new Persona(new ByteArrayInputStream(personaBytes))
@@ -329,6 +337,7 @@ class ConnectionAcceptor {
                 def json = slurper.parse(payload)
                 results[i] = ResultsParser.parse(sender, resultsUUID, json)
                 results[i].chat = chat
+                results[i].feed = feed
             }
             eventBus.publish(new UIResultBatchEvent(uuid: resultsUUID, results: results))
         } catch (IOException bad) {
@@ -374,13 +383,16 @@ class ConnectionAcceptor {
             boolean chat = chatServer.running.get() && settings.advertiseChat
             os.write("Chat: ${chat}\r\n".getBytes(StandardCharsets.US_ASCII))
             
+            boolean feed = settings.fileFeed && settings.advertiseFeed
+            os.write("Feed: ${feed}\r\n".getBytes(StandardCharsets.US_ASCII))
+            
             os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
 
             DataOutputStream dos = new DataOutputStream(new GZIPOutputStream(os))
             JsonOutput jsonOutput = new JsonOutput()
             sharedFiles.each {
                 it.hit(browser, System.currentTimeMillis(), "Browse Host");
-                int certificates = certificateManager.getByInfoHash(it.getInfoHash()).size()
+                int certificates = certificateManager.getByInfoHash(new InfoHash(it.getRoot())).size()
                 def obj = ResultsSender.sharedFileToObj(it, false, certificates)
                 def json = jsonOutput.toJson(obj)
                 dos.writeShort((short)json.length())
@@ -524,5 +536,56 @@ class ConnectionAcceptor {
             throw new Exception("Invalid IRC connection")
         chatServer.handle(e)
     }
+    
+    private void processFEED(Endpoint e) {
+        try {
+            byte[] EED = new byte[5];
+            DataInputStream dis = new DataInputStream(e.getInputStream())
+            dis.readFully(EED);
+            if (EED != "EED\r\n".getBytes(StandardCharsets.US_ASCII))
+                throw new Exception("Invalid FEED connection")
+
+            OutputStream os = e.getOutputStream()
+
+            Map<String, String> headers = DataUtil.readAllHeaders(dis)
+            if (!headers.containsKey("Persona"))
+                throw new Exception("Persona header missing")
+            Persona requestor = new Persona(new ByteArrayInputStream(Base64.decode(headers['Persona'])))
+            if (requestor.destination != e.destination)
+                throw new Exception("Requestor persona mismatch")
+
+            if (!settings.fileFeed) {
+                os.write("403 Not Allowed\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                os.flush()
+                e.close()
+                return
+            }
+
+            long timestamp = 0
+            if (headers.containsKey("Timestamp")) {
+                timestamp = Long.parseLong(headers['Timestamp'])
+            }
+
+            List<SharedFile> published = fileManager.getPublishedSince(timestamp)
+
+            os.write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.write("Count: ${published.size()}\r\n".getBytes(StandardCharsets.US_ASCII));
+            os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
+
+            DataOutputStream dos = new DataOutputStream(new GZIPOutputStream(os))
+            JsonOutput jsonOutput = new JsonOutput()
+            published.each {
+                int certificates = certificateManager.getByInfoHash(new InfoHash(it.getRoot())).size()
+                def obj = FeedItems.sharedFileToObj(it, certificates)
+                def json = jsonOutput.toJson(obj)
+                dos.writeShort((short)json.length())
+                dos.write(json.getBytes(StandardCharsets.US_ASCII))
+            }
+            dos.flush()
+            dos.close()
+        } finally {
+            e.close()
+        }
+    }
 
 }

core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy

@@ -1,6 +1,7 @@
 package com.muwire.core.download
 
 import com.muwire.core.connection.I2PConnector
+import com.muwire.core.filefeeds.UIDownloadFeedItemEvent
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHasher
 import com.muwire.core.mesh.Mesh
@@ -62,11 +63,6 @@ public class DownloadManager {
 
 
     public void onUIDownloadEvent(UIDownloadEvent e) {
-
-        File incompletes = muSettings.incompleteLocation
-        if (incompletes == null)
-            incompletes = new File(home, "incompletes")
-        incompletes.mkdirs()
         
         def size = e.result[0].size
         def infohash = e.result[0].infohash
@@ -79,12 +75,29 @@ public class DownloadManager {
         destinations.addAll(e.sources)
         destinations.remove(me.destination)
 
-        Pieces pieces = getPieces(infohash, size, pieceSize, e.sequential)
+        doDownload(infohash, e.target, size, pieceSize, e.sequential, destinations)
 
-        def downloader = new Downloader(eventBus, this, me, e.target, size,
-            infohash, pieceSize, connector, destinations,
-            incompletes, pieces)
-        downloaders.put(infohash, downloader)
+    }
+    
+    public void onUIDownloadFeedItemEvent(UIDownloadFeedItemEvent e) {
+        Set<Destination> singleSource = new HashSet<>()
+        singleSource.add(e.item.getPublisher().getDestination())
+        doDownload(e.item.getInfoHash(), e.target, e.item.getSize(), e.item.getPieceSize(), 
+            e.sequential, singleSource)
+    }
+    
+    private void doDownload(InfoHash infoHash, File target, long size, int pieceSize, 
+        boolean sequential, Set<Destination> destinations) {
+        File incompletes = muSettings.incompleteLocation
+        if (incompletes == null)
+            incompletes = new File(home, "incompletes")
+        incompletes.mkdirs()
+        
+        Pieces pieces = getPieces(infoHash, size, pieceSize, sequential)
+        def downloader = new Downloader(eventBus, this, me, target, size,
+                infoHash, pieceSize, connector, destinations,
+                incompletes, pieces)
+        downloaders.put(infoHash, downloader)
         persistDownloaders()
         executor.execute({downloader.download()} as Runnable)
         eventBus.publish(new DownloadStartedEvent(downloader : downloader))

core/src/main/groovy/com/muwire/core/download/Downloader.groovy

@@ -405,8 +405,9 @@ public class Downloader {
                     }
                     eventBus.publish(
                         new FileDownloadedEvent(
-                            downloadedFile : new DownloadedFile(file.getCanonicalFile(), getInfoHash(), pieceSizePow2, successfulDestinations),
-                        downloader : Downloader.this))
+                            downloadedFile : new DownloadedFile(file.getCanonicalFile(), getInfoHash().getRoot(), pieceSizePow2, successfulDestinations),
+                        downloader : Downloader.this,
+                        infoHash: getInfoHash()))
 
                 }
                 endpoint?.close()

core/src/main/groovy/com/muwire/core/filecert/CertificateManager.groovy

@@ -70,7 +70,7 @@ class CertificateManager {
     }
     
     void onUICreateCertificateEvent(UICreateCertificateEvent e) {
-        InfoHash infoHash = e.sharedFile.getInfoHash()
+        InfoHash infoHash = new InfoHash(e.sharedFile.getRoot())
         String name = e.sharedFile.getFile().getName()
         long timestamp = System.currentTimeMillis()
         

core/src/main/groovy/com/muwire/core/filefeeds/FeedClient.groovy

@@ -0,0 +1,110 @@
+package com.muwire.core.filefeeds
+
+import java.util.logging.Level
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.Executor
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.zip.GZIPInputStream
+
+import com.muwire.core.EventBus
+import com.muwire.core.Persona
+import com.muwire.core.connection.Endpoint
+import com.muwire.core.connection.I2PConnector
+import com.muwire.core.util.DataUtil
+
+import groovy.json.JsonSlurper
+import groovy.util.logging.Log
+
+@Log
+class FeedClient {
+    
+    private final I2PConnector connector
+    private final EventBus eventBus
+    private final Persona me
+    private final FeedManager feedManager
+    
+    private final ExecutorService feedFetcher = Executors.newCachedThreadPool() 
+    private final Timer feedUpdater = new Timer("feed-updater", true)
+    
+    FeedClient(I2PConnector connector, EventBus eventBus, Persona me, FeedManager feedManager) {
+        this.connector = connector
+        this.eventBus = eventBus
+        this.me = me
+        this.feedManager = feedManager
+    }
+    
+    private void start() {
+        feedUpdater.schedule({updateAnyFeeds()} as TimerTask, 60000, 60000)
+    }
+    
+    private void stop() {
+        feedUpdater.cancel()
+        feedFetcher.shutdown()
+    }
+    
+    private void updateAnyFeeds() {
+        feedManager.getFeedsToUpdate().each { feed ->
+            feedFetcher.execute({updateFeed(feed)} as Runnable)
+        }
+    }
+    
+    void onUIFeedUpdateEvent(UIFeedUpdateEvent e) {
+        Feed feed = feedManager.getFeed(e.host)
+        if (feed == null) {
+            log.severe("UI request to update non-existent feed " + e.host.getHumanReadableName())
+            return
+        }
+        
+        feedFetcher.execute({updateFeed(feed)} as Runnable)
+    }
+    
+    private void updateFeed(Feed feed) {
+        log.info("updating feed " + feed.getPublisher().getHumanReadableName())
+        Endpoint endpoint = null
+        try {
+            eventBus.publish(new FeedFetchEvent(host : feed.getPublisher(), status : FeedFetchStatus.CONNECTING))
+            feed.setLastUpdateAttempt(System.currentTimeMillis())
+            endpoint = connector.connect(feed.getPublisher().getDestination())
+            OutputStream os = endpoint.getOutputStream()
+            os.write("FEED\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.write("Persona:${me.toBase64()}\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.write("Timestamp:${feed.getLastUpdated()}\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.flush()
+            
+            InputStream is = endpoint.getInputStream()
+            String code = DataUtil.readTillRN(is)
+            if (!code.startsWith("200"))
+                throw new IOException("Invalid code $code")
+                
+            // parse all headers
+            Map<String,String> headers = DataUtil.readAllHeaders(is)
+            
+            if (!headers.containsKey("Count"))
+                throw new IOException("No count header")
+            
+            int items = Integer.parseInt(headers['Count'])
+            
+            eventBus.publish(new FeedFetchEvent(host : feed.getPublisher(), status : FeedFetchStatus.FETCHING, totalItems: items))
+            
+            JsonSlurper slurper = new JsonSlurper()
+            DataInputStream dis = new DataInputStream(new GZIPInputStream(is))
+            for (int i = 0; i < items; i++) {
+                int size = dis.readUnsignedShort()
+                byte [] tmp = new byte[size]
+                dis.readFully(tmp)
+                def json = slurper.parse(tmp)
+                FeedItem item = FeedItems.objToFeedItem(json, feed.getPublisher())
+                eventBus.publish(new FeedItemFetchedEvent(item: item))
+            }
+            
+            eventBus.publish(new FeedFetchEvent(host : feed.getPublisher(), status : FeedFetchStatus.FINISHED))
+        } catch (Exception bad) {
+            log.log(Level.WARNING, "Feed update failed", bad)
+            eventBus.publish(new FeedFetchEvent(host : feed.getPublisher(), status : FeedFetchStatus.FAILED)) 
+        } finally {
+            endpoint?.close()
+        }
+    }
+}

core/src/main/groovy/com/muwire/core/filefeeds/FeedFetchEvent.groovy

@@ -0,0 +1,10 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class FeedFetchEvent extends Event {
+    Persona host
+    FeedFetchStatus status
+    int totalItems
+}

core/src/main/groovy/com/muwire/core/filefeeds/FeedItemFetchedEvent.groovy

@@ -0,0 +1,7 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+
+class FeedItemFetchedEvent extends Event {
+    FeedItem item
+}

core/src/main/groovy/com/muwire/core/filefeeds/FeedItemLoadedEvent.groovy

@@ -0,0 +1,7 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+
+class FeedItemLoadedEvent extends Event {
+    FeedItem item
+}

core/src/main/groovy/com/muwire/core/filefeeds/FeedItems.groovy

@@ -0,0 +1,79 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.InfoHash
+import com.muwire.core.Persona
+import com.muwire.core.SharedFile
+import com.muwire.core.files.FileHasher
+import com.muwire.core.util.DataUtil
+
+import net.i2p.data.Base64
+
+class FeedItems {
+    
+    public static def sharedFileToObj(SharedFile sf, int certificates) {
+        def json = [:]
+        json.type = "FeedItem"
+        json.version = 1
+        json.name = Base64.encode(DataUtil.encodei18nString(sf.getFile().getName()))
+        json.infoHash = Base64.encode(sf.getRoot())
+        json.size = sf.getCachedLength()
+        json.pieceSize = sf.getPieceSize()
+        
+        if (sf.getComment() != null)
+            json.comment = sf.getComment()
+        
+        json.certificates = certificates
+        
+        json.timestamp = sf.getPublishedTimestamp()
+        
+        json
+    } 
+    
+    public static FeedItem objToFeedItem(def obj, Persona publisher) throws InvalidFeedItemException {
+        if (obj.timestamp == null)
+            throw new InvalidFeedItemException("No timestamp");
+        if (obj.name == null)
+            throw new InvalidFeedItemException("No name");
+        if (obj.size == null || obj.size <= 0 || obj.size > FileHasher.MAX_SIZE)
+            throw new InvalidFeedItemException("length missing or invalid ${obj.size}")
+        if (obj.pieceSize == null || obj.pieceSize < FileHasher.MIN_PIECE_SIZE_POW2 || obj.pieceSize > FileHasher.MAX_PIECE_SIZE_POW2)
+            throw new InvalidFeedItemException("piece size missing or invalid ${obj.pieceSize}")
+        if (obj.infoHash == null)
+            throw new InvalidFeedItemException("Infohash missing")
+        
+            
+        InfoHash infoHash
+        try {
+            infoHash = new InfoHash(Base64.decode(obj.infoHash))
+        } catch (Exception bad) {
+            throw new InvalidFeedItemException("Invalid infohash", bad)
+        }
+        
+        String name
+        try {
+            name = DataUtil.readi18nString(Base64.decode(obj.name))
+        } catch (Exception bad) {
+            throw new InvalidFeedItemException("Invalid name", bad)
+        }
+        
+        int certificates = 0
+        if (obj.certificates != null)
+            certificates = obj.certificates
+        
+        new FeedItem(publisher, obj.timestamp, name, obj.size, obj.pieceSize, infoHash, certificates, obj.comment)
+    }
+    
+    public static def feedItemToObj(FeedItem item) {
+        def json = [:]
+        json.type = "FeedItem"
+        json.version = 1
+        json.name = Base64.encode(DataUtil.encodei18nString(item.getName()))
+        json.infoHash = Base64.encode(item.getInfoHash().getRoot())
+        json.size = item.getSize()
+        json.pieceSize = item.getPieceSize()
+        json.timestamp = item.getTimestamp()
+        json.certificates = item.getCertificates()
+        json.comment = item.getComment()
+        json
+    }
+}

core/src/main/groovy/com/muwire/core/filefeeds/FeedLoadedEvent.groovy

@@ -0,0 +1,7 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+
+class FeedLoadedEvent extends Event {
+    Feed feed
+}

core/src/main/groovy/com/muwire/core/filefeeds/FeedManager.groovy

@@ -0,0 +1,225 @@
+package com.muwire.core.filefeeds
+
+import java.nio.file.Files
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.ThreadFactory
+import java.util.stream.Collectors
+
+import com.muwire.core.EventBus
+import com.muwire.core.Persona
+
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
+import groovy.util.logging.Log
+
+import net.i2p.data.Base64
+import net.i2p.util.ConcurrentHashSet
+
+@Log
+class FeedManager {
+    
+    private final EventBus eventBus
+    private final File metadataFolder, itemsFolder
+    private final Map<Persona, Feed> feeds = new ConcurrentHashMap<>()
+    private final Map<Persona, Set<FeedItem>> feedItems = new ConcurrentHashMap<>()
+    
+    private final ExecutorService persister = Executors.newSingleThreadExecutor({r ->
+        new Thread(r, "feed persister")
+    } as ThreadFactory)
+    
+    
+    FeedManager(EventBus eventBus, File home) {
+        this.eventBus = eventBus
+        File feedsFolder = new File(home, "filefeeds")
+        if (!feedsFolder.exists())
+            feedsFolder.mkdir()
+        this.metadataFolder = new File(feedsFolder, "metadata")
+        if (!metadataFolder.exists())
+            metadataFolder.mkdir()
+        this.itemsFolder = new File(feedsFolder, "items")
+        if (!itemsFolder.exists())
+            itemsFolder.mkdir()
+    }
+    
+    public Feed getFeed(Persona persona) {
+        feeds.get(persona)
+    }
+    
+    public Set<FeedItem> getFeedItems(Persona persona) {
+        feedItems.getOrDefault(persona, Collections.emptySet())
+    }
+    
+    public List<Feed> getFeedsToUpdate() {
+        long now = System.currentTimeMillis()
+        feeds.values().stream().
+            filter({Feed f -> !f.getStatus().isActive()}).
+            filter({Feed f -> f.getLastUpdateAttempt() + f.getUpdateInterval() <= now})
+            .collect(Collectors.toList())
+    }
+    
+    void start() {
+        log.info("starting feed manager")
+        persister.submit({loadFeeds()} as Runnable)
+        persister.submit({loadItems()} as Runnable)
+    }
+    
+    void stop() {
+        persister.shutdown()
+    }
+    
+    private void loadFeeds() {
+        def slurper = new JsonSlurper()
+        Files.walk(metadataFolder.toPath()).
+            filter( { it.getFileName().toString().endsWith(".json")}).
+            forEach( {
+                def parsed = slurper.parse(it.toFile())
+                Persona publisher = new Persona(new ByteArrayInputStream(Base64.decode(parsed.publisher)))
+                Feed feed = new Feed(publisher)
+                feed.setUpdateInterval(parsed.updateInterval)
+                feed.setLastUpdated(parsed.lastUpdated)
+                feed.setLastUpdateAttempt(parsed.lastUpdateAttempt)
+                feed.setItemsToKeep(parsed.itemsToKeep)
+                feed.setAutoDownload(parsed.autoDownload)
+                feed.setSequential(parsed.sequential)
+                
+                feed.setStatus(FeedFetchStatus.IDLE)
+                
+                feeds.put(feed.getPublisher(), feed)
+                
+                eventBus.publish(new FeedLoadedEvent(feed : feed))
+            })     
+    }
+    
+    private void loadItems() {
+        def slurper = new JsonSlurper()
+        feeds.keySet().each { persona ->
+            File itemsFile = getItemsFile(feeds[persona])
+            if (!itemsFile.exists())
+                return // no items yet?
+            itemsFile.eachLine { line ->
+                def parsed = slurper.parseText(line)
+                FeedItem item = FeedItems.objToFeedItem(parsed, persona)
+                Set<FeedItem> items = feedItems.get(persona)
+                if (items == null) {
+                    items = new ConcurrentHashSet<>()
+                    feedItems.put(persona, items)
+                }
+                items.add(item)
+                eventBus.publish(new FeedItemLoadedEvent(item : item))
+            }
+        }
+    }
+    
+    void onFeedItemFetchedEvent(FeedItemFetchedEvent e) {
+        Set<FeedItem> set = feedItems.get(e.item.getPublisher())
+        if (set == null) {
+            set = new ConcurrentHashSet<>()
+            feedItems.put(e.getItem().getPublisher(), set)
+        }
+        set.add(e.item)
+    }
+    
+    void onFeedFetchEvent(FeedFetchEvent e) {
+        
+        Feed feed = feeds.get(e.host)
+        if (feed == null) {
+            log.severe("Fetching non-existent feed " + e.host.getHumanReadableName())
+            return
+        }
+        
+        feed.setStatus(e.status)
+        
+        if (e.status.isActive())
+            return
+        
+        if (e.status == FeedFetchStatus.FINISHED) {
+            feed.setStatus(FeedFetchStatus.IDLE)
+            feed.setLastUpdated(e.getTimestamp())
+        }
+        // save feed items, then save feed.  This will save partial fetches too
+        // which is ok because the items are stored in a Set
+        persister.submit({saveFeedItems(e.host)} as Runnable)
+        persister.submit({saveFeedMetadata(feed)} as Runnable)
+    }
+    
+    void onUIFeedConfigurationEvent(UIFeedConfigurationEvent e) {
+        feeds.put(e.feed.getPublisher(), e.feed)
+        persister.submit({saveFeedMetadata(e.feed)} as Runnable)
+    }
+    
+    void onUIFeedDeletedEvent(UIFeedDeletedEvent e) {
+        Feed f = feeds.get(e.host)
+        if (f == null) {
+            log.severe("Deleting a non-existing feed " + e.host.getHumanReadableName())
+            return
+        }
+        persister.submit({deleteFeed(f)} as Runnable)
+    }
+    
+    private void saveFeedItems(Persona publisher) {
+        Set<FeedItem> set = feedItems.get(publisher)
+        if (set == null)
+            return // can happen if nothing was published
+        
+        Feed feed = feeds[publisher]
+        if (feed == null) {
+            log.severe("Persisting items for non-existing feed " + publisher.getHumanReadableName())
+            return
+        }   
+              
+        if (feed.getItemsToKeep() == 0)
+            return
+             
+        List<FeedItem> list = new ArrayList<>(set)
+        if (feed.getItemsToKeep() > 0 && list.size() > feed.getItemsToKeep()) {
+            log.info("will persist ${feed.getItemsToKeep()}/${list.size()} items")
+            list.sort({l, r ->
+                Long.compare(r.getTimestamp(), l.getTimestamp())
+            } as Comparator<FeedItem>)
+            list = list[0..feed.getItemsToKeep() - 1]
+        }
+        
+        
+        File itemsFile = getItemsFile(feed)
+        itemsFile.withPrintWriter { writer -> 
+            list.each { item -> 
+                def obj = FeedItems.feedItemToObj(item)
+                def json = JsonOutput.toJson(obj)
+                writer.println(json)
+            }
+        }
+    }
+    
+    private void saveFeedMetadata(Feed feed) {
+        File metadataFile = getMetadataFile(feed)
+        metadataFile.withPrintWriter { writer ->
+            def json = [:]
+            json.publisher = feed.getPublisher().toBase64()
+            json.itemsToKeep = feed.getItemsToKeep()
+            json.lastUpdated = feed.getLastUpdated()
+            json.updateInterval = feed.getUpdateInterval()
+            json.autoDownload = feed.isAutoDownload()
+            json.sequential = feed.isSequential()
+            json.lastUpdateAttempt = feed.getLastUpdateAttempt()
+            json = JsonOutput.toJson(json)
+            writer.println(json)
+        }
+    }
+    
+    private void deleteFeed(Feed feed) {
+        feeds.remove(feed.getPublisher())
+        feedItems.remove(feed.getPublisher())
+        getItemsFile(feed).delete()
+        getMetadataFile(feed).delete()
+    }
+    
+    private File getItemsFile(Feed feed) {
+        return new File(itemsFolder, feed.getPublisher().destination.toBase32() + ".json")
+    }
+    
+    private File getMetadataFile(Feed feed) {
+        return new File(metadataFolder, feed.getPublisher().destination.toBase32() + ".json")
+    }
+}

core/src/main/groovy/com/muwire/core/filefeeds/UIDownloadFeedItemEvent.groovy

@@ -0,0 +1,9 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+
+class UIDownloadFeedItemEvent extends Event {
+    FeedItem item
+    File target
+    boolean sequential
+}

core/src/main/groovy/com/muwire/core/filefeeds/UIFeedConfigurationEvent.groovy

@@ -0,0 +1,12 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+
+/**
+ * Emitted when configuration of a feed changes.  
+ * The object should already contain the updated values.
+ */
+class UIFeedConfigurationEvent extends Event {
+    Feed feed
+    boolean newFeed
+}

core/src/main/groovy/com/muwire/core/filefeeds/UIFeedDeletedEvent.groovy

@@ -0,0 +1,8 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class UIFeedDeletedEvent extends Event {
+    Persona host
+}

core/src/main/groovy/com/muwire/core/filefeeds/UIFeedUpdateEvent.groovy

@@ -0,0 +1,8 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class UIFeedUpdateEvent extends Event {
+    Persona host
+}

core/src/main/groovy/com/muwire/core/filefeeds/UIFilePublishedEvent.groovy

@@ -0,0 +1,8 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+import com.muwire.core.SharedFile
+
+class UIFilePublishedEvent extends Event {
+    SharedFile sf
+}

core/src/main/groovy/com/muwire/core/filefeeds/UIFileUnpublishedEvent.groovy

@@ -0,0 +1,8 @@
+package com.muwire.core.filefeeds
+
+import com.muwire.core.Event
+import com.muwire.core.SharedFile
+
+class UIFileUnpublishedEvent extends Event {
+    SharedFile sf
+}

core/src/main/groovy/com/muwire/core/files/BasePersisterService.groovy

@@ -0,0 +1,168 @@
+package com.muwire.core.files
+
+import com.muwire.core.DownloadedFile
+import com.muwire.core.InfoHash
+import com.muwire.core.Persona
+import com.muwire.core.Service
+import com.muwire.core.SharedFile
+import com.muwire.core.util.DataUtil
+import net.i2p.data.Base64
+import net.i2p.data.Destination
+
+import java.util.stream.Collectors
+
+abstract class BasePersisterService extends Service{
+
+    protected static FileLoadedEvent fromJson(def json) {
+        if (json.file == null || json.length == null || json.infoHash == null || json.hashList == null)
+            throw new IllegalArgumentException()
+        if (!(json.hashList instanceof List))
+            throw new IllegalArgumentException()
+
+        def file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
+        file = file.getCanonicalFile()
+        if (!file.exists() || file.isDirectory())
+            return null
+        long length = Long.valueOf(json.length)
+        if (length != file.length())
+            return null
+
+        List hashList = (List) json.hashList
+        ByteArrayOutputStream baos = new ByteArrayOutputStream()
+        hashList.each {
+            byte [] hash = Base64.decode it.toString()
+            if (hash == null)
+                throw new IllegalArgumentException()
+            baos.write hash
+        }
+        byte[] hashListBytes = baos.toByteArray()
+
+        InfoHash ih = InfoHash.fromHashList(hashListBytes)
+        byte [] root = Base64.decode(json.infoHash.toString())
+        if (root == null)
+            throw new IllegalArgumentException()
+        if (!Arrays.equals(root, ih.getRoot()))
+            return null
+
+        int pieceSize = 0
+        if (json.pieceSize != null)
+            pieceSize = json.pieceSize
+            
+        if (json.sources != null) {
+            List sources = (List)json.sources
+            Set<Destination> sourceSet = sources.stream().map({ d -> new Destination(d.toString())}).collect Collectors.toSet()
+            DownloadedFile df = new DownloadedFile(file, ih.getRoot(), pieceSize, sourceSet)
+            df.setComment(json.comment)
+            return new FileLoadedEvent(loadedFile : df, infoHash: ih)
+        }
+
+
+        SharedFile sf = new SharedFile(file, ih.getRoot(), pieceSize)
+        sf.setComment(json.comment)
+        if (json.downloaders != null)
+            sf.getDownloaders().addAll(json.downloaders)
+        if (json.searchers != null) {
+            json.searchers.each {
+                Persona searcher = null
+                if (it.searcher != null)
+                    searcher = new Persona(new ByteArrayInputStream(Base64.decode(it.searcher)))
+                long timestamp = it.timestamp
+                String query = it.query
+                sf.hit(searcher, timestamp, query)
+            }
+        }
+        return new FileLoadedEvent(loadedFile: sf, infoHash: ih)
+
+    }
+    
+    protected static FileLoadedEvent fromJsonLite(json) {
+        if (json.file == null || json.length == null || json.root == null)
+            throw new IllegalArgumentException()
+            
+        def file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
+        file = file.getCanonicalFile()
+        if (!file.exists() || file.isDirectory())
+            return null
+        long length = Long.valueOf(json.length)
+        if (length != file.length())
+            return null
+            
+        byte[] root = Base64.decode(json.root)
+        InfoHash ih = new InfoHash(root)
+        
+        int pieceSize = 0
+        if (json.pieceSize != null)
+            pieceSize = json.pieceSize
+
+        boolean published = false
+        long publishedTimestamp = -1
+        if (json.published != null && json.published) {
+            published = true
+            publishedTimestamp = json.publishedTimestamp
+        }
+
+        if (json.sources != null) {
+            List sources = (List)json.sources
+            Set<Destination> sourceSet = sources.stream().map({ d -> new Destination(d.toString())}).collect Collectors.toSet()
+            DownloadedFile df = new DownloadedFile(file, ih.getRoot(), pieceSize, sourceSet)
+            if (published)
+                df.publish(publishedTimestamp)
+            df.setComment(json.comment)
+            return new FileLoadedEvent(loadedFile : df, infoHash: ih)
+        }
+
+
+        SharedFile sf = new SharedFile(file, ih.getRoot(), pieceSize)
+        sf.setComment(json.comment)
+        if (published)
+            sf.publish(publishedTimestamp)
+        if (json.downloaders != null)
+            sf.getDownloaders().addAll(json.downloaders)
+        if (json.searchers != null) {
+            json.searchers.each {
+                Persona searcher = null
+                if (it.searcher != null)
+                    searcher = new Persona(new ByteArrayInputStream(Base64.decode(it.searcher)))
+                long timestamp = it.timestamp
+                String query = it.query
+                sf.hit(searcher, timestamp, query)
+            }
+        }
+        return new FileLoadedEvent(loadedFile: sf, infoHash: ih)
+    }
+
+    protected static toJson(SharedFile sf) {
+        def json = [:]
+        json.file = sf.getB64EncodedFileName()
+        json.length = sf.getCachedLength()
+        json.root = Base64.encode(sf.getRoot())
+        json.pieceSize = sf.getPieceSize()
+        json.comment = sf.getComment()
+        json.hits = sf.getHits()
+        json.downloaders = sf.getDownloaders()
+
+        if (!sf.searches.isEmpty()) {
+            Set searchers = new HashSet<>()
+            sf.searches.each {
+                def search = [:]
+                if (it.searcher != null)
+                    search.searcher = it.searcher.toBase64()
+                search.timestamp = it.timestamp
+                search.query = it.query
+                searchers.add(search)
+            }
+            json.searchers = searchers
+        }
+
+        if (sf instanceof DownloadedFile) {
+            json.sources = sf.sources.stream().map( {d -> d.toBase64()}).collect(Collectors.toList())
+        }
+        
+        if (sf.isPublished()) {
+            json.published = true
+            json.publishedTimestamp = sf.getPublishedTimestamp()
+        }
+
+        json
+    }
+}

core/src/main/groovy/com/muwire/core/files/FileDownloadedEvent.groovy

@@ -2,6 +2,7 @@ package com.muwire.core.files
 
 import com.muwire.core.DownloadedFile
 import com.muwire.core.Event
+import com.muwire.core.InfoHash
 import com.muwire.core.download.Downloader
 
 import net.i2p.data.Destination
@@ -9,4 +10,5 @@ import net.i2p.data.Destination
 class FileDownloadedEvent extends Event {
     Downloader downloader
     DownloadedFile downloadedFile
+    InfoHash infoHash
 }

core/src/main/groovy/com/muwire/core/files/FileHashedEvent.groovy

@@ -1,16 +1,18 @@
 package com.muwire.core.files
 
 import com.muwire.core.Event
+import com.muwire.core.InfoHash
 import com.muwire.core.SharedFile
 
 class FileHashedEvent extends Event {
 
     SharedFile sharedFile
+    InfoHash infoHash
     String error
 
     @Override
     public String toString() {
-        super.toString() + " sharedFile " + sharedFile?.file.getAbsolutePath() + " error: $error"
+        super.toString() + " sharedFile " + sharedFile?.file?.getAbsolutePath() + " error: $error"
     }
 
 }

core/src/main/groovy/com/muwire/core/files/FileLoadedEvent.groovy

@@ -1,9 +1,12 @@
 package com.muwire.core.files
 
 import com.muwire.core.Event
+import com.muwire.core.InfoHash
 import com.muwire.core.SharedFile
 
 class FileLoadedEvent extends Event {
 
     SharedFile loadedFile
+    InfoHash infoHash
+    String source
 }

core/src/main/groovy/com/muwire/core/files/FileManager.groovy

@@ -1,5 +1,8 @@
 package com.muwire.core.files
 
+import java.util.stream.Collectors
+import java.util.stream.Stream
+
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 import com.muwire.core.MuWireSettings
@@ -75,7 +78,7 @@ class FileManager {
 
     private void addToIndex(SharedFile sf) {
         log.info("Adding shared file " + sf.getFile())
-        InfoHash infoHash = sf.getInfoHash()
+        InfoHash infoHash = new InfoHash(sf.getRoot())
         Set<SharedFile> existing = rootToFiles.get(infoHash)
         if (existing == null) {
             log.info("adding new root")
@@ -117,7 +120,7 @@ class FileManager {
 
     void onFileUnsharedEvent(FileUnsharedEvent e) {
         SharedFile sf = e.unsharedFile
-        InfoHash infoHash = sf.getInfoHash()
+        InfoHash infoHash = new InfoHash(sf.getRoot())
         Set<SharedFile> existing = rootToFiles.get(infoHash)
         if (existing != null) {
             existing.remove(sf)
@@ -190,6 +193,10 @@ class FileManager {
     Set<SharedFile> getSharedFiles(byte []root) {
             return rootToFiles.get(new InfoHash(root))
     }
+    
+    boolean isShared(InfoHash infoHash) {
+        rootToFiles.containsKey(infoHash)
+    }
 
     void onSearchEvent(SearchEvent e) {
         // hash takes precedence
@@ -254,4 +261,13 @@ class FileManager {
         settings.negativeFileTree.clear()
         settings.negativeFileTree.addAll(negativeTree.fileToNode.keySet().collect { it.getAbsolutePath() })
     }
+    
+    public List<SharedFile> getPublishedSince(long timestamp) {
+        synchronized(fileToSharedFile) {
+            fileToSharedFile.values().stream().
+                    filter({sf -> sf.isPublished()}).
+                    filter({sf -> sf.getPublishedTimestamp() >= timestamp}).
+                    collect(Collectors.toList())
+        }
+    }
 }

core/src/main/groovy/com/muwire/core/files/HasherService.groovy

@@ -65,7 +65,8 @@ class HasherService {
             } else {
                 eventBus.publish new FileHashingEvent(hashingFile: f)
                 def hash = hasher.hashFile f
-                eventBus.publish new FileHashedEvent(sharedFile: new SharedFile(f, hash, FileHasher.getPieceSize(f.length())))
+                eventBus.publish new FileHashedEvent(sharedFile: new SharedFile(f, hash.getRoot(), FileHasher.getPieceSize(f.length())),
+                    infoHash : hash)
             }
         }
     }

core/src/main/groovy/com/muwire/core/files/PersisterDoneEvent.groovy

@@ -0,0 +1,12 @@
+package com.muwire.core.files
+
+import com.muwire.core.Event
+
+/**
+ * Should be triggered by the old PersisterService
+ * once it has finished reading the old file
+ *
+ * @see PersisterService
+ */
+class PersisterDoneEvent extends Event{
+}

core/src/main/groovy/com/muwire/core/files/PersisterFolderService.groovy

@@ -0,0 +1,195 @@
+package com.muwire.core.files
+
+import com.muwire.core.*
+import com.muwire.core.filefeeds.UIFilePublishedEvent
+import com.muwire.core.filefeeds.UIFileUnpublishedEvent
+
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
+import groovy.util.logging.Log
+
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.ThreadFactory
+import java.util.logging.Level
+
+/**
+ * A persister that stores information about the files shared using
+ * individual JSON files in directories.
+ *
+ * The absolute path's 32bit hash to the shared file is used
+ * to build the directory and filename.
+ *
+ * This persister only starts working once the old persister has finished loading
+ * @see PersisterFolderService#getJsonPath
+ */
+@Log
+class PersisterFolderService extends BasePersisterService {
+
+    final static int CUT_LENGTH = 6
+
+    private final Core core;
+    final File location
+    final EventBus listener
+    final int interval
+    final Timer timer
+    final ExecutorService persisterExecutor = Executors.newSingleThreadExecutor({ r ->
+        new Thread(r, "file persister")
+    } as ThreadFactory)
+
+    PersisterFolderService(Core core, File location, EventBus listener) {
+        this.core = core;
+        this.location = location
+        this.listener = listener
+        this.interval = interval
+        timer = new Timer("file-folder persister timer", true)
+    }
+
+    void stop() {
+        timer.cancel()
+        persisterExecutor.shutdown()
+    }
+
+    void onPersisterDoneEvent(PersisterDoneEvent persisterDoneEvent) {
+        log.info("Old persister done")
+        load()
+    }
+
+    void onFileHashedEvent(FileHashedEvent hashedEvent) {
+        if (core.getMuOptions().getAutoPublishSharedFiles() && hashedEvent.sharedFile != null) 
+            hashedEvent.sharedFile.publish(System.currentTimeMillis())
+        persistFile(hashedEvent.sharedFile, hashedEvent.infoHash)
+    }
+
+    void onFileDownloadedEvent(FileDownloadedEvent downloadedEvent) {
+        if (core.getMuOptions().getShareDownloadedFiles()) {
+            if (core.getMuOptions().getAutoPublishSharedFiles())
+                downloadedEvent.downloadedFile.publish(System.currentTimeMillis())
+            persistFile(downloadedEvent.downloadedFile, downloadedEvent.infoHash)
+        }
+    }
+
+    /**
+     * Get rid of the json and hashlists of unshared files
+     * @param unsharedEvent
+     */
+    void onFileUnsharedEvent(FileUnsharedEvent unsharedEvent) {
+        def jsonPath = getJsonPath(unsharedEvent.unsharedFile)
+        def jsonFile = jsonPath.toFile()
+        if(jsonFile.isFile()){
+            jsonFile.delete()
+        }
+        def hashListPath = getHashListPath(unsharedEvent.unsharedFile)
+        def hashListFile = hashListPath.toFile()
+        if (hashListFile.isFile())
+            hashListFile.delete()
+    }
+    
+    void onFileLoadedEvent(FileLoadedEvent loadedEvent) {
+        if(loadedEvent.source == "PersisterService"){
+            log.info("Migrating persisted file from PersisterService: "
+                    + loadedEvent.loadedFile.file.absolutePath.toString())
+            persistFile(loadedEvent.loadedFile, loadedEvent.infoHash)
+        }
+    }
+    
+    void onUICommentEvent(UICommentEvent e) {
+        persistFile(e.sharedFile,null)
+    }
+    
+    void onUIFilePublishedEvent(UIFilePublishedEvent e) {
+        persistFile(e.sf, null)
+    }
+    
+    void onUIFileUnpublishedEvent(UIFileUnpublishedEvent e) {
+        persistFile(e.sf, null)
+    }
+
+    void load() {
+        log.fine("Loading...")
+        Thread.currentThread().setPriority(Thread.MIN_PRIORITY)
+
+        if (location.exists() && location.isDirectory()) {
+            try {
+                _load()
+            }
+            catch (IllegalArgumentException e) {
+                log.log(Level.WARNING, "couldn't load files", e)
+            }
+        } else {
+            location.mkdirs()
+            listener.publish(new AllFilesLoadedEvent())
+        }
+        loaded = true
+    }
+
+    /**
+     * Loads every JSON into memory
+     */
+    private void _load() {
+        int loaded = 0
+        def slurper = new JsonSlurper()
+        Files.walk(location.toPath())
+                .filter({
+                    it.getFileName().toString().endsWith(".json")
+                })
+                .forEach({
+                    def parsed = slurper.parse it.toFile()
+                    def event = fromJsonLite parsed
+                    if (event == null) return
+
+                    log.fine("loaded file $event.loadedFile.file")
+                    listener.publish event
+                    loaded++
+                    if (loaded % 10 == 0)
+                        Thread.sleep(20)
+
+                })
+        listener.publish(new AllFilesLoadedEvent())
+    }
+
+    private void persistFile(SharedFile sf, InfoHash ih) {
+        persisterExecutor.submit({
+            def jsonPath = getJsonPath(sf)
+
+            def startTime = System.currentTimeMillis()
+            jsonPath.parent.toFile().mkdirs()
+            jsonPath.toFile().withPrintWriter { writer ->
+                def json = toJson sf
+                json = JsonOutput.toJson(json)
+                writer.println json
+            }
+            
+            if (ih != null) {
+                def hashListPath = getHashListPath(sf)
+                hashListPath.toFile().bytes = ih.hashList
+            }
+            log.fine("Time(ms) to write json+hashList: " + (System.currentTimeMillis() - startTime))
+        } as Runnable)
+    }
+    private Path getJsonPath(SharedFile sf){
+        def pathHash = sf.getB64PathHash()
+        return Paths.get(
+                location.getAbsolutePath(),
+                pathHash.substring(0, CUT_LENGTH),
+                pathHash.substring(CUT_LENGTH) + ".json"
+        )
+    }
+    
+    private Path getHashListPath(SharedFile sf) {
+        def pathHash = sf.getB64PathHash()
+        return Paths.get(
+                location.getAbsolutePath(),
+                pathHash.substring(0, CUT_LENGTH),
+                pathHash.substring(CUT_LENGTH) + ".hashlist"
+        )
+    }
+    
+    InfoHash loadInfoHash(SharedFile sf) {
+        def path = getHashListPath(sf)
+        InfoHash.fromHashList(path.toFile().bytes)
+    }
+}

core/src/main/groovy/com/muwire/core/files/PersisterService.groovy

@@ -1,40 +1,24 @@
 package com.muwire.core.files
 
-import java.nio.file.CopyOption
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
+
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.ThreadFactory
 import java.util.logging.Level
-import java.util.stream.Collectors
 
-import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
-import com.muwire.core.InfoHash
-import com.muwire.core.Persona
-import com.muwire.core.Service
-import com.muwire.core.SharedFile
 import com.muwire.core.UILoadedEvent
-import com.muwire.core.util.DataUtil
-
-import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import groovy.util.logging.Log
-import net.i2p.data.Base64
-import net.i2p.data.Destination
 
 @Log
-class PersisterService extends Service {
+class PersisterService extends BasePersisterService {
 
     final File location
     final EventBus listener
     final int interval
     final Timer timer
     final FileManager fileManager
-    final ExecutorService persisterExecutor = Executors.newSingleThreadExecutor({ r -> 
-        new Thread(r, "file persister")
-    } as ThreadFactory)
 
     PersisterService(File location, EventBus listener, int interval, FileManager fileManager) {
         this.location = location
@@ -51,10 +35,6 @@ class PersisterService extends Service {
     void onUILoadedEvent(UILoadedEvent e) {
         timer.schedule({load()} as TimerTask, 1)
     }
-    
-    void onUIPersistFilesEvent(UIPersistFilesEvent e) {
-        persistFiles()
-    }
 
     void load() {
         Thread.currentThread().setPriority(Thread.MIN_PRIORITY)
@@ -69,6 +49,7 @@ class PersisterService extends Service {
                         def event = fromJson parsed
                         if (event != null) {
                             log.fine("loaded file $event.loadedFile.file")
+                            event.source = "PersisterService"
                             listener.publish event
                             loaded++
                             if (loaded % 10 == 0)
@@ -76,126 +57,18 @@ class PersisterService extends Service {
                         }
                     }
                 }
-                listener.publish(new AllFilesLoadedEvent())
-            } catch (IllegalArgumentException|NumberFormatException e) {
+                // Backup the old hashes
+                location.renameTo(
+                        new File(location.absolutePath + ".bak")
+                )
+                listener.publish(new PersisterDoneEvent())
+            } catch (IllegalArgumentException e) {
                 log.log(Level.WARNING, "couldn't load files",e)
             }
         } else {
-            listener.publish(new AllFilesLoadedEvent())
+            listener.publish(new PersisterDoneEvent())
         }
-        timer.schedule({persistFiles()} as TimerTask, 1000, interval)
         loaded = true
     }
 
-    private static FileLoadedEvent fromJson(def json) {
-        if (json.file == null || json.length == null || json.infoHash == null || json.hashList == null)
-            throw new IllegalArgumentException()
-        if (!(json.hashList instanceof List))
-            throw new IllegalArgumentException()
-
-        def file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
-        file = file.getCanonicalFile()
-        if (!file.exists() || file.isDirectory())
-            return null
-        long length = Long.valueOf(json.length)
-        if (length != file.length())
-            return null
-
-        List hashList = (List) json.hashList
-        ByteArrayOutputStream baos = new ByteArrayOutputStream()
-        hashList.each {
-            byte [] hash = Base64.decode it.toString()
-            if (hash == null)
-                throw new IllegalArgumentException()
-            baos.write hash
-        }
-        byte[] hashListBytes = baos.toByteArray()
-
-        InfoHash ih = InfoHash.fromHashList(hashListBytes)
-        byte [] root = Base64.decode(json.infoHash.toString())
-        if (root == null)
-            throw new IllegalArgumentException()
-        if (!Arrays.equals(root, ih.getRoot()))
-            return null
-
-        int pieceSize = 0
-        if (json.pieceSize != null)
-            pieceSize = json.pieceSize
-
-        if (json.sources != null) {
-            List sources = (List)json.sources
-            Set<Destination> sourceSet = sources.stream().map({d -> new Destination(d.toString())}).collect Collectors.toSet()
-            DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
-            df.setComment(json.comment)
-            return new FileLoadedEvent(loadedFile : df)
-        }
-
-
-        SharedFile sf = new SharedFile(file, ih, pieceSize)
-        sf.setComment(json.comment)
-        if (json.downloaders != null)
-            sf.getDownloaders().addAll(json.downloaders)
-        if (json.searchers != null) {
-            json.searchers.each {
-                Persona searcher = null
-                if (it.searcher != null)
-                    searcher = new Persona(new ByteArrayInputStream(Base64.decode(it.searcher)))
-                long timestamp = it.timestamp
-                String query = it.query
-                sf.hit(searcher, timestamp, query)
-            }
-        }
-        return new FileLoadedEvent(loadedFile: sf)
-
-    }
-
-    private void persistFiles() {
-        persisterExecutor.submit( {
-            def sharedFiles = fileManager.getSharedFiles()
-
-            File tmp = File.createTempFile("muwire-files", "tmp")
-            tmp.deleteOnExit()
-            tmp.withPrintWriter { writer ->
-                sharedFiles.each { k, v ->
-                    def json = toJson(k,v)
-                    json = JsonOutput.toJson(json)
-                    writer.println json
-                }
-            }
-            Files.copy(tmp.toPath(), location.toPath(), StandardCopyOption.REPLACE_EXISTING)
-            tmp.delete()
-        } as Runnable)
-    }
-
-    private def toJson(File f, SharedFile sf) {
-        def json = [:]
-        json.file = sf.getB64EncodedFileName()
-        json.length = sf.getCachedLength()
-        InfoHash ih = sf.getInfoHash()
-        json.infoHash = sf.getB64EncodedHashRoot()
-        json.pieceSize = sf.getPieceSize()
-        json.hashList = sf.getB64EncodedHashList()
-        json.comment = sf.getComment()
-        json.hits = sf.getHits()
-        json.downloaders = sf.getDownloaders()
-
-        if (!sf.searches.isEmpty()) {
-            Set searchers = new HashSet<>()
-            sf.searches.each {
-                def search = [:]
-                if (it.searcher != null)
-                    search.searcher = it.searcher.toBase64()
-                search.timestamp = it.timestamp
-                search.query = it.query
-                searchers.add(search)
-            }
-            json.searchers = searchers
-        }
-        
-        if (sf instanceof DownloadedFile) {
-            json.sources = sf.sources.stream().map( {d -> d.toBase64()}).collect(Collectors.toList())
-        }
-
-        json
-    }
 }

core/src/main/groovy/com/muwire/core/files/UIPersistFilesEvent.groovy

@@ -1,6 +0,0 @@
-package com.muwire.core.files
-
-import com.muwire.core.Event
-
-class UIPersistFilesEvent extends Event {
-}

core/src/main/groovy/com/muwire/core/hostcache/CacheClient.groovy

@@ -1,5 +1,7 @@
 package com.muwire.core.hostcache
 
+import java.util.concurrent.atomic.AtomicBoolean
+
 import com.muwire.core.EventBus
 import com.muwire.core.MuWireSettings
 import com.muwire.core.connection.ConnectionManager
@@ -27,6 +29,7 @@ class CacheClient {
     final long interval
     final MuWireSettings settings
     final Timer timer
+    private final AtomicBoolean stopped = new AtomicBoolean();
 
     public CacheClient(EventBus eventBus, HostCache cache,
         ConnectionManager manager, I2PSession session,
@@ -47,9 +50,12 @@ class CacheClient {
 
     void stop() {
         timer.cancel()
+        stopped.set(true)
     }
 
     private void queryIfNeeded() {
+        if (stopped.get())
+            return
         if (!manager.getConnections().isEmpty())
             return
         if (!cache.getHosts(1).isEmpty())
@@ -65,7 +71,12 @@ class CacheClient {
         options.setSendLeaseSet(true)
         CacheServers.getCacheServers().each {
             log.info "Querying hostcache ${it.toBase32()}"
-            session.sendMessage(it, ping, 0, ping.length, I2PSession.PROTO_DATAGRAM, 1, 0, options)
+            try {
+                session.sendMessage(it, ping, 0, ping.length, I2PSession.PROTO_DATAGRAM, 1, 0, options)
+            } catch (Exception e) {
+                if (!stopped.get())
+                    throw e
+            }
         }
     }
 

core/src/main/groovy/com/muwire/core/search/ResultsSender.groovy

@@ -77,18 +77,19 @@ class ResultsSender {
                 if (it.getComment() != null) {
                     comment = DataUtil.readi18nString(Base64.decode(it.getComment()))
                 }
-                int certificates = certificateManager.getByInfoHash(it.getInfoHash()).size()
+                int certificates = certificateManager.getByInfoHash(new InfoHash(it.getRoot())).size()
                 def uiResultEvent = new UIResultEvent( sender : me,
                     name : it.getFile().getName(),
                     size : length,
-                    infohash : it.getInfoHash(),
+                    infohash : new InfoHash(it.getRoot()),
                     pieceSize : pieceSize,
                     uuid : uuid,
                     browse : settings.browseFiles,
                     sources : suggested,
                     comment : comment,
                     certificates : certificates,
-                    chat : chatServer.running.get() && settings.advertiseChat
+                    chat : chatServer.running.get() && settings.advertiseChat,
+                    feed : settings.fileFeed && settings.advertiseFeed
                     )
                 uiResultEvents << uiResultEvent
             }
@@ -119,7 +120,7 @@ class ResultsSender {
                         me.write(os)
                         os.writeShort((short)results.length)
                         results.each {
-                            int certificates = certificateManager.getByInfoHash(it.getInfoHash()).size()
+                            int certificates = certificateManager.getByInfoHash(new InfoHash(it.getRoot())).size()
                             def obj = sharedFileToObj(it, settings.browseFiles, certificates)
                             def json = jsonOutput.toJson(obj)
                             os.writeShort((short)json.length())
@@ -138,10 +139,12 @@ class ResultsSender {
                         os.write("Count: $results.length\r\n".getBytes(StandardCharsets.US_ASCII))
                         boolean chat = chatServer.running.get() && settings.advertiseChat
                         os.write("Chat: $chat\r\n".getBytes(StandardCharsets.US_ASCII))
+                        boolean feed = settings.fileFeed && settings.advertiseFeed
+                        os.write("Feed: $feed\r\n".getBytes(StandardCharsets.US_ASCII))
                         os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
                         DataOutputStream dos = new DataOutputStream(new GZIPOutputStream(os))
                         results.each { 
-                            int certificates = certificateManager.getByInfoHash(it.getInfoHash()).size()
+                            int certificates = certificateManager.getByInfoHash(new InfoHash(it.getRoot())).size()
                             def obj = sharedFileToObj(it, settings.browseFiles, certificates)
                             def json = jsonOutput.toJson(obj)
                             dos.writeShort((short)json.length())
@@ -170,7 +173,7 @@ class ResultsSender {
         obj.type = "Result"
         obj.version = 2
         obj.name = encodedName
-        obj.infohash = Base64.encode(sf.getInfoHash().getRoot())
+        obj.infohash = Base64.encode(sf.getRoot())
         obj.size = sf.getCachedLength()
         obj.pieceSize = sf.getPieceSize()
 

core/src/main/groovy/com/muwire/core/search/UIResultEvent.groovy

@@ -18,7 +18,8 @@ class UIResultEvent extends Event {
     boolean browse
     int certificates
     boolean chat
-
+    boolean feed
+    
     @Override
     public String toString() {
         super.toString() + "name:$name size:$size sender:${sender.getHumanReadableName()} pieceSize $pieceSize"

core/src/main/groovy/com/muwire/core/update/UpdateClient.groovy

@@ -83,7 +83,7 @@ class UpdateClient {
     }
 
     void onFileDownloadedEvent(FileDownloadedEvent e) {
-        if (e.downloadedFile.infoHash != updateInfoHash)
+        if (e.infoHash != updateInfoHash)
             return
         updateDownloading = false
         eventBus.publish(new UpdateDownloadedEvent(version : version, signer : signer, text : text))

core/src/main/groovy/com/muwire/core/upload/UploadManager.groovy

@@ -12,6 +12,7 @@ import com.muwire.core.download.DownloadManager
 import com.muwire.core.download.Downloader
 import com.muwire.core.download.SourceDiscoveredEvent
 import com.muwire.core.files.FileManager
+import com.muwire.core.files.PersisterFolderService
 import com.muwire.core.mesh.Mesh
 import com.muwire.core.mesh.MeshManager
 
@@ -22,6 +23,7 @@ import net.i2p.data.Base64
 public class UploadManager {
     private final EventBus eventBus
     private final FileManager fileManager
+    private final PersisterFolderService persisterService
     private final MeshManager meshManager
     private final DownloadManager downloadManager
     private final MuWireSettings props
@@ -34,9 +36,11 @@ public class UploadManager {
 
     public UploadManager(EventBus eventBus, FileManager fileManager,
         MeshManager meshManager, DownloadManager downloadManager,
+        PersisterFolderService persisterService,
         MuWireSettings props) {
         this.eventBus = eventBus
         this.fileManager = fileManager
+        this.persisterService = persisterService
         this.meshManager = meshManager
         this.downloadManager = downloadManager
         this.props = props
@@ -162,7 +166,7 @@ public class UploadManager {
 
         InfoHash fullInfoHash
         if (downloader == null) {
-            fullInfoHash = sharedFiles.iterator().next().infoHash
+            fullInfoHash = persisterService.loadInfoHash(sharedFiles.iterator().next())
         } else {
             byte [] hashList = downloader.getInfoHash().getHashList()
             if (hashList != null && hashList.length > 0)

core/src/main/java/com/muwire/core/DownloadedFile.java

@@ -10,9 +10,9 @@ public class DownloadedFile extends SharedFile {
 
     private final Set<Destination> sources;
 
-    public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources)
+    public DownloadedFile(File file, byte[] root, int pieceSize, Set<Destination> sources)
     throws IOException {
-        super(file, infoHash, pieceSize);
+        super(file, root, pieceSize);
         this.sources = sources;
     }
 

core/src/main/java/com/muwire/core/SharedFile.java

@@ -2,7 +2,10 @@ package com.muwire.core;
 
 import java.io.File;
 import java.io.IOException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -16,44 +19,49 @@ import net.i2p.data.Base64;
 public class SharedFile {
 
     private final File file;
-    private final InfoHash infoHash;
+    private final byte[] root;
     private final int pieceSize;
 
     private final String cachedPath;
     private final long cachedLength;
-    
+
+    private String b64PathHash;
     private final String b64EncodedFileName;
-    private final String b64EncodedHashRoot;
-    private final List<String> b64EncodedHashList;
     
     private volatile String comment;
     private final Set<String> downloaders = Collections.synchronizedSet(new HashSet<>());
     private final Set<SearchEntry> searches = Collections.synchronizedSet(new HashSet<>());
+    private volatile boolean published;
+    private volatile long publishedTimestamp;
 
-    public SharedFile(File file, InfoHash infoHash, int pieceSize) throws IOException {
+    public SharedFile(File file, byte[] root, int pieceSize) throws IOException {
         this.file = file;
-        this.infoHash = infoHash;
+        this.root = root;
         this.pieceSize = pieceSize;
         this.cachedPath = file.getAbsolutePath();
         this.cachedLength = file.length();
         this.b64EncodedFileName = Base64.encode(DataUtil.encodei18nString(file.toString()));
-        this.b64EncodedHashRoot = Base64.encode(infoHash.getRoot());
-        
-        List<String> b64List = new ArrayList<String>();
-        byte[] tmp = new byte[32];
-        for (int i = 0; i < infoHash.getHashList().length / 32; i++) {
-            System.arraycopy(infoHash.getHashList(), i * 32, tmp, 0, 32);
-            b64List.add(Base64.encode(tmp));
-        }
-        this.b64EncodedHashList = b64List;
     }
 
     public File getFile() {
         return file;
     }
 
-    public InfoHash getInfoHash() {
-        return infoHash;
+    public byte[] getPathHash() throws NoSuchAlgorithmException {
+        MessageDigest digester = MessageDigest.getInstance("SHA-256");
+        digester.update(file.getAbsolutePath().getBytes());
+        return digester.digest();
+    }
+
+    public String getB64PathHash() throws NoSuchAlgorithmException {
+        if(b64PathHash == null){
+            b64PathHash = Base64.encode(getPathHash());
+        }
+        return b64PathHash;
+    }
+
+    public byte[] getRoot() {
+        return root;
     }
 
     public int getPieceSize() {
@@ -73,14 +81,6 @@ public class SharedFile {
         return b64EncodedFileName;
     }
     
-    public String getB64EncodedHashRoot() {
-        return b64EncodedHashRoot;
-    }
-    
-    public List<String> getB64EncodedHashList() {
-        return b64EncodedHashList;
-    }
-
     public String getCachedPath() {
         return cachedPath;
     }
@@ -116,10 +116,28 @@ public class SharedFile {
     public void addDownloader(String name) {
         downloaders.add(name);
     }
+    
+    public void publish(long timestamp) {
+        published = true;
+        publishedTimestamp = timestamp;
+    }
+    
+    public void unpublish() {
+        published = false;
+        publishedTimestamp = 0;
+    }
+    
+    public boolean isPublished() {
+        return published;
+    }
+    
+    public long getPublishedTimestamp() {
+        return publishedTimestamp;
+    }
 
     @Override
     public int hashCode() {
-        return file.hashCode() ^ infoHash.hashCode();
+        return file.hashCode() ^ Arrays.hashCode(root);
     }
 
     @Override
@@ -127,7 +145,7 @@ public class SharedFile {
         if (!(o instanceof SharedFile))
             return false;
         SharedFile other = (SharedFile)o;
-        return file.equals(other.file) && infoHash.equals(other.infoHash);
+        return file.equals(other.file) && Arrays.equals(root, other.root);
     }
     
     public static class SearchEntry {

core/src/main/java/com/muwire/core/filefeeds/Feed.java

@@ -0,0 +1,81 @@
+package com.muwire.core.filefeeds;
+
+import com.muwire.core.Persona;
+
+public class Feed {
+    
+    private final Persona publisher;
+    
+    private int updateInterval;
+    private long lastUpdated;
+    private volatile long lastUpdateAttempt;
+    private int itemsToKeep;
+    private boolean autoDownload;
+    private boolean sequential;
+    private FeedFetchStatus status;
+    
+    public Feed(Persona publisher) {
+        this.publisher = publisher;
+        this.status = FeedFetchStatus.IDLE;
+    }
+
+    public int getUpdateInterval() {
+        return updateInterval;
+    }
+
+    public void setUpdateInterval(int updateInterval) {
+        this.updateInterval = updateInterval;
+    }
+
+    public long getLastUpdated() {
+        return lastUpdated;
+    }
+
+    public void setLastUpdated(long lastUpdated) {
+        this.lastUpdated = lastUpdated;
+    }
+
+    public int getItemsToKeep() {
+        return itemsToKeep;
+    }
+
+    public void setItemsToKeep(int itemsToKeep) {
+        this.itemsToKeep = itemsToKeep;
+    }
+
+    public boolean isAutoDownload() {
+        return autoDownload;
+    }
+
+    public void setAutoDownload(boolean autoDownload) {
+        this.autoDownload = autoDownload;
+    }
+
+    public Persona getPublisher() {
+        return publisher;
+    }
+
+    public void setStatus(FeedFetchStatus status) {
+        this.status = status;
+    }
+    
+    public FeedFetchStatus getStatus() {
+        return status;
+    }
+    
+    public void setSequential(boolean sequential) {
+        this.sequential = sequential;
+    }
+    
+    public boolean isSequential() {
+        return sequential;
+    }
+    
+    public void setLastUpdateAttempt(long lastUpdateAttempt) {
+        this.lastUpdateAttempt = lastUpdateAttempt;
+    }
+    
+    public long getLastUpdateAttempt() {
+        return lastUpdateAttempt;
+    }
+}

core/src/main/java/com/muwire/core/filefeeds/FeedFetchStatus.java

@@ -0,0 +1,19 @@
+package com.muwire.core.filefeeds;
+
+public enum FeedFetchStatus {
+    IDLE(false), 
+    CONNECTING(true), 
+    FETCHING(true), 
+    FINISHED(false), 
+    FAILED(false);
+    
+    private final boolean active;
+    
+    FeedFetchStatus(boolean active) {
+        this.active = active;
+    }
+    
+    public boolean isActive() {
+        return active;
+    }
+}

core/src/main/java/com/muwire/core/filefeeds/FeedItem.java

@@ -0,0 +1,79 @@
+package com.muwire.core.filefeeds;
+
+import java.util.Objects;
+
+import com.muwire.core.InfoHash;
+import com.muwire.core.Persona;
+
+public class FeedItem {
+
+    private final Persona publisher;
+    private final long timestamp;
+    private final String name;
+    private final long size;
+    private final int pieceSize;
+    private final InfoHash infoHash;
+    private final int certificates;
+    private final String comment;
+    
+    public FeedItem(Persona publisher, long timestamp, String name, long size, int pieceSize, InfoHash infoHash,
+            int certificates, String comment) {
+        super();
+        this.publisher = publisher;
+        this.timestamp = timestamp;
+        this.name = name;
+        this.size = size;
+        this.pieceSize = pieceSize;
+        this.infoHash = infoHash;
+        this.certificates = certificates;
+        this.comment = comment;
+    }
+
+    public Persona getPublisher() {
+        return publisher;
+    }
+
+    public long getTimestamp() {
+        return timestamp;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public long getSize() {
+        return size;
+    }
+
+    public int getPieceSize() {
+        return pieceSize;
+    }
+
+    public InfoHash getInfoHash() {
+        return infoHash;
+    }
+
+    public int getCertificates() {
+        return certificates;
+    }
+
+    public String getComment() {
+        return comment;
+    }
+    
+    @Override
+    public int hashCode() {
+        return Objects.hash(publisher, timestamp, name, infoHash);
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof FeedItem))
+            return false;
+        FeedItem other = (FeedItem)o;
+        return Objects.equals(publisher, other.publisher) &&
+                timestamp == other.timestamp &&
+                Objects.equals(name, other.name) &&
+                Objects.equals(infoHash, other.infoHash);
+    }
+}

core/src/main/java/com/muwire/core/filefeeds/InvalidFeedItemException.java

@@ -0,0 +1,30 @@
+package com.muwire.core.filefeeds;
+
+public class InvalidFeedItemException extends Exception {
+
+    public InvalidFeedItemException() {
+        super();
+    }
+
+    public InvalidFeedItemException(String message, Throwable cause, boolean enableSuppression,
+            boolean writableStackTrace) {
+        super(message, cause, enableSuppression, writableStackTrace);
+        // TODO Auto-generated constructor stub
+    }
+
+    public InvalidFeedItemException(String message, Throwable cause) {
+        super(message, cause);
+        // TODO Auto-generated constructor stub
+    }
+
+    public InvalidFeedItemException(String message) {
+        super(message);
+        // TODO Auto-generated constructor stub
+    }
+
+    public InvalidFeedItemException(Throwable cause) {
+        super(cause);
+        // TODO Auto-generated constructor stub
+    }
+
+}

core/src/main/resources/defaults/i2p.properties

@@ -0,0 +1,8 @@
+inbound.nickname=MuWire
+outbound.nickname=MuWire
+inbound.length=3
+inbound.quantity=4
+outbound.length=3
+outbound.quantity=4
+i2cp.tcp.host=127.0.0.1
+i2cp.tcp.port=7654

docker/rootfs/etc/cont-init.d/00-app-user-map.sh

@@ -0,0 +1,26 @@
+#!/usr/bin/with-contenv sh
+
+#
+# Add the app user to the password and group databases.  This is needed just to
+# make sure that mapping between the user/group ID and its name is possible.
+#
+
+set -e # Exit immediately if a command exits with a non-zero status.
+set -u # Treat unset variables as an error.
+
+cp /defaults/passwd /etc/passwd
+cp /defaults/group /etc/group
+cp /defaults/shadow /etc/shadow
+chown root:shadow /etc/shadow
+chmod 640 /etc/shadow
+
+echo "$APP_USER:x:$USER_ID:$GROUP_ID::${APP_HOME:-/dev/null}:/sbin/nologin" >> /etc/passwd
+echo "$APP_USER:x:$GROUP_ID:" >> /etc/group
+
+# Make sure APP_HOME is editable by the user
+if [[ -n "$APP_HOME" ]] ; then
+    chown -R "$APP_USER" "$APP_HOME"
+    chmod -R u+rw "$APP_HOME"
+fi
+
+# vim:ft=sh:ts=4:sw=4:et:sts=4

docker/rootfs/muwire/.MuWire/MuWire.properties

@@ -0,0 +1,34 @@
+#This file is UTF-8
+#Tue Jan 14 12:08:47 GMT 2020
+meshExpiration=60
+autoDownloadUpdate=true
+hostHopelessInterval=1440
+uploadSlotsPerUser=-1
+downloadLocation=/output
+allowTrustLists=true
+embeddedRouter=false
+incompleteLocation=/incompletes
+outBw=128
+searchExtraHop=false
+shareHiddenFiles=false
+advertiseChat=true
+totalUploadSlots=-1
+hostClearInterval=15
+searchComments=true
+downloadSequentialRatio=0.8
+maxChatConnectios=-1
+trustListInterval=1
+crawlerResponse=REGISTERED
+browseFiles=true
+lastUpdateCheck=1579003533112
+hostRejectInterval=1
+inBw=256
+leaf=false
+updateCheckInterval=24
+plugin=false
+downloadRetryInterval=60
+speedSmoothSeconds=60
+allowUntrusted=true
+shareDownloadedFiles=true
+startChatServer=false
+updateType=jar

docker/rootfs/muwire/.MuWire/i2p.properties

@@ -0,0 +1 @@
+i2cp.tcp.host=172.17.0.1

docker/rootfs/startapp.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Explicitly define HOME otherwise it might not have been set
+export HOME=/muwire
+
+echo "Starting MuWire"
+exec /muwire/bin/MuWire

gradle.properties

@@ -1,5 +1,5 @@
 group         = com.muwire
-version       = 0.6.8
+version       = 0.6.10
 i2pVersion    = 0.9.44
 groovyVersion = 2.4.15
 slf4jVersion  = 1.7.25
@@ -16,6 +16,6 @@ author = zab@mail.i2p
 signer = zab@mail.i2p
 keystorePassword=changeit
 websiteURL=http://muwire.i2p
-updateURLsu3=http://muwire.i2p/MuWire.su3
+updateURLsu3=http://muwire.i2p/MuWire-update.su3
 
 pack200=true

gui/griffon-app/conf/Config.groovy

@@ -126,4 +126,9 @@ mvcGroups {
         view = 'com.muwire.gui.ChatMonitorView'
         controller = 'com.muwire.gui.ChatMonitorController'
     }
+    'feed-configuration' {
+        model = 'com.muwire.gui.FeedConfigurationModel'
+        view = 'com.muwire.gui.FeedConfigurationView'
+        controller = 'com.muwire.gui.FeedConfigurationController'
+    }
 }

gui/griffon-app/controllers/com/muwire/gui/BrowseController.groovy

@@ -113,7 +113,9 @@ class BrowseController {
             return
         
         def params = [:]
-        params['result'] = result
+        params['host'] = result.getSender()
+        params['infoHash'] = result.getInfohash()
+        params['name'] = result.getName()
         params['core'] = core
         mvcGroup.createMVCGroup("fetch-certificates", params)
     }

gui/griffon-app/controllers/com/muwire/gui/FeedConfigurationController.groovy

@@ -0,0 +1,36 @@
+package com.muwire.gui
+
+import griffon.core.artifact.GriffonController
+import griffon.core.controller.ControllerAction
+import griffon.inject.MVCMember
+import griffon.metadata.ArtifactProviderFor
+import javax.annotation.Nonnull
+
+import com.muwire.core.filefeeds.UIFeedConfigurationEvent
+
+@ArtifactProviderFor(GriffonController)
+class FeedConfigurationController {
+    @MVCMember @Nonnull
+    FeedConfigurationModel model
+    @MVCMember @Nonnull
+    FeedConfigurationView view
+
+    @ControllerAction
+    void save() {
+        
+        model.feed.setAutoDownload(view.autoDownloadCheckbox.model.isSelected())
+        model.feed.setSequential(view.sequentialCheckbox.model.isSelected())
+        model.feed.setItemsToKeep(Integer.parseInt(view.itemsToKeepField.text))
+        model.feed.setUpdateInterval(Integer.parseInt(view.updateIntervalField.text) * 60000)
+        
+        model.core.eventBus.publish(new UIFeedConfigurationEvent(feed : model.feed))
+        
+        cancel()    
+    }
+    
+    @ControllerAction
+    void cancel() {
+        view.dialog.setVisible(false)
+        mvcGroup.destroy()
+    }
+}

gui/griffon-app/controllers/com/muwire/gui/FetchCertificatesController.groovy

@@ -28,7 +28,7 @@ class FetchCertificatesController {
         core.eventBus.with { 
             register(CertificateFetchEvent.class, this)
             register(CertificateFetchedEvent.class, this)
-            publish(new UIFetchCertificatesEvent(host : model.result.sender, infoHash : model.result.infohash))
+            publish(new UIFetchCertificatesEvent(host : model.host, infoHash : model.infoHash))
         }
     }
     

gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy

@@ -3,15 +3,11 @@ package com.muwire.gui
 import griffon.core.GriffonApplication
 import griffon.core.artifact.GriffonController
 import griffon.core.controller.ControllerAction
-import griffon.core.mvc.MVCGroup
-import griffon.core.mvc.MVCGroupConfiguration
 import griffon.inject.MVCMember
 import griffon.metadata.ArtifactProviderFor
-import groovy.json.StringEscapeUtils
 import net.i2p.crypto.DSAEngine
 import net.i2p.data.Base64
 import net.i2p.data.Signature
-import net.i2p.data.SigningPrivateKey
 
 import java.awt.Desktop
 import java.awt.Toolkit
@@ -30,15 +26,18 @@ import com.muwire.core.Persona
 import com.muwire.core.SharedFile
 import com.muwire.core.SplitPattern
 import com.muwire.core.download.Downloader
-import com.muwire.core.download.DownloadStartedEvent
 import com.muwire.core.download.UIDownloadCancelledEvent
-import com.muwire.core.download.UIDownloadEvent
 import com.muwire.core.download.UIDownloadPausedEvent
 import com.muwire.core.download.UIDownloadResumedEvent
 import com.muwire.core.filecert.UICreateCertificateEvent
-import com.muwire.core.files.DirectoryUnsharedEvent
+import com.muwire.core.filefeeds.Feed
+import com.muwire.core.filefeeds.FeedItem
+import com.muwire.core.filefeeds.UIDownloadFeedItemEvent
+import com.muwire.core.filefeeds.UIFeedDeletedEvent
+import com.muwire.core.filefeeds.UIFeedUpdateEvent
+import com.muwire.core.filefeeds.UIFilePublishedEvent
+import com.muwire.core.filefeeds.UIFileUnpublishedEvent
 import com.muwire.core.files.FileUnsharedEvent
-import com.muwire.core.files.UIPersistFilesEvent
 import com.muwire.core.search.QueryEvent
 import com.muwire.core.search.SearchEvent
 import com.muwire.core.trust.RemoteTrustList
@@ -371,7 +370,6 @@ class MainFrameController {
         sf.each {  
             core.eventBus.publish(new FileUnsharedEvent(unsharedFile : it))
         }
-        core.eventBus.publish(new UIPersistFilesEvent())
     }
     
     @ControllerAction
@@ -514,6 +512,105 @@ class MainFrameController {
         clipboard.setContents(selection, null)
     }
     
+    @ControllerAction
+    void publish() {
+        def selectedFiles = view.selectedSharedFiles()
+        if (selectedFiles == null || selectedFiles.isEmpty())
+            return
+        
+        if (model.publishButtonText == "Unpublish") {
+            selectedFiles.each { 
+                it.unpublish()
+                model.core.eventBus.publish(new UIFileUnpublishedEvent(sf : it))
+            }
+        } else {
+            long now = System.currentTimeMillis()
+            selectedFiles.stream().filter({!it.isPublished()}).forEach({
+                it.publish(now)
+                model.core.eventBus.publish(new UIFilePublishedEvent(sf : it))
+            })
+        }
+        view.refreshSharedFiles()
+    }
+    
+    @ControllerAction
+    void updateFileFeed() {
+        Feed feed = view.selectedFeed()
+        if (feed == null)
+            return
+        model.core.eventBus.publish(new UIFeedUpdateEvent(host: feed.getPublisher()))
+    }
+    
+    @ControllerAction
+    void unsubscribeFileFeed() {
+        Feed feed = view.selectedFeed()
+        if (feed == null)
+            return
+        model.core.eventBus.publish(new UIFeedDeletedEvent(host : feed.getPublisher()))
+        runInsideUIAsync {
+            model.feeds.remove(feed)
+            model.feedItems.clear()
+            view.refreshFeeds()
+        }
+    }
+    
+    @ControllerAction
+    void configureFileFeed() {
+        Feed feed = view.selectedFeed()
+        if (feed == null)
+            return
+        
+        def params = [:]
+        params['core'] = core
+        params['feed'] = feed
+        mvcGroup.createMVCGroup("feed-configuration", params)
+    }
+    
+    @ControllerAction
+    void downloadFeedItem() {
+        List<FeedItem> items = view.selectedFeedItems()
+        if (items == null || items.isEmpty())
+            return
+        Feed f = model.core.getFeedManager().getFeed(items.get(0).getPublisher())
+        items.each { 
+            if (!model.canDownload(it.getInfoHash()))
+                return
+            File target = new File(application.context.get("muwire-settings").downloadLocation, it.getName())
+            model.core.eventBus.publish(new UIDownloadFeedItemEvent(item : it, target : target, sequential : f.isSequential()))
+        }
+        view.showDownloadsWindow.call()
+    }
+    
+    @ControllerAction
+    void viewFeedItemComment() {
+        List<FeedItem> items = view.selectedFeedItems()
+        if (items == null || items.size() != 1)
+            return
+        FeedItem item = items.get(0)
+        
+        String groupId = Base64.encode(item.getInfoHash().getRoot())
+        Map<String, Object> params = new HashMap<>()
+        params['text'] = DataUtil.readi18nString(Base64.decode(item.getComment()))
+        params['name'] = item.getName()
+        
+        mvcGroup.createMVCGroup("show-comment", groupId, params)
+    }
+    
+    @ControllerAction
+    void viewFeedItemCertificates() {
+        List<FeedItem> items = view.selectedFeedItems()
+        if (items == null || items.size() != 1)
+            return
+        FeedItem item = items.get(0)
+        
+        def params = [:]
+        params['core'] = core
+        params['host'] = item.getPublisher()
+        params['infoHash'] = item.getInfoHash()
+        params['name'] = item.getName()
+        mvcGroup.createMVCGroup("fetch-certificates", params)
+    }
+    
     void startChat(Persona p) {
         if (!mvcGroup.getChildrenGroups().containsKey(p.getHumanReadableName())) {
             def params = [:]
@@ -534,4 +631,4 @@ class MainFrameController {
             core = e.getNewValue()
         })
     }
-}
+}

gui/griffon-app/controllers/com/muwire/gui/OptionsController.groovy

@@ -122,7 +122,38 @@ class OptionsController {
             model.outBw = text
             settings.outBw = Integer.valueOf(text)
         }
+        
+        // feed saving
+        
+        boolean fileFeed = view.fileFeedCheckbox.model.isSelected()
+        model.fileFeed = fileFeed
+        settings.fileFeed = fileFeed
+        
+        boolean advertiseFeed = view.advertiseFeedCheckbox.model.isSelected()
+        model.advertiseFeed = advertiseFeed
+        settings.advertiseFeed = advertiseFeed
+        
+        boolean autoPublishSharedFiles = view.autoPublishSharedFilesCheckbox.model.isSelected()
+        model.autoPublishSharedFiles = autoPublishSharedFiles
+        settings.autoPublishSharedFiles = autoPublishSharedFiles
+        
+        boolean defaultFeedAutoDownload = view.defaultFeedAutoDownloadCheckbox.model.isSelected()
+        model.defaultFeedAutoDownload = defaultFeedAutoDownload
+        settings.defaultFeedAutoDownload = defaultFeedAutoDownload
+        
+        boolean defaultFeedSequential = view.defaultFeedSequentialCheckbox.model.isSelected()
+        model.defaultFeedSequential = defaultFeedSequential
+        settings.defaultFeedSequential = defaultFeedSequential
+        
+        String defaultFeedItemsToKeep = view.defaultFeedItemsToKeepField.text
+        model.defaultFeedItemsToKeep = defaultFeedItemsToKeep
+        settings.defaultFeedItemsToKeep = Integer.parseInt(defaultFeedItemsToKeep)
+        
+        String defaultFeedUpdateInterval = view.defaultFeedUpdateIntervalField.text
+        model.defaultFeedUpdateInterval = defaultFeedUpdateInterval
+        settings.defaultFeedUpdateInterval = Integer.parseInt(defaultFeedUpdateInterval)
 
+        // trust saving
 
         boolean onlyTrusted = view.allowUntrustedCheckbox.model.isSelected()
         model.onlyTrusted = onlyTrusted

gui/griffon-app/controllers/com/muwire/gui/SearchTabController.groovy

@@ -12,6 +12,8 @@ import javax.swing.JOptionPane
 import com.muwire.core.Core
 import com.muwire.core.Persona
 import com.muwire.core.download.UIDownloadEvent
+import com.muwire.core.filefeeds.Feed
+import com.muwire.core.filefeeds.UIFeedConfigurationEvent
 import com.muwire.core.search.UIResultEvent
 import com.muwire.core.trust.TrustEvent
 import com.muwire.core.trust.TrustLevel
@@ -107,6 +109,22 @@ class SearchTabController {
         mvcGroup.createMVCGroup("browse", groupId, params)
     }
     
+    @ControllerAction
+    void subscribe() {
+        def sender = view.selectedSender()
+        if (sender == null)
+            return
+
+        Feed feed = new Feed(sender)
+        feed.setAutoDownload(core.muOptions.defaultFeedAutoDownload)
+        feed.setSequential(core.muOptions.defaultFeedSequential)
+        feed.setItemsToKeep(core.muOptions.defaultFeedItemsToKeep)
+        feed.setUpdateInterval(core.muOptions.defaultFeedUpdateInterval * 60 * 1000)
+        
+        core.eventBus.publish(new UIFeedConfigurationEvent(feed : feed, newFeed: true))  
+        mvcGroup.parentGroup.view.showFeedsWindow.call()          
+    }
+    
     @ControllerAction
     void chat() {
         def sender = view.selectedSender()
@@ -139,7 +157,9 @@ class SearchTabController {
             return
 
         def params = [:]
-        params['result'] = event
+        params['host'] = event.getSender()
+        params['infoHash'] = event.getInfohash()
+        params['name'] = event.getName()
         params['core'] = core
         mvcGroup.createMVCGroup("fetch-certificates", params)
     }

gui/griffon-app/lifecycle/Ready.groovy

@@ -44,6 +44,8 @@ class Ready extends AbstractLifecycleHandler {
             propsFile.withReader("UTF-8", {
                 props.load(it)
             })
+            if (!props.containsKey("nickname"))
+                props.setProperty("nickname", selectNickname())
             props = new MuWireSettings(props)
             if (props.incompleteLocation == null)
                 props.incompleteLocation = new File(home, "incompletes")
@@ -53,29 +55,7 @@ class Ready extends AbstractLifecycleHandler {
             props.incompleteLocation = new File(home, "incompletes")
             props.embeddedRouter = Boolean.parseBoolean(System.getProperties().getProperty("embeddedRouter"))
             props.updateType = System.getProperty("updateType","jar")
-            def nickname
-            while (true) {
-                nickname = JOptionPane.showInputDialog(null,
-                        "Your nickname is displayed when you send search results so other MuWire users can choose to trust you",
-                        "Please choose a nickname", JOptionPane.PLAIN_MESSAGE)
-                if (nickname == null) {
-                    JOptionPane.showMessageDialog(null, "MuWire cannot start without a nickname and will now exit", JOptionPane.PLAIN_MESSAGE)
-                    System.exit(0)
-                }
-                if (nickname.trim().length() == 0) {
-                    JOptionPane.showMessageDialog(null, "Nickname cannot be empty", "Select another nickname",
-                        JOptionPane.WARNING_MESSAGE)
-                    continue
-                }
-                if (nickname.contains("@")) {
-                    JOptionPane.showMessageDialog(null, "Nickname cannot contain @, choose another",
-                        "Select another nickname", JOptionPane.WARNING_MESSAGE)
-                    continue
-                }
-                nickname = nickname.trim()
-                break
-            }
-            props.setNickname(nickname)
+            props.setNickname(selectNickname())
 
 
             def portableDownloads = System.getProperty("portable.downloads")
@@ -102,23 +82,49 @@ class Ready extends AbstractLifecycleHandler {
         Core core
         try {
             core = new Core(props, home, metadata["application.version"])
+            Runtime.getRuntime().addShutdownHook({
+                core.shutdown()
+            })
+            core.startServices()
+            application.context.put("muwire-settings", props)
+            application.context.put("core",core)
+            application.getPropertyChangeListeners("core").each {
+                it.propertyChange(new PropertyChangeEvent(this, "core", null, core))
+            }
+
+            core.eventBus.publish(new UILoadedEvent())
         } catch (Exception bad) {
             log.log(Level.SEVERE,"couldn't initialize core",bad)
             JOptionPane.showMessageDialog(null, "Couldn't connect to I2P router.  Make sure I2P is running and restart MuWire",
-                "Can't connect to I2P router", JOptionPane.WARNING_MESSAGE)
+                    "Can't connect to I2P router", JOptionPane.WARNING_MESSAGE)
             System.exit(0)
         }
-        Runtime.getRuntime().addShutdownHook({
-            core.shutdown()
-        })
-        core.startServices()
-        application.context.put("muwire-settings", props)
-        application.context.put("core",core)
-        application.getPropertyChangeListeners("core").each {
-            it.propertyChange(new PropertyChangeEvent(this, "core", null, core))
+    }
+    
+    private String selectNickname() {
+        String nickname
+        while (true) {
+            nickname = JOptionPane.showInputDialog(null,
+                    "Your nickname is displayed when you send search results so other MuWire users can choose to trust you",
+                    "Please choose a nickname", JOptionPane.PLAIN_MESSAGE)
+                    if (nickname == null) {
+                        JOptionPane.showMessageDialog(null, "MuWire cannot start without a nickname and will now exit", JOptionPane.PLAIN_MESSAGE)
+                        System.exit(0)
+                    }
+            if (nickname.trim().length() == 0) {
+                JOptionPane.showMessageDialog(null, "Nickname cannot be empty", "Select another nickname",
+                        JOptionPane.WARNING_MESSAGE)
+                continue
+            }
+            if (nickname.contains("@")) {
+                JOptionPane.showMessageDialog(null, "Nickname cannot contain @, choose another",
+                        "Select another nickname", JOptionPane.WARNING_MESSAGE)
+                continue
+            }
+            nickname = nickname.trim()
+            break
         }
-
-        core.eventBus.publish(new UILoadedEvent())
+        nickname
     }
 }
 

gui/griffon-app/models/com/muwire/gui/FeedConfigurationModel.groovy

@@ -0,0 +1,26 @@
+package com.muwire.gui
+
+import com.muwire.core.Core
+import com.muwire.core.filefeeds.Feed
+
+import griffon.core.artifact.GriffonModel
+import griffon.transform.Observable
+import griffon.metadata.ArtifactProviderFor
+
+@ArtifactProviderFor(GriffonModel)
+class FeedConfigurationModel {
+    Core core
+    Feed feed
+    
+    @Observable boolean autoDownload
+    @Observable boolean sequential
+    @Observable int updateInterval
+    @Observable int itemsToKeep
+    
+    void mvcGroupInit(Map<String, String> args) {
+        autoDownload = feed.isAutoDownload()
+        sequential = feed.isSequential()
+        updateInterval = feed.getUpdateInterval() / 60000
+        itemsToKeep = feed.getItemsToKeep()
+    }
+}

gui/griffon-app/models/com/muwire/gui/FetchCertificatesModel.groovy

@@ -1,6 +1,9 @@
 package com.muwire.gui
 
+import com.muwire.core.InfoHash
+import com.muwire.core.Persona
 import com.muwire.core.filecert.CertificateFetchStatus
+import com.muwire.core.filefeeds.FeedItem
 import com.muwire.core.search.UIResultEvent
 
 import griffon.core.artifact.GriffonModel
@@ -9,7 +12,9 @@ import griffon.metadata.ArtifactProviderFor
 
 @ArtifactProviderFor(GriffonModel)
 class FetchCertificatesModel {
-    UIResultEvent result
+    Persona host
+    InfoHash infoHash
+    String name
     
     @Observable CertificateFetchStatus status
     @Observable int totalCertificates

gui/griffon-app/models/com/muwire/gui/MainFrameModel.groovy

@@ -28,6 +28,12 @@ import com.muwire.core.content.ContentControlEvent
 import com.muwire.core.download.DownloadStartedEvent
 import com.muwire.core.download.Downloader
 import com.muwire.core.filecert.CertificateCreatedEvent
+import com.muwire.core.filefeeds.Feed
+import com.muwire.core.filefeeds.FeedFetchEvent
+import com.muwire.core.filefeeds.FeedItemFetchedEvent
+import com.muwire.core.filefeeds.FeedLoadedEvent
+import com.muwire.core.filefeeds.UIDownloadFeedItemEvent
+import com.muwire.core.filefeeds.UIFeedConfigurationEvent
 import com.muwire.core.files.AllFilesLoadedEvent
 import com.muwire.core.files.DirectoryUnsharedEvent
 import com.muwire.core.files.DirectoryWatchedEvent
@@ -61,6 +67,7 @@ import griffon.transform.FXObservable
 import griffon.transform.Observable
 import net.i2p.data.Base64
 import net.i2p.data.Destination
+import net.i2p.util.ConcurrentHashSet
 import griffon.metadata.ArtifactProviderFor
 
 @ArtifactProviderFor(GriffonModel)
@@ -89,6 +96,8 @@ class MainFrameModel {
     def trusted = []
     def distrusted = []
     def subscriptions = []
+    def feeds = []
+    def feedItems = []
     
     boolean sessionRestored
 
@@ -103,6 +112,14 @@ class MainFrameModel {
     @Observable boolean previewButtonEnabled
     @Observable String resumeButtonText
     @Observable boolean addCommentButtonEnabled
+    @Observable boolean publishButtonEnabled
+    @Observable String publishButtonText
+    @Observable boolean updateFileFeedButtonEnabled
+    @Observable boolean unsubscribeFileFeedButtonEnabled
+    @Observable boolean configureFileFeedButtonEnabled
+    @Observable boolean downloadFeedItemButtonEnabled
+    @Observable boolean viewFeedItemCommentButtonEnabled
+    @Observable boolean viewFeedItemCertificatesButtonEnabled
     @Observable boolean subscribeButtonEnabled
     @Observable boolean markNeutralFromTrustedButtonEnabled
     @Observable boolean markDistrustedButtonEnabled
@@ -118,6 +135,7 @@ class MainFrameModel {
     @Observable boolean downloadsPaneButtonEnabled
     @Observable boolean uploadsPaneButtonEnabled
     @Observable boolean monitorPaneButtonEnabled
+    @Observable boolean feedsPaneButtonEnabled
     @Observable boolean trustPaneButtonEnabled
     @Observable boolean chatPaneButtonEnabled
     
@@ -125,7 +143,7 @@ class MainFrameModel {
     
     @Observable Downloader downloader
 
-    private final Set<InfoHash> downloadInfoHashes = new HashSet<>()
+    private final Set<InfoHash> downloadInfoHashes = new ConcurrentHashSet<>()
 
     @Observable volatile Core core
 
@@ -215,6 +233,10 @@ class MainFrameModel {
             core.eventBus.register(TrustSubscriptionUpdatedEvent.class, this)
             core.eventBus.register(SearchEvent.class, this)
             core.eventBus.register(CertificateCreatedEvent.class, this)
+            core.eventBus.register(FeedLoadedEvent.class, this)
+            core.eventBus.register(FeedFetchEvent.class, this)
+            core.eventBus.register(FeedItemFetchedEvent.class, this)
+            core.eventBus.register(UIFeedConfigurationEvent.class, this)
 
             core.muOptions.watchedKeywords.each {
                 core.eventBus.publish(new ContentControlEvent(term : it, regex: false, add: true))
@@ -253,11 +275,13 @@ class MainFrameModel {
                 distrusted.addAll(core.trustService.bad.values())
 
                 resumeButtonText = "Retry"
+                publishButtonText = "Publish"
                 
                 searchesPaneButtonEnabled = false
                 downloadsPaneButtonEnabled = true
                 uploadsPaneButtonEnabled = true
                 monitorPaneButtonEnabled = true
+                feedsPaneButtonEnabled = true
                 trustPaneButtonEnabled = true
                 chatPaneButtonEnabled = true
                 
@@ -363,6 +387,8 @@ class MainFrameModel {
     }
 
     void onFileLoadedEvent(FileLoadedEvent e) {
+        if (e.source == "PersisterService")
+            return
         runInsideUIAsync {
             shared << e.loadedFile
             loadedFiles = shared.size()
@@ -649,4 +675,41 @@ class MainFrameModel {
         int requests
         boolean finished
     }
+    
+    void onFeedLoadedEvent(FeedLoadedEvent e) {
+        runInsideUIAsync {
+            feeds << e.feed
+            view.refreshFeeds()
+        }
+    }
+    
+    void onFeedFetchEvent(FeedFetchEvent e) {
+        runInsideUIAsync {
+            view.refreshFeeds()
+        }
+    }
+    
+    void onUIFeedConfigurationEvent(UIFeedConfigurationEvent e) {
+        if (!e.newFeed)
+            return
+        runInsideUIAsync {
+            if (feeds.contains(e.feed))
+                return
+            feeds << e.feed
+            view.refreshFeeds()
+        }
+    }
+    
+    void onFeedItemFetchedEvent(FeedItemFetchedEvent e) {
+        Feed feed = core.feedManager.getFeed(e.item.getPublisher())
+        if (feed == null || !feed.isAutoDownload())
+            return
+        if (!canDownload(e.item.getInfoHash()))
+            return
+        if (core.fileManager.isShared(e.item.getInfoHash()))
+            return
+            
+        File target = new File(core.getMuOptions().getDownloadLocation(), e.item.getName())    
+        core.eventBus.publish(new UIDownloadFeedItemEvent(item : e.item, target : target, sequential : feed.isSequential()))
+    }
 }

gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy

@@ -50,6 +50,15 @@ class OptionsModel {
     @Observable String inBw
     @Observable String outBw
 
+    // feed options
+    @Observable boolean fileFeed
+    @Observable boolean advertiseFeed
+    @Observable boolean autoPublishSharedFiles
+    @Observable boolean defaultFeedAutoDownload
+    @Observable String defaultFeedItemsToKeep
+    @Observable boolean defaultFeedSequential
+    @Observable String defaultFeedUpdateInterval
+    
     // trust options
     @Observable boolean onlyTrusted
     @Observable boolean searchExtraHop
@@ -105,6 +114,14 @@ class OptionsModel {
             inBw = String.valueOf(settings.inBw)
             outBw = String.valueOf(settings.outBw)
         }
+        
+        fileFeed = settings.fileFeed
+        advertiseFeed = settings.advertiseFeed
+        autoPublishSharedFiles = settings.autoPublishSharedFiles
+        defaultFeedAutoDownload = settings.defaultFeedAutoDownload
+        defaultFeedItemsToKeep = String.valueOf(settings.defaultFeedItemsToKeep)
+        defaultFeedSequential = settings.defaultFeedSequential
+        defaultFeedUpdateInterval = String.valueOf(settings.defaultFeedUpdateInterval)
 
         onlyTrusted = !settings.allowUntrusted()
         searchExtraHop = settings.searchExtraHop

gui/griffon-app/models/com/muwire/gui/SearchTabModel.groovy

@@ -25,6 +25,7 @@ class SearchTabModel {
     @Observable boolean viewCommentActionEnabled
     @Observable boolean viewCertificatesActionEnabled
     @Observable boolean chatActionEnabled
+    @Observable boolean subscribeActionEnabled
     @Observable boolean groupedByFile
 
     Core core

gui/griffon-app/models/com/muwire/gui/SharedFileModel.groovy

@@ -1,6 +1,7 @@
 package com.muwire.gui
 
 import com.muwire.core.Core
+import com.muwire.core.InfoHash
 import com.muwire.core.SharedFile
 
 import griffon.core.artifact.GriffonModel
@@ -21,6 +22,6 @@ class SharedFileModel {
     public void mvcGroupInit(Map<String,String> args) {
         searchers.addAll(sf.getSearches())
         downloaders.addAll(sf.getDownloaders())
-        certificates.addAll(core.certificateManager.byInfoHash.getOrDefault(sf.infoHash,[]))
+        certificates.addAll(core.certificateManager.byInfoHash.getOrDefault(new InfoHash(sf.getRoot()),[]))
     }
 }

gui/griffon-app/views/com/muwire/gui/FeedConfigurationView.groovy

@@ -0,0 +1,73 @@
+package com.muwire.gui
+
+import griffon.core.artifact.GriffonView
+import griffon.inject.MVCMember
+import griffon.metadata.ArtifactProviderFor
+
+import javax.swing.JDialog
+import javax.swing.SwingConstants
+
+import java.awt.BorderLayout
+import java.awt.GridBagConstraints
+import java.awt.event.WindowAdapter
+import java.awt.event.WindowEvent
+
+import javax.annotation.Nonnull
+
+@ArtifactProviderFor(GriffonView)
+class FeedConfigurationView {
+    @MVCMember @Nonnull
+    FactoryBuilderSupport builder
+    @MVCMember @Nonnull
+    FeedConfigurationModel model
+
+    def dialog
+    def p
+    def mainFrame
+    
+    def autoDownloadCheckbox
+    def sequentialCheckbox
+    def itemsToKeepField
+    def updateIntervalField
+    
+    void initUI() {
+        mainFrame = application.windowManager.findWindow("main-frame")
+        dialog = new JDialog(mainFrame, "Feed Configuration", true)
+        dialog.setResizable(false)
+        
+        p = builder.panel {
+            borderLayout()
+            panel (constraints : BorderLayout.NORTH) {
+                label("Configuration for feed " + model.feed.getPublisher().getHumanReadableName())
+            }
+            panel (constraints : BorderLayout.CENTER) {
+                gridBagLayout()
+                label(text : "Automatically download files from feed", constraints : gbc(gridx: 0, gridy : 0, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                autoDownloadCheckbox = checkBox(selected : bind {model.autoDownload}, constraints : gbc(gridx: 1, gridy : 0, anchor : GridBagConstraints.LINE_END))
+                label(text : "Download files from feed sequentially", constraints : gbc(gridx: 0, gridy : 1, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                sequentialCheckbox = checkBox(selected : bind {model.sequential}, constraints : gbc(gridx: 1, gridy : 1, anchor : GridBagConstraints.LINE_END))
+                label(text : "Feed items to store on disk (-1 means unlimited)", constraints : gbc(gridx: 0, gridy : 2, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                itemsToKeepField = textField(text : bind {model.itemsToKeep}, constraints:gbc(gridx :1, gridy:2, anchor : GridBagConstraints.LINE_END))
+                label(text : "Feed refresh frequency in minutes", constraints : gbc(gridx: 0, gridy : 3, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                updateIntervalField = textField(text : bind {model.updateInterval}, constraints:gbc(gridx :1, gridy:3, anchor : GridBagConstraints.LINE_END))
+            }
+            panel (constraints : BorderLayout.SOUTH) {
+                button(text : "Save", saveAction)
+                button(text : "Cancel", cancelAction)
+            } 
+        }
+    }
+    
+    void mvcGroupInit(Map<String,String> args) {
+        dialog.getContentPane().add(p)
+        dialog.pack()
+        dialog.setLocationRelativeTo(mainFrame)
+        dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE)
+        dialog.addWindowListener(new WindowAdapter() {
+            public void windowClosed(WindowEvent e) {
+                mvcGroup.destroy()
+            }
+        })
+        dialog.show()
+    }
+}

gui/griffon-app/views/com/muwire/gui/FetchCertificatesView.groovy

@@ -38,7 +38,7 @@ class FetchCertificatesView {
     void initUI() {
         int rowHeight = application.context.get("row-height")
         mainFrame = application.windowManager.findWindow("main-frame")
-        dialog = new JDialog(mainFrame, model.result.name, true)
+        dialog = new JDialog(mainFrame, model.name, true)
         dialog.setResizable(true)
         
         p = builder.panel {

gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy

@@ -35,9 +35,13 @@ import javax.swing.tree.TreePath
 
 import com.muwire.core.Constants
 import com.muwire.core.Core
+import com.muwire.core.InfoHash
 import com.muwire.core.MuWireSettings
 import com.muwire.core.SharedFile
 import com.muwire.core.download.Downloader
+import com.muwire.core.filefeeds.Feed
+import com.muwire.core.filefeeds.FeedFetchStatus
+import com.muwire.core.filefeeds.FeedItem
 import com.muwire.core.files.FileSharedEvent
 import com.muwire.core.trust.RemoteTrustList
 import java.awt.BorderLayout
@@ -75,6 +79,8 @@ class MainFrameView {
     def lastSharedSortEvent
     def trustTablesSortEvents = [:]
     def expansionListener = new TreeExpansions()
+    def lastFeedsSortEvent
+    def lastFeedItemsSortEvent
     
 
     UISettings settings
@@ -150,6 +156,7 @@ class MainFrameView {
                         button(text: "Uploads", enabled : bind{model.uploadsPaneButtonEnabled}, actionPerformed : showUploadsWindow)
                         if (settings.showMonitor)
                             button(text: "Monitor", enabled: bind{model.monitorPaneButtonEnabled},actionPerformed : showMonitorWindow)
+                        button(text: "Feeds", enabled: bind {model.feedsPaneButtonEnabled}, actionPerformed : showFeedsWindow)
                         button(text: "Trust", enabled:bind{model.trustPaneButtonEnabled},actionPerformed : showTrustWindow)
                         button(text: "Chat", enabled : bind{model.chatPaneButtonEnabled}, actionPerformed : showChatWindow)
                     }
@@ -289,8 +296,9 @@ class MainFrameView {
                                                     closureColumn(header : "Comments", preferredWidth : 50, type : Boolean, read : {it.getComment() != null})
                                                     closureColumn(header : "Certified", preferredWidth : 50, type : Boolean, read : {
                                                         Core core = application.context.get("core")
-                                                        core.certificateManager.hasLocalCertificate(it.getInfoHash())
+                                                        core.certificateManager.hasLocalCertificate(new InfoHash(it.getRoot()))
                                                     })
+                                                    closureColumn(header : "Published", preferredWidth : 50, type : Boolean, read : {row -> row.isPublished()})
                                                     closureColumn(header : "Search Hits", preferredWidth: 50, type : Integer, read : {it.getHits()})
                                                     closureColumn(header : "Downloaders", preferredWidth: 50, type : Integer, read : {it.getDownloaders().size()})
                                                 }
@@ -315,9 +323,11 @@ class MainFrameView {
                                     radioButton(text : "Table", selected : false, buttonGroup : sharedViewType, actionPerformed : showSharedFilesTable)
                                 }
                                 panel {
-                                    button(text : "Share", actionPerformed : shareFiles)
-                                    button(text : "Add Comment", enabled : bind {model.addCommentButtonEnabled}, addCommentAction)
-                                    button(text : "Certify", enabled : bind {model.addCommentButtonEnabled}, issueCertificateAction)
+                                    gridBagLayout()
+                                    button(text : "Share", constraints : gbc(gridx: 0), actionPerformed : shareFiles)
+                                    button(text : "Add Comment", enabled : bind {model.addCommentButtonEnabled}, constraints : gbc(gridx: 1), addCommentAction)
+                                    button(text : "Certify", enabled : bind {model.addCommentButtonEnabled}, constraints : gbc(gridx: 2), issueCertificateAction)
+                                    button(text : bind {model.publishButtonText}, enabled : bind {model.publishButtonEnabled}, constraints : gbc(gridx:3), publishAction)
                                 }
                                 panel {
                                     panel {
@@ -424,6 +434,56 @@ class MainFrameView {
                             }
                         }
                     }
+                    panel(constraints : "feeds window") {
+                        gridLayout(rows : 2, cols : 1)
+                        panel {
+                            borderLayout()
+                            panel (constraints : BorderLayout.NORTH) {
+                                label(text: "Subscriptions")
+                            }
+                            scrollPane(constraints : BorderLayout.CENTER) {
+                                table(id : "feeds-table", autoCreateRowSorter : true, rowHeight : rowHeight) {
+                                    tableModel(list : model.feeds) {
+                                        closureColumn(header : "Publisher", preferredWidth: 350, type : String, read : {it.getPublisher().getHumanReadableName()})
+                                        closureColumn(header : "Files", preferredWidth: 10, type : Integer, read : {model.core.feedManager.getFeedItems(it.getPublisher()).size()})
+                                        closureColumn(header : "Last Updated", type : Long, read : {it.getLastUpdated()})
+                                        closureColumn(header : "Status", preferredWidth: 10, type : String, read : {it.getStatus()})
+                                    }
+                                }
+                            }
+                            panel (constraints : BorderLayout.SOUTH) {
+                                button(text : "Update", enabled : bind {model.updateFileFeedButtonEnabled}, updateFileFeedAction)
+                                button(text : "Unsubscribe", enabled : bind {model.unsubscribeFileFeedButtonEnabled}, unsubscribeFileFeedAction)
+                                button(text : "Configure", enabled : bind {model.configureFileFeedButtonEnabled}, configureFileFeedAction)
+                            }
+                        }
+                        panel {
+                            borderLayout()
+                            panel (constraints : BorderLayout.NORTH) {
+                                label(text : "Published Files")
+                            }
+                            scrollPane(constraints : BorderLayout.CENTER) {
+                                table(id : "feed-items-table", autoCreateRowSorter : true, rowHeight : rowHeight) {
+                                    tableModel(list : model.feedItems) {
+                                        closureColumn(header : "Name", preferredWidth: 350, type : String, read : {it.getName()})
+                                        closureColumn(header : "Size", preferredWidth: 10, type : Long, read : {it.getSize()})
+                                        closureColumn(header : "Comment", preferredWidth: 10, type : Boolean, read : {it.getComment() != null})
+                                        closureColumn(header : "Certificates", preferredWidth: 10, type : Integer, read : {it.getCertificates()})
+                                        closureColumn(header : "Downloaded", preferredWidth: 10, type : Boolean, read : {
+                                            InfoHash ih = it.getInfoHash()
+                                            model.core.fileManager.isShared(ih)
+                                        })
+                                        closureColumn(header: "Date", type : Long, read : {it.getTimestamp()})
+                                    }
+                                }
+                            }
+                            panel(constraints : BorderLayout.SOUTH) {
+                                button(text : "Download", enabled : bind {model.downloadFeedItemButtonEnabled}, downloadFeedItemAction)
+                                button(text : "View Comment", enabled : bind {model.viewFeedItemCommentButtonEnabled}, viewFeedItemCommentAction)
+                                button(text : "View Certificates", enabled : bind {model.viewFeedItemCertificatesButtonEnabled}, viewFeedItemCertificatesAction )
+                            }
+                        }
+                    }
                     panel(constraints : "trust window") {
                         gridLayout(rows : 2, cols : 1)
                         panel {
@@ -681,14 +741,30 @@ class MainFrameView {
             if (selectedFiles == null || selectedFiles.isEmpty())
                 return
             model.addCommentButtonEnabled = true
+            model.publishButtonEnabled = true
+            boolean unpublish = true
+            selectedFiles.each { 
+                unpublish &= it.isPublished()
+            }
+            model.publishButtonText = unpublish ? "Unpublish" : "Publish"
         })
+        
         def sharedFilesTree = builder.getVariable("shared-files-tree")
         sharedFilesTree.addMouseListener(sharedFilesMouseListener)
 
         sharedFilesTree.addTreeSelectionListener({
             def selectedNode = sharedFilesTree.getLastSelectedPathComponent()
             model.addCommentButtonEnabled = selectedNode != null
-
+            model.publishButtonEnabled = selectedNode != null
+            
+            def selectedFiles = selectedSharedFiles()
+            if (selectedFiles == null || selectedFiles.isEmpty())
+                return
+            boolean unpublish = true
+            selectedFiles.each {
+                unpublish &= it.isPublished()
+            }
+            model.publishButtonText = unpublish ? "Unpublish" : "Publish"
         })
         
         sharedFilesTree.addTreeExpansionListener(expansionListener)
@@ -744,6 +820,98 @@ class MainFrameView {
                     }
                 })
 
+        // feeds table
+        def feedsTable = builder.getVariable("feeds-table")
+        feedsTable.rowSorter.addRowSorterListener({evt -> lastFeedsSortEvent = evt})
+        feedsTable.rowSorter.setSortsOnUpdates(true)
+        feedsTable.setDefaultRenderer(Integer.class, centerRenderer)
+        feedsTable.setDefaultRenderer(Long.class, new DateRenderer())
+        selectionModel = feedsTable.getSelectionModel()
+        selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
+        selectionModel.addListSelectionListener({
+            Feed selectedFeed = selectedFeed()
+            if (selectedFeed == null) {
+                model.updateFileFeedButtonEnabled = false
+                model.unsubscribeFileFeedButtonEnabled = false
+                model.configureFileFeedButtonEnabled = false
+                return
+            }
+
+            model.unsubscribeFileFeedButtonEnabled = true
+            model.configureFileFeedButtonEnabled = true
+            model.updateFileFeedButtonEnabled = !selectedFeed.getStatus().isActive()
+            
+            def items = model.core.feedManager.getFeedItems(selectedFeed.getPublisher())
+            model.feedItems.clear()
+            model.feedItems.addAll(items)
+            
+            def feedItemsTable = builder.getVariable("feed-items-table")
+            int selectedItemRow = feedItemsTable.getSelectedRow()
+            feedItemsTable.model.fireTableDataChanged()
+            if (selectedItemRow >= 0 && selectedItemRow < items.size())
+                feedItemsTable.selectionModel.setSelectionInterval(selectedItemRow, selectedItemRow)
+        })
+        feedsTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if(e.isPopupTrigger() || e.getButton() == MouseEvent.BUTTON3)
+                    showFeedsPopupMenu(e)
+            }
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                if(e.isPopupTrigger() || e.getButton() == MouseEvent.BUTTON3)
+                    showFeedsPopupMenu(e)
+            }
+        })
+        
+        
+        // feed items table
+        def feedItemsTable = builder.getVariable("feed-items-table")
+        feedItemsTable.rowSorter.addRowSorterListener({evt -> lastFeedItemsSortEvent = evt})
+        feedItemsTable.rowSorter.setSortsOnUpdates(true)
+        feedItemsTable.setDefaultRenderer(Integer.class, centerRenderer)
+        feedItemsTable.columnModel.getColumn(1).setCellRenderer(new SizeRenderer())
+        feedItemsTable.columnModel.getColumn(5).setCellRenderer(new DateRenderer())
+        
+        selectionModel = feedItemsTable.getSelectionModel()
+        selectionModel.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION)
+        selectionModel.addListSelectionListener({
+            List<FeedItem> selectedItems = selectedFeedItems()
+            if (selectedItems == null || selectedItems.isEmpty()) {
+                model.downloadFeedItemButtonEnabled = false
+                model.viewFeedItemCommentButtonEnabled = false
+                model.viewFeedItemCertificatesButtonEnabled = false
+                return
+            }
+            model.downloadFeedItemButtonEnabled = true
+            model.viewFeedItemCommentButtonEnabled = false
+            model.viewFeedItemCertificatesButtonEnabled = false
+            if (selectedItems.size() == 1) {
+                FeedItem item = selectedItems.get(0)
+                model.viewFeedItemCommentButtonEnabled = item.getComment() != null
+                model.viewFeedItemCertificatesButtonEnabled = item.getCertificates() > 0
+            }
+        })
+        feedItemsTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                List<FeedItem> selectedItems = selectedFeedItems()
+                if (e.isPopupTrigger() || e.getButton() == MouseEvent.BUTTON3)
+                    showFeedItemsPopupMenu(e)
+                else if (e.getButton() == MouseEvent.BUTTON1 && e.getClickCount() == 2 &&
+                    selectedItems != null && selectedItems.size() == 1 &&
+                    model.canDownload(selectedItems.get(0).getInfoHash())) {
+                    mvcGroup.controller.downloadFeedItem()
+                }
+            }
+            
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                if (e.isPopupTrigger() || e.getButton() == MouseEvent.BUTTON3)
+                    showFeedItemsPopupMenu(e)
+            }
+        })
+        
         // subscription table
         def subscriptionTable = builder.getVariable("subscription-table")
         subscriptionTable.setDefaultRenderer(Integer.class, centerRenderer)
@@ -911,7 +1079,7 @@ class MainFrameView {
         String roots = ""
         for (Iterator<SharedFile> iterator = selectedFiles.iterator(); iterator.hasNext(); ) {
             SharedFile selected = iterator.next()
-            String root = Base64.encode(selected.infoHash.getRoot())
+            String root = Base64.encode(selected.getRoot())
             roots += root
             if (iterator.hasNext())
                 roots += "\n"
@@ -1006,6 +1174,52 @@ class MainFrameView {
         showPopupMenu(menu, e)
     }
     
+    void showFeedsPopupMenu(MouseEvent e) {
+        Feed feed = selectedFeed()
+        if (feed == null)
+            return
+        JPopupMenu menu = new JPopupMenu()
+        if (model.updateFileFeedButtonEnabled) {
+            JMenuItem update = new JMenuItem("Update")
+            update.addActionListener({mvcGroup.controller.updateFileFeed()})
+            menu.add(update)
+        }
+        
+        JMenuItem unsubscribe = new JMenuItem("Unsubscribe")
+        unsubscribe.addActionListener({mvcGroup.controller.unsubscribeFileFeed()})
+        menu.add(unsubscribe)
+        
+        JMenuItem configure = new JMenuItem("Configure")
+        configure.addActionListener({mvcGroup.controller.configureFileFeed()})
+        menu.add(configure)
+        
+        showPopupMenu(menu,e)
+    }
+    
+    void showFeedItemsPopupMenu(MouseEvent e) {
+        List<FeedItem> items = selectedFeedItems()
+        if (items == null || items.isEmpty())
+            return
+        // TODO: finish
+        JPopupMenu menu = new JPopupMenu()
+        if (model.downloadFeedItemButtonEnabled) {
+            JMenuItem download = new JMenuItem("Download")
+            download.addActionListener({mvcGroup.controller.downloadFeedItem()})
+            menu.add(download)
+        }
+        if (model.viewFeedItemCommentButtonEnabled) {
+            JMenuItem viewComment = new JMenuItem("View Comment")
+            viewComment.addActionListener({mvcGroup.controller.viewFeedItemComment()})
+            menu.add(viewComment)
+        }
+        if (model.viewFeedItemCertificatesButtonEnabled) {
+            JMenuItem viewCertificates = new JMenuItem("View Certificates")
+            viewCertificates.addActionListener({mvcGroup.controller.viewFeedItemCertificates()})
+            menu.add(viewCertificates)
+        }
+        showPopupMenu(menu, e)
+    }
+    
     def selectedUploader() {
         def uploadsTable = builder.getVariable("uploads-table")
         int selectedRow = uploadsTable.getSelectedRow()
@@ -1056,6 +1270,7 @@ class MainFrameView {
         model.downloadsPaneButtonEnabled = true
         model.uploadsPaneButtonEnabled = true
         model.monitorPaneButtonEnabled = true
+        model.feedsPaneButtonEnabled = true
         model.trustPaneButtonEnabled = true
         model.chatPaneButtonEnabled = true
         chatNotificator.mainWindowDeactivated()
@@ -1068,6 +1283,7 @@ class MainFrameView {
         model.downloadsPaneButtonEnabled = false
         model.uploadsPaneButtonEnabled = true
         model.monitorPaneButtonEnabled = true
+        model.feedsPaneButtonEnabled = true
         model.trustPaneButtonEnabled = true
         model.chatPaneButtonEnabled = true
         chatNotificator.mainWindowDeactivated()
@@ -1080,6 +1296,7 @@ class MainFrameView {
         model.downloadsPaneButtonEnabled = true
         model.uploadsPaneButtonEnabled = false
         model.monitorPaneButtonEnabled = true
+        model.feedsPaneButtonEnabled = true
         model.trustPaneButtonEnabled = true
         model.chatPaneButtonEnabled = true
         chatNotificator.mainWindowDeactivated()
@@ -1092,6 +1309,20 @@ class MainFrameView {
         model.downloadsPaneButtonEnabled = true
         model.uploadsPaneButtonEnabled = true
         model.monitorPaneButtonEnabled = false
+        model.feedsPaneButtonEnabled = true
+        model.trustPaneButtonEnabled = true
+        model.chatPaneButtonEnabled = true
+        chatNotificator.mainWindowDeactivated()
+    }
+    
+    def showFeedsWindow = {
+        def cardsPanel = builder.getVariable("cards-panel")
+        cardsPanel.getLayout().show(cardsPanel,"feeds window")
+        model.searchesPaneButtonEnabled = true
+        model.downloadsPaneButtonEnabled = true
+        model.uploadsPaneButtonEnabled = true
+        model.monitorPaneButtonEnabled = true
+        model.feedsPaneButtonEnabled = false
         model.trustPaneButtonEnabled = true
         model.chatPaneButtonEnabled = true
         chatNotificator.mainWindowDeactivated()
@@ -1104,6 +1335,7 @@ class MainFrameView {
         model.downloadsPaneButtonEnabled = true
         model.uploadsPaneButtonEnabled = true
         model.monitorPaneButtonEnabled = true
+        model.feedsPaneButtonEnabled = true
         model.trustPaneButtonEnabled = false
         model.chatPaneButtonEnabled = true
         chatNotificator.mainWindowDeactivated()
@@ -1116,6 +1348,7 @@ class MainFrameView {
         model.downloadsPaneButtonEnabled = true
         model.uploadsPaneButtonEnabled = true
         model.monitorPaneButtonEnabled = true
+        model.feedsPaneButtonEnabled = true
         model.trustPaneButtonEnabled = true
         model.chatPaneButtonEnabled = false
         chatNotificator.mainWindowActivated()
@@ -1172,6 +1405,43 @@ class MainFrameView {
         builder.getVariable("shared-files-table").model.fireTableDataChanged()
     }
     
+    public void refreshFeeds() {
+        JTable feedsTable = builder.getVariable("feeds-table")
+        int selectedFeed = feedsTable.getSelectedRow()
+        feedsTable.model.fireTableDataChanged()
+        if (selectedFeed >= 0)
+            feedsTable.selectionModel.setSelectionInterval(selectedFeed, selectedFeed)
+        
+        JTable feedItemsTable = builder.getVariable("feed-items-table")
+        feedItemsTable.model.fireTableDataChanged()
+    }
+    
+    Feed selectedFeed() {
+        JTable feedsTable = builder.getVariable("feeds-table")
+        int row = feedsTable.getSelectedRow()
+        if (row < 0)
+            return null
+        if (lastFeedsSortEvent != null)
+            row = feedsTable.rowSorter.convertRowIndexToModel(row)
+        model.feeds[row]
+    }
+    
+    List<FeedItem> selectedFeedItems() {
+        JTable feedItemsTable = builder.getVariable("feed-items-table")
+        int [] selectedRows = feedItemsTable.getSelectedRows()
+        if (selectedRows.length == 0)
+            return null
+        List<FeedItem> rv = new ArrayList<>()
+        if (lastFeedItemsSortEvent != null) {
+            for (int i = 0; i < selectedRows.length; i++) {
+                selectedRows[i] = feedItemsTable.rowSorter.convertRowIndexToModel(selectedRows[i])
+            }
+        }
+        for (int selectedRow : selectedRows)
+            rv.add(model.feedItems[selectedRow])
+        rv
+    }
+    
     private void closeApplication() {
         Core core = application.getContext().get("core")
         

gui/griffon-app/views/com/muwire/gui/OptionsView.groovy

@@ -32,6 +32,7 @@ class OptionsView {
     def i
     def u
     def bandwidth
+    def feed
     def trust
     def chat
 
@@ -66,6 +67,14 @@ class OptionsView {
 
     def inBwField
     def outBwField
+    
+    def fileFeedCheckbox
+    def advertiseFeedCheckbox
+    def autoPublishSharedFilesCheckbox
+    def defaultFeedAutoDownloadCheckbox
+    def defaultFeedItemsToKeepField
+    def defaultFeedSequentialCheckbox
+    def defaultFeedUpdateIntervalField
 
     def allowUntrustedCheckbox
     def searchExtraHopCheckbox
@@ -257,6 +266,32 @@ class OptionsView {
             }
             panel(constraints : gbc(gridx: 0, gridy: 1, weighty: 100))
         }
+        feed = builder.panel {
+            gridBagLayout()
+            panel (border : titledBorder(title : "General Feed Settings", border : etchedBorder(), titlePosition : TitledBorder.TOP),
+                constraints : gbc(gridx : 0, gridy : 0, fill : GridBagConstraints.HORIZONTAL, weightx: 100)) {
+                gridBagLayout()
+                label(text : "Enable file feed", constraints : gbc(gridx: 0, gridy : 0, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                fileFeedCheckbox = checkBox(selected : bind {model.fileFeed}, constraints : gbc(gridx: 1, gridy : 0, anchor : GridBagConstraints.LINE_END))
+                label(text : "Advertise feed in search results", constraints : gbc(gridx: 0, gridy : 1, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                advertiseFeedCheckbox = checkBox(selected : bind {model.advertiseFeed}, constraints : gbc(gridx: 1, gridy : 1, anchor : GridBagConstraints.LINE_END))
+                label(text : "Automatically publish shared files", constraints : gbc(gridx: 0, gridy : 2, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                autoPublishSharedFilesCheckbox = checkBox(selected : bind {model.autoPublishSharedFiles}, constraints : gbc(gridx: 1, gridy : 2, anchor : GridBagConstraints.LINE_END))
+            }
+            panel (border : titledBorder(title : "Default Settings For New Feeds", border : etchedBorder(), titlePosition : TitledBorder.TOP),
+                constraints : gbc(gridx : 0, gridy : 1, fill : GridBagConstraints.HORIZONTAL, weightx: 100)) {
+                gridBagLayout()
+                label(text : "Automatically download files from feed", constraints : gbc(gridx: 0, gridy : 0, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                defaultFeedAutoDownloadCheckbox = checkBox(selected : bind {model.defaultFeedAutoDownload}, constraints : gbc(gridx: 1, gridy : 0, anchor : GridBagConstraints.LINE_END))
+                label(text : "Download files from feed sequentially", constraints : gbc(gridx: 0, gridy : 1, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                defaultFeedSequentialCheckbox = checkBox(selected : bind {model.defaultFeedSequential}, constraints : gbc(gridx: 1, gridy : 1, anchor : GridBagConstraints.LINE_END))
+                label(text : "Feed items to store on disk (-1 means unlimited)", constraints : gbc(gridx: 0, gridy : 2, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                defaultFeedItemsToKeepField = textField(text : bind {model.defaultFeedItemsToKeep}, constraints:gbc(gridx :1, gridy:2, anchor : GridBagConstraints.LINE_END))
+                label(text : "Feed refresh frequency in minutes", constraints : gbc(gridx: 0, gridy : 3, anchor : GridBagConstraints.LINE_START, weightx: 100))
+                defaultFeedUpdateIntervalField = textField(text : bind {model.defaultFeedUpdateInterval}, constraints:gbc(gridx :1, gridy:3, anchor : GridBagConstraints.LINE_END))
+            }
+            panel(constraints : gbc(gridx: 0, gridy : 2, weighty: 100))
+        }
         trust = builder.panel {
             gridBagLayout()
             panel (border : titledBorder(title : "Trust Settings", border : etchedBorder(), titlePosition : TitledBorder.TOP),
@@ -311,6 +346,7 @@ class OptionsView {
         if (core.router != null) {
             tabbedPane.addTab("Bandwidth", bandwidth)
         }
+        tabbedPane.addTab("Feed", feed)
         tabbedPane.addTab("Trust", trust)
         tabbedPane.addTab("Chat", chat)
 

gui/griffon-app/views/com/muwire/gui/SearchTabView.groovy

@@ -74,6 +74,7 @@ class SearchTabView {
                                             closureColumn(header : "Sender", preferredWidth : 500, type: String, read : {row -> row.getHumanReadableName()})
                                             closureColumn(header : "Results", preferredWidth : 20, type: Integer, read : {row -> model.sendersBucket[row].size()})
                                             closureColumn(header : "Browse", preferredWidth : 20, type: Boolean, read : {row -> model.sendersBucket[row].first().browse})
+                                            closureColumn(header : "Feed", preferredWidth : 20, type : Boolean, read : {row -> model.sendersBucket[row].first().feed})
                                             closureColumn(header : "Chat", preferredWidth : 20, type : Boolean, read : {row -> model.sendersBucket[row].first().chat})
                                             closureColumn(header : "Trust", preferredWidth : 50, type: String, read : { row ->
                                                 model.core.trustService.getLevel(row.destination).toString()
@@ -85,6 +86,7 @@ class SearchTabView {
                                     gridLayout(rows: 1, cols : 2)
                                     panel (border : etchedBorder()){
                                         button(text : "Browse Host", enabled : bind {model.browseActionEnabled}, browseAction)
+                                        button(text : "Subscribe", enabled : bind {model.subscribeActionEnabled}, subscribeAction)
                                         button(text : "Chat", enabled : bind{model.chatActionEnabled}, chatAction)
                                     }
                                     panel (border : etchedBorder()){
@@ -156,6 +158,14 @@ class SearchTabView {
                                                 }
                                                 count
                                             })
+                                            closureColumn(header : "Feeds", preferredWidth : 20, type : Integer, read : {
+                                                int count = 0
+                                                model.hashBucket[it].each { 
+                                                    if (it.feed)
+                                                        count++
+                                                }
+                                                count
+                                            })
                                             closureColumn(header : "Chat Hosts", preferredWidth : 20, type : Integer, read : {
                                                 int count = 0
                                                 model.hashBucket[it].each { 
@@ -187,6 +197,7 @@ class SearchTabView {
                                         tableModel(list : model.senders2) {
                                             closureColumn(header : "Sender", preferredWidth : 350, type : String, read : {it.sender.getHumanReadableName()})
                                             closureColumn(header : "Browse", preferredWidth : 20, type : Boolean, read : {it.browse})
+                                            closureColumn(header : "Feed", preferredWidth : 20, type: Boolean, read : {it.feed})
                                             closureColumn(header : "Chat", preferredWidth : 20, type : Boolean, read : {it.chat})
                                             closureColumn(header : "Comment", preferredWidth : 20, type : Boolean, read : {it.comment != null})
                                             closureColumn(header : "Certificates", preferredWidth : 20, type: Integer, read : {it.certificates})
@@ -200,6 +211,7 @@ class SearchTabView {
                                     gridLayout(rows : 1, cols : 2)
                                     panel (border : etchedBorder()) {
                                         button(text : "Browse Host", enabled : bind {model.browseActionEnabled}, browseAction)
+                                        button(text : "Subscribe", enabled : bind {model.subscribeActionEnabled}, subscribeAction)
                                         button(text : "Chat", enabled : bind{model.chatActionEnabled}, chatAction)
                                         button(text : "View Comment", enabled : bind {model.viewCommentActionEnabled}, showCommentAction)
                                         button(text : "View Certificates", enabled : bind {model.viewCertificatesActionEnabled}, viewCertificatesAction)
@@ -308,6 +320,7 @@ class SearchTabView {
             if (result == null) {
                 model.viewCommentActionEnabled = false
                 model.viewCertificatesActionEnabled = false
+                model.subscribeActionEnabled = false
                 return
             } else {
                 model.viewCommentActionEnabled = result.comment != null
@@ -326,12 +339,14 @@ class SearchTabView {
             if (row < 0) {
                 model.trustButtonsEnabled = false
                 model.browseActionEnabled = false
-                model.chatActionEnabled = false
+                model.subscribeActionEnabled = false
                 return
             } else {
                 Persona sender = model.senders[row]
                 model.browseActionEnabled = model.sendersBucket[sender].first().browse
                 model.chatActionEnabled = model.sendersBucket[sender].first().chat
+                model.subscribeActionEnabled = model.sendersBucket[sender].first().feed &&
+                    model.core.feedManager.getFeed(sender) == null
                 model.trustButtonsEnabled = true
                 model.results.clear()
                 model.results.addAll(model.sendersBucket[sender])
@@ -386,16 +401,19 @@ class SearchTabView {
             if (row < 0 || model.senders2[row] == null) {
                 model.browseActionEnabled = false
                 model.chatActionEnabled = false
+                model.subscribeActionEnabled = false
                 model.viewCertificatesActionEnabled = false
                 model.trustButtonsEnabled = false
                 model.viewCommentActionEnabled = false
                 return
             }
-            model.browseActionEnabled = model.senders2[row].browse
-            model.chatActionEnabled = model.senders2[row].chat
+            UIResultEvent e = model.senders2[row]
+            model.browseActionEnabled = e.browse
+            model.chatActionEnabled = e.chat
+            model.subscribeActionEnabled = e.feed && model.core.feedManager.getFeed(e.getSender()) == null 
             model.trustButtonsEnabled = true
-            model.viewCommentActionEnabled = model.senders2[row].comment != null
-            model.viewCertificatesActionEnabled = model.senders2[row].certificates > 0
+            model.viewCommentActionEnabled = e.comment != null
+            model.viewCertificatesActionEnabled = e.certificates > 0
         })
        
         if (settings.groupByFile)

plug/build.gradle

@@ -94,7 +94,7 @@ task pack {
     doLast {
         if (project.pack200 == "true") {
             libDir.listFiles().stream().filter( { it.getName().endsWith(".jar") } ).
-                filter({it.length() > 512*1024}).forEach {
+                forEach {
                 println "packing $it"
                 def name = it.toString()
                 println "pack200 --no-gzip ${name}.pack $name".execute().text

webui/locale/messages_ar.po

@@ -18,13 +18,14 @@
 # ButterflyOfFire, 2019
 # Tashigi OP, 2019
 # Ali Muhammed <a.muhammed@psiphon.ca>, 2019
+# ducki2p <ducki2p@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Ali Muhammed <a.muhammed@psiphon.ca>, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: ducki2p <ducki2p@gmail.com>, 2019\n"
 "Language-Team: Arabic (https://www.transifex.com/otf/teams/12694/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,7 +85,7 @@ msgstr "تصفح"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "الحالة"
 
@@ -132,7 +133,7 @@ msgstr "التنزيلات"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr "الملفات المرفوعة"
 
@@ -153,7 +154,7 @@ msgstr "الملفات المرفوعة"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "بحث"
 
@@ -167,7 +168,7 @@ msgstr "بحث"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -180,7 +181,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -190,6 +191,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -295,7 +297,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "رفع"
 
@@ -308,7 +310,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "المشاركة"
 
@@ -357,7 +359,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "حفظ"
 
@@ -390,7 +392,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -419,7 +421,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "أرسل"
 
@@ -436,8 +438,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -480,7 +486,7 @@ 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -528,208 +534,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "أسفل"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "تحميل"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
+#: src/main/java/com/muwire/webui/Util.java:48
+msgid "Downloaded"
+msgstr "محمل"
+
+#: src/main/java/com/muwire/webui/Util.java:49
 msgid "Downloaded Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:48
+#: src/main/java/com/muwire/webui/Util.java:50
 msgid "Downloader"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:49
+#: src/main/java/com/muwire/webui/Util.java:51
 msgid "Downloading"
 msgstr "جاري التحميل"
 
-#: src/main/java/com/muwire/webui/Util.java:50
+#: src/main/java/com/muwire/webui/Util.java:52
 msgid "Enter Reason (Optional)"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:51
+#: src/main/java/com/muwire/webui/Util.java:53
 msgid "ETA"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:52
+#: src/main/java/com/muwire/webui/Util.java:54
 msgid "Fetching Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:53
+#: src/main/java/com/muwire/webui/Util.java:55
 msgid "File"
 msgstr "ملفّ"
 
-#: src/main/java/com/muwire/webui/Util.java:54
+#: src/main/java/com/muwire/webui/Util.java:56
 msgid "Hashing"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:55
+#: src/main/java/com/muwire/webui/Util.java:57
 msgid "Hide Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:56
+#: src/main/java/com/muwire/webui/Util.java:58
 msgid "Hide Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:57
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "استضافة"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "استورد"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "الاسم"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Pause"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "السبب"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "تحديث"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "حاول مجددا"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "السّعة"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "‮السرعة"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "الحالة"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "إشترك "
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "المستخدم"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "المستخدم"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_az.po

@@ -7,16 +7,16 @@
 # Translators:
 # erinm, 2019
 # Emin Mastizada <emin@linux.com>, 2019
-# Nikafn <appone6@gmail.com>, 2019
 # ferhad.necef, 2019
 # ulkar!(($-2017 <ulkernatiqqizis@gmail.com>, 2019
+# Nikafn <appone6@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: ulkar!(($-2017 <ulkernatiqqizis@gmail.com>, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: Nikafn <appone6@gmail.com>, 2019\n"
 "Language-Team: Azerbaijani (https://www.transifex.com/otf/teams/12694/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -76,7 +76,7 @@ msgstr "Bax"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Status"
 
@@ -124,7 +124,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Axtarış"
 
@@ -159,7 +159,7 @@ msgstr "Axtarış"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -172,7 +172,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -182,6 +182,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -287,7 +288,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Yüklə"
 
@@ -300,7 +301,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr ""
 
@@ -349,7 +350,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Saxla"
 
@@ -382,7 +383,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr "Nəticələr"
 
@@ -411,7 +412,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Göndər"
 
@@ -428,8 +429,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -472,7 +477,7 @@ msgid "Never"
 msgstr "Heç vaxt"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -520,208 +525,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
+msgid "Down"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Endir"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "Yüklənir"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "Yüklənir"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "Fayl"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "Fayl"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Host"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "İdxal"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Ad"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Səbəb"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Yenilə"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Təkrar"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Ölçü"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Vəziyyət"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
+msgstr "Etibarlı"
+
+#: src/main/java/com/muwire/webui/Util.java:100
 msgid "Trusted User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:96
+#: src/main/java/com/muwire/webui/Util.java:101
 msgid "Unshare"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:97
+#: src/main/java/com/muwire/webui/Util.java:102
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:100
+#: src/main/java/com/muwire/webui/Util.java:105
 msgid "User"
 msgstr "İstifadəçi"
 
-#: src/main/java/com/muwire/webui/Util.java:101
+#: src/main/java/com/muwire/webui/Util.java:106
 msgid "View 1 Certificate"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:102
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_bg.po

@@ -18,7 +18,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Vladislav Stoyanov <vlado1972@yahoo.com>, 2019\n"
 "Language-Team: Bulgarian (https://www.transifex.com/otf/teams/12694/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -79,7 +79,7 @@ msgstr "Прелисти"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Статус"
 
@@ -127,7 +127,7 @@ msgstr "Изтегляния"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -148,7 +148,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Търсене"
 
@@ -162,7 +162,7 @@ msgstr "Търсене"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -175,7 +175,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -185,6 +185,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -290,7 +291,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Качване"
 
@@ -303,7 +304,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Споделяне"
 
@@ -352,7 +353,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Запази"
 
@@ -385,7 +386,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -414,7 +415,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Изпрати"
 
@@ -431,8 +432,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -475,7 +480,7 @@ 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -523,208 +528,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
+msgid "Down"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Изтегли"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "Изтегляне"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "Изтегляне"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "Файл"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "Файл"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Хост"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Внасяне"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Име"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Pause"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Причина"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Опресни"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Опитай пак"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Размер"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Скорост "
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Състояние"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "Потребител"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "Потребител"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_br.po

@@ -12,7 +12,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Irriep Nala Novram <allannkorh@yahoo.fr>, 2019\n"
 "Language-Team: Breton (https://www.transifex.com/otf/teams/12694/br/)\n"
 "MIME-Version: 1.0\n"
@@ -73,7 +73,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Statud"
 
@@ -121,7 +121,7 @@ msgstr "Pellgargadennoù"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Klask"
 
@@ -156,7 +156,7 @@ msgstr "Klask"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -169,7 +169,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -179,6 +179,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -284,7 +285,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Uskargañ"
 
@@ -297,7 +298,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr ""
 
@@ -346,7 +347,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Enrollañ"
 
@@ -379,7 +380,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr "Disoc'hoù"
 
@@ -408,7 +409,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr ""
 
@@ -425,8 +426,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -469,7 +474,7 @@ msgid "Never"
 msgstr "Morse"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -517,208 +522,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
+msgid "Down"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Pellgargañ"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
+msgid "Downloaded Pieces"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
+msgid "Downloading"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
+msgid "ETA"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
+msgid "File"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Host"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Emporzhiañ"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Anv"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Ehan"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Adklask"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
+msgstr "Fiziet"
+
+#: src/main/java/com/muwire/webui/Util.java:100
 msgid "Trusted User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:96
+#: src/main/java/com/muwire/webui/Util.java:101
 msgid "Unshare"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:97
+#: src/main/java/com/muwire/webui/Util.java:102
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:100
+#: src/main/java/com/muwire/webui/Util.java:105
 msgid "User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:101
+#: src/main/java/com/muwire/webui/Util.java:106
 msgid "View 1 Certificate"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:102
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_bs.po

@@ -14,7 +14,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Mersad Avdic <mersad.developer@gmail.com>, 2019\n"
 "Language-Team: Bosnian (https://www.transifex.com/otf/teams/12694/bs/)\n"
 "MIME-Version: 1.0\n"
@@ -75,7 +75,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Status"
 
@@ -123,7 +123,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr ""
 
@@ -158,7 +158,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -181,6 +181,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -286,7 +287,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Postavi"
 
@@ -299,7 +300,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr ""
 
@@ -348,7 +349,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Sačuvaj"
 
@@ -381,7 +382,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -410,7 +411,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "podnijeti"
 
@@ -427,8 +428,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -471,7 +476,7 @@ msgid "Never"
 msgstr "Nikad"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -519,208 +524,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
+msgid "Down"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Preuzmi"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
+msgid "Downloaded Pieces"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
+msgid "Downloading"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "Datoteka"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "Datoteka"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Host"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Uvezi"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Ime"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Ponovi"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Veličina"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "stanje"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "korisnik"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "korisnik"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_ca.po

@@ -22,7 +22,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Jaime Muñoz Martín <jmmartin_5@outlook.com>, 2019\n"
 "Language-Team: Catalan (https://www.transifex.com/otf/teams/12694/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "Navega"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Estat"
 
@@ -131,7 +131,7 @@ msgstr "Descàrregues"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -152,7 +152,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Cerca"
 
@@ -166,7 +166,7 @@ msgstr "Cerca"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -179,7 +179,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -189,6 +189,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -294,7 +295,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Pujada"
 
@@ -307,7 +308,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Comparteix"
 
@@ -356,7 +357,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Desa"
 
@@ -389,7 +390,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -418,7 +419,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Tramet"
 
@@ -435,8 +436,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -479,7 +484,7 @@ msgid "Never"
 msgstr "Mai"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -527,208 +532,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
+msgid "Down"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Baixada"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "Baixada"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "Baixada"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "Fitxer"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "Fitxer"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Allotjador"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Subscriu-me"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Nom"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Raó"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Actualitza"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Reintenta"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Mida"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Velocitat"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Estat o província"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "Usuari"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "Usuari"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_cs.po

@@ -22,7 +22,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Plarome, 2019\n"
 "Language-Team: Czech (https://www.transifex.com/otf/teams/12694/cs/)\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "Prohlížet"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Stav"
 
@@ -131,7 +131,7 @@ msgstr "Ke stažení"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -152,7 +152,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Hledat"
 
@@ -166,7 +166,7 @@ msgstr "Hledat"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -179,7 +179,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -189,6 +189,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -294,7 +295,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Nahrát"
 
@@ -307,7 +308,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Sdílení"
 
@@ -356,7 +357,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Uložit"
 
@@ -389,7 +390,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -418,7 +419,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Odeslat"
 
@@ -435,8 +436,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -479,7 +484,7 @@ msgid "Never"
 msgstr "Nikdy"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -527,208 +532,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "Dolů"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Stáhnout"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "Stahování"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "Stahování"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "Soubor"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "Soubor"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Server"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Import"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Název"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Pauza"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Důvod"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Aktualizace"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Opakovat"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr "Odesílatel"
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Velikost"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Rychlost"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Stav"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "Uživatel"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "Uživatel"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_da.po

@@ -16,7 +16,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Bo Elkjaer <bo_elkjaer@riseup.net>, 2019\n"
 "Language-Team: Danish (https://www.transifex.com/otf/teams/12694/da/)\n"
 "MIME-Version: 1.0\n"
@@ -77,7 +77,7 @@ msgstr "Brows"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Status"
 
@@ -125,7 +125,7 @@ msgstr "Downloads"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -146,7 +146,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Søg"
 
@@ -160,7 +160,7 @@ msgstr "Søg"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -173,7 +173,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -183,6 +183,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -288,7 +289,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Sender"
 
@@ -301,7 +302,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Deling"
 
@@ -350,7 +351,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Gem"
 
@@ -383,7 +384,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -412,7 +413,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Send"
 
@@ -429,8 +430,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -473,7 +478,7 @@ msgid "Never"
 msgstr "Aldrig"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -521,208 +526,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "Ned"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Download"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "Downloading"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "Downloading"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "Fil"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "Fil"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Vært"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Importer"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "NAvn"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Pause"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Årsag"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Opdater"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Forsøg igen"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr "Afsender"
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Størrelse"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Hastighed "
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Tilstand"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "Bruger"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "Bruger"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_de.po

@@ -21,15 +21,16 @@
 # IDRASSI Mounir <mounir.idrassi@idrix.fr>, 2019
 # Jens Reinheimer, 2019
 # Vincent Breitmoser <look@my.amazin.horse>, 2019
-# Ettore Atalan <atalanttore@googlemail.com>, 2019
 # Forecast <taisto@web.de>, 2019
+# Ettore Atalan <atalanttore@googlemail.com>, 2019
+# Lars Schimmer <echelon@i2pmail.org>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 20:26+0000\n"
-"Last-Translator: Forecast <taisto@web.de>, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: Lars Schimmer <echelon@i2pmail.org>, 2019\n"
 "Language-Team: German (https://www.transifex.com/otf/teams/12694/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,7 +90,7 @@ msgstr "Durchsuchen"
 #: 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:90
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Status"
 
@@ -137,7 +138,7 @@ msgstr "Downloads"
 #: 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:101
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr "Uploads"
 
@@ -158,7 +159,7 @@ msgstr "Uploads"
 #: 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:80
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Suchen"
 
@@ -172,7 +173,7 @@ msgstr "Suchen"
 #: 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:83
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr "Geteilte Dateien"
 
@@ -185,7 +186,7 @@ msgstr "Geteilte Dateien"
 #: 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:95
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr "Vertrauen"
 
@@ -195,6 +196,7 @@ msgstr "Vertrauen"
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -300,7 +302,7 @@ msgid "Directory for incomplete files"
 msgstr "Verzeichnis für unvollständige Dateien"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:247
-#: src/main/java/com/muwire/webui/Util.java:100
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Upload"
 
@@ -313,7 +315,7 @@ msgid "Upload slots per user (-1 means unlimited)"
 msgstr "Gleichzeitige Uploads je Nutzer (-1 für unbegrenzt)"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:257
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Beteiligung"
 
@@ -362,7 +364,7 @@ msgid "Outbound tunnel quantity"
 msgstr "Tunnelanzahl ausgehend"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:79
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Speichern"
 
@@ -395,7 +397,7 @@ msgid "Group By Sender"
 msgstr "Nach Absender gruppieren"
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr "Ergebnisse"
 
@@ -426,7 +428,7 @@ msgid "Directory for storing incomplete files"
 msgstr "Verzeichnis für unvollständige Dateien"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:180
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Übermitteln"
 
@@ -443,9 +445,13 @@ msgstr "Tabellenansicht"
 msgid "View As Tree"
 msgstr "Baumansicht"
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
-msgstr "Nutzern vertrauen"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr "Vertrauenswürdiger Nutzer"
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
+msgstr "Misstrauter Nutzer"
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:89
@@ -487,7 +493,7 @@ msgid "Never"
 msgstr "Nie"
 
 #: src/main/java/com/muwire/webui/UploadServlet.java:92
-#: src/main/java/com/muwire/webui/Util.java:106
+#: src/main/java/com/muwire/webui/Util.java:109
 #, java-format
 msgid "{0}% of piece"
 msgstr "{0}% des Stücks"
@@ -555,196 +561,202 @@ msgid "Download Location"
 msgstr "Speicherort"
 
 #: src/main/java/com/muwire/webui/Util.java:48
+msgid "Downloaded"
+msgstr "Heruntergeladen"
+
+#: src/main/java/com/muwire/webui/Util.java:49
 msgid "Downloaded Pieces"
 msgstr "Geladene Stücke"
 
-#: src/main/java/com/muwire/webui/Util.java:49
+#: src/main/java/com/muwire/webui/Util.java:50
 msgid "Downloader"
 msgstr "Downloader"
 
-#: src/main/java/com/muwire/webui/Util.java:50
+#: src/main/java/com/muwire/webui/Util.java:51
 msgid "Downloading"
 msgstr "Lade herunter"
 
-#: src/main/java/com/muwire/webui/Util.java:51
+#: src/main/java/com/muwire/webui/Util.java:52
 msgid "Enter Reason (Optional)"
 msgstr "Grund eingeben (optional)"
 
-#: src/main/java/com/muwire/webui/Util.java:52
+#: src/main/java/com/muwire/webui/Util.java:53
 msgid "ETA"
 msgstr "ETA"
 
-#: src/main/java/com/muwire/webui/Util.java:53
+#: src/main/java/com/muwire/webui/Util.java:54
 msgid "Fetching Certificates"
 msgstr "Hole Beglaubigungen"
 
-#: src/main/java/com/muwire/webui/Util.java:54
+#: src/main/java/com/muwire/webui/Util.java:55
 msgid "File"
 msgstr "Datei"
 
-#: src/main/java/com/muwire/webui/Util.java:55
+#: src/main/java/com/muwire/webui/Util.java:56
 msgid "Hashing"
 msgstr "Hashwertberechnung"
 
-#: src/main/java/com/muwire/webui/Util.java:56
+#: src/main/java/com/muwire/webui/Util.java:57
 msgid "Hide Certificates"
 msgstr "Beglaubigungen ausblenden"
 
-#: src/main/java/com/muwire/webui/Util.java:57
+#: src/main/java/com/muwire/webui/Util.java:58
 msgid "Hide Comment"
 msgstr "Kommentar ausblenden"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Rechner"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Import"
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr "importiert"
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr "Bekannte Quellen"
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr "Zuletzt aktualisiert"
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr "Als misstraut markieren"
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr "Als neutral markieren"
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr "Als vertrauenswürdig markieren"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Name"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Pause"
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr "Größe des Stückes"
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr "Abfrage"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Grund"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr "Stücke der Gegenstelle"
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr "Ergebnisse für {0}"
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr "Ergebnisse von {0}"
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr "weiter"
 
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Versuche erneut"
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr "Absender"
 
-#: src/main/java/com/muwire/webui/Util.java:82
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr "Absender"
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr "Kommentar zeigen"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Grösse"
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr "Quellen"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Geschw."
 
-#: src/main/java/com/muwire/webui/Util.java:89
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Status"
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: src/main/java/com/muwire/webui/Util.java:94
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr "Gesamtzahl Stücke"
 
-#: src/main/java/com/muwire/webui/Util.java:96
+#: src/main/java/com/muwire/webui/Util.java:99
 msgid "Trusted"
 msgstr "Vertrauenswürdig"
 
-#: src/main/java/com/muwire/webui/Util.java:97
+#: src/main/java/com/muwire/webui/Util.java:100
 msgid "Trusted User"
 msgstr "Vertrauenswürdiger Nutzer"
 
-#: src/main/java/com/muwire/webui/Util.java:98
+#: src/main/java/com/muwire/webui/Util.java:101
 msgid "Unshare"
 msgstr "Nicht teilen"
 
-#: src/main/java/com/muwire/webui/Util.java:99
+#: src/main/java/com/muwire/webui/Util.java:102
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: src/main/java/com/muwire/webui/Util.java:102
+#: src/main/java/com/muwire/webui/Util.java:105
 msgid "User"
 msgstr "Benutzer"
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:106
 msgid "View 1 Certificate"
 msgstr "1 Beglaubigung zeigen"
 
-#: src/main/java/com/muwire/webui/Util.java:104
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr "{0} Beglaubigungen zeigen"
 
-#: src/main/java/com/muwire/webui/Util.java:105
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr "Dein Vertrauen"

webui/locale/messages_el.po

@@ -14,17 +14,17 @@
 # LaScapigliata <ditri2000@hotmail.com>, 2019
 # Alexandros Dorodoulis <aldor94@gmail.com>, 2019
 # IDRASSI Mounir <mounir.idrassi@idrix.fr>, 2019
-# Elektra M. <safiragon@yahoo.gr>, 2019
-# Wasilis Mandratzis-Walz <inactive+beonex123@transifex.com>, 2019
 # Panagiotis Vasilopoulos, 2019
 # Alexandros Melidis <almel01@gmail.com>, 2019
+# Wasilis Mandratzis-Walz <inactive+beonex123@transifex.com>, 2019
+# Elektra M. <safiragon@yahoo.gr>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Alexandros Melidis <almel01@gmail.com>, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: Elektra M. <safiragon@yahoo.gr>, 2019\n"
 "Language-Team: Greek (https://www.transifex.com/otf/teams/12694/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -47,7 +47,7 @@ msgstr ""
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:162
 #: src/main/java/com/muwire/webui/MuWireServlet.java:64
 msgid "Welcome to MuWire"
-msgstr ""
+msgstr "Καλώς ήρθατε στο MuWire"
 
 #: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:164
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:172
@@ -62,6 +62,8 @@ msgstr ""
 #: src/main/java/com/muwire/webui/MuWireServlet.java:72
 msgid "MuWire requires JavaScript. Please enable JavaScript in your browser."
 msgstr ""
+"Το MuWire απαιτεί JavaScript. Παρακαλούμε ενεργοποιήστε τη JavaScript στον "
+"φυλλομετρητή σας."
 
 #: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:167
 #: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:184
@@ -84,7 +86,7 @@ msgstr "Περιήγηση"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Κατάσταση"
 
@@ -132,9 +134,9 @@ msgstr "Λήψεις"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
-msgstr ""
+msgstr "Μεταφoρτώσεις"
 
 #: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:180
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:176
@@ -153,7 +155,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Αναζήτηση"
 
@@ -167,7 +169,7 @@ msgstr "Αναζήτηση"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -180,7 +182,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr "Εμπιστοσύνη"
 
@@ -190,6 +192,7 @@ msgstr "Εμπιστοσύνη"
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -205,7 +208,7 @@ msgstr "Χρήστες"
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:183
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:198
 msgid "Subscriptions"
-msgstr ""
+msgstr "Συνδρομές"
 
 #: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:192
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:140
@@ -276,7 +279,7 @@ msgstr "Σχετικα"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:225
 msgid "Search in comments"
-msgstr ""
+msgstr "Αναζήτηση στα σχόλια"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:229
 msgid "Allow browsing"
@@ -295,7 +298,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Ανέβασμα"
 
@@ -308,7 +311,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Κοινή χρήση"
 
@@ -357,7 +360,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Αποθήκευση"
 
@@ -390,7 +393,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr "Αποτελέσματα"
 
@@ -419,7 +422,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Καταχώρηση"
 
@@ -436,8 +439,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -480,7 +487,7 @@ 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -528,208 +535,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "Κάτω"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Λήψη"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr "Λήψη Τοποθεσίας"
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "Γίνεται λήψη"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "Γίνεται λήψη"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "Αρχείο"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "Αρχείο"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Οικοδεσπότης"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Εισαγωγή"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Όνομα"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Pause"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Λόγος"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Ανανέωση"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Ξαναδοκίμασε"
 
-#: src/main/java/com/muwire/webui/Util.java:80
-msgid "Sender"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:81
-msgid "Senders"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:84
-msgid "Show Comment"
-msgstr ""
+msgid "Sender"
+msgstr "Αποστολέας"
 
 #: src/main/java/com/muwire/webui/Util.java:85
+msgid "Senders"
+msgstr "Αποστολείς"
+
+#: src/main/java/com/muwire/webui/Util.java:88
+msgid "Show Comment"
+msgstr "Προβολή Σχολίου "
+
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
-msgstr ""
+msgstr "Πηγές"
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Ταχύτητα"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Κατάσταση"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
+msgstr "Εμπιστοσύνη"
+
+#: src/main/java/com/muwire/webui/Util.java:100
 msgid "Trusted User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:96
+#: src/main/java/com/muwire/webui/Util.java:101
 msgid "Unshare"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:97
+#: src/main/java/com/muwire/webui/Util.java:102
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:100
+#: src/main/java/com/muwire/webui/Util.java:105
 msgid "User"
 msgstr "Χρήστης"
 
-#: src/main/java/com/muwire/webui/Util.java:101
+#: src/main/java/com/muwire/webui/Util.java:106
 msgid "View 1 Certificate"
-msgstr ""
+msgstr "Προβολή 1 Πιστοποιητικού"
 
-#: src/main/java/com/muwire/webui/Util.java:102
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_el_GR.po

@@ -1,726 +0,0 @@
-# I2P
-# Copyright (C) 2019 The MuWire Project
-# This file is distributed under the same license as the MuWire package.
-# To contribute translations, see https://github.com/zlatinb/muwire/wiki/Translate
-# foo <foo@bar>, 2019.
-# 
-# Translators:
-# Angelos Orfanakos, 2019
-# platon <boban@pressmail.ch>, 2019
-# LaScapigliata <ditri2000@hotmail.com>, 2019
-# Elektra M. <safiragon@yahoo.gr>, 2019
-# 
-msgid ""
-msgstr ""
-"Project-Id-Version: I2P MuWire\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Elektra M. <safiragon@yahoo.gr>, 2019\n"
-"Language-Team: Greek (Greece) (https://www.transifex.com/otf/teams/12694/el_GR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: el_GR\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: build/tmp_jsp/com/muwire/webui/BrowseHost_jsp.java:131
-msgid "Browse Host"
-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
-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/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
-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"
-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/TrustLists_jsp.java:195
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:195
-#: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:210
-msgid "About"
-msgstr "Σχετικά με"
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:225
-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"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:273
-msgid "Search extra hop"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:277
-msgid "Allow others to view my trust list"
-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"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:287
-msgid "Inbound tunnel length"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:291
-msgid "Inbound tunnel quantity"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:295
-msgid "Outbound tunnel length"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:299
-msgid "Outbound tunnel quantity"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
-msgid "Save"
-msgstr "Αποθήκευση"
-
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:213
-msgid "Download Details"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:215
-msgid "Click on a download to view details"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:141
-msgid "Home"
-msgstr "Αρχική"
-
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:203
-msgid "Active Searches By Sender"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:205
-msgid "Group By File"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:209
-msgid "Active Searches By File"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:211
-msgid "Group By Sender"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
-msgid "Results"
-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
-msgid "Welcome to MuWire!  Please select a nickname and download locations"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:168
-msgid "These directories will be created if they do not already exist"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:170
-msgid "Nickname"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:172
-msgid "Directory for saving downloaded files"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:176
-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
-msgid "Submit"
-msgstr "Υποβολή"
-
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:174
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:180
-msgid "Share"
-msgstr "Κοινοποίηση"
-
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:184
-msgid "View As Table"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/SharedFiles_jsp.java:188
-msgid "View As Tree"
-msgstr ""
-
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
-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
-msgid "Bad input"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:96
-#, java-format
-msgid "{0} does not exist"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:98
-#, java-format
-msgid "{0} is not a directory"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/ConfigurationServlet.java:100
-#, java-format
-msgid "{0} not writeable"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/DownloadServlet.java:221
-msgid "Unknown"
-msgstr "Άγνωστο"
-
-#: src/main/java/com/muwire/webui/MuWireServlet.java:57
-msgid "MuWire"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/MuWireServlet.java:68
-msgid "MuWire is initializing, please wait"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/TrustServlet.java:285
-msgid "Never"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/UploadServlet.java:92
-#: src/main/java/com/muwire/webui/Util.java:104
-#, java-format
-msgid "{0}% of piece"
-msgstr ""
-
-#. alphabetical please
-#: src/main/java/com/muwire/webui/Util.java:32
-msgid "Actions"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:33
-msgid "Active Sources"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:35
-msgid "Browsing"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:36
-msgid "Cancel"
-msgstr "Ακύρωση"
-
-#: src/main/java/com/muwire/webui/Util.java:37
-msgid "Certificates"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:38
-msgid "Certified"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:39
-msgid "Certify"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:40
-msgid "Clear Finished"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:41
-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"
-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"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
-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"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:57
-msgid "Host"
-msgstr "Εξυπηρετητής"
-
-#: src/main/java/com/muwire/webui/Util.java:58
-msgid "Import"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:59
-msgid "Imported"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:60
-msgid "Known Sources"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:61
-msgid "Last Updated"
-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"
-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"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:67
-msgid "Piece Size"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:68
-msgid "Progress"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:69
-msgid "Query"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:70
-msgid "Reason"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:71
-msgid "Refresh"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:72
-msgid "Remote Pieces"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:74
-#, java-format
-msgid "Results for {0}"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:75
-#, java-format
-msgid "Results from {0}"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:76
-msgid "Resume"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:77
-msgid "Retry"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:80
-msgid "Sender"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:81
-msgid "Senders"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:84
-msgid "Show Comment"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:85
-msgid "Size"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:86
-msgid "Sources"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:87
-msgid "Speed"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:88
-msgid "State"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:91
-msgid "Subscribe"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:92
-msgid "Subscribed"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:93
-msgid "Total Pieces"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:102
-#, java-format
-msgid "View {0} Certificates"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:103
-msgid "Your Trust"
-msgstr ""

webui/locale/messages_es.po

@@ -6,9 +6,7 @@
 # 
 # Translators:
 # Adolfo Jayme-Barrientos, 2019
-# Daniel Mustieles <inactive+leo@transifex.com>, 2019
 # cedpren <cedpren@gmail.com>, 2019
-# strel, 2019
 # Trolly, 2019
 # Adam Lynn <adam@opentechfund.org>, 2019
 # Martus Translations <translations@martus.org>, 2019
@@ -21,13 +19,15 @@
 # Pablo Di Noto <pdinoto@gmail.com>, 2019
 # María Estocolmo <rowanda@gmail.com>, 2019
 # Zuhualime Akoochimoya, 2019
+# strel, 2019
+# Daniel Mustieles <inactive+leo@transifex.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Zuhualime Akoochimoya, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: Daniel Mustieles <inactive+leo@transifex.com>, 2019\n"
 "Language-Team: Spanish (https://www.transifex.com/otf/teams/12694/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,7 +87,7 @@ msgstr "Navegar"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Estado"
 
@@ -135,7 +135,7 @@ msgstr "Descargas"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr "Subidas"
 
@@ -156,7 +156,7 @@ msgstr "Subidas"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Buscar"
 
@@ -170,7 +170,7 @@ msgstr "Buscar"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr "Ficheros compartidos"
 
@@ -183,7 +183,7 @@ msgstr "Ficheros compartidos"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr "Confianza"
 
@@ -193,6 +193,7 @@ msgstr "Confianza"
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -298,7 +299,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Subir"
 
@@ -311,7 +312,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Compartir"
 
@@ -360,7 +361,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Guardar"
 
@@ -393,7 +394,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr "Resultados"
 
@@ -422,7 +423,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Enviar"
 
@@ -439,8 +440,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -483,7 +488,7 @@ msgid "Never"
 msgstr "Nunca"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -531,208 +536,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "Bajar"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Descarga"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr "Ubicación de descarga"
 
-#: src/main/java/com/muwire/webui/Util.java:47
+#: src/main/java/com/muwire/webui/Util.java:48
+msgid "Downloaded"
+msgstr "Descargado"
+
+#: src/main/java/com/muwire/webui/Util.java:49
 msgid "Downloaded Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:48
+#: src/main/java/com/muwire/webui/Util.java:50
 msgid "Downloader"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:49
+#: src/main/java/com/muwire/webui/Util.java:51
 msgid "Downloading"
 msgstr "Descargando"
 
-#: src/main/java/com/muwire/webui/Util.java:50
+#: src/main/java/com/muwire/webui/Util.java:52
 msgid "Enter Reason (Optional)"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:51
+#: src/main/java/com/muwire/webui/Util.java:53
 msgid "ETA"
 msgstr "Llegada"
 
-#: src/main/java/com/muwire/webui/Util.java:52
+#: src/main/java/com/muwire/webui/Util.java:54
 msgid "Fetching Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:53
+#: src/main/java/com/muwire/webui/Util.java:55
 msgid "File"
 msgstr "Fichero"
 
-#: src/main/java/com/muwire/webui/Util.java:54
+#: src/main/java/com/muwire/webui/Util.java:56
 msgid "Hashing"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:55
+#: src/main/java/com/muwire/webui/Util.java:57
 msgid "Hide Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:56
+#: src/main/java/com/muwire/webui/Util.java:58
 msgid "Hide Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:57
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Servidor (host)"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Importar"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr "Importado"
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Nombre"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr "Tamaño de la parte"
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr "Progreso"
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Razón"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr "Retomar"
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Intentar de nuevo"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr "Legítimo"
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Velocidad"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Estado"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "Suscribirse"
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
+msgstr "De confianza"
+
+#: src/main/java/com/muwire/webui/Util.java:100
 msgid "Trusted User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:96
+#: src/main/java/com/muwire/webui/Util.java:101
 msgid "Unshare"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:97
+#: src/main/java/com/muwire/webui/Util.java:102
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:100
+#: src/main/java/com/muwire/webui/Util.java:105
 msgid "User"
 msgstr "Usuario"
 
-#: src/main/java/com/muwire/webui/Util.java:101
+#: src/main/java/com/muwire/webui/Util.java:106
 msgid "View 1 Certificate"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:102
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_es_AR.po

@@ -13,7 +13,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Zuhualime Akoochimoya, 2019\n"
 "Language-Team: Spanish (Argentina) (https://www.transifex.com/otf/teams/12694/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -74,7 +74,7 @@ msgstr "Navegar"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Estado"
 
@@ -122,7 +122,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -143,7 +143,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Búsqueda"
 
@@ -157,7 +157,7 @@ msgstr "Búsqueda"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -170,7 +170,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -180,6 +180,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -285,7 +286,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Subir"
 
@@ -298,7 +299,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr ""
 
@@ -347,7 +348,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Guardar"
 
@@ -380,7 +381,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -409,7 +410,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Enviar"
 
@@ -426,8 +427,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -470,7 +475,7 @@ 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -518,208 +523,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
+msgid "Down"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Descargar"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "Descargando"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "Descargando"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
+msgid "ETA"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
+msgid "File"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Host"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Importar"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Nombre"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Razón"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Reintentar"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Talle"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Estado"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
+msgid "Trusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_fa.po

@@ -13,15 +13,15 @@
 # Amir Moezzi <amirreza.mz@yahoo.com>, 2019
 # Marzieh Behboodi <marziehbehboodi@yahoo.com>, 2019
 # b0b47d46632b78a09a40de799fda9a65, 2019
-# magnifico, 2019
 # Samaneh M <asamana.haoma@gmail.com>, 2019
+# magnifico, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Samaneh M <asamana.haoma@gmail.com>, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: magnifico, 2019\n"
 "Language-Team: Persian (https://www.transifex.com/otf/teams/12694/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -81,7 +81,7 @@ msgstr "مرور وب!"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "وضعیت"
 
@@ -129,7 +129,7 @@ msgstr "دانلودها"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr "آپلودها"
 
@@ -150,7 +150,7 @@ msgstr "آپلودها"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "جستجو"
 
@@ -164,7 +164,7 @@ msgstr "جستجو"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -177,7 +177,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr "اعتماد"
 
@@ -187,6 +187,7 @@ msgstr "اعتماد"
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -292,7 +293,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "آپلود"
 
@@ -305,7 +306,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "به اشتراک گذاری"
 
@@ -354,7 +355,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "ذخیره"
 
@@ -387,7 +388,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -416,7 +417,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "درخواست"
 
@@ -433,8 +434,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -477,7 +482,7 @@ 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -525,208 +530,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "پایین"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "بارگیری"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
+#: src/main/java/com/muwire/webui/Util.java:48
+msgid "Downloaded"
+msgstr "دانلود شد"
+
+#: src/main/java/com/muwire/webui/Util.java:49
 msgid "Downloaded Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:48
+#: src/main/java/com/muwire/webui/Util.java:50
 msgid "Downloader"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:49
+#: src/main/java/com/muwire/webui/Util.java:51
 msgid "Downloading"
 msgstr "◾️ دانلود مرورگر"
 
-#: src/main/java/com/muwire/webui/Util.java:50
+#: src/main/java/com/muwire/webui/Util.java:52
 msgid "Enter Reason (Optional)"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:51
+#: src/main/java/com/muwire/webui/Util.java:53
 msgid "ETA"
 msgstr "ETA"
 
-#: src/main/java/com/muwire/webui/Util.java:52
+#: src/main/java/com/muwire/webui/Util.java:54
 msgid "Fetching Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:53
+#: src/main/java/com/muwire/webui/Util.java:55
 msgid "File"
 msgstr "فایل"
 
-#: src/main/java/com/muwire/webui/Util.java:54
+#: src/main/java/com/muwire/webui/Util.java:56
 msgid "Hashing"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:55
+#: src/main/java/com/muwire/webui/Util.java:57
 msgid "Hide Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:56
+#: src/main/java/com/muwire/webui/Util.java:58
 msgid "Hide Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:57
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "ميزبان"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "وارد کردن"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "نام"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "توقف"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr "پیشرفت"
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "دلیل"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "تازه کردن"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr "ادامه"
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "تلاش دوباره"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "اندازه"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "سرعت"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "وضعیت"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "اشتراک"
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "کاربر"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "کاربر"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_fi.po

@@ -5,7 +5,6 @@
 # foo <foo@bar>, 2019.
 # 
 # Translators:
-# Jorma Karvonen <karvonen.jorma@gmail.com>, 2019
 # erinm, 2019
 # Steve Dougherty, 2019
 # Jaakko Korhonen <jaakko.korhonen@gmail.com>, 2019
@@ -13,13 +12,14 @@
 # Jarkko Nabb <syrinx78@gmail.com>, 2019
 # IDRASSI Mounir <mounir.idrassi@idrix.fr>, 2019
 # Panu Ahvenharju, 2019
+# Jorma Karvonen <karvonen.jorma@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Panu Ahvenharju, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: Jorma Karvonen <karvonen.jorma@gmail.com>, 2019\n"
 "Language-Team: Finnish (https://www.transifex.com/otf/teams/12694/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -79,7 +79,7 @@ msgstr "Selaa"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Tila"
 
@@ -127,7 +127,7 @@ msgstr "Lataukset"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr "Lähetykset"
 
@@ -148,7 +148,7 @@ msgstr "Lähetykset"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Haku"
 
@@ -162,7 +162,7 @@ msgstr "Haku"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -175,7 +175,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr "Luottamus"
 
@@ -185,6 +185,7 @@ msgstr "Luottamus"
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -290,7 +291,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Kopioi palvelimelle"
 
@@ -303,7 +304,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Jakaminen"
 
@@ -352,7 +353,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Tallenna"
 
@@ -385,7 +386,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -414,7 +415,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Lähetä"
 
@@ -431,8 +432,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -475,7 +480,7 @@ msgid "Never"
 msgstr "Ei koskaan"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -523,208 +528,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "Alas"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Lataa"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr "Lataa sijainti"
 
-#: src/main/java/com/muwire/webui/Util.java:47
+#: src/main/java/com/muwire/webui/Util.java:48
+msgid "Downloaded"
+msgstr "Ladattu"
+
+#: src/main/java/com/muwire/webui/Util.java:49
 msgid "Downloaded Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:48
+#: src/main/java/com/muwire/webui/Util.java:50
 msgid "Downloader"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:49
+#: src/main/java/com/muwire/webui/Util.java:51
 msgid "Downloading"
 msgstr "Ladataan"
 
-#: src/main/java/com/muwire/webui/Util.java:50
+#: src/main/java/com/muwire/webui/Util.java:52
 msgid "Enter Reason (Optional)"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:51
+#: src/main/java/com/muwire/webui/Util.java:53
 msgid "ETA"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:52
+#: src/main/java/com/muwire/webui/Util.java:54
 msgid "Fetching Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:53
+#: src/main/java/com/muwire/webui/Util.java:55
 msgid "File"
 msgstr "Tiedosto"
 
-#: src/main/java/com/muwire/webui/Util.java:54
+#: src/main/java/com/muwire/webui/Util.java:56
 msgid "Hashing"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:55
+#: src/main/java/com/muwire/webui/Util.java:57
 msgid "Hide Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:56
+#: src/main/java/com/muwire/webui/Util.java:58
 msgid "Hide Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:57
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Palvelin"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Tuo"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Nimi"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Tauko"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr "Edistyminen"
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Syy"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Päivitä"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Yritä uudelleen"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Koko"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Nopeus"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Tila"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "Käyttäjä"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "Käyttäjä"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_fil.po

@@ -12,7 +12,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Neo_Anderson <neoandersonmatrix16@gmail.com>, 2019\n"
 "Language-Team: Filipino (https://www.transifex.com/otf/teams/12694/fil/)\n"
 "MIME-Version: 1.0\n"
@@ -73,7 +73,7 @@ msgstr "Mag-browse"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Katayuan"
 
@@ -121,7 +121,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -142,7 +142,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Maghanap"
 
@@ -156,7 +156,7 @@ msgstr "Maghanap"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -169,7 +169,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -179,6 +179,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -284,7 +285,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Upload"
 
@@ -297,7 +298,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr ""
 
@@ -346,7 +347,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "I-save"
 
@@ -379,7 +380,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -408,7 +409,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr ""
 
@@ -425,8 +426,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -469,7 +474,7 @@ 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -517,208 +522,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
+msgid "Down"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Download"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
+msgid "Downloaded Pieces"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
+msgid "Downloading"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
+msgid "ETA"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
+msgid "File"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
-msgid "Host"
-msgstr "Host"
+msgid "Hide Certificates"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:58
-msgid "Import"
+msgid "Hide Comment"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:59
-msgid "Imported"
-msgstr ""
+msgid "Host"
+msgstr "Host"
 
 #: src/main/java/com/muwire/webui/Util.java:60
-msgid "Known Sources"
+msgid "Import"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:61
-msgid "Last Updated"
+msgid "Imported"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:62
-msgid "Mark Distrusted"
+msgid "Known Sources"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:63
-msgid "Mark Neutral"
+msgid "Last Updated"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:64
-msgid "Mark Trusted"
+msgid "Mark Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:65
-msgid "Name"
-msgstr "Name"
+msgid "Mark Neutral"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:66
-msgid "Pause"
+msgid "Mark Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:67
-msgid "Piece Size"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:68
-msgid "Progress"
-msgstr ""
+msgid "Name"
+msgstr "Name"
 
+#. verb
 #: src/main/java/com/muwire/webui/Util.java:69
-msgid "Query"
+msgid "Pause"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:70
-msgid "Reason"
-msgstr "Dahilan"
+msgid "Piece Size"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:71
-msgid "Refresh"
+msgid "Progress"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:72
+msgid "Query"
+msgstr ""
+
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
+msgid "Reason"
+msgstr "Dahilan"
+
+#: src/main/java/com/muwire/webui/Util.java:75
+msgid "Refresh"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Estado"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
+msgid "Trusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_fr.po

@@ -5,7 +5,6 @@
 # foo <foo@bar>, 2019.
 # 
 # Translators:
-# kytv <killyourtv@i2pmail.org>, 2019
 # Boxoa590, 2019
 # Martus Translations <translations@martus.org>, 2019
 # erinm, 2019
@@ -13,13 +12,14 @@
 # Steve Dougherty, 2019
 # nicolas hernandez <nicolas.hernandez@aleph-networks.com>, 2019
 # Emma Peel, 2019
+# kytv <killyourtv@i2pmail.org>, 2019
 # AO <ao@localizationlab.org>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 20:26+0000\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
 "Last-Translator: AO <ao@localizationlab.org>, 2019\n"
 "Language-Team: French (https://www.transifex.com/otf/teams/12694/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr "Parcourir"
 #: 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:90
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "État"
 
@@ -129,7 +129,7 @@ msgstr "Téléchargements"
 #: 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:101
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr "Téléversements"
 
@@ -150,7 +150,7 @@ msgstr "Téléversements"
 #: 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:80
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Chercher"
 
@@ -164,7 +164,7 @@ msgstr "Chercher"
 #: 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:83
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr "Fichiers partagés"
 
@@ -177,7 +177,7 @@ msgstr "Fichiers partagés"
 #: 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:95
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr "Confiance"
 
@@ -187,6 +187,7 @@ msgstr "Confiance"
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -292,7 +293,7 @@ msgid "Directory for incomplete files"
 msgstr "Répertoire des fichiers incomplets"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:247
-#: src/main/java/com/muwire/webui/Util.java:100
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Téléversement"
 
@@ -305,7 +306,7 @@ msgid "Upload slots per user (-1 means unlimited)"
 msgstr "Créneaux de téléversement par utilisateur (-1 = sans limite)"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:257
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Partage"
 
@@ -354,7 +355,7 @@ msgid "Outbound tunnel quantity"
 msgstr "Nombre de tunnels sortants"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:79
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -387,7 +388,7 @@ msgid "Group By Sender"
 msgstr "Grouper par expéditeur"
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr "Résultats"
 
@@ -418,7 +419,7 @@ msgid "Directory for storing incomplete files"
 msgstr "Répertoire d’enregistrement des fichiers incomplets"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:180
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Envoyer"
 
@@ -435,9 +436,13 @@ msgstr "Visualiser en tableau"
 msgid "View As Tree"
 msgstr "Visualiser en arborescence"
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
-msgstr "Faire confiance aux utilisateurs"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr "Utilisateurs de confiance"
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
+msgstr "Utilisateurs douteux"
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:89
@@ -479,7 +484,7 @@ msgid "Never"
 msgstr "Jamais"
 
 #: src/main/java/com/muwire/webui/UploadServlet.java:92
-#: src/main/java/com/muwire/webui/Util.java:106
+#: src/main/java/com/muwire/webui/Util.java:109
 #, java-format
 msgid "{0}% of piece"
 msgstr "{0} % du morceau"
@@ -547,196 +552,202 @@ msgid "Download Location"
 msgstr "Emplacement de téléchargement"
 
 #: src/main/java/com/muwire/webui/Util.java:48
+msgid "Downloaded"
+msgstr "Téléchargé"
+
+#: src/main/java/com/muwire/webui/Util.java:49
 msgid "Downloaded Pieces"
 msgstr "Morceaux téléchargés"
 
-#: src/main/java/com/muwire/webui/Util.java:49
+#: src/main/java/com/muwire/webui/Util.java:50
 msgid "Downloader"
 msgstr "Téléchargeur"
 
-#: src/main/java/com/muwire/webui/Util.java:50
+#: src/main/java/com/muwire/webui/Util.java:51
 msgid "Downloading"
 msgstr "Téléchargement"
 
-#: src/main/java/com/muwire/webui/Util.java:51
+#: src/main/java/com/muwire/webui/Util.java:52
 msgid "Enter Reason (Optional)"
 msgstr "Écrivez une raison (facultatif)"
 
-#: src/main/java/com/muwire/webui/Util.java:52
+#: src/main/java/com/muwire/webui/Util.java:53
 msgid "ETA"
 msgstr "Fin prévue"
 
-#: src/main/java/com/muwire/webui/Util.java:53
+#: src/main/java/com/muwire/webui/Util.java:54
 msgid "Fetching Certificates"
 msgstr "Récupération des certificats"
 
-#: src/main/java/com/muwire/webui/Util.java:54
+#: src/main/java/com/muwire/webui/Util.java:55
 msgid "File"
 msgstr "Fichier"
 
-#: src/main/java/com/muwire/webui/Util.java:55
+#: src/main/java/com/muwire/webui/Util.java:56
 msgid "Hashing"
 msgstr "Hachage"
 
-#: src/main/java/com/muwire/webui/Util.java:56
+#: src/main/java/com/muwire/webui/Util.java:57
 msgid "Hide Certificates"
 msgstr "Cacher les certificats"
 
-#: src/main/java/com/muwire/webui/Util.java:57
+#: src/main/java/com/muwire/webui/Util.java:58
 msgid "Hide Comment"
 msgstr "Cacher le commentaire"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Hôte"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Importer"
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr "Importé"
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr "Sources connues"
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr "Dernière mise à jour"
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr "Marquer comme douteux"
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr "Marquer comme neutre"
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr "Marquer comme fiable"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Nom"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Mettre en pause"
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr "Taille des morceaux"
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr "Progression"
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr "Demande"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Raison"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Actualiser"
 
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr "Morceaux distants"
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr "Résultats pour {0}"
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr "Résultats de {0}"
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Ressayer"
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr "Expéditeur"
 
-#: src/main/java/com/muwire/webui/Util.java:82
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr "Expéditeurs"
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr "Afficher le commentaire"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Taille"
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr "Sources"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Vitesse"
 
-#: src/main/java/com/muwire/webui/Util.java:89
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "État"
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "S’abonner"
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr "Abonné"
 
-#: src/main/java/com/muwire/webui/Util.java:94
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr "Total des morceaux"
 
-#: src/main/java/com/muwire/webui/Util.java:96
+#: src/main/java/com/muwire/webui/Util.java:99
 msgid "Trusted"
 msgstr "Fiable"
 
-#: src/main/java/com/muwire/webui/Util.java:97
+#: src/main/java/com/muwire/webui/Util.java:100
 msgid "Trusted User"
 msgstr "Utilisateur de confiance"
 
-#: src/main/java/com/muwire/webui/Util.java:98
+#: src/main/java/com/muwire/webui/Util.java:101
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: src/main/java/com/muwire/webui/Util.java:99
+#: src/main/java/com/muwire/webui/Util.java:102
 msgid "Unsubscribe"
 msgstr "Se désabonner"
 
-#: src/main/java/com/muwire/webui/Util.java:102
+#: src/main/java/com/muwire/webui/Util.java:105
 msgid "User"
 msgstr "Utilisateur"
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:106
 msgid "View 1 Certificate"
 msgstr "Voir un certificat"
 
-#: src/main/java/com/muwire/webui/Util.java:104
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr "Voir {0} certificats"
 
-#: src/main/java/com/muwire/webui/Util.java:105
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr "Votre confiance"

webui/locale/messages_gl.po

@@ -15,7 +15,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Oscar Guardiola <Oscar.Guardiola@davinci-ti.es>, 2019\n"
 "Language-Team: Galician (https://www.transifex.com/otf/teams/12694/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr "Examinar"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Estado"
 
@@ -124,7 +124,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Busca"
 
@@ -159,7 +159,7 @@ msgstr "Busca"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -172,7 +172,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -182,6 +182,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -287,7 +288,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Cargar"
 
@@ -300,7 +301,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Compartindo"
 
@@ -349,7 +350,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Gardar"
 
@@ -382,7 +383,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -411,7 +412,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Enviar"
 
@@ -428,8 +429,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -472,7 +477,7 @@ msgid "Never"
 msgstr "Nunca"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -520,208 +525,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
+msgid "Down"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Descargar"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "Descargando"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "Descargando"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "Ficheiro"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "Ficheiro"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Host"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Importar"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Nome"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Causa"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Actualizar"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Tentar de novo"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Tamaño"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Estado"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "Usuario"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "Usuario"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_hi.po

@@ -6,16 +6,16 @@
 # 
 # Translators:
 # erinm, 2019
-# Kalyan Dikshit <dikshitrocks93@gmail.com>, 2019
 # Vaibhav Kaushik <vaibhavkaushik@disroot.org>, 2019
 # Kunj Talky <kunjan.directi@gmail.com>, 2019
+# Kalyan Dikshit <dikshitrocks93@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Kunj Talky <kunjan.directi@gmail.com>, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: Kalyan Dikshit <dikshitrocks93@gmail.com>, 2019\n"
 "Language-Team: Hindi (https://www.transifex.com/otf/teams/12694/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +75,7 @@ msgstr "ब्राउज़"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "स्थिति"
 
@@ -123,7 +123,7 @@ msgstr "डाउनलोड"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -144,7 +144,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "खोज"
 
@@ -158,7 +158,7 @@ msgstr "खोज"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -171,7 +171,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -181,6 +181,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -286,7 +287,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "अपलोड करें"
 
@@ -299,7 +300,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "सहभाजन"
 
@@ -348,7 +349,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "बचाना"
 
@@ -381,7 +382,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr "परिणाम"
 
@@ -410,7 +411,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "जमा करें"
 
@@ -427,8 +428,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -471,7 +476,7 @@ 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -519,208 +524,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
-msgid "Down"
+msgid "Distrusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:45
+msgid "Down"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "डाउनलोड"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
+msgid "Downloaded Pieces"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
+msgid "Downloading"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
+msgid "ETA"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
+msgid "File"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Host"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "आयात"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "नाम"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "पुन: प्रयास करें"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "आकर"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "स्थिति"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
+msgstr "विश्वसनीय"
+
+#: src/main/java/com/muwire/webui/Util.java:100
 msgid "Trusted User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:96
+#: src/main/java/com/muwire/webui/Util.java:101
 msgid "Unshare"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:97
+#: src/main/java/com/muwire/webui/Util.java:102
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:100
+#: src/main/java/com/muwire/webui/Util.java:105
 msgid "User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:101
+#: src/main/java/com/muwire/webui/Util.java:106
 msgid "View 1 Certificate"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:102
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_hr.po

@@ -15,7 +15,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: Karlo Prikratki <karlo@karloprikratki.com>, 2019\n"
 "Language-Team: Croatian (https://www.transifex.com/otf/teams/12694/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr "Pregledaj"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Status"
 
@@ -124,7 +124,7 @@ msgstr "Preuzimanja"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Pretraživanje"
 
@@ -159,7 +159,7 @@ msgstr "Pretraživanje"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr "Dijeljene datoteke"
 
@@ -172,7 +172,7 @@ msgstr "Dijeljene datoteke"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr "Povjerenje"
 
@@ -182,6 +182,7 @@ msgstr "Povjerenje"
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -287,7 +288,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Učitaj"
 
@@ -300,7 +301,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Dijeljenje"
 
@@ -349,7 +350,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Spremi"
 
@@ -382,7 +383,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -411,7 +412,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Pošalji"
 
@@ -428,8 +429,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -472,7 +477,7 @@ msgid "Never"
 msgstr "Nikad"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -520,208 +525,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "Dolje"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Preuzmi"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr "Lokacija preuzimanja"
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "Preuzimanje"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "Preuzimanje"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "Datoteka"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "Datoteka"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Domaćin"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Uvezi"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Ime"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Razlog"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Osvježi"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Pokušaj ponovno"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Veličina"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Stanje"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
+msgid "Trusted User"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_hu.po

@@ -7,18 +7,18 @@
 # Translators:
 # vargaviktor <viktor.varga@gmail.com>, 2019
 # kytv <killyourtv@i2pmail.org>, 2019
-# AdminLMH <lehetmashogy@i2pmail.org>, 2019
 # erinm, 2019
 # benewfy <benewfy@gmail.com>, 2019
 # IDRASSI Mounir <mounir.idrassi@idrix.fr>, 2019
 # Gergő Doma <domag02@gmail.com>, 2019
+# AdminLMH <lehetmashogy@i2pmail.org>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Gergő Doma <domag02@gmail.com>, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: AdminLMH <lehetmashogy@i2pmail.org>, 2019\n"
 "Language-Team: Hungarian (https://www.transifex.com/otf/teams/12694/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +80,7 @@ msgstr "Tallóz"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Állapot"
 
@@ -128,7 +128,7 @@ msgstr "Letöltések"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr "Feltöltések"
 
@@ -149,7 +149,7 @@ msgstr "Feltöltések"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Keresés"
 
@@ -163,7 +163,7 @@ msgstr "Keresés"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr "Megosztott fájlok"
 
@@ -176,7 +176,7 @@ msgstr "Megosztott fájlok"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr "Bizalom"
 
@@ -186,6 +186,7 @@ msgstr "Bizalom"
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -291,34 +292,34 @@ msgid "Directory for incomplete files"
 msgstr "Befejezetlen fájlok könyvtára"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:247
-#: src/main/java/com/muwire/webui/Util.java:98
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Feltöltés"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:249
 msgid "Total upload slots (-1 means unlimited)"
-msgstr ""
+msgstr "Összes feltöltési szál (-1 jelentése: korlátlan)"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:253
 msgid "Upload slots per user (-1 means unlimited)"
-msgstr ""
+msgstr "Feltöltési szálak felhasználónként (-1 jelentése: korlátlan)"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:257
-#: src/main/java/com/muwire/webui/Util.java:83
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Megosztás"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:259
 msgid "Share downloaded files"
-msgstr ""
+msgstr "Letöltött fájlok megosztása"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:263
 msgid "Share hidden files"
-msgstr ""
+msgstr "Rejtett fájlok megosztása"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:269
 msgid "Allow only trusted connections"
-msgstr ""
+msgstr "Csak a megbízható kapcsolatok engedélyezése"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:273
 msgid "Search extra hop"
@@ -326,44 +327,44 @@ msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:277
 msgid "Allow others to view my trust list"
-msgstr ""
+msgstr "Engedélyezi mások számára hogy megtekinthessék a bizalmi listáját"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:281
 msgid "Trust list update frequency (hours)"
-msgstr ""
+msgstr "Bizalmi lista frissítésének gyakorisága (órában)"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:285
 msgid "I2P Tunnels - Changes Require Plugin Restart"
-msgstr ""
+msgstr "I2P Alagutak - A módosításokhoz a beépülő újraindítása szükséges"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:287
 msgid "Inbound tunnel length"
-msgstr ""
+msgstr "Bejövő alagút hossza"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:291
 msgid "Inbound tunnel quantity"
-msgstr ""
+msgstr "Bejövő alagutak mennyisége"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:295
 msgid "Outbound tunnel length"
-msgstr ""
+msgstr "Kimenő alagút hossza"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:299
 msgid "Outbound tunnel quantity"
-msgstr ""
+msgstr "Kimenő alagutak mennyisége"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Mentés"
 
 #: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:213
 msgid "Download Details"
-msgstr ""
+msgstr "Letöltés részletei"
 
 #: build/tmp_jsp/com/muwire/webui/Downloads_jsp.java:215
 msgid "Click on a download to view details"
-msgstr ""
+msgstr "A részletek megtekintéséhez kattintson a letöltésre"
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:141
 msgid "Home"
@@ -371,7 +372,7 @@ msgstr "Kezdőlap"
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:203
 msgid "Active Searches By Sender"
-msgstr ""
+msgstr "Aktív keresések feladónként"
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:205
 msgid "Group By File"
@@ -379,28 +380,28 @@ msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:209
 msgid "Active Searches By File"
-msgstr ""
+msgstr "Aktív keresések fájlonként"
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:211
 msgid "Group By Sender"
-msgstr ""
+msgstr "Csoportosítás feladónként"
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
-msgstr ""
+msgstr "Eredmények"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:122
 msgid "Initial Setup"
-msgstr ""
+msgstr "Kezdeti beállítás"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:166
 msgid "Welcome to MuWire!  Please select a nickname and download locations"
-msgstr ""
+msgstr "Üdvözli a MuWire! Kérem válasszon egy becenevet és letöltési helyeket"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:168
 msgid "These directories will be created if they do not already exist"
-msgstr ""
+msgstr "Ezek a könyvtárak létre lesznek hozva ha még nem léteznének"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:170
 msgid "Nickname"
@@ -408,14 +409,14 @@ msgstr "Becenév"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:172
 msgid "Directory for saving downloaded files"
-msgstr ""
+msgstr "Könyvtár a letöltött fájlok elmentésére"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:176
 msgid "Directory for storing incomplete files"
-msgstr ""
+msgstr "Könyvtár a befejezetlen fájlok tárolására"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:180
-#: src/main/java/com/muwire/webui/Util.java:90
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Elküld"
 
@@ -432,8 +433,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -447,17 +452,17 @@ msgstr ""
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:96
 #, java-format
 msgid "{0} does not exist"
-msgstr ""
+msgstr "{0} nem létezik"
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:98
 #, java-format
 msgid "{0} is not a directory"
-msgstr ""
+msgstr "{0} nem könyvtár"
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:100
 #, java-format
 msgid "{0} not writeable"
-msgstr ""
+msgstr "{0} nem írható"
 
 #: src/main/java/com/muwire/webui/DownloadServlet.java:221
 msgid "Unknown"
@@ -469,14 +474,14 @@ msgstr "MuWire"
 
 #: src/main/java/com/muwire/webui/MuWireServlet.java:68
 msgid "MuWire is initializing, please wait"
-msgstr ""
+msgstr "MuWire elindul, kérem várjon"
 
 #: src/main/java/com/muwire/webui/TrustServlet.java:285
 msgid "Never"
 msgstr "Soha"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -488,7 +493,7 @@ msgstr "Események"
 
 #: src/main/java/com/muwire/webui/Util.java:33
 msgid "Active Sources"
-msgstr ""
+msgstr "Aktív források"
 
 #: src/main/java/com/muwire/webui/Util.java:35
 msgid "Browsing"
@@ -504,15 +509,15 @@ msgstr "Tanúsítványok"
 
 #: src/main/java/com/muwire/webui/Util.java:38
 msgid "Certified"
-msgstr ""
+msgstr "Tanúsítva"
 
 #: src/main/java/com/muwire/webui/Util.java:39
 msgid "Certify"
-msgstr ""
+msgstr "Tanúsítás"
 
 #: src/main/java/com/muwire/webui/Util.java:40
 msgid "Clear Finished"
-msgstr ""
+msgstr "Befejezettek kitakarítása"
 
 #: src/main/java/com/muwire/webui/Util.java:41
 msgid "Comment"
@@ -521,211 +526,225 @@ msgstr "Megjegyzés"
 #: src/main/java/com/muwire/webui/Util.java:42
 #, java-format
 msgid "Details for {0}"
-msgstr ""
+msgstr "{0} részletei"
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "Le"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Letöltés"
 
-#: 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"
-msgstr ""
+msgid "Download Location"
+msgstr "Letöltési hely"
 
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
-msgstr ""
+msgid "Downloaded"
+msgstr "Letöltött"
 
 #: src/main/java/com/muwire/webui/Util.java:49
+msgid "Downloaded Pieces"
+msgstr "Letöltött részek"
+
+#: src/main/java/com/muwire/webui/Util.java:50
+msgid "Downloader"
+msgstr "Letöltő"
+
+#: src/main/java/com/muwire/webui/Util.java:51
 msgid "Downloading"
 msgstr "Letöltés"
 
-#: src/main/java/com/muwire/webui/Util.java:50
+#: src/main/java/com/muwire/webui/Util.java:52
 msgid "Enter Reason (Optional)"
-msgstr ""
+msgstr "Indoklás megadása (opcionális)"
 
-#: src/main/java/com/muwire/webui/Util.java:51
+#: src/main/java/com/muwire/webui/Util.java:53
 msgid "ETA"
 msgstr "BIE"
 
-#: src/main/java/com/muwire/webui/Util.java:52
+#: src/main/java/com/muwire/webui/Util.java:54
 msgid "Fetching Certificates"
-msgstr ""
+msgstr "Tanúsítványok lekérdezése"
 
-#: src/main/java/com/muwire/webui/Util.java:53
+#: src/main/java/com/muwire/webui/Util.java:55
 msgid "File"
 msgstr "Fájl"
 
-#: src/main/java/com/muwire/webui/Util.java:54
+#: src/main/java/com/muwire/webui/Util.java:56
 msgid "Hashing"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:55
+#: src/main/java/com/muwire/webui/Util.java:57
 msgid "Hide Certificates"
-msgstr ""
+msgstr "Tanúsítványok elrejtése"
 
-#: src/main/java/com/muwire/webui/Util.java:56
+#: src/main/java/com/muwire/webui/Util.java:58
 msgid "Hide Comment"
 msgstr "Megjegyzés elrejtése"
 
-#: src/main/java/com/muwire/webui/Util.java:57
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Állomás"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Importálás"
 
-#: src/main/java/com/muwire/webui/Util.java:59
-msgid "Imported"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:60
-msgid "Known Sources"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:61
-msgid "Last Updated"
-msgstr ""
+msgid "Imported"
+msgstr "Importálva"
 
 #: src/main/java/com/muwire/webui/Util.java:62
+msgid "Known Sources"
+msgstr "Ismert források"
+
+#: src/main/java/com/muwire/webui/Util.java:63
+msgid "Last Updated"
+msgstr "Legutoljára frissítve"
+
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Név"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
-msgstr ""
+msgstr "Szünet"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
-msgstr ""
+msgstr "Folyamat"
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Oka"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Frissítés"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
-msgstr ""
+msgstr "Eredmények ehhez: {0}"
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
-msgstr ""
+msgstr "Eredmények ebből: {0}"
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
-msgstr ""
+msgstr "Folytat"
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Újra"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr "Feladó"
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
-msgstr ""
+msgstr "Feladók"
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr "Megjegyzés mutatása"
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Méret"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
-msgstr ""
+msgstr "Források"
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Sebesség "
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Állapot"
 
-#: src/main/java/com/muwire/webui/Util.java:91
-msgid "Subscribe"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:92
-msgid "Subscribed"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:93
-msgid "Total Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
+msgid "Subscribe"
+msgstr "Feliratkozás"
 
 #: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
+msgid "Subscribed"
+msgstr "Feliratkozva"
 
 #: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+msgid "Total Pieces"
+msgstr "Összes rész"
+
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "Felhasználó"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr "Leiratkozás"
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "Felhasználó"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr "1 tanúsítvány megjelenítése"
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
-msgstr ""
+msgstr "{0} tanúsítvány megjelenítése"
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_in.po

@@ -12,15 +12,15 @@
 # IDRASSI Mounir <mounir.idrassi@idrix.fr>, 2019
 # Nurahmat Agustianto <sh.indonesia@gmail.com>, 2019
 # Andre Julian <andrejulian30@gmail.com>, 2019
-# Robert Dafis <robertdafis@gmail.com>, 2019
 # Muhammad Yusuf <myusuffin@gmail.com>, 2019
+# Robert Dafis <robertdafis@gmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Muhammad Yusuf <myusuffin@gmail.com>, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: Robert Dafis <robertdafis@gmail.com>, 2019\n"
 "Language-Team: Indonesian (https://www.transifex.com/otf/teams/12694/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -80,7 +80,7 @@ msgstr "Ramban"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Status"
 
@@ -128,7 +128,7 @@ msgstr "Downloads"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -149,7 +149,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Cari"
 
@@ -163,7 +163,7 @@ msgstr "Cari"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -176,7 +176,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -186,6 +186,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -291,7 +292,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Unggah"
 
@@ -304,7 +305,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Berbagi"
 
@@ -353,7 +354,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Simpan"
 
@@ -386,7 +387,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr "Hasil"
 
@@ -415,7 +416,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Kirim"
 
@@ -432,8 +433,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -476,7 +481,7 @@ msgid "Never"
 msgstr "Tidak pernah"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -524,208 +529,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "Bawah"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Unduh"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
+#: src/main/java/com/muwire/webui/Util.java:48
+msgid "Downloaded"
+msgstr "Telah terdonwload"
+
+#: src/main/java/com/muwire/webui/Util.java:49
 msgid "Downloaded Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:48
+#: src/main/java/com/muwire/webui/Util.java:50
 msgid "Downloader"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:49
+#: src/main/java/com/muwire/webui/Util.java:51
 msgid "Downloading"
 msgstr "Mengunduh"
 
-#: src/main/java/com/muwire/webui/Util.java:50
+#: src/main/java/com/muwire/webui/Util.java:52
 msgid "Enter Reason (Optional)"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:51
+#: src/main/java/com/muwire/webui/Util.java:53
 msgid "ETA"
 msgstr "Waktu selesai"
 
-#: src/main/java/com/muwire/webui/Util.java:52
+#: src/main/java/com/muwire/webui/Util.java:54
 msgid "Fetching Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:53
+#: src/main/java/com/muwire/webui/Util.java:55
 msgid "File"
 msgstr "File"
 
-#: src/main/java/com/muwire/webui/Util.java:54
+#: src/main/java/com/muwire/webui/Util.java:56
 msgid "Hashing"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:55
+#: src/main/java/com/muwire/webui/Util.java:57
 msgid "Hide Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:56
+#: src/main/java/com/muwire/webui/Util.java:58
 msgid "Hide Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:57
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Host"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Impor"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr "Sudah diimpor"
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Nama"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr "Besarnya Bagian"
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr "Progress "
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Alasan"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Segarkan"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr "Lanjutkan"
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Coba Lagi"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Ukuran"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Kecepatan"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Negara"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "Langganan"
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
+msgstr "Terpercaya"
+
+#: src/main/java/com/muwire/webui/Util.java:100
 msgid "Trusted User"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:96
+#: src/main/java/com/muwire/webui/Util.java:101
 msgid "Unshare"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:97
+#: src/main/java/com/muwire/webui/Util.java:102
 msgid "Unsubscribe"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:100
+#: src/main/java/com/muwire/webui/Util.java:105
 msgid "User"
 msgstr "Pengguna"
 
-#: src/main/java/com/muwire/webui/Util.java:101
+#: src/main/java/com/muwire/webui/Util.java:106
 msgid "View 1 Certificate"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:102
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_it.po

@@ -8,7 +8,6 @@
 # mkkid <jokjok@hotmail.it>, 2019
 # Dominik Schürmann <dominik@schuermann.eu>, 2019
 # Bad Cluster <badcluster@i2pmail.org>, 2019
-# spawned76 <fswitch20@hotmail.com>, 2019
 # Giovanni Pellerano <giovanni.pellerano@evilaliv3.org>, 2019
 # Stefano Fedele <duaslauros@gmail.com>, 2019
 # erinm, 2019
@@ -24,13 +23,15 @@
 # Paveway noname <paveway80@gmail.com>, 2019
 # Davide Sant <spuuu@outlook.it>, 2019
 # Gio Doro <CyberMatique@protonmail.com>, 2019
+# HostFat <hostfat@gmail.com>, 2019
+# spawned76 <fswitch20@hotmail.com>, 2019
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: I2P MuWire\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-17 17:04+0000\n"
-"Last-Translator: Gio Doro <CyberMatique@protonmail.com>, 2019\n"
+"POT-Creation-Date: 2019-12-19 13:15+0000\n"
+"Last-Translator: spawned76 <fswitch20@hotmail.com>, 2019\n"
 "Language-Team: Italian (https://www.transifex.com/otf/teams/12694/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,7 +91,7 @@ msgstr "Sfoglia"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "Stato"
 
@@ -138,7 +139,7 @@ msgstr "Download"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr "Upload"
 
@@ -159,7 +160,7 @@ msgstr "Upload"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "Cerca"
 
@@ -173,7 +174,7 @@ msgstr "Cerca"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr "File Condivisi"
 
@@ -186,7 +187,7 @@ msgstr "File Condivisi"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr "Fiducia"
 
@@ -196,6 +197,7 @@ msgstr "Fiducia"
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -282,11 +284,11 @@ msgstr "Informazioni"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:225
 msgid "Search in comments"
-msgstr ""
+msgstr "Ricerca nei commenti"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:229
 msgid "Allow browsing"
-msgstr ""
+msgstr "Permetti navicazione"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:235
 msgid "Download retry frequency (seconds)"
@@ -301,7 +303,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "Carica"
 
@@ -314,17 +316,17 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "Condivisione"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:259
 msgid "Share downloaded files"
-msgstr ""
+msgstr "Condividi file scaricati"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:263
 msgid "Share hidden files"
-msgstr ""
+msgstr "Condividi file nascosti"
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:269
 msgid "Allow only trusted connections"
@@ -363,7 +365,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "Salva"
 
@@ -385,7 +387,7 @@ msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:205
 msgid "Group By File"
-msgstr ""
+msgstr "Raggruppa per file"
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:209
 msgid "Active Searches By File"
@@ -396,9 +398,9 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
-msgstr ""
+msgstr "Risultati"
 
 #: build/tmp_jsp/com/muwire/webui/MuWire_jsp.java:122
 msgid "Initial Setup"
@@ -425,7 +427,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "Invia"
 
@@ -442,8 +444,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -486,7 +492,7 @@ msgid "Never"
 msgstr "Mai"
 
 #: 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -514,7 +520,7 @@ msgstr "Certificati"
 
 #: src/main/java/com/muwire/webui/Util.java:38
 msgid "Certified"
-msgstr ""
+msgstr "Certificato"
 
 #: src/main/java/com/muwire/webui/Util.java:39
 msgid "Certify"
@@ -534,208 +540,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "Sotto"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "Download"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr "Destinazione Download"
 
-#: src/main/java/com/muwire/webui/Util.java:47
+#: src/main/java/com/muwire/webui/Util.java:48
+msgid "Downloaded"
+msgstr "Scaricato"
+
+#: src/main/java/com/muwire/webui/Util.java:49
 msgid "Downloaded Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:48
+#: src/main/java/com/muwire/webui/Util.java:50
 msgid "Downloader"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:49
+#: src/main/java/com/muwire/webui/Util.java:51
 msgid "Downloading"
 msgstr "Download"
 
-#: src/main/java/com/muwire/webui/Util.java:50
+#: src/main/java/com/muwire/webui/Util.java:52
 msgid "Enter Reason (Optional)"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:51
+#: src/main/java/com/muwire/webui/Util.java:53
 msgid "ETA"
 msgstr "ETA"
 
-#: src/main/java/com/muwire/webui/Util.java:52
+#: src/main/java/com/muwire/webui/Util.java:54
 msgid "Fetching Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:53
+#: src/main/java/com/muwire/webui/Util.java:55
 msgid "File"
 msgstr "File"
 
-#: src/main/java/com/muwire/webui/Util.java:54
+#: src/main/java/com/muwire/webui/Util.java:56
 msgid "Hashing"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:55
+#: src/main/java/com/muwire/webui/Util.java:57
 msgid "Hide Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:56
+#: src/main/java/com/muwire/webui/Util.java:58
 msgid "Hide Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:57
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "Host"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "Importa"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr "Importato"
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "Nome"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "Pausa"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr "Dimensione pezzo"
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr "Completato"
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "Motivo"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "Ricarica"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr "Riprendi"
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "Riprova"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr "Mittente"
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "Dimensione"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "Velocità"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "Stato"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "Sottoscrivi"
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "Utente"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "Utente"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""

webui/locale/messages_iw.po

@@ -15,7 +15,7 @@ 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: 2019-12-19 13:15+0000\n"
 "Last-Translator: ION, 2019\n"
 "Language-Team: Hebrew (https://www.transifex.com/otf/teams/12694/he/)\n"
 "MIME-Version: 1.0\n"
@@ -76,7 +76,7 @@ msgstr "דפדף"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:93
 msgid "Status"
 msgstr "מעמד"
 
@@ -124,7 +124,7 @@ msgstr "הורדות"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:104
 msgid "Uploads"
 msgstr ""
 
@@ -145,7 +145,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:83
 msgid "Search"
 msgstr "חיפוש"
 
@@ -159,7 +159,7 @@ msgstr "חיפוש"
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:86
 msgid "Shared Files"
 msgstr ""
 
@@ -172,7 +172,7 @@ msgstr ""
 #: 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
+#: src/main/java/com/muwire/webui/Util.java:98
 msgid "Trust"
 msgstr ""
 
@@ -182,6 +182,7 @@ msgstr ""
 #: 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:128
 #: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:181
 #: build/tmp_jsp/com/muwire/webui/Uploads_jsp.java:196
 msgid "Users"
@@ -287,7 +288,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:103
 msgid "Upload"
 msgstr "העלה"
 
@@ -300,7 +301,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:87
 msgid "Sharing"
 msgstr "שיתוף"
 
@@ -349,7 +350,7 @@ msgid "Outbound tunnel quantity"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/ConfigurationPage_jsp.java:303
-#: src/main/java/com/muwire/webui/Util.java:78
+#: src/main/java/com/muwire/webui/Util.java:82
 msgid "Save"
 msgstr "שמור את"
 
@@ -382,7 +383,7 @@ msgid "Group By Sender"
 msgstr ""
 
 #: build/tmp_jsp/com/muwire/webui/Home_jsp.java:251
-#: src/main/java/com/muwire/webui/Util.java:73
+#: src/main/java/com/muwire/webui/Util.java:77
 msgid "Results"
 msgstr ""
 
@@ -411,7 +412,7 @@ 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
+#: src/main/java/com/muwire/webui/Util.java:94
 msgid "Submit"
 msgstr "הגש"
 
@@ -428,8 +429,12 @@ msgstr ""
 msgid "View As Tree"
 msgstr ""
 
-#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:128
-msgid "Trust Users"
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:198
+msgid "Trusted Users"
+msgstr ""
+
+#: build/tmp_jsp/com/muwire/webui/TrustUsers_jsp.java:200
+msgid "Distrusted Users"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/ConfigurationServlet.java:82
@@ -472,7 +477,7 @@ 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:109
 #, java-format
 msgid "{0}% of piece"
 msgstr ""
@@ -520,208 +525,222 @@ msgid "Details for {0}"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:43
-msgid "Distrusted User"
+msgid "Distrusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:44
+msgid "Distrusted User"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:45
 msgid "Down"
 msgstr "למטה"
 
-#: src/main/java/com/muwire/webui/Util.java:45
+#: src/main/java/com/muwire/webui/Util.java:46
 msgid "Download"
 msgstr "הורד"
 
-#: src/main/java/com/muwire/webui/Util.java:46
+#: src/main/java/com/muwire/webui/Util.java:47
 msgid "Download Location"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:47
-msgid "Downloaded Pieces"
-msgstr ""
-
 #: src/main/java/com/muwire/webui/Util.java:48
-msgid "Downloader"
+msgid "Downloaded"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:49
-msgid "Downloading"
-msgstr "הורדה"
+msgid "Downloaded Pieces"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:50
-msgid "Enter Reason (Optional)"
+msgid "Downloader"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:51
-msgid "ETA"
-msgstr ""
+msgid "Downloading"
+msgstr "הורדה"
 
 #: src/main/java/com/muwire/webui/Util.java:52
-msgid "Fetching Certificates"
+msgid "Enter Reason (Optional)"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:53
-msgid "File"
-msgstr "קובץ"
+msgid "ETA"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:54
-msgid "Hashing"
+msgid "Fetching Certificates"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:55
-msgid "Hide Certificates"
-msgstr ""
+msgid "File"
+msgstr "קובץ"
 
 #: src/main/java/com/muwire/webui/Util.java:56
-msgid "Hide Comment"
+msgid "Hashing"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:57
+msgid "Hide Certificates"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:58
+msgid "Hide Comment"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:59
 msgid "Host"
 msgstr "מארח"
 
-#: src/main/java/com/muwire/webui/Util.java:58
+#: src/main/java/com/muwire/webui/Util.java:60
 msgid "Import"
 msgstr "ייבא"
 
-#: src/main/java/com/muwire/webui/Util.java:59
+#: src/main/java/com/muwire/webui/Util.java:61
 msgid "Imported"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:60
+#: src/main/java/com/muwire/webui/Util.java:62
 msgid "Known Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:61
+#: src/main/java/com/muwire/webui/Util.java:63
 msgid "Last Updated"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:62
+#: src/main/java/com/muwire/webui/Util.java:64
 msgid "Mark Distrusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:63
+#: src/main/java/com/muwire/webui/Util.java:65
 msgid "Mark Neutral"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:64
+#: src/main/java/com/muwire/webui/Util.java:66
 msgid "Mark Trusted"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:65
+#: src/main/java/com/muwire/webui/Util.java:67
 msgid "Name"
 msgstr "שם"
 
-#: src/main/java/com/muwire/webui/Util.java:66
+#. verb
+#: src/main/java/com/muwire/webui/Util.java:69
 msgid "Pause"
 msgstr "השהה"
 
-#: src/main/java/com/muwire/webui/Util.java:67
+#: src/main/java/com/muwire/webui/Util.java:70
 msgid "Piece Size"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:68
+#: src/main/java/com/muwire/webui/Util.java:71
 msgid "Progress"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:69
+#: src/main/java/com/muwire/webui/Util.java:72
 msgid "Query"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:70
+#. noun
+#: src/main/java/com/muwire/webui/Util.java:74
 msgid "Reason"
 msgstr "סיבה"
 
-#: src/main/java/com/muwire/webui/Util.java:71
+#: src/main/java/com/muwire/webui/Util.java:75
 msgid "Refresh"
 msgstr "רענן"
 
-#: src/main/java/com/muwire/webui/Util.java:72
+#: src/main/java/com/muwire/webui/Util.java:76
 msgid "Remote Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:74
+#: src/main/java/com/muwire/webui/Util.java:78
 #, java-format
 msgid "Results for {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:75
+#: src/main/java/com/muwire/webui/Util.java:79
 #, java-format
 msgid "Results from {0}"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:76
+#: src/main/java/com/muwire/webui/Util.java:80
 msgid "Resume"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:77
+#: src/main/java/com/muwire/webui/Util.java:81
 msgid "Retry"
 msgstr "נסה שוב"
 
-#: src/main/java/com/muwire/webui/Util.java:80
+#: src/main/java/com/muwire/webui/Util.java:84
 msgid "Sender"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:81
+#: src/main/java/com/muwire/webui/Util.java:85
 msgid "Senders"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:84
+#: src/main/java/com/muwire/webui/Util.java:88
 msgid "Show Comment"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:85
+#: src/main/java/com/muwire/webui/Util.java:89
 msgid "Size"
 msgstr "גודל"
 
-#: src/main/java/com/muwire/webui/Util.java:86
+#: src/main/java/com/muwire/webui/Util.java:90
 msgid "Sources"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:87
+#: src/main/java/com/muwire/webui/Util.java:91
 msgid "Speed"
 msgstr "מהירות"
 
-#: src/main/java/com/muwire/webui/Util.java:88
+#: src/main/java/com/muwire/webui/Util.java:92
 msgid "State"
 msgstr "מדינה"
 
-#: src/main/java/com/muwire/webui/Util.java:91
+#: src/main/java/com/muwire/webui/Util.java:95
 msgid "Subscribe"
 msgstr "הירשם כמנוי"
 
-#: src/main/java/com/muwire/webui/Util.java:92
+#: src/main/java/com/muwire/webui/Util.java:96
 msgid "Subscribed"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:93
+#: src/main/java/com/muwire/webui/Util.java:97
 msgid "Total Pieces"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:95
-msgid "Trusted User"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:96
-msgid "Unshare"
-msgstr ""
-
-#: src/main/java/com/muwire/webui/Util.java:97
-msgid "Unsubscribe"
+#: src/main/java/com/muwire/webui/Util.java:99
+msgid "Trusted"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:100
-msgid "User"
-msgstr "משתמש"
+msgid "Trusted User"
+msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:101
-msgid "View 1 Certificate"
+msgid "Unshare"
 msgstr ""
 
 #: src/main/java/com/muwire/webui/Util.java:102
+msgid "Unsubscribe"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:105
+msgid "User"
+msgstr "משתמש"
+
+#: src/main/java/com/muwire/webui/Util.java:106
+msgid "View 1 Certificate"
+msgstr ""
+
+#: src/main/java/com/muwire/webui/Util.java:107
 #, java-format
 msgid "View {0} Certificates"
 msgstr ""
 
-#: src/main/java/com/muwire/webui/Util.java:103
+#: src/main/java/com/muwire/webui/Util.java:108
 msgid "Your Trust"
 msgstr ""