Author: jhs
Date: Mon Jan 7 20:17:50 2008
New Revision: 3432
URL: http://svn.gnome.org/viewvc/anjuta?rev=3432&view=rev
Log:
2008-01-07 Johannes Schmid <[EMAIL PROTECTED]>
* plugins/build-basic-autotools/build-basic-autotools.c:
(on_build_terminated):
* plugins/gtodo/interface.c: (set_read_only):
* plugins/project-manager/plugin.c: (confirm_removal),
(on_popup_add_to_project):
* plugins/subversion/anjuta-subversion.glade:
* plugins/tools/execute.c: (atp_output_context_print_result):
Fixed some strings from #496833
Modified:
trunk/ChangeLog
trunk/plugins/build-basic-autotools/build-basic-autotools.c
trunk/plugins/gtodo/interface.c
trunk/plugins/project-manager/plugin.c
trunk/plugins/subversion/anjuta-subversion.glade
trunk/plugins/tools/execute.c
trunk/po/de.po
Modified: trunk/plugins/build-basic-autotools/build-basic-autotools.c
==============================================================================
--- trunk/plugins/build-basic-autotools/build-basic-autotools.c (original)
+++ trunk/plugins/build-basic-autotools/build-basic-autotools.c Mon Jan 7
20:17:50 2008
@@ -745,12 +745,12 @@
if (status)
{
ianjuta_message_view_buffer_append
(context->message_view,
-
_("Completed... unsuccessful\n"), NULL);
+
_("Completed unsuccessful\n"), NULL);
}
else
{
ianjuta_message_view_buffer_append
(context->message_view,
-
_("Completed... successful\n"), NULL);
+
_("Completed successful\n"), NULL);
}
ianjuta_message_view_buffer_append (context->message_view,
buff1, NULL);
g_free (buff1);
Modified: trunk/plugins/gtodo/interface.c
==============================================================================
--- trunk/plugins/gtodo/interface.c (original)
+++ trunk/plugins/gtodo/interface.c Mon Jan 7 20:17:50 2008
@@ -33,12 +33,6 @@
gtk_widget_set_sensitive (mw.tbdelbut, FALSE);
gtk_label_set_text_with_mnemonic(GTK_LABEL(mw.tbeditlb),_("_View"));
gtk_widget_set_sensitive(mw.tbaddbut, FALSE);
- gtk_widget_set_sensitive (gtk_item_factory_get_widget(GTK_ITEM_FACTORY
(mw.item_factory), N_("/Item/Edit")), FALSE);
- gtk_widget_set_sensitive (gtk_item_factory_get_widget(GTK_ITEM_FACTORY
(mw.item_factory), N_("/Item/Remove")), FALSE);
- gtk_widget_set_sensitive (gtk_item_factory_get_widget(GTK_ITEM_FACTORY
(mw.item_factory), N_("/Item/Add")), FALSE);
- gtk_widget_set_sensitive (gtk_item_factory_get_widget(GTK_ITEM_FACTORY
(mw.item_factory), N_("/Item/Remove Completed Items")), FALSE);
- gtk_widget_set_sensitive (gtk_item_factory_get_widget(GTK_ITEM_FACTORY
(mw.item_factory), N_("/ToDo/Edit Categories")), FALSE);
- // gtk_widget_show_all(mw.window);
}
void gtodo_load_settings ()
Modified: trunk/plugins/project-manager/plugin.c
==============================================================================
--- trunk/plugins/project-manager/plugin.c (original)
+++ trunk/plugins/project-manager/plugin.c Mon Jan 7 20:17:50 2008
@@ -577,26 +577,29 @@
{
gboolean answer;
gchar *mesg;
+ gchar* question;
switch (data->type)
{
case GBF_TREE_NODE_GROUP:
+ question = _("Are you sure you want to remove the
following group from project?\n\n");
mesg = _("%sGroup: %s\n\nThe group will not be deleted
from file system.");
break;
case GBF_TREE_NODE_TARGET:
+ question = _("Are you sure you want to remove the
following target from project?\n\n");
mesg = _("%sTarget: %s");
break;
case GBF_TREE_NODE_TARGET_SOURCE:
+ question = _("Are you sure you want to remove the
following source file from project?\n\n");
mesg = _("%sSource: %s\n\nThe source file will not be
deleted from file system.");
break;
default:
- g_warning ("Unknow node");
+ g_warning ("Unknown node");
return FALSE;
}
answer =
anjuta_util_dialog_boolean_question (get_plugin_parent_window
(plugin),
-
mesg,
- _("Are you sure you want to remove the following from
project?\n\n"),
+
mesg, question,
data->name);
return answer;
}
@@ -698,9 +701,9 @@
if (res != GNOME_VFS_OK)
mesg = gnome_vfs_result_to_string (res);
else
- mesg = _("URI is link");
+ mesg = _("The file you selected is a link and can't be
added to the project");
anjuta_util_dialog_error (win,
- _("Failed to
retried URI info of %s: %s"),
+ _("Failed to
retrieve URI info of %s: %s"),
plugin->fm_current_uri, mesg);
}
}
Modified: trunk/plugins/subversion/anjuta-subversion.glade
==============================================================================
--- trunk/plugins/subversion/anjuta-subversion.glade (original)
+++ trunk/plugins/subversion/anjuta-subversion.glade Mon Jan 7 20:17:50 2008
@@ -35,7 +35,7 @@
<widget class="GtkDialog" id="subversion_add">
<property name="visible">True</property>
<property name="border_width">10</property>
- <property name="title" translatable="yes">Subversion: Add
file/directory</property>
+ <property name="title" translatable="yes">Add file/directory</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
@@ -798,47 +798,42 @@
<placeholder/>
</child>
<child>
- <widget class="GtkLabel" id="label38">
+ <widget class="GtkLabel" id="label40">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Username: </property>
+ <property name="label" translatable="yes">Realm:</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="GtkLabel" id="label39">
+ <widget class="GtkLabel" id="auth_realm">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Password:</property>
+ <property name="label" translatable="yes">realm</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkCheckButton" id="remember_pwd">
+ <widget class="GtkEntry" id="password_entry">
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Remember
Password</property>
- <property name="use_underline">True</property>
- <property name="response_id">0</property>
- <property name="draw_indicator">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">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="y_options"></property>
</packing>
</child>
@@ -857,41 +852,46 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="password_entry">
+ <widget class="GtkCheckButton" id="remember_pwd">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="visibility">False</property>
- <property name="invisible_char">*</property>
- <property name="activates_default">True</property>
+ <property name="label" translatable="yes">Remember
Password</property>
+ <property name="use_underline">True</property>
+ <property name="response_id">0</property>
+ <property name="draw_indicator">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="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="auth_realm">
+ <widget class="GtkLabel" id="label39">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">realm</property>
+ <property name="label" translatable="yes">Password:</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>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label40">
+ <widget class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Realm:</property>
+ <property name="label" translatable="yes">Username: </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>
@@ -1208,7 +1208,7 @@
<property name="height_request">400</property>
<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>
- <property name="title" translatable="yes">Subversion: Commit
Changes</property>
+ <property name="title" translatable="yes">Commit 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>
@@ -2885,7 +2885,7 @@
<property name="height_request">400</property>
<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>
- <property name="title" translatable="yes">Subversion: Set Conflicts as
Resolved</property>
+ <property name="title" translatable="yes">Set Conflicts as
Resolved</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>
Modified: trunk/plugins/tools/execute.c
==============================================================================
--- trunk/plugins/tools/execute.c (original)
+++ trunk/plugins/tools/execute.c Mon Jan 7 20:17:50 2008
@@ -482,7 +482,7 @@
atp_output_context_print_result (ATPOutputContext *this, gint error)
{
gboolean ok;
- char buffer[33];
+ gchar* buffer;
IAnjutaMessageManager *man;
ok = TRUE;
@@ -497,13 +497,14 @@
{
if (error)
{
- ok = atp_output_context_print (this,
_("Completed... unsuccessful with "));
- sprintf (buffer, "%d", error);
- ok &= atp_output_context_print (this, buffer);
+ buffer = g_strdup_printf (_("Completed
unsuccessful with %d\n"),
+
error);
+ ok = atp_output_context_print (this, buffer);
+ g_free (buffer);
}
else
{
- ok = atp_output_context_print (this,
_("Completed... successful"));
+ ok = atp_output_context_print (this,
_("Completed successful\n"));
}
ok &= atp_output_context_print (this, "\n");
if (this->view)
_______________________________________________
SVN-commits-list mailing list
[email protected]
http://mail.gnome.org/mailman/listinfo/svn-commits-list
