Merge lp:~codygarver/scratch/grammar-fixes into lp:~registry/scratch/scratch

[Cody Garver]

[Cody Garver (codygarver)]

Double check line 161 of src/Widgets/toolbar.vala

[xapantu (xapantu)]

Thanks for these changes, really appreciated :)

I don't have the time to merge your branch right now, but I am sure someone will merge your branch ASAP :)

review: Approve

=== modified file 'src/Dialogs/save_dialog.vala'
--- src/Dialogs/save_dialog.vala	2011-08-10 17:52:09 +0000
+++ src/Dialogs/save_dialog.vala	2011-09-13 15:50:45 +0000
@@ -41,7 +41,7 @@
 
             caller = callertab;
 
-            label = new Label(_("Changes on this file aren't saved.") + "\n" + _("Do you want to save changes before close this file?"));
+            label = new Label(_("Changes to this file haven't been saved.") + "\n" + _("Do you want to save changes before closing this file?"));
             image = new Image.from_stock(Stock.DIALOG_WARNING, IconSize.DIALOG);				
             
             headbox = new Box(Orientation.HORIZONTAL, 10);

=== modified file 'src/Widgets/menu.vala'
--- src/Widgets/menu.vala	2011-08-31 20:30:52 +0000
+++ src/Widgets/menu.vala	2011-09-13 15:50:45 +0000
@@ -41,9 +41,9 @@
         
         public void create () {		
             
-            view = new MenuItem.with_label (_("Add a new view"));
+            view = new MenuItem.with_label (_("Add New View"));
             
-            remove_view = new MenuItem.with_label (_("Remove current view"));
+            remove_view = new MenuItem.with_label (_("Remove Current View"));
             if (window.split_view != null) {
 				if (window.split_view.total_view <= 1) remove_view.set_sensitive(false);
 				else remove_view.set_sensitive(true);
@@ -55,9 +55,9 @@
             
             preferences = new ImageMenuItem.from_stock (Stock.PREFERENCES, null);
 
-            sidebar_visible = new CheckMenuItem.with_label (_("Show sidebar"));
+            sidebar_visible = new CheckMenuItem.with_label (_("Show Sidebar"));
             settings.schema.bind("sidebar-visible", sidebar_visible, "active", SettingsBindFlags.DEFAULT);
-            context_visible = new CheckMenuItem.with_label (_("Show context view"));
+            context_visible = new CheckMenuItem.with_label (_("Show Context View"));
             settings.schema.bind("context-visible", context_visible, "active", SettingsBindFlags.DEFAULT);
 
             context_visible.sensitive = false;

=== modified file 'src/Widgets/notebook.vala'
--- src/Widgets/notebook.vala	2011-09-12 09:47:58 +0000
+++ src/Widgets/notebook.vala	2011-09-13 15:50:45 +0000
@@ -337,12 +337,12 @@
 			
 			public ScratchWelcome(ScratchNotebook caller) {
 		
-				base(_("No files opened."), _("Open a file to start editing"));
+				base(_("No files are open."), _("Open a file to begin editing"));
 		
 				notebook = caller;
 		
 				append(Stock.OPEN, _("Open file"), _("open a saved file"));
-				append(Stock.NEW, _("New file"), _("create an new empty file"));
+				append(Stock.NEW, _("New file"), _("create a new empty file"));
 				this.activated.connect (on_activated);
 				
 				show_all();

=== modified file 'src/Widgets/share_menu.vala'
--- src/Widgets/share_menu.vala	2011-08-29 19:57:30 +0000
+++ src/Widgets/share_menu.vala	2011-09-13 15:50:45 +0000
@@ -36,7 +36,7 @@
             this.window = window;
 
             /*pastebin = new MenuItem.with_label (_("Upload to Pastebin..."));*/
-            share_email = new MenuItem.with_label (_("Share via email..."));
+            share_email = new MenuItem.with_label (_("Share via Email..."));
 
             /*append (pastebin);*/
             append (share_email);
@@ -51,7 +51,7 @@
 					GLib.Process.spawn_command_line_sync ("postler mailto:?attach=" + window.current_tab.filename);
 				}
 				else {
-					warning ("To share the file you need to save it!");
+					warning ("To share the file you need to save it first!");
 				}
 			});
 

=== modified file 'src/Widgets/toolbar.vala'
--- src/Widgets/toolbar.vala	2011-09-12 17:14:05 +0000
+++ src/Widgets/toolbar.vala	2011-09-13 15:50:45 +0000
@@ -158,7 +158,7 @@
            combobox.append ("fortran", "Fortran"); 
            combobox.append ("gettext-translation", "Gettext");
            combobox.append ("html", "HTML");
-           combobox.append ("ini", "ini");
+           combobox.append ("ini", "INI");
            combobox.append ("java", "Java");
            combobox.append ("js", "JavaScript");
            combobox.append ("latex", "Latex"); 

=== modified file 'src/main_window.vala'
--- src/main_window.vala	2011-09-13 14:30:55 +0000
+++ src/main_window.vala	2011-09-13 15:50:45 +0000
@@ -697,7 +697,7 @@
 						FileUtils.get_contents (filename, out text);
 						text = text.locale_to_utf8 (len, out r, out w); //TODO:fix it
                     } catch (Error e) {
-						status.set_text (_("The file cannot be opened"));
+						status.set_text (_("The file could not be opened"));
 					}
                     //get the filename from strig filename =)
                     var name = Filename.display_basename (filename);
@@ -746,7 +746,7 @@
             
             if (!can_write (filename)) {
 				debug ("Opening a file wich is Read Only");
-				status.set_text (_("The file is under 'Read Only' permissions"));
+				status.set_text (_("The file is 'Read Only'"));
 				current_tab.text_view.editable = false;
 			}