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

[Chris Johns]

Fixes bug. Also cleans up a lot of obsolete strings.

[Mario Guerriero (mefrio-g)]

you should edit the string in the warning dialog class too. Also don't edit translations manually but keep them handled by launchpad. So you should revert you changes and change the string into the vala class for warning dialogs. Then you will be able to change translations directly from launchpad.

[Cody Garver (codygarver)]

Mario, the way we update translations is:

cd scratch
cd build
cmake ..
make pot
cd ../
bzr commit -m "Update translations."

Are you doing it another way?

[Chris Johns (ter0)]

Thanks for the help guys. The method Cody suggests generates
scratch-text-editor.pot, but the one in the branch already was just
scratch.pot?

On 9 January 2013 16:51, Cody Garver <email address hidden> wrote:

> Mario, the way we update translations is:
>
> cd scratch
> cd build
> cmake ..
> make pot
> cd ../
> bzr commit -m "Update translations."
>
> Are you doing it another way?
> --
> https://code.launchpad.net/~ter0/scratch/fix-1097443/+merge/142485
> You are the owner of lp:~ter0/scratch/fix-1097443.
>

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

972. By Chris Johns on 2013-01-09

Changed label text.

[Cody Garver (codygarver)]

Chris, it's probably best if you ignore translations. Thanks for the fix!

Mario, make pot is how we manage all the other translation updates so you should consider checking it out.

=== modified file 'src/Dialogs/WarnDialog.vala'
--- src/Dialogs/WarnDialog.vala	2012-08-03 09:37:11 +0000
+++ src/Dialogs/WarnDialog.vala	2013-01-09 17:31:23 +0000
@@ -57,7 +57,7 @@
 	            text = ("<b>" + _("The file %s was deleted.") +  "</b>").printf(filename);
                     text += "\n\n" + _("Do you want to create it again?");
 	            
-	            add_button (Stock.YES, ResponseType.ACCEPT);
+	            add_button (_("Recreate"), ResponseType.ACCEPT);
                 add_button (Stock.CLOSE, ResponseType.CANCEL);
 	        }