Correct usage of ellipses.

2003-06-28  Piers Cornwell  <piersc@cogs.susx.ac.uk>

	* src/ephy-window.c:

	Correct usage of ellipses.

	* src/prefs-dialog.c:

	Correct spelling of Bokmal and several cleanups.

3 files changed, 22 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index f84887a39..a6cb81d8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-06-28  Piers Cornwell  <piersc@cogs.susx.ac.uk>
+
+	* src/ephy-window.c:
+
+	Correct usage of ellipses.
+
+	* src/prefs-dialog.c:
+
+	Correct spelling of Bokmal and several cleanups.
+
 2003-06-28  Christophe Fergeau  <teuf@users.sourceforge.net>
 
 	* embed/mozilla/EphyWrapper.cpp: removed unused header, 
diff --git a/src/ephy-window.c b/src/ephy-window.c
index d39f70023..256eaa7cb 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -156,7 +156,7 @@ static EggActionGroupEntry ephy_menu_entries [] = {
 	  G_CALLBACK (window_cmd_view_page_source), NULL },
 
 	/* Bookmarks menu */
-	{ "FileBookmarkPage", N_("_Add Bookmark"), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
+	{ "FileBookmarkPage", N_("_Add Bookmark..."), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
 	  N_("Add a bookmark for the current page"),
 	  G_CALLBACK (window_cmd_file_bookmark_page), NULL },
 	{ "GoBookmarks", N_("_Edit Bookmarks"), EPHY_STOCK_BOOKMARKS, "<control>B",
@@ -217,7 +217,7 @@ static EggActionGroupEntry ephy_popups_entries [] = {
 	/* Document */
 	{ "SaveBackgroundAs", N_("_Save Background As..."), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_save_background_as), NULL },
-	{ "ContextBookmarkPage", N_("Add Boo_kmark"), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
+	{ "ContextBookmarkPage", N_("Add Boo_kmark..."), EPHY_STOCK_BOOKMARK_PAGE, "<control>D",
 	  N_("Add a bookmark for the current page"),
 	  G_CALLBACK (window_cmd_file_bookmark_page), NULL },
 
@@ -236,7 +236,7 @@ static EggActionGroupEntry ephy_popups_entries [] = {
 	  NULL, G_CALLBACK (popup_cmd_link_in_new_window), NULL },
 	{ "OpenLinkInNewTab", N_("Open Link in New _Tab"), NULL, NULL,
 	  NULL, G_CALLBACK (popup_cmd_link_in_new_tab), NULL },
-	{ "DownloadLink", N_("_Download Link"), GTK_STOCK_SAVE, NULL,
+	{ "DownloadLink", N_("_Download Link..."), GTK_STOCK_SAVE, NULL,
 	  NULL, G_CALLBACK (popup_cmd_download_link), NULL },
 	{ "BookmarkLink", N_("_Bookmark Link..."), EPHY_STOCK_BOOKMARK_PAGE, NULL,
 	  NULL, G_CALLBACK (popup_cmd_bookmark_link), NULL },
diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c
index 9d86664d0..b07df0fd3 100644
--- a/src/prefs-dialog.c
+++ b/src/prefs-dialog.c
@@ -117,7 +117,7 @@ languages [] =
 	{ N_("Macedonian"), "mk" },
 	{ N_("Malay"), "ms" },
 	{ N_("Norwegian/Nynorsk"), "nn" },
-	{ N_("Norwegian/Bokmaal"), "nb" },
+	{ N_("Norwegian/Bokmal"), "nb" },
 	{ N_("Norwegian"), "no" },
 	{ N_("Polish"), "pl" },
 	{ N_("Portuguese"), "pt" },
@@ -218,11 +218,8 @@ enum
 	/* General */
 	OPEN_IN_TABS_PROP,
 	HOMEPAGE_ENTRY_PROP,
-	AUTO_ENCODING_PROP,
-	DEFAULT_ENCODING_PROP,
-	LANGUAGE_PROP,
 
-	/* Appeareance */
+	/* Fonts and Colors */
 	FONTS_LANGUAGE_PROP,
 	SERIF_PROP,
 	SANSSERIF_PROP,
@@ -243,7 +240,9 @@ enum
 	/* Advanced */
 	CACHE_COMPARE_PROP,
 	DISK_CACHE_PROP,
-	MEMORY_CACHE_PROP
+	AUTO_ENCODING_PROP,
+	DEFAULT_ENCODING_PROP,
+	LANGUAGE_PROP,
 };
 
 #define CONF_FONTS_FOR_LANGUAGE	"/apps/epiphany/dialogs/preferences_font_language"
@@ -257,11 +256,8 @@ EphyDialogProperty properties [] =
 	/* General */
 	{ OPEN_IN_TABS_PROP, "open_in_tabs_checkbutton", CONF_TABS_TABBED, PT_AUTOAPPLY, NULL },
 	{ HOMEPAGE_ENTRY_PROP, "homepage_entry", CONF_GENERAL_HOMEPAGE, PT_AUTOAPPLY, NULL },
-	{ AUTO_ENCODING_PROP, "auto_encoding_optionmenu", NULL, PT_NORMAL, NULL },
-	{ DEFAULT_ENCODING_PROP, "default_encoding_optionmenu", NULL, PT_NORMAL, NULL },
-	{ LANGUAGE_PROP, "language_optionmenu", NULL, PT_NORMAL, NULL },
 
-	/* Appeareance */
+	/* Fonts and Colors */
 	{ FONTS_LANGUAGE_PROP, "fonts_language_optionmenu", CONF_FONTS_FOR_LANGUAGE, PT_AUTOAPPLY, NULL },
 	{ SERIF_PROP, "serif_combo", NULL, PT_NORMAL, NULL },
 	{ SANSSERIF_PROP, "sansserif_combo", NULL, PT_NORMAL, NULL },
@@ -282,6 +278,9 @@ EphyDialogProperty properties [] =
 	/* Advanced */
 	{ CACHE_COMPARE_PROP, "cache_compare_radiobutton", CONF_NETWORK_CACHE_COMPARE, PT_AUTOAPPLY, NULL },
 	{ DISK_CACHE_PROP, "disk_cache_spin", CONF_NETWORK_CACHE_SIZE, PT_AUTOAPPLY, NULL },
+	{ AUTO_ENCODING_PROP, "auto_encoding_optionmenu", NULL, PT_NORMAL, NULL },
+	{ DEFAULT_ENCODING_PROP, "default_encoding_optionmenu", NULL, PT_NORMAL, NULL },
+	{ LANGUAGE_PROP, "language_optionmenu", NULL, PT_NORMAL, NULL },
 
 	{ -1, NULL, NULL }
 };