cwtch.im
/
ui
Archived
6
7
Fork 2
Code Issues 64 Pull Requests 2 Releases 9 Wiki Activity

Merge branch 'master' into makefile
the build was successful Details

This commit is contained in:
Sarah Jamie Lewis 2020-12-02 13:37:56 -08:00
parent 8e6f5e813a 4b081a0db6
commit e9b98f2aea
10 changed files with 80 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
go.mod
View File

@ -3,8 +3,8 @@ module cwtch.im/ui
go 1.12 go 1.12
require ( require (
cwtch.im/cwtch v0.4.9 cwtch.im/cwtch v0.4.10
git.openprivacy.ca/openprivacy/connectivity v1.3.2 git.openprivacy.ca/openprivacy/connectivity v1.3.3
git.openprivacy.ca/openprivacy/log v1.0.1 git.openprivacy.ca/openprivacy/log v1.0.1
github.com/c-bata/go-prompt v0.2.3 // indirect github.com/c-bata/go-prompt v0.2.3 // indirect
github.com/google/go-cmp v0.4.0 // indirect github.com/google/go-cmp v0.4.0 // indirect

4
go.sum
View File

@ -15,6 +15,8 @@ cwtch.im/cwtch v0.4.8 h1:f/FIek3PkJMskLT+f7SpIjpjlp5hMspAnGguXC3SA8s=
cwtch.im/cwtch v0.4.8/go.mod h1:Mh7vQQ3z55+prpX6EuUkg4QNQkBACMoDcgCNBeAH2EY= cwtch.im/cwtch v0.4.8/go.mod h1:Mh7vQQ3z55+prpX6EuUkg4QNQkBACMoDcgCNBeAH2EY=
cwtch.im/cwtch v0.4.9 h1:X/6r5rARHSEjk4h0ZPw9NA/oFa+XdWgih0zEdrier40= cwtch.im/cwtch v0.4.9 h1:X/6r5rARHSEjk4h0ZPw9NA/oFa+XdWgih0zEdrier40=
cwtch.im/cwtch v0.4.9/go.mod h1:Mh7vQQ3z55+prpX6EuUkg4QNQkBACMoDcgCNBeAH2EY= cwtch.im/cwtch v0.4.9/go.mod h1:Mh7vQQ3z55+prpX6EuUkg4QNQkBACMoDcgCNBeAH2EY=
cwtch.im/cwtch v0.4.10 h1:sgEyJRY+ck3otC+mc4bgCcUWBHhZGbPWdXK0oP+xXIk=
cwtch.im/cwtch v0.4.10/go.mod h1:snHZIZwRQPAZG2LRZsN5SpAIbeR597VJoDS+KHm7q9w=
cwtch.im/tapir v0.2.0 h1:7MkoR5+uEuPW34/O0GZRidnIjq/01Cfm8nl5IRuqpGc= cwtch.im/tapir v0.2.0 h1:7MkoR5+uEuPW34/O0GZRidnIjq/01Cfm8nl5IRuqpGc=
cwtch.im/tapir v0.2.0/go.mod h1:xzzZ28adyUXNkYL1YodcHsAiTt3IJ8Loc29YVn9mIEQ= cwtch.im/tapir v0.2.0/go.mod h1:xzzZ28adyUXNkYL1YodcHsAiTt3IJ8Loc29YVn9mIEQ=
cwtch.im/tapir v0.2.1 h1:t1YJB9q5sV1A9xwiiwL6WVfw3dwQWLoecunuzT1PQtw= cwtch.im/tapir v0.2.1 h1:t1YJB9q5sV1A9xwiiwL6WVfw3dwQWLoecunuzT1PQtw=
@ -32,6 +34,8 @@ git.openprivacy.ca/openprivacy/connectivity v1.3.1 h1:d1t7rtzn+Fc63Z2M4mAGmGYU8h
git.openprivacy.ca/openprivacy/connectivity v1.3.1/go.mod h1:s0/QhONuUqJQfYTAgUlu+ya7G3Ov6bKgpT5QkOhVxDI= git.openprivacy.ca/openprivacy/connectivity v1.3.1/go.mod h1:s0/QhONuUqJQfYTAgUlu+ya7G3Ov6bKgpT5QkOhVxDI=
git.openprivacy.ca/openprivacy/connectivity v1.3.2 h1:gbQ0YsrghzPEtIYBbI1/+S66l8AzuMM/G0XZiq9uPWI= git.openprivacy.ca/openprivacy/connectivity v1.3.2 h1:gbQ0YsrghzPEtIYBbI1/+S66l8AzuMM/G0XZiq9uPWI=
git.openprivacy.ca/openprivacy/connectivity v1.3.2/go.mod h1:DL9QitHjpyNspMUe3wjIej9gFgDK2FdRKP2JE4+7T90= git.openprivacy.ca/openprivacy/connectivity v1.3.2/go.mod h1:DL9QitHjpyNspMUe3wjIej9gFgDK2FdRKP2JE4+7T90=
git.openprivacy.ca/openprivacy/connectivity v1.3.3 h1:OKHZ/pzY95+UNOhF74DisSYPh7lULtjbxFQnK9r6cAk=
git.openprivacy.ca/openprivacy/connectivity v1.3.3/go.mod h1:DL9QitHjpyNspMUe3wjIej9gFgDK2FdRKP2JE4+7T90=
git.openprivacy.ca/openprivacy/log v1.0.0/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw= git.openprivacy.ca/openprivacy/log v1.0.0/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw=
git.openprivacy.ca/openprivacy/log v1.0.1 h1:NWV5oBTatvlSzUE6wtB+UQCulgyMOtm4BXGd34evMys= git.openprivacy.ca/openprivacy/log v1.0.1 h1:NWV5oBTatvlSzUE6wtB+UQCulgyMOtm4BXGd34evMys=
git.openprivacy.ca/openprivacy/log v1.0.1/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw= git.openprivacy.ca/openprivacy/log v1.0.1/go.mod h1:gGYK8xHtndRLDymFtmjkG26GaMQNgyhioNS82m812Iw=

6
go/handlers/appHandler.go
View File

@ -21,8 +21,10 @@ func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts
the.AppBus.Subscribe(event.AppError, q) the.AppBus.Subscribe(event.AppError, q)
the.AppBus.Subscribe(event.ACNStatus, q) the.AppBus.Subscribe(event.ACNStatus, q)
the.AppBus.Subscribe(event.ReloadDone, q) the.AppBus.Subscribe(event.ReloadDone, q)
the.AppBus.Subscribe(event.ACNVersion, q)
subscribed <- true subscribed <- true
the.CwtchApp.QueryACNVersion()
gcd.Loaded() gcd.Loaded()
for { for {
@ -46,7 +48,9 @@ func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts
statuscode = 3 statuscode = 3
} }
gcd.SetTorStatus(statuscode) gcd.SetTorStatus(statuscode)
case event.ACNVersion:
version := e.Data[event.Data]
gcd.SetTorVersion(version)
case event.PeerError: case event.PeerError:
// current only case // current only case
log.Errorf("couldn't load profiles: %v", e.Data[event.Error]) log.Errorf("couldn't load profiles: %v", e.Data[event.Error])

5
go/ui/gcd.go
View File

@ -23,7 +23,7 @@ import (
type GrandCentralDispatcher struct { type GrandCentralDispatcher struct {
core.QObject core.QObject
AndroidCwtchActivity *android.CwtchActivity AndroidCwtchActivity *android.CwtchActivity
QMLEngine *qml.QQmlApplicationEngine QMLEngine *qml.QQmlApplicationEngine
Translator, OpaqueTranslator *core.QTranslator Translator, OpaqueTranslator *core.QTranslator
@ -45,6 +45,7 @@ type GrandCentralDispatcher struct {
_ string `property:"theme,auto,changed"` _ string `property:"theme,auto,changed"`
_ string `property:"locale,auto,changed"` _ string `property:"locale,auto,changed"`
_ string `property:"version"` _ string `property:"version"`
_ string `property:"torVersion"`
_ string `property:"buildDate"` _ string `property:"buildDate"`
_ string `property:"assetPath"` _ string `property:"assetPath"`
_ string `property:"selectedProfile,auto"` _ string `property:"selectedProfile,auto"`
@ -60,7 +61,7 @@ type GrandCentralDispatcher struct {
_ func() `signal:"ResetProfileList"` _ func() `signal:"ResetProfileList"`
_ func(failed bool) `signal:"ChangePasswordResponse"` _ func(failed bool) `signal:"ChangePasswordResponse"`
_ func(onion string, online bool) `signal:"UpdateProfileNetworkStatus"` _ func(onion string, online bool) `signal:"UpdateProfileNetworkStatus"`
_ func(onion string) `signal:"Notify"` _ func(onion string) `signal:"Notify"`
// server management // server management
_ func(handle, displayname, image string, status int, autostart bool, bundle string, messages int, key_types []string, keys []string) `signal:"AddServer"` _ func(handle, displayname, image string, status int, autostart bool, bundle string, messages int, key_types []string, keys []string) `signal:"AddServer"`

30
i18n/translation_de.ts
View File

@ -105,18 +105,18 @@ Name</extracomment>
<context> <context>
<name>BulletinOverlay</name> <name>BulletinOverlay</name>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="203"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
<source>new-bulletin-label</source> <source>new-bulletin-label</source>
<translation>Neue Meldung</translation> <translation>Neue Meldung</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="215"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
<source>post-new-bulletin-label</source> <source>post-new-bulletin-label</source>
<extracomment>Post a new Bulletin Post</extracomment> <extracomment>Post a new Bulletin Post</extracomment>
<translation>Neue Meldung veröffentlichen</translation> <translation>Neue Meldung veröffentlichen</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="221"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
<source>title-placeholder</source> <source>title-placeholder</source>
<extracomment>title place holder text</extracomment> <extracomment>title place holder text</extracomment>
<translation>Titel...</translation> <translation>Titel...</translation>
@ -233,18 +233,18 @@ Name</extracomment>
<translation type="vanished">noch zu erledigen</translation> <translation type="vanished">noch zu erledigen</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="33"/> <location filename="../qml/overlays/ListOverlay.qml" line="32"/>
<source>search-list</source> <source>search-list</source>
<extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment> <extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="63"/> <location filename="../qml/overlays/ListOverlay.qml" line="62"/>
<source>peer-not-online</source> <source>peer-not-online</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="201"/> <location filename="../qml/overlays/ListOverlay.qml" line="200"/>
<source>add-list-item-btn</source> <source>add-list-item-btn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -252,7 +252,7 @@ Name</extracomment>
<context> <context>
<name>MembershipOverlay</name> <name>MembershipOverlay</name>
<message> <message>
<location filename="../qml/overlays/MembershipOverlay.qml" line="22"/> <location filename="../qml/overlays/MembershipOverlay.qml" line="21"/>
<source>membership-description</source> <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> <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>Unten steht eine Liste der Benutzer, die Nachrichten an die Gruppe gesendet haben. Möglicherweise enthält diese Benutzerzliste nicht alle, die Zugang zur Gruppe haben.</translation> <translation>Unten steht eine Liste der Benutzer, die Nachrichten an die Gruppe gesendet haben. Möglicherweise enthält diese Benutzerzliste nicht alle, die Zugang zur Gruppe haben.</translation>
@ -267,18 +267,18 @@ Name</extracomment>
<translation>Klicken, um DM zu senden</translation> <translation>Klicken, um DM zu senden</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>could-not-send-msg-error</source> <source>could-not-send-msg-error</source>
<extracomment>Could not send this message</extracomment> <extracomment>Could not send this message</extracomment>
<translation>Nachricht konnte nicht gesendet werden</translation> <translation>Nachricht konnte nicht gesendet werden</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>acknowledged-label</source> <source>acknowledged-label</source>
<translation>bestätigt</translation> <translation>bestätigt</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>pending-label</source> <source>pending-label</source>
<translation>Bestätigung ausstehend</translation> <translation>Bestätigung ausstehend</translation>
</message> </message>
@ -286,13 +286,13 @@ Name</extracomment>
<context> <context>
<name>MessageEditor</name> <name>MessageEditor</name>
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/> <location filename="../qml/widgets/MessageEditor.qml" line="31"/>
<source>peer-blocked-message</source> <source>peer-blocked-message</source>
<extracomment>Peer is blocked</extracomment> <extracomment>Peer is blocked</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="49"/> <location filename="../qml/widgets/MessageEditor.qml" line="48"/>
<source>peer-offline-message</source> <source>peer-offline-message</source>
<extracomment>Peer is offline, messages can&apos;t be delivered right now</extracomment> <extracomment>Peer is offline, messages can&apos;t be delivered right now</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -659,8 +659,8 @@ Name</extracomment>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="162"/> <location filename="../qml/panes/SettingsPane.qml" line="162"/>
<source>version %1</source> <source>version %1 tor %2</source>
<extracomment>Version %1</extracomment> <extracomment>Version %1 with tor %2</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -719,7 +719,7 @@ Name</extracomment>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<location filename="../qml/main.qml" line="286"/> <location filename="../qml/main.qml" line="264"/>
<source>new-connection-pane-title</source> <source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment> <extracomment>New Connection</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

BIN
i18n/translation_en.qm
View File

Binary file not shown.

33
i18n/translation_en.ts
View File

@ -118,18 +118,18 @@ Name</extracomment>
<context> <context>
<name>BulletinOverlay</name> <name>BulletinOverlay</name>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="203"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
<source>new-bulletin-label</source> <source>new-bulletin-label</source>
<translation>New Bulletin</translation> <translation>New Bulletin</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="215"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
<source>post-new-bulletin-label</source> <source>post-new-bulletin-label</source>
<extracomment>Post a new Bulletin Post</extracomment> <extracomment>Post a new Bulletin Post</extracomment>
<translation>Post new bulletin</translation> <translation>Post new bulletin</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="221"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
<source>title-placeholder</source> <source>title-placeholder</source>
<extracomment>title place holder text</extracomment> <extracomment>title place holder text</extracomment>
<translation>title...</translation> <translation>title...</translation>
@ -326,18 +326,18 @@ Right-click to reset.</translation>
<context> <context>
<name>ListOverlay</name> <name>ListOverlay</name>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="33"/> <location filename="../qml/overlays/ListOverlay.qml" line="32"/>
<source>search-list</source> <source>search-list</source>
<extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment> <extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment>
<translation>Search List</translation> <translation>Search List</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="63"/> <location filename="../qml/overlays/ListOverlay.qml" line="62"/>
<source>peer-not-online</source> <source>peer-not-online</source>
<translation>Peer is Offline. Applications cannot be used right now.</translation> <translation>Peer is Offline. Applications cannot be used right now.</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="201"/> <location filename="../qml/overlays/ListOverlay.qml" line="200"/>
<source>add-list-item-btn</source> <source>add-list-item-btn</source>
<translation>Add Item</translation> <translation>Add Item</translation>
</message> </message>
@ -345,7 +345,7 @@ Right-click to reset.</translation>
<context> <context>
<name>MembershipOverlay</name> <name>MembershipOverlay</name>
<message> <message>
<location filename="../qml/overlays/MembershipOverlay.qml" line="22"/> <location filename="../qml/overlays/MembershipOverlay.qml" line="21"/>
<source>membership-description</source> <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> <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>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.</translation> <translation>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.</translation>
@ -360,18 +360,18 @@ Right-click to reset.</translation>
<translation>Click to DM</translation> <translation>Click to DM</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>could-not-send-msg-error</source> <source>could-not-send-msg-error</source>
<extracomment>Could not send this message</extracomment> <extracomment>Could not send this message</extracomment>
<translation>Could not send this message</translation> <translation>Could not send this message</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>acknowledged-label</source> <source>acknowledged-label</source>
<translation>Acknowledged</translation> <translation>Acknowledged</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>pending-label</source> <source>pending-label</source>
<translation>Pending</translation> <translation>Pending</translation>
</message> </message>
@ -379,13 +379,13 @@ Right-click to reset.</translation>
<context> <context>
<name>MessageEditor</name> <name>MessageEditor</name>
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/> <location filename="../qml/widgets/MessageEditor.qml" line="31"/>
<source>peer-blocked-message</source> <source>peer-blocked-message</source>
<extracomment>Peer is blocked</extracomment> <extracomment>Peer is blocked</extracomment>
<translation>Peer is blocked</translation> <translation>Peer is blocked</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="49"/> <location filename="../qml/widgets/MessageEditor.qml" line="48"/>
<source>peer-offline-message</source> <source>peer-offline-message</source>
<extracomment>Peer is offline, messages can&apos;t be delivered right now</extracomment> <extracomment>Peer is offline, messages can&apos;t be delivered right now</extracomment>
<translation>Peer is offline, messages can&apos;t be delivered right now</translation> <translation>Peer is offline, messages can&apos;t be delivered right now</translation>
@ -787,9 +787,14 @@ Right-click to reset.</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="162"/> <location filename="../qml/panes/SettingsPane.qml" line="162"/>
<source>version %1 tor %2</source>
<extracomment>Version %1 with tor %2</extracomment>
<translation>Version %1 with tor %2</translation>
</message>
<message>
<source>version %1</source> <source>version %1</source>
<extracomment>Version %1</extracomment> <extracomment>Version %1</extracomment>
<translation>Version %1</translation> <translation type="vanished">Version %1</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="169"/> <location filename="../qml/panes/SettingsPane.qml" line="169"/>
@ -855,7 +860,7 @@ Right-click to reset.</translation>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<location filename="../qml/main.qml" line="286"/> <location filename="../qml/main.qml" line="264"/>
<source>new-connection-pane-title</source> <source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment> <extracomment>New Connection</extracomment>
<translation>New Connection</translation> <translation>New Connection</translation>

30
i18n/translation_fr.ts
View File

@ -105,18 +105,18 @@ Name</extracomment>
<context> <context>
<name>BulletinOverlay</name> <name>BulletinOverlay</name>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="203"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
<source>new-bulletin-label</source> <source>new-bulletin-label</source>
<translation>Nouveau bulletin</translation> <translation>Nouveau bulletin</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="215"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
<source>post-new-bulletin-label</source> <source>post-new-bulletin-label</source>
<extracomment>Post a new Bulletin Post</extracomment> <extracomment>Post a new Bulletin Post</extracomment>
<translation>Envoyer un nouveau bulletin</translation> <translation>Envoyer un nouveau bulletin</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="221"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
<source>title-placeholder</source> <source>title-placeholder</source>
<extracomment>title place holder text</extracomment> <extracomment>title place holder text</extracomment>
<translation>titre...</translation> <translation>titre...</translation>
@ -233,18 +233,18 @@ Name</extracomment>
<translation type="vanished">A faire...</translation> <translation type="vanished">A faire...</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="33"/> <location filename="../qml/overlays/ListOverlay.qml" line="32"/>
<source>search-list</source> <source>search-list</source>
<extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment> <extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="63"/> <location filename="../qml/overlays/ListOverlay.qml" line="62"/>
<source>peer-not-online</source> <source>peer-not-online</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="201"/> <location filename="../qml/overlays/ListOverlay.qml" line="200"/>
<source>add-list-item-btn</source> <source>add-list-item-btn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -252,7 +252,7 @@ Name</extracomment>
<context> <context>
<name>MembershipOverlay</name> <name>MembershipOverlay</name>
<message> <message>
<location filename="../qml/overlays/MembershipOverlay.qml" line="22"/> <location filename="../qml/overlays/MembershipOverlay.qml" line="21"/>
<source>membership-description</source> <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> <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>Liste des utilisateurs ayant envoyés un ou plusieurs messages au groupe. Cette liste peut ne pas être representatives de l&apos;ensemble des membres du groupe.</translation> <translation>Liste des utilisateurs ayant envoyés un ou plusieurs messages au groupe. Cette liste peut ne pas être representatives de l&apos;ensemble des membres du groupe.</translation>
@ -267,18 +267,18 @@ Name</extracomment>
<translation>Envoyer un message privé</translation> <translation>Envoyer un message privé</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>could-not-send-msg-error</source> <source>could-not-send-msg-error</source>
<extracomment>Could not send this message</extracomment> <extracomment>Could not send this message</extracomment>
<translation>Impossible d&apos;envoyer ce message</translation> <translation>Impossible d&apos;envoyer ce message</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>acknowledged-label</source> <source>acknowledged-label</source>
<translation>Confirmé</translation> <translation>Confirmé</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>pending-label</source> <source>pending-label</source>
<translation>En attente</translation> <translation>En attente</translation>
</message> </message>
@ -286,13 +286,13 @@ Name</extracomment>
<context> <context>
<name>MessageEditor</name> <name>MessageEditor</name>
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/> <location filename="../qml/widgets/MessageEditor.qml" line="31"/>
<source>peer-blocked-message</source> <source>peer-blocked-message</source>
<extracomment>Peer is blocked</extracomment> <extracomment>Peer is blocked</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="49"/> <location filename="../qml/widgets/MessageEditor.qml" line="48"/>
<source>peer-offline-message</source> <source>peer-offline-message</source>
<extracomment>Peer is offline, messages can&apos;t be delivered right now</extracomment> <extracomment>Peer is offline, messages can&apos;t be delivered right now</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -659,8 +659,8 @@ Name</extracomment>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="162"/> <location filename="../qml/panes/SettingsPane.qml" line="162"/>
<source>version %1</source> <source>version %1 tor %2</source>
<extracomment>Version %1</extracomment> <extracomment>Version %1 with tor %2</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -719,7 +719,7 @@ Name</extracomment>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<location filename="../qml/main.qml" line="286"/> <location filename="../qml/main.qml" line="264"/>
<source>new-connection-pane-title</source> <source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment> <extracomment>New Connection</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

30
i18n/translation_pt.ts
View File

@ -105,18 +105,18 @@ Name</extracomment>
<context> <context>
<name>BulletinOverlay</name> <name>BulletinOverlay</name>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="203"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
<source>new-bulletin-label</source> <source>new-bulletin-label</source>
<translation>Novo Boletim</translation> <translation>Novo Boletim</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="215"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
<source>post-new-bulletin-label</source> <source>post-new-bulletin-label</source>
<extracomment>Post a new Bulletin Post</extracomment> <extracomment>Post a new Bulletin Post</extracomment>
<translation>Postar novo boletim</translation> <translation>Postar novo boletim</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="221"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
<source>title-placeholder</source> <source>title-placeholder</source>
<extracomment>title place holder text</extracomment> <extracomment>title place holder text</extracomment>
<translation>título…</translation> <translation>título…</translation>
@ -233,18 +233,18 @@ Name</extracomment>
<translation type="vanished">Afazer…</translation> <translation type="vanished">Afazer…</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="33"/> <location filename="../qml/overlays/ListOverlay.qml" line="32"/>
<source>search-list</source> <source>search-list</source>
<extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment> <extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="63"/> <location filename="../qml/overlays/ListOverlay.qml" line="62"/>
<source>peer-not-online</source> <source>peer-not-online</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="201"/> <location filename="../qml/overlays/ListOverlay.qml" line="200"/>
<source>add-list-item-btn</source> <source>add-list-item-btn</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -252,7 +252,7 @@ Name</extracomment>
<context> <context>
<name>MembershipOverlay</name> <name>MembershipOverlay</name>
<message> <message>
<location filename="../qml/overlays/MembershipOverlay.qml" line="22"/> <location filename="../qml/overlays/MembershipOverlay.qml" line="21"/>
<source>membership-description</source> <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> <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>A lista abaixo é de usuários que enviaram mensagens ao grupo. Essa lista pode não refletir todos os usuários que têm acesso ao grupo.</translation> <translation>A lista abaixo é de usuários que enviaram mensagens ao grupo. Essa lista pode não refletir todos os usuários que têm acesso ao grupo.</translation>
@ -267,18 +267,18 @@ Name</extracomment>
<translation>Clique para DM</translation> <translation>Clique para DM</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>could-not-send-msg-error</source> <source>could-not-send-msg-error</source>
<extracomment>Could not send this message</extracomment> <extracomment>Could not send this message</extracomment>
<translation>Não deu para enviar esta mensagem</translation> <translation>Não deu para enviar esta mensagem</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>acknowledged-label</source> <source>acknowledged-label</source>
<translation>Confirmada</translation> <translation>Confirmada</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="187"/> <location filename="../qml/widgets/Message.qml" line="188"/>
<source>pending-label</source> <source>pending-label</source>
<translation>Pendente</translation> <translation>Pendente</translation>
</message> </message>
@ -286,13 +286,13 @@ Name</extracomment>
<context> <context>
<name>MessageEditor</name> <name>MessageEditor</name>
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="32"/> <location filename="../qml/widgets/MessageEditor.qml" line="31"/>
<source>peer-blocked-message</source> <source>peer-blocked-message</source>
<extracomment>Peer is blocked</extracomment> <extracomment>Peer is blocked</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/MessageEditor.qml" line="49"/> <location filename="../qml/widgets/MessageEditor.qml" line="48"/>
<source>peer-offline-message</source> <source>peer-offline-message</source>
<extracomment>Peer is offline, messages can&apos;t be delivered right now</extracomment> <extracomment>Peer is offline, messages can&apos;t be delivered right now</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -659,8 +659,8 @@ Name</extracomment>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="162"/> <location filename="../qml/panes/SettingsPane.qml" line="162"/>
<source>version %1</source> <source>version %1 tor %2</source>
<extracomment>Version %1</extracomment> <extracomment>Version %1 with tor %2</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -719,7 +719,7 @@ Name</extracomment>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<location filename="../qml/main.qml" line="286"/> <location filename="../qml/main.qml" line="264"/>
<source>new-connection-pane-title</source> <source>new-connection-pane-title</source>
<extracomment>New Connection</extracomment> <extracomment>New Connection</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

4
qml/panes/SettingsPane.qml
View File

@ -158,8 +158,8 @@ Opaque.SettingsList { // settingsPane
Opaque.ScalingLabel { Opaque.ScalingLabel {
id: versionLabel id: versionLabel
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
//: Version %1 //: Version %1 with tor %2
text: qsTr("version %1").arg(gcd.version) text: qsTr("version %1 tor %2").arg(gcd.version).arg(gcd.torVersion)
} }
Opaque.ScalingLabel { Opaque.ScalingLabel {