hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'OMEMO-Translations' into 'master'

Browse Source 
OMEMO Make some more strings translatable

See merge request gajim/gajim-plugins!57
This commit is contained in:
Yann Leboulanger
2017-12-23 21:36:26 +01:00
parent 5e31aefe27 e9ce75d735
commit e279d63af8
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
httpupload/httpupload.py
View File

@@ -274,7 +274,7 @@ class Base(object):
file.progress.close_dialog()
ErrorDialog(
_('Error'),
'For the choosen encryption is no encryption method available',
_('For the chosen encryption no encryption method is available'),
transient_for=file.control.parent_win.window)
def request_slot(self, file):

10
omemo/file_crypto.py
View File

@@ -144,8 +144,8 @@ class FileDecryption:
file.filepath = os.path.join(DIRECTORY, newfilename)
def finished(self, file):
question = 'Do you want to open %s' % file.filename
YesNoDialog('Open File', question,
question = _('Do you want to open %s') % file.filename
YesNoDialog(_('Open File'), question,
transient_for=self.window,
on_response_yes=(self.open_file, file.filepath))
return False
@@ -169,18 +169,18 @@ class Download:
self.download()
def download(self):
GLib.idle_add(self.progressbar.set_text, 'Downloading...')
GLib.idle_add(self.progressbar.set_text, _('Downloading...'))
data = self.load_url()
if isinstance(data, str):
GLib.idle_add(self.progressbar.close_dialog)
GLib.idle_add(self.error, data)
return
GLib.idle_add(self.progressbar.set_text, 'Decrypting...')
GLib.idle_add(self.progressbar.set_text, _('Decrypting...'))
decrypted_data = self.aes_decrypt(data)
GLib.idle_add(
self.progressbar.set_text, 'Writing file to harddisk...')
self.progressbar.set_text, _('Writing file to harddisk...'))
self.write_file(decrypted_data)
GLib.idle_add(self.progressbar.close_dialog)

4
omemo/omemo_connection.py
View File

@@ -493,8 +493,8 @@ class OMEMOConnection:
event.msg_iq.addChild(node=eme_node)
# Add Message for devices that dont support OMEMO
support_msg = 'You received a message encrypted with ' \
'OMEMO but your client doesnt support OMEMO.'
support_msg = _('You received a message encrypted with ' \
'OMEMO but your client doesnt support OMEMO.')
event.msg_iq.setBody(support_msg)
# Store Hint for MAM

26
omemo/ui.py
View File

@@ -192,10 +192,10 @@ class OMEMOConfigDialog(GajimPluginConfigDialog):
fpr = fpr[31:-12]
YesNoDialog(
'Delete Fingerprint?',
'Do you want to delete the '
'fingerprint of <b>{}</b> on your account <b>{}</b>?'
'\n\n<tt>{}</tt>'.format(jid, account, fpr),
_('Delete Fingerprint?'),
_('Do you want to delete the '
'fingerprint of <b>{jid}</b> on your account <b>{account}</b>?'
'\n\n<tt>{fingerprint}</tt>').format(jid=jid, account=account, fingerprint=fpr),
on_response_yes=on_yes, transient_for=self)
def trust_button_clicked_cb(self, button, *args):
@@ -223,10 +223,10 @@ class OMEMOConfigDialog(GajimPluginConfigDialog):
identity_key = record.getSessionState().getRemoteIdentityKey()
YesNoDialog(
'Trust / Revoke Fingerprint?',
'Do you want to trust the fingerprint of <b>{}</b> '
'on your account <b>{}</b>?\n\n'
'<tt>{}</tt>'.format(jid, account, fpr),
_('Trust / Revoke Fingerprint?'),
_('Do you want to trust the fingerprint of <b>{jid}</b> '
'on your account <b>{account}</b>?\n\n'
'<tt>{fingerprint}</tt>').format(jid=jid, account=account, fingerprint=fpr),
on_response_yes=(on_yes, identity_key),
on_response_no=(on_no, identity_key),
transient_for=self)
@@ -365,7 +365,7 @@ class FingerprintWindow(Gtk.Dialog):
self.omemostate = self.plugin.get_omemo(self.account)
self.own_jid = app.get_jid_from_account(self.account)
Gtk.Dialog.__init__(self,
title=('Fingerprints for %s') % contact.jid,
title=(_('Fingerprints for %s')) % contact.jid,
parent=parent,
flags=Gtk.DialogFlags.DESTROY_WITH_PARENT)
close_button = self.add_button(Gtk.STOCK_CLOSE, Gtk.ResponseType.CLOSE)
@@ -432,10 +432,10 @@ class FingerprintWindow(Gtk.Dialog):
identity_key = record.getSessionState().getRemoteIdentityKey()
YesNoDialog(
'Trust / Revoke Fingerprint?',
'Do you want to trust the fingerprint of <b>{}</b> '
'on your account <b>{}</b>?\n\n'
'<tt>{}</tt>'.format(jid, self.account, fpr),
_('Trust / Revoke Fingerprint?'),
_('Do you want to trust the fingerprint of <b>{jid}</b> '
'on your account <b>{account}</b>?\n\n'
'<tt>{fingerprint}</tt>').format(jid=jid, account=self.account, fingerprint=fpr),
on_response_yes=(on_yes, identity_key),
on_response_no=(on_no, identity_key),
transient_for=self)