Commits

commits@gajim.org

17632 discussions

gajim: ManageBookmarksWindow. Remove unused function
by Fomin Denis 23 Nov '12

23 Nov '12

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

1 0

gajim: hide 'bookmark_ button' if private storage not supported....
by Fomin Denis 20 Nov '12

20 Nov '12

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,

1 0

gajim: hide 'bookmark_ button' if private storage not supported
by Fomin Denis 20 Nov '12

20 Nov '12

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)

1 0

gajim: prevent traceback
by Fomin Denis 18 Nov '12

18 Nov '12

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:

1 0

gajim: [Darlan].Update Hebrew translation.
by Fomin Denis 17 Nov '12

17 Nov '12

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 <genghiskhan(a)gmx.ca>\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" +"מפרוטוקול זה. נא להקיש על לחצן\n" "הרשמה כדי להמשיך." #: ../data/gui/add_new_contact_window.ui.h:13 msgid "_Register" -msgstr "ה_רשמה" - +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 msgid "I would like to add you to my contact list." -msgstr "ברצוני להוסיפך אל רשימת אנשי־הקשר שלי." +msgstr "ברצוני להוסיפך אל רשימת הקשר שלי." #. displaying the window #: ../data/gui/adhoc_commands_window.ui.h:1 @@ -805,14 +807,14 @@ #: ../data/gui/blocked_contacts_window.ui.h:1 msgid "Blocked Contacts" -msgstr "אנשי־קשר חסומים" +msgstr "אנשי קשר חסומים" #: ../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:5846 -#: ../src/roster_window.py:5973 -#: ../src/roster_window.py:6106 +#: ../src/roster_window.py:5863 +#: ../src/roster_window.py:5990 +#: ../src/roster_window.py:6123 msgid "_Unblock" msgstr "_ביטול חסימה" @@ -915,7 +917,7 @@ #: ../data/gui/chat_control.ui.h:3 msgid "Add this contact to roster (Ctrl+D)" -msgstr "הוספת איש־קשר זה אל הרשימה (Ctrl+D)" +msgstr "הוספת איש קשר זה אל הרשימה (Ctrl+D)" #. change tooltip text for audio and video buttons if python-farstream is #. not installed @@ -931,14 +933,13 @@ msgid "Toggle video session" msgstr "הפעלת סשן וידאו" -# לשיחה #: ../data/gui/chat_control.ui.h:6 msgid "Invite contacts to the conversation (Ctrl+G)" -msgstr "הזמנת אנשי־קשר אל השיחה (Ctrl+G)" +msgstr "הזמנת אנשי קשר אל הדיון (Ctrl+G)" #: ../data/gui/chat_control.ui.h:7 msgid "Show the contact's profile (Ctrl+I)" -msgstr "הצגת דיוקן איש־קשר (Ctrl+I)" +msgstr "הצגת דיוקן איש קשר (Ctrl+I)" #: ../data/gui/chat_control.ui.h:8 #: ../data/gui/groupchat_control.ui.h:6 @@ -1018,7 +1019,7 @@ "Select the contacts you want to invite" msgstr "" "בחרת להתחיל שיחה מרובת משתתפים.\n" -"נא לבחור את אנשי־הקשר אותם ברצונך להזמין" +"נא לבחור את אנשי הקשר אותם ברצונך להזמין" # שרת MUC # נא לבחור שרת MUC (שיחה מרובת משתתפים). @@ -1051,14 +1052,14 @@ #. Invite to Groupchat #: ../data/gui/contact_context_menu.ui.h:4 #: ../data/gui/gc_occupants_menu.ui.h:11 -#: ../src/roster_window.py:5782 -#: ../src/roster_window.py:5941 +#: ../src/roster_window.py:5799 +#: ../src/roster_window.py:5958 msgid "In_vite to" msgstr "ה_זמנה אל" #: ../data/gui/contact_context_menu.ui.h:5 msgid "Invite _Contacts" -msgstr "הזמנת _אנשי־קשר" +msgstr "הזמנת _אנשי קשר" #: ../data/gui/contact_context_menu.ui.h:6 msgid "Toggle Open_PGP Encryption" @@ -1073,8 +1074,8 @@ msgstr "הפעלת הצפנת E2E" #: ../data/gui/contact_context_menu.ui.h:8 -#: ../src/roster_window.py:5792 -#: ../src/roster_window.py:6030 +#: ../src/roster_window.py:5809 +#: ../src/roster_window.py:6047 msgid "Send Cus_tom Status" msgstr "שליחת מצב־חיבור מו_תאם" @@ -1084,7 +1085,7 @@ #: ../data/gui/contact_context_menu.ui.h:10 msgid "M_anage Contact" -msgstr "_ניהול איש־קשר" +msgstr "_ניהול איש קשר" #: ../data/gui/contact_context_menu.ui.h:11 msgid "_Rename..." @@ -1108,29 +1109,29 @@ #: ../data/gui/contact_context_menu.ui.h:16 msgid "_Subscription" -msgstr "_רישום" +msgstr "ה_רשמה" # Changed to: Allow this contact to view my status -# לאיש־קשר זה +# לאיש קשר זה #: ../data/gui/contact_context_menu.ui.h:17 msgid "_Allow him/her to see my status" -msgstr "_התר לאיש־קשר זה לראות את מצב־חיבורי" +msgstr "_התר לאיש קשר זה לראות את מצב־חיבורי"

1 0

gajim: Update russian translation
by Fomin Denis 15 Nov '12

15 Nov '12

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 <fominde(a)mail.ru>\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 "_Блокировать" @@ -1071,7 +1072,7 @@ #: ../data/gui/gc_control_popup_menu.ui.h:9 #: ../data/gui/gc_occupants_menu.ui.h:15 #: ../data/gui/roster_window.ui.h:19 -#: ../src/roster_window.py:6173 +#: ../src/roster_window.py:6197 msgid "_History" msgstr "_История" @@ -1164,7 +1165,7 @@ msgstr "Скрывает окно" #: ../data/gui/filetransfers.ui.h:16 -#: ../src/filetransfers_window.py:889 +#: ../src/filetransfers_window.py:905 msgid "_Continue" msgstr "_Продолжить" @@ -1492,7 +1493,7 @@ msgstr "" #: ../data/gui/join_groupchat_window.ui.h:1 -#: ../src/dialogs.py:2371 +#: ../src/dialogs.py:2372 msgid "Join Group Chat" msgstr "Войти в комнату" @@ -2262,7 +2263,7 @@ msgstr "Списки доступа:" #: ../data/gui/privacy_list_window.ui.h:1 -#: ../src/dialogs.py:4020 +#: ../src/dialogs.py:4023 msgid "Privacy List" msgstr "Список доступа" @@ -2514,9 +2515,9 @@ #. Remove group #. Remove #: ../data/gui/remove_account_window.ui.h:4 -#: ../src/roster_window.py:5857 -#: ../src/roster_window.py:5982 -#: ../src/roster_window.py:6112 +#: ../src/roster_window.py:5881 +#: ../src/roster_window.py:6006 +#: ../src/roster_window.py:6136 msgid "_Remove" msgstr "_Удалить" @@ -2581,7 +2582,7 @@ msgstr "Показать Т_ранспорты" #: ../data/gui/roster_window.ui.h:17 -#: ../src/statusicon.py:356 +#: ../src/statusicon.py:359 msgid "Show _Roster" msgstr "Показать _ростер" @@ -2631,7 +2632,7 @@ #. Information #: ../data/gui/search_window.ui.h:4 -#: ../src/roster_window.py:6124 +#: ../src/roster_window.py:6148 msgid "_Information" msgstr "_Информация о контакте" @@ -2869,10 +2870,6 @@ msgid "Personal" msgstr "Личная информация" -#: ../data/gajim.desktop.in.in.h:1 -msgid "Gajim Instant Messenger" -msgstr "Клиент для мгновенных сообщений Gajim" - #: ../data/gajim.desktop.in.in.h:2 msgid "Jabber IM Client" msgstr "Jabber клиент для мгновенных сообщений" @@ -3146,18 +3143,18 @@ #: ../src/common/contacts.py:273 #: ../src/common/helpers.py:67 #: ../src/common/helpers.py:261 -#: ../src/dialogs.py:1100 -#: ../src/dialogs.py:2265 -#: ../src/dialogs.py:2294 +#: ../src/dialogs.py:1101 +#: ../src/dialogs.py:2266 +#: ../src/dialogs.py:2295 #: ../src/gui_interface.py:484 #: ../src/gui_menu_builder.py:262 #: ../src/gui_menu_builder.py:416 #: ../src/roster_window.py:767 -#: ../src/roster_window.py:1715 -#: ../src/roster_window.py:1717 -#: ../src/roster_window.py:2065 -#: ../src/roster_window.py:3682 -#: ../src/roster_window.py:3709 +#: ../src/roster_window.py:1722 +#: ../src/roster_window.py:1724 +#: ../src/roster_window.py:2072 +#: ../src/roster_window.py:3689 +#: ../src/roster_window.py:3716 msgid "Not in Roster" msgstr "Не в ростере" @@ -3190,7 +3187,7 @@ #. No key assigned nor a key is used by remote contact #: ../src/chat_control.py:2170 -#: ../src/dialogs.py:5089 +#: ../src/dialogs.py:5092 msgid "No GPG key assigned" msgstr "Ключ GPG не присвоен" @@ -3303,8 +3300,8 @@ #: ../src/chat_control.py:2896 #: ../src/common/connection_handlers_events.py:911 -#: ../src/common/connection_handlers.py:952 -#: ../src/common/connection_handlers.py:1068 +#: ../src/common/connection_handlers.py:955 +#: ../src/common/connection_handlers.py:1077 #: ../src/common/connection.py:462 #: ../src/common/logger.py:1155 #: ../src/gajim.py:208 @@ -3318,7 +3315,7 @@ msgstr "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его или удалить (вся история будет утеряна)." #: ../src/chat_control.py:3134 -#: ../src/gui_interface.py:1149 +#: ../src/gui_interface.py:1151 #, python-format msgid "" "Unable to decrypt message from %s\n" @@ -3350,21 +3347,21 @@ msgstr "Передача завершена" #: ../src/chat_control.py:3288 -#: ../src/dialogs.py:2827 +#: ../src/dialogs.py:2828 #: ../src/gui_interface.py:645 #: ../src/notify.py:278 msgid "Groupchat Invitation" msgstr "Приглашение в комнату" #: ../src/chat_control.py:3310 -#: ../src/gui_interface.py:1007

1 0

gajim: Make Location information translatable
by Fomin Denis 15 Nov '12

15 Nov '12

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<b>%(tag)s</b>: %(text)s' % \ - {'tag': entry.capitalize(), 'text': text} + {'tag': tag.capitalize(), 'text': text} return location_string.strip()

1 0

gajim: typo
by Fomin Denis 15 Nov '12

15 Nov '12

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'),

1 0

gajim: coding style.
by Fomin Denis 15 Nov '12

15 Nov '12

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'), + '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')}, 'having_appointment': {'category': _('Having an Appointment')}, - 'inactive': {'category': _('Inactive'), - 'day_off': _('Day Off'), - 'hanging_out': _('Hanging out'), - 'hiding': _('Hiding'), - 'on_vacation': _('On Vacation'), - 'praying': _('Praying'), - 'scheduled_holiday': _('Scheduled Holiday'), - 'sleeping': _('Sleeping'), - 'thinking': _('Thinking')}, - 'relaxing': {'category': _('Relaxing'), - 'fishing': _('Fishing'), - 'gaming': _('Gaming'), - 'going_out': _('Going out'), - 'partying': _('Partying'), - 'reading': _('Reading'), - 'rehearsing': _('Rehearsing'), - 'shopping': _('Shopping'), - 'smoking': _('Smoking'), - 'socializing': _('Socializing'), - 'sunbathing': _('Sunbathing'), - 'watching_tv': _('Watching TV'), - 'watching_a_movie': _('Watching a Movie')}, - 'talking': {'category': _('Talking'), - 'in_real_life': _('In Real Life'), - 'on_the_phone': _('On the Phone'), - 'on_video_phone': _('On Video Phone')}, - 'traveling': {'category': _('Traveling'), - 'commuting': _('Commuting'), - 'cycling': _('Cycling'), - 'driving': _('Driving'), - 'in_a_car': _('In a Car'), - 'on_a_bus': _('On a Bus'), - 'on_a_plane': _('On a Plane'), - 'on_a_train': _('On a Train'), - 'on_a_trip': _('On a Trip'), - 'walking': _('Walking')}, - 'working': {'category': _('Working'), - 'coding': _('Coding'), - 'in_a_meeting': _('In a Meeting'), - 'studying': _('Studying'), - 'writing': _('Writing')}} + 'inactive': {'category': _('Inactive'), + 'day_off': _('Day Off'), + 'hanging_out': _('Hanging out'), + 'hiding': _('Hiding'), + 'on_vacation': _('On Vacation'), + 'praying': _('Praying'), + 'scheduled_holiday': _('Scheduled Holiday'), + 'sleeping': _('Sleeping'), + 'thinking': _('Thinking')}, + 'relaxing': {'category': _('Relaxing'), + 'fishing': _('Gaming'), + 'going_out': _('Going out'), + 'partying': _('Partying'), + 'reading': _('Reading'), + 'rehearsing': _('Rehearsing'), + 'shopping': _('Shopping'), + 'smoking': _('Smoking'), + 'socializing': _('Socializing'), + 'sunbathing': _('Sunbathing'), + 'watching_tv': _('Watching TV'), + 'watching_a_movie': _('Watching a Movie')}, + 'talking': {'category': _('Talking'), + 'in_real_life': _('In Real Life'), + 'on_the_phone': _('On the Phone'), + 'on_video_phone': _('On Video Phone')}, + 'traveling': {'category': _('Traveling'), + 'commuting': _('Commuting'), + 'cycling': _('Cycling'), + 'driving': _('Driving'), + 'in_a_car': _('In a Car'), + 'on_a_bus': _('On a Bus'), + 'on_a_plane': _('On a Plane'), + 'on_a_train': _('On a Train'), + 'on_a_trip': _('On a Trip'), + 'walking': _('Walking')}, + 'working': {'category': _('Working'), + 'coding': _('Coding'), + 'in_a_meeting': _('In a Meeting'), + 'studying': _('Studying'), + 'writing': _('Writing')}} 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'] + 'locality', 'lon', 'postalcode', 'region', 'room', 'speed', + 'street', 'text', 'timestamp', 'uri'] import gobject import gtk @@ -324,7 +323,7 @@ tune_dict[name] = data retracted = items.getTag('retract') or not ('artist' in tune_dict or - 'title' in tune_dict) + 'title' in tune_dict) return (tune_dict, retracted) def asPixbufIcon(self):

1 0

gajim: [chrysn] pluralize some strings
by Yann Leboulanger 14 Nov '12

14 Nov '12

changeset 0794de05520f in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0794de05520f description: [chrysn] pluralize some strings diffstat: po/de.po | 18 ++++++++++++++---- src/dialogs.py | 7 +++++-- 2 files changed, 19 insertions(+), 6 deletions(-) diffs (62 lines): diff -r 6993af372e75 -r 0794de05520f po/de.po --- a/po/de.po Mon Nov 12 17:21:26 2012 +0400 +++ b/po/de.po Wed Nov 14 17:13:06 2012 +0100 @@ -7544,13 +7544,23 @@ #: ../src/dialogs.py:3477 #, python-format -msgid "Added %s contacts" -msgstr "%s Kontakte hinzugefügt" +msgid "Added %d contacts" +msgstr "%d Kontakte hinzugefügt" + +#: ../src/dialogs.py:3477 +#, python-format +msgid "Added %d contact" +msgstr "%d Kontakt hinzugefügt" #: ../src/dialogs.py:3514 #, python-format -msgid "Removed %s contacts" -msgstr "%s Kontakte entfernt" +msgid "Removed %d contacts" +msgstr "%d Kontakte entfernt" + +#: ../src/dialogs.py:3514 +#, python-format +msgid "Removed %d contact" +msgstr "%d Kontakt entfernt" #: ../src/dialogs.py:3554 ../src/dialogs.py:3731 #, python-format diff -r 6993af372e75 -r 0794de05520f src/dialogs.py --- a/src/dialogs.py Mon Nov 12 17:21:26 2012 +0400 +++ b/src/dialogs.py Wed Nov 14 17:13:06 2012 +0100 @@ -57,6 +57,7 @@ from common import gajim from common import helpers +from common import i18n from common import dataforms from common.exceptions import GajimGeneralException @@ -3558,7 +3559,8 @@ self.account, groups=groups, nickname=model[iter_][2], auto_auth=True) iter_ = model.iter_next(iter_) - InformationDialog(_('Added %s contacts') % str(a)) + InformationDialog(i18n.ngettext('Added %d contact', + 'Added %d contacts', a, a, a)) elif self.action == 'modify': a = 0 while iter_: @@ -3595,7 +3597,8 @@ gajim.interface.roster.remove_contact(jid, self.account) gajim.contacts.remove_jid(self.account, jid) iter_ = model.iter_next(iter_) - InformationDialog(_('Removed %s contacts') % str(a)) + InformationDialog(i18n.ngettext('Removed %d contact', + 'Removed %d contacts', a, a, a)) self.window.destroy() def on_cancel_button_clicked(self, widget):

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits