Commit faa88819 authored by Yann Leboulanger's avatar Yann Leboulanger
Browse files

improve some strings

parent f7d9c167
......@@ -3,11 +3,11 @@ Categories=Network;InstantMessaging;GTK;GNOME;
Name=Gajim
GenericName=Jabber IM Client
Comment=A GTK+ Jabber client
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
#Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
Keywords=chat;messaging;im;xmpp;bonjour;voip;
Version=1.0
Exec=gajim %u
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
#Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=org.gajim.Gajim
StartupNotify=true
StartupWMClass=Gajim
......
......@@ -922,7 +922,7 @@ def print_esession_details(self):
if not self.session.verified_identity:
ChatControlBase.print_conversation_line(self, _("Remote contact's identity not verified. Click the shield button for more details."), 'status', '', None)
else:
msg = _('E2E encryption disabled')
msg = _('end-to-end encryption disabled')
ChatControlBase.print_conversation_line(self, msg, 'status', '', None)
self._show_lock_image(e2e_is_active, 'E2E',
......
......@@ -1170,8 +1170,8 @@ def _on_ok(c):
contact = app.contacts.get_contact(self.account, gc_contact.jid)
if not contact or contact.sub not in ('both', 'to'):
prim_text = _('Really send file?')
sec_text = _('If you send a file to %s, he/she will know your '
'real JID.') % gc_contact.name
sec_text = _('If you send a file to %s, your real JID will '
'be revealed.') % gc_contact.name
dialog = dialogs.NonModalConfirmationDialog(prim_text,
sec_text, on_response_ok=(_on_ok, gc_contact))
dialog.popup()
......
......@@ -296,7 +296,7 @@ def invite(self, jid, reason):
'room_jid': self.room_jid}
@command(raw=True, empty=True)
@doc(_("Join a group chat given by a jid"))
@doc(_("Join a group chat given by a JID"))
def join(self, jid):
if '@' not in jid:
jid = jid + '@' + app.get_server_from_jid(self.room_jid)
......@@ -310,9 +310,9 @@ def leave(self, reason):
@command(raw=True, empty=True)
@doc(_("""
Ban user by a nick or a jid from a groupchat
Ban user by a nick or a JID from a groupchat
If given nickname is not found it will be treated as a jid.
If given nickname is not found it will be treated as a JID.
"""))
def ban(self, who, reason):
if who in app.contacts.get_nick_list(self.account, self.room_jid):
......
This diff is collapsed.
......@@ -121,7 +121,7 @@ def make_bin_from_config(self, config_key, pipeline, text):
InformationEvent(
None, conn=self.session.connection, level='error',
pri_txt=_('%s configuration error') % text.capitalize(),
sec_txt=_('Couldn’t setup %(text)s. Check your '
sec_txt=_('Couldn’t set up %(text)s. Check your '
'configuration.\n\nPipeline was:\n%(pipeline)s\n\n'
'Error was:\n%(error)s') % {'text': text,
'pipeline': pipeline, 'error': str(e)}))
......
......@@ -213,7 +213,7 @@
'street': _('street'),
'text': _('text'),
'timestamp': _('timestamp'),
'uri': _('uri')}
'uri': _('URI')}
from gi.repository import GLib
......
......@@ -802,7 +802,7 @@ audio-mic-volume-low</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Choose an encryption</property>
<property name="tooltip_text" translatable="yes">Choose encryption</property>
<property name="relief">none</property>
<child>
<placeholder/>
......
......@@ -280,7 +280,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="tooltip_text" translatable="yes">Choose an encryption</property>
<property name="tooltip_text" translatable="yes">Choose encryption</property>
<property name="relief">none</property>
<child>
<placeholder/>
......
......@@ -48,7 +48,7 @@
<object class="GtkSwitch" id="autojoin_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Join this Groupchat everytime Gajim is started</property>
<property name="tooltip_text" translatable="yes">Join this Groupchat every time Gajim is started</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="active">True</property>
......
......@@ -75,7 +75,7 @@
</child>
<child>
<object class="GtkButton" id="install_plugin_button">
<property name="label" translatable="yes">Install from zip</property>
<property name="label" translatable="yes">Install from ZIP</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
......
......@@ -2659,7 +2659,7 @@ to discover one from server.</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using End-to-End encryption the remote party has to agree on logging, else the messages will not be logged.</property>
<property name="tooltip_text" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using end-to-end encryption the remote party has to agree on logging, else the messages will not be logged.</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
......
......@@ -21,7 +21,7 @@
<object class="GtkShortcutsShortcut">
<property name="visible">1</property>
<property name="accelerator">&lt;shift&gt;Return &lt;ctrl&gt;Return</property>
<property name="title" translatable="yes">Create a new line</property>
<property name="title" translatable="yes">Add new line</property>
</object>
</child>
<child>
......@@ -42,7 +42,7 @@
<object class="GtkShortcutsShortcut">
<property name="visible">1</property>
<property name="accelerator">&lt;ctrl&gt;Up</property>
<property name="title" translatable="yes">Previous sent message</property>
<property name="title" translatable="yes">Previously sent message</property>
</object>
</child>
<child>
......
......@@ -155,7 +155,7 @@
'unsecure-error': Message(
_('Unsecure'),
_('Server returned unsecure transport (http)'),
_('Server returned unsecure transport (HTTP)'),
ErrorDialog),
'httpupload-response-error': Message(
......@@ -170,7 +170,7 @@
'httpupload-encryption-not-available': Message(
_('Encryption Error'),
_('For the choosen encryption is no encryption method available'),
_('For the choosen encryption there is no encryption method available'),
ErrorDialog),
}
......
......@@ -4073,9 +4073,9 @@ def _nec_archiving_error(self, obj=None):
except Exception as e:
log.debug(e)
if not obj:
msg = _('We got no response from the Server')
msg = _('No response from the Server')
else:
msg = _('We received an error: {}').format(self.error_msg)
msg = _('Error received: {}').format(self.error_msg)
dialog = HigDialog(
self.window, Gtk.MessageType.INFO, Gtk.ButtonsType.OK,
......@@ -5369,7 +5369,7 @@ def __init__(self, parent, account, cert):
<b>Fingerprint</b>
SHA-1 Fingerprint: %(sha1)s
SHA256 Fingerprint: %(sha256)s
SHA-256 Fingerprint: %(sha256)s
''') % {
'scn': subject.commonName, 'sorg': subject.organizationName,
'sou': subject.organizationalUnitName,
......@@ -5456,15 +5456,15 @@ def _on_httpupload_progress(self, obj):
if self.file != obj.file:
return
if obj.status == 'request':
self.label.set_text(_('Requesting HTTP Upload Slot...'))
self.label.set_text(_('Requesting HTTP Upload Slot'))
elif obj.status == 'close':
self.destroy()
elif obj.status == 'upload':
self.label.set_text(_('Uploading file via HTTP File Upload...'))
self.label.set_text(_('Uploading file via HTTP File Upload'))
elif obj.status == 'update':
self.update_progress(obj.seen, obj.total)
elif obj.status == 'encrypt':
self.label.set_text(_('Encrypting file...'))
self.label.set_text(_('Encrypting file'))
def _pulse_progressbar(self):
self.progressbar.pulse()
......
......@@ -48,14 +48,14 @@ def __init__(self):
_('Bonjour / Zeroconf'): (self.zeroconf_available,
_('Serverless chatting with autodetected clients in a local network.'),
_('Requires python-avahi.'),
_('Requires pybonjour and bonjour SDK running (http://developer.apple.com/opensource/).')),
_('Requires pybonjour and bonjour SDK running (https://developer.apple.com/opensource/).')),
_('Command line'): (self.dbus_available,
_('A script to control Gajim via commandline.'),
_('Requires python-dbus.'),
_('Feature not available under Windows.')),
_('OpenPGP message encryption'): (self.gpg_available,
_('Ability to encrypting chat messages with OpenPGP.'),
_('Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/).'),
_('Requires gpg and python-gnupg (%(url)s).') % {'url': 'https://bitbucket.org/vinay.sajip/python-gnupg'},
_('Requires gpg.exe in PATH.')),
_('Password encryption'): (self.some_keyring_available,
_('Passwords can be stored securely and not just in plaintext.'),
......
......@@ -78,7 +78,7 @@ def __init__(self):
self.add_main_option('separate', ord('s'), GLib.OptionFlags.NONE,
GLib.OptionArg.NONE,
_('Separate profile files completely (even '
'history db and plugins)'))
'history DB and plugins)'))
self.add_main_option('verbose', ord('v'), GLib.OptionFlags.NONE,
GLib.OptionArg.NONE,
_('Print XML stanzas and other debug '
......
......@@ -1389,7 +1389,7 @@ def on_cancel():
if obj.error_num in (18, 27):
checktext1 = _('Add this certificate to the list of trusted '
'certificates.\nSHA-1 fingerprint of the certificate:\n%(sha1)s'
'\nSHA256 fingerprint of the certificate:\n%(sha256)s') % \
'\nSHA-256 fingerprint of the certificate:\n%(sha256)s') % \
{'sha1': obj.fingerprint_sha1, 'sha256': obj.fingerprint_sha256}
else:
checktext1 = ''
......
......@@ -609,8 +609,8 @@ def get_transport_menu(contact, account):
def get_singlechat_menu(control_id):
singlechat_menu = [
(_('Send File…'), [
('win.send-file-httpupload-', _('Upload File…')),
('win.send-file-jingle-', _('Send File Directly…')),
('win.send-file-httpupload-', 'HTTP Upload'),
('win.send-file-jingle-', 'Jingle'),
]),
('win.invite-contacts-', _('Invite Contacts')),
('win.add-to-roster-', _('Add to Roster')),
......@@ -728,11 +728,11 @@ def get_account_menu(account):
sub menu: list
'''
account_menu = [
('-add-contact', _('Add Contact...')),
('-add-contact', _('Add Contact')),
('-join-groupchat', _('Join Group Chat')),
('-profile', _('Profile')),
('-services', _('Discover Services')),
('-start-single-chat', _('Send Single Message...')),
('-start-single-chat', _('Send Single Message')),
(_('Advanced'), [
('-archive', _('Archiving Preferences')),
('-sync-history', _('Synchronise History')),
......@@ -741,10 +741,10 @@ def get_account_menu(account):
('-xml-console', _('XML Console'))
]),
(_('Admin'), [
('-send-server-message', _('Send Server Message...')),
('-set-motd', _('Set MOTD...')),
('-update-motd', _('Update MOTD...')),
('-delete-motd', _('Delete MOTD...'))
('-send-server-message', _('Send Server Message')),
('-set-motd', _('Set MOTD')),
('-update-motd', _('Update MOTD')),
('-delete-motd', _('Delete MOTD'))
]),
]
......
......@@ -40,7 +40,7 @@ class MessageTextView(Gtk.TextView):
chat/groupchat windows
"""
UNDO_LIMIT = 20
PLACEHOLDER = _('Write a message..')
PLACEHOLDER = _('Write a message')
def __init__(self):
Gtk.TextView.__init__(self)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment