diff --git a/data/gramps.desktop.in b/data/gramps.desktop.in
index cc3ecc8b0..1c0d334a0 100644
--- a/data/gramps.desktop.in
+++ b/data/gramps.desktop.in
@@ -1,5 +1,5 @@
[Desktop Entry]
-_Name=GRAMPS Genealogy System
+_Name=Gramps Genealogy System
_Comment=Manage genealogical information, perform genealogical research and analysis
Icon=gramps
Terminal=false
diff --git a/data/gramps.keys.in b/data/gramps.keys.in
index 78e912bcc..f0a070832 100644
--- a/data/gramps.keys.in
+++ b/data/gramps.keys.in
@@ -1,5 +1,5 @@
application/x-gramps:
- _description=GRAMPS database
+ _description=Gramps database
default_action_type=application
short_list_application_ids=gramps
short_list_application_ids_for_novice_user_level=gramps
@@ -10,7 +10,7 @@ application/x-gramps:
open=gramps %f
application/x-gramps-package:
- _description=GRAMPS package
+ _description=Gramps package
default_action_type=application
short_list_application_ids=gramps
short_list_application_ids_for_novice_user_level=gramps
@@ -21,7 +21,7 @@ application/x-gramps-package:
open=gramps %f
application/x-gramps-xml:
- _description=GRAMPS XML database
+ _description=Gramps XML database
default_action_type=application
short_list_application_ids=gramps
short_list_application_ids_for_novice_user_level=gramps
diff --git a/src/cli/arghandler.py b/src/cli/arghandler.py
index c8aeeec71..b3fe927c2 100644
--- a/src/cli/arghandler.py
+++ b/src/cli/arghandler.py
@@ -125,7 +125,7 @@ class ArgHandler(object):
return db_path
else:
self.__error( _('Error: Input family tree "%s" does not exist.\n'
- "If gedcom, gramps-xml or grdb, use the -i option to "
+ "If GEDCOM, Gramps-xml or grdb, use the -i option to "
"import into a family tree instead.") % value)
sys.exit(0)
diff --git a/src/data/tips.xml.in b/src/data/tips.xml.in
index ffe903494..26d0dfebb 100644
--- a/src/data/tips.xml.in
+++ b/src/data/tips.xml.in
@@ -209,18 +209,18 @@ Check it out.
<_tip number="31">
Improving Gramps: Users are encouraged to request enhancements to
Gramps.
-Requesting an enhancement can be done either through the gramps-users or
-gramps-devel mailing lists, or by creating a Feature Request at
+Requesting an enhancement can be done either through the Gramps-users or
+Gramps-devel mailing lists, or by creating a Feature Request at
http://bugs.gramps-project.org
Filing a Feature Request is preferred.
<_tip number="32">
Gramps Mailing Lists: Want answers to your queries about Gramps?
-Check out the gramps-users list.
+Check out the Gramps-users list.
Many people are on the list, so you're likely to get an answer quickly.
If you have questions related to the development of Gramps,
-try gramps-devel. Information on both mailing lists can be found at
+try Gramps-devel. Information on both mailing lists can be found at
lists.sf.net.
@@ -230,7 +230,7 @@ Want to help with Gramps but can't program? Not a problem. A project
as large as Gramps requires people with a wide variety of skills.
Contributions can vary from writing documentation to testing development
versions to helping with the web site.
-Start by subscribing to the gramps developers mailing list, gramps-devel
+Start by subscribing to the Gramps developers mailing list, Gramps-devel
and introducing yourself.
Subscription information can be found at lists.sf.net.
@@ -412,7 +412,7 @@ is easier to distribute than multiple reports, especially when printed.
<_tip number="59">
Interested in getting notified when a new version of Gramps is released?
-Join the gramps-announce mailing list at
+Join the Gramps-announce mailing list at
http://lists.sourceforge.net/lists/listinfo/gramps-announce
diff --git a/src/gen/db/dbdir.py b/src/gen/db/dbdir.py
index 51740f660..32f15eb1f 100644
--- a/src/gen/db/dbdir.py
+++ b/src/gen/db/dbdir.py
@@ -1156,7 +1156,7 @@ class GrampsDBDir(GrampsDbBase, UpdateCallback):
self.db_is_open = False
raise FileVersionError(
_("The database version is not supported by this "
- "version of GRAMPS.\nPlease upgrade to the "
+ "version of Gramps.\nPlease upgrade to the "
"corresponding version or use XML for porting "
"data between different database versions."))
diff --git a/src/gui/views/navigationview.py b/src/gui/views/navigationview.py
index 6972f2565..ec22483da 100644
--- a/src/gui/views/navigationview.py
+++ b/src/gui/views/navigationview.py
@@ -298,7 +298,7 @@ class NavigationView(PageView):
else:
self.uistate.push_message(
self.dbstate,
- _("Error: %s is not a valid GRAMPS ID") % gid)
+ _("Error: %s is not a valid Gramps ID") % gid)
dialog.destroy()
def get_handle_from_gramps_id(self, gid):
diff --git a/src/plugins/import/ImportCsv.py b/src/plugins/import/ImportCsv.py
index 5588da919..655c4575d 100644
--- a/src/plugins/import/ImportCsv.py
+++ b/src/plugins/import/ImportCsv.py
@@ -263,7 +263,7 @@ def cleanup_column_name(column):
"death cause", _("death cause")]:
return "deathcause"
elif retval in ["grampsid", "id", "gramps_id",
- "gramps id", _("gramps id")]:
+ "gramps id", _("Gramps id")]:
return "grampsid"
elif retval in ["person", _("person")]:
return "person"
diff --git a/src/plugins/tool/tools.gpr.py b/src/plugins/tool/tools.gpr.py
index 9904d7284..5a8962ded 100644
--- a/src/plugins/tool/tools.gpr.py
+++ b/src/plugins/tool/tools.gpr.py
@@ -486,8 +486,8 @@ tool_modes = [TOOL_MODE_GUI]
register(TOOL,
id = 'reorder_ids',
-name = _("Reorder GRAMPS IDs"),
-description = _("Reorders the gramps IDs "
+name = _("Reorder Gramps IDs"),
+description = _("Reorders the Gramps IDs "
"according to Gramps' default rules."),
version = '1.0',
status = STABLE,
diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py
index 2ae557311..68ab15df3 100644
--- a/src/plugins/webreport/NarrativeWeb.py
+++ b/src/plugins/webreport/NarrativeWeb.py
@@ -945,7 +945,7 @@ class BasePage(object):
value = format_date(date.Today())
msg = _('Generated by '
- 'GRAMPS on %(date)s') % {
+ 'Gramps on %(date)s') % {
'date': value, 'homepage' : const.URL_HOMEPAGE
}