diff --git a/go/handlers/appHandler.go b/go/handlers/appHandler.go
index b6bb9869..f598903c 100644
--- a/go/handlers/appHandler.go
+++ b/go/handlers/appHandler.go
@@ -73,7 +73,7 @@ func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts
 					initialProfileLoad = false
 					gcd.Loaded()
 				} else {
-					gcd.ErrorLoaded0()
+					gcd.InvokePopup("0-profiles")
 				}
 			}
 
diff --git a/go/ui/gcd.go b/go/ui/gcd.go
index 3d6ae68e..31206650 100644
--- a/go/ui/gcd.go
+++ b/go/ui/gcd.go
@@ -60,7 +60,6 @@ type GrandCentralDispatcher struct {
 	// profile management stuff
 	_ func()                                                                `signal:"Loaded"`
 	_ func(handle, displayname, image, tag string, unread int, online bool) `signal:"AddProfile"`
-	_ func()                                                                `signal:"ErrorLoaded0"`
 	_ func()                                                                `signal:"ResetProfile"`
 	_ func()                                                                `signal:"ResetProfileList"`
 	_ func(failed bool)                                                     `signal:"ChangePasswordResponse"`
diff --git a/i18n/translation_de.ts b/i18n/translation_de.ts
index 1c49f66a..f69f9f63 100644
--- a/i18n/translation_de.ts
+++ b/i18n/translation_de.ts
@@ -81,19 +81,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="152"/>
+        <location filename="../qml/panes/AddPeerGroupPane.qml" line="150"/>
         <source>server</source>
         <extracomment>Server</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="161"/>
-        <source>invitation</source>
-        <extracomment>Invitation</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="183"/>
+        <location filename="../qml/panes/AddPeerGroupPane.qml" line="177"/>
         <source>group-addr</source>
         <extracomment>Address</extracomment>
         <translation type="unfinished"></translation>
@@ -122,19 +116,19 @@
 <context>
     <name>ChatOverlay</name>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="75"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="69"/>
         <source>chat-history-default</source>
         <extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="77"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="71"/>
         <source>chat-history-disabled</source>
         <extracomment>Message history is disabled.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="79"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="73"/>
         <source>chat-history-enabled</source>
         <extracomment>Message history is enabled.</extracomment>
         <translation type="unfinished"></translation>
@@ -148,7 +142,7 @@
         <translation type="obsolete">Adresse hier hinzufügen, um einen Kontakt aufzunehmen</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/ContactList.qml" line="240"/>
+        <location filename="../qml/widgets/ContactList.qml" line="252"/>
         <source>blocked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -561,7 +555,7 @@
 <context>
     <name>ProfileList</name>
     <message>
-        <location filename="../qml/widgets/ProfileList.qml" line="114"/>
+        <location filename="../qml/widgets/ProfileList.qml" line="116"/>
         <source>add-new-profile-btn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -580,19 +574,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="78"/>
-        <source>error-0-profiles-loaded-for-password</source>
-        <extracomment>0 profiles loaded with that password</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="119"/>
+        <location filename="../qml/panes/ProfileManagerPane.qml" line="117"/>
         <source>your-profiles</source>
         <extracomment>Your Profiles</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="148"/>
+        <location filename="../qml/panes/ProfileManagerPane.qml" line="146"/>
         <source>your-servers</source>
         <extracomment>Your Profiles</extracomment>
         <translation type="unfinished"></translation>
@@ -752,5 +740,11 @@
         <extracomment>New Connection</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qml/main.qml" line="398"/>
+        <source>error-0-profiles-loaded-for-password</source>
+        <extracomment>0 profiles loaded with that password</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/translation_en.qm b/i18n/translation_en.qm
index bc4dbdc6..3bcd5684 100644
Binary files a/i18n/translation_en.qm and b/i18n/translation_en.qm differ
diff --git a/i18n/translation_en.ts b/i18n/translation_en.ts
index 7606e16f..f6167b17 100644
--- a/i18n/translation_en.ts
+++ b/i18n/translation_en.ts
@@ -81,19 +81,18 @@
         <translation>Group name</translation>
     </message>
     <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="152"/>
+        <location filename="../qml/panes/AddPeerGroupPane.qml" line="150"/>
         <source>server</source>
         <extracomment>Server</extracomment>
         <translation>Server</translation>
     </message>
     <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="161"/>
         <source>invitation</source>
         <extracomment>Invitation</extracomment>
-        <translation>Invitation</translation>
+        <translation type="vanished">Invitation</translation>
     </message>
     <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="183"/>
+        <location filename="../qml/panes/AddPeerGroupPane.qml" line="177"/>
         <source>group-addr</source>
         <extracomment>Address</extracomment>
         <translation>Address</translation>
@@ -135,19 +134,19 @@
 <context>
     <name>ChatOverlay</name>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="75"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="69"/>
         <source>chat-history-default</source>
         <extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
         <translation>Your history with this peer is ephemeral and will not be saved. If you would like to save history, please go to settings and turn it on.</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="77"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="71"/>
         <source>chat-history-disabled</source>
         <extracomment>Message history is disabled.</extracomment>
         <translation>Message history is disabled.</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="79"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="73"/>
         <source>chat-history-enabled</source>
         <extracomment>Message history is enabled.</extracomment>
         <translation>Message history is enabled.</translation>
@@ -161,7 +160,7 @@
         <translation type="vanished">... paste an address here to add a contact...</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/ContactList.qml" line="240"/>
+        <location filename="../qml/widgets/ContactList.qml" line="252"/>
         <source>blocked</source>
         <translation>Blocked</translation>
     </message>
@@ -680,7 +679,7 @@ Right-click to reset.</translation>
 <context>
     <name>ProfileList</name>
     <message>
-        <location filename="../qml/widgets/ProfileList.qml" line="114"/>
+        <location filename="../qml/widgets/ProfileList.qml" line="116"/>
         <source>add-new-profile-btn</source>
         <translation>Add new profile</translation>
     </message>
@@ -699,19 +698,18 @@ Right-click to reset.</translation>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="78"/>
         <source>error-0-profiles-loaded-for-password</source>
         <extracomment>0 profiles loaded with that password</extracomment>
-        <translation>0 profiles loaded with that password</translation>
+        <translation type="vanished">0 profiles loaded with that password</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="119"/>
+        <location filename="../qml/panes/ProfileManagerPane.qml" line="117"/>
         <source>your-profiles</source>
         <extracomment>Your Profiles</extracomment>
         <translation>Your Profiles</translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="148"/>
+        <location filename="../qml/panes/ProfileManagerPane.qml" line="146"/>
         <source>your-servers</source>
         <extracomment>Your Profiles</extracomment>
         <translation>Your Servers</translation>
@@ -893,5 +891,11 @@ Right-click to reset.</translation>
         <extracomment>New Connection</extracomment>
         <translation>New Connection</translation>
     </message>
+    <message>
+        <location filename="../qml/main.qml" line="398"/>
+        <source>error-0-profiles-loaded-for-password</source>
+        <extracomment>0 profiles loaded with that password</extracomment>
+        <translation>0 profiles loaded with that password</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/translation_es.qm b/i18n/translation_es.qm
index 7207bbfb..fea63b99 100644
Binary files a/i18n/translation_es.qm and b/i18n/translation_es.qm differ
diff --git a/i18n/translation_es.ts b/i18n/translation_es.ts
index 5a4a52f9..2e5db596 100644
--- a/i18n/translation_es.ts
+++ b/i18n/translation_es.ts
@@ -75,7 +75,7 @@
     <message>
         <source>invitation</source>
         <extracomment>Invitation</extracomment>
-        <translation>Invitación</translation>
+        <translation type="vanished">Invitación</translation>
     </message>
     <message>
         <source>group-addr</source>
@@ -557,7 +557,7 @@
     <message>
         <source>error-0-profiles-loaded-for-password</source>
         <extracomment>0 profiles loaded with that password</extracomment>
-        <translation>0 perfiles cargados con esa contraseña</translation>
+        <translation type="vanished">0 perfiles cargados con esa contraseña</translation>
     </message>
     <message>
         <source>your-profiles</source>
@@ -717,5 +717,10 @@
         <extracomment>New Connection</extracomment>
         <translation>Nueva conexión</translation>
     </message>
+    <message>
+        <source>error-0-profiles-loaded-for-password</source>
+        <extracomment>0 profiles loaded with that password</extracomment>
+        <translation>0 perfiles cargados con esa contraseña</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/translation_fr.ts b/i18n/translation_fr.ts
index 7d18891b..fd1ec94e 100644
--- a/i18n/translation_fr.ts
+++ b/i18n/translation_fr.ts
@@ -81,19 +81,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="152"/>
+        <location filename="../qml/panes/AddPeerGroupPane.qml" line="150"/>
         <source>server</source>
         <extracomment>Server</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="161"/>
-        <source>invitation</source>
-        <extracomment>Invitation</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="183"/>
+        <location filename="../qml/panes/AddPeerGroupPane.qml" line="177"/>
         <source>group-addr</source>
         <extracomment>Address</extracomment>
         <translation type="unfinished"></translation>
@@ -122,19 +116,19 @@
 <context>
     <name>ChatOverlay</name>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="75"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="69"/>
         <source>chat-history-default</source>
         <extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="77"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="71"/>
         <source>chat-history-disabled</source>
         <extracomment>Message history is disabled.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="79"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="73"/>
         <source>chat-history-enabled</source>
         <extracomment>Message history is enabled.</extracomment>
         <translation type="unfinished"></translation>
@@ -148,7 +142,7 @@
         <translation type="obsolete">... coller une adresse ici pour ajouter un contact...</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/ContactList.qml" line="240"/>
+        <location filename="../qml/widgets/ContactList.qml" line="252"/>
         <source>blocked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -561,7 +555,7 @@
 <context>
     <name>ProfileList</name>
     <message>
-        <location filename="../qml/widgets/ProfileList.qml" line="114"/>
+        <location filename="../qml/widgets/ProfileList.qml" line="116"/>
         <source>add-new-profile-btn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -580,19 +574,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="78"/>
-        <source>error-0-profiles-loaded-for-password</source>
-        <extracomment>0 profiles loaded with that password</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="119"/>
+        <location filename="../qml/panes/ProfileManagerPane.qml" line="117"/>
         <source>your-profiles</source>
         <extracomment>Your Profiles</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="148"/>
+        <location filename="../qml/panes/ProfileManagerPane.qml" line="146"/>
         <source>your-servers</source>
         <extracomment>Your Profiles</extracomment>
         <translation type="unfinished"></translation>
@@ -752,5 +740,11 @@
         <extracomment>New Connection</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qml/main.qml" line="398"/>
+        <source>error-0-profiles-loaded-for-password</source>
+        <extracomment>0 profiles loaded with that password</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/translation_it.qm b/i18n/translation_it.qm
index e23dfed4..bb3d2f57 100644
Binary files a/i18n/translation_it.qm and b/i18n/translation_it.qm differ
diff --git a/i18n/translation_it.ts b/i18n/translation_it.ts
index 520b5821..bd1e4da2 100644
--- a/i18n/translation_it.ts
+++ b/i18n/translation_it.ts
@@ -1,654 +1,730 @@
-<!DOCTYPE TS><TS version="2.1" language="it">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="it">
 <context>
-	<name>AddGroupPane</name>
-	<message>
-		<source>create-group-title</source>
-		<translation>Crea un gruppo</translation>
-	</message>
-	<message>
-		<source>server-label</source>
-		<translation>Server</translation>
-	</message>
-	<message>
-		<source>group-name-label</source>
-		<translation>Nome del gruppo</translation>
-	</message>
-	<message>
-		<source>default-group-name</source>
-		<translation>Gruppo fantastico</translation>
-	</message>
-	<message>
-		<source>create-group-btn</source>
-		<translation>Crea</translation>
-	</message>
+    <name>AddGroupPane</name>
+    <message>
+        <source>create-group-title</source>
+        <translation type="vanished">Crea un gruppo</translation>
+    </message>
+    <message>
+        <source>server-label</source>
+        <translation type="vanished">Server</translation>
+    </message>
+    <message>
+        <source>group-name-label</source>
+        <translation type="vanished">Nome del gruppo</translation>
+    </message>
+    <message>
+        <source>default-group-name</source>
+        <translation type="vanished">Gruppo fantastico</translation>
+    </message>
+    <message>
+        <source>create-group-btn</source>
+        <translation type="vanished">Crea</translation>
+    </message>
 </context>
 <context>
-	<name>AddPeerGroupPane</name>
-	<message>
-		<source>profile-oniblon-label</source>
-		<translation>Inviare questo indirizzo ai peer con cui si desidera connettersi</translation>
-	</message>
-	<message>
-		<source>copy-btn</source>
-		<translation>Copia</translation>
-	</message>
-	<message>
-		<source>copied-to-clipboard-notification</source>
-		<translation>Copiato negli Appunti</translation>
-	</message>
-	<message>
-		<source>add-peer-tab</source>
-		<translation>Aggiungi un peer</translation>
-	</message>
-	<message>
-		<source>create-group-tab</source>
-		<translation>Crea un gruppo</translation>
-	</message>
-	<message>
-		<source>join-group-tab</source>
-		<translation>Unisciti a un gruppo</translation>
-	</message>
-	<message>
-		<source>peer-address</source>
-		<translation>Indirizzo</translation>
-	</message>
-	<message>
-		<source>peer-name</source>
-		<translation>Nome</translation>
-	</message>
-	<message>
-		<source>group-name</source>
-		<translation>Nome del gruppo</translation>
-	</message>
-	<message>
-		<source>server</source>
-		<translation>Server</translation>
-	</message>
-	<message>
-		<source>invitation</source>
-		<translation>Invito</translation>
-	</message>
-	<message>
-		<source>group-addr</source>
-		<translation>Indirizzo</translation>
-	</message>
-	<message>
-		<source>add-peer</source>
-		<translation>Aggiungi peer</translation>
-	</message>
-	<message>
-		<source>create-group</source>
-		<translation>Crea un gruppo</translation>
-	</message>
-	<message>
-		<source>join-group</source>
-		<translation>Unisciti al gruppo</translation>
-	</message>
+    <name>AddPeerGroupPane</name>
+    <message>
+        <source>profile-oniblon-label</source>
+        <extracomment>Send this address to peers you want to connect with</extracomment>
+        <translation>Inviare questo indirizzo ai peer con cui si desidera connettersi</translation>
+    </message>
+    <message>
+        <source>copy-btn</source>
+        <translation>Copia</translation>
+    </message>
+    <message>
+        <source>copied-to-clipboard-notification</source>
+        <extracomment>notification: copied to clipboard</extracomment>
+        <translation>Copiato negli Appunti</translation>
+    </message>
+    <message>
+        <source>add-peer-tab</source>
+        <translation>Aggiungi un peer</translation>
+    </message>
+    <message>
+        <source>create-group-tab</source>
+        <translation>Crea un gruppo</translation>
+    </message>
+    <message>
+        <source>join-group-tab</source>
+        <translation>Unisciti a un gruppo</translation>
+    </message>
+    <message>
+        <source>peer-address</source>
+        <extracomment>Address</extracomment>
+        <translation>Indirizzo</translation>
+    </message>
+    <message>
+        <source>peer-name</source>
+        <extracomment>Name</extracomment>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>group-name</source>
+        <extracomment>Group Name</extracomment>
+        <translation>Nome del gruppo</translation>
+    </message>
+    <message>
+        <source>server</source>
+        <extracomment>Server</extracomment>
+        <translation>Server</translation>
+    </message>
+    <message>
+        <source>invitation</source>
+        <translation type="vanished">Invito</translation>
+    </message>
+    <message>
+        <source>group-addr</source>
+        <extracomment>Address</extracomment>
+        <translation>Indirizzo</translation>
+    </message>
+    <message>
+        <source>add-peer</source>
+        <translation type="vanished">Aggiungi peer</translation>
+    </message>
+    <message>
+        <source>create-group</source>
+        <translation type="vanished">Crea un gruppo</translation>
+    </message>
+    <message>
+        <source>join-group</source>
+        <translation type="vanished">Unisciti al gruppo</translation>
+    </message>
 </context>
 <context>
-	<name>BulletinOverlay</name>
-	<message>
-		<source>new-bulletin-label</source>
-		<translation>Nuovo bollettino</translation>
-	</message>
-	<message>
-		<source>post-new-bulletin-label</source>
-		<translation>Pubblica un nuovo bollettino</translation>
-	</message>
-	<message>
-		<source>title-placeholder</source>
-		<translation>titolo...</translation>
-	</message>
+    <name>BulletinOverlay</name>
+    <message>
+        <source>new-bulletin-label</source>
+        <translation>Nuovo bollettino</translation>
+    </message>
+    <message>
+        <source>post-new-bulletin-label</source>
+        <extracomment>Post a new Bulletin Post</extracomment>
+        <translation>Pubblica un nuovo bollettino</translation>
+    </message>
+    <message>
+        <source>title-placeholder</source>
+        <extracomment>title place holder text</extracomment>
+        <translation>titolo...</translation>
+    </message>
 </context>
 <context>
-	<name>ContactList</name>
-	<message>
-		<source>paste-address-to-add-contact</source>
-		<translation>... incolla qui un indirizzo per aggiungere un contatto...</translation>
-	</message>
-	<message>
-		<source>blocked</source>
-		<translation>Bloccato</translation>
-	</message>
+    <name>ChatOverlay</name>
+    <message>
+        <source>chat-history-default</source>
+        <extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>chat-history-disabled</source>
+        <extracomment>Message history is disabled.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>chat-history-enabled</source>
+        <extracomment>Message history is enabled.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-	<name>EmojiDrawer</name>
-	<message>
-		<source>cycle-cats-android</source>
-		<translation>Fare clic per scorrere le categorie.
+    <name>ContactList</name>
+    <message>
+        <source>paste-address-to-add-contact</source>
+        <translation type="vanished">... incolla qui un indirizzo per aggiungere un contatto...</translation>
+    </message>
+    <message>
+        <source>blocked</source>
+        <translation>Bloccato</translation>
+    </message>
+</context>
+<context>
+    <name>EmojiDrawer</name>
+    <message>
+        <source>cycle-cats-android</source>
+        <translation type="vanished">Fare clic per scorrere le categorie.
 Pressione lunga per resettare.</translation>
-	</message>
-	<message>
-		<source>cycle-cats-desktop</source>
-		<translation>Fare clic per scorrere le categorie.
+    </message>
+    <message>
+        <source>cycle-cats-desktop</source>
+        <translation type="vanished">Fare clic per scorrere le categorie.
 Cliccare con il tasto destro per resettare.</translation>
-	</message>
-	<message>
-		<source>cycle-morphs-android</source>
-		<translation>Fare clic per scorrere i morph.
+    </message>
+    <message>
+        <source>cycle-morphs-android</source>
+        <translation type="vanished">Fare clic per scorrere i morph.
 Pressione lunga per resettare.</translation>
-	</message>
-	<message>
-		<source>cycle-morphs-desktop</source>
-		<translation>Fare clic per scorrere i morph.
+    </message>
+    <message>
+        <source>cycle-morphs-desktop</source>
+        <translation type="vanished">Fare clic per scorrere i morph.
 Cliccare con il tasto destro per resettare.</translation>
-	</message>
-	<message>
-		<source>cycle-colours-android</source>
-		<translation>Fare clic per scorrere i colori.
+    </message>
+    <message>
+        <source>cycle-colours-android</source>
+        <translation type="vanished">Fare clic per scorrere i colori.
 Pressione lunga per resettare.</translation>
-	</message>
-	<message>
-		<source>cycle-colours-desktop</source>
-		<translation>Fare clic per scorrere i colori.
+    </message>
+    <message>
+        <source>cycle-colours-desktop</source>
+        <translation type="vanished">Fare clic per scorrere i colori.
 Cliccare con il tasto destro per resettare.</translation>
-	</message>
-	<message>
-		<source>search</source>
-		<translation>Ricerca...</translation>
-	</message>
+    </message>
+    <message>
+        <source>search</source>
+        <translation type="vanished">Ricerca...</translation>
+    </message>
 </context>
 <context>
-	<name>GroupSettingsPane</name>
-	<message>
-		<source>server-label</source>
-		<translation>Server</translation>
-	</message>
-	<message>
-		<source>copy-btn</source>
-		<translation>Copia</translation>
-	</message>
-	<message>
-		<source>copied-to-clipboard-notification</source>
-		<translation>Copiato negli Appunti</translation>
-	</message>
-	<message>
-		<source>invitation-label</source>
-		<translation>Invito</translation>
-	</message>
-	<message>
-		<source>server-info</source>
-		<translation>Informazioni sul server</translation>
-	</message>
-	<message>
-		<source>server-connectivity-connected</source>
-		<translation>Server connesso</translation>
-	</message>
-	<message>
-		<source>server-connectivity-disconnected</source>
-		<translation>Server disconnesso</translation>
-	</message>
-	<message>
-		<source>server-synced</source>
-		<translation>Sincronizzato</translation>
-	</message>
-	<message>
-		<source>server-not-synced</source>
-		<translation>Non sincronizzato</translation>
-	</message>
-	<message>
-		<source>view-server-info</source>
-		<translation>Informazioni sul server</translation>
-	</message>
-	<message>
-		<source>group-name-label</source>
-		<translation>Nome del gruppo</translation>
-	</message>
-	<message>
-		<source>save-btn</source>
-		<translation>Salva</translation>
-	</message>
-	<message>
-		<source>invite-to-group-label</source>
-		<translation>Invitare nel gruppo</translation>
-	</message>
-	<message>
-		<source>invite-btn</source>
-		<translation>Invitare</translation>
-	</message>
-	<message>
-		<source>delete-btn</source>
-		<translation>Elimina</translation>
-	</message>
+    <name>GroupSettingsPane</name>
+    <message>
+        <source>server-label</source>
+        <translation>Server</translation>
+    </message>
+    <message>
+        <source>copy-btn</source>
+        <translation>Copia</translation>
+    </message>
+    <message>
+        <source>copied-to-clipboard-notification</source>
+        <extracomment>notification: copied to clipboard</extracomment>
+        <translation>Copiato negli Appunti</translation>
+    </message>
+    <message>
+        <source>invitation-label</source>
+        <translation>Invito</translation>
+    </message>
+    <message>
+        <source>server-info</source>
+        <translation>Informazioni sul server</translation>
+    </message>
+    <message>
+        <source>server-connectivity-connected</source>
+        <translation>Server connesso</translation>
+    </message>
+    <message>
+        <source>server-connectivity-disconnected</source>
+        <translation>Server disconnesso</translation>
+    </message>
+    <message>
+        <source>server-synced</source>
+        <translation>Sincronizzato</translation>
+    </message>
+    <message>
+        <source>server-not-synced</source>
+        <translation>Non sincronizzato</translation>
+    </message>
+    <message>
+        <source>view-server-info</source>
+        <translation>Informazioni sul server</translation>
+    </message>
+    <message>
+        <source>group-name-label</source>
+        <translation>Nome del gruppo</translation>
+    </message>
+    <message>
+        <source>save-btn</source>
+        <translation>Salva</translation>
+    </message>
+    <message>
+        <source>invite-to-group-label</source>
+        <translation type="vanished">Invitare nel gruppo</translation>
+    </message>
+    <message>
+        <source>invite-btn</source>
+        <translation type="vanished">Invitare</translation>
+    </message>
+    <message>
+        <source>delete-btn</source>
+        <translation>Elimina</translation>
+    </message>
 </context>
 <context>
-	<name>InplaceEditText</name>
-	<message>
-		<source>Update</source>
-		<translation>Aggiornamento</translation>
-	</message>
+    <name>InplaceEditText</name>
+    <message>
+        <source>Update</source>
+        <translation type="vanished">Aggiornamento</translation>
+    </message>
 </context>
 <context>
-	<name>ListOverlay</name>
-	<message>
-		<source>search-list</source>
-		<translation>Cerca nella lista</translation>
-	</message>
-	<message>
-		<source>peer-not-online</source>
-		<translation>Il peer è offline. Le applicazioni non possono essere utilizzate in questo momento.</translation>
-	</message>
-	<message>
-		<source>add-list-item-btn</source>
-		<translation>Aggiungi elemento</translation>
-	</message>
-	<message>
-		<source>add-list-item</source>
-		<translation>Aggiungi un nuovo elemento alla lista</translation>
-	</message>
-	<message>
-		<source>add-new-item</source>
-		<translation>Aggiungi un nuovo elemento alla lista</translation>
-	</message>
-	<message>
-		<source>todo-placeholder</source>
-		<translation>Da fare...</translation>
-	</message>
+    <name>ListOverlay</name>
+    <message>
+        <source>search-list</source>
+        <extracomment>ex: &quot;Find...&quot;</extracomment>
+        <translation>Cerca nella lista</translation>
+    </message>
+    <message>
+        <source>peer-not-online</source>
+        <translation>Il peer è offline. Le applicazioni non possono essere utilizzate in questo momento.</translation>
+    </message>
+    <message>
+        <source>add-list-item-btn</source>
+        <translation>Aggiungi elemento</translation>
+    </message>
+    <message>
+        <source>add-list-item</source>
+        <translation type="vanished">Aggiungi un nuovo elemento alla lista</translation>
+    </message>
+    <message>
+        <source>add-new-item</source>
+        <translation type="vanished">Aggiungi un nuovo elemento alla lista</translation>
+    </message>
+    <message>
+        <source>todo-placeholder</source>
+        <translation type="vanished">Da fare...</translation>
+    </message>
 </context>
 <context>
-	<name>MembershipOverlay</name>
-	<message>
-		<source>membership-description</source>
-		<translation>Di seguito è riportato un elenco di utenti che hanno inviato messaggi al gruppo. Questo elenco potrebbe non corrispondere a tutti gli utenti che hanno accesso al gruppo.</translation>
-	</message>
+    <name>MembershipOverlay</name>
+    <message>
+        <source>membership-description</source>
+        <extracomment>Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.</extracomment>
+        <translation>Di seguito è riportato un elenco di utenti che hanno inviato messaggi al gruppo. Questo elenco potrebbe non corrispondere a tutti gli utenti che hanno accesso al gruppo.</translation>
+    </message>
 </context>
 <context>
-	<name>Message</name>
-	<message>
-		<source>dm-tooltip</source>
-		<translation>Clicca per inviare un Messagio Diretto</translation>
-	</message>
-	<message>
-		<source>could-not-send-msg-error</source>
-		<translation>Impossibile inviare questo messaggio</translation>
-	</message>
-	<message>
-		<source>acknowledged-label</source>
-		<translation>Riconosciuto</translation>
-	</message>
-	<message>
-		<source>pending-label</source>
-		<translation>In corso</translation>
-	</message>
+    <name>Message</name>
+    <message>
+        <source>dm-tooltip</source>
+        <extracomment>Click to DM</extracomment>
+        <translation>Clicca per inviare un Messagio Diretto</translation>
+    </message>
+    <message>
+        <source>could-not-send-msg-error</source>
+        <extracomment>Could not send this message</extracomment>
+        <translation>Impossibile inviare questo messaggio</translation>
+    </message>
+    <message>
+        <source>acknowledged-label</source>
+        <translation>Riconosciuto</translation>
+    </message>
+    <message>
+        <source>pending-label</source>
+        <translation>In corso</translation>
+    </message>
 </context>
 <context>
-	<name>MessageEditor</name>
-	<message>
-		<source>peer-blocked-message</source>
-		<translation>Il peer è bloccato</translation>
-	</message>
-	<message>
-		<source>peer-offline-message</source>
-		<translation>Il peer è offline, i messaggi non possono essere recapitati in questo momento</translation>
-	</message>
+    <name>MessageEditor</name>
+    <message>
+        <source>peer-blocked-message</source>
+        <extracomment>Peer is blocked</extracomment>
+        <translation>Il peer è bloccato</translation>
+    </message>
+    <message>
+        <source>peer-offline-message</source>
+        <extracomment>Peer is offline, messages can&apos;t be delivered right now</extracomment>
+        <translation>Il peer è offline, i messaggi non possono essere recapitati in questo momento</translation>
+    </message>
 </context>
 <context>
-	<name>MyProfile</name>
-	<message>
-		<source>copy-btn</source>
-		<translation>Copia</translation>
-	</message>
-	<message>
-		<source>copied-clipboard-notification</source>
-		<translation>Copiato negli Appunti</translation>
-	</message>
-	<message>
-		<source>new-group-btn</source>
-		<translation>Crea un nuovo gruppo</translation>
-	</message>
-	<message>
-		<source>paste-address-to-add-contact</source>
-		<translation>... incolla qui un indirizzo per aggiungere un contatto ...</translation>
-	</message>
+    <name>MyProfile</name>
+    <message>
+        <source>copy-btn</source>
+        <translation type="vanished">Copia</translation>
+    </message>
+    <message>
+        <source>copied-clipboard-notification</source>
+        <translation type="vanished">Copiato negli Appunti</translation>
+    </message>
+    <message>
+        <source>new-group-btn</source>
+        <translation type="vanished">Crea un nuovo gruppo</translation>
+    </message>
+    <message>
+        <source>paste-address-to-add-contact</source>
+        <translation type="vanished">... incolla qui un indirizzo per aggiungere un contatto ...</translation>
+    </message>
 </context>
 <context>
-	<name>OverlayPane</name>
-	<message>
-		<source>accept-group-invite-label</source>
-		<translation>Vuoi accettare l&apos;invito a</translation>
-	</message>
-	<message>
-		<source>accept-group-btn</source>
-		<translation>Accetta</translation>
-	</message>
-	<message>
-		<source>reject-group-btn</source>
-		<translation>Rifiuta</translation>
-	</message>
-	<message>
-		<source>chat-btn</source>
-		<translation>Chat</translation>
-	</message>
-	<message>
-		<source>lists-btn</source>
-		<translation>Liste</translation>
-	</message>
-	<message>
-		<source>bulletins-btn</source>
-		<translation>Bollettini</translation>
-	</message>
-	<message>
-		<source>puzzle-game-btn</source>
-		<translation>Gioco di puzzle</translation>
-	</message>
+    <name>OverlayPane</name>
+    <message>
+        <source>accept-group-invite-label</source>
+        <translation type="vanished">Vuoi accettare l&apos;invito a</translation>
+    </message>
+    <message>
+        <source>accept-group-btn</source>
+        <translation type="vanished">Accetta</translation>
+    </message>
+    <message>
+        <source>reject-group-btn</source>
+        <translation type="vanished">Rifiuta</translation>
+    </message>
+    <message>
+        <source>chat-btn</source>
+        <translation>Chat</translation>
+    </message>
+    <message>
+        <source>lists-btn</source>
+        <translation>Liste</translation>
+    </message>
+    <message>
+        <source>bulletins-btn</source>
+        <translation>Bollettini</translation>
+    </message>
+    <message>
+        <source>puzzle-game-btn</source>
+        <translation type="vanished">Gioco di puzzle</translation>
+    </message>
 </context>
 <context>
-	<name>PeerSettingsPane</name>
-	<message>
-		<source>address-label</source>
-		<translation>Indirizzo</translation>
-	</message>
-	<message>
-		<source>copy-btn</source>
-		<translation>Copia</translation>
-	</message>
-	<message>
-		<source>copied-to-clipboard-notification</source>
-		<translation>Copiato negli Appunti</translation>
-	</message>
-	<message>
-		<source>display-name-label</source>
-		<translation>Nome visualizzato</translation>
-	</message>
-	<message>
-		<source>save-btn</source>
-		<translation>Salva</translation>
-	</message>
-	<message>
-		<source>block-btn</source>
-		<translation>Blocca il peer</translation>
-	</message>
-	<message>
-		<source>save-peer-history</source>
-		<translation>Salva cronologia peer</translation>
-	</message>
-	<message>
-		<source>save-peer-history-description</source>
-		<translation>Determina se eliminare o meno ogni cronologia eventualmente associata al peer.</translation>
-	</message>
-	<message>
-		<source>dont-save-peer-history</source>
-		<translation>Elimina cronologia dei peer</translation>
-	</message>
-	<message>
-		<source>unblock-btn</source>
-		<translation>Sblocca il peer</translation>
-	</message>
-	<message>
-		<source>delete-btn</source>
-		<translation>Elimina</translation>
-	</message>
+    <name>PeerSettingsPane</name>
+    <message>
+        <source>address-label</source>
+        <translation>Indirizzo</translation>
+    </message>
+    <message>
+        <source>copy-btn</source>
+        <translation>Copia</translation>
+    </message>
+    <message>
+        <source>copied-to-clipboard-notification</source>
+        <extracomment>notification: copied to clipboard</extracomment>
+        <translation>Copiato negli Appunti</translation>
+    </message>
+    <message>
+        <source>display-name-label</source>
+        <translation>Nome visualizzato</translation>
+    </message>
+    <message>
+        <source>save-btn</source>
+        <translation>Salva</translation>
+    </message>
+    <message>
+        <source>block-btn</source>
+        <translation>Blocca il peer</translation>
+    </message>
+    <message>
+        <source>save-peer-history</source>
+        <extracomment>Save Peer History</extracomment>
+        <translation>Salva cronologia peer</translation>
+    </message>
+    <message>
+        <source>save-peer-history-description</source>
+        <translation>Determina se eliminare o meno ogni cronologia eventualmente associata al peer.</translation>
+    </message>
+    <message>
+        <source>dont-save-peer-history</source>
+        <translation>Elimina cronologia dei peer</translation>
+    </message>
+    <message>
+        <source>unblock-btn</source>
+        <translation type="vanished">Sblocca il peer</translation>
+    </message>
+    <message>
+        <source>delete-btn</source>
+        <translation>Elimina</translation>
+    </message>
 </context>
 <context>
-	<name>ProfileAddEditPane</name>
-	<message>
-		<source>add-profile-title</source>
-		<translation>Aggiungi nuovo profilo</translation>
-	</message>
-	<message>
-		<source>edit-profile-title</source>
-		<translation>Modifica profilo</translation>
-	</message>
-	<message>
-		<source>profile-name</source>
-		<translation>Nome visualizzato</translation>
-	</message>
-	<message>
-		<source>default-profile-name</source>
-		<translation>Alice</translation>
-	</message>
-	<message>
-		<source>new-profile</source>
-		<translation>Nuovo profilo</translation>
-	</message>
-	<message>
-		<source>edit-profile</source>
-		<translation>Modifica profilo</translation>
-	</message>
-	<message>
-		<source>profile-onion-label</source>
-		<translation>Inviare questo indirizzo ai peer con cui si desidera connettersi</translation>
-	</message>
-	<message>
-		<source>copy-btn</source>
-		<translation>Copia</translation>
-	</message>
-	<message>
-		<source>copied-to-clipboard-notification</source>
-		<translation>Copiato negli appunti</translation>
-	</message>
-	<message>
-		<source>radio-use-password</source>
-		<translation>Password</translation>
-	</message>
-	<message>
-		<source>radio-no-password</source>
-		<translation>Non criptato (senza password)</translation>
-	</message>
-	<message>
-		<source>no-password-warning</source>
-		<translation>Non utilizzare una password su questo account significa che tutti i dati archiviati localmente non verranno criptati</translation>
-	</message>
-	<message>
-		<source>profile-oniblon-label</source>
-		<translation>Inviare questo indirizzo ai peer con cui si desidera connettersi</translation>
-	</message>
-	<message>
-		<source>your-display-name</source>
-		<translation>Il tuo nome visualizzato</translation>
-	</message>
-	<message>
-		<source>current-password-label</source>
-		<translation>Password corrente</translation>
-	</message>
-	<message>
-		<source>password1-label</source>
-		<translation>Password</translation>
-	</message>
-	<message>
-		<source>password2-label</source>
-		<translation>Reinserire la password</translation>
-	</message>
-	<message>
-		<source>password-error-empty</source>
-		<translation>La password non può essere vuota</translation>
-	</message>
-	<message>
-		<source>create-profile-btn</source>
-		<translation>Crea un profilo</translation>
-	</message>
-	<message>
-		<source>save-profile-btn</source>
-		<translation>Salva il profilo</translation>
-	</message>
-	<message>
-		<source>password-error-match</source>
-		<translation>Le password non corrispondono</translation>
-	</message>
-	<message>
-		<source>password-change-error</source>
-		<translation>Errore durante la modifica della password: password fornita rifiutata</translation>
-	</message>
-	<message>
-		<source>delete-profile-btn</source>
-		<translation>Elimina profilo</translation>
-	</message>
-	<message>
-		<source>delete-confirm-label</source>
-		<translation>Digita ELIMINA per confermare</translation>
-	</message>
-	<message>
-		<source>delete-profile-confirm-btn</source>
-		<translation>Elimina realmente il profilo</translation>
-	</message>
-	<message>
-		<source>delete-confirm-text</source>
-		<translation>ELIMINA</translation>
-	</message>
+    <name>ProfileAddEditPane</name>
+    <message>
+        <source>add-profile-title</source>
+        <translation type="vanished">Aggiungi nuovo profilo</translation>
+    </message>
+    <message>
+        <source>edit-profile-title</source>
+        <translation type="vanished">Modifica profilo</translation>
+    </message>
+    <message>
+        <source>profile-name</source>
+        <translation type="vanished">Nome visualizzato</translation>
+    </message>
+    <message>
+        <source>default-profile-name</source>
+        <translation type="vanished">Alice</translation>
+    </message>
+    <message>
+        <source>new-profile</source>
+        <extracomment>New Profile || Edit Profile</extracomment>
+        <translation>Nuovo profilo</translation>
+    </message>
+    <message>
+        <source>edit-profile</source>
+        <translation>Modifica profilo</translation>
+    </message>
+    <message>
+        <source>profile-onion-label</source>
+        <translation type="vanished">Inviare questo indirizzo ai peer con cui si desidera connettersi</translation>
+    </message>
+    <message>
+        <source>copy-btn</source>
+        <translation>Copia</translation>
+    </message>
+    <message>
+        <source>copied-to-clipboard-notification</source>
+        <extracomment>notification: copied to clipboard</extracomment>
+        <translation>Copiato negli appunti</translation>
+    </message>
+    <message>
+        <source>radio-use-password</source>
+        <extracomment>Password</extracomment>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>radio-no-password</source>
+        <extracomment>Unencrypted (No password)</extracomment>
+        <translation>Non criptato (senza password)</translation>
+    </message>
+    <message>
+        <source>no-password-warning</source>
+        <extracomment>Not using a password on this account means that all data stored locally will not be encrypted</extracomment>
+        <translation>Non utilizzare una password su questo account significa che tutti i dati archiviati localmente non verranno criptati</translation>
+    </message>
+    <message>
+        <source>profile-oniblon-label</source>
+        <extracomment>Send this address to peers you want to connect with</extracomment>
+        <translation>Inviare questo indirizzo ai peer con cui si desidera connettersi</translation>
+    </message>
+    <message>
+        <source>your-display-name</source>
+        <extracomment>Your Display Name</extracomment>
+        <translation>Il tuo nome visualizzato</translation>
+    </message>
+    <message>
+        <source>current-password-label</source>
+        <extracomment>Current Password</extracomment>
+        <translation>Password corrente</translation>
+    </message>
+    <message>
+        <source>password1-label</source>
+        <extracomment>Password</extracomment>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>password2-label</source>
+        <extracomment>Reenter password</extracomment>
+        <translation>Reinserire la password</translation>
+    </message>
+    <message>
+        <source>password-error-empty</source>
+        <extracomment>Passwords do not match</extracomment>
+        <translation>La password non può essere vuota</translation>
+    </message>
+    <message>
+        <source>create-profile-btn</source>
+        <extracomment>Create || Save</extracomment>
+        <translation>Crea un profilo</translation>
+    </message>
+    <message>
+        <source>save-profile-btn</source>
+        <translation>Salva il profilo</translation>
+    </message>
+    <message>
+        <source>password-error-match</source>
+        <translation>Le password non corrispondono</translation>
+    </message>
+    <message>
+        <source>password-change-error</source>
+        <extracomment>Error changing password: Supplied password rejected</extracomment>
+        <translation>Errore durante la modifica della password: password fornita rifiutata</translation>
+    </message>
+    <message>
+        <source>delete-profile-btn</source>
+        <extracomment>Delete Profile</extracomment>
+        <translation>Elimina profilo</translation>
+    </message>
+    <message>
+        <source>delete-confirm-label</source>
+        <extracomment>Type DELETE to confirm</extracomment>
+        <translation>Digita ELIMINA per confermare</translation>
+    </message>
+    <message>
+        <source>delete-profile-confirm-btn</source>
+        <extracomment>Really Delete Profile</extracomment>
+        <translation>Elimina realmente il profilo</translation>
+    </message>
+    <message>
+        <source>delete-confirm-text</source>
+        <extracomment>DELETE</extracomment>
+        <translation>ELIMINA</translation>
+    </message>
 </context>
 <context>
-	<name>ProfileList</name>
-	<message>
-		<source>add-new-profile-btn</source>
-		<translation>Aggiungi nuovo profilo</translation>
-	</message>
+    <name>ProfileList</name>
+    <message>
+        <source>add-new-profile-btn</source>
+        <translation>Aggiungi nuovo profilo</translation>
+    </message>
 </context>
 <context>
-	<name>ProfileManagerPane</name>
-	<message>
-		<source>enter-profile-password</source>
-		<translation>Inserisci una password per visualizzare i tuoi profili</translation>
-	</message>
-	<message>
-		<source>password</source>
-		<translation>Password</translation>
-	</message>
-	<message>
-		<source>error-0-profiles-loaded-for-password</source>
-		<translation>0 profili caricati con quella password</translation>
-	</message>
-	<message>
-		<source>your-profiles</source>
-		<translation>I tuoi profili</translation>
-	</message>
-	<message>
-		<source>your-servers</source>
-		<translation>I tuoi server</translation>
-	</message>
-	<message>
-		<source>unlock</source>
-		<translation>Sblocca</translation>
-	</message>
+    <name>ProfileManagerPane</name>
+    <message>
+        <source>enter-profile-password</source>
+        <extracomment>Enter a password to view your profiles</extracomment>
+        <translation>Inserisci una password per visualizzare i tuoi profili</translation>
+    </message>
+    <message>
+        <source>password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>error-0-profiles-loaded-for-password</source>
+        <translation type="vanished">0 profili caricati con quella password</translation>
+    </message>
+    <message>
+        <source>your-profiles</source>
+        <extracomment>Your Profiles</extracomment>
+        <translation>I tuoi profili</translation>
+    </message>
+    <message>
+        <source>your-servers</source>
+        <extracomment>Your Profiles</extracomment>
+        <translation>I tuoi server</translation>
+    </message>
+    <message>
+        <source>unlock</source>
+        <extracomment>Unlock</extracomment>
+        <translation>Sblocca</translation>
+    </message>
 </context>
 <context>
-	<name>SettingsPane</name>
-	<message>
-		<source>cwtch-settings-title</source>
-		<translation>Impostazioni di Cwtch</translation>
-	</message>
-	<message>
-		<source>version %1 builddate %2</source>
-		<translation>Versione: %1 Costruito il: %2</translation>
-	</message>
-	<message>
-		<source>zoom-label</source>
-		<translation>Zoom dell&apos;interfaccia (influisce principalmente sulle dimensioni del testo e dei pulsanti)</translation>
-	</message>
-	<message>
-		<source>block-unknown-label</source>
-		<translation>Blocca peer sconosciuti</translation>
-	</message>
-	<message>
-		<source>setting-language</source>
-		<translation>Lingua</translation>
-	</message>
-	<message>
-		<source>locale-en</source>
-		<translation>Inglese</translation>
-	</message>
-	<message>
-		<source>locale-fr</source>
-		<translation>Francese</translation>
-	</message>
-	<message>
-		<source>locale-pt</source>
-		<translation>Portoghese</translation>
-	</message>
-	<message>
-		<source>locale-de</source>
-		<translation>Tedesco</translation>
-	</message>
-	<message>
-		<source>setting-interface-zoom</source>
-		<translation>Livello di zoom</translation>
-	</message>
-	<message>
-		<source>large-text-label</source>
-		<translation>Grande</translation>
-	</message>
-	<message>
-		<source>setting-theme</source>
-		<translation>Tema</translation>
-	</message>
-	<message>
-		<source>theme-light</source>
-		<translation>Chiaro</translation>
-	</message>
-	<message>
-		<source>theme-dark</source>
-		<translation>Scuro</translation>
-	</message>
-	<message>
-		<source>experiments-enabled</source>
-		<translation>Esperimenti abilitati</translation>
-	</message>
-	<message>
-		<source>version %1 tor %2</source>
-		<translation>Versione %1 con tor %2</translation>
-	</message>
-	<message>
-		<source>version %1</source>
-		<translation>Versione %1</translation>
-	</message>
-	<message>
-		<source>builddate %2</source>
-		<translation>Costruito il: %2</translation>
-	</message>
-	<message>
-		<source>default-scaling-text</source>
-		<translation>Testo di dimensioni predefinite (fattore di scala:</translation>
-	</message>
-	<message>
-		<source>small-text-label</source>
-		<translation>Piccolo</translation>
-	</message>
-	<message>
-		<source>locale-es</source>
-		<translation>Spagnolo</translation>
-	</message>
-	<message>
-		<source>locale-it</source>
-		<translation>Italiano</translation>
-	</message>
+    <name>SettingsPane</name>
+    <message>
+        <source>cwtch-settings-title</source>
+        <translation type="vanished">Impostazioni di Cwtch</translation>
+    </message>
+    <message>
+        <source>version %1 builddate %2</source>
+        <translation type="vanished">Versione: %1 Costruito il: %2</translation>
+    </message>
+    <message>
+        <source>zoom-label</source>
+        <translation type="vanished">Zoom dell&apos;interfaccia (influisce principalmente sulle dimensioni del testo e dei pulsanti)</translation>
+    </message>
+    <message>
+        <source>block-unknown-label</source>
+        <translation type="vanished">Blocca peer sconosciuti</translation>
+    </message>
+    <message>
+        <source>setting-language</source>
+        <extracomment>Language</extracomment>
+        <translation>Lingua</translation>
+    </message>
+    <message>
+        <source>locale-en</source>
+        <translation>Inglese</translation>
+    </message>
+    <message>
+        <source>locale-fr</source>
+        <translation>Francese</translation>
+    </message>
+    <message>
+        <source>locale-pt</source>
+        <translation>Portoghese</translation>
+    </message>
+    <message>
+        <source>locale-de</source>
+        <translation>Tedesco</translation>
+    </message>
+    <message>
+        <source>setting-interface-zoom</source>
+        <extracomment>Interface Zoom</extracomment>
+        <translation>Livello di zoom</translation>
+    </message>
+    <message>
+        <source>large-text-label</source>
+        <translation>Grande</translation>
+    </message>
+    <message>
+        <source>setting-theme</source>
+        <extracomment>Theme</extracomment>
+        <translation>Tema</translation>
+    </message>
+    <message>
+        <source>theme-light</source>
+        <translation>Chiaro</translation>
+    </message>
+    <message>
+        <source>theme-dark</source>
+        <translation>Scuro</translation>
+    </message>
+    <message>
+        <source>experiments-enabled</source>
+        <extracomment>Theme</extracomment>
+        <translation>Esperimenti abilitati</translation>
+    </message>
+    <message>
+        <source>version %1 tor %2</source>
+        <extracomment>Version %1 with tor %2</extracomment>
+        <translation>Versione %1 con tor %2</translation>
+    </message>
+    <message>
+        <source>version %1</source>
+        <translation type="vanished">Versione %1</translation>
+    </message>
+    <message>
+        <source>builddate %2</source>
+        <extracomment>Built on: %2</extracomment>
+        <translation>Costruito il: %2</translation>
+    </message>
+    <message>
+        <source>default-scaling-text</source>
+        <translation type="vanished">Testo di dimensioni predefinite (fattore di scala:</translation>
+    </message>
+    <message>
+        <source>small-text-label</source>
+        <translation>Piccolo</translation>
+    </message>
+    <message>
+        <source>locale-es</source>
+        <translation>Spagnolo</translation>
+    </message>
+    <message>
+        <source>locale-it</source>
+        <translation>Italiano</translation>
+    </message>
 </context>
 <context>
-	<name>SplashPane</name>
-	<message>
-		<source>loading-tor</source>
-		<translation>Caricamento di tor...</translation>
-	</message>
+    <name>SplashPane</name>
+    <message>
+        <source>loading-tor</source>
+        <extracomment>Loading tor...</extracomment>
+        <translation>Caricamento di tor...</translation>
+    </message>
 </context>
 <context>
-	<name>StackToolbar</name>
-	<message>
-		<source>view-group-membership-tooltip</source>
-		<translation>Visualizza i membri del gruppo</translation>
-	</message>
+    <name>StackToolbar</name>
+    <message>
+        <source>view-group-membership-tooltip</source>
+        <translation type="vanished">Visualizza i membri del gruppo</translation>
+    </message>
 </context>
 <context>
-	<name>Statusbar</name>
-	<message>
-		<source>network-status-disconnected</source>
-		<translation>Disconnesso da Internet, controlla la tua connessione</translation>
-	</message>
-	<message>
-		<source>network-status-attempting-tor</source>
-		<translation>Tentativo di connessione alla rete Tor</translation>
-	</message>
-	<message>
-		<source>network-status-connecting</source>
-		<translation>Connessione alla rete e ai peer ...</translation>
-	</message>
-	<message>
-		<source>network-status-online</source>
-		<translation>Online</translation>
-	</message>
+    <name>Statusbar</name>
+    <message>
+        <source>network-status-disconnected</source>
+        <extracomment>Disconnected from the internet, check your connection</extracomment>
+        <translation>Disconnesso da Internet, controlla la tua connessione</translation>
+    </message>
+    <message>
+        <source>network-status-attempting-tor</source>
+        <extracomment>Attempting to connect to Tor network</extracomment>
+        <translation>Tentativo di connessione alla rete Tor</translation>
+    </message>
+    <message>
+        <source>network-status-connecting</source>
+        <extracomment>Connecting...</extracomment>
+        <translation>Connessione alla rete e ai peer ...</translation>
+    </message>
+    <message>
+        <source>network-status-online</source>
+        <extracomment>Online</extracomment>
+        <translation>Online</translation>
+    </message>
 </context>
 <context>
-	<name>main</name>
-	<message>
-		<source>new-connection-pane-title</source>
-		<translation>Nuova connessione</translation>
-	</message>
+    <name>main</name>
+    <message>
+        <source>new-connection-pane-title</source>
+        <extracomment>New Connection</extracomment>
+        <translation>Nuova connessione</translation>
+    </message>
+    <message>
+        <source>error-0-profiles-loaded-for-password</source>
+        <extracomment>0 profiles loaded with that password</extracomment>
+        <translation>0 profili caricati con quella password</translation>
+    </message>
 </context>
 </TS>
diff --git a/i18n/translation_pt.ts b/i18n/translation_pt.ts
index 2d52e119..e93a2316 100644
--- a/i18n/translation_pt.ts
+++ b/i18n/translation_pt.ts
@@ -81,19 +81,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="152"/>
+        <location filename="../qml/panes/AddPeerGroupPane.qml" line="150"/>
         <source>server</source>
         <extracomment>Server</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="161"/>
-        <source>invitation</source>
-        <extracomment>Invitation</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="183"/>
+        <location filename="../qml/panes/AddPeerGroupPane.qml" line="177"/>
         <source>group-addr</source>
         <extracomment>Address</extracomment>
         <translation type="unfinished"></translation>
@@ -122,19 +116,19 @@
 <context>
     <name>ChatOverlay</name>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="75"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="69"/>
         <source>chat-history-default</source>
         <extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="77"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="71"/>
         <source>chat-history-disabled</source>
         <extracomment>Message history is disabled.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="79"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="73"/>
         <source>chat-history-enabled</source>
         <extracomment>Message history is enabled.</extracomment>
         <translation type="unfinished"></translation>
@@ -148,7 +142,7 @@
         <translation type="obsolete">… cole um endereço aqui para adicionar um contato…</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/ContactList.qml" line="240"/>
+        <location filename="../qml/widgets/ContactList.qml" line="252"/>
         <source>blocked</source>
         <translation type="unfinished"></translation>
     </message>
@@ -561,7 +555,7 @@
 <context>
     <name>ProfileList</name>
     <message>
-        <location filename="../qml/widgets/ProfileList.qml" line="114"/>
+        <location filename="../qml/widgets/ProfileList.qml" line="116"/>
         <source>add-new-profile-btn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -580,19 +574,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="78"/>
-        <source>error-0-profiles-loaded-for-password</source>
-        <extracomment>0 profiles loaded with that password</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="119"/>
+        <location filename="../qml/panes/ProfileManagerPane.qml" line="117"/>
         <source>your-profiles</source>
         <extracomment>Your Profiles</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/ProfileManagerPane.qml" line="148"/>
+        <location filename="../qml/panes/ProfileManagerPane.qml" line="146"/>
         <source>your-servers</source>
         <extracomment>Your Profiles</extracomment>
         <translation type="unfinished"></translation>
@@ -752,5 +740,11 @@
         <extracomment>New Connection</extracomment>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../qml/main.qml" line="398"/>
+        <source>error-0-profiles-loaded-for-password</source>
+        <extracomment>0 profiles loaded with that password</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>
diff --git a/qml/main.qml b/qml/main.qml
index a2a6f6a2..f51aa1f0 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -391,6 +391,13 @@ ApplicationWindow {
         radius: 15
         visible: false
 
+        // We store error messages in QML referenced by an ID so they can be called from go
+        // and the qupdate / qml i18n system can easily find and translate them here
+        property var errorMessages: (new Map([
+            //: 0 profiles loaded with that password
+            ["0-profiles", qsTr("error-0-profiles-loaded-for-password")],
+        ]))
+
 
         Label {
             id: lblPopup
@@ -401,12 +408,13 @@ ApplicationWindow {
         }
     }
 
-
-
     Connections { // POPUPS ARE INVOKED BY GO FUNCS
         target: gcd
 
         onInvokePopup: function(str) {
+            if (popup.errorMessages.get(str) != undefined) {
+                str = popup.errorMessages.get(str)
+            }
             lblPopup.text = str
             popup.opacity = 0.5
             popup.visible = true
diff --git a/qml/panes/ProfileAddEditPane.qml b/qml/panes/ProfileAddEditPane.qml
index 180f2c0e..f929234b 100644
--- a/qml/panes/ProfileAddEditPane.qml
+++ b/qml/panes/ProfileAddEditPane.qml
@@ -134,11 +134,16 @@ Opaque.Flickable {
                     performTransform: true
                     overlayColor: Theme.portraitProfileBadgeTextColor
 
-                    badgeContent: Image {// Profle Type
+                    badgeContent: Opaque.Icon {// Profle Type
                         id: profiletype
-                        source: radioUsePassword.checked ? gcd.assetPath + "core/lock-24px.webp" : gcd.assetPath + "core/lock-open-24px.webp"
+                        source: radioUsePassword.checked ? gcd.assetPath + "core/lock-24px.webp" : gcd.assetPath + "core/lock_open-24px.webp"
+
                         height: 40 * gcd.themeScale
                         width: height
+
+                        iconColor: Theme.defaultButtonTextColor
+                        backgroundColor: portrait.badgeColor
+                        hilightBackgroundColor: portrait.badgeColor
                     }
                 }
 
diff --git a/qml/panes/ProfileManagerPane.qml b/qml/panes/ProfileManagerPane.qml
index f21ff010..a6f3e741 100644
--- a/qml/panes/ProfileManagerPane.qml
+++ b/qml/panes/ProfileManagerPane.qml
@@ -65,7 +65,6 @@ ColumnLayout {
             onClicked: {
                 gcd.unlockProfiles(txtPassword.text)
                 txtPassword.text = ""
-                error.visible = false
             }
         }
     }
@@ -74,8 +73,7 @@ ColumnLayout {
         id: error
         Layout.alignment: Qt.AlignHCenter
         color: Theme.textfieldErrorColor
-        //: 0 profiles loaded with that password
-        text: qsTr("error-0-profiles-loaded-for-password")
+
         visible: false
     }