gtranslator r3904 - in trunk: . plugins/open-tran plugins/source-code-view plugins/subversion src src/dialogs
- From: psanxiao svn gnome org
- To: svn-commits-list gnome org
- Subject: gtranslator r3904 - in trunk: . plugins/open-tran plugins/source-code-view plugins/subversion src src/dialogs
- Date: Tue, 30 Dec 2008 19:04:44 +0000 (UTC)
Author: psanxiao
Date: Tue Dec 30 19:04:44 2008
New Revision: 3904
URL: http://svn.gnome.org/viewvc/gtranslator?rev=3904&view=rev
Log:
* plugins/open-tran/open-tran-dialog.glade:
* plugins/source-code-view/source-code-view-dialog.glade:
* plugins/subversion/subversion.glade:
* plugins/subversion/svn-command.c:
* src/context.c:
* src/dialogs/preferences-dialog.glade:
Removed trailing spaces. (Fixes bug #565817)
Modified:
trunk/ChangeLog
trunk/plugins/open-tran/open-tran-dialog.glade
trunk/plugins/source-code-view/source-code-view-dialog.glade
trunk/plugins/subversion/subversion.glade
trunk/plugins/subversion/svn-command.c
trunk/src/context.c
trunk/src/dialogs/preferences-dialog.glade
Modified: trunk/plugins/open-tran/open-tran-dialog.glade
==============================================================================
--- trunk/plugins/open-tran/open-tran-dialog.glade (original)
+++ trunk/plugins/open-tran/open-tran-dialog.glade Tue Dec 30 19:04:44 2008
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.1 on Tue Feb 5 12:08:42 2008 -->
+<?xml version="1.0"?>
<glade-interface>
+ <requires-version lib="gtk+" version="2.12"/>
<widget class="GtkDialog" id="dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
@@ -42,7 +41,7 @@
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">6</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -85,7 +84,7 @@
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -123,7 +122,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="no">gtk-cancel</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="response_id">-6</property>
</widget>
@@ -134,7 +133,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="no">gtk-ok</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="response_id">-5</property>
</widget>
Modified: trunk/plugins/source-code-view/source-code-view-dialog.glade
==============================================================================
--- trunk/plugins/source-code-view/source-code-view-dialog.glade (original)
+++ trunk/plugins/source-code-view/source-code-view-dialog.glade Tue Dec 30 19:04:44 2008
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Jun 30 12:37:34 2008 -->
+<?xml version="1.0"?>
<glade-interface>
+ <requires-version lib="gtk+" version="2.12"/>
<widget class="GtkDialog" id="dialog">
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
@@ -54,7 +53,7 @@
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">6</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -98,7 +97,7 @@
<widget class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -143,7 +142,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="no">gtk-cancel</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="response_id">-6</property>
</widget>
@@ -154,7 +153,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="no">gtk-ok</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="response_id">-5</property>
</widget>
Modified: trunk/plugins/subversion/subversion.glade
==============================================================================
--- trunk/plugins/subversion/subversion.glade (original)
+++ trunk/plugins/subversion/subversion.glade Tue Dec 30 19:04:44 2008
@@ -1,65 +1,45 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Sun Dec 28 18:30:09 2008 -->
+<?xml version="1.0"?>
<glade-interface>
- <widget class="GtkDialog" id="svn_user_auth">
+ <requires-version lib="gtk+" version="2.12"/>
+ <widget class="GtkDialog" id="checkout_dialog">
<property name="border_width">5</property>
- <property name="title" translatable="yes">Repository authorization</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
+ <widget class="GtkVBox" id="dialog-vbox7">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <widget class="GtkVBox" id="checkout_main_box">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox1">
+ <widget class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"><b>Realm:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="auth_realm">
- <property name="visible">True</property>
- <property name="label">Realm</property>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Directory to checkout:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox2">
+ <widget class="GtkHBox" id="hbox18">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label3">
+ <widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Username:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">4</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="username_entry">
+ <widget class="GtkEntry" id="path_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
@@ -67,6 +47,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <widget class="GtkButton" id="dir_find_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label">gtk-find</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
@@ -74,23 +68,34 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox3">
+ <widget class="GtkLabel" id="label29">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Subversion URL:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox20">
<property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkLabel" id="label30">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Password:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="password_entry">
+ <widget class="GtkEntry" id="url_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="tooltip_text">svn+ssh://[login ]svn gnome org/svn/[module]/trunk</property>
</widget>
<packing>
<property name="position">1</property>
@@ -99,23 +104,46 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox4">
+ <widget class="GtkLabel" id="label27">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Information:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox19">
<property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <placeholder/>
+ <widget class="GtkLabel" id="label28">
+ <property name="visible">True</property>
+ <property name="xpad">8</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
</child>
<child>
- <widget class="GtkCheckButton" id="remember_pwd">
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Remember Password</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTreeView" id="checkout_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="position">1</property>
@@ -123,8 +151,7 @@
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">3</property>
+ <property name="position">5</property>
</packing>
</child>
</widget>
@@ -133,27 +160,27 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <widget class="GtkHButtonBox" id="dialog-action_area7">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button2">
+ <widget class="GtkButton" id="button14">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label">gtk-cancel</property>
+ <property name="label">gtk-apply</property>
<property name="use_stock">True</property>
- <property name="response_id">-6</property>
+ <property name="response_id">-10</property>
</widget>
</child>
<child>
- <widget class="GtkButton" id="button1">
+ <widget class="GtkButton" id="button13">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label">gtk-ok</property>
+ <property name="label">gtk-close</property>
<property name="use_stock">True</property>
- <property name="response_id">-5</property>
+ <property name="response_id">0</property>
</widget>
<packing>
<property name="position">1</property>
@@ -168,77 +195,145 @@
</widget>
</child>
</widget>
- <widget class="GtkDialog" id="svn_server_trust">
+ <widget class="GtkDialog" id="diff_dialog">
<property name="border_width">5</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox2">
+ <widget class="GtkVBox" id="dialog-vbox6">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="vbox2">
+ <widget class="GtkVBox" id="diff_main_box">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox5">
+ <widget class="GtkLabel" id="label18">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Diff options:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox14">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkLabel" id="label19">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Realm:</b></property>
- <property name="use_markup">True</property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="realm_label">
+ <widget class="GtkCheckButton" id="use_configured_program">
<property name="visible">True</property>
- <property name="label" translatable="yes">label</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use configured program to view the diff</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
<child>
- <widget class="GtkLabel" id="server_info_label">
+ <widget class="GtkHBox" id="hbox15">
<property name="visible">True</property>
- <property name="xalign">0.10000000149011612</property>
- <property name="label" translatable="yes">label</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label20">
+ <property name="visible">True</property>
+ <property name="xpad">8</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="save_diff">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Save the diff file</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="remember_check">
+ <widget class="GtkHBox" id="hbox16">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Remember this decision</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label21">
+ <property name="visible">True</property>
+ <property name="xpad">8</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="diff_filename_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkButton" id="diff_find">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label">gtk-find</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <widget class="GtkHButtonBox" id="dialog-action_area6">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button3">
+ <widget class="GtkButton" id="button12">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -248,11 +343,11 @@
</widget>
</child>
<child>
- <widget class="GtkButton" id="button4">
+ <widget class="GtkButton" id="button11">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label">gtk-yes</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
@@ -269,25 +364,25 @@
</widget>
</child>
</widget>
- <widget class="GtkDialog" id="commit_dialog">
+ <widget class="GtkDialog" id="settings_dialog">
<property name="border_width">5</property>
- <property name="title" translatable="yes">Send Changes</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox3">
+ <widget class="GtkVBox" id="dialog-vbox5">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="commit_main_box">
+ <widget class="GtkVBox" id="main_box">
<property name="visible">True</property>
+ <property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Log Message:</b></property>
+ <property name="label" translatable="yes"><b>Diff program:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -295,162 +390,57 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox6">
+ <widget class="GtkHBox" id="hbox12">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <widget class="GtkLabel" id="label14">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTextView" id="changelog_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
+ <property name="xpad">8</property>
</widget>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
<child>
- <widget class="GtkLabel" id="label22">
+ <widget class="GtkLabel" id="label15">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">6</property>
+ <property name="label" translatable="yes">Program name:</property>
</widget>
<packing>
<property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkCheckButton" id="add_log_checkbutton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Add Log Message to ChangeLog file</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
<property name="position">1</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <widget class="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Select files to Commit:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox7">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
<child>
- <widget class="GtkScrolledWindow" id="sw_view">
+ <widget class="GtkEntry" id="program_name">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="position">4</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox17">
- <property name="visible">True</property>
- <child>
- <widget class="GtkLabel" id="label24">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkProgressBar" id="status_progress_bar">
- <property name="visible">True</property>
- <property name="text" translatable="yes">Retrieving status...</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">5</property>
+ <property name="padding">6</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox8">
+ <widget class="GtkHBox" id="hbox13">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label23">
+ <widget class="GtkLabel" id="label16">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">8</property>
</widget>
- <packing>
- <property name="expand">False</property>
- </packing>
</child>
<child>
- <widget class="GtkButton" id="select_all_button">
+ <widget class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label">gtk-select-all</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
+ <property name="xpad">6</property>
+ <property name="label" translatable="yes">Line argument:</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -458,24 +448,18 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="clear_button">
+ <widget class="GtkEntry" id="line_argument">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label">gtk-clear</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">6</property>
+ <property name="position">2</property>
</packing>
</child>
</widget>
@@ -484,11 +468,11 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area3">
+ <widget class="GtkHButtonBox" id="dialog-action_area5">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button6">
+ <widget class="GtkButton" id="button10">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -498,13 +482,13 @@
</widget>
</child>
<child>
- <widget class="GtkButton" id="button5">
+ <widget class="GtkButton" id="button9">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
- <property name="response_id">-3</property>
+ <property name="response_id">-5</property>
</widget>
<packing>
<property name="position">1</property>
@@ -550,7 +534,7 @@
<child>
<widget class="GtkLabel" id="label12">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -590,7 +574,7 @@
<child>
<widget class="GtkLabel" id="label10">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -660,25 +644,25 @@
</widget>
</child>
</widget>
- <widget class="GtkDialog" id="settings_dialog">
+ <widget class="GtkDialog" id="commit_dialog">
<property name="border_width">5</property>
+ <property name="title" translatable="yes">Send Changes</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox5">
+ <widget class="GtkVBox" id="dialog-vbox3">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="main_box">
+ <widget class="GtkVBox" id="commit_main_box">
<property name="visible">True</property>
- <property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label13">
+ <widget class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Diff program:</b></property>
+ <property name="label" translatable="yes"><b>Log Message:</b></property>
<property name="use_markup">True</property>
</widget>
<packing>
@@ -686,50 +670,45 @@
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox12">
+ <widget class="GtkHBox" id="hbox6">
<property name="visible">True</property>
- <property name="spacing">6</property>
- <child>
- <widget class="GtkLabel" id="label14">
- <property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
<child>
- <widget class="GtkLabel" id="label15">
+ <widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label" translatable="yes">Program name:</property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="program_name">
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <widget class="GtkTextView" id="changelog_view">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox13">
+ <widget class="GtkHBox" id="hbox11">
<property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label16">
+ <widget class="GtkLabel" id="label22">
<property name="visible">True</property>
<property name="label" translatable="yes"> </property>
</widget>
@@ -738,22 +717,15 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label17">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Line argument:</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <widget class="GtkEntry" id="line_argument">
+ <widget class="GtkCheckButton" id="add_log_checkbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="label" translatable="yes">Add Log Message to ChangeLog file</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="position">2</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
@@ -762,91 +734,40 @@
<property name="position">2</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="position">1</property>
- </packing>
- </child>
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area5">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <child>
- <widget class="GtkButton" id="button10">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">True</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
<child>
- <widget class="GtkButton" id="button9">
+ <widget class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">True</property>
- <property name="response_id">-5</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Select files to Commit:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
- <property name="position">1</property>
+ <property name="expand">False</property>
+ <property name="position">3</property>
</packing>
</child>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
- </widget>
- </child>
- </widget>
- <widget class="GtkDialog" id="diff_dialog">
- <property name="border_width">5</property>
- <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox6">
- <property name="visible">True</property>
- <property name="spacing">2</property>
- <child>
- <widget class="GtkVBox" id="diff_main_box">
- <property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label18">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Diff options:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox14">
+ <widget class="GtkHBox" id="hbox7">
<property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label19">
+ <widget class="GtkLabel" id="label8">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="use_configured_program">
+ <widget class="GtkScrolledWindow" id="sw_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Use configured program to view the diff</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">1</property>
@@ -854,30 +775,25 @@
</child>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="position">1</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox15">
+ <widget class="GtkHBox" id="hbox17">
<property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label20">
+ <widget class="GtkLabel" id="label24">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="save_diff">
+ <widget class="GtkProgressBar" id="status_progress_bar">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Save the diff file</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
+ <property name="text" translatable="yes">Retrieving status...</property>
</widget>
<packing>
<property name="position">1</property>
@@ -886,37 +802,42 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">2</property>
+ <property name="position">5</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox16">
+ <widget class="GtkHBox" id="hbox8">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label21">
+ <widget class="GtkLabel" id="label23">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label" translatable="yes"> </property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="diff_filename_entry">
+ <widget class="GtkButton" id="select_all_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label">gtk-select-all</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
</widget>
<packing>
+ <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="diff_find">
+ <widget class="GtkButton" id="clear_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label">gtk-find</property>
+ <property name="label">gtk-clear</property>
<property name="use_stock">True</property>
<property name="response_id">0</property>
</widget>
@@ -928,7 +849,8 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">3</property>
+ <property name="fill">False</property>
+ <property name="position">6</property>
</packing>
</child>
</widget>
@@ -937,27 +859,27 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area6">
+ <widget class="GtkHButtonBox" id="dialog-action_area3">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button12">
+ <widget class="GtkButton" id="button6">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
+ <property name="response_id">-6</property>
</widget>
</child>
<child>
- <widget class="GtkButton" id="button11">
+ <widget class="GtkButton" id="button5">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="label">gtk-ok</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
+ <property name="response_id">-3</property>
</widget>
<packing>
<property name="position">1</property>
@@ -972,101 +894,139 @@
</widget>
</child>
</widget>
- <widget class="GtkDialog" id="checkout_dialog">
+ <widget class="GtkDialog" id="svn_server_trust">
<property name="border_width">5</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox7">
+ <widget class="GtkVBox" id="dialog-vbox2">
<property name="visible">True</property>
<property name="spacing">2</property>
<child>
- <widget class="GtkVBox" id="checkout_main_box">
+ <widget class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label25">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Directory to checkout:</b></property>
- <property name="use_markup">True</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHBox" id="hbox18">
+ <widget class="GtkHBox" id="hbox5">
<property name="visible">True</property>
- <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label26">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label" translatable="yes"><b>Realm:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="path_entry">
+ <widget class="GtkLabel" id="realm_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="label" translatable="yes">label</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
- <child>
- <widget class="GtkButton" id="dir_find_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="label">gtk-find</property>
- <property name="use_stock">True</property>
- <property name="response_id">0</property>
- </widget>
- <packing>
- <property name="expand">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="server_info_label">
+ <property name="visible">True</property>
+ <property name="xalign">0.10000000149011612</property>
+ <property name="label" translatable="yes">label</property>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label29">
+ <widget class="GtkCheckButton" id="remember_check">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Subversion URL:</b></property>
- <property name="use_markup">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Remember this decision</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
</widget>
<packing>
- <property name="expand">False</property>
<property name="position">2</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <child>
+ <widget class="GtkButton" id="button3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkButton" id="button4">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="label">gtk-yes</property>
+ <property name="use_stock">True</property>
+ <property name="response_id">0</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <widget class="GtkDialog" id="svn_user_auth">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Repository authorization</property>
+ <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox20">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label30">
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label" translatable="yes"><b>Realm:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="url_entry">
+ <widget class="GtkLabel" id="auth_realm">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text">svn+ssh://[login ]svn gnome org/svn/[module]/trunk</property>
+ <property name="label">Realm</property>
</widget>
<packing>
<property name="position">1</property>
@@ -1075,46 +1035,55 @@
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">3</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label27">
+ <widget class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Information:</b></property>
- <property name="use_markup">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Username:</b></property>
+ <property name="use_markup">True</property>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="username_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="expand">False</property>
- <property name="position">4</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox19">
+ <widget class="GtkHBox" id="hbox3">
<property name="visible">True</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label28">
+ <widget class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="label" translatable="yes"> </property>
+ <property name="label" translatable="yes"><b>Password:</b></property>
+ <property name="use_markup">True</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <widget class="GtkEntry" id="password_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <child>
- <widget class="GtkTreeView" id="checkout_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- </widget>
- </child>
</widget>
<packing>
<property name="position">1</property>
@@ -1122,7 +1091,33 @@
</child>
</widget>
<packing>
- <property name="position">5</property>
+ <property name="expand">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <widget class="GtkCheckButton" id="remember_pwd">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Remember Password</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="expand">False</property>
+ <property name="position">3</property>
</packing>
</child>
</widget>
@@ -1131,27 +1126,27 @@
</packing>
</child>
<child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area7">
+ <widget class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="layout_style">GTK_BUTTONBOX_END</property>
<child>
- <widget class="GtkButton" id="button14">
+ <widget class="GtkButton" id="button2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label">gtk-apply</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
- <property name="response_id">-10</property>
+ <property name="response_id">-6</property>
</widget>
</child>
<child>
- <widget class="GtkButton" id="button13">
+ <widget class="GtkButton" id="button1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="label">gtk-close</property>
+ <property name="label">gtk-ok</property>
<property name="use_stock">True</property>
- <property name="response_id">0</property>
+ <property name="response_id">-5</property>
</widget>
<packing>
<property name="position">1</property>
Modified: trunk/plugins/subversion/svn-command.c
==============================================================================
--- trunk/plugins/subversion/svn-command.c (original)
+++ trunk/plugins/subversion/svn-command.c Tue Dec 30 19:04:44 2008
@@ -222,12 +222,12 @@
if (args->realm)
gtk_label_set_text (GTK_LABEL (auth_realm), args->realm);
- info = g_strconcat(_("Hostname: "), args->cert_info->hostname, "\n",
- _("Fingerprint: "), args->cert_info->fingerprint, "\n",
- _("Valid from: "), args->cert_info->valid_from, "\n",
- _("Valid until: "), args->cert_info->valid_until, "\n",
- _("Issuer DN: "), args->cert_info->issuer_dname, "\n",
- _("DER certificate: "), args->cert_info->ascii_cert, "\n",
+ info = g_strconcat(_("Hostname:"), args->cert_info->hostname, "\n",
+ _("Fingerprint:"), args->cert_info->fingerprint, "\n",
+ _("Valid from:"), args->cert_info->valid_from, "\n",
+ _("Valid until:"), args->cert_info->valid_until, "\n",
+ _("Issuer DN:"), args->cert_info->issuer_dname, "\n",
+ _("DER certificate:"), args->cert_info->ascii_cert, "\n",
NULL);
gtk_label_set_text (GTK_LABEL (server_info), info);
Modified: trunk/src/context.c
==============================================================================
--- trunk/src/context.c (original)
+++ trunk/src/context.c Tue Dec 30 19:04:44 2008
@@ -58,7 +58,7 @@
gtk_text_buffer_set_text (buffer, "", 0);
gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
- format = g_strconcat (_("Format: "), gtranslator_msg_get_format (msg), NULL);
+ format = g_strconcat (_("Format:"), gtranslator_msg_get_format (msg), NULL);
context = g_strconcat (_("Context:"), gtranslator_msg_get_msgctxt (msg), NULL);
extracted = g_strconcat (_("Extracted comments:"),
gtranslator_msg_get_extracted_comments(msg), NULL);
Modified: trunk/src/dialogs/preferences-dialog.glade
==============================================================================
--- trunk/src/dialogs/preferences-dialog.glade (original)
+++ trunk/src/dialogs/preferences-dialog.glade Tue Dec 30 19:04:44 2008
@@ -1,7 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri Nov 14 11:53:55 2008 -->
+<?xml version="1.0"?>
<glade-interface>
+ <requires-version lib="gtk+" version="2.12"/>
<widget class="GtkDialog" id="preferences_dialog">
<property name="border_width">5</property>
<property name="title" translatable="yes">Gtranslator Preferences</property>
@@ -44,7 +43,7 @@
<child>
<widget class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="label"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -121,7 +120,7 @@
<child>
<widget class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="label"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -224,8 +223,8 @@
<property name="label" translatable="yes">Files</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -255,7 +254,7 @@
<child>
<widget class="GtkLabel" id="label17">
<property name="visible">True</property>
- <property name="label"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -378,7 +377,7 @@
<child>
<widget class="GtkLabel" id="label19">
<property name="visible">True</property>
- <property name="label"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -439,9 +438,9 @@
<property name="label" translatable="yes">Editor</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">1</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -536,9 +535,9 @@
<property name="label" translatable="yes">Profiles</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">2</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -569,7 +568,7 @@
<widget class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -622,7 +621,7 @@
<widget class="GtkLabel" id="label14">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes"> </property>
+ <property name="xpad">8</property>
</widget>
<packing>
<property name="expand">False</property>
@@ -662,9 +661,9 @@
<property name="label" translatable="yes">Interface</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">3</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -835,28 +834,33 @@
<property name="n_columns">2</property>
<property name="column_spacing">12</property>
<child>
- <widget class="GtkSpinButton" id="sentence_length_spinbutton">
+ <widget class="GtkCheckButton" id="use_lang_profile_in_tm">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Use only files with this name:</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkEntry" id="tm_lang_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="adjustment">2 0 100 1 10 10</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="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label24">
+ <widget class="GtkLabel" id="label23">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Max. difference in sentence length:</property>
+ <property name="label" translatable="yes">Max. # of missing words:</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
@@ -874,36 +878,31 @@
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label23">
+ <widget class="GtkLabel" id="label24">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Max. # of missing words:</property>
+ <property name="label" translatable="yes">Max. difference in sentence length:</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
- <widget class="GtkEntry" id="tm_lang_entry">
+ <widget class="GtkSpinButton" id="sentence_length_spinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="adjustment">2 0 100 1 10 10</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="x_options">GTK_FILL</property>
</packing>
</child>
- <child>
- <widget class="GtkCheckButton" id="use_lang_profile_in_tm">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Use only files with this name:</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">True</property>
- </widget>
- </child>
</widget>
<packing>
<property name="position">1</property>
@@ -936,9 +935,9 @@
<property name="label" translatable="yes">Translation Memory</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">4</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
<child>
@@ -959,9 +958,9 @@
<property name="label" translatable="yes">Plugins</property>
</widget>
<packing>
- <property name="type">tab</property>
<property name="position">5</property>
<property name="tab_fill">False</property>
+ <property name="type">tab</property>
</packing>
</child>
</widget>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
