summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdd Dumbill <edd@usefulinc.com>2005-01-07 12:33:40 +0000
committerEdd Dumbill <edd@src.gnome.org>2005-01-07 12:33:40 +0000
commit8861680bb7ee4c56a7f327acba171216035bd063 (patch)
treee5dbbdc44f979c8f3bebd0059e3acb412b6f31e6
parent88f5210921ac5374a2e1d151c0deb137b6cb096a (diff)
downloadgnome-bluetooth-8861680bb7ee4c56a7f327acba171216035bd063.tar.gz
Change translator_credits to translator-credits. Regenerate pot file.
2005-01-07 Edd Dumbill <edd@usefulinc.com> * obex/gnome-obex-server.c: Change translator_credits to translator-credits. Regenerate pot file.
-rw-r--r--ChangeLog5
-rw-r--r--obex/gnome-obex-send.c4
-rw-r--r--obex/gnome-obex-server.c6
-rw-r--r--po/Makefile.in.in10
-rw-r--r--src/fileactiondialog.gob1
5 files changed, 19 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index e2c4b32e..12ab1be5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-07 Edd Dumbill <edd@usefulinc.com>
+
+ * obex/gnome-obex-server.c: Change translator_credits to
+ translator-credits. Regenerate pot file.
+
2004-11-06 Amanpreet Singh Alam<aalam@redhat.com>
* configure.in: Add pa [Punjabi] to ALL_LINGUAS
diff --git a/obex/gnome-obex-send.c b/obex/gnome-obex-send.c
index 6d2cf7b7..1c38a98d 100644
--- a/obex/gnome-obex-send.c
+++ b/obex/gnome-obex-send.c
@@ -58,7 +58,9 @@ static gchar *bdaddrstr = NULL;
static const struct poptOption options[] = {
{"dest", 'd', POPT_ARG_STRING, &bdaddrstr,
- 0, _("Bluetooth address of destination device"), "BDADDR"},
+/* FIXME: find way of doing this:
+ * 0, _("Bluetooth address of destination device"), "BDADDR"}, */
+ 0, "Bluetooth address of destination device", "BDADDR"},
{NULL, '\0', 0, NULL, 0}
};
diff --git a/obex/gnome-obex-server.c b/obex/gnome-obex-server.c
index 64aeded2..41038595 100644
--- a/obex/gnome-obex-server.c
+++ b/obex/gnome-obex-server.c
@@ -252,7 +252,9 @@ about_activated(GtkMenuItem *item, gpointer data)
GdkPixbuf *pixbuf = NULL;
const gchar *authors[] = { "Edd Dumbill <edd@usefulinc.com>", NULL };
const gchar *documenters[] = { NULL };
- const gchar *translator_credits = _("translator_credits");
+ /* add your name and email address in here if you've translated
+ this program */
+ const gchar *translator_credits = _("translator-credits");
if (about != NULL) {
gdk_window_raise (GTK_WIDGET(about)->window);
@@ -268,7 +270,7 @@ about_activated(GtkMenuItem *item, gpointer data)
(const char **)authors,
(const char **)documenters,
strcmp (translator_credits,
- "translator_credits") != 0 ?
+ "translator-credits") != 0 ?
translator_credits : NULL,
pixbuf);
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 6d2cd50a..b79b407a 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -32,10 +32,12 @@ localedir = $(libdir)/locale
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
+install_sh = @install_sh@
+mkdir_p = @mkdir_p@
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
CC = @CC@
GENCAT = @GENCAT@
@@ -102,7 +104,7 @@ install-exec:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
+ if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
@@ -116,7 +118,7 @@ install-data-yes: all
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
- if test -r "$(MKINSTALLDIRS)"; then \
+ if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
@@ -144,7 +146,7 @@ install-data-yes: all
fi; \
done
if test "$(PACKAGE)" = "glib"; then \
- if test -r "$(MKINSTALLDIRS)"; then \
+ if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
diff --git a/src/fileactiondialog.gob b/src/fileactiondialog.gob
index 4f485aef..fccced87 100644
--- a/src/fileactiondialog.gob
+++ b/src/fileactiondialog.gob
@@ -117,6 +117,7 @@ class Gnomebt:FileActionDialog from Gtk:Dialog {
gnome_vfs_mime_application_free (self->_priv->app);
}
+/* FIXME: make this DISCARD, not DELETE */
self->_priv->deletebutton = GTK_WIDGET (gtk_dialog_add_button (
GTK_DIALOG(self), GTK_STOCK_DELETE, GNOMEBT_FILEACTION_DELETE));