Rename ghex2 binary to ghex

kalev · Aug 4, 2011 · 612e2f2 · 612e2f2
1 parent b9614df
commit 612e2f2
Show file tree

Hide file tree

Showing 16 changed files with 26 additions and 26 deletions.
diff --git a/data/ghex.desktop.in b/data/ghex.desktop.in
@@ -2,7 +2,7 @@
 _Name=GHex
 _GenericName=Hex Editor
 _Comment=Inspect and edit binary files
-Exec=ghex2 %F
+Exec=ghex %F
 Terminal=false
 Type=Application
 Icon=ghex

diff --git a/help/C/ghex2.xml → help/C/ghex.xml b/help/C/ghex2.xml → help/C/ghex.xml
@@ -202,7 +202,7 @@
 <varlistentry>
 <term>Command line</term>
 <listitem>
-<para>Execute the following command: <command>ghex2</command></para>
+<para>Execute the following command: <command>ghex</command></para>
 </listitem>
 </varlistentry>
 </variablelist>

diff --git a/help/Makefile.am b/help/Makefile.am
@@ -1,11 +1,11 @@
 include $(top_srcdir)/gnome-doc-utils.make
 dist-hook: doc-dist-hook
 
-DOC_MODULE = ghex2
+DOC_MODULE = ghex
 DOC_ENTITIES =
 DOC_INCLUDES = legal.xml
-DOC_H_FILE = ghex2-docs.h
-DOC_H_DOCS = C/ghex2.xml
+DOC_H_FILE = ghex-docs.h
+DOC_H_DOCS = C/ghex.xml
 DOC_FIGURES =	\
 	figures/ghex_window_empty.png	\
 	figures/ghex_window_open.png

diff --git a/help/cs/cs.po b/help/cs/cs.po
@@ -341,8 +341,8 @@ msgid "Command line"
 msgstr "Příkazový řádek"
 
 #: C/ghex2.xml:205(para)
-msgid "Execute the following command: <command>ghex2</command>"
-msgstr "Spustit následující příkaz: <command>ghex2</command>"
+msgid "Execute the following command: <command>ghex</command>"
+msgstr "Spustit následující příkaz: <command>ghex</command>"
 
 #: C/ghex2.xml:212(title)
 msgid "When You Start GHex"

diff --git a/help/de/de.po b/help/de/de.po
@@ -344,8 +344,8 @@ msgid "Command line"
 msgstr "Befehlszeile"
 
 #: C/ghex2.xml:203(para)
-msgid "Execute the following command: <command>ghex2</command>"
-msgstr "Führen Sie folgenden Befehl aus: <command>ghex2</command>"
+msgid "Execute the following command: <command>ghex</command>"
+msgstr "Führen Sie folgenden Befehl aus: <command>ghex</command>"
 
 #: C/ghex2.xml:210(title)
 msgid "When You Start GHex"

diff --git a/help/es/es.po b/help/es/es.po
@@ -350,8 +350,8 @@ msgid "Command line"
 msgstr "Línea de comandos"
 
 #: C/ghex2.xml:205(para)
-msgid "Execute the following command: <command>ghex2</command>"
-msgstr "Ejecute el siguiente comando: <command>ghex2</command>"
+msgid "Execute the following command: <command>ghex</command>"
+msgstr "Ejecute el siguiente comando: <command>ghex</command>"
 
 #: C/ghex2.xml:212(title)
 msgid "When You Start GHex"

diff --git a/help/fr/fr.po b/help/fr/fr.po
@@ -351,8 +351,8 @@ msgid "Command line"
 msgstr "Ligne de commande"
 
 #: C/ghex2.xml:205(para)
-msgid "Execute the following command: <command>ghex2</command>"
-msgstr "Éxécutez la commande suivante : <command>ghex2</command>"
+msgid "Execute the following command: <command>ghex</command>"
+msgstr "Éxécutez la commande suivante : <command>ghex</command>"
 
 #: C/ghex2.xml:212(title)
 msgid "When You Start GHex"

diff --git a/help/ghex2.omf.in → help/ghex.omf.in b/help/ghex2.omf.in → help/ghex.omf.in
diff --git a/help/oc/oc.po b/help/oc/oc.po
@@ -272,7 +272,7 @@ msgid "Command line"
 msgstr "Linha de comanda"
 
 #: C/ghex2.xml:195(para)
-msgid "Execute the following command: <command>ghex2</command>"
+msgid "Execute the following command: <command>ghex</command>"
 msgstr ""
 
 #: C/ghex2.xml:202(title)

diff --git a/help/sl/sl.po b/help/sl/sl.po
@@ -243,7 +243,7 @@ msgid "Command line"
 msgstr ""
 
 #: C/ghex2.xml:205(para)
-msgid "Execute the following command: <command>ghex2</command>"
+msgid "Execute the following command: <command>ghex</command>"
 msgstr ""
 
 #: C/ghex2.xml:212(title)

diff --git a/help/sv/sv.po b/help/sv/sv.po
@@ -226,8 +226,8 @@ msgid "Command line"
 msgstr "Kommandoraden"
 
 #: C/ghex2.xml:195(para)
-msgid "Execute the following command: <command>ghex2</command>"
-msgstr "Kör följande kommando: <command>ghex2</command>"
+msgid "Execute the following command: <command>ghex</command>"
+msgstr "Kör följande kommando: <command>ghex</command>"
 
 #: C/ghex2.xml:202(title)
 msgid "When You Start GHex"

diff --git a/help/th/th.po b/help/th/th.po
@@ -309,8 +309,8 @@ msgid "Command line"
 msgstr "บรรทัดคำสั่ง"
 
 #: C/ghex2.xml:195(para)
-msgid "Execute the following command: <command>ghex2</command>"
-msgstr "เรียกคำสั่งต่อไปนี้: <command>ghex2</command>"
+msgid "Execute the following command: <command>ghex</command>"
+msgstr "เรียกคำสั่งต่อไปนี้: <command>ghex</command>"
 
 #: C/ghex2.xml:202(title)
 msgid "When You Start GHex"

diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
@@ -307,8 +307,8 @@ msgid "Command line"
 msgstr "命令行"
 
 #: C/ghex2.xml:205(para)
-msgid "Execute the following command: <command>ghex2</command>"
-msgstr "执行如下命令：<command>ghex2</command>"
+msgid "Execute the following command: <command>ghex</command>"
+msgstr "执行如下命令：<command>ghex</command>"
 
 #: C/ghex2.xml:212(title)
 msgid "When You Start GHex"

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -14,7 +14,7 @@ BUILT_SOURCES = \
 	ghex-marshal.c	\
 	ghex-marshal.h
 
-bin_PROGRAMS = ghex2
+bin_PROGRAMS = ghex
 
 lib_LTLIBRARIES = libgtkhex-3.la
 
@@ -42,7 +42,7 @@ gtkhexinclude_HEADERS = \
 	hex-document.h 			\
 	gtkhex.h
 
-ghex2_SOURCES = \
+ghex_SOURCES = \
 	hex-document-ui.c preferences.c findreplace.c converter.c	\
 	config.c main.c ui.c chartable.c				\
 	print.c ghex-window.c ghex-window.h				\

diff --git a/src/preferences.c b/src/preferences.c
@@ -445,7 +445,7 @@ prefs_response_cb(GtkDialog *dlg, gint response, PropertyUI *pui)
 
 	switch(response) {
 	case GTK_RESPONSE_HELP:
-		gtk_show_uri (NULL, "ghelp:ghex2?ghex-prefs",  gtk_get_current_event_time (), &error);
+		gtk_show_uri (NULL, "ghelp:ghex?ghex-prefs",  gtk_get_current_event_time (), &error);
 		if(NULL != error) {
 			GtkWidget *dialog;
 			dialog = gtk_message_dialog_new

diff --git a/src/ui.c b/src/ui.c
@@ -145,7 +145,7 @@ about_cb (GtkAction *action,
 	                           "Copyright © 2006 - 2010 GHex Contributors");
 
 	/* For documentation_credits */
-	#include "../help/ghex2-docs.h"
+	#include "../help/ghex-docs.h"
 
 	const gchar *license[] = {
 		N_("This program is free software; you can redistribute it and/or modify "
@@ -191,7 +191,7 @@ help_cb (GtkAction *action,
 {
 	GError *error = NULL;
 
-	gtk_show_uri (NULL, "ghelp:ghex2",  gtk_get_current_event_time (), &error);
+	gtk_show_uri (NULL, "ghelp:ghex",  gtk_get_current_event_time (), &error);
 
 	if (error != NULL) {
 		GtkWidget *dialog;