Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=gfpm.git;a=commitdiff;h=62660dc01550c15cc12bb2699ef216caf480a301
commit 62660dc01550c15cc12bb2699ef216caf480a301
Author: Priyank <[EMAIL PROTECTED]>
Date: Wed Sep 19 21:04:16 2007 +0530
gettext'ized some strings and removed whitespaces
* gfpm should also check whether the system is a stable or current one
diff --git a/src/gfpm-db.c b/src/gfpm-db.c
index a0944de..77cb404 100644
--- a/src/gfpm-db.c
+++ b/src/gfpm-db.c
@@ -36,11 +36,8 @@ static void _db_callback (char *section, PM_DB *db);
int
gfpm_db_init (void)
{
- //if (NULL == (sync_db=pacman_db_register(FW_CURRENT)))
- // return 1;
if (NULL == (local_db=pacman_db_register(FW_LOCAL)))
return 1;
- //asprintf (&repo, "%s", FW_CURRENT);
return 0;
}
diff --git a/src/gfpm-interface.c b/src/gfpm-interface.c
index f3e2dab..15666f4 100644
--- a/src/gfpm-interface.c
+++ b/src/gfpm-interface.c
@@ -106,7 +106,7 @@ gfpm_populate_repos_combobox (GtkComboBox *combo)
char *c_repo = (char *)pacman_db_getinfo ((PM_DB *)rlist->data, PM_DB_TREENAME);
gtk_list_store_append (store, &iter);
gtk_list_store_set (store, &iter, 0, c_repo, -1);
- if (!strcmp(c_repo,FW_CURRENT))
+ if (!strcmp(c_repo, FW_CURRENT) || !(strcmp(c_repo, FW_STABLE))
c_index++;
}
gtk_list_store_append (store, &iter);
@@ -263,7 +263,6 @@ gfpm_interface_init (void)
gtk_widget_set_sensitive (GTK_WIDGET(glade_xml_get_widget(xml,
"button_file1")), FALSE);
}
-
/* initialize modules */
if (gfpm_db_init ())
gfpm_error (_("Error"), _("Failed to initialize local package database."));
diff --git a/src/gfpm-messages.c b/src/gfpm-messages.c
index f2862a4..675e0b1 100644
--- a/src/gfpm-messages.c
+++ b/src/gfpm-messages.c
@@ -460,10 +460,10 @@ gfpm_input (const char *title, const char *message, int
*res)
GTK_WINDOW(gfpm_mw),
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK,
- GTK_RESPONSE_ACCEPT,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_REJECT,
- NULL);
+ GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL,
+ GTK_RESPONSE_REJECT,
+ NULL);
gtk_window_set_resizable (GTK_WINDOW(dialog), FALSE);
label = gtk_label_new (message);
entry = gtk_entry_new ();
@@ -489,64 +489,64 @@ cb_gfpm_trans_conv (unsigned char event, void *data1,
void *data2, void *data3,
char *str = NULL;
case PM_TRANS_CONV_REPLACE_PKG:
- str = g_strdup_printf ("Do you want to replace %s with
%s/%s ?",
+ str = g_strdup_printf (_("Do you want to replace %s
with %s/%s ?"),
(char*)pacman_pkg_getinfo (data1, PM_PKG_NAME),
(char*)data3,
(char*)pacman_pkg_getinfo (data2, PM_PKG_NAME));
- if (gfpm_question(_("Replace package"), _(str)) ==
GTK_RESPONSE_YES)
+ if (gfpm_question(_("Replace package"), str) ==
GTK_RESPONSE_YES)
*response = 1;
else
*response = 0;
break;
case PM_TRANS_CONV_INSTALL_IGNOREPKG:
- str = g_strdup_printf ("%s requires %s, but it is
IgnorePkg. Install anyway?",
+ str = g_strdup_printf (_("%s requires %s, but it is
IgnorePkg. Install anyway?"),
(char*)pacman_pkg_getinfo (data1, PM_PKG_NAME),
(char*)pacman_pkg_getinfo (data2, PM_PKG_NAME));
- if (gfpm_question("Gfpm", _(str)) == GTK_RESPONSE_YES)
+ if (gfpm_question("Gfpm", str) == GTK_RESPONSE_YES)
*response = 1;
else
*response = 0;
break;
case PM_TRANS_CONV_REMOVE_HOLDPKG:
- str = g_strdup_printf ("%s is designated as HoldPkg.
Remove anyway?",
+ str = g_strdup_printf (_("%s is designated as HoldPkg.
Remove anyway?"),
(char*)pacman_pkg_getinfo (data1, PM_PKG_NAME));
- if (gfpm_question("Gfpm", _(str)) == GTK_RESPONSE_YES)
+ if (gfpm_question("Gfpm", str) == GTK_RESPONSE_YES)
*response = 1;
else
*response = 0;
break;
case PM_TRANS_CONV_CONFLICT_PKG:
- str = g_strdup_printf ("%s conflicts with %s. Remove
%s?",
+ str = g_strdup_printf (_("%s conflicts with %s. Remove
%s?"),
(char*)data1,
(char*)data2,
(char*)data2);
- if (gfpm_question(_("Conflict"), _(str)) ==
GTK_RESPONSE_YES)
+ if (gfpm_question(_("Conflict"), str) ==
GTK_RESPONSE_YES)
*response = 1;
else
*response = 0;
break;
case PM_TRANS_CONV_LOCAL_NEWER:
- str = g_strdup_printf ("%s-%s: local version is newer.
Upgrade anyway?",
+ str = g_strdup_printf (_("%s-%s: local version is
newer. Upgrade anyway?"),
(char*)pacman_pkg_getinfo (data1, PM_PKG_NAME),
(char*)pacman_pkg_getinfo (data1, PM_PKG_VERSION));
- if (gfpm_question(_("Local version newer"), _(str)) ==
GTK_RESPONSE_YES)
+ if (gfpm_question(_("Local version newer"), str) ==
GTK_RESPONSE_YES)
*response = 1;
else
*response = 0;
break;
case PM_TRANS_CONV_LOCAL_UPTODATE:
- str = g_strdup_printf ("%s-%s: local version is up to
date. Upgrade anyway?",
+ str = g_strdup_printf (_("%s-%s: local version is up to
date. Upgrade anyway?"),
(char*)pacman_pkg_getinfo (data1, PM_PKG_NAME),
(char*)pacman_pkg_getinfo (data1, PM_PKG_VERSION));
- if (gfpm_question(_("Local version up to date"),
_(str)) == GTK_RESPONSE_YES)
+ if (gfpm_question(_("Local version up to date"), str)
== GTK_RESPONSE_YES)
*response = 1;
else
*response = 0;
break;
case PM_TRANS_CONV_CORRUPTED_PKG:
- str = g_strdup_printf ("Archive %s is corrupted. Do you
want to delete it?",
+ str = g_strdup_printf (_("Archive %s is corrupted. Do
you want to delete it?"),
(char*)pacman_pkg_getinfo (data1, PM_PKG_NAME));
- if (gfpm_question(_("Package corrupted"), _(str)) ==
GTK_RESPONSE_YES)
+ if (gfpm_question(_("Package corrupted"), str) ==
GTK_RESPONSE_YES)
*response = 1;
else
*response = 0;
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
