Commit 47f94615 authored by Yann Leboulanger's avatar Yann Leboulanger

[Jeff Bailes] improved english strings

parent 6b223829
......@@ -670,7 +670,7 @@
<child>
<widget class="GtkCheckButton" id="send_keepalive_checkbutton">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">If checked, Gajim will send keep-alive packets so it prevents connection timeout which results in disconnection</property>
<property name="tooltip" translatable="yes">If checked, Gajim will send keep-alive packets to prevent connection timeout which results in disconnection</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Send keep-alive packets</property>
<property name="use_underline">True</property>
......
......@@ -19,6 +19,7 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<signal name="destroy" handler="on_accounts_window_destroy" last_modification_time="Sat, 02 Apr 2005 20:34:04 GMT"/>
<signal name="key_press_event" handler="on_accounts_window_key_press_event" last_modification_time="Wed, 25 May 2005 23:19:56 GMT"/>
......@@ -63,7 +64,7 @@
<child>
<widget class="GtkCheckButton" id="merge_checkbutton">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account</property>
<property name="tooltip" translatable="yes">If you have 2 or more accounts and this is checked, Gajim will list all contacts as if you had one account</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Mer_ge accounts</property>
<property name="use_underline">True</property>
......
......@@ -404,7 +404,7 @@
<child>
<widget class="GtkLabel" id="label224">
<property name="visible">True</property>
<property name="label" translatable="yes">You have to register to this transport
<property name="label" translatable="yes">You have to register with this transport
to be able to add a contact from this
protocol. Click on register button to
proceed.</property>
......
......@@ -204,7 +204,7 @@
<child>
<widget class="GtkLabel" id="restart_label">
<property name="label" translatable="yes">&lt;b&gt;NOTE:&lt;/b&gt; You should restart Gajim for some setting to take effect</property>
<property name="label" translatable="yes">&lt;b&gt;NOTE:&lt;/b&gt; You should restart Gajim for some settings to take effect</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
......
......@@ -2,6 +2,7 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
<widget class="GtkMenu" id="advanced_menuitem_menu">
<child>
......@@ -10,7 +11,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1453">
<widget class="GtkImage" id="image1457">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -52,12 +53,12 @@
<child>
<widget class="GtkImageMenuItem" id="send_server_message_menuitem">
<property name="tooltip" translatable="yes">Sends a message to currently connected users to this server</property>
<property name="tooltip" translatable="yes">Sends a message to users currently connected to this server</property>
<property name="label" translatable="yes">_Send Server Message</property>
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1454">
<widget class="GtkImage" id="image1458">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
......@@ -99,7 +100,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
<widget class="GtkImage" id="image1455">
<widget class="GtkImage" id="image1459">
<property name="visible">True</property>
<property name="stock">gtk-clear</property>
<property name="icon_size">1</property>
......@@ -116,4 +117,5 @@
</widget>
</child>
</widget>
</glade-interface>
......@@ -2,6 +2,7 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
<glade-interface>
<widget class="GtkWindow" id="file_transfers_window">
<property name="border_width">12</property>
<property name="title" translatable="yes">File Transfers</property>
......@@ -16,9 +17,10 @@
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">File Transfers</atkproperty>
<atkproperty name="AtkObject::accessible_description" translatable="yes">Shows a list of file transfers between you and other</atkproperty>
<atkproperty name="AtkObject::accessible_description" translatable="yes">Shows a list of file transfers between you and others</atkproperty>
</accessibility>
<signal name="delete_event" handler="on_file_transfers_dialog_delete_event" last_modification_time="Wed, 31 Aug 2005 22:17:01 GMT"/>
<signal name="key_press_event" handler="on_file_transfers_window_key_press_event" last_modification_time="Mon, 15 Aug 2005 12:42:20 GMT"/>
......@@ -386,4 +388,5 @@
</widget>
</child>
</widget>
</glade-interface>
......@@ -1829,7 +1829,7 @@ Per type</property>
<child>
<widget class="GtkCheckButton" id="ignore_events_from_unknown_contacts_checkbutton">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, cause it blocks all messages from any contact that is not in the roster</property>
<property name="tooltip" translatable="yes">Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, because it blocks all messages from any contact that is not in the roster</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">_Ignore events from contacts not in the roster</property>
<property name="use_underline">True</property>
......
......@@ -110,7 +110,7 @@
<child>
<widget class="GtkButton" id="deny_button">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Deny authorization from contact so he cannot know when you're connected</property>
<property name="tooltip" translatable="yes">Deny authorization from contact so he or she cannot know when you're connected</property>
<property name="can_default">True</property>
<property name="can_focus">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
......@@ -277,7 +277,7 @@
<child>
<widget class="GtkButton" id="authorize_button">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Authorize contact so he can know when you're connected</property>
<property name="tooltip" translatable="yes">Authorize contact so he or she can know when you're connected</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="can_focus">True</property>
......
......@@ -86,7 +86,7 @@ def check_and_possibly_create_paths():
AVATAR_PATH = gajim.AVATAR_PATH
dot_gajim = os.path.dirname(VCARD_PATH)
if os.path.isfile(dot_gajim):
print _('%s is file but it should be a directory') % dot_gajim
print _('%s is a file but it should be a directory') % dot_gajim
print _('Gajim will now exit')
sys.exit()
elif os.path.isdir(dot_gajim):
......@@ -97,14 +97,14 @@ def check_and_possibly_create_paths():
if not os.path.exists(VCARD_PATH):
create_path(VCARD_PATH)
elif os.path.isfile(VCARD_PATH):
print _('%s is file but it should be a directory') % VCARD_PATH
print _('%s is a file but it should be a directory') % VCARD_PATH
print _('Gajim will now exit')
sys.exit()
if not os.path.exists(AVATAR_PATH):
create_path(AVATAR_PATH)
elif os.path.isfile(AVATAR_PATH):
print _('%s is file but it should be a directory') % AVATAR_PATH
print _('%s is a file but it should be a directory') % AVATAR_PATH
print _('Gajim will now exit')
sys.exit()
......@@ -112,7 +112,7 @@ def check_and_possibly_create_paths():
create_log_db()
gajim.logger.init_vars()
elif os.path.isdir(LOG_DB_PATH):
print _('%s is directory but should be file') % LOG_DB_PATH
print _('%s is a directory but should be a file') % LOG_DB_PATH
print _('Gajim will now exit')
sys.exit()
......
......@@ -89,7 +89,7 @@ class Config:
'ignore_incoming_xhtml': [ opt_bool, False, ],
'speller_language': [ opt_str, '', _('Language used by speller')],
'print_time': [ opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')],
'print_time_fuzzy': [ opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. This is used only if print_time is \'sometimes\'.') ],
'print_time_fuzzy': [ opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is \'sometimes\'.') ],
'emoticons_theme': [opt_str, 'static', '', True ],
'ascii_formatting': [ opt_bool, True,
_('Treat * / _ pairs as possible formatting characters.'), True],
......
......@@ -2419,7 +2419,7 @@ class GroupchatConfigWindow(DataFormWindow):
prompt = _('<b>Whom do you want to make a member?</b>\n\n')
elif affiliation == 'owner':
title = _('Adding Owner...')
prompt = _('<b>Whom do you want to make a owner?</b>\n\n')
prompt = _('<b>Whom do you want to make an owner?</b>\n\n')
else:
title = _('Adding Administrator...')
prompt = _('<b>Whom do you want to make an administrator?</b>\n\n')
......@@ -3069,9 +3069,9 @@ class AccountCreationWizardWindow:
if self.modify:
finish_text = '<big><b>%s</b></big>\n\n%s' % (
_('Account has been added successfully'),
_('You can set advanced account options by pressing Advanced '
'button, or later by clicking in Accounts menuitem under Edit '
'menu from the main window.'))
_('You can set advanced account options by pressing the '
'Advanced button, or later by choosing the Accounts menuitem '
'under the Edit menu from the main window.'))
self.finish_label.set_markup(finish_text)
self.finish_button.show()
self.finish_button.set_property('has-default', True)
......@@ -3104,9 +3104,9 @@ class AccountCreationWizardWindow:
finish_text = '<big><b>%s</b></big>\n\n%s' % (
_('Your new account has been created successfully'),
_('You can set advanced account options by pressing Advanced button, '
'or later by clicking in Accounts menuitem under Edit menu from the '
'main window.'))
_('You can set advanced account options by pressing the Advanced '
'button, or later by choosing the Accounts menuitem under the Edit '
'menu from the main window.'))
self.finish_label.set_markup(finish_text)
self.notebook.set_current_page(3) # show finish page
......
......@@ -224,8 +224,8 @@ _('Connection with peer cannot be established.'))
sectext += '\n\t' + _('Recipient: %s') % jid
if error_msg:
sectext += '\n\t' + _('Error message: %s') % error_msg
dialogs.ErrorDialog(_('File transfer stopped by the contact of the other side'), \
sectext)
dialogs.ErrorDialog(_('File transfer stopped by the contact at the other '
'end'), sectext)
self.tree.get_selection().unselect_all()
def show_file_send_request(self, account, contact):
......
......@@ -74,13 +74,15 @@ class GajimRemote:
[]
],
'show_next_pending_event': [
_('Popups a window with the next pending event'),
_('Pops up a window with the next pending event'),
[]
],
'list_contacts': [
_('Prints a list of all contacts in the roster. Each contact appear on a separate line'),
_('Prints a list of all contacts in the roster. Each contact '
'appears on a separate line'),
[
(_('account'), _('show only contacts of the given account'), False)
(_('account'), _('show only contacts of the given account'),
False)
]
],
......
......@@ -1257,7 +1257,7 @@ class GroupchatControl(ChatControlBase):
self.print_conversation(s, 'info')
elif command == 'chat' or command == 'query':
self.print_conversation(_('Usage: /%s <nickname>, opens a private chat'
' window to the specified occupant.') % command, 'info')
' window with the specified occupant.') % command, 'info')
elif command == 'clear':
self.print_conversation(
_('Usage: /%s, clears the text window.') % command, 'info')
......@@ -1286,7 +1286,7 @@ class GroupchatControl(ChatControlBase):
(command, command), 'info')
elif command == 'msg':
s = _('Usage: /%s <nickname> [message], opens a private message window'
'and sends message to the occupant specified by nickname.') % \
' and sends message to the occupant specified by nickname.') % \
command
self.print_conversation(s, 'info')
elif command == 'nick':
......
......@@ -1398,7 +1398,7 @@ class RosterWindow:
if len(list_) == 1:
pritext = _('Transport "%s" will be removed') % contact.jid
sectext = _('You will no longer be able to send and receive messages '
'to contacts from this transport.')
'from contacts using this transport.')
else:
pritext = _('Transports will be removed')
jids = ''
......
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