Merge lp:~ter0/scratch/fix-1097690 into lp:~elementary-apps/scratch/scratch

[Chris Johns]

Reordered splash screen buttons

[lp:~ter0/scratch/fix-1097690]

972. By Launchpad Translations on behalf of elementary-apps on 2013-01-10

Launchpad automatic translations update.

973. By Launchpad Translations on behalf of elementary-apps on 2013-01-13

Launchpad automatic translations update.

974. By Launchpad Translations on behalf of elementary-apps on 2013-01-15

Launchpad automatic translations update.

975. By Launchpad Translations on behalf of elementary-apps on 2013-01-17

Launchpad automatic translations update.

976. By Launchpad Translations on behalf of elementary-apps on 2013-01-22

Launchpad automatic translations update.

977. By Sergey "Shnatsel" Davidoff on 2013-01-24

merged lp:~shnatsel/scratch/fix-1101448

978. By Launchpad Translations on behalf of elementary-apps on 2013-01-28

Launchpad automatic translations update.

[Sergey "Shnatsel" Davidoff (shnatsel)]

Needs designer input on the original bug report: https://bugs.launchpad.net/scratch/+bug/1097690

[Danielle Foré (danrabbit)]

Commented on the report. I'm +1 to reversing the button order.

[lp:~ter0/scratch/fix-1097690]

979. By Sergey "Shnatsel" Davidoff on 2013-01-30

gsettings cleanup

980. By Chris Johns on 2013-01-30

Fixed file delete dialog typo

981. By Chris Johns on 2013-01-30

Fixed welcome button order

=== modified file 'src/Widgets/Notebook.vala'
--- src/Widgets/Notebook.vala	2012-12-01 17:45:15 +0000
+++ src/Widgets/Notebook.vala	2013-01-09 18:49:22 +0000
@@ -187,8 +187,9 @@
 
             base(_("No files are open."), _("Open a file to begin editing."));
             
+            append("document-new", _("New file"), _("Create a new empty file."));
             append("document-open", _("Open file"), _("Open a saved file."));
-            append("document-new", _("New file"), _("Create a new empty file."));
+
             this.activated.connect (on_activated);
             this.window = window;