update localization

Changed files (5)

• modified src/ExportTool.vala
• modified src/VersionList.vala
• added translations/birdfont-sv.po
• deleted translations/birdfont-sv_SE.po
• modified wscript

Diff

diff --git a/src/ExportTool.vala b/src/ExportTool.valaindex 97fcbc8..bc60186 100644--- a/src/ExportTool.vala+++ b/src/ExportTool.vala@@ -123,10 +123,10 @@ public class ExportTool : Tool { 		} catch (Error e) { 			stderr.printf (@"Export \"$svg_file\" \n"); 			critical (@"$(e.message)");-			status ("Can't export $svg_file.");+			status (_("Can't export") + @" $svg_file."); 		} 		-		status ("Wrote $svg_file.");+		status (_("Wrote") + @" $svg_file."); 	}  	public static void generate_html_document (string html_file, Font font) {@@ -288,7 +288,7 @@ os.put_string ( </div>  <div>-	<h4 class="smaller">Alphabet</h4>+	<h4 class="smaller">""" +  _("Alphabet") + """</h4> 	<p class="smaller">""" + _("a b c d e f g h i j k l m n o p q r s t u v w x y z") + """</p> 	<p class="smaller">""" + _("A B C D E F G H I J K L M N O P Q R S T U V W X Y Z") + """</p> 	<p class="smaller">0 1 2 3 4 5 6 7 8 9</p>@@ -446,7 +446,7 @@ os.put_string ( 			return false; 		} 		-		status (@"Wrote font files");+		status (_ ("Wrote font files")); 		return true; 	} diff --git a/src/VersionList.vala b/src/VersionList.valaindex 3ddc5ab..3f11a88 100644--- a/src/VersionList.vala+++ b/src/VersionList.vala@@ -67,10 +67,7 @@ public class VersionList : DropMenu { 	 	private void set_selected_item (MenuAction ma) { 		int i = ma.index;-		Tab? t;-		Tab tab;-		Font font = Supplement.get_current_font ();-					+				 		return_if_fail (0 <= i < glyphs.length ());  		current_version = i;diff --git a/translations/birdfont-sv.po b/translations/birdfont-sv.ponew file mode 100644index 0000000..22f4ceb--- /dev/null+++ b/translations/birdfont-sv.po@@ -0,0 +1,294 @@+# SOME DESCRIPTIVE TITLE.+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER+# This file is distributed under the same license as the PACKAGE package.+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.+#+#, fuzzy+msgid ""+msgstr ""+"Project-Id-Version: PACKAGE VERSION\n"+"Report-Msgid-Bugs-To: \n"+"POT-Creation-Date: 2012-12-05 18:37+0100\n"+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"+"Language-Team: LANGUAGE <LL@li.org>\n"+"Language: \n"+"MIME-Version: 1.0\n"+"Content-Type: text/plain; charset=utf-8\n"+"Content-Transfer-Encoding: 8bit\n"++#: src/Argument.vala:225+msgid "Usage"+msgstr ""++#: src/Argument.vala:229+msgid "show coordinate in glyph view"+msgstr ""++#: src/Argument.vala:230+msgid "exit if a testcase failes"+msgstr ""++#: src/Argument.vala:231+msgid "treat warnings as fatal"+msgstr ""++#: src/Argument.vala:232+msgid "show this message"+msgstr ""++#: src/Argument.vala:233+msgid "sleep between each command in test suite"+msgstr ""++#: src/Argument.vala:234+msgid "run test case"+msgstr ""++#: src/BackgroundTool.vala:40+msgid "Move, resize and rotate background image"+msgstr ""++#: src/Birdfont.vala:22+msgid "Usage:"+msgstr ""++#: src/Birdfont.vala:25+msgid "print this message\n"+msgstr ""++#: src/Birdfont.vala:26+msgid "write files to this directory\n"+msgstr ""++#: src/Birdfont.vala:27+msgid "write svg file\n"+msgstr ""++#: src/Birdfont.vala:28+msgid "write ttf and eot files\n"+msgstr ""++#: src/Birdfont.vala:118+msgid "Can't find output directory"+msgstr ""++#: src/Birdfont.vala:123 src/Birdfont.vala:128+msgid "Writing"+msgstr ""++#: src/ExportTool.vala:29+msgid "Export glyph to svg file"+msgstr ""++#: src/GlyphRange.vala:36+msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z"+msgstr ""++#: src/GlyphRange.vala:37+msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"+msgstr ""++#: src/MenuTab.vala:113+msgid "Create a new font"+msgstr ""++#: src/MenuTab.vala:114+msgid "Open an existing ffi file"+msgstr ""++#: src/MenuTab.vala:115+msgid "Save font"+msgstr ""++#: src/MenuTab.vala:116+msgid "Save font with a different name"+msgstr ""++#: src/MenuTab.vala:117+msgid "Show kerning context"+msgstr ""++#: src/MenuTab.vala:118+msgid "Add a new size for grid"+msgstr ""++#: src/MenuTab.vala:119+msgid "Remove current grid size"+msgstr ""++#: src/MenuTab.vala:136+msgid "Export"+msgstr ""++#: src/MenuTab.vala:137+msgid "Preview"+msgstr ""++#: src/MenuTab.vala:153+msgid "Recent files"+msgstr ""++#: src/MenuTab.vala:266 src/SaveDialog.vala:82+msgid "Save"+msgstr "Spara"++#: src/MergeTool.vala:23+msgid "Merge paths"+msgstr ""++#: src/MoveTool.vala:36+msgid "Move paths"+msgstr ""++#: src/PenTool.vala:48+msgid ""+"Right click to add new point, left click to move points and double click to "+"add new point on path"+msgstr ""++#: src/SaveDialog.vala:83+msgid "Save as"+msgstr "Spara som"++#: src/SaveDialog.vala:84+msgid "Discard"+msgstr ""++#: src/SaveDialog.vala:85+msgid "Cancel"+msgstr ""++#: src/Toolbox.vala:94+msgid ""+"Right click to add new point, left click to move points and double click to "+"ad new point on path"+msgstr ""++#: src/Toolbox.vala:101+msgid "Add new point on path"+msgstr ""++#: src/Toolbox.vala:109+msgid "Begin new path from point on path"+msgstr ""++#: src/Toolbox.vala:117+msgid "Tie curve handles for selected edit point"+msgstr ""++#: src/Toolbox.vala:137+msgid "Tie coordinates to previous edit point"+msgstr ""++#: src/Toolbox.vala:144+msgid "Delete edit points"+msgstr ""++#: src/Toolbox.vala:153+msgid "Set precision"+msgstr ""++#: src/Toolbox.vala:181+msgid "Create counter from outline"+msgstr ""++#: src/Toolbox.vala:193+msgid "Move to path to bottom layer"+msgstr ""++#: src/Toolbox.vala:205+msgid "Show full unicode characters set"+msgstr ""++#: src/Toolbox.vala:216+msgid "Show default characters set"+msgstr ""++#: src/Toolbox.vala:227+msgid "Show characters in font"+msgstr ""++#: src/Toolbox.vala:236+msgid "Delete selected glyph"+msgstr ""++#: src/Toolbox.vala:302+msgid "Show help lines for x-height and baseline"+msgstr ""++#: src/Toolbox.vala:317+msgid "Show help lines at top and bottom margin"+msgstr ""++#: src/Toolbox.vala:335+msgid "Zoom in"+msgstr ""++#: src/Toolbox.vala:342+msgid "Zoom out"+msgstr ""++#: src/Toolbox.vala:349+msgid "Zoom to scale 1:1"+msgstr ""++#: src/Toolbox.vala:357+msgid "Show full glyph"+msgstr ""++#: src/Toolbox.vala:364+msgid "Zoom in at region boundries"+msgstr ""++#: src/Toolbox.vala:371+msgid "Zoom in background image"+msgstr ""++#: src/Toolbox.vala:384+msgid "Previous view"+msgstr ""++#: src/Toolbox.vala:390+msgid "Next view"+msgstr ""++#: src/Toolbox.vala:397+msgid "Set size for background image"+msgstr ""++#: src/Toolbox.vala:427+msgid "Show/hide background image"+msgstr ""++#: src/Toolbox.vala:435+msgid "Insert new background image"+msgstr ""++#: src/Toolbox.vala:440+msgid "Creating thumbnails"+msgstr ""++#: src/Toolbox.vala:459+msgid "Set background contrast"+msgstr ""++#: src/Toolbox.vala:479+msgid "Set threshold"+msgstr ""++#: src/Toolbox.vala:670+msgid "Set size for grid"+msgstr ""++#: src/VersionList.vala:32+msgid "New version"+msgstr ""++#: src/VersionList.vala:86+msgid "Version"+msgstr ""++#, fuzzy+#~ msgid "Save?"+#~ msgstr "Spara"diff --git a/translations/birdfont-sv_SE.po b/translations/birdfont-sv_SE.podeleted file mode 100644index d2cac3b..0000000--- a/translations/birdfont-sv_SE.po+++ /dev/null@@ -1,327 +0,0 @@-# SOME DESCRIPTIVE TITLE.-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER-# This file is distributed under the same license as the PACKAGE package.-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.-#-#, fuzzy-msgid ""-msgstr ""-"Project-Id-Version: PACKAGE VERSION\n"-"Report-Msgid-Bugs-To: \n"-"POT-Creation-Date: 2012-12-05 18:53+0100\n"-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"-"Language-Team: LANGUAGE <LL@li.org>\n"-"Language: \n"-"MIME-Version: 1.0\n"-"Content-Type: text/plain; charset=utf-8\n"-"Content-Transfer-Encoding: 8bit\n"--#: src/Argument.c:1067-msgid "Usage"-msgstr ""--#: src/Argument.c:1079-msgid "show coordinate in glyph view"-msgstr ""--#: src/Argument.c:1081-msgid "exit if a testcase failes"-msgstr ""--#: src/Argument.c:1083-msgid "treat warnings as fatal"-msgstr ""--#: src/Argument.c:1085-msgid "show this message"-msgstr ""--#: src/Argument.c:1087-msgid "sleep between each command in test suite"-msgstr ""--#: src/Argument.c:1089-msgid "run test case"-msgstr ""--#: src/BackgroundTool.c:587-msgid "Move, resize and rotate background image"-msgstr ""--#: src/Birdfont.c:169-msgid "Usage:"-msgstr ""--#: src/Birdfont.c:179-msgid "print this message\n"-msgstr ""--#: src/Birdfont.c:185-msgid "write files to this directory\n"-msgstr ""--#: src/Birdfont.c:191-msgid "write svg file\n"-msgstr ""--#: src/Birdfont.c:197-msgid "write ttf and eot files\n"-msgstr ""--#: src/Birdfont.c:633-msgid "Can't find output directory"-msgstr ""--#: src/Birdfont.c:679 src/Birdfont.c:726-msgid "Writing"-msgstr ""--#: src/ExportTool.c:461-msgid "Export glyph to svg file"-msgstr ""--#: src/ExportTool.c:1229 src/GlyphRange.c:208-msgid "a b c d e f g h i j k l m n o p q r s t u v w x y z å ä ö"-msgstr ""--#: src/ExportTool.c:1261 src/GlyphRange.c:211-msgid "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z Å Ä Ö"-msgstr ""--#: src/MenuTab.c:992-msgid "Create a new font"-msgstr ""--#: src/MenuTab.c:1010-msgid "New"-msgstr ""--#: src/MenuTab.c:1017-msgid "Open an existing ffi file"-msgstr ""--#: src/MenuTab.c:1022-msgid "Open"-msgstr ""--#: src/MenuTab.c:1029-msgid "Save font"-msgstr ""--#: src/MenuTab.c:1034 src/MenuTab.c:1687 src/SaveDialog.c:334-msgid "Save"-msgstr "Spara"--#: src/MenuTab.c:1041-msgid "Save font with a different name"-msgstr ""--#: src/MenuTab.c:1046 src/SaveDialog.c:344-msgid "Save as"-msgstr "Spara som"--#: src/MenuTab.c:1053-msgid "Show kerning context"-msgstr ""--#: src/MenuTab.c:1058-msgid "Kerning context"-msgstr ""--#: src/MenuTab.c:1065-msgid "Add a new size for grid"-msgstr ""--#: src/MenuTab.c:1070-msgid "Add grid"-msgstr ""--#: src/MenuTab.c:1077-msgid "Remove current grid size"-msgstr ""--#: src/MenuTab.c:1082-msgid "Remove grid"-msgstr ""--#: src/MenuTab.c:1091-msgid "Edit"-msgstr ""--#: src/MenuTab.c:1128-msgid "Glyph sequence"-msgstr ""--#: src/MenuTab.c:1145-msgid "Name"-msgstr ""--#: src/MenuTab.c:1166-msgid "Export"-msgstr ""--#: src/MenuTab.c:1174-msgid "Export SVG, TTF & EOF fonts"-msgstr ""--#: src/MenuTab.c:1181-msgid "Preview"-msgstr ""--#: src/MenuTab.c:1189-msgid "Export SVG font and view the result"-msgstr ""--#: src/MenuTab.c:1243-msgid "Recent files"-msgstr ""--#: src/MergeTool.c:224-msgid "Merge paths"-msgstr ""--#: src/MoveTool.c:823-msgid "Move paths"-msgstr ""--#: src/PenTool.c:883 src/Toolbox.c:2376-msgid "Right click to add new point, left click to move points and double cli"-msgstr ""--#: src/SaveDialog.c:310-#, fuzzy-msgid "Save?"-msgstr "Spara"--#: src/SaveDialog.c:354-msgid "Discard"-msgstr ""--#: src/SaveDialog.c:364-msgid "Cancel"-msgstr ""--#: src/Toolbox.c:1882-msgid "Creating thumbnails"-msgstr ""--#: src/Toolbox.c:2382-msgid "Add new point on path"-msgstr ""--#: src/Toolbox.c:2395-msgid "Begin new path from point on path"-msgstr ""--#: src/Toolbox.c:2405-msgid "Tie curve handles for selected edit point"-msgstr ""--#: src/Toolbox.c:2413-msgid "Tie coordinates to previous edit point"-msgstr ""--#: src/Toolbox.c:2418-msgid "Delete edit points"-msgstr ""--#: src/Toolbox.c:2425-msgid "Set precision"-msgstr ""--#: src/Toolbox.c:2457-msgid "Create counter from outline"-msgstr ""--#: src/Toolbox.c:2465-msgid "Move to path to bottom layer"-msgstr ""--#: src/Toolbox.c:2473-msgid "Show full unicode characters set"-msgstr ""--#: src/Toolbox.c:2481-msgid "Show default characters set"-msgstr ""--#: src/Toolbox.c:2489-msgid "Show characters in font"-msgstr ""--#: src/Toolbox.c:2497-msgid "Delete selected glyph"-msgstr ""--#: src/Toolbox.c:2582-msgid "Show help lines for x-height and baseline"-msgstr ""--#: src/Toolbox.c:2588-msgid "Show help lines at top and bottom margin"-msgstr ""--#: src/Toolbox.c:2598-msgid "Zoom in"-msgstr ""--#: src/Toolbox.c:2604-msgid "Zoom out"-msgstr ""--#: src/Toolbox.c:2610-msgid "Zoom to scale 1:1"-msgstr ""--#: src/Toolbox.c:2616-msgid "Show full glyph"-msgstr ""--#: src/Toolbox.c:2622-msgid "Zoom in at region boundries"-msgstr ""--#: src/Toolbox.c:2628-msgid "Zoom in background image"-msgstr ""--#: src/Toolbox.c:2634-msgid "Previous view"-msgstr ""--#: src/Toolbox.c:2640-msgid "Next view"-msgstr ""--#: src/Toolbox.c:2646-msgid "Set size for background image"-msgstr ""--#: src/Toolbox.c:2673-msgid "Show/hide background image"-msgstr ""--#: src/Toolbox.c:2679-msgid "Insert new background image"-msgstr ""--#: src/Toolbox.c:2686-msgid "Set background contrast"-msgstr ""--#: src/Toolbox.c:2692-msgid "Set threshold"-msgstr ""--#: src/Toolbox.c:3313-msgid "Set size for grid"-msgstr ""--#: src/VersionList.c:382-msgid "New version"-msgstr ""--#: src/VersionList.c:585-msgid "Version"-msgstr ""diff --git a/wscript b/wscriptindex b195f13..15e545d 100644--- a/wscript+++ b/wscript@@ -73,7 +73,7 @@ def build(bld): 
 def update_translations (bld):
 	bld (
-		rule = "xgettext --language=C# --keyword=_ --from-code=utf-8 --output=birdfont.pot src/* 2&> xgettext.errors",
+		rule = "xgettext --language=C# --keyword=_ --from-code=utf-8 --output=../birdfont.pot src/* 2&> xgettext.errors",
 		name = "update pot",
 		always = True
 	)
@@ -85,9 +85,22 @@ def update_translations (bld): 		d = "../translations/birdfont-" + loc + ".po"
 
 		bld (
-			rule = "msgmerge " + d + """ birdfont.pot > """ + d + """.new && mv """ + d + ".new " + d,
-				
+			rule = "ls",
+			always = True
+		)
+
+		print (d)
+
+		bld (
+			rule = "msgmerge " + d + """ ../birdfont.pot > build/birdfont-""" + loc + ".po.new",
 			depends = "update pot",
+			name = "merge pot",
+			always = True
+		)		
+
+		bld (
+			rule = "mv build/birdfont-""" + loc + ".po.new " + d,
+			depends = "merge pot",
 			always = True
 		)