Index: Tomboy/NoteWindow.cs
===================================================================
--- Tomboy/NoteWindow.cs	(revision 1977)
+++ Tomboy/NoteWindow.cs	(working copy)
@@ -439,7 +439,8 @@
 			
 			Gtk.ToolButton search = new Gtk.ToolButton (new Gtk.Image (Gtk.Stock.Find, tb.IconSize), Catalog.GetString ("Search"));
 			search.Clicked += SearchActivate;
-			toolbar_tips.SetTip (search, Catalog.GetString ("Search your notes (Ctrl-Shift-F)"), null);
+            // TODO: If we ever add a way to customize internal keybindings, this will need to change
+			toolbar_tips.SetTip (search, Catalog.GetString ("Search your notes") + " (Ctrl-Shift-F)", null);
 			search.AddAccelerator ("clicked",
 			                       accel_group,
 			                       (uint) Gdk.Key.f,
@@ -452,7 +453,8 @@
 			link_button = new Gtk.ToolButton (new Gtk.Image (Gtk.Stock.JumpTo, tb.IconSize), Catalog.GetString ("Link"));
 			link_button.Sensitive = (note.Buffer.Selection != null);
 			link_button.Clicked += LinkToNoteActivate;
-			toolbar_tips.SetTip (link_button, Catalog.GetString ("Link selected text to a new note (Ctrl-L)"), null);
+            // TODO: If we ever add a way to customize internal keybindings, this will need to change
+			toolbar_tips.SetTip (link_button, Catalog.GetString ("Link selected text to a new note") + " (Ctrl-L)", null);
 			link_button.AddAccelerator ("clicked",
 			                            accel_group,
 			                            (uint) Gdk.Key.l,
Index: Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs
===================================================================
--- Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs	(revision 1977)
+++ Tomboy/Addins/StickyNoteImport/StickyNoteImportNoteAddin.cs	(working copy)
@@ -141,8 +141,11 @@
 		{
 			ShowMessageDialog (
 			        Catalog.GetString ("Sticky Notes import completed"),
-			        string.Format (Catalog.GetString ("<b>{0}</b> of <b>{1}</b> Sticky Notes " +
-			                                          "were successfully imported."),
+			        string.Format (Catalog.GetPluralString ("<b>{0}</b> of <b>{1}</b> Sticky " +
+                                                            "Note was successfully imported.",
+                                                            "<b>{0}</b> of <b>{1}</b> Sticky " +
+                                                            "Notes were successfully imported.",
+                                                            numNotesImported),
 			                       numNotesImported,
 			                       numNotesTotal),
 			        Gtk.MessageType.Info);
Index: Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs
===================================================================
--- Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs	(revision 1977)
+++ Tomboy/Addins/NoteOfTheDay/NoteOfTheDayPreferences.cs	(working copy)
@@ -13,8 +13,8 @@
 		{
 			Gtk.Label label = new Gtk.Label (
 			        Catalog.GetString (
-			                "Change the <span weight=\"bold\">Today: Template</span> " +
-			                "note to customize the text that new Today notes have."));
+			                "Change the <b>Today: Template</b> note to customize " +
+                            "the text that new Today notes have."));
 			label.UseMarkup = true;
 			label.Wrap = true;
 			label.Show ();
Index: Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs
===================================================================
--- Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs	(revision 1977)
+++ Tomboy/Addins/Backlinks/BacklinksNoteAddin.cs	(working copy)
@@ -80,6 +80,7 @@
 
 			// If nothing was found, add in a "dummy" item
 			if (menu.Children.Length == 0) {
+                // This is a disabled placeholder item for an empty menu
 				Gtk.MenuItem blank_item = new Gtk.MenuItem (Catalog.GetString ("(none)"));
 				blank_item.Sensitive = false;
 				blank_item.ShowAll ();
Index: data/tomboy.schemas.in
===================================================================
--- data/tomboy.schemas.in	(revision 1977)
+++ data/tomboy.schemas.in	(working copy)
@@ -38,7 +38,7 @@
       <type>bool</type>
       <default>true</default>
       <locale name="C">
-         <short>Enable Auto bulleted lists.</short>
+         <short>Enable automatic bulleted lists.</short>
          <long>
          Enable this option if you want bulleted lists to be automatic when you place - or * at the beginning of a line.
          </long>
@@ -274,7 +274,7 @@
       <type>string</type>
       <default></default>
       <locale name="C">
-         <short>HTML Export Last Directory</short>
+         <short>Last Directory used in HTML Export</short>
          <long>
 	   The last directory a note was exported to using the Export To HTML plugin.
          </long>
