diff --git a/i18n/translation_de.ts b/i18n/translation_de.ts
index 743a717b..c27fa42e 100644
--- a/i18n/translation_de.ts
+++ b/i18n/translation_de.ts
@@ -48,38 +48,35 @@
in die Zwischenablage kopiert
-
+
- Add a peer
-
+
- Create a group
-
+
- Join a group
-
+
Address
-
+
Name
-
-
+
+
Group Name
----------
@@ -87,39 +84,23 @@ Name
-
+
Server
-
+
Invitation
-
+
Address
-
-
-
- Add Peer | Create Group | Join Group
-
-
-
-
-
-
-
-
-
-
-
-
BulletinOverlay
@@ -258,12 +239,12 @@ Name
-
+
-
+
@@ -286,18 +267,18 @@ Name
Klicken, um DM zu senden
-
+
Could not send this message
Nachricht konnte nicht gesendet werden
-
+
bestätigt
-
+
Bestätigung ausstehend
@@ -358,17 +339,17 @@ Name
Ablehnen
-
+
Chat
-
+
Listen
-
+
Meldungen
@@ -380,55 +361,55 @@ Name
PeerSettingsPane
-
+
Adresse
-
+
Kopieren
-
+
notification: copied to clipboard
in die Zwischenablage kopiert
-
+
Angezeigter Name
-
+
speichern
-
-
+
+
Save Peer History
-
+
-
+
-
+
löschen
-
+
@@ -505,6 +486,12 @@ Name
Reenter password
+
+
+
+ Passwords do not match
+
+
@@ -519,7 +506,6 @@ Name
- Passwords do not match
@@ -529,26 +515,26 @@ Name
-
+
Delete Profile
-
-
+
+
Type DELETE to confirm
-
+
Really Delete Profile
-
+
DELETE
@@ -557,7 +543,7 @@ Name
ProfileList
-
+
@@ -576,25 +562,25 @@ Name
-
+
0 profiles loaded with that password
-
+
Your Profiles
-
+
Your Profiles
-
+
Unlock
@@ -613,72 +599,72 @@ Name
Benutzeroberflächen-Zoom (betriftt hauptsächlich Text- und Knopgrößen)
-
+
Language
-
+
-
+
-
+
-
+
-
+
Interface Zoom
-
+
Groß
-
+
Theme
-
+
-
+
-
+
Theme
-
+
Version %1
-
+
Built on: %2
@@ -689,7 +675,7 @@ Name
defaultmäßige Textgröße (Skalierungsfaktor:
-
+
Klein
@@ -697,7 +683,7 @@ Name
SplashPane
-
+
Loading tor...
@@ -706,25 +692,25 @@ Name
Statusbar
-
+
Disconnected from the internet, check your connection
-
+
Attempting to connect to Tor network
-
+
Connecting...
-
+
Online
@@ -733,7 +719,7 @@ Name
main
-
+
New Connection
diff --git a/i18n/translation_en.qm b/i18n/translation_en.qm
index fd89b959..eb00a31c 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 904bb3a1..59a7ed6d 100644
--- a/i18n/translation_en.ts
+++ b/i18n/translation_en.ts
@@ -48,38 +48,35 @@
Copied to Clipboard
-
+
- Add a peer
Add a peer
-
+
- Create a group
Create a group
-
+
- Join a group
Join a group
-
+
Address
Address
-
+
Name
Name
-
-
+
+
Group Name
----------
@@ -87,38 +84,35 @@ Name
Group name
-
+
Server
Server
-
+
Invitation
Invitation
-
+
Address
Address
-
Add Peer | Create Group | Join Group
- Add Peer
+ Add Peer
-
- Create group
+ Create group
-
- Join group
+ Join group
@@ -338,12 +332,12 @@ Right-click to reset.
Search List
-
+
Peer is Offline. Applications cannot be used right now.
-
+
Add Item
@@ -366,18 +360,18 @@ Right-click to reset.
Click to DM
-
+
Could not send this message
Could not send this message
-
+
Acknowledged
-
+
Pending
@@ -438,17 +432,17 @@ Right-click to reset.
Reject
-
+
Chat
-
+
Lists
-
+
Bulletins
@@ -460,50 +454,50 @@ Right-click to reset.
PeerSettingsPane
-
+
Address
-
+
Copy
-
+
notification: copied to clipboard
Copied to Clipboard
-
+
Display Name
-
+
Save
-
+
Block Peer
-
-
+
+
Save Peer History
Save Peer History
-
+
Determines whether or not to delete any history associated with the peer.
-
+
Delete Peer History
@@ -512,7 +506,7 @@ Right-click to reset.
Unblock Peer
-
+
Delete
@@ -611,6 +605,12 @@ Right-click to reset.
Reenter password
Reenter password
+
+
+
+ Passwords do not match
+ Password cannot be empty
+
@@ -625,7 +625,6 @@ Right-click to reset.
- Passwords do not match
Passwords do not match
@@ -635,26 +634,26 @@ Right-click to reset.
Error changing password: Supplied password rejected
-
+
Delete Profile
Delete Profile
-
-
+
+
Type DELETE to confirm
Type DELETE to confirm
-
+
Really Delete Profile
Really Delete Profile
-
+
DELETE
DELETE
@@ -663,7 +662,7 @@ Right-click to reset.
ProfileList
-
+
Add new profile
@@ -682,25 +681,25 @@ Right-click to reset.
Password
-
+
0 profiles loaded with that password
0 profiles loaded with that password
-
+
Your Profiles
Your Profiles
-
+
Your Profiles
Your Servers
-
+
Unlock
Unlock
@@ -728,72 +727,72 @@ Right-click to reset.
Block Unknown Peers
-
+
Language
Language
-
+
English
-
+
Frances
-
+
Portuguesa
-
+
Deutsche
-
+
Interface Zoom
Zoom level
-
+
Large
-
+
Theme
Theme
-
+
Light
-
+
Dark
-
+
Theme
Experiments enabled
-
+
Version %1
Version %1
-
+
Built on: %2
Built on: %2
@@ -804,7 +803,7 @@ Right-click to reset.
Default size text (scale factor:
-
+
Small
@@ -812,7 +811,7 @@ Right-click to reset.
SplashPane
-
+
Loading tor...
Loading tor...
@@ -829,25 +828,25 @@ Right-click to reset.
Statusbar
-
+
Disconnected from the internet, check your connection
Disconnected from the internet, check your connection
-
+
Attempting to connect to Tor network
Attempting to connect to Tor network
-
+
Connecting...
Connecting to network and peers...
-
+
Online
Online
@@ -856,7 +855,7 @@ Right-click to reset.
main
-
+
New Connection
New Connection
diff --git a/i18n/translation_fr.ts b/i18n/translation_fr.ts
index ff072a80..6d65ff5b 100644
--- a/i18n/translation_fr.ts
+++ b/i18n/translation_fr.ts
@@ -48,38 +48,35 @@
Copié dans le presse-papier
-
+
- Add a peer
-
+
- Create a group
-
+
- Join a group
-
+
Address
-
+
Name
-
-
+
+
Group Name
----------
@@ -87,39 +84,23 @@ Name
-
+
Server
-
+
Invitation
-
+
Address
-
-
-
- Add Peer | Create Group | Join Group
-
-
-
-
-
-
-
-
-
-
-
-
BulletinOverlay
@@ -258,12 +239,12 @@ Name
-
+
-
+
@@ -286,18 +267,18 @@ Name
Envoyer un message privé
-
+
Could not send this message
Impossible d'envoyer ce message
-
+
Confirmé
-
+
En attente
@@ -358,17 +339,17 @@ Name
Refuser
-
+
Discuter
-
+
Listes
-
+
Bulletins
@@ -380,55 +361,55 @@ Name
PeerSettingsPane
-
+
Adresse
-
+
Copier
-
+
notification: copied to clipboard
Copié dans le presse-papier
-
+
Pseudo
-
+
Sauvegarder
-
-
+
+
Save Peer History
-
+
-
+
-
+
Effacer
-
+
@@ -505,6 +486,12 @@ Name
Reenter password
+
+
+
+ Passwords do not match
+
+
@@ -519,7 +506,6 @@ Name
- Passwords do not match
@@ -529,26 +515,26 @@ Name
-
+
Delete Profile
-
-
+
+
Type DELETE to confirm
-
+
Really Delete Profile
-
+
DELETE
@@ -557,7 +543,7 @@ Name
ProfileList
-
+
@@ -576,25 +562,25 @@ Name
-
+
0 profiles loaded with that password
-
+
Your Profiles
-
+
Your Profiles
-
+
Unlock
@@ -613,72 +599,72 @@ Name
Interface zoom (essentiellement la taille du texte et des composants de l'interface)
-
+
Language
-
+
-
+
-
+
-
+
-
+
Interface Zoom
-
+
Large
-
+
Theme
-
+
-
+
-
+
Theme
-
+
Version %1
-
+
Built on: %2
@@ -689,7 +675,7 @@ Name
Taille par défaut du texte (échelle:
-
+
Petit
@@ -697,7 +683,7 @@ Name
SplashPane
-
+
Loading tor...
@@ -706,25 +692,25 @@ Name
Statusbar
-
+
Disconnected from the internet, check your connection
-
+
Attempting to connect to Tor network
-
+
Connecting...
-
+
Online
@@ -733,7 +719,7 @@ Name
main
-
+
New Connection
diff --git a/i18n/translation_pt.ts b/i18n/translation_pt.ts
index ab11775a..d18c42f1 100644
--- a/i18n/translation_pt.ts
+++ b/i18n/translation_pt.ts
@@ -48,38 +48,35 @@
Copiado
-
+
- Add a peer
-
+
- Create a group
-
+
- Join a group
-
+
Address
-
+
Name
-
-
+
+
Group Name
----------
@@ -87,39 +84,23 @@ Name
-
+
Server
-
+
Invitation
-
+
Address
-
-
-
- Add Peer | Create Group | Join Group
-
-
-
-
-
-
-
-
-
-
-
-
BulletinOverlay
@@ -258,12 +239,12 @@ Name
-
+
-
+
@@ -286,18 +267,18 @@ Name
Clique para DM
-
+
Could not send this message
Não deu para enviar esta mensagem
-
+
Confirmada
-
+
Pendente
@@ -358,17 +339,17 @@ Name
Recusar
-
+
Chat
-
+
Listas
-
+
Boletins
@@ -380,55 +361,55 @@ Name
PeerSettingsPane
-
+
Endereço
-
+
Copiar
-
+
notification: copied to clipboard
Copiado
-
+
Nome de Exibição
-
+
Salvar
-
-
+
+
Save Peer History
-
+
-
+
-
+
Deletar
-
+
@@ -505,6 +486,12 @@ Name
Reenter password
+
+
+
+ Passwords do not match
+
+
@@ -519,7 +506,6 @@ Name
- Passwords do not match
@@ -529,26 +515,26 @@ Name
-
+
Delete Profile
-
-
+
+
Type DELETE to confirm
-
+
Really Delete Profile
-
+
DELETE
@@ -557,7 +543,7 @@ Name
ProfileList
-
+
@@ -576,25 +562,25 @@ Name
-
+
0 profiles loaded with that password
-
+
Your Profiles
-
+
Your Profiles
-
+
Unlock
@@ -613,72 +599,72 @@ Name
Zoom da interface (afeta principalmente tamanho de texto e botões)
-
+
Language
-
+
-
+
-
+
-
+
-
+
Interface Zoom
-
+
Grande
-
+
Theme
-
+
-
+
-
+
Theme
-
+
Version %1
-
+
Built on: %2
@@ -689,7 +675,7 @@ Name
Texto tamanho padrão (fator de escala:
-
+
Pequeno
@@ -697,7 +683,7 @@ Name
SplashPane
-
+
Loading tor...
@@ -706,25 +692,25 @@ Name
Statusbar
-
+
Disconnected from the internet, check your connection
-
+
Attempting to connect to Tor network
-
+
Connecting...
-
+
Online
@@ -733,7 +719,7 @@ Name
main
-
+
New Connection
diff --git a/qml/main.qml b/qml/main.qml
index b2c17069..6678e9b2 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -129,12 +129,18 @@ ApplicationWindow {
onBack: { backFn() }
onRightMenu: {
+ // If a group is selected....
if (gcd.selectedConversation.length == 32) {
theStack.pane = theStack.groupProfilePane
gcd.requestGroupSettings(gcd.selectedConversation)
} else {
- theStack.pane = theStack.userProfilePane
- gcd.requestPeerSettings(gcd.selectedConversation)
+ // if a peer is selected..
+ if (theStack.pane == theStack.userProfilePane) {
+ theStack.pane = theStack.messagePane
+ } else {
+ theStack.pane = theStack.userProfilePane
+ gcd.requestPeerSettings(gcd.selectedConversation)
+ }
}
}
}
diff --git a/qml/panes/PeerSettingsPane.qml b/qml/panes/PeerSettingsPane.qml
index 95a9349f..d83260d5 100644
--- a/qml/panes/PeerSettingsPane.qml
+++ b/qml/panes/PeerSettingsPane.qml
@@ -60,7 +60,14 @@ Opaque.SettingsList { // settingsPane
onClicked: {
gcd.savePeerSettings(txtOnion.text, txtDisplayName.text)
toolbar.setTitle(txtDisplayName.text)
+
+ // FIXME this is kind of a hack as ideally we could just update the peer name
+ // and have that change broadcast to each message - but there isn't an easy way to do that
+ // with our current message model setup. As such we simply reset and reload the message pane
+ gcd.broadcast("ResetMessagePane")
theStack.pane = theStack.messagePane
+ mm.setHandle(txtOnion.text)
+ gcd.loadMessagesPane(txtOnion.text)
}
}
}
diff --git a/qml/panes/ProfileAddEditPane.qml b/qml/panes/ProfileAddEditPane.qml
index dd949e50..180f2c0e 100644
--- a/qml/panes/ProfileAddEditPane.qml
+++ b/qml/panes/ProfileAddEditPane.qml
@@ -348,7 +348,7 @@ Opaque.Flickable {
size: Theme.secondaryTextSize
//: Passwords do not match
- text: qsTr("password-error-match")
+ text: txtPassword1.text.length == 0 ? qsTr("password-error-empty") : qsTr("password-error-match")
visible: false
color: Theme.textfieldErrorColor
}
@@ -376,7 +376,8 @@ Opaque.Flickable {
onClicked: {
reset_errors()
if (mode == mode_add) {
- if (txtPassword1.text != txtPassword2.text) {
+
+ if (radioUsePassword.checked && ((txtPassword1.text != txtPassword2.text) || txtPassword1.text.length == 0)) {
passwordErrorLabel.visible = true
txtPassword1.error = true
txtPassword2.error = true
@@ -386,17 +387,15 @@ Opaque.Flickable {
parentStack.pane = parentStack.managementPane
}
} else {
- console.log("Save clicked")
gcd.updateNick(onion, txtProfileName.text)
if (changingPassword) {
- console.log("changingPassword")
- if (txtPassword1.text != txtPassword2.text) {
+ // Don't allow an empty password
+ if (txtPassword1.text != txtPassword2.text || textPassword1.text.length() > 0) {
passwordErrorLabel.visible = true
txtPassword1.error = true
txtPassword2.error = true
} else {
- console.log("gcd.changePassword")
gcd.changePassword(onion, txtCurrentPassword.text, txtPassword1.text, radioNoPassword.checked)
}
} else {