Merge pull request 'Various Fixes from User Feedback' (#422) from emoji into master
the build was successful Details

Reviewed-on: #422
This commit is contained in:
Dan Ballard 2020-11-26 15:05:27 -08:00
commit d5e81e9ae3
8 changed files with 283 additions and 314 deletions

View File

@ -48,38 +48,35 @@
<translation type="unfinished">in die Zwischenablage kopiert</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="91"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>add-peer-tab</source>
<extracomment>Add a peer</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="108"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>create-group-tab</source>
<extracomment>Create a group</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="125"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>join-group-tab</source>
<extracomment>Join a group</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="162"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="107"/>
<source>peer-address</source>
<extracomment>Address</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="174"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="119"/>
<source>peer-name</source>
<extracomment>Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="195"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="251"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="140"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="196"/>
<source>group-name</source>
<extracomment>Group Name
----------
@ -87,39 +84,23 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="207"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="152"/>
<source>server</source>
<extracomment>Server</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="216"/>
<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="238"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="183"/>
<source>group-addr</source>
<extracomment>Address</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>add-peer</source>
<extracomment>Add Peer | Create Group | Join Group</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>create-group</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>join-group</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BulletinOverlay</name>
@ -258,12 +239,12 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/overlays/ListOverlay.qml" line="62"/>
<location filename="../qml/overlays/ListOverlay.qml" line="63"/>
<source>peer-not-online</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/overlays/ListOverlay.qml" line="200"/>
<location filename="../qml/overlays/ListOverlay.qml" line="201"/>
<source>add-list-item-btn</source>
<translation type="unfinished"></translation>
</message>
@ -286,18 +267,18 @@ Name</extracomment>
<translation>Klicken, um DM zu senden</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>could-not-send-msg-error</source>
<extracomment>Could not send this message</extracomment>
<translation>Nachricht konnte nicht gesendet werden</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>acknowledged-label</source>
<translation>bestätigt</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>pending-label</source>
<translation>Bestätigung ausstehend</translation>
</message>
@ -358,17 +339,17 @@ Name</extracomment>
<translation type="vanished">Ablehnen</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="35"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>chat-btn</source>
<translation>Chat</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="49"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>lists-btn</source>
<translation>Listen</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="63"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>bulletins-btn</source>
<translation>Meldungen</translation>
</message>
@ -380,55 +361,55 @@ Name</extracomment>
<context>
<name>PeerSettingsPane</name>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="28"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
<source>address-label</source>
<translation>Adresse</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="38"/>
<source>copy-btn</source>
<translation>Kopieren</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="37"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="42"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation>in die Zwischenablage kopiert</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="49"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="54"/>
<source>display-name-label</source>
<translation>Angezeigter Name</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="58"/>
<source>save-btn</source>
<translation>speichern</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="102"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="112"/>
<source>save-peer-history</source>
<extracomment>Save Peer History</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="91"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="103"/>
<source>save-peer-history-description</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="111"/>
<source>dont-save-peer-history</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="121"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="133"/>
<source>delete-btn</source>
<translation>löschen</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="65"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="77"/>
<source>block-btn</source>
<translation type="unfinished"></translation>
</message>
@ -505,6 +486,12 @@ Name</extracomment>
<extracomment>Reenter password</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="351"/>
<source>password-error-empty</source>
<extracomment>Passwords do not match</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="374"/>
<source>create-profile-btn</source>
@ -519,7 +506,6 @@ Name</extracomment>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="351"/>
<source>password-error-match</source>
<extracomment>Passwords do not match</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -529,26 +515,26 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="419"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="418"/>
<source>delete-profile-btn</source>
<extracomment>Delete Profile</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="438"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="451"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="437"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="450"/>
<source>delete-confirm-label</source>
<extracomment>Type DELETE to confirm</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="462"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="461"/>
<source>delete-profile-confirm-btn</source>
<extracomment>Really Delete Profile</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="467"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="466"/>
<source>delete-confirm-text</source>
<extracomment>DELETE</extracomment>
<translation type="unfinished"></translation>
@ -557,7 +543,7 @@ Name</extracomment>
<context>
<name>ProfileList</name>
<message>
<location filename="../qml/widgets/ProfileList.qml" line="102"/>
<location filename="../qml/widgets/ProfileList.qml" line="114"/>
<source>add-new-profile-btn</source>
<translation type="unfinished"></translation>
</message>
@ -576,25 +562,25 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="82"/>
<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="123"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="119"/>
<source>your-profiles</source>
<extracomment>Your Profiles</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="152"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="148"/>
<source>your-servers</source>
<extracomment>Your Profiles</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="64"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="63"/>
<source>unlock</source>
<extracomment>Unlock</extracomment>
<translation type="unfinished"></translation>
@ -613,72 +599,72 @@ Name</extracomment>
<translation type="vanished">Benutzeroberflächen-Zoom (betriftt hauptsächlich Text- und Knopgrößen)</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="27"/>
<location filename="../qml/panes/SettingsPane.qml" line="33"/>
<source>setting-language</source>
<extracomment>Language</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="38"/>
<location filename="../qml/panes/SettingsPane.qml" line="44"/>
<source>locale-en</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="39"/>
<location filename="../qml/panes/SettingsPane.qml" line="45"/>
<source>locale-fr</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="40"/>
<location filename="../qml/panes/SettingsPane.qml" line="46"/>
<source>locale-pt</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="41"/>
<location filename="../qml/panes/SettingsPane.qml" line="47"/>
<source>locale-de</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="59"/>
<location filename="../qml/panes/SettingsPane.qml" line="65"/>
<source>setting-interface-zoom</source>
<extracomment>Interface Zoom</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="90"/>
<location filename="../qml/panes/SettingsPane.qml" line="95"/>
<source>large-text-label</source>
<translation>Groß</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="98"/>
<location filename="../qml/panes/SettingsPane.qml" line="103"/>
<source>setting-theme</source>
<extracomment>Theme</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="107"/>
<location filename="../qml/panes/SettingsPane.qml" line="112"/>
<source>theme-light</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="108"/>
<location filename="../qml/panes/SettingsPane.qml" line="113"/>
<source>theme-dark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="127"/>
<location filename="../qml/panes/SettingsPane.qml" line="132"/>
<source>experiments-enabled</source>
<extracomment>Theme</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="188"/>
<location filename="../qml/panes/SettingsPane.qml" line="162"/>
<source>version %1</source>
<extracomment>Version %1</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="197"/>
<location filename="../qml/panes/SettingsPane.qml" line="169"/>
<source>builddate %2</source>
<extracomment>Built on: %2</extracomment>
<translation type="unfinished"></translation>
@ -689,7 +675,7 @@ Name</extracomment>
<translation type="vanished">defaultmäßige Textgröße (Skalierungsfaktor:</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="66"/>
<location filename="../qml/panes/SettingsPane.qml" line="72"/>
<source>small-text-label</source>
<translation>Klein</translation>
</message>
@ -697,7 +683,7 @@ Name</extracomment>
<context>
<name>SplashPane</name>
<message>
<location filename="../qml/panes/SplashPane.qml" line="45"/>
<location filename="../qml/panes/SplashPane.qml" line="47"/>
<source>loading-tor</source>
<extracomment>Loading tor...</extracomment>
<translation type="unfinished"></translation>
@ -706,25 +692,25 @@ Name</extracomment>
<context>
<name>Statusbar</name>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="70"/>
<location filename="../qml/widgets/Statusbar.qml" line="65"/>
<source>network-status-disconnected</source>
<extracomment>Disconnected from the internet, check your connection</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="80"/>
<location filename="../qml/widgets/Statusbar.qml" line="75"/>
<source>network-status-attempting-tor</source>
<extracomment>Attempting to connect to Tor network</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="90"/>
<location filename="../qml/widgets/Statusbar.qml" line="85"/>
<source>network-status-connecting</source>
<extracomment>Connecting...</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="100"/>
<location filename="../qml/widgets/Statusbar.qml" line="95"/>
<source>network-status-online</source>
<extracomment>Online</extracomment>
<translation type="unfinished"></translation>
@ -733,7 +719,7 @@ Name</extracomment>
<context>
<name>main</name>
<message>
<location filename="../qml/main.qml" line="277"/>
<location filename="../qml/main.qml" line="286"/>
<source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment>
<translation type="unfinished"></translation>

Binary file not shown.

View File

@ -48,38 +48,35 @@
<translation>Copied to Clipboard</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="91"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>add-peer-tab</source>
<extracomment>Add a peer</extracomment>
<translation>Add a peer</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="108"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>create-group-tab</source>
<extracomment>Create a group</extracomment>
<translation>Create a group</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="125"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>join-group-tab</source>
<extracomment>Join a group</extracomment>
<translation>Join a group</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="162"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="107"/>
<source>peer-address</source>
<extracomment>Address</extracomment>
<translation>Address</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="174"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="119"/>
<source>peer-name</source>
<extracomment>Name</extracomment>
<translation>Name</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="195"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="251"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="140"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="196"/>
<source>group-name</source>
<extracomment>Group Name
----------
@ -87,38 +84,35 @@ Name</extracomment>
<translation>Group name</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="207"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="152"/>
<source>server</source>
<extracomment>Server</extracomment>
<translation>Server</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="216"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="161"/>
<source>invitation</source>
<extracomment>Invitation</extracomment>
<translation>Invitation</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="238"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="183"/>
<source>group-addr</source>
<extracomment>Address</extracomment>
<translation>Address</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>add-peer</source>
<extracomment>Add Peer | Create Group | Join Group</extracomment>
<translation>Add Peer</translation>
<translation type="vanished">Add Peer</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>create-group</source>
<translation>Create group</translation>
<translation type="vanished">Create group</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>join-group</source>
<translation>Join group</translation>
<translation type="vanished">Join group</translation>
</message>
</context>
<context>
@ -338,12 +332,12 @@ Right-click to reset.</translation>
<translation>Search List</translation>
</message>
<message>
<location filename="../qml/overlays/ListOverlay.qml" line="62"/>
<location filename="../qml/overlays/ListOverlay.qml" line="63"/>
<source>peer-not-online</source>
<translation>Peer is Offline. Applications cannot be used right now.</translation>
</message>
<message>
<location filename="../qml/overlays/ListOverlay.qml" line="200"/>
<location filename="../qml/overlays/ListOverlay.qml" line="201"/>
<source>add-list-item-btn</source>
<translation>Add Item</translation>
</message>
@ -366,18 +360,18 @@ Right-click to reset.</translation>
<translation>Click to DM</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>could-not-send-msg-error</source>
<extracomment>Could not send this message</extracomment>
<translation>Could not send this message</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>acknowledged-label</source>
<translation>Acknowledged</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>pending-label</source>
<translation>Pending</translation>
</message>
@ -438,17 +432,17 @@ Right-click to reset.</translation>
<translation type="vanished">Reject</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="35"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>chat-btn</source>
<translation>Chat</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="49"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>lists-btn</source>
<translation>Lists</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="63"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>bulletins-btn</source>
<translation>Bulletins</translation>
</message>
@ -460,50 +454,50 @@ Right-click to reset.</translation>
<context>
<name>PeerSettingsPane</name>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="28"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
<source>address-label</source>
<translation>Address</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="38"/>
<source>copy-btn</source>
<translation>Copy</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="37"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="42"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation>Copied to Clipboard</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="49"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="54"/>
<source>display-name-label</source>
<translation>Display Name</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="58"/>
<source>save-btn</source>
<translation>Save</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="65"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="77"/>
<source>block-btn</source>
<translation>Block Peer</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="102"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="112"/>
<source>save-peer-history</source>
<extracomment>Save Peer History</extracomment>
<translation>Save Peer History</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="91"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="103"/>
<source>save-peer-history-description</source>
<translation>Determines whether or not to delete any history associated with the peer.</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="111"/>
<source>dont-save-peer-history</source>
<translation>Delete Peer History</translation>
</message>
@ -512,7 +506,7 @@ Right-click to reset.</translation>
<translation type="vanished">Unblock Peer</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="121"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="133"/>
<source>delete-btn</source>
<translation>Delete</translation>
</message>
@ -611,6 +605,12 @@ Right-click to reset.</translation>
<extracomment>Reenter password</extracomment>
<translation>Reenter password</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="351"/>
<source>password-error-empty</source>
<extracomment>Passwords do not match</extracomment>
<translation>Password cannot be empty</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="374"/>
<source>create-profile-btn</source>
@ -625,7 +625,6 @@ Right-click to reset.</translation>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="351"/>
<source>password-error-match</source>
<extracomment>Passwords do not match</extracomment>
<translation>Passwords do not match</translation>
</message>
<message>
@ -635,26 +634,26 @@ Right-click to reset.</translation>
<translation>Error changing password: Supplied password rejected</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="419"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="418"/>
<source>delete-profile-btn</source>
<extracomment>Delete Profile</extracomment>
<translation>Delete Profile</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="438"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="451"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="437"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="450"/>
<source>delete-confirm-label</source>
<extracomment>Type DELETE to confirm</extracomment>
<translation>Type DELETE to confirm</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="462"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="461"/>
<source>delete-profile-confirm-btn</source>
<extracomment>Really Delete Profile</extracomment>
<translation>Really Delete Profile</translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="467"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="466"/>
<source>delete-confirm-text</source>
<extracomment>DELETE</extracomment>
<translation>DELETE</translation>
@ -663,7 +662,7 @@ Right-click to reset.</translation>
<context>
<name>ProfileList</name>
<message>
<location filename="../qml/widgets/ProfileList.qml" line="102"/>
<location filename="../qml/widgets/ProfileList.qml" line="114"/>
<source>add-new-profile-btn</source>
<translation>Add new profile</translation>
</message>
@ -682,25 +681,25 @@ Right-click to reset.</translation>
<translation>Password</translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="82"/>
<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>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="123"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="119"/>
<source>your-profiles</source>
<extracomment>Your Profiles</extracomment>
<translation>Your Profiles</translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="152"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="148"/>
<source>your-servers</source>
<extracomment>Your Profiles</extracomment>
<translation>Your Servers</translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="64"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="63"/>
<source>unlock</source>
<extracomment>Unlock</extracomment>
<translation>Unlock</translation>
@ -728,72 +727,72 @@ Right-click to reset.</translation>
<translation type="vanished">Block Unknown Peers</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="27"/>
<location filename="../qml/panes/SettingsPane.qml" line="33"/>
<source>setting-language</source>
<extracomment>Language</extracomment>
<translation>Language</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="38"/>
<location filename="../qml/panes/SettingsPane.qml" line="44"/>
<source>locale-en</source>
<translation>English</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="39"/>
<location filename="../qml/panes/SettingsPane.qml" line="45"/>
<source>locale-fr</source>
<translation>Frances</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="40"/>
<location filename="../qml/panes/SettingsPane.qml" line="46"/>
<source>locale-pt</source>
<translation>Portuguesa</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="41"/>
<location filename="../qml/panes/SettingsPane.qml" line="47"/>
<source>locale-de</source>
<translation>Deutsche</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="59"/>
<location filename="../qml/panes/SettingsPane.qml" line="65"/>
<source>setting-interface-zoom</source>
<extracomment>Interface Zoom</extracomment>
<translation>Zoom level</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="90"/>
<location filename="../qml/panes/SettingsPane.qml" line="95"/>
<source>large-text-label</source>
<translation>Large</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="98"/>
<location filename="../qml/panes/SettingsPane.qml" line="103"/>
<source>setting-theme</source>
<extracomment>Theme</extracomment>
<translation>Theme</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="107"/>
<location filename="../qml/panes/SettingsPane.qml" line="112"/>
<source>theme-light</source>
<translation>Light</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="108"/>
<location filename="../qml/panes/SettingsPane.qml" line="113"/>
<source>theme-dark</source>
<translation>Dark</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="127"/>
<location filename="../qml/panes/SettingsPane.qml" line="132"/>
<source>experiments-enabled</source>
<extracomment>Theme</extracomment>
<translation>Experiments enabled</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="188"/>
<location filename="../qml/panes/SettingsPane.qml" line="162"/>
<source>version %1</source>
<extracomment>Version %1</extracomment>
<translation>Version %1</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="197"/>
<location filename="../qml/panes/SettingsPane.qml" line="169"/>
<source>builddate %2</source>
<extracomment>Built on: %2</extracomment>
<translation>Built on: %2</translation>
@ -804,7 +803,7 @@ Right-click to reset.</translation>
<translation type="vanished">Default size text (scale factor:</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="66"/>
<location filename="../qml/panes/SettingsPane.qml" line="72"/>
<source>small-text-label</source>
<translation>Small</translation>
</message>
@ -812,7 +811,7 @@ Right-click to reset.</translation>
<context>
<name>SplashPane</name>
<message>
<location filename="../qml/panes/SplashPane.qml" line="45"/>
<location filename="../qml/panes/SplashPane.qml" line="47"/>
<source>loading-tor</source>
<extracomment>Loading tor...</extracomment>
<translation>Loading tor...</translation>
@ -829,25 +828,25 @@ Right-click to reset.</translation>
<context>
<name>Statusbar</name>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="70"/>
<location filename="../qml/widgets/Statusbar.qml" line="65"/>
<source>network-status-disconnected</source>
<extracomment>Disconnected from the internet, check your connection</extracomment>
<translation>Disconnected from the internet, check your connection</translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="80"/>
<location filename="../qml/widgets/Statusbar.qml" line="75"/>
<source>network-status-attempting-tor</source>
<extracomment>Attempting to connect to Tor network</extracomment>
<translation>Attempting to connect to Tor network</translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="90"/>
<location filename="../qml/widgets/Statusbar.qml" line="85"/>
<source>network-status-connecting</source>
<extracomment>Connecting...</extracomment>
<translation>Connecting to network and peers...</translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="100"/>
<location filename="../qml/widgets/Statusbar.qml" line="95"/>
<source>network-status-online</source>
<extracomment>Online</extracomment>
<translation>Online</translation>
@ -856,7 +855,7 @@ Right-click to reset.</translation>
<context>
<name>main</name>
<message>
<location filename="../qml/main.qml" line="277"/>
<location filename="../qml/main.qml" line="286"/>
<source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment>
<translation>New Connection</translation>

View File

@ -48,38 +48,35 @@
<translation type="unfinished">Copié dans le presse-papier</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="91"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>add-peer-tab</source>
<extracomment>Add a peer</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="108"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>create-group-tab</source>
<extracomment>Create a group</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="125"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>join-group-tab</source>
<extracomment>Join a group</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="162"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="107"/>
<source>peer-address</source>
<extracomment>Address</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="174"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="119"/>
<source>peer-name</source>
<extracomment>Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="195"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="251"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="140"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="196"/>
<source>group-name</source>
<extracomment>Group Name
----------
@ -87,39 +84,23 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="207"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="152"/>
<source>server</source>
<extracomment>Server</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="216"/>
<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="238"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="183"/>
<source>group-addr</source>
<extracomment>Address</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>add-peer</source>
<extracomment>Add Peer | Create Group | Join Group</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>create-group</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>join-group</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BulletinOverlay</name>
@ -258,12 +239,12 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/overlays/ListOverlay.qml" line="62"/>
<location filename="../qml/overlays/ListOverlay.qml" line="63"/>
<source>peer-not-online</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/overlays/ListOverlay.qml" line="200"/>
<location filename="../qml/overlays/ListOverlay.qml" line="201"/>
<source>add-list-item-btn</source>
<translation type="unfinished"></translation>
</message>
@ -286,18 +267,18 @@ Name</extracomment>
<translation>Envoyer un message privé</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>could-not-send-msg-error</source>
<extracomment>Could not send this message</extracomment>
<translation>Impossible d&apos;envoyer ce message</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>acknowledged-label</source>
<translation>Confirmé</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>pending-label</source>
<translation>En attente</translation>
</message>
@ -358,17 +339,17 @@ Name</extracomment>
<translation type="vanished">Refuser</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="35"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>chat-btn</source>
<translation>Discuter</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="49"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>lists-btn</source>
<translation>Listes</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="63"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>bulletins-btn</source>
<translation>Bulletins</translation>
</message>
@ -380,55 +361,55 @@ Name</extracomment>
<context>
<name>PeerSettingsPane</name>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="28"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
<source>address-label</source>
<translation>Adresse</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="38"/>
<source>copy-btn</source>
<translation>Copier</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="37"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="42"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation>Copié dans le presse-papier</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="49"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="54"/>
<source>display-name-label</source>
<translation>Pseudo</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="58"/>
<source>save-btn</source>
<translation>Sauvegarder</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="102"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="112"/>
<source>save-peer-history</source>
<extracomment>Save Peer History</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="91"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="103"/>
<source>save-peer-history-description</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="111"/>
<source>dont-save-peer-history</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="121"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="133"/>
<source>delete-btn</source>
<translation>Effacer</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="65"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="77"/>
<source>block-btn</source>
<translation type="unfinished"></translation>
</message>
@ -505,6 +486,12 @@ Name</extracomment>
<extracomment>Reenter password</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="351"/>
<source>password-error-empty</source>
<extracomment>Passwords do not match</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="374"/>
<source>create-profile-btn</source>
@ -519,7 +506,6 @@ Name</extracomment>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="351"/>
<source>password-error-match</source>
<extracomment>Passwords do not match</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -529,26 +515,26 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="419"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="418"/>
<source>delete-profile-btn</source>
<extracomment>Delete Profile</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="438"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="451"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="437"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="450"/>
<source>delete-confirm-label</source>
<extracomment>Type DELETE to confirm</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="462"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="461"/>
<source>delete-profile-confirm-btn</source>
<extracomment>Really Delete Profile</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="467"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="466"/>
<source>delete-confirm-text</source>
<extracomment>DELETE</extracomment>
<translation type="unfinished"></translation>
@ -557,7 +543,7 @@ Name</extracomment>
<context>
<name>ProfileList</name>
<message>
<location filename="../qml/widgets/ProfileList.qml" line="102"/>
<location filename="../qml/widgets/ProfileList.qml" line="114"/>
<source>add-new-profile-btn</source>
<translation type="unfinished"></translation>
</message>
@ -576,25 +562,25 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="82"/>
<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="123"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="119"/>
<source>your-profiles</source>
<extracomment>Your Profiles</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="152"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="148"/>
<source>your-servers</source>
<extracomment>Your Profiles</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="64"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="63"/>
<source>unlock</source>
<extracomment>Unlock</extracomment>
<translation type="unfinished"></translation>
@ -613,72 +599,72 @@ Name</extracomment>
<translation type="vanished">Interface zoom (essentiellement la taille du texte et des composants de l&apos;interface)</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="27"/>
<location filename="../qml/panes/SettingsPane.qml" line="33"/>
<source>setting-language</source>
<extracomment>Language</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="38"/>
<location filename="../qml/panes/SettingsPane.qml" line="44"/>
<source>locale-en</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="39"/>
<location filename="../qml/panes/SettingsPane.qml" line="45"/>
<source>locale-fr</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="40"/>
<location filename="../qml/panes/SettingsPane.qml" line="46"/>
<source>locale-pt</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="41"/>
<location filename="../qml/panes/SettingsPane.qml" line="47"/>
<source>locale-de</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="59"/>
<location filename="../qml/panes/SettingsPane.qml" line="65"/>
<source>setting-interface-zoom</source>
<extracomment>Interface Zoom</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="90"/>
<location filename="../qml/panes/SettingsPane.qml" line="95"/>
<source>large-text-label</source>
<translation type="unfinished">Large</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="98"/>
<location filename="../qml/panes/SettingsPane.qml" line="103"/>
<source>setting-theme</source>
<extracomment>Theme</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="107"/>
<location filename="../qml/panes/SettingsPane.qml" line="112"/>
<source>theme-light</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="108"/>
<location filename="../qml/panes/SettingsPane.qml" line="113"/>
<source>theme-dark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="127"/>
<location filename="../qml/panes/SettingsPane.qml" line="132"/>
<source>experiments-enabled</source>
<extracomment>Theme</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="188"/>
<location filename="../qml/panes/SettingsPane.qml" line="162"/>
<source>version %1</source>
<extracomment>Version %1</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="197"/>
<location filename="../qml/panes/SettingsPane.qml" line="169"/>
<source>builddate %2</source>
<extracomment>Built on: %2</extracomment>
<translation type="unfinished"></translation>
@ -689,7 +675,7 @@ Name</extracomment>
<translation type="vanished">Taille par défaut du texte (échelle:</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="66"/>
<location filename="../qml/panes/SettingsPane.qml" line="72"/>
<source>small-text-label</source>
<translation>Petit</translation>
</message>
@ -697,7 +683,7 @@ Name</extracomment>
<context>
<name>SplashPane</name>
<message>
<location filename="../qml/panes/SplashPane.qml" line="45"/>
<location filename="../qml/panes/SplashPane.qml" line="47"/>
<source>loading-tor</source>
<extracomment>Loading tor...</extracomment>
<translation type="unfinished"></translation>
@ -706,25 +692,25 @@ Name</extracomment>
<context>
<name>Statusbar</name>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="70"/>
<location filename="../qml/widgets/Statusbar.qml" line="65"/>
<source>network-status-disconnected</source>
<extracomment>Disconnected from the internet, check your connection</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="80"/>
<location filename="../qml/widgets/Statusbar.qml" line="75"/>
<source>network-status-attempting-tor</source>
<extracomment>Attempting to connect to Tor network</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="90"/>
<location filename="../qml/widgets/Statusbar.qml" line="85"/>
<source>network-status-connecting</source>
<extracomment>Connecting...</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="100"/>
<location filename="../qml/widgets/Statusbar.qml" line="95"/>
<source>network-status-online</source>
<extracomment>Online</extracomment>
<translation type="unfinished"></translation>
@ -733,7 +719,7 @@ Name</extracomment>
<context>
<name>main</name>
<message>
<location filename="../qml/main.qml" line="277"/>
<location filename="../qml/main.qml" line="286"/>
<source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment>
<translation type="unfinished"></translation>

View File

@ -48,38 +48,35 @@
<translation type="unfinished">Copiado</translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="91"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>add-peer-tab</source>
<extracomment>Add a peer</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="108"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>create-group-tab</source>
<extracomment>Create a group</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="125"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="81"/>
<source>join-group-tab</source>
<extracomment>Join a group</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="162"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="107"/>
<source>peer-address</source>
<extracomment>Address</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="174"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="119"/>
<source>peer-name</source>
<extracomment>Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="195"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="251"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="140"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="196"/>
<source>group-name</source>
<extracomment>Group Name
----------
@ -87,39 +84,23 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="207"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="152"/>
<source>server</source>
<extracomment>Server</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="216"/>
<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="238"/>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="183"/>
<source>group-addr</source>
<extracomment>Address</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>add-peer</source>
<extracomment>Add Peer | Create Group | Join Group</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>create-group</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/AddPeerGroupPane.qml" line="270"/>
<source>join-group</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>BulletinOverlay</name>
@ -258,12 +239,12 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/overlays/ListOverlay.qml" line="62"/>
<location filename="../qml/overlays/ListOverlay.qml" line="63"/>
<source>peer-not-online</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/overlays/ListOverlay.qml" line="200"/>
<location filename="../qml/overlays/ListOverlay.qml" line="201"/>
<source>add-list-item-btn</source>
<translation type="unfinished"></translation>
</message>
@ -286,18 +267,18 @@ Name</extracomment>
<translation>Clique para DM</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>could-not-send-msg-error</source>
<extracomment>Could not send this message</extracomment>
<translation>Não deu para enviar esta mensagem</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>acknowledged-label</source>
<translation>Confirmada</translation>
</message>
<message>
<location filename="../qml/widgets/Message.qml" line="189"/>
<location filename="../qml/widgets/Message.qml" line="187"/>
<source>pending-label</source>
<translation>Pendente</translation>
</message>
@ -358,17 +339,17 @@ Name</extracomment>
<translation type="vanished">Recusar</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="35"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>chat-btn</source>
<translation>Chat</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="49"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>lists-btn</source>
<translation>Listas</translation>
</message>
<message>
<location filename="../qml/panes/OverlayPane.qml" line="63"/>
<location filename="../qml/panes/OverlayPane.qml" line="26"/>
<source>bulletins-btn</source>
<translation>Boletins</translation>
</message>
@ -380,55 +361,55 @@ Name</extracomment>
<context>
<name>PeerSettingsPane</name>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="28"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
<source>address-label</source>
<translation>Endereço</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="33"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="38"/>
<source>copy-btn</source>
<translation>Copiar</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="37"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="42"/>
<source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment>
<translation>Copiado</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="49"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="54"/>
<source>display-name-label</source>
<translation>Nome de Exibição</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="58"/>
<source>save-btn</source>
<translation>Salvar</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="90"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="102"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="112"/>
<source>save-peer-history</source>
<extracomment>Save Peer History</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="91"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="103"/>
<source>save-peer-history-description</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="111"/>
<source>dont-save-peer-history</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="121"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="133"/>
<source>delete-btn</source>
<translation>Deletar</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="65"/>
<location filename="../qml/panes/PeerSettingsPane.qml" line="77"/>
<source>block-btn</source>
<translation type="unfinished"></translation>
</message>
@ -505,6 +486,12 @@ Name</extracomment>
<extracomment>Reenter password</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="351"/>
<source>password-error-empty</source>
<extracomment>Passwords do not match</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="374"/>
<source>create-profile-btn</source>
@ -519,7 +506,6 @@ Name</extracomment>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="351"/>
<source>password-error-match</source>
<extracomment>Passwords do not match</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
@ -529,26 +515,26 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="419"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="418"/>
<source>delete-profile-btn</source>
<extracomment>Delete Profile</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="438"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="451"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="437"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="450"/>
<source>delete-confirm-label</source>
<extracomment>Type DELETE to confirm</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="462"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="461"/>
<source>delete-profile-confirm-btn</source>
<extracomment>Really Delete Profile</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="467"/>
<location filename="../qml/panes/ProfileAddEditPane.qml" line="466"/>
<source>delete-confirm-text</source>
<extracomment>DELETE</extracomment>
<translation type="unfinished"></translation>
@ -557,7 +543,7 @@ Name</extracomment>
<context>
<name>ProfileList</name>
<message>
<location filename="../qml/widgets/ProfileList.qml" line="102"/>
<location filename="../qml/widgets/ProfileList.qml" line="114"/>
<source>add-new-profile-btn</source>
<translation type="unfinished"></translation>
</message>
@ -576,25 +562,25 @@ Name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="82"/>
<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="123"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="119"/>
<source>your-profiles</source>
<extracomment>Your Profiles</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="152"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="148"/>
<source>your-servers</source>
<extracomment>Your Profiles</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/ProfileManagerPane.qml" line="64"/>
<location filename="../qml/panes/ProfileManagerPane.qml" line="63"/>
<source>unlock</source>
<extracomment>Unlock</extracomment>
<translation type="unfinished"></translation>
@ -613,72 +599,72 @@ Name</extracomment>
<translation type="vanished">Zoom da interface (afeta principalmente tamanho de texto e botões)</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="27"/>
<location filename="../qml/panes/SettingsPane.qml" line="33"/>
<source>setting-language</source>
<extracomment>Language</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="38"/>
<location filename="../qml/panes/SettingsPane.qml" line="44"/>
<source>locale-en</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="39"/>
<location filename="../qml/panes/SettingsPane.qml" line="45"/>
<source>locale-fr</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="40"/>
<location filename="../qml/panes/SettingsPane.qml" line="46"/>
<source>locale-pt</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="41"/>
<location filename="../qml/panes/SettingsPane.qml" line="47"/>
<source>locale-de</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="59"/>
<location filename="../qml/panes/SettingsPane.qml" line="65"/>
<source>setting-interface-zoom</source>
<extracomment>Interface Zoom</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="90"/>
<location filename="../qml/panes/SettingsPane.qml" line="95"/>
<source>large-text-label</source>
<translation>Grande</translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="98"/>
<location filename="../qml/panes/SettingsPane.qml" line="103"/>
<source>setting-theme</source>
<extracomment>Theme</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="107"/>
<location filename="../qml/panes/SettingsPane.qml" line="112"/>
<source>theme-light</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="108"/>
<location filename="../qml/panes/SettingsPane.qml" line="113"/>
<source>theme-dark</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="127"/>
<location filename="../qml/panes/SettingsPane.qml" line="132"/>
<source>experiments-enabled</source>
<extracomment>Theme</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="188"/>
<location filename="../qml/panes/SettingsPane.qml" line="162"/>
<source>version %1</source>
<extracomment>Version %1</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="197"/>
<location filename="../qml/panes/SettingsPane.qml" line="169"/>
<source>builddate %2</source>
<extracomment>Built on: %2</extracomment>
<translation type="unfinished"></translation>
@ -689,7 +675,7 @@ Name</extracomment>
<translation type="vanished">Texto tamanho padrão (fator de escala: </translation>
</message>
<message>
<location filename="../qml/panes/SettingsPane.qml" line="66"/>
<location filename="../qml/panes/SettingsPane.qml" line="72"/>
<source>small-text-label</source>
<translation>Pequeno</translation>
</message>
@ -697,7 +683,7 @@ Name</extracomment>
<context>
<name>SplashPane</name>
<message>
<location filename="../qml/panes/SplashPane.qml" line="45"/>
<location filename="../qml/panes/SplashPane.qml" line="47"/>
<source>loading-tor</source>
<extracomment>Loading tor...</extracomment>
<translation type="unfinished"></translation>
@ -706,25 +692,25 @@ Name</extracomment>
<context>
<name>Statusbar</name>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="70"/>
<location filename="../qml/widgets/Statusbar.qml" line="65"/>
<source>network-status-disconnected</source>
<extracomment>Disconnected from the internet, check your connection</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="80"/>
<location filename="../qml/widgets/Statusbar.qml" line="75"/>
<source>network-status-attempting-tor</source>
<extracomment>Attempting to connect to Tor network</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="90"/>
<location filename="../qml/widgets/Statusbar.qml" line="85"/>
<source>network-status-connecting</source>
<extracomment>Connecting...</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/widgets/Statusbar.qml" line="100"/>
<location filename="../qml/widgets/Statusbar.qml" line="95"/>
<source>network-status-online</source>
<extracomment>Online</extracomment>
<translation type="unfinished"></translation>
@ -733,7 +719,7 @@ Name</extracomment>
<context>
<name>main</name>
<message>
<location filename="../qml/main.qml" line="277"/>
<location filename="../qml/main.qml" line="286"/>
<source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment>
<translation type="unfinished"></translation>

View File

@ -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)
}
}
}
}

View File

@ -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)
}
}
}

View File

@ -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 {