[Jeff Bailes] better strings
This commit is contained in:
parent
b84d073df2
commit
6f3cca4669
|
@ -2343,7 +2343,7 @@ class ChatControl(ChatControlBase):
|
||||||
pending_how_many, timeout, self.account)
|
pending_how_many, timeout, self.account)
|
||||||
except exceptions.DatabaseMalformed:
|
except exceptions.DatabaseMalformed:
|
||||||
dialogs.ErrorDialog(_('Database Error'),
|
dialogs.ErrorDialog(_('Database Error'),
|
||||||
_('The database file (%s) cannot be read. Try to repare it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH)
|
_('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH)
|
||||||
rows = []
|
rows = []
|
||||||
local_old_kind = None
|
local_old_kind = None
|
||||||
for row in rows: # row[0] time, row[1] has kind, row[2] the message
|
for row in rows: # row[0] time, row[1] has kind, row[2] the message
|
||||||
|
|
|
@ -35,7 +35,7 @@ MOODS = {
|
||||||
'contented': _('Contented'), 'cranky': _('Cranky'),
|
'contented': _('Contented'), 'cranky': _('Cranky'),
|
||||||
'curious': _('Curious'), 'depressed': _('Depressed'),
|
'curious': _('Curious'), 'depressed': _('Depressed'),
|
||||||
'disappointed': _('Disappointed'), 'disgusted': _('Disgusted'),
|
'disappointed': _('Disappointed'), 'disgusted': _('Disgusted'),
|
||||||
'distracted': _('Distracted'), 'embarrassed': _('Embarassed'),
|
'distracted': _('Distracted'), 'embarrassed': _('Embarrassed'),
|
||||||
'excited': _('Excited'), 'flirtatious': _('Flirtatious'),
|
'excited': _('Excited'), 'flirtatious': _('Flirtatious'),
|
||||||
'frustrated': _('Frustrated'), 'grumpy': _('Grumpy'),
|
'frustrated': _('Frustrated'), 'grumpy': _('Grumpy'),
|
||||||
'guilty': _('Guilty'), 'happy': _('Happy'),
|
'guilty': _('Guilty'), 'happy': _('Happy'),
|
||||||
|
|
|
@ -57,7 +57,7 @@ class FeaturesWindow:
|
||||||
_('Requires python-avahi.'),
|
_('Requires python-avahi.'),
|
||||||
_('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')),
|
_('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')),
|
||||||
_('gajim-remote'): (self.dbus_available,
|
_('gajim-remote'): (self.dbus_available,
|
||||||
_('A script to controle Gajim via commandline.'),
|
_('A script to control Gajim via commandline.'),
|
||||||
_('Requires python-dbus.'),
|
_('Requires python-dbus.'),
|
||||||
_('Feature not available under Windows.')),
|
_('Feature not available under Windows.')),
|
||||||
_('OpenGPG'): (self.gpg_available,
|
_('OpenGPG'): (self.gpg_available,
|
||||||
|
|
|
@ -168,7 +168,7 @@ try:
|
||||||
from common import gajim
|
from common import gajim
|
||||||
except exceptions.DatabaseMalformed:
|
except exceptions.DatabaseMalformed:
|
||||||
pritext = _('Database Error')
|
pritext = _('Database Error')
|
||||||
sectext = _('The database file (%s) cannot be read. Try to repare it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH
|
sectext = _('The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost).') % common.logger.LOG_DB_PATH
|
||||||
else:
|
else:
|
||||||
from common import dbus_support
|
from common import dbus_support
|
||||||
if dbus_support.supported:
|
if dbus_support.supported:
|
||||||
|
@ -1293,7 +1293,8 @@ class Interface:
|
||||||
# Standard way, the message comes from the occupant who set the subject
|
# Standard way, the message comes from the occupant who set the subject
|
||||||
text = None
|
text = None
|
||||||
if len(jids) > 1:
|
if len(jids) > 1:
|
||||||
text = _('%s has set the subject to %s') % (jids[1], array[1])
|
text = _('%(jid)s has set the subject to %(subject)s') % {
|
||||||
|
'jid': jids[1], 'subject': array[1]}
|
||||||
# Workaround for psi bug http://flyspray.psi-im.org/task/595 , to be
|
# Workaround for psi bug http://flyspray.psi-im.org/task/595 , to be
|
||||||
# deleted one day. We can receive a subject with a body that contains
|
# deleted one day. We can receive a subject with a body that contains
|
||||||
# "X has set the subject to Y" ...
|
# "X has set the subject to Y" ...
|
||||||
|
|
|
@ -3924,7 +3924,7 @@ class RosterWindow:
|
||||||
# Popup dialog to confirm sending
|
# Popup dialog to confirm sending
|
||||||
prim_text = 'Send file?'
|
prim_text = 'Send file?'
|
||||||
sec_text = i18n.ngettext('Do you want to send this file to %s:',
|
sec_text = i18n.ngettext('Do you want to send this file to %s:',
|
||||||
'Do you want to send those files to %s:', nb_uri) %\
|
'Do you want to send these files to %s:', nb_uri) %\
|
||||||
c_dest.get_shown_name()
|
c_dest.get_shown_name()
|
||||||
for uri in uri_splitted:
|
for uri in uri_splitted:
|
||||||
path = helpers.get_file_path_from_dnd_dropped_uri(uri)
|
path = helpers.get_file_path_from_dnd_dropped_uri(uri)
|
||||||
|
|
Loading…
Reference in New Issue