Improve slogans, app description and text strings

app/src/main/resources/banner.txt

@@ -4,5 +4,5 @@ __   __
  /   \ / _ \ '__/ _ \/ __|
 / /^\ \  __/ | |  __/\__ \
 \/   \/\___|_|  \___||___/
-:: Uncensorable Peer-to-Peer ::
+:: Uncensorable Friend-to-Friend ::
 :: https://xeres.io ::

ui/src/main/java/io/xeres/ui/controller/contact/ContactViewController.java

@@ -420,11 +420,9 @@ private void setupContactTreeTableView()
 		// Then we restore the selection after filteredList has been
 		// updated.
 		filteredList.addListener((ListChangeListener<? super TreeItem<Contact>>) c -> {
-			// XXX: actually, the selection might be relevant! Check if 'c' changes what is currently being selected?
-
 			log.debug("FilteredList changed, actions: {}", c);
 
-			// XXX: if we don't call this, the selection is lost
+			// We must call this otherwise the selection is lost
 			contactTreeTableView.getSelectionModel().select(selectedItem);
 
 			contactListLocked = false;
@@ -894,12 +892,6 @@ private void displayContact(TreeItem<Contact> contact, boolean force)
 			return;
 		}
 
-		// Prevent re-displaying the same contact when a different contact was added
-//		if (displayedContact != null && contact.getValue().equals(displayedContact.getValue()))
-//		{
-//			return;
-//		}
-
 		displayedContact = contact;
 
 		hideBadges();
@@ -1175,8 +1167,6 @@ private void createLocationTableContextMenu()
 			return location != null;
 		});
 		xContextMenu.addToNode(locationTableView);
-
-		// XXX: add connect now?
 	}
 
 	private MenuItem createStateMenuItem(Availability availability)

ui/src/main/resources/i18n/messages.properties

@@ -43,33 +43,35 @@ view=View
 
 trust=Trust
 
+# File Requesters
+
 file-requester.profiles=Profile files
 file-requester.xml=XML files
 file-requester.png=PNG files
 file-requester.images=Image files
 file-requester.save-image-title=Select where to save your image
-
 file-requester.error=Error with file {0}: {1}
 
 # Main
 
 ## Menu
 
-main.menu.add-peer=_Add Peer...
-main.menu.broadcast=_Broadcast...
-main.menu.exit=E_xit
+main.menu.add-peer=Add Peer...
+main.menu.broadcast=Broadcast...
+main.menu.shares=Configure shares
+main.menu.statistics=Show statistics
 
-main.menu.tools=More _tools
-main.menu.tools.web-interface=Web Interface
+main.menu.tools=Tools
+main.menu.tools.import-from-rs=Import friends from Retroshare...
 main.menu.tools.export=Export...
-main.menu.settings=Se_ttings
 
-main.menu.help=_Help
+main.menu.help=Help
+main.menu.help.about=About Xeres
 main.menu.help.documentation=Documentation
 main.menu.help.report-bug=Report bug
-main.menu.help.about=_About Xeres
 
-main.menu.tools.import-from-rs=Import friends from Retroshare...
+main.menu.settings=Settings
+main.menu.exit=Exit
 
 main.friends-import-successful=Friends imported successfully.
 
@@ -83,7 +85,7 @@ main.chats=Chats
 main.forums=Forums
 main.files=Files
 
-main.home.slogan=Uncensorable Peer-to-Peer
+main.home.slogan=Where Friendship Meets Freedom
 main.home.share-id=This is your Xeres ID. Share it with other people.
 main.home.received-id=Did you receive an ID from a peer?
 main.home.add-peer=Add Peer
@@ -111,7 +113,6 @@ main.status.dht.initializing=DHT is currently initializing. This can take a whil
 main.status.dht.running=DHT is working properly, the client's IP address is advertised to its peers.
 main.status.dht.stats=Number of peers: {0,number,integer}\nReceived packets: {1,number,integer} ({2})\nSent packets: {3,number,integer} ({4})\nKey count: {5,number,integer}\nItem count: {6,number,integer}
 
-
 # Account creation
 
 account.profile=Profile
@@ -126,7 +127,7 @@ account.generation.location-keys-and-certificate=Generating location keys and ce
 account.generation.identity=Generating identity...
 account.generation.profile-load=Select a Xeres profile file (xeres_backup.xml), a Retroshare keyring (retroshare_secret_keyring.gpg) or a Retroshare profile (*.asc)
 account.generation.import=Import...
-account.generation.import.tip=You can import two kind of profiles:\n\nA profile exported from Xeres (xeres_backup.xml).\n\nA Retroshare profile (retroshare_secret.keyring.gpg).
+account.generation.import.tip=You can import 3 kind of profiles:\n\nA profile exported from Xeres (xeres_backup.xml).\n\nA Retroshare keyring (retroshare_secret_keyring.gpg) or a profile exported from Retroshare (*.asc).
 account.generation.import.progress=Importing profile...
 account.generation.import.confirm.title=Retroshare Importer
 account.generation.import.confirm.prompt=Enter the Retroshare password
@@ -161,7 +162,7 @@ chat.room.create.window-title=Create Chat Room
 chat.room.create.name.prompt=Short and descriptive name of the room
 chat.room.create.name.tip=Name of the room. Use proper capitalization and spaces.
 chat.room.create.topic.prompt=What the room is about
-chat.room.create.topic.tip=The description of the room, what is it about.
+chat.room.create.topic.tip=The description of the room, what it is about.
 chat.room.create.visibility=Visibility
 chat.room.create.visibility.tip=Public rooms are visible by peers.\nPrivate rooms aren't and work on invitation only.
 chat.room.create.security.checkbox=Signed identities only
@@ -235,7 +236,7 @@ rs-id.add.fingerprint.tip=Cryptographic checksum to certify the authenticity of
 rs-id.add.location=Location ID
 rs-id.add.location.tip=Location identifier. A profile can have several locations and each has a unique ID.
 rs-id.add.addresses=Addresses
-rs-id.add.addresses.tip=Addresses to connect to. They will all be tried in turn, but you can preselect the best one for a faster connection.\nAddresses ending in .onion require using a Tor proxy.\nAddresses ending in .i2p require using an I2P proxy.
+rs-id.add.addresses.tip=Addresses to connect to. They will all be tried in turn, but you can preselect the best one for a faster initial connection.\nAddresses ending in .onion require using a Tor proxy.\nAddresses ending in .i2p require using an I2P proxy.
 rs-id.add.trust.tip=The trust level you have on the peer.\nUnknown: no opinion.\nNever: none or minimal, met online recently.\nMarginal: more or less trustable, acquaintance.\nFull: very trustable, good friend.
 rs-id.add.add=Add
 rs-id.add.no-own=You can't add your own ID
@@ -268,7 +269,7 @@ profiles.delete=Delete profile
 about.window-title=About {0}
 about.version=Version:
 about.title=About
-about.slogan=A Peer-to-Peer (Friend-to-Friend), decentralized, encrypted and secure application designed for communication and sharing
+about.slogan=A Friend-to-Friend, decentralized and secure application for communication and sharing
 about.authors=Authors
 about.author-by=by
 about.all-rights-reserved=All Rights Reserved
@@ -398,9 +399,16 @@ editor.action.preview=Preview the message
 search.main.search=Search
 search.main.downloads=Downloads
 search.main.uploads=Uploads
+search.main.trends=Trends
 
+search.input.prompt=Enter search terms
 search.input.search.tip=Typing several search terms will search files that contain all of them. Use \" around the search terms for an exact match.
 
+trends.none=No trends yet
+trends.list.terms=Terms
+trends.list.from=From
+trends.list.time=Time
+
 download-view.list.none=No downloads
 download-view.list.name=Name
 download-view.list.state=State
@@ -470,10 +478,14 @@ contact-view.search.prompt=Search people
 contact-view.search.show-all=Show all contacts
 contact-view.search.no-contacts=No contacts
 contact-view.avatar.change-image=Change image...
-contact-view.badge.own=This is yourself.
-contact-view.badge.partial=A partial contact is not backed by a full profile yet. It needs to be connected to at least once, then it will be checked and, if successful, promoted to a full profile.
-contact-view.badge.accepted=This contact is accepted for incoming connections and outgoing connections to it are attempted as well.
-contact-view.badge.not-validated=The contact has not been validated yet. Its profile signature will be verified shortly and, if successful, will be marked as valid. If unsuccessful, it will be deleted (but might be transferred again, if so, try to inform its owner about the problem).
+contact-view.badge.own=Own
+contact-view.badge.own.tip=This is yourself.
+contact-view.badge.partial=Partial
+contact-view.badge.partial.tip=A partial contact is not backed by a full profile yet. It needs to be connected to at least once, then it will be checked and, if successful, promoted to a full profile.
+contact-view.badge.accepted=Accepted
+contact-view.badge.accepted.tip=This contact is accepted for incoming connections and outgoing connections to it are attempted as well.
+contact-view.badge.not-validated=Not validated yet
+contact-view.badge.not-validated.tip=The contact has not been validated yet. Its profile signature will be verified shortly and, if successful, will be marked as valid. If unsuccessful, it will be deleted (but might be transferred again, if so, try to inform its owner about the problem).
 contact-view.action.chat=Chat
 contact-view.action.connect=Attempt to connect
 contact-view.information.locations=Locations
@@ -493,7 +505,7 @@ trust-converter.marginal=Marginal trustees
 trust-converter.full=Full trustees
 trust-converter.ultimate=Only myself
 
-# Enums (beware of naming!)
+# Enums (beware of the key naming which must be the same as the class!)
 
 ## Trust
 

ui/src/main/resources/i18n/messages_fr.properties

@@ -965,4 +965,12 @@ enum.country.tor=Tor
 enum.country.i2p=I2P
 # suppress inspection "UnusedProperty"
 enum.country.lan=LAN
+deselect-all=Déselectionner tout
+view=Voir
+trust=Confiance
+main.menu.shares=Configurer les partages
+main.menu.statistics=Montrer les statistiques
+main.menu.tools.import-from-rs=Importer des amis de Retroshare...
+main.friends-import-successful=Les amis ont été importés avec succès.
+main.import-friends=Sélectionnez le fichier amis de Retroshare
 

ui/src/main/resources/view/contact/contactview.fxml

@@ -89,37 +89,37 @@
                     </HBox.margin>
                     <VBox>
                         <Label fx:id="nameLabel" style="-fx-font-size: 2.5em"/>
-                        <Label fx:id="badgeOwn" text="Own" styleClass="accent" managed="false" visible="false">
+                        <Label fx:id="badgeOwn" text="%contact-view.badge.own" styleClass="accent" managed="false" visible="false">
                             <graphic>
                                 <FontIcon iconLiteral="mdi2l-label"/>
                             </graphic>
                             <tooltip>
-                                <Tooltip showDuration="1m" maxWidth="300" wrapText="true" text="%contact-view.badge.own"/>
+                                <Tooltip showDuration="1m" maxWidth="300" wrapText="true" text="%contact-view.badge.own.tip"/>
                             </tooltip>
                         </Label>
-                        <Label fx:id="badgePartial" text="Partial" styleClass="warning" managed="false" visible="false">
+                        <Label fx:id="badgePartial" text="%contact-view.badge.partial" styleClass="warning" managed="false" visible="false">
                             <graphic>
                                 <FontIcon iconLiteral="mdi2l-label"/>
                             </graphic>
                             <tooltip>
-                                <Tooltip showDuration="1m" maxWidth="300" wrapText="true" text="%contact-view.badge.partial"/>
+                                <Tooltip showDuration="1m" maxWidth="300" wrapText="true" text="%contact-view.badge.partial.tip"/>
                             </tooltip>
                         </Label>
-                        <Label fx:id="badgeAccepted" text="Accepted" managed="false" visible="false">
+                        <Label fx:id="badgeAccepted" text="%contact-view.badge.accepted" managed="false" visible="false">
                             <graphic>
                                 <FontIcon iconLiteral="mdi2l-label"/>
                             </graphic>
                             <tooltip>
-                                <Tooltip showDuration="1m" maxWidth="300" wrapText="true" text="%contact-view.badge.accepted"/>
+                                <Tooltip showDuration="1m" maxWidth="300" wrapText="true" text="%contact-view.badge.accepted.tip"/>
                             </tooltip>
                         </Label>
-                        <Label fx:id="badgeUnvalidated" text="Not validated yet" styleClass="warning" managed="false" visible="false">
+                        <Label fx:id="badgeUnvalidated" text="%contact-view.badge.not-validated" styleClass="warning" managed="false" visible="false">
                             <graphic>
                                 <FontIcon iconLiteral="mdi2l-label"/>
                             </graphic>
                             <tooltip>
                                 <Tooltip showDuration="1m" maxWidth="300" wrapText="true"
-                                         text="%contact-view.badge.not-validated"/>
+                                         text="%contact-view.badge.not-validated.tip"/>
                             </tooltip>
                         </Label>
                     </VBox>
@@ -190,7 +190,6 @@
                         </columns>
                     </TableView>
                 </VBox>
-
             </VBox>
         </VBox>
     </SplitPane>

ui/src/main/resources/view/file/main.fxml

@@ -43,7 +43,7 @@
                 </graphic>
                 <fx:include fx:id="fileUploadView" source="upload.fxml"/>
             </Tab>
-            <Tab fx:id="trends" text="Trends">
+            <Tab fx:id="trends" text="%search.main.trends">
                 <graphic>
                     <FontIcon iconLiteral="mdi2t-trending-up"/>
                 </graphic>

ui/src/main/resources/view/file/search.fxml

@@ -28,7 +28,7 @@
     <padding>
         <Insets bottom="4.0" left="4.0" right="4.0" top="4.0"/>
     </padding>
-    <TextField fx:id="search" promptText="Enter file name">
+    <TextField fx:id="search" promptText="%search.input.prompt">
         <tooltip>
             <Tooltip showDuration="1m" maxWidth="300" wrapText="true" text="%search.input.search.tip"/>
         </tooltip>

ui/src/main/resources/view/file/trend.fxml

@@ -33,12 +33,12 @@
             <TableView fx:constant="CONSTRAINED_RESIZE_POLICY_FLEX_LAST_COLUMN"/>
         </columnResizePolicy>
         <placeholder>
-            <Label text="No trends yet"/>
+            <Label text="%trends.none"/>
         </placeholder>
         <columns>
-            <TableColumn fx:id="tableTerms" minWidth="100.0" prefWidth="180.0" text="Terms" sortable="false"/>
-            <TableColumn fx:id="tableFrom" prefWidth="120.0" text="From" sortable="false"/>
-            <TableColumn fx:id="tableTime" prefWidth="100.0" text="Time" sortable="false"/>
+            <TableColumn fx:id="tableTerms" minWidth="100.0" prefWidth="180.0" text="%trends.list.terms" sortable="false"/>
+            <TableColumn fx:id="tableFrom" prefWidth="120.0" text="%trends.list.from" sortable="false"/>
+            <TableColumn fx:id="tableTime" prefWidth="100.0" text="%trends.list.time" sortable="false"/>
         </columns>
     </TableView>
 </VBox>

ui/src/main/resources/view/main.fxml

@@ -150,12 +150,12 @@
                             <FontIcon iconLiteral="mdi2r-radio-tower"/>
                         </graphic>
                     </MenuItem>
-                    <MenuItem fx:id="showSharesWindow" text="Configure shares">
+                    <MenuItem fx:id="showSharesWindow" text="%main.menu.shares">
                         <graphic>
                             <FontIcon iconLiteral="mdi2f-folder-multiple"/>
                         </graphic>
                     </MenuItem>
-                    <MenuItem fx:id="statistics" mnemonicParsing="false" text="Show statistics">
+                    <MenuItem fx:id="statistics" mnemonicParsing="false" text="%main.menu.statistics">
                         <graphic>
                             <FontIcon iconLiteral="mdi2c-chart-line"/>
                         </graphic>
@@ -176,7 +176,7 @@
                         </MenuItem>
                         <SeparatorMenuItem fx:id="debugSeparator" mnemonicParsing="false" visible="false"/>
                         <Menu fx:id="debug" text="_Debug" visible="false">
-                            <MenuItem fx:id="launchWebInterface" mnemonicParsing="false" text="%main.menu.tools.web-interface">
+                            <MenuItem fx:id="launchWebInterface" mnemonicParsing="false" text="Web Interface">
                                 <graphic>
                                     <FontIcon iconLiteral="mdi2w-web"/>
                                 </graphic>