Commits July 2007

commits@gajim.org

8 participants
98 discussions

[commit-gajim] r8426 - trunk/src
by steve-e＠gajim.org 23 Jul '07

23 Jul '07

Author: steve-e Date: 2007-07-23 15:07:04 +0200 (Mon, 23 Jul 2007) New Revision: 8426 Modified: trunk/src/chat_control.py trunk/src/groupchat_control.py Log: Gerneralize DND on chat windows and enable it for msg_textview. ToDo: Invite to groupchat via DND Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-07-22 23:12:16 UTC (rev 8425) +++ trunk/src/chat_control.py 2007-07-23 13:07:04 UTC (rev 8426) @@ -131,13 +131,37 @@ id = self.widget.connect('key_press_event', self._on_keypress_event) self.handlers[id] = self.widget + # Create banner and connect signals widget = self.xml.get_widget('banner_eventbox') id = widget.connect('button-press-event', self._on_banner_eventbox_button_press_event) self.handlers[id] = widget + # Init DND + self.TARGET_TYPE_URI_LIST = 80 + self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ) ] + id = self.widget.connect('drag_data_received', + self._on_drag_data_received) + self.handlers[id] = self.widget + self.widget.drag_dest_set(gtk.DEST_DEFAULT_MOTION | + gtk.DEST_DEFAULT_HIGHLIGHT | + gtk.DEST_DEFAULT_DROP, + self.dnd_list, gtk.gdk.ACTION_COPY) # Create textviews and connect signals self.conv_textview = ConversationTextview(self.account) + # FIXME: DND on non editable TextView, find a better way + self.drag_entered = False + id = self.conv_textview.tv.connect('drag_data_received', + self._on_drag_data_received) + self.handlers[id] = self.conv_textview.tv + id = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion) + self.handlers[id] = self.conv_textview.tv + id = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave) + self.handlers[id] = self.conv_textview.tv + self.conv_textview.tv.drag_dest_set(gtk.DEST_DEFAULT_MOTION | + gtk.DEST_DEFAULT_HIGHLIGHT | + gtk.DEST_DEFAULT_DROP, + self.dnd_list, gtk.gdk.ACTION_COPY) self.conv_scrolledwindow = self.xml.get_widget( 'conversation_scrolledwindow') @@ -151,6 +175,7 @@ self.handlers[id] = widget self.scroll_to_end_id = None self.was_at_the_end = True + # add MessageTextView to UI and connect signals self.msg_scrolledwindow = self.xml.get_widget('message_scrolledwindow') self.msg_textview = MessageTextView() @@ -166,6 +191,14 @@ id = self.msg_textview.connect('populate_popup', self.on_msg_textview_populate_popup) self.handlers[id] = self.msg_textview + # Setup DND + id = self.msg_textview.connect('drag_data_received', + self._on_drag_data_received) + self.handlers[id] = self.msg_textview + self.msg_textview.drag_dest_set(gtk.DEST_DEFAULT_MOTION | + gtk.DEST_DEFAULT_HIGHLIGHT | + gtk.DEST_DEFAULT_DROP, + self.dnd_list, gtk.gdk.ACTION_COPY) self.update_font() @@ -483,6 +516,22 @@ self.handle_message_textview_mykey_press(widget, event_keyval, event_keymod) + def _on_drag_data_received(self, widget, context, x, y, selection, + target_type, timestamp): + pass # Derived classes SHOULD implement this method + + def _on_drag_leave(self, widget, context, time): + # FIXME: DND on non editable TextView, find a better way + self.drag_entered = False + self.conv_textview.tv.set_editable(False) + + def _on_drag_motion(self, widget, context, x, y, time): + # FIXME: DND on non editable TextView, find a better way + if not self.drag_entered: + # We drag new data over the TextView, make it editable to catch dnd + self.drag_entered_conv = True + self.conv_textview.tv.set_editable(True) + def _process_command(self, message): if not message or message[0] != '/': return False @@ -913,29 +962,6 @@ self.chat_buttons_set_visible(compact_view) self.widget_set_visible(self.xml.get_widget('banner_eventbox'), gajim.config.get('hide_chat_banner')) - # Initialize drag-n-drop - self.TARGET_TYPE_URI_LIST = 80 - self.dnd_list = [ ( 'text/uri-list', 0, self.TARGET_TYPE_URI_LIST ) ] - id = self.widget.connect('drag_data_received', - self._on_drag_data_received) - self.handlers[id] = self.widget - self.widget.drag_dest_set(gtk.DEST_DEFAULT_MOTION | - gtk.DEST_DEFAULT_HIGHLIGHT | - gtk.DEST_DEFAULT_DROP, - self.dnd_list, gtk.gdk.ACTION_COPY) - # FIXME: DND on non editable TextView, find a better way - self.drag_entered = False - id = self.conv_textview.tv.connect('drag_data_received', - self._on_drag_data_received) - self.handlers[id] = self.conv_textview.tv - id = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion) - self.handlers[id] = self.conv_textview.tv - id = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave) - self.handlers[id] = self.conv_textview.tv - self.conv_textview.tv.drag_dest_set(gtk.DEST_DEFAULT_MOTION | - gtk.DEST_DEFAULT_HIGHLIGHT | - gtk.DEST_DEFAULT_DROP, - self.dnd_list, gtk.gdk.ACTION_COPY) # keep timeout id and window obj for possible big avatar # it is on enter-notify and leave-notify so no need to be per jid @@ -1749,21 +1775,7 @@ if os.path.isfile(path): # is it file? ft = gajim.interface.instances['file_transfers'] ft.send_file(self.account, c, path) - # FIXME: DND on non editable TextView, find a better way - self.conv_textview.tv.set_editable(False) - def _on_drag_leave(self, widget, context, time): - # FIXME: DND on non editable TextView, find a better way - self.drag_entered = False - self.conv_textview.tv.set_editable(False) - - def _on_drag_motion(self, widget, context, x, y, time): - # FIXME: DND on non editable TextView, find a better way - if not self.drag_entered: - # We drag new data over the TextView, make it editable to catch dnd - self.drag_entered = True - self.conv_textview.tv.set_editable(True) - def _on_message_tv_buffer_changed(self, textbuffer): self.kbd_activity_in_last_5_secs = True self.kbd_activity_in_last_30_secs = True Modified: trunk/src/groupchat_control.py =================================================================== --- trunk/src/groupchat_control.py 2007-07-22 23:12:16 UTC (rev 8425) +++ trunk/src/groupchat_control.py 2007-07-23 13:07:04 UTC (rev 8426) @@ -1653,8 +1653,13 @@ _('Bookmark has been added successfully'), _('You can manage your bookmarks via Actions menu in your roster.')) + def _on_drag_data_received(self, widget, context, x, y, selection, + target_type, timestamp): + # TODO: Invite to groupchat on dnd of a contact + pass + def handle_message_textview_mykey_press(self, widget, event_keyval, - event_keymod): + event_keymod): # NOTE: handles mykeypress which is custom signal connected to this # CB in new_room(). for this singal see message_textview.py

1 0

[commit-gajim] r8425 - trunk/src
by steve-e＠gajim.org 22 Jul '07

22 Jul '07

Author: steve-e Date: 2007-07-23 01:12:16 +0200 (Mon, 23 Jul 2007) New Revision: 8425 Modified: trunk/src/chat_control.py Log: DnD filetransfer on whole message window. Fixes #2562. See http://bugzilla.gnome.org/show_bug.cgi?id=459022 Modified: trunk/src/chat_control.py =================================================================== --- trunk/src/chat_control.py 2007-07-22 18:25:43 UTC (rev 8424) +++ trunk/src/chat_control.py 2007-07-22 23:12:16 UTC (rev 8425) @@ -923,6 +923,19 @@ gtk.DEST_DEFAULT_HIGHLIGHT | gtk.DEST_DEFAULT_DROP, self.dnd_list, gtk.gdk.ACTION_COPY) + # FIXME: DND on non editable TextView, find a better way + self.drag_entered = False + id = self.conv_textview.tv.connect('drag_data_received', + self._on_drag_data_received) + self.handlers[id] = self.conv_textview.tv + id = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion) + self.handlers[id] = self.conv_textview.tv + id = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave) + self.handlers[id] = self.conv_textview.tv + self.conv_textview.tv.drag_dest_set(gtk.DEST_DEFAULT_MOTION | + gtk.DEST_DEFAULT_HIGHLIGHT | + gtk.DEST_DEFAULT_DROP, + self.dnd_list, gtk.gdk.ACTION_COPY) # keep timeout id and window obj for possible big avatar # it is on enter-notify and leave-notify so no need to be per jid @@ -1721,7 +1734,7 @@ def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): - # If not resource, we can't send file + # If no resource is known, we can't send a file if self.TYPE_ID == message_control.TYPE_PM: c = self.gc_contact else: @@ -1736,7 +1749,21 @@ if os.path.isfile(path): # is it file? ft = gajim.interface.instances['file_transfers'] ft.send_file(self.account, c, path) + # FIXME: DND on non editable TextView, find a better way + self.conv_textview.tv.set_editable(False) + + def _on_drag_leave(self, widget, context, time): + # FIXME: DND on non editable TextView, find a better way + self.drag_entered = False + self.conv_textview.tv.set_editable(False) + def _on_drag_motion(self, widget, context, x, y, time): + # FIXME: DND on non editable TextView, find a better way + if not self.drag_entered: + # We drag new data over the TextView, make it editable to catch dnd + self.drag_entered = True + self.conv_textview.tv.set_editable(True) + def _on_message_tv_buffer_changed(self, textbuffer): self.kbd_activity_in_last_5_secs = True self.kbd_activity_in_last_30_secs = True

1 0

[commit-gajim] r8424 - in trunk/src: . common
by asterix＠gajim.org 22 Jul '07

22 Jul '07

Author: asterix Date: 2007-07-22 20:25:43 +0200 (Sun, 22 Jul 2007) New Revision: 8424 Modified: trunk/src/common/connection.py trunk/src/common/connection_handlers.py trunk/src/vcard.py Log: request last_status_time and os_info to real jid if we know it. fixes #3304 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-07-22 13:39:18 UTC (rev 8423) +++ trunk/src/common/connection.py 2007-07-22 18:25:43 UTC (rev 8424) @@ -133,6 +133,10 @@ self.pep_supported = False # Do we continue connection when we get roster (send presence,get vcard...) self.continue_connect_info = None + # To know the groupchat jid associated with a sranza ID. Useful to + # request vcard or os info... to a real JID but act as if it comes from + # the fake jid + self.groupchat_jids = {} # {ID : groupchat_jid} if USE_GPG: self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) gajim.config.set('usegpg', True) @@ -1058,7 +1062,9 @@ def account_changed(self, new_name): self.name = new_name - def request_last_status_time(self, jid, resource): + def request_last_status_time(self, jid, resource, groupchat_jid=None): + '''groupchat_jid is used when we want to send a request to a real jid + and act as if the answer comes from the groupchat_jid''' if not self.connection: return to_whom_jid = jid @@ -1066,9 +1072,15 @@ to_whom_jid += '/' + resource iq = common.xmpp.Iq(to = to_whom_jid, typ = 'get', queryNS =\ common.xmpp.NS_LAST) + id = self.connection.getAnID() + iq.setID(id) + if groupchat_jid: + self.groupchat_jids[id] = groupchat_jid self.connection.send(iq) - def request_os_info(self, jid, resource): + def request_os_info(self, jid, resource, groupchat_jid=None): + '''groupchat_jid is used when we want to send a request to a real jid + and act as if the answer comes from the groupchat_jid''' if not self.connection: return # If we are invisible, do not request @@ -1080,6 +1092,10 @@ to_whom_jid += '/' + resource iq = common.xmpp.Iq(to = to_whom_jid, typ = 'get', queryNS =\ common.xmpp.NS_VERSION) + id = self.connection.getAnID() + iq.setID(id) + if groupchat_jid: + self.groupchat_jids[id] = groupchat_jid self.connection.send(iq) def get_settings(self): Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-07-22 13:39:18 UTC (rev 8423) +++ trunk/src/common/connection_handlers.py 2007-07-22 18:25:43 UTC (rev 8424) @@ -828,8 +828,7 @@ self.vcard_sha = None self.vcard_shas = {} # sha of contacts self.room_jids = [] # list of gc jids so that vcard are saved in a folder - self.groupchat_jids = {} # {ID : groupchat_jid} - + def add_sha(self, p, send_caps = True): c = p.setTag('x', namespace = common.xmpp.NS_VCARD_UPDATE) if self.vcard_sha is not None: @@ -1337,7 +1336,12 @@ seconds = int(seconds) except: return - who = helpers.get_full_jid_from_iq(iq_obj) + id = iq_obj.getID() + if id in self.groupchat_jids: + who = self.groupchat_jids[id] + del self.groupchat_jids[id] + else: + who = helpers.get_full_jid_from_iq(iq_obj) jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) self.dispatch('LAST_STATUS_TIME', (jid_stripped, resource, seconds, status)) @@ -1352,7 +1356,12 @@ client_info += ' ' + qp.getTag('version').getData() if qp.getTag('os'): os_info += qp.getTag('os').getData() - who = helpers.get_full_jid_from_iq(iq_obj) + id = iq_obj.getID() + if id in self.groupchat_jids: + who = self.groupchat_jids[id] + del self.groupchat_jids[id] + else: + who = helpers.get_full_jid_from_iq(iq_obj) jid_stripped, resource = gajim.get_room_and_nick_from_fjid(who) self.dispatch('OS_INFO', (jid_stripped, resource, client_info, os_info)) Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2007-07-22 13:39:18 UTC (rev 8423) +++ trunk/src/vcard.py 2007-07-22 18:25:43 UTC (rev 8424) @@ -329,8 +329,13 @@ self.contact.status = '' # Request list time status - gajim.connections[self.account].request_last_status_time(self.contact.jid, - self.contact.resource) + if self.gc_contact: + j, r = gajim.get_room_and_nick_from_fjid(self.real_jid) + gajim.connections[self.account].request_last_status_time(j, r, + self.contact.jid) + else: + gajim.connections[self.account].request_last_status_time( + self.contact.jid, self.contact.resource) # do not wait for os_info if contact is not connected or has error # additional check for observer is needed, as show is offline for him @@ -338,8 +343,13 @@ and not self.contact.is_observer(): self.os_info_arrived = True else: # Request os info if contact is connected - gobject.idle_add(gajim.connections[self.account].request_os_info, - self.contact.jid, self.contact.resource) + if self.gc_contact: + j, r = gajim.get_room_and_nick_from_fjid(self.real_jid) + gobject.idle_add(gajim.connections[self.account].request_os_info, + j, r, self.contact.jid) + else: + gobject.idle_add(gajim.connections[self.account].request_os_info, + self.contact.jid, self.contact.resource) self.os_info = {0: {'resource': self.contact.resource, 'client': '', 'os': ''}} i = 1

1 0

[commit-gajim] r8423 - trunk/src
by asterix＠gajim.org 22 Jul '07

22 Jul '07

Author: asterix Date: 2007-07-22 15:39:18 +0200 (Sun, 22 Jul 2007) New Revision: 8423 Modified: trunk/src/vcard.py Log: request vcard to real jid if we know it. see #3054. TODO: request last time and os information to real jid too Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2007-07-22 09:04:33 UTC (rev 8422) +++ trunk/src/vcard.py 2007-07-22 13:39:18 UTC (rev 8423) @@ -71,6 +71,17 @@ self.account = account self.gc_contact = gc_contact + # Get real jid + if gc_contact: + if gc_contact.jid: + self.real_jid = gc_contact.jid + if gc_contact.resource: + self.real_jid += '/' + gc_contact.resource + else: + self.real_jid = gc_contact.get_full_jid() + else: + self.real_jid = contact.get_full_jid() + puny_jid = helpers.sanitize_filename(contact.jid) local_avatar_basepath = os.path.join(gajim.AVATAR_PATH, puny_jid) + \ '_local' @@ -357,7 +368,7 @@ self.fill_status_label() if self.gc_contact: - gajim.connections[self.account].request_vcard(self.contact.jid, + gajim.connections[self.account].request_vcard(self.real_jid, self.gc_contact.get_full_jid()) else: gajim.connections[self.account].request_vcard(self.contact.jid)

1 0

[commit-gajim] r8422 - in trunk: data/glade src
by asterix＠gajim.org 22 Jul '07

22 Jul '07

Author: asterix Date: 2007-07-22 11:04:33 +0200 (Sun, 22 Jul 2007) New Revision: 8422 Modified: trunk/data/glade/search_window.glade trunk/src/search_window.py Log: add 2 buttons to search window: add contact to roster and information. fixes #3304 Modified: trunk/data/glade/search_window.glade =================================================================== --- trunk/data/glade/search_window.glade 2007-07-21 19:39:45 UTC (rev 8421) +++ trunk/data/glade/search_window.glade 2007-07-22 09:04:33 UTC (rev 8422) @@ -1,191 +1,215 @@ -<?xml version="1.0" standalone="no"?>  -<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"> - +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd"> + <glade-interface> - -<widget class="GtkWindow" id="search_window"> - <property name="border_width">12</property> - <property name="title" translatable="yes">Search</property> - <property name="type">GTK_WINDOW_TOPLEVEL</property> - <property name="window_position">GTK_WIN_POS_NONE</property> - <property name="modal">False</property> - <property name="resizable">True</property> - <property name="destroy_with_parent">False</property> - <property name="decorated">True</property> - <property name="skip_taskbar_hint">False</property> - <property name="skip_pager_hint">False</property> - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <property name="focus_on_map">True</property> - <property name="urgency_hint">False</property> - <signal name="key_press_event" handler="on_search_window_key_press_event" last_modification_time="Wed, 04 Apr 2007 18:39:27 GMT"/> - <signal name="destroy" handler="on_search_window_destroy" last_modification_time="Wed, 04 Apr 2007 18:39:35 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkVBox" id="search_vbox"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="label"> - <property name="visible">True</property> - <property name="label" translatable="yes">Please wait while retrieving search form...</property> - <property name="use_underline">False</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkProgressBar" id="progressbar"> - <property name="visible">True</property> - <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property> - <property name="fraction">0</property> - <property name="pulse_step">0.10000000149</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <placeholder/> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkHButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkButton" id="search_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_search_button_clicked" last_modification_time="Thu, 19 Apr 2007 09:43:28 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <property name="top_padding">0</property> - <property name="bottom_padding">0</property> - <property name="left_padding">0</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkHBox" id="hbox5"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-find</property> - <property name="icon_size">4</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label58"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Search</property> - <property name="use_underline">True</property> - <property name="use_markup">False</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> - <property name="width_chars">-1</property> - <property name="single_line_mode">False</property> - <property name="angle">0</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkButton" id="close_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-close</property> - <property name="use_stock">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Mon, 25 Sep 2006 05:08:55 GMT"/> - </widget> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - + <widget class="GtkWindow" id="search_window"> + <property name="border_width">12</property> + <property name="title" translatable="yes">Search</property> + <signal name="key_press_event" handler="on_search_window_key_press_event"/> + <signal name="destroy" handler="on_search_window_destroy"/> + <child> + <widget class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkVBox" id="search_vbox"> + <property name="visible">True</property> + <child> + <widget class="GtkLabel" id="label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Please wait while retrieving search form...</property> + </widget> + <packing> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkProgressBar" id="progressbar"> + <property name="visible">True</property> + <property name="pulse_step">0.10000000149</property> + </widget> + <packing> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </widget> + </child> + <child> + <widget class="GtkHButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="spacing">6</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <child> + <widget class="GtkButton" id="add_contact_button"> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_add_contact_button_clicked"/> + <child> + <widget class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkHBox" id="hbox1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-add</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">_Add contact</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkButton" id="information_button"> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_information_button_clicked"/> + <child> + <widget class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="stock">gtk-info</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">_Information</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="search_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_search_button_clicked"/> + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkHBox" id="hbox5"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-find</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label58"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Search</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="close_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-close</property> + <property name="use_stock">True</property> + <property name="response_id">0</property> + <signal name="clicked" handler="on_close_button_clicked"/> + </widget> + <packing> + <property name="position">3</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> </glade-interface> Modified: trunk/src/search_window.py =================================================================== --- trunk/src/search_window.py 2007-07-21 19:39:45 UTC (rev 8421) +++ trunk/src/search_window.py 2007-07-22 09:04:33 UTC (rev 8422) @@ -19,6 +19,7 @@ import gtkgui_helpers import dialogs +import vcard import config import dataforms_widget @@ -33,7 +34,8 @@ # retrieving widgets from xml self.xml = gtkgui_helpers.get_glade('search_window.glade') self.window = self.xml.get_widget('search_window') - for name in ('label', 'progressbar', 'search_vbox', 'search_button'): + for name in ('label', 'progressbar', 'search_vbox', 'search_button', + 'add_contact_button', 'information_button'): self.__dict__[name] = self.xml.get_widget(name) # displaying the window @@ -44,6 +46,9 @@ self.is_form = None + # Is there a jid column in results ? if -1: no, else column number + self.jid_column = -1 + def request_form(self): gajim.connections[self.account].request_search_fields(self.jid) @@ -83,6 +88,27 @@ self.pulse_id = gobject.timeout_add(80, self.pulse_callback) self.search_button.hide() + def on_add_contact_button_clicked(self, widget): + (model, iter) = self.result_treeview.get_selection().get_selected() + if not iter: + return + jid = model[iter][self.jid_column] + dialogs.AddNewContactWindow(self.account, jid) + + def on_information_button_clicked(self, widget): + (model, iter) = self.result_treeview.get_selection().get_selected() + if not iter: + return + jid = model[iter][self.jid_column] + if gajim.interface.instances[self.account]['infos'].has_key(jid): + gajim.interface.instances[self.account]['infos'][jid].window.present() + else: + contact = gajim.contacts.create_contact(jid = jid, name='', groups=[], + show='', status='', sub='', ask='', resource='', priority=0, + keyID='', our_chatstate=None, chatstate=None) + gajim.interface.instances[self.account]['infos'][jid] = \ + vcard.VcardWindow(contact, self.account) + def on_form_arrived(self, form, is_form): if self.pulse_id: gobject.source_remove(self.pulse_id) @@ -110,6 +136,19 @@ self.data_form_widget.show_all() self.search_vbox.pack_start(self.data_form_widget) + def on_result_treeview_cursor_changed(self, treeview): + if self.jid_column == -1: + return + (model, iter) = treeview.get_selection().get_selected() + if not iter: + return + if model[iter][self.jid_column]: + self.add_contact_button.set_sensitive(True) + self.information_button.set_sensitive(True) + else: + self.add_contact_button.set_sensitive(False) + self.information_button.set_sensitive(False) + def on_result_arrived(self, form, is_form): if self.pulse_id: gobject.source_remove(self.pulse_id) @@ -124,8 +163,10 @@ # We suppose all items have the same fields sw = gtk.ScrolledWindow() sw.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC) - treeview = gtk.TreeView() - sw.add(treeview) + self.result_treeview = gtk.TreeView() + self.result_treeview.connect('cursor-changed', + self.on_result_treeview_cursor_changed) + sw.add(self.result_treeview) # Create model fieldtypes = [str]*len(form[0]) model = gtk.ListStore(*fieldtypes) @@ -135,13 +176,18 @@ # Create columns counter = 0 for field in form[0].keys(): - treeview.append_column( + self.result_treeview.append_column( gtk.TreeViewColumn(field, gtk.CellRendererText(), text = counter)) + if field == 'jid': + self.jid_column = counter counter += 1 - treeview.set_model(model) + self.result_treeview.set_model(model) sw.show_all() self.search_vbox.pack_start(sw) + if self.jid_column > -1: + self.add_contact_button.show() + self.information_button.show() return self.dataform = dataforms.ExtendForm(node = form) @@ -154,8 +200,23 @@ self.label.show() return + self.result_treeview = self.data_form_widget.records_treeview + selection = self.result_treeview.get_selection() + selection.set_mode(gtk.SELECTION_SINGLE) + self.result_treeview.connect('cursor-changed', + self.on_result_treeview_cursor_changed) + + counter = 0 + for field in self.dataform.items[0].fields: + if field.var == 'jid': + self.jid_column = counter + break + counter += 1 self.search_vbox.pack_start(self.data_form_widget) self.data_form_widget.show() + if self.jid_column > -1: + self.add_contact_button.show() + self.information_button.show() if self.data_form_widget.title: self.window.set_title('%s - Search - Gajim' % \ self.data_form_widget.title)

1 0

[commit-gajim] r8421 - trunk/src/common
by asterix＠gajim.org 21 Jul '07

21 Jul '07

Author: asterix Date: 2007-07-21 21:39:45 +0200 (Sat, 21 Jul 2007) New Revision: 8421 Modified: trunk/src/common/connection.py Log: show jid in search result with non data forms result. see #3304 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-07-21 19:09:47 UTC (rev 8420) +++ trunk/src/common/connection.py 2007-07-21 19:39:45 UTC (rev 8421) @@ -1419,7 +1419,8 @@ return df = [] for item in tag.getTags('item'): - f = {} + # We also show attributes. jid is there + f = item.attrs for i in item.getPayload(): f[i.getName()] = i.getData() df.append(f)

1 0

[commit-gajim] r8420 - trunk/src
by asterix＠gajim.org 21 Jul '07

21 Jul '07

Author: asterix Date: 2007-07-21 21:09:47 +0200 (Sat, 21 Jul 2007) New Revision: 8420 Modified: trunk/src/config.py Log: [fowles] fix a bug in bookmarks window. fixes #3311 Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-07-21 15:46:00 UTC (rev 8419) +++ trunk/src/config.py 2007-07-21 19:09:47 UTC (rev 8420) @@ -2883,7 +2883,7 @@ self.pass_entry.set_text(password) else: self.pass_entry.set_text('') - nick = model[iter][5] + nick = model[iter][6] if nick: nick = nick.decode('utf-8') self.nick_entry.set_text(nick)

1 0

[commit-gajim] r8419 - www-website
by asterix＠gajim.org 21 Jul '07

21 Jul '07

Author: asterix Date: 2007-07-21 17:46:00 +0200 (Sat, 21 Jul 2007) New Revision: 8419 Modified: www-website/downloads.php Log: missing ; in downloads.php Modified: www-website/downloads.php =================================================================== --- www-website/downloads.php 2007-07-21 15:43:46 UTC (rev 8418) +++ www-website/downloads.php 2007-07-21 15:46:00 UTC (rev 8419) @@ -21,7 +21,7 @@ print (" deb ftp://ftp.gajim.org/debian unstable main\n"); print (" \n"); print _("and install it by doing")." apt-get install gajim-svn.\n"; -print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do")." apt-get install gajim-dev-keyring.\n" +print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do")." apt-get install gajim-dev-keyring.\n"; print (" \n"); print ("<a name=\"slackware\">\n");

1 0

[commit-gajim] r8418 - in www-website: . locale/bg_BG/LC_MESSAGES locale/de_DE/LC_MESSAGES locale/eo/LC_MESSAGES locale/es_ES/LC_MESSAGES locale/fr_FR/LC_MESSAGES locale/pt_BR/LC_MESSAGES locale/ru_RU/LC_MESSAGES
by asterix＠gajim.org 21 Jul '07

21 Jul '07

Author: asterix Date: 2007-07-21 17:43:46 +0200 (Sat, 21 Jul 2007) New Revision: 8418 Modified: www-website/downloads.php www-website/locale/bg_BG/LC_MESSAGES/msg.po www-website/locale/de_DE/LC_MESSAGES/msg.po www-website/locale/eo/LC_MESSAGES/msg.po www-website/locale/es_ES/LC_MESSAGES/msg.po www-website/locale/fr_FR/LC_MESSAGES/msg.po www-website/locale/pt_BR/LC_MESSAGES/msg.po www-website/locale/ru_RU/LC_MESSAGES/msg.po www-website/msg.pot Log: add a note on how to get the GPG key of the nightly built debian package. fixes #3309 Modified: www-website/downloads.php =================================================================== --- www-website/downloads.php 2007-07-21 14:58:56 UTC (rev 8417) +++ www-website/downloads.php 2007-07-21 15:43:46 UTC (rev 8418) @@ -21,6 +21,7 @@ print (" deb ftp://ftp.gajim.org/debian unstable main\n"); print (" \n"); print _("and install it by doing")." apt-get install gajim-svn.\n"; +print _("You can get the GPG key of this package by installing gajim-dev-keyring package from the same repository. Just do")." apt-get install gajim-dev-keyring.\n" print (" \n"); print ("<a name=\"slackware\">\n"); Modified: www-website/locale/bg_BG/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/bg_BG/LC_MESSAGES/msg.po 2007-07-21 14:58:56 UTC (rev 8417) +++ www-website/locale/bg_BG/LC_MESSAGES/msg.po 2007-07-21 15:43:46 UTC (rev 8418) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-31 17:29+0200\n" +"POT-Creation-Date: 2007-07-21 17:42+0200\n" "PO-Revision-Date: 2007-03-14 17:52+0200\n" "Last-Translator: Yavor Doganov <yavor(a)gnu.org>\n" "Language-Team: Bulgarian <dict(a)fsa-bg.org>\n" @@ -166,9 +166,9 @@ msgstr " Архивите на списъка са достъпни " #: dev.php:20 docs.php:46 docs.php:49 docs.php:52 docs.php:55 docs.php:66 -#: docs.php:72 docs.php:74 downloads.php:84 downloads.php:109 -#: downloads.php:125 downloads.php:133 downloads.php:144 downloads.php:182 -#: downloads.php:188 downloads.php:204 index.php:14 +#: docs.php:72 docs.php:74 downloads.php:85 downloads.php:110 +#: downloads.php:126 downloads.php:134 downloads.php:145 downloads.php:183 +#: downloads.php:189 downloads.php:205 index.php:14 msgid "here" msgstr "тук" @@ -272,7 +272,7 @@ msgid "page.\n" msgstr ".\n" -#: docs.php:21 downloads.php:147 +#: docs.php:21 downloads.php:148 msgid " Under GNU/Linux\n" msgstr " Под GNU/Линукс\n" @@ -350,7 +350,7 @@ msgid " In a first time, you have to install" msgstr " Като начало, трябва да инсталирате" -#: docs.php:42 downloads.php:70 downloads.php:121 +#: docs.php:42 downloads.php:71 downloads.php:122 msgid "and" msgstr "и" @@ -458,56 +458,62 @@ msgid "and install it by doing" msgstr "Инсталирайте го чрез" -#: downloads.php:31 +#: downloads.php:24 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + +#: downloads.php:32 msgid "Soon available here." msgstr "Скоро достъпен тук." -#: downloads.php:40 +#: downloads.php:41 msgid " If you use Ubuntu universe repository do" msgstr " Ако използвате хранилището „universe“ на Убунту, изпълнете" -#: downloads.php:48 +#: downloads.php:49 msgid " You can install Gajim provided you have Fedora Extras repository by" msgstr "" " Може да инсталирате Gajim, ако имате хранилището „Fedora Extras“, с" -#: downloads.php:53 +#: downloads.php:54 msgid " Gentoo\n" msgstr " Дженту\n" -#: downloads.php:56 downloads.php:63 downloads.php:91 +#: downloads.php:57 downloads.php:64 downloads.php:92 msgid " Just" msgstr " Само" -#: downloads.php:60 +#: downloads.php:61 msgid " Archlinux\n" msgstr " Archlinux\n" -#: downloads.php:67 +#: downloads.php:68 msgid " SUSE\n" msgstr " SuSE\n" -#: downloads.php:70 +#: downloads.php:71 msgid " You need: " msgstr " Нужни са: " -#: downloads.php:70 +#: downloads.php:71 msgid "gajim rpm" msgstr "rpm пакет на gajim" -#: downloads.php:70 +#: downloads.php:71 msgid "pydns rpm" msgstr "rpm пакет на pydns" -#: downloads.php:70 +#: downloads.php:71 msgid "python-sqlite2 rpm" msgstr "rpm пакет на python-sqlite2" -#: downloads.php:74 +#: downloads.php:75 msgid " PLD\n" msgstr " PLD\n" -#: downloads.php:77 +#: downloads.php:78 msgid "" " Gajim is at the moment in the ac-ready tree (it is turned off by " "default, so you may need to check your poldek configuration) and can be " @@ -516,56 +522,56 @@ " В момента Gajim е в дървото ac-ready (по подразбиране е изключено, така " "че може да проверите конфигурацията на poldek) и може да се инсталира с " -#: downloads.php:81 +#: downloads.php:82 msgid " SourceMage\n" msgstr " SourceMage\n" -#: downloads.php:84 +#: downloads.php:85 msgid " Use files available " msgstr " Използвайте файловете, достъпни " -#: downloads.php:96 +#: downloads.php:97 msgid " FreeBSD\n" msgstr " FreeBSD\n" -#: downloads.php:99 +#: downloads.php:100 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr "" " Може да използвате Gajim под FreeBSD чрез портовете. Просто изпълнете " -#: downloads.php:101 downloads.php:112 +#: downloads.php:102 downloads.php:113 msgid "Find out more" msgstr "Научете повече" -#: downloads.php:105 +#: downloads.php:106 msgid " Autopackage\n" msgstr " Autopackage\n" -#: downloads.php:109 +#: downloads.php:110 msgid " You can download the autopackage " msgstr "" -#: downloads.php:110 +#: downloads.php:111 msgid "To use it: make it executable, run it and follow the instructions.\n" msgstr "" -#: downloads.php:118 +#: downloads.php:119 msgid " Windows installer\n" msgstr " Инсталатор за „Уиндоус“\n" -#: downloads.php:121 +#: downloads.php:122 msgid " There is a Gajim installer " msgstr " Има инсталатор на Gajim " -#: downloads.php:121 +#: downloads.php:122 msgid "with GTK+ included" msgstr "с включен GTK+" -#: downloads.php:121 +#: downloads.php:122 msgid "without GTK+" msgstr "без GTK+" -#: downloads.php:125 +#: downloads.php:126 msgid "" " If you got the installer without GTK, you will have to download the " "latest version of the GTK+ Runtime Environment" @@ -573,7 +579,7 @@ " Ако използвате инсталатора без GTK, трябва да изтеглите последната " "версия на библиотеката GTK+" -#: downloads.php:125 +#: downloads.php:126 msgid "" "You can skip this, if you already have a GTK+ Runtime installed with " "libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade " @@ -582,23 +588,23 @@ "Може да прескочите това, ако вече имате инсталиран GTK+ Runtime с поддръжка " "на libglade; GTK+ Runtime от gimp-win.sf.net НЯМА да работи (липсва libglade)" -#: downloads.php:130 +#: downloads.php:131 msgid " Source\n" msgstr " Изходен код\n" -#: downloads.php:133 +#: downloads.php:134 msgid " The tarball version of Gajim is " msgstr " Архивиран изходен код на версията на Gajim има " -#: downloads.php:133 +#: downloads.php:134 msgid "For information on how to build Gajim," msgstr "За информация как да компилирате Gajim," -#: downloads.php:133 +#: downloads.php:134 msgid "in English" msgstr "на английски език" -#: downloads.php:135 +#: downloads.php:136 msgid "" "If you want to use the last unstable development version, then you should " "checkout the subversion repository.\n" @@ -606,25 +612,25 @@ "Ако искате да ползвате последната нестабилна версия, все още в процес на " "разработка, то изтеглете работно копие на хранилището на subversion.\n" -#: downloads.php:141 +#: downloads.php:142 msgid " Subversion\n" msgstr " Subversion\n" -#: downloads.php:144 +#: downloads.php:145 msgid " The subversion server is available at this address: " msgstr " Сървърът на subversion е достъпен на този адрес: " -#: downloads.php:144 +#: downloads.php:145 msgid "and viewable" msgstr "и може да се разглежда" -#: downloads.php:149 +#: downloads.php:150 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr "" " За да изтеглите изходния код на Gajim, трябва да изпълните следните " "стъпки:\n" -#: downloads.php:150 +#: downloads.php:151 msgid "" " You first have to install subversion (apt-get install subversion " "under Debian)\n" @@ -632,31 +638,31 @@ " Да инсталирате subversion (apt-get install subversion под " "Дебиан)\n" -#: downloads.php:152 +#: downloads.php:153 msgid " Then in a console, enter the following commands:\n" msgstr " След това, в конзола въведете следните команди:\n" -#: downloads.php:160 +#: downloads.php:161 msgid " Install dependencies, and build Gajim. Please see the" msgstr " Инсталирайте зависимостите и компилирайте Gajim. Вижте" -#: downloads.php:160 +#: downloads.php:161 msgid "English" msgstr "на английски език" -#: downloads.php:160 +#: downloads.php:161 msgid "for details.\n" msgstr "за подробности.\n" -#: downloads.php:163 +#: downloads.php:164 msgid " You can run Gajim by typing the following:\n" msgstr " Може да стартирате Gajim, като напишете:\n" -#: downloads.php:167 +#: downloads.php:168 msgid "and then" msgstr "и после" -#: downloads.php:171 +#: downloads.php:172 msgid "" " Once you have the repository, you can update it periodicaly so it matches " "the latest version from the server with the following command:\n" @@ -664,11 +670,11 @@ " След като имате хранилището, може да го обновявате периодично спрямо " "последната версия от сървъра на Subversion чрез тази команда:\n" -#: downloads.php:180 +#: downloads.php:181 msgid " Under Windows\n" msgstr " Под „Уиндоус“\n" -#: downloads.php:182 +#: downloads.php:183 msgid "" " You first have to install subversion for windows. In order to do that, " "download the binary" @@ -676,7 +682,7 @@ " Първо трябва да инсталирате subversion за „Уиндоус“. За тази цел " "изтеглете двоичния файл" -#: downloads.php:184 +#: downloads.php:185 msgid "" " Once subversion is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " @@ -686,27 +692,27 @@ "GNU/Линукс. Единствената разлика е, че вместо launch.sh стартирате launch." "bat. Въведете ги в командния ред на допотопния „MS-DOS Prompt“ и сте готови." -#: downloads.php:186 +#: downloads.php:187 msgid " You can also use a graphical program like" msgstr " Може да използвате и графична програма като" -#: downloads.php:186 +#: downloads.php:187 msgid "to get the latest Subversion version\n" msgstr "за да изтеглите последната версия на кода\n" -#: downloads.php:188 +#: downloads.php:189 msgid " To run Gajim, you need" msgstr " За да стартирате Gajim, ви трябва" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" msgstr "(версия1 2.10.x или по-нова, версия на PyGTK < 2.10 е достъпна" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.4 or higher, 2.5 is recommended)," msgstr "(версия 2.4 или по-нова, препоръчва се 2.5)," -#: downloads.php:188 +#: downloads.php:189 msgid "" "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " "gimp-win.sf.net will NOT work (libglade is missing)," @@ -714,27 +720,27 @@ "(версия 2.6.x или по-нова, препоръчва се 2.10.x) ЗАБЕЛЕЖКА: Библиотеката GTK" "+ от gimp-win.sf.net НЯМА да работи (липсва libglade)," -#: downloads.php:188 +#: downloads.php:189 msgid "GTK Runtime Environment" msgstr "GTK Runtime Environment" -#: downloads.php:188 +#: downloads.php:189 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" msgstr "PyGTK за Уиндоус (PyGTK с pycairo и pygobject)" -#: downloads.php:188 +#: downloads.php:189 msgid "and at last" msgstr "и най-накрая" -#: downloads.php:188 +#: downloads.php:189 msgid "by Mark Hammond." msgstr "от Марк Хамънд." -#: downloads.php:193 +#: downloads.php:194 msgid " Daily Snapshots\n" msgstr " Ежедневни архиви от хранилището\n" -#: downloads.php:196 +#: downloads.php:197 msgid "" " Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can " "use them if svn is broken for you at the moment." @@ -743,15 +749,15 @@ "хранилището във формат bz2. Може да ги използвате, ако хранилището на SVN е " "недостъпно." -#: downloads.php:196 +#: downloads.php:197 msgid "Here to get them" msgstr "Оттук може да ги изтеглите" -#: downloads.php:201 +#: downloads.php:202 msgid " Old releases\n" msgstr " Стари версии\n" -#: downloads.php:204 +#: downloads.php:205 msgid " You'll find old releases of Gajim" msgstr " Ще намерите стари версии на Gajim" Modified: www-website/locale/de_DE/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/de_DE/LC_MESSAGES/msg.po 2007-07-21 14:58:56 UTC (rev 8417) +++ www-website/locale/de_DE/LC_MESSAGES/msg.po 2007-07-21 15:43:46 UTC (rev 8418) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-31 17:29+0200\n" +"POT-Creation-Date: 2007-07-21 17:42+0200\n" "PO-Revision-Date: 2007-01-08 14:59+0100\n" "Last-Translator: Michael Skiba <michael(a)michael-skiba.de>\n" "Language-Team: German <translation-team-de(a)lists.sourceforge.net>\n" @@ -166,9 +166,9 @@ msgstr " Die Archivierten Nachrichten finden sie " #: dev.php:20 docs.php:46 docs.php:49 docs.php:52 docs.php:55 docs.php:66 -#: docs.php:72 docs.php:74 downloads.php:84 downloads.php:109 -#: downloads.php:125 downloads.php:133 downloads.php:144 downloads.php:182 -#: downloads.php:188 downloads.php:204 index.php:14 +#: docs.php:72 docs.php:74 downloads.php:85 downloads.php:110 +#: downloads.php:126 downloads.php:134 downloads.php:145 downloads.php:183 +#: downloads.php:189 downloads.php:205 index.php:14 msgid "here" msgstr "hier" @@ -275,7 +275,7 @@ msgid "page.\n" msgstr "Seite.\n" -#: docs.php:21 downloads.php:147 +#: docs.php:21 downloads.php:148 msgid " Under GNU/Linux\n" msgstr " Unter GNU/Linux\n" @@ -357,7 +357,7 @@ msgid " In a first time, you have to install" msgstr " Beim ersten Mal, müssen Sie folgenden Programme installieren:" -#: docs.php:42 downloads.php:70 downloads.php:121 +#: docs.php:42 downloads.php:71 downloads.php:122 msgid "and" msgstr "und" @@ -471,57 +471,63 @@ msgid "and install it by doing" msgstr "und installieren Sie die SVN-Version durch" -#: downloads.php:31 +#: downloads.php:24 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + +#: downloads.php:32 msgid "Soon available here." msgstr "In kürze hier verfügbar." -#: downloads.php:40 +#: downloads.php:41 msgid " If you use Ubuntu universe repository do" msgstr " Wenn Sie das Ubuntu Gesamt Repositorium benutzen reicht" -#: downloads.php:48 +#: downloads.php:49 msgid " You can install Gajim provided you have Fedora Extras repository by" msgstr "" " Wenn Sie die Fedora Extra Repositorien benutzen können Sie Gajim wie " "folgt installieren:" -#: downloads.php:53 +#: downloads.php:54 msgid " Gentoo\n" msgstr " Gentoo\n" -#: downloads.php:56 downloads.php:63 downloads.php:91 +#: downloads.php:57 downloads.php:64 downloads.php:92 msgid " Just" msgstr " Einfach" -#: downloads.php:60 +#: downloads.php:61 msgid " Archlinux\n" msgstr " Archlinux\n" -#: downloads.php:67 +#: downloads.php:68 msgid " SUSE\n" msgstr " SUSE\n" -#: downloads.php:70 +#: downloads.php:71 msgid " You need: " msgstr " Sie benötigen die folgenden Pakete: " -#: downloads.php:70 +#: downloads.php:71 msgid "gajim rpm" msgstr "gajim rpm" -#: downloads.php:70 +#: downloads.php:71 msgid "pydns rpm" msgstr "pydns rpm" -#: downloads.php:70 +#: downloads.php:71 msgid "python-sqlite2 rpm" msgstr "python-sqlite2 rpm" -#: downloads.php:74 +#: downloads.php:75 msgid " PLD\n" msgstr " PLD\n" -#: downloads.php:77 +#: downloads.php:78 msgid "" " Gajim is at the moment in the ac-ready tree (it is turned off by " "default, so you may need to check your poldek configuration) and can be " @@ -531,56 +537,56 @@ "ggf. müssen Sie also ihre poldek Konfiguration überprüfen) und kann wie " "folgt installiert werden " -#: downloads.php:81 +#: downloads.php:82 msgid " SourceMage\n" msgstr " SourceMage\n" -#: downloads.php:84 +#: downloads.php:85 msgid " Use files available " msgstr " Benutzen Sie die diese Dateien, klicken Sie " -#: downloads.php:96 +#: downloads.php:97 msgid " FreeBSD\n" msgstr " FreeBSD\n" -#: downloads.php:99 +#: downloads.php:100 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr " Gajim ist in FreeBSD über die FreeBSD ports verfügbar. Einfach " -#: downloads.php:101 downloads.php:112 +#: downloads.php:102 downloads.php:113 msgid "Find out more" msgstr "Weitere Informationen" -#: downloads.php:105 +#: downloads.php:106 msgid " Autopackage\n" msgstr " Autopackage\n" -#: downloads.php:109 +#: downloads.php:110 msgid " You can download the autopackage " msgstr "" -#: downloads.php:110 +#: downloads.php:111 msgid "To use it: make it executable, run it and follow the instructions.\n" msgstr "" -#: downloads.php:118 +#: downloads.php:119 msgid " Windows installer\n" msgstr " Windows Installationsprogramm\n" -#: downloads.php:121 +#: downloads.php:122 msgid " There is a Gajim installer " msgstr "" " Es gibt das Gajim Installationsprogramm in zwei Fassungen, das eine " -#: downloads.php:121 +#: downloads.php:122 msgid "with GTK+ included" msgstr "beinhaltet GTK+" -#: downloads.php:121 +#: downloads.php:122 msgid "without GTK+" msgstr "das andere nicht" -#: downloads.php:125 +#: downloads.php:126 msgid "" " If you got the installer without GTK, you will have to download the " "latest version of the GTK+ Runtime Environment" @@ -588,7 +594,7 @@ " Falls Sie das Installationsprogramm ohne GTK haben, müssen Sie die " "neuste Version der GTK+ Runtime Environment herunterladen" -#: downloads.php:125 +#: downloads.php:126 msgid "" "You can skip this, if you already have a GTK+ Runtime installed with " "libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade " @@ -598,27 +604,27 @@ "Version installiert haben die mit libglade Unterstützung daher kommt; Die GTK" "+ Runtime von gimp-win.sf.net wird NICHT funktionieren (libglade fehlt)" -#: downloads.php:130 +#: downloads.php:131 msgid " Source\n" msgstr " Quellcode\n" -#: downloads.php:133 +#: downloads.php:134 msgid " The tarball version of Gajim is " msgstr " Die Tarball Version von Gajim gibts " -#: downloads.php:133 +#: downloads.php:134 #, fuzzy msgid "For information on how to build Gajim," msgstr "" " Für weitere Informationen und Installationsanweisungen, bitte nachgucken in " "der" -#: downloads.php:133 +#: downloads.php:134 #, fuzzy msgid "in English" msgstr "Englisch" -#: downloads.php:135 +#: downloads.php:136 msgid "" "If you want to use the last unstable development version, then you should " "checkout the subversion repository.\n" @@ -626,24 +632,24 @@ "Wenn Sie die neuste unstabile Entwicklungsversion von Gajim benutzen wollen " "sollten Sie die SVN-Version ausprobieren(Siehe unten).\n" -#: downloads.php:141 +#: downloads.php:142 msgid " Subversion\n" msgstr " Subversion\n" -#: downloads.php:144 +#: downloads.php:145 msgid " The subversion server is available at this address: " msgstr " Der Subversion Server ist unter folgender Adresse erreichbar: " -#: downloads.php:144 +#: downloads.php:145 msgid "and viewable" msgstr "und online einsehbar" -#: downloads.php:149 +#: downloads.php:150 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr "" " Um die Gajim Quellcodes herunter zu laden, müssen Sie folgendes tun:\n" -#: downloads.php:150 +#: downloads.php:151 msgid "" " You first have to install subversion (apt-get install subversion " "under Debian)\n" @@ -651,33 +657,33 @@ " Als erstes müssen Sie Subversion installieren (apt-get install " "subversion unter Debian)\n" -#: downloads.php:152 +#: downloads.php:153 msgid " Then in a console, enter the following commands:\n" msgstr "" " Anschließend müssen Sie folgenden Befehl in einer Konsole eingeben:\n" -#: downloads.php:160 +#: downloads.php:161 msgid " Install dependencies, and build Gajim. Please see the" msgstr "" " Liste der Abhängigkeiten und Installationsanweisungen, gibt es hier:" -#: downloads.php:160 +#: downloads.php:161 msgid "English" msgstr "Englisch" -#: downloads.php:160 +#: downloads.php:161 msgid "for details.\n" msgstr ".\n" -#: downloads.php:163 +#: downloads.php:164 msgid " You can run Gajim by typing the following:\n" msgstr " Sie können Gajim starten indem Sie folgendes eintippen:\n" -#: downloads.php:167 +#: downloads.php:168 msgid "and then" msgstr "und anschließend" -#: downloads.php:171 +#: downloads.php:172 msgid "" " Once you have the repository, you can update it periodicaly so it matches " "the latest version from the server with the following command:\n" @@ -686,11 +692,11 @@ "periodisch updaten, um es mit der neusten Version auf dem Server " "abzugleichen, indem Sie folgenden Befehl benutzen:\n" -#: downloads.php:180 +#: downloads.php:181 msgid " Under Windows\n" msgstr " Unter Windows\n" -#: downloads.php:182 +#: downloads.php:183 msgid "" " You first have to install subversion for windows. In order to do that, " "download the binary" @@ -698,7 +704,7 @@ " Als erstes müssen Sie Subversion für Windows installieren. Um dies zu tun " "laden Sie sich die Binarys herunter, diese gibt es" -#: downloads.php:184 +#: downloads.php:185 msgid "" " Once subversion is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " @@ -709,27 +715,27 @@ "die launch.bat. Rufen Sie diese über die MS-DOS Eingabeaufforderung auf und " "Sie sind fertig." -#: downloads.php:186 +#: downloads.php:187 msgid " You can also use a graphical program like" msgstr " Sie können auch ein grafisches Programm wie z.B." -#: downloads.php:186 +#: downloads.php:187 msgid "to get the latest Subversion version\n" msgstr "benutzen um die neuste SVN-Version von Gajim zu bekommen\n" -#: downloads.php:188 +#: downloads.php:189 msgid " To run Gajim, you need" msgstr " Um Gajim zu starten brauchen Sie die" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" msgstr "(Version 2.10.x oder höher, PyGTK Version < 2.10 gibt es" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.4 or higher, 2.5 is recommended)," msgstr "(Version 2.4 oder höher, 2.5 ist empfohlen)," -#: downloads.php:188 +#: downloads.php:189 msgid "" "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " "gimp-win.sf.net will NOT work (libglade is missing)," @@ -737,27 +743,27 @@ "(Version 2.6.x oder höher, 2.10.x ist empfohlen) HINWEIS: Die GTK+ Runtime " "von gimp-win.sf.net wird NICHT funktionieren (libglade fehlt)," -#: downloads.php:188 +#: downloads.php:189 msgid "GTK Runtime Environment" msgstr "GTK Runtime Environment" -#: downloads.php:188 +#: downloads.php:189 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" msgstr "PyGTK für Windows (PyGTK mit pycairo und pygobject)" -#: downloads.php:188 +#: downloads.php:189 msgid "and at last" msgstr "und als letztes die" -#: downloads.php:188 +#: downloads.php:189 msgid "by Mark Hammond." msgstr "von Mark Hammond." -#: downloads.php:193 +#: downloads.php:194 msgid " Daily Snapshots\n" msgstr " Täglichen Versionen\n" -#: downloads.php:196 +#: downloads.php:197 msgid "" " Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can " "use them if svn is broken for you at the moment." @@ -766,15 +772,15 @@ "erstellt. Sie können sie entweder momentan für sich benutzen oder für den " "Fall das SVN mal nicht erreichbar sein sollte." -#: downloads.php:196 +#: downloads.php:197 msgid "Here to get them" msgstr "Zum download hier klicken" -#: downloads.php:201 +#: downloads.php:202 msgid " Old releases\n" msgstr " Alte Versionen\n" -#: downloads.php:204 +#: downloads.php:205 msgid " You'll find old releases of Gajim" msgstr " Für die alten Versionen von Gajim klicken Sie bitte" Modified: www-website/locale/eo/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/eo/LC_MESSAGES/msg.po 2007-07-21 14:58:56 UTC (rev 8417) +++ www-website/locale/eo/LC_MESSAGES/msg.po 2007-07-21 15:43:46 UTC (rev 8418) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-31 17:29+0200\n" +"POT-Creation-Date: 2007-07-21 17:42+0200\n" "PO-Revision-Date: 2007-02-19 20:40+0400\n" "Last-Translator: Sergio Ĥlutĉin <Sergey.Khlutchin(a)gmail.com>\n" "Language-Team: Esperanto <translation-team-eo(a)lists.sourceforge.net>\n" @@ -166,9 +166,9 @@ msgstr " Dissendolistaj arkivoj disponeblas " #: dev.php:20 docs.php:46 docs.php:49 docs.php:52 docs.php:55 docs.php:66 -#: docs.php:72 docs.php:74 downloads.php:84 downloads.php:109 -#: downloads.php:125 downloads.php:133 downloads.php:144 downloads.php:182 -#: downloads.php:188 downloads.php:204 index.php:14 +#: docs.php:72 docs.php:74 downloads.php:85 downloads.php:110 +#: downloads.php:126 downloads.php:134 downloads.php:145 downloads.php:183 +#: downloads.php:189 downloads.php:205 index.php:14 msgid "here" msgstr "ĉi tie" @@ -272,7 +272,7 @@ msgid "page.\n" msgstr "paĝo.\n" -#: docs.php:21 downloads.php:147 +#: docs.php:21 downloads.php:148 msgid " Under GNU/Linux\n" msgstr " Ĉe GNU/Linux\n" @@ -348,7 +348,7 @@ msgid " In a first time, you have to install" msgstr " Komence vi devas instali" -#: docs.php:42 downloads.php:70 downloads.php:121 +#: docs.php:42 downloads.php:71 downloads.php:122 msgid "and" msgstr "kaj" @@ -456,56 +456,62 @@ msgid "and install it by doing" msgstr "kaj instalu ĝin farante" -#: downloads.php:31 +#: downloads.php:24 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + +#: downloads.php:32 msgid "Soon available here." msgstr "Baldaŭ disponeblos ĉi tie." -#: downloads.php:40 +#: downloads.php:41 msgid " If you use Ubuntu universe repository do" msgstr " Se vi uzas Ubuntu unuverse deponejon, faru" -#: downloads.php:48 +#: downloads.php:49 msgid " You can install Gajim provided you have Fedora Extras repository by" msgstr "" " Vi povas instali Gajim, se vi havas la deponejon Fedora Extras, per" -#: downloads.php:53 +#: downloads.php:54 msgid " Gentoo\n" msgstr " Gentoo\n" -#: downloads.php:56 downloads.php:63 downloads.php:91 +#: downloads.php:57 downloads.php:64 downloads.php:92 msgid " Just" msgstr " Simple" -#: downloads.php:60 +#: downloads.php:61 msgid " Archlinux\n" msgstr " Archlinux\n" -#: downloads.php:67 +#: downloads.php:68 msgid " SUSE\n" msgstr " SUSE\n" -#: downloads.php:70 +#: downloads.php:71 msgid " You need: " msgstr " Vi bezonas: " -#: downloads.php:70 +#: downloads.php:71 msgid "gajim rpm" msgstr "rpm de gajim" -#: downloads.php:70 +#: downloads.php:71 msgid "pydns rpm" msgstr "rpm de pydns" -#: downloads.php:70 +#: downloads.php:71 msgid "python-sqlite2 rpm" msgstr "rpm de python-sqlite2" -#: downloads.php:74 +#: downloads.php:75 msgid " PLD\n" msgstr " PLD\n" -#: downloads.php:77 +#: downloads.php:78 msgid "" " Gajim is at the moment in the ac-ready tree (it is turned off by " "default, so you may need to check your poldek configuration) and can be " @@ -515,56 +521,56 @@ "defaŭlte, do vi povas kontroli vian poldek agordon) kaj povas esti instalita " "per la sekva komando " -#: downloads.php:81 +#: downloads.php:82 msgid " SourceMage\n" msgstr " SourceMage\n" -#: downloads.php:84 +#: downloads.php:85 msgid " Use files available " msgstr " Uzu dosierojn disponeblajn " -#: downloads.php:96 +#: downloads.php:97 msgid " FreeBSD\n" msgstr " FreeBSD\n" -#: downloads.php:99 +#: downloads.php:100 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr " Gajim estas disponebla en FreeBSD per FreeBSD portaĵoj. Simple " -#: downloads.php:101 downloads.php:112 +#: downloads.php:102 downloads.php:113 msgid "Find out more" msgstr "Trovu pli" -#: downloads.php:105 +#: downloads.php:106 msgid " Autopackage\n" msgstr " Autopackage\n" -#: downloads.php:109 +#: downloads.php:110 msgid " You can download the autopackage " msgstr " Vi povas elŝuti la aŭtopakaĵon " -#: downloads.php:110 +#: downloads.php:111 msgid "To use it: make it executable, run it and follow the instructions.\n" msgstr "" "Por uzi ĝin: faru ĝin plenumebla, lanĉu ĝin kaj sekvu la instrukciojn.\n" -#: downloads.php:118 +#: downloads.php:119 msgid " Windows installer\n" msgstr " Vindoza instalilo\n" -#: downloads.php:121 +#: downloads.php:122 msgid " There is a Gajim installer " msgstr " Ĉi tie estas Gajim-instalilo " -#: downloads.php:121 +#: downloads.php:122 msgid "with GTK+ included" msgstr "kun GTK+ ene" -#: downloads.php:121 +#: downloads.php:122 msgid "without GTK+" msgstr "sen GTK+" -#: downloads.php:125 +#: downloads.php:126 msgid "" " If you got the installer without GTK, you will have to download the " "latest version of the GTK+ Runtime Environment" @@ -572,7 +578,7 @@ " Se vi akiris la instalilon sen GTK, vi devas elŝuti la plej lastan " "version de la GTK+ Rultempa Medio" -#: downloads.php:125 +#: downloads.php:126 msgid "" "You can skip this, if you already have a GTK+ Runtime installed with " "libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade " @@ -582,23 +588,23 @@ "kun subteno de libglade; GTK+ Medio de gimp-win.sf.net ne funkcios (ĉar " "libglade mankas)" -#: downloads.php:130 +#: downloads.php:131 msgid " Source\n" msgstr " Fonto\n" -#: downloads.php:133 +#: downloads.php:134 msgid " The tarball version of Gajim is " msgstr " La tar-pakaĵa versio de Gajim estas " -#: downloads.php:133 +#: downloads.php:134 msgid "For information on how to build Gajim," msgstr "Por informo pri kiel konstrui Gajim," -#: downloads.php:133 +#: downloads.php:134 msgid "in English" msgstr "en la angla" -#: downloads.php:135 +#: downloads.php:136 msgid "" "If you want to use the last unstable development version, then you should " "checkout the subversion repository.\n" @@ -606,23 +612,23 @@ "Se vi volas uzi la lastan nestabilan evoluantan version, do vi bezonas " "elŝuti la subversian deponejon.\n" -#: downloads.php:141 +#: downloads.php:142 msgid " Subversion\n" msgstr " Subversio\n" -#: downloads.php:144 +#: downloads.php:145 msgid " The subversion server is available at this address: " msgstr " La subversia servilo estas disponebla ĉe ĉi tiu adreso: " -#: downloads.php:144 +#: downloads.php:145 msgid "and viewable" msgstr "kaj videbla" -#: downloads.php:149 +#: downloads.php:150 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr " Por elŝuti Gajim fontojn, tie ĉi estas kion vi devas fari:\n" -#: downloads.php:150 +#: downloads.php:151 msgid "" " You first have to install subversion (apt-get install subversion " "under Debian)\n" @@ -630,31 +636,31 @@ " Komence vi devas instali subversion (apt-get install subversion " "ĉe Debian)\n" -#: downloads.php:152 +#: downloads.php:153 msgid " Then in a console, enter the following commands:\n" msgstr " Poste en la konzolo enigu la sekvajn komandojn:\n" -#: downloads.php:160 +#: downloads.php:161 msgid " Install dependencies, and build Gajim. Please see the" msgstr " Instalu dependaĵojn kaj konstruu Gajim. Bonvolu legi la" -#: downloads.php:160 +#: downloads.php:161 msgid "English" msgstr "angle" -#: downloads.php:160 +#: downloads.php:161 msgid "for details.\n" msgstr "por detaloj.\n" -#: downloads.php:163 +#: downloads.php:164 msgid " You can run Gajim by typing the following:\n" msgstr " Vi povas lanĉi Gajim tajpade la sekvan:\n" -#: downloads.php:167 +#: downloads.php:168 msgid "and then" msgstr "kaj poste" -#: downloads.php:171 +#: downloads.php:172 msgid "" " Once you have the repository, you can update it periodicaly so it matches " "the latest version from the server with the following command:\n" @@ -662,11 +668,11 @@ " Havante unufoje instalitan deponejon, vi povas ĝisdatigi ĝin periode por " "ke ĝi respondu lastan version de la servilo per la sekva komando:\n" -#: downloads.php:180 +#: downloads.php:181 msgid " Under Windows\n" msgstr " Ĉe Vindozo\n" -#: downloads.php:182 +#: downloads.php:183 msgid "" " You first have to install subversion for windows. In order to do that, " "download the binary" @@ -674,7 +680,7 @@ " Komence vi devas instali subversion por vindozo. Por fari tion, elŝutu la " "duumaĵon" -#: downloads.php:184 +#: downloads.php:185 msgid "" " Once subversion is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " @@ -684,27 +690,27 @@ "Linux. Nur malsameco estas ke anstataŭ launch.sh vi lanĉu launch.bat. Enigu " "ilin en MS-DOS komanda linio." -#: downloads.php:186 +#: downloads.php:187 msgid " You can also use a graphical program like" msgstr " Vi ankaŭ povas uzi grafikan programon kiel" -#: downloads.php:186 +#: downloads.php:187 msgid "to get the latest Subversion version\n" msgstr "por akiri la plej lastan version de Subversio\n" -#: downloads.php:188 +#: downloads.php:189 msgid " To run Gajim, you need" msgstr " Por lanĉi Gajim, vi bezonas" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" msgstr "(Versio 2.10.x aŭ pli nova, PyGTK versio < 2.10 disponeblas" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.4 or higher, 2.5 is recommended)," msgstr "(Versio 2.4 aŭ pli nova, 2.5 estas rekomendita)," -#: downloads.php:188 +#: downloads.php:189 msgid "" "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " "gimp-win.sf.net will NOT work (libglade is missing)," @@ -712,27 +718,27 @@ "(Versio 2.6.x aŭ pli nova, 2.10.x estas rekomendita) NOTU: GTK+ Rultempa " "Medio de gimp-win.sf.net ne funkcios (libglade mankas)," -#: downloads.php:188 +#: downloads.php:189 msgid "GTK Runtime Environment" msgstr "GTK Rultempa Medio" -#: downloads.php:188 +#: downloads.php:189 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" msgstr "PyGTK por Vindozo (PyGTK kun pycairo kaj pygobject)" -#: downloads.php:188 +#: downloads.php:189 msgid "and at last" msgstr "kaj fine" -#: downloads.php:188 +#: downloads.php:189 msgid "by Mark Hammond." msgstr "de Mark Hammond." -#: downloads.php:193 +#: downloads.php:194 msgid " Daily Snapshots\n" msgstr " Ĉiutagaj kaptaĵoj\n" -#: downloads.php:196 +#: downloads.php:197 msgid "" " Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can " "use them if svn is broken for you at the moment." @@ -740,15 +746,15 @@ " Ĉiutage je 01:00 (laŭ GMT+1 tempo) bz2 arkivoj estas farata de svn. Vi " "povas uzi ilin se svn estas rompita je tiu momento." -#: downloads.php:196 +#: downloads.php:197 msgid "Here to get them" msgstr "Prenu ilin ĉi tie" -#: downloads.php:201 +#: downloads.php:202 msgid " Old releases\n" msgstr " Malnovaj eldonoj\n" -#: downloads.php:204 +#: downloads.php:205 msgid " You'll find old releases of Gajim" msgstr " Vi trovos malnovajn eldonojn de Gajim" Modified: www-website/locale/es_ES/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/es_ES/LC_MESSAGES/msg.po 2007-07-21 14:58:56 UTC (rev 8417) +++ www-website/locale/es_ES/LC_MESSAGES/msg.po 2007-07-21 15:43:46 UTC (rev 8418) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-31 17:29+0200\n" +"POT-Creation-Date: 2007-07-21 17:42+0200\n" "PO-Revision-Date: 2005-06-01 19:05+0300\n" "Last-Translator: <membriskhan(a)gmail.com>\n" "Language-Team: Spanish <es(a)li.org>\n" @@ -168,9 +168,9 @@ msgstr " Los archivos de la lista están disponibles " #: dev.php:20 docs.php:46 docs.php:49 docs.php:52 docs.php:55 docs.php:66 -#: docs.php:72 docs.php:74 downloads.php:84 downloads.php:109 -#: downloads.php:125 downloads.php:133 downloads.php:144 downloads.php:182 -#: downloads.php:188 downloads.php:204 index.php:14 +#: docs.php:72 docs.php:74 downloads.php:85 downloads.php:110 +#: downloads.php:126 downloads.php:134 downloads.php:145 downloads.php:183 +#: downloads.php:189 downloads.php:205 index.php:14 msgid "here" msgstr "aquí" @@ -275,7 +275,7 @@ msgid "page.\n" msgstr "de descargas.\n" -#: docs.php:21 downloads.php:147 +#: docs.php:21 downloads.php:148 msgid " Under GNU/Linux\n" msgstr " Bajo GNU/Linux\n" @@ -353,7 +353,7 @@ msgid " In a first time, you have to install" msgstr " Desde un principio, tienes que instalar" -#: docs.php:42 downloads.php:70 downloads.php:121 +#: docs.php:42 downloads.php:71 downloads.php:122 msgid "and" msgstr "y" @@ -465,58 +465,64 @@ msgid "and install it by doing" msgstr "e instálalo haciendo" -#: downloads.php:31 +#: downloads.php:24 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + +#: downloads.php:32 msgid "Soon available here." msgstr "" -#: downloads.php:40 +#: downloads.php:41 msgid " If you use Ubuntu universe repository do" msgstr " Si usas el repositorio de Ubuntu universe haz" -#: downloads.php:48 +#: downloads.php:49 #, fuzzy msgid " You can install Gajim provided you have Fedora Extras repository by" msgstr "" " Puedes instalar Gajim en FC4 con el repositorio Fedora Extras haciendo " -#: downloads.php:53 +#: downloads.php:54 msgid " Gentoo\n" msgstr "" -#: downloads.php:56 downloads.php:63 downloads.php:91 +#: downloads.php:57 downloads.php:64 downloads.php:92 msgid " Just" msgstr " Simplemente " -#: downloads.php:60 +#: downloads.php:61 msgid " Archlinux\n" msgstr "" -#: downloads.php:67 +#: downloads.php:68 msgid " SUSE\n" msgstr "" -#: downloads.php:70 +#: downloads.php:71 msgid " You need: " msgstr " Necesitas: " -#: downloads.php:70 +#: downloads.php:71 msgid "gajim rpm" msgstr "rpm de gajim" -#: downloads.php:70 +#: downloads.php:71 msgid "pydns rpm" msgstr "rpm de pydns" -#: downloads.php:70 +#: downloads.php:71 #, fuzzy msgid "python-sqlite2 rpm" msgstr "rpm de pydns" -#: downloads.php:74 +#: downloads.php:75 msgid " PLD\n" msgstr "" -#: downloads.php:77 +#: downloads.php:78 msgid "" " Gajim is at the moment in the ac-ready tree (it is turned off by " "default, so you may need to check your poldek configuration) and can be " @@ -526,65 +532,65 @@ "defecto, podrías necesitar comprobar tu configuración de poldek) y puede ser " "instalado escribiendo " -#: downloads.php:81 +#: downloads.php:82 msgid " SourceMage\n" msgstr "" -#: downloads.php:84 +#: downloads.php:85 msgid " Use files available " msgstr " Los archivos use están disponibles " -#: downloads.php:96 +#: downloads.php:97 msgid " FreeBSD\n" msgstr "" -#: downloads.php:99 +#: downloads.php:100 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr "" " Gajim está disponible en FreeBSD a través de los ports de FreeBSD. " "Sólamente " -#: downloads.php:101 downloads.php:112 +#: downloads.php:102 downloads.php:113 msgid "Find out more" msgstr "Saber más" -#: downloads.php:105 +#: downloads.php:106 msgid " Autopackage\n" msgstr "" -#: downloads.php:109 +#: downloads.php:110 msgid " You can download the autopackage " msgstr " Puedes descargar el autopackage " -#: downloads.php:110 +#: downloads.php:111 msgid "To use it: make it executable, run it and follow the instructions.\n" msgstr "Para usarlo: hazlo ejecutable, lánzalo y sigue las instrucciones.\n" -#: downloads.php:118 +#: downloads.php:119 msgid " Windows installer\n" msgstr " Instalador para Windows\n" -#: downloads.php:121 +#: downloads.php:122 #, fuzzy msgid " There is a Gajim installer " msgstr " La versión en archivotar de Gajim está " -#: downloads.php:121 +#: downloads.php:122 msgid "with GTK+ included" msgstr "" -#: downloads.php:121 +#: downloads.php:122 msgid "without GTK+" msgstr "" -#: downloads.php:125 +#: downloads.php:126 #, fuzzy msgid "" " If you got the installer without GTK, you will have to download the " "latest version of the GTK+ Runtime Environment" msgstr " Para usarlo, descarga la última versión de las librerías GTK+" -#: downloads.php:125 +#: downloads.php:126 #, fuzzy msgid "" "You can skip this, if you already have a GTK+ Runtime installed with " @@ -594,23 +600,23 @@ "(Versión 2.6.x o superior) NOTA: La librería GTK+ de gimp-win.sf.net NO " "funcionará (carece de libglade)," -#: downloads.php:130 +#: downloads.php:131 msgid " Source\n" msgstr " Código fuente\n" -#: downloads.php:133 +#: downloads.php:134 msgid " The tarball version of Gajim is " msgstr " La versión en archivotar de Gajim está " -#: downloads.php:133 +#: downloads.php:134 msgid "For information on how to build Gajim," msgstr "" -#: downloads.php:133 +#: downloads.php:134 msgid "in English" msgstr "" -#: downloads.php:135 +#: downloads.php:136 msgid "" "If you want to use the last unstable development version, then you should " "checkout the subversion repository.\n" @@ -618,25 +624,25 @@ "Si quieres usar la última versión en desarrollo, comprueba el repositorio de " "Subversion.\n" -#: downloads.php:141 +#: downloads.php:142 msgid " Subversion\n" msgstr "" -#: downloads.php:144 +#: downloads.php:145 msgid " The subversion server is available at this address: " msgstr " El servidor de subversion está disponible en esta dirección: " -#: downloads.php:144 +#: downloads.php:145 msgid "and viewable" msgstr "y navegable" -#: downloads.php:149 +#: downloads.php:150 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr "" " Para descargar el código fuente de Gajim, tienes que hacer lo " "siguiente:\n" -#: downloads.php:150 +#: downloads.php:151 msgid "" " You first have to install subversion (apt-get install subversion " "under Debian)\n" @@ -644,31 +650,31 @@ " En primer lugar debes instalar subversion (apt-get install " "subversion bajo Debian)\n" -#: downloads.php:152 +#: downloads.php:153 msgid " Then in a console, enter the following commands:\n" msgstr " Luego, en una consola introduce el siguiente comando:\n" -#: downloads.php:160 +#: downloads.php:161 msgid " Install dependencies, and build Gajim. Please see the" msgstr "" -#: downloads.php:160 +#: downloads.php:161 msgid "English" msgstr "" -#: downloads.php:160 +#: downloads.php:161 msgid "for details.\n" msgstr "" -#: downloads.php:163 +#: downloads.php:164 msgid " You can run Gajim by typing the following:\n" msgstr "" -#: downloads.php:167 +#: downloads.php:168 msgid "and then" msgstr "" -#: downloads.php:171 +#: downloads.php:172 #, fuzzy msgid "" " Once you have the repository, you can update it periodicaly so it matches " @@ -678,11 +684,11 @@ "periódicamente con la última versión del servidor de subversion con el " "siguiente comando:\n" -#: downloads.php:180 +#: downloads.php:181 msgid " Under Windows\n" msgstr " Bajo Windows\n" -#: downloads.php:182 +#: downloads.php:183 msgid "" " You first have to install subversion for windows. In order to do that, " "download the binary" @@ -690,7 +696,7 @@ " Primero tienes que instalar subversion para Windows. Para ello debes " "descargar el binario" -#: downloads.php:184 +#: downloads.php:185 #, fuzzy msgid "" " Once subversion is installed, the commands are the same with those under " @@ -700,28 +706,28 @@ " Una vez que subversion está instalado, los comandos son los mismos " "quebajo GNU/Linux introduciéndolos en una línea de comandos de MS-DOS." -#: downloads.php:186 +#: downloads.php:187 msgid " You can also use a graphical program like" msgstr " También puedes usar un programa gráfico como" -#: downloads.php:186 +#: downloads.php:187 msgid "to get the latest Subversion version\n" msgstr "para obtener la última versión de Subversion\n" -#: downloads.php:188 +#: downloads.php:189 msgid " To run Gajim, you need" msgstr " Para lanzar Gajim, necesitas las" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" msgstr "" -#: downloads.php:188 +#: downloads.php:189 #, fuzzy msgid "(Version 2.4 or higher, 2.5 is recommended)," msgstr "(Preferentemente la versión 2.4.x)," -#: downloads.php:188 +#: downloads.php:189 #, fuzzy msgid "" "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " @@ -730,27 +736,27 @@ "(Versión 2.6.x o superior) NOTA: La librería GTK+ de gimp-win.sf.net NO " "funcionará (carece de libglade)," -#: downloads.php:188 +#: downloads.php:189 msgid "GTK Runtime Environment" msgstr "librerías GTK" -#: downloads.php:188 +#: downloads.php:189 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" msgstr "" -#: downloads.php:188 +#: downloads.php:189 msgid "and at last" msgstr "y por último" -#: downloads.php:188 +#: downloads.php:189 msgid "by Mark Hammond." msgstr "por Mark Hammond." -#: downloads.php:193 +#: downloads.php:194 msgid " Daily Snapshots\n" msgstr " Snapshots diarios\n" -#: downloads.php:196 +#: downloads.php:197 msgid "" " Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can " "use them if svn is broken for you at the moment." @@ -758,15 +764,15 @@ " Todos los días a la 01:00 (GMT+1) se producen bz2balls desde el svn. " "Puedes usarlos si svn está roto de momento para tí." -#: downloads.php:196 +#: downloads.php:197 msgid "Here to get them" msgstr "Aquí para obtenerlos" -#: downloads.php:201 +#: downloads.php:202 msgid " Old releases\n" msgstr " Versiones anteriores\n" -#: downloads.php:204 +#: downloads.php:205 msgid " You'll find old releases of Gajim" msgstr " Econtrarás anteriores versiones de Gajim" Modified: www-website/locale/fr_FR/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/fr_FR/LC_MESSAGES/msg.po 2007-07-21 14:58:56 UTC (rev 8417) +++ www-website/locale/fr_FR/LC_MESSAGES/msg.po 2007-07-21 15:43:46 UTC (rev 8418) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-31 17:29+0200\n" +"POT-Creation-Date: 2007-07-21 17:42+0200\n" "PO-Revision-Date: 2005-08-18 13:21+0100\n" "Last-Translator: Yann Le Boulanger <asterix(a)lagaule.org>\n" "Language-Team: none\n" @@ -169,9 +169,9 @@ msgstr " Les archives sont disponibles " #: dev.php:20 docs.php:46 docs.php:49 docs.php:52 docs.php:55 docs.php:66 -#: docs.php:72 docs.php:74 downloads.php:84 downloads.php:109 -#: downloads.php:125 downloads.php:133 downloads.php:144 downloads.php:182 -#: downloads.php:188 downloads.php:204 index.php:14 +#: docs.php:72 docs.php:74 downloads.php:85 downloads.php:110 +#: downloads.php:126 downloads.php:134 downloads.php:145 downloads.php:183 +#: downloads.php:189 downloads.php:205 index.php:14 msgid "here" msgstr "ici" @@ -277,7 +277,7 @@ msgid "page.\n" msgstr ".\n" -#: docs.php:21 downloads.php:147 +#: docs.php:21 downloads.php:148 msgid " Under GNU/Linux\n" msgstr " Sous GNU/Linux\n" @@ -357,7 +357,7 @@ msgid " In a first time, you have to install" msgstr " Dans un premier temps, vous devez installer" -#: docs.php:42 downloads.php:70 downloads.php:121 +#: docs.php:42 downloads.php:71 downloads.php:122 msgid "and" msgstr "et" @@ -467,57 +467,65 @@ msgid "and install it by doing" msgstr "et installez-le en faisant" -#: downloads.php:31 +#: downloads.php:24 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" +"Vous pouvez récupérer la clé GPG de ce paquet en installant le paquet gajim-" +"dev-keyring du même dépot. Faites simplement" + +#: downloads.php:32 msgid "Soon available here." msgstr "Bientôt disponible ici." -#: downloads.php:40 +#: downloads.php:41 msgid " If you use Ubuntu universe repository do" msgstr " Si vous utilisez Ubuntu universe, faites" -#: downloads.php:48 +#: downloads.php:49 msgid " You can install Gajim provided you have Fedora Extras repository by" msgstr "" " Vous pouvez installer Gajim en supposant que vous avez le dêpot Fedora " "Extras avec " -#: downloads.php:53 +#: downloads.php:54 msgid " Gentoo\n" msgstr " Gentoo\n" -#: downloads.php:56 downloads.php:63 downloads.php:91 +#: downloads.php:57 downloads.php:64 downloads.php:92 msgid " Just" msgstr " Lancez simplement" -#: downloads.php:60 +#: downloads.php:61 msgid " Archlinux\n" msgstr " ArchLinux\n" -#: downloads.php:67 +#: downloads.php:68 msgid " SUSE\n" msgstr " SUSE\n" -#: downloads.php:70 +#: downloads.php:71 msgid " You need: " msgstr " Vous avez besoin de : " -#: downloads.php:70 +#: downloads.php:71 msgid "gajim rpm" msgstr "rpm de gajim" -#: downloads.php:70 +#: downloads.php:71 msgid "pydns rpm" msgstr "rpm de pydns" -#: downloads.php:70 +#: downloads.php:71 msgid "python-sqlite2 rpm" msgstr "rpm de python-sqlite2" -#: downloads.php:74 +#: downloads.php:75 msgid " PLD\n" msgstr " PLD\n" -#: downloads.php:77 +#: downloads.php:78 msgid "" " Gajim is at the moment in the ac-ready tree (it is turned off by " "default, so you may need to check your poldek configuration) and can be " @@ -527,59 +535,59 @@ "défaut, donc vérifiez votre configuration de poldek) et peut être installé " "en tappant " -#: downloads.php:81 +#: downloads.php:82 msgid " SourceMage\n" msgstr " SourceMage\n" -#: downloads.php:84 +#: downloads.php:85 msgid " Use files available " msgstr " Utilisez les fichiers disponibles " -#: downloads.php:96 +#: downloads.php:97 msgid " FreeBSD\n" msgstr " FreeBSD\n" -#: downloads.php:99 +#: downloads.php:100 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr "" " Gajim est disponible pour FreeBSD via le portage FreeBSD. Tapez " "simplement" -#: downloads.php:101 downloads.php:112 +#: downloads.php:102 downloads.php:113 msgid "Find out more" msgstr "Pour en savoir plus" -#: downloads.php:105 +#: downloads.php:106 msgid " Autopackage\n" msgstr " Autopackage\n" -#: downloads.php:109 +#: downloads.php:110 msgid " You can download the autopackage " msgstr " Vous pouvez télécharger l'autopackage " -#: downloads.php:110 +#: downloads.php:111 msgid "To use it: make it executable, run it and follow the instructions.\n" msgstr "" "Pour l'utiliser : rendez-le exécutable, lancez-le et suivez les " "instructions.\n" -#: downloads.php:118 +#: downloads.php:119 msgid " Windows installer\n" msgstr " Installateur Windows\n" -#: downloads.php:121 +#: downloads.php:122 msgid " There is a Gajim installer " msgstr " Voici un installeur de Gajim " -#: downloads.php:121 +#: downloads.php:122 msgid "with GTK+ included" msgstr "avec GTK+ inclu" -#: downloads.php:121 +#: downloads.php:122 msgid "without GTK+" msgstr "sans GTK+" -#: downloads.php:125 +#: downloads.php:126 msgid "" " If you got the installer without GTK, you will have to download the " "latest version of the GTK+ Runtime Environment" @@ -587,7 +595,7 @@ " Si vous récuperez l'installeur sans GTK, vous devez télécharger la " "dernière version du \"Runtime Environment\" de GTK+" -#: downloads.php:125 +#: downloads.php:126 msgid "" "You can skip this, if you already have a GTK+ Runtime installed with " "libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade " @@ -597,23 +605,23 @@ "avec le support de libglade ; le Runtime GTK+ de gimp-win.sf.net NE " "fonctionnera PAS (libglade n'est pas inclu)." -#: downloads.php:130 +#: downloads.php:131 msgid " Source\n" msgstr " Source\n" -#: downloads.php:133 +#: downloads.php:134 msgid " The tarball version of Gajim is " msgstr " La version tarball de Gajim est " -#: downloads.php:133 +#: downloads.php:134 msgid "For information on how to build Gajim," msgstr "Pour les informations sur la façon de construire," -#: downloads.php:133 +#: downloads.php:134 msgid "in English" msgstr "en Anglais" -#: downloads.php:135 +#: downloads.php:136 msgid "" "If you want to use the last unstable development version, then you should " "checkout the subversion repository.\n" @@ -621,24 +629,24 @@ "Si vous souhaitez utiliser la dernière version de développement instable, " "vous pouvez télécharger la version Subversion.\n" -#: downloads.php:141 +#: downloads.php:142 msgid " Subversion\n" msgstr " Subversion\n" -#: downloads.php:144 +#: downloads.php:145 msgid " The subversion server is available at this address: " msgstr " Le serveur Subversion se trouve à cette adresse : " -#: downloads.php:144 +#: downloads.php:145 msgid "and viewable" msgstr "et visible" -#: downloads.php:149 +#: downloads.php:150 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr "" " Pour télécharger les sources de Gajim, voici la marche à suivre :\n" -#: downloads.php:150 +#: downloads.php:151 msgid "" " You first have to install subversion (apt-get install subversion " "under Debian)\n" @@ -646,32 +654,32 @@ " Il faut commencer par installer subversion (apt-get install " "subversion sous debian)\n" -#: downloads.php:152 +#: downloads.php:153 msgid " Then in a console, enter the following commands:\n" msgstr " Ensuite dans une console, tapez les commandes suivantes :\n" -#: downloads.php:160 +#: downloads.php:161 msgid " Install dependencies, and build Gajim. Please see the" msgstr "" " Installez les dépendances, et construisez Gajim. S'il vous plait, voir le" -#: downloads.php:160 +#: downloads.php:161 msgid "English" msgstr "Anglais" -#: downloads.php:160 +#: downloads.php:161 msgid "for details.\n" msgstr "pour plus de détails.\n" -#: downloads.php:163 +#: downloads.php:164 msgid " You can run Gajim by typing the following:\n" msgstr " Vous pouvez lancer Gajim en tappant :\n" -#: downloads.php:167 +#: downloads.php:168 msgid "and then" msgstr "puis" -#: downloads.php:171 +#: downloads.php:172 msgid "" " Once you have the repository, you can update it periodicaly so it matches " "the latest version from the server with the following command:\n" @@ -680,11 +688,11 @@ "périodiquement avec la dernière version présente sur le serveur Subversion " "par la commande :\n" -#: downloads.php:180 +#: downloads.php:181 msgid " Under Windows\n" msgstr " Sous Windows\n" -#: downloads.php:182 +#: downloads.php:183 msgid "" " You first have to install subversion for windows. In order to do that, " "download the binary" @@ -692,7 +700,7 @@ " Il faut commencer par installer subversion sous windows. Pour ce faire, " "téléchargez l'exécutable" -#: downloads.php:184 +#: downloads.php:185 msgid "" " Once subversion is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " @@ -702,27 +710,27 @@ "Linux en tappant les commandes dans une invite de commande MS-DOS. La seule " "différence est de lancer launch.bat au lieu de launch.sh." -#: downloads.php:186 +#: downloads.php:187 msgid " You can also use a graphical program like" msgstr " Vous pouvez aussi utiliser un programme graphique tel que" -#: downloads.php:186 +#: downloads.php:187 msgid "to get the latest Subversion version\n" msgstr "pour récupérer la dernière version Subversion\n" -#: downloads.php:188 +#: downloads.php:189 msgid " To run Gajim, you need" msgstr " Pour lancer Gajim, vous avez besoin de" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" msgstr "(Version 2.10.x ou supérieure, PyGTK version < 2.10 est disponible" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.4 or higher, 2.5 is recommended)," msgstr "(Version 2.4 ou supérieure, 2.5 recommandée)," -#: downloads.php:188 +#: downloads.php:189 msgid "" "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " "gimp-win.sf.net will NOT work (libglade is missing)," @@ -730,27 +738,27 @@ "(Version 2.6.x ou supérieure, 2.10.x recommandée) NOTE: le Runtime GTK+ de " "gimp-win.sf.net NE fonctionnera PAS (libglade n'est pas inclu)," -#: downloads.php:188 +#: downloads.php:189 msgid "GTK Runtime Environment" msgstr "GTK Runtime Environment" -#: downloads.php:188 +#: downloads.php:189 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" msgstr "PyGTK pour Windows (PyGTK avec pycairo et pygobject)" -#: downloads.php:188 +#: downloads.php:189 msgid "and at last" msgstr "et finalement" -#: downloads.php:188 +#: downloads.php:189 msgid "by Mark Hammond." msgstr "de Mark Hammond." -#: downloads.php:193 +#: downloads.php:194 msgid " Daily Snapshots\n" msgstr " Versions quotidiennes\n" -#: downloads.php:196 +#: downloads.php:197 msgid "" " Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can " "use them if svn is broken for you at the moment." @@ -758,15 +766,15 @@ " Chaque jour, à 1h, des archives bz2 sont créées à partir de la version " "svn. Vous pouvez les utiliser si la version svn est provisoirement cassée." -#: downloads.php:196 +#: downloads.php:197 msgid "Here to get them" msgstr "Ici pour les récupérer" -#: downloads.php:201 +#: downloads.php:202 msgid " Old releases\n" msgstr " Anciennes versions\n" -#: downloads.php:204 +#: downloads.php:205 msgid " You'll find old releases of Gajim" msgstr " Vous trouverez les anciennes versions de Gajim" Modified: www-website/locale/pt_BR/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pt_BR/LC_MESSAGES/msg.po 2007-07-21 14:58:56 UTC (rev 8417) +++ www-website/locale/pt_BR/LC_MESSAGES/msg.po 2007-07-21 15:43:46 UTC (rev 8418) @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-31 17:29+0200\n" +"POT-Creation-Date: 2007-07-21 17:42+0200\n" "PO-Revision-Date: 2007-07-13 20:52-0300\n" "Last-Translator: Mauricio B. C. Vieira <mauricio.vieira(a)gmail.com>\n" "Language-Team: Português Brasileiro <gajim-devel(a)gajim.org>\n" @@ -129,13 +129,14 @@ msgstr " Idioma:" #: Design.php:174 -msgid " Site optimized for W3C Standards and realized with vim editor under GNU/Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" -msgstr " Site otimizado para os padrões W3C e construído com o editor Vim no GNU/Linux por Asterix (Jabber ID: asterx(a)jabber.lagaule.org)\n" +msgid "" +" Site optimized for W3C Standards and realized with vim editor under GNU/" +"Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" +msgstr "" +" Site otimizado para os padrões W3C e construído com o " +"editor Vim no GNU/Linux por Asterix (Jabber ID: asterx(a)jabber.lagaule.org)\n" -#: dev.php:5 -#: downloads.php:5 -#: index.php:7 -#: screenshots.php:7 +#: dev.php:5 downloads.php:5 index.php:7 screenshots.php:7 msgid "Gajim, a Jabber client" msgstr "Gajim, um cliente Jabber" @@ -157,7 +158,9 @@ #: dev.php:19 msgid " You may also want to subscribe to our mailing list (low-traffic): " -msgstr " Você também pode se inscrever na nossa lista de discussão (tráfego baixo): " +msgstr "" +" Você também pode se inscrever na nossa lista de " +"discussão (tráfego baixo): " #: dev.php:19 msgid "or by visiting" @@ -167,23 +170,10 @@ msgid " List archives are available " msgstr " O histórico da lista está disponível " -#: dev.php:20 -#: docs.php:46 -#: docs.php:49 -#: docs.php:52 -#: docs.php:55 -#: docs.php:66 -#: docs.php:72 -#: docs.php:74 -#: downloads.php:84 -#: downloads.php:109 -#: downloads.php:125 -#: downloads.php:133 -#: downloads.php:144 -#: downloads.php:182 -#: downloads.php:188 -#: downloads.php:204 -#: index.php:14 +#: dev.php:20 docs.php:46 docs.php:49 docs.php:52 docs.php:55 docs.php:66 +#: docs.php:72 docs.php:74 downloads.php:85 downloads.php:110 +#: downloads.php:126 downloads.php:134 downloads.php:145 downloads.php:183 +#: downloads.php:189 downloads.php:205 index.php:14 msgid "here" msgstr "aqui" @@ -221,11 +211,17 @@ #: dev.php:38 msgid " You can help us make Gajim even better by:\n" -msgstr " Você pode nos ajudam a tornar o Gajim cada vez melhor das seguintes formas:\n" +msgstr "" +" Você pode nos ajudam a tornar o Gajim cada vez melhor das seguintes " +"formas:\n" #: dev.php:41 -msgid " Coding: contact us on our mailing list or in our room gajim(a)conference.gajim.org \n" -msgstr " Programando: entre em contato conosco em nossa lista de discussão ou em nossa sala gajim(a)conferecence.gajim.org \n" +msgid "" +" Coding: contact us on our mailing list or in our room gajim@conference." +"gajim.org \n" +msgstr "" +" Programando: entre em contato conosco em nossa lista de discussã" +"o ou em nossa sala gajim(a)conferecence.gajim.org \n" #: dev.php:44 msgid " Submitting a translation: see" @@ -237,7 +233,8 @@ #: dev.php:47 msgid " Bug reporting: in case you find a bug, do not hesitate to" -msgstr " Reportando bugs: se você encontrar algum, não hesite em" +msgstr "" +" Reportando bugs: se você encontrar algum, não hesite em" #: dev.php:47 msgid "report it" @@ -273,7 +270,9 @@ #: docs.php:19 msgid " To get one of these versions, go to the" -msgstr " Para obter uma dessas versão, vá até a página de" +msgstr "" +" Para obter uma dessas versão, vá até a pá" +"gina de" #: docs.php:19 msgid "download" @@ -283,14 +282,17 @@ msgid "page.\n" msgstr "página.\n" -#: docs.php:21 -#: downloads.php:147 +#: docs.php:21 downloads.php:148 msgid " Under GNU/Linux\n" msgstr " sob GNU/Linux\n" #: docs.php:23 -msgid " To run this version, you have to install some packages: python2.3 python2.3-gtk2 and python2.3-glade2.\n" -msgstr " Para executar essa versão, você precisa ter instalados alguns pacotes: python2.3, python2.3-gtk2 e python2.3-glade2.\n" +msgid "" +" To run this version, you have to install some packages: python2.3 " +"python2.3-gtk2 and python2.3-glade2.\n" +msgstr "" +" Para executar essa versão, você precisa ter instalados " +"alguns pacotes: python2.3, python2.3-gtk2 e python2.3-glade2.\n" #: docs.php:24 msgid " (With Debian, just run:" @@ -301,20 +303,36 @@ msgstr " Note que o python2.4 pode ser usado no lugar do python2.3.\n" #: docs.php:28 -msgid " To use the idle module, the trayicon one and the gtkspell one, you have to compile them. For idle you may need libxss-dev (if you don't have scrnsaver.h) and for the trayicon and gtkspell you can avoid compiling them, if you have gnome-python-extras." -msgstr " Para usar os módulos idle (inatividade), trayicon (bandeja do sistema) egtkspell (correção ortográfica), você precisará compilá-los. Para o idle precisará do pacote libxss-dev (se você não tiver o scrnsaver.h) e, para o trayicon e o gtkspell, você não previsa compilá-los caso tenha instalado o pacote gnome-python-extras." +msgid "" +" To use the idle module, the trayicon one and the gtkspell one, you have " +"to compile them. For idle you may need libxss-dev (if you don't have " +"scrnsaver.h) and for the trayicon and gtkspell you can avoid compiling them, " +"if you have gnome-python-extras." +msgstr "" +" Para usar os módulos idle (inatividade), trayicon (bandeja do " +"sistema) egtkspell (correção ortográfica), você " +"precisará compilá-los. Para o idle precisará do pacote " +"libxss-dev (se você não tiver o scrnsaver.h) e, para o trayicon " +"e o gtkspell, você não previsa compilá-los caso tenha " +"instalado o pacote gnome-python-extras." #: docs.php:30 msgid " In order to compile them all type" msgstr " Para compilar todos eles, digite" #: docs.php:30 -msgid "in the gajim folder. (python-dev, python-gtk2-dev, libgtkspell-dev and libgtk2.0-dev packages are needed)\n" -msgstr "no diretório gajim (os pacotes python-dex, python-gtk2-dev, libgtkspell-dev e libgtk2.0-dev são necessários\n" +msgid "" +"in the gajim folder. (python-dev, python-gtk2-dev, libgtkspell-dev and " +"libgtk2.0-dev packages are needed)\n" +msgstr "" +"no diretório gajim (os pacotes python-dex, python-gtk2-dev, " +"libgtkspell-dev e libgtk2.0-dev são necessários\n" #: docs.php:33 msgid " You can install or run from source. To run from source" -msgstr " Você pode instalar ou executar a partir do código-fonte. Para executar a partir do código-fonte" +msgstr "" +" Você pode instalar ou executar a partir do código-fonte. " +"Para executar a partir do código-fonte" #: docs.php:34 msgid "in the gajim folder." @@ -344,9 +362,7 @@ msgid " In a first time, you have to install" msgstr " Primeiramente, você precisa instalar" -#: docs.php:42 -#: downloads.php:70 -#: downloads.php:121 +#: docs.php:42 downloads.php:71 downloads.php:122 msgid "and" msgstr "e" @@ -358,27 +374,30 @@ msgid "(Gajim works with python-2.4.x)" msgstr "(o Gajim funciona com o python-2.4.x)" -#: docs.php:46 -#: docs.php:49 +#: docs.php:46 docs.php:49 msgid "and install it.\n" msgstr "e instale.\n" #: docs.php:49 -msgid " To get GTK+, download the latest version of the \"Runtime Environment\"" -msgstr " Para obter o GTK+, baixe a última versão do \"Runtime Environemt\"" +msgid "" +" To get GTK+, download the latest version of the \"Runtime Environment" +"\"" +msgstr "" +" Para obter o GTK+, baixe a última versão do \"Runtime " +"Environemt\"" #: docs.php:52 msgid " To get pygtk, download latest version " msgstr " Para obter o pygtk, baixe a última versão" -#: docs.php:52 -#: docs.php:55 +#: docs.php:52 docs.php:55 msgid " and install it.\n" msgstr " e instale.\n" #: docs.php:55 msgid " At last, to get pywin32, download latest version " -msgstr " Por fim, para obter o pywin32, baixe a última versão " +msgstr "" +" Por fim, para obter o pywin32, baixe a última versão " #: docs.php:59 msgid " You can now" @@ -422,7 +441,9 @@ #: downloads.php:9 msgid "If your distribution doesn't have the latest version " -msgstr "Se a última versão não estiver disponível para sua distribuição " +msgstr "" +"Se a última versão não estiver disponível para " +"sua distribuição " #: downloads.php:10 msgid "or the " @@ -442,7 +463,9 @@ #: downloads.php:19 msgid " A daily package from svn is also built. To use it, remove gajim" -msgstr " Todo dia, um pacote é compilado a partir do repositório SVN. para usá-lo, remova o Gajim" +msgstr "" +" Todo dia, um pacote é compilado a partir do repositório " +"SVN. para usá-lo, remova o Gajim" #: downloads.php:19 msgid "add this line to your" @@ -452,254 +475,318 @@ msgid "and install it by doing" msgstr "e instale fazendo" -#: downloads.php:31 +#: downloads.php:24 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + +#: downloads.php:32 msgid "Soon available here." msgstr "Em breve disponível aqui" -#: downloads.php:40 +#: downloads.php:41 msgid " If you use Ubuntu universe repository do" -msgstr " Se você usa o Ubuntu com repositório universe, faça" +msgstr "" +" Se você usa o Ubuntu com repositório universe, faça" -#: downloads.php:48 +#: downloads.php:49 msgid " You can install Gajim provided you have Fedora Extras repository by" -msgstr " Você pode instalar o Gajim fornecido pelo repositóri Fedora Extrasda seguinte forma" +msgstr "" +" Você pode instalar o Gajim fornecido pelo repositóri Fedora " +"Extrasda seguinte forma" -#: downloads.php:53 +#: downloads.php:54 msgid " Gentoo\n" msgstr " Gentoo\n" -#: downloads.php:56 -#: downloads.php:63 -#: downloads.php:91 +#: downloads.php:57 downloads.php:64 downloads.php:92 msgid " Just" msgstr " Apenas" -#: downloads.php:60 +#: downloads.php:61 msgid " Archlinux\n" msgstr " Archlinux\n" -#: downloads.php:67 +#: downloads.php:68 msgid " SUSE\n" msgstr " SUSE\n" -#: downloads.php:70 +#: downloads.php:71 msgid " You need: " msgstr " Você precisa: " -#: downloads.php:70 +#: downloads.php:71 msgid "gajim rpm" msgstr "gajim rpm" -#: downloads.php:70 +#: downloads.php:71 msgid "pydns rpm" msgstr "pydns rpm" -#: downloads.php:70 +#: downloads.php:71 msgid "python-sqlite2 rpm" msgstr "pacote RPM do python-sqlite" -#: downloads.php:74 +#: downloads.php:75 msgid " PLD\n" msgstr " PLD\n" -#: downloads.php:77 -msgid " Gajim is at the moment in the ac-ready tree (it is turned off by default, so you may need to check your poldek configuration) and can be installed by typing " -msgstr " O Gajim está, no momento, na árvore ac-ready (está iativa por padrão, então você precisa checar a configuração do poldek) e pode serinstalado digitando " +#: downloads.php:78 +msgid "" +" Gajim is at the moment in the ac-ready tree (it is turned off by " +"default, so you may need to check your poldek configuration) and can be " +"installed by typing " +msgstr "" +" O Gajim está, no momento, na árvore ac-ready (está " +"iativa por padrão, então você precisa checar a " +"configuração do poldek) e pode serinstalado digitando " -#: downloads.php:81 +#: downloads.php:82 msgid " SourceMage\n" msgstr " SourceMage\n" -#: downloads.php:84 +#: downloads.php:85 msgid " Use files available " msgstr " Use os arquivos disponíveis " -#: downloads.php:96 +#: downloads.php:97 msgid " FreeBSD\n" msgstr " FreeBSD\n" -#: downloads.php:99 +#: downloads.php:100 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " -msgstr " O Gajim está disponível para o FreeBSD através dos ports. Apenas " +msgstr "" +" O Gajim está disponível para o FreeBSD através dos " +"ports. Apenas " -#: downloads.php:101 -#: downloads.php:112 +#: downloads.php:102 downloads.php:113 msgid "Find out more" msgstr "Encontre mais" -#: downloads.php:105 +#: downloads.php:106 msgid " Autopackage\n" msgstr " Autopackage\n" -#: downloads.php:109 +#: downloads.php:110 msgid " You can download the autopackage " msgstr " Voc&ecirc pode baixar o autopackage " -#: downloads.php:110 +#: downloads.php:111 msgid "To use it: make it executable, run it and follow the instructions.\n" -msgstr "Para usá-lo: transforme-no em executável, execute e siga as instruções.\n" +msgstr "" +"Para usá-lo: transforme-no em executável, execute e siga as " +"instruções.\n" -#: downloads.php:118 +#: downloads.php:119 msgid " Windows installer\n" msgstr " Instalador para Windows\n" -#: downloads.php:121 +#: downloads.php:122 msgid " There is a Gajim installer " msgstr " Há um instalador do Gajim " -#: downloads.php:121 +#: downloads.php:122 msgid "with GTK+ included" msgstr "com o GTK+ incluso" -#: downloads.php:121 +#: downloads.php:122 msgid "without GTK+" msgstr "sem o GTK+" -#: downloads.php:125 -msgid " If you got the installer without GTK, you will have to download the latest version of the GTK+ Runtime Environment" -msgstr " Se você pegou o instalador sem o GTK, será necessário baixar a última versão do GTK+ Runtime Environment" +#: downloads.php:126 +msgid "" +" If you got the installer without GTK, you will have to download the " +"latest version of the GTK+ Runtime Environment" +msgstr "" +" Se você pegou o instalador sem o GTK, será necessá" +"rio baixar a última versão do GTK+ Runtime Environment" -#: downloads.php:125 -msgid "You can skip this, if you already have a GTK+ Runtime installed with libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade is missing)" -msgstr "Você pode ignorar isso caso já possua o GTK+ Runtime Environment instalado com suporte a libglade; o GTK+ Runtime do gimp-win.sf.netNÂO funcionará (pois lhe falta o libglade)" +#: downloads.php:126 +msgid "" +"You can skip this, if you already have a GTK+ Runtime installed with " +"libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade " +"is missing)" +msgstr "" +"Você pode ignorar isso caso já possua o GTK+ Runtime " +"Environment instalado com suporte a libglade; o GTK+ Runtime do gimp-win.sf." +"netNÂO funcionará (pois lhe falta o libglade)" -#: downloads.php:130 +#: downloads.php:131 msgid " Source\n" msgstr " Código-fonte\n" -#: downloads.php:133 +#: downloads.php:134 msgid " The tarball version of Gajim is " -msgstr " A versão do pacote de código-fonte do Gajim é " +msgstr "" +" A versão do pacote de código-fonte do Gajim é " -#: downloads.php:133 +#: downloads.php:134 msgid "For information on how to build Gajim," msgstr "Para mais informações sobre como compilar o Gajim," -#: downloads.php:133 +#: downloads.php:134 msgid "in English" msgstr "em inglês" -#: downloads.php:135 -msgid "If you want to use the last unstable development version, then you should checkout the subversion repository.\n" -msgstr "Se você quiser usar a última versão instável de desenvolvimento, precisará checar o repositório do subversion.\n" +#: downloads.php:136 +msgid "" +"If you want to use the last unstable development version, then you should " +"checkout the subversion repository.\n" +msgstr "" +"Se você quiser usar a última versão instável de " +"desenvolvimento, precisará checar o repositório do " +"subversion.\n" -#: downloads.php:141 +#: downloads.php:142 msgid " Subversion\n" msgstr " Subversion\n" -#: downloads.php:144 +#: downloads.php:145 msgid " The subversion server is available at this address: " -msgstr " O servidor subversion está disponível no seguinte endereço: " +msgstr "" +" O servidor subversion está disponível no seguinte " +"endereço: " -#: downloads.php:144 +#: downloads.php:145 msgid "and viewable" msgstr "e visualizável" -#: downloads.php:149 +#: downloads.php:150 msgid " In order to download Gajim sources, here is what you have to do:\n" -msgstr " Para baixar o código-font do Gajim, faça o seguinte:\n" +msgstr "" +" Para baixar o código-font do Gajim, faça o seguinte:\n" -#: downloads.php:150 -msgid " You first have to install subversion (apt-get install subversion under Debian)\n" -msgstr " Primeiramente você previsa instalar o subversion(apt-get install subversion no Debian)\n" +#: downloads.php:151 +msgid "" +" You first have to install subversion (apt-get install subversion " +"under Debian)\n" +msgstr "" +" Primeiramente você previsa instalar o subversion(apt-get " +"install subversion no Debian)\n" -#: downloads.php:152 +#: downloads.php:153 msgid " Then in a console, enter the following commands:\n" msgstr " Então, em um console, dê os seguinte comandos:\n" -#: downloads.php:160 +#: downloads.php:161 msgid " Install dependencies, and build Gajim. Please see the" msgstr " Instale as dependências e compile o Gajim. Por favor leia a" -#: downloads.php:160 +#: downloads.php:161 msgid "English" msgstr "Inglês" -#: downloads.php:160 +#: downloads.php:161 msgid "for details.\n" msgstr "para mais detalhes.\n" -#: downloads.php:163 +#: downloads.php:164 msgid " You can run Gajim by typing the following:\n" msgstr " Você pode executar o Gajim digitando o seguinte:\n" -#: downloads.php:167 +#: downloads.php:168 msgid "and then" msgstr "e então" -#: downloads.php:171 -msgid " Once you have the repository, you can update it periodicaly so it matches the latest version from the server with the following command:\n" -msgstr " Uma vez que você tenha o repositório, poderá atualizá-lo periodicamente, sincronizando a sua versão com a versão do servidor com o seguinte comando:\n" +#: downloads.php:172 +msgid "" +" Once you have the repository, you can update it periodicaly so it matches " +"the latest version from the server with the following command:\n" +msgstr "" +" Uma vez que você tenha o repositório, poderá " +"atualizá-lo periodicamente, sincronizando a sua versão com a " +"versão do servidor com o seguinte comando:\n" -#: downloads.php:180 +#: downloads.php:181 msgid " Under Windows\n" msgstr " No Windows\n" -#: downloads.php:182 -msgid " You first have to install subversion for windows. In order to do that, download the binary" -msgstr " Primeiramente, você precisa instalar o Subversion para Windows. Para isso, baixe o binário executável" +#: downloads.php:183 +msgid "" +" You first have to install subversion for windows. In order to do that, " +"download the binary" +msgstr "" +" Primeiramente, você precisa instalar o Subversion para Windows. " +"Para isso, baixe o binário executável" -#: downloads.php:184 -msgid " Once subversion is installed, the commands are the same with those under GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter them in an MS-DOS command line and you're done." -msgstr " Uma vez que o Subversion esteja instalado, os comandos são os mesmo da versão para GNU/Linux. A única diferença é que você deverá rodar o launch.bat ao invés de launch.sh. Entre com os comandos no prompt do MS-DOS e estará feito." +#: downloads.php:185 +msgid "" +" Once subversion is installed, the commands are the same with those under " +"GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " +"them in an MS-DOS command line and you're done." +msgstr "" +" Uma vez que o Subversion esteja instalado, os comandos são os " +"mesmo da versão para GNU/Linux. A única diferença " +"é que você deverá rodar o launch.bat ao invés de " +"launch.sh. Entre com os comandos no prompt do MS-DOS e estará feito." -#: downloads.php:186 +#: downloads.php:187 msgid " You can also use a graphical program like" msgstr " Você também pode usar um programa gráfico, como" -#: downloads.php:186 +#: downloads.php:187 msgid "to get the latest Subversion version\n" msgstr "para obter a última versão do Subversion\n" -#: downloads.php:188 +#: downloads.php:189 msgid " To run Gajim, you need" msgstr " Para rodar o Gajim, você precisa" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" msgstr "(Versão 2.10.x ou superior, PyGTK versão < 2.10 está disponível" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.4 or higher, 2.5 is recommended)," msgstr "(Versão 2.4 ou superior, 2.5 recomendada)," -#: downloads.php:188 -msgid "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from gimp-win.sf.net will NOT work (libglade is missing)," -msgstr "(Versão 2.6 ou superior, 2.10.x recomendada) NOTA: o GTK+ Runtime do gimp-win.sf.net NÃO vai funcionar (falta a libglade)," +#: downloads.php:189 +msgid "" +"(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " +"gimp-win.sf.net will NOT work (libglade is missing)," +msgstr "" +"(Versão 2.6 ou superior, 2.10.x recomendada) NOTA: o GTK+ Runtime do gimp-" +"win.sf.net NÃO vai funcionar (falta a libglade)," -#: downloads.php:188 +#: downloads.php:189 msgid "GTK Runtime Environment" msgstr "GTK Runtime Environment" -#: downloads.php:188 +#: downloads.php:189 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" msgstr "PyGTK para Windows (PyGTK com pycairo e pygobject)" -#: downloads.php:188 +#: downloads.php:189 msgid "and at last" msgstr "e, por último," -#: downloads.php:188 +#: downloads.php:189 msgid "by Mark Hammond." msgstr "por Mark Hammond" -#: downloads.php:193 +#: downloads.php:194 msgid " Daily Snapshots\n" msgstr " Snapshots diários\n" -#: downloads.php:196 -msgid " Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can use them if svn is broken for you at the moment." -msgstr "Todos os dias, às 01:00 (fuso horário GMT+1), os pacotes bz2 são gerados a partir do svn. Você pode usá-los se o svn não estiver funcionando pra você no momento." +#: downloads.php:197 +msgid "" +" Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can " +"use them if svn is broken for you at the moment." +msgstr "" +"Todos os dias, às 01:00 (fuso horário GMT+1), os pacotes bz2 " +"são gerados a partir do svn. Você pode usá-los se o svn " +"não estiver funcionando pra você no momento." -#: downloads.php:196 +#: downloads.php:197 msgid "Here to get them" msgstr "Aqui para obtê-los" -#: downloads.php:201 +#: downloads.php:202 msgid " Old releases\n" msgstr " Lançamentos antigos\n" -#: downloads.php:204 +#: downloads.php:205 msgid " You'll find old releases of Gajim" msgstr " Você vai encontrar lançamentos antigos do Gajim" @@ -708,8 +795,17 @@ msgstr "Olá! Seja bem-vindo ao website do projeto Gajim" #: index.php:14 -msgid "The goal of Gajim is to provide a full featured and easy to use Jabber client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better please send tickets" -msgstr "O objetivo do Gajim é fornecer um cliente Jabber completo e fácil de usar. O Gajim funciona muito bem com o GNOME, mas não precisa dele para rodar. Ele é lançado sob a Licença Pública Geral GNU (GPL). Se você encontrar falhas ou tiver idéias de como o Gajim pode ficar melhor, por favor, envie um tíquete." +msgid "" +"The goal of Gajim is to provide a full featured and easy to use Jabber " +"client. Gajim works nicely with GNOME, but does not require it to run. It is " +"released under the GNU General Public License. If you find bugs or have " +"ideas how Gajim can be better please send tickets" +msgstr "" +"O objetivo do Gajim é fornecer um cliente Jabber completo e fá" +"cil de usar. O Gajim funciona muito bem com o GNOME, mas não precisa " +"dele para rodar. Ele é lançado sob a Licença Pú" +"blica Geral GNU (GPL). Se você encontrar falhas ou tiver idéias " +"de como o Gajim pode ficar melhor, por favor, envie um tíquete." #: index.php:22 msgid "FEATURES:" @@ -733,7 +829,9 @@ #: index.php:28 msgid "Trayicon, Speller, extented chat history functionalities" -msgstr "Ícone da bandeja, Corretor ortográfico, funções avançadas de histórico de conversas" +msgstr "" +"Ícone da bandeja, Corretor ortográfico, funções " +"avançadas de histórico de conversas" #: index.php:29 msgid "TLS and GPG support (with SSL legacy support)" @@ -749,7 +847,9 @@ #: index.php:32 msgid "Wikipedia, dictionary and search engine lookup" -msgstr "Sistema de procura em mecanismos de busca, dicionários e Wikipédia" +msgstr "" +"Sistema de procura em mecanismos de busca, dicionários e Wikipé" +"dia" #: index.php:33 msgid "Multiple accounts support" @@ -768,8 +868,16 @@ msgstr "Console XML" #: index.php:36 -msgid "Gajim is available in 24 languages: Basque, Belarusian, Brasilian, Breton, British, Bulgarian, Chinese (simplified), Croatian, Czech, Dutch, English, Esperanto, French, German, Greek, Italian, Norwegian (Bokmål), Polish, Portugese, Russian, Serbian, Spanish, Slovak and Swedish" -msgstr "O Gajim está diponível em 24 idiomas: alemão, basco, bielorusso, bretão, búlgaro, chinês (simplificado), croata, eslovaco, espanhol, esperanto, francês, grego, holandês, inglês, inglês britânico, italiano, norueguês, polonês, português, português do Brasil, russo, sérvio, sueco e tcheco" +msgid "" +"Gajim is available in 24 languages: Basque, Belarusian, Brasilian, Breton, " +"British, Bulgarian, Chinese (simplified), Croatian, Czech, Dutch, English, " +"Esperanto, French, German, Greek, Italian, Norwegian (Bokmål), Polish, " +"Portugese, Russian, Serbian, Spanish, Slovak and Swedish" +msgstr "" +"O Gajim está diponível em 24 idiomas: alemão, basco, bielorusso, bretão, " +"búlgaro, chinês (simplificado), croata, eslovaco, espanhol, esperanto, " +"francês, grego, holandês, inglês, inglês britânico, italiano, norueguês, " +"polonês, português, português do Brasil, russo, sérvio, sueco e tcheco" #: index.php:46 msgid "NEWS" @@ -811,34 +919,28 @@ msgid "Version 0.11 of Gajim has been released." msgstr "A versão 0.11 do Gajim é lançada." -#: index.php:61 -#: index.php:62 -#: index.php:63 +#: index.php:61 index.php:62 index.php:63 msgid "What's new since " msgstr "O que há de novo desde" -#: index.php:66 -#: index.php:78 +#: index.php:66 index.php:78 msgid "Fix Idle and non-ascii languages under Windows" msgstr "Corrigidos os idiomas ociosos e não-ASCII no Windows" -#: index.php:67 -#: index.php:79 +#: index.php:67 index.php:79 msgid "Fix International Domain Name usage" -msgstr "Corrigo uso de nome de domínio internacional (Internacional Domain Name)" +msgstr "" +"Corrigo uso de nome de domínio internacional (Internacional Domain Name)" -#: index.php:68 -#: index.php:80 +#: index.php:68 index.php:80 msgid "Fixed avatars cache problems in group chats" msgstr "Corrigido problema com cache do avatar em salas de conferência" -#: index.php:69 -#: index.php:81 +#: index.php:69 index.php:81 msgid "Support of XEP-0202 (Entity Time)" msgstr "Suporte a XEP-0202 (horário de entidade)" -#: index.php:70 -#: index.php:82 +#: index.php:70 index.php:82 msgid "Support of XEP-0199 (XMPP Ping)" msgstr "Suporte a XEP-0199 (ping XMPP)" @@ -850,15 +952,11 @@ msgid "Fix pubsub usage" msgstr "Corrigido uso de \"pubsub\"" -#: index.php:73 -#: index.php:83 -#: index.php:95 +#: index.php:73 index.php:83 index.php:95 msgid "Full ChangeLog" msgstr "Registro Completo das Alterações" -#: index.php:74 -#: index.php:84 -#: index.php:96 +#: index.php:74 index.php:84 index.php:96 msgid "Bugs/Annoyances closed" msgstr "Problemas resolvidos" @@ -893,4 +991,3 @@ #: screenshots.php:11 msgid "Here are some screenshots of Gajim:" msgstr "Aqui estão alguns screenshots do Gajim:" - Modified: www-website/locale/ru_RU/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/ru_RU/LC_MESSAGES/msg.po 2007-07-21 14:58:56 UTC (rev 8417) +++ www-website/locale/ru_RU/LC_MESSAGES/msg.po 2007-07-21 15:43:46 UTC (rev 8418) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-31 17:29+0200\n" +"POT-Creation-Date: 2007-07-21 17:42+0200\n" "PO-Revision-Date: 2007-02-19 20:59+0400\n" "Last-Translator: Sergey Y. Khlutchin <root@s915>\n" "Language-Team: Russian <ru(a)li.org>\n" @@ -167,9 +167,9 @@ msgstr " Архивы списка рассылки доступны " #: dev.php:20 docs.php:46 docs.php:49 docs.php:52 docs.php:55 docs.php:66 -#: docs.php:72 docs.php:74 downloads.php:84 downloads.php:109 -#: downloads.php:125 downloads.php:133 downloads.php:144 downloads.php:182 -#: downloads.php:188 downloads.php:204 index.php:14 +#: docs.php:72 docs.php:74 downloads.php:85 downloads.php:110 +#: downloads.php:126 downloads.php:134 downloads.php:145 downloads.php:183 +#: downloads.php:189 downloads.php:205 index.php:14 msgid "here" msgstr "здесь" @@ -276,7 +276,7 @@ msgid "page.\n" msgstr ".\n" -#: docs.php:21 downloads.php:147 +#: docs.php:21 downloads.php:148 msgid " Under GNU/Linux\n" msgstr " В GNU/Linux\n" @@ -354,7 +354,7 @@ msgid " In a first time, you have to install" msgstr " Сначала вы должны установить" -#: docs.php:42 downloads.php:70 downloads.php:121 +#: docs.php:42 downloads.php:71 downloads.php:122 msgid "and" msgstr "и" @@ -464,57 +464,63 @@ msgid "and install it by doing" msgstr "и установите его с помощью" -#: downloads.php:31 +#: downloads.php:24 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + +#: downloads.php:32 msgid "Soon available here." msgstr "Скоро будет здесь." -#: downloads.php:40 +#: downloads.php:41 msgid " If you use Ubuntu universe repository do" msgstr " Если вы используете репозиторий Ubuntu unuverse, дайте команду" -#: downloads.php:48 +#: downloads.php:49 msgid " You can install Gajim provided you have Fedora Extras repository by" msgstr "" " Вы можете установить Gajim, если у вас есть репозиторий Fedora Extras, " "командой" -#: downloads.php:53 +#: downloads.php:54 msgid " Gentoo\n" msgstr " Gentoo\n" -#: downloads.php:56 downloads.php:63 downloads.php:91 +#: downloads.php:57 downloads.php:64 downloads.php:92 msgid " Just" msgstr " Просто" -#: downloads.php:60 +#: downloads.php:61 msgid " Archlinux\n" msgstr " Archlinux\n" -#: downloads.php:67 +#: downloads.php:68 msgid " SUSE\n" msgstr " SUSE\n" -#: downloads.php:70 +#: downloads.php:71 msgid " You need: " msgstr " Вам нужно: " -#: downloads.php:70 +#: downloads.php:71 msgid "gajim rpm" msgstr "rpm для gajim" -#: downloads.php:70 +#: downloads.php:71 msgid "pydns rpm" msgstr "rpm для pydns" -#: downloads.php:70 +#: downloads.php:71 msgid "python-sqlite2 rpm" msgstr "rpm для python-sqlite2" -#: downloads.php:74 +#: downloads.php:75 msgid " PLD\n" msgstr " PLD\n" -#: downloads.php:77 +#: downloads.php:78 msgid "" " Gajim is at the moment in the ac-ready tree (it is turned off by " "default, so you may need to check your poldek configuration) and can be " @@ -523,57 +529,57 @@ " Gajim на сей момент есть в дереве ac-ready (он отключен по-умолчанию, " "так что проверьте свои настройки poldek) и может быть установлен командой " -#: downloads.php:81 +#: downloads.php:82 msgid " SourceMage\n" msgstr " SourceMage\n" -#: downloads.php:84 +#: downloads.php:85 msgid " Use files available " msgstr " Используйте файлы доступные " -#: downloads.php:96 +#: downloads.php:97 msgid " FreeBSD\n" msgstr " FreeBSD\n" -#: downloads.php:99 +#: downloads.php:100 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr " Gajim доступен в FreeBSD через FreeBSD порты. Просто " -#: downloads.php:101 downloads.php:112 +#: downloads.php:102 downloads.php:113 msgid "Find out more" msgstr "Узнайте больше" -#: downloads.php:105 +#: downloads.php:106 msgid " Autopackage\n" msgstr " Autopackage\n" -#: downloads.php:109 +#: downloads.php:110 msgid " You can download the autopackage " msgstr " Вы можете загрузить автопакет " -#: downloads.php:110 +#: downloads.php:111 msgid "To use it: make it executable, run it and follow the instructions.\n" msgstr "" "Чтобы использовать его: сделайте его исполняемым, зпустите и следуйте " "инструкциям.\n" -#: downloads.php:118 +#: downloads.php:119 msgid " Windows installer\n" msgstr " Установщик для Windows\n" -#: downloads.php:121 +#: downloads.php:122 msgid " There is a Gajim installer " msgstr " Здесь есть установщик Gajim " -#: downloads.php:121 +#: downloads.php:122 msgid "with GTK+ included" msgstr "содержащий GTK+" -#: downloads.php:121 +#: downloads.php:122 msgid "without GTK+" msgstr "без GTK+" -#: downloads.php:125 +#: downloads.php:126 msgid "" " If you got the installer without GTK, you will have to download the " "latest version of the GTK+ Runtime Environment" @@ -581,7 +587,7 @@ " Если вы взяли установщик без GTK, вам нужно скачать самую последнюю " "версию Среды Исполнения GTK+" -#: downloads.php:125 +#: downloads.php:126 msgid "" "You can skip this, if you already have a GTK+ Runtime installed with " "libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade " @@ -591,23 +597,23 @@ "поддержкой libglade; Среда GTK+ из gimp-win.sf.net не подходит (из-за " "отсутствия libglade)" -#: downloads.php:130 +#: downloads.php:131 msgid " Source\n" msgstr " Исходный текст\n" -#: downloads.php:133 +#: downloads.php:134 msgid " The tarball version of Gajim is " msgstr " Tar-архив Gajim " -#: downloads.php:133 +#: downloads.php:134 msgid "For information on how to build Gajim," msgstr "Для информации, как собрать Gajim," -#: downloads.php:133 +#: downloads.php:134 msgid "in English" msgstr "по-английски" -#: downloads.php:135 +#: downloads.php:136 msgid "" "If you want to use the last unstable development version, then you should " "checkout the subversion repository.\n" @@ -615,23 +621,23 @@ "Если вы хотите пользоваться последней нестабильной версией для " "разработчиков, то вам нужно загрузить subversion-репозиторий.\n" -#: downloads.php:141 +#: downloads.php:142 msgid " Subversion\n" msgstr " Subversion\n" -#: downloads.php:144 +#: downloads.php:145 msgid " The subversion server is available at this address: " msgstr " Subversion-сервер доступен по данному адресу: " -#: downloads.php:144 +#: downloads.php:145 msgid "and viewable" msgstr "и для просмотра" -#: downloads.php:149 +#: downloads.php:150 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr " Чтобы загрузить исходники Gajim, вам нужно сделать следующее:\n" -#: downloads.php:150 +#: downloads.php:151 msgid "" " You first have to install subversion (apt-get install subversion " "under Debian)\n" @@ -639,31 +645,31 @@ " Сначала установите subversion (apt-get install subversion в " "Debian)\n" -#: downloads.php:152 +#: downloads.php:153 msgid " Then in a console, enter the following commands:\n" msgstr " За тем в консоли введите следующие команды:\n" -#: downloads.php:160 +#: downloads.php:161 msgid " Install dependencies, and build Gajim. Please see the" msgstr " Установите зависимости и собирайте Gajim. Пожалуйста, смотрите " -#: downloads.php:160 +#: downloads.php:161 msgid "English" msgstr "по-английски" -#: downloads.php:160 +#: downloads.php:161 msgid "for details.\n" msgstr "для подробной информации.\n" -#: downloads.php:163 +#: downloads.php:164 msgid " You can run Gajim by typing the following:\n" msgstr " Вы можете запустить Gajim набрав следующее:\n" -#: downloads.php:167 +#: downloads.php:168 msgid "and then" msgstr "а за тем" -#: downloads.php:171 +#: downloads.php:172 msgid "" " Once you have the repository, you can update it periodicaly so it matches " "the latest version from the server with the following command:\n" @@ -671,11 +677,11 @@ " Имея уже однажды загруженный репозиторий, вы можете обновлять его, чтобы " "он соответствовал последней версии на сервере, следующей командой:\n" -#: downloads.php:180 +#: downloads.php:181 msgid " Under Windows\n" msgstr " В Windows\n" -#: downloads.php:182 +#: downloads.php:183 msgid "" " You first have to install subversion for windows. In order to do that, " "download the binary" @@ -683,7 +689,7 @@ " Сначала вам нужно устновить subversion для windows. Чтобы это сделать, " "загрузите исполняемый файл" -#: downloads.php:184 +#: downloads.php:185 msgid "" " Once subversion is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " @@ -693,27 +699,27 @@ "Linux. Единственное отличие, что вместо launch.sh вы должны запускать launch." "bat. Вводите их в командной строке MS-DOS." -#: downloads.php:186 +#: downloads.php:187 msgid " You can also use a graphical program like" msgstr " Вы можете так же использовать графическую программу как" -#: downloads.php:186 +#: downloads.php:187 msgid "to get the latest Subversion version\n" msgstr "чтобы получить последнюю версию от Subversion\n" -#: downloads.php:188 +#: downloads.php:189 msgid " To run Gajim, you need" msgstr " Чтобы запустить Gajim, вам требуется" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" msgstr "(Версия 2.10.x или новее, PyGTK версии < 2.10 доступен" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.4 or higher, 2.5 is recommended)," msgstr "(Версия 2.4 или новее, рекомендуется 2.5)," -#: downloads.php:188 +#: downloads.php:189 msgid "" "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " "gimp-win.sf.net will NOT work (libglade is missing)," @@ -721,27 +727,27 @@ "(Версия 2.6.x или новее, рекомендуется 2.10.x) ЗАМЕТЬТЕ, что Среда " "Исполнения GTK+ от gimp-win.sf.net не подходит (нет libglade)," -#: downloads.php:188 +#: downloads.php:189 msgid "GTK Runtime Environment" msgstr "Среда Исполнения GTK" -#: downloads.php:188 +#: downloads.php:189 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" msgstr "PyGTK для Windows (PyGTK с pycairo и pygobject)" -#: downloads.php:188 +#: downloads.php:189 msgid "and at last" msgstr "и наконец" -#: downloads.php:188 +#: downloads.php:189 msgid "by Mark Hammond." msgstr "от Mark Hammond." -#: downloads.php:193 +#: downloads.php:194 msgid " Daily Snapshots\n" msgstr " Ежедневные архивы\n" -#: downloads.php:196 +#: downloads.php:197 msgid "" " Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can " "use them if svn is broken for you at the moment." @@ -749,15 +755,15 @@ " Ежедневно в 01:00 (по времени GMT+1) создаются bz2-архивы из svn. Вы " "можете использовать их, если svn испорчен или недоступен на данный момент." -#: downloads.php:196 +#: downloads.php:197 msgid "Here to get them" msgstr "Возмите их здесь" -#: downloads.php:201 +#: downloads.php:202 msgid " Old releases\n" msgstr " Старые выпуски\n" -#: downloads.php:204 +#: downloads.php:205 msgid " You'll find old releases of Gajim" msgstr " Вы найдёте старые выпуски Gajim" Modified: www-website/msg.pot =================================================================== --- www-website/msg.pot 2007-07-21 14:58:56 UTC (rev 8417) +++ www-website/msg.pot 2007-07-21 15:43:46 UTC (rev 8418) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-05-31 17:29+0200\n" +"POT-Creation-Date: 2007-07-21 17:42+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -163,9 +163,9 @@ msgstr "" #: dev.php:20 docs.php:46 docs.php:49 docs.php:52 docs.php:55 docs.php:66 -#: docs.php:72 docs.php:74 downloads.php:84 downloads.php:109 -#: downloads.php:125 downloads.php:133 downloads.php:144 downloads.php:182 -#: downloads.php:188 downloads.php:204 index.php:14 +#: docs.php:72 docs.php:74 downloads.php:85 downloads.php:110 +#: downloads.php:126 downloads.php:134 downloads.php:145 downloads.php:183 +#: downloads.php:189 downloads.php:205 index.php:14 msgid "here" msgstr "" @@ -267,7 +267,7 @@ msgid "page.\n" msgstr "" -#: docs.php:21 downloads.php:147 +#: docs.php:21 downloads.php:148 msgid " Under GNU/Linux\n" msgstr "" @@ -335,7 +335,7 @@ msgid " In a first time, you have to install" msgstr "" -#: docs.php:42 downloads.php:70 downloads.php:121 +#: docs.php:42 downloads.php:71 downloads.php:122 msgid "and" msgstr "" @@ -441,274 +441,280 @@ msgid "and install it by doing" msgstr "" -#: downloads.php:31 +#: downloads.php:24 +msgid "" +"You can get the GPG key of this package by installing gajim-dev-keyring " +"package from the same repository. Just do" +msgstr "" + +#: downloads.php:32 msgid "Soon available here." msgstr "" -#: downloads.php:40 +#: downloads.php:41 msgid " If you use Ubuntu universe repository do" msgstr "" -#: downloads.php:48 +#: downloads.php:49 msgid " You can install Gajim provided you have Fedora Extras repository by" msgstr "" -#: downloads.php:53 +#: downloads.php:54 msgid " Gentoo\n" msgstr "" -#: downloads.php:56 downloads.php:63 downloads.php:91 +#: downloads.php:57 downloads.php:64 downloads.php:92 msgid " Just" msgstr "" -#: downloads.php:60 +#: downloads.php:61 msgid " Archlinux\n" msgstr "" -#: downloads.php:67 +#: downloads.php:68 msgid " SUSE\n" msgstr "" -#: downloads.php:70 +#: downloads.php:71 msgid " You need: " msgstr "" -#: downloads.php:70 +#: downloads.php:71 msgid "gajim rpm" msgstr "" -#: downloads.php:70 +#: downloads.php:71 msgid "pydns rpm" msgstr "" -#: downloads.php:70 +#: downloads.php:71 msgid "python-sqlite2 rpm" msgstr "" -#: downloads.php:74 +#: downloads.php:75 msgid " PLD\n" msgstr "" -#: downloads.php:77 +#: downloads.php:78 msgid "" " Gajim is at the moment in the ac-ready tree (it is turned off by " "default, so you may need to check your poldek configuration) and can be " "installed by typing " msgstr "" -#: downloads.php:81 +#: downloads.php:82 msgid " SourceMage\n" msgstr "" -#: downloads.php:84 +#: downloads.php:85 msgid " Use files available " msgstr "" -#: downloads.php:96 +#: downloads.php:97 msgid " FreeBSD\n" msgstr "" -#: downloads.php:99 +#: downloads.php:100 msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr "" -#: downloads.php:101 downloads.php:112 +#: downloads.php:102 downloads.php:113 msgid "Find out more" msgstr "" -#: downloads.php:105 +#: downloads.php:106 msgid " Autopackage\n" msgstr "" -#: downloads.php:109 +#: downloads.php:110 msgid " You can download the autopackage " msgstr "" -#: downloads.php:110 +#: downloads.php:111 msgid "To use it: make it executable, run it and follow the instructions.\n" msgstr "" -#: downloads.php:118 +#: downloads.php:119 msgid " Windows installer\n" msgstr "" -#: downloads.php:121 +#: downloads.php:122 msgid " There is a Gajim installer " msgstr "" -#: downloads.php:121 +#: downloads.php:122 msgid "with GTK+ included" msgstr "" -#: downloads.php:121 +#: downloads.php:122 msgid "without GTK+" msgstr "" -#: downloads.php:125 +#: downloads.php:126 msgid "" " If you got the installer without GTK, you will have to download the " "latest version of the GTK+ Runtime Environment" msgstr "" -#: downloads.php:125 +#: downloads.php:126 msgid "" "You can skip this, if you already have a GTK+ Runtime installed with " "libglade support; GTK+ Runtime from gimp-win.sf.net will NOT work (libglade " "is missing)" msgstr "" -#: downloads.php:130 +#: downloads.php:131 msgid " Source\n" msgstr "" -#: downloads.php:133 +#: downloads.php:134 msgid " The tarball version of Gajim is " msgstr "" -#: downloads.php:133 +#: downloads.php:134 msgid "For information on how to build Gajim," msgstr "" -#: downloads.php:133 +#: downloads.php:134 msgid "in English" msgstr "" -#: downloads.php:135 +#: downloads.php:136 msgid "" "If you want to use the last unstable development version, then you should " "checkout the subversion repository.\n" msgstr "" -#: downloads.php:141 +#: downloads.php:142 msgid " Subversion\n" msgstr "" -#: downloads.php:144 +#: downloads.php:145 msgid " The subversion server is available at this address: " msgstr "" -#: downloads.php:144 +#: downloads.php:145 msgid "and viewable" msgstr "" -#: downloads.php:149 +#: downloads.php:150 msgid " In order to download Gajim sources, here is what you have to do:\n" msgstr "" -#: downloads.php:150 +#: downloads.php:151 msgid "" " You first have to install subversion (apt-get install subversion " "under Debian)\n" msgstr "" -#: downloads.php:152 +#: downloads.php:153 msgid " Then in a console, enter the following commands:\n" msgstr "" -#: downloads.php:160 +#: downloads.php:161 msgid " Install dependencies, and build Gajim. Please see the" msgstr "" -#: downloads.php:160 +#: downloads.php:161 msgid "English" msgstr "" -#: downloads.php:160 +#: downloads.php:161 msgid "for details.\n" msgstr "" -#: downloads.php:163 +#: downloads.php:164 msgid " You can run Gajim by typing the following:\n" msgstr "" -#: downloads.php:167 +#: downloads.php:168 msgid "and then" msgstr "" -#: downloads.php:171 +#: downloads.php:172 msgid "" " Once you have the repository, you can update it periodicaly so it matches " "the latest version from the server with the following command:\n" msgstr "" -#: downloads.php:180 +#: downloads.php:181 msgid " Under Windows\n" msgstr "" -#: downloads.php:182 +#: downloads.php:183 msgid "" " You first have to install subversion for windows. In order to do that, " "download the binary" msgstr "" -#: downloads.php:184 +#: downloads.php:185 msgid "" " Once subversion is installed, the commands are the same with those under " "GNU/Linux. Only difference is instead of launch.sh you run launch.bat. Enter " "them in an MS-DOS command line and you're done." msgstr "" -#: downloads.php:186 +#: downloads.php:187 msgid " You can also use a graphical program like" msgstr "" -#: downloads.php:186 +#: downloads.php:187 msgid "to get the latest Subversion version\n" msgstr "" -#: downloads.php:188 +#: downloads.php:189 msgid " To run Gajim, you need" msgstr "" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.10.x or higher, PyGTK version < 2.10 is available" msgstr "" -#: downloads.php:188 +#: downloads.php:189 msgid "(Version 2.4 or higher, 2.5 is recommended)," msgstr "" -#: downloads.php:188 +#: downloads.php:189 msgid "" "(Version 2.6.x or higher, 2.10.x is recommended) NOTE: GTK+ Runtime from " "gimp-win.sf.net will NOT work (libglade is missing)," msgstr "" -#: downloads.php:188 +#: downloads.php:189 msgid "GTK Runtime Environment" msgstr "" -#: downloads.php:188 +#: downloads.php:189 msgid "PyGTK for Windows (PyGTK with pycairo and pygobject)" msgstr "" -#: downloads.php:188 +#: downloads.php:189 msgid "and at last" msgstr "" -#: downloads.php:188 +#: downloads.php:189 msgid "by Mark Hammond." msgstr "" -#: downloads.php:193 +#: downloads.php:194 msgid " Daily Snapshots\n" msgstr "" -#: downloads.php:196 +#: downloads.php:197 msgid "" " Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can " "use them if svn is broken for you at the moment." msgstr "" -#: downloads.php:196 +#: downloads.php:197 msgid "Here to get them" msgstr "" -#: downloads.php:201 +#: downloads.php:202 msgid " Old releases\n" msgstr "" -#: downloads.php:204 +#: downloads.php:205 msgid " You'll find old releases of Gajim" msgstr ""

1 0

[commit-gajim] r8417 - in trunk/src: . common
by asterix＠gajim.org 21 Jul '07

21 Jul '07

Author: asterix Date: 2007-07-21 16:58:56 +0200 (Sat, 21 Jul 2007) New Revision: 8417 Modified: trunk/src/common/config.py trunk/src/conversation_textview.py Log: add a limit to the number of lines displayed in conversation textview. Modified: trunk/src/common/config.py =================================================================== --- trunk/src/common/config.py 2007-07-20 00:05:38 UTC (rev 8416) +++ trunk/src/common/config.py 2007-07-21 14:58:56 UTC (rev 8417) @@ -228,6 +228,7 @@ 'scroll_roster_to_last_message': [opt_bool, True, _('If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened.')], 'use_latex': [opt_bool, False, _('If True, Gajim will convert string between $$ and $$ to an image using dvips and convert before insterting it in chat window.')], 'change_status_window_timeout': [opt_int, 15, _('Time of inactivity needed before the change status window closes down.')], + 'max_conversation_lines': [opt_int, 500, _('Maximum number of lines that are printed in conversations. Oldest lines are cleared.')], } __options_per_key = { Modified: trunk/src/conversation_textview.py =================================================================== --- trunk/src/conversation_textview.py 2007-07-20 00:05:38 UTC (rev 8416) +++ trunk/src/conversation_textview.py 2007-07-21 14:58:56 UTC (rev 8417) @@ -26,6 +26,7 @@ import tooltips import dialogs import locale +import Queue import gtkgui_helpers from common import gajim @@ -141,6 +142,10 @@ buffer.create_tag('focus-out-line', justification = gtk.JUSTIFY_CENTER) + size = gajim.config.get('max_conversation_lines') + size = 2 * size - 1 + self.marks_queue = Queue.Queue(size) + self.allow_focus_out_line = True # holds the iter's offset which points to the end of --- line self.focus_out_end_iter_offset = None @@ -315,6 +320,9 @@ buffer = self.tv.get_buffer() start, end = buffer.get_bounds() buffer.delete(start, end) + size = gajim.config.get('max_conversation_lines') + size = 2 * size - 1 + self.marks_queue = Queue.Queue(size) self.focus_out_end_iter_offset = None def visit_url_from_menuitem(self, widget, link): @@ -767,13 +775,29 @@ '''prints 'chat' type messages''' buffer = self.tv.get_buffer() buffer.begin_user_action() + if self.marks_queue.full(): + # remove oldest line + m1 = self.marks_queue.get() + m2 = self.marks_queue.get() + i1 = buffer.get_iter_at_mark(m1) + i2 = buffer.get_iter_at_mark(m2) + buffer.delete(i1, i2) + buffer.delete_mark(m1) end_iter = buffer.get_end_iter() at_the_end = False if self.at_the_end(): at_the_end = True + # Create one mark and add it to queue once if it's the first line + # else twice (one for end bound, one for start bound) + mark = None if buffer.get_char_count() > 0: buffer.insert_with_tags_by_name(end_iter, '\n', 'eol') + mark = buffer.create_mark(None, end_iter, left_gravity=True) + self.marks_queue.put(mark) + if not mark: + mark = buffer.create_mark(None, end_iter, left_gravity=True) + self.marks_queue.put(mark) if kind == 'incoming_queue': kind = 'incoming' if old_kind == 'incoming_queue':

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2007