gajim: ManageBookmarksWindow. Remove unused function
changeset 2672b6652c4e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2672b6652c4e description: ManageBookmarksWindow. Remove unused function diffstat: src/config.py | 13 - 1 files changed, 0 insertions(+), 13 deletions(-) diffs (23 lines): diff -r a1aa5635e322 -r 2672b6652c4e src/config.py --- a/src/config.py Tue Nov 20 13:00:57 2012 +0400 +++ b/src/config.py Fri Nov 23 11:44:03 2012 +0400 @@ -3192,19 +3192,6 @@ # select root iter self.selection.select_iter(self.treestore.get_iter_root()) -def on_bookmarks_treeview_button_press_event(self, widget, event): -(model, iter_) = self.selection.get_selected() -if not iter_: -# Removed a bookmark before -return - -if model.iter_parent(iter_): -# The currently selected node is a bookmark -return not self.check_valid_bookmark() - -def on_manage_bookmarks_window_destroy(self, widget, event): -del gajim.interface.instances['manage_bookmarks'] - def on_add_bookmark_button_clicked(self, widget): """ Add a new bookmark ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: prevent traceback
changeset b579b4cf66f9 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=b579b4cf66f9
description: prevent traceback
diffstat:
src/common/helpers.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r bdef21a83e15 -r b579b4cf66f9 src/common/helpers.py
--- a/src/common/helpers.py Mon Nov 12 17:21:26 2012 +0400
+++ b/src/common/helpers.py Sun Nov 18 23:46:43 2012 +0400
@@ -1429,7 +1429,7 @@
except Exception:
proxy = None
p = gajim.config.get('global_proxy')
-if p:
+if p and p in gajim.config.get_per('proxies'):
proxy = {}
proxyptr = gajim.config.get_per('proxies', p)
if not proxyptr:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: hide 'bookmark_ button' if private storage not supported
changeset 577a45b6306b in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=577a45b6306b
description: hide 'bookmark_ button' if private storage not supported
diffstat:
src/groupchat_control.py | 6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (16 lines):
diff -r b579b4cf66f9 -r 577a45b6306b src/groupchat_control.py
--- a/src/groupchat_control.py Sun Nov 18 23:46:43 2012 +0400
+++ b/src/groupchat_control.py Tue Nov 20 11:29:13 2012 +0400
@@ -327,8 +327,10 @@
if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'):
img = self.xml.get_object('image7')
img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU)
-
-widget.show()
+if not gajim.connections[self.account].private_storage_supported:
+widget.hide()
+else:
+widget.show()
widget = self.xml.get_object('list_treeview')
id_ = widget.connect('row_expanded',
self.on_list_treeview_row_expanded)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: hide 'bookmark_ button' if private storage not supported....
changeset a1aa5635e322 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a1aa5635e322
description: hide 'bookmark_ button' if private storage not supported.part 2
diffstat:
src/groupchat_control.py | 13 -
1 files changed, 8 insertions(+), 5 deletions(-)
diffs (30 lines):
diff -r 577a45b6306b -r a1aa5635e322 src/groupchat_control.py
--- a/src/groupchat_control.py Tue Nov 20 11:29:13 2012 +0400
+++ b/src/groupchat_control.py Tue Nov 20 13:00:57 2012 +0400
@@ -327,10 +327,11 @@
if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'):
img = self.xml.get_object('image7')
img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU)
-if not gajim.connections[self.account].private_storage_supported:
-widget.hide()
-else:
-widget.show()
+widget.set_sensitive(
+gajim.connections[self.account].private_storage_supported or \
+(gajim.connections[self.account].pubsub_supported and \
+
gajim.connections[self.account].pubsub_publish_options_supported))
+widget.show()
widget = self.xml.get_object('list_treeview')
id_ = widget.connect('row_expanded',
self.on_list_treeview_row_expanded)
@@ -842,7 +843,9 @@
if self.contact.jid in gajim.config.get_per('accounts', self.account,
'minimized_gc').split(' '):
minimize_menuitem.set_active(True)
-if not gajim.connections[self.account].private_storage_supported:
+conn = gajim.connections[self.account]
+if not conn.private_storage_supported and (not conn.pubsub_supported
or \
+not conn.pubsub_publish_options_supported):
bookmark_room_menuitem.set_sensitive(False)
if gajim.gc_connected[self.account][self.room_jid]:
c = gajim.contacts.get_gc_contact(self.account, self.room_jid,
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Add 'gc_tooltip_populate' gui extension point
changeset bdef21a83e15 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=bdef21a83e15
description: Add 'gc_tooltip_populate' gui extension point
diffstat:
src/tooltips.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diffs (12 lines):
diff -r e184286eec1b -r bdef21a83e15 src/tooltips.py
--- a/src/tooltips.py Sun Nov 11 22:03:08 2012 +0400
+++ b/src/tooltips.py Mon Nov 12 17:21:26 2012 +0400
@@ -444,6 +444,8 @@
self.avatar_image.set_alignment(0, 0)
vcard_table.attach(self.avatar_image, 3, 4, 2, vcard_current_row + 1,
gtk.FILL, gtk.FILL | gtk.EXPAND, 3, 3)
+gajim.plugin_manager.gui_extension_point('gc_tooltip_populate',
+self, contact, vcard_table)
self.win.add(vcard_table)
class RosterTooltip(NotificationAreaTooltip):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Add 'roster_tooltip_populate' gui extension point
changeset e184286eec1b in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=e184286eec1b
description: Add 'roster_tooltip_populate' gui extension point
diffstat:
src/tooltips.py | 7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diffs (24 lines):
diff -r 66471f38503c -r e184286eec1b src/tooltips.py
--- a/src/tooltips.py Thu Nov 08 12:09:13 2012 +0100
+++ b/src/tooltips.py Sun Nov 11 22:03:08 2012 +0400
@@ -489,7 +489,7 @@
table_size = 4
else:
self.avatar_image.set_from_pixbuf(None)
-vcard_table = gtk.Table(table_size, 1)
+vcard_table = gtk.Table(1,table_size)
vcard_table.set_property('column-spacing', 2)
vcard_table.set_homogeneous(False)
vcard_current_row = 1
@@ -685,7 +685,10 @@
self.avatar_image.set_alignment(0, 0)
if table_size == 4:
vcard_table.attach(self.avatar_image, 3, 4, 2,
-vcard_current_row + 1, gtk.FILL, gtk.FILL | gtk.EXPAND, 3,
3)
+vcard_current_row + 1, gtk.FILL, gtk.FILL | gtk.EXPAND, 3, 3)
+
+gajim.plugin_manager.gui_extension_point('roster_tooltip_populate',
+self, contacts, vcard_table)
self.win.add(vcard_table)
def update_last_time(self, last_time):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: ManageBookmarksWindow. Remove unused function
changeset b8a2f4925a43 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b8a2f4925a43 description: ManageBookmarksWindow. Remove unused function diffstat: src/config.py | 13 - 1 files changed, 0 insertions(+), 13 deletions(-) diffs (23 lines): diff -r fba5f172650b -r b8a2f4925a43 src/config.py --- a/src/config.py Tue Nov 20 13:00:57 2012 +0400 +++ b/src/config.py Fri Nov 23 11:44:03 2012 +0400 @@ -3191,19 +3191,6 @@ # select root iter self.selection.select_iter(self.treestore.get_iter_root()) -def on_bookmarks_treeview_button_press_event(self, widget, event): -(model, iter_) = self.selection.get_selected() -if not iter_: -# Removed a bookmark before -return - -if model.iter_parent(iter_): -# The currently selected node is a bookmark -return not self.check_valid_bookmark() - -def on_manage_bookmarks_window_destroy(self, widget, event): -del gajim.interface.instances['manage_bookmarks'] - def on_add_bookmark_button_clicked(self, widget): """ Add a new bookmark ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: hide 'bookmark_ button' if private storage not supported....
changeset fba5f172650b in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=fba5f172650b
description: hide 'bookmark_ button' if private storage not supported.part 2
diffstat:
src/groupchat_control.py | 13 -
1 files changed, 8 insertions(+), 5 deletions(-)
diffs (30 lines):
diff -r 39d2f5181210 -r fba5f172650b src/groupchat_control.py
--- a/src/groupchat_control.py Tue Nov 20 11:29:13 2012 +0400
+++ b/src/groupchat_control.py Tue Nov 20 13:00:57 2012 +0400
@@ -328,10 +328,11 @@
if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'):
img = self.xml.get_object('image7')
img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU)
-if not gajim.connections[self.account].private_storage_supported:
-widget.hide()
-else:
-widget.show()
+widget.set_sensitive(
+gajim.connections[self.account].private_storage_supported or \
+(gajim.connections[self.account].pubsub_supported and \
+
gajim.connections[self.account].pubsub_publish_options_supported))
+widget.show()
widget = self.xml.get_object('list_treeview')
id_ = widget.connect('row_expanded',
self.on_list_treeview_row_expanded)
@@ -843,7 +844,9 @@
if self.contact.jid in gajim.config.get_per('accounts', self.account,
'minimized_gc').split(' '):
minimize_menuitem.set_active(True)
-if not gajim.connections[self.account].private_storage_supported:
+conn = gajim.connections[self.account]
+if not conn.private_storage_supported and (not conn.pubsub_supported
or \
+not conn.pubsub_publish_options_supported):
bookmark_room_menuitem.set_sensitive(False)
if gajim.gc_connected[self.account][self.room_jid]:
c = gajim.contacts.get_gc_contact(self.account, self.room_jid,
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: hide 'bookmark_ button' if private storage not supported
changeset 39d2f5181210 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=39d2f5181210
description: hide 'bookmark_ button' if private storage not supported
diffstat:
src/groupchat_control.py | 6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diffs (16 lines):
diff -r 6c6914187d03 -r 39d2f5181210 src/groupchat_control.py
--- a/src/groupchat_control.py Sun Nov 18 23:46:43 2012 +0400
+++ b/src/groupchat_control.py Tue Nov 20 11:29:13 2012 +0400
@@ -328,8 +328,10 @@
if gtkgui_helpers.gtk_icon_theme.has_icon('bookmark-new'):
img = self.xml.get_object('image7')
img.set_from_icon_name('bookmark-new', gtk.ICON_SIZE_MENU)
-
-widget.show()
+if not gajim.connections[self.account].private_storage_supported:
+widget.hide()
+else:
+widget.show()
widget = self.xml.get_object('list_treeview')
id_ = widget.connect('row_expanded',
self.on_list_treeview_row_expanded)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: prevent traceback
changeset 6c6914187d03 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=6c6914187d03
description: prevent traceback
diffstat:
src/common/helpers.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r c71ab70fbd35 -r 6c6914187d03 src/common/helpers.py
--- a/src/common/helpers.py Sat Nov 17 23:30:09 2012 +0400
+++ b/src/common/helpers.py Sun Nov 18 23:46:43 2012 +0400
@@ -1433,7 +1433,7 @@
except Exception:
proxy = None
p = gajim.config.get('global_proxy')
-if p:
+if p and p in gajim.config.get_per('proxies'):
proxy = {}
proxyptr = gajim.config.get_per('proxies', p)
if not proxyptr:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Darlan].Update Hebrew translation.
changeset c71ab70fbd35 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c71ab70fbd35 description: [Darlan].Update Hebrew translation. diffstat: po/he.po | 1534 - 1 files changed, 804 insertions(+), 730 deletions(-) diffs (truncated from 4260 to 300 lines): diff -r 1ca106577a08 -r c71ab70fbd35 po/he.po --- a/po/he.po Thu Nov 15 15:01:21 2012 +0400 +++ b/po/he.po Sat Nov 17 23:30:09 2012 +0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-04 21:59+0400\n" -"PO-Revision-Date: 2012-10-04 20:28+0200\n" +"POT-Creation-Date: 2012-11-15 14:27+0400\n" +"PO-Revision-Date: 2012-11-17 21:33+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut\n" "Language: he\n" @@ -43,7 +43,7 @@ #: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." -msgstr "הוספת _איש־קשר..." +msgstr "הוספת _איש קשר..." # איתור #: ../data/gui/account_context_menu.ui.h:6 @@ -213,10 +213,10 @@ #: ../src/config.py:2412 #: ../src/config.py:3698 #: ../src/config.py:3773 -#: ../src/dialogs.py:312 -#: ../src/dialogs.py:314 -#: ../src/dialogs.py:520 -#: ../src/dialogs.py:533 +#: ../src/dialogs.py:313 +#: ../src/dialogs.py:315 +#: ../src/dialogs.py:521 +#: ../src/dialogs.py:534 #: ../src/roster_window.py:3214 #: ../src/roster_window.py:3220 #: ../src/roster_window.py:3225 @@ -229,21 +229,21 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3425 -#: ../src/dialogs.py:3471 +#: ../src/dialogs.py:3426 +#: ../src/dialogs.py:3472 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3429 -#: ../src/dialogs.py:3526 +#: ../src/dialogs.py:3430 +#: ../src/dialogs.py:3527 msgid "Delete" msgstr "מחיקה" #. Rename #: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5827 +#: ../src/roster_window.py:5844 msgid "Re_name" msgstr "_שינוי שם" @@ -266,6 +266,7 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:9 #: ../data/gui/roster_window.ui.h:1 +#: ../data/gajim.desktop.in.in.h:1 #: ../src/common/helpers.py:1168 #: ../src/common/helpers.py:1180 #: ../src/notify.py:316 @@ -276,14 +277,14 @@ msgstr "Gajim" # BUG: _underline -# אישי־קשר +# אישי קשר #: ../data/gui/accounts_window.ui.h:10 msgid "Synchronize contacts" -msgstr "סנכרון אנשי־קשר" +msgstr "סנכרון אנשי קשר" #: ../data/gui/accounts_window.ui.h:11 msgid "Click to request authorization to all contacts of another account" -msgstr "לחצו בכדי לבקש הרשאות עבור כל אנשי־הקשר שבחשבון אחר" +msgstr "לחצו בכדי לבקש הרשאות עבור כל אנשי קשר של בחשבון אחר" #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" @@ -292,7 +293,7 @@ # Omitted: Click to #: ../data/gui/accounts_window.ui.h:13 msgid "Click to change account's password" -msgstr "שינוי הסיסמה של החשבון" +msgstr "שינוי סיסמת חשבון" # מנהל, ניהול #: ../data/gui/accounts_window.ui.h:14 @@ -363,7 +364,7 @@ # יו_מני שיחות #: ../data/gui/accounts_window.ui.h:32 msgid "Save conversation _logs for all contacts" -msgstr "שמירת רשו_מות שיחה עבור כל אנשי־הקשר" +msgstr "שמירת רשו_מות שיחה עבור כל אנשי קשר" # כוללני #: ../data/gui/accounts_window.ui.h:33 @@ -398,11 +399,11 @@ #: ../data/gui/accounts_window.ui.h:37 #: ../data/gui/preferences_window.ui.h:46 #: ../src/common/contacts.py:135 -#: ../src/dialogs.py:112 -#: ../src/dialogs.py:124 +#: ../src/dialogs.py:113 +#: ../src/dialogs.py:125 #: ../src/roster_window.py:3156 #: ../src/roster_window.py:4284 -#: ../src/roster_window.py:5877 +#: ../src/roster_window.py:5894 msgid "General" msgstr "כללית" @@ -547,7 +548,7 @@ #: ../data/gui/accounts_window.ui.h:67 #: ../data/gui/zeroconf_information_window.ui.h:7 #: ../src/config.py:1862 -#: ../src/dialogs.py:838 +#: ../src/dialogs.py:839 msgid "Jabber ID:" msgstr "JID:" @@ -557,7 +558,7 @@ #: ../data/gui/add_new_contact_window.ui.h:1 msgid "Add New Contact" -msgstr "הוספת איש־קשר חדש" +msgstr "הוספת איש קשר חדש" #: ../data/gui/add_new_contact_window.ui.h:2 msgid "A_ccount:" @@ -574,7 +575,7 @@ #: ../data/gui/add_new_contact_window.ui.h:5 #: ../data/gui/manage_bookmarks_window.ui.h:5 msgid "_Nickname:" -msgstr "כי_נוי:" +msgstr "שם כי_נוי:" #: ../data/gui/add_new_contact_window.ui.h:6 msgid "_Group:" @@ -582,7 +583,7 @@ #: ../data/gui/add_new_contact_window.ui.h:7 msgid "A_llow this contact to view my status" -msgstr "הת_ר לאיש־קשר זה לראות את מצב־חיבורי" +msgstr "הת_ר לאיש קשר זה לראות את מצב־חיבורי" # BUG: Request or Subscription Request instead of Subscription # בקשת @@ -599,26 +600,27 @@ "proceed." msgstr "" "נרשמת באמצעות מוביל זה\n" -"כדי שתהיה ביכולתך להוסיף איש־קשר\n" -"מפרוטוקול זה. נא להקיש על הלחצן\n" +"כדי שתהיה ביכולתך להוסיף איש קשר\n" +"מפרוטוקול זה. נא להקיש על לח
gajim: Update russian translation
changeset 1ca106577a08 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=1ca106577a08 description: Update russian translation diffstat: po/ru.po | 1223 + 1 files changed, 654 insertions(+), 569 deletions(-) diffs (truncated from 3021 to 300 lines): diff -r 7f3bcabc2f38 -r 1ca106577a08 po/ru.po --- a/po/ru.po Thu Nov 15 14:44:48 2012 +0400 +++ b/po/ru.po Thu Nov 15 15:01:21 2012 +0400 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-06 23:05+0400\n" -"PO-Revision-Date: 2012-09-06 23:36+0300\n" +"POT-Creation-Date: 2012-11-15 14:27+0400\n" +"PO-Revision-Date: 2012-11-15 14:56+0300\n" "Last-Translator: Fomin Denis \n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -196,13 +196,13 @@ #: ../src/config.py:2412 #: ../src/config.py:3698 #: ../src/config.py:3773 -#: ../src/dialogs.py:312 -#: ../src/dialogs.py:314 -#: ../src/dialogs.py:520 -#: ../src/dialogs.py:533 -#: ../src/roster_window.py:3207 -#: ../src/roster_window.py:3213 -#: ../src/roster_window.py:3218 +#: ../src/dialogs.py:313 +#: ../src/dialogs.py:315 +#: ../src/dialogs.py:521 +#: ../src/dialogs.py:534 +#: ../src/roster_window.py:3214 +#: ../src/roster_window.py:3220 +#: ../src/roster_window.py:3225 msgid "None" msgstr "Нет" @@ -212,21 +212,21 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3425 -#: ../src/dialogs.py:3471 +#: ../src/dialogs.py:3426 +#: ../src/dialogs.py:3472 msgid "Add" msgstr "Добавить" #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3429 -#: ../src/dialogs.py:3526 +#: ../src/dialogs.py:3430 +#: ../src/dialogs.py:3527 msgid "Delete" msgstr "Удалить" #. Rename #: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5820 +#: ../src/roster_window.py:5844 msgid "Re_name" msgstr "П_ереименовать" @@ -247,6 +247,7 @@ #. No configured account #: ../data/gui/accounts_window.ui.h:9 #: ../data/gui/roster_window.ui.h:1 +#: ../data/gajim.desktop.in.in.h:1 #: ../src/common/helpers.py:1168 #: ../src/common/helpers.py:1180 #: ../src/notify.py:316 @@ -358,11 +359,11 @@ #: ../data/gui/accounts_window.ui.h:37 #: ../data/gui/preferences_window.ui.h:46 #: ../src/common/contacts.py:135 -#: ../src/dialogs.py:112 -#: ../src/dialogs.py:124 -#: ../src/roster_window.py:3149 -#: ../src/roster_window.py:4277 -#: ../src/roster_window.py:5870 +#: ../src/dialogs.py:113 +#: ../src/dialogs.py:125 +#: ../src/roster_window.py:3156 +#: ../src/roster_window.py:4284 +#: ../src/roster_window.py:5894 msgid "General" msgstr "Общие" @@ -494,7 +495,7 @@ #: ../data/gui/accounts_window.ui.h:67 #: ../data/gui/zeroconf_information_window.ui.h:7 #: ../src/config.py:1862 -#: ../src/dialogs.py:838 +#: ../src/dialogs.py:839 msgid "Jabber ID:" msgstr "Jabber ID:" @@ -747,9 +748,9 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_occupants_menu.ui.h:14 -#: ../src/roster_window.py:5839 -#: ../src/roster_window.py:5966 -#: ../src/roster_window.py:6099 +#: ../src/roster_window.py:5863 +#: ../src/roster_window.py:5990 +#: ../src/roster_window.py:6123 msgid "_Unblock" msgstr "_Разблокировать" @@ -890,7 +891,7 @@ #: ../data/gui/chat_control.ui.h:12 #: ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/xml_console_window.ui.h:15 -#: ../src/filetransfers_window.py:306 +#: ../src/filetransfers_window.py:322 msgid "_Send" msgstr "_Отправить" @@ -980,8 +981,8 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 #: ../data/gui/gc_occupants_menu.ui.h:11 -#: ../src/roster_window.py:5775 -#: ../src/roster_window.py:5934 +#: ../src/roster_window.py:5799 +#: ../src/roster_window.py:5958 msgid "In_vite to" msgstr "_Пригласить в" @@ -998,8 +999,8 @@ msgstr "Включить End to End шифрование" #: ../data/gui/contact_context_menu.ui.h:8 -#: ../src/roster_window.py:5785 -#: ../src/roster_window.py:6023 +#: ../src/roster_window.py:5809 +#: ../src/roster_window.py:6047 msgid "Send Cus_tom Status" msgstr "Установи_ть статус" @@ -1049,9 +1050,9 @@ #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 -#: ../src/roster_window.py:5847 -#: ../src/roster_window.py:5972 -#: ../src/roster_window.py:6102 +#: ../src/roster_window.py:5871 +#: ../src/roster_window.py:5996 +#: ../src/roster_window.py:6126 msgid "_Block" msgstr "_Блокировать"
gajim: Make Location information translatable
changeset 7f3bcabc2f38 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=7f3bcabc2f38
description: Make Location information translatable
diffstat:
src/common/pep.py | 31 ++-
1 files changed, 26 insertions(+), 5 deletions(-)
diffs (49 lines):
diff -r b168e3d3f44c -r 7f3bcabc2f38 src/common/pep.py
--- a/src/common/pep.py Thu Nov 15 14:19:02 2012 +0400
+++ b/src/common/pep.py Thu Nov 15 14:44:48 2012 +0400
@@ -190,10 +190,29 @@
TUNE_DATA = ['artist', 'title', 'source', 'track', 'length']
-LOCATION_DATA = ['accuracy', 'alt', 'area', 'bearing', 'building', 'country',
-'countrycode', 'datum', 'description', 'error', 'floor', 'lat',
-'locality', 'lon', 'postalcode', 'region', 'room', 'speed',
-'street', 'text', 'timestamp', 'uri']
+LOCATION_DATA = {
+'accuracy': _('accuracy'),
+'alt': _('alt'),
+'area': _('area'),
+'bearing': _('bearing'),
+'building': _('building'),
+'country': _('country'),
+'countrycode': _('countrycode'),
+'datum':_('datum'),
+'description': _('description'),
+'error':_('error'),
+'floor':_('floor'),
+'lat': _('lat'),
+'locality': _('locality'),
+'lon': _('lon'),
+'postalcode': _('postalcode'),
+'region': _('region'),
+'room': _('room'),
+'speed':_('speed'),
+'street': _('street'),
+'text': _('text'),
+'timestamp':_('timestamp'),
+'uri': _('uri')}
import gobject
import gtk
@@ -483,8 +502,10 @@
for entry in location.keys():
text = location[entry]
text = gobject.markup_escape_text(text)
+# Translate standart location tag
+tag = LOCATION_DATA.get(entry, entry)
location_string += '\n%(tag)s: %(text)s' % \
-{'tag': entry.capitalize(), 'text': text}
+{'tag': tag.capitalize(), 'text': text}
return location_string.strip()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: typo
changeset b168e3d3f44c in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=b168e3d3f44c
description: typo
diffstat:
src/common/pep.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 7106e00107c0 -r b168e3d3f44c src/common/pep.py
--- a/src/common/pep.py Thu Nov 15 14:05:10 2012 +0400
+++ b/src/common/pep.py Thu Nov 15 14:19:02 2012 +0400
@@ -121,7 +121,7 @@
'running_an_errand':_('Running an Errand'),
'walking_the_dog': _('Walking the Dog')},
'drinking': {'category':_('Drinking'),
-'having_a_beer' _('Having a Beer'),
+'having_a_beer': _('Having a Beer'),
'having_coffee':_('Having Coffee'),
'having_tea': _('Having Tea')},
'eating': {'category': _('Eating'),
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: coding style.
changeset 7106e00107c0 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=7106e00107c0
description: coding style.
diffstat:
src/common/pep.py | 159 ++---
1 files changed, 79 insertions(+), 80 deletions(-)
diffs (182 lines):
diff -r 0794de05520f -r 7106e00107c0 src/common/pep.py
--- a/src/common/pep.py Wed Nov 14 17:13:06 2012 +0100
+++ b/src/common/pep.py Thu Nov 15 14:05:10 2012 +0400
@@ -110,91 +110,90 @@
'worried': _('Worried')}
ACTIVITIES = {
-'doing_chores': {'category':_('Doing Chores'),
-'buying_groceries':
_('Buying Groceries'),
-'cleaning':
_('Cleaning'),
-'cooking':
_('Cooking'),
-'doing_maintenance':
_('Doing Maintenance'),
-'doing_the_dishes':
_('Doing the Dishes'),
-'doing_the_laundry':
_('Doing the Laundry'),
-'gardening':
_('Gardening'),
-'running_an_errand':
_('Running an Errand'),
-'walking_the_dog':
_('Walking the Dog')},
-'drinking': {'category':_('Drinking'),
-'having_a_beer':
_('Having a Beer'),
-'having_coffee':
_('Having Coffee'),
-'having_tea':
_('Having Tea')},
-'eating': {'category': _('Eating'),
-'having_a_snack':
_('Having a Snack'),
-'having_breakfast':
_('Having Breakfast'),
-'having_dinner':
_('Having Dinner'),
-'having_lunch':
_('Having Lunch')},
-'exercising': {'category':
_('Exercising'),
-'cycling':
_('Cycling'),
-'dancing':
_('Dancing'),
-'hiking':
_('Hiking'),
-'jogging':
_('Jogging'),
-'playing_sports':
_('Playing Sports'),
-'running':
_('Running'),
-'skiing':
_('Skiing'),
-'swimming':
_('Swimming'),
-'working_out':
_('Working out')},
-'grooming': {'category':_('Grooming'),
-'at_the_spa':
_('At the Spa'),
-'brushing_teeth':
_('Brushing Teeth'),
-'getting_a_haircut':
_('Getting a Haircut'),
-'shaving':
_('Shaving'),
-'taking_a_bath':
_('Taking a Bath'),
-'taking_a_shower':
_('Taking a Shower')},
+'doing_chores': {'category':_('Doing Chores'),
+'buying_groceries': _('Buying Groceries'),
+'cleaning': _('Cleaning'),
+'cooking': _('Cooking'),
+'doing_maintenance':_('Doing Maintenance'),
+'doing_the_dishes': _('Doing the Dishes'),
+'doing_the_laundry':_('Doing the Laundry'),
+'gardening':_('Gardening'),
+'running_an_errand':_('Running an Errand'),
+'walking_the_dog': _('Walking the Dog')},
+'drinking': {'category':_('Drinking'),
+'having_a_beer' _('Having a Beer'),
+
gajim: Add 'gc_tooltip_populate' gui extension point
changeset 6993af372e75 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=6993af372e75
description: Add 'gc_tooltip_populate' gui extension point
diffstat:
src/tooltips.py | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diffs (12 lines):
diff -r d28fae10f746 -r 6993af372e75 src/tooltips.py
--- a/src/tooltips.py Sun Nov 11 22:03:08 2012 +0400
+++ b/src/tooltips.py Mon Nov 12 17:21:26 2012 +0400
@@ -444,6 +444,8 @@
self.avatar_image.set_alignment(0, 0)
vcard_table.attach(self.avatar_image, 3, 4, 2, vcard_current_row + 1,
gtk.FILL, gtk.FILL | gtk.EXPAND, 3, 3)
+gajim.plugin_manager.gui_extension_point('gc_tooltip_populate',
+self, contact, vcard_table)
self.win.add(vcard_table)
class RosterTooltip(NotificationAreaTooltip):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Add 'roster_tooltip_populate' gui extension point
changeset d28fae10f746 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=d28fae10f746
description: Add 'roster_tooltip_populate' gui extension point
diffstat:
src/tooltips.py | 7 +--
1 files changed, 5 insertions(+), 2 deletions(-)
diffs (24 lines):
diff -r dcf6b69e63c0 -r d28fae10f746 src/tooltips.py
--- a/src/tooltips.py Sun Nov 11 10:05:23 2012 +0100
+++ b/src/tooltips.py Sun Nov 11 22:03:08 2012 +0400
@@ -489,7 +489,7 @@
table_size = 4
else:
self.avatar_image.set_from_pixbuf(None)
-vcard_table = gtk.Table(table_size, 1)
+vcard_table = gtk.Table(1,table_size)
vcard_table.set_property('column-spacing', 2)
vcard_table.set_homogeneous(False)
vcard_current_row = 1
@@ -685,7 +685,10 @@
self.avatar_image.set_alignment(0, 0)
if table_size == 4:
vcard_table.attach(self.avatar_image, 3, 4, 2,
-vcard_current_row + 1, gtk.FILL, gtk.FILL | gtk.EXPAND, 3,
3)
+vcard_current_row + 1, gtk.FILL, gtk.FILL | gtk.EXPAND, 3, 3)
+
+gajim.plugin_manager.gui_extension_point('roster_tooltip_populate',
+self, contacts, vcard_table)
self.win.add(vcard_table)
def update_last_time(self, last_time):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Herein].Update Hebrew translation(0.15).
changeset b080a751f6a9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b080a751f6a9 description: [Herein].Update Hebrew translation(0.15). diffstat: po/he.po | 2936 +++-- 1 files changed, 1284 insertions(+), 1652 deletions(-) diffs (truncated from 6712 to 300 lines): diff -r 05d010254411 -r b080a751f6a9 po/he.po --- a/po/he.po Tue Oct 30 18:15:52 2012 +0100 +++ b/po/he.po Sat Nov 03 12:19:02 2012 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-08-17 21:02+0200\n" -"PO-Revision-Date: 2012-08-18 10:39+0200\n" +"PO-Revision-Date: 2012-11-02 09:03+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut\n" "Language: he\n" @@ -27,7 +27,8 @@ msgid "_Personal Events" msgstr "_אירועים אישיים" -#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3 +#: ../data/gui/account_context_menu.ui.h:3 +#: ../data/gui/roster_window.ui.h:3 msgid "_Start Chat..." msgstr "התחלת _שיחה..." @@ -35,7 +36,8 @@ # שיחה מרובת משתתפים # שיחה קבוצתית # קבוצת שיחה -#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/roster_window.ui.h:5 +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." msgstr "שיחת _קבוצה..." @@ -44,7 +46,8 @@ msgstr "הוספת _איש־קשר..." # איתור -#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7 +#: ../data/gui/account_context_menu.ui.h:6 +#: ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" msgstr "מציאת _שירותים" @@ -62,7 +65,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: אשף יצירת חשבון" +msgstr "Gajim: אשף יצירת חשבון" #: ../data/gui/account_creation_wizard_window.ui.h:2 msgid "" @@ -87,7 +90,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please choose one of the options below:" -msgstr "נא לבחור באחת מהאפשרויות הבאות:" +msgstr "נא לבחור באחת מן האפשרויות מטה:" #: ../data/gui/account_creation_wizard_window.ui.h:7 msgid "Please fill in the data for your existing account" @@ -97,13 +100,13 @@ #: ../data/gui/accounts_window.ui.h:22 #: ../data/gui/manage_bookmarks_window.ui.h:2 msgid "_Password:" -msgstr "_מילת־מעבר:" +msgstr "סיס_מה:" # שמירת סיסמא #: ../data/gui/account_creation_wizard_window.ui.h:9 #: ../data/gui/accounts_window.ui.h:20 msgid "Save pass_word" -msgstr "שמירת מילת־מע_בר" +msgstr "שמי_רת סיסמה" # BUG: a dot at the end # From: Clipman @@ -114,12 +117,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:10 #: ../data/gui/accounts_window.ui.h:21 msgid "If checked, Gajim will remember the password for this account" -msgstr "במידה ואפשרות זו מסומנת, Gajim יזכור את מילת־המעבר עבור חשבון זה" +msgstr "במידה ואפשרות זו מסומנת, Gajim יזכור את הסיסמה עבור חשבון זה" #: ../data/gui/account_creation_wizard_window.ui.h:11 #: ../data/gui/accounts_window.ui.h:23 msgid "_Jabber ID:" -msgstr "_JID:" +msgstr "_JID:" #: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Anon_ymous authentication" @@ -160,7 +163,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:20 #: ../data/gui/roster_window.ui.h:8 msgid "_Advanced" -msgstr "מת_קדם" +msgstr "_מתקדם" # הוספת אישור זה לרשימת האישורים המהימנים.\n # טביעת אצבע (מסוג) SHA1 של האישור:\n @@ -179,7 +182,7 @@ "\n" "Please wait..." msgstr "" -"מתחבר אל השרת\n" +"מתחבר כעת אל שרת\n" "\n" "נא להמתין..." @@ -197,14 +200,27 @@ msgstr "_סיום" #: ../data/gui/account_creation_wizard_window.ui.h:30 -#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1254 ../src/config.py:1268 ../src/config.py:1273 -#: ../src/config.py:1321 ../src/config.py:1424 ../src/config.py:1740 -#: ../src/config.py:1745 ../src/config.py:2321 ../src/config.py:2400 -#: ../src/config.py:2413 ../src/config.py:3698 ../src/config.py:3773 -#: ../src/dialogs.py:312 ../src/dialogs.py:314 ../src/dialogs.py:520 -#: ../src/dialogs.py:533 ../src/roster_window.py:3184 -#: ../src/roster_window.py:3190 ../src/roster_window.py:3195 +#: ../data/gui/accounts_window.ui.h:1 +#: ../data/gui/change_mood_dialog.ui.h:1 +#: ../src/config.py:1254 +#: ../src/config.py:1268 +#: ../src/config.py:1273 +#: ../src/config.py:1321 +#: ../src/config.py:1424 +#: ../src/config.py:1740 +#: ../src/config.py:1745 +#: ../src/config.py:2321 +#: ../src/config.py:2400 +#: ../src/config.py:2413 +#: ../src/config.py:3698 +#: ../src/config.py:3773 +#: ../src/dialogs.py:312 +#: ../src/dialogs.py:314 +#: ../src/dialogs.py:520 +#: ../src/dialogs.py:533 +#: ../src/roster_window.py:3184 +#: ../src/roster_window.py:3190 +#: ../src/roster_window.py:3195 msgid "None" msgstr "ללא" @@ -213,24 +229,28 @@ msgstr "חשבונות" #. Change label for accept_button to action name instead of 'OK'. -#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3390 +#: ../dat
gajim: [Aлекс]. Fix time string encoding in the russian windows(...
changeset e0de4f6d0d18 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=e0de4f6d0d18
description: [Aлекс]. Fix time string encoding in the russian windows(cp1251).
diffstat:
src/conversation_textview.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r d3368ce04285 -r e0de4f6d0d18 src/conversation_textview.py
--- a/src/conversation_textview.py Mon Oct 29 15:11:16 2012 +0100
+++ b/src/conversation_textview.py Mon Sep 03 22:02:07 2012 +0400
@@ -1334,7 +1334,7 @@
timestamp_str = helpers.from_one_line(timestamp_str)
format_ += timestamp_str
tim_format = time.strftime(format_, tim)
-if locale.getpreferredencoding() != 'KOI8-R':
+if locale.getpreferredencoding() not in ('KOI8-R', 'cp1251'):
# if tim_format comes as unicode because of day_str.
# we convert it to the encoding that we want (and that is utf-8)
tim_format = helpers.ensure_utf8_string(tim_format)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBA...
changeset 6f0e22a69b08 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=6f0e22a69b08
description: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBAL = 70. A
network device is connected, with global network connectivity.)
diffstat:
src/network_manager_listener.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diffs (16 lines):
diff -r 48536d028e08 -r 6f0e22a69b08 src/network_manager_listener.py
--- a/src/network_manager_listener.py Sun Oct 14 18:21:30 2012 +0200
+++ b/src/network_manager_listener.py Thu Oct 18 00:36:57 2012 +0400
@@ -45,9 +45,10 @@
def state_changed(state):
"""
-For Network Manager 0.7
+For Network Manager 0.7 - 0.9
"""
-if props.Get("org.freedesktop.NetworkManager", "State") == 3:
+nm_state = props.Get("org.freedesktop.NetworkManager", "State")
+if nm_state == 3 or nm_state == 70:
for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.time_to_reconnect:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: typo
changeset 73973c51813e in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=73973c51813e
description: typo
diffstat:
src/session.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (14 lines):
diff -r 841390d32360 -r 73973c51813e src/session.py
--- a/src/session.pyWed Aug 29 12:21:53 2012 +0200
+++ b/src/session.pyWed Sep 05 10:59:59 2012 +0400
@@ -103,8 +103,8 @@
'or remove it (all history will be lost).') % \
common.logger.LOG_DB_PATH
gajim.nec.push_incoming_event(InformationEvent(None,
-conn=self.conn, level='error', pri_txt=pritxt,
-sec_txt=sectxt))
+conn=self.conn, level='error', pri_txt=pritext,
+sec_txt=sectext))
treat_as = gajim.config.get('treat_incoming_messages')
if treat_as:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Fix ugly statusicon in MATE desktop.Set statusicon_size t...
changeset de75ed7e7ed7 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=de75ed7e7ed7
description: Fix ugly statusicon in MATE desktop.Set statusicon_size to 16 if
MATE session detected.
diffstat:
src/statusicon.py | 5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diffs (21 lines):
diff -r fd2366743516 -r de75ed7e7ed7 src/statusicon.py
--- a/src/statusicon.py Thu Oct 18 00:36:57 2012 +0400
+++ b/src/statusicon.py Thu Oct 18 16:05:31 2012 +0400
@@ -118,13 +118,16 @@
def on_status_icon_size_changed(self, statusicon, size):
if size > 31:
self.statusicon_size = '32'
-elif size > 23:
+elif size > 23:
self.statusicon_size = '24'
else:
self.statusicon_size = '16'
if os.environ.get('KDE_FULL_SESSION') == 'true':
# detect KDE session. see #5476
self.statusicon_size = '32'
+if os.environ.get('MATE_DESKTOP_SESSION_ID'):
+# detect MATE session.
+self.statusicon_size = '16'
self.set_img()
def set_img(self):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBA...
changeset fd2366743516 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=fd2366743516
description: add support Network Manager 0.9 (NM_STATE_CONNECTED_GLOBAL = 70. A
network device is connected, with global network connectivity.)
diffstat:
src/network_manager_listener.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diffs (16 lines):
diff -r e5ad3e5e0d51 -r fd2366743516 src/network_manager_listener.py
--- a/src/network_manager_listener.py Sun Oct 14 18:21:30 2012 +0200
+++ b/src/network_manager_listener.py Thu Oct 18 00:36:57 2012 +0400
@@ -45,9 +45,10 @@
def state_changed(state):
"""
-For Network Manager 0.7
+For Network Manager 0.7 - 0.9
"""
-if props.Get("org.freedesktop.NetworkManager", "State") == 3:
+nm_state = props.Get("org.freedesktop.NetworkManager", "State")
+if nm_state == 3 or nm_state == 70:
for connection in gajim.connections.itervalues():
if gajim.config.get_per('accounts', connection.name,
'listen_to_network_manager') and connection.time_to_reconnect:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Darlan].Update Hebrew translation.
changeset 05861886349b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=05861886349b description: [Darlan].Update Hebrew translation. diffstat: po/he.po | 1521 +++-- 1 files changed, 780 insertions(+), 741 deletions(-) diffs (truncated from 4040 to 300 lines): diff -r eede7f0239f8 -r 05861886349b po/he.po --- a/po/he.po Thu Oct 04 17:52:28 2012 +0200 +++ b/po/he.po Thu Oct 04 22:25:07 2012 +0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-17 22:54+0400\n" -"PO-Revision-Date: 2012-09-17 15:20+0200\n" +"POT-Creation-Date: 2012-10-04 21:59+0400\n" +"PO-Revision-Date: 2012-10-04 20:28+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut\n" "Language: he\n" @@ -90,7 +90,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please choose one of the options below:" -msgstr "נא לבחור באחת מן האפשרויות הבאות:" +msgstr "נא לבחור באחת מן האפשרויות מטה:" # credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 @@ -163,7 +163,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:20 #: ../data/gui/roster_window.ui.h:8 msgid "_Advanced" -msgstr "מת_קדם" +msgstr "_מתקדם" # הוספת אישור זה לרשימת האישורים המהימנים.\n # טביעת אצבע (מסוג) SHA1 של האישור:\n @@ -175,14 +175,13 @@ "הוספת תעודה זו אל רשימת התעודות המהימנות.\n" "טביעת אצבע SHA1 של התעודה:\n" -# מתחבר כעת #: ../data/gui/account_creation_wizard_window.ui.h:24 msgid "" "Connecting to server\n" "\n" "Please wait..." msgstr "" -"מתחבר אל השרת\n" +"מתחבר כעת אל שרת\n" "\n" "נא להמתין..." @@ -212,15 +211,15 @@ #: ../src/config.py:2320 #: ../src/config.py:2399 #: ../src/config.py:2412 -#: ../src/config.py:3697 -#: ../src/config.py:3772 +#: ../src/config.py:3698 +#: ../src/config.py:3773 #: ../src/dialogs.py:312 #: ../src/dialogs.py:314 #: ../src/dialogs.py:520 #: ../src/dialogs.py:533 -#: ../src/roster_window.py:3207 -#: ../src/roster_window.py:3213 -#: ../src/roster_window.py:3218 +#: ../src/roster_window.py:3214 +#: ../src/roster_window.py:3220 +#: ../src/roster_window.py:3225 msgid "None" msgstr "ללא" @@ -230,21 +229,21 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3390 -#: ../src/dialogs.py:3436 +#: ../src/dialogs.py:3425 +#: ../src/dialogs.py:3471 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3394 -#: ../src/dialogs.py:3491 +#: ../src/dialogs.py:3429 +#: ../src/dialogs.py:3526 msgid "Delete" msgstr "מחיקה" #. Rename #: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5789 +#: ../src/roster_window.py:5827 msgid "Re_name" msgstr "_שינוי שם" @@ -401,9 +400,9 @@ #: ../src/common/contacts.py:135 #: ../src/dialogs.py:112 #: ../src/dialogs.py:124 -#: ../src/roster_window.py:3149 -#: ../src/roster_window.py:4246 -#: ../src/roster_window.py:5839 +#: ../src/roster_window.py:3156 +#: ../src/roster_window.py:4284 +#: ../src/roster_window.py:5877 msgid "General" msgstr "כללית" @@ -747,32 +746,30 @@ msgid "Yes" msgstr "כן" +# מועדפת #: ../data/gui/archiving_preferences_window.ui.h:3 -#, fuzzy msgid "Prefer" -msgstr "העדפות" - +msgstr "העדף" + +# Concession/Waive = ויתור #: ../data/gui/archiving_preferences_window.ui.h:4 msgid "Concede" -msgstr "" - +msgstr "וותר" + +# אסירה #: ../data/gui/archiving_preferences_window.ui.h:5 -#, fuzzy msgid "Forbid" -msgstr "אסירה" +msgstr "אסור" #: ../data/gui/archiving_preferences_window.ui.h:6 -#, fuzzy msgid "Method Manual" msgstr "שיטה ידנית" #: ../data/gui/archiving_preferences_window.ui.h:7 -#, fuzzy msgid "Method Local" msgstr "שיטה מקומית" #: ../data/gui/archiving_preferences_window.ui.h:8 -#, fuzzy msgid "Method Auto" msgstr "שיטה אוטומטית" @@ -802,6 +799,10 @@ msgid "Last modified:" msgstr "שונתה לאחרונה:" +#: ../data/gui/atom_entry_window.ui.h:6 +msgid "Next entry" +msgstr "רשומה באה" + #: ../data/gui/blocked_contacts_window.ui.h:1 msgid "Blocked Contacts" msgstr "אנשי־קשר חסומים" @@ -809,9 +810,9 @@ #: ../data/gui/blocked_contacts_window.ui.h:2 #: ../data/gui/contact_context_menu.ui.h:20 #: ../data/gui/gc_occupants_menu.ui.h:14 -#: ../src/roster_window.py:5808 -#: ../src/roster_window.py:5935 -#: ../src/roster_window.py:6068 +#: ../src/roster_window.py:5846 +#: ../src/roster_window.py:5973 +#: ../src/roster_window.py:6106 msgid "_Unblock" msgstr "_ביטול חסימה" @@ -958,7 +959,7 @@ #: ../data/gui/chat_control.ui.h:12 #: ../data/gui/groupchat_control.ui.h:9 #: ../data/gui/xml_console_window.ui.h:15 -#: ../src/filetransfers_window.py:304 +#: ../src/filetransfers_window.py:322 msgid "_Send" msgstr "_שליחה" @@ -1016,7 +1017,7 @@ "You are going to begin a Multi-User Chat.\n" "Select the contacts you want to invite" msg
gajim: output style.
changeset ec3c3635aecf in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ec3c3635aecf
description: output style.
diffstat:
src/command_system/implementation/standard.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (14 lines):
diff -r 850eb549ea8f -r ec3c3635aecf
src/command_system/implementation/standard.py
--- a/src/command_system/implementation/standard.py Sun Sep 23 13:34:21
2012 +0200
+++ b/src/command_system/implementation/standard.py Sun Sep 23 23:59:26
2012 +0400
@@ -129,8 +129,8 @@
@doc(_("""
Set the current status
-Status can be given as one of the following values: online, away,
-chat, xa, dnd.
+Status can be given as one of the following values:
+online, away, chat, xa, dnd.
"""))
def status(self, status, message):
if status not in ('online', 'away', 'chat', 'xa', 'dnd'):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Darlan]. Update Hebrew translation.
changeset 9c8c9cdad426 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9c8c9cdad426 description: [Darlan]. Update Hebrew translation. diffstat: po/he.po | 869 ++ 1 files changed, 425 insertions(+), 444 deletions(-) diffs (truncated from 2118 to 300 lines): diff -r 4d684f50be00 -r 9c8c9cdad426 po/he.po --- a/po/he.po Wed Sep 19 17:20:45 2012 +0200 +++ b/po/he.po Thu Sep 20 21:50:05 2012 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-08-17 22:54+0400\n" -"PO-Revision-Date: 2012-09-11 13:47+0200\n" +"PO-Revision-Date: 2012-09-17 15:20+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut\n" "Language: he\n" @@ -274,7 +274,7 @@ #: ../src/notify.py:389 #: ../src/notify.py:405 msgid "Gajim" -msgstr "Gajim" +msgstr "Gajim" # BUG: _underline # אישי־קשר @@ -300,7 +300,7 @@ msgid "Administration operations" msgstr "פעולות הנהלת מערכת" -# BUG: from a jabber +# BUG: from a jabber "the" # שני לקוחות ומעלה #: ../data/gui/accounts_window.ui.h:15 msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" @@ -369,7 +369,7 @@ # כוללני #: ../data/gui/accounts_window.ui.h:33 msgid "Synch_ronize account status with global status" -msgstr "סנכרון מצב חשבון עם מצב־החיבור ה_גלובלי" +msgstr "סנכרון מצב חשבון עם מצב־חיבור _גלובלי" # BUG: a dot at the end # תיבת אפשרויות @@ -379,7 +379,7 @@ # תיבת שיח #: ../data/gui/accounts_window.ui.h:34 msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly" -msgstr "במידה ואפשרות זו מסומנת, כל שינוי למצב־החיבור הגלובלי (מטופל על ידי תיבת־הבחירה שמצויה בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" +msgstr "במידה ואפשרות זו מסומנת, כל שינוי אל מצב־החיבור הגלובלי (מטופל על ידי תיבת־הבחירה שמצויה בתחתית חלון הרשימה) ישנה את המצב של חשבון זה בהתאמה" # BUG: _underline #: ../data/gui/accounts_window.ui.h:35 @@ -511,7 +511,7 @@ #: ../data/gui/accounts_window.ui.h:60 msgid "Synchroni_ze account status with global status" -msgstr "סנכרון מצב חשבון עם מצב־החיבור ה_גלובלי" +msgstr "סנכרון מצב חשבון עם מצב־חיבור _גלובלי" #: ../data/gui/accounts_window.ui.h:61 msgid "Use cust_om port:" @@ -523,7 +523,7 @@ "If the default port that is used for incoming messages is unfitting for your setup you can select another one here.\n" "You might consider to change possible firewall settings." msgstr "" -"במידה והפתחה המשתמטת שמצויה בשימוש עבור הודעות נכנסות איננה מתאימה עבור ההתקנה שלך ביכולתך לבחור פתחה אחרת כאן.\n" +"במידה והפתחה המשתמטת שמצויה בשימוש עבור הודעות נכנסות איננה מתאימה עבור התקנתך ביכולתך לבחור פתחה אחרת כאן.\n" "ייתכן שיהיה ברצונך לשקול לשנות הגדרות חומת־אש אפשריות." #: ../data/gui/accounts_window.ui.h:64 @@ -581,10 +581,9 @@ msgid "_Group:" msgstr "_קבוצה:" -# הענקת הרשאה #: ../data/gui/add_new_contact_window.ui.h:7 msgid "A_llow this contact to view my status" -msgstr "ה_רשה לאיש־קשר זה לראות את מצב־החיבור שלי" +msgstr "הת_ר לאיש־קשר זה לראות את מצב־חיבורי" # BUG: Request or Subscription Request instead of Subscription # בקשת @@ -609,14 +608,13 @@ msgid "_Register" msgstr "ה_רשמה" -# היכולת #: ../data/gui/add_new_contact_window.ui.h:14 msgid "" "You must be connected to the transport to be able\n" "to add a contact from this protocol." msgstr "" "עליך להתחבר אל מוביל בכדי שתעמוד לרשותך\n" -"האפשרות להוסיף איש־קשר מפרוטוקול זה ." +"היכולת להוסיף איש־קשר מן פרוטוקול זה." #: ../data/gui/add_new_contact_window.ui.h:16 #: ../src/common/helpers.py:1363 @@ -1115,7 +1113,7 @@ # לאיש־קשר זה #: ../data/gui/contact_context_menu.ui.h:17 msgid "_Allow him/her to see my status" -msgstr "_התר לאיש־קשר זה לראות את מצב־החיבור שלי" +msgstr "_התר לאיש־קשר זה לראות את מצב־חיבורי" # לראות # שלה/שלו @@ -1125,7 +1123,7 @@ #: ../data/gui/contact_context_menu.ui.h:19 msgid "_Forbid him/her to see my status" -msgstr "_מנע מאיש־קשר זה מלראות את מצב־החיבור שלי" +msgstr "_מנע מאיש־קשר זה מלראות את מצב־חיבורי" #: ../data/gui/contact_context_menu.ui.h:21 #: ../data/gui/gc_occupants_menu.ui.h:13 @@ -1276,7 +1274,7 @@ #: ../data/gui/gajim_themes_window.ui.h:5 msgid "Gajim Themes Customization" -msgstr "התאמת מוטיבים של Gajim" +msgstr "התאמת מוטיבים של Gajim" #: ../data/gui/gajim_themes_window.ui.h:6 msgid "Text _color:" @@ -1427,7 +1425,7 @@ #: ../data/gui/groupchat_control.ui.h:3 msgid "Change your nickname (Ctrl+N)" -msgstr "שינוי הכינוי שלך (Ctrl+N)" +msgstr "שינוי כינוייך (Ctrl+N)" #: ../data/gui/groupchat_control.ui.h:4 msgid "Change the room's subject (Alt+T)" @@ -1454,7 +1452,7 @@ #: ../data/gui/history_manager.ui.h:1 msgid "Gajim History Logs Manager" -msgstr "מנהל רשומות ההיסטור
gajim: [Darlan]. Update Hebrew translation.
changeset 25cc05720fe1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=25cc05720fe1 description: [Darlan]. Update Hebrew translation. diffstat: po/he.po | 429 -- 1 files changed, 218 insertions(+), 211 deletions(-) diffs (truncated from 1657 to 300 lines): diff -r e777df0d7025 -r 25cc05720fe1 po/he.po --- a/po/he.po Sun Sep 09 14:28:56 2012 +0400 +++ b/po/he.po Tue Sep 11 21:53:20 2012 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-08-17 22:54+0400\n" -"PO-Revision-Date: 2012-08-18 10:37+0200\n" +"PO-Revision-Date: 2012-09-11 13:47+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut\n" "Language: he\n" @@ -65,7 +65,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:1 msgid "Gajim: Account Creation Wizard" -msgstr "Gajim: אשף יצירת חשבון" +msgstr "Gajim: אשף יצירת חשבון" #: ../data/gui/account_creation_wizard_window.ui.h:2 msgid "" @@ -90,7 +90,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:6 msgid "Please choose one of the options below:" -msgstr "נא לבחור באחת מהאפשרויות הבאות:" +msgstr "נא לבחור באחת מן האפשרויות הבאות:" # credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 @@ -101,13 +101,12 @@ #: ../data/gui/accounts_window.ui.h:22 #: ../data/gui/manage_bookmarks_window.ui.h:2 msgid "_Password:" -msgstr "_מילת־מעבר:" - -# שמירת סיסמא +msgstr "סיס_מה:" + #: ../data/gui/account_creation_wizard_window.ui.h:9 #: ../data/gui/accounts_window.ui.h:20 msgid "Save pass_word" -msgstr "שמירת מילת־מע_בר" +msgstr "שמי_רת סיסמה" # BUG: a dot at the end # From: Clipman @@ -118,12 +117,12 @@ #: ../data/gui/account_creation_wizard_window.ui.h:10 #: ../data/gui/accounts_window.ui.h:21 msgid "If checked, Gajim will remember the password for this account" -msgstr "במידה ואפשרות זו מסומנת, Gajim יזכור את מילת־המעבר עבור חשבון זה" +msgstr "במידה ואפשרות זו מסומנת, Gajim יזכור את הסיסמה עבור חשבון זה" #: ../data/gui/account_creation_wizard_window.ui.h:11 #: ../data/gui/accounts_window.ui.h:23 msgid "_Jabber ID:" -msgstr "_JID:" +msgstr "_JID:" #: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Anon_ymous authentication" @@ -262,7 +261,7 @@ #: ../data/gui/accounts_window.ui.h:8 msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" -msgstr "משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, תלוי במספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהי/ה מחובר/ת אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" +msgstr "משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, בהסתמך על מספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהי/ה מחובר/ת אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" # In Hebrew: גאג'ים #. No configured account @@ -289,22 +288,23 @@ #: ../data/gui/accounts_window.ui.h:12 msgid "Chan_ge Password" -msgstr "שי_נוי מילת־מעבר" +msgstr "שי_נוי סיסמה" # Omitted: Click to #: ../data/gui/accounts_window.ui.h:13 msgid "Click to change account's password" -msgstr "שינוי מילת־המעבר של החשבון" +msgstr "שינוי הסיסמה של החשבון" # מנהל, ניהול #: ../data/gui/accounts_window.ui.h:14 msgid "Administration operations" msgstr "פעולות הנהלת מערכת" +# BUG: from a jabber # שני לקוחות ומעלה #: ../data/gui/accounts_window.ui.h:15 msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The client with the highest priority gets the events" -msgstr "עדיפת משמשת אצל Jabber כדי לקבוע מי מקבל את האירועים משרת ה־jabber כאשר שני לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר יקבל את האירועים" +msgstr "עדיפת משמשת אצל Jabber כדי לקבוע מי מקבל את האירועים מן שרת jabber כאשר שני לקוחות או יותר מחוברים באמצעות אותו החשבון; הלקוח בעל העדיפות הגבוהה ביותר יקבל את האירועים" #: ../data/gui/accounts_window.ui.h:16 msgid "A_djust to status" @@ -426,7 +426,7 @@ #: ../data/gui/accounts_window.ui.h:42 msgid "Check this so Gajim will ask you before sending your password over an insecure connection." -msgstr "סמנו את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת מילת־המעבר שלך על פני חיבור לא מאובטח." +msgstr "סמנו את אפשרות זו כדי ש־Gajim ישאל אותך טרם שליחת סיסמתך על פני חיבור לא מאובטח." # חבילות נתונים מסוג #: ../data/gui/accounts_window.ui.h:43 @@ -481,12 +481,12 @@ # BUG: a dot at the end #: ../data/gui/ac
gajim: Add build.bat
changeset e777df0d7025 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=e777df0d7025 description: Add build.bat diffstat: build.bat | 37 + 1 files changed, 37 insertions(+), 0 deletions(-) diffs (42 lines): diff -r 8d801cac3b5c -r e777df0d7025 build.bat --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/build.bat Sun Sep 09 14:28:56 2012 +0400 @@ -0,0 +1,37 @@ +rmdir /S /Q gajim_built + +mkdir gajim_built +hg archive gajim_built +xcopy ..\gajim-plugins\plugin_installer gajim_built\plugins\plugin_installer /e /i + +copy msgfmt.exe gajim_built +copy gettextsrc.dll gajim_built +copy gettextlib.dll gajim_built +copy msvcr90.dll gajim_built + +cd gajim_built + +REM for libglade-2.0.0.dll +PATH=..\src\gtk\bin;%PATH% + +c:\python27\python.exe setup_win32.py build_exe + +move build\exe.win32-2.7 . +rename exe.win32-2.7 bin + +copy ..\LIBEAY32.dll bin +copy ..\SSLEAY32.dll bin + +mkdir bin\gtk +cd ../src/gtk +hg archive ..\..\gajim_built\bin\gtk +cd ../../gajim_built/ + +REM for msgfmt +PATH=bin\gtk\bin;%PATH% + +for %%l in (po\*.po) do mkdir po\%%~nl & mkdir po\%%~nl\LC_MESSAGES & msgfmt -o po\%%~nl\LC_MESSAGES\gajim.mo %%l + +"C:\Program Files\NSIS\makensis" gajim.nsi + +cd .. \ No newline at end of file ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: russian translation update
changeset 4e4310406a4a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=4e4310406a4a description: russian translation update diffstat: po/ru.po | 7079 +++-- 1 files changed, 3639 insertions(+), 3440 deletions(-) diffs (truncated from 11556 to 300 lines): diff -r ec85c0433906 -r 4e4310406a4a po/ru.po --- a/po/ru.po Thu Sep 06 23:07:35 2012 +0400 +++ b/po/ru.po Thu Sep 06 23:38:53 2012 +0400 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-01 11:01+0400\n" -"PO-Revision-Date: 2012-08-12 21:54+0300\n" +"POT-Creation-Date: 2012-09-06 23:05+0400\n" +"PO-Revision-Date: 2012-09-06 23:36+0300\n" "Last-Translator: Fomin Denis \n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -25,46 +25,141 @@ "X-Generator: Virtaal 0.6.1\n" #: ../data/gui/account_context_menu.ui.h:1 -#: ../data/gui/roster_window.ui.h:7 +#: ../data/gui/zeroconf_context_menu.ui.h:1 +msgid "_Status" +msgstr "_Статус" + +#: ../data/gui/account_context_menu.ui.h:2 +msgid "_Personal Events" +msgstr "_Расширенный статус" + +#: ../data/gui/account_context_menu.ui.h:3 +#: ../data/gui/roster_window.ui.h:3 +msgid "_Start Chat..." +msgstr "_Начать беседу..." + +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/roster_window.ui.h:5 msgid "Join _Group Chat..." -msgstr "Войти в _комнату" - -#: ../data/gui/account_context_menu.ui.h:2 +msgstr "Войти в _комнату..." + +#: ../data/gui/account_context_menu.ui.h:5 msgid "_Add Contact..." msgstr "_Добавить контакт..." -#: ../data/gui/account_context_menu.ui.h:3 -#: ../data/gui/roster_window.ui.h:19 +#: ../data/gui/account_context_menu.ui.h:6 +#: ../data/gui/roster_window.ui.h:7 msgid "_Discover Services" msgstr "_Просмотреть сервисы" -#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/account_context_menu.ui.h:7 msgid "_Execute Command..." msgstr "В_ыполнить команду..." -#: ../data/gui/account_context_menu.ui.h:5 +#: ../data/gui/account_context_menu.ui.h:8 +msgid "_Open Gmail Inbox" +msgstr "_Открыть Gmail" + +#: ../data/gui/account_context_menu.ui.h:9 msgid "_Modify Account" msgstr "_Редактировать учетную запись" -#: ../data/gui/account_context_menu.ui.h:6 -msgid "_Open Gmail Inbox" -msgstr "_Открыть Gmail" - -#: ../data/gui/account_context_menu.ui.h:7 -msgid "_Personal Events" -msgstr "_Расширенный статус" - -#: ../data/gui/account_context_menu.ui.h:8 -#: ../data/gui/roster_window.ui.h:24 -msgid "_Start Chat..." -msgstr "_Начать беседу" - -#: ../data/gui/account_context_menu.ui.h:9 -#: ../data/gui/zeroconf_context_menu.ui.h:2 -msgid "_Status" -msgstr "_Статус" - #: ../data/gui/account_creation_wizard_window.ui.h:1 +msgid "Gajim: Account Creation Wizard" +msgstr "Gajim: мастер создания учетной записи" + +#: ../data/gui/account_creation_wizard_window.ui.h:2 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "" +"Необходимо создать учетную запись для присоединения \n" +"к сети Jabber." + +#: ../data/gui/account_creation_wizard_window.ui.h:4 +msgid "I already have an account I want to _use" +msgstr "У меня уже есть учетная запись, которую я хочу _использовать" + +#: ../data/gui/account_creation_wizard_window.ui.h:5 +msgid "I want to _register for a new account" +msgstr "Я хочу _зарегистрировать новую учетную запись" + +#: ../data/gui/account_creation_wizard_window.ui.h:6 +msgid "Please choose one of the options below:" +msgstr "Выберите одну из опций из списка ниже:" + +#: ../data/gui/account_creation_wizard_window.ui.h:7 +msgid "Please fill in the data for your existing account" +msgstr "Заполните данные для вашей новой учетной записи" + +#: ../data/gui/account_creation_wizard_window.ui.h:8 +#: ../data/gui/accounts_window.ui.h:22 +#: ../data/gui/manage_bookmarks_window.ui.h:2 +msgid "_Password:" +msgstr "_Пароль:" + +#: ../data/gui/account_creation_wizard_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:20 +msgid "Save pass_word" +msgstr "Сохранить _пароль" + +#: ../data/gui/account_creation_wizard_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:21 +msgid "If checked, Gajim will remember the password for this account" +msgstr "Если отмечено, то Gajim запомнит пароль учетной записи" + +#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/accounts_window
gajim: typo
changeset ec85c0433906 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ec85c0433906
description: typo
diffstat:
src/chat_control.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (14 lines):
diff -r a1b03412a1cd -r ec85c0433906 src/chat_control.py
--- a/src/chat_control.py Thu Sep 06 18:41:30 2012 +0200
+++ b/src/chat_control.py Thu Sep 06 23:07:35 2012 +0400
@@ -2894,8 +2894,8 @@
except exceptions.DatabaseMalformed:
import common.logger
dialogs.ErrorDialog(_('Database Error'),
-_('The database file (%s) cannot be read. Try to repair 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 = []
local_old_kind = None
for row in rows: # row[0] time, row[1] has kind, row[2] the message
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: typo
changeset 3b91071c9876 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=3b91071c9876
description: typo
diffstat:
src/session.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diffs (14 lines):
diff -r c1103a8737dc -r 3b91071c9876 src/session.py
--- a/src/session.pyMon Sep 03 22:02:07 2012 +0400
+++ b/src/session.pyWed Sep 05 10:59:59 2012 +0400
@@ -103,8 +103,8 @@
'or remove it (all history will be lost).') % \
common.logger.LOG_DB_PATH
gajim.nec.push_incoming_event(InformationEvent(None,
-conn=self.conn, level='error', pri_txt=pritxt,
-sec_txt=sectxt))
+conn=self.conn, level='error', pri_txt=pritext,
+sec_txt=sectext))
treat_as = gajim.config.get('treat_incoming_messages')
if treat_as:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Aлекс]. Fix time string encoding in the russian windows(...
changeset c1103a8737dc in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=c1103a8737dc
description: [Aлекс]. Fix time string encoding in the russian windows(cp1251).
diffstat:
src/conversation_textview.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 4d141800e2e6 -r c1103a8737dc src/conversation_textview.py
--- a/src/conversation_textview.py Sun Sep 02 12:59:55 2012 -0400
+++ b/src/conversation_textview.py Mon Sep 03 22:02:07 2012 +0400
@@ -1303,7 +1303,7 @@
timestamp_str = helpers.from_one_line(timestamp_str)
format_ += timestamp_str
tim_format = time.strftime(format_, tim)
-if locale.getpreferredencoding() != 'KOI8-R':
+if locale.getpreferredencoding() not in ('KOI8-R', 'cp1251'):
# if tim_format comes as unicode because of day_str.
# we convert it to the encoding that we want (and that is utf-8)
tim_format = helpers.ensure_utf8_string(tim_format)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: don't resize empty and animation icon.Fixes #7225
changeset 0d137d5012e6 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=0d137d5012e6
description: don't resize empty and animation icon.Fixes #7225
diffstat:
src/gtkgui_helpers.py | 30 +-
1 files changed, 21 insertions(+), 9 deletions(-)
diffs (50 lines):
diff -r a4fe5b28e9e0 -r 0d137d5012e6 src/gtkgui_helpers.py
--- a/src/gtkgui_helpers.py Fri Aug 31 11:46:45 2012 +0200
+++ b/src/gtkgui_helpers.py Fri Aug 31 15:42:25 2012 +0400
@@ -1042,6 +1042,13 @@
iconset = gajim.config.DEFAULT_ICONSET
gajim.config.set('iconset', iconset)
+path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
+gajim.interface.jabber_state_images['16'] = load_iconset(path)
+
+pixo, pixc = load_icons_meta()
+gajim.interface.jabber_state_images['opened'] = load_iconset(path, pixo)
+gajim.interface.jabber_state_images['closed'] = load_iconset(path, pixc)
+
path = os.path.join(helpers.get_iconset_path(iconset), '32x32')
gajim.interface.jabber_state_images['32'] = load_iconset(path)
@@ -1052,18 +1059,23 @@
# Resize 32x32 icons to 24x24
for each in gajim.interface.jabber_state_images['32']:
img = gtk.Image()
-pix = gajim.interface.jabber_state_images['32'][each].get_pixbuf()
-scaled_pix = pix.scale_simple(24, 24, gtk.gdk.INTERP_BILINEAR)
+pix = gajim.interface.jabber_state_images['32'][each]
+pix_type = pix.get_storage_type()
+if pix_type == gtk.IMAGE_ANIMATION:
+animation = pix.get_animation()
+pixbuf = animation.get_static_image()
+elif pix_type == gtk.IMAGE_EMPTY:
+pix = gajim.interface.jabber_state_images['16'][each]
+pix_16_type = pix.get_storage_type()
+if pix_16_type == gtk.IMAGE_ANIMATION:
+animation = pix.get_animation()
+pixbuf = animation.get_static_image()
+else:
+pixbuf = pix.get_pixbuf()
+scaled_pix = pixbuf.scale_simple(24, 24, gtk.gdk.INTERP_BILINEAR)
img.set_from_pixbuf(scaled_pix)
gajim.interface.jabber_state_images['24'][each] = img
-path = os.path.join(helpers.get_iconset_path(iconset), '16x16')
-gajim.interface.jabber_state_images['16'] = load_iconset(path)
-
-pixo, pixc = load_icons_meta()
-gajim.interface.jabber_state_images['opened'] = load_iconset(path, pixo)
-gajim.interface.jabber_state_images['closed'] = load_iconset(path, pixc)
-
def reload_jabber_state_images():
make_jabber_state_images()
gajim.interface.roster.update_jabber_state_images()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: set the focus when the first tab is opened
changeset df0845a7b449 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=df0845a7b449
description: set the focus when the first tab is opened
diffstat:
data/gui/message_window.ui | 1 -
src/message_window.py | 3 +--
2 files changed, 1 insertions(+), 3 deletions(-)
diffs (31 lines):
diff -r 0e4f8195b061 -r df0845a7b449 data/gui/message_window.ui
--- a/data/gui/message_window.uiFri Aug 24 17:26:00 2012 +0400
+++ b/data/gui/message_window.uiFri Aug 24 18:21:38 2012 +0400
@@ -12,7 +12,6 @@
True
-True
True
0
diff -r 0e4f8195b061 -r df0845a7b449 src/message_window.py
--- a/src/message_window.py Fri Aug 24 17:26:00 2012 +0400
+++ b/src/message_window.py Fri Aug 24 18:21:38 2012 +0400
@@ -144,8 +144,6 @@
self.notebook.set_show_border(gajim.config.get('tabs_border'))
self.show_icon()
-gobject.idle_add(self.notebook.grab_focus)
-
def change_account_name(self, old_name, new_name):
if old_name in self._controls:
self._controls[new_name] = self._controls[old_name]
@@ -307,6 +305,7 @@
# NOTE: we do not call set_control_active(True) since we don't know
# whether the tab is the active one.
self.show_title()
+gobject.timeout_add(500, control.msg_textview.grab_focus)
def on_tab_eventbox_button_press_event(self, widget, event, child):
if event.button == 3: # right click
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Add Keyboard Shortcuts menuitem to Help menu
changeset 0e4f8195b061 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=0e4f8195b061
description: Add Keyboard Shortcuts menuitem to Help menu
diffstat:
data/gui/roster_window.ui | 17 -
src/roster_window.py | 4
2 files changed, 20 insertions(+), 1 deletions(-)
diffs (55 lines):
diff -r 7719b4c17326 -r 0e4f8195b061 data/gui/roster_window.ui
--- a/data/gui/roster_window.ui Fri Aug 24 13:33:27 2012 +0200
+++ b/data/gui/roster_window.ui Fri Aug 24 17:26:00 2012 +0400
@@ -12,9 +12,9 @@
-
+
@@ -283,6 +283,16 @@
+
+Keyboard
Shortcuts
+True
+True
+image14
+False
+
+
+
+
True
@@ -467,4 +477,9 @@
gtk-disconnect
1
+
+True
+gtk-info
+1
+
diff -r 7719b4c17326 -r 0e4f8195b061 src/roster_window.py
--- a/src/roster_window.py Fri Aug 24 13:33:27 2012 +0200
+++ b/src/roster_window.py Fri Aug 24 17:26:00 2012 +0400
@@ -3978,6 +3978,10 @@
helpers.launch_browser_mailer('url',
'http://trac.gajim.org/wiki/GajimFaq')
+def on_keyboard_shortcuts_menuitem_activate(self, widget):
+helpers.launch_browser_mailer('url',
+'http://trac.gajim.org/wiki/KeyboardShortcuts')
+
def on_features_menuitem_activate(self, widget):
features_window.FeaturesWindow()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: merge
changeset 24193ae70518 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=24193ae70518 description: merge ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: typo
changeset 037a10dda218 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=037a10dda218 description: typo diffstat: src/dialogs.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diffs (15 lines): diff -r e00cf699baf7 -r 037a10dda218 src/dialogs.py --- a/src/dialogs.pyThu Aug 23 22:11:21 2012 +0200 +++ b/src/dialogs.pyFri Aug 24 10:33:46 2012 +0400 @@ -1662,9 +1662,9 @@ *self.user_response_yes[1:]) else: if self.textview: +self.user_response_yes(self.is_checked(), txt) +else: self.user_response_yes(self.is_checked()) -else: -self.user_response_yes(self.is_checked(), txt) self.call_cancel_on_destroy = False self.destroy() ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: fix unexpected indent
changeset 0c6bb3ae90e1 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=0c6bb3ae90e1
description: fix unexpected indent
diffstat:
src/roster_window.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (16 lines):
diff -r a669ca598089 -r 0c6bb3ae90e1 src/roster_window.py
--- a/src/roster_window.py Wed Aug 22 22:28:41 2012 +0400
+++ b/src/roster_window.py Wed Aug 22 22:42:00 2012 +0400
@@ -1194,9 +1194,9 @@
# the treeview
if contact.status and gajim.config.get('show_status_msgs_in_roster'):
status = contact.status.strip()
-if status != '':
-status = helpers.reduce_chars_newlines(status,
-max_lines = 1)
+if status != '':
+status = helpers.reduce_chars_newlines(status,
+max_lines = 1)
# escape markup entities and make them small
# italic and fg color color is calcuted to be
# always readable
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: revert test patch. fix previous commit
changeset a669ca598089 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=a669ca598089
description: revert test patch. fix previous commit
diffstat:
src/roster_window.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (17 lines):
diff -r 89ca4c2f1dd0 -r a669ca598089 src/roster_window.py
--- a/src/roster_window.py Wed Aug 22 22:21:26 2012 +0400
+++ b/src/roster_window.py Wed Aug 22 22:28:41 2012 +0400
@@ -1192,10 +1192,10 @@
# add status msg, if not empty, under contact name in
# the treeview
-if not contact.status:
-contact.status = ' '
if contact.status and gajim.config.get('show_status_msgs_in_roster'):
-status = helpers.reduce_chars_newlines(contact.status,
+status = contact.status.strip()
+if status != '':
+status = helpers.reduce_chars_newlines(status,
max_lines = 1)
# escape markup entities and make them small
# italic and fg color color is calcuted to be
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: plugin system. checking the type of stored data. Fix #7220
changeset 89ca4c2f1dd0 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=89ca4c2f1dd0
description: plugin system. checking the type of stored data. Fix #7220
diffstat:
src/plugins/plugin.py | 2 ++
src/roster_window.py | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diffs (29 lines):
diff -r 2359e1b05621 -r 89ca4c2f1dd0 src/plugins/plugin.py
--- a/src/plugins/plugin.py Mon Aug 20 15:46:20 2012 +0200
+++ b/src/plugins/plugin.py Wed Aug 22 22:21:26 2012 +0400
@@ -259,6 +259,8 @@
s = shelve.open(self.FILE_PATH)
for (k, v) in s.iteritems():
self.data[k] = v
+if not isinstance(self.data, dict):
+raise GajimPluginException
s.close()
self.save()
except:
diff -r 2359e1b05621 -r 89ca4c2f1dd0 src/roster_window.py
--- a/src/roster_window.py Mon Aug 20 15:46:20 2012 +0200
+++ b/src/roster_window.py Wed Aug 22 22:21:26 2012 +0400
@@ -1192,10 +1192,10 @@
# add status msg, if not empty, under contact name in
# the treeview
+if not contact.status:
+contact.status = ' '
if contact.status and gajim.config.get('show_status_msgs_in_roster'):
-status = contact.status.strip()
-if status != '':
-status = helpers.reduce_chars_newlines(status,
+status = helpers.reduce_chars_newlines(contact.status,
max_lines = 1)
# escape markup entities and make them small
# italic and fg color color is calcuted to be
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Isratine Citizen]. Update Hebrew translation.
changeset 3bff619a66d2 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3bff619a66d2 description: [Isratine Citizen]. Update Hebrew translation. diffstat: po/he.po | 2358 +++-- 1 files changed, 1214 insertions(+), 1144 deletions(-) diffs (truncated from 5960 to 300 lines): diff -r be7b3003df1f -r 3bff619a66d2 po/he.po --- a/po/he.po Fri Aug 17 23:09:24 2012 +0400 +++ b/po/he.po Sun Aug 19 14:46:42 2012 +0400 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-07-04 22:54+0400\n" -"PO-Revision-Date: 2012-07-26 14:47+0200\n" +"POT-Creation-Date: 2012-08-17 22:54+0400\n" +"PO-Revision-Date: 2012-08-18 10:37+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut\n" "Language: he\n" @@ -92,9 +92,10 @@ msgid "Please choose one of the options below:" msgstr "נא לבחור באחת מהאפשרויות הבאות:" +# credentials #: ../data/gui/account_creation_wizard_window.ui.h:7 msgid "Please fill in the data for your existing account" -msgstr "נא להזין מידע עבור חשבונך הקיים" +msgstr "נא להזין את נתוני ההתחברות עבור חשבונך הקיים" #: ../data/gui/account_creation_wizard_window.ui.h:8 #: ../data/gui/accounts_window.ui.h:22 @@ -106,7 +107,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:9 #: ../data/gui/accounts_window.ui.h:20 msgid "Save pass_word" -msgstr "שמירת _מילת־מעבר" +msgstr "שמירת מילת־מע_בר" # BUG: a dot at the end # From: Clipman @@ -122,7 +123,7 @@ #: ../data/gui/account_creation_wizard_window.ui.h:11 #: ../data/gui/accounts_window.ui.h:23 msgid "_Jabber ID:" -msgstr "_JID:" +msgstr "_JID:" #: ../data/gui/account_creation_wizard_window.ui.h:12 msgid "Anon_ymous authentication" @@ -202,25 +203,25 @@ #: ../data/gui/account_creation_wizard_window.ui.h:30 #: ../data/gui/accounts_window.ui.h:1 #: ../data/gui/change_mood_dialog.ui.h:1 -#: ../src/config.py:1253 -#: ../src/config.py:1267 -#: ../src/config.py:1272 -#: ../src/config.py:1320 -#: ../src/config.py:1423 -#: ../src/config.py:1738 -#: ../src/config.py:1743 -#: ../src/config.py:2319 -#: ../src/config.py:2398 -#: ../src/config.py:2411 -#: ../src/config.py:3691 -#: ../src/config.py:3766 -#: ../src/dialogs.py:311 -#: ../src/dialogs.py:313 -#: ../src/dialogs.py:519 -#: ../src/dialogs.py:532 -#: ../src/roster_window.py:3202 -#: ../src/roster_window.py:3208 +#: ../src/config.py:1254 +#: ../src/config.py:1268 +#: ../src/config.py:1273 +#: ../src/config.py:1321 +#: ../src/config.py:1424 +#: ../src/config.py:1739 +#: ../src/config.py:1744 +#: ../src/config.py:2320 +#: ../src/config.py:2399 +#: ../src/config.py:2412 +#: ../src/config.py:3697 +#: ../src/config.py:3772 +#: ../src/dialogs.py:312 +#: ../src/dialogs.py:314 +#: ../src/dialogs.py:520 +#: ../src/dialogs.py:533 +#: ../src/roster_window.py:3207 #: ../src/roster_window.py:3213 +#: ../src/roster_window.py:3218 msgid "None" msgstr "ללא" @@ -230,21 +231,21 @@ #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:3 -#: ../src/dialogs.py:3389 -#: ../src/dialogs.py:3435 +#: ../src/dialogs.py:3390 +#: ../src/dialogs.py:3436 msgid "Add" msgstr "הוספה" #. Change label for accept_button to action name instead of 'OK'. #: ../data/gui/accounts_window.ui.h:4 -#: ../src/dialogs.py:3393 -#: ../src/dialogs.py:3490 +#: ../src/dialogs.py:3394 +#: ../src/dialogs.py:3491 msgid "Delete" msgstr "מחיקה" #. Rename #: ../data/gui/accounts_window.ui.h:5 -#: ../src/roster_window.py:5784 +#: ../src/roster_window.py:5789 msgid "Re_name" msgstr "_שינוי שם" @@ -252,7 +253,7 @@ #: ../data/gui/accounts_window.ui.h:6 #: ../data/gui/xml_console_window.ui.h:3 msgid "_Enable" -msgstr "_אפשור" +msgstr "א_פשור" # אימות אלמוני #: ../data/gui/accounts_window.ui.h:7 @@ -261,7 +262,7 @@ #: ../data/gui/accounts_window.ui.h:8 msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)" -msgstr "משאב נשלח אל שרת ה־Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, תלוי במספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהי/ה מחובר/ת אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" +msgstr "משאב נשלח אל שרת Jabber בכדי להפריד את אותה כתובת JID בשני חלקים או יותר, תלוי במספר הלקוחות שמחוברים אל אותו השרת עם אותו החשבון. כך שייתכן שתהי/ה מחובר/ת אל אותו החשבון עם משאב 'בית' וגם 'עבודה' בו זמנית. המשאב לו נתונה העדיפות הגבוהה ביותר יקבל את האירועים. (ראו למטה)" # In Hebrew: גאג'ים #. No configured account @@ -269,10 +270,10 @@ #: ../data/gui/roster_window.ui.h:1 #: ../src/common/helpers.py:
gajim: make button label ranslatable
changeset be7b3003df1f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=be7b3003df1f description: make button label ranslatable diffstat: data/gui/atom_entry_window.ui | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diffs (57 lines): diff -r 2d08ef345ad2 -r be7b3003df1f data/gui/atom_entry_window.ui --- a/data/gui/atom_entry_window.ui Fri Aug 17 00:02:54 2012 +0400 +++ b/data/gui/atom_entry_window.ui Fri Aug 17 23:09:24 2012 +0400 @@ -45,7 +45,7 @@ GTK_FILL - + @@ -58,7 +58,7 @@ 2 3 GTK_FILL - + @@ -71,7 +71,7 @@ 3 4 GTK_FILL - + @@ -86,7 +86,7 @@ 2 1 2 - + @@ -100,7 +100,7 @@ 2 3 4 - + @@ -193,7 +193,7 @@ -Next entry +Next entry True True False ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: fix wrong commit
changeset 2d08ef345ad2 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=2d08ef345ad2
description: fix wrong commit
diffstat:
src/common/gajim.py | 16
1 files changed, 8 insertions(+), 8 deletions(-)
diffs (26 lines):
diff -r 7295d0748500 -r 2d08ef345ad2 src/common/gajim.py
--- a/src/common/gajim.py Thu Aug 16 20:22:29 2012 +0400
+++ b/src/common/gajim.py Fri Aug 17 00:02:54 2012 +0400
@@ -204,14 +204,14 @@
gajim_identity = {'type': 'pc', 'category': 'client', 'name': 'Gajim'}
gajim_common_features = [xmpp.NS_BYTESTREAM, xmpp.NS_SI, xmpp.NS_FILE,
-xmpp.NS_MUC, xmpp.NS_MUC_USER, xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER,
-xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS, xmpp.NS_DISCO_INFO, 'ipv6',
-'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE,
-xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED,
'msglog',
-'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED,
xmpp.NS_SSN,
-xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX,
xmpp.NS_SECLABEL]
-xmpp.NS_HASHES, xmpp.NS_HASHES_MD5, xmpp.NS_HASHES_SHA1,
-xmpp.NS_HASHES_SHA256, xmpp.NS_HASHES_SHA512]
+xmpp.NS_MUC, xmpp.NS_MUC_USER, xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER,
+xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS, xmpp.NS_DISCO_INFO, 'ipv6',
+'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE,
+xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED,
'msglog',
+'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED, xmpp.NS_SSN,
+xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX,
xmpp.NS_SECLABEL,
+xmpp.NS_HASHES, xmpp.NS_HASHES_MD5, xmpp.NS_HASHES_SHA1,
+xmpp.NS_HASHES_SHA256, xmpp.NS_HASHES_SHA512]
# Optional features gajim supports per account
gajim_optional_features = {}
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: split long lines
changeset 7295d0748500 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=7295d0748500
description: split long lines
diffstat:
src/common/gajim.py | 19 ---
1 files changed, 12 insertions(+), 7 deletions(-)
diffs (38 lines):
diff -r 3ac9d3dc9f0e -r 7295d0748500 src/common/gajim.py
--- a/src/common/gajim.py Thu Aug 16 22:02:10 2012 +0400
+++ b/src/common/gajim.py Thu Aug 16 20:22:29 2012 +0400
@@ -92,14 +92,19 @@
transport_type = {} # list the type of transport
last_message_time = {} # list of time of the latest incomming message
-# {acct1: {jid1:
time1, jid2: time2}, }
-encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..}
+ # {acct1: {jid1: time1, jid2: time2}, }
+encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..}
contacts = LegacyContactsAPI()
-gc_connected = {} # tell if we are connected to the room or not {acct:
{room_jid: True}}
-gc_passwords = {} # list of the pass required to enter a room {room_jid:
password}
-automatic_rooms = {} # list of rooms that must be automaticaly configured and
for which we have a list of invities {account: {room_jid: {'invities': []}}}
-new_room_nick = None # if it's != None, use this nick instead of asking for a
new nickname when there is a conflict.
+gc_connected = {}# tell if we are connected to the room or not
+ # {acct: {room_jid: True}}
+gc_passwords = {}# list of the pass required to enter a room
+ # {room_jid: password}
+automatic_rooms = {} # list of rooms that must be automaticaly configured
+ # and for which we have a list of invities
+ #{account: {room_jid: {'invities': []}}}
+new_room_nick = None # if it's != None, use this nick instead of asking for
+ # a new nickname when there is a conflict.
groups = {} # list of groups
newly_added = {} # list of contacts that has just signed in
@@ -204,7 +209,7 @@
'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE,
xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED,
'msglog',
'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED,
xmpp.NS_SSN,
-xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX,
xmpp.NS_SECLABEL,
+xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX,
xmpp.NS_SECLABEL]
xmpp.NS_HASHES, xmpp.NS_HASHES_MD5, xmpp.NS_HASHES_SHA1,
xmpp.NS_HASHES_SHA256, xmpp.NS_HASHES_SHA512]
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: D-Bus Support. sdd icon
changeset 3ac9d3dc9f0e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3ac9d3dc9f0e description: D-Bus Support. sdd icon diffstat: plugins/dbus_plugin/dbus_plugin.png | Bin plugins/dbus_plugin/manifest.ini|2 +- 2 files changed, 1 insertions(+), 1 deletions(-) diffs (14 lines): diff -r b4aae367188b -r 3ac9d3dc9f0e plugins/dbus_plugin/dbus_plugin.png Binary file plugins/dbus_plugin/dbus_plugin.png has changed diff -r b4aae367188b -r 3ac9d3dc9f0e plugins/dbus_plugin/manifest.ini --- a/plugins/dbus_plugin/manifest.ini Thu Aug 16 17:58:00 2012 +0400 +++ b/plugins/dbus_plugin/manifest.ini Thu Aug 16 22:02:10 2012 +0400 @@ -1,7 +1,7 @@ [info] name: D-Bus Support short_name: dbus -version: 0.1 +version: 0.1.1 description: D-Bus support. Based on remote_control module from Gajim core but uses new events handling system. authors = Mateusz Biliński ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: split long lines
changeset 6145dada9635 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=6145dada9635
description: split long lines
diffstat:
src/common/gajim.py | 24 +++-
1 files changed, 15 insertions(+), 9 deletions(-)
diffs (43 lines):
diff -r 59d9ae148726 -r 6145dada9635 src/common/gajim.py
--- a/src/common/gajim.py Sun Aug 12 22:04:20 2012 +0400
+++ b/src/common/gajim.py Thu Aug 16 20:22:29 2012 +0400
@@ -90,14 +90,19 @@
transport_type = {} # list the type of transport
last_message_time = {} # list of time of the latest incomming message
-# {acct1: {jid1:
time1, jid2: time2}, }
-encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..}
+ # {acct1: {jid1: time1, jid2: time2}, }
+encrypted_chats = {} # list of encrypted chats {acct1: [jid1, jid2], ..}
contacts = LegacyContactsAPI()
-gc_connected = {} # tell if we are connected to the room or not {acct:
{room_jid: True}}
-gc_passwords = {} # list of the pass required to enter a room {room_jid:
password}
-automatic_rooms = {} # list of rooms that must be automaticaly configured and
for which we have a list of invities {account: {room_jid: {'invities': []}}}
-new_room_nick = None # if it's != None, use this nick instead of asking for a
new nickname when there is a conflict.
+gc_connected = {}# tell if we are connected to the room or not
+ # {acct: {room_jid: True}}
+gc_passwords = {}# list of the pass required to enter a room
+ # {room_jid: password}
+automatic_rooms = {} # list of rooms that must be automaticaly configured
+ # and for which we have a list of invities
+ #{account: {room_jid: {'invities': []}}}
+new_room_nick = None # if it's != None, use this nick instead of asking for
+ # a new nickname when there is a conflict.
groups = {} # list of groups
newly_added = {} # list of contacts that has just signed in
@@ -204,9 +209,10 @@
xmpp.NS_MUC, xmpp.NS_MUC_USER, xmpp.NS_MUC_ADMIN, xmpp.NS_MUC_OWNER,
xmpp.NS_MUC_CONFIG, xmpp.NS_COMMANDS, xmpp.NS_DISCO_INFO, 'ipv6',
'jabber:iq:gateway', xmpp.NS_LAST, xmpp.NS_PRIVACY, xmpp.NS_PRIVATE,
-xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED,
'msglog',
-'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED,
xmpp.NS_SSN,
-xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK, xmpp.NS_ROSTERX,
xmpp.NS_SECLABEL]
+xmpp.NS_REGISTER, xmpp.NS_VERSION, xmpp.NS_DATA, xmpp.NS_ENCRYPTED,
+'msglog', 'sslc2s', 'stringprep', xmpp.NS_PING, xmpp.NS_TIME_REVISED,
+xmpp.NS_SSN, xmpp.NS_MOOD, xmpp.NS_ACTIVITY, xmpp.NS_NICK,
+xmpp.NS_ROSTERX, xmpp.NS_SECLABEL]
# Optional features gajim supports per account
gajim_optional_features = {}
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: plugin system. add plugin icon support
changeset b4aae367188b in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=b4aae367188b
description: plugin system. add plugin icon support
diffstat:
src/plugins/gui.py | 32 ++--
1 files changed, 26 insertions(+), 6 deletions(-)
diffs (89 lines):
diff -r ee8ea17504e2 -r b4aae367188b src/plugins/gui.py
--- a/src/plugins/gui.pyThu Aug 16 16:56:02 2012 +0400
+++ b/src/plugins/gui.pyThu Aug 16 17:58:00 2012 +0400
@@ -27,7 +27,7 @@
__all__ = ['PluginsWindow']
import pango
-import gtk, gobject
+import gtk, gobject, os
import gtkgui_helpers
from dialogs import WarningDialog, YesNoDialog, ArchiveChooserDialog
@@ -69,12 +69,18 @@
self.plugin_name_label.set_attributes(attr_list)
self.installed_plugins_model = gtk.ListStore(gobject.TYPE_PYOBJECT,
-gobject.TYPE_STRING, gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN)
+gobject.TYPE_STRING, gobject.TYPE_BOOLEAN, gobject.TYPE_BOOLEAN,
+gtk.gdk.Pixbuf)
self.installed_plugins_treeview.set_model(self.installed_plugins_model)
self.installed_plugins_treeview.set_rules_hint(True)
renderer = gtk.CellRendererText()
-col = gtk.TreeViewColumn(_('Plugin'), renderer, text=NAME)
+col = gtk.TreeViewColumn(_('Plugin'))#, renderer, text=NAME)
+cell = gtk.CellRendererPixbuf()
+col.pack_start(cell, False)
+col.add_attribute(cell, 'pixbuf', ICON)
+col.pack_start(renderer, True)
+col.add_attribute(renderer, 'text', NAME)
self.installed_plugins_treeview.append_column(col)
renderer = gtk.CellRendererToggle()
@@ -83,6 +89,10 @@
activatable=ACTIVATABLE)
self.installed_plugins_treeview.append_column(col)
+icon = gtk.Image()
+self.def_icon = icon.render_icon(gtk.STOCK_PREFERENCES,
+gtk.ICON_SIZE_MENU)
+
# connect signal for selection change
selection = self.installed_plugins_treeview.get_selection()
selection.connect('changed',
@@ -102,6 +112,7 @@
self.window.show_all()
gtkgui_helpers.possibly_move_window_in_current_desktop(self.window)
+
def on_plugins_notebook_switch_page(self, widget, page, page_num):
gobject.idle_add(self.xml.get_object('close_button').grab_focus)
@@ -162,8 +173,17 @@
self.installed_plugins_model.set_sort_column_id(1, gtk.SORT_ASCENDING)
for plugin in pm.plugins:
+icon = self.get_plugin_icon(plugin)
self.installed_plugins_model.append([plugin, plugin.name,
-plugin.active and plugin.activatable, plugin.activatable])
+plugin.active and plugin.activatable, plugin.activatable,
icon])
+
+def get_plugin_icon(self, plugin):
+icon_file = os.path.join(plugin.__path__, os.path.split(
+plugin.__path__)[1]) + '.png'
+icon = self.def_icon
+if os.path.isfile(icon_file):
+icon = gtk.gdk.pixbuf_new_from_file_at_size(icon_file, 16, 16)
+return icon
@log_calls('PluginsWindow')
def installed_plugins_toggled_cb(self, cell, path):
@@ -249,7 +269,7 @@
break
iter_ = model.append([plugin, plugin.name, False,
-plugin.activatable])
+plugin.activatable, self.get_plugin_icon(plugin)])
sel = self.installed_plugins_treeview.get_selection()
sel.select_iter(iter_)
@@ -272,7 +292,7 @@
return
model = self.installed_plugins_model
iter_ = model.append([plugin, plugin.name, False,
-plugin.activatable])
+plugin.activatable], self.get_plugin_icon(plugin))
sel = self.installed_plugins_treeview.get_selection()
sel.select_iter(iter_)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: coding style
changeset ee8ea17504e2 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=ee8ea17504e2
description: coding style
diffstat:
src/plugins/gui.py | 42 ++
1 files changed, 26 insertions(+), 16 deletions(-)
diffs (105 lines):
diff -r fe49adb8ec1c -r ee8ea17504e2 src/plugins/gui.py
--- a/src/plugins/gui.pyTue Aug 14 22:36:16 2012 +0400
+++ b/src/plugins/gui.pyThu Aug 16 16:56:02 2012 +0400
@@ -36,6 +36,15 @@
from plugins.helpers import GajimPluginActivateException
from common.exceptions import PluginsystemError
+(
+PLUGIN,
+NAME,
+ACTIVE,
+ACTIVATABLE,
+ICON,
+) = range(5)
+
+
class PluginsWindow(object):
'''Class for Plugins window'''
@@ -65,12 +74,13 @@
self.installed_plugins_treeview.set_rules_hint(True)
renderer = gtk.CellRendererText()
-col = gtk.TreeViewColumn(_('Plugin'), renderer, text=1)
+col = gtk.TreeViewColumn(_('Plugin'), renderer, text=NAME)
self.installed_plugins_treeview.append_column(col)
renderer = gtk.CellRendererToggle()
renderer.connect('toggled', self.installed_plugins_toggled_cb)
-col = gtk.TreeViewColumn(_('Active'), renderer, active=2,
activatable=3)
+col = gtk.TreeViewColumn(_('Active'), renderer, active=ACTIVE,
+activatable=ACTIVATABLE)
self.installed_plugins_treeview.append_column(col)
# connect signal for selection change
@@ -99,9 +109,9 @@
def installed_plugins_treeview_selection_changed(self, treeview_selection):
model, iter = treeview_selection.get_selected()
if iter:
-plugin = model.get_value(iter, 0)
-plugin_name = model.get_value(iter, 1)
-is_active = model.get_value(iter, 2)
+plugin = model.get_value(iter, PLUGIN)
+plugin_name = model.get_value(iter, NAME)
+is_active = model.get_value(iter, ACTIVE)
self._display_installed_plugin_info(plugin)
else:
@@ -157,8 +167,8 @@
@log_calls('PluginsWindow')
def installed_plugins_toggled_cb(self, cell, path):
-is_active = self.installed_plugins_model[path][2]
-plugin = self.installed_plugins_model[path][0]
+is_active = self.installed_plugins_model[path][ACTIVE]
+plugin = self.installed_plugins_model[path][PLUGIN]
if is_active:
gajim.plugin_manager.deactivate_plugin(plugin)
@@ -170,7 +180,7 @@
transient_for=self.window)
return
-self.installed_plugins_model[path][2] = not is_active
+self.installed_plugins_model[path][ACTIVE] = not is_active
@log_calls('PluginsWindow')
def on_plugins_window_destroy(self, widget):
@@ -187,9 +197,9 @@
selection = self.installed_plugins_treeview.get_selection()
model, iter = selection.get_selected()
if iter:
-plugin = model.get_value(iter, 0)
-plugin_name = model.get_value(iter, 1)
-is_active = model.get_value(iter, 2)
+plugin = model.get_value(iter, PLUGIN)
+plugin_name = model.get_value(iter, NAME)
+is_active = model.get_value(iter, ACTIVE)
result = plugin.config_dialog.run(self.window)
@@ -205,9 +215,9 @@
selection = self.installed_plugins_treeview.get_selection()
model, iter = selection.get_selected()
if iter:
-plugin = model.get_value(iter, 0)
-plugin_name = model.get_value(iter, 1).decode('utf-8')
-is_active = model.get_value(iter, 2)
+plugin = model.get_value(iter, PLUGIN)
+plugin_name = model.get_value(iter, NAME).decode('utf-8')
+is_active = model.get_value(iter, ACTIVE)
try:
gajim.plugin_manager.remove_plugin(plugin)
except PluginsystemError, e:
@@ -234,8 +244,8 @@
model = self.installed_plugins_model
for row in xrange(len(model)):
-if plugin == model[row][0]:
-model.remove(model.get_iter((row, 0)))
+if plugin == model[row][PLUGIN]:
+model.remove(model.get_iter((row, PLUGIN)))
break
iter_ = model.append([plugin, plugin.name, False,
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Darlan and I].added the ability to restore the old tray ...
changeset fe49adb8ec1c in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=fe49adb8ec1c
description: [Darlan and I].added the ability to restore the old tray icon
(envelope).'trayicon_blink' in the ACE. Fixes #7176
diffstat:
src/common/config.py | 1 +
src/statusicon.py| 26 +-
2 files changed, 18 insertions(+), 9 deletions(-)
diffs (60 lines):
diff -r d0cfa7938e57 -r fe49adb8ec1c src/common/config.py
--- a/src/common/config.py Sun Aug 12 22:04:20 2012 +0400
+++ b/src/common/config.py Tue Aug 14 22:36:16 2012 +0400
@@ -207,6 +207,7 @@
'use_kib_mib': [opt_bool, False, _('IEC standard says KiB = 1024
bytes, KB = 1000 bytes.')],
'notify_on_all_muc_messages': [opt_bool, False],
'trayicon_notification_on_events': [opt_bool, True, _('Notify of
events in the notification area.')],
+'trayicon_blink': [opt_bool, True, _('If False, Gajim will display
a static event icon instead of the blinking status icon in the notification
area when notifying on event.')],
'last_save_dir': [opt_str, ''],
'last_send_dir': [opt_str, ''],
'last_emoticons_dir': [opt_str, ''],
diff -r d0cfa7938e57 -r fe49adb8ec1c src/statusicon.py
--- a/src/statusicon.py Sun Aug 12 22:04:20 2012 +0400
+++ b/src/statusicon.py Tue Aug 14 22:36:16 2012 +0400
@@ -129,13 +129,28 @@
"""
Apart from image, we also update tooltip text here
"""
+def really_set_img():
+if image.get_storage_type() == gtk.IMAGE_PIXBUF:
+self.status_icon.set_from_pixbuf(image.get_pixbuf())
+# FIXME: oops they forgot to support GIF animation?
+# or they were lazy to get it to work under Windows! WTF!
+elif image.get_storage_type() == gtk.IMAGE_ANIMATION:
+self.status_icon.set_from_pixbuf(
+image.get_animation().get_static_image())
+# self.status_icon.set_from_animation(image.get_animation())
+
if not gajim.interface.systray_enabled:
return
if gajim.config.get('trayicon') == 'always':
self.status_icon.set_visible(True)
if gajim.events.get_nb_systray_events():
self.status_icon.set_visible(True)
-self.status_icon.set_blinking(True)
+if gajim.config.get('trayicon_blink'):
+self.status_icon.set_blinking(True)
+else:
+image = gtkgui_helpers.load_icon('event')
+really_set_img()
+return
else:
if gajim.config.get('trayicon') == 'on_event':
self.status_icon.set_visible(False)
@@ -143,14 +158,7 @@
image = gajim.interface.jabber_state_images[self.statusicon_size][
self.status]
-if image.get_storage_type() == gtk.IMAGE_PIXBUF:
-self.status_icon.set_from_pixbuf(image.get_pixbuf())
-# FIXME: oops they forgot to support GIF animation?
-# or they were lazy to get it to work under Windows! WTF!
-elif image.get_storage_type() == gtk.IMAGE_ANIMATION:
-self.status_icon.set_from_pixbuf(
-image.get_animation().get_static_image())
-# self.img_tray.set_from_animation(image.get_animation())
+really_set_img()
def change_status(self, global_status):
"""
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Fix russian translation
changeset 59d9ae148726 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=59d9ae148726 description: Fix russian translation diffstat: po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 68114c3db74e -r 59d9ae148726 po/ru.po --- a/po/ru.po Sun Aug 12 11:24:22 2012 +0400 +++ b/po/ru.po Sun Aug 12 22:04:20 2012 +0400 @@ -9983,7 +9983,7 @@ #: ../src/plugins/gui.py:162 msgid "Plugin failed" -msgstr "Неудачный модуль" +msgstr "Ошибка в модуле" #: ../src/plugins/gui.py:206 msgid "Unable to properly remove the plugin" ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: remove command_system modules from demandimport.ignore
changeset 68114c3db74e in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=68114c3db74e
description: remove command_system modules from demandimport.ignore
diffstat:
src/chat_control.py | 19 ++-
src/gajim.py| 4 +---
2 files changed, 15 insertions(+), 8 deletions(-)
diffs (64 lines):
diff -r a93e2a768a9f -r 68114c3db74e src/chat_control.py
--- a/src/chat_control.py Sun Aug 12 10:33:41 2012 +0400
+++ b/src/chat_control.py Sun Aug 12 11:24:22 2012 +0400
@@ -62,8 +62,8 @@
# Here we load the module with the standard commands, so they are being
detected
# and dispatched.
-import command_system.implementation.standard
-import command_system.implementation.execute
+from command_system.implementation.standard import StandardChatCommands
+from command_system.implementation.execute import Execute, Show
try:
import gtkspell
@@ -81,7 +81,15 @@
##!/bin/sh
#LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#echo "{_('en'):'en'",$LANG"}"
-langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg',
_('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el',
_('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basque'):
'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian
(b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl',
_('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru',
_('Serbian'): 'sr', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'):
'zh_CN'}
+langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg',
+_('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de',
+_('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo',
+_('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr',
+_('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb',
+_('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl',
+_('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR',
+_('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk',
+_('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'}
if gajim.config.get('use_speller') and HAS_GTK_SPELL:
# loop removing non-existent dictionaries
@@ -2311,7 +2319,7 @@
else:
displaymarking = None
self.print_conversation(message, self.contact.jid,
encrypted=encrypted,
-xep0184_id=xep0184_id, xhtml=xhtml,
displaymarking=displaymarking)
+xep0184_id=xep0184_id, xhtml=xhtml,
displaymarking=displaymarking)
ChatControlBase.send_message(self, message, keyID, type_='chat',
chatstate=chatstate_to_send, composing_xep=composing_xep,
@@ -2926,7 +2934,8 @@
except exceptions.DatabaseMalformed:
import common.logger
dialogs.ErrorDialog(_('Database Error'),
-_('The database file (%s) cannot be read. Try to repair 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 = []
local_old_kind = None
for row in rows: # row[0] time, row[1] has kind, row[2] the message
diff -r a93e2a768a9f -r 68114c3db74e src/gajim.py
--- a/src/gajim.py Sun Aug 12 10:33:41 2012 +0400
+++ b/src/gajim.py Sun Aug 12 11:24:22 2012 +0400
@@ -65,9 +65,7 @@
from common import demandimport
demandimport.enable()
demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n',
-'logging.NullHandler', 'dbus.service',
-'command_system.implementation.standard',
-'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto',
+'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto',
'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic',
'Crypto.PublicKey']
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: remove dbus.glib from demandimport.ignore
changeset a93e2a768a9f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a93e2a768a9f description: remove dbus.glib from demandimport.ignore diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r d5d67440d14b -r a93e2a768a9f src/gajim.py --- a/src/gajim.py Sat Aug 11 22:46:39 2012 +0200 +++ b/src/gajim.py Sun Aug 12 10:33:41 2012 +0400 @@ -65,7 +65,7 @@ from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', -'logging.NullHandler', 'dbus.glib', 'dbus.service', +'logging.NullHandler', 'dbus.service', 'command_system.implementation.standard', 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Add 'role' and 'affiliate' command to command system.
changeset f0700c90c1dd in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=f0700c90c1dd
description: Add 'role' and 'affiliate' command to command system.
diffstat:
src/command_system/implementation/middleware.py | 2 +-
src/command_system/implementation/standard.py | 24
src/command_system/mapping.py | 8
3 files changed, 29 insertions(+), 5 deletions(-)
diffs (85 lines):
diff -r 5b62751d4930 -r f0700c90c1dd
src/command_system/implementation/middleware.py
--- a/src/command_system/implementation/middleware.py Fri Aug 10 10:43:02
2012 +0200
+++ b/src/command_system/implementation/middleware.py Sat Aug 11 14:59:05
2012 +0400
@@ -71,7 +71,7 @@
except CommandError, error:
self.echo_error("%s: %s" % (error.name, error.message))
except Exception:
-self.echo_error("Error during command execution!")
+self.echo_error(_("Error during command execution!"))
print_exc()
else:
self.command_succeeded = True
diff -r 5b62751d4930 -r f0700c90c1dd
src/command_system/implementation/standard.py
--- a/src/command_system/implementation/standard.py Fri Aug 10 10:43:02
2012 +0200
+++ b/src/command_system/implementation/standard.py Sat Aug 11 14:59:05
2012 +0400
@@ -347,6 +347,30 @@
raise CommandError(_("Nickname not found"))
self.connection.gc_set_role(self.room_jid, who, 'none', reason or
str())
+@command(raw=True)
+@doc(_("""Set occupant role in group chat.
+Role can be given as one of the following values:
+moderator, participant, visitor, none"""))
+def role(self, who, role):
+if role not in ('moderator', 'participant', 'visitor', 'none'):
+raise CommandError(_("Invalid role given"))
+if not who in gajim.contacts.get_nick_list(self.account,
self.room_jid):
+raise CommandError(_("Nickname not found"))
+self.connection.gc_set_role(self.room_jid, who, role)
+
+@command(raw=True)
+@doc(_("""Set occupant affiliation in group chat.
+Affiliation can be given as one of the following values:
+owner, admin, member, outcast, none"""))
+def affiliate(self, who, affiliation):
+if affiliation not in ('owner', 'admin', 'member', 'outcast', 'none'):
+raise CommandError(_("Invalid affiliation given"))
+if not who in gajim.contacts.get_nick_list(self.account,
self.room_jid):
+raise CommandError(_("Nickname not found"))
+contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
who)
+self.connection.gc_set_affiliation(self.room_jid, contact.jid,
+affiliation)
+
@command
@doc(_("Display names of all group chat occupants"))
def names(self, verbose=False):
diff -r 5b62751d4930 -r f0700c90c1dd src/command_system/mapping.py
--- a/src/command_system/mapping.py Fri Aug 10 10:43:02 2012 +0200
+++ b/src/command_system/mapping.py Sat Aug 11 14:59:05 2012 +0400
@@ -162,7 +162,7 @@
try:
stopper, (start, end) = args[spec_len - 2]
except IndexError:
-raise CommandError("Missing arguments", command)
+raise CommandError(_("Missing arguments"), command)
# The essential point of the whole play. After
# boundaries are being determined (supposingly correct)
@@ -172,7 +172,7 @@
raw = raw.strip() or None
if not raw and not command.empty:
-raise CommandError("Missing arguments", command)
+raise CommandError(_("Missing arguments"), command)
# Discard residual arguments and all of the options as
# raw command does not support options and if an option
@@ -192,7 +192,7 @@
if command.empty:
args.append((None, (0, 0)))
else:
-raise CommandError("Missing arguments", command)
+raise CommandError(_("Missing arguments"), command)
# The first stage of transforming options we have got to a format
# that can be used to associate them with declared keyword
@@ -259,7 +259,7 @@
for arg, (spec_key, spec_value) in zip(overlapped, spec_kwargs):
opts.append((spec_key, arg))
else:
-raise CommandError("Excessive arguments", command)
+raise CommandError(_("Excessive arguments"), command)
# Detect every switch and ensure it will not receive any arguments.
# Normally this does not happen unless overlapping is enabled.
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: first load the plugins of the user directory. does not l...
changeset 2b9665a0d5ed in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=2b9665a0d5ed description: first load the plugins of the user directory. does not load the module twice. diffstat: src/plugins/pluginmanager.py | 5 - 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 1ec7b818e2c8 -r 2b9665a0d5ed src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sat Aug 04 17:14:34 2012 +0200 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' -for path in gajim.PLUGINS_DIRS: +for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config() @@ -433,6 +433,9 @@ elif os.path.isdir(file_path) and scan_dirs: module_name = elem_name +if module_name in sys.modules: +# do not load the module twice +continue file_path += os.path.sep try: module = __import__(module_name) ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: typo
changeset 29cea7237598 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=29cea7237598 description: typo diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 2b9665a0d5ed -r 29cea7237598 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:55:35 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' -for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): +for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]]: pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config() ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Darlan]. typo
changeset 4eb2a1c69e3f in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=4eb2a1c69e3f
description: [Darlan]. typo
diffstat:
src/command_system/implementation/standard.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 1f8e1c86b81e -r 4eb2a1c69e3f
src/command_system/implementation/standard.py
--- a/src/command_system/implementation/standard.py Thu Jul 19 22:47:47
2012 +0400
+++ b/src/command_system/implementation/standard.py Sat Jul 28 22:46:11
2012 +0400
@@ -127,7 +127,7 @@
@command(raw=True, empty=True)
@doc(_("""
-Set current the status
+Set the current status
Status can be given as one of the following values: online, away,
chat, xa, dnd.
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Darlan]. fix typo
changeset 0ec91ae95834 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=0ec91ae95834
description: [Darlan]. fix typo
diffstat:
src/common/zeroconf/client_zeroconf.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 4eb2a1c69e3f -r 0ec91ae95834 src/common/zeroconf/client_zeroconf.py
--- a/src/common/zeroconf/client_zeroconf.pySat Jul 28 22:46:11 2012 +0400
+++ b/src/common/zeroconf/client_zeroconf.pyThu Aug 02 21:52:20 2012 +0400
@@ -447,7 +447,7 @@
self._owner.Dispatcher.Event('', DATA_ERROR, (
self.client.to, thread_id))
else:
-self._owner.on_not_ok('conenction timeout')
+self._owner.on_not_ok('connection timeout')
ids[self.fd] = []
self.pollend()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: update Copyright
changeset 1f8e1c86b81e in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=1f8e1c86b81e
description: update Copyright
diffstat:
src/dialogs.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r d2a181d87d20 -r 1f8e1c86b81e src/dialogs.py
--- a/src/dialogs.pySun Jul 15 22:44:02 2012 +0200
+++ b/src/dialogs.pyThu Jul 19 22:47:47 2012 +0400
@@ -1264,7 +1264,7 @@
dlg.set_transient_for(gajim.interface.roster.window)
dlg.set_name('Gajim')
dlg.set_version(gajim.version)
-s = u'Copyright © 2003-2011 Gajim Team'
+s = u'Copyright © 2003-2012 Gajim Team'
dlg.set_copyright(s)
copying_file_path = self.get_path('COPYING')
if copying_file_path:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Set parent window for ChooseGPGKeyDialog.
changeset fb38c55406b3 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=fb38c55406b3
description: Set parent window for ChooseGPGKeyDialog.
diffstat:
src/config.py | 3 ++-
src/dialogs.py | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diffs (32 lines):
diff -r fd57686e12e2 -r fb38c55406b3 src/config.py
--- a/src/config.py Thu Jun 28 13:37:55 2012 +0400
+++ b/src/config.py Thu Jul 05 23:23:56 2012 +0400
@@ -2430,7 +2430,8 @@
keyID[0])
dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'),
-_('Choose your OpenPGP key'), secret_keys, on_key_selected)
+_('Choose your OpenPGP key'), secret_keys, on_key_selected,
+transient_for=self.window)
def on_use_gpg_agent_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'use_gpg_agent')
diff -r fd57686e12e2 -r fb38c55406b3 src/dialogs.py
--- a/src/dialogs.pyThu Jun 28 13:37:55 2012 +0400
+++ b/src/dialogs.pyThu Jul 05 23:23:56 2012 +0400
@@ -277,12 +277,14 @@
"""
def __init__(self, title_text, prompt_text, secret_keys, on_response,
- selected=None):
+selected=None, transient_for=None):
'''secret_keys : {keyID: userName, ...}'''
self.on_response = on_response
xml = gtkgui_helpers.get_gtk_builder('choose_gpg_key_dialog.ui')
self.window = xml.get_object('choose_gpg_key_dialog')
self.window.set_title(title_text)
+if not transient_for:
+self.window.set_transient_for(gajim.interface.roster.window)
self.keys_treeview = xml.get_object('keys_treeview')
prompt_label = xml.get_object('prompt_label')
prompt_label.set_text(prompt_text)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Set parent window for ProfileWindow. See #7184.
changeset 64f5c1467c42 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=64f5c1467c42
description: Set parent window for ProfileWindow. See #7184.
diffstat:
data/gui/profile_window.ui | 1 +
src/config.py | 7 ++-
src/profile_window.py | 5 +++--
3 files changed, 10 insertions(+), 3 deletions(-)
diffs (52 lines):
diff -r fb38c55406b3 -r 64f5c1467c42 data/gui/profile_window.ui
--- a/data/gui/profile_window.uiThu Jul 05 23:23:56 2012 +0400
+++ b/data/gui/profile_window.uiThu Jul 05 23:53:51 2012 +0400
@@ -4,6 +4,7 @@
Personal Information
+center-on-parent
dialog
diff -r fb38c55406b3 -r 64f5c1467c42 src/config.py
--- a/src/config.py Thu Jul 05 23:23:56 2012 +0400
+++ b/src/config.py Thu Jul 05 23:53:51 2012 +0400
@@ -45,6 +45,7 @@
import message_control
import chat_control
import dataforms_widget
+import profile_window
try:
import gtkspell
@@ -2455,7 +2456,11 @@
_("Your server can't save your personal information."))
return
-gajim.interface.edit_own_details(self.current_account)
+jid = gajim.get_jid_from_account(self.current_account)
+if 'profile' not in gajim.interface.instances[self.current_account]:
+gajim.interface.instances[self.current_account]['profile'] = \
+profile_window.ProfileWindow(self.current_account, self.window)
+gajim.connections[self.current_account].request_vcard(jid)
def on_checkbutton_toggled(self, widget, config_name,
change_sensitivity_widgets = None, account = None):
diff -r fb38c55406b3 -r 64f5c1467c42 src/profile_window.py
--- a/src/profile_window.py Thu Jul 05 23:23:56 2012 +0400
+++ b/src/profile_window.py Thu Jul 05 23:53:51 2012 +0400
@@ -42,10 +42,11 @@
Class for our information window
"""
-def __init__(self, account):
+def __init__(self, account, transient_for=None):
self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui')
self.window = self.xml.get_object('profile_window')
-self.window.set_transient_for(gajim.interface.roster.window)
+if not transient_for:
+self.window.set_transient_for(gajim.interface.roster.window)
self.progressbar = self.xml.get_object('progressbar')
self.statusbar = self.xml.get_object('statusbar')
self.context_id = self.statusbar.get_context_id('profile')
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: fix set parent window for ProfileWindow and ChoseGPGKeyDi...
changeset d600ffb766f4 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=d600ffb766f4
description: fix set parent window for ProfileWindow and ChoseGPGKeyDialog.
diffstat:
data/gui/profile_window.ui | 1 -
src/config.py | 2 +-
src/dialogs.py | 3 +--
src/gui_interface.py | 2 +-
src/profile_window.py | 3 +--
src/roster_window.py | 2 +-
6 files changed, 5 insertions(+), 8 deletions(-)
diffs (73 lines):
diff -r 64f5c1467c42 -r d600ffb766f4 data/gui/profile_window.ui
--- a/data/gui/profile_window.uiThu Jul 05 23:53:51 2012 +0400
+++ b/data/gui/profile_window.uiFri Jul 06 01:38:18 2012 +0400
@@ -4,7 +4,6 @@
Personal Information
-center-on-parent
dialog
diff -r 64f5c1467c42 -r d600ffb766f4 src/config.py
--- a/src/config.py Thu Jul 05 23:53:51 2012 +0400
+++ b/src/config.py Fri Jul 06 01:38:18 2012 +0400
@@ -2459,7 +2459,7 @@
jid = gajim.get_jid_from_account(self.current_account)
if 'profile' not in gajim.interface.instances[self.current_account]:
gajim.interface.instances[self.current_account]['profile'] = \
-profile_window.ProfileWindow(self.current_account, self.window)
+profile_window.ProfileWindow(self.current_account,
transient_for=self.window)
gajim.connections[self.current_account].request_vcard(jid)
def on_checkbutton_toggled(self, widget, config_name,
diff -r 64f5c1467c42 -r d600ffb766f4 src/dialogs.py
--- a/src/dialogs.pyThu Jul 05 23:53:51 2012 +0400
+++ b/src/dialogs.pyFri Jul 06 01:38:18 2012 +0400
@@ -283,8 +283,7 @@
xml = gtkgui_helpers.get_gtk_builder('choose_gpg_key_dialog.ui')
self.window = xml.get_object('choose_gpg_key_dialog')
self.window.set_title(title_text)
-if not transient_for:
-self.window.set_transient_for(gajim.interface.roster.window)
+self.window.set_transient_for(transient_for)
self.keys_treeview = xml.get_object('keys_treeview')
prompt_label = xml.get_object('prompt_label')
prompt_label.set_text(prompt_text)
diff -r 64f5c1467c42 -r d600ffb766f4 src/gui_interface.py
--- a/src/gui_interface.py Thu Jul 05 23:53:51 2012 +0400
+++ b/src/gui_interface.py Fri Jul 06 01:38:18 2012 +0400
@@ -237,7 +237,7 @@
jid = gajim.get_jid_from_account(account)
if 'profile' not in self.instances[account]:
self.instances[account]['profile'] = \
-profile_window.ProfileWindow(account)
+profile_window.ProfileWindow(account,
gajim.interface.roster.window)
gajim.connections[account].request_vcard(jid)
def handle_gc_error(self, gc_control, pritext, sectext):
diff -r 64f5c1467c42 -r d600ffb766f4 src/profile_window.py
--- a/src/profile_window.py Thu Jul 05 23:53:51 2012 +0400
+++ b/src/profile_window.py Fri Jul 06 01:38:18 2012 +0400
@@ -45,8 +45,7 @@
def __init__(self, account, transient_for=None):
self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui')
self.window = self.xml.get_object('profile_window')
-if not transient_for:
-self.window.set_transient_for(gajim.interface.roster.window)
+self.window.set_transient_for(transient_for)
self.progressbar = self.xml.get_object('progressbar')
self.statusbar = self.xml.get_object('statusbar')
self.context_id = self.statusbar.get_context_id('profile')
diff -r 64f5c1467c42 -r d600ffb766f4 src/roster_window.py
--- a/src/roster_window.py Thu Jul 05 23:53:51 2012 +0400
+++ b/src/roster_window.py Fri Jul 06 01:38:18 2012 +0400
@@ -3215,7 +3215,7 @@
dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'),
_('Select a key to apply to the contact'), public_keys,
-on_key_selected, selected=keyID)
+on_key_selected, selected=keyID, transient_for=self.window)
def on_set_custom_avatar_activate(self, widget, contact, account):
def on_ok(widget, path_to_file):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Select root iter in the PluginsWindow treeview. set focus...
changeset fd57686e12e2 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=fd57686e12e2
description: Select root iter in the PluginsWindow treeview. set focus on close
button when switch page.
diffstat:
data/gui/plugins_window.ui | 1 +
src/plugins/gui.py | 5 +
2 files changed, 6 insertions(+), 0 deletions(-)
diffs (34 lines):
diff -r 346f4ded0411 -r fd57686e12e2 data/gui/plugins_window.ui
--- a/data/gui/plugins_window.uiThu Jun 28 13:15:52 2012 +0400
+++ b/data/gui/plugins_window.uiThu Jun 28 13:37:55 2012 +0400
@@ -20,6 +20,7 @@
True
True
+
True
diff -r 346f4ded0411 -r fd57686e12e2 src/plugins/gui.py
--- a/src/plugins/gui.pyThu Jun 28 13:15:52 2012 +0400
+++ b/src/plugins/gui.pyThu Jun 28 13:37:55 2012 +0400
@@ -82,14 +82,19 @@
self._clear_installed_plugin_info()
self.fill_installed_plugins_model()
+selection.select_iter(self.installed_plugins_model.get_iter_root())
self.xml.connect_signals(self)
self.plugins_notebook.set_current_page(0)
+self.xml.get_object('close_button').grab_focus()
self.window.show_all()
gtkgui_helpers.possibly_move_window_in_current_desktop(self.window)
+def on_plugins_notebook_switch_page(self, widget, page, page_num):
+gobject.idle_add(self.xml.get_object('close_button').grab_focus)
+
@log_calls('PluginsWindow')
def installed_plugins_treeview_selection_changed(self, treeview_selection):
model, iter = treeview_selection.get_selected()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Don't ellipsize Family Name label in the profile window.
changeset 346f4ded0411 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=346f4ded0411 description: Don't ellipsize Family Name label in the profile window. diffstat: data/gui/profile_window.ui | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r a960791e8c1f -r 346f4ded0411 data/gui/profile_window.ui --- a/data/gui/profile_window.uiThu Jun 28 13:03:56 2012 +0400 +++ b/data/gui/profile_window.uiThu Jun 28 13:15:52 2012 +0400 @@ -128,7 +128,6 @@ 0 Family: True -middle GTK_FILL ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Set focus on close button when switch vcard page.
changeset b949134e01ac in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=b949134e01ac description: Set focus on close button when switch vcard page. diffstat: data/gui/vcard_information_window.ui | 157 +- src/vcard.py |3 + 2 files changed, 80 insertions(+), 80 deletions(-) diffs (truncated from 727 to 300 lines): diff -r 090d769eb568 -r b949134e01ac data/gui/vcard_information_window.ui --- a/data/gui/vcard_information_window.ui Tue Jun 26 00:25:19 2012 +0400 +++ b/data/gui/vcard_information_window.ui Thu Jun 28 12:38:43 2012 +0400 @@ -29,6 +29,7 @@ True + True @@ -56,7 +57,7 @@ GTK_FILL - + @@ -71,7 +72,7 @@ 1 2 GTK_FILL - + @@ -86,7 +87,7 @@ 2 3 GTK_FILL - + @@ -101,7 +102,7 @@ 3 4 GTK_FILL - + @@ -116,13 +117,12 @@ 4 5 GTK_FILL - + True -True 0 0 5 @@ -132,7 +132,7 @@ 1 2 - + @@ -156,7 +156,7 @@ 2 1 2 - + @@ -175,7 +175,7 @@ 2 3 4 - + @@ -195,7 +195,7 @@ 2 4 5 - + @@ -235,7 +235,7 @@ 5 6 GTK_FILL - + @@ -254,7 +254,7 @@ 2 5 6 - + @@ -366,7 +366,7 @@ 1 2 - + @@ -386,7 +386,7 @@ 3 4 - + @@ -399,7 +399,7 @@ GTK_FILL - + @@ -414,7 +414,7 @@ 2 3 GTK_FILL - + @@ -480,7 +480,7 @@ 1 2 - +
gajim: Set focus on close button when switch preferences window ...
changeset a960791e8c1f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=a960791e8c1f description: Set focus on close button when switch preferences window page. diffstat: data/gui/preferences_window.ui | 53 + src/config.py | 4 +++ 2 files changed, 31 insertions(+), 26 deletions(-) diffs (249 lines): diff -r f2b9adc8be9d -r a960791e8c1f data/gui/preferences_window.ui --- a/data/gui/preferences_window.uiThu Jun 28 12:49:54 2012 +0400 +++ b/data/gui/preferences_window.uiThu Jun 28 13:03:56 2012 +0400 @@ -166,6 +166,7 @@ True True False + True @@ -1059,7 +1060,7 @@ GTK_FILL - + @@ -1077,7 +1078,7 @@ 1 2 GTK_FILL - + @@ -1090,7 +1091,7 @@ 2 3 GTK_FILL - + @@ -1105,7 +1106,7 @@ 1 2 GTK_FILL - + @@ -1168,7 +1169,7 @@ 3 4 - + @@ -1185,7 +1186,7 @@ 4 1 2 - + @@ -1698,7 +1699,7 @@ GTK_FILL - + @@ -1713,7 +1714,7 @@ 2 3 GTK_FILL - + @@ -1728,7 +1729,7 @@ 2 3 GTK_FILL - + @@ -1744,7 +1745,7 @@ 2 3 GTK_FILL - + @@ -1827,7 +1828,7 @@ 1 2 GTK_FILL - + @@ -1842,7 +1843,7 @@ 1 2 GTK_FILL - + @@ -1881,8 +1882,8 @@ 2 1 2 - - + + @@ -1921,8 +1922,8 @@ 4 1 2 - - + + @@ -1951,7 +1952,7 @@
gajim: Set focus on ok button when switch profile window page.
changeset f2b9adc8be9d in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=f2b9adc8be9d description: Set focus on ok button when switch profile window page. diffstat: data/gui/profile_window.ui | 127 ++-- src/profile_window.py |4 + 2 files changed, 68 insertions(+), 63 deletions(-) diffs (truncated from 585 to 300 lines): diff -r b949134e01ac -r f2b9adc8be9d data/gui/profile_window.ui --- a/data/gui/profile_window.uiThu Jun 28 12:38:43 2012 +0400 +++ b/data/gui/profile_window.uiThu Jun 28 12:49:54 2012 +0400 @@ -15,6 +15,7 @@ True 6 + True @@ -31,7 +32,7 @@ 1 2 - + @@ -44,7 +45,7 @@ 4 4 5 - + @@ -67,7 +68,7 @@ 1 2 - + @@ -78,7 +79,7 @@ 3 4 - + @@ -91,7 +92,7 @@ 2 1 2 - + @@ -104,7 +105,7 @@ 2 2 3 - + @@ -117,7 +118,7 @@ 4 2 3 - + @@ -131,7 +132,7 @@ GTK_FILL - + @@ -146,7 +147,7 @@ 1 2 GTK_FILL - + @@ -161,7 +162,7 @@ 2 3 GTK_FILL - + @@ -176,7 +177,7 @@ 2 3 GTK_FILL - + @@ -193,7 +194,7 @@ 2 3 GTK_FILL - + @@ -218,7 +219,7 @@ 4 1 2 - + @@ -229,7 +230,7 @@ 3 4 - + @@ -252,7 +253,7 @@ 1 2 - + @@ -263,7 +264,7 @@ 3 4 - + @@ -276,7 +277,7 @@ 2 1 2 - + @@ -289,7 +290,7 @@ 4 1 2 - +
gajim: Select root iter in the AccountsWindow treeview.
changeset 090d769eb568 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=090d769eb568
description: Select root iter in the AccountsWindow treeview.
diffstat:
src/config.py | 6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diffs (30 lines):
diff -r 0e2cb8d5ec7d -r 090d769eb568 src/config.py
--- a/src/config.py Mon Jun 25 23:49:20 2012 +0400
+++ b/src/config.py Tue Jun 26 00:25:19 2012 +0400
@@ -1559,7 +1559,6 @@
self.update_proxy_list()
self.xml.connect_signals(self)
self.init_accounts()
-self.xml.get_object('close_button').grab_focus()
self.window.show_all()
# Merge accounts
@@ -1576,6 +1575,8 @@
except ImportError:
self.avahi_available = False
+self.xml.get_object('close_button').grab_focus()
+
def on_accounts_window_key_press_event(self, widget, event):
if event.keyval == gtk.keysyms.Escape:
self.check_resend_relog()
@@ -1604,6 +1605,9 @@
iter_ = model.append()
model.set(iter_, 0, account)
+self.selection = self.accounts_treeview.get_selection()
+self.selection.select_iter(model.get_iter_root())
+
def resend(self, account):
if not account in gajim.connections:
return
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Set focus on close button in the AccountsWindow.
changeset 0e2cb8d5ec7d in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=0e2cb8d5ec7d
description: Set focus on close button in the AccountsWindow.
diffstat:
src/config.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diffs (11 lines):
diff -r 81476f72b194 -r 0e2cb8d5ec7d src/config.py
--- a/src/config.py Mon Jun 25 23:27:23 2012 +0400
+++ b/src/config.py Mon Jun 25 23:49:20 2012 +0400
@@ -1559,6 +1559,7 @@
self.update_proxy_list()
self.xml.connect_signals(self)
self.init_accounts()
+self.xml.get_object('close_button').grab_focus()
self.window.show_all()
# Merge accounts
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Do not highlight(mark) contact name in VcardWindow.
changeset 81476f72b194 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=81476f72b194
description: Do not highlight(mark) contact name in VcardWindow.
diffstat:
src/vcard.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (13 lines):
diff -r 37be0bb91ad9 -r 81476f72b194 src/vcard.py
--- a/src/vcard.py Sun Apr 01 19:49:52 2012 +0200
+++ b/src/vcard.py Mon Jun 25 23:27:23 2012 +0400
@@ -142,8 +142,8 @@
buffer_.set_text(annotations[self.contact.jid])
self.xml.connect_signals(self)
+self.xml.get_object('close_button').grab_focus()
self.window.show_all()
-self.xml.get_object('close_button').grab_focus()
def update_progressbar(self):
self.progressbar.pulse()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Fix russian translation
changeset d0cfa7938e57 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=d0cfa7938e57 description: Fix russian translation diffstat: po/ru.po | 7 +++ 1 files changed, 3 insertions(+), 4 deletions(-) diffs (32 lines): diff -r cc2dc83d1597 -r d0cfa7938e57 po/ru.po --- a/po/ru.po Sun Aug 12 11:24:22 2012 +0400 +++ b/po/ru.po Sun Aug 12 22:04:20 2012 +0400 @@ -13,7 +13,7 @@ "Project-Id-Version: ru\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-03-01 11:01+0400\n" -"PO-Revision-Date: 2012-03-01 11:08+0300\n" +"PO-Revision-Date: 2012-08-12 21:54+0300\n" "Last-Translator: Fomin Denis \n" "Language-Team: Linux Support LLC\n" "Language: ru\n" @@ -3430,9 +3430,8 @@ #: ../src/command_system/implementation/standard.py:184 #: ../src/command_system/implementation/standard.py:261 -#, fuzzy msgid "Clear the text window" -msgstr "Использование: /%s, очищает текстовое окно." +msgstr "Очистить текстовое окно" #: ../src/command_system/implementation/standard.py:189 #, fuzzy @@ -9602,7 +9601,7 @@ #: ../src/plugins/gui.py:162 msgid "Plugin failed" -msgstr "Неудачный модуль" +msgstr "Ошибка в модуле" #: ../src/plugins/gui.py:206 msgid "Unable to properly remove the plugin" ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: remove command_system modules from demandimport.ignore
changeset cc2dc83d1597 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=cc2dc83d1597
description: remove command_system modules from demandimport.ignore
diffstat:
src/chat_control.py | 19 ++-
src/gajim.py| 4 +---
2 files changed, 15 insertions(+), 8 deletions(-)
diffs (64 lines):
diff -r 7c10c9d09d85 -r cc2dc83d1597 src/chat_control.py
--- a/src/chat_control.py Sun Aug 12 10:33:41 2012 +0400
+++ b/src/chat_control.py Sun Aug 12 11:24:22 2012 +0400
@@ -64,8 +64,8 @@
# Here we load the module with the standard commands, so they are being
detected
# and dispatched.
-import command_system.implementation.standard
-import command_system.implementation.execute
+from command_system.implementation.standard import StandardChatCommands
+from command_system.implementation.execute import Execute, Show
try:
import gtkspell
@@ -83,7 +83,15 @@
##!/bin/sh
#LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#echo "{_('en'):'en'",$LANG"}"
-langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg',
_('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de', _('Greek'): 'el',
_('British'): 'en_GB', _('Esperanto'): 'eo', _('Spanish'): 'es', _('Basque'):
'eu', _('French'): 'fr', _('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian
(b)'): 'nb', _('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl',
_('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR', _('Russian'): 'ru',
_('Serbian'): 'sr', _('Slovak'): 'sk', _('Swedish'): 'sv', _('Chinese (Ch)'):
'zh_CN'}
+langs = {_('English'): 'en', _('Belarusian'): 'be', _('Bulgarian'): 'bg',
+_('Breton'): 'br', _('Czech'): 'cs', _('German'): 'de',
+_('Greek'): 'el', _('British'): 'en_GB', _('Esperanto'): 'eo',
+_('Spanish'): 'es', _('Basque'): 'eu', _('French'): 'fr',
+_('Croatian'): 'hr', _('Italian'): 'it', _('Norwegian (b)'): 'nb',
+_('Dutch'): 'nl', _('Norwegian'): 'no', _('Polish'): 'pl',
+_('Portuguese'): 'pt', _('Brazilian Portuguese'): 'pt_BR',
+_('Russian'): 'ru', _('Serbian'): 'sr', _('Slovak'): 'sk',
+_('Swedish'): 'sv', _('Chinese (Ch)'): 'zh_CN'}
if gajim.config.get('use_speller') and HAS_GTK_SPELL:
# loop removing non-existent dictionaries
@@ -2293,7 +2301,7 @@
else:
displaymarking = None
self.print_conversation(message, self.contact.jid,
encrypted=encrypted,
-xep0184_id=xep0184_id, xhtml=xhtml,
displaymarking=displaymarking)
+xep0184_id=xep0184_id, xhtml=xhtml,
displaymarking=displaymarking)
ChatControlBase.send_message(self, message, keyID, type_='chat',
chatstate=chatstate_to_send, xhtml=xhtml, callback=_on_sent,
@@ -2886,7 +2894,8 @@
except exceptions.DatabaseMalformed:
import common.logger
dialogs.ErrorDialog(_('Database Error'),
-_('The database file (%s) cannot be read. Try to repair 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 = []
local_old_kind = None
for row in rows: # row[0] time, row[1] has kind, row[2] the message
diff -r 7c10c9d09d85 -r cc2dc83d1597 src/gajim.py
--- a/src/gajim.py Sun Aug 12 10:33:41 2012 +0400
+++ b/src/gajim.py Sun Aug 12 11:24:22 2012 +0400
@@ -65,9 +65,7 @@
from common import demandimport
demandimport.enable()
demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n',
-'logging.NullHandler', 'dbus.service',
-'command_system.implementation.standard',
-'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto',
+'logging.NullHandler', 'dbus.service', 'OpenSSL.SSL', 'OpenSSL.crypto',
'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic',
'Crypto.PublicKey']
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: remove dbus.glib from demandimport.ignore
changeset 7c10c9d09d85 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7c10c9d09d85 description: remove dbus.glib from demandimport.ignore diffstat: src/gajim.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 10a73406c098 -r 7c10c9d09d85 src/gajim.py --- a/src/gajim.py Sat Aug 11 22:46:39 2012 +0200 +++ b/src/gajim.py Sun Aug 12 10:33:41 2012 +0400 @@ -65,7 +65,7 @@ from common import demandimport demandimport.enable() demandimport.ignore += ['gobject._gobject', 'libasyncns', 'i18n', -'logging.NullHandler', 'dbus.glib', 'dbus.service', +'logging.NullHandler', 'dbus.service', 'command_system.implementation.standard', 'command_system.implementation.execute', 'OpenSSL.SSL', 'OpenSSL.crypto', 'common.sleepy', 'DLFCN', 'dl', 'xml.sax', 'xml.sax.handler', 'ic', ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Add 'role' and 'affiliate' command to command system.
changeset e3941cc6b21a in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=e3941cc6b21a
description: Add 'role' and 'affiliate' command to command system.
diffstat:
src/command_system/implementation/middleware.py | 2 +-
src/command_system/implementation/standard.py | 24
src/command_system/mapping.py | 8
3 files changed, 29 insertions(+), 5 deletions(-)
diffs (85 lines):
diff -r 42f7ecdf64a2 -r e3941cc6b21a
src/command_system/implementation/middleware.py
--- a/src/command_system/implementation/middleware.py Fri Aug 10 10:43:02
2012 +0200
+++ b/src/command_system/implementation/middleware.py Sat Aug 11 14:59:05
2012 +0400
@@ -71,7 +71,7 @@
except CommandError, error:
self.echo_error("%s: %s" % (error.name, error.message))
except Exception:
-self.echo_error("Error during command execution!")
+self.echo_error(_("Error during command execution!"))
print_exc()
else:
self.command_succeeded = True
diff -r 42f7ecdf64a2 -r e3941cc6b21a
src/command_system/implementation/standard.py
--- a/src/command_system/implementation/standard.py Fri Aug 10 10:43:02
2012 +0200
+++ b/src/command_system/implementation/standard.py Sat Aug 11 14:59:05
2012 +0400
@@ -352,6 +352,30 @@
raise CommandError(_("Nickname not found"))
self.connection.gc_set_role(self.room_jid, who, 'none', reason or
str())
+@command(raw=True)
+@doc(_("""Set occupant role in group chat.
+Role can be given as one of the following values:
+moderator, participant, visitor, none"""))
+def role(self, who, role):
+if role not in ('moderator', 'participant', 'visitor', 'none'):
+raise CommandError(_("Invalid role given"))
+if not who in gajim.contacts.get_nick_list(self.account,
self.room_jid):
+raise CommandError(_("Nickname not found"))
+self.connection.gc_set_role(self.room_jid, who, role)
+
+@command(raw=True)
+@doc(_("""Set occupant affiliation in group chat.
+Affiliation can be given as one of the following values:
+owner, admin, member, outcast, none"""))
+def affiliate(self, who, affiliation):
+if affiliation not in ('owner', 'admin', 'member', 'outcast', 'none'):
+raise CommandError(_("Invalid affiliation given"))
+if not who in gajim.contacts.get_nick_list(self.account,
self.room_jid):
+raise CommandError(_("Nickname not found"))
+contact = gajim.contacts.get_gc_contact(self.account, self.room_jid,
who)
+self.connection.gc_set_affiliation(self.room_jid, contact.jid,
+affiliation)
+
@command
@doc(_("Display names of all group chat occupants"))
def names(self, verbose=False):
diff -r 42f7ecdf64a2 -r e3941cc6b21a src/command_system/mapping.py
--- a/src/command_system/mapping.py Fri Aug 10 10:43:02 2012 +0200
+++ b/src/command_system/mapping.py Sat Aug 11 14:59:05 2012 +0400
@@ -162,7 +162,7 @@
try:
stopper, (start, end) = args[spec_len - 2]
except IndexError:
-raise CommandError("Missing arguments", command)
+raise CommandError(_("Missing arguments"), command)
# The essential point of the whole play. After
# boundaries are being determined (supposingly correct)
@@ -172,7 +172,7 @@
raw = raw.strip() or None
if not raw and not command.empty:
-raise CommandError("Missing arguments", command)
+raise CommandError(_("Missing arguments"), command)
# Discard residual arguments and all of the options as
# raw command does not support options and if an option
@@ -192,7 +192,7 @@
if command.empty:
args.append((None, (0, 0)))
else:
-raise CommandError("Missing arguments", command)
+raise CommandError(_("Missing arguments"), command)
# The first stage of transforming options we have got to a format
# that can be used to associate them with declared keyword
@@ -259,7 +259,7 @@
for arg, (spec_key, spec_value) in zip(overlapped, spec_kwargs):
opts.append((spec_key, arg))
else:
-raise CommandError("Excessive arguments", command)
+raise CommandError(_("Excessive arguments"), command)
# Detect every switch and ensure it will not receive any arguments.
# Normally this does not happen unless overlapping is enabled.
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: typo
changeset 321ef21af2e5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=321ef21af2e5 description: typo diffstat: src/plugins/pluginmanager.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r cb7602bb9c5c -r 321ef21af2e5 src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:55:35 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' -for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): +for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]]: pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config() ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: first load the plugins of the user directory. does not l...
changeset cb7602bb9c5c in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=cb7602bb9c5c description: first load the plugins of the user directory. does not load the module twice. diffstat: src/plugins/pluginmanager.py | 5 - 1 files changed, 4 insertions(+), 1 deletions(-) diffs (22 lines): diff -r 27b33dd6fe25 -r cb7602bb9c5c src/plugins/pluginmanager.py --- a/src/plugins/pluginmanager.py Sun Aug 05 13:34:35 2012 +0200 +++ b/src/plugins/pluginmanager.py Thu Aug 09 21:48:00 2012 +0400 @@ -100,7 +100,7 @@ ''' Registered handlers of GUI extension points. ''' -for path in gajim.PLUGINS_DIRS: +for path in [gajim.PLUGINS_DIRS[1], gajim.PLUGINS_DIRS[0]): pc = PluginManager.scan_dir_for_plugins(path) self.add_plugins(pc) self._activate_all_plugins_from_global_config() @@ -433,6 +433,9 @@ elif os.path.isdir(file_path) and scan_dirs: module_name = elem_name +if module_name in sys.modules: +# do not load the module twice +continue file_path += os.path.sep try: module = __import__(module_name) ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Darlan]. fix typo
changeset 227a2aec93bd in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=227a2aec93bd
description: [Darlan]. fix typo
diffstat:
src/common/zeroconf/client_zeroconf.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 26aaa8d886fe -r 227a2aec93bd src/common/zeroconf/client_zeroconf.py
--- a/src/common/zeroconf/client_zeroconf.pySat Jul 28 22:46:11 2012 +0400
+++ b/src/common/zeroconf/client_zeroconf.pyThu Aug 02 21:52:20 2012 +0400
@@ -447,7 +447,7 @@
self._owner.Dispatcher.Event('', DATA_ERROR, (
self.client.to, thread_id))
else:
-self._owner.on_not_ok('conenction timeout')
+self._owner.on_not_ok('connection timeout')
ids[self.fd] = []
self.pollend()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Darlan]. typo
changeset 26aaa8d886fe in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=26aaa8d886fe
description: [Darlan]. typo
diffstat:
src/command_system/implementation/standard.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r aa53d9665e2a -r 26aaa8d886fe
src/command_system/implementation/standard.py
--- a/src/command_system/implementation/standard.py Thu Jul 26 16:06:08
2012 +0400
+++ b/src/command_system/implementation/standard.py Sat Jul 28 22:46:11
2012 +0400
@@ -127,7 +127,7 @@
@command(raw=True, empty=True)
@doc(_("""
-Set the current the status
+Set the current status
Status can be given as one of the following values: online, away,
chat, xa, dnd.
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Isratine Citizen]. Update Hebrew translation.
changeset aa53d9665e2a in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=aa53d9665e2a description: [Isratine Citizen]. Update Hebrew translation. diffstat: po/he.po | 36 +++- 1 files changed, 15 insertions(+), 21 deletions(-) diffs (107 lines): diff -r 360664e64a5b -r aa53d9665e2a po/he.po --- a/po/he.po Tue Jul 24 21:56:39 2012 +0400 +++ b/po/he.po Thu Jul 26 16:06:08 2012 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-04 22:54+0400\n" -"PO-Revision-Date: 2012-07-24 11:05+0200\n" +"PO-Revision-Date: 2012-07-26 14:47+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut\n" "Language: he\n" @@ -5133,7 +5133,7 @@ # Is deode different from decrypt? #: ../src/common/connection.py:74 msgid "Unable to decode issuer public key" -msgstr "לא ניתן לפענח את המפתח הציבורי של המנפיק" +msgstr "לא ניתן לפענח מפתח ציבורי של מנפיק" # תעודת חתימה נכשל #: ../src/common/connection.py:75 @@ -5185,29 +5185,25 @@ msgstr "" #: ../src/common/connection.py:86 -#, fuzzy msgid "Self signed certificate" -msgstr "תעודה" +msgstr "תעודה חתומה עצמית" #: ../src/common/connection.py:87 -#, fuzzy msgid "Self signed certificate in certificate chain" -msgstr "תעודה" +msgstr "תעודה חתומה עצמית בשרשרת התעודה" #: ../src/common/connection.py:88 -#, fuzzy msgid "Unable to get local issuer certificate" -msgstr "לא ניתן לקבל תעודת מנפיק מקומי" +msgstr "לא ניתן לקבל תעודת מנפיק מקומית" #: ../src/common/connection.py:89 msgid "Unable to verify the first certificate" msgstr "לא ניתן לאמת את התעודה הראשונה" -# מחרוזת? +# מחרוזת #: ../src/common/connection.py:90 -#, fuzzy msgid "Certificate chain too long" -msgstr "שרשרת התעודה ארוכה מידי" +msgstr "שרשרת תעודה ארוכה מידי" # נפסלה #: ../src/common/connection.py:91 @@ -5243,15 +5239,13 @@ msgstr "" #: ../src/common/connection.py:98 -#, fuzzy msgid "Authority and subject key identifier mismatch" -msgstr "רשות ומזהה מפתח נושא לא תואמים" - -# ומספר סידורי של מנפיק +msgstr "רשות ונושא מזהה מפתח לא תואמים" + +# ומספר מנפיק סידורי #: ../src/common/connection.py:99 -#, fuzzy msgid "Authority and issuer serial number mismatch" -msgstr "רשות ומספר מנפיק סידורי לא תואמים" +msgstr "רשות ומספר סידורי של מנפיק לא תואמים" #: ../src/common/connection.py:100 msgid "Key usage does not include certificate signing" @@ -9841,10 +9835,10 @@ "בחרת להחריב את חדר זה.\n" "באפשרותך לציין סיבה למטה:" +# מקום מפגש #: ../src/groupchat_control.py:2104 -#, fuzzy msgid "You may also enter an alternate venue:" -msgstr "באפשרותך להזין גם venue אלטרנטיבי/ת:" +msgstr "באפשרותך להזין זירה אלטרנטיבית:" #. ask for reason #: ../src/groupchat_control.py:2299 @@ -10648,7 +10642,7 @@ #: ../src/roster_window.py:2042 msgid "Authorization has been sent" -msgstr "ההרשאה נשלחה" +msgstr "הרשאה נשלחה" #: ../src/roster_window.py:2043 #, python-format @@ -10668,7 +10662,7 @@ #: ../src/roster_window.py:2081 msgid "Authorization has been removed" -msgstr "ההרשאה הוסרה" +msgstr "הרשאה הוסרה" #: ../src/roster_window.py:2082 #, python-format ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Isratine Citizen]. Update Hebrew translation.
changeset 360664e64a5b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=360664e64a5b description: [Isratine Citizen]. Update Hebrew translation. diffstat: po/he.po | 28 ++-- 1 files changed, 14 insertions(+), 14 deletions(-) diffs (129 lines): diff -r 00ee0685db1a -r 360664e64a5b po/he.po --- a/po/he.po Mon Jul 23 11:13:20 2012 +0400 +++ b/po/he.po Tue Jul 24 21:56:39 2012 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-04 22:54+0400\n" -"PO-Revision-Date: 2012-07-17 21:41+0200\n" +"PO-Revision-Date: 2012-07-24 11:05+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut\n" "Language: he\n" @@ -913,7 +913,7 @@ #: ../data/gui/chat_control.ui.h:3 msgid "Add this contact to roster (Ctrl+D)" -msgstr "הוספת אישקשר זה אל לוח החברים (Ctrl+D)" +msgstr "הוספת איש־קשר זה אל לוח החברים (Ctrl+D)" #: ../data/gui/chat_control.ui.h:4 #: ../src/command_system/implementation/standard.py:214 @@ -1899,7 +1899,7 @@ #: ../data/gui/preferences_window.ui.h:21 msgid "Display status _messages of contacts in roster" -msgstr "הצגת הו_דעות מצב־החיבור של אנשי־קשר בלוח החברים" +msgstr "הצגת הו_דעות מצב של אנשי־קשר בלוח החברים" # BUG: a dot at the end #: ../data/gui/preferences_window.ui.h:22 @@ -1909,7 +1909,7 @@ # מ_צבי הרוח #: ../data/gui/preferences_window.ui.h:23 msgid "Display m_ood of contacts in roster" -msgstr "הצגת צמ_בי רוח של אנשי־קשר בלוח החברים" +msgstr "הצגת מצ_בי רוח של אנשי־קשר בלוח החברים" # BUG: a dot at the end #: ../data/gui/preferences_window.ui.h:24 @@ -3326,7 +3326,7 @@ #: ../src/chat_control.py:1154 #, python-format msgid "If you send a file to %s, he/she will know your real Jabber ID." -msgstr "אם תשלח קובץ אל %s, הוא/היא ידעו את כתובת ה־JID המלאה שלך." +msgstr "אם תשלח קובץ אל %s, הוא/היא ידעו את כתובתך (JID) המלאה." # Changed enabled with activated # Enabled = מאופשרת @@ -3368,7 +3368,7 @@ #: ../src/chat_control.py:1737 msgid "You need to know the real JID of the contact to send him or her a file." -msgstr "יש צורך לדעת את כתובת ה־JID של איש־הקשר כדי לשלוח אליהם קובץ." +msgstr "יש צורך לדעת את הכתובת (JID) של איש־הקשר כדי לשלוח אליו/אליה קובץ." #: ../src/chat_control.py:1851 #, python-format @@ -4420,7 +4420,7 @@ "'never' - Never show roster.\n" "'last_state' - Restore the last state roster." msgstr "" -"הצגת לח החברים בעת הפעלה.\n" +"הצגת לוח החברים בעת הפעלה.\n" "'always' - תמיד להציג את לוח החברים.\n" "'never' - לא להציג את לוח החברים בכלל.\n" "'last_state' - שחזור המצב האחרון של לוח החברים." @@ -7260,7 +7260,7 @@ #: ../src/gui_interface.py:692 #, python-format msgid "Enter your password for account %s" -msgstr "נא להזין את מילת־המעבר של עבור החשבון %s" +msgstr "נא להזין את מילת־המעבר עבור החשבון %s" #: ../src/config.py:3026 #: ../src/gui_interface.py:712 @@ -7575,7 +7575,7 @@ #: ../src/dataforms_widget.py:638 msgid "The Jabber ID you entered is already in the list. Choose another one." -msgstr "כתובת ה־JID שהזנת כבר מצויה ברשימה. נא לבחור כתובת אחרת." +msgstr "הכתובת (JID) שהזנת כבר מצויה ברשימה. נא לבחור כתובת אחרת." #. Default jid #: ../src/dataforms_widget.py:649 @@ -7827,7 +7827,7 @@ #: ../src/dialogs.py:2490 #: ../src/groupchat_control.py:2095 msgid "The group chat Jabber ID has not allowed characters." -msgstr "כתובת ה־JID של שיחת הקבוצה מכילה תווים אסורים." +msgstr "כתובת (JID) שיחת קבוצה מכילה תווים אסורים." # זו לא #: ../src/dialogs.py:2495 @@ -8065,7 +8065,7 @@ #: ../src/dialogs.py:3511 #, python-format msgid "%s suggested me to add you in my roster." -msgstr "%s הציע לי להוסיפך אל אל לוח החברים שלי." +msgstr "%s הציע לי להוסיפך אל לוח החברים שלי." #: ../src/dialogs.py:3525 #, python-format @@ -9648,7 +9648,7 @@ #: ../src/groupchat_control.py:1245 #: ../src/groupchat_control.py:1512 msgid "Any occupant is allowed to see your full JID" -msgstr "כל הנוכחים מורשים לראות את כתובת ה־JID המלאה שלך" +msgstr "כל הנוכחים מורשים לראות את כתובתך (JID) המלאה" # BUG: members? #: ../src/groupchat_control.py:1248 @@ -10801,7 +10801,7 @@ #: ../src/roster_window.py:3195 msgid "Also remove all contacts in this group from your roster" -msgstr "הסר בנוסף את כל אנשי־הקשר שבקבוצה זו מלוח החברים" +msgstr "הסר בנוסף את כל אנשי־הקשר שבקבוצה זו מלוח החברים שלך" #: ../src/roster_window.py:3234 msgid "Assign OpenPGP Key" @@ -10904,7 +10904,7 @@ #: ../src/roster_window.py:4686 msgid "Invalid file URI:" -msgstr "כתובת URI שגויה של קובץ:" +msgstr "כתובת URI של קובץ שגויה:" #: ../src/roster_window.py:4698 #, python-format ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: typo.
changeset 00ee0685db1a in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=00ee0685db1a
description: typo.
diffstat:
src/filetransfers_window.py | 8
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (27 lines):
diff -r c659b17f27b1 -r 00ee0685db1a src/filetransfers_window.py
--- a/src/filetransfers_window.py Thu Jul 19 22:47:47 2012 +0400
+++ b/src/filetransfers_window.py Mon Jul 23 11:13:20 2012 +0400
@@ -251,11 +251,11 @@
def show_hash_error(self, jid, file_props, account):
def on_yes(dummy):
# Request the file to the sender
-sid = gajim.connections[account].start_file_transfer(jid,
-file_props,
+sid = gajim.connections[account].start_file_transfer(jid,
+file_props,
True)
file_props['sid'] = sid
-
+
if file_props['type'] == 'r':
file_name = os.path.basename(file_props['file-name'])
@@ -876,7 +876,7 @@
self.continue_menuitem.set_no_show_all(True)
else:
-label = _('_Continue')
+label = _('Continue')
self.pause_button.set_label(label)
self.pause_button.set_image(gtk.image_new_from_stock(
gtk.STOCK_MEDIA_PLAY, gtk.ICON_SIZE_MENU))
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: update Copyright
changeset c659b17f27b1 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=c659b17f27b1
description: update Copyright
diffstat:
src/dialogs.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (12 lines):
diff -r 66b7c28317c1 -r c659b17f27b1 src/dialogs.py
--- a/src/dialogs.pyThu Jul 19 20:31:06 2012 +0400
+++ b/src/dialogs.pyThu Jul 19 22:47:47 2012 +0400
@@ -1264,7 +1264,7 @@
dlg.set_transient_for(gajim.interface.roster.window)
dlg.set_name('Gajim')
dlg.set_version(gajim.version)
-s = u'Copyright © 2003-2011 Gajim Team'
+s = u'Copyright © 2003-2012 Gajim Team'
dlg.set_copyright(s)
copying_file_path = self.get_path('COPYING')
if copying_file_path:
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: move change tooltip text for audio and video buttons from...
changeset 66b7c28317c1 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=66b7c28317c1
description: move change tooltip text for audio and video buttons from init to
_update_toolbar.
diffstat:
src/chat_control.py | 36
1 files changed, 16 insertions(+), 20 deletions(-)
diffs (53 lines):
diff -r f3ba2501017a -r 66b7c28317c1 src/chat_control.py
--- a/src/chat_control.py Thu Jul 19 19:43:00 2012 +0400
+++ b/src/chat_control.py Thu Jul 19 20:31:06 2012 +0400
@@ -1650,26 +1650,6 @@
self.restore_conversation()
self.msg_textview.grab_focus()
-# change tooltip text for audio and video buttons if python-farstream
is
-# not installed
-if not gajim.HAVE_FARSTREAM:
-tooltip_text = self._audio_button.get_tooltip_text()
-self._audio_button.set_tooltip_text(
-'%s\n%s' % (tooltip_text,
-_('Feature not available, see Help->Features')))
-tooltip_text = self._video_button.get_tooltip_text()
-self._video_button.set_tooltip_text(
-'%s\n%s' % (tooltip_text,
-_('Feature not available, see Help->Features')))
-elif not self.audio_available :
-self._audio_button.set_tooltip_text(
-'%s\n%s' % (tooltip_text,
-_('Feature not supported by remote client')))
-tooltip_text = self._video_button.get_tooltip_text()
-self._video_button.set_tooltip_text(
-'%s\n%s' % (tooltip_text,
-_('Feature not supported by remote client')))
-
gajim.ged.register_event_handler('pep-received', ged.GUI1,
self._nec_pep_received)
gajim.ged.register_event_handler('vcard-received', ged.GUI1,
@@ -1731,6 +1711,22 @@
# Video buttons
self._video_button.set_sensitive(self.video_available)
+# change tooltip text for audio and video buttons if python-farstream
is
+# not installed
+audio_tooltip_text = _('Toggle audio session') + '\n'
+video_tooltip_text = _('Toggle video session') + '\n'
+if not gajim.HAVE_FARSTREAM:
+ext_text = _('Feature not available, see Help->Features')
+self._audio_button.set_tooltip_text(audio_tooltip_text + ext_text)
+self._video_button.set_tooltip_text(video_tooltip_text + ext_text)
+elif not self.audio_available :
+ext_text =_('Feature not supported by remote client')
+self._audio_button.set_tooltip_text(audio_tooltip_text + ext_text)
+self._video_button.set_tooltip_text(video_tooltip_text + ext_text)
+else:
+self._audio_button.set_tooltip_text(audio_tooltip_text[:-1])
+self._video_button.set_tooltip_text(video_tooltip_text[:-1])
+
# Send file
if (self.contact.supports(NS_FILE) or \
self.contact.supports(NS_JINGLE_FILE_TRANSFER)) or \
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: change tooltip text for audio and video buttons.
changeset f3ba2501017a in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=f3ba2501017a
description: change tooltip text for audio and video buttons.
diffstat:
src/chat_control.py | 14 --
1 files changed, 12 insertions(+), 2 deletions(-)
diffs (26 lines):
diff -r 22b70b9f148b -r f3ba2501017a src/chat_control.py
--- a/src/chat_control.py Tue Jul 17 22:42:22 2012 +0400
+++ b/src/chat_control.py Thu Jul 19 19:43:00 2012 +0400
@@ -1655,10 +1655,20 @@
if not gajim.HAVE_FARSTREAM:
tooltip_text = self._audio_button.get_tooltip_text()
self._audio_button.set_tooltip_text(
-'%s\n%s' % (tooltip_text, _('Requires python-farstream.')))
+'%s\n%s' % (tooltip_text,
+_('Feature not available, see Help->Features')))
tooltip_text = self._video_button.get_tooltip_text()
self._video_button.set_tooltip_text(
-'%s\n%s' % (tooltip_text, _('Requires python-farstream.')))
+'%s\n%s' % (tooltip_text,
+_('Feature not available, see Help->Features')))
+elif not self.audio_available :
+self._audio_button.set_tooltip_text(
+'%s\n%s' % (tooltip_text,
+_('Feature not supported by remote client')))
+tooltip_text = self._video_button.get_tooltip_text()
+self._video_button.set_tooltip_text(
+'%s\n%s' % (tooltip_text,
+_('Feature not supported by remote client')))
gajim.ged.register_event_handler('pep-received', ged.GUI1,
self._nec_pep_received)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Isratine Citizen]. Update Hebrew translation.
changeset 22b70b9f148b in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=22b70b9f148b description: [Isratine Citizen]. Update Hebrew translation. diffstat: po/he.po | 61 + 1 files changed, 25 insertions(+), 36 deletions(-) diffs (245 lines): diff -r 3601ec4a9b3a -r 22b70b9f148b po/he.po --- a/po/he.po Sun Jul 15 22:48:48 2012 +0200 +++ b/po/he.po Tue Jul 17 22:42:22 2012 +0400 @@ -8,7 +8,7 @@ "Project-Id-Version: gajim 0.15\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-07-04 22:54+0400\n" -"PO-Revision-Date: 2012-07-15 12:46+0200\n" +"PO-Revision-Date: 2012-07-17 21:41+0200\n" "Last-Translator: Isratine Citizen \n" "Language-Team: Rahut\n" "Language: he\n" @@ -1864,7 +1864,7 @@ #: ../data/gui/preferences_window.ui.h:13 msgid "Detached roster with single chat" -msgstr "לוח החברים מנותק עם שיחה בודדת" +msgstr "לוח החברים מנותק עם שיחה יחידה" #: ../data/gui/preferences_window.ui.h:14 msgid "Single window for everything" @@ -2916,11 +2916,11 @@ #: ../data/gui/systray_context_menu.ui.h:4 msgid "Send Single _Message" -msgstr "_שליחת הודעה בודדת..." +msgstr "שליחת הודעה _בודדת" #: ../data/gui/systray_context_menu.ui.h:5 msgid "Show All Pending _Events" -msgstr "הצגת אירועים תלויים ועומדים" +msgstr "הצגת _אירועים תלויים ועומדים" # ה_דממת #: ../data/gui/systray_context_menu.ui.h:6 @@ -3414,10 +3414,9 @@ msgstr "הינה" # Needs to be tested -# *אינה* #: ../src/chat_control.py:2207 msgid "is NOT" -msgstr "אינה" +msgstr "*אינה*" # Needs to be tested #. chat session %s be logged @@ -3425,11 +3424,9 @@ msgid "will" msgstr "יירשם" -# Needs to be tested -# *לא* יירשם #: ../src/chat_control.py:2209 msgid "will NOT" -msgstr "לא יירשם" +msgstr "לא יירשם" # Needs to be tested #. About encrypted chat session @@ -3471,7 +3468,7 @@ #: ../src/chat_control.py:2373 msgid "This session is encrypted" -msgstr "סשן זה מוצפן" +msgstr "סשן זה הינו מוצפן" #: ../src/chat_control.py:2376 msgid " and WILL be logged" @@ -3483,7 +3480,7 @@ #: ../src/chat_control.py:2383 msgid "Remote contact's identity not verified. Click the shield button for more details." -msgstr "זהות איש־קשר מרוחק לא מאומתת. לחצו על כפתור המגן עבור פרטים נוספים." +msgstr "זהות איש־קשר מרוחק לא מאומתת. נא ללחוץ על כפתור המגן עבור פרטים נוספים." #: ../src/chat_control.py:2385 msgid "E2E encryption disabled" @@ -3492,7 +3489,7 @@ #: ../src/chat_control.py:2433 #: ../src/chat_control.py:2447 msgid "The following message was NOT encrypted" -msgstr "ההודעה שלהלן לא הוצפנה" +msgstr "ההודעה שלהלן *לא* הוצפנה" #: ../src/chat_control.py:2439 msgid "The following message was encrypted" @@ -4513,6 +4510,7 @@ msgid "If True, Gajim will show number of online and total contacts in account and group rows." msgstr "במידה והעדפה זו מופעלת, Gajim יציג מספר של אנשי־קשר מקוונים בשורות חשבון וקבוצה." +# what type? # אפשרי שיהיה #: ../src/common/config.py:291 #, fuzzy @@ -4553,7 +4551,7 @@ # שידור בקשות #: ../src/common/config.py:298 msgid "Ask offline status message to all offline contacts when connection to an accoutn is established. WARNING: This causes a lot of requests to be sent!" -msgstr "בקש הודעות מצב לא מקוונות מכל אנשי־הקשר הבלתי מקוונים כאשר חיבור אל חשבון מבוסס. אזהרה: זה עלול לגרום לשליחת מספר רב של בקשות!" +msgstr "בקש הודעות מצב לא מקוונות מכל אנשי־הקשר הבלתי מקוונים כאשר חיבור אל חשבון מבוסס. אזהרה: זו עלולה לגרום לשליחת מספר רב של בקשות!" #: ../src/common/config.py:299 msgid "If True, completion in groupchats will be like a shell auto-completion" @@ -5283,7 +5281,7 @@ #. we're not english: one in locale and one en #: ../src/common/connection.py:343 msgid "[This message is *encrypted* (See :XEP:`27`]" -msgstr "[הודעה זו הינה *מוצפנת* (ראה :XEP:`27`]" +msgstr "[הודעה זו הינה *מוצפנת* (ראו :XEP:`27`]" #: ../src/common/connection.py:446 #, python-format @@ -5387,6 +5385,7 @@ # חסרת תוקף # שם תחום +# כוללת #: ../src/common/connection.py:1335 #, python-format msgid "" @@ -5691,11 +5690,7 @@ msgid "Weekend!" msgstr "סופשבוע!" -# What does it mean? -# 1 and 1023 chars -# 1 to 1023 characters? #: ../src/common/helpers.py:158 -#, fuzzy msgid "Username must be between 1 and 1023 chars" msgstr "שם משתמש מוכרח להיות בין 1 אל 1023 תווים" @@ -5706,7 +5701,6 @@ msgstr "Invalid character in username." #: ../src/common/helpers.py:169 -#, fuzzy msgid "Server must be between 1 and 1023 chars" msgstr "שרת מוכרח להיות בין 1 אל 1023 תווים" @@ -5721,7 +5715,6 @@ msgstr "נדרשת כתובת שרת." #: ../src/common/helpers.py:180 -#, fuzzy msgid "Resource must be between 1 and 1023 chars" msgstr "משאב מוכרח להיות בין 1 אל 1023 תווים" @@ -8544,9 +8537,7 @@ #: ../src/features_window.py:57 msgid "Requires pybonjour and bonjour SDK running (http://developer.apple.com/opensource/)." -msgstr "" -"יש צורך בהתקנת ובהרצת pybonjour וגם bonjour SDK\n" -"http://developer.apple.com/opensour
gajim: [Isratine Citizen]. Add Hebrew translation.
changeset 7970f1923d10 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=7970f1923d10 description: [Isratine Citizen]. Add Hebrew translation. diffstat: po/LINGUAS | 1 + po/he.po | 12440 +++ 2 files changed, 12441 insertions(+), 0 deletions(-) diffs (truncated from 12452 to 300 lines): diff -r 9f891f9fbd3f -r 7970f1923d10 po/LINGUAS --- a/po/LINGUASThu Jul 12 22:21:58 2012 +0400 +++ b/po/LINGUASSun Jul 15 13:47:09 2012 +0400 @@ -31,3 +31,4 @@ uk ja kk +he diff -r 9f891f9fbd3f -r 7970f1923d10 po/he.po --- /dev/null Thu Jan 01 00:00:00 1970 + +++ b/po/he.po Sun Jul 15 13:47:09 2012 +0400 @@ -0,0 +1,12440 @@ +# Hebrew translations for gajim +# Copyright (C) Copyright © 2003-2012 Gajim Team +# This file is distributed under the same license as the gajim package. +# Darlan , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: gajim 0.15\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2012-07-04 22:54+0400\n" +"PO-Revision-Date: 2012-07-15 12:46+0200\n" +"Last-Translator: Isratine Citizen \n" +"Language-Team: Rahut\n" +"Language: he\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: Hebrew\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: ../data/gui/account_context_menu.ui.h:1 +#: ../data/gui/zeroconf_context_menu.ui.h:1 +msgid "_Status" +msgstr "_מצב־חיבור" + +#: ../data/gui/account_context_menu.ui.h:2 +msgid "_Personal Events" +msgstr "_אירועים אישיים" + +#: ../data/gui/account_context_menu.ui.h:3 +#: ../data/gui/roster_window.ui.h:3 +msgid "_Start Chat..." +msgstr "התחלת _שיחה..." + +# הצטרפות אך/ל +# שיחה מרובת משתתפים +# שיחה קבוצתית +# קבוצת שיחה +#: ../data/gui/account_context_menu.ui.h:4 +#: ../data/gui/roster_window.ui.h:5 +msgid "Join _Group Chat..." +msgstr "שיחת _קבוצה..." + +#: ../data/gui/account_context_menu.ui.h:5 +msgid "_Add Contact..." +msgstr "הוספת _איש־קשר..." + +# איתור +#: ../data/gui/account_context_menu.ui.h:6 +#: ../data/gui/roster_window.ui.h:7 +msgid "_Discover Services" +msgstr "מציאת _שירותים" + +#: ../data/gui/account_context_menu.ui.h:7 +msgid "_Execute Command..." +msgstr "הרצת _פקודה..." + +#: ../data/gui/account_context_menu.ui.h:8 +msgid "_Open Gmail Inbox" +msgstr "_פתיחת תיבת דואר נכנס של GMail" + +#: ../data/gui/account_context_menu.ui.h:9 +msgid "_Modify Account" +msgstr "ה_תאמת חשבון" + +#: ../data/gui/account_creation_wizard_window.ui.h:1 +msgid "Gajim: Account Creation Wizard" +msgstr "Gajim: אשף יצירת חשבון" + +#: ../data/gui/account_creation_wizard_window.ui.h:2 +msgid "" +"You need to have an account in order to connect\n" +"to the Jabber network." +msgstr "" +"יש צורך בחשבון בכדי להתחבר\n" +"אל רשת התקשורת Jabber." + +# בו אני רוצה לעשות +#: ../data/gui/account_creation_wizard_window.ui.h:4 +msgid "I already have an account I want to _use" +msgstr "כבר קיים ברשותי _חשבון שברצוני לעשות שימוש בו" + +# I want to _register a new account +# אני רוצה _לרשום חשבון חדש +# I want to _register for a new account +# אני רוצה _להירשם לחשבון חדש +#: ../data/gui/account_creation_wizard_window.ui.h:5 +msgid "I want to _register for a new account" +msgstr "ברצוני ל_רשום חשבון חדש" + +#: ../data/gui/account_creation_wizard_window.ui.h:6 +msgid "Please choose one of the options below:" +msgstr "נא לבחור באחת מהאפשרויות הבאות:" + +#: ../data/gui/account_creation_wizard_window.ui.h:7 +msgid "Please fill in the data for your existing account" +msgstr "נא להזין מידע עבור חשבונך הקיים" + +#: ../data/gui/account_creation_wizard_window.ui.h:8 +#: ../data/gui/accounts_window.ui.h:22 +#: ../data/gui/manage_bookmarks_window.ui.h:2 +msgid "_Password:" +msgstr "_מילת־מעבר:" + +# שמירת סיסמא +#: ../data/gui/account_creation_wizard_window.ui.h:9 +#: ../data/gui/accounts_window.ui.h:20 +msgid "Save pass_word" +msgstr "שמירת _מילת־מעבר" + +# BUG: a dot at the end +# From: Clipman +# If checked, this option allows to store one image inside the history +# במידה והמשבצת/והאפשרות מסומנת +# במידה ומשבצת/ואפשרות זו מסומנת +# בבוחרך באפשרות זו, Wicd +#: ../data/gui/account_creation_wizard_window.ui.h:10 +#: ../data/gui/accounts_window.ui.h:21 +msgid "If checked, Gajim will remember the password for this account" +msgstr "במידה ואפשרות זו מסומנת, Gajim יזכור את מילת־המעבר עבור חשבון זה" + +#: ../data/gui/account_creation_wizard_window.ui.h:11 +#: ../data/gui/accounts_window.ui.h:23 +msgid "_Jabber ID:" +msgstr "_JID:" + +#: ../data/gui/account_creation_wizard_window.ui.h:12 +msgid "Anon_ymous authentication" +msgstr "אימות _אלמוני" + +#: ../data/gui/account_creation_wizard_window.ui.h:13 +msgid "Please select a server" +msgstr "נא לבחור שרת" + +#: ../data/gui/account_creation_wizard_window.ui.h:14 +#: ../data/gui/manage_bookmarks_window.ui.h:3 +msgid "_Server:" +msgstr "_שרת:" + +#: ../data/gui/account_creation_wizard_window.ui.h:15 +msgid "Prox_y:" +msgstr "_פרוקסי:" + +# BUG: _underline +#: ..
gajim: Translatable window title (Contact Information.zeroconf)....
changeset 9f891f9fbd3f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=9f891f9fbd3f description: Translatable window title (Contact Information.zeroconf). Fixes #7191 diffstat: data/gui/zeroconf_information_window.ui | 28 ++-- 1 files changed, 14 insertions(+), 14 deletions(-) diffs (129 lines): diff -r 631ed591e5a7 -r 9f891f9fbd3f data/gui/zeroconf_information_window.ui --- a/data/gui/zeroconf_information_window.ui Fri Jul 06 01:38:18 2012 +0400 +++ b/data/gui/zeroconf_information_window.ui Thu Jul 12 22:21:58 2012 +0400 @@ -4,7 +4,7 @@ 12 -Contact Information +Contact Information False dialog @@ -51,7 +51,7 @@ GTK_FILL - + @@ -65,7 +65,7 @@ 1 2 GTK_FILL - + @@ -79,7 +79,7 @@ 2 3 GTK_FILL - + @@ -95,7 +95,7 @@ 1 2 - + @@ -119,7 +119,7 @@ 2 1 2 - + @@ -161,7 +161,7 @@ 3 4 GTK_FILL - + @@ -231,7 +231,7 @@ 2 3 GTK_FILL - + @@ -250,7 +250,7 @@ 2 3 GTK_FILL - + @@ -264,7 +264,7 @@ 3 4 GTK_FILL - + @@ -284,7 +284,7 @@ 3 4 GTK_FILL - + @@ -298,7 +298,7 @@ 1 2 GTK_FILL - + @@ -310,7 +310,7 @@ GTK_FILL - + @@ -345,7 +345,7 @@ 1 2 GTK_FILL - + ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: fix set parent window for ProfileWindow and ChoseGPGKeyDi...
changeset 631ed591e5a7 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=631ed591e5a7
description: fix set parent window for ProfileWindow and ChoseGPGKeyDialog.
diffstat:
data/gui/profile_window.ui | 1 -
src/config.py | 2 +-
src/dialogs.py | 3 +--
src/gui_interface.py | 2 +-
src/profile_window.py | 3 +--
src/roster_window.py | 2 +-
6 files changed, 5 insertions(+), 8 deletions(-)
diffs (73 lines):
diff -r 0c82b12d2983 -r 631ed591e5a7 data/gui/profile_window.ui
--- a/data/gui/profile_window.uiThu Jul 05 23:53:51 2012 +0400
+++ b/data/gui/profile_window.uiFri Jul 06 01:38:18 2012 +0400
@@ -4,7 +4,6 @@
Personal Information
-center-on-parent
dialog
diff -r 0c82b12d2983 -r 631ed591e5a7 src/config.py
--- a/src/config.py Thu Jul 05 23:53:51 2012 +0400
+++ b/src/config.py Fri Jul 06 01:38:18 2012 +0400
@@ -2458,7 +2458,7 @@
jid = gajim.get_jid_from_account(self.current_account)
if 'profile' not in gajim.interface.instances[self.current_account]:
gajim.interface.instances[self.current_account]['profile'] = \
-profile_window.ProfileWindow(self.current_account, self.window)
+profile_window.ProfileWindow(self.current_account,
transient_for=self.window)
gajim.connections[self.current_account].request_vcard(jid)
def on_checkbutton_toggled(self, widget, config_name,
diff -r 0c82b12d2983 -r 631ed591e5a7 src/dialogs.py
--- a/src/dialogs.pyThu Jul 05 23:53:51 2012 +0400
+++ b/src/dialogs.pyFri Jul 06 01:38:18 2012 +0400
@@ -283,8 +283,7 @@
xml = gtkgui_helpers.get_gtk_builder('choose_gpg_key_dialog.ui')
self.window = xml.get_object('choose_gpg_key_dialog')
self.window.set_title(title_text)
-if not transient_for:
-self.window.set_transient_for(gajim.interface.roster.window)
+self.window.set_transient_for(transient_for)
self.keys_treeview = xml.get_object('keys_treeview')
prompt_label = xml.get_object('prompt_label')
prompt_label.set_text(prompt_text)
diff -r 0c82b12d2983 -r 631ed591e5a7 src/gui_interface.py
--- a/src/gui_interface.py Thu Jul 05 23:53:51 2012 +0400
+++ b/src/gui_interface.py Fri Jul 06 01:38:18 2012 +0400
@@ -238,7 +238,7 @@
jid = gajim.get_jid_from_account(account)
if 'profile' not in self.instances[account]:
self.instances[account]['profile'] = \
-profile_window.ProfileWindow(account)
+profile_window.ProfileWindow(account,
gajim.interface.roster.window)
gajim.connections[account].request_vcard(jid)
def handle_gc_error(self, gc_control, pritext, sectext):
diff -r 0c82b12d2983 -r 631ed591e5a7 src/profile_window.py
--- a/src/profile_window.py Thu Jul 05 23:53:51 2012 +0400
+++ b/src/profile_window.py Fri Jul 06 01:38:18 2012 +0400
@@ -45,8 +45,7 @@
def __init__(self, account, transient_for=None):
self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui')
self.window = self.xml.get_object('profile_window')
-if not transient_for:
-self.window.set_transient_for(gajim.interface.roster.window)
+self.window.set_transient_for(transient_for)
self.progressbar = self.xml.get_object('progressbar')
self.statusbar = self.xml.get_object('statusbar')
self.context_id = self.statusbar.get_context_id('profile')
diff -r 0c82b12d2983 -r 631ed591e5a7 src/roster_window.py
--- a/src/roster_window.py Thu Jul 05 23:53:51 2012 +0400
+++ b/src/roster_window.py Fri Jul 06 01:38:18 2012 +0400
@@ -3233,7 +3233,7 @@
dialogs.ChooseGPGKeyDialog(_('Assign OpenPGP Key'),
_('Select a key to apply to the contact'), public_keys,
-on_key_selected, selected=keyID)
+on_key_selected, selected=keyID, transient_for=self.window)
def on_set_custom_avatar_activate(self, widget, contact, account):
def on_ok(widget, path_to_file):
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Set parent window for ProfileWindow. See #7184.
changeset 0c82b12d2983 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=0c82b12d2983
description: Set parent window for ProfileWindow. See #7184.
diffstat:
data/gui/profile_window.ui | 1 +
src/config.py | 7 ++-
src/profile_window.py | 5 +++--
3 files changed, 10 insertions(+), 3 deletions(-)
diffs (52 lines):
diff -r dac3f13d02c4 -r 0c82b12d2983 data/gui/profile_window.ui
--- a/data/gui/profile_window.uiThu Jul 05 23:23:56 2012 +0400
+++ b/data/gui/profile_window.uiThu Jul 05 23:53:51 2012 +0400
@@ -4,6 +4,7 @@
Personal Information
+center-on-parent
dialog
diff -r dac3f13d02c4 -r 0c82b12d2983 src/config.py
--- a/src/config.py Thu Jul 05 23:23:56 2012 +0400
+++ b/src/config.py Thu Jul 05 23:53:51 2012 +0400
@@ -45,6 +45,7 @@
import message_control
import chat_control
import dataforms_widget
+import profile_window
try:
import gtkspell
@@ -2454,7 +2455,11 @@
_("Your server can't save your personal information."))
return
-gajim.interface.edit_own_details(self.current_account)
+jid = gajim.get_jid_from_account(self.current_account)
+if 'profile' not in gajim.interface.instances[self.current_account]:
+gajim.interface.instances[self.current_account]['profile'] = \
+profile_window.ProfileWindow(self.current_account, self.window)
+gajim.connections[self.current_account].request_vcard(jid)
def on_checkbutton_toggled(self, widget, config_name,
change_sensitivity_widgets = None, account = None):
diff -r dac3f13d02c4 -r 0c82b12d2983 src/profile_window.py
--- a/src/profile_window.py Thu Jul 05 23:23:56 2012 +0400
+++ b/src/profile_window.py Thu Jul 05 23:53:51 2012 +0400
@@ -42,10 +42,11 @@
Class for our information window
"""
-def __init__(self, account):
+def __init__(self, account, transient_for=None):
self.xml = gtkgui_helpers.get_gtk_builder('profile_window.ui')
self.window = self.xml.get_object('profile_window')
-self.window.set_transient_for(gajim.interface.roster.window)
+if not transient_for:
+self.window.set_transient_for(gajim.interface.roster.window)
self.progressbar = self.xml.get_object('progressbar')
self.statusbar = self.xml.get_object('statusbar')
self.context_id = self.statusbar.get_context_id('profile')
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Set parent window for ChooseGPGKeyDialog.
changeset dac3f13d02c4 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=dac3f13d02c4
description: Set parent window for ChooseGPGKeyDialog.
diffstat:
src/config.py | 3 ++-
src/dialogs.py | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diffs (32 lines):
diff -r 0f66fb0158c1 -r dac3f13d02c4 src/config.py
--- a/src/config.py Thu Jun 28 13:37:55 2012 +0400
+++ b/src/config.py Thu Jul 05 23:23:56 2012 +0400
@@ -2429,7 +2429,8 @@
keyID[0])
dialogs.ChooseGPGKeyDialog(_('OpenPGP Key Selection'),
-_('Choose your OpenPGP key'), secret_keys, on_key_selected)
+_('Choose your OpenPGP key'), secret_keys, on_key_selected,
+transient_for=self.window)
def on_use_gpg_agent_checkbutton_toggled(self, widget):
self.on_checkbutton_toggled(widget, 'use_gpg_agent')
diff -r 0f66fb0158c1 -r dac3f13d02c4 src/dialogs.py
--- a/src/dialogs.pyThu Jun 28 13:37:55 2012 +0400
+++ b/src/dialogs.pyThu Jul 05 23:23:56 2012 +0400
@@ -277,12 +277,14 @@
"""
def __init__(self, title_text, prompt_text, secret_keys, on_response,
- selected=None):
+selected=None, transient_for=None):
'''secret_keys : {keyID: userName, ...}'''
self.on_response = on_response
xml = gtkgui_helpers.get_gtk_builder('choose_gpg_key_dialog.ui')
self.window = xml.get_object('choose_gpg_key_dialog')
self.window.set_title(title_text)
+if not transient_for:
+self.window.set_transient_for(gajim.interface.roster.window)
self.keys_treeview = xml.get_object('keys_treeview')
prompt_label = xml.get_object('prompt_label')
prompt_label.set_text(prompt_text)
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Select root iter in the PluginsWindow treeview. set focus...
changeset 0f66fb0158c1 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=0f66fb0158c1
description: Select root iter in the PluginsWindow treeview. set focus on close
button when switch page.
diffstat:
data/gui/plugins_window.ui | 1 +
src/plugins/gui.py | 5 +
2 files changed, 6 insertions(+), 0 deletions(-)
diffs (34 lines):
diff -r 39d1781d54e5 -r 0f66fb0158c1 data/gui/plugins_window.ui
--- a/data/gui/plugins_window.uiThu Jun 28 13:15:52 2012 +0400
+++ b/data/gui/plugins_window.uiThu Jun 28 13:37:55 2012 +0400
@@ -20,6 +20,7 @@
True
True
+
True
diff -r 39d1781d54e5 -r 0f66fb0158c1 src/plugins/gui.py
--- a/src/plugins/gui.pyThu Jun 28 13:15:52 2012 +0400
+++ b/src/plugins/gui.pyThu Jun 28 13:37:55 2012 +0400
@@ -82,14 +82,19 @@
self._clear_installed_plugin_info()
self.fill_installed_plugins_model()
+selection.select_iter(self.installed_plugins_model.get_iter_root())
self.xml.connect_signals(self)
self.plugins_notebook.set_current_page(0)
+self.xml.get_object('close_button').grab_focus()
self.window.show_all()
gtkgui_helpers.possibly_move_window_in_current_desktop(self.window)
+def on_plugins_notebook_switch_page(self, widget, page, page_num):
+gobject.idle_add(self.xml.get_object('close_button').grab_focus)
+
@log_calls('PluginsWindow')
def installed_plugins_treeview_selection_changed(self, treeview_selection):
model, iter = treeview_selection.get_selected()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Don't ellipsize Family Name label in the profile window.
changeset 39d1781d54e5 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=39d1781d54e5 description: Don't ellipsize Family Name label in the profile window. diffstat: data/gui/profile_window.ui | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diffs (11 lines): diff -r c1374c9127fc -r 39d1781d54e5 data/gui/profile_window.ui --- a/data/gui/profile_window.uiThu Jun 28 13:03:56 2012 +0400 +++ b/data/gui/profile_window.uiThu Jun 28 13:15:52 2012 +0400 @@ -128,7 +128,6 @@ 0 Family: True -middle GTK_FILL ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Set focus on close button when switch vcard page.
changeset 95b6bf380532 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=95b6bf380532 description: Set focus on close button when switch vcard page. diffstat: data/gui/vcard_information_window.ui | 157 +- src/vcard.py |3 + 2 files changed, 80 insertions(+), 80 deletions(-) diffs (truncated from 727 to 300 lines): diff -r dcfcc68ab956 -r 95b6bf380532 data/gui/vcard_information_window.ui --- a/data/gui/vcard_information_window.ui Tue Jun 26 00:25:19 2012 +0400 +++ b/data/gui/vcard_information_window.ui Thu Jun 28 12:38:43 2012 +0400 @@ -29,6 +29,7 @@ True + True @@ -56,7 +57,7 @@ GTK_FILL - + @@ -71,7 +72,7 @@ 1 2 GTK_FILL - + @@ -86,7 +87,7 @@ 2 3 GTK_FILL - + @@ -101,7 +102,7 @@ 3 4 GTK_FILL - + @@ -116,13 +117,12 @@ 4 5 GTK_FILL - + True -True 0 0 5 @@ -132,7 +132,7 @@ 1 2 - + @@ -156,7 +156,7 @@ 2 1 2 - + @@ -175,7 +175,7 @@ 2 3 4 - + @@ -195,7 +195,7 @@ 2 4 5 - + @@ -235,7 +235,7 @@ 5 6 GTK_FILL - + @@ -254,7 +254,7 @@ 2 5 6 - + @@ -366,7 +366,7 @@ 1 2 - + @@ -386,7 +386,7 @@ 3 4 - + @@ -399,7 +399,7 @@ GTK_FILL - + @@ -414,7 +414,7 @@ 2 3 GTK_FILL - + @@ -480,7 +480,7 @@ 1 2 - +
gajim: Set focus on close button when switch preferences window ...
changeset c1374c9127fc in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=c1374c9127fc description: Set focus on close button when switch preferences window page. diffstat: data/gui/preferences_window.ui | 53 + src/config.py | 4 +++ 2 files changed, 31 insertions(+), 26 deletions(-) diffs (249 lines): diff -r ca5c75aa8433 -r c1374c9127fc data/gui/preferences_window.ui --- a/data/gui/preferences_window.uiThu Jun 28 12:49:54 2012 +0400 +++ b/data/gui/preferences_window.uiThu Jun 28 13:03:56 2012 +0400 @@ -166,6 +166,7 @@ True True False + True @@ -1059,7 +1060,7 @@ GTK_FILL - + @@ -1077,7 +1078,7 @@ 1 2 GTK_FILL - + @@ -1090,7 +1091,7 @@ 2 3 GTK_FILL - + @@ -1105,7 +1106,7 @@ 1 2 GTK_FILL - + @@ -1168,7 +1169,7 @@ 3 4 - + @@ -1185,7 +1186,7 @@ 4 1 2 - + @@ -1698,7 +1699,7 @@ GTK_FILL - + @@ -1713,7 +1714,7 @@ 2 3 GTK_FILL - + @@ -1728,7 +1729,7 @@ 2 3 GTK_FILL - + @@ -1744,7 +1745,7 @@ 2 3 GTK_FILL - + @@ -1827,7 +1828,7 @@ 1 2 GTK_FILL - + @@ -1842,7 +1843,7 @@ 1 2 GTK_FILL - + @@ -1881,8 +1882,8 @@ 2 1 2 - - + + @@ -1921,8 +1922,8 @@ 4 1 2 - - + + @@ -1951,7 +1952,7 @@
gajim: Set focus on ok button when switch profile window page.
changeset ca5c75aa8433 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=ca5c75aa8433 description: Set focus on ok button when switch profile window page. diffstat: data/gui/profile_window.ui | 127 ++-- src/profile_window.py |4 + 2 files changed, 68 insertions(+), 63 deletions(-) diffs (truncated from 585 to 300 lines): diff -r 95b6bf380532 -r ca5c75aa8433 data/gui/profile_window.ui --- a/data/gui/profile_window.uiThu Jun 28 12:38:43 2012 +0400 +++ b/data/gui/profile_window.uiThu Jun 28 12:49:54 2012 +0400 @@ -15,6 +15,7 @@ True 6 + True @@ -31,7 +32,7 @@ 1 2 - + @@ -44,7 +45,7 @@ 4 4 5 - + @@ -67,7 +68,7 @@ 1 2 - + @@ -78,7 +79,7 @@ 3 4 - + @@ -91,7 +92,7 @@ 2 1 2 - + @@ -104,7 +105,7 @@ 2 2 3 - + @@ -117,7 +118,7 @@ 4 2 3 - + @@ -131,7 +132,7 @@ GTK_FILL - + @@ -146,7 +147,7 @@ 1 2 GTK_FILL - + @@ -161,7 +162,7 @@ 2 3 GTK_FILL - + @@ -176,7 +177,7 @@ 2 3 GTK_FILL - + @@ -193,7 +194,7 @@ 2 3 GTK_FILL - + @@ -218,7 +219,7 @@ 4 1 2 - + @@ -229,7 +230,7 @@ 3 4 - + @@ -252,7 +253,7 @@ 1 2 - + @@ -263,7 +264,7 @@ 3 4 - + @@ -276,7 +277,7 @@ 2 1 2 - + @@ -289,7 +290,7 @@ 4 1 2 - +
gajim: Select root iter in the AccountsWindow treeview.
changeset dcfcc68ab956 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=dcfcc68ab956
description: Select root iter in the AccountsWindow treeview.
diffstat:
src/config.py | 6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diffs (30 lines):
diff -r 4b5b53d48a6c -r dcfcc68ab956 src/config.py
--- a/src/config.py Mon Jun 25 23:49:20 2012 +0400
+++ b/src/config.py Tue Jun 26 00:25:19 2012 +0400
@@ -1558,7 +1558,6 @@
self.update_proxy_list()
self.xml.connect_signals(self)
self.init_accounts()
-self.xml.get_object('close_button').grab_focus()
self.window.show_all()
# Merge accounts
@@ -1575,6 +1574,8 @@
except ImportError:
self.avahi_available = False
+self.xml.get_object('close_button').grab_focus()
+
def on_accounts_window_key_press_event(self, widget, event):
if event.keyval == gtk.keysyms.Escape:
self.check_resend_relog()
@@ -1603,6 +1604,9 @@
iter_ = model.append()
model.set(iter_, 0, account)
+self.selection = self.accounts_treeview.get_selection()
+self.selection.select_iter(model.get_iter_root())
+
def resend(self, account):
if not account in gajim.connections:
return
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Set focus on close button in the AccountsWindow.
changeset 4b5b53d48a6c in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=4b5b53d48a6c
description: Set focus on close button in the AccountsWindow.
diffstat:
src/config.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diffs (11 lines):
diff -r aaca933b6584 -r 4b5b53d48a6c src/config.py
--- a/src/config.py Mon Jun 25 23:27:23 2012 +0400
+++ b/src/config.py Mon Jun 25 23:49:20 2012 +0400
@@ -1558,6 +1558,7 @@
self.update_proxy_list()
self.xml.connect_signals(self)
self.init_accounts()
+self.xml.get_object('close_button').grab_focus()
self.window.show_all()
# Merge accounts
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: Do not highlight(mark) contact name in VcardWindow.
changeset aaca933b6584 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=aaca933b6584
description: Do not highlight(mark) contact name in VcardWindow.
diffstat:
src/vcard.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diffs (13 lines):
diff -r e5d66fcb024f -r aaca933b6584 src/vcard.py
--- a/src/vcard.py Thu Jun 21 14:10:01 2012 +0200
+++ b/src/vcard.py Mon Jun 25 23:27:23 2012 +0400
@@ -142,8 +142,8 @@
buffer_.set_text(annotations[self.contact.jid])
self.xml.connect_signals(self)
+self.xml.get_object('close_button').grab_focus()
self.window.show_all()
-self.xml.get_object('close_button').grab_focus()
def update_progressbar(self):
self.progressbar.pulse()
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: fix typo
changeset 41acee25913c in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=41acee25913c
description: fix typo
diffstat:
src/tooltips.py | 8
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (21 lines):
diff -r 0def65e3600a -r 41acee25913c src/tooltips.py
--- a/src/tooltips.py Tue Jun 19 20:50:34 2012 +0200
+++ b/src/tooltips.py Tue Jun 19 22:45:19 2012 +0400
@@ -207,13 +207,13 @@
formatted = "%s"
color = None
if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")):
-color = gajim.conig.get('tooltip_affiliation_none_color')
+color = gajim.config.get('tooltip_affiliation_none_color')
elif affiliation.startswith(_("Member")):
-color = gajim.conig.get('tooltip_affiliation_member_color')
+color = gajim.config.get('tooltip_affiliation_member_color')
elif affiliation.startswith(_("Administrator")):
-color = gajim.conig.get('tooltip_affiliation_administrator_color')
+color = gajim.config.get('tooltip_affiliation_administrator_color')
elif affiliation.startswith(_("Owner")):
-color = gajim.conig.get('tooltip_affiliation_owner_color')
+color = gajim.config.get('tooltip_affiliation_owner_color')
if color:
affiliation = formatted % (color, affiliation)
return affiliation
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: fix typo
changeset 31c71ead in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=31c71ead
description: fix typo
diffstat:
src/tooltips.py | 8
1 files changed, 4 insertions(+), 4 deletions(-)
diffs (21 lines):
diff -r dd85d8b743c2 -r 31c71ead src/tooltips.py
--- a/src/tooltips.py Tue Jun 19 19:19:24 2012 +0200
+++ b/src/tooltips.py Tue Jun 19 22:45:19 2012 +0400
@@ -207,13 +207,13 @@
formatted = "%s"
color = None
if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")):
-color = gajim.conig.get('tooltip_affiliation_none_color')
+color = gajim.config.get('tooltip_affiliation_none_color')
elif affiliation.startswith(_("Member")):
-color = gajim.conig.get('tooltip_affiliation_member_color')
+color = gajim.config.get('tooltip_affiliation_member_color')
elif affiliation.startswith(_("Administrator")):
-color = gajim.conig.get('tooltip_affiliation_administrator_color')
+color = gajim.config.get('tooltip_affiliation_administrator_color')
elif affiliation.startswith(_("Owner")):
-color = gajim.conig.get('tooltip_affiliation_owner_color')
+color = gajim.config.get('tooltip_affiliation_owner_color')
if color:
affiliation = formatted % (color, affiliation)
return affiliation
___
Commits mailing list
Commits@gajim.org
http://lists.gajim.org/cgi-bin/listinfo/commits
gajim: [Schnouki ] using paint_shadow() rather than paint_flat_b...
changeset 551f7d62600e in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=551f7d62600e description: [Schnouki ] using paint_shadow() rather than paint_flat_box() to add these borders/shadows. Fixes #5899 diffstat: src/tooltips.py | 10 ++ 1 files changed, 2 insertions(+), 8 deletions(-) diffs (20 lines): diff -r e3bb1938d448 -r 551f7d62600e src/tooltips.py --- a/src/tooltips.py Wed May 30 08:30:49 2012 +0200 +++ b/src/tooltips.py Wed Jun 13 17:17:45 2012 +0400 @@ -135,14 +135,8 @@ def expose(self, widget, event): style = self.win.get_style() size = self.win.get_size() -style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, -None, self.win, 'tooltip', 0, 0, -1, 1) -style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, -None, self.win, 'tooltip', 0, size[1] - 1, -1, 1) -style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, -None, self.win, 'tooltip', 0, 0, 1, -1) -style.paint_flat_box(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, -None, self.win, 'tooltip', size[0] - 1, 0, 1, -1) +style.paint_shadow(self.win.window, gtk.STATE_NORMAL, gtk.SHADOW_OUT, +None, self.win, 'tooltip', 0, 0, size[0], size[1]) return True def show_tooltip(self, data, widget_height, widget_y_position): ___ Commits mailing list Commits@gajim.org http://lists.gajim.org/cgi-bin/listinfo/commits
