Commits May 2007

commits@gajim.org

4 participants
63 discussions

[commit-gajim] r8185 - in trunk: data/glade src src/common src/common/xmpp
by asterix＠gajim.org 31 May '07

31 May '07

Author: asterix Date: 2007-05-31 23:49:49 +0200 (Thu, 31 May 2007) New Revision: 8185 Modified: trunk/data/glade/account_creation_wizard_window.glade trunk/src/common/connection.py trunk/src/common/xmpp/features_nb.py trunk/src/config.py trunk/src/gajim.py Log: new account registration wizard that follow XEP 77 better. fixes #2700 too (advanced options available while creation an account) Modified: trunk/data/glade/account_creation_wizard_window.glade =================================================================== --- trunk/data/glade/account_creation_wizard_window.glade 2007-05-31 20:54:46 UTC (rev 8184) +++ trunk/data/glade/account_creation_wizard_window.glade 2007-05-31 21:49:49 UTC (rev 8185) @@ -1,1244 +1,825 @@ -<?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="account_creation_wizard_window"> - <property name="border_width">12</property> - <property name="title" translatable="yes">Gajim: Account Creation Wizard</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">False</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> - <signal name="destroy" handler="on_wizard_window_destroy" last_modification_time="Thu, 03 Nov 2005 22:08:55 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox77"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkNotebook" id="notebook"> - <property name="visible">True</property> - <property name="show_tabs">False</property> - <property name="show_border">False</property> - <property name="tab_pos">GTK_POS_TOP</property> - <property name="scrollable">False</property> - <property name="enable_popup">False</property> - - <child> - <widget class="GtkVBox" id="vbox78"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="label256"> - <property name="visible">True</property> - <property name="label" translatable="yes">You need to have an account in order to connect + <widget class="GtkWindow" id="account_creation_wizard_window"> + <property name="border_width">12</property> + <property name="title" translatable="yes">Gajim: Account Creation Wizard</property> + <property name="resizable">False</property> + <signal name="destroy" handler="on_wizard_window_destroy"/> + <child> + <widget class="GtkVBox" id="vbox77"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkNotebook" id="notebook"> + <property name="visible">True</property> + <property name="show_tabs">False</property> + <property name="show_border">False</property> + <child> + <widget class="GtkVBox" id="vbox78"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <widget class="GtkLabel" id="label256"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">You need to have an account in order to connect to the Jabber network.</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</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> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkFrame" id="frame33"> + <property name="visible">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">GTK_SHADOW_NONE</property> + <child> + <widget class="GtkAlignment" id="alignment68"> + <property name="visible">True</property> + <property name="top_padding">5</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkVBox" id="vbox83"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">6</property> + <child> + <widget class="GtkRadioButton" id="use_existing_account_radiobutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">I already have an account I want to use</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkRadioButton" id="register_new_account_radiobutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">I want to _register for a new account</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">use_existing_account_radiobutton</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label269"> + <property name="visible">True</property> + <property name="label" translatable="yes">Please choose one of the options below:</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label259"> + <property name="visible">True</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="register_vbox"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">12</property> + <child> + <widget class="GtkLabel" id="label270"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Please fill in the data for your new account</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkTable" id="table27"> + <property name="visible">True</property> + <property name="n_rows">4</property> + <property name="n_columns">3</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <widget class="GtkLabel" id="jid_label"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="xalign">0</property> + <property name="use_markup">True</property> + <property name="selectable">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label258"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Your JID:</property> + </widget> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label262"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Username:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">username_entry</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="password_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="invisible_char">*</property> + <property name="activates_default">True</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="save_password_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property> + <property name="label" translatable="yes">Save pass_word</property> + <property name="use_underline">True</property> + <property name="focus_on_click">False</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_save_password_checkbutton_toggled"/> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label263"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Password:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">password_entry</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkComboBoxEntry" id="server_comboboxentry"> + <property name="visible">True</property> + <signal name="changed" handler="on_server_comboboxentry_changed"/> + <child internal-child="entry"> + <widget class="GtkEntry" id="comboboxentry-entry1"> + </widget> + </child> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label267"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Server:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="username_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="invisible_char">*</property> + <signal name="changed" handler="on_username_entry_changed"/> + <signal name="key_press_event" handler="on_username_entry_key_press_event"/> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">1</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label261"> + <property name="visible">True</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="position">1</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="vbox105"> + <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">12</property> + <child> + <widget class="GtkLabel" id="label368"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Please select a server</property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkHBox" id="hbox2997"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="label369"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Server:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkComboBoxEntry" id="server_comboboxentry1"> + <property name="visible">True</property> + <child internal-child="entry"> + <widget class="GtkEntry" id="comboboxentry-entry2"> + </widget> + </child> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="server_features_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Click to see features (like MSN, ICQ transports) of jabber servers</property> + <property name="label" translatable="yes">Servers Features</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_register_server_features_button_clicked"/> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkExpander" id="expander1"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <child> + <widget class="GtkTable" id="table32"> + <property name="visible">True</property> + <property name="border_width">5</property> + <property name="n_rows">3</property> + <property name="n_columns">3</property> + <property name="column_spacing">5</property> + <property name="row_spacing">5</property> + <child> + <widget class="GtkHBox" id="custom_host_hbox"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="spacing">6</property> + <child> + <widget class="GtkLabel" id="label380"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Hostname:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">custom_host_entry</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="custom_host_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label379"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Port:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">custom_port_entry</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="custom_port_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="width_chars">6</property> + <property name="text">5222</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> + </child> + </widget> + <packing> + <property name="right_attach">3</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="custom_host_port_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Use custom hostname/port</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <signal name="toggled" handler="on_custom_host_port_checkbutton_toggled"/> + </widget> + <packing> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkButton" id="manage_proxies_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Manage...</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_manage_proxies_button_clicked"/> + </widget> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <widget class="GtkComboBox" id="proxies_combobox"> + <property name="visible">True</property> + <property name="items">None</property> + </widget> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label381"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Prox_y:</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label378"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Advanced</property> + <property name="use_underline">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="position">2</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label367"> + <property name="visible">True</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="position">2</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="form_vbox"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="position">3</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label382"> + <property name="visible">True</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="position">3</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="vbox104"> + <property name="visible">True</property> + <child> + <widget class="GtkLabel" id="progressbar_label"> + <property name="visible">True</property> + <property name="label" translatable="yes">Connecting to server - <child> - <widget class="GtkFrame" id="frame33"> - <property name="visible">True</property> - <property name="label_xalign">0</property> - <property name="label_yalign">0.5</property> - <property name="shadow_type">GTK_SHADOW_NONE</property> - - <child> - <widget class="GtkAlignment" id="alignment68"> - <property name="visible">True</property> - <property name="xalign">0.5</property> - <property name="yalign">0.5</property> - <property name="xscale">1</property> - <property name="yscale">1</property> - <property name="top_padding">5</property> - <property name="bottom_padding">0</property> - <property name="left_padding">12</property> - <property name="right_padding">0</property> - - <child> - <widget class="GtkVBox" id="vbox83"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">6</property> - - <child> - <widget class="GtkRadioButton" id="use_existing_account_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">I already have an account I want to use</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkRadioButton" id="register_new_account_radiobutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">I want to _register for a new account</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">False</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <property name="group">use_existing_account_radiobutton</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label269"> - <property name="visible">True</property> - <property name="label" translatable="yes">Please choose one of the options below:</property> - <property name="use_underline">False</property> - <property name="use_markup">True</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="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label259"> - <property name="visible">True</property> - <property name="label" translatable="yes"></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="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="register_vbox"> - <property name="border_width">6</property> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkLabel" id="label270"> - <property name="visible">True</property> - <property name="label" translatable="yes">Please fill in the data for your new account</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">False</property> - <property name="xalign">0</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> - - <child> - <widget class="GtkTable" id="table27"> - <property name="visible">True</property> - <property name="n_rows">6</property> - <property name="n_columns">3</property> - <property name="homogeneous">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - - <child> - <widget class="GtkEntry" id="username_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_username_entry_changed" last_modification_time="Sat, 05 Nov 2005 11:13:14 GMT"/> - <signal name="key_press_event" handler="on_username_entry_key_press_event" last_modification_time="Sat, 05 Nov 2005 11:13:18 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label267"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Server:</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</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkComboBoxEntry" id="server_comboboxentry"> - <property name="visible">True</property> - <property name="add_tearoffs">False</property> - <property name="has_frame">True</property> - <property name="focus_on_click">True</property> - <signal name="changed" handler="on_server_comboboxentry_changed" last_modification_time="Thu, 08 Sep 2005 09:49:18 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkButton" id="server_features_button"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">Click to see features (like MSN, ICQ transports) of jabber servers</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Servers Features</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_register_server_features_button_clicked" last_modification_time="Sun, 18 Sep 2005 18:32:19 GMT"/> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label263"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Password:</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</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">pass1_entry</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="save_password_checkbutton"> - <property name="visible">True</property> - <property name="tooltip" translatable="yes">If checked, Gajim will remember the password for this account</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Save pass_word</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">False</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_save_password_checkbutton_toggled" last_modification_time="Thu, 08 Sep 2005 09:50:11 GMT"/> - </widget> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="pass1_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">False</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label262"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Username:</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</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">username_entry</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="pass2_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">False</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">True</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="pass2_label"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Retype Password:</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</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">pass2_entry</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkExpander" id="register_useproxy_expander"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="expanded">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkTable" id="table30"> - <property name="border_width">5</property> - <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">2</property> - <property name="homogeneous">False</property> - <property name="row_spacing">5</property> - <property name="column_spacing">5</property> - - <child> - <widget class="GtkLabel" id="label291"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Host:</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</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">proxyhost_entry</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label292"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Port:</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</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">proxyport_entry</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label293"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Username:</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</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">proxyuser_entry</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label294"> - <property name="visible">True</property> - <property name="label" translatable="yes">Pass_word:</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</property> - <property name="yalign">0.5</property> - <property name="xpad">0</property> - <property name="ypad">0</property> - <property name="mnemonic_widget">proxypass_entry</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="proxyhost_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">0</property> - <property name="bottom_attach">1</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="proxyport_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text">3128</property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_proxyport_entry_changed" last_modification_time="Thu, 08 Sep 2005 09:49:40 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="proxyuser_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">True</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_proxyuser_entry_changed" last_modification_time="Thu, 08 Sep 2005 09:49:48 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkEntry" id="proxypass_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="editable">True</property> - <property name="visibility">False</property> - <property name="max_length">0</property> - <property name="text" translatable="yes"></property> - <property name="has_frame">True</property> - <property name="invisible_char">*</property> - <property name="activates_default">False</property> - <signal name="changed" handler="on_proxypass_entry_changed" last_modification_time="Thu, 08 Sep 2005 09:49:56 GMT"/> - </widget> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - </child> - - <child> - <widget class="GtkLabel" id="label295"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Use proxy</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="type">label_item</property> - </packing> - </child> - </widget> - <packing> - <property name="left_attach">0</property> - <property name="right_attach">3</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">fill</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label258"> - <property name="visible">True</property> - <property name="label" translatable="yes">Your JID:</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</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="left_attach">0</property> - <property name="right_attach">1</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="jid_label"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label"></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">False</property> - <property name="selectable">True</property> - <property name="xalign">0</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="left_attach">1</property> - <property name="right_attach">3</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">fill</property> - <property name="y_options"></property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label261"> - <property name="visible">True</property> - <property name="label" translatable="yes"></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="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox104"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkLabel" id="label366"> - <property name="visible">True</property> - <property name="label" translatable="yes">Account is being created - Please wait...</property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_CENTER</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">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label365"> - <property name="visible">True</property> - <property name="label" translatable="yes"></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="type">tab</property> - </packing> - </child> - - <child> - <widget class="GtkVBox" id="vbox103"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">0</property> - - <child> - <widget class="GtkHBox" id="hbox2986"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkImage" id="finish_image"> - <property name="visible">True</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="finish_label"> - <property name="visible">True</property> - <property name="label" translatable="yes"></property> - <property name="use_underline">False</property> - <property name="use_markup">True</property> - <property name="justify">GTK_JUSTIFY_LEFT</property> - <property name="wrap">True</property> - <property name="selectable">False</property> - <property name="xalign">0.10000000149</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">True</property> - </packing> - </child> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">True</property> - <property name="fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="go_online_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Connect when I press Finish</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - - <child> - <widget class="GtkCheckButton" id="show_vcard_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="label" translatable="yes">Set my profile when I connect</property> - <property name="use_underline">True</property> - <property name="relief">GTK_RELIEF_NORMAL</property> - <property name="focus_on_click">True</property> - <property name="active">True</property> - <property name="inconsistent">False</property> - <property name="draw_indicator">True</property> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">False</property> - </packing> - </child> - </widget> - <packing> - <property name="tab_expand">False</property> - <property name="tab_fill">True</property> - </packing> - </child> - - <child> - <widget class="GtkLabel" id="label286"> - <property name="visible">True</property> - <property name="label" translatable="yes"></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="type">tab</property> - </packing> - </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="hbuttonbox19"> - <property name="visible">True</property> - <property name="layout_style">GTK_BUTTONBOX_END</property> - <property name="spacing">12</property> - - <child> - <widget class="GtkButton" id="cancel_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-cancel</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_cancel_button_clicked" last_modification_time="Thu, 26 May 2005 20:18:12 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="back_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-go-back</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_back_button_clicked" last_modification_time="Thu, 26 May 2005 20:18:09 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="forward_button"> - <property name="visible">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="can_focus">True</property> - <property name="label">gtk-go-forward</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_forward_button_clicked" last_modification_time="Thu, 26 May 2005 20:18:03 GMT"/> - </widget> - </child> - - <child> - <widget class="GtkButton" id="advanced_button"> - <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_advanced_button_clicked" last_modification_time="Thu, 03 Nov 2005 09:55:32 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment96"> - <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="hbox2996"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1265"> - <property name="visible">True</property> - <property name="stock">gtk-preferences</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="label364"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Advanced</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="finish_button"> - <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_finish_button_clicked" last_modification_time="Sat, 06 Aug 2005 23:25:27 GMT"/> - - <child> - <widget class="GtkAlignment" id="alignment87"> - <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="hbox2989"> - <property name="visible">True</property> - <property name="homogeneous">False</property> - <property name="spacing">2</property> - - <child> - <widget class="GtkImage" id="image1112"> - <property name="visible">True</property> - <property name="stock">gtk-apply</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="label352"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Finish</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> - </widget> - <packing> - <property name="padding">0</property> - <property name="expand">False</property> - <property name="fill">True</property> - </packing> - </child> - </widget> - </child> -</widget> - + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_CENTER</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="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </widget> + <packing> + <property name="position">4</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label365"> + <property name="visible">True</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="position">4</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> + <widget class="GtkVBox" id="vbox103"> + <property name="visible">True</property> + <child> + <widget class="GtkHBox" id="hbox2986"> + <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <widget class="GtkImage" id="finish_image"> + <property name="visible">True</property> + <property name="stock">gtk-missing-image</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="finish_label"> + <property name="visible">True</property> + <property name="xalign">0.10000000149011612</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + </widget> + </child> + <child> + <widget class="GtkCheckButton" id="go_online_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Connect when I press Finish</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkCheckButton" id="show_vcard_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes">Set my profile when I connect</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </widget> + <packing> + <property name="position">5</property> + <property name="tab_expand">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label286"> + <property name="visible">True</property> + </widget> + <packing> + <property name="type">tab</property> + <property name="position">5</property> + <property name="tab_expand">False</property> + <property name="tab_fill">False</property> + </packing> + </child> + </widget> + </child> + <child> + <widget class="GtkHButtonBox" id="hbuttonbox19"> + <property name="visible">True</property> + <property name="spacing">12</property> + <property name="layout_style">GTK_BUTTONBOX_END</property> + <child> + <widget class="GtkButton" id="cancel_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-cancel</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked"/> + </widget> + </child> + <child> + <widget class="GtkButton" id="back_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="label">gtk-go-back</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_back_button_clicked"/> + </widget> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="forward_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="has_default">True</property> + <property name="label">gtk-go-forward</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_forward_button_clicked"/> + </widget> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="advanced_button"> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <signal name="clicked" handler="on_advanced_button_clicked"/> + <child> + <widget class="GtkAlignment" id="alignment96"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkHBox" id="hbox2996"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image1265"> + <property name="visible">True</property> + <property name="stock">gtk-preferences</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label364"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Advanced</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">3</property> + </packing> + </child> + <child> + <widget class="GtkButton" id="finish_button"> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <signal name="clicked" handler="on_finish_button_clicked"/> + <child> + <widget class="GtkAlignment" id="alignment87"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <widget class="GtkHBox" id="hbox2989"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <widget class="GtkImage" id="image1112"> + <property name="visible">True</property> + <property name="stock">gtk-apply</property> + </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label352"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Finish</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">4</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/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-05-31 20:54:46 UTC (rev 8184) +++ trunk/src/common/connection.py 2007-05-31 21:49:49 UTC (rev 8185) @@ -206,30 +206,15 @@ # it's a new account if not data[1]: # wrong answer self.dispatch('ACC_NOT_OK', ( - _('Transport %s answered wrongly to register request: %s')\ + _('Server %s answered wrongly to register request: %s')\ % (data[0], data[3]))) return - req = data[1].asDict() - req['username'] = self.new_account_info['name'] - req['password'] = self.new_account_info['password'] - def _on_register_result(result): - if not common.xmpp.isResultNode(result): - self.dispatch('ACC_NOT_OK', (result.getError())) - return - self.password = self.new_account_info['password'] - if USE_GPG: - self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) - gajim.config.set('usegpg', True) - else: - gajim.config.set('usegpg', False) - gajim.connections[self.name] = self - self.dispatch('ACC_OK', (self.new_account_info)) - self.new_account_info = None - if self.connection: - self.connection.UnregisterDisconnectHandler(self._on_new_account) - self.disconnect(on_purpose=True) - common.xmpp.features_nb.register(self.connection, data[0], - req, _on_register_result) + is_form = data[2] + if is_form: + conf = data[1] + else: + conf = data[1].asDict() + self.dispatch('NEW_ACC_CONNECTED', (conf, is_form)) return if not data[1]: # wrong answer self.dispatch('ERROR', (_('Invalid answer'), @@ -1014,12 +999,46 @@ self.connection.getRoster().setItem(jid = jid, name = name, groups = groups) + def send_new_account_infos(self, form, is_form): + def _on_register_result(result): + if not common.xmpp.isResultNode(result): + self.dispatch('ACC_NOT_OK', (result.getError())) + return + if USE_GPG: + self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) + gajim.config.set('usegpg', True) + else: + gajim.config.set('usegpg', False) + gajim.connections[self.name] = self + self.dispatch('ACC_OK', (self.new_account_info)) + self.new_account_info = None + if self.connection: + self.connection.UnregisterDisconnectHandler(self._on_new_account) + self.disconnect(on_purpose=True) + if is_form: + # Get username and password and put them in new_account_info + for field in self._data_form.iter_fields(): + if field.var == 'username': + self.new_account_info['name'] = field.value + if field.var == 'password': + self.new_account_info['password'] = field.value + iq=Iq('set', NS_REGISTER, to = self._hostname) + iq.setTag('query').addChild(node = form) + self.connection.SendAndCallForResponse(iq, _on_register_result) + else: + # Get username and password and put them in new_account_info + if form.has_key('username'): + self.new_account_info['name'] = form['username'] + if form.has_key('password'): + self.new_account_info['password'] = form['password'] + common.xmpp.features_nb.register(self.connection, self._hostname, + form, _on_register_result) + def new_account(self, name, config, sync = False): # If a connection already exist we cannot create a new account if self.connection: return self._hostname = config['hostname'] - self.server_resource = config['resource'] self.new_account_info = config self.name = name self.on_connect_success = self._on_new_account @@ -1028,13 +1047,11 @@ def _on_new_account(self, con = None, con_type = None): if not con_type: - self.dispatch('ACC_NOT_OK', + self.dispatch('NEW_ACC_NOT_CONNECTED', (_('Could not connect to "%s"') % self._hostname)) return self.on_connect_failure = None self.connection = con - #if con: - # con.RegisterDisconnectHandler(self._on_new_account) common.xmpp.features_nb.getRegInfo(con, self._hostname) def account_changed(self, new_name): Modified: trunk/src/common/xmpp/features_nb.py =================================================================== --- trunk/src/common/xmpp/features_nb.py 2007-05-31 20:54:46 UTC (rev 8184) +++ trunk/src/common/xmpp/features_nb.py 2007-05-31 21:49:49 UTC (rev 8185) @@ -143,7 +143,6 @@ def register(disp, host, info, cb): """ Perform registration on remote server with provided info. disp must be connected dispatcher instance. - Returns true or false depending on registration result. If registration fails you can get additional info from the dispatcher's owner attributes lastErrNode, lastErr and lastErrCode. """ Modified: trunk/src/config.py =================================================================== --- trunk/src/config.py 2007-05-31 20:54:46 UTC (rev 8184) +++ trunk/src/config.py 2007-05-31 21:49:49 UTC (rev 8185) @@ -2097,7 +2097,7 @@ self._draw_table() def _draw_table(self): - '''Draw the table in the window''' + '''Draw the table''' nbrow = 0 if self.infos.has_key('instructions'): nbrow = 1 @@ -2778,14 +2778,22 @@ 'account_creation_wizard_window.glade') self.window = self.xml.get_widget('account_creation_wizard_window') + completion = gtk.EntryCompletion() # Connect events from comboboxentry.child server_comboboxentry = self.xml.get_widget('server_comboboxentry') entry = server_comboboxentry.child entry.connect('key_press_event', - self.on_server_comboboxentry_key_press_event) - completion = gtk.EntryCompletion() + self.on_server_comboboxentry_key_press_event, server_comboboxentry) entry.set_completion(completion) + # Do the same for the other server comboboxentry + server_comboboxentry1 = self.xml.get_widget('server_comboboxentry1') + entry = server_comboboxentry1.child + entry.connect('key_press_event', + self.on_server_comboboxentry_key_press_event, server_comboboxentry1) + entry.set_completion(completion) + self.update_proxy_list() + # parse servers.xml servers_xml = os.path.join(gajim.DATA_DIR, 'other', 'servers.xml') servers = gtkgui_helpers.parse_server_xml(servers_xml) @@ -2800,6 +2808,8 @@ # Put servers into comboboxentries server_comboboxentry.set_model(servers_model) server_comboboxentry.set_text_column(0) + server_comboboxentry1.set_model(servers_model) + server_comboboxentry1.set_text_column(0) # Generic widgets self.notebook = self.xml.get_widget('notebook') @@ -2838,29 +2848,19 @@ self.window.destroy() def on_back_button_clicked(self, widget): - if self.notebook.get_current_page() == 1: + if self.notebook.get_current_page() in (1, 2): self.notebook.set_current_page(0) self.back_button.set_sensitive(False) - elif self.notebook.get_current_page() == 3: # finish page + elif self.notebook.get_current_page() == 3: + self.notebook.set_current_page(2) + self.xml.get_widget('form_vbox').remove(self.data_form_widget) + elif self.notebook.get_current_page() == 5: # finish page self.forward_button.show() - self.notebook.set_current_page(1) # Goto parameters page + if self.modify: + self.notebook.set_current_page(1) # Go to parameters page + else: + self.notebook.set_current_page(2) # Go to server page - def get_widgets(self): - widgets = {} - for widget in ( - 'username_entry', - 'server_comboboxentry', - 'pass1_entry', - 'pass2_entry', - 'save_password_checkbutton', - 'proxyhost_entry', - 'proxyport_entry', - 'proxyuser_entry', - 'proxypass_entry', - 'jid_label'): - widgets[widget] = self.xml.get_widget(widget) - return widgets - def on_forward_button_clicked(self, widget): cur_page = self.notebook.get_current_page() @@ -2868,74 +2868,64 @@ widget = self.xml.get_widget('use_existing_account_radiobutton') if widget.get_active(): self.modify = True - self.xml.get_widget('server_features_button').hide() - self.xml.get_widget('pass2_entry').hide() - self.xml.get_widget('pass2_label').hide() + self.notebook.set_current_page(1) else: self.modify = False - self.xml.get_widget('server_features_button').show() - self.xml.get_widget('pass2_entry').show() - self.xml.get_widget('pass2_label').show() - self.notebook.set_current_page(1) + self.notebook.set_current_page(2) self.back_button.set_sensitive(True) return - widgets = self.get_widgets() - username = widgets['username_entry'].get_text().decode('utf-8') - if not username: - pritext = _('Invalid username') - sectext = _('You must provide a username to configure this account.') - dialogs.ErrorDialog(pritext, sectext) - return - server = widgets['server_comboboxentry'].child.get_text().decode('utf-8') - savepass = widgets['save_password_checkbutton'].get_active() - password = widgets['pass1_entry'].get_text().decode('utf-8') - - if not self.modify: - if password == '': - dialogs.ErrorDialog(_('Invalid password'), - _('You must enter a password for the new account.')) + elif cur_page == 1: + # We are adding an existing account + username = self.xml.get_widget('username_entry').get_text().decode( + 'utf-8') + if not username: + pritext = _('Invalid username') + sectext = _( + 'You must provide a username to configure this account.') + dialogs.ErrorDialog(pritext, sectext) return + server = self.xml.get_widget('server_comboboxentry').child.get_text().\ + decode('utf-8') + savepass = self.xml.get_widget('save_password_checkbutton').\ + get_active() + password = self.xml.get_widget('password_entry').get_text().decode( + 'utf-8') - if widgets['pass2_entry'].get_text() != password: - dialogs.ErrorDialog(_('Passwords do not match'), - _('The passwords typed in both fields must be identical.')) + jid = username + '@' + server + # check if jid is conform to RFC and stringprep it + try: + jid = helpers.parse_jid(jid) + except helpers.InvalidFormat, s: + pritext = _('Invalid Jabber ID') + dialogs.ErrorDialog(pritext, str(s)) return - jid = username + '@' + server - # check if jid is conform to RFC and stringprep it - try: - jid = helpers.parse_jid(jid) - except helpers.InvalidFormat, s: - pritext = _('Invalid Jabber ID') - dialogs.ErrorDialog(pritext, str(s)) - return + already_in_jids = [] + for account in gajim.connections: + j = gajim.config.get_per('accounts', account, 'name') + j += '@' + gajim.config.get_per('accounts', account, 'hostname') + already_in_jids.append(j) - already_in_jids = [] - for account in gajim.connections: - j = gajim.config.get_per('accounts', account, 'name') - j += '@' + gajim.config.get_per('accounts', account, 'hostname') - already_in_jids.append(j) + if jid in already_in_jids: + pritext = _('Duplicate Jabber ID') + sectext = _('This account is already configured in Gajim.') + dialogs.ErrorDialog(pritext, sectext) + return - if jid in already_in_jids: - pritext = _('Duplicate Jabber ID') - sectext = _('This account is already configured in Gajim.') - dialogs.ErrorDialog(pritext, sectext) - return + self.account = server + i = 1 + while self.account in gajim.connections: + self.account = server + str(i) + i += 1 - self.account = server - i = 1 - while self.account in gajim.connections: - self.account = server + str(i) - i += 1 - - username, server = gajim.get_name_and_server_from_jid(jid) - self.save_account(username, server, savepass, password) - self.cancel_button.hide() - self.back_button.hide() - self.forward_button.hide() - if self.modify: - finish_text = '<big>%s</big>\n\n%s' % ( + username, server = gajim.get_name_and_server_from_jid(jid) + self.save_account(username, server, savepass, password) + self.cancel_button.hide() + self.back_button.hide() + self.forward_button.hide() + if self.modify: + finish_text = '<big>%s</big>\n\n%s' % ( _('Account has been added successfully'), _('You can set advanced account options by pressing the ' 'Advanced button, or later by choosing the Accounts menuitem ' @@ -2947,20 +2937,130 @@ self.go_online_checkbutton.show() img = self.xml.get_widget('finish_image') img.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_DIALOG) - self.notebook.set_current_page(3) # show finish page + self.notebook.set_current_page(5) # show finish page self.show_vcard_checkbutton.set_active(False) - else: - self.notebook.set_current_page(2) # show creating page + elif cur_page == 2: + server = self.xml.get_widget('server_comboboxentry1').child.get_text()\ + .decode('utf-8') + + if not server: + dialogs.ErrorDialog(_('Invalid server'), + _('Please provide a server on which you want to register.')) + return + self.account = server + i = 1 + while self.account in gajim.connections: + self.account = server + str(i) + i += 1 + + config = self.get_config('', server, '', '') + # Get advanced options + proxies_combobox = self.xml.get_widget('proxies_combobox') + active = proxies_combobox.get_active() + proxy = proxies_combobox.get_model()[active][0].decode('utf-8') + if proxy == _('None'): + proxy = '' + config['proxy'] = proxy + + config['use_custom_host'] = self.xml.get_widget( + 'custom_host_port_checkbutton').get_active() + custom_port = self.xml.get_widget('custom_port_entry').get_text() + try: + custom_port = int(custom_port) + except: + dialogs.ErrorDialog(_('Invalid entry'), + _('Custom port must be a port number.')) + return + config['custom_port'] = custom_port + config['custom_host'] = self.xml.get_widget( + 'custom_host_entry').get_text().decode('utf-8') + + self.notebook.set_current_page(4) # show creating page + self.back_button.hide() + self.forward_button.hide() self.update_progressbar_timeout_id = gobject.timeout_add(100, self.update_progressbar) + # Get form from serveur + con = connection.Connection(self.account) + con.new_account(self.account, config) + gajim.connections[self.account] = con + elif cur_page == 3: + if self.is_form: + form = self.data_form_widget.data_form + else: + form = self.data_form_widget.get_infos() + gajim.connections[self.account].send_new_account_infos(form, + self.is_form) + self.xml.get_widget('form_vbox').remove(self.data_form_widget) + self.xml.get_widget('progressbar_label').set_markup('Account is being created\n\nPlease wait...') + self.notebook.set_current_page(4) # show creating page + self.back_button.hide() + self.forward_button.hide() + self.update_progressbar_timeout_id = gobject.timeout_add(100, + self.update_progressbar) + def update_proxy_list(self): + proxies_combobox = self.xml.get_widget('proxies_combobox') + model = gtk.ListStore(str) + proxies_combobox.set_model(model) + l = gajim.config.get_per('proxies') + l.insert(0, _('None')) + for i in xrange(len(l)): + model.append([l[i]]) + proxies_combobox.set_active(0) + + def on_manage_proxies_button_clicked(self, widget): + if gajim.interface.instances.has_key('manage_proxies'): + gajim.interface.instances['manage_proxies'].window.present() + else: + gajim.interface.instances['manage_proxies'] = \ + ManageProxiesWindow() + + def on_custom_host_port_checkbutton_toggled(self, widget): + self.xml.get_widget('custom_host_hbox').set_sensitive(widget.get_active()) + def update_progressbar(self): self.progressbar.pulse() return True # loop forever + def new_acc_connected(self, form, is_form): + '''connection to server succeded, present the form to the user''' + if self.update_progressbar_timeout_id is not None: + gobject.source_remove(self.update_progressbar_timeout_id) + self.back_button.show() + self.forward_button.show() + self.notebook.set_current_page(3) # show form page + self.is_form = is_form + if is_form: + dataform = dataforms.ExtendForm(node = form) + self.data_form_widget = dataforms_widget.DataFormWidget(dataform) + else: + self.data_form_widget = FakeDataForm(form) + self.data_form_widget.show_all() + self.xml.get_widget('form_vbox').pack_start(self.data_form_widget) + + def new_acc_not_connected(self, reason): + '''Account creation failed: connection to server failed''' + if self.update_progressbar_timeout_id is not None: + gobject.source_remove(self.update_progressbar_timeout_id) + del gajim.connections[self.account] + self.back_button.show() + self.cancel_button.show() + self.go_online_checkbutton.hide() + self.show_vcard_checkbutton.hide() + img = self.xml.get_widget('finish_image') + img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) + finish_text = '<big>%s</big>\n\n%s' % ( + _('An error occurred during account creation') , reason) + self.finish_label.set_markup(finish_text) + self.notebook.set_current_page(5) # show finish page + def acc_is_ok(self, config): '''Account creation succeeded''' self.create_vars(config) + self.cancel_button.hide() + self.back_button.hide() + self.forward_button.hide() self.finish_button.show() self.finish_button.set_property('has-default', True) self.advanced_button.show() @@ -2976,7 +3076,7 @@ 'button, or later by choosing the Accounts menuitem under the Edit ' 'menu from the main window.')) self.finish_label.set_markup(finish_text) - self.notebook.set_current_page(3) # show finish page + self.notebook.set_current_page(5) # show finish page if self.update_progressbar_timeout_id is not None: gobject.source_remove(self.update_progressbar_timeout_id) @@ -2987,13 +3087,17 @@ self.cancel_button.show() self.go_online_checkbutton.hide() self.show_vcard_checkbutton.hide() + del gajim.connections[self.account] img = self.xml.get_widget('finish_image') img.set_from_stock(gtk.STOCK_DIALOG_ERROR, gtk.ICON_SIZE_DIALOG) finish_text = '<big>%s</big>\n\n%s' % (_('An error occurred during ' 'account creation') , reason) self.finish_label.set_markup(finish_text) - self.notebook.set_current_page(3) # show finish page + self.notebook.set_current_page(5) # show finish page + if self.update_progressbar_timeout_id is not None: + gobject.source_remove(self.update_progressbar_timeout_id) + def on_advanced_button_clicked(self, widget): gajim.interface.instances[self.account]['account_modification'] = \ AccountModificationWindow(self.account) @@ -3022,12 +3126,11 @@ combobox.child.set_position(-1) return True - def on_server_comboboxentry_key_press_event(self, widget, event): + def on_server_comboboxentry_key_press_event(self, widget, event, combobox): # If backspace is pressed in empty field, return to the nick entry field backspace = event.keyval == gtk.keysyms.BackSpace - combobox = self.xml.get_widget('server_comboboxentry') empty = len(combobox.get_active_text()) == 0 - if backspace and empty: + if backspace and empty and self.modify: username_entry = self.xml.get_widget('username_entry') username_entry.grab_focus() username_entry.set_position(-1) @@ -3045,14 +3148,7 @@ string = '%s@%s' % (name, server) jid_label.set_label(string) - def save_account(self, login, server, savepass, password): - if self.account in gajim.connections: - dialogs.ErrorDialog(_('Account name is in use'), - _('You already have an account using this name.')) - return - con = connection.Connection(self.account) - con.password = password - + def get_config(self, login, server, savepass, password): config = {} config['name'] = login config['hostname'] = server @@ -3072,7 +3168,18 @@ config['keyid'] = '' config['savegpgpass'] = False config['gpgpassword'] = '' + return config + def save_account(self, login, server, savepass, password): + if self.account in gajim.connections: + dialogs.ErrorDialog(_('Account name is in use'), + _('You already have an account using this name.')) + return + con = connection.Connection(self.account) + con.password = password + + config = self.get_config(login, server, savepass, password) + if not self.modify: con.new_account(self.account, config) return Modified: trunk/src/gajim.py =================================================================== --- trunk/src/gajim.py 2007-05-31 20:54:46 UTC (rev 8184) +++ trunk/src/gajim.py 2007-05-31 21:49:49 UTC (rev 8185) @@ -948,6 +948,17 @@ except AttributeError: return + def handle_event_new_acc_connected(self, account, array): + #('NEW_ACC_CONNECTED', account, (infos, is_form)) + if self.instances.has_key('account_creation_wizard'): + self.instances['account_creation_wizard'].new_acc_connected(array[0], + array[1]) + + def handle_event_new_acc_not_connected(self, account, array): + #('NEW_ACC_NOT_CONNECTED', account, (reason)) + if self.instances.has_key('account_creation_wizard'): + self.instances['account_creation_wizard'].new_acc_not_connected(array) + def handle_event_acc_ok(self, account, array): #('ACC_OK', account, (config)) if self.instances.has_key('account_creation_wizard'): @@ -2047,6 +2058,8 @@ 'AGENT_INFO_ITEMS': self.handle_event_agent_info_items, 'AGENT_INFO_INFO': self.handle_event_agent_info_info, 'QUIT': self.handle_event_quit, + 'NEW_ACC_CONNECTED': self.handle_event_new_acc_connected, + 'NEW_ACC_NOT_CONNECTED': self.handle_event_new_acc_not_connected, 'ACC_OK': self.handle_event_acc_ok, 'ACC_NOT_OK': self.handle_event_acc_not_ok, 'MYVCARD': self.handle_event_myvcard,

1 0

[commit-gajim] r8184 - trunk/data/other
by roidelapluie＠gajim.org 31 May '07

31 May '07

Author: roidelapluie Date: 2007-05-31 22:54:46 +0200 (Thu, 31 May 2007) New Revision: 8184 Modified: trunk/data/other/servers.xml Log: Add fritalk.com to the list of Jabber servers Modified: trunk/data/other/servers.xml =================================================================== --- trunk/data/other/servers.xml 2007-05-31 15:35:25 UTC (rev 8183) +++ trunk/data/other/servers.xml 2007-05-31 20:54:46 UTC (rev 8184) @@ -70,6 +70,9 @@ <item jid="foxalpha.de" name=""> <active port="5222"/> </item> + <item jid="fritalk.com" name="French Jabber Server"> + <active port="5222"/> + </item> <item jid="here.dk" name="Jabber server in Denmark"> <active port="5222"/> </item>

1 0

[commit-gajim] r8183 - 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 31 May '07

31 May '07

Author: asterix Date: 2007-05-31 17:35:25 +0200 (Thu, 31 May 2007) New Revision: 8183 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: autopackage for 0.11.1 is available. Thanks Filippos Papadopoulos Modified: www-website/downloads.php =================================================================== --- www-website/downloads.php 2007-05-31 15:14:39 UTC (rev 8182) +++ www-website/downloads.php 2007-05-31 15:35:25 UTC (rev 8183) @@ -105,11 +105,11 @@ print _(" Autopackage\n"); print (" </h2>\n"); print ("</a>\n"); -print _("Soon available here."); -#print _(" You can download the autopackage ")."<a href=\"downloads/gajim-0.11-1.x86.package\">"._("here")."</a>.\n"; -#print _("To use it: make it executable, run it and follow the instructions.\n"); -#print ("<a href=\"http://autopackage.org/using.html\">"); -#print _("Find out more")."</a>.\n"; +#print _("Soon available here."); +print _(" You can download the autopackage ")."<a href=\"downloads/gajim-0.11.1-1.x86.package\">"._("here")."</a>.\n"; +print _("To use it: make it executable, run it and follow the instructions.\n"); +print ("<a href=\"http://autopackage.org/using.html\">"); +print _("Find out more")."</a>.\n"; print (" \n"); @@ -130,7 +130,7 @@ print _(" Source\n"); print (" </h2>\n"); print ("</a>\n"); -print _(" The tarball version of Gajim is ")."<a href=\"downloads/gajim-0.11.1.tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://trac.gajim.org/browser/branches/gajim_0.11i.1/README.html?format=raw\">see the <tt>README</tt></a> ("._("in English")."). \n"; +print _(" The tarball version of Gajim is ")."<a href=\"downloads/gajim-0.11.1.tar.bz2\">"._("here")."</a>. "._("For information on how to build Gajim,")." <a href=\"http://trac.gajim.org/browser/branches/gajim_0.11.1/README.html?format=raw\">see the <tt>README</tt></a> ("._("in English")."). \n"; #print _(" The tarball version of 0.11.0.7951 pre-release is ")."<a href=\"downloads/gajim-0.11.0.7951.tar.gz\">"._("here")."</a>. \n"; print _("If you want to use the last unstable development version, then you should checkout the subversion repository.\n"); Modified: www-website/locale/bg_BG/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/bg_BG/LC_MESSAGES/msg.po 2007-05-31 15:14:39 UTC (rev 8182) +++ www-website/locale/bg_BG/LC_MESSAGES/msg.po 2007-05-31 15:35:25 UTC (rev 8183) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: gajim website\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-03-14 17:27+0200\n" +"POT-Creation-Date: 2007-05-31 17:29+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: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: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 msgid "here" msgstr "тук" @@ -458,7 +458,7 @@ msgid "and install it by doing" msgstr "Инсталирайте го чрез" -#: downloads.php:31 downloads.php:108 +#: downloads.php:31 msgid "Soon available here." msgstr "Скоро достъпен тук." @@ -533,7 +533,7 @@ msgstr "" " Може да използвате Gajim под FreeBSD чрез портовете. Просто изпълнете " -#: downloads.php:101 +#: downloads.php:101 downloads.php:112 msgid "Find out more" msgstr "Научете повече" @@ -541,6 +541,14 @@ msgid " Autopackage\n" msgstr " Autopackage\n" +#: downloads.php:109 +msgid " You can download the autopackage " +msgstr "" + +#: downloads.php:110 +msgid "To use it: make it executable, run it and follow the instructions.\n" +msgstr "" + #: downloads.php:118 msgid " Windows installer\n" msgstr " Инсталатор за „Уиндоус“\n" Modified: www-website/locale/de_DE/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/de_DE/LC_MESSAGES/msg.po 2007-05-31 15:14:39 UTC (rev 8182) +++ www-website/locale/de_DE/LC_MESSAGES/msg.po 2007-05-31 15:35:25 UTC (rev 8183) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-18 23:21+0100\n" +"POT-Creation-Date: 2007-05-31 17:29+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: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: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 msgid "here" msgstr "hier" @@ -247,11 +247,11 @@ msgid " Project is composed of:" msgstr " Das Projekt ist ein Werk von:" -#: dev.php:65 +#: dev.php:68 msgid " We also want to thank" msgstr " Außerdem wollen wir noch" -#: dev.php:65 +#: dev.php:68 msgid "these people" msgstr "diesen Leuten danken" @@ -471,7 +471,7 @@ msgid "and install it by doing" msgstr "und installieren Sie die SVN-Version durch" -#: downloads.php:31 downloads.php:108 +#: downloads.php:31 msgid "Soon available here." msgstr "In kürze hier verfügbar." @@ -547,7 +547,7 @@ 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:101 downloads.php:112 msgid "Find out more" msgstr "Weitere Informationen" @@ -555,6 +555,14 @@ msgid " Autopackage\n" msgstr " Autopackage\n" +#: downloads.php:109 +msgid " You can download the autopackage " +msgstr "" + +#: downloads.php:110 +msgid "To use it: make it executable, run it and follow the instructions.\n" +msgstr "" + #: downloads.php:118 msgid " Windows installer\n" msgstr " Windows Installationsprogramm\n" Modified: www-website/locale/eo/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/eo/LC_MESSAGES/msg.po 2007-05-31 15:14:39 UTC (rev 8182) +++ www-website/locale/eo/LC_MESSAGES/msg.po 2007-05-31 15:35:25 UTC (rev 8183) @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-18 23:21+0100\n" +"POT-Creation-Date: 2007-05-31 17:29+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: Design.php:85 msgid "Home" @@ -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: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: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 msgid "here" msgstr "ĉi tie" @@ -244,11 +244,11 @@ msgid " Project is composed of:" msgstr " Projekto estas kreita de:" -#: dev.php:65 +#: dev.php:68 msgid " We also want to thank" msgstr " Ni ankaŭ volas danki" -#: dev.php:65 +#: dev.php:68 msgid "these people" msgstr "ĉi tiujn homojn" @@ -456,7 +456,7 @@ msgid "and install it by doing" msgstr "kaj instalu ĝin farante" -#: downloads.php:31 downloads.php:108 +#: downloads.php:31 msgid "Soon available here." msgstr "Baldaŭ disponeblos ĉi tie." @@ -531,7 +531,7 @@ 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:101 downloads.php:112 msgid "Find out more" msgstr "Trovu pli" @@ -539,6 +539,15 @@ msgid " Autopackage\n" msgstr " Autopackage\n" +#: downloads.php:109 +msgid " You can download the autopackage " +msgstr " Vi povas elŝuti la aŭtopakaĵon " + +#: downloads.php:110 +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 msgid " Windows installer\n" msgstr " Vindoza instalilo\n" @@ -822,10 +831,10 @@ "Esperanto, French, German, Greek, Italian, Norwegian (Bokmål), Polish, " "Portugese, Russian, Serbian, Spanish, Slovak and Swedish" msgstr "" -"Gajim estas disponebla je 24 lingvoj: Angla, Belorusa, Bulgara, Brazila, Bretona, " -"Brita, Ĉeĥa, Ĉina (simpligita), Esperanto, Eŭska, Franca, Germana, Greka, " -"Hispana, Itala, Kroata, Nederlanda, Norvega (Bokmål), Pola, Portugala, Rusa, " -"Serba, Slovaka kaj Sveda" +"Gajim estas disponebla je 24 lingvoj: Angla, Belorusa, Bulgara, Brazila, " +"Bretona, Brita, Ĉeĥa, Ĉina (simpligita), Esperanto, Eŭska, Franca, Germana, " +"Greka, Hispana, Itala, Kroata, Nederlanda, Norvega (Bokmål), Pola, " +"Portugala, Rusa, Serba, Slovaka kaj Sveda" #: index.php:46 msgid "NEWS" @@ -1030,13 +1039,6 @@ #~ msgid "Depends packages are" #~ msgstr "Dependaj pakaĵoj estas" -#~ msgid " You can download the autopackage " -#~ msgstr " Vi povas elŝuti la aŭtopakaĵon " - -#~ 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" - #~ msgid "(Version 2.6.x or higher)," #~ msgstr "(Versio 2.6.x aŭ pli nova)," Modified: www-website/locale/es_ES/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/es_ES/LC_MESSAGES/msg.po 2007-05-31 15:14:39 UTC (rev 8182) +++ www-website/locale/es_ES/LC_MESSAGES/msg.po 2007-05-31 15:35:25 UTC (rev 8183) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-18 23:21+0100\n" +"POT-Creation-Date: 2007-05-31 17:29+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: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: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 msgid "here" msgstr "aquí" @@ -247,11 +247,11 @@ msgid " Project is composed of:" msgstr " El proyecto está compuesto de" -#: dev.php:65 +#: dev.php:68 msgid " We also want to thank" msgstr " También queremos agradecer a" -#: dev.php:65 +#: dev.php:68 msgid "these people" msgstr "toda esta gente" @@ -465,7 +465,7 @@ msgid "and install it by doing" msgstr "e instálalo haciendo" -#: downloads.php:31 downloads.php:108 +#: downloads.php:31 msgid "Soon available here." msgstr "" @@ -544,7 +544,7 @@ " Gajim está disponible en FreeBSD a través de los ports de FreeBSD. " "Sólamente " -#: downloads.php:101 +#: downloads.php:101 downloads.php:112 msgid "Find out more" msgstr "Saber más" @@ -552,6 +552,14 @@ msgid " Autopackage\n" msgstr "" +#: downloads.php:109 +msgid " You can download the autopackage " +msgstr " Puedes descargar el autopackage " + +#: downloads.php:110 +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 msgid " Windows installer\n" msgstr " Instalador para Windows\n" @@ -983,12 +991,6 @@ #~ msgid " You can get the Slackware package of Gajim" #~ msgstr " Puedes descargar el autopackage " -#~ msgid " You can download the autopackage " -#~ msgstr " Puedes descargar el autopackage " - -#~ 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" - #~ msgid "(Version 2.6.x or up)," #~ msgstr "(Versión 2.6.x o superior)," Modified: www-website/locale/fr_FR/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/fr_FR/LC_MESSAGES/msg.po 2007-05-31 15:14:39 UTC (rev 8182) +++ www-website/locale/fr_FR/LC_MESSAGES/msg.po 2007-05-31 15:35:25 UTC (rev 8183) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.11\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-19 22:10+0200\n" +"POT-Creation-Date: 2007-05-31 17:29+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: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: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 msgid "here" msgstr "ici" @@ -467,7 +467,7 @@ msgid "and install it by doing" msgstr "et installez-le en faisant" -#: downloads.php:31 downloads.php:108 +#: downloads.php:31 msgid "Soon available here." msgstr "Bientôt disponible ici." @@ -545,7 +545,7 @@ " Gajim est disponible pour FreeBSD via le portage FreeBSD. Tapez " "simplement" -#: downloads.php:101 +#: downloads.php:101 downloads.php:112 msgid "Find out more" msgstr "Pour en savoir plus" @@ -553,6 +553,16 @@ msgid " Autopackage\n" msgstr " Autopackage\n" +#: downloads.php:109 +msgid " You can download the autopackage " +msgstr " Vous pouvez télécharger l'autopackage " + +#: downloads.php:110 +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 msgid " Windows installer\n" msgstr " Installateur Windows\n" @@ -1064,14 +1074,6 @@ #~ msgid "Depends packages are" #~ msgstr "Les paquets dépendants sont" -#~ msgid " You can download the autopackage " -#~ msgstr " Vous pouvez télécharger l'autopackage " - -#~ 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" - #~ msgid "(Version 2.6.x or up)," #~ msgstr "(Version 2.6.x ou supérieure)," Modified: www-website/locale/pt_BR/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/pt_BR/LC_MESSAGES/msg.po 2007-05-31 15:14:39 UTC (rev 8182) +++ www-website/locale/pt_BR/LC_MESSAGES/msg.po 2007-05-31 15:35:25 UTC (rev 8183) @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-19 16:50-0300\n" +"POT-Creation-Date: 2007-05-31 17:29+0200\n" "PO-Revision-Date: 2007-04-19 17:07-0300\n" "Last-Translator: Gajim <gajim-devel(a)gajim.org>\n" "Language-Team: Português Brasileiro <gajim-devel(a)gajim.org>\n" @@ -170,9 +170,9 @@ msgstr " Listar arquivos 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: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: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 msgid "here" msgstr "aqui" @@ -232,7 +232,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" @@ -240,9 +241,7 @@ #: dev.php:50 msgid " Donating: contact me on Jabber (asterix(a)jabber.lagaule.org)" -msgstr "" -" Doações: contate-me no Jabber " -"(asterix(a)jabber.lagaule.org)" +msgstr " Doações: contate-me no Jabber (asterix(a)jabber.lagaule.org)" #: dev.php:56 msgid " Authors" @@ -396,7 +395,8 @@ #: 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" @@ -474,13 +474,14 @@ msgid "and install it by doing" msgstr "e instale fazendo" -#: downloads.php:31 downloads.php:108 +#: downloads.php:31 msgid "Soon available here." msgstr "Em breve disponível aqui" #: downloads.php:40 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 msgid " You can install Gajim provided you have Fedora Extras repository by" @@ -552,7 +553,7 @@ " O Gajim está disponível para o FreeBSD através dos " "ports. Apenas " -#: downloads.php:101 +#: downloads.php:101 downloads.php:112 msgid "Find out more" msgstr "Encontre mais" @@ -560,6 +561,14 @@ msgid " Autopackage\n" msgstr " Autopackage\n" +#: downloads.php:109 +msgid " You can download the autopackage " +msgstr "" + +#: downloads.php:110 +msgid "To use it: make it executable, run it and follow the instructions.\n" +msgstr "" + #: downloads.php:118 msgid " Windows installer\n" msgstr " Instalador para Windows\n" @@ -635,7 +644,8 @@ #: downloads.php:149 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 "" @@ -726,8 +736,8 @@ "(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)," +"(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 msgid "GTK Runtime Environment" @@ -853,7 +863,11 @@ "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" +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" @@ -905,7 +919,8 @@ #: 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 msgid "Fixed avatars cache problems in group chats" @@ -966,4 +981,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-05-31 15:14:39 UTC (rev 8182) +++ www-website/locale/ru_RU/LC_MESSAGES/msg.po 2007-05-31 15:35:25 UTC (rev 8183) @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: gajim-website 20061103\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-18 23:21+0100\n" +"POT-Creation-Date: 2007-05-31 17:29+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" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%\n" #: Design.php:85 msgid "Home" @@ -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: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: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 msgid "here" msgstr "здесь" @@ -248,11 +248,11 @@ msgid " Project is composed of:" msgstr " Создатели проекта:" -#: dev.php:65 +#: dev.php:68 msgid " We also want to thank" msgstr " Хотим так же поблагодарить" -#: dev.php:65 +#: dev.php:68 msgid "these people" msgstr "этих людей" @@ -464,7 +464,7 @@ msgid "and install it by doing" msgstr "и установите его с помощью" -#: downloads.php:31 downloads.php:108 +#: downloads.php:31 msgid "Soon available here." msgstr "Скоро будет здесь." @@ -539,7 +539,7 @@ msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr " Gajim доступен в FreeBSD через FreeBSD порты. Просто " -#: downloads.php:101 +#: downloads.php:101 downloads.php:112 msgid "Find out more" msgstr "Узнайте больше" @@ -547,6 +547,16 @@ msgid " Autopackage\n" msgstr " Autopackage\n" +#: downloads.php:109 +msgid " You can download the autopackage " +msgstr " Вы можете загрузить автопакет " + +#: downloads.php:110 +msgid "To use it: make it executable, run it and follow the instructions.\n" +msgstr "" +"Чтобы использовать его: сделайте его исполняемым, зпустите и следуйте " +"инструкциям.\n" + #: downloads.php:118 msgid " Windows installer\n" msgstr " Установщик для Windows\n" @@ -833,10 +843,10 @@ "Portugese, Russian, Serbian, Spanish, Slovak and Swedish" msgstr "" "Gajim доступен на 24 языках: Английском, Баскском, Белорусском, Болгарском, " -"Бразильском, Британском, Бретонском, Голландском, Греческом, Немецком, Норвежском " -"(Bokmål), Испанском, Итальянском, Китайском (упрощённом), Польском, " -"Португальском, Русском, Сербском, Словацком, Французском, Хорватском, Чешском, " -"Шведском и Эсперанто" +"Бразильском, Британском, Бретонском, Голландском, Греческом, Немецком, " +"Норвежском (Bokmål), Испанском, Итальянском, Китайском (упрощённом), " +"Польском, Португальском, Русском, Сербском, Словацком, Французском, " +"Хорватском, Чешском, Шведском и Эсперанто" #: index.php:46 msgid "NEWS" @@ -1043,14 +1053,6 @@ #~ msgid "Depends packages are" #~ msgstr "Зависимые пакеты" -#~ msgid " You can download the autopackage " -#~ msgstr " Вы можете загрузить автопакет " - -#~ msgid "To use it: make it executable, run it and follow the instructions.\n" -#~ msgstr "" -#~ "Чтобы использовать его: сделайте его исполняемым, зпустите и следуйте " -#~ "инструкциям.\n" - #~ msgid "(Version 2.6.x or higher)," #~ msgstr "(Версия 2.6.x или новее)," Modified: www-website/msg.pot =================================================================== --- www-website/msg.pot 2007-05-31 15:14:39 UTC (rev 8182) +++ www-website/msg.pot 2007-05-31 15:35:25 UTC (rev 8183) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-18 23:21+0100\n" +"POT-Creation-Date: 2007-05-31 17:29+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: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: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 msgid "here" msgstr "" @@ -239,11 +239,11 @@ msgid " Project is composed of:" msgstr "" -#: dev.php:65 +#: dev.php:68 msgid " We also want to thank" msgstr "" -#: dev.php:65 +#: dev.php:68 msgid "these people" msgstr "" @@ -441,7 +441,7 @@ msgid "and install it by doing" msgstr "" -#: downloads.php:31 downloads.php:108 +#: downloads.php:31 msgid "Soon available here." msgstr "" @@ -512,7 +512,7 @@ msgid " Gajim is available in FreeBSD via FreeBSD ports. Just " msgstr "" -#: downloads.php:101 +#: downloads.php:101 downloads.php:112 msgid "Find out more" msgstr "" @@ -520,6 +520,14 @@ msgid " Autopackage\n" msgstr "" +#: downloads.php:109 +msgid " You can download the autopackage " +msgstr "" + +#: downloads.php:110 +msgid "To use it: make it executable, run it and follow the instructions.\n" +msgstr "" + #: downloads.php:118 msgid " Windows installer\n" msgstr ""

1 0

[commit-gajim] r8182 - trunk/autopackage
by asterix＠gajim.org 31 May '07

31 May '07

Author: asterix Date: 2007-05-31 17:14:39 +0200 (Thu, 31 May 2007) New Revision: 8182 Modified: trunk/autopackage/default.apspec Log: [Filippos Papadopoulos] updated autopackage files for 0.11.1 Modified: trunk/autopackage/default.apspec =================================================================== --- trunk/autopackage/default.apspec 2007-05-31 01:47:08 UTC (rev 8181) +++ trunk/autopackage/default.apspec 2007-05-31 15:14:39 UTC (rev 8182) @@ -9,7 +9,7 @@ Summary: Gajim is a Jabber client written in Python. URL: http://www.gajim.org/ License: GNU General Public License, Version 2 -SoftwareVersion: 0.10 +SoftwareVersion: 0.11.1 AutopackageTarget: 1.0 PackageVersion: 1 @@ -28,15 +28,9 @@ [BuildPrepare] -echo "-------==========$USER i am making the package...===============------" -export build_root="/tmp/build-root.$$" -echo "Build root is $build_root" -mkdir "$build_root" -make PREFIX=$build_root CC=apgcc CXX=apg++ || exit 1 -make install PREFIX=$build_root CC=apgcc CXX=apg++ || exit 1 +prepareBuild - [BuildUnprepare] unprepareBuild @@ -44,44 +38,56 @@ [Imports] echo '*' | import import <<EOF -$source_dir/gajim.desktop -$source_dir/gajim.1 EOF [Prepare] # Dependency checking +#PyGTK 2.4 requires python 2.3 require @python.org/python 2.4 require @python.org/python-xml 2.4 require @gtk.org/gtk 2.6 - -########The 2.5 version is for SUSE 9.3 require @gnome.org/pygtk 2.5 require @gnome.org/pyglade 2.5 require @glade.gnome.org/libglade 2 require @pysqlite.org/pysqlite 2 recommend @gtkspell.sourceforge.net/gtkspell 0 +if ! require @dnspython.org/dnspython 1; then +recommend @pydns.sourceforge.net/pydns 2 +fi +#recommend @dnspython.org/dnspython 1 +#recommend @pydns.sourceforge.net/pydns 2 + + [Install] # Put your installation script here copyFiles lib/gajim "$PREFIX/lib" copyFiles share/gajim "$PREFIX/share/" +copyFiles share/doc "$PREFIX/share/" installLocale share/locale installIcon share/pixmaps/gajim.png -installDesktop "Network/Instant Messaging" gajim.desktop -installMan 1 gajim.1 +installIcon share/pixmaps/gajim_about.png +installDesktop "Network/Instant Messaging" share/applications/gajim.desktop +installMan 1 share/man/man1/gajim.1 share/man/man1/gajim-remote.1 + #In the following safeSed we assume that the original Makefile is a bit modified so that to be relocatable by AP #so you have to manually remove the sed in Makefile for AP to work safeSed bin/gajim "s!PREFIX!$PREFIX!g" safeSed bin/gajim-remote "s!PREFIX!$PREFIX!g" +locateCommand python +safeSed bin/gajim "s!PYBIN!$lc_location!g" +safeSed bin/gajim-remote "s!PYBIN!$lc_location!g" installExe bin/* -chmod +x "$PREFIX/bin/gajim" -chmod +x "$PREFIX/bin/gajim-remote" +#chmod +x "$PREFIX/bin/gajim" +#chmod +x "$PREFIX/bin/gajim-remote" + + [Uninstall] # Usually just the following line is enough to uninstall everything uninstallFromLog

1 0

[commit-gajim] r8181 - in branches/e2e_encryption/src: . common
by bct＠gajim.org 31 May '07

31 May '07

Author: bct Date: 2007-05-31 03:47:08 +0200 (Thu, 31 May 2007) New Revision: 8181 Modified: branches/e2e_encryption/src/chat_control.py branches/e2e_encryption/src/common/contacts.py branches/e2e_encryption/src/message_control.py branches/e2e_encryption/src/roster_window.py Log: support for one 'chat' session per Contact Modified: branches/e2e_encryption/src/chat_control.py =================================================================== --- branches/e2e_encryption/src/chat_control.py 2007-05-30 16:57:37 UTC (rev 8180) +++ branches/e2e_encryption/src/chat_control.py 2007-05-31 01:47:08 UTC (rev 8181) @@ -1815,6 +1815,9 @@ encrypted = data[4], subject = data[1], xhtml = data[7]) if len(data) > 6 and isinstance(data[6], int): message_ids.append(data[6]) + + if len(data) > 8: + self.set_thread_id(data[8]) if message_ids: gajim.logger.set_read_messages(message_ids) gajim.events.remove_events(self.account, jid_with_resource, Modified: branches/e2e_encryption/src/common/contacts.py =================================================================== --- branches/e2e_encryption/src/common/contacts.py 2007-05-30 16:57:37 UTC (rev 8180) +++ branches/e2e_encryption/src/common/contacts.py 2007-05-31 01:47:08 UTC (rev 8181) @@ -16,6 +16,8 @@ import common.gajim +import random, string + class Contact: '''Information concerning each contact''' def __init__(self, jid='', name='', groups=[], show='', status='', sub='', @@ -50,6 +52,20 @@ self.chatstate = chatstate self.last_status_time = last_status_time + # XEP-0201 + self.sessions = {} + + def new_session(self): + thread_id = "".join([random.choice(string.letters) for x in xrange(0,32)]) + self.sessions[self.get_full_jid()] = thread_id + return thread_id + + def get_session(self): + try: + return self.sessions[self.get_full_jid()] + except KeyError: + return None + def get_full_jid(self): if self.resource: return self.jid + '/' + self.resource Modified: branches/e2e_encryption/src/message_control.py =================================================================== --- branches/e2e_encryption/src/message_control.py 2007-05-30 16:57:37 UTC (rev 8180) +++ branches/e2e_encryption/src/message_control.py 2007-05-31 01:47:08 UTC (rev 8181) @@ -37,6 +37,8 @@ self.hide_chat_buttons_current = False self.resource = resource + self.thread_id = self.contact.get_session() + gajim.last_message_time[self.account][self.get_full_jid()] = 0 self.xml = gtkgui_helpers.get_glade('message_window.glade', widget_name) @@ -110,14 +112,26 @@ def get_specific_unread(self): return len(gajim.events.get_events(self.account, self.contact.jid)) + def set_thread_id(self, thread_id): + if thread_id == self.thread_id: + return + if self.thread_id: + print "starting a new session, forgetting about the old one!" + self.thread_id = thread_id + self.contact.sessions[self.contact.get_full_jid()] = thread_id + def send_message(self, message, keyID = '', type = 'chat', chatstate = None, msg_id = None, composing_jep = None, resource = None, user_nick = None): '''Send the given message to the active tab. Doesn't return None if error ''' jid = self.contact.jid + + if not self.thread_id: + self.thread_id = self.contact.new_session() + # Send and update history return gajim.connections[self.account].send_message(jid, message, keyID, type = type, chatstate = chatstate, msg_id = msg_id, composing_jep = composing_jep, resource = self.resource, - user_nick = user_nick) + user_nick = user_nick, thread = self.thread_id) Modified: branches/e2e_encryption/src/roster_window.py =================================================================== --- branches/e2e_encryption/src/roster_window.py 2007-05-30 16:57:37 UTC (rev 8180) +++ branches/e2e_encryption/src/roster_window.py 2007-05-31 01:47:08 UTC (rev 8181) @@ -3596,6 +3596,8 @@ typ = '' if msg_type == 'error': typ = 'status' + if thread: + ctrl.set_thread_id(thread) ctrl.print_conversation(msg, typ, tim = tim, encrypted = encrypted, subject = subject, xhtml = xhtml) if msg_id:

1 0

[commit-gajim] r8180 - branches/e2e_encryption/src/common/zeroconf
by asterix＠gajim.org 30 May '07

30 May '07

Author: asterix Date: 2007-05-30 18:57:37 +0200 (Wed, 30 May 2007) New Revision: 8180 Modified: branches/e2e_encryption/src/common/zeroconf/connection_handlers_zeroconf.py Log: add thread to zeroconf connections too Modified: branches/e2e_encryption/src/common/zeroconf/connection_handlers_zeroconf.py =================================================================== --- branches/e2e_encryption/src/common/zeroconf/connection_handlers_zeroconf.py 2007-05-30 15:31:41 UTC (rev 8179) +++ branches/e2e_encryption/src/common/zeroconf/connection_handlers_zeroconf.py 2007-05-30 16:57:37 UTC (rev 8180) @@ -639,6 +639,7 @@ msghtml = msg.getXHTML() mtype = msg.getType() subject = msg.getSubject() # if not there, it's None + thread = msg.getThread() tim = msg.getTimestamp() tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') tim = time.localtime(timegm(tim)) @@ -715,7 +716,7 @@ msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim, subject = subject) self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, subject, - chatstate, msg_id, composing_jep, user_nick, msghtml)) + chatstate, msg_id, composing_jep, user_nick, msghtml, thread)) elif mtype == 'normal': # it's single message if self.name not in no_log_for and jid not in no_log_for and msgtxt: gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim,

1 0

[commit-gajim] r8179 - in branches/e2e_encryption/src: . common
by bct＠gajim.org 30 May '07

30 May '07

Author: bct Date: 2007-05-30 17:31:41 +0200 (Wed, 30 May 2007) New Revision: 8179 Modified: branches/e2e_encryption/src/common/connection.py branches/e2e_encryption/src/common/connection_handlers.py branches/e2e_encryption/src/dialogs.py branches/e2e_encryption/src/gajim.py branches/e2e_encryption/src/roster_window.py Log: add <thread/> to replies to single message that contain a <thread/> Modified: branches/e2e_encryption/src/common/connection.py =================================================================== --- branches/e2e_encryption/src/common/connection.py 2007-05-30 14:24:38 UTC (rev 8178) +++ branches/e2e_encryption/src/common/connection.py 2007-05-30 15:31:41 UTC (rev 8179) @@ -839,7 +839,7 @@ def send_message(self, jid, msg, keyID, type = 'chat', subject='', chatstate = None, msg_id = None, composing_jep = None, resource = None, - user_nick = None, xhtml = None): + user_nick = None, xhtml = None, thread = None): if not self.connection: return 1 if msg and not xhtml and gajim.config.get('rst_formatting_outgoing_messages'): @@ -883,6 +883,10 @@ if msgenc: msg_iq.setTag(common.xmpp.NS_ENCRYPTED + ' x').setData(msgenc) + # XEP-0201 + if thread: + msg_iq.setTag("thread").setData(thread) + # JEP-0172: user_nickname if user_nick: msg_iq.setTag('nick', namespace = common.xmpp.NS_NICK).setData( Modified: branches/e2e_encryption/src/common/connection_handlers.py =================================================================== --- branches/e2e_encryption/src/common/connection_handlers.py 2007-05-30 14:24:38 UTC (rev 8178) +++ branches/e2e_encryption/src/common/connection_handlers.py 2007-05-30 15:31:41 UTC (rev 8179) @@ -1407,6 +1407,7 @@ msghtml = msg.getXHTML() mtype = msg.getType() subject = msg.getSubject() # if not there, it's None + thread = msg.getThread() tim = msg.getTimestamp() tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') tim = time.localtime(timegm(tim)) @@ -1523,7 +1524,7 @@ if treat_as: mtype = treat_as self.dispatch('MSG', (frm, msgtxt, tim, encrypted, mtype, - subject, chatstate, msg_id, composing_jep, user_nick, msghtml)) + subject, chatstate, msg_id, composing_jep, user_nick, msghtml, thread)) # END messageCB def _pubsubEventCB(self, con, msg): Modified: branches/e2e_encryption/src/dialogs.py =================================================================== --- branches/e2e_encryption/src/dialogs.py 2007-05-30 14:24:38 UTC (rev 8178) +++ branches/e2e_encryption/src/dialogs.py 2007-05-30 15:31:41 UTC (rev 8179) @@ -1686,7 +1686,7 @@ or 'receive'. ''' def __init__(self, account, to = '', action = '', from_whom = '', - subject = '', message = '', resource = ''): + subject = '', message = '', resource = '', thread = None): self.account = account self.action = action @@ -1695,6 +1695,7 @@ self.to = to self.from_whom = from_whom self.resource = resource + self.thread = thread self.xml = gtkgui_helpers.get_glade('single_message_window.glade') self.window = self.xml.get_widget('single_message_window') @@ -1896,7 +1897,7 @@ # FIXME: allow GPG message some day gajim.connections[self.account].send_message(to_whom_jid, message, - keyID = None, type = 'normal', subject=subject) + keyID = None, type = 'normal', subject=subject, thread = self.thread) self.subject_entry.set_text('') # we sent ok, clear the subject self.message_tv_buffer.set_text('') # we sent ok, clear the textview @@ -1913,7 +1914,7 @@ self.window.destroy() SingleMessageWindow(self.account, to = self.from_whom, action = 'send', from_whom = self.from_whom, subject = self.subject, - message = self.message) + message = self.message, thread = self.thread) def on_send_and_close_button_clicked(self, widget): self.send_single_message() Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-05-30 14:24:38 UTC (rev 8178) +++ branches/e2e_encryption/src/gajim.py 2007-05-30 15:31:41 UTC (rev 8179) @@ -665,7 +665,7 @@ def handle_event_msg(self, account, array): # 'MSG' (account, (jid, msg, time, encrypted, msg_type, subject, - # chatstate, msg_id, composing_jep, user_nick, xhtml)) + # chatstate, msg_id, composing_jep, user_nick, xhtml, thread)) # user_nick is JEP-0172 full_jid_with_resource = array[0] @@ -680,6 +680,7 @@ msg_id = array[7] composing_jep = array[8] xhtml = array[10] + thread = array[11] if gajim.config.get('ignore_incoming_xhtml'): xhtml = None if gajim.jid_is_transport(jid): @@ -775,12 +776,12 @@ if encrypted: self.roster.on_message(jid, message, array[2], account, array[3], msg_type, subject, resource, msg_id, array[9], - advanced_notif_num) + advanced_notif_num, thread = thread) else: # xhtml in last element self.roster.on_message(jid, message, array[2], account, array[3], msg_type, subject, resource, msg_id, array[9], - advanced_notif_num, xhtml = xhtml) + advanced_notif_num, xhtml = xhtml, thread = thread) nickname = gajim.get_name_from_jid(account, jid) # Check and do wanted notifications msg = message Modified: branches/e2e_encryption/src/roster_window.py =================================================================== --- branches/e2e_encryption/src/roster_window.py 2007-05-30 14:24:38 UTC (rev 8178) +++ branches/e2e_encryption/src/roster_window.py 2007-05-30 15:31:41 UTC (rev 8179) @@ -3531,7 +3531,7 @@ def on_message(self, jid, msg, tim, account, encrypted = False, msg_type = '', subject = None, resource = '', msg_id = None, - user_nick = '', advanced_notif_num = None, xhtml = None): + user_nick = '', advanced_notif_num = None, xhtml = None, thread = None): '''when we receive a message''' contact = None # if chat window will be for specific resource @@ -3588,7 +3588,7 @@ if msg_type == 'normal' and popup: # it's single message to be autopopuped dialogs.SingleMessageWindow(account, contact.jid, action = 'receive', from_whom = jid, subject = subject, - message = msg, resource = resource) + message = msg, resource = resource, thread = thread) return # We print if window is opened and it's not a single message @@ -3611,7 +3611,7 @@ show_in_roster = notify.get_show_in_roster(event_type, account, contact) show_in_systray = notify.get_show_in_systray(event_type, account, contact) event = gajim.events.create_event(type_, (msg, subject, msg_type, tim, - encrypted, resource, msg_id, xhtml), show_in_roster = show_in_roster, + encrypted, resource, msg_id, xhtml, thread), show_in_roster = show_in_roster, show_in_systray = show_in_systray) gajim.events.add_event(account, fjid, event) if popup: @@ -3873,7 +3873,7 @@ if event.type_ == 'normal': dialogs.SingleMessageWindow(account, jid, action = 'receive', from_whom = jid, subject = data[1], - message = data[0], resource = data[5]) + message = data[0], resource = data[5], thread = data[8]) gajim.interface.remove_first_event(account, jid, event.type_) return True elif event.type_ == 'file-request':

1 0

[commit-gajim] r8178 - branches
by asterix＠gajim.org 30 May '07

30 May '07

Author: asterix Date: 2007-05-30 16:24:38 +0200 (Wed, 30 May 2007) New Revision: 8178 Added: branches/e2e_encryption/ Log: branch for end to end encryption, Gsoc project from Brendan Taylor Copied: branches/e2e_encryption (from rev 8177, trunk)

1 0

[commit-gajim] r8177 - in trunk/src: . common
by asterix＠gajim.org 29 May '07

29 May '07

Author: asterix Date: 2007-05-29 22:22:41 +0200 (Tue, 29 May 2007) New Revision: 8177 Modified: trunk/src/common/rst_xhtml_generator.py trunk/src/htmltextview.py Log: [sgala and I] better support of sizes in XHTML, simplify rst generator Modified: trunk/src/common/rst_xhtml_generator.py =================================================================== --- trunk/src/common/rst_xhtml_generator.py 2007-05-29 19:23:50 UTC (rev 8176) +++ trunk/src/common/rst_xhtml_generator.py 2007-05-29 20:22:41 UTC (rev 8177) @@ -21,40 +21,71 @@ from docutils import nodes,utils from docutils.parsers.rst.roles import set_classes except: + print "Requires docutils 0.4 for set_classes to be available" def create_xhtml(text): return None else: - def jep_reference_role(role, rawtext, text, lineno, inliner, - options={}, content=[]): - '''Role to make handy references to Jabber Enhancement Proposals (JEP). + def pos_int_validator(text): + """Validates that text can be evaluated as a positive integer.""" + result = int(text) + if result < 0: + raise ValueError("Error: value '%(text)s' " + "must be a positive integer") + return result - Use as :JEP:`71` (or jep, or jep-reference). - Modeled after the sample in docutils documentation. + def generate_uri_role( role_name, aliases, + anchor_text, base_url, + interpret_url, validator): + '''Creates and register a uri based "interpreted role". + + Those are similar to the RFC, and PEP ones, and take + role_name: + name that will be registered + aliases: + list of alternate names + anchor_text: + text that will be used, together with the role + base_url: + base url for the link + interpret_url: + this, modulo the validated text, will be added to it + validator: + should return the validated text, or raise ValueError ''' + def uri_reference_role(role, rawtext, text, lineno, inliner, + options={}, content=[]): + try: + valid_text = validator(text) + except ValueError, e: + msg = inliner.reporter.error( e.message % dict(text=text), line=lineno) + prb = inliner.problematic(rawtext, rawtext, msg) + return [prb], [msg] + ref = base_url + interpret_url % valid_text + set_classes(options) + node = nodes.reference(rawtext, anchor_text + utils.unescape(text), refuri=ref, + **options) + return [node], [] - jep_base_url = 'http://www.jabber.org/jeps/' - jep_url = 'jep-%04d.html' - try: - jepnum = int(text) - if jepnum <= 0: - raise ValueError - except ValueError: - msg = inliner.reporter.error( - 'JEP number must be a number greater than or equal to 1; ' - '"%s" is invalid.' % text, line=lineno) - prb = inliner.problematic(rawtext, rawtext, msg) - return [prb], [msg] - ref = jep_base_url + jep_url % jepnum - set_classes(options) - node = nodes.reference(rawtext, 'JEP ' + utils.unescape(text), refuri=ref, - **options) - return [node], [] + uri_reference_role.__doc__ = """Role to make handy references to URIs. - roles.register_canonical_role('jep-reference', jep_reference_role) - from docutils.parsers.rst.languages.en import roles - roles['jep-reference'] = 'jep-reference' - roles['jep'] = 'jep-reference' + Use as :%(role_name)s:`71` (or any of %(aliases)s). + It will use %(base_url)s+%(interpret_url)s + validator should throw a ValueError, containing optionally + a %%(text)s format, if the interpreted text is not valid. + """ % locals() + roles.register_canonical_role(role_name, uri_reference_role) + from docutils.parsers.rst.languages import en + en.roles[role_name] = role_name + for alias in aliases: + en.roles[alias] = role_name + generate_uri_role('xep-reference', ('jep', 'xep'), + 'XEP #', 'http://www.xmpp.org/extensions/', 'xep-%04d.html', + pos_int_validator) + generate_uri_role('gajim-ticket-reference', ('ticket','gtrack'), + 'Gajim Ticket #', 'http://trac.gajim.org/ticket/', '%d', + pos_int_validator) + class HTMLGenerator: '''Really simple HTMLGenerator starting from publish_parts. @@ -108,7 +139,7 @@ if __name__ == '__main__': - print Generator.create_xhtml(''' + print "test 1\n", Generator.create_xhtml(""" test:: >>> print 1 @@ -118,9 +149,10 @@ this `` should trigger`` should trigger the   problem. -''') - print Generator.create_xhtml(''' +""") + print "test 2\n", Generator.create_xhtml(""" *test1 test2_ -''') +""") + print "test 3\n", Generator.create_xhtml(""":ticket:`316` implements :xep:`71`""") Modified: trunk/src/htmltextview.py =================================================================== --- trunk/src/htmltextview.py 2007-05-29 19:23:50 UTC (rev 8176) +++ trunk/src/htmltextview.py 2007-05-29 20:22:41 UTC (rev 8177) @@ -40,10 +40,10 @@ import urllib2 import operator +if __name__ == '__main__': + from common import i18n from common import gajim -#from common import i18n - import tooltips @@ -56,13 +56,13 @@ display_resolution = 0.3514598*(gtk.gdk.screen_height() / float(gtk.gdk.screen_height_mm())) -#embryo of CSS classes +# embryo of CSS classes classes = { #'system-message':';display: none', 'problematic':';color: red', } -#styles for elemens +# styles for elements element_styles = { 'u' : ';text-decoration: underline', 'em' : ';font-style: oblique', @@ -83,9 +83,6 @@ element_styles['i'] = element_styles['em'] element_styles['b'] = element_styles['strong'] -class_styles = { -} - ''' ========== JEP-0071 @@ -182,40 +179,43 @@ def build_patterns(view, config, interface): - #extra, rst does not mark _underline_ or /it/ up - #actually , or are not in the JEP-0071, but are seen in the wild + # extra, rst does not mark _underline_ or /it/ up + # actually , or are not in the JEP-0071, but are seen in the wild basic_pattern = r'(?<!\w|\<|/|:)' r'/[^\s/]' r'([^/]*[^\s/])?' r'/(?!\w|/|:)|'\ r'(?<!\w)' r'_[^\s_]' r'([^_]*[^\s_])?' r'_(?!\w)' view.basic_pattern_re = re.compile(basic_pattern) - #TODO: emoticons + # emoticons emoticons_pattern = '' - if config.get('emoticons_theme'): - # When an emoticon is bordered by an alpha-numeric character it is NOT - # expanded. e.g., foo:) NO, foo :) YES, (brb) NO, (:)) YES, etc. - # We still allow multiple emoticons side-by-side like :P:P:P - # sort keys by length so :qwe emot is checked before :q - keys = interface.emoticons.keys() - keys.sort(interface.on_emoticon_sort) - emoticons_pattern_prematch = '' - emoticons_pattern_postmatch = '' - emoticon_length = 0 - for emoticon in keys: # travel thru emoticons list - emoticon_escaped = re.escape(emoticon) # espace regexp metachars - emoticons_pattern += emoticon_escaped + '|'# | means or in regexp - if (emoticon_length != len(emoticon)): - # Build up expressions to match emoticons next to other emoticons - emoticons_pattern_prematch = emoticons_pattern_prematch[:-1] + ')|(?<=' - emoticons_pattern_postmatch = emoticons_pattern_postmatch[:-1] + ')|(?=' - emoticon_length = len(emoticon) - emoticons_pattern_prematch += emoticon_escaped + '|' - emoticons_pattern_postmatch += emoticon_escaped + '|' - # We match from our list of emoticons, but they must either have - # whitespace, or another emoticon next to it to match successfully - # [\w.] alphanumeric and dot (for not matching 8) in (2.8)) - emoticons_pattern = '|' + \ + try: + if config.get('emoticons_theme'): + # When an emoticon is bordered by an alpha-numeric character it is NOT + # expanded. e.g., foo:) NO, foo :) YES, (brb) NO, (:)) YES, etc. + # We still allow multiple emoticons side-by-side like :P:P:P + # sort keys by length so :qwe emot is checked before :q + keys = interface.emoticons.keys() + keys.sort(interface.on_emoticon_sort) + emoticons_pattern_prematch = '' + emoticons_pattern_postmatch = '' + emoticon_length = 0 + for emoticon in keys: # travel thru emoticons list + emoticon_escaped = re.escape(emoticon) # espace regexp metachars + emoticons_pattern += emoticon_escaped + '|'# | means or in regexp + if (emoticon_length != len(emoticon)): + # Build up expressions to match emoticons next to other emoticons + emoticons_pattern_prematch = emoticons_pattern_prematch[:-1] + ')|(?<=' + emoticons_pattern_postmatch = emoticons_pattern_postmatch[:-1] + ')|(?=' + emoticon_length = len(emoticon) + emoticons_pattern_prematch += emoticon_escaped + '|' + emoticons_pattern_postmatch += emoticon_escaped + '|' + # We match from our list of emoticons, but they must either have + # whitespace, or another emoticon next to it to match successfully + # [\w.] alphanumeric and dot (for not matching 8) in (2.8)) + emoticons_pattern = '|' + \ '(?:(?<![\w.]' + emoticons_pattern_prematch[:-1] + '))' + \ '(?:' + emoticons_pattern[:-1] + ')' + \ '(?:(?![\w.]' + emoticons_pattern_postmatch[:-1] + '))' + except: + pass # because emoticons match later (in the string) they need to be after # basic matches that may occur earlier @@ -230,10 +230,17 @@ return gtk.gdk.Color(r, g, b) else: return gtk.gdk.color_parse(color) + +def style_iter(style): + return (map(lambda x:x.strip(),item.split(':', 1)) for item in style.split(';') if len(item.strip())) class HtmlHandler(xml.sax.handler.ContentHandler): - + """A handler to display html to a gtk textview. + + It keeps a stack of "style spans" (start/end element pairs) + and a stack of list counters, for nested lists. + """ def __init__(self, textview, startiter): xml.sax.handler.ContentHandler.__init__(self) self.textbuf = textview.get_buffer() @@ -303,16 +310,20 @@ frac, callback, args): callback(allocation.width*frac, *args) - def _parse_length(self, value, font_relative, callback, *args): + def _parse_length(self, value, font_relative, block_relative, minl, maxl, callback, *args): '''Parse/calc length, converting to pixels, calls callback(length, *args) when the length is first computed or changes''' if value.endswith('%'): - frac = float(value[:-1])/100 + val = float(value[:-1]) + sign = cmp(val,0) + # limits: 1% to 500% + val = sign*max(1,min(abs(val),500)) + frac = val/100 if font_relative: attrs = self._get_current_attributes() font_size = attrs.font.get_size() / pango.SCALE callback(frac*display_resolution*font_size, *args) - else: + elif block_relative: # CSS says 'Percentage values: refer to width of the closest # block-level ancestor' # This is difficult/impossible to implement, so we use @@ -323,27 +334,42 @@ self.textview.connect('size-allocate', self.__parse_length_frac_size_allocate, frac, callback, args) + else: + callback(frac, *args) + return - elif value.endswith('pt'): # points - callback(float(value[:-2])*display_resolution, *args) + val = float(value[:-2]) + sign = cmp(val,0) + # validate length + val = sign*max(minl,min(abs(val*display_resolution),maxl)) + if value.endswith('pt'): # points + callback(val*display_resolution, *args) - elif value.endswith('em'): # ems, the height of the element's font + elif value.endswith('em'): # ems, the width of the element's font attrs = self._get_current_attributes() font_size = attrs.font.get_size() / pango.SCALE - callback(float(value[:-2])*display_resolution*font_size, *args) + callback(val*display_resolution*font_size, *args) elif value.endswith('ex'): # x-height, ~ the height of the letter 'x' # FIXME: figure out how to calculate this correctly # for now 'em' size is used as approximation attrs = self._get_current_attributes() font_size = attrs.font.get_size() / pango.SCALE - callback(float(value[:-2])*display_resolution*font_size, *args) + callback(val*display_resolution*font_size, *args) elif value.endswith('px'): # pixels - callback(int(value[:-2]), *args) + callback(val, *args) else: - warnings.warn('Unable to parse length value "%s"' % value) + try: + # TODO: isn't "no units" interpreted as pixels? + val = int(value) + sign = cmp(val,0) + # validate length + val = sign*max(minl,min(abs(val),maxl)) + callback(val, *args) + except: + warnings.warn('Unable to parse length value "%s"' % value) def __parse_font_size_cb(length, tag): tag.set_property('size-points', length/display_resolution) @@ -352,7 +378,7 @@ def _parse_style_display(self, tag, value): if value == 'none': tag.set_property('invisible','true') - #Fixme: display: block, inline + # FIXME: display: block, inline def _parse_style_font_size(self, tag, value): try: @@ -377,7 +403,8 @@ if value == 'larger': tag.set_property('scale', pango.SCALE_LARGE) return - self._parse_length(value, True, self.__parse_font_size_cb, tag) + # font relative (5 ~ 4pt, 110 ~ 72pt) + self._parse_length(value, True, False, 5, 110, self.__parse_font_size_cb, tag) def _parse_style_font_style(self, tag, value): try: @@ -399,11 +426,13 @@ #__frac_length_tag_cb = staticmethod(__frac_length_tag_cb) def _parse_style_margin_left(self, tag, value): - self._parse_length(value, False, self.__frac_length_tag_cb, + # block relative + self._parse_length(value, False, True, 1, 1000, self.__frac_length_tag_cb, tag, 'left-margin') def _parse_style_margin_right(self, tag, value): - self._parse_length(value, False, self.__frac_length_tag_cb, + # block relative + self._parse_length(value, False, True, 1, 1000, self.__frac_length_tag_cb, tag, 'right-margin') def _parse_style_font_weight(self, tag, value): @@ -469,13 +498,32 @@ tag.set_property('wrap_mode', gtk.WRAP_WORD) elif value == 'nowrap': tag.set_property('wrap_mode', gtk.WRAP_NONE) + + def __length_tag_cb(self, value, tag, propname): + try: + tag.set_property(propname, value) + except: + gajim.log.warn( "Error with prop: " + propname + " for tag: " + str(tag)) + + + def _parse_style_width(self, tag, value): + if value == 'auto': + return + self._parse_length(value, False, False, 1, 1000, self.__length_tag_cb, + tag, "width") + def _parse_style_height(self, tag, value): + if value == 'auto': + return + self._parse_length(value, False, False, 1, 1000, self.__length_tag_cb, + tag, "height") # build a dictionary mapping styles to methods, for greater speed __style_methods = dict() for style in ['background-color', 'color', 'font-family', 'font-size', 'font-style', 'font-weight', 'margin-left', 'margin-right', - 'text-align', 'text-decoration', 'white-space', 'display' ]: + 'text-align', 'text-decoration', 'white-space', 'display', + 'width', 'height' ]: try: method = locals()['_parse_style_%s' % style.replace('-', '_')] except KeyError: @@ -489,6 +537,8 @@ return [tag for tag in self.styles if tag is not None] def _create_url(self, href, title, type_, id_): + '''Process a url tag. + ''' tag = self.textbuf.create_tag(id_) if href and href[0] != '#': tag.href = href @@ -501,6 +551,125 @@ tag.title = title return tag + def _process_img(self, attrs): + '''Process a img tag. + ''' + try: + # Wait maximum 1s for connection + socket.setdefaulttimeout(1) + try: + f = urllib2.urlopen(attrs['src']) + except Exception, ex: + gajim.log.debug(str('Error loading image %s ' % attrs['src'] + ex)) + pixbuf = None + alt = attrs.get('alt', 'Broken image') + else: + # Wait 0.1s between each byte + try: + f.fp._sock.fp._sock.settimeout(0.5) + except: + pass + # Max image size = 2 MB (to try to prevent DoS) + mem = '' + deadline = time.time() + 3 + while True: + if time.time() > deadline: + gajim.log.debug(str('Timeout loading image %s ' % \ + attrs['src'] + ex)) + mem = '' + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Timeout loading image') + break + try: + temp = f.read(100) + except socket.timeout, ex: + gajim.log.debug('Timeout loading image %s ' % attrs['src'] + \ + str(ex)) + mem = '' + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Timeout loading image') + break + if temp: + mem += temp + else: + break + if len(mem) > 2*1024*1024: + alt = attrs.get('alt', '') + if alt: + alt += '\n' + alt += _('Image is too big') + break + pixbuf = None + if mem: + # Caveat: GdkPixbuf is known not to be safe to load + # images from network... this program is now potentially + # hackable ;) + loader = gtk.gdk.PixbufLoader() + dims = [0,0] + def height_cb(length): + dims[1] = length + def width_cb(length): + dims[0] = length + # process width and height attributes + w = attrs.get('width') + h = attrs.get('height') + # override with width and height styles + for attr, val in style_iter(attrs.get('style', '')): + if attr == 'width': + w = val + elif attr == 'height': + h = val + if w: + self._parse_length(w, False, False, 1, 1000, width_cb) + if h: + self._parse_length(h, False, False, 1, 1000, height_cb) + def set_size(pixbuf, w, h, dims): + '''FIXME: floats should be relative to the whole + textview, and resize with it. This needs new + pifbufs for every resize, gtk.gdk.Pixbuf.scale_simple + or similar. + ''' + if type(dims[0]) == float: + dims[0] = int(dims[0]*w) + elif not dims[0]: + dims[0] = w + if type(dims[1]) == float: + dims[1] = int(dims[1]*h) + if not dims[1]: + dims[1] = h + loader.set_size(*dims) + if w or h: + loader.connect('size-prepared', set_size, dims) + loader.write(mem) + loader.close() + pixbuf = loader.get_pixbuf() + alt = attrs.get('alt', '') + if pixbuf is not None: + tags = self._get_style_tags() + if tags: + tmpmark = self.textbuf.create_mark(None, self.iter, True) + self.textbuf.insert_pixbuf(self.iter, pixbuf) + self.starting = False + if tags: + start = self.textbuf.get_iter_at_mark(tmpmark) + for tag in tags: + self.textbuf.apply_tag(tag, start, self.iter) + self.textbuf.delete_mark(tmpmark) + else: + self._insert_text('[IMG: %s]' % alt) + except Exception, ex: + gajim.log.error('Error loading image ' + str(ex)) + pixbuf = None + alt = attrs.get('alt', 'Broken image') + try: + loader.close() + except: + pass + return pixbuf def _begin_span(self, style, tag=None, id_=None): if style is None: @@ -511,9 +680,9 @@ tag = self.textbuf.create_tag(id_) else: tag = self.textbuf.create_tag() # we create anonymous tag - for attr, val in [item.split(':', 1) for item in style.split(';') if len(item.strip())]: - attr = attr.strip().lower() - val = val.strip() + for attr, val in style_iter(style): + attr = attr.lower() + val = val try: method = self.__style_methods[attr] except KeyError: @@ -603,6 +772,7 @@ self.text += content return if allwhitespace_rx.match(content) is not None and self._starts_line(): + self.text += ' ' return self.text += content self.starting = False @@ -611,9 +781,8 @@ def startElement(self, name, attrs): self._flush_text() klass = [i for i in attrs.get('class',' ').split(' ') if i] - style = attrs.get('style','') + style = '' #Add styles defined for classes - #TODO: priority between class and style elements? for k in klass: if k in classes: style += classes[k] @@ -641,9 +810,13 @@ tag.is_anchor = True elif name in LIST_ELEMS: style += ';margin-left: 2em' + elif name == 'img': + tag = self._process_img(attrs) if name in element_styles: style += element_styles[name] - + # so that explicit styles override implicit ones, + # we add the attribute last + style += ";"+attrs.get('style','') if style == '': style = None self._begin_span(style, tag, id_) @@ -681,84 +854,8 @@ elif name == 'dt': if not self.starting: self._jump_line() - elif name == 'img': - # Wait maximum 1s for connection - socket.setdefaulttimeout(1) - try: - f = urllib2.urlopen(attrs['src']) - except Exception, ex: - gajim.log.debug(str('Error loading image %s ' % attrs['src'] + ex)) - pixbuf = None - alt = attrs.get('alt', 'Broken image') - else: - # Wait 10ms between each byte - try: - f.fp._sock.fp._sock.settimeout(0.1) - except: - pass - # Max image size = 2 MB (to try to prevent DoS) in Max 3s - mem = '' - deadline = time.time() + 3 - while True: - if time.time() > deadline: - gajim.log.debug(str('Timeout loading image %s ' % \ - attrs['src'] + ex)) - mem = '' - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Timeout loading image') - break - try: - temp = f.read(100) - except socket.timeout, ex: - gajim.log.debug('Timeout loading image %s ' % attrs['src'] + \ - str(ex)) - mem = '' - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Timeout loading image') - break - if temp: - mem += temp - else: - break - if len(mem) > 2*1024*1024: - alt = attrs.get('alt', '') - if alt: - alt += '\n' - alt += _('Image is too big') - break - - if mem: - # Caveat: GdkPixbuf is known not to be safe to load - # images from network... this program is now potentially - # hackable ;) - loader = gtk.gdk.PixbufLoader() - loader.write(mem) - loader.close() - pixbuf = loader.get_pixbuf() - else: - pixbuf = None - if pixbuf is not None: - tags = self._get_style_tags() - if tags: - tmpmark = self.textbuf.create_mark(None, self.iter, True) - - self.textbuf.insert_pixbuf(self.iter, pixbuf) - - if tags: - start = self.textbuf.get_iter_at_mark(tmpmark) - for tag in tags: - self.textbuf.apply_tag(tag, start, self.iter) - self.textbuf.delete_mark(tmpmark) - else: - self._insert_text('[IMG: %s]' % alt) - elif name == 'body' or name == 'html': + elif name in ('a', 'img', 'body', 'html'): pass - elif name == 'a': - pass elif name in INLINE: pass else: @@ -807,10 +904,6 @@ # self.text = ' ' class HtmlTextView(gtk.TextView): - __gtype_name__ = 'HtmlTextView' - __gsignals__ = { - 'url-clicked': (gobject.SIGNAL_RUN_LAST, None, (str, str)), # href, type - } def __init__(self): gobject.GObject.__init__(self) @@ -886,16 +979,39 @@ parser.setContentHandler(HtmlHandler(self, eob)) parser.parse(StringIO(html)) + # too much space after :) #if not eob.starts_line(): # buffer.insert(eob, '\n') + change_cursor = None if __name__ == '__main__': + import os + from common import gajim + class log(object): + + def debug(self, text): + print "debug:", text + def warn(self, text): + print "warn;", text + def error(self,text): + print "error;", text + + gajim.log=log() + + if gajim.config.get('emoticons_theme'): + print "emoticons" + htmlview = HtmlTextView() + path_to_file = os.path.join(gajim.DATA_DIR, 'pixmaps', 'muc_separator.png') + # use this for hr + htmlview.focus_out_line_pixbuf = gtk.gdk.pixbuf_new_from_file(path_to_file) + + tooltip = tooltips.BaseTooltip() def on_textview_motion_notify_event(widget, event): '''change the cursor to a hand when we are over a mail or an url''' @@ -965,9 +1081,9 @@ <body xmlns='http://www.w3.org/1999/xhtml'> Hey, are you licensed to <a href='http://www.jabber.org/'>Jabber</a>? <img src='http://www.jabber.org/images/psa-license.jpg' - alt='A License to Jabber' - height='261' - width='537'/> + alt='A License to Jabber' + width='50%' height='50%' + /> </body> ''') htmlview.display_html('<hr />') @@ -992,8 +1108,9 @@ <li> One </li> <li> Two is nested: <ul style='background-color:rgb(200,200,100)'> <li> One </li> - <li> Two </li> - <li> Three </li> + <li style='font-size:50%'> Two </li> + <li style='font-size:200%'> Three </li> + <li style='font-size:9999pt'> Four </li> </ul></li> <li> Three </li></ol> </body>

1 0

[commit-gajim] r8176 - trunk/po
by asterix＠gajim.org 29 May '07

29 May '07

Author: asterix Date: 2007-05-29 21:23:50 +0200 (Tue, 29 May 2007) New Revision: 8176 Modified: trunk/po/hr.po Log: [Adrian C] updated croatian translation Modified: trunk/po/hr.po =================================================================== --- trunk/po/hr.po 2007-05-27 09:16:21 UTC (rev 8175) +++ trunk/po/hr.po 2007-05-29 19:23:50 UTC (rev 8176) @@ -1,18 +1,22 @@ -# Croatian translations for gajim. -# Copyright (C) 2006 RiLinux +# Croatian translations for Gajim. +# Copyright (C) 2007 RiLinux # This file is distributed under the same license as the gajim package. -# Adrian C. <anrxc(a)sysphere.org>, 2006. +# Adrian C. <anrxc(a)sysphere.org>, 2007. # Deni B. <baccic(a)gmail.com>, 2006. # Armando V. <synan(a)rilinux.hr> 2006. # Vedran M. <rivanvx(a)gmail.com> 2006. # -#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209 +#: ../src/chat_control.py:1224 ../src/gajim-remote.py:203 +#: ../src/gajim-remote.py:210 ../src/gajim-remote.py:236 +#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:243 +#: ../src/gajim-remote.py:244 ../src/gajim-remote.py:245 +#: ../src/gajim-remote.py:246 msgid "" msgstr "" -"Project-Id-Version: gajim 0.11\n" +"Project-Id-Version: gajim 0.11.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-12-18 09:32+0100\n" -"PO-Revision-Date: 2006-12-07 20:05+0100\n" +"POT-Creation-Date: 2007-05-29 21:17+0200\n" +"PO-Revision-Date: 2007-05-26 22:10+0100\n" "Last-Translator: Adrian C. <anrxc(a)sysphere.org>\n" "Language-Team: Croatian\n" "MIME-Version: 1.0\n" @@ -69,8 +73,9 @@ msgstr "_Status" #: ../data/glade/account_creation_wizard_window.glade.h:1 +#, fuzzy msgid "" -"Account is being created\n" +"Connecting to server\n" "\n" "Please wait..." msgstr "" @@ -87,51 +92,65 @@ msgstr "Molimo popunite podatke za vaš novi korisnički račun" #: ../data/glade/account_creation_wizard_window.glade.h:6 +msgid "Please select a server" +msgstr "" + +#: ../data/glade/account_creation_wizard_window.glade.h:7 msgid "Click to see features (like MSN, ICQ transports) of jabber servers" msgstr "" "Kliknite da vidite mogućnosti (kao što su MSN, ICQ transporti od jabber " "servera" -#: ../data/glade/account_creation_wizard_window.glade.h:7 +#: ../data/glade/account_creation_wizard_window.glade.h:8 msgid "Connect when I press Finish" msgstr "Spoji se kada pritisnem Završi" -#: ../data/glade/account_creation_wizard_window.glade.h:8 +#: ../data/glade/account_creation_wizard_window.glade.h:9 msgid "Gajim: Account Creation Wizard" msgstr "Gajim: Čarobnjak za Stvaranje Računa" -#: ../data/glade/account_creation_wizard_window.glade.h:9 +#: ../data/glade/account_creation_wizard_window.glade.h:10 msgid "I already have an account I want to use" msgstr "Već imam račun koji želim koristiti" -#: ../data/glade/account_creation_wizard_window.glade.h:10 +#: ../data/glade/account_creation_wizard_window.glade.h:11 msgid "I want to _register for a new account" msgstr "Želim se _registrirati novi račun" -#: ../data/glade/account_creation_wizard_window.glade.h:11 -#: ../data/glade/account_modification_window.glade.h:18 +#: ../data/glade/account_creation_wizard_window.glade.h:12 +#: ../data/glade/account_modification_window.glade.h:20 msgid "If checked, Gajim will remember the password for this account" msgstr "Ako je označeno, Gajim će pamtiti lozinku za ovaj račun" -#: ../data/glade/account_creation_wizard_window.glade.h:12 -#: ../data/glade/manage_proxies_window.glade.h:6 -msgid "Pass_word:" -msgstr "Lo_zinka:" +#: ../data/glade/account_creation_wizard_window.glade.h:13 +#: ../data/glade/account_modification_window.glade.h:26 +msgid "Manage..." +msgstr "Podesi..." -#: ../data/glade/account_creation_wizard_window.glade.h:13 -#: ../data/glade/account_modification_window.glade.h:38 +#: ../data/glade/account_creation_wizard_window.glade.h:14 +#, fuzzy +msgid "Prox_y:" +msgstr "Proxy:" + +#: ../data/glade/account_creation_wizard_window.glade.h:15 +#: ../data/glade/account_modification_window.glade.h:40 msgid "Save pass_word" msgstr "Snimi lo_zinku" -#: ../data/glade/account_creation_wizard_window.glade.h:14 +#: ../data/glade/account_creation_wizard_window.glade.h:16 msgid "Servers Features" msgstr "Mogućnosti Poslužitelja" -#: ../data/glade/account_creation_wizard_window.glade.h:15 +#: ../data/glade/account_creation_wizard_window.glade.h:17 msgid "Set my profile when I connect" msgstr "Postavi moj profil pri spajanju" -#: ../data/glade/account_creation_wizard_window.glade.h:16 +#: ../data/glade/account_creation_wizard_window.glade.h:18 +#: ../data/glade/account_modification_window.glade.h:45 +msgid "Use custom hostname/port" +msgstr "Koristi vlastito ime poslužitelja/port" + +#: ../data/glade/account_creation_wizard_window.glade.h:19 msgid "" "You need to have an account in order to connect\n" "to the Jabber network." @@ -139,48 +158,40 @@ "Morate imati račun kako bi se mogli spojiti\n" "na Jabber mrežu." -#: ../data/glade/account_creation_wizard_window.glade.h:18 +#: ../data/glade/account_creation_wizard_window.glade.h:21 msgid "Your JID:" msgstr "Vaš JID:" -#: ../data/glade/account_creation_wizard_window.glade.h:19 +#: ../data/glade/account_creation_wizard_window.glade.h:22 #: ../data/glade/roster_window.glade.h:11 msgid "_Advanced" msgstr "_Napredno" -#: ../data/glade/account_creation_wizard_window.glade.h:20 +#: ../data/glade/account_creation_wizard_window.glade.h:23 msgid "_Finish" msgstr "_Završi" -#: ../data/glade/account_creation_wizard_window.glade.h:21 -#: ../data/glade/manage_proxies_window.glade.h:9 -msgid "_Host:" -msgstr "_Poslužitelj:" +#: ../data/glade/account_creation_wizard_window.glade.h:24 +#, fuzzy +msgid "_Hostname:" +msgstr "Ime poslužitelja:" -#: ../data/glade/account_creation_wizard_window.glade.h:22 -#: ../data/glade/account_modification_window.glade.h:47 +#: ../data/glade/account_creation_wizard_window.glade.h:25 +#: ../data/glade/account_modification_window.glade.h:50 msgid "_Password:" msgstr "_Lozinka:" -#: ../data/glade/account_creation_wizard_window.glade.h:23 -#: ../data/glade/manage_proxies_window.glade.h:10 +#: ../data/glade/account_creation_wizard_window.glade.h:26 +#: ../data/glade/manage_proxies_window.glade.h:11 msgid "_Port:" msgstr "_Port:" -#: ../data/glade/account_creation_wizard_window.glade.h:24 -msgid "_Retype Password:" -msgstr "_Ponovo utipkajte Password:" - -#: ../data/glade/account_creation_wizard_window.glade.h:25 +#: ../data/glade/account_creation_wizard_window.glade.h:27 msgid "_Server:" msgstr "_Poslužitelj:" -#: ../data/glade/account_creation_wizard_window.glade.h:26 -msgid "_Use proxy" -msgstr "_Koristi proxy" - -#: ../data/glade/account_creation_wizard_window.glade.h:27 -#: ../data/glade/manage_proxies_window.glade.h:11 +#: ../data/glade/account_creation_wizard_window.glade.h:28 +#: ../data/glade/manage_proxies_window.glade.h:12 msgid "_Username:" msgstr "_Korisničko ime:" @@ -208,19 +219,23 @@ msgstr "Modifikacija Korisničkog Računa" #: ../data/glade/account_modification_window.glade.h:6 -msgid "Autoreconnect when connection is lost" +msgid "Administration operations" +msgstr "Administratorski postupci" + +#: ../data/glade/account_modification_window.glade.h:7 +msgid "Auto-reconnect when connection is lost" msgstr "Automatsko ponovno spajanje kada je veza izgubljena" -#: ../data/glade/account_modification_window.glade.h:7 +#: ../data/glade/account_modification_window.glade.h:8 #: ../data/glade/zeroconf_properties_window.glade.h:3 msgid "C_onnect on Gajim startup" msgstr "Sp_oji se prilikom pokretanja Gajima" -#: ../data/glade/account_modification_window.glade.h:8 +#: ../data/glade/account_modification_window.glade.h:9 msgid "Chan_ge Password" msgstr "P_romijeni Lozinku" -#: ../data/glade/account_modification_window.glade.h:9 +#: ../data/glade/account_modification_window.glade.h:10 msgid "" "Check this so Gajim will connect in port 5223 where legacy servers are " "expected to have SSL capabilities. Note that Gajim uses TLS encryption by " @@ -232,44 +247,48 @@ "enkripciju ukoliko to server podržava, te će sa ovom opcijom uključenom TLS " "biti onemogućen" -#: ../data/glade/account_modification_window.glade.h:10 +#: ../data/glade/account_modification_window.glade.h:11 #: ../data/glade/zeroconf_properties_window.glade.h:4 msgid "Choose _Key..." msgstr "Odaberi _Ključ" -#: ../data/glade/account_modification_window.glade.h:11 +#: ../data/glade/account_modification_window.glade.h:12 msgid "Click to change account's password" msgstr "Kliknite za promjenu lozinke korisničkog računa" -#: ../data/glade/account_modification_window.glade.h:12 +#: ../data/glade/account_modification_window.glade.h:13 +msgid "Click to request authorization to all contacts of another account" +msgstr "Kliknite da zatražite autorizaciju svih kontakata drugog računa" + +#: ../data/glade/account_modification_window.glade.h:14 msgid "Connection" msgstr "Veza" -#: ../data/glade/account_modification_window.glade.h:13 +#: ../data/glade/account_modification_window.glade.h:15 msgid "Edit Personal Information..." msgstr "Izmjeni Osobne Informacije" -#: ../data/glade/account_modification_window.glade.h:14 -#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:453 -#: ../src/notify.py:475 ../src/notify.py:487 ../src/common/helpers.py:905 +#: ../data/glade/account_modification_window.glade.h:16 +#: ../data/glade/roster_window.glade.h:5 ../src/notify.py:460 +#: ../src/notify.py:482 ../src/notify.py:494 ../src/common/helpers.py:918 msgid "Gajim" msgstr "Gajim" -#. Contact is not in a group, so count it in General group -#: ../data/glade/account_modification_window.glade.h:15 -#: ../data/glade/preferences_window.glade.h:49 +#: ../data/glade/account_modification_window.glade.h:17 +#: ../data/glade/preferences_window.glade.h:51 #: ../data/glade/zeroconf_properties_window.glade.h:7 -#: ../src/roster_window.py:342 ../src/roster_window.py:1207 -#: ../src/roster_window.py:1418 ../src/roster_window.py:2029 -#: ../src/roster_window.py:2071 ../src/common/contacts.py:278 +#: ../src/roster_window.py:349 ../src/roster_window.py:604 +#: ../src/roster_window.py:1309 ../src/roster_window.py:1677 +#: ../src/roster_window.py:2453 ../src/roster_window.py:2495 +#: ../src/roster_window.py:2532 ../src/common/contacts.py:292 msgid "General" msgstr "Općenito" -#: ../data/glade/account_modification_window.glade.h:16 +#: ../data/glade/account_modification_window.glade.h:18 msgid "Hostname: " msgstr "Ime poslužitelja:" -#: ../data/glade/account_modification_window.glade.h:17 +#: ../data/glade/account_modification_window.glade.h:19 msgid "" "If checked, Gajim will also broadcast some more IPs except from just your " "IP, so file transfer has higher chances of working." @@ -277,15 +296,15 @@ "Ako je označeno, Gajim će odašiljati još neke IP adrese osim vaše, kako bi " "prijenosi datoteka imali veću šansu uspjeha." -#: ../data/glade/account_modification_window.glade.h:19 +#: ../data/glade/account_modification_window.glade.h:21 msgid "" -"If checked, Gajim will send keep-alive packets so it prevents connection " -"timeout which results in disconnection" +"If checked, Gajim will send keep-alive packets to prevent connection timeout " +"which results in disconnection" msgstr "" -"Ako je označeno, Gajim će slati keep-alive pakete kako bi spriječio prekid " -"veze zbog preduge neaktivnosti" +"Ako je označeno, Gajim će slati \"keep-alive\" pakete kako bi održao " +"konekciju i spriječio prekid veze." -#: ../data/glade/account_modification_window.glade.h:20 +#: ../data/glade/account_modification_window.glade.h:22 #: ../data/glade/zeroconf_properties_window.glade.h:8 msgid "" "If checked, Gajim will store the password in ~/.gajim/config with 'read' " @@ -294,7 +313,7 @@ "Ako je označeno, Gajim će spremiti lozinku u ~/.gajim/config sa 'čitaj' " "dozvolom samo za vas" -#: ../data/glade/account_modification_window.glade.h:21 +#: ../data/glade/account_modification_window.glade.h:23 #: ../data/glade/zeroconf_properties_window.glade.h:9 msgid "" "If checked, Gajim, when launched, will automatically connect to jabber using " @@ -303,7 +322,7 @@ "Ako je označeno, Gajim će se pri pokretanju automatski spojiti na jabber " "koristeći ovaj račun" -#: ../data/glade/account_modification_window.glade.h:22 +#: ../data/glade/account_modification_window.glade.h:24 #: ../data/glade/zeroconf_properties_window.glade.h:10 msgid "" "If checked, any change to the global status (handled by the combobox at the " @@ -313,44 +332,44 @@ "Ako je označeno, svaka promjena globalnog statusa (koji se mjenja padajućim " "izbornikom na dnu prozora kontaktne liste) promjenit će status i ovog računa" -#: ../data/glade/account_modification_window.glade.h:23 +#: ../data/glade/account_modification_window.glade.h:25 msgid "Information about you, as stored in the server" msgstr "Informacije o vama, kako stoji na poslužitelju" -#: ../data/glade/account_modification_window.glade.h:24 -msgid "Manage..." -msgstr "Podesi..." - -#: ../data/glade/account_modification_window.glade.h:25 -#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1643 -#: ../src/config.py:3436 +#: ../data/glade/account_modification_window.glade.h:27 +#: ../data/glade/zeroconf_properties_window.glade.h:16 ../src/config.py:1623 +#: ../src/config.py:3413 msgid "No key selected" msgstr "Niti jedan ključ nije odabran" #. None means no proxy profile selected -#: ../data/glade/account_modification_window.glade.h:27 ../src/config.py:1225 -#: ../src/config.py:1230 ../src/config.py:1414 ../src/config.py:1633 -#: ../src/config.py:1642 ../src/config.py:1701 ../src/config.py:1775 -#: ../src/config.py:2646 ../src/config.py:3426 ../src/config.py:3435 -#: ../src/dialogs.py:281 ../src/dialogs.py:283 +#. GPG Key +#: ../data/glade/account_modification_window.glade.h:29 +#: ../data/glade/vcard_information_window.glade.h:32 ../src/config.py:1196 +#: ../src/config.py:1201 ../src/config.py:1385 ../src/config.py:1613 +#: ../src/config.py:1622 ../src/config.py:1682 ../src/config.py:1756 +#: ../src/config.py:2958 ../src/config.py:3003 ../src/config.py:3403 +#: ../src/config.py:3412 ../src/dialogs.py:282 ../src/dialogs.py:284 +#: ../src/roster_window.py:1781 ../src/roster_window.py:1788 +#: ../src/roster_window.py:1795 msgid "None" msgstr "Ništa" -#: ../data/glade/account_modification_window.glade.h:28 -#: ../data/glade/profile_window.glade.h:25 +#: ../data/glade/account_modification_window.glade.h:30 +#: ../data/glade/profile_window.glade.h:26 #: ../data/glade/zeroconf_properties_window.glade.h:17 msgid "Personal Information" msgstr "Osobne Informacije" -#: ../data/glade/account_modification_window.glade.h:29 +#: ../data/glade/account_modification_window.glade.h:31 msgid "Port: " msgstr "Port:" -#: ../data/glade/account_modification_window.glade.h:30 +#: ../data/glade/account_modification_window.glade.h:32 msgid "Priori_ty:" msgstr "Priori_tet:" -#: ../data/glade/account_modification_window.glade.h:31 +#: ../data/glade/account_modification_window.glade.h:33 msgid "" "Priority is used in Jabber to determine who gets the events from the jabber " "server when two or more clients are connected using the same account; The " @@ -360,19 +379,19 @@ "jabber servera kada su spojena 2 ili više klijenta koristeći isti račun; " "klijent sa najvišim prioritetom dobiva te događaje" -#: ../data/glade/account_modification_window.glade.h:32 +#: ../data/glade/account_modification_window.glade.h:34 msgid "Priority will change automatically according to your status." msgstr "Prioritet će biti automatski promijenjen prema vašem statusu." -#: ../data/glade/account_modification_window.glade.h:33 +#: ../data/glade/account_modification_window.glade.h:35 msgid "Proxy:" msgstr "Proxy:" -#: ../data/glade/account_modification_window.glade.h:34 -msgid "Resour_ce: " -msgstr "Resur_s" +#: ../data/glade/account_modification_window.glade.h:36 +msgid "Resour_ce:" +msgstr "Resur_s:" -#: ../data/glade/account_modification_window.glade.h:35 +#: ../data/glade/account_modification_window.glade.h:37 msgid "" "Resource is sent to the Jabber server in order to separate the same JID in " "two or more parts depending on the number of the clients connected in the " @@ -385,47 +404,47 @@ "možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa najvišim " "prioritetom dobivat će obavijesti o događajima" -#: ../data/glade/account_modification_window.glade.h:36 +#: ../data/glade/account_modification_window.glade.h:38 #: ../data/glade/zeroconf_properties_window.glade.h:18 msgid "Save _passphrase (insecure)" msgstr "Snimi _lozinku (nesigurno)" -#: ../data/glade/account_modification_window.glade.h:37 +#: ../data/glade/account_modification_window.glade.h:39 #: ../data/glade/zeroconf_properties_window.glade.h:19 msgid "Save conversation _logs for all contacts" msgstr "Snimi _dnevnik razgovora za sve kontakte" -#: ../data/glade/account_modification_window.glade.h:39 +#: ../data/glade/account_modification_window.glade.h:41 msgid "Send keep-alive packets" msgstr "Šalji keep-alive pakete" -#: ../data/glade/account_modification_window.glade.h:40 +#: ../data/glade/account_modification_window.glade.h:42 #: ../data/glade/zeroconf_properties_window.glade.h:20 msgid "Synch_ronize account status with global status" msgstr "Sink_roniziraj status računa sa globalnim statusom" -#: ../data/glade/account_modification_window.glade.h:41 +#: ../data/glade/account_modification_window.glade.h:43 +msgid "Synchronise contacts" +msgstr "Sinkroniziraj kontakte" + +#: ../data/glade/account_modification_window.glade.h:44 msgid "Use _SSL (legacy)" msgstr "Koristi _SSL (zastarjelo)" -#: ../data/glade/account_modification_window.glade.h:42 -msgid "Use custom hostname/port" -msgstr "Koristi vlastito ime poslužitelja/port" - -#: ../data/glade/account_modification_window.glade.h:43 +#: ../data/glade/account_modification_window.glade.h:46 msgid "Use file transfer proxies" msgstr "Koristi proxy za prijenos datoteka" -#: ../data/glade/account_modification_window.glade.h:44 +#: ../data/glade/account_modification_window.glade.h:47 msgid "_Adjust to status" msgstr "_Podesi prema statusu" -#: ../data/glade/account_modification_window.glade.h:45 +#: ../data/glade/account_modification_window.glade.h:48 msgid "_Jabber ID:" msgstr "_Jabber ID:" -#: ../data/glade/account_modification_window.glade.h:46 -msgid "_Name: " +#: ../data/glade/account_modification_window.glade.h:49 +msgid "_Name:" msgstr "_Ime:" #: ../data/glade/accounts_window.glade.h:1 @@ -449,7 +468,7 @@ #: ../data/glade/accounts_window.glade.h:4 msgid "" -"If you have 2 or more accounts and it is checked, Gajim will list all " +"If you have 2 or more accounts and this is checked, Gajim will list all " "contacts as if you had one account" msgstr "" "Ako imate 2 ili više računa i ovo je označeno, Gajim će prikazivati sve " @@ -490,14 +509,14 @@ #: ../data/glade/add_new_contact_window.glade.h:5 msgid "" -"You have to register to this transport\n" +"You have to register with this transport\n" "to be able to add a contact from this\n" "protocol. Click on register button to\n" "proceed." msgstr "" "Morate se registrirati na ovom transportu\n" -"kako biste mogli dodati kontakte sa ovog\n" -"protokola. Kliknite na dugme registracije za\n" +"kako bi ste mogli dodati kontakte sa ovog\n" +"protokola. Kliknite na gumb registracije za\n" "nastavak." #: ../data/glade/add_new_contact_window.glade.h:9 @@ -505,7 +524,7 @@ "You must be connected to the transport to be able\n" "to add a contact from this protocol." msgstr "" -"Morate biti spojeni na transport da biste mogli\n" +"Morate biti spojeni na transport da bi ste mogli\n" "dodavati kontakte sa ovog protokola." #: ../data/glade/add_new_contact_window.glade.h:11 @@ -529,52 +548,49 @@ msgstr "_ID Korisnika:" #: ../data/glade/adhoc_commands_window.glade.h:1 -msgid "An error has occured:" -msgstr "" +msgid "An error has occurred:" +msgstr "Pojavila se greška:" #: ../data/glade/adhoc_commands_window.glade.h:2 msgid "Choose command to execute:" -msgstr "" +msgstr "Izaberite naredbu za izvršiti:" #: ../data/glade/adhoc_commands_window.glade.h:3 msgid "Ad-hoc Commands - Gajim" -msgstr "" +msgstr "Ad-hoc Naredbe - Gajim" #: ../data/glade/adhoc_commands_window.glade.h:4 msgid "Check once more" -msgstr "" +msgstr "Provjeri još jednom" #: ../data/glade/adhoc_commands_window.glade.h:5 -#, fuzzy msgid "Error description..." -msgstr "Opis" +msgstr "Opis greške..." #: ../data/glade/adhoc_commands_window.glade.h:6 -#, fuzzy msgid "Please wait while retrieving command list..." -msgstr "Pričekajte dok se odvija selidba zapisa..." +msgstr "Pričekajte dok se odvija primanje liste naredbi..." #: ../data/glade/adhoc_commands_window.glade.h:7 -#, fuzzy msgid "Please wait while the command is sending..." -msgstr "Pričekajte dok se odvija selidba zapisa..." +msgstr "Pričekajte dok se odvija slanje naredbe..." #: ../data/glade/adhoc_commands_window.glade.h:8 msgid "Please wait..." -msgstr "" +msgstr "Molim pričekajte..." #: ../data/glade/adhoc_commands_window.glade.h:9 msgid "This jabber entity does not expose any commands." -msgstr "" +msgstr "Ovaj jabber entitet ne izlaže nikakve naredbe." #: ../data/glade/advanced_configuration_window.glade.h:1 msgid "Description" msgstr "Opis" #: ../data/glade/advanced_configuration_window.glade.h:2 -msgid "NOTE: You should restart gajim for some setting to take effect" +msgid "NOTE: You should restart Gajim for some settings to take effect" msgstr "" -"NAPOMENA: Trebali biste ponovno pokrenuti gajim da bi neke postavke " +"NAPOMENA: Trebali bi ste ponovno pokrenuti gajim da bi neke postavke " "postale aktivne" #: ../data/glade/advanced_configuration_window.glade.h:3 @@ -594,7 +610,7 @@ msgstr "Briše Poruku Dana" #: ../data/glade/advanced_menuitem_menu.glade.h:3 -msgid "Sends a message to currently connected users to this server" +msgid "Sends a message to users currently connected to this server" msgstr "Šalje poruku trenutno spojenim korisnicima na ovom poslužitelju" #: ../data/glade/advanced_menuitem_menu.glade.h:4 @@ -622,14 +638,18 @@ msgstr "_Administrator" #: ../data/glade/advanced_menuitem_menu.glade.h:10 +msgid "_Blocked Contacts" +msgstr "_Blokirani Kontakti" + +#: ../data/glade/advanced_menuitem_menu.glade.h:11 msgid "_Privacy Lists" msgstr "Liste _Privatnosti" -#: ../data/glade/advanced_menuitem_menu.glade.h:11 +#: ../data/glade/advanced_menuitem_menu.glade.h:12 msgid "_Send Server Message" msgstr "_Pošalji Poslužiteljsku Poruku" -#: ../data/glade/advanced_menuitem_menu.glade.h:12 +#: ../data/glade/advanced_menuitem_menu.glade.h:13 msgid "_Send Single Message" msgstr "_Pošalji Jednu Poruku" @@ -656,20 +676,20 @@ #: ../data/glade/advanced_notifications_window.glade.h:6 msgid "Advanced Notifications Control" -msgstr "Editor Naprednih Obavijesti" +msgstr "Napredno Upravljanje Obavijestima" #: ../data/glade/advanced_notifications_window.glade.h:7 msgid "All statuses" msgstr "Svi statusi" #: ../data/glade/advanced_notifications_window.glade.h:8 -#: ../src/common/helpers.py:234 +#: ../src/common/commands.py:91 ../src/common/helpers.py:243 msgid "Away" msgstr "Odsutan" #: ../data/glade/advanced_notifications_window.glade.h:9 msgid "Busy " -msgstr "Zaposlen" +msgstr "Zauzet " #: ../data/glade/advanced_notifications_window.glade.h:10 msgid "Don't have " @@ -680,7 +700,7 @@ msgstr "Imam " #: ../data/glade/advanced_notifications_window.glade.h:12 -#: ../src/common/helpers.py:244 +#: ../src/common/helpers.py:253 msgid "Invisible" msgstr "Nevidljiv" @@ -689,7 +709,7 @@ msgstr "Pokrenite naredbu" #: ../data/glade/advanced_notifications_window.glade.h:14 -#: ../src/common/helpers.py:217 +#: ../src/common/helpers.py:226 msgid "Not Available" msgstr "Nedostupan" @@ -708,17 +728,15 @@ #: ../data/glade/advanced_notifications_window.glade.h:18 msgid "" "Receive a Message\n" -"Contact Connected \n" "Contact Disconnected \n" "Contact Change Status \n" "Group Chat Message Highlight \n" "Group Chat Message Received \n" -"File Transfert Resquest \n" -"File Transfert Started \n" -"File Transfert Finished" +"File Transfer Request \n" +"File Transfer Started \n" +"File Transfer Finished" msgstr "" "Primanje Poruke\n" -"Kontakt Spojen\n" "Kontakt Odspojen\n" "Kontakt Promjeni Status\n" "Osvjetljavanje na Poruku Grupnog Razgovora\n" @@ -727,58 +745,58 @@ "Početak Prijenosa Datoteke\n" "Završen Prijenos Datoteke" -#: ../data/glade/advanced_notifications_window.glade.h:27 +#: ../data/glade/advanced_notifications_window.glade.h:26 msgid "When " msgstr "Kada " -#: ../data/glade/advanced_notifications_window.glade.h:28 +#: ../data/glade/advanced_notifications_window.glade.h:27 msgid "" "_Activate window manager's UrgencyHint to make chat window in taskbar flash" msgstr "" "_Aktivacija opcije upravitelja prozora za bljeskanje prozora razgovora u " "taskbaru" -#: ../data/glade/advanced_notifications_window.glade.h:29 +#: ../data/glade/advanced_notifications_window.glade.h:28 msgid "_Disable auto opening chat window" msgstr "_Onemogući automatsko otvaranje prozora razgovora" -#: ../data/glade/advanced_notifications_window.glade.h:30 +#: ../data/glade/advanced_notifications_window.glade.h:29 msgid "_Disable existing popup window" msgstr "_Onemogući postojeći iskočni prozor" -#: ../data/glade/advanced_notifications_window.glade.h:31 +#: ../data/glade/advanced_notifications_window.glade.h:30 msgid "_Disable existing sound for this event" msgstr "_Onemogući postojeći zvuk za ovaj događaj" -#: ../data/glade/advanced_notifications_window.glade.h:32 +#: ../data/glade/advanced_notifications_window.glade.h:31 msgid "_Disable showing event in roster" msgstr "_Onemogući prikazivanje događaja u listi kontakata" -#: ../data/glade/advanced_notifications_window.glade.h:33 +#: ../data/glade/advanced_notifications_window.glade.h:32 msgid "_Disable showing event in systray" msgstr "_Onemogući prikazivanje događaja u systrayu" -#: ../data/glade/advanced_notifications_window.glade.h:34 +#: ../data/glade/advanced_notifications_window.glade.h:33 msgid "_Inform me with a popup window" msgstr "_Obavijesti me sa iskočnim prozorom" -#: ../data/glade/advanced_notifications_window.glade.h:35 +#: ../data/glade/advanced_notifications_window.glade.h:34 msgid "_Open chat window with user" msgstr "_Otvori prozor za razgovor sa korisnikom" -#: ../data/glade/advanced_notifications_window.glade.h:36 +#: ../data/glade/advanced_notifications_window.glade.h:35 msgid "_Show event in roster" msgstr "Prikaži događaj u _listi kontakata" -#: ../data/glade/advanced_notifications_window.glade.h:37 +#: ../data/glade/advanced_notifications_window.glade.h:36 msgid "_Show event in systray" msgstr "Prikaži samo u _listi kontakata" -#: ../data/glade/advanced_notifications_window.glade.h:38 +#: ../data/glade/advanced_notifications_window.glade.h:37 msgid "and I " msgstr "i ja " -#: ../data/glade/advanced_notifications_window.glade.h:39 +#: ../data/glade/advanced_notifications_window.glade.h:38 msgid "" "contact(s)\n" "group(s)\n" @@ -788,53 +806,33 @@ "grupe\n" "svi" -#: ../data/glade/advanced_notifications_window.glade.h:42 +#: ../data/glade/advanced_notifications_window.glade.h:41 msgid "for " msgstr "za" -#: ../data/glade/advanced_notifications_window.glade.h:43 +#: ../data/glade/advanced_notifications_window.glade.h:42 msgid "when I'm in" msgstr "kada sam u" #: ../data/glade/atom_entry_window.glade.h:1 -msgid "2003-12-13T18:30:02Z" -msgstr "" +msgid "Entry:" +msgstr "Unos:" #: ../data/glade/atom_entry_window.glade.h:2 -msgid "Romeo and Juliet" -msgstr "" +msgid "Feed name:" +msgstr "Ime članaka:" #: ../data/glade/atom_entry_window.glade.h:3 -#, fuzzy -msgid "Entry:" -msgstr "Država:" +msgid "Last modified:" +msgstr "Posljednja izmjena:" #: ../data/glade/atom_entry_window.glade.h:4 -#, fuzzy -msgid "Feed name:" -msgstr "ime teme" +msgid "New entry received" +msgstr "Primljen novi unos" #: ../data/glade/atom_entry_window.glade.h:5 -#, fuzzy -msgid "Last modified:" -msgstr "Prezime:" - -#: ../data/glade/atom_entry_window.glade.h:6 -#, fuzzy -msgid "New entry received" -msgstr "Kada se primi novi događaj" - -#: ../data/glade/atom_entry_window.glade.h:7 -msgid "Old stories" -msgstr "" - -#: ../data/glade/atom_entry_window.glade.h:8 -msgid "Soliloquy" -msgstr "" - -#: ../data/glade/atom_entry_window.glade.h:9 msgid "You have received new entry:" -msgstr "" +msgstr "Primili ste novi unos:" #: ../data/glade/change_password_dialog.glade.h:1 msgid "Change Password" @@ -866,8 +864,8 @@ #: ../data/glade/chat_context_menu.glade.h:2 #: ../data/glade/chat_control_popup_menu.glade.h:4 -#: ../data/glade/gc_occupants_menu.glade.h:2 -#: ../data/glade/roster_contact_context_menu.glade.h:10 +#: ../data/glade/gc_occupants_menu.glade.h:3 +#: ../data/glade/roster_contact_context_menu.glade.h:12 msgid "_Add to Roster" msgstr "_Dodaj na Listu" @@ -899,7 +897,7 @@ msgstr "Pritisnite za pregled prošlih razgovora sa ovim kontaktom" #: ../data/glade/chat_control_popup_menu.glade.h:2 -#: ../data/glade/roster_contact_context_menu.glade.h:8 +#: ../data/glade/roster_contact_context_menu.glade.h:9 #: ../data/glade/zeroconf_contact_context_menu.glade.h:4 msgid "Send _File" msgstr "Pošalji _Datoteku" @@ -914,9 +912,9 @@ msgstr "_Kompaktan Pregled Alt+K" #: ../data/glade/chat_control_popup_menu.glade.h:6 -#: ../data/glade/gc_control_popup_menu.glade.h:7 -#: ../data/glade/gc_occupants_menu.glade.h:5 -#: ../data/glade/roster_contact_context_menu.glade.h:13 +#: ../data/glade/gc_control_popup_menu.glade.h:8 +#: ../data/glade/gc_occupants_menu.glade.h:6 +#: ../data/glade/roster_contact_context_menu.glade.h:16 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6 msgid "_History" msgstr "_Povijest" @@ -966,12 +964,12 @@ msgstr "Ukloni prijenos datoteka sa liste" #: ../data/glade/filetransfers.glade.h:9 -msgid "Removes completed, canceled and failed file transfers from the list" +msgid "Removes completed, cancelled and failed file transfers from the list" msgstr "" "Ukloni završene, zaustavljene ili neuspjele prijenose datoteka sa liste" #: ../data/glade/filetransfers.glade.h:10 -msgid "Shows a list of file transfers between you and other" +msgid "Shows a list of file transfers between you and others" msgstr "Prikazuje listu prijenosa datoteka između vas i ostalih" #: ../data/glade/filetransfers.glade.h:11 @@ -986,7 +984,7 @@ msgid "When a file transfer is complete show a popup notification" msgstr "Pokaži popup obavijest kada se završi prijenos datoteka" -#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:769 +#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:761 msgid "_Continue" msgstr "_Nastaviti" @@ -994,7 +992,7 @@ msgid "_Notify me when a file transfer is complete" msgstr "_Obavijesti me kada se završi prijenos datoteka" -#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:190 +#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:188 msgid "_Open Containing Folder" msgstr "_Otvaranje Mape Sadržaja" @@ -1102,30 +1100,39 @@ msgid "_Bookmark This Room" msgstr "_Postavi Knjižnu Oznaku" +#: ../data/glade/gc_control_popup_menu.glade.h:7 +msgid "_Destroy room" +msgstr "_Uništi sobu" + +#: ../data/glade/gc_control_popup_menu.glade.h:9 +msgid "_Minimize" +msgstr "_Minimiziraj" + #: ../data/glade/gc_occupants_menu.glade.h:1 +#, fuzzy +msgid "A_dministrator" +msgstr "Administrator" + +#: ../data/glade/gc_occupants_menu.glade.h:2 msgid "Mo_derator" msgstr "Mo_derator" -#: ../data/glade/gc_occupants_menu.glade.h:3 +#: ../data/glade/gc_occupants_menu.glade.h:4 msgid "_Admin" msgstr "_Admin" -#: ../data/glade/gc_occupants_menu.glade.h:4 +#: ../data/glade/gc_occupants_menu.glade.h:5 msgid "_Ban" msgstr "_Zabrani" -#: ../data/glade/gc_occupants_menu.glade.h:6 +#: ../data/glade/gc_occupants_menu.glade.h:7 msgid "_Kick" msgstr "_Izbaci" -#: ../data/glade/gc_occupants_menu.glade.h:7 +#: ../data/glade/gc_occupants_menu.glade.h:8 msgid "_Member" msgstr "_Član" -#: ../data/glade/gc_occupants_menu.glade.h:8 -msgid "_Occupant Actions" -msgstr "_Akcije Prisutnih" - #: ../data/glade/gc_occupants_menu.glade.h:9 msgid "_Owner" msgstr "_Vlasnik" @@ -1139,17 +1146,16 @@ msgstr "_Glas" #: ../data/glade/groups_post_window.glade.h:1 -#, fuzzy msgid "Create new post" -msgstr "Nova objava" +msgstr "Stvorite novi dopis" -#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:259 +#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:268 msgid "From" msgstr "Od" #. holds subject -#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:141 -#: ../src/history_manager.py:172 +#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:142 +#: ../src/history_manager.py:173 msgid "Subject" msgstr "Tema" @@ -1206,6 +1212,11 @@ msgstr "Pretraga" #: ../data/glade/history_window.glade.h:5 +#: ../data/glade/zeroconf_information_window.glade.h:10 +msgid "_Log conversation history" +msgstr "_Pamti povijest razgovora" + +#: ../data/glade/history_window.glade.h:6 ../src/disco.py:1177 msgid "_Search" msgstr "_Pretraga" @@ -1222,33 +1233,37 @@ msgid "Invitation Received" msgstr "Primljen Poziv" -#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1146 +#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1243 msgid "Join Group Chat" msgstr "Pridružiti se Grupnom Razgovoru" #: ../data/glade/join_groupchat_window.glade.h:2 +msgid "Join this room automatically when I connect" +msgstr "Pridruži se ovoj sobi automatski kada se povežem" + +#: ../data/glade/join_groupchat_window.glade.h:3 #: ../data/glade/manage_bookmarks_window.glade.h:4 -#: ../data/glade/profile_window.glade.h:23 -#: ../data/glade/vcard_information_window.glade.h:29 +#: ../data/glade/profile_window.glade.h:24 +#: ../data/glade/vcard_information_window.glade.h:31 msgid "Nickname:" msgstr "Nadimak:" -#: ../data/glade/join_groupchat_window.glade.h:3 +#: ../data/glade/join_groupchat_window.glade.h:4 #: ../data/glade/manage_bookmarks_window.glade.h:5 msgid "Password:" msgstr "Lozinka:" -#: ../data/glade/join_groupchat_window.glade.h:4 +#: ../data/glade/join_groupchat_window.glade.h:5 msgid "Recently:" msgstr "Nedavno:" -#: ../data/glade/join_groupchat_window.glade.h:5 +#: ../data/glade/join_groupchat_window.glade.h:6 #: ../data/glade/manage_bookmarks_window.glade.h:7 msgid "Room:" msgstr "Soba:" -#: ../data/glade/join_groupchat_window.glade.h:6 ../src/disco.py:1151 -#: ../src/disco.py:1518 +#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1165 +#: ../src/disco.py:1615 msgid "_Join" msgstr "_Pridruživanje" @@ -1290,32 +1305,44 @@ msgstr "Postavke" #: ../data/glade/manage_proxies_window.glade.h:3 -msgid "HTTP Connect" -msgstr "HTTP Spoj" +msgid "" +"HTTP Connect\n" +"SOCKS5" +msgstr "" +"HTTP Spoj\n" +"SOCKS5" -#: ../data/glade/manage_proxies_window.glade.h:4 +#: ../data/glade/manage_proxies_window.glade.h:5 msgid "Manage Proxy Profiles" msgstr "Podešavanje Proxy Profila" -#: ../data/glade/manage_proxies_window.glade.h:5 -#: ../data/glade/profile_window.glade.h:22 -#: ../data/glade/vcard_information_window.glade.h:28 +#: ../data/glade/manage_proxies_window.glade.h:6 +#: ../data/glade/profile_window.glade.h:23 +#: ../data/glade/vcard_information_window.glade.h:30 msgid "Name:" msgstr "Ime:" #: ../data/glade/manage_proxies_window.glade.h:7 +msgid "Pass_word:" +msgstr "Lo_zinka:" + +#: ../data/glade/manage_proxies_window.glade.h:8 msgid "Type:" msgstr "Vrsta:" -#: ../data/glade/manage_proxies_window.glade.h:8 +#: ../data/glade/manage_proxies_window.glade.h:9 msgid "Use authentication" msgstr "Koristi autentifikaciju" +#: ../data/glade/manage_proxies_window.glade.h:10 +msgid "_Host:" +msgstr "_Poslužitelj:" + #: ../data/glade/message_window.glade.h:1 msgid "Click to insert an emoticon (Alt+M)" msgstr "Kliknite da ubacite emoticon (Alt+M)" -#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1104 +#: ../data/glade/message_window.glade.h:2 ../src/chat_control.py:1167 msgid "OpenPGP Encryption" msgstr "OpenPGP Enkripcija" @@ -1329,7 +1356,7 @@ #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector) #: ../data/glade/message_window.glade.h:6 #: ../data/glade/xml_console_window.glade.h:11 -#: ../src/filetransfers_window.py:253 +#: ../src/filetransfers_window.py:245 msgid "_Send" msgstr "_Pošalji" @@ -1371,14 +1398,10 @@ msgstr "Vizualne Obavijesti" #: ../data/glade/preferences_window.glade.h:12 -msgid "A_fter nickname:" -msgstr "Poslije nadimka:" - -#: ../data/glade/preferences_window.glade.h:13 msgid "Advanced" msgstr "Napredno" -#: ../data/glade/preferences_window.glade.h:14 +#: ../data/glade/preferences_window.glade.h:13 msgid "" "All chat states\n" "Composing only\n" @@ -1388,19 +1411,22 @@ "Samo pisanje\n" "Onemogućeno" -#: ../data/glade/preferences_window.glade.h:17 +#: ../data/glade/preferences_window.glade.h:16 msgid "Allow _OS information to be sent" msgstr "Dozvoli slanje podataka o _OS-u" -#: ../data/glade/preferences_window.glade.h:18 +#: ../data/glade/preferences_window.glade.h:17 msgid "Allow popup/notifications when I'm _away/na/busy/invisible" -msgstr "" -"Dozvoli popup obavijesti kada sam _odsutan/nedostupan/zaposlen/nevidljiv" +msgstr "Dozvoli popup obavijesti kada sam _odsutan/nedostupan/zauzet/nevidljiv" -#: ../data/glade/preferences_window.glade.h:19 +#: ../data/glade/preferences_window.glade.h:18 msgid "Also known as iChat style" msgstr "Poznato i kao iChat stil" +#: ../data/glade/preferences_window.glade.h:19 +msgid "Always check to see if Gajim is the _default Jabber client on startup" +msgstr "Uvijek provjeri ako je Gajim _zadani Jabber klijent, pri pokretanju" + #: ../data/glade/preferences_window.glade.h:20 msgid "" "An example: If you have enabled status message for away, Gajim won't ask you " @@ -1438,64 +1464,70 @@ "Prilagođeno" #: ../data/glade/preferences_window.glade.h:29 -msgid "B_efore nickname:" -msgstr "Prij_e nadimka" - -#: ../data/glade/preferences_window.glade.h:30 ../src/chat_control.py:844 msgid "Chat" msgstr "Razgovor" -#: ../data/glade/preferences_window.glade.h:31 +#: ../data/glade/preferences_window.glade.h:30 msgid "" "Check this option, only if someone you don't have in the roster spams/annoys " -"you. Use with caution, cause it blocks all messages from any contact that is " -"not in the roster" +"you. Use with caution, because it blocks all messages from any contact that " +"is not in the roster" msgstr "" -"Označite ovu opciju samo ako vas netko van vaše liste spama/uznemirava. " -"Koristite sa oprezom, blokira sve poruke koje dolaze od ljudi van vaše liste " -"kontakata" +"Označite ovu opciju samo ako vam netko van vaše liste šalje neželjene poruke " +"ili vas uznemirava. Koristite sa oprezom, blokira sve poruke koje dolaze od " +"ljudi van vaše liste kontakata" -#: ../data/glade/preferences_window.glade.h:32 +#: ../data/glade/preferences_window.glade.h:31 msgid "Configure color and font of the interface" msgstr "Postavi boje i font sučelja" -#: ../data/glade/preferences_window.glade.h:33 +#: ../data/glade/preferences_window.glade.h:32 msgid "Default Status Messages" msgstr "Predefinirana Statusna Poruka" -#: ../data/glade/preferences_window.glade.h:34 +#: ../data/glade/preferences_window.glade.h:33 msgid "Default status _iconset:" msgstr "Predefinirani statusni set _ikona" -#: ../data/glade/preferences_window.glade.h:35 +#: ../data/glade/preferences_window.glade.h:34 +msgid "" +"Determined by sender\n" +"Chat message\n" +"Single message" +msgstr "" +"Utvrđeno po pošiljaocu\n" +"Razgovorna poruka\n" +"Jedna poruka" + +#: ../data/glade/preferences_window.glade.h:37 msgid "Display _extra email details" msgstr "Prikaži dodatne email _detalje" -#: ../data/glade/preferences_window.glade.h:36 +#: ../data/glade/preferences_window.glade.h:38 msgid "Display a_vatars of contacts in roster" msgstr "Prikaži a_vatare kontakata na listi" -#: ../data/glade/preferences_window.glade.h:37 +#: ../data/glade/preferences_window.glade.h:39 msgid "Display status _messages of contacts in roster" msgstr "Prikaži statusne _poruke kontakata na listi" -#: ../data/glade/preferences_window.glade.h:38 +#: ../data/glade/preferences_window.glade.h:40 msgid "Displayed Chat state noti_fications:" msgstr "Prikazane Noti_fikacije o statusu razgovora" -#: ../data/glade/preferences_window.glade.h:39 +#: ../data/glade/preferences_window.glade.h:41 msgid "E_very 5 minutes" msgstr "S_vakih 5 minuta" -#: ../data/glade/preferences_window.glade.h:40 +#: ../data/glade/preferences_window.glade.h:42 msgid "Emoticons:" msgstr "Emotikone:" -#: ../data/glade/preferences_window.glade.h:41 +#: ../data/glade/preferences_window.glade.h:43 msgid "Events" msgstr "Događaji" -#: ../data/glade/preferences_window.glade.h:42 +#: ../data/glade/preferences_window.glade.h:44 msgid "" "Gajim can send and receive meta-information related to a conversation you " "may have with a contact. Here you can specify which chatstates you want to " @@ -1505,7 +1537,7 @@ "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se prikazati u " "prozorima razgovora." -#: ../data/glade/preferences_window.glade.h:43 +#: ../data/glade/preferences_window.glade.h:45 msgid "" "Gajim can send and receive meta-information related to a conversation you " "may have with a contact. Here you can specify which chatstates you want to " @@ -1515,13 +1547,12 @@ "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati " "drugoj osobi." -#: ../data/glade/preferences_window.glade.h:44 +#: ../data/glade/preferences_window.glade.h:46 msgid "" -"Gajim will automatically show new events by poping up the relative window" -msgstr "" -"Gajim će automatski prikazivati nove događaje iskačući sa bitnim prozorom" +"Gajim will automatically show new events by popping up the relevant window" +msgstr "Gajim će automatski prikazivati nove događaje prikazujući bitan prozor" -#: ../data/glade/preferences_window.glade.h:45 +#: ../data/glade/preferences_window.glade.h:47 msgid "" "Gajim will notify you for new events via a popup in the bottom right of the " "screen" @@ -1529,7 +1560,7 @@ "Gajim će vas obavijestiti o novim događajima sa popup prozorom u donjem " "desnom kutu ekrana" -#: ../data/glade/preferences_window.glade.h:46 +#: ../data/glade/preferences_window.glade.h:48 msgid "" "Gajim will notify you via a popup window in the bottom right of the screen " "about contacts that just signed in" @@ -1537,7 +1568,7 @@ "Gajim će vas obavijestiti o kontaktima koji su se upravo prijavili sa popup " "prozorom u donjem desnom kutu ekrana" -#: ../data/glade/preferences_window.glade.h:47 +#: ../data/glade/preferences_window.glade.h:49 msgid "" "Gajim will notify you via a popup window in the bottom right of the screen " "about contacts that just signed out" @@ -1545,13 +1576,13 @@ "Gajim će vas obavijestiti o kontaktima koji su se upravo odjavili sa popup " "prozorom u donjem desnom kutu ekrana" -#: ../data/glade/preferences_window.glade.h:48 +#: ../data/glade/preferences_window.glade.h:50 msgid "" "Gajim will only change the icon of the contact that triggered the new event" msgstr "" "Gajim će mjenjati ikonu samo onom kontaktu koji je potaknuo novi događaj" -#: ../data/glade/preferences_window.glade.h:50 +#: ../data/glade/preferences_window.glade.h:52 msgid "" "If checked, Gajim will also include information about the sender of the new " "emails" @@ -1559,7 +1590,7 @@ "Ako je označeno, Gajim će ujedno uključiti i informacije o pošiljatelju " "novih emailova" -#: ../data/glade/preferences_window.glade.h:51 +#: ../data/glade/preferences_window.glade.h:53 msgid "" "If checked, Gajim will display avatars of contacts in roster window and in " "group chats" @@ -1567,7 +1598,7 @@ "Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i " "u grupnim razgovorima" -#: ../data/glade/preferences_window.glade.h:52 +#: ../data/glade/preferences_window.glade.h:54 msgid "" "If checked, Gajim will display status messages of contacts under the contact " "name in roster window and in group chats" @@ -1575,7 +1606,7 @@ "Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena " "kontakta u listi kontakata i u grupnim razgovorima" -#: ../data/glade/preferences_window.glade.h:53 +#: ../data/glade/preferences_window.glade.h:55 msgid "" "If checked, Gajim will remember the roster and chat window positions in the " "screen and the sizes of them next time you run it" @@ -1583,7 +1614,7 @@ "Ako je označeno, Gajim će se prisjetiti pozicije prozora liste kontakata i " "razgovora, kao i njihove veličine kod sljedećeg pokretanja" -#: ../data/glade/preferences_window.glade.h:54 +#: ../data/glade/preferences_window.glade.h:56 msgid "" "If checked, Gajim will use protocol-specific status icons. (eg. A contact " "from MSN will have the equivalent msn icon for status online, away, busy, " @@ -1592,7 +1623,7 @@ "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. " "(npr. kontakt sa MSN-a će imati msn ikone za statuse)" -#: ../data/glade/preferences_window.glade.h:55 +#: ../data/glade/preferences_window.glade.h:57 msgid "" "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent " "animated or static graphical emoticons" @@ -1600,15 +1631,15 @@ "Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa " "ekvivalentnim animiranim ili statičnim grafičkim emotikonama" -#: ../data/glade/preferences_window.glade.h:56 +#: ../data/glade/preferences_window.glade.h:58 msgid "Ignore rich content in incoming messages" msgstr "Ignoriraj bogati sadržaj u dolaznim porukama" -#: ../data/glade/preferences_window.glade.h:57 +#: ../data/glade/preferences_window.glade.h:59 msgid "Ma_nage..." msgstr "Po_desi" -#: ../data/glade/preferences_window.glade.h:58 +#: ../data/glade/preferences_window.glade.h:60 msgid "" "Never\n" "Always\n" @@ -1620,59 +1651,59 @@ "Ovisi o računu\n" "Ovisi o tipu" -#: ../data/glade/preferences_window.glade.h:62 +#: ../data/glade/preferences_window.glade.h:64 msgid "Notify me about contacts that: " msgstr "Obavijesti me o kontaktima koji:" -#: ../data/glade/preferences_window.glade.h:63 +#: ../data/glade/preferences_window.glade.h:65 msgid "Notify on new _GMail email" msgstr "Obavijesti o novoj _Gmail e-pošti" -#: ../data/glade/preferences_window.glade.h:64 +#: ../data/glade/preferences_window.glade.h:66 msgid "On every _message" msgstr "Na svaku _poruku" -#: ../data/glade/preferences_window.glade.h:65 +#: ../data/glade/preferences_window.glade.h:67 msgid "One message _window:" msgstr "Prozor _jedne poruke:" -#: ../data/glade/preferences_window.glade.h:66 +#: ../data/glade/preferences_window.glade.h:68 msgid "Outgoing Chat state noti_fications:" msgstr "Noti_fikacije o statusu odlaznog razgovora" -#: ../data/glade/preferences_window.glade.h:67 +#: ../data/glade/preferences_window.glade.h:69 msgid "Play _sounds" msgstr "Sviraj _zvukove" -#: ../data/glade/preferences_window.glade.h:68 +#: ../data/glade/preferences_window.glade.h:70 msgid "Preferences" msgstr "Postavke" -#: ../data/glade/preferences_window.glade.h:69 +#: ../data/glade/preferences_window.glade.h:71 msgid "Print time:" msgstr "Prikaz vremena:" -#: ../data/glade/preferences_window.glade.h:70 +#: ../data/glade/preferences_window.glade.h:72 msgid "Save _position and size for roster and chat windows" msgstr "Snimi _poziciju i veličinu za prozore liste kontakata i razgovora" -#: ../data/glade/preferences_window.glade.h:71 +#: ../data/glade/preferences_window.glade.h:73 msgid "Set status message to reflect currently playing _music track" msgstr "Postavi statusnu poruku da odražava trenutno svirajuću _glazbenu traku" -#: ../data/glade/preferences_window.glade.h:72 +#: ../data/glade/preferences_window.glade.h:74 msgid "Show only in _roster" msgstr "Prikaži samo u _listi kontakata" -#: ../data/glade/preferences_window.glade.h:73 +#: ../data/glade/preferences_window.glade.h:75 msgid "Sign _in" msgstr "Se _prijavi" -#: ../data/glade/preferences_window.glade.h:74 +#: ../data/glade/preferences_window.glade.h:76 msgid "Sign _out" msgstr "_Se odjavi" -#: ../data/glade/preferences_window.glade.h:75 +#: ../data/glade/preferences_window.glade.h:77 msgid "" "Some messages may include rich content (formatting, colors etc). If checked, " "Gajim will just display the raw message text." @@ -1680,35 +1711,39 @@ "Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.) Ako je " "označeno, Gajim će samo prikazivati sirovi tekst poruke." -#: ../data/glade/preferences_window.glade.h:76 +#: ../data/glade/preferences_window.glade.h:78 msgid "Status" msgstr "Status" -#: ../data/glade/preferences_window.glade.h:77 +#: ../data/glade/preferences_window.glade.h:79 msgid "T_heme:" msgstr "_Tema:" -#: ../data/glade/preferences_window.glade.h:78 +#: ../data/glade/preferences_window.glade.h:80 msgid "The auto away status message" msgstr "Statusna poruka automatske odsutnosti" -#: ../data/glade/preferences_window.glade.h:79 +#: ../data/glade/preferences_window.glade.h:81 msgid "The auto not available status message" msgstr "Statusna poruka automatske ne dostupnosti" -#: ../data/glade/preferences_window.glade.h:80 +#: ../data/glade/preferences_window.glade.h:82 +msgid "Treat all incoming messages as:" +msgstr "Tretiraj sve dolazne poruke kao:" + +#: ../data/glade/preferences_window.glade.h:83 msgid "Use _transports iconsets" msgstr "Koristi set ikona _transporta" -#: ../data/glade/preferences_window.glade.h:81 +#: ../data/glade/preferences_window.glade.h:84 msgid "Use system _default" msgstr "Koristi pret_postavljeno od sustava" -#: ../data/glade/preferences_window.glade.h:82 +#: ../data/glade/preferences_window.glade.h:85 msgid "Use t_rayicon (aka. notification area icon)" msgstr "Koristi t_ray ikonu" -#: ../data/glade/preferences_window.glade.h:83 +#: ../data/glade/preferences_window.glade.h:86 msgid "" "When a new event (message, file transfer request etc..) is received, the " "following methods may be used to inform you about it. Please note that " @@ -1720,11 +1755,11 @@ "obavijesti o novim porukama prikazuju samo za kontakte sa kojima trenutno ne " "razgovarate" -#: ../data/glade/preferences_window.glade.h:84 +#: ../data/glade/preferences_window.glade.h:87 msgid "When new event is received" msgstr "Kada se primi novi događaj" -#: ../data/glade/preferences_window.glade.h:85 +#: ../data/glade/preferences_window.glade.h:88 msgid "" "Works for Rhythmbox and Muine players. For more players, please visit http://" "trac.gajim.org/wiki/GajimAndMusicPlayer" @@ -1732,91 +1767,83 @@ "Radi sa Rhytmbox i Muine sviračima. Za više svirača, molimo posjetite http://" "trac.gajim.org/wiki/GajimAndMusicPlayer" -#: ../data/glade/preferences_window.glade.h:86 +#: ../data/glade/preferences_window.glade.h:89 msgid "_Advanced Notifications Control..." msgstr "_Napredno Upravljanje Obavijestima..." -#: ../data/glade/preferences_window.glade.h:87 -msgid "_After time:" -msgstr "_Nakon vremena:" - -#: ../data/glade/preferences_window.glade.h:88 -msgid "_Before time:" -msgstr "_Prije vremena:" - -#: ../data/glade/preferences_window.glade.h:89 +#: ../data/glade/preferences_window.glade.h:90 msgid "_Browser:" msgstr "_Pretražnik:" -#: ../data/glade/preferences_window.glade.h:90 +#: ../data/glade/preferences_window.glade.h:91 msgid "_File manager:" msgstr "_Upravitelj datotekama:" -#: ../data/glade/preferences_window.glade.h:91 +#: ../data/glade/preferences_window.glade.h:92 msgid "_Font:" msgstr "_Font:" -#: ../data/glade/preferences_window.glade.h:92 +#: ../data/glade/preferences_window.glade.h:93 msgid "_Highlight misspelled words" msgstr "_Osvijetli krivo napisane riječi" -#: ../data/glade/preferences_window.glade.h:93 +#: ../data/glade/preferences_window.glade.h:94 msgid "_Ignore events from contacts not in the roster" msgstr "_Ignoriraj događaje od kontakata koji nisu na listi kontakata" -#: ../data/glade/preferences_window.glade.h:94 +#: ../data/glade/preferences_window.glade.h:95 msgid "_Incoming message:" msgstr "_Dolazna poruka:" -#: ../data/glade/preferences_window.glade.h:95 +#: ../data/glade/preferences_window.glade.h:96 msgid "_Log status changes of contacts" msgstr "_Pamti promjene statusa kontakata" -#: ../data/glade/preferences_window.glade.h:96 +#: ../data/glade/preferences_window.glade.h:97 msgid "_Mail client:" msgstr "_Mail klijent:" -#: ../data/glade/preferences_window.glade.h:97 +#: ../data/glade/preferences_window.glade.h:98 msgid "_Never" msgstr "_Nikada" -#: ../data/glade/preferences_window.glade.h:98 +#: ../data/glade/preferences_window.glade.h:99 msgid "_Notify me about it" msgstr "_Obavijesti me o tome" -#: ../data/glade/preferences_window.glade.h:99 +#: ../data/glade/preferences_window.glade.h:100 msgid "_Open..." msgstr "_Otvori..." -#: ../data/glade/preferences_window.glade.h:100 +#: ../data/glade/preferences_window.glade.h:101 msgid "_Outgoing message:" msgstr "_Odlazna poruka:" -#: ../data/glade/preferences_window.glade.h:101 +#: ../data/glade/preferences_window.glade.h:102 msgid "_Player:" msgstr "_Player:" -#: ../data/glade/preferences_window.glade.h:102 +#: ../data/glade/preferences_window.glade.h:103 msgid "_Pop it up" msgstr "_Iskoči ga" -#: ../data/glade/preferences_window.glade.h:103 +#: ../data/glade/preferences_window.glade.h:104 msgid "_Reset to Default Colors" msgstr "_Ponovo učitavanje Pretpostavljenih Boja" -#: ../data/glade/preferences_window.glade.h:104 +#: ../data/glade/preferences_window.glade.h:105 msgid "_Sort contacts by status" msgstr "_Sortiranje kontakata po statusu" -#: ../data/glade/preferences_window.glade.h:105 +#: ../data/glade/preferences_window.glade.h:106 msgid "_Status message:" msgstr "_Statusna poruka:" -#: ../data/glade/preferences_window.glade.h:106 +#: ../data/glade/preferences_window.glade.h:107 msgid "_URL:" msgstr "_URL:" -#: ../data/glade/preferences_window.glade.h:107 +#: ../data/glade/preferences_window.glade.h:108 msgid "minutes" msgstr "minuta" @@ -1860,7 +1887,7 @@ msgid "Order:" msgstr "Poredak:" -#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:1841 +#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2085 msgid "Privacy List" msgstr "Lista Privatnosti" @@ -1926,126 +1953,122 @@ msgstr "Mjesto:" #: ../data/glade/profile_window.glade.h:7 -#: ../data/glade/vcard_information_window.glade.h:10 +msgid "Click to set your avatar" +msgstr "Kliknite za postavljanje avatara" + +#: ../data/glade/profile_window.glade.h:8 +#: ../data/glade/vcard_information_window.glade.h:11 msgid "Company:" msgstr "Poduzeće:" -#: ../data/glade/profile_window.glade.h:8 -#: ../data/glade/vcard_information_window.glade.h:13 +#: ../data/glade/profile_window.glade.h:9 +#: ../data/glade/vcard_information_window.glade.h:15 msgid "Country:" msgstr "Država:" -#: ../data/glade/profile_window.glade.h:9 -#: ../data/glade/vcard_information_window.glade.h:14 +#: ../data/glade/profile_window.glade.h:10 +#: ../data/glade/vcard_information_window.glade.h:16 msgid "Department:" msgstr "Odjel:" -#: ../data/glade/profile_window.glade.h:10 -#: ../data/glade/vcard_information_window.glade.h:15 +#: ../data/glade/profile_window.glade.h:11 +#: ../data/glade/vcard_information_window.glade.h:17 #: ../data/glade/zeroconf_information_window.glade.h:2 #: ../data/glade/zeroconf_properties_window.glade.h:5 msgid "E-Mail:" msgstr "E-Mail:" -#: ../data/glade/profile_window.glade.h:11 -#: ../data/glade/vcard_information_window.glade.h:16 +#: ../data/glade/profile_window.glade.h:12 +#: ../data/glade/vcard_information_window.glade.h:18 msgid "Extra Address:" msgstr "Dodatna Adresa:" #. Family Name -#: ../data/glade/profile_window.glade.h:13 -#: ../data/glade/vcard_information_window.glade.h:18 +#: ../data/glade/profile_window.glade.h:14 +#: ../data/glade/vcard_information_window.glade.h:20 msgid "Family:" msgstr "Obitelj:" #. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly) -#: ../data/glade/profile_window.glade.h:15 -#: ../data/glade/vcard_information_window.glade.h:20 +#: ../data/glade/profile_window.glade.h:16 +#: ../data/glade/vcard_information_window.glade.h:22 msgid "Format: YYYY-MM-DD" msgstr "Format: GGGG-MM-DD" #. Given Name -#: ../data/glade/profile_window.glade.h:17 -#: ../data/glade/vcard_information_window.glade.h:22 +#: ../data/glade/profile_window.glade.h:18 +#: ../data/glade/vcard_information_window.glade.h:24 msgid "Given:" msgstr "Dano:" -#: ../data/glade/profile_window.glade.h:18 -#: ../data/glade/vcard_information_window.glade.h:23 +#: ../data/glade/profile_window.glade.h:19 +#: ../data/glade/vcard_information_window.glade.h:25 msgid "Homepage:" msgstr "Vlastita stranica:" #. Middle Name -#: ../data/glade/profile_window.glade.h:20 -#: ../data/glade/vcard_information_window.glade.h:26 +#: ../data/glade/profile_window.glade.h:21 +#: ../data/glade/vcard_information_window.glade.h:28 msgid "Middle:" msgstr "Srednje" -#: ../data/glade/profile_window.glade.h:21 -#: ../data/glade/vcard_information_window.glade.h:27 +#: ../data/glade/profile_window.glade.h:22 +#: ../data/glade/vcard_information_window.glade.h:29 msgid "More" msgstr "Više" -#: ../data/glade/profile_window.glade.h:24 -#: ../data/glade/vcard_information_window.glade.h:31 +#: ../data/glade/profile_window.glade.h:25 +#: ../data/glade/vcard_information_window.glade.h:34 msgid "Personal Info" msgstr "Osobne Informacije" -#: ../data/glade/profile_window.glade.h:26 -#: ../data/glade/vcard_information_window.glade.h:32 +#: ../data/glade/profile_window.glade.h:27 +#: ../data/glade/vcard_information_window.glade.h:35 msgid "Phone No.:" msgstr "Broj Telefona:" -#: ../data/glade/profile_window.glade.h:27 -#: ../data/glade/vcard_information_window.glade.h:33 +#: ../data/glade/profile_window.glade.h:28 +#: ../data/glade/vcard_information_window.glade.h:36 msgid "Position:" msgstr "Pozicija:" -#: ../data/glade/profile_window.glade.h:28 -#: ../data/glade/vcard_information_window.glade.h:34 +#: ../data/glade/profile_window.glade.h:29 +#: ../data/glade/vcard_information_window.glade.h:37 msgid "Postal Code:" msgstr "Poštanski broj:" #. Prefix in Name -#: ../data/glade/profile_window.glade.h:30 -#: ../data/glade/vcard_information_window.glade.h:36 +#: ../data/glade/profile_window.glade.h:31 +#: ../data/glade/vcard_information_window.glade.h:39 msgid "Prefix:" msgstr "Prefiks:" -#: ../data/glade/profile_window.glade.h:31 -#: ../data/glade/vcard_information_window.glade.h:38 ../src/vcard.py:273 +#: ../data/glade/profile_window.glade.h:32 +#: ../data/glade/vcard_information_window.glade.h:41 ../src/vcard.py:382 msgid "Role:" msgstr "Uloga:" -#: ../data/glade/profile_window.glade.h:32 -#: ../data/glade/vcard_information_window.glade.h:39 +#: ../data/glade/profile_window.glade.h:33 +#: ../data/glade/vcard_information_window.glade.h:42 msgid "State:" msgstr "Država:" -#: ../data/glade/profile_window.glade.h:33 -#: ../data/glade/vcard_information_window.glade.h:41 +#: ../data/glade/profile_window.glade.h:34 +#: ../data/glade/vcard_information_window.glade.h:44 msgid "Street:" msgstr "Ulica:" #. Suffix in Name -#: ../data/glade/profile_window.glade.h:35 -#: ../data/glade/vcard_information_window.glade.h:45 +#: ../data/glade/profile_window.glade.h:36 +#: ../data/glade/vcard_information_window.glade.h:48 msgid "Suffix:" msgstr "Sufiks:" -#: ../data/glade/profile_window.glade.h:36 -#: ../data/glade/vcard_information_window.glade.h:46 +#: ../data/glade/profile_window.glade.h:37 +#: ../data/glade/vcard_information_window.glade.h:50 msgid "Work" msgstr "Posao" -#: ../data/glade/profile_window.glade.h:37 -msgid "_Publish" -msgstr "_Objava" - -#: ../data/glade/profile_window.glade.h:38 -msgid "_Retrieve" -msgstr "_Dohvati" - #: ../data/glade/remove_account_window.glade.h:1 msgid "What do you want to do?" msgstr "Što želite učiniti?" @@ -2068,61 +2091,84 @@ msgstr "Dodaj Posebnu _Obavijest" #: ../data/glade/roster_contact_context_menu.glade.h:3 +msgid "Assign Custom _Avatar" +msgstr "" + +#: ../data/glade/roster_contact_context_menu.glade.h:4 #: ../data/glade/zeroconf_contact_context_menu.glade.h:2 msgid "Assign Open_PGP Key" msgstr "Pridruži Open_PGP Ključ" -#: ../data/glade/roster_contact_context_menu.glade.h:4 +#: ../data/glade/roster_contact_context_menu.glade.h:5 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3 -#: ../src/roster_window.py:1993 +#: ../src/roster_window.py:2357 msgid "Edit _Groups" msgstr "Izmjeni _Grupe" -#: ../data/glade/roster_contact_context_menu.glade.h:5 -#: ../src/roster_window.py:2128 +#: ../data/glade/roster_contact_context_menu.glade.h:6 +#: ../src/roster_window.py:2593 msgid "Execute Command..." msgstr "Izvršiti Naredbu..." -#: ../data/glade/roster_contact_context_menu.glade.h:6 -#: ../src/roster_window.py:1951 +#: ../data/glade/roster_contact_context_menu.glade.h:7 +#: ../src/roster_window.py:2315 msgid "In_vite to" msgstr "Pozo_vi u" -#: ../data/glade/roster_contact_context_menu.glade.h:7 +#: ../data/glade/roster_contact_context_menu.glade.h:8 #: ../data/glade/systray_context_menu.glade.h:2 msgid "Send Single _Message" msgstr "Pošalji Jednu _Poruku" -#: ../data/glade/roster_contact_context_menu.glade.h:9 +#: ../data/glade/roster_contact_context_menu.glade.h:10 +msgid "Send cus_tom status" +msgstr "Pošalji prilagođeni status" + +#: ../data/glade/roster_contact_context_menu.glade.h:11 #: ../data/glade/zeroconf_contact_context_menu.glade.h:5 msgid "Start _Chat" msgstr "Započni _Razgovor" -#: ../data/glade/roster_contact_context_menu.glade.h:11 +#: ../data/glade/roster_contact_context_menu.glade.h:13 msgid "_Allow him/her to see my status" msgstr "_Dozvoli njemu/njoj da vidi moj status" -#: ../data/glade/roster_contact_context_menu.glade.h:12 +#: ../data/glade/roster_contact_context_menu.glade.h:14 +#: ../src/roster_window.py:2381 ../src/roster_window.py:2540 +msgid "_Block" +msgstr "_Blokiraj" + +#: ../data/glade/roster_contact_context_menu.glade.h:15 msgid "_Forbid him/her to see my status" msgstr "_Zabrani mu/joj da vidi moj status" +#: ../data/glade/roster_contact_context_menu.glade.h:17 +#, fuzzy +msgid "_Manage contact" +msgstr "Podešavanje Računa" + #. Remove group -#: ../data/glade/roster_contact_context_menu.glade.h:14 -#: ../src/roster_window.py:1945 ../src/roster_window.py:2042 -#: ../src/roster_window.py:2149 +#: ../data/glade/roster_contact_context_menu.glade.h:18 +#: ../src/roster_window.py:2309 ../src/roster_window.py:2466 +#: ../src/roster_window.py:2614 msgid "_Remove from Roster" msgstr "_Ukloni sa Liste kontakata" -#: ../data/glade/roster_contact_context_menu.glade.h:15 +#: ../data/glade/roster_contact_context_menu.glade.h:19 #: ../data/glade/zeroconf_contact_context_menu.glade.h:7 -#: ../src/roster_window.py:2137 +#: ../src/roster_window.py:2602 msgid "_Rename" msgstr "_Preimenuj" -#: ../data/glade/roster_contact_context_menu.glade.h:16 +#: ../data/glade/roster_contact_context_menu.glade.h:20 msgid "_Subscription" msgstr "_Pretplata" +#: ../data/glade/roster_contact_context_menu.glade.h:21 +#: ../src/roster_window.py:2375 ../src/roster_window.py:2534 +msgid "_Unblock" +msgstr "_Odblokiraj" + #: ../data/glade/roster_window.glade.h:1 msgid "A_ccounts" msgstr "Korisnički računi" @@ -2163,8 +2209,8 @@ msgid "_Discover Services" msgstr "_Otkrivanje Usluga" -#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1256 -#: ../src/roster_window.py:2120 +#: ../data/glade/roster_window.glade.h:14 ../src/disco.py:1353 +#: ../src/roster_window.py:2585 msgid "_Edit" msgstr "_Uredi" @@ -2257,11 +2303,13 @@ msgstr "_Odobri" #: ../data/glade/subscription_request_window.glade.h:2 -msgid "Authorize contact so he can know when you're connected" +msgid "Authorize contact so he or she can know when you're connected" msgstr "Dozvoli kontaktu da može vidjeti kada sam spojen" #: ../data/glade/subscription_request_window.glade.h:3 -msgid "Deny authorization from contact so he cannot know when you're connected" +msgid "" +"Deny authorization from contact so he or she cannot know when you're " +"connected" msgstr "Odbija autorizaciju kontaktu kako nebi mogao vidjeti kada ste spojeni" #: ../data/glade/subscription_request_window.glade.h:4 @@ -2294,51 +2342,58 @@ msgstr "Pitaj:" #: ../data/glade/vcard_information_window.glade.h:8 +msgid "Click to force avatar" +msgstr "Kliknite za prisilno postavljanje avatara" + +#: ../data/glade/vcard_information_window.glade.h:9 msgid "Client:" msgstr "Klijent:" -#: ../data/glade/vcard_information_window.glade.h:9 +#: ../data/glade/vcard_information_window.glade.h:10 msgid "Comments" msgstr "Komentari" -#: ../data/glade/vcard_information_window.glade.h:11 +#: ../data/glade/vcard_information_window.glade.h:12 +msgid "Configured avatar:" +msgstr "Podešeni avatar:" + +#: ../data/glade/vcard_information_window.glade.h:13 #: ../data/glade/zeroconf_information_window.glade.h:1 msgid "Contact" msgstr "Kontakt" -#: ../data/glade/vcard_information_window.glade.h:12 +#: ../data/glade/vcard_information_window.glade.h:14 msgid "Contact Information" msgstr "Informacije Kontakta" -#: ../data/glade/vcard_information_window.glade.h:24 +#: ../data/glade/vcard_information_window.glade.h:26 #: ../data/glade/zeroconf_information_window.glade.h:4 -#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:416 +#: ../data/glade/zeroconf_properties_window.glade.h:13 ../src/dialogs.py:442 msgid "Jabber ID:" msgstr "Jabber ID:" -#: ../data/glade/vcard_information_window.glade.h:30 +#: ../data/glade/vcard_information_window.glade.h:33 msgid "OS:" msgstr "OS:" -#: ../data/glade/vcard_information_window.glade.h:37 +#: ../data/glade/vcard_information_window.glade.h:40 #: ../data/glade/zeroconf_information_window.glade.h:8 msgid "Resource:" msgstr "Resurs" -#: ../data/glade/vcard_information_window.glade.h:40 +#: ../data/glade/vcard_information_window.glade.h:43 #: ../data/glade/zeroconf_information_window.glade.h:9 msgid "Status:" msgstr "Status:" #. Family Name -#: ../data/glade/vcard_information_window.glade.h:43 +#: ../data/glade/vcard_information_window.glade.h:46 msgid "Subscription:" msgstr "Pretplata:" -#: ../data/glade/vcard_information_window.glade.h:47 -#: ../data/glade/zeroconf_information_window.glade.h:10 -msgid "_Log conversation history" -msgstr "_Pamti povijest razgovora" +#: ../data/glade/vcard_information_window.glade.h:49 +msgid "User avatar:" +msgstr "Korisnički Avatar:" #: ../data/glade/xml_console_window.glade.h:1 msgid "Jabber Traffic" @@ -2397,7 +2452,7 @@ msgstr "" "Ako je pretpostavljeni port koji se koristi za dolazne poruke neprikladan za " "vaše postavke, ovdje možete odabrati neki drugi.\n" -"Mogli biste uzeti u obzir mogućnost izmjene postavki vatrozida." +"Mogli bi ste uzeti u obzir mogućnost izmjene postavki vatrozida." #: ../data/glade/zeroconf_properties_window.glade.h:15 msgid "Modify Account" @@ -2407,25 +2462,50 @@ msgid "Use custom port:" msgstr "Koristi vlastiti port:" -#: ../src/advanced.py:57 +#. For i18n +#: ../src/advanced.py:51 +msgid "Activated" +msgstr "Aktivno" + +#: ../src/advanced.py:51 +msgid "Deactivated" +msgstr "Neaktivno" + +#: ../src/advanced.py:53 +msgid "Boolean" +msgstr "Boolean" + +#: ../src/advanced.py:54 +msgid "Integer" +msgstr "Cijeli broj" + +#: ../src/advanced.py:55 +msgid "Text" +msgstr "Tekst" + +#: ../src/advanced.py:56 +msgid "Color" +msgstr "Boja" + +#: ../src/advanced.py:65 msgid "Preference Name" msgstr "Ime Postavke" -#: ../src/advanced.py:63 +#: ../src/advanced.py:71 msgid "Value" msgstr "Vrijednost" -#: ../src/advanced.py:72 +#: ../src/advanced.py:79 msgid "Type" msgstr "Vrsta" #. we talk about option description in advanced configuration editor -#: ../src/advanced.py:128 +#: ../src/advanced.py:136 msgid "(None)" msgstr "(Nema)" #. we talk about password -#: ../src/advanced.py:227 +#: ../src/advanced.py:239 msgid "Hidden" msgstr "Skrivena" @@ -2439,12 +2519,16 @@ msgstr "Engleski" #: ../src/chat_control.py:52 +msgid "Belarusian" +msgstr "Bjeloruski" + +#: ../src/chat_control.py:52 msgid "Bulgarian" msgstr "Bugarski" #: ../src/chat_control.py:52 -msgid "Briton" -msgstr "Britanski" +msgid "Breton" +msgstr "Bretonski" #: ../src/chat_control.py:52 msgid "Czech" @@ -2459,6 +2543,10 @@ msgstr "Grčki" #: ../src/chat_control.py:52 +msgid "British" +msgstr "Britanski" + +#: ../src/chat_control.py:52 msgid "Esperanto" msgstr "Esperanto" @@ -2467,7 +2555,7 @@ msgstr "Španjolski" #: ../src/chat_control.py:52 -msgid "Basc" +msgid "Basque" msgstr "Baskijski" #: ../src/chat_control.py:52 @@ -2483,15 +2571,15 @@ msgstr "Talijanski" #: ../src/chat_control.py:52 -msgid "Norvegian b" -msgstr "Norveški b" +msgid "Norwegian (b)" +msgstr "Norveški (b)" #: ../src/chat_control.py:52 msgid "Dutch" msgstr "Nizozemski" #: ../src/chat_control.py:52 -msgid "Norvegian" +msgid "Norwegian" msgstr "Norveški" #: ../src/chat_control.py:52 @@ -2511,6 +2599,10 @@ msgstr "Ruski" #: ../src/chat_control.py:52 +msgid "Serbian" +msgstr "Srpski" + +#: ../src/chat_control.py:52 msgid "Slovak" msgstr "Slovački" @@ -2522,78 +2614,78 @@ msgid "Chinese (Ch)" msgstr "Kineski (Ch)" -#: ../src/chat_control.py:201 ../src/dialogs.py:1497 -msgid "" -"If that is not your language for which you want to highlight misspelled " -"words, then please set your $LANG as appropriate. Eg. for French do export " -"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it " -"global in /etc/profile.\n" -"\n" -"Highlighting misspelled words feature will not be used" -msgstr "" -"Ako to nije vaš jezik za koji želite osvjetliti krivo napisane riječi, " -"molimo podesite $LANG varijablu na odgovarajuću vrijednost. Npr. za " -"francuski napravite export LANG=fr_FR ili export LANG=fr_FR.UTF-8 u ~/." -"bash_profile ili kako bi bilo globalno u /etc/profile.\n" -"\n" -"Mogućnost osvjetljavanja krivo napisanih riječi neće biti korištena" - -#: ../src/chat_control.py:239 +#: ../src/chat_control.py:244 msgid "Spelling language" msgstr "Jezik pravopisa" #. we are not connected -#: ../src/chat_control.py:262 ../src/chat_control.py:468 +#: ../src/chat_control.py:267 ../src/chat_control.py:473 msgid "A connection is not available" msgstr "Veza nije dostupna" -#: ../src/chat_control.py:263 ../src/chat_control.py:469 +#: ../src/chat_control.py:268 ../src/chat_control.py:474 msgid "Your message can not be sent until you are connected." msgstr "Vaša poruka ne može biti poslana dok niste spojeni." -#: ../src/chat_control.py:844 -msgid "Chats" -msgstr "Razgovori" - -#: ../src/chat_control.py:1030 +#: ../src/chat_control.py:1092 #, python-format msgid "%(nickname)s from group chat %(room_name)s" msgstr "%(nickname)s iz grupnog razgovora %(room_name)s" #. we talk about a contact here -#: ../src/chat_control.py:1118 +#: ../src/chat_control.py:1181 #, python-format msgid "%s has not broadcast an OpenPGP key, nor has one been assigned" msgstr "%s nije ustupio OpenPGP ključ, niti mu je ikoji dodijeljen" -#: ../src/chat_control.py:1254 +#: ../src/chat_control.py:1215 ../src/groupchat_control.py:1337 +#, python-format +msgid "Commands: %s" +msgstr "Komanda: %s" + +#: ../src/chat_control.py:1218 ../src/groupchat_control.py:1351 +#, python-format +msgid "Usage: /%s, clears the text window." +msgstr "Način korištenja: /%s, prazni tekstualni prozor" + +#: ../src/chat_control.py:1221 ../src/groupchat_control.py:1356 +#, python-format +msgid "Usage: /%s, hide the chat buttons." +msgstr "Način korištenja: /%s, sakriva dugmadi." + +#: ../src/chat_control.py:1226 ../src/groupchat_control.py:1395 +#, python-format +msgid "No help info for /%s" +msgstr "Nema informacija ni pomoći za /%s" + +#: ../src/chat_control.py:1356 msgid "Encryption enabled" msgstr "Enkripcija omogućena" -#: ../src/chat_control.py:1259 +#: ../src/chat_control.py:1361 msgid "Encryption disabled" msgstr "Enkripcija onemogućena" #. add_to_roster_menuitem -#: ../src/chat_control.py:1401 ../src/conversation_textview.py:495 -#: ../src/dialogs.py:629 ../src/gajim.py:781 ../src/gajim.py:782 -#: ../src/gajim.py:1121 ../src/roster_window.py:328 -#: ../src/roster_window.py:404 ../src/roster_window.py:1638 -#: ../src/roster_window.py:1819 ../src/roster_window.py:2392 -#: ../src/roster_window.py:2596 ../src/roster_window.py:2607 -#: ../src/roster_window.py:3832 ../src/roster_window.py:3834 -#: ../src/common/contacts.py:73 ../src/common/helpers.py:42 -#: ../src/common/helpers.py:246 +#: ../src/chat_control.py:1505 ../src/conversation_textview.py:501 +#: ../src/dialogs.py:655 ../src/gajim.py:862 ../src/gajim.py:863 +#: ../src/gajim.py:1254 ../src/roster_window.py:335 +#: ../src/roster_window.py:417 ../src/roster_window.py:1739 +#: ../src/roster_window.py:1749 ../src/roster_window.py:1928 +#: ../src/roster_window.py:2152 ../src/roster_window.py:2857 +#: ../src/roster_window.py:3064 ../src/roster_window.py:4362 +#: ../src/roster_window.py:4364 ../src/common/contacts.py:76 +#: ../src/common/helpers.py:43 ../src/common/helpers.py:255 msgid "Not in Roster" msgstr "Nije na Listi Kontakata" #. %s is being replaced in the code with JID -#: ../src/chat_control.py:1545 +#: ../src/chat_control.py:1649 #, python-format msgid "You just received a new message from \"%s\"" msgstr "Upravo ste primili novu poruku od \"%s\"" -#: ../src/chat_control.py:1546 +#: ../src/chat_control.py:1650 msgid "" "If you close this tab and you have history disabled, this message will be " "lost." @@ -2601,277 +2693,278 @@ "Ako zatvorite ovaj tab, a imate povijest onemogućenu, ova poruka biti će " "izgubljena." -#: ../src/config.py:135 ../src/config.py:594 +#: ../src/config.py:139 ../src/config.py:588 msgid "Disabled" msgstr "Onemogućeno" -#: ../src/config.py:221 +#: ../src/config.py:233 #, python-format msgid "Every %s _minutes" msgstr "Svakih %s _minuta" -#: ../src/config.py:363 +#: ../src/config.py:353 msgid "Active" msgstr "Aktivno" -#: ../src/config.py:371 +#: ../src/config.py:361 msgid "Event" msgstr "Događaj" -#: ../src/config.py:685 ../src/gajim.py:2142 +#: ../src/config.py:684 ../src/dialogs.py:941 #, python-format msgid "Dictionary for lang %s not available" msgstr "Riječnik za jezik %s nije dostupan" -#: ../src/config.py:686 ../src/gajim.py:2143 +#: ../src/config.py:685 #, python-format msgid "" "You have to install %s dictionary to use spellchecking, or choose another " "language by setting the speller_language option." msgstr "" -"Morate instalirati %s rječnik kako biste mogli koristiti provjeru pravopisa, " -"ili odaberite drugi jezik postavkom odabira speller_language opcije." +"Morate instalirati %s rječnik kako bi ste mogli koristiti provjeru " +"pravopisa, ili odaberite drugi jezik postavkom odabira speller_language " +"opcije." -#: ../src/config.py:1038 +#: ../src/config.py:1008 msgid "status message title" msgstr "naslov statusne poruke" -#: ../src/config.py:1038 +#: ../src/config.py:1008 msgid "status message text" msgstr "tekst statusne poruke" -#: ../src/config.py:1073 +#: ../src/config.py:1044 msgid "First Message Received" msgstr "Prva Poruka Primljena" -#: ../src/config.py:1074 +#: ../src/config.py:1045 msgid "Next Message Received" msgstr "Sljedeća Poruka Primljena" -#: ../src/config.py:1075 +#: ../src/config.py:1046 msgid "Contact Connected" msgstr "Kontakt Spojen" -#: ../src/config.py:1076 +#: ../src/config.py:1047 msgid "Contact Disconnected" msgstr "Kontakt Odspojen" -#: ../src/config.py:1077 +#: ../src/config.py:1048 msgid "Message Sent" msgstr "Poruka Poslana" -#: ../src/config.py:1078 +#: ../src/config.py:1049 msgid "Group Chat Message Highlight" msgstr "Označavanje Poruke Grupnog Razgovora" -#: ../src/config.py:1079 +#: ../src/config.py:1050 msgid "Group Chat Message Received" msgstr "Primljena Poruka Grupnog Razgovora" -#: ../src/config.py:1086 +#: ../src/config.py:1057 msgid "GMail Email Received" msgstr "Primljen Gmail Email" -#: ../src/config.py:1289 +#: ../src/config.py:1260 msgid "OpenPGP is not usable in this computer" msgstr "OpenPGP nije moguće koristiti na ovom računalu" -#: ../src/config.py:1335 +#: ../src/config.py:1306 msgid "You are currently connected to the server" msgstr "Trenutno ste spojeni na poslužitelj" -#: ../src/config.py:1336 +#: ../src/config.py:1307 msgid "To change the account name, you must be disconnected." msgstr "Za promjenu imena računa morate se odspojiti." -#: ../src/config.py:1339 ../src/config.py:1931 +#: ../src/config.py:1310 ../src/config.py:1916 msgid "Unread events" msgstr "Nepročitani događaji" -#: ../src/config.py:1340 +#: ../src/config.py:1311 msgid "To change the account name, you must read all pending events." msgstr "" -"Da biste mogli promjeniti ime računa, morate pročitati sve čekajuće događaje" +"Da bi ste mogli promjeniti ime računa, morate pročitati sve čekajuće događaje" -#: ../src/config.py:1344 +#: ../src/config.py:1315 msgid "Account Name Already Used" msgstr "Ime Računa Već Upotrebljeno" -#: ../src/config.py:1345 +#: ../src/config.py:1316 msgid "" "This name is already used by another of your accounts. Please choose another " "name." msgstr "Ovo ime već koristi vaš drugi račun. Molimo odaberite drugo ime." -#: ../src/config.py:1349 ../src/config.py:1353 +#: ../src/config.py:1320 ../src/config.py:1324 msgid "Invalid account name" msgstr "Neispravno ime računa" -#: ../src/config.py:1350 +#: ../src/config.py:1321 msgid "Account name cannot be empty." msgstr "Ime računa ne može biti prazno." -#: ../src/config.py:1354 +#: ../src/config.py:1325 msgid "Account name cannot contain spaces." msgstr "Ime računa ne može sadržavati razmake." -#: ../src/config.py:1362 ../src/config.py:1368 ../src/config.py:1378 -#: ../src/config.py:3036 +#: ../src/config.py:1333 ../src/config.py:1339 ../src/config.py:1349 +#: ../src/config.py:2897 msgid "Invalid Jabber ID" msgstr "Neispravan Jabber ID" -#: ../src/config.py:1369 +#: ../src/config.py:1340 msgid "A Jabber ID must be in the form \"user@servername\"." msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"." -#: ../src/config.py:1428 +#: ../src/config.py:1399 ../src/config.py:2968 msgid "Invalid entry" msgstr "Neispravan unos" -#: ../src/config.py:1429 +#: ../src/config.py:1400 ../src/config.py:2969 msgid "Custom port must be a port number." msgstr "Osobni port mora biti broj porta." -#: ../src/config.py:1555 ../src/common/config.py:363 +#: ../src/config.py:1528 ../src/common/config.py:370 msgid "Be right back." msgstr "Odmah se vraćam." -#: ../src/config.py:1565 +#: ../src/config.py:1538 msgid "Relogin now?" msgstr "Prijaviti se odmah?" -#: ../src/config.py:1566 +#: ../src/config.py:1539 msgid "If you want all the changes to apply instantly, you must relogin." msgstr "" "Ako želite da se sve promjene odmah primjene, morate se ponovo prijaviti." -#: ../src/config.py:1592 +#: ../src/config.py:1565 msgid "No such account available" msgstr "Takav račun nije dostupan" -#: ../src/config.py:1593 +#: ../src/config.py:1566 msgid "You must create your account before editing your personal information." msgstr "Morate napravit svoj račun prije izmjena osobnih informacija." -#: ../src/config.py:1600 ../src/dialogs.py:1128 ../src/dialogs.py:1297 -#: ../src/disco.py:417 ../src/profile_window.py:307 -#: ../src/profile_window.py:373 +#: ../src/config.py:1573 ../src/dialogs.py:1225 ../src/dialogs.py:1361 +#: ../src/dialogs.py:1541 ../src/disco.py:420 ../src/profile_window.py:329 msgid "You are not connected to the server" msgstr "Niste spojeni na poslužitelj." -#: ../src/config.py:1601 +#: ../src/config.py:1574 msgid "Without a connection, you can not edit your personal information." msgstr "Bez veze sa poslužiteljom nije moguća izmjena osobnih informacija." -#: ../src/config.py:1605 +#: ../src/config.py:1578 msgid "Your server doesn't support Vcard" msgstr "Vaš poslužitelj ne podržava Vcard" -#: ../src/config.py:1606 +#: ../src/config.py:1579 msgid "Your server can't save your personal information." msgstr "Vaš poslužitelj nije u mogućnosti spremiti vaše osobne informacije." -#: ../src/config.py:1630 ../src/config.py:3423 +#: ../src/config.py:1610 ../src/config.py:3400 msgid "Failed to get secret keys" msgstr "Neuspješno dohvaćanje tajnih ključeva" -#: ../src/config.py:1631 ../src/config.py:3424 +#: ../src/config.py:1611 ../src/config.py:3401 msgid "There was a problem retrieving your OpenPGP secret keys." msgstr "Došlo je do problema pri dohvaćanju vaših OpenPGP tajnih ključeva." -#: ../src/config.py:1634 ../src/config.py:3427 +#: ../src/config.py:1614 ../src/config.py:3404 msgid "OpenPGP Key Selection" msgstr "Odabir OpenPGP Ključeva" -#: ../src/config.py:1635 ../src/config.py:3428 +#: ../src/config.py:1615 ../src/config.py:3405 msgid "Choose your OpenPGP key" msgstr "Odaberite svoj OpenPGP ključ" #. Name column -#: ../src/config.py:1865 ../src/disco.py:741 ../src/disco.py:1467 -#: ../src/disco.py:1705 ../src/history_window.py:78 +#: ../src/config.py:1850 ../src/dialogs.py:1373 ../src/dialogs.py:1437 +#: ../src/disco.py:741 ../src/disco.py:1564 ../src/disco.py:1802 +#: ../src/history_window.py:78 msgid "Name" msgstr "Ime" -#: ../src/config.py:1868 +#: ../src/config.py:1853 ../src/dialogs.py:1376 msgid "Server" msgstr "Poslužitelj" -#: ../src/config.py:1932 +#: ../src/config.py:1917 msgid "Read all pending events before removing this account." msgstr "Pročitajte sve događaje na čekanju prije uklanjanja ovog računa." -#: ../src/config.py:1969 +#: ../src/config.py:1954 #, python-format msgid "You have opened chat in account %s" msgstr "Otvorili ste razgovor u računu %s" -#: ../src/config.py:1970 +#: ../src/config.py:1955 msgid "All chat and groupchat windows will be closed. Do you want to continue?" msgstr "" "Prozori svih razgovora i grupnih razgovora biti će zatvoreni. Želite li " "nastaviti?" -#: ../src/config.py:2029 +#: ../src/config.py:2014 msgid "Account Local already exists." msgstr "Račun Lokalno već postoji." -#: ../src/config.py:2030 +#: ../src/config.py:2015 msgid "Please rename or remove it before enabling link-local messaging." msgstr "" "Molimo uklonite ili preimenujte prije omogućivanja poruka lokalne veze." -#: ../src/config.py:2262 +#: ../src/config.py:2153 #, python-format msgid "Edit %s" msgstr "Izmjena %s" -#: ../src/config.py:2264 +#: ../src/config.py:2155 #, python-format msgid "Register to %s" msgstr "Registrirati se na %s" -#. list at the begining -#: ../src/config.py:2336 +#. list at the beginning +#: ../src/config.py:2191 msgid "Ban List" msgstr "Ban Lista" -#: ../src/config.py:2337 +#: ../src/config.py:2192 msgid "Member List" msgstr "Lista Članova" -#: ../src/config.py:2338 +#: ../src/config.py:2193 msgid "Owner List" msgstr "Lista Vasnika" -#: ../src/config.py:2339 +#: ../src/config.py:2194 msgid "Administrator List" msgstr "Lista Administratora" #. Address column #. holds JID (who said this) -#: ../src/config.py:2372 ../src/disco.py:748 ../src/history_manager.py:154 +#: ../src/config.py:2243 ../src/disco.py:748 ../src/history_manager.py:155 msgid "JID" msgstr "JID" -#: ../src/config.py:2380 +#: ../src/config.py:2251 msgid "Reason" msgstr "Razlog" -#: ../src/config.py:2385 +#: ../src/config.py:2256 msgid "Nick" msgstr "Nadimak" -#: ../src/config.py:2389 +#: ../src/config.py:2260 msgid "Role" msgstr "Uloga" -#: ../src/config.py:2410 +#: ../src/config.py:2285 msgid "Banning..." msgstr "Zabranjivanje..." #. You can move '\n' before user@domain if that line is TOO BIG -#: ../src/config.py:2412 +#: ../src/config.py:2287 msgid "" "Whom do you want to ban?\n" "\n" @@ -2879,11 +2972,11 @@ "Koga želite zabraniti?\n" "\n" -#: ../src/config.py:2414 +#: ../src/config.py:2289 msgid "Adding Member..." msgstr "Dodaja Člana..." -#: ../src/config.py:2415 +#: ../src/config.py:2290 msgid "" "Whom do you want to make a member?\n" "\n" @@ -2891,23 +2984,23 @@ "Koga želite učiniti članom?\n" "\n" -#: ../src/config.py:2417 +#: ../src/config.py:2292 msgid "Adding Owner..." msgstr "Dodavanje Vlasnika..." -#: ../src/config.py:2418 +#: ../src/config.py:2293 msgid "" -"Whom do you want to make a owner?\n" +"Whom do you want to make an owner?\n" "\n" msgstr "" "Koga želite učiniti vlasnikom?\n" "\n" -#: ../src/config.py:2420 +#: ../src/config.py:2295 msgid "Adding Administrator..." msgstr "Dodajem Administratora..." -#: ../src/config.py:2421 +#: ../src/config.py:2296 msgid "" "Whom do you want to make an administrator?\n" "\n" @@ -2915,7 +3008,7 @@ "Koga želite učiniti administratorom?\n" "\n" -#: ../src/config.py:2422 +#: ../src/config.py:2297 msgid "" "Can be one of the following:\n" "1. user@domain/resource (only that resource matches).\n" @@ -2931,121 +3024,120 @@ "4. domena (sama domena se poklapa, kao i bilo koji korisnik@domena,\n" "domena/resurs, ili adresa koja sadrži poddomenu." -#: ../src/config.py:2527 +#: ../src/config.py:2401 #, python-format msgid "Removing %s account" msgstr "Uklanjanje %s računa" -#: ../src/config.py:2544 ../src/roster_window.py:2665 +#: ../src/config.py:2418 ../src/roster_window.py:3123 msgid "Password Required" msgstr "Potrebna Lozinka" -#: ../src/config.py:2545 ../src/roster_window.py:2666 +#: ../src/config.py:2419 ../src/roster_window.py:3119 #, python-format msgid "Enter your password for account %s" msgstr "Unesite svoju lozinku za račun %s" -#: ../src/config.py:2546 ../src/roster_window.py:2667 +#: ../src/config.py:2420 ../src/roster_window.py:3124 msgid "Save password" msgstr "Spremiti lozinku" -#: ../src/config.py:2560 +#: ../src/config.py:2434 #, python-format msgid "Account \"%s\" is connected to the server" msgstr "Račun \"%s\" je spojen na poslužitelj" -#: ../src/config.py:2561 +#: ../src/config.py:2435 msgid "If you remove it, the connection will be lost." msgstr "Ukoliko ga uklonite, veza će biti izgubljena." -#: ../src/config.py:2645 +#: ../src/config.py:2520 msgid "Default" msgstr "Predefinirano" -#: ../src/config.py:2645 +#: ../src/config.py:2520 msgid "?print_status:All" msgstr "?ispis_statusa:Sve" -#: ../src/config.py:2646 +#: ../src/config.py:2521 msgid "Enter and leave only" msgstr "Ući i samo napustiti" -#: ../src/config.py:2716 +#: ../src/config.py:2522 +msgid "?print_status:None" +msgstr "?ispis_statusa:Ništa" + +#: ../src/config.py:2590 msgid "New Group Chat" msgstr "Novi Grupni Razgovor" -#: ../src/config.py:2748 +#: ../src/config.py:2623 msgid "This bookmark has invalid data" msgstr "Ova knjižna oznaka ima neispravne podatke" -#: ../src/config.py:2749 +#: ../src/config.py:2624 msgid "" "Please be sure to fill out server and room fields or remove this bookmark." msgstr "" "Molimo obavezno ispunite polja poslužitelja i sobe ili uklonite ovu kljižnu " "oznaku." -#: ../src/config.py:3011 +#: ../src/config.py:2880 msgid "Invalid username" msgstr "Neispravno korisničko ime" -#: ../src/config.py:3012 +#: ../src/config.py:2882 msgid "You must provide a username to configure this account." msgstr "Morate ponuditi korisničko ime za postavke ovog računa." -#: ../src/config.py:3022 ../src/dialogs.py:1316 -msgid "Invalid password" -msgstr "Neispravna lozinka" - -#: ../src/config.py:3023 -msgid "You must enter a password for the new account." -msgstr "Morate unesti lozinku za novi račun" - -#: ../src/config.py:3027 ../src/dialogs.py:1321 -msgid "Passwords do not match" -msgstr "Lozinke se ne podudaraju" - -#: ../src/config.py:3028 ../src/dialogs.py:1322 -msgid "The passwords typed in both fields must be identical." -msgstr "Lozinke upisane u oba polja moraju biti identične." - -#: ../src/config.py:3047 +#: ../src/config.py:2908 msgid "Duplicate Jabber ID" msgstr "Dvostruki Jabber ID" -#: ../src/config.py:3048 +#: ../src/config.py:2909 msgid "This account is already configured in Gajim." msgstr "Ovaj račun je već konfiguriran u Gajimu." -#: ../src/config.py:3065 +#: ../src/config.py:2926 msgid "Account has been added successfully" msgstr "Račun je uspješno dodan" -#: ../src/config.py:3066 ../src/config.py:3101 +#: ../src/config.py:2927 ../src/config.py:3071 msgid "" -"You can set advanced account options by pressing Advanced button, or later " -"by clicking in Accounts menuitem under Edit menu from the main window." +"You can set advanced account options by pressing the Advanced button, or " +"later by choosing the Accounts menuitem under the Edit menu from the main " +"window." msgstr "" "Napredne opcije računa možete podesiti pritiskom na gumb Napredno, ili " "kasnije klikom na element Računi pod izbornikom Uredi iz glavnog prozora." -#: ../src/config.py:3100 +#: ../src/config.py:2944 +#, fuzzy +msgid "Invalid server" +msgstr "Neispravno korisničko ime" + +#: ../src/config.py:2945 +#, fuzzy +msgid "Please provide a server on which you want to register." +msgstr "Molimo specificirajte novi nadimak ako ga želite koristiti:" + +#: ../src/config.py:3050 ../src/config.py:3088 +msgid "An error occurred during account creation" +msgstr "Pojavila se greška pri stvaranju računa" + +#: ../src/config.py:3070 msgid "Your new account has been created successfully" msgstr "Vaš novi račun je uspješno stvoren" -#: ../src/config.py:3118 -msgid "An error occured during account creation" -msgstr "Pojavila se greška pri stvaranju računa" - -#: ../src/config.py:3176 +#: ../src/config.py:3170 msgid "Account name is in use" msgstr "Ime računa se već koristi" -#: ../src/config.py:3177 +#: ../src/config.py:3171 msgid "You already have an account using this name." msgstr "Već imate račun pod tim imenom." -#: ../src/conversation_textview.py:273 +#: ../src/conversation_textview.py:279 msgid "" "Text below this line is what has been said since the last time you paid " "attention to this group chat" @@ -3053,182 +3145,182 @@ "Tekst niže od ove linije je ono što je rečeno od kad ste zadnji puta " "obraćali pozornost na ovaj grupni razovor" -#: ../src/conversation_textview.py:342 +#: ../src/conversation_textview.py:348 #, python-format msgid "_Actions for \"%s\"" msgstr "_Akcije za \"%s\"" -#: ../src/conversation_textview.py:354 +#: ../src/conversation_textview.py:360 msgid "Read _Wikipedia Article" msgstr "Pročitajte članak na _Wikipedii" -#: ../src/conversation_textview.py:359 +#: ../src/conversation_textview.py:365 msgid "Look it up in _Dictionary" msgstr "Potražiti u _Riječniku" #. we must have %s in the url if not WIKTIONARY -#: ../src/conversation_textview.py:375 +#: ../src/conversation_textview.py:381 #, python-format msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY" msgstr "URL-u riječnika nedostaje \"%s\" i nije WIKTIONARY" #. we must have %s in the url -#: ../src/conversation_textview.py:388 +#: ../src/conversation_textview.py:394 #, python-format msgid "Web Search URL is missing an \"%s\"" msgstr "URL-u Web Pretrage nedostaje \"%s\"" -#: ../src/conversation_textview.py:391 +#: ../src/conversation_textview.py:397 msgid "Web _Search for it" msgstr "_Pretraži Web" -#: ../src/conversation_textview.py:397 +#: ../src/conversation_textview.py:403 msgid "Open as _Link" msgstr "Otvori kao _Poveznicu" -#: ../src/conversation_textview.py:757 +#: ../src/conversation_textview.py:848 msgid "Yesterday" msgstr "Jučer" #. the number is >= 2 #. %i is day in year (1-365), %d (1-31) we want %i -#: ../src/conversation_textview.py:761 +#: ../src/conversation_textview.py:852 #, python-format msgid "%i days ago" msgstr "Prije %i dana" #. if we have subject, show it too! -#: ../src/conversation_textview.py:793 +#: ../src/conversation_textview.py:886 #, python-format msgid "Subject: %s\n" msgstr "Tema: %s\n" -#: ../src/dialogs.py:59 +#: ../src/dialogs.py:60 #, python-format msgid "Contact name: %s" msgstr "Ime kontakta: %s" -#: ../src/dialogs.py:61 +#: ../src/dialogs.py:62 #, python-format msgid "Jabber ID: %s" msgstr "Jabber ID: %s" -#: ../src/dialogs.py:211 +#: ../src/dialogs.py:212 msgid "Group" msgstr "Grupa" -#: ../src/dialogs.py:218 +#: ../src/dialogs.py:219 msgid "In the group" msgstr "U grupi" -#: ../src/dialogs.py:269 +#: ../src/dialogs.py:270 msgid "KeyID" msgstr "ID ključa" -#: ../src/dialogs.py:272 +#: ../src/dialogs.py:273 msgid "Contact name" msgstr "Ime kontakta" -#: ../src/dialogs.py:318 +#: ../src/dialogs.py:319 #, python-format msgid "%s Status Message" msgstr "%s Statusna Poruka" -#: ../src/dialogs.py:320 +#: ../src/dialogs.py:321 msgid "Status Message" msgstr "Statusna Poruka" -#: ../src/dialogs.py:395 +#: ../src/dialogs.py:421 msgid "Save as Preset Status Message" msgstr "Snimiti kao Unaprijed Postavljenu Statusnu Poruku" -#: ../src/dialogs.py:396 +#: ../src/dialogs.py:422 msgid "Please type a name for this status message" msgstr "Molimo unesite ime za ovu statusnu poruku" -#: ../src/dialogs.py:417 +#: ../src/dialogs.py:443 msgid "AIM Address:" msgstr "AIM Adresa:" -#: ../src/dialogs.py:418 +#: ../src/dialogs.py:444 msgid "GG Number:" msgstr "GG Broj:" -#: ../src/dialogs.py:419 +#: ../src/dialogs.py:445 msgid "ICQ Number:" msgstr "ICQ Broj:" -#: ../src/dialogs.py:420 +#: ../src/dialogs.py:446 msgid "MSN Address:" msgstr "MSN Adresa:" -#: ../src/dialogs.py:421 +#: ../src/dialogs.py:447 msgid "Yahoo! Address:" msgstr "Yahoo! Adresa:" -#: ../src/dialogs.py:457 +#: ../src/dialogs.py:483 #, python-format msgid "Please fill in the data of the contact you want to add in account %s" msgstr "Molimo ispunite podatke kontakta kojeg želite dodati u račun %s" -#: ../src/dialogs.py:459 +#: ../src/dialogs.py:485 msgid "Please fill in the data of the contact you want to add" msgstr "Molimo ispunite podatke kontakta kojeg želite dodati" -#: ../src/dialogs.py:609 ../src/dialogs.py:615 +#: ../src/dialogs.py:635 ../src/dialogs.py:641 msgid "Invalid User ID" msgstr "Neispravan Korisnički ID" -#: ../src/dialogs.py:616 +#: ../src/dialogs.py:642 msgid "The user ID must not contain a resource." msgstr "ID korisnika ne smije sadržavati resurs." -#: ../src/dialogs.py:630 +#: ../src/dialogs.py:656 msgid "Contact already in roster" msgstr "Kontakt je već na listi" -#: ../src/dialogs.py:631 +#: ../src/dialogs.py:657 msgid "This contact is already listed in your roster." msgstr "Ovaj kontakt je već na vašoj listi kontakata." -#: ../src/dialogs.py:665 +#: ../src/dialogs.py:694 msgid "User ID:" msgstr "ID Korisnika:" -#: ../src/dialogs.py:728 +#: ../src/dialogs.py:757 msgid "A GTK+ jabber client" msgstr "GTK+ jabber klijent" -#: ../src/dialogs.py:729 +#: ../src/dialogs.py:758 msgid "GTK+ Version:" msgstr "GTK+ Verzija:" -#: ../src/dialogs.py:730 +#: ../src/dialogs.py:759 msgid "PyGTK Version:" msgstr "PyGTK Verzija:" -#: ../src/dialogs.py:744 +#: ../src/dialogs.py:773 msgid "Current Developers:" msgstr "Trenutni Razvojni Programeri:" -#: ../src/dialogs.py:746 +#: ../src/dialogs.py:775 msgid "Past Developers:" msgstr "Prošli Razvojni Programeri:" -#: ../src/dialogs.py:756 +#: ../src/dialogs.py:785 msgid "THANKS:" msgstr "ZAHVALE:" #. remove one english sentence #. and add it manually as translatable -#: ../src/dialogs.py:762 +#: ../src/dialogs.py:791 msgid "Last but not least, we would like to thank all the package maintainers." msgstr "" "Zadnje, ali ne najmanje, željeli bismo se zahvaliti svim održavateljima " "paketa" #. here you write your name in the form Name FamilyName <someone@somewhere> -#: ../src/dialogs.py:776 +#: ../src/dialogs.py:804 msgid "translator-credits" msgstr "" "Adrian C. <anrxc(a)sysphere.org>\n" @@ -3236,70 +3328,100 @@ "Armando V. <synan(a)rilinux.hr>\n" "Vedran M. <rivanvx(a)gmail.com>" -#: ../src/dialogs.py:906 +#: ../src/dialogs.py:934 #, python-format msgid "Unable to bind to port %s." msgstr "Nemoguće vezanje na port %s." -#: ../src/dialogs.py:907 +#: ../src/dialogs.py:935 msgid "" "Maybe you have another running instance of Gajim. File Transfer will be " -"canceled." +"cancelled." msgstr "" "Možda već imate pokrenutu jednu instancu Gajima. Prijenos Datoteka će biti " -"prekinut." +"otkazan." -#: ../src/dialogs.py:1058 +#: ../src/dialogs.py:942 #, python-format +msgid "" +"You have to install %s dictionary to use spellchecking, or choose another " +"language by setting the speller_language option.\n" +"\n" +"Highlighting misspelled words feature will not be used" +msgstr "" +"Morate instalirati %s rječnik kako bi ste mogli koristiti provjeru " +"pravopisa, ili odaberite drugi jezik postavkom odabira speller_language " +"opcije." + +#: ../src/dialogs.py:1155 +#, python-format msgid "Subscription request for account %s from %s" msgstr "Zahtjev pretplate za račun %s od %s" -#: ../src/dialogs.py:1061 +#: ../src/dialogs.py:1158 #, python-format msgid "Subscription request from %s" msgstr "Zahtjev za pretplatom od %s" -#: ../src/dialogs.py:1121 ../src/roster_window.py:681 +#: ../src/dialogs.py:1218 ../src/roster_window.py:743 #, python-format msgid "You are already in group chat %s" msgstr "Već ste u grupnom razgovoru %s" -#: ../src/dialogs.py:1129 +#: ../src/dialogs.py:1226 msgid "You can not join a group chat unless you are connected." msgstr "Ne možete se pridružiti grupnom razgovoru ukoliko niste spojeni." -#: ../src/dialogs.py:1144 +#: ../src/dialogs.py:1241 #, python-format msgid "Join Group Chat with account %s" msgstr "Pridružiti se Grupnom Razgovoru sa računom %s" -#: ../src/dialogs.py:1212 ../src/dialogs.py:1218 +#: ../src/dialogs.py:1309 ../src/dialogs.py:1315 +#: ../src/groupchat_control.py:1536 msgid "Invalid group chat Jabber ID" msgstr "Neispravan Jabber ID grupnog razgovora" -#: ../src/dialogs.py:1213 ../src/dialogs.py:1219 +#: ../src/dialogs.py:1310 ../src/dialogs.py:1316 +#: ../src/groupchat_control.py:1537 msgid "The group chat Jabber ID has not allowed characters." msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove." -#: ../src/dialogs.py:1225 +#: ../src/dialogs.py:1322 msgid "This is not a group chat" msgstr "Ovo nije grupni razgovor" -#: ../src/dialogs.py:1226 +#: ../src/dialogs.py:1323 #, python-format msgid "%s is not the name of a group chat." msgstr "%s nije ime grupnog razgovora." -#: ../src/dialogs.py:1248 +#: ../src/dialogs.py:1362 +msgid "Without a connection, you can not synchronise your contacts." +msgstr "Bez veze nije moguća sinkronizirati vaše kontakte." + +#: ../src/dialogs.py:1409 +msgid "This account is not connected to the server" +msgstr "Ovaj račun nije spojen sa poslužiteljem" + +#: ../src/dialogs.py:1410 +msgid "You cannot synchronize with an account unless it is connected." +msgstr "Ne možete sinkronizirati sa računom ukoliko nije spojen." + +#: ../src/dialogs.py:1434 +msgid "Synchronise" +msgstr "Sinkroniziraj" + +#: ../src/dialogs.py:1492 #, python-format msgid "Start Chat with account %s" msgstr "Započeti Razgovor sa računom %s" -#: ../src/dialogs.py:1250 +#: ../src/dialogs.py:1494 msgid "Start Chat" msgstr "Započeti Razgovor" -#: ../src/dialogs.py:1251 +#: ../src/dialogs.py:1495 msgid "" "Fill in the nickname or the Jabber ID of the contact you would like\n" "to send a chat message to:" @@ -3308,261 +3430,288 @@ "poslati razgovornu poruku:" #. if offline or connecting -#: ../src/dialogs.py:1276 ../src/dialogs.py:1635 ../src/dialogs.py:1764 +#: ../src/dialogs.py:1520 ../src/dialogs.py:1877 ../src/dialogs.py:2008 msgid "Connection not available" msgstr "Veza nije dostupna" -#: ../src/dialogs.py:1277 ../src/dialogs.py:1636 ../src/dialogs.py:1765 +#: ../src/dialogs.py:1521 ../src/dialogs.py:1878 ../src/dialogs.py:2009 #, python-format msgid "Please make sure you are connected with \"%s\"." msgstr "Molimo potvrdite da ste spojeni na \"%s\"." -#: ../src/dialogs.py:1286 ../src/dialogs.py:1289 +#: ../src/dialogs.py:1530 ../src/dialogs.py:1533 msgid "Invalid JID" msgstr "Neispravan JID" -#: ../src/dialogs.py:1289 +#: ../src/dialogs.py:1533 #, python-format msgid "Unable to parse \"%s\"." msgstr "Nije moguće učitati \"%s\"." -#: ../src/dialogs.py:1298 +#: ../src/dialogs.py:1542 msgid "Without a connection, you can not change your password." msgstr "Bez veze nije moguća promjena lozinke." -#: ../src/dialogs.py:1317 +#: ../src/dialogs.py:1560 +msgid "Invalid password" +msgstr "Neispravna lozinka" + +#: ../src/dialogs.py:1561 msgid "You must enter a password." msgstr "Morate unesti lozinku." +#: ../src/dialogs.py:1565 +msgid "Passwords do not match" +msgstr "Lozinke se ne podudaraju" + +#: ../src/dialogs.py:1566 +msgid "The passwords typed in both fields must be identical." +msgstr "Lozinke upisane u oba polja moraju biti identične." + #. img to display #. default value -#: ../src/dialogs.py:1364 ../src/notify.py:211 ../src/notify.py:411 +#: ../src/dialogs.py:1608 ../src/notify.py:214 ../src/notify.py:418 msgid "Contact Signed In" msgstr "Kontakt Se Prijavio" -#: ../src/dialogs.py:1366 ../src/notify.py:219 ../src/notify.py:413 +#: ../src/dialogs.py:1610 ../src/notify.py:222 ../src/notify.py:420 msgid "Contact Signed Out" msgstr "Kontakt Se Odjavio" #. chat message -#: ../src/dialogs.py:1368 ../src/notify.py:238 ../src/notify.py:415 +#: ../src/dialogs.py:1612 ../src/notify.py:241 ../src/notify.py:422 msgid "New Message" msgstr "Nova Poruka" #. single message -#: ../src/dialogs.py:1368 ../src/notify.py:223 ../src/notify.py:415 +#: ../src/dialogs.py:1612 ../src/notify.py:226 ../src/notify.py:422 msgid "New Single Message" msgstr "Nova Jedna Poruka" #. private message -#: ../src/dialogs.py:1369 ../src/notify.py:230 ../src/notify.py:416 +#: ../src/dialogs.py:1613 ../src/notify.py:233 ../src/notify.py:423 msgid "New Private Message" msgstr "Nova Privatna Poruka" -#: ../src/dialogs.py:1369 ../src/gajim.py:1216 ../src/notify.py:424 +#: ../src/dialogs.py:1613 ../src/gajim.py:1350 ../src/notify.py:431 msgid "New E-mail" msgstr "Novi E-mail" -#: ../src/dialogs.py:1371 ../src/gajim.py:1369 ../src/notify.py:418 +#: ../src/dialogs.py:1615 ../src/gajim.py:1503 ../src/notify.py:425 msgid "File Transfer Request" msgstr "Zahtjev Razmjene Datoteka" -#: ../src/dialogs.py:1373 ../src/gajim.py:1188 ../src/gajim.py:1345 -#: ../src/notify.py:420 +#: ../src/dialogs.py:1617 ../src/gajim.py:1322 ../src/gajim.py:1479 +#: ../src/notify.py:427 msgid "File Transfer Error" msgstr "Greška u Razmjeni Datoteka" -#: ../src/dialogs.py:1375 ../src/gajim.py:1408 ../src/gajim.py:1430 -#: ../src/gajim.py:1447 ../src/notify.py:422 +#: ../src/dialogs.py:1619 ../src/gajim.py:1542 ../src/gajim.py:1564 +#: ../src/gajim.py:1581 ../src/notify.py:429 msgid "File Transfer Completed" msgstr "Razmjena Datoteka Završena" -#: ../src/dialogs.py:1376 ../src/gajim.py:1411 ../src/notify.py:422 +#: ../src/dialogs.py:1620 ../src/gajim.py:1545 ../src/notify.py:429 msgid "File Transfer Stopped" msgstr "Razmjena Datoteka Zaustavljena" -#: ../src/dialogs.py:1378 ../src/gajim.py:1086 ../src/notify.py:426 +#: ../src/dialogs.py:1622 ../src/gajim.py:1218 ../src/notify.py:433 msgid "Groupchat Invitation" msgstr "Poziv na Grupni Razgovor" -#: ../src/dialogs.py:1380 ../src/notify.py:203 ../src/notify.py:428 +#: ../src/dialogs.py:1624 ../src/notify.py:206 ../src/notify.py:435 msgid "Contact Changed Status" msgstr "Kontakt Promjenio Status" -#: ../src/dialogs.py:1565 +#: ../src/dialogs.py:1807 #, python-format msgid "Single Message using account %s" msgstr "Jedna Poruka koristeći račun %s" -#: ../src/dialogs.py:1567 +#: ../src/dialogs.py:1809 #, python-format msgid "Single Message in account %s" msgstr "Jedna Poruka u računu %s" -#: ../src/dialogs.py:1569 +#: ../src/dialogs.py:1811 msgid "Single Message" msgstr "Jedna Poruka" #. prepare UI for Sending -#: ../src/dialogs.py:1572 +#: ../src/dialogs.py:1814 #, python-format msgid "Send %s" msgstr "Poslati %s" #. prepare UI for Receiving -#: ../src/dialogs.py:1595 +#: ../src/dialogs.py:1837 #, python-format msgid "Received %s" msgstr "Primljene %s" #. we create a new blank window to send and we preset RE: and to jid -#: ../src/dialogs.py:1667 +#: ../src/dialogs.py:1909 #, python-format msgid "RE: %s" msgstr "RE: %s" -#: ../src/dialogs.py:1668 +#: ../src/dialogs.py:1910 #, python-format msgid "%s wrote:\n" msgstr "%s piše:\n" -#: ../src/dialogs.py:1712 +#: ../src/dialogs.py:1954 #, python-format msgid "XML Console for %s" msgstr "XML Konzola za %s" -#: ../src/dialogs.py:1714 +#: ../src/dialogs.py:1956 msgid "XML Console" msgstr "XML Konzola" -#: ../src/dialogs.py:1835 +#: ../src/dialogs.py:2079 #, python-format msgid "Privacy List %s" msgstr "Lista Privatnosti %s" -#: ../src/dialogs.py:1839 +#: ../src/dialogs.py:2083 #, python-format msgid "Privacy List for %s" msgstr "Lista Privatnosti za %s" -#: ../src/dialogs.py:1887 +#: ../src/dialogs.py:2141 #, python-format msgid "Order: %s, action: %s, type: %s, value: %s" msgstr "Redoslijed: %s, akcija: %s, tip: %s, vrijednost: %s" -#: ../src/dialogs.py:1890 +#: ../src/dialogs.py:2144 #, python-format msgid "Order: %s, action: %s" msgstr "Redosljed: %s, akcija: %s" -#: ../src/dialogs.py:1932 +#: ../src/dialogs.py:2186 msgid "Edit a rule" msgstr "Izmjena pravila" -#: ../src/dialogs.py:2019 +#: ../src/dialogs.py:2273 msgid "Add a rule" msgstr "Dodaj pravilo" -#: ../src/dialogs.py:2115 +#: ../src/dialogs.py:2362 #, python-format +msgid "Blocked Contacts for %s" +msgstr "Blokirani Kontakti za %s" + +#: ../src/dialogs.py:2364 +msgid "Blocked Contacts" +msgstr "Blokirani Kontakti" + +#: ../src/dialogs.py:2433 +#, python-format +msgid "Group %s" +msgstr "Grupa %s" + +#: ../src/dialogs.py:2464 +#, python-format msgid "Privacy Lists for %s" msgstr "Liste Privatnosti za %s" -#: ../src/dialogs.py:2117 +#: ../src/dialogs.py:2466 msgid "Privacy Lists" msgstr "Liste Privatnosti" -#: ../src/dialogs.py:2185 +#: ../src/dialogs.py:2536 msgid "Invalid List Name" msgstr "Neispravno Ime Liste" -#: ../src/dialogs.py:2186 +#: ../src/dialogs.py:2537 msgid "You must enter a name to create a privacy list." msgstr "Morate unesti ime za stvaranje liste privatnosti." -#. FIXME: use nickname instead of contact_jid -#: ../src/dialogs.py:2220 +#. Don't translate $Contact +#: ../src/dialogs.py:2571 #, python-format -msgid "%(contact_jid)s has invited you to group chat %(room_jid)s" -msgstr "%(contact_jid)s vas je pozvao na grupni razgovor %(room_jid)s" +msgid "$Contact has invited you to group chat %(room_jid)s" +msgstr "$Contact vas je pozvao na grupni razgovor %(room_jid)s" #. only if not None and not '' -#: ../src/dialogs.py:2226 +#: ../src/dialogs.py:2583 #, python-format msgid "Comment: %s" msgstr "Komentar: %s" -#: ../src/dialogs.py:2288 +#: ../src/dialogs.py:2645 msgid "Choose Sound" msgstr "Odabir Zvuka" -#: ../src/dialogs.py:2298 ../src/dialogs.py:2343 +#: ../src/dialogs.py:2655 ../src/dialogs.py:2700 msgid "All files" msgstr "Sve datoteke" -#: ../src/dialogs.py:2303 +#: ../src/dialogs.py:2660 msgid "Wav Sounds" msgstr "Wav Zvukovi" -#: ../src/dialogs.py:2333 +#: ../src/dialogs.py:2690 msgid "Choose Image" msgstr "Odabir Slike" -#: ../src/dialogs.py:2348 +#: ../src/dialogs.py:2705 msgid "Images" msgstr "Slike" -#: ../src/dialogs.py:2405 +#: ../src/dialogs.py:2762 #, python-format msgid "When %s becomes:" msgstr "Kad %s postane:" -#: ../src/dialogs.py:2407 +#: ../src/dialogs.py:2764 #, python-format msgid "Adding Special Notification for %s" msgstr "Dodavanje Posebne Obavijesti za %s" #. # means number -#: ../src/dialogs.py:2478 +#: ../src/dialogs.py:2835 msgid "#" msgstr "#" -#: ../src/dialogs.py:2484 +#: ../src/dialogs.py:2841 msgid "Condition" msgstr "Uvjet" -#: ../src/dialogs.py:2605 +#: ../src/dialogs.py:2962 msgid "when I am " msgstr "kada sam " -#: ../src/disco.py:101 +#: ../src/disco.py:104 msgid "Others" msgstr "Ostali" -#: ../src/disco.py:102 ../src/disco.py:103 ../src/disco.py:1253 -#: ../src/gajim.py:539 ../src/roster_window.py:267 ../src/roster_window.py:325 -#: ../src/roster_window.py:364 ../src/roster_window.py:445 -#: ../src/roster_window.py:477 ../src/roster_window.py:479 -#: ../src/roster_window.py:3828 ../src/roster_window.py:3830 -#: ../src/common/helpers.py:42 +#: ../src/disco.py:105 ../src/disco.py:106 ../src/disco.py:1350 +#: ../src/gajim.py:613 ../src/roster_window.py:273 ../src/roster_window.py:332 +#: ../src/roster_window.py:371 ../src/roster_window.py:471 +#: ../src/roster_window.py:503 ../src/roster_window.py:505 +#: ../src/roster_window.py:4358 ../src/roster_window.py:4360 +#: ../src/common/contacts.py:275 ../src/common/contacts.py:290 +#: ../src/common/helpers.py:43 msgid "Transports" msgstr "Prijenosi" #. conference is a category for listing mostly groupchats in service discovery -#: ../src/disco.py:105 +#: ../src/disco.py:108 msgid "Conference" msgstr "Konferencija" -#: ../src/disco.py:418 +#: ../src/disco.py:421 msgid "Without a connection, you can not browse available services" msgstr "Ukoliko niste spojeni nećete moći pregledati dostupne usluge" -#: ../src/disco.py:497 +#: ../src/disco.py:500 #, python-format msgid "Service Discovery using account %s" msgstr "Otkrivanje Usluga koristeći račun %s" -#: ../src/disco.py:499 +#: ../src/disco.py:502 msgid "Service Discovery" msgstr "Otkrivanje Usluga" @@ -3599,43 +3748,47 @@ msgid "This service does not contain any items to browse." msgstr "Ova usluga ne sadrži stvari za pretraživanje" -#: ../src/disco.py:1143 ../src/disco.py:1258 +#: ../src/disco.py:1147 +msgid "_Execute Command" +msgstr "_Izvrši Naredbu..." + +#: ../src/disco.py:1157 ../src/disco.py:1355 msgid "Re_gister" msgstr "Re_gistracija" -#: ../src/disco.py:1295 +#: ../src/disco.py:1392 #, python-format msgid "Scanning %d / %d.." msgstr "Skeniranje %d / %d.." #. Users column -#: ../src/disco.py:1476 +#: ../src/disco.py:1573 msgid "Users" msgstr "Korisnici" #. Description column -#: ../src/disco.py:1483 +#: ../src/disco.py:1580 msgid "Description" msgstr "Opis" #. Id column -#: ../src/disco.py:1490 +#: ../src/disco.py:1587 msgid "Id" msgstr "Identifikacija" -#: ../src/disco.py:1713 +#: ../src/disco.py:1810 msgid "Subscribed" msgstr "Pretplaćeno" -#: ../src/disco.py:1739 +#: ../src/disco.py:1836 msgid "New post" msgstr "Nova objava" -#: ../src/disco.py:1745 +#: ../src/disco.py:1842 msgid "_Subscribe" msgstr "_Pretplatiti se" -#: ../src/disco.py:1751 +#: ../src/disco.py:1848 msgid "_Unsubscribe" msgstr "_Ukinuti pretplatu" @@ -3651,132 +3804,132 @@ msgid "Progress" msgstr "Napredak" -#: ../src/filetransfers_window.py:163 ../src/filetransfers_window.py:223 +#: ../src/filetransfers_window.py:161 ../src/filetransfers_window.py:215 #, python-format msgid "Filename: %s" msgstr "Ime datoteke: %s" -#: ../src/filetransfers_window.py:164 ../src/filetransfers_window.py:298 +#: ../src/filetransfers_window.py:162 ../src/filetransfers_window.py:290 #, python-format msgid "Size: %s" msgstr "veličina: %s" #. You is a reply of who sent a file #. You is a reply of who received a file -#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:183 +#: ../src/filetransfers_window.py:171 ../src/filetransfers_window.py:181 #: ../src/history_manager.py:463 msgid "You" msgstr "Vi" -#: ../src/filetransfers_window.py:174 +#: ../src/filetransfers_window.py:172 #, python-format msgid "Sender: %s" msgstr "Pošiljatelj: %s" -#: ../src/filetransfers_window.py:175 ../src/filetransfers_window.py:572 -#: ../src/tooltips.py:573 +#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:564 +#: ../src/tooltips.py:585 msgid "Recipient: " msgstr "Primatelj: " -#: ../src/filetransfers_window.py:186 +#: ../src/filetransfers_window.py:184 #, python-format msgid "Saved in: %s" msgstr "Spremljeno u: %s" -#: ../src/filetransfers_window.py:188 +#: ../src/filetransfers_window.py:186 msgid "File transfer completed" msgstr "Prijenos datoteka završen" -#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:212 -msgid "File transfer canceled" -msgstr "Prijenos datoteka prekinut" +#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:206 +msgid "File transfer cancelled" +msgstr "Prijenos datoteka otkazan" -#: ../src/filetransfers_window.py:204 ../src/filetransfers_window.py:213 +#: ../src/filetransfers_window.py:200 ../src/filetransfers_window.py:207 msgid "Connection with peer cannot be established." msgstr "Vezu nije moguće ostvariti." -#: ../src/filetransfers_window.py:224 +#: ../src/filetransfers_window.py:216 #, python-format msgid "Recipient: %s" msgstr "Primatelj: %s" -#: ../src/filetransfers_window.py:226 +#: ../src/filetransfers_window.py:218 #, python-format msgid "Error message: %s" msgstr "Poruka Greške: %s" -#: ../src/filetransfers_window.py:227 -msgid "File transfer stopped by the contact of the other side" -msgstr "Prijenos datoteka je zaustavio kontakt na drugoj strani" +#: ../src/filetransfers_window.py:219 +msgid "File transfer stopped by the contact at the other end" +msgstr "Prijenos datoteka je otkazao kontakt na drugoj strani" -#: ../src/filetransfers_window.py:244 +#: ../src/filetransfers_window.py:236 msgid "Choose File to Send..." msgstr "Odabir Datoteke za Slanje..." -#: ../src/filetransfers_window.py:263 +#: ../src/filetransfers_window.py:255 msgid "Gajim cannot access this file" msgstr "Gajim ne može pristupiti ovoj datoteci" -#: ../src/filetransfers_window.py:264 +#: ../src/filetransfers_window.py:256 msgid "This file is being used by another process." msgstr "Ovu datoteku koristi neki drugi proces." -#: ../src/filetransfers_window.py:296 +#: ../src/filetransfers_window.py:288 #, python-format msgid "File: %s" msgstr "Datoteka: %s" -#: ../src/filetransfers_window.py:301 +#: ../src/filetransfers_window.py:293 #, python-format msgid "Type: %s" msgstr "Tip: %s" -#: ../src/filetransfers_window.py:303 +#: ../src/filetransfers_window.py:295 #, python-format msgid "Description: %s" msgstr "Opis: %s" -#: ../src/filetransfers_window.py:304 +#: ../src/filetransfers_window.py:296 #, python-format msgid "%s wants to send you a file:" msgstr "%s vam želi poslati datoteku:" -#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:683 +#: ../src/filetransfers_window.py:310 ../src/gtkgui_helpers.py:767 #, python-format msgid "Cannot overwrite existing file \"%s\"" msgstr "Nije moguće prepisati postojeću datoteku \"%s\"" -#: ../src/filetransfers_window.py:319 ../src/gtkgui_helpers.py:685 +#: ../src/filetransfers_window.py:311 ../src/gtkgui_helpers.py:769 msgid "" "A file with this name already exists and you do not have permission to " "overwrite it." msgstr "Datoteka sa ovim imenom već postoji i nemate ovlasti prepisati ju." -#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689 +#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:773 msgid "This file already exists" msgstr "Ova datoteka već postoji" -#: ../src/filetransfers_window.py:326 ../src/gtkgui_helpers.py:689 +#: ../src/filetransfers_window.py:318 ../src/gtkgui_helpers.py:773 msgid "What do you want to do?" msgstr "Å to želite učiniti?" -#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:699 +#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:783 #, python-format msgid "Directory \"%s\" is not writable" msgstr "U direktorij \"%s\" nije moguće zapisivati" -#: ../src/filetransfers_window.py:338 ../src/gtkgui_helpers.py:700 +#: ../src/filetransfers_window.py:330 ../src/gtkgui_helpers.py:784 msgid "You do not have permission to create files in this directory." msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju" -#: ../src/filetransfers_window.py:348 +#: ../src/filetransfers_window.py:340 msgid "Save File as..." msgstr "Snimiti Datoteku kao..." #. Print remaining time in format 00:00:00 #. You can change the places of (hours), (minutes), (seconds) - #. they are not translatable. -#: ../src/filetransfers_window.py:429 +#: ../src/filetransfers_window.py:421 #, python-format msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d" msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d" @@ -3784,60 +3937,65 @@ #. This should make the string Kb/s, #. where 'Kb' part is taken from %s. #. Only the 's' after / (which means second) should be translated. -#: ../src/filetransfers_window.py:505 +#: ../src/filetransfers_window.py:497 #, python-format msgid "(%(filesize_unit)s/s)" msgstr "(%(filesize_unit)s/s)" -#: ../src/filetransfers_window.py:544 ../src/filetransfers_window.py:547 +#: ../src/filetransfers_window.py:536 ../src/filetransfers_window.py:539 msgid "Invalid File" msgstr "Neispravna Datoteka" -#: ../src/filetransfers_window.py:544 +#: ../src/filetransfers_window.py:536 msgid "File: " msgstr "Datoteka: " -#: ../src/filetransfers_window.py:548 +#: ../src/filetransfers_window.py:540 msgid "It is not possible to send empty files" msgstr "Nije moguće poslati prazne datoteke" -#: ../src/filetransfers_window.py:568 ../src/tooltips.py:563 +#: ../src/filetransfers_window.py:560 ../src/tooltips.py:575 msgid "Name: " msgstr "Ime: " -#: ../src/filetransfers_window.py:570 ../src/tooltips.py:567 +#: ../src/filetransfers_window.py:562 ../src/tooltips.py:579 msgid "Sender: " msgstr "Pošiljatelj: " -#: ../src/filetransfers_window.py:758 +#: ../src/filetransfers_window.py:750 msgid "Pause" msgstr "Pauza" #: ../src/gajim.py:47 -msgid "Gajim needs Xserver to run. Quiting..." -msgstr "Gajim treba Xserver za pokretanje. Izlaz..." +#, python-format +msgid "%s is not a valid loglevel" +msgstr "%s nije valjana razina zapisnika (loglevel)" -#: ../src/gajim.py:51 -msgid "Gajim needs PyGTK 2.6 or above" -msgstr "Gajim treba pyGTK 2.6 ili viši" +#: ../src/gajim.py:122 +msgid "Gajim needs X server to run. Quiting..." +msgstr "Gajim treba X server za pokretanje. Izlaz..." -#: ../src/gajim.py:52 -msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..." -msgstr "Gajim needs PyGTK 2.6 ili viši za pokretanje. Izlaz..." +#: ../src/gajim.py:126 +msgid "Gajim needs PyGTK 2.8 or above" +msgstr "Gajim treba pyGTK 2.8 ili viši" -#: ../src/gajim.py:54 -msgid "Gajim needs GTK 2.6 or above" -msgstr "Gajim treba GTK 2.6 ili viši" +#: ../src/gajim.py:127 +msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..." +msgstr "Gajim needs PyGTK 2.8 ili viši za pokretanje. Izlaz..." -#: ../src/gajim.py:55 -msgid "Gajim needs GTK 2.6 or above to run. Quiting..." -msgstr "Gajim treba GTK 2.6 ili viši za pokretanje. Izlaz..." +#: ../src/gajim.py:129 +msgid "Gajim needs GTK 2.8 or above" +msgstr "Gajim treba GTK 2.8 ili viši" -#: ../src/gajim.py:60 +#: ../src/gajim.py:130 +msgid "Gajim needs GTK 2.8 or above to run. Quiting..." +msgstr "Gajim treba GTK 2.8 ili viši za pokretanje. Izlaz..." + +#: ../src/gajim.py:135 msgid "GTK+ runtime is missing libglade support" msgstr "GTK+ nema podršku za libglade" -#: ../src/gajim.py:62 +#: ../src/gajim.py:137 #, python-format msgid "" "Please remove your current GTK+ runtime and install the latest stable " @@ -3846,21 +4004,21 @@ "Molimo uklonite svoj trenutni GTK+ i instalirajte posljednju stabilnu " "verziju sa %s" -#: ../src/gajim.py:64 +#: ../src/gajim.py:139 msgid "" "Please make sure that GTK+ and PyGTK have libglade support in your system." msgstr "" "Molimo provjerite da GTK+ i PyGTK imaju podršku za libglade na vašem sustavu" -#: ../src/gajim.py:69 +#: ../src/gajim.py:144 msgid "Gajim needs PySQLite2 to run" msgstr "Gajim treba PySQLite2 za pokretanje" -#: ../src/gajim.py:77 +#: ../src/gajim.py:152 msgid "Gajim needs pywin32 to run" msgstr "Gajim treba pywin32 za pokretanje" -#: ../src/gajim.py:78 +#: ../src/gajim.py:153 #, python-format msgid "" "Please make sure that Pywin32 is installed on your system. You can get it at " @@ -3870,11 +4028,11 @@ "na %s" #. set the icon to all newly opened wind -#: ../src/gajim.py:238 +#: ../src/gajim.py:300 msgid "Gajim is already running" msgstr "Gajim je već pokrenut" -#: ../src/gajim.py:239 +#: ../src/gajim.py:301 msgid "" "Another instance of Gajim seems to be running\n" "Run anyway?" @@ -3882,76 +4040,83 @@ "Trenutno je već pokrenuta jedna instanca Gajima\n" "Svejedno pokrenuti?" -#: ../src/gajim.py:346 +#: ../src/gajim.py:408 +msgid "Do you accept this request?" +msgstr "Prihvaćate li ovaj zahtjev?" + +#: ../src/gajim.py:411 #, python-format msgid "HTTP (%s) Authorization for %s (id: %s)" msgstr "HTTP (%s) Autorizacija za %s (id: %s)" -#: ../src/gajim.py:347 -msgid "Do you accept this request?" -msgstr "Prihvaćate li ovaj zahtjev?" - -#: ../src/gajim.py:393 ../src/notify.py:430 +#: ../src/gajim.py:458 ../src/notify.py:437 msgid "Connection Failed" msgstr "Veza Prekinuta" -#: ../src/gajim.py:706 +#: ../src/gajim.py:788 #, python-format msgid "Subject: %s" msgstr "Tema: %s" #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time)) -#: ../src/gajim.py:751 ../src/gajim.py:764 +#: ../src/gajim.py:832 ../src/gajim.py:845 #, python-format msgid "error while sending %s ( %s )" msgstr "greška prilikom slanja %s ( %s )" -#: ../src/gajim.py:797 +#: ../src/gajim.py:878 msgid "Authorization accepted" msgstr "Autorizacija prihvaćena" -#: ../src/gajim.py:798 +#: ../src/gajim.py:879 #, python-format msgid "The contact \"%s\" has authorized you to see his or her status." msgstr "Kontakt \"%s\" vam je dozvolio da vidite njegov ili njezin status." -#: ../src/gajim.py:806 +#: ../src/gajim.py:887 #, python-format msgid "Contact \"%s\" removed subscription from you" msgstr "Kontankt \"%s\" je uklonio pretplatu od vas" -#: ../src/gajim.py:807 +#: ../src/gajim.py:888 msgid "You will always see him or her as offline." msgstr "Uvijek ćete vidjeti njega ili nju kao nepriključenog." -#: ../src/gajim.py:850 +#: ../src/gajim.py:932 #, python-format msgid "Contact with \"%s\" cannot be established" msgstr "Kontakt sa \"%s\" ne može biti uspostavljen" -#: ../src/gajim.py:851 ../src/common/connection.py:406 +#: ../src/gajim.py:933 ../src/common/connection.py:423 msgid "Check your connection or try again later." msgstr "Provjerite svoju vezu ili pokušajte kasnije." -#: ../src/gajim.py:999 ../src/roster_window.py:1197 +#: ../src/gajim.py:1100 ../src/roster_window.py:1302 #, python-format msgid "%s is now %s (%s)" msgstr "%s je sada %s (%s)" -#: ../src/gajim.py:1096 +#. No status message +#: ../src/gajim.py:1103 ../src/groupchat_control.py:1023 +#: ../src/roster_window.py:1305 +#, python-format +msgid "%s is now %s" +msgstr "%s je sada %s" + +#: ../src/gajim.py:1228 msgid "Your passphrase is incorrect" msgstr "Vaša lozinka nije točna" -#: ../src/gajim.py:1097 +#: ../src/gajim.py:1229 msgid "You are currently connected without your OpenPGP key." msgstr "Trenutno ste spojeni bez OpenPGP ključa." -#: ../src/gajim.py:1199 +#: ../src/gajim.py:1333 #, python-format msgid "New mail on %(gmail_mail_address)s" msgstr "Novi E-mail na %(gmail_mail_address)s" -#: ../src/gajim.py:1201 +#: ../src/gajim.py:1335 #, python-format msgid "You have %d new mail conversation" msgid_plural "You have %d new mail conversations" @@ -3962,7 +4127,7 @@ #. FIXME: emulate Gtalk client popups. find out what they parse and how #. they decide what to show #. each message has a 'From', 'Subject' and 'Snippet' field -#: ../src/gajim.py:1210 +#: ../src/gajim.py:1344 #, python-format msgid "" "\n" @@ -3971,91 +4136,115 @@ "\n" "Od: %(from_address)s" -#: ../src/gajim.py:1366 +#: ../src/gajim.py:1500 #, python-format msgid "%s wants to send you a file." msgstr "%s vam želi poslati datoteku." -#: ../src/gajim.py:1431 +#: ../src/gajim.py:1565 #, python-format msgid "You successfully received %(filename)s from %(name)s." msgstr "Uspješno ste primili %(filename)s od %(name)s." #. ft stopped -#: ../src/gajim.py:1435 +#: ../src/gajim.py:1569 #, python-format msgid "File transfer of %(filename)s from %(name)s stopped." msgstr "Prijenos %(filename)s od %(name)s je zaustavljen." -#: ../src/gajim.py:1448 +#: ../src/gajim.py:1582 #, python-format msgid "You successfully sent %(filename)s to %(name)s." msgstr "Uspješno ste poslali %(filename)s %(name)s" #. ft stopped -#: ../src/gajim.py:1452 +#: ../src/gajim.py:1586 #, python-format msgid "File transfer of %(filename)s to %(name)s stopped." msgstr "Prijenos %(filename)s %(name)s je zaustavljen. " -#: ../src/gajim.py:1558 +#: ../src/gajim.py:1718 msgid "Username Conflict" msgstr "Konflikt korisničkog imena" -#: ../src/gajim.py:1559 +#: ../src/gajim.py:1719 msgid "Please type a new username for your local account" msgstr "Molimo unesite novo korisničko ime za vaš lokalni račun" +#: ../src/gajim.py:1736 +msgid "Ping?" +msgstr "Ping?" + +#: ../src/gajim.py:1744 +#, python-format +msgid "Pong! (%s s.)" +msgstr "Pong! (%s s.)" + +#: ../src/gajim.py:1750 +msgid "Error." +msgstr "Greška." + +#: ../src/gajim.py:1775 +msgid "Resource Conflict" +msgstr "Konflikt Resursa" + +#: ../src/gajim.py:1776 +msgid "" +"You are already connected to this account with the same resource. Please " +"type a new one" +msgstr "Već ste spojeni na ovaj račun sa istim resursom. Molim unesite novi." + #. it is good to notify the user #. in case he or she cannot see the output of the console -#: ../src/gajim.py:1898 +#: ../src/gajim.py:2120 msgid "Could not save your settings and preferences" msgstr "Nije moguće spremanje vaših postavki" -#: ../src/gajim.py:2090 +#: ../src/gajim.py:2330 msgid "Network Manager support not available" msgstr "Podrška za Upravitelja Mrežom nije dostupna" -#: ../src/gajim.py:2165 +#: ../src/gajim.py:2403 msgid "Session Management support not available (missing gnome.ui module)" msgstr "" "Podrška za Upravljanje Seansama nije dostupna (nedostaje gnome.ui modul)" -#: ../src/gajim-remote.py:66 +#: ../src/gajim-remote.py:65 msgid "Shows a help on specific command" msgstr "Prikazuje pomoć za određenu naredbu" #. User gets help for the command, specified by this parameter -#: ../src/gajim-remote.py:69 +#: ../src/gajim-remote.py:68 msgid "command" msgstr "naredba" -#: ../src/gajim-remote.py:70 +#: ../src/gajim-remote.py:69 msgid "show help on command" msgstr "prikaži pomoć za komandu" -#: ../src/gajim-remote.py:74 +#: ../src/gajim-remote.py:73 msgid "Shows or hides the roster window" msgstr "Prikazuje ili skriva prozor liste" -#: ../src/gajim-remote.py:78 -msgid "Popups a window with the next pending event" -msgstr "Iskače prozor sa sljedećim događajem na čekanju" +#: ../src/gajim-remote.py:77 +msgid "Pops up a window with the next pending event" +msgstr "Prikazuje prozor sa sljedećim događajem na čekanju" -#: ../src/gajim-remote.py:82 +#: ../src/gajim-remote.py:81 msgid "" -"Prints a list of all contacts in the roster. Each contact appear on a " +"Prints a list of all contacts in the roster. Each contact appears on a " "separate line" msgstr "" "Ispisuje listu svih kontakata na listi. Svaki kontakt pojavljuje se u " "odvojenoj liniji" -#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:98 -#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:121 -#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:156 -#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195 -#: ../src/gajim-remote.py:202 ../src/gajim-remote.py:209 -#: ../src/gajim-remote.py:220 +#: ../src/gajim-remote.py:84 ../src/gajim-remote.py:99 +#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:122 +#: ../src/gajim-remote.py:136 ../src/gajim-remote.py:157 +#: ../src/gajim-remote.py:187 ../src/gajim-remote.py:196 +#: ../src/gajim-remote.py:203 ../src/gajim-remote.py:210 +#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:237 +#: ../src/gajim-remote.py:246 msgid "account" msgstr "račun" @@ -4063,33 +4252,35 @@ msgid "show only contacts of the given account" msgstr "prikaži samo kontakte ovog računa" -#: ../src/gajim-remote.py:89 +#: ../src/gajim-remote.py:90 msgid "Prints a list of registered accounts" msgstr "Ispisuje listu registriranih računa" -#: ../src/gajim-remote.py:93 +#: ../src/gajim-remote.py:94 msgid "Changes the status of account or accounts" msgstr "Mjenja status jednog računa ili više njih" #. offline, online, chat, away, xa, dnd, invisible should not be translated -#: ../src/gajim-remote.py:96 +#: ../src/gajim-remote.py:97 msgid "status" msgstr "status" -#: ../src/gajim-remote.py:96 +#: ../src/gajim-remote.py:97 msgid "one of: offline, online, chat, away, xa, dnd, invisible " -msgstr "jedno od: " +msgstr "" +"jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, " +"nevidljiv" -#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:118 -#: ../src/gajim-remote.py:132 +#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:119 +#: ../src/gajim-remote.py:133 msgid "message" msgstr "poruka" -#: ../src/gajim-remote.py:97 +#: ../src/gajim-remote.py:98 msgid "status message" msgstr "statusna poruka" -#: ../src/gajim-remote.py:98 +#: ../src/gajim-remote.py:99 msgid "" "change status of account \"account\". If not specified, try to change status " "of all accounts that have \"sync with global status\" option set" @@ -4098,19 +4289,19 @@ "statusa svih računa koji imaju podešenu opciju \"sinkronizacija sa globalnim " "statusom\"" -#: ../src/gajim-remote.py:104 +#: ../src/gajim-remote.py:105 msgid "Shows the chat dialog so that you can send messages to a contact" msgstr "Prikazuje dialog razgovora kako bi mogli slati poruke kontaktu" -#: ../src/gajim-remote.py:106 +#: ../src/gajim-remote.py:107 msgid "JID of the contact that you want to chat with" msgstr "JID kontakta sa kojim želite razgovarati" -#: ../src/gajim-remote.py:108 ../src/gajim-remote.py:186 +#: ../src/gajim-remote.py:109 ../src/gajim-remote.py:187 msgid "if specified, contact is taken from the contact list of this account" msgstr "ako je označeno, kontak se uzima sa kontakt liste ovog računa" -#: ../src/gajim-remote.py:113 +#: ../src/gajim-remote.py:114 msgid "" "Sends new chat message to a contact in the roster. Both OpenPGP key and " "account are optional. If you want to set only 'account', without 'OpenPGP " @@ -4120,27 +4311,27 @@ "Ako želite postaviti samo 'račun', bez 'OpenPGP ključa', samo podesite " "'OpenPGP ključ' na ''." -#: ../src/gajim-remote.py:117 ../src/gajim-remote.py:130 +#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:131 msgid "JID of the contact that will receive the message" msgstr "JID kontakta koji će primiti poruku" -#: ../src/gajim-remote.py:118 ../src/gajim-remote.py:132 +#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133 msgid "message contents" msgstr "sadržaj poruke" -#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133 +#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134 msgid "pgp key" msgstr "pgp ključ" -#: ../src/gajim-remote.py:119 ../src/gajim-remote.py:133 +#: ../src/gajim-remote.py:120 ../src/gajim-remote.py:134 msgid "if specified, the message will be encrypted using this public key" msgstr "ako je označeno, poruka će biti kriptirana koristeći ovaj javni ključ" -#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:135 +#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:136 msgid "if specified, the message will be sent using this account" msgstr "ako je označeno, poruka će biti poslana koristeći ovaj račun" -#: ../src/gajim-remote.py:126 +#: ../src/gajim-remote.py:127 msgid "" "Sends new single message to a contact in the roster. Both OpenPGP key and " "account are optional. If you want to set only 'account', without 'OpenPGP " @@ -4150,126 +4341,126 @@ "želite postaviti samo 'račun', bez 'OpenPGP ključa', samo podesite 'OpenPGP " "ključ' na ''." -#: ../src/gajim-remote.py:131 +#: ../src/gajim-remote.py:132 msgid "subject" msgstr "tema" -#: ../src/gajim-remote.py:131 +#: ../src/gajim-remote.py:132 msgid "message subject" msgstr "tema poruke" -#: ../src/gajim-remote.py:140 +#: ../src/gajim-remote.py:141 msgid "Gets detailed info on a contact" msgstr "Daje detaljne informacije o kontaktu" -#: ../src/gajim-remote.py:142 ../src/gajim-remote.py:155 -#: ../src/gajim-remote.py:185 ../src/gajim-remote.py:194 +#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156 +#: ../src/gajim-remote.py:186 ../src/gajim-remote.py:195 msgid "JID of the contact" msgstr "JID kontakta" -#: ../src/gajim-remote.py:146 +#: ../src/gajim-remote.py:147 msgid "Gets detailed info on a account" msgstr "Daje detaljne informacije o računu" -#: ../src/gajim-remote.py:148 +#: ../src/gajim-remote.py:149 msgid "Name of the account" msgstr "Ime računa" -#: ../src/gajim-remote.py:152 +#: ../src/gajim-remote.py:153 msgid "Sends file to a contact" msgstr "Å alje datoteku kontaktu" -#: ../src/gajim-remote.py:154 +#: ../src/gajim-remote.py:155 msgid "file" msgstr "datoteka" -#: ../src/gajim-remote.py:154 +#: ../src/gajim-remote.py:155 msgid "File path" msgstr "Putanja datoteke" -#: ../src/gajim-remote.py:156 +#: ../src/gajim-remote.py:157 msgid "if specified, file will be sent using this account" msgstr "ako je označeno, datoteka će biti poslana koriteći ovaj račun" -#: ../src/gajim-remote.py:161 +#: ../src/gajim-remote.py:162 msgid "Lists all preferences and their values" msgstr "Prikatuje sve postavke i njihove vrijednosti" -#: ../src/gajim-remote.py:165 +#: ../src/gajim-remote.py:166 msgid "Sets value of 'key' to 'value'." msgstr "Postavlja vrijednost 'ključa' na 'vrijednost'." -#: ../src/gajim-remote.py:167 +#: ../src/gajim-remote.py:168 msgid "key=value" msgstr "ključ=vrijednost" -#: ../src/gajim-remote.py:167 +#: ../src/gajim-remote.py:168 msgid "'key' is the name of the preference, 'value' is the value to set it to" msgstr "" "'ključ' je ime postavke, 'vrijednost' je vrijednost na koju će se postaviti" -#: ../src/gajim-remote.py:172 +#: ../src/gajim-remote.py:173 msgid "Deletes a preference item" msgstr "Briše element postavke" -#: ../src/gajim-remote.py:174 +#: ../src/gajim-remote.py:175 msgid "key" msgstr "ključ" -#: ../src/gajim-remote.py:174 +#: ../src/gajim-remote.py:175 msgid "name of the preference to be deleted" msgstr "ime postavke koja će se brisati" -#: ../src/gajim-remote.py:178 +#: ../src/gajim-remote.py:179 msgid "Writes the current state of Gajim preferences to the .config file" msgstr "Zapisuje trenutno stanje Gajim postavku u .config datoteku" -#: ../src/gajim-remote.py:183 +#: ../src/gajim-remote.py:184 msgid "Removes contact from roster" msgstr "Uklanja kontakt sa liste" -#: ../src/gajim-remote.py:192 +#: ../src/gajim-remote.py:193 msgid "Adds contact to roster" msgstr "Dodaje kontakt na listu" -#: ../src/gajim-remote.py:194 +#: ../src/gajim-remote.py:195 msgid "jid" msgstr "jid" -#: ../src/gajim-remote.py:195 +#: ../src/gajim-remote.py:196 msgid "Adds new contact to this account" msgstr "Dodaje novi kontakt ovom računu" -#: ../src/gajim-remote.py:200 +#: ../src/gajim-remote.py:201 msgid "Returns current status (the global one unless account is specified)" msgstr "Vraća trenutni status (globalni ukoliko nije određen račun)" -#: ../src/gajim-remote.py:207 +#: ../src/gajim-remote.py:208 msgid "" "Returns current status message(the global one unless account is specified)" msgstr "Vraća trenutnu statusnu poruku (globalnu ukoliko nije određen račun)" -#: ../src/gajim-remote.py:214 -msgid "Returns number of unreaded messages" +#: ../src/gajim-remote.py:215 +msgid "Returns number of unread messages" msgstr "Vraća broj nepročitanih poruka" -#: ../src/gajim-remote.py:218 +#: ../src/gajim-remote.py:219 msgid "Opens 'Start Chat' dialog" msgstr "Otvaranje dialoga 'Započeti Razgovor'" -#: ../src/gajim-remote.py:220 +#: ../src/gajim-remote.py:221 msgid "Starts chat, using this account" msgstr "Započinje razgovor, koristeći ovaj račun" -#: ../src/gajim-remote.py:224 +#: ../src/gajim-remote.py:225 msgid "Sends custom XML" msgstr "Šalje korisnički XML" -#: ../src/gajim-remote.py:226 +#: ../src/gajim-remote.py:227 msgid "XML to send" msgstr "XML za slanje" -#: ../src/gajim-remote.py:227 +#: ../src/gajim-remote.py:228 msgid "" "Account in which the xml will be sent; if not specified, xml will be sent to " "all accounts" @@ -4277,11 +4468,35 @@ "Račun u kojem će xml biti poslan; ako nije specificirano, xml će biti poslan " "na sve račune" -#: ../src/gajim-remote.py:249 +#: ../src/gajim-remote.py:234 +msgid "Handle a xmpp:/ uri" +msgstr "Rukuj xmpp:/ adresama" + +#: ../src/gajim-remote.py:236 +msgid "uri" +msgstr "uri" + +#: ../src/gajim-remote.py:241 +msgid "Join a MUC room" +msgstr "Pridruživanje Novoj Sobi" + +#: ../src/gajim-remote.py:243 +msgid "room" +msgstr "soba" + +#: ../src/gajim-remote.py:244 +msgid "nick" +msgstr "nadimak" + +#: ../src/gajim-remote.py:245 +msgid "password" +msgstr "lozinka" + +#: ../src/gajim-remote.py:268 msgid "Missing argument \"contact_jid\"" msgstr "Nedostaje argument \"contact_jid\"" -#: ../src/gajim-remote.py:268 +#: ../src/gajim-remote.py:287 #, python-format msgid "" "'%s' is not in your roster.\n" @@ -4290,11 +4505,11 @@ "'%s' nije na vašoj listi.\n" "Molimo odredite račun za slanje poruke." -#: ../src/gajim-remote.py:271 +#: ../src/gajim-remote.py:290 msgid "You have no active account" msgstr "nemate aktivnih računa" -#: ../src/gajim-remote.py:335 +#: ../src/gajim-remote.py:354 #, python-format msgid "" "Usage: %s %s %s \n" @@ -4303,16 +4518,16 @@ "Korištenje: %s %s %s \n" "\t %s" -#: ../src/gajim-remote.py:338 +#: ../src/gajim-remote.py:357 msgid "Arguments:" msgstr "Argumenti:" -#: ../src/gajim-remote.py:342 +#: ../src/gajim-remote.py:361 #, python-format msgid "%s not found" msgstr "%s nije pronađen" -#: ../src/gajim-remote.py:346 +#: ../src/gajim-remote.py:365 #, python-format msgid "" "Usage: %s command [arguments]\n" @@ -4321,15 +4536,28 @@ "Korištenje: %s naredba [argumenti]\n" "Naredba je jedna od:\n" -#: ../src/gajim-remote.py:420 +#: ../src/gajim-remote.py:438 #, python-format msgid "" +"Too many arguments. \n" +"Type \"%s help %s\" for more info" +msgstr "" +"Previše argumenata. \n" +"Unesite \"%s help %s\" za više informacija" + +#: ../src/gajim-remote.py:442 +#, python-format +msgid "" "Argument \"%s\" is not specified. \n" "Type \"%s help %s\" for more info" msgstr "" "Argument \"%s\" nije određen. \n" "Unesite \"%s help %s\" za više informacija" +#: ../src/gajim-remote.py:460 +msgid "Wrong uri" +msgstr "Krivi uri" + #: ../src/gajim_themes_window.py:60 msgid "Theme" msgstr "Tema" @@ -4347,14 +4575,6 @@ msgid "Please first choose another for your current theme." msgstr "Molimo vas da prvo odaberete neku drugu temu za trenutnu." -#: ../src/groupchat_control.py:106 -msgid "Private Chat" -msgstr "Privatni Razgovor" - -#: ../src/groupchat_control.py:106 -msgid "Private Chats" -msgstr "Privanti Razgovori" - #: ../src/groupchat_control.py:123 msgid "Sending private message failed" msgstr "Slanje privatne poruke neuspješno" @@ -4365,101 +4585,82 @@ msgid "You are no longer in group chat \"%s\" or \"%s\" has left." msgstr "Više niste u grupnom razgovoru \"%s\" ili je \"%s\" otišao." -#: ../src/groupchat_control.py:144 -msgid "Group Chat" -msgstr "Grupni Razgovor" - -#: ../src/groupchat_control.py:144 -msgid "Group Chats" -msgstr "Grupni Razgovori" - -#: ../src/groupchat_control.py:318 +#: ../src/groupchat_control.py:330 msgid "Insert Nickname" msgstr "Umetni _Nadimak" #. do not print 'kicked by None' -#: ../src/groupchat_control.py:831 +#: ../src/groupchat_control.py:873 #, python-format msgid "%(nick)s has been kicked: %(reason)s" msgstr "%(nick)s je izbačen: %(reason)s" -#: ../src/groupchat_control.py:835 +#: ../src/groupchat_control.py:877 #, python-format msgid "%(nick)s has been kicked by %(who)s: %(reason)s" msgstr "%(nick)s je izbačen od strane %(who)s: %(reason)s" #. do not print 'banned by None' -#: ../src/groupchat_control.py:842 +#: ../src/groupchat_control.py:884 #, python-format msgid "%(nick)s has been banned: %(reason)s" msgstr "%(nick)s ima zabranjen pristup: %(reason)s" -#: ../src/groupchat_control.py:846 +#: ../src/groupchat_control.py:888 #, python-format msgid "%(nick)s has been banned by %(who)s: %(reason)s" msgstr "%(nick)s ima zabranjen pristup od strane %(who)s: %(reason)s" -#: ../src/groupchat_control.py:854 +#: ../src/groupchat_control.py:896 #, python-format msgid "You are now known as %s" msgstr "Od sada ste poznati kao %s" -#: ../src/groupchat_control.py:856 +#: ../src/groupchat_control.py:898 #, python-format msgid "%s is now known as %s" msgstr "%s je od sada poznat kao %s" -#: ../src/groupchat_control.py:936 +#: ../src/groupchat_control.py:1016 #, python-format msgid "%s has left" msgstr "%s je napustio" -#: ../src/groupchat_control.py:941 +#: ../src/groupchat_control.py:1021 #, python-format msgid "%s has joined the group chat" msgstr "%s se pridružio grupnom razgovoru" -#. No status message -#: ../src/groupchat_control.py:943 ../src/roster_window.py:1200 +#: ../src/groupchat_control.py:1149 ../src/groupchat_control.py:1167 +#: ../src/groupchat_control.py:1260 ../src/groupchat_control.py:1277 #, python-format -msgid "%s is now %s" -msgstr "%s je sada %s" - -#: ../src/groupchat_control.py:1062 ../src/groupchat_control.py:1080 -#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1190 -#, python-format msgid "Nickname not found: %s" msgstr "Nadimak nije pronađen: %s " -#: ../src/groupchat_control.py:1096 +#: ../src/groupchat_control.py:1183 msgid "This group chat has no subject" msgstr "Ovaj grupni razgovor nema temu" -#: ../src/groupchat_control.py:1109 +#: ../src/groupchat_control.py:1196 #, python-format msgid "Invited %(contact_jid)s to %(room_jid)s." msgstr "Pozvali ste %(contact_jid)s na %(room_jid)s" #. %s is something the user wrote but it is not a jid so we inform -#: ../src/groupchat_control.py:1116 ../src/groupchat_control.py:1144 +#: ../src/groupchat_control.py:1203 ../src/groupchat_control.py:1231 #, python-format msgid "%s does not appear to be a valid JID" msgstr "%s ne izgleda kao valjani JID" -#: ../src/groupchat_control.py:1227 +#: ../src/groupchat_control.py:1314 #, python-format msgid "No such command: /%s (if you want to send this, prefix it with /say)" msgstr "" "Ne postoji komanda: /%s (ako želite poslati to kao poruku, prefiksirajte je " "sa /say)" -#: ../src/groupchat_control.py:1250 +#: ../src/groupchat_control.py:1340 #, python-format -msgid "Commands: %s" -msgstr "Komanda: %s" - -#: ../src/groupchat_control.py:1252 -#, python-format msgid "" "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The " "nickname of an occupant may be substituted, but not if it contains \"@\". If " @@ -4471,20 +4672,17 @@ "trenutno u sobi, on/ona/ono će biti izbačen(a/o). Razmaci u imenima NISU " "podržani." -#: ../src/groupchat_control.py:1259 +#: ../src/groupchat_control.py:1347 #, python-format msgid "" -"Usage: /%s <nickname>, opens a private chat window to the specified occupant." +"Usage: /%s <nickname>, opens a private chat window with the specified " +"occupant." msgstr "" -"Način korištenja: /%s <nickname>, otvara privatni razgovor sa učesnikom" +"Način korištenja: /%s <nickname>, otvara privatni razgovor sa navedenim " +"učesnikom." -#: ../src/groupchat_control.py:1263 +#: ../src/groupchat_control.py:1353 #, python-format -msgid "Usage: /%s, clears the text window." -msgstr "Način korištenja: /%s, prazni tekstualni prozor" - -#: ../src/groupchat_control.py:1265 -#, python-format msgid "" "Usage: /%s [reason], closes the current window or tab, displaying reason if " "specified." @@ -4492,13 +4690,8 @@ "Način korištenja: /%s [razlog], zatvara trenutni prozor ili tab, i prikazuje " "razlog ako je specificiran." -#: ../src/groupchat_control.py:1268 +#: ../src/groupchat_control.py:1359 #, python-format -msgid "Usage: /%s, hide the chat buttons." -msgstr "Način korištenja: /%s, sakriva dugmadi." - -#: ../src/groupchat_control.py:1271 -#, python-format msgid "" "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally " "providing a reason." @@ -4506,7 +4699,7 @@ "Način korištenja: /%s <JID> [razlog], poziva JID u trenutni grupni razgovor, " "opcionalno dajući razlog." -#: ../src/groupchat_control.py:1275 +#: ../src/groupchat_control.py:1363 #, python-format msgid "" "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally " @@ -4515,7 +4708,7 @@ "Način korištenja: /%s <soba>@<poslužitelj>[/nadimak], nudi mogućnost " "spajanja na sobu@poslužitelj koristeći navedeni nadimak." -#: ../src/groupchat_control.py:1279 +#: ../src/groupchat_control.py:1367 #, python-format msgid "" "Usage: /%s <nickname> [reason], removes the occupant specified by nickname " @@ -4526,7 +4719,7 @@ "nadimkom iz grupnog razgovora i opcionalno prikazuje razlog. NE podržava " "razmake u nadimku." -#: ../src/groupchat_control.py:1284 +#: ../src/groupchat_control.py:1372 #, python-format msgid "" "Usage: /%s <action>, sends action to the current group chat. Use third " @@ -4535,107 +4728,120 @@ "Način korištenja: /%s <action>, šalje akciju trenutnom grupnom razgovoru. " "Koristite treću osobu. (npr. /%s eksplodira.)" -#: ../src/groupchat_control.py:1288 +#: ../src/groupchat_control.py:1376 #, python-format msgid "" -"Usage: /%s <nickname> [message], opens a private message windowand sends " +"Usage: /%s <nickname> [message], opens a private message window and sends " "message to the occupant specified by nickname." msgstr "" "Način korištenja: /%s <nickname> [poruka], otvara prozor privatne poruke i " -"šalje poruku učesniku specificiranom pomoću nadimka." +"šalje poruku učesniku navedenom nadimkom." -#: ../src/groupchat_control.py:1293 +#: ../src/groupchat_control.py:1381 #, python-format msgid "Usage: /%s <nickname>, changes your nickname in current group chat." msgstr "" "Način korištenja: /%s <nickname>, mjenja vaš nadimak u trenutnom grupnom " "razgovoru." -#: ../src/groupchat_control.py:1297 +#: ../src/groupchat_control.py:1385 #, python-format msgid "Usage: /%s , display the names of group chat occupants." msgstr "Način korištenja: /%s , prikazuje imena učesnika u grupnom razgovoru." -#: ../src/groupchat_control.py:1301 +#: ../src/groupchat_control.py:1389 #, python-format msgid "Usage: /%s [topic], displays or updates the current group chat topic." msgstr "" "Način korištenja: /%s [tema], prikazuje ili ažurira temu grupnog razgovora." -#: ../src/groupchat_control.py:1304 +#: ../src/groupchat_control.py:1392 #, python-format msgid "" "Usage: /%s <message>, sends a message without looking for other commands." msgstr "" "Način korištenja: /%s <message>, šalje poruku bez gledanja za ostale komande." -#: ../src/groupchat_control.py:1307 +#: ../src/groupchat_control.py:1458 #, python-format -msgid "No help info for /%s" -msgstr "Nema informacija ni pomoći za /%s" - -#: ../src/groupchat_control.py:1356 -#, python-format msgid "Are you sure you want to leave group chat \"%s\"?" msgstr "Jeste li sigurni da želite napustiti grupni razgovor \"%s\"?" -#: ../src/groupchat_control.py:1358 +#: ../src/groupchat_control.py:1460 msgid "" "If you close this window, you will be disconnected from this group chat." msgstr "" "Ako zatvorite ovaj prozor, biti ćete odspojeni iz ovog grupnog razgovora." -#: ../src/groupchat_control.py:1362 ../src/roster_window.py:3962 +#: ../src/groupchat_control.py:1464 ../src/roster_window.py:4504 msgid "Do _not ask me again" msgstr "_Ne pitaj me više" -#: ../src/groupchat_control.py:1396 +#: ../src/groupchat_control.py:1498 msgid "Changing Subject" msgstr "Mijenjanje Teme" -#: ../src/groupchat_control.py:1397 +#: ../src/groupchat_control.py:1499 msgid "Please specify the new subject:" msgstr "Molimo specificirajte novu temu:" -#: ../src/groupchat_control.py:1406 +#: ../src/groupchat_control.py:1508 msgid "Changing Nickname" msgstr "Mijenjam Nadimak" -#: ../src/groupchat_control.py:1407 +#: ../src/groupchat_control.py:1509 msgid "Please specify the new nickname you want to use:" msgstr "Molimo specificirajte novi nadimak ako ga želite koristiti:" -#: ../src/groupchat_control.py:1432 +#. Ask for a reason +#: ../src/groupchat_control.py:1524 +#, python-format +msgid "Destroying %s" +msgstr "Uništavam %s" + +#: ../src/groupchat_control.py:1525 +msgid "" +"You are going to definitively destroy this room.\n" +"You may specify a reason below:" +msgstr "" +"Definitivno će te uništiti ovu sobu.\n" +"Ispod možete navesti razlog:" + +#: ../src/groupchat_control.py:1527 +msgid "You may also enter an alternate venue:" +msgstr "Također možete unjeti alternativno mjesto sastanka:" + +#: ../src/groupchat_control.py:1557 msgid "Bookmark already set" msgstr "Knjižna oznaka je već postavljena" -#: ../src/groupchat_control.py:1433 +#: ../src/groupchat_control.py:1558 #, python-format msgid "Group Chat \"%s\" is already in your bookmarks." msgstr "Grupni Razgovor \"%s\" je već u vašim knjižnim oznakama." -#: ../src/groupchat_control.py:1442 +#: ../src/groupchat_control.py:1567 msgid "Bookmark has been added successfully" msgstr "Knjižna oznaka je bez uspješno dodana" -#: ../src/groupchat_control.py:1443 +#: ../src/groupchat_control.py:1568 msgid "You can manage your bookmarks via Actions menu in your roster." msgstr "" "Možete upravljati vašim knjižnim oznakama pomoću izbornika Akcije u vašem " "spisku." #. ask for reason -#: ../src/groupchat_control.py:1569 +#: ../src/groupchat_control.py:1703 #, python-format msgid "Kicking %s" msgstr "Izbacujem %s" -#: ../src/groupchat_control.py:1570 ../src/groupchat_control.py:1852 +#: ../src/groupchat_control.py:1704 ../src/groupchat_control.py:1996 msgid "You may specify a reason below:" msgstr "Možete specificirati razlog ispod:" #. ask for reason -#: ../src/groupchat_control.py:1851 +#: ../src/groupchat_control.py:1995 #, python-format msgid "Banning %s" msgstr "Zabranjujem pristup %s" @@ -4660,67 +4866,80 @@ msgstr "Detalji" #. we talk about file -#: ../src/gtkgui_helpers.py:153 ../src/gtkgui_helpers.py:168 +#: ../src/gtkgui_helpers.py:156 ../src/gtkgui_helpers.py:171 #, python-format msgid "Error: cannot open %s for reading" msgstr "Greška: nije moguće otvoriti %s za čitanje" -#: ../src/gtkgui_helpers.py:293 +#: ../src/gtkgui_helpers.py:336 msgid "Error reading file:" msgstr "Greška pri čitanju datoteke:" -#: ../src/gtkgui_helpers.py:296 +#: ../src/gtkgui_helpers.py:339 msgid "Error parsing file:" msgstr "Greška pri učitavanju datoteke:" #. do not traceback (could be a permission problem) #. we talk about a file here -#: ../src/gtkgui_helpers.py:334 +#: ../src/gtkgui_helpers.py:376 #, python-format msgid "Could not write to %s. Session Management support will not work" msgstr "Nije moguće pisati u %s. Rukovanje sesijama neće biti moguće" -#: ../src/gtkgui_helpers.py:728 +#. xmpp: is currently handled by another program, so ask the user +#: ../src/gtkgui_helpers.py:711 +msgid "Gajim is not the default Jabber client" +msgstr "Gajim nije zadani Jabber klijent" + +#: ../src/gtkgui_helpers.py:712 +msgid "Would you like to make Gajim the default Jabber client?" +msgstr "Želite li postaviti Gajim za zadani Jabber klijent?" + +#: ../src/gtkgui_helpers.py:713 +msgid "Always check to see if Gajim is the default Jabber client on startup" +msgstr "Uvijek provjeri ako je Gajim zadani Jabber klijent, pri pokretanju" + +#: ../src/gtkgui_helpers.py:812 msgid "Extension not supported" msgstr "Produžetak nije podržan" -#: ../src/gtkgui_helpers.py:729 +#: ../src/gtkgui_helpers.py:813 #, python-format msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?" msgstr "" "Sliku nije moguće spremiti u %(type)s formatu. Spremiti kao %(new_filename)s?" -#: ../src/gtkgui_helpers.py:738 +#: ../src/gtkgui_helpers.py:822 msgid "Save Image as..." msgstr "Snimiti Sliku kao..." -#: ../src/history_manager.py:64 +#: ../src/history_manager.py:65 msgid "Cannot find history logs database" msgstr "Nije moguće pronaći bazu podataka zabilješki povijesti" #. holds jid -#: ../src/history_manager.py:107 +#: ../src/history_manager.py:108 msgid "Contacts" msgstr "Kontakti" #. holds time -#: ../src/history_manager.py:120 ../src/history_manager.py:160 +#: ../src/history_manager.py:121 ../src/history_manager.py:161 #: ../src/history_window.py:86 msgid "Date" msgstr "Datum" #. holds nickname -#: ../src/history_manager.py:126 ../src/history_manager.py:178 +#: ../src/history_manager.py:127 ../src/history_manager.py:179 msgid "Nickname" msgstr "Nadimak" #. holds message -#: ../src/history_manager.py:134 ../src/history_manager.py:166 +#: ../src/history_manager.py:135 ../src/history_manager.py:167 #: ../src/history_window.py:94 msgid "Message" msgstr "Poruka" -#: ../src/history_manager.py:186 +#: ../src/history_manager.py:187 msgid "" "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS " "RUNNING)" @@ -4728,7 +4947,7 @@ "Želite li očistiti bazu podataka? (NE PREPORUČUJEMO UKOLIKO JE GAJIM " "POKRENUT)" -#: ../src/history_manager.py:188 +#: ../src/history_manager.py:189 msgid "" "Normally allocated database size will not be freed, it will just become " "reusable. If you really want to reduce database filesize, click YES, else " @@ -4742,7 +4961,7 @@ "\n" "Ukoliko pritisnite Da, pričekajte..." -#: ../src/history_manager.py:400 +#: ../src/history_manager.py:401 msgid "Exporting History Logs..." msgstr "Izvozim Zabilješke Povijesti..." @@ -4774,109 +4993,130 @@ msgid "Conversation History with %s" msgstr "Povijest Razgovora sa %s" -#: ../src/history_window.py:261 +#: ../src/history_window.py:266 #, python-format msgid "%(nick)s is now %(status)s: %(status_msg)s" msgstr "%(nick)s je trenutno %(status)s: %(status_msg)s" -#: ../src/history_window.py:265 ../src/notify.py:198 +#: ../src/history_window.py:270 ../src/notify.py:201 #, python-format msgid "%(nick)s is now %(status)s" msgstr "%(nick)s je trenutno %(status)s" -#: ../src/history_window.py:271 +#: ../src/history_window.py:276 #, python-format msgid "Status is now: %(status)s: %(status_msg)s" msgstr "Stauts je trenutno: %(status)s: %(status_msg)s" -#: ../src/history_window.py:274 +#: ../src/history_window.py:279 #, python-format msgid "Status is now: %(status)s" msgstr "Status je trenutno: %(status)s" -#: ../src/message_window.py:273 +#: ../src/htmltextview.py:583 ../src/htmltextview.py:594 +msgid "Timeout loading image" +msgstr "Vrijeme isteklo kod učitavanja slike" + +#: ../src/htmltextview.py:604 +msgid "Image is too big" +msgstr "Slika je prevelika" + +#: ../src/message_window.py:276 +msgid "Chats" +msgstr "Razgovori" + +#: ../src/message_window.py:278 +msgid "Group Chats" +msgstr "Grupni Razgovori" + +#: ../src/message_window.py:280 +msgid "Private Chats" +msgstr "Privanti Razgovori" + +#: ../src/message_window.py:282 msgid "Messages" msgstr "Poruke" -#: ../src/message_window.py:274 +#: ../src/message_window.py:283 #, python-format msgid "%s - Gajim" msgstr "%s - Gajim" -#: ../src/notify.py:196 +#: ../src/notify.py:199 #, python-format msgid "%(nick)s Changed Status" msgstr "%(nick)s je Promjenio Status" -#: ../src/notify.py:206 +#: ../src/notify.py:209 #, python-format msgid "%(nickname)s Signed In" msgstr "%(nickname)s Se Prijavio" -#: ../src/notify.py:214 +#: ../src/notify.py:217 #, python-format msgid "%(nickname)s Signed Out" msgstr "%(nickname)s Se Odjavio" -#: ../src/notify.py:226 +#: ../src/notify.py:229 #, python-format msgid "New Single Message from %(nickname)s" msgstr "Nova Jedna Poruka od %(nickname)s" -#: ../src/notify.py:234 +#: ../src/notify.py:237 #, python-format msgid "New Private Message from group chat %s" msgstr "Nova Privatna Poruka iz privatnog razgovora %s" -#: ../src/notify.py:235 +#: ../src/notify.py:238 #, python-format msgid "%(nickname)s: %(message)s" msgstr "%(nickname)s: %(message)s" -#: ../src/notify.py:241 +#: ../src/notify.py:244 #, python-format msgid "New Message from %(nickname)s" msgstr "Nova poruka od %(nickname)s" -#: ../src/profile_window.py:72 ../src/profile_window.py:376 +#: ../src/profile_window.py:72 msgid "Retrieving profile..." msgstr "Dohvaćam profil..." -#: ../src/profile_window.py:107 ../src/profile_window.py:203 -#: ../src/profile_window.py:212 ../src/profile_window.py:370 -msgid "Click to set your avatar" -msgstr "Kliknite za postavljanje avatara" +#: ../src/profile_window.py:127 ../src/vcard.py:135 +msgid "File is empty" +msgstr "Datoteka je prazna" +#: ../src/profile_window.py:130 ../src/vcard.py:138 +msgid "File does not exist" +msgstr "Datoteka ne postoji" + #. keep identation -#: ../src/profile_window.py:136 +#. unknown format +#: ../src/profile_window.py:144 ../src/profile_window.py:160 +#: ../src/vcard.py:140 ../src/vcard.py:151 msgid "Could not load image" msgstr "Nemogu učitati sliku" -#: ../src/profile_window.py:238 +#: ../src/profile_window.py:261 msgid "Information received" msgstr "Primljene informacije" -#: ../src/profile_window.py:308 +#: ../src/profile_window.py:330 msgid "Without a connection you can not publish your contact information." msgstr "Bez veze ne možete objaviti informacije o sebi" -#: ../src/profile_window.py:320 +#: ../src/profile_window.py:342 msgid "Sending profile..." msgstr "Šaljem profil..." -#: ../src/profile_window.py:328 -msgid "Information published" -msgstr "Informacije objavljene" - -#: ../src/profile_window.py:340 +#: ../src/profile_window.py:357 msgid "Information NOT published" msgstr "Informacije NISU objavljene" -#: ../src/profile_window.py:347 +#: ../src/profile_window.py:364 msgid "vCard publication failed" msgstr "Objava vCard neuspješna" -#: ../src/profile_window.py:348 +#: ../src/profile_window.py:365 msgid "" "There was an error while publishing your personal information, try again " "later." @@ -4884,26 +5124,30 @@ "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte " "ponovno kasnije." -#: ../src/profile_window.py:374 -msgid "Without a connection, you can not get your contact information." -msgstr "Bez veze ne možete dobiti informacije o kontaktu." - -#: ../src/roster_window.py:168 ../src/roster_window.py:223 +#: ../src/roster_window.py:173 ../src/roster_window.py:228 msgid "Merged accounts" msgstr "Spojeni računi" -#: ../src/roster_window.py:340 ../src/common/helpers.py:42 +#: ../src/roster_window.py:347 ../src/roster_window.py:602 +#: ../src/common/helpers.py:43 msgid "Observers" msgstr "Posmatrači" -#: ../src/roster_window.py:686 ../src/roster_window.py:3133 +#: ../src/roster_window.py:373 ../src/roster_window.py:429 +#: ../src/roster_window.py:434 ../src/roster_window.py:2442 +#: ../src/common/commands.py:194 ../src/common/contacts.py:89 +#: ../src/common/helpers.py:43 +msgid "Groupchats" +msgstr "Grupni Razgovori" + +#: ../src/roster_window.py:752 ../src/roster_window.py:3651 msgid "You cannot join a group chat while you are invisible" msgstr "Nije moguće pridruživanje grupnom razgovoru dok ste nevidljivi" #. new chat #. for chat_with #. for single message -#: ../src/roster_window.py:878 ../src/systray.py:187 ../src/systray.py:192 +#: ../src/roster_window.py:968 ../src/systray.py:206 ../src/systray.py:211 #, python-format msgid "using account %s" msgstr "koristeći račun %s" @@ -4911,68 +5155,68 @@ #. the 'manage gc bookmarks' item is shown #. below to avoid duplicate code #. add -#: ../src/roster_window.py:903 +#: ../src/roster_window.py:993 #, python-format msgid "to %s account" msgstr "na %s račun" #. disco -#: ../src/roster_window.py:908 +#: ../src/roster_window.py:998 #, python-format msgid "using %s account" msgstr "koristeći %s račun" #. profile, avatar -#: ../src/roster_window.py:983 +#: ../src/roster_window.py:1073 #, python-format msgid "of account %s" msgstr "računa %s" -#: ../src/roster_window.py:1003 +#: ../src/roster_window.py:1093 msgid "_Manage Bookmarks..." msgstr "Upravljanje Knjižni_m Oznakama..." -#: ../src/roster_window.py:1032 +#: ../src/roster_window.py:1122 #, python-format msgid "for account %s" msgstr "za račun %s" #. History manager -#: ../src/roster_window.py:1053 +#: ../src/roster_window.py:1143 msgid "History Manager" msgstr "Upravitelj Povijesti" -#: ../src/roster_window.py:1062 +#: ../src/roster_window.py:1152 msgid "_Join New Group Chat" msgstr "Pridružit_i se Novom Grupnom Razgovoru" -#: ../src/roster_window.py:1380 ../src/roster_window.py:3326 -#: ../src/roster_window.py:3333 +#: ../src/roster_window.py:1493 ../src/roster_window.py:3847 +#: ../src/roster_window.py:3854 msgid "You have unread messages" msgstr "Imte nepročitane poruke" -#: ../src/roster_window.py:1381 +#: ../src/roster_window.py:1494 msgid "You must read them before removing this transport." msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa." -#: ../src/roster_window.py:1384 +#: ../src/roster_window.py:1497 #, python-format msgid "Transport \"%s\" will be removed" msgstr "Prijenos \"%s\" biti će uklonjen" -#: ../src/roster_window.py:1385 +#: ../src/roster_window.py:1498 msgid "" -"You will no longer be able to send and receive messages to contacts from " +"You will no longer be able to send and receive messages from contacts using " "this transport." msgstr "" -"Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovog " -"prijenosa." +"Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji " +"koriste ovaj prijenos." -#: ../src/roster_window.py:1388 +#: ../src/roster_window.py:1501 msgid "Transports will be removed" msgstr "Prijenos će biti uklonjen" -#: ../src/roster_window.py:1393 +#: ../src/roster_window.py:1506 #, python-format msgid "" "You will no longer be able to send and receive messages to contacts from " @@ -4982,114 +5226,122 @@ "prijenosa:%s" #. it's jid -#: ../src/roster_window.py:1413 +#: ../src/roster_window.py:1672 msgid "Rename Contact" msgstr "Preimenuj Kontakt" -#: ../src/roster_window.py:1414 +#: ../src/roster_window.py:1673 #, python-format msgid "Enter a new nickname for contact %s" msgstr "Unesite novi nadimak za kontakt %s" -#: ../src/roster_window.py:1421 +#: ../src/roster_window.py:1680 msgid "Rename Group" msgstr "Preimenuj Grupu" -#: ../src/roster_window.py:1422 +#: ../src/roster_window.py:1681 #, python-format msgid "Enter a new name for group %s" msgstr "Unesite novo ime za grupu %s" -#: ../src/roster_window.py:1476 +#: ../src/roster_window.py:1756 msgid "Remove Group" msgstr "Ukloni Grupu" -#: ../src/roster_window.py:1477 +#: ../src/roster_window.py:1757 #, python-format msgid "Do you want to remove group %s from the roster?" msgstr "Želite li ukloniti grupu %s sa liste kontakata?" -#: ../src/roster_window.py:1478 +#: ../src/roster_window.py:1758 msgid "Remove also all contacts in this group from your roster" msgstr "Ujedno ukloni i sve kontakte sa ove grupe sa liste kontakata" -#: ../src/roster_window.py:1502 +#: ../src/roster_window.py:1789 msgid "Assign OpenPGP Key" msgstr "Dodjeli OpenPGP Ključ" -#: ../src/roster_window.py:1503 +#: ../src/roster_window.py:1790 msgid "Select a key to apply to the contact" msgstr "Odaberite ključ za dodavanje kontaktu" -#: ../src/roster_window.py:1784 ../src/roster_window.py:1960 +#: ../src/roster_window.py:2030 ../src/roster_window.py:2324 msgid "_New group chat" msgstr "_Novi grupni razgovor" -#: ../src/roster_window.py:1842 +#: ../src/roster_window.py:2175 msgid "I would like to add you to my roster" msgstr "Želio bih vas dodati na svoju listu kontakata" -#: ../src/roster_window.py:2005 ../src/roster_window.py:2052 +#: ../src/roster_window.py:2369 ../src/roster_window.py:2476 msgid "Send Group M_essage" msgstr "Pošalji _Grupnu Poruku" -#: ../src/roster_window.py:2031 +#: ../src/roster_window.py:2406 +msgid "_Maximize" +msgstr "_Maksimiziraj" + +#: ../src/roster_window.py:2455 msgid "Re_name" msgstr "Pre_imenuj" -#: ../src/roster_window.py:2058 +#: ../src/roster_window.py:2482 msgid "To all users" msgstr "Svim korisnicima" -#: ../src/roster_window.py:2061 +#: ../src/roster_window.py:2485 msgid "To all online users" msgstr "Svim spojenim korisnicima" -#: ../src/roster_window.py:2097 +#: ../src/roster_window.py:2505 +msgid "Send Cus_tom Status" +msgstr "Šalje Prila_gođeni Status" + +#: ../src/roster_window.py:2562 msgid "_Log on" msgstr "_Prijava" -#: ../src/roster_window.py:2107 +#: ../src/roster_window.py:2572 msgid "Log _off" msgstr "_Odjava" -#: ../src/roster_window.py:2229 ../src/roster_window.py:2300 +#: ../src/roster_window.py:2694 ../src/roster_window.py:2765 msgid "_Change Status Message" msgstr "_Izmjena Statusne Poruke" -#: ../src/roster_window.py:2372 +#: ../src/roster_window.py:2837 msgid "Authorization has been sent" msgstr "Odobrenje je poslano" -#: ../src/roster_window.py:2373 +#: ../src/roster_window.py:2838 #, python-format msgid "Now \"%s\" will know your status." msgstr "Sada će \"%s\" znati vaš status." -#: ../src/roster_window.py:2393 +#: ../src/roster_window.py:2858 msgid "Subscription request has been sent" msgstr "Zahtjev za pretplatom je poslan" -#: ../src/roster_window.py:2394 +#: ../src/roster_window.py:2859 #, python-format msgid "If \"%s\" accepts this request you will know his or her status." msgstr "Ako \"%s\" prihvati ovaj zahtjev znati će te njegov/njezin status." -#: ../src/roster_window.py:2406 +#: ../src/roster_window.py:2871 msgid "Authorization has been removed" msgstr "Odobrenje je uklonjeno" -#: ../src/roster_window.py:2407 +#: ../src/roster_window.py:2872 #, python-format msgid "Now \"%s\" will always see you as offline." msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog." -#: ../src/roster_window.py:2615 +#: ../src/roster_window.py:3070 #, python-format msgid "Contact \"%s\" will be removed from your roster" msgstr "Kontakt \"%s\" biti će uklonjen sa vaše liste kontakata" -#: ../src/roster_window.py:2619 +#: ../src/roster_window.py:3074 msgid "" "By removing this contact you also remove authorization resulting in him or " "her always seeing you as offline." @@ -5097,7 +5349,7 @@ "Uklanjanjem ovog kontakta ujedno i uklanjate odobrenje što konačno znači da " "će vas ta osoba uvijek vidjeti kao da ste odspojeni." -#: ../src/roster_window.py:2624 +#: ../src/roster_window.py:3079 msgid "" "By removing this contact you also by default remove authorization resulting " "in him or her always seeing you as offline." @@ -5105,16 +5357,16 @@ "Uklanjanjem ovog kontakta ujedno po pretpostavljenom uklanjate i odobrenje " "što konačno znači da će vas ta osoba uvijek vidjeti kao da ste odspojeni." -#: ../src/roster_window.py:2627 +#: ../src/roster_window.py:3082 msgid "I want this contact to know my status after removal" msgstr "Želim da ovaj kontakt zna moj status nakon uklanjanja" #. several contact to remove at the same time -#: ../src/roster_window.py:2631 +#: ../src/roster_window.py:3086 msgid "Contacts will be removed from your roster" msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata" -#: ../src/roster_window.py:2635 +#: ../src/roster_window.py:3090 #, python-format msgid "" "By removing these contacts:%s\n" @@ -5124,40 +5376,48 @@ "ujedno uklanjate i odobrenje što konačno znači da će vas ta osoba uvijek " "vidjeti kao da ste odspojeni." +#: ../src/roster_window.py:3122 +msgid "" +"Gnome Keyring is installed but not correctly started (environment variable " +"probably not correctly set)" +msgstr "" +"Gnome Keyring je instaliran, ali nije ispravno pokrenut (vjerovatno " +"varijabla okruženja nije ispravno postavljena)" + #. TODO: make this string translatable #. %s is the account name here -#: ../src/roster_window.py:2693 ../src/common/connection.py:587 -#: ../src/common/zeroconf/connection_zeroconf.py:158 +#: ../src/roster_window.py:3150 ../src/common/connection.py:692 +#: ../src/common/zeroconf/connection_zeroconf.py:164 #, python-format msgid "You will be connected to %s without OpenPGP." msgstr "Biti će te spojeni na %s bez OpenPGP-a." -#: ../src/roster_window.py:2710 +#: ../src/roster_window.py:3167 msgid "Passphrase Required" msgstr "Potrebna Lozinka" -#: ../src/roster_window.py:2711 +#: ../src/roster_window.py:3168 #, python-format msgid "Enter GPG key passphrase for account %s." msgstr "Unesite lozinku GPG ključa za račun %s." -#: ../src/roster_window.py:2716 +#: ../src/roster_window.py:3173 msgid "Save passphrase" msgstr "Sačuvati lozinku" -#: ../src/roster_window.py:2724 +#: ../src/roster_window.py:3181 msgid "Wrong Passphrase" msgstr "Kriva Lozinka" -#: ../src/roster_window.py:2725 +#: ../src/roster_window.py:3182 msgid "Please retype your GPG passphrase or press Cancel." msgstr "Molimo ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani" -#: ../src/roster_window.py:2782 ../src/roster_window.py:2842 +#: ../src/roster_window.py:3252 ../src/roster_window.py:3320 msgid "You are participating in one or more group chats" msgstr "Sudjelujete u jednom ili više grupnih razovora" -#: ../src/roster_window.py:2783 ../src/roster_window.py:2843 +#: ../src/roster_window.py:3253 ../src/roster_window.py:3321 msgid "" "Changing your status to invisible will result in disconnection from those " "group chats. Are you sure you want to go invisible?" @@ -5165,21 +5425,21 @@ "Promjena vašeg statusa u nevidljivo rezultirati će odspajanjem sa tih " "grupnih razgovora. Jeste li sigurni da želite ići na nevidljivo?" -#: ../src/roster_window.py:2800 +#: ../src/roster_window.py:3278 msgid "No account available" msgstr "Nema dostupnih računa" -#: ../src/roster_window.py:2801 +#: ../src/roster_window.py:3279 msgid "You must create an account before you can chat with other contacts." msgstr "" "Morate stvoriti račun prije nego što možete razgovarati sa drugim kontaktima." -#: ../src/roster_window.py:2899 +#: ../src/roster_window.py:3401 #, python-format msgid "\"%(title)s\" by %(artist)s" msgstr "\"%(title)s\" od %(artist)s" -#: ../src/roster_window.py:3327 ../src/roster_window.py:3334 +#: ../src/roster_window.py:3848 ../src/roster_window.py:3855 msgid "" "Messages will only be available for reading them later if you have history " "enabled." @@ -5187,11 +5447,11 @@ "Poruke će biti dostupne za čitanje i kasnije ukoliko imate omogućenu " "povijest." -#: ../src/roster_window.py:3912 +#: ../src/roster_window.py:4454 msgid "Metacontacts storage not supported by your server" msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju" -#: ../src/roster_window.py:3914 +#: ../src/roster_window.py:4456 msgid "" "Your server does not support storing metacontacts information. So those " "information will not be save on next reconnection." @@ -5199,15 +5459,15 @@ "Vaš poslužitelj ne podržava spremanje informacija metakontakata. Te " "informacije neće biti spremljene na sljedećem spajanju." -#: ../src/roster_window.py:3956 +#: ../src/roster_window.py:4498 msgid "" "You are about to create a metacontact. Are you sure you want to continue?" msgstr "" "Upravo ćete stvoriti metakontakt. Jeste li sigurni da želite nastaviti?" -#: ../src/roster_window.py:3958 +#: ../src/roster_window.py:4500 msgid "" -"Metacontacts are a way to regroup several contacts in one line. Generaly it " +"Metacontacts are a way to regroup several contacts in one line. Generally it " "is used when the same person has several Jabber accounts or transport " "accounts." msgstr "" @@ -5215,33 +5475,40 @@ "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa " "prijenosa." -#: ../src/roster_window.py:4125 +#: ../src/roster_window.py:4578 #, python-format +msgid "Do you want to send that file to %s:" +msgid_plural "Do you want to send those files to %s:" +msgstr[0] "Želite li poslati tu datoteku kontaktu %s:" +msgstr[1] "Želite li poslati te datoteke kontaktu %s:" + +#: ../src/roster_window.py:4683 +#, python-format msgid "Drop %s in group %s" msgstr "Spusti %s u grupu %s" -#: ../src/roster_window.py:4132 +#: ../src/roster_window.py:4690 #, python-format msgid "Make %s and %s metacontacts" msgstr "Učini %s i %s pseudokontaktima" -#: ../src/roster_window.py:4319 +#: ../src/roster_window.py:4877 msgid "Change Status Message..." msgstr "Promijeni Statusnu Poruku..." -#: ../src/systray.py:144 +#: ../src/systray.py:163 msgid "_Change Status Message..." msgstr "_Promijeni Statusnu Poruku..." -#: ../src/systray.py:234 +#: ../src/systray.py:251 msgid "Hide this menu" msgstr "Sakrij ovaj izbornik" -#: ../src/tooltips.py:309 ../src/tooltips.py:492 +#: ../src/tooltips.py:309 ../src/tooltips.py:502 msgid "Jabber ID: " msgstr "Jabber ID: " -#: ../src/tooltips.py:312 ../src/tooltips.py:496 +#: ../src/tooltips.py:312 ../src/tooltips.py:506 msgid "Resource: " msgstr "Resurs: " @@ -5250,75 +5517,91 @@ msgid "%(owner_or_admin_or_member)s of this group chat" msgstr "%(owner_or_admin_or_member)s ovog grupnog razgovora" -#: ../src/tooltips.py:430 ../src/tooltips.py:610 +#: ../src/tooltips.py:414 +msgid " [blocked]" +msgstr "[blokirano]" + +#: ../src/tooltips.py:418 +msgid " [minimized]" +msgstr "[minimizirano]" + +#: ../src/tooltips.py:433 ../src/tooltips.py:622 msgid "Status: " msgstr "Status: " -#: ../src/tooltips.py:461 +#: ../src/tooltips.py:464 #, python-format msgid "Last status: %s" msgstr "Zadnji status: %s" -#: ../src/tooltips.py:463 +#: ../src/tooltips.py:466 #, python-format msgid " since %s" msgstr " od %s" +#: ../src/tooltips.py:484 +msgid "Connected" +msgstr "Spojen" + +#: ../src/tooltips.py:486 +msgid "Disconnected" +msgstr "Odspojen" + #. ('both' is the normal sub so we don't show it) -#: ../src/tooltips.py:502 +#: ../src/tooltips.py:513 msgid "Subscription: " msgstr "Pretplata: " -#: ../src/tooltips.py:512 +#: ../src/tooltips.py:523 msgid "OpenPGP: " msgstr "OpenPGP: " -#: ../src/tooltips.py:566 +#: ../src/tooltips.py:578 msgid "Download" msgstr "Skidanje" -#: ../src/tooltips.py:572 +#: ../src/tooltips.py:584 msgid "Upload" msgstr "Podizanje" -#: ../src/tooltips.py:579 +#: ../src/tooltips.py:591 msgid "Type: " msgstr "Tip: " -#: ../src/tooltips.py:585 +#: ../src/tooltips.py:597 msgid "Transferred: " msgstr "Prenešeno: " -#: ../src/tooltips.py:588 ../src/tooltips.py:609 +#: ../src/tooltips.py:600 ../src/tooltips.py:621 msgid "Not started" msgstr "Nije početo" -#: ../src/tooltips.py:592 +#: ../src/tooltips.py:604 msgid "Stopped" msgstr "Zaustavljeno" -#: ../src/tooltips.py:594 ../src/tooltips.py:597 +#: ../src/tooltips.py:606 ../src/tooltips.py:609 msgid "Completed" msgstr "Završeno" -#: ../src/tooltips.py:601 +#: ../src/tooltips.py:613 msgid "?transfer status:Paused" msgstr "?status prijenosa:Stanka" #. stalled is not paused. it is like 'frozen' it stopped alone -#: ../src/tooltips.py:605 +#: ../src/tooltips.py:617 msgid "Stalled" msgstr "Zaustavljeno" -#: ../src/tooltips.py:607 +#: ../src/tooltips.py:619 msgid "Transferring" msgstr "Prenosim" -#: ../src/tooltips.py:639 +#: ../src/tooltips.py:651 msgid "This service has not yet responded with detailed information" msgstr "Ovaj servis nije još pružio detaljnije informacije" -#: ../src/tooltips.py:642 +#: ../src/tooltips.py:654 msgid "" "This service could not respond with detailed information.\n" "It is most likely legacy or broken" @@ -5326,24 +5609,24 @@ "Ova usluga nije mogla odgovoriti sa detaljnim informacijama.\n" "Najvjerojatnije je zastarjela ili neispravna" -#: ../src/vcard.py:217 +#: ../src/vcard.py:326 msgid "?Client:Unknown" msgstr "?Klijent:Nepoznat" -#: ../src/vcard.py:219 +#: ../src/vcard.py:328 msgid "?OS:Unknown" msgstr "?OS:Nepoznat" -#: ../src/vcard.py:247 ../src/vcard.py:449 +#: ../src/vcard.py:356 ../src/vcard.py:537 #, python-format msgid "since %s" msgstr "od %s" -#: ../src/vcard.py:277 +#: ../src/vcard.py:386 msgid "Affiliation:" msgstr "Pripadnost:" -#: ../src/vcard.py:285 +#: ../src/vcard.py:394 msgid "" "This contact is interested in your presence information, but you are not " "interested in his/her presence" @@ -5351,7 +5634,7 @@ "Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne " "zanimaju informacije o njegovom/njenom prisustvu" -#: ../src/vcard.py:287 +#: ../src/vcard.py:396 msgid "" "You are interested in the contact's presence information, but he/she is not " "interested in yours" @@ -5359,24 +5642,24 @@ "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/" "njega ne interesira vaše prisutstvo" -#: ../src/vcard.py:289 +#: ../src/vcard.py:398 msgid "You and the contact are interested in each other's presence information" msgstr "" "Vi i vaš kontakt ste zainteresirani za informacije o prisustvu jedno drugog" #. None -#: ../src/vcard.py:291 +#: ../src/vcard.py:400 msgid "" "You are not interested in the contact's presence, and neither he/she is " "interested in yours" msgstr "" "Ne interesira vas prisutnost kontakta, niti vaša prisutnost zanima njega/nju" -#: ../src/vcard.py:299 +#: ../src/vcard.py:408 msgid "You are waiting contact's answer about your subscription request" msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom" -#: ../src/vcard.py:311 ../src/vcard.py:338 ../src/vcard.py:482 +#: ../src/vcard.py:412 ../src/vcard.py:439 ../src/vcard.py:562 msgid " resource with priority " msgstr " resurs s prioritetom " @@ -5387,7 +5670,7 @@ #: ../src/common/check_paths.py:89 ../src/common/check_paths.py:100 #: ../src/common/check_paths.py:107 #, python-format -msgid "%s is file but it should be a directory" +msgid "%s is a file but it should be a directory" msgstr "%s je datoteka ali bi trebao biti direktorij" #: ../src/common/check_paths.py:90 ../src/common/check_paths.py:101 @@ -5397,7 +5680,7 @@ #: ../src/common/check_paths.py:115 #, python-format -msgid "%s is directory but should be file" +msgid "%s is a directory but should be a file" msgstr "%s je direktorij ali bi trebao biti datoteka" #: ../src/common/check_paths.py:131 @@ -5405,42 +5688,103 @@ msgid "creating %s directory" msgstr "kreiram %s direktorij" -#: ../src/common/config.py:55 +#: ../src/common/commands.py:69 +msgid "Change status information" +msgstr "Izmjeni informacije o statusu" + +#: ../src/common/commands.py:82 +msgid "Change status" +msgstr "Promjeni status" + +#: ../src/common/commands.py:83 +msgid "Set the presence type and description" +msgstr "Postavi tip i opis prisustva" + +#: ../src/common/commands.py:89 +msgid "Free for chat" +msgstr "Slobodan za razgovor" + +#: ../src/common/commands.py:90 +msgid "Online" +msgstr "Spojen" + +#: ../src/common/commands.py:92 +msgid "Extended away" +msgstr "Produženo odsustvo" + +#: ../src/common/commands.py:93 +msgid "Do not disturb" +msgstr "Ne uznemiravaj" + +#: ../src/common/commands.py:94 +msgid "Offline - disconnect" +msgstr "Neumreženo - prekid veze" + +#: ../src/common/commands.py:99 +msgid "Presence description:" +msgstr "Opis prisustva:" + +#: ../src/common/commands.py:134 +msgid "The status has been changed." +msgstr "Status je promjenjen." + +#: ../src/common/commands.py:179 +#, python-format +msgid "%(nickname)s on %(room_jid)s" +msgstr "%(nickname)s u %(room_name)s" + +#: ../src/common/commands.py:183 +msgid "You have not joined a groupchat." +msgstr "Niste se pridružili grupnom razgovoru" + +#: ../src/common/commands.py:189 +msgid "Leave Groupchats" +msgstr "Novi Grupni Razgovor" + +#: ../src/common/commands.py:190 +msgid "Choose the groupchats you want to leave" +msgstr "Izaberite grupne razgovore koje želite napustiti" + +#: ../src/common/commands.py:230 +msgid "You left the following groupchats:" +msgstr "Napustili ste sljedeći grupni razgovor:" + +#: ../src/common/config.py:56 msgid "Use D-Bus and Notification-Daemon to show notifications" msgstr "Koristi DBus i Obavještajni-Demon za prikazivanje obavijesti" -#: ../src/common/config.py:60 +#: ../src/common/config.py:61 msgid "Time in minutes, after which your status changes to away." msgstr "" "Vrijeme u minutama, nako kojega će se vaš status promijeniti u odsutan." -#: ../src/common/config.py:61 +#: ../src/common/config.py:62 msgid "Away as a result of being idle" msgstr "Odsutan, kao posljedica mirovanja" -#: ../src/common/config.py:63 +#: ../src/common/config.py:64 msgid "Time in minutes, after which your status changes to not available." msgstr "" "Vrijeme u minutama, nakon kojega će se vaš status promijenti u nije dostupan." -#: ../src/common/config.py:64 +#: ../src/common/config.py:65 msgid "Not available as a result of being idle" msgstr "Nije dostupan, kao posljedica mirovanja." -#: ../src/common/config.py:82 +#: ../src/common/config.py:83 msgid "" "List (space separated) of rows (accounts and groups) that are collapsed." msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni." -#: ../src/common/config.py:87 +#: ../src/common/config.py:88 msgid "Enable link-local/zeroconf messaging" msgstr "Omogući lokalnu vezu/zeroconf poruke" -#: ../src/common/config.py:90 +#: ../src/common/config.py:91 msgid "Language used by speller" msgstr "Jezik koji koristi pravopis" -#: ../src/common/config.py:91 +#: ../src/common/config.py:92 msgid "" "'always' - print time for every message.\n" "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n" @@ -5450,10 +5794,10 @@ "'ponekad' - ispisuj vrijeme svakih print_ichat_every_foo_minutes minuta.\n" "'nikada' - nikada ne ispisuj vrijeme." -#: ../src/common/config.py:92 +#: ../src/common/config.py:93 msgid "" "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 " -"to disable fuzzyclock. 1 is the most precise clock, 4 the less precise one. " +"to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. " "This is used only if print_time is 'sometimes'." msgstr "" "Ispisuj vrijeme u razgovorima koristeći Nejasni Sat. Vrijednost nejasnoće od " @@ -5461,26 +5805,28 @@ "najneprecizniji. Ovo se koristi samo ukoliko je prikazivanje _vremena na " "'ponekad'." -#: ../src/common/config.py:95 +#: ../src/common/config.py:96 msgid "Treat * / _ pairs as possible formatting characters." msgstr "Koristi * / _ parove kao znakove za formatiranje." -#: ../src/common/config.py:96 +#: ../src/common/config.py:97 msgid "" "If True, do not remove */_ . So *abc* will be bold but with * * not removed." msgstr "" "Ako je Istinito, nemoj odstraniti */_ . Tako će *abc* biti podebljano, ali " "omeđeno sa * *." -#: ../src/common/config.py:99 +#: ../src/common/config.py:100 msgid "" -"Uses ReStructured text markup for HTML, plus ascii formatting if selected. " -"(If you want to use this, install docutils)" +"Uses ReStructured text markup to send HTML, plus ascii formatting if " +"selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/" +"restructuredtext.html (If you want to use this, install docutils)" msgstr "" -"Koristi ReStructured text markup za HTML i ascii formatiranje ako je " -"odabrano. (Ako ovo želite koristiti, instalirajte docutils)" +"Koristi ReStructured tekst markup za HTML i ascii formatiranje ako je " +"odabrano. Za sintaksu, pogledajte http://docutils.sourceforge.net/docs/ref/" +"rst/restructuredtext.html (Ako ovo želite koristiti, instalirajte docutils)" -#: ../src/common/config.py:108 +#: ../src/common/config.py:109 msgid "" "Character to add after nickname when using nick completion (tab) in group " "chat." @@ -5488,7 +5834,7 @@ "Znak za dodavanje nakon nadimka pri korištenju završavanja nadimka (tipka " "tab) u grupnom razgovoru" -#: ../src/common/config.py:109 +#: ../src/common/config.py:110 msgid "" "Character to propose to add after desired nickname when desired nickname is " "used by someone else in group chat." @@ -5496,6 +5842,25 @@ "Znak koji treba pokušati dodati željenom nadimku ukoliko netko u grupnom " "razgovoru već koristi željeni nadimak" +#: ../src/common/config.py:133 +msgid "" +"This option let you customize timestamp that is printed in conversation. For " +"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on " +"strftime for full documentation: http://docs.python.org/lib/module-time.html" +msgstr "" +"Ova postavka omogućava prilagođavanje vremenske oznake koja se ispisuje u " +"razgovorima. Na primjer \"[%H:%M] \" će prikazati \"[hour:minute] \". " +"Pogledati python dokumentaciju za strftime za kompletan opis: http://docs." +"python.org/lib/module-time.html" + +#: ../src/common/config.py:134 +msgid "Characters that are printed before the nickname in conversations" +msgstr "Znakovi koji se ispisuju ispred nadimka u razgovorima" + +#: ../src/common/config.py:135 +msgid "Characters that are printed after the nickname in conversations" +msgstr "Znakovi koji se ispisuju nakon nadimka u razgovorima" + #: ../src/common/config.py:142 msgid "Add * and [n] in roster title?" msgstr "Dodaj * i [n] u naslov liste?" @@ -5593,11 +5958,11 @@ #: ../src/common/config.py:164 msgid "" -"Overrides the host we send for File Transfer in case of address translation/" -"port forwarding." +"Comma separated list of hosts that we send, in addition of local interfaces, " +"for File Transfer in case of address translation/port forwarding." msgstr "" -"Prepisuje poslužitelja kojega koristimo za prijenos datoteka u slučaju " -"prosljeđivanja" +"Lista računala odvojenih zarezom koje šaljemo, kao dodatak lokalnim " +"sučeljima, za prijenos datoteka u slučaju prosljeđivanja." #: ../src/common/config.py:166 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes." @@ -5617,7 +5982,7 @@ #: ../src/common/config.py:176 msgid "Show close button in tab?" -msgstr "Prikaži dugme za zatvaranje u tabu?" +msgstr "Prikaži gumb za zatvaranje u tabu?" #: ../src/common/config.py:189 msgid "" @@ -5627,26 +5992,35 @@ "razgovorima." #: ../src/common/config.py:190 +msgid "If True, autojoined bookmarked rooms will be minimized on startup." +msgstr "" +"Ako je Istinito, označene sobe kojima se automatski pristupa će biti " +"minimizirane pri pokretanju." + +#: ../src/common/config.py:191 msgid "" "If True, quits Gajim when X button of Window Manager is clicked. This " "setting is taken into account only if trayicon is used." msgstr "" -"Ako je Istinito, Gajim se završava kad je pritisnuto X dugme. Ova postavka " -"je upotrebljena samo ako je trayicon u upotrebi." +"Ako je Istinito, Gajim se završava kad je pritisnut X gumb. Ova postavka je " +"upotrebljena samo ako je \"trayicon\" u upotrebi." -#: ../src/common/config.py:191 -msgid "If True, Gajim registers for xmpp:// on each startup." -msgstr "Ako je Istinito, Gajim registrira za xmpp:// pri svakom pokretanju." - #: ../src/common/config.py:192 msgid "" +"If True, Gajim will check if it's the default jabber client on each startup." +msgstr "" +"Ako je Istinito, Gajim će provjeriti da li je zadani jabber klijent pri " +"svakom pokretanju." + +#: ../src/common/config.py:193 +msgid "" "If True, Gajim will display an icon on each tab containing unread messages. " "Depending on the theme, this icon may be animated." msgstr "" "Ako je Istinito, Gajim će prikazvati ikonu na svakom tabu koji sadrži " "nepročitane poruke. Ovisno o temi, ikona može biti i animirana." -#: ../src/common/config.py:193 +#: ../src/common/config.py:194 msgid "" "If True, Gajim will display the status message, if not empty, for every " "contact under the contact name in roster window." @@ -5654,7 +6028,7 @@ "Ako je Istinito, Gajim će prikazivati statusnu poruku, ako nije prazna, za " "svaki kontakt pod imenom kontakta na listi." -#: ../src/common/config.py:195 +#: ../src/common/config.py:196 msgid "" "If True, Gajim will ask for avatar each contact that did not have an avatar " "last time or has one cached that is too old." @@ -5662,7 +6036,7 @@ "Ako je Istinito, će Gajim poslati upit za avatar svaki kontakt, koji nije " "imao avatar ili je onaj u memoriji prestar" -#: ../src/common/config.py:196 +#: ../src/common/config.py:197 msgid "" "If False, Gajim will no longer print status line in chats when a contact " "changes his or her status and/or his or her status message." @@ -5670,12 +6044,12 @@ "Ako je Neistinito, više nećete vidjeti statusnu poruku u razgovorima, kada " "kontakt promjeni svoj status i/ili statusnu poruku." -#: ../src/common/config.py:197 +#: ../src/common/config.py:198 msgid "" "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no " "longer print status line in groupchats when a member changes his or her " "status and/or his or her status message. If \"all\" Gajim will print all " -"status messages. If \"in_and_out\", gajim will only print FOO enters/leaves " +"status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves " "group chat." msgstr "" "može biti \"ništa\", \"sve\" ili \"ulaz_i_izlaz\". Ako je \"ništa\", Gajim " @@ -5684,29 +6058,29 @@ "prikazivati sve statusne poruke. Ako je \"ulaz_i_izlaz\" Gajim će " "prikazivati samo poruke tipa FOO je ušao/izašao u/iz sobe" -#: ../src/common/config.py:199 +#: ../src/common/config.py:200 msgid "Background color of contacts when they just signed in." msgstr "Boja pozadine kontakata kada su se upravo prijavili." -#: ../src/common/config.py:200 +#: ../src/common/config.py:201 msgid "Background color of contacts when they just signed out." msgstr "Boja pozadine kontakata kada su se upravo odjavili." -#: ../src/common/config.py:202 +#: ../src/common/config.py:203 msgid "" "If True, restored messages will use a smaller font than the default one." msgstr "" "Ako je Istinito, vraćene poruke će koristiti manji font od pretpostavljenog." -#: ../src/common/config.py:203 +#: ../src/common/config.py:204 msgid "Don't show avatar for the transport itself." msgstr "Ne prikazuj avatar za sam transport." -#: ../src/common/config.py:204 +#: ../src/common/config.py:205 msgid "Don't show roster in the system taskbar." msgstr "Ne prikazuj listu kontakata u programskoj traci." -#: ../src/common/config.py:205 +#: ../src/common/config.py:206 msgid "" "If True and installed GTK+ and PyGTK versions are at least 2.8, make the " "window flash (the default behaviour in most Window Managers) when holding " @@ -5716,7 +6090,7 @@ "prozor bljeska (pretpostavljeno ponašanje u većini Upravitelja Prozorima) " "pri novim događajima." -#: ../src/common/config.py:207 +#: ../src/common/config.py:208 msgid "" "Jabberd1.4 does not like sha info when one join a password protected group " "chat. Turn this option to False to stop sending sha info in group chat " @@ -5727,7 +6101,7 @@ "grupnim razgovorima" #. always, never, peracct, pertype should not be translated -#: ../src/common/config.py:210 +#: ../src/common/config.py:211 msgid "" "Controls the window where new messages are placed.\n" "'always' - All messages are sent to a single window.\n" @@ -5745,35 +6119,35 @@ "svoj prozor. Promjena ove opcije zahtijeva ponovno pokretanje Gajima kako bi " "se promjene primjenile." -#: ../src/common/config.py:211 +#: ../src/common/config.py:212 msgid "If False, you will no longer see the avatar in the chat window." msgstr "Ako je Neistinito, nećete više vidjeti avatar u prozoru razgovora." -#: ../src/common/config.py:212 +#: ../src/common/config.py:213 msgid "If True, pressing the escape key closes a tab/window." msgstr "Ako je Istinito, pritisak na 'esc' tipku zatvara tab/prozor." -#: ../src/common/config.py:213 +#: ../src/common/config.py:214 msgid "Hides the buttons in group chat window." msgstr "Skriva dugmad u prozoru grupnog razgovora." -#: ../src/common/config.py:214 +#: ../src/common/config.py:215 msgid "Hides the buttons in two persons chat window." -msgstr "Skriva dugme u prozoru razgovora dviju osoba." +msgstr "Skriva gumbe u prozoru razgovora dviju osoba." -#: ../src/common/config.py:215 +#: ../src/common/config.py:216 msgid "Hides the banner in a group chat window" msgstr "Sakrije baner u prozoru grupnog razgovora" -#: ../src/common/config.py:216 +#: ../src/common/config.py:217 msgid "Hides the banner in two persons chat window" msgstr "Sakrije baner u prozoru razgovora dviju osoba" -#: ../src/common/config.py:217 +#: ../src/common/config.py:218 msgid "Hides the group chat occupants list in group chat window." msgstr "Skriva listu učesnika u prozoru grupnog razgovora." -#: ../src/common/config.py:218 +#: ../src/common/config.py:219 msgid "" "In a chat, show the nickname at the beginning of a line only when it's not " "the same person talking than in previous message." @@ -5781,20 +6155,20 @@ "U razgovoru, prikaži nadimak na početku reda samo kada se ne radi o istoj " "osobi koja je pričala i u prošloj poruci." -#: ../src/common/config.py:219 -msgid "Indentation when using merge consecutive nickame." -msgstr "Uvlačenje pri korištenju spajanja toka po nadimcima." +#: ../src/common/config.py:220 +msgid "Indentation when using merge consecutive nickname." +msgstr "Indentacija kod korištenja nadimaka koji se uzastopno pojavljuju." -#: ../src/common/config.py:220 +#: ../src/common/config.py:221 msgid "List of colors that will be used to color nicknames in group chats." msgstr "" "Lista boja koje će biti korištene za bojanje nadimaka u grupnim razgovorima." -#: ../src/common/config.py:221 +#: ../src/common/config.py:222 msgid "Ctrl-Tab go to next composing tab when none is unread." msgstr "Ctrl-Tab idi na sljedeći tab kada nema nepročitanih." -#: ../src/common/config.py:222 +#: ../src/common/config.py:223 msgid "" "Should we show the confirm metacontacts creation dialog or not? Empty string " "means we never show the dialog." @@ -5802,19 +6176,64 @@ "Trebamo li prikazati upit za potvrdu stvaranja metakontakata ili ne? Prazan " "niz znači da nikada ne prikazujemo upit." -#: ../src/common/config.py:223 +#: ../src/common/config.py:224 msgid "" "If True, you will be able to set a negative priority to your account in " -"account modification window. BE CAREFULL, when you are logged in with a " +"account modification window. BE CAREFUL, when you are logged in with a " "negative priority, you will NOT receive any message from your server." msgstr "" "Ako je Istinito, biti ćete u mogućnosti postaviti negativni prioritet na vaš " "račun u prozoru za izmjenu postavki računa. BUDITE OPREZNI, kada ste " -"prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke od " +"prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke sa vašeg " "poslužitelja." -#: ../src/common/config.py:234 +#: ../src/common/config.py:225 msgid "" +"If True, Gajim will use Gnome Keyring (if available) to store account " +"passwords." +msgstr "" +"Ako je Istinito, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi " +"pohranio lozinke računa." + +#: ../src/common/config.py:226 +msgid "" +"If True, Gajim will show number of online and total contacts in account and " +"group rows." +msgstr "" +"Ako je Istinito, Gajim će prikazivati broj prisutnih i ukupnih kontakata u " +"redovima za račune i grupe." + +#: ../src/common/config.py:227 +msgid "" +"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages " +"as if they were of this type" +msgstr "" +"Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretiraj sve dolazne " +"poruke kao da su izabrane vrste" + +#: ../src/common/config.py:228 +msgid "" +"If True, Gajim will scroll and select the contact who sent you the last " +"message, if chat window is not already opened." +msgstr "" +"Ako je Istinito, Gajim će otklizati i izabrati izabrati kontakt koji vam je " +"poslao posljednju poruku, ako prozor s razgovorom već nije otvoren." + +#: ../src/common/config.py:229 +msgid "" +"If True, Gajim will convert string between $$ and $$ to an image using dvips " +"and convert before insterting it in chat window." +msgstr "" +"Ako je Istinito, Gajim će pretvoriti frazu između $$ i $$ u sliku koristeći " +"dvips i pretvoriti prije ubacivanja u prozor s razgovorom." + +#: ../src/common/config.py:230 +msgid "Time of inactivity needed before the change status window closes down." +msgstr "" +"Vrijeme neaktivnosti potrebno da bi se prozor za promjenu statusa zatvorio." + +#: ../src/common/config.py:241 +msgid "" "Priority will change automatically according to your status. Priorities are " "defined in autopriority_* options." msgstr "" @@ -5822,11 +6241,11 @@ "definirani u autopriority_* opcijama." #. yes, no, ask -#: ../src/common/config.py:263 +#: ../src/common/config.py:270 msgid "Jabberd2 workaround" msgstr "Jabberd2 workaround" -#: ../src/common/config.py:267 +#: ../src/common/config.py:274 msgid "" "If checked, Gajim will use your IP and proxies defined in " "file_transfer_proxies option for file transfer." @@ -5834,101 +6253,101 @@ "Ako je označeno, Gajim če koristiti vašu IP adresu i proxy koji je definiran " "u file_transfer_proxies opcijama za prijenos." -#: ../src/common/config.py:326 +#: ../src/common/config.py:333 msgid "Is OpenPGP enabled for this contact?" msgstr "Je li OpenPGP omogućen za ovog kontakta?" -#: ../src/common/config.py:327 ../src/common/config.py:330 +#: ../src/common/config.py:334 ../src/common/config.py:337 msgid "Language for which we want to check misspelled words" msgstr "Jezik u kojem želimo provjeriti krivo napisane riječi" -#: ../src/common/config.py:336 +#: ../src/common/config.py:343 msgid "all or space separated status" msgstr "sve ili razmakom odvojen status" -#: ../src/common/config.py:337 +#: ../src/common/config.py:344 msgid "'yes', 'no', or 'both'" msgstr "'da', 'ne', ili 'oboje'" -#: ../src/common/config.py:338 ../src/common/config.py:340 -#: ../src/common/config.py:341 ../src/common/config.py:344 -#: ../src/common/config.py:345 +#: ../src/common/config.py:345 ../src/common/config.py:347 +#: ../src/common/config.py:348 ../src/common/config.py:351 +#: ../src/common/config.py:352 msgid "'yes', 'no' or ''" msgstr "'da', 'ne' ili ''" -#: ../src/common/config.py:351 +#: ../src/common/config.py:358 msgid "Sleeping" msgstr "Spavam" -#: ../src/common/config.py:352 +#: ../src/common/config.py:359 msgid "Back soon" msgstr "Vraćam se ubrzo" -#: ../src/common/config.py:352 +#: ../src/common/config.py:359 msgid "Back in some minutes." msgstr "Vraćam se za nekoliko minuta." -#: ../src/common/config.py:353 +#: ../src/common/config.py:360 msgid "Eating" msgstr "Jedem" -#: ../src/common/config.py:353 +#: ../src/common/config.py:360 msgid "I'm eating, so leave me a message." msgstr "Jedem, ostavite mi poruku." -#: ../src/common/config.py:354 +#: ../src/common/config.py:361 msgid "Movie" msgstr "Film" -#: ../src/common/config.py:354 +#: ../src/common/config.py:361 msgid "I'm watching a movie." msgstr "Gledam film." -#: ../src/common/config.py:355 +#: ../src/common/config.py:362 msgid "Working" msgstr "Radim." -#: ../src/common/config.py:355 +#: ../src/common/config.py:362 msgid "I'm working." msgstr "Radim." -#: ../src/common/config.py:356 +#: ../src/common/config.py:363 msgid "Phone" msgstr "Telefon" -#: ../src/common/config.py:356 +#: ../src/common/config.py:363 msgid "I'm on the phone." msgstr "Telefoniram." -#: ../src/common/config.py:357 +#: ../src/common/config.py:364 msgid "Out" msgstr "Vani" -#: ../src/common/config.py:357 +#: ../src/common/config.py:364 msgid "I'm out enjoying life." msgstr "Vani uživam život." -#: ../src/common/config.py:361 +#: ../src/common/config.py:368 msgid "I'm available." msgstr "Dostupan sam." -#: ../src/common/config.py:362 +#: ../src/common/config.py:369 msgid "I'm free for chat." msgstr "Slobodan sam za razgovor." -#: ../src/common/config.py:364 +#: ../src/common/config.py:371 msgid "I'm not available." msgstr "Nedostupan sam." -#: ../src/common/config.py:365 +#: ../src/common/config.py:372 msgid "Do not disturb." -msgstr "Ne smetaj." +msgstr "Ne uznemiravaj." -#: ../src/common/config.py:366 ../src/common/config.py:367 +#: ../src/common/config.py:373 ../src/common/config.py:374 msgid "Bye!" msgstr "Pozdrav!" -#: ../src/common/config.py:376 +#: ../src/common/config.py:383 msgid "" "Sound to play when a group chat message contains one of the words in " "muc_highlight_words, or when a group chat message contains your nickname." @@ -5937,23 +6356,23 @@ "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš " "nadimak." -#: ../src/common/config.py:377 +#: ../src/common/config.py:384 msgid "Sound to play when any MUC message arrives." msgstr "Zvuk koji će svirati kada stigne neka MUC poruka." -#: ../src/common/config.py:386 ../src/common/optparser.py:197 +#: ../src/common/config.py:393 ../src/common/optparser.py:195 msgid "green" msgstr "zelena" -#: ../src/common/config.py:390 ../src/common/optparser.py:183 +#: ../src/common/config.py:397 ../src/common/optparser.py:181 msgid "grocery" msgstr "namirnice" -#: ../src/common/config.py:394 +#: ../src/common/config.py:401 msgid "human" msgstr "ljudska" -#: ../src/common/config.py:398 +#: ../src/common/config.py:405 msgid "marine" msgstr "morska" @@ -5962,26 +6381,32 @@ msgid "Unable to load idle module" msgstr "Nije moguće učitati modul idle" -#: ../src/common/connection_handlers.py:177 -#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233 +#: ../src/common/connection_handlers.py:180 +#: ../src/common/connection_handlers.py:215 +#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236 msgid "Wrong host" msgstr "Krivi domaćin" -#: ../src/common/connection_handlers.py:177 -#: ../src/common/zeroconf/connection_handlers_zeroconf.py:233 +#: ../src/common/connection_handlers.py:180 +#: ../src/common/zeroconf/connection_handlers_zeroconf.py:236 +#, python-format msgid "" -"The host you configured as the ft_override_host_to_send advanced option is " +"The host %s you configured as the ft_add_hosts_to_send advanced option is " "not valid, so ignored." msgstr "" -"Domaćin koji ste postavili kao ft_override_host_to_send naprednu opciju nije " -"ispravan, time ignoriran." +"Domaćin %s koji ste postavili kao ft_add_hosts_to_send naprednu opciju nije " +"ispravan, biti će ignoriran." -#: ../src/common/connection_handlers.py:590 +#: ../src/common/connection_handlers.py:216 +msgid "Invalid local address? :-O" +msgstr "Neispravna lokalna adresa? :-O" + +#: ../src/common/connection_handlers.py:607 #, python-format msgid "Registration information for transport %s has not arrived in time" msgstr "Registracijske informacije za transport %s nisu došle na vrijeme" -#: ../src/common/connection_handlers.py:1523 +#: ../src/common/connection_handlers.py:1573 #, python-format msgid "Nickname not allowed: %s" msgstr "Nedozvoljeni nadimak: %s " @@ -5989,41 +6414,41 @@ #. password required to join #. we are banned #. group chat does not exist -#: ../src/common/connection_handlers.py:1585 -#: ../src/common/connection_handlers.py:1588 -#: ../src/common/connection_handlers.py:1591 -#: ../src/common/connection_handlers.py:1594 -#: ../src/common/connection_handlers.py:1597 -#: ../src/common/connection_handlers.py:1600 -#: ../src/common/connection_handlers.py:1608 +#: ../src/common/connection_handlers.py:1640 +#: ../src/common/connection_handlers.py:1643 +#: ../src/common/connection_handlers.py:1646 +#: ../src/common/connection_handlers.py:1649 +#: ../src/common/connection_handlers.py:1652 +#: ../src/common/connection_handlers.py:1655 +#: ../src/common/connection_handlers.py:1663 msgid "Unable to join group chat" msgstr "Nije moguće pridružiti se grupnom razgovoru" -#: ../src/common/connection_handlers.py:1586 +#: ../src/common/connection_handlers.py:1641 msgid "A password is required to join this group chat." msgstr "Potrebna je lozinka za pridruživanje ovom grupnom razgovoru." -#: ../src/common/connection_handlers.py:1589 +#: ../src/common/connection_handlers.py:1644 msgid "You are banned from this group chat." msgstr "Zabranjen vam je pristup ovom grupnom razgovoru." -#: ../src/common/connection_handlers.py:1592 +#: ../src/common/connection_handlers.py:1647 msgid "Such group chat does not exist." msgstr "Takav grupni razgovor ne postoji." -#: ../src/common/connection_handlers.py:1595 +#: ../src/common/connection_handlers.py:1650 msgid "Group chat creation is restricted." msgstr "Stvaranje grupnih razgovora je ograničeno." -#: ../src/common/connection_handlers.py:1598 +#: ../src/common/connection_handlers.py:1653 msgid "Your registered nickname must be used." msgstr "Morate koristiti vaš registrirani nadimak." -#: ../src/common/connection_handlers.py:1601 +#: ../src/common/connection_handlers.py:1656 msgid "You are not in the members list." msgstr "Niste u listi članova." -#: ../src/common/connection_handlers.py:1609 +#: ../src/common/connection_handlers.py:1664 msgid "" "Your desired nickname is in use or registered by another occupant.\n" "Please specify another nickname below:" @@ -6032,27 +6457,38 @@ "od učesnika.\n" "Molimo niže odredite drugi nadimak:" -#: ../src/common/connection_handlers.py:1659 +#. Room has been destroyed. see +#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom +#: ../src/common/connection_handlers.py:1692 +msgid "Room has been destroyed" +msgstr "Soba je uništena" + +#: ../src/common/connection_handlers.py:1699 +#, python-format +msgid "You can join this room instead: %s" +msgstr "Možete se pridružiti ovoj sobi umjesto: %s" + +#: ../src/common/connection_handlers.py:1726 msgid "I would like to add you to my roster." msgstr "Želio bih te dodati na moju listu kontakata." #. BE CAREFUL: no con.updateRosterItem() in a callback -#: ../src/common/connection_handlers.py:1680 +#: ../src/common/connection_handlers.py:1747 #, python-format msgid "we are now subscribed to %s" msgstr "sada smo pretplaćeni na %s" -#: ../src/common/connection_handlers.py:1682 +#: ../src/common/connection_handlers.py:1749 #, python-format msgid "unsubscribe request from %s" msgstr "Zahtjev za ukidanjem pretplate od %s" -#: ../src/common/connection_handlers.py:1684 +#: ../src/common/connection_handlers.py:1751 #, python-format msgid "we are now unsubscribed from %s" msgstr "sada smo ukinuli pretplatu za %s" -#: ../src/common/connection_handlers.py:1854 +#: ../src/common/connection_handlers.py:1870 #, python-format msgid "" "JID %s is not RFC compliant. It will not be added to your roster. Use roster " @@ -6062,79 +6498,112 @@ "Upotrijebite alate za upravljanje listom kontakata kao što je http://jru." "jabberstudio.org/ za uklanjanje" -#: ../src/common/connection.py:175 -#: ../src/common/zeroconf/connection_zeroconf.py:196 +#: ../src/common/connection.py:197 +#: ../src/common/zeroconf/connection_zeroconf.py:202 #, python-format msgid "Connection with account \"%s\" has been lost" msgstr "Veza sa računom \"%s\" je izgubljena" -#: ../src/common/connection.py:176 +#: ../src/common/connection.py:198 msgid "Reconnect manually." msgstr "Ponovo se spojite ručno." -#: ../src/common/connection.py:187 ../src/common/connection.py:214 -#, python-format -msgid "Transport %s answered wrongly to register request: %s" +#: ../src/common/connection.py:209 +#, fuzzy, python-format +msgid "Server %s answered wrongly to register request: %s" msgstr "Prijenos %s je krivo odgovorio na poziv za registraciju: %s" #. wrong answer -#: ../src/common/connection.py:213 +#: ../src/common/connection.py:220 msgid "Invalid answer" msgstr "Nepravilan odgovor" -#: ../src/common/connection.py:405 ../src/common/connection.py:440 -#: ../src/common/connection.py:889 -#: ../src/common/zeroconf/connection_zeroconf.py:217 +#: ../src/common/connection.py:221 #, python-format +msgid "Transport %s answered wrongly to register request: %s" +msgstr "Prijenos %s je krivo odgovorio na poziv za registraciju: %s" + +#: ../src/common/connection.py:368 +msgid "Connection to proxy failed" +msgstr "Veza na proxy nije uspjela" + +#: ../src/common/connection.py:422 ../src/common/connection.py:520 +#: ../src/common/connection.py:1051 +#: ../src/common/zeroconf/connection_zeroconf.py:236 +#, python-format msgid "Could not connect to \"%s\"" msgstr "Nije moguća veza sa \"%s\"" -#: ../src/common/connection.py:419 +#: ../src/common/connection.py:436 #, python-format msgid "Connected to server %s:%s with %s" msgstr "Povezan na poslužitelj %s:%s sa %s" -#: ../src/common/connection.py:441 +#: ../src/common/connection.py:449 +#, python-format +msgid "Security error connecting to \"%s\"" +msgstr "Sigurnosna greška prilikom spajanja na \"%s\"" + +#: ../src/common/connection.py:450 +msgid "" +"The server's key has changed, or someone is trying to hack your connection." +msgstr "Ključ servera se promjenio, ili netko pokušava prtljati po vašoj vezi." + +#: ../src/common/connection.py:457 +#, python-format +msgid "Unable to check fingerprint for %s. Connection could be insecure." +msgstr "Nemoguće provjeriti potpis za %s. Veza može biti nesigurna." + +#: ../src/common/connection.py:499 +#, python-format +msgid "Missing fingerprint in SSL connection to %s" +msgstr "Nedostaje potpis u SSL vezi do %s" + +#: ../src/common/connection.py:505 +#, python-format +msgid "Fingerprint mismatch for %s: Got %s, expected %s" +msgstr "Potpis se ne slaže za %s: Dobiveno %s, očekivano %s" + +#: ../src/common/connection.py:521 msgid "Check your connection or try again later" msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije" -#: ../src/common/connection.py:467 +#: ../src/common/connection.py:547 #, python-format msgid "Authentication failed with \"%s\"" msgstr "Autentifikacija sa \"%s\" nije uspjela" -#: ../src/common/connection.py:468 +#: ../src/common/connection.py:548 msgid "Please check your login and password for correctness." msgstr "Molimo vas da provjerite korisničko ime i lozinku za greške." +#: ../src/common/connection.py:591 +msgid "Error while removing privacy list" +msgstr "Greška prilikom brisanja liste privatnosti" + +#: ../src/common/connection.py:592 +#, python-format +msgid "" +"Privacy list %s has not been removed. It is maybe active in one of your " +"connected resources. Deactivate it and try again." +msgstr "" +"Lista privatnosti %s nije uklonjena. Možda je aktivna u nekom od vaših " +"spojenih resursa. Obustavite ju i pokušajte ponovno." + #. We didn't set a passphrase -#: ../src/common/connection.py:585 -#: ../src/common/zeroconf/connection_zeroconf.py:156 +#: ../src/common/connection.py:690 +#: ../src/common/zeroconf/connection_zeroconf.py:162 msgid "OpenPGP passphrase was not given" msgstr "Lozinka za OpenPGP nije unešena" -#. do not show I'm invisible! -#: ../src/common/connection.py:627 -msgid "invisible" -msgstr "nevidljiv" - -#: ../src/common/connection.py:628 -msgid "offline" -msgstr "odspojen" - -#: ../src/common/connection.py:629 -#, python-format -msgid "I'm %s" -msgstr "Ja sam %s" - #. we're not english #. one in locale and one en -#: ../src/common/connection.py:720 +#: ../src/common/connection.py:847 msgid "[This message is *encrypted* (See :JEP:`27`]" msgstr "[Ova poruka je *kriptirana* (Vidi :JEP:`27`]" -#: ../src/common/connection.py:776 -#: ../src/common/zeroconf/connection_zeroconf.py:397 +#: ../src/common/connection.py:903 +#: ../src/common/zeroconf/connection_zeroconf.py:421 #, python-format msgid "" "Subject: %s\n" @@ -6143,10 +6612,14 @@ "Tema: %s\n" "%s" -#: ../src/common/connection.py:915 +#: ../src/common/connection.py:1075 msgid "Not fetched because of invisible status" msgstr "Nije dohvaćeno zbog statusa nevidljivosti" +#: ../src/common/contacts.py:279 +msgid "Not in roster" +msgstr "Nije na Listi Kontakata" + #. only say that to non Windows users #: ../src/common/dbus_support.py:33 msgid "D-Bus python bindings are missing in this computer" @@ -6228,391 +6701,391 @@ #. Strings to use for the output. %0 will be replaced with the preceding hour (e.g. "x PAST %0"), %1 with the coming hour (e.g. "x TO %1). ''' #. A "singular-form". It is used when talking about hour 0 #: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55 -msgid "%0 o'clock" -msgstr "%0 sati" +msgid "$0 o'clock" +msgstr "$0 sati" #: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55 -msgid "five past %0" -msgstr "pet poslije %0" +msgid "five past $0" +msgstr "pet poslije $0" -#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:56 -msgid "ten past %0" -msgstr "deset poslije %0" +#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56 +msgid "ten past $0" +msgstr "deset poslije $0" #: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56 -msgid "quarter past %0" -msgstr "četvrt poslije %0" +msgid "quarter past $0" +msgstr "četvrt poslije $0" -#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:57 -msgid "twenty past %0" -msgstr "dvadeset poslije %0" +#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57 +msgid "twenty past $0" +msgstr "dvadeset poslije $0" #: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57 -msgid "twenty five past %0" -msgstr "dvadeset pet poslije %0" +msgid "twenty five past $0" +msgstr "dvadeset pet poslije $0" -#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:58 -msgid "half past %0" -msgstr "%0 i pola" +#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58 +msgid "half past $0" +msgstr "$0 i pola" #: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58 -msgid "twenty five to %1" -msgstr "dvadeset i pet do %1" +msgid "twenty five to $1" +msgstr "dvadeset i pet do $1" -#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:59 -msgid "twenty to %1" -msgstr "dvadeset do %1" +#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59 +msgid "twenty to $1" +msgstr "dvadeset do $1" #: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59 -msgid "quarter to %1" -msgstr "četvrt do %1" +msgid "quarter to $1" +msgstr "četvrt do $1" -#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60 -msgid "ten to %1" -msgstr "deset do %1" +#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60 +msgid "ten to $1" +msgstr "deset do $1" -#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:60 -msgid "five to %1" -msgstr "pet do %1" - #: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60 -msgid "%1 o'clock" -msgstr "%1 sati" +msgid "five to $1" +msgstr "pet do $1" -#: ../src/common/fuzzyclock.py:62 +#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61 +msgid "$1 o'clock" +msgstr "$1 sati" + +#: ../src/common/fuzzyclock.py:64 msgid "Night" msgstr "Noć" -#: ../src/common/fuzzyclock.py:62 +#: ../src/common/fuzzyclock.py:64 msgid "Early morning" msgstr "Rano jutro" -#: ../src/common/fuzzyclock.py:62 +#: ../src/common/fuzzyclock.py:64 msgid "Morning" msgstr "Jutro" -#: ../src/common/fuzzyclock.py:62 +#: ../src/common/fuzzyclock.py:64 msgid "Almost noon" msgstr "Skoro podne" -#: ../src/common/fuzzyclock.py:63 +#: ../src/common/fuzzyclock.py:65 msgid "Noon" msgstr "Podne" -#: ../src/common/fuzzyclock.py:63 +#: ../src/common/fuzzyclock.py:65 msgid "Afternoon" msgstr "Poslijepodne" -#: ../src/common/fuzzyclock.py:63 +#: ../src/common/fuzzyclock.py:65 msgid "Evening" msgstr "Večer" -#: ../src/common/fuzzyclock.py:63 +#: ../src/common/fuzzyclock.py:65 msgid "Late evening" msgstr "Kasna večer" -#: ../src/common/fuzzyclock.py:65 +#: ../src/common/fuzzyclock.py:67 msgid "Start of week" msgstr "Početak tjedna" -#: ../src/common/fuzzyclock.py:65 +#: ../src/common/fuzzyclock.py:67 msgid "Middle of week" msgstr "Sredina tjedna" -#: ../src/common/fuzzyclock.py:65 +#: ../src/common/fuzzyclock.py:67 msgid "End of week" msgstr "Kraj tjedna" -#: ../src/common/fuzzyclock.py:66 +#: ../src/common/fuzzyclock.py:68 msgid "Weekend!" msgstr "Vikend!" -#: ../src/common/helpers.py:105 +#: ../src/common/helpers.py:114 msgid "Invalid character in username." msgstr "Neispravan znak u korisničkom imenu." -#: ../src/common/helpers.py:110 +#: ../src/common/helpers.py:119 msgid "Server address required." msgstr "Potrebna je adresa poslužitelja." -#: ../src/common/helpers.py:115 +#: ../src/common/helpers.py:124 msgid "Invalid character in hostname." msgstr "Neispravan znak u imenu računala." -#: ../src/common/helpers.py:121 +#: ../src/common/helpers.py:130 msgid "Invalid character in resource." msgstr "Neispravan znak u resursu." #. GiB means gibibyte -#: ../src/common/helpers.py:161 +#: ../src/common/helpers.py:170 #, python-format msgid "%s GiB" msgstr "%s GiB" #. GB means gigabyte -#: ../src/common/helpers.py:164 +#: ../src/common/helpers.py:173 #, python-format msgid "%s GB" msgstr "%s GB" #. MiB means mibibyte -#: ../src/common/helpers.py:168 +#: ../src/common/helpers.py:177 #, python-format msgid "%s MiB" msgstr "%s MiB" #. MB means megabyte -#: ../src/common/helpers.py:171 +#: ../src/common/helpers.py:180 #, python-format msgid "%s MB" msgstr "%s MB" #. KiB means kibibyte -#: ../src/common/helpers.py:175 +#: ../src/common/helpers.py:184 #, python-format msgid "%s KiB" msgstr "%s KiB" #. KB means kilo bytes -#: ../src/common/helpers.py:178 +#: ../src/common/helpers.py:187 #, python-format msgid "%s KB" msgstr "%s KB" #. B means bytes -#: ../src/common/helpers.py:181 +#: ../src/common/helpers.py:190 #, python-format msgid "%s B" msgstr "%s B" -#: ../src/common/helpers.py:210 +#: ../src/common/helpers.py:219 msgid "_Busy" -msgstr "_Zaposlen" +msgstr "_Zauzet" -#: ../src/common/helpers.py:212 +#: ../src/common/helpers.py:221 msgid "Busy" -msgstr "Zaposlen" +msgstr "Zauzet" -#: ../src/common/helpers.py:215 +#: ../src/common/helpers.py:224 msgid "_Not Available" msgstr "_Nedostupan" -#: ../src/common/helpers.py:220 +#: ../src/common/helpers.py:229 msgid "_Free for Chat" msgstr "_Slobodan za razgovor" -#: ../src/common/helpers.py:222 +#: ../src/common/helpers.py:231 msgid "Free for Chat" msgstr "Slobodan za razgovor" -#: ../src/common/helpers.py:225 +#: ../src/common/helpers.py:234 msgid "_Available" msgstr "_Dostupan" -#: ../src/common/helpers.py:227 +#: ../src/common/helpers.py:236 msgid "Available" msgstr "Dostupan" -#: ../src/common/helpers.py:229 +#: ../src/common/helpers.py:238 msgid "Connecting" msgstr "Povezujem" -#: ../src/common/helpers.py:232 +#: ../src/common/helpers.py:241 msgid "A_way" msgstr "O_dsutan" -#: ../src/common/helpers.py:237 +#: ../src/common/helpers.py:246 msgid "_Offline" msgstr "_Odspojen" -#: ../src/common/helpers.py:239 +#: ../src/common/helpers.py:248 msgid "Offline" msgstr "Odspojen" -#: ../src/common/helpers.py:242 +#: ../src/common/helpers.py:251 msgid "_Invisible" msgstr "_Nevidljiv" -#: ../src/common/helpers.py:248 +#: ../src/common/helpers.py:257 msgid "?contact has status:Unknown" msgstr "?kontakt ima status:Nepoznat" -#: ../src/common/helpers.py:250 +#: ../src/common/helpers.py:259 msgid "?contact has status:Has errors" msgstr "?kontakt ima status:Ima greške" -#: ../src/common/helpers.py:255 +#: ../src/common/helpers.py:264 msgid "?Subscription we already have:None" msgstr "?Pretplata koju već imamo:Ništa" -#: ../src/common/helpers.py:257 +#: ../src/common/helpers.py:266 msgid "To" msgstr "Za" -#: ../src/common/helpers.py:261 +#: ../src/common/helpers.py:270 msgid "Both" msgstr "Oboje" -#: ../src/common/helpers.py:269 +#: ../src/common/helpers.py:278 msgid "?Ask (for Subscription):None" msgstr "?Pitaj (za Pretplatu):Ništa" -#: ../src/common/helpers.py:271 +#: ../src/common/helpers.py:280 msgid "Subscribe" msgstr "Pretplatite se" -#: ../src/common/helpers.py:280 +#: ../src/common/helpers.py:289 msgid "?Group Chat Contact Role:None" msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva" -#: ../src/common/helpers.py:283 +#: ../src/common/helpers.py:292 msgid "Moderators" msgstr "Moderatori" -#: ../src/common/helpers.py:285 +#: ../src/common/helpers.py:294 msgid "Moderator" msgstr "Moderator" -#: ../src/common/helpers.py:288 +#: ../src/common/helpers.py:297 msgid "Participants" msgstr "Sudionici" -#: ../src/common/helpers.py:290 +#: ../src/common/helpers.py:299 msgid "Participant" msgstr "Sudionik" -#: ../src/common/helpers.py:293 +#: ../src/common/helpers.py:302 msgid "Visitors" msgstr "Posjetitelji" -#: ../src/common/helpers.py:295 +#: ../src/common/helpers.py:304 msgid "Visitor" msgstr "Posjetitelj" -#: ../src/common/helpers.py:301 +#: ../src/common/helpers.py:310 msgid "?Group Chat Contact Affiliation:None" msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva" -#: ../src/common/helpers.py:303 +#: ../src/common/helpers.py:312 msgid "Owner" msgstr "Vlasnik" -#: ../src/common/helpers.py:305 +#: ../src/common/helpers.py:314 msgid "Administrator" msgstr "Administrator" -#: ../src/common/helpers.py:307 +#: ../src/common/helpers.py:316 msgid "Member" msgstr "Član" -#: ../src/common/helpers.py:346 +#: ../src/common/helpers.py:355 msgid "is paying attention to the conversation" msgstr "obraća pažnju na razgovor" -#: ../src/common/helpers.py:348 +#: ../src/common/helpers.py:357 msgid "is doing something else" msgstr "radi nešto drugo" -#: ../src/common/helpers.py:350 +#: ../src/common/helpers.py:359 msgid "is composing a message..." msgstr "piše poruku..." -#. paused means he or she was compoing but has stopped for a while -#: ../src/common/helpers.py:353 +#. paused means he or she was composing but has stopped for a while +#: ../src/common/helpers.py:362 msgid "paused composing a message" msgstr "stanka pri pisanju poruke" -#: ../src/common/helpers.py:355 +#: ../src/common/helpers.py:364 msgid "has closed the chat window or tab" msgstr "je zatvorio/zatvorila prozor za razgovor" -#: ../src/common/helpers.py:881 +#: ../src/common/helpers.py:894 #, python-format msgid " %d unread message" msgid_plural " %d unread messages" msgstr[0] "%d nepročitana poruka" msgstr[1] "%d nepročitanih poruka" -#: ../src/common/helpers.py:887 +#: ../src/common/helpers.py:900 #, python-format msgid " %d unread single message" msgid_plural " %d unread single messages" msgstr[0] "%d nepročitana jedna poruka" msgstr[1] "%d nepročitanih jednih poruka" -#: ../src/common/helpers.py:893 +#: ../src/common/helpers.py:906 #, python-format msgid " %d unread group chat message" msgid_plural " %d unread group chat messages" msgstr[0] "%d nepročitana poruka grupnih razgovora" msgstr[1] "%d nepročitanih poruka grupnih razgovora" -#: ../src/common/helpers.py:899 +#: ../src/common/helpers.py:912 #, python-format msgid " %d unread private message" msgid_plural " %d unread private messages" msgstr[0] "Gajim - %d nepročitana privatna poruka" msgstr[1] "%d nepročitanih privatnih poruka" -#: ../src/common/helpers.py:909 ../src/common/helpers.py:911 +#: ../src/common/helpers.py:922 ../src/common/helpers.py:924 #, python-format msgid "Gajim - %s" msgstr "Gajim - %s" #. we talk about a file -#: ../src/common/optparser.py:60 +#: ../src/common/optparser.py:59 #, python-format msgid "error: cannot open %s for reading" msgstr "greška: nemogu otvoriti %s za čitanje" -#: ../src/common/optparser.py:183 +#: ../src/common/optparser.py:181 msgid "gtk+" msgstr "gtk+" -#: ../src/common/optparser.py:192 ../src/common/optparser.py:193 +#: ../src/common/optparser.py:190 ../src/common/optparser.py:191 msgid "cyan" msgstr "cijan" -#: ../src/common/optparser.py:302 -msgid "migrating logs database to indeces" +#: ../src/common/optparser.py:308 +msgid "migrating logs database to indices" msgstr "migriram bazu zabilješki u indekse" -#: ../src/common/passwords.py:86 +#: ../src/common/passwords.py:82 #, python-format msgid "Gajim account %s" msgstr "Gajim račun %s" -#: ../src/common/zeroconf/client_zeroconf.py:189 +#: ../src/common/zeroconf/client_zeroconf.py:187 msgid "" "Connection to host could not be established: Incorrect answer from server." msgstr "" "Vezu sa domaćinom nije moguće ostvariti: Neispravan odgovor od poslužitelja." -#: ../src/common/zeroconf/client_zeroconf.py:205 +#: ../src/common/zeroconf/client_zeroconf.py:213 msgid "Connection to host could not be established" msgstr "Vezu na domaćina nije moguće ostvariti" -#: ../src/common/zeroconf/client_zeroconf.py:334 +#: ../src/common/zeroconf/client_zeroconf.py:347 msgid "" "Connection to host could not be established: Timeout while sending data." msgstr "" "Vezu sa domaćinom nije moguće ostvariti: Isteklo vrijeme za slanja podataka." -#: ../src/common/zeroconf/client_zeroconf.py:629 +#: ../src/common/zeroconf/client_zeroconf.py:640 msgid "Contact is offline. Your message could not be sent." msgstr "Kontakt je odspojen. Vašu poruku nije moguće poslati." -#: ../src/common/zeroconf/connection_zeroconf.py:197 +#: ../src/common/zeroconf/connection_zeroconf.py:203 msgid "To continue sending and receiving messages, you will need to reconnect." msgstr "" "Ako želite nastaviti sa slanjem i primanjem poruka, morati će te se ponovno " "spojiti." -#: ../src/common/zeroconf/connection_zeroconf.py:207 +#: ../src/common/zeroconf/connection_zeroconf.py:226 msgid "Avahi error" msgstr "Avahi greška" -#: ../src/common/zeroconf/connection_zeroconf.py:207 +#: ../src/common/zeroconf/connection_zeroconf.py:226 #, python-format msgid "" "%s\n" @@ -6621,31 +7094,31 @@ "%s\n" "Poruke lokalne veze možda ne rade kako treba." -#: ../src/common/zeroconf/connection_zeroconf.py:218 +#: ../src/common/zeroconf/connection_zeroconf.py:237 msgid "Please check if Avahi is installed." msgstr "Molimo provjerite da je Avahi instaliran." -#: ../src/common/zeroconf/connection_zeroconf.py:227 -#: ../src/common/zeroconf/connection_zeroconf.py:231 +#: ../src/common/zeroconf/connection_zeroconf.py:246 +#: ../src/common/zeroconf/connection_zeroconf.py:250 msgid "Could not start local service" msgstr "Nije moguće pokrenuti lokalnu uslugu" -#: ../src/common/zeroconf/connection_zeroconf.py:228 +#: ../src/common/zeroconf/connection_zeroconf.py:247 #, python-format msgid "Unable to bind to port %d." msgstr "Nemoguće vezanje na port %d." -#: ../src/common/zeroconf/connection_zeroconf.py:232 -#: ../src/common/zeroconf/connection_zeroconf.py:325 +#: ../src/common/zeroconf/connection_zeroconf.py:251 +#: ../src/common/zeroconf/connection_zeroconf.py:345 msgid "Please check if avahi-daemon is running." msgstr "Molimo provjerite da li je avahi-daemon pokrenut." -#: ../src/common/zeroconf/connection_zeroconf.py:324 +#: ../src/common/zeroconf/connection_zeroconf.py:344 #, python-format msgid "Could not change status of account \"%s\"" msgstr "Nije moguće promjeniti status računa \"%s\"" -#: ../src/common/zeroconf/connection_zeroconf.py:341 +#: ../src/common/zeroconf/connection_zeroconf.py:361 msgid "" "You are not connected or not visible to others. Your message could not be " "sent." @@ -6653,7 +7126,7 @@ "Niste spojeni ili ste nevidljivi za druge. Vašu poruku nije moguće poslati." #. we're not english -#: ../src/common/zeroconf/connection_zeroconf.py:353 +#: ../src/common/zeroconf/connection_zeroconf.py:373 msgid "[This message is encrypted]" msgstr "[Ova poruka je kriptirana]" @@ -6662,81 +7135,14 @@ msgid "Error while adding service. %s" msgstr "Greška prilikom dodavanja usluge. %s" -#~ msgid "Add" -#~ msgstr "Dodaj" +#~ msgid "_Retype Password:" +#~ msgstr "_Ponovo utipkajte Password:" -#~ msgid "Away " -#~ msgstr "Odsutan" +#~ msgid "_Use proxy" +#~ msgstr "_Koristi proxy" -#~ msgid "Down" -#~ msgstr "Skidanje" +#~ msgid "_Occupant Actions" +#~ msgstr "_Akcije Prisutnih" -#~ msgid "List of special notifications settings" -#~ msgstr "Lista podešenja posebnih obavijesti" - -#~ msgid "Not Available " -#~ msgstr "Nedostupan" - -#~ msgid "Up" -#~ msgstr "Gore" - -#~ msgid "Create your own Privacy Lists" -#~ msgstr "Sami stvorite svoju vlasitu Listu Privatnosti" - -#~ msgid "Server-based Privacy Lists" -#~ msgstr "Liste Privatnosti ovisne o poslužitelju" - -#~ msgid "Contact _Info" -#~ msgstr "Kontakt _Info" - -#~ msgid "Jabber" -#~ msgstr "Jabber" - -#~ msgid "Invalid room or server name" -#~ msgstr "Neispravno ime sobe ili poslužitelja" - -#~ msgid "Unknown D-Bus version: %s" -#~ msgstr "Nepoznata verzija D-Busa: %s" - -#~ msgid "vCard publication succeeded" -#~ msgstr "Objava vCard uspješna" - -#~ msgid "Your personal information has been published successfully." -#~ msgstr "Vaši osobni podaci su uspješno objavljeni." - -#~ msgid "Migrating Logs..." -#~ msgstr "Selim Zapise..." - -#~ msgid "_Join New Room" -#~ msgstr "_Pridruživanje Novoj Sobi" - -#~ msgid "Gajim - %d unread message" -#~ msgid_plural "Gajim - %d unread messages" -#~ msgstr[0] "Gajim - %d nepročitana poruka" -#~ msgstr[1] "Gajim - %d nepročitanih poruka" -#~ msgstr[2] "" - -#~ msgid "Role: " -#~ msgstr "Uloga: " - -#~ msgid "Since %s" -#~ msgstr "Od %s" - -#~ msgid "Merge consecutive nickname in chat window" -#~ msgstr "Spajanje toka po nadimcima u prozoru razgovora" - -#~ msgid "" -#~ "Sound to play when any MUC message arrives. (This setting is taken into " -#~ "account only if notify_on_all_muc_messages is True)" -#~ msgstr "" -#~ "Zvuk koji će biti pušten kad je primljena neka MUC poruka. (Ova postavka " -#~ "je postavljena samo ako je notify_on_all_muc_messages Istinito)" - -#~ msgid "Automatically authorize contact" -#~ msgstr "Automatski autoriziraj kontakt" - -#~ msgid "Send File" -#~ msgstr "Pošalji Datoteku" - -#~ msgid "Underline" -#~ msgstr "Podcrtano" +#~ msgid "You must enter a password for the new account." +#~ msgstr "Morate unesti lozinku za novi račun"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits May 2007