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

Expose Blocking in the UI (initial version)

This commit is contained in:
Sarah Jamie Lewis 2019-08-06 19:14:40 -07:00
parent 1b54cf2a19
commit 9a4c24626d
14 changed files with 214 additions and 157 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
go/characters/appEventListener.go
View File

@ -90,6 +90,7 @@ func AppEventListener(gcd *gothings.GrandCentralDispatcher, subscribed chan bool
DisplayName: displayName, DisplayName: displayName,
Image: cwutil.RandomProfileImage(contacts[i]), Image: cwutil.RandomProfileImage(contacts[i]),
Trusted: contact.Trusted, Trusted: contact.Trusted,
Blocked: contact.Blocked,
Loading: false, Loading: false,
}) })
} }

1
go/characters/presencepoller.go
View File

@ -29,6 +29,7 @@ func PresencePoller(uiState *gothings.InterfaceState) {
0, 0,
0, 0,
c.Trusted, c.Trusted,
c.Blocked,
false, false,
}) })

1
go/gobjects/contact.go
View File

@ -8,5 +8,6 @@ type Contact struct {
Badge int Badge int
Status int Status int
Trusted bool Trusted bool
Blocked bool
Loading bool Loading bool
} }

15
go/gothings/gcd.go
View File

@ -30,8 +30,8 @@ type GrandCentralDispatcher struct {
_ string `property:"buildDate"` _ string `property:"buildDate"`
// contact list stuff // contact list stuff
_ func(handle, displayName, image, server string, badge, status int, trusted bool, loading bool) `signal:"AddContact"` _ func(handle, displayName, image, server string, badge, status int, trusted bool, blocked bool, loading bool) `signal:"AddContact"`
_ func(handle, displayName, image, server string, badge, status int, trusted bool, loading bool) `signal:"UpdateContact"` _ func(handle, displayName, image, server string, badge, status int, trusted bool, blocked bool, loading bool) `signal:"UpdateContact"`
_ func(handle, key, value string) `signal:"UpdateContactAttribute"` _ func(handle, key, value string) `signal:"UpdateContactAttribute"`
// messages pane stuff // messages pane stuff
@ -56,6 +56,7 @@ type GrandCentralDispatcher struct {
// signals emitted from the ui (written in go, below) // signals emitted from the ui (written in go, below)
_ func(message string, mid string) `signal:"sendMessage,auto"` _ func(message string, mid string) `signal:"sendMessage,auto"`
_ func(onion string) `signal:"blockPeer,auto"`
_ func(onion string) `signal:"loadMessagesPane,auto"` _ func(onion string) `signal:"loadMessagesPane,auto"`
_ func(signal string) `signal:"broadcast,auto"` // convenience relay signal _ func(signal string) `signal:"broadcast,auto"` // convenience relay signal
_ func(str string) `signal:"importString,auto"` _ func(str string) `signal:"importString,auto"`
@ -170,6 +171,7 @@ func (this *GrandCentralDispatcher) loadMessagesPaneHelper(handle string) {
0, 0,
false, false,
false, false,
false,
}) })
} else { } else {
c.Badge = 0 c.Badge = 0
@ -481,6 +483,15 @@ func (this *GrandCentralDispatcher) createGroup(server, groupName string) {
the.Peer.JoinServer(server) the.Peer.JoinServer(server)
} }
func (this *GrandCentralDispatcher) blockPeer(onion string) {
err := the.Peer.BlockPeer(onion)
if err != nil {
this.InvokePopup("Error Blocking Peer: " + err.Error())
}
this.UIState.UpdateContact(onion)
}
func (this *GrandCentralDispatcher) inviteToGroup(onion, groupID string) { func (this *GrandCentralDispatcher) inviteToGroup(onion, groupID string) {
err := the.Peer.InviteOnionToGroup(onion, groupID) err := the.Peer.InviteOnionToGroup(onion, groupID)
if err != nil { if err != nil {

18
go/gothings/uistate.go
View File

@ -29,7 +29,7 @@ func (this *InterfaceState) Acknowledge(mID string) {
func (this *InterfaceState) AddContact(c *gobjects.Contact) { func (this *InterfaceState) AddContact(c *gobjects.Contact) {
if len(c.Handle) == 32 { // ADD GROUP if len(c.Handle) == 32 { // ADD GROUP
if _, found := this.contacts.Load(c.Handle); !found { if _, found := this.contacts.Load(c.Handle); !found {
this.parentGcd.AddContact(c.Handle, c.DisplayName, c.Image, c.Server, c.Badge, c.Status, c.Trusted, c.Loading) this.parentGcd.AddContact(c.Handle, c.DisplayName, c.Image, c.Server, c.Badge, c.Status, c.Trusted, c.Blocked, c.Loading)
this.contacts.Store(c.Handle, c) this.contacts.Store(c.Handle, c)
} }
return return
@ -41,7 +41,7 @@ func (this *InterfaceState) AddContact(c *gobjects.Contact) {
if _, found := this.contacts.Load(c.Handle); !found { if _, found := this.contacts.Load(c.Handle); !found {
this.contacts.Store(c.Handle, c) this.contacts.Store(c.Handle, c)
this.parentGcd.AddContact(c.Handle, c.DisplayName, c.Image, c.Server, c.Badge, c.Status, c.Trusted, false) this.parentGcd.AddContact(c.Handle, c.DisplayName, c.Image, c.Server, c.Badge, c.Status, c.Trusted, c.Blocked, false)
if the.Peer.GetContact(c.Handle) == nil { if the.Peer.GetContact(c.Handle) == nil {
the.Peer.AddContact(c.DisplayName, c.Handle, c.Trusted) the.Peer.AddContact(c.DisplayName, c.Handle, c.Trusted)
go the.Peer.PeerWithOnion(c.Handle) go the.Peer.PeerWithOnion(c.Handle)
@ -67,6 +67,7 @@ func (this *InterfaceState) GetContact(handle string) *gobjects.Contact {
0, 0,
group.Accepted, group.Accepted,
false, false,
false,
}) })
} else { } else {
log.Errorf("Attempting to add non existent group to ui %v", handle) log.Errorf("Attempting to add non existent group to ui %v", handle)
@ -86,6 +87,7 @@ func (this *InterfaceState) GetContact(handle string) *gobjects.Contact {
0, 0,
0, 0,
false, false,
contact.Blocked,
false, false,
}) })
} else if contact == nil { } else if contact == nil {
@ -167,10 +169,14 @@ func (this *InterfaceState) GetMessages(handle string) []*gobjects.Message {
} }
func (this *InterfaceState) UpdateContact(handle string) { func (this *InterfaceState) UpdateContact(handle string) {
cif, found := this.contacts.Load(handle) contact := the.Peer.GetContact(handle)
if found { if contact != nil {
c := cif.(*gobjects.Contact) cif, found := this.contacts.Load(handle)
this.parentGcd.UpdateContact(c.Handle, c.DisplayName, c.Image, c.Server, c.Badge, c.Status, c.Trusted, c.Loading) if found {
c := cif.(*gobjects.Contact)
c.Blocked = contact.Blocked
this.parentGcd.UpdateContact(c.Handle, c.DisplayName, c.Image, c.Server, c.Badge, c.Status, c.Trusted, c.Blocked, c.Loading)
}
} }
} }

77
i18n/translation_de.ts
View File

@ -4,30 +4,30 @@
<context> <context>
<name>AddGroupPane</name> <name>AddGroupPane</name>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="17"/> <location filename="../qml/panes/AddGroupPane.qml" line="19"/>
<source>create-group-title</source> <source>create-group-title</source>
<translation>Gruppe Anlegen</translation> <translation>Gruppe Anlegen</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="27"/> <location filename="../qml/panes/AddGroupPane.qml" line="42"/>
<source>server-label</source> <source>server-label</source>
<extracomment>Server label</extracomment> <extracomment>Server label</extracomment>
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="38"/> <location filename="../qml/panes/AddGroupPane.qml" line="53"/>
<source>group-name-label</source> <source>group-name-label</source>
<extracomment>Group name label</extracomment> <extracomment>Group name label</extracomment>
<translation>Gruppenname</translation> <translation>Gruppenname</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="45"/> <location filename="../qml/panes/AddGroupPane.qml" line="60"/>
<source>default-group-name</source> <source>default-group-name</source>
<extracomment>default suggested group name</extracomment> <extracomment>default suggested group name</extracomment>
<translation>Tolle Gruppe</translation> <translation>Tolle Gruppe</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="50"/> <location filename="../qml/panes/AddGroupPane.qml" line="65"/>
<source>create-group-btn</source> <source>create-group-btn</source>
<extracomment>create group button</extracomment> <extracomment>create group button</extracomment>
<translation>Anlegen</translation> <translation>Anlegen</translation>
@ -36,18 +36,18 @@
<context> <context>
<name>BulletinOverlay</name> <name>BulletinOverlay</name>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="181"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="204"/>
<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="193"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="216"/>
<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="199"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="222"/>
<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>
@ -56,44 +56,44 @@
<context> <context>
<name>GroupSettingsPane</name> <name>GroupSettingsPane</name>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="30"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="42"/>
<source>server-label</source> <source>server-label</source>
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="41"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="53"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="62"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="74"/>
<source>copy-btn</source> <source>copy-btn</source>
<translation>Kopieren</translation> <translation>Kopieren</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="51"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="63"/>
<source>invitation-label</source> <source>invitation-label</source>
<translation>Einladung</translation> <translation>Einladung</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="72"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="84"/>
<source>group-name-label</source> <source>group-name-label</source>
<translation>Gruppenname</translation> <translation>Gruppenname</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="81"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="93"/>
<source>save-btn</source> <source>save-btn</source>
<translation>Speichern</translation> <translation>Speichern</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="91"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="103"/>
<source>invite-to-group-label</source> <source>invite-to-group-label</source>
<extracomment>Invite someone to the group</extracomment> <extracomment>Invite someone to the group</extracomment>
<translation>In die Gruppe einladen</translation> <translation>In die Gruppe einladen</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="102"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="114"/>
<source>invite-btn</source> <source>invite-btn</source>
<translation>Einladen</translation> <translation>Einladen</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="111"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="123"/>
<source>delete-btn</source> <source>delete-btn</source>
<translation>Löschen</translation> <translation>Löschen</translation>
</message> </message>
@ -101,19 +101,19 @@
<context> <context>
<name>ListOverlay</name> <name>ListOverlay</name>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="162"/> <location filename="../qml/overlays/ListOverlay.qml" line="184"/>
<source>add-list-item</source> <source>add-list-item</source>
<extracomment>Add a New List Item</extracomment> <extracomment>Add a New List Item</extracomment>
<translation>Liste hinzufügen</translation> <translation>Liste hinzufügen</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="174"/> <location filename="../qml/overlays/ListOverlay.qml" line="196"/>
<source>add-new-item</source> <source>add-new-item</source>
<extracomment>Add a new item to the list</extracomment> <extracomment>Add a new item to the list</extracomment>
<translation>Neues Listenelement hinzüfgen</translation> <translation>Neues Listenelement hinzüfgen</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="180"/> <location filename="../qml/overlays/ListOverlay.qml" line="202"/>
<source>todo-placeholder</source> <source>todo-placeholder</source>
<extracomment>Todo... placeholder text</extracomment> <extracomment>Todo... placeholder text</extracomment>
<translation>noch zu erledigen</translation> <translation>noch zu erledigen</translation>
@ -131,24 +131,24 @@
<context> <context>
<name>Message</name> <name>Message</name>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="55"/> <location filename="../qml/widgets/Message.qml" line="56"/>
<source>dm-tooltip</source> <source>dm-tooltip</source>
<extracomment>Click to DM</extracomment> <extracomment>Click to DM</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="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<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="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<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="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<source>pending-label</source> <source>pending-label</source>
<translation>Bestätigung ausstehend</translation> <translation>Bestätigung ausstehend</translation>
</message> </message>
@ -224,33 +224,38 @@
<context> <context>
<name>PeerSettingsPane</name> <name>PeerSettingsPane</name>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="29"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="42"/>
<source>address-label</source> <source>address-label</source>
<translation>Adresse</translation> <translation>Adresse</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="40"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
<source>copy-btn</source> <source>copy-btn</source>
<translation>Kopieren</translation> <translation>Kopieren</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="44"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="57"/>
<source>copied-to-clipboard-notification</source> <source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment> <extracomment>notification: copied to clipboard</extracomment>
<translation>in die Zwischenablage kopiert</translation> <translation>in die Zwischenablage kopiert</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="51"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="64"/>
<source>display-name-label</source> <source>display-name-label</source>
<translation>Angezeigter Name</translation> <translation>Angezeigter Name</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="60"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="73"/>
<source>save-btn</source> <source>save-btn</source>
<translation>speichern</translation> <translation>speichern</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="71"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="85"/>
<source>block-btn</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="94"/>
<source>delete-btn</source> <source>delete-btn</source>
<translation>löschen</translation> <translation>löschen</translation>
</message> </message>
@ -258,36 +263,36 @@
<context> <context>
<name>SettingsPane</name> <name>SettingsPane</name>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="18"/> <location filename="../qml/panes/SettingsPane.qml" line="20"/>
<source>cwtch-settings-title</source> <source>cwtch-settings-title</source>
<extracomment>Cwtch Settings title</extracomment> <extracomment>Cwtch Settings title</extracomment>
<translation>Cwtch Einstellungen</translation> <translation>Cwtch Einstellungen</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="28"/> <location filename="../qml/panes/SettingsPane.qml" line="46"/>
<source>version %1 builddate %2</source> <source>version %1 builddate %2</source>
<extracomment>Version: %1 Built on: %2</extracomment> <extracomment>Version: %1 Built on: %2</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="35"/> <location filename="../qml/panes/SettingsPane.qml" line="53"/>
<source>zoom-label</source> <source>zoom-label</source>
<extracomment>Interface zoom (mostly affects text and button sizes)</extracomment> <extracomment>Interface zoom (mostly affects text and button sizes)</extracomment>
<translation>Benutzeroberflächen-Zoom (betriftt hauptsächlich Text- und Knopgrößen)</translation> <translation>Benutzeroberflächen-Zoom (betriftt hauptsächlich Text- und Knopgrößen)</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="52"/> <location filename="../qml/panes/SettingsPane.qml" line="71"/>
<source>large-text-label</source> <source>large-text-label</source>
<translation>Groß</translation> <translation>Groß</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="58"/> <location filename="../qml/panes/SettingsPane.qml" line="79"/>
<source>default-scaling-text</source> <source>default-scaling-text</source>
<extracomment>&quot;Default size text (scale factor: &quot;</extracomment> <extracomment>&quot;Default size text (scale factor: &quot;</extracomment>
<translation>defaultmäßige Textgröße (Skalierungsfaktor:</translation> <translation>defaultmäßige Textgröße (Skalierungsfaktor:</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="62"/> <location filename="../qml/panes/SettingsPane.qml" line="83"/>
<source>small-text-label</source> <source>small-text-label</source>
<translation>Klein</translation> <translation>Klein</translation>
</message> </message>

BIN
i18n/translation_en.qm
View File

Binary file not shown.

77
i18n/translation_en.ts
View File

@ -4,30 +4,30 @@
<context> <context>
<name>AddGroupPane</name> <name>AddGroupPane</name>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="17"/> <location filename="../qml/panes/AddGroupPane.qml" line="19"/>
<source>create-group-title</source> <source>create-group-title</source>
<translation>Create Group</translation> <translation>Create Group</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="27"/> <location filename="../qml/panes/AddGroupPane.qml" line="42"/>
<source>server-label</source> <source>server-label</source>
<extracomment>Server label</extracomment> <extracomment>Server label</extracomment>
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="38"/> <location filename="../qml/panes/AddGroupPane.qml" line="53"/>
<source>group-name-label</source> <source>group-name-label</source>
<extracomment>Group name label</extracomment> <extracomment>Group name label</extracomment>
<translation>Group name</translation> <translation>Group name</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="45"/> <location filename="../qml/panes/AddGroupPane.qml" line="60"/>
<source>default-group-name</source> <source>default-group-name</source>
<extracomment>default suggested group name</extracomment> <extracomment>default suggested group name</extracomment>
<translation>Awesome Group</translation> <translation>Awesome Group</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="50"/> <location filename="../qml/panes/AddGroupPane.qml" line="65"/>
<source>create-group-btn</source> <source>create-group-btn</source>
<extracomment>create group button</extracomment> <extracomment>create group button</extracomment>
<translation>Create</translation> <translation>Create</translation>
@ -36,18 +36,18 @@
<context> <context>
<name>BulletinOverlay</name> <name>BulletinOverlay</name>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="181"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="204"/>
<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="193"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="216"/>
<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="199"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="222"/>
<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>
@ -56,44 +56,44 @@
<context> <context>
<name>GroupSettingsPane</name> <name>GroupSettingsPane</name>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="30"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="42"/>
<source>server-label</source> <source>server-label</source>
<translation>Server</translation> <translation>Server</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="41"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="53"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="62"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="74"/>
<source>copy-btn</source> <source>copy-btn</source>
<translation>Copy</translation> <translation>Copy</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="51"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="63"/>
<source>invitation-label</source> <source>invitation-label</source>
<translation>Invitation</translation> <translation>Invitation</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="72"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="84"/>
<source>group-name-label</source> <source>group-name-label</source>
<translation>Group Name</translation> <translation>Group Name</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="81"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="93"/>
<source>save-btn</source> <source>save-btn</source>
<translation>Save</translation> <translation>Save</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="91"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="103"/>
<source>invite-to-group-label</source> <source>invite-to-group-label</source>
<extracomment>Invite someone to the group</extracomment> <extracomment>Invite someone to the group</extracomment>
<translation>Invite to group</translation> <translation>Invite to group</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="102"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="114"/>
<source>invite-btn</source> <source>invite-btn</source>
<translation>Invite</translation> <translation>Invite</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="111"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="123"/>
<source>delete-btn</source> <source>delete-btn</source>
<translation>Delete</translation> <translation>Delete</translation>
</message> </message>
@ -101,19 +101,19 @@
<context> <context>
<name>ListOverlay</name> <name>ListOverlay</name>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="162"/> <location filename="../qml/overlays/ListOverlay.qml" line="184"/>
<source>add-list-item</source> <source>add-list-item</source>
<extracomment>Add a New List Item</extracomment> <extracomment>Add a New List Item</extracomment>
<translation>Add a New List Item</translation> <translation>Add a New List Item</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="174"/> <location filename="../qml/overlays/ListOverlay.qml" line="196"/>
<source>add-new-item</source> <source>add-new-item</source>
<extracomment>Add a new item to the list</extracomment> <extracomment>Add a new item to the list</extracomment>
<translation>Add a new item to the list</translation> <translation>Add a new item to the list</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="180"/> <location filename="../qml/overlays/ListOverlay.qml" line="202"/>
<source>todo-placeholder</source> <source>todo-placeholder</source>
<extracomment>Todo... placeholder text</extracomment> <extracomment>Todo... placeholder text</extracomment>
<translation>Todo...</translation> <translation>Todo...</translation>
@ -131,24 +131,24 @@
<context> <context>
<name>Message</name> <name>Message</name>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="55"/> <location filename="../qml/widgets/Message.qml" line="56"/>
<source>dm-tooltip</source> <source>dm-tooltip</source>
<extracomment>Click to DM</extracomment> <extracomment>Click to DM</extracomment>
<translation>Click to DM</translation> <translation>Click to DM</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<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="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<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="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<source>pending-label</source> <source>pending-label</source>
<translation>Pending</translation> <translation>Pending</translation>
</message> </message>
@ -224,33 +224,38 @@
<context> <context>
<name>PeerSettingsPane</name> <name>PeerSettingsPane</name>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="29"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="42"/>
<source>address-label</source> <source>address-label</source>
<translation>Address</translation> <translation>Address</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="40"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
<source>copy-btn</source> <source>copy-btn</source>
<translation>Copy</translation> <translation>Copy</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="44"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="57"/>
<source>copied-to-clipboard-notification</source> <source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment> <extracomment>notification: copied to clipboard</extracomment>
<translation>Copied to Clipboard</translation> <translation>Copied to Clipboard</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="51"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="64"/>
<source>display-name-label</source> <source>display-name-label</source>
<translation>Display Name</translation> <translation>Display Name</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="60"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="73"/>
<source>save-btn</source> <source>save-btn</source>
<translation>Save</translation> <translation>Save</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="71"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="85"/>
<source>block-btn</source>
<translation>Block Peer</translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="94"/>
<source>delete-btn</source> <source>delete-btn</source>
<translation>Delete</translation> <translation>Delete</translation>
</message> </message>
@ -258,36 +263,36 @@
<context> <context>
<name>SettingsPane</name> <name>SettingsPane</name>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="18"/> <location filename="../qml/panes/SettingsPane.qml" line="20"/>
<source>cwtch-settings-title</source> <source>cwtch-settings-title</source>
<extracomment>Cwtch Settings title</extracomment> <extracomment>Cwtch Settings title</extracomment>
<translation>Cwtch Settings</translation> <translation>Cwtch Settings</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="28"/> <location filename="../qml/panes/SettingsPane.qml" line="46"/>
<source>version %1 builddate %2</source> <source>version %1 builddate %2</source>
<extracomment>Version: %1 Built on: %2</extracomment> <extracomment>Version: %1 Built on: %2</extracomment>
<translation>Version: %1 Built on: %2</translation> <translation>Version: %1 Built on: %2</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="35"/> <location filename="../qml/panes/SettingsPane.qml" line="53"/>
<source>zoom-label</source> <source>zoom-label</source>
<extracomment>Interface zoom (mostly affects text and button sizes)</extracomment> <extracomment>Interface zoom (mostly affects text and button sizes)</extracomment>
<translation>Interface zoom (mostly affects text and button sizes)</translation> <translation>Interface zoom (mostly affects text and button sizes)</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="52"/> <location filename="../qml/panes/SettingsPane.qml" line="71"/>
<source>large-text-label</source> <source>large-text-label</source>
<translation>Large</translation> <translation>Large</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="58"/> <location filename="../qml/panes/SettingsPane.qml" line="79"/>
<source>default-scaling-text</source> <source>default-scaling-text</source>
<extracomment>&quot;Default size text (scale factor: &quot;</extracomment> <extracomment>&quot;Default size text (scale factor: &quot;</extracomment>
<translation>Default size text (scale factor:</translation> <translation>Default size text (scale factor:</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="62"/> <location filename="../qml/panes/SettingsPane.qml" line="83"/>
<source>small-text-label</source> <source>small-text-label</source>
<translation>Small</translation> <translation>Small</translation>
</message> </message>

77
i18n/translation_fr.ts
View File

@ -4,30 +4,30 @@
<context> <context>
<name>AddGroupPane</name> <name>AddGroupPane</name>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="17"/> <location filename="../qml/panes/AddGroupPane.qml" line="19"/>
<source>create-group-title</source> <source>create-group-title</source>
<translation>Créer un groupe</translation> <translation>Créer un groupe</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="27"/> <location filename="../qml/panes/AddGroupPane.qml" line="42"/>
<source>server-label</source> <source>server-label</source>
<extracomment>Server label</extracomment> <extracomment>Server label</extracomment>
<translation>Serveur</translation> <translation>Serveur</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="38"/> <location filename="../qml/panes/AddGroupPane.qml" line="53"/>
<source>group-name-label</source> <source>group-name-label</source>
<extracomment>Group name label</extracomment> <extracomment>Group name label</extracomment>
<translation>Groupe</translation> <translation>Groupe</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="45"/> <location filename="../qml/panes/AddGroupPane.qml" line="60"/>
<source>default-group-name</source> <source>default-group-name</source>
<extracomment>default suggested group name</extracomment> <extracomment>default suggested group name</extracomment>
<translation>Un super groupe</translation> <translation>Un super groupe</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="50"/> <location filename="../qml/panes/AddGroupPane.qml" line="65"/>
<source>create-group-btn</source> <source>create-group-btn</source>
<extracomment>create group button</extracomment> <extracomment>create group button</extracomment>
<translation>Créer</translation> <translation>Créer</translation>
@ -36,18 +36,18 @@
<context> <context>
<name>BulletinOverlay</name> <name>BulletinOverlay</name>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="181"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="204"/>
<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="193"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="216"/>
<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="199"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="222"/>
<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>
@ -56,44 +56,44 @@
<context> <context>
<name>GroupSettingsPane</name> <name>GroupSettingsPane</name>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="30"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="42"/>
<source>server-label</source> <source>server-label</source>
<translation>Serveur</translation> <translation>Serveur</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="41"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="53"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="62"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="74"/>
<source>copy-btn</source> <source>copy-btn</source>
<translation>Copier</translation> <translation>Copier</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="51"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="63"/>
<source>invitation-label</source> <source>invitation-label</source>
<translation>Invitation</translation> <translation>Invitation</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="72"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="84"/>
<source>group-name-label</source> <source>group-name-label</source>
<translation>Nom du groupe</translation> <translation>Nom du groupe</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="81"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="93"/>
<source>save-btn</source> <source>save-btn</source>
<translation>Sauvegarder</translation> <translation>Sauvegarder</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="91"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="103"/>
<source>invite-to-group-label</source> <source>invite-to-group-label</source>
<extracomment>Invite someone to the group</extracomment> <extracomment>Invite someone to the group</extracomment>
<translation>Inviter quelqu&apos;un</translation> <translation>Inviter quelqu&apos;un</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="102"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="114"/>
<source>invite-btn</source> <source>invite-btn</source>
<translation>Invitation</translation> <translation>Invitation</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="111"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="123"/>
<source>delete-btn</source> <source>delete-btn</source>
<translation>Effacer</translation> <translation>Effacer</translation>
</message> </message>
@ -101,19 +101,19 @@
<context> <context>
<name>ListOverlay</name> <name>ListOverlay</name>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="162"/> <location filename="../qml/overlays/ListOverlay.qml" line="184"/>
<source>add-list-item</source> <source>add-list-item</source>
<extracomment>Add a New List Item</extracomment> <extracomment>Add a New List Item</extracomment>
<translation>Ajouter un nouvel élément</translation> <translation>Ajouter un nouvel élément</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="174"/> <location filename="../qml/overlays/ListOverlay.qml" line="196"/>
<source>add-new-item</source> <source>add-new-item</source>
<extracomment>Add a new item to the list</extracomment> <extracomment>Add a new item to the list</extracomment>
<translation>Ajouter un nouvel élément à la liste</translation> <translation>Ajouter un nouvel élément à la liste</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="180"/> <location filename="../qml/overlays/ListOverlay.qml" line="202"/>
<source>todo-placeholder</source> <source>todo-placeholder</source>
<extracomment>Todo... placeholder text</extracomment> <extracomment>Todo... placeholder text</extracomment>
<translation>A faire...</translation> <translation>A faire...</translation>
@ -131,24 +131,24 @@
<context> <context>
<name>Message</name> <name>Message</name>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="55"/> <location filename="../qml/widgets/Message.qml" line="56"/>
<source>dm-tooltip</source> <source>dm-tooltip</source>
<extracomment>Click to DM</extracomment> <extracomment>Click to DM</extracomment>
<translation>Envoyer un message privé</translation> <translation>Envoyer un message privé</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<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="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<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="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<source>pending-label</source> <source>pending-label</source>
<translation>En attente</translation> <translation>En attente</translation>
</message> </message>
@ -224,33 +224,38 @@
<context> <context>
<name>PeerSettingsPane</name> <name>PeerSettingsPane</name>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="29"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="42"/>
<source>address-label</source> <source>address-label</source>
<translation>Adresse</translation> <translation>Adresse</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="40"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
<source>copy-btn</source> <source>copy-btn</source>
<translation>Copier</translation> <translation>Copier</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="44"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="57"/>
<source>copied-to-clipboard-notification</source> <source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment> <extracomment>notification: copied to clipboard</extracomment>
<translation>Copié dans le presse-papier</translation> <translation>Copié dans le presse-papier</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="51"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="64"/>
<source>display-name-label</source> <source>display-name-label</source>
<translation>Pseudo</translation> <translation>Pseudo</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="60"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="73"/>
<source>save-btn</source> <source>save-btn</source>
<translation>Sauvegarder</translation> <translation>Sauvegarder</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="71"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="85"/>
<source>block-btn</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="94"/>
<source>delete-btn</source> <source>delete-btn</source>
<translation>Effacer</translation> <translation>Effacer</translation>
</message> </message>
@ -258,36 +263,36 @@
<context> <context>
<name>SettingsPane</name> <name>SettingsPane</name>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="18"/> <location filename="../qml/panes/SettingsPane.qml" line="20"/>
<source>cwtch-settings-title</source> <source>cwtch-settings-title</source>
<extracomment>Cwtch Settings title</extracomment> <extracomment>Cwtch Settings title</extracomment>
<translation>Préférences Cwtch</translation> <translation>Préférences Cwtch</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="28"/> <location filename="../qml/panes/SettingsPane.qml" line="46"/>
<source>version %1 builddate %2</source> <source>version %1 builddate %2</source>
<extracomment>Version: %1 Built on: %2</extracomment> <extracomment>Version: %1 Built on: %2</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="35"/> <location filename="../qml/panes/SettingsPane.qml" line="53"/>
<source>zoom-label</source> <source>zoom-label</source>
<extracomment>Interface zoom (mostly affects text and button sizes)</extracomment> <extracomment>Interface zoom (mostly affects text and button sizes)</extracomment>
<translation>Interface zoom (essentiellement la taille du texte et des composants de l&apos;interface)</translation> <translation>Interface zoom (essentiellement la taille du texte et des composants de l&apos;interface)</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="52"/> <location filename="../qml/panes/SettingsPane.qml" line="71"/>
<source>large-text-label</source> <source>large-text-label</source>
<translation type="unfinished">Large</translation> <translation type="unfinished">Large</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="58"/> <location filename="../qml/panes/SettingsPane.qml" line="79"/>
<source>default-scaling-text</source> <source>default-scaling-text</source>
<extracomment>&quot;Default size text (scale factor: &quot;</extracomment> <extracomment>&quot;Default size text (scale factor: &quot;</extracomment>
<translation>Taille par défaut du texte (échelle:</translation> <translation>Taille par défaut du texte (échelle:</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="62"/> <location filename="../qml/panes/SettingsPane.qml" line="83"/>
<source>small-text-label</source> <source>small-text-label</source>
<translation>Petit</translation> <translation>Petit</translation>
</message> </message>

77
i18n/translation_pt.ts
View File

@ -4,30 +4,30 @@
<context> <context>
<name>AddGroupPane</name> <name>AddGroupPane</name>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="17"/> <location filename="../qml/panes/AddGroupPane.qml" line="19"/>
<source>create-group-title</source> <source>create-group-title</source>
<translation>Criar Grupo</translation> <translation>Criar Grupo</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="27"/> <location filename="../qml/panes/AddGroupPane.qml" line="42"/>
<source>server-label</source> <source>server-label</source>
<extracomment>Server label</extracomment> <extracomment>Server label</extracomment>
<translation>Servidor</translation> <translation>Servidor</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="38"/> <location filename="../qml/panes/AddGroupPane.qml" line="53"/>
<source>group-name-label</source> <source>group-name-label</source>
<extracomment>Group name label</extracomment> <extracomment>Group name label</extracomment>
<translation>Nome do grupo</translation> <translation>Nome do grupo</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="45"/> <location filename="../qml/panes/AddGroupPane.qml" line="60"/>
<source>default-group-name</source> <source>default-group-name</source>
<extracomment>default suggested group name</extracomment> <extracomment>default suggested group name</extracomment>
<translation>Grupo incrível</translation> <translation>Grupo incrível</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/AddGroupPane.qml" line="50"/> <location filename="../qml/panes/AddGroupPane.qml" line="65"/>
<source>create-group-btn</source> <source>create-group-btn</source>
<extracomment>create group button</extracomment> <extracomment>create group button</extracomment>
<translation>Criar</translation> <translation>Criar</translation>
@ -36,18 +36,18 @@
<context> <context>
<name>BulletinOverlay</name> <name>BulletinOverlay</name>
<message> <message>
<location filename="../qml/overlays/BulletinOverlay.qml" line="181"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="204"/>
<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="193"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="216"/>
<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="199"/> <location filename="../qml/overlays/BulletinOverlay.qml" line="222"/>
<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>
@ -56,44 +56,44 @@
<context> <context>
<name>GroupSettingsPane</name> <name>GroupSettingsPane</name>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="30"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="42"/>
<source>server-label</source> <source>server-label</source>
<translation>Servidor</translation> <translation>Servidor</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="41"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="53"/>
<location filename="../qml/panes/GroupSettingsPane.qml" line="62"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="74"/>
<source>copy-btn</source> <source>copy-btn</source>
<translation>Copiar</translation> <translation>Copiar</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="51"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="63"/>
<source>invitation-label</source> <source>invitation-label</source>
<translation>Convite</translation> <translation>Convite</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="72"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="84"/>
<source>group-name-label</source> <source>group-name-label</source>
<translation>Nome do Grupo</translation> <translation>Nome do Grupo</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="81"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="93"/>
<source>save-btn</source> <source>save-btn</source>
<translation>Salvar</translation> <translation>Salvar</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="91"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="103"/>
<source>invite-to-group-label</source> <source>invite-to-group-label</source>
<extracomment>Invite someone to the group</extracomment> <extracomment>Invite someone to the group</extracomment>
<translation>Convidar ao grupo</translation> <translation>Convidar ao grupo</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="102"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="114"/>
<source>invite-btn</source> <source>invite-btn</source>
<translation>Convidar</translation> <translation>Convidar</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/GroupSettingsPane.qml" line="111"/> <location filename="../qml/panes/GroupSettingsPane.qml" line="123"/>
<source>delete-btn</source> <source>delete-btn</source>
<translation>Deletar</translation> <translation>Deletar</translation>
</message> </message>
@ -101,19 +101,19 @@
<context> <context>
<name>ListOverlay</name> <name>ListOverlay</name>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="162"/> <location filename="../qml/overlays/ListOverlay.qml" line="184"/>
<source>add-list-item</source> <source>add-list-item</source>
<extracomment>Add a New List Item</extracomment> <extracomment>Add a New List Item</extracomment>
<translation>Adicionar Item à Lista</translation> <translation>Adicionar Item à Lista</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="174"/> <location filename="../qml/overlays/ListOverlay.qml" line="196"/>
<source>add-new-item</source> <source>add-new-item</source>
<extracomment>Add a new item to the list</extracomment> <extracomment>Add a new item to the list</extracomment>
<translation>Adicionar novo item à lista</translation> <translation>Adicionar novo item à lista</translation>
</message> </message>
<message> <message>
<location filename="../qml/overlays/ListOverlay.qml" line="180"/> <location filename="../qml/overlays/ListOverlay.qml" line="202"/>
<source>todo-placeholder</source> <source>todo-placeholder</source>
<extracomment>Todo... placeholder text</extracomment> <extracomment>Todo... placeholder text</extracomment>
<translation>Afazer…</translation> <translation>Afazer…</translation>
@ -131,24 +131,24 @@
<context> <context>
<name>Message</name> <name>Message</name>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="55"/> <location filename="../qml/widgets/Message.qml" line="56"/>
<source>dm-tooltip</source> <source>dm-tooltip</source>
<extracomment>Click to DM</extracomment> <extracomment>Click to DM</extracomment>
<translation>Clique para DM</translation> <translation>Clique para DM</translation>
</message> </message>
<message> <message>
<location filename="../qml/widgets/Message.qml" line="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<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="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<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="154"/> <location filename="../qml/widgets/Message.qml" line="161"/>
<source>pending-label</source> <source>pending-label</source>
<translation>Pendente</translation> <translation>Pendente</translation>
</message> </message>
@ -224,33 +224,38 @@
<context> <context>
<name>PeerSettingsPane</name> <name>PeerSettingsPane</name>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="29"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="42"/>
<source>address-label</source> <source>address-label</source>
<translation>Endereço</translation> <translation>Endereço</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="40"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="53"/>
<source>copy-btn</source> <source>copy-btn</source>
<translation>Copiar</translation> <translation>Copiar</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="44"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="57"/>
<source>copied-to-clipboard-notification</source> <source>copied-to-clipboard-notification</source>
<extracomment>notification: copied to clipboard</extracomment> <extracomment>notification: copied to clipboard</extracomment>
<translation>Copiado</translation> <translation>Copiado</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="51"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="64"/>
<source>display-name-label</source> <source>display-name-label</source>
<translation>Nome de Exibição</translation> <translation>Nome de Exibição</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="60"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="73"/>
<source>save-btn</source> <source>save-btn</source>
<translation>Salvar</translation> <translation>Salvar</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="71"/> <location filename="../qml/panes/PeerSettingsPane.qml" line="85"/>
<source>block-btn</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../qml/panes/PeerSettingsPane.qml" line="94"/>
<source>delete-btn</source> <source>delete-btn</source>
<translation>Deletar</translation> <translation>Deletar</translation>
</message> </message>
@ -258,36 +263,36 @@
<context> <context>
<name>SettingsPane</name> <name>SettingsPane</name>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="18"/> <location filename="../qml/panes/SettingsPane.qml" line="20"/>
<source>cwtch-settings-title</source> <source>cwtch-settings-title</source>
<extracomment>Cwtch Settings title</extracomment> <extracomment>Cwtch Settings title</extracomment>
<translation>Configurações do Cwtch</translation> <translation>Configurações do Cwtch</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="28"/> <location filename="../qml/panes/SettingsPane.qml" line="46"/>
<source>version %1 builddate %2</source> <source>version %1 builddate %2</source>
<extracomment>Version: %1 Built on: %2</extracomment> <extracomment>Version: %1 Built on: %2</extracomment>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="35"/> <location filename="../qml/panes/SettingsPane.qml" line="53"/>
<source>zoom-label</source> <source>zoom-label</source>
<extracomment>Interface zoom (mostly affects text and button sizes)</extracomment> <extracomment>Interface zoom (mostly affects text and button sizes)</extracomment>
<translation>Zoom da interface (afeta principalmente tamanho de texto e botões)</translation> <translation>Zoom da interface (afeta principalmente tamanho de texto e botões)</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="52"/> <location filename="../qml/panes/SettingsPane.qml" line="71"/>
<source>large-text-label</source> <source>large-text-label</source>
<translation>Grande</translation> <translation>Grande</translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="58"/> <location filename="../qml/panes/SettingsPane.qml" line="79"/>
<source>default-scaling-text</source> <source>default-scaling-text</source>
<extracomment>&quot;Default size text (scale factor: &quot;</extracomment> <extracomment>&quot;Default size text (scale factor: &quot;</extracomment>
<translation>Texto tamanho padrão (fator de escala: </translation> <translation>Texto tamanho padrão (fator de escala: </translation>
</message> </message>
<message> <message>
<location filename="../qml/panes/SettingsPane.qml" line="62"/> <location filename="../qml/panes/SettingsPane.qml" line="83"/>
<source>small-text-label</source> <source>small-text-label</source>
<translation>Pequeno</translation> <translation>Pequeno</translation>
</message> </message>

1
qml/overlays/MembershipOverlay.qml
View File

@ -106,6 +106,7 @@ ColumnLayout {
displayName: _displayName displayName: _displayName
image: _image image: _image
trusted: true trusted: true
blocked: false
background: false background: false
} }
} }

10
qml/panes/PeerSettingsPane.qml
View File

@ -79,6 +79,16 @@ ColumnLayout { // peerSettingsPane
} }
} }
SimpleButton {
icon: "solid/hand-paper"
text: qsTr("block-btn")
onClicked: {
gcd.blockPeer(txtOnion.text)
}
}
SimpleButton { SimpleButton {
icon: "regular/trash-alt" icon: "regular/trash-alt"
text: qsTr("delete-btn") text: qsTr("delete-btn")

8
qml/widgets/ContactList.qml
View File

@ -47,17 +47,18 @@ ColumnLayout {
Connections { // ADD/REMOVE CONTACT ENTRIES Connections { // ADD/REMOVE CONTACT ENTRIES
target: gcd target: gcd
onAddContact: function(handle, displayName, image, server, badge, status, trusted, loading) { onAddContact: function(handle, displayName, image, server, badge, status, trusted, blocked, loading) {
contactsModel.append({ contactsModel.append({
"_handle": handle, "_handle": handle,
"_displayName": displayName, "_displayName": displayName + (blocked ? " (blocked)" : "" ),
"_image": image, "_image": image,
"_server": server, "_server": server,
"_badge": badge, "_badge": badge,
"_status": status, "_status": status,
"_trusted": trusted, "_trusted": trusted,
"_deleted": false, "_deleted": false,
"_loading": loading "_loading": loading,
"_blocked": blocked
}) })
} }
@ -88,6 +89,7 @@ ColumnLayout {
badge: _badge badge: _badge
status: _status status: _status
trusted: _trusted trusted: _trusted
blocked: _blocked
deleted: _deleted deleted: _deleted
loading: _loading loading: _loading
} }

8
qml/widgets/ContactRow.qml
View File

@ -24,6 +24,7 @@ Item { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
property bool isActive property bool isActive
property bool isHover property bool isHover
property bool trusted property bool trusted
property bool blocked
property bool deleted property bool deleted
property bool loading property bool loading
property alias status: imgProfile.status property alias status: imgProfile.status
@ -54,6 +55,7 @@ Item { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
font.pixelSize: 16 * gcd.themeScale font.pixelSize: 16 * gcd.themeScale
font.italic: !trusted font.italic: !trusted
font.strikeout: blocked
textFormat: Text.PlainText textFormat: Text.PlainText
//fontSizeMode: Text.HorizontalFit //fontSizeMode: Text.HorizontalFit
elide: Text.ElideRight elide: Text.ElideRight
@ -143,16 +145,18 @@ Item { // LOTS OF NESTING TO DEAL WITH QT WEIRDNESS, SORRY
isActive = false isActive = false
} }
onUpdateContact: function(_handle, _displayName, _image, _server, _badge, _status, _trusted, _loading) { onUpdateContact: function(_handle, _displayName, _image, _server, _badge, _status, _trusted, _blocked, _loading) {
if (handle == _handle) { if (handle == _handle) {
displayName = _displayName displayName = _displayName + (_blocked == true ? " (blocked)" : "")
image = _image image = _image
server = _server server = _server
badge = _badge badge = _badge
status = _status status = _status
trusted = _trusted trusted = _trusted
blocked = _blocked
loading = _loading loading = _loading
if (loading == true) { if (loading == true) {
loadingProgress.visible = true loadingProgress.visible = true
loadingProgress.running = true loadingProgress.running = true