[glabels] Updated Japanese translation

[Takayuki Kusano <kusano src gnome org>]

commit 51b590ea08683c08ab39366970c140b1fc6f5eef
Author: Takayoshi OKANO <kano na rim or jp>
Date:   Thu Apr 14 23:39:53 2011 +0900

    Updated Japanese translation

 po/ja.po | 1938 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1173 insertions(+), 765 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 3591f48..45b14a2 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,384 +1,400 @@
 # glabels ja.po.
-# Copyright (C) 2001-2005,2007-2010 Free Software Foundation, Inc.
+# Copyright (C) 2001-2005,2007-2011 glabel's COPYRIGHT HOLDER
 # Takeshi Aihana <takeshi aihana gmail com>, 2001-2005,2007-2010.
+# Takayoshi OKANO <kano na rim or jp>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: glabels glabels_2_2\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 00:37-0400\n"
+"Project-Id-Version: glabels master\n"
+"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
+"POT-Creation-Date: 2011-04-03 14:39+0000\n"
 "PO-Revision-Date: 2010-05-11 23:01+0900\n"
-"Last-Translator: Takeshi AIHANA <takeshi aihana gmail com>\n"
+"Last-Translator: Takayoshi OKANO <kano na rim or jp>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../src/bc.c:66
+#: ../src/bc-backends.c:81
+msgid "Built-in"
+msgstr ""
+
+#: ../src/bc-backends.c:101
 msgid "POSTNET (any)"
 msgstr "POSTNET (ä½?ã?§ã??)"
 
-#: ../src/bc.c:69
+#: ../src/bc-backends.c:104
 msgid "POSTNET-5 (ZIP only)"
 msgstr "POSTNET-5 (ZIP ��)"
 
-#: ../src/bc.c:72
+#: ../src/bc-backends.c:107
 msgid "POSTNET-9 (ZIP+4)"
 msgstr "POSTNET-9 (ZIP+4)"
 
-#: ../src/bc.c:75
+#: ../src/bc-backends.c:110
 msgid "POSTNET-11 (DPBC)"
 msgstr "POSTNET-11 (DPBC)"
 
-#: ../src/bc.c:80
+#: ../src/bc-backends.c:113
 msgid "CEPNET"
 msgstr "CEPNET"
 
-#: ../src/bc.c:83
+#: ../src/bc-backends.c:116
+msgid "One Code"
+msgstr ""
+
+#: ../src/bc-backends.c:119 ../src/bc-backends.c:175 ../src/bc-backends.c:248
+msgid "Code 39"
+msgstr "Code 39"
+
+#: ../src/bc-backends.c:122 ../src/bc-backends.c:251
+#, fuzzy
+msgid "Code 39 Extended"
+msgstr "Code 39"
+
+#: ../src/bc-backends.c:127
 msgid "EAN (any)"
 msgstr "EAN (ä½?ã?§ã??)"
 
-#: ../src/bc.c:86
+#: ../src/bc-backends.c:130
 msgid "EAN-8"
 msgstr "EAN-8"
 
-#: ../src/bc.c:89
+#: ../src/bc-backends.c:133
 msgid "EAN-8 +2"
 msgstr "EAN-8 +2"
 
-#: ../src/bc.c:92
+#: ../src/bc-backends.c:136
 msgid "EAN-8 +5"
 msgstr "EAN-8 +5"
 
-#: ../src/bc.c:95
+#: ../src/bc-backends.c:139
 msgid "EAN-13"
 msgstr "EAN-13"
 
-#: ../src/bc.c:98
+#: ../src/bc-backends.c:142
 msgid "EAN-13 +2"
 msgstr "EAN-13 +2"
 
-#: ../src/bc.c:101
+#: ../src/bc-backends.c:145
 msgid "EAN-13 +5"
 msgstr "EAN-13 +5"
 
-#: ../src/bc.c:104
+#: ../src/bc-backends.c:148
 msgid "UPC (UPC-A or UPC-E)"
 msgstr "UPC (UPC-A ã?¾ã??ã?¯ UPC-E)"
 
-#: ../src/bc.c:107 ../src/bc.c:348
+#: ../src/bc-backends.c:151 ../src/bc-backends.c:395
 msgid "UPC-A"
 msgstr "UPC-A"
 
-#: ../src/bc.c:110
+#: ../src/bc-backends.c:154
 msgid "UPC-A +2"
 msgstr "UPC-A +2"
 
-#: ../src/bc.c:113
+#: ../src/bc-backends.c:157
 msgid "UPC-A +5"
 msgstr "UPC-A +5"
 
-#: ../src/bc.c:116 ../src/bc.c:351
+#: ../src/bc-backends.c:160 ../src/bc-backends.c:398
 msgid "UPC-E"
 msgstr "UPC-E"
 
-#: ../src/bc.c:119
+#: ../src/bc-backends.c:163
 msgid "UPC-E +2"
 msgstr "UPC-E +2"
 
-#: ../src/bc.c:122
+#: ../src/bc-backends.c:166
 msgid "UPC-E +5"
 msgstr "UPC-E +5"
 
-#: ../src/bc.c:125 ../src/bc.c:288
+#: ../src/bc-backends.c:169 ../src/bc-backends.c:332
 msgid "ISBN"
 msgstr "ISBN"
 
-#: ../src/bc.c:128
+#: ../src/bc-backends.c:172
 msgid "ISBN +5"
 msgstr "ISBN +5"
 
-#: ../src/bc.c:131 ../src/bc.c:204
-msgid "Code 39"
-msgstr "Code 39"
-
-#: ../src/bc.c:134 ../src/bc.c:216
+#: ../src/bc-backends.c:178 ../src/bc-backends.c:260
 msgid "Code 128"
 msgstr "Code 128"
 
-#: ../src/bc.c:137
+#: ../src/bc-backends.c:181
 msgid "Code 128C"
 msgstr "Code 128C"
 
-#: ../src/bc.c:140
+#: ../src/bc-backends.c:184
 msgid "Code 128B"
 msgstr "Code 128B"
 
-#: ../src/bc.c:143 ../src/bc.c:285
+#: ../src/bc-backends.c:187 ../src/bc-backends.c:329
 msgid "Interleaved 2 of 5"
 msgstr "綴ã??è¾¼ã?¿ 2/5"
 
-#: ../src/bc.c:146 ../src/bc.c:180
+#: ../src/bc-backends.c:190 ../src/bc-backends.c:224
 msgid "Codabar"
 msgstr "Codabar"
 
-#: ../src/bc.c:149
+#: ../src/bc-backends.c:193
 msgid "MSI"
 msgstr "MSI"
 
-#: ../src/bc.c:152
+#: ../src/bc-backends.c:196
 msgid "Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:155 ../src/bc.c:213
+#: ../src/bc-backends.c:199 ../src/bc-backends.c:257
 #, fuzzy
 msgid "Code 93"
 msgstr "Code 39"
 
-#: ../src/bc.c:162
+#: ../src/bc-backends.c:206
 msgid "Australia Post Standard"
 msgstr ""
 
-#: ../src/bc.c:165
+#: ../src/bc-backends.c:209
 msgid "Australia Post Reply Paid"
 msgstr ""
 
-#: ../src/bc.c:168
+#: ../src/bc-backends.c:212
 msgid "Australia Post Route Code"
 msgstr ""
 
-#: ../src/bc.c:171
+#: ../src/bc-backends.c:215
 msgid "Australia Post Redirect"
 msgstr ""
 
-#: ../src/bc.c:174
+#: ../src/bc-backends.c:218
 msgid "Aztec Code"
 msgstr ""
 
-#: ../src/bc.c:177
+#: ../src/bc-backends.c:221
 msgid "Aztec Rune"
 msgstr ""
 
-#: ../src/bc.c:183
+#: ../src/bc-backends.c:227
 #, fuzzy
 msgid "Code One"
 msgstr "Code 39"
 
-#: ../src/bc.c:186
+#: ../src/bc-backends.c:230
 #, fuzzy
 msgid "Code 11"
 msgstr "Code 128"
 
-#: ../src/bc.c:189
+#: ../src/bc-backends.c:233
 #, fuzzy
 msgid "Code 16K"
 msgstr "Code 128"
 
-#: ../src/bc.c:192
+#: ../src/bc-backends.c:236
 msgid "Code 2 of 5 Matrix"
 msgstr ""
 
-#: ../src/bc.c:195
+#: ../src/bc-backends.c:239
 msgid "Code 2 of 5 IATA"
 msgstr ""
 
-#: ../src/bc.c:198
+#: ../src/bc-backends.c:242
 msgid "Code 2 of 5 Data Logic"
 msgstr ""
 
-#: ../src/bc.c:201
+#: ../src/bc-backends.c:245
 msgid "Code 32 (Italian Pharmacode)"
 msgstr ""
 
-#: ../src/bc.c:207
-#, fuzzy
-msgid "Code 39 Extended"
-msgstr "Code 39"
-
-#: ../src/bc.c:210
+#: ../src/bc-backends.c:254
 #, fuzzy
 msgid "Code 49"
 msgstr "Code 39"
 
-#: ../src/bc.c:219
+#: ../src/bc-backends.c:263
 msgid "Code 128 (Mode C supression)"
 msgstr ""
 
-#: ../src/bc.c:222
+#: ../src/bc-backends.c:266
 msgid "DAFT Code"
 msgstr ""
 
-#: ../src/bc.c:225
+#: ../src/bc-backends.c:269
 #, fuzzy
 msgid "Data Matrix"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:228
+#: ../src/bc-backends.c:272
 msgid "Deutsche Post Leitcode"
 msgstr ""
 
-#: ../src/bc.c:231
+#: ../src/bc-backends.c:275
 msgid "Deutsche Post Identcode"
 msgstr ""
 
-#: ../src/bc.c:234
+#: ../src/bc-backends.c:278
 msgid "Dutch Post KIX Code"
 msgstr ""
 
-#: ../src/bc.c:237
-msgid "European Article Number (EAN)"
-msgstr ""
+#: ../src/bc-backends.c:281
+#, fuzzy
+msgid "EAN"
+msgstr "EAN-8"
 
-#: ../src/bc.c:240
+#: ../src/bc-backends.c:284
 msgid "Grid Matrix"
 msgstr ""
 
-#: ../src/bc.c:243
+#: ../src/bc-backends.c:287
 msgid "GS1-128"
 msgstr ""
 
-#: ../src/bc.c:246
+#: ../src/bc-backends.c:290
 msgid "GS1 DataBar-14"
 msgstr ""
 
-#: ../src/bc.c:255
+#: ../src/bc-backends.c:299
 msgid "GS1 DataBar-14 Stacked"
 msgstr ""
 
-#: ../src/bc.c:258
+#: ../src/bc-backends.c:302
 msgid "GS1 DataBar-14 Stacked Omni."
 msgstr ""
 
-#: ../src/bc.c:261
+#: ../src/bc-backends.c:305
 msgid "GS1 DataBar Extended Stacked"
 msgstr ""
 
-#: ../src/bc.c:264
+#: ../src/bc-backends.c:308
 #, fuzzy
 msgid "HIBC Code 128"
 msgstr "Code 128"
 
-#: ../src/bc.c:267
+#: ../src/bc-backends.c:311
 #, fuzzy
 msgid "HIBC Code 39"
 msgstr "Code 39"
 
-#: ../src/bc.c:270
+#: ../src/bc-backends.c:314
 #, fuzzy
 msgid "HIBC Data Matrix"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:273
+#: ../src/bc-backends.c:317
 msgid "HIBC QR Code"
 msgstr ""
 
-#: ../src/bc.c:276
+#: ../src/bc-backends.c:320
 msgid "HIBC PDF417"
 msgstr ""
 
-#: ../src/bc.c:279
+#: ../src/bc-backends.c:323
 msgid "HIBC Micro PDF417"
 msgstr ""
 
-#: ../src/bc.c:282
+#: ../src/bc-backends.c:326
 msgid "HIBC Aztec Code"
 msgstr ""
 
-#: ../src/bc.c:291
+#: ../src/bc-backends.c:335
 msgid "ITF-14"
 msgstr ""
 
-#: ../src/bc.c:294
+#: ../src/bc-backends.c:338
 msgid "Japanese Postal"
 msgstr ""
 
-#: ../src/bc.c:297
+#: ../src/bc-backends.c:341
 msgid "Korean Postal"
 msgstr ""
 
-#: ../src/bc.c:300
+#: ../src/bc-backends.c:344
 msgid "LOGMARS"
 msgstr ""
 
-#: ../src/bc.c:303
+#: ../src/bc-backends.c:347
+#, fuzzy
+msgid "Maxicode"
+msgstr "ã??ã?¼ã?³ã?¼ã??"
+
+#: ../src/bc-backends.c:350
 msgid "Micro PDF417"
 msgstr ""
 
-#: ../src/bc.c:306
+#: ../src/bc-backends.c:353
 msgid "Micro QR Code"
 msgstr ""
 
-#: ../src/bc.c:309
+#: ../src/bc-backends.c:356
 #, fuzzy
 msgid "MSI Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:312
+#: ../src/bc-backends.c:359
 msgid "NVE-18"
 msgstr ""
 
-#: ../src/bc.c:315
+#: ../src/bc-backends.c:362
 msgid "PDF417"
 msgstr ""
 
-#: ../src/bc.c:318
+#: ../src/bc-backends.c:365
 msgid "PDF417 Truncated"
 msgstr ""
 
-#: ../src/bc.c:321
+#: ../src/bc-backends.c:368
 #, fuzzy
 msgid "PLANET"
 msgstr "CEPNET"
 
-#: ../src/bc.c:324
+#: ../src/bc-backends.c:371
 #, fuzzy
 msgid "PostNet"
 msgstr "è²¼ã??ä»?ã??"
 
-#: ../src/bc.c:327
+#: ../src/bc-backends.c:374
 #, fuzzy
 msgid "Pharmacode"
 msgstr "ã??ã?¼ã?³ã?¼ã??"
 
-#: ../src/bc.c:330
+#: ../src/bc-backends.c:377
 msgid "Pharmacode 2-track"
 msgstr ""
 
-#: ../src/bc.c:333
+#: ../src/bc-backends.c:380
 msgid "Pharmazentral Nummer (PZN)"
 msgstr ""
 
-#: ../src/bc.c:336
+#: ../src/bc-backends.c:383
 msgid "QR Code"
 msgstr ""
 
-#: ../src/bc.c:339
+#: ../src/bc-backends.c:386
 msgid "Royal Mail 4-State"
 msgstr ""
 
-#: ../src/bc.c:342
+#: ../src/bc-backends.c:389
 #, fuzzy
 msgid "Telepen"
 msgstr "å??é?¤"
 
-#: ../src/bc.c:345
+#: ../src/bc-backends.c:392
 msgid "Telepen Numeric"
 msgstr ""
 
-#: ../src/bc.c:354
+#: ../src/bc-backends.c:401
 msgid "USPS One Code"
 msgstr ""
 
-#: ../src/bc.c:357
+#: ../src/bc-backends.c:404
 #, fuzzy
 msgid "UK Plessey"
 msgstr "Plessey"
 
-#: ../src/bc.c:364
+#: ../src/bc-backends.c:411
 msgid "IEC16022 (DataMatrix)"
 msgstr "IEC16022 (DataMatrix)"
 
-#: ../src/bc.c:371
+#: ../src/bc-backends.c:418
 msgid "IEC18004 (QRCode)"
 msgstr ""
 
@@ -570,7 +586,7 @@ msgstr "gLabels ã?§è?´å?½ç??ã?ªã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ï¼?"
 msgid "New Label or Card"
 msgstr "æ?°è¦?ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??"
 
-#: ../src/file.c:175 ../src/label.c:587 ../src/label.c:631
+#: ../src/file.c:175 ../src/label.c:601 ../src/label.c:645
 msgid "Label properties"
 msgstr "ã?©ã??ã?«ã?®ã??ã?­ã??ã??ã?£"
 
@@ -740,7 +756,7 @@ msgstr "端ã?®ã??ã?¼ã?¯ã??æ??ã??ã?¦å?°å?·ã??ã??"
 msgid "input file for merging"
 msgstr "ã??ã?¡ã?¤ã?«ã??ã??ã?¼ã?¸ã??ã??"
 
-#: ../src/glabels-batch.c:69 ../src/glabels.c:64
+#: ../src/glabels-batch.c:69 ../src/glabels.c:63
 msgid "[FILE...]"
 msgstr "[FILE...]"
 
@@ -748,7 +764,7 @@ msgstr "[FILE...]"
 msgid "Print files created with gLabels."
 msgstr ""
 
-#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#: ../src/glabels-batch.c:107 ../src/glabels.c:87
 #, c-format
 msgid ""
 "%s\n"
@@ -765,30 +781,30 @@ msgstr "gLabels ã??ã?¡ã?¤ã?« %s ã?¨ã??ã?­ã?¥ã?¡ã?³ã??ã??çµ?å??ã?§ã??ã?¾ã??ã??\n"
 msgid "cannot open glabels file %s\n"
 msgstr "gLabels ã?®ã??ã?¡ã?¤ã?« %s ã??é??ã??ã?¾ã??ã??\n"
 
-#: ../src/glabels.c:81
+#: ../src/glabels.c:79
 #, fuzzy
 msgid "Launch gLabels label and business card designer."
 msgstr "ã?©ã??ã?«ã?¨å??å?ºã??ã??ã?¶ã?¤ã?³ã??ã??ã??ã?­ã?°ã?©ã? ã?§ã??ã??\n"
 
-#: ../src/label-barcode.c:154 ../src/ui.c:319
+#: ../src/label-barcode.c:183 ../src/ui.c:317
 msgid "Create barcode object"
 msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/label-barcode.c:227 ../src/label-barcode.c:389
+#: ../src/label-barcode.c:259 ../src/label-barcode.c:461
 #, fuzzy
 msgid "Barcode data"
 msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??空ã?§ã??"
 
-#: ../src/label-barcode.c:263
+#: ../src/label-barcode.c:290
 #, fuzzy
 msgid "Barcode property"
 msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£"
 
-#: ../src/label-barcode.c:485
+#: ../src/label-barcode.c:684
 msgid "Barcode data empty"
 msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??空ã?§ã??"
 
-#: ../src/label-barcode.c:489
+#: ../src/label-barcode.c:688
 msgid "Invalid barcode data"
 msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 
@@ -797,13 +813,13 @@ msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã??ã?¼ã?¿ã??é??é??ã?£ã?¦ã??ã?¾ã??"
 msgid "Create box object"
 msgstr "æ??å­?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/label-box.c:230 ../src/label-ellipse.c:232 ../src/stock.c:93
+#: ../src/label-box.c:230 ../src/label-ellipse.c:232
 #: ../data/ui/property-bar.ui.h:3
 msgid "Fill color"
 msgstr "è?²ã?§å¡?ã??ã?¤ã?¶ã??ã?¾ã??"
 
 #: ../src/label-box.c:261 ../src/label-ellipse.c:261 ../src/label-line.c:212
-#: ../src/stock.c:94 ../data/ui/property-bar.ui.h:8
+#: ../data/ui/property-bar.ui.h:8
 msgid "Line color"
 msgstr "ç·?ã?®è?²ã??é?¸æ??ã??ã?¾ã??"
 
@@ -812,79 +828,79 @@ msgstr "ç·?ã?®è?²ã??é?¸æ??ã??ã?¾ã??"
 msgid "Line width"
 msgstr "ç·?å¹?"
 
-#: ../src/label.c:402
+#: ../src/label.c:405
 msgid "Untitled"
 msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
 
-#: ../src/label.c:705 ../src/ui.c:422
+#: ../src/label.c:719 ../src/ui.c:420
 msgid "Merge properties"
 msgstr "ã??ã?­ã??ã??ã?£ã?®çµ?å??"
 
-#: ../src/label.c:1197 ../src/ui.c:215
+#: ../src/label.c:1215 ../src/ui.c:213
 msgid "Delete"
 msgstr "å??é?¤"
 
-#: ../src/label.c:1230 ../src/ui.c:324
+#: ../src/label.c:1248 ../src/ui.c:322
 msgid "Bring to front"
 msgstr "å??é?¢ã?«æ??ã?£ã?¦ã??ã??"
 
-#: ../src/label.c:1266 ../src/ui.c:331
+#: ../src/label.c:1284 ../src/ui.c:329
 msgid "Send to back"
-msgstr "å¾?ã??ã?«ã?¾ã??ã??(_B)"
+msgstr "å¾?ã??ã?«ã?¾ã??ã??"
 
-#: ../src/label.c:1307
+#: ../src/label.c:1325
 msgid "Rotate"
 msgstr "å??転ã??ã??ã??"
 
-#: ../src/label.c:1342 ../src/ui.c:338
+#: ../src/label.c:1360 ../src/ui.c:336
 msgid "Rotate left"
 msgstr "å·¦ã?«å??転ã??ã??"
 
-#: ../src/label.c:1375 ../src/ui.c:345
+#: ../src/label.c:1393 ../src/ui.c:343
 msgid "Rotate right"
 msgstr "å?³ã?«å??転ã??ã??"
 
-#: ../src/label.c:1410 ../src/ui.c:352
+#: ../src/label.c:1428 ../src/ui.c:350
 msgid "Flip horizontally"
 msgstr "æ°´å¹³æ?¹å??ã?«ã??ã?ªã??ã??ã??ã??"
 
-#: ../src/label.c:1445 ../src/ui.c:359
+#: ../src/label.c:1463 ../src/ui.c:357
 msgid "Flip vertically"
 msgstr "å??ç?´æ?¹å??ã?«ã??ã?ªã??ã??ã??ã??"
 
-#: ../src/label.c:1485 ../src/ui.c:366
+#: ../src/label.c:1503 ../src/ui.c:364
 msgid "Align left"
 msgstr "å·¦å¯?ã??"
 
-#: ../src/label.c:1542 ../src/ui.c:373
+#: ../src/label.c:1560 ../src/ui.c:371
 msgid "Align right"
 msgstr "å?³å¯?ã??"
 
-#: ../src/label.c:1603 ../src/ui.c:380
+#: ../src/label.c:1621 ../src/ui.c:378
 msgid "Align horizontal center"
 msgstr "中央å¯?ã?? (æ°´å¹³æ?¹å??)"
 
-#: ../src/label.c:1679 ../src/ui.c:387
+#: ../src/label.c:1697 ../src/ui.c:385
 msgid "Align tops"
 msgstr "ä¸?å¯?ã??"
 
-#: ../src/label.c:1736 ../src/ui.c:394
+#: ../src/label.c:1754 ../src/ui.c:392
 msgid "Align bottoms"
 msgstr "ä¸?å¯?ã??"
 
-#: ../src/label.c:1797 ../src/ui.c:401
+#: ../src/label.c:1815 ../src/ui.c:399
 msgid "Align vertical center"
 msgstr "中央å¯?ã?? (å??ç?´æ?¹å??)"
 
-#: ../src/label.c:1875 ../src/ui.c:408
+#: ../src/label.c:1893 ../src/ui.c:406
 msgid "Center horizontally"
 msgstr "水平移å??"
 
-#: ../src/label.c:1922 ../src/ui.c:415
+#: ../src/label.c:1940 ../src/ui.c:413
 msgid "Center vertically"
 msgstr "å??ç?´ç§»å??"
 
-#: ../src/label.c:2610 ../src/label.c:2652 ../src/label.c:2678 ../src/ui.c:208
+#: ../src/label.c:2628 ../src/label.c:2670 ../src/label.c:2696 ../src/ui.c:206
 msgid "Paste"
 msgstr "è²¼ã??ä»?ã??"
 
@@ -893,7 +909,7 @@ msgstr "è²¼ã??ä»?ã??"
 msgid "Create ellipse object"
 msgstr "ç?´ç·?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/label-image.c:200 ../src/ui.c:312
+#: ../src/label-image.c:200 ../src/ui.c:310
 msgid "Create image object"
 msgstr "ç?»å??ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
@@ -902,108 +918,117 @@ msgstr "ç?»å??ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 msgid "Set image"
 msgstr "ç?»å??ã?µã?¤ã?ºã?®ã?ªã?»ã??ã??"
 
-#: ../src/label-line.c:147 ../src/ui.c:298
+#: ../src/label-line.c:147 ../src/ui.c:296
 msgid "Create line object"
 msgstr "ç?´ç·?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/label-object.c:383 ../src/label-object.c:416
+#: ../src/label-object.c:394 ../src/label-object.c:428
 msgid "Move"
 msgstr ""
 
-#: ../src/label-object.c:467
+#: ../src/label-object.c:479
 #, fuzzy
 msgid "Resize"
 msgstr "ç?¨ç´?ã?®å¤§ã??ã??:"
 
-#: ../src/label-object.c:1185
+#: ../src/label-object.c:1217
 #, fuzzy
 msgid "Shadow state"
 msgstr "å½±"
 
-#: ../src/label-object.c:1228
+#: ../src/label-object.c:1260
 #, fuzzy
 msgid "Shadow offset"
 msgstr "å½±"
 
-#: ../src/label-object.c:1276
+#: ../src/label-object.c:1308
 #, fuzzy
 msgid "Shadow color"
 msgstr "å½±"
 
-#: ../src/label-object.c:1319
+#: ../src/label-object.c:1351
 #, fuzzy
 msgid "Shadow opacity"
 msgstr "å½±"
 
-#: ../src/label-text.c:279 ../src/ui.c:284
+#: ../src/label-text.c:281 ../src/ui.c:282
 msgid "Create text object"
 msgstr "æ??å­?ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/label-text.c:451
+#: ../src/label-text.c:453
 #, fuzzy
 msgid "Typing"
 msgstr "ã??ã?³ã?¯"
 
-#: ../src/label-text.c:584 ../data/ui/property-bar.ui.h:4
+#: ../src/label-text.c:586 ../data/ui/property-bar.ui.h:4
 msgid "Font family"
 msgstr "ã??ã?©ã?³ã??å??"
 
-#: ../src/label-text.c:622 ../data/ui/property-bar.ui.h:5
+#: ../src/label-text.c:624 ../data/ui/property-bar.ui.h:5
 msgid "Font size"
 msgstr "ã??ã?©ã?³ã??ã?®å¤§ã??ã??"
 
-#: ../src/label-text.c:655
+#: ../src/label-text.c:657
 #, fuzzy
 msgid "Font weight"
 msgstr "å?³ã?«å??転ã??ã??"
 
-#: ../src/label-text.c:688 ../data/ui/property-bar.ui.h:6
+#: ../src/label-text.c:690 ../data/ui/property-bar.ui.h:6
 msgid "Italic"
 msgstr "ã?¤ã?¿ã?ªã??ã?¯"
 
-#: ../src/label-text.c:721
+#: ../src/label-text.c:723
 #, fuzzy
 msgid "Align text"
 msgstr "å·¦å¯?ã??"
 
-#: ../src/label-text.c:754
+#: ../src/label-text.c:756
 #, fuzzy
 msgid "Line spacing"
 msgstr "è¡?é??:"
 
-#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
+#: ../src/label-text.c:789 ../data/ui/property-bar.ui.h:11
 msgid "Text color"
 msgstr "æ??å­?ã?®è?²"
 
-#: ../src/label-text.c:931
+#: ../src/label-text.c:933
 msgid "Auto shrink"
 msgstr ""
 
-#: ../src/media-select.c:349 ../src/media-select.c:353
-#: ../src/media-select.c:502 ../src/media-select.c:701
+#: ../src/media-select.c:358 ../src/media-select.c:361
+#: ../src/media-select.c:506 ../src/media-select.c:723
 #, fuzzy
 msgctxt "Brand"
 msgid "Any"
 msgstr "ã??ã??ã??ã??"
 
-#: ../src/media-select.c:358 ../src/media-select.c:871
+#: ../src/media-select.c:365 ../src/media-select.c:893
 #, fuzzy
 msgctxt "Page size"
 msgid "Any"
 msgstr "ã??ã??ã??ã??"
 
-#: ../src/media-select.c:367 ../src/media-select.c:370
-#: ../src/media-select.c:880
+#: ../src/media-select.c:372 ../src/media-select.c:375
+#: ../src/media-select.c:902
 #, fuzzy
 msgctxt "Category"
 msgid "Any"
 msgstr "ã??ã??ã??ã??"
 
-#: ../src/media-select.c:968
+#: ../src/media-select.c:648
+#, c-format
+msgid "Delete template \"%s\"?"
+msgstr ""
+
+#: ../src/media-select.c:650
+msgid "This action will permanently delete this template."
+msgstr ""
+
+#: ../src/media-select.c:990
 msgid "No recent templates found."
 msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../src/media-select.c:970
+#: ../src/media-select.c:992
 #, fuzzy
 msgid "Try selecting a template in the \"Search all\" tab."
 msgstr ""
@@ -1012,20 +1037,20 @@ msgstr ""
 
 #. Translators: "No match" means that for the given template search criteria, there
 #. * were no matches found.
-#: ../src/media-select.c:1061
+#: ../src/media-select.c:1083
 msgid "No match."
 msgstr "è¦?ã?¤ã??ã??ã?¾ã??ã??"
 
-#: ../src/media-select.c:1063
+#: ../src/media-select.c:1085
 msgid "Try selecting a different brand, page size or category."
 msgstr "å?¥ã?®ã??ã?©ã?³ã??ã??ç?¨ç´?ã?®å¤§ã??ã??ã??ã?¾ã??ã?¯ã?«ã??ã?´ã?ªã??æ??å®?ã??ã?¦ã?¿ã?¦ä¸?ã??ã??ã??"
 
-#: ../src/media-select.c:1157
+#: ../src/media-select.c:1179
 #, fuzzy
 msgid "No custom templates found."
 msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??"
 
-#: ../src/media-select.c:1159
+#: ../src/media-select.c:1181
 msgid ""
 "You may create new templates or try searching for pre-defined templates in "
 "the \"Search all\" tab."
@@ -1037,22 +1062,6 @@ msgstr ""
 msgid "None"
 msgstr "ã?ªã??"
 
-#: ../src/merge-evolution.c:316
-msgid "Couldn't construct query"
-msgstr "ã?¯ã?¨ã?ªã??æ§?ç¯?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/merge-evolution.c:322 ../src/merge-evolution.c:333
-msgid "Couldn't open addressbook."
-msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??é??ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/merge-evolution.c:348
-msgid "Couldn't list available fields."
-msgstr "å?©ç?¨å?¯è?½ã?ªé ?å??ã?®ä¸?覧ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
-#: ../src/merge-evolution.c:384
-msgid "Couldn't get contacts."
-msgstr "é?£çµ¡å??ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
-
 #: ../src/merge-init.c:57
 msgid "Text: Comma Separated Values (CSV)"
 msgstr ""
@@ -1095,27 +1104,27 @@ msgstr "Evolution ã?¢ã??ã?¬ã?¹å¸³ã?®ã??ã?¼ã?¿"
 msgid "VCards"
 msgstr "ã??ã?³ã??ã?®ã?«ã?¼ã??"
 
-#: ../src/merge-properties-dialog.c:282
+#: ../src/merge-properties-dialog.c:280
 msgid "Merge Properties"
 msgstr "çµ?å??ã??ã?­ã??ã??ã?£"
 
-#: ../src/merge-properties-dialog.c:308 ../src/merge-properties-dialog.c:424
+#: ../src/merge-properties-dialog.c:304 ../src/merge-properties-dialog.c:420
 msgid "Select merge-database source"
 msgstr "çµ?å??ã??ã?¼ã?¿ã??ã?¼ã?¹ã?»ã?½ã?¼ã?¹ã?®é?¸æ??"
 
-#: ../src/merge-properties-dialog.c:319 ../src/merge-properties-dialog.c:450
+#: ../src/merge-properties-dialog.c:315 ../src/merge-properties-dialog.c:446
 msgid "N/A"
 msgstr "N/A"
 
-#: ../src/merge-properties-dialog.c:345
+#: ../src/merge-properties-dialog.c:341
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../src/merge-properties-dialog.c:352
+#: ../src/merge-properties-dialog.c:348
 msgid "Record/Field"
 msgstr "ã?¬ã?³ã?¼ã??/ã??ã?£ã?¼ã?«ã??"
 
-#: ../src/merge-properties-dialog.c:360 ../data/ui/object-editor.ui.h:8
+#: ../src/merge-properties-dialog.c:356 ../data/ui/object-editor.ui.h:10
 msgid "Data"
 msgstr "ã??ã?¼ã?¿"
 
@@ -1123,12 +1132,12 @@ msgstr "ã??ã?¼ã?¿"
 #. * no further choices to further define the source of data.  E.g. if you select the
 #. * evolution-data-server, there are no further choices -- the source is "Fixed."
 #.
-#: ../src/merge-properties-dialog.c:443
+#: ../src/merge-properties-dialog.c:439
 msgid "Fixed"
 msgstr "��"
 
 #. Translators: "Up" refers to the direction towards the top of a label.
-#: ../src/mini-preview.c:1074
+#: ../src/mini-preview.c:1054
 msgid "Up"
 msgstr ""
 
@@ -1145,37 +1154,37 @@ msgstr ""
 msgid "Review"
 msgstr ""
 
-#: ../src/object-editor-bc-page.c:93 ../src/object-editor-shadow-page.c:93
-#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:339
-#: ../src/ui-property-bar.c:280
+#: ../src/object-editor-bc-page.c:97 ../src/object-editor-shadow-page.c:93
+#: ../src/object-editor-text-page.c:97 ../src/prefs-dialog.c:335
+#: ../src/ui-property-bar.c:277
 msgid "Default"
 msgstr "ã??ã??ã?©ã?«ã??"
 
-#: ../src/object-editor.c:159 ../src/object-editor.c:460
+#: ../src/object-editor.c:161 ../src/object-editor.c:470
 msgid "Object properties"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£"
 
-#: ../src/object-editor.c:309
+#: ../src/object-editor.c:314
 msgid "Box object properties"
 msgstr "ç?©å½¢ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£"
 
-#: ../src/object-editor.c:328
+#: ../src/object-editor.c:333
 msgid "Ellipse object properties"
 msgstr "æ¥?å??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£"
 
-#: ../src/object-editor.c:347
+#: ../src/object-editor.c:352
 msgid "Line object properties"
 msgstr "ç?´ç·?ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£"
 
-#: ../src/object-editor.c:364
+#: ../src/object-editor.c:369
 msgid "Image object properties"
 msgstr "ç?»å??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£"
 
-#: ../src/object-editor.c:381
+#: ../src/object-editor.c:386
 msgid "Text object properties"
 msgstr "æ??å­?ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£"
 
-#: ../src/object-editor.c:403
+#: ../src/object-editor.c:408
 msgid "Barcode object properties"
 msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£"
 
@@ -1183,189 +1192,97 @@ msgstr "ã??ã?¼ã?³ã?¼ã??ã?»ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£"
 msgid "Insert merge field"
 msgstr "çµ?å??ã??ã?£ã?¼ã?«ã??ã?®æ?¿å?¥"
 
-#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:345
-#: ../src/ui-property-bar.c:292
+#: ../src/object-editor-fill-page.c:79 ../src/prefs-dialog.c:341
+#: ../src/ui-property-bar.c:287
 #, fuzzy
 msgid "No Fill"
 msgstr "å¡?ã??ã?¤ã?¶ã??ã?ªã??"
 
-#: ../src/object-editor-image-page.c:278
+#: ../src/object-editor-image-page.c:302
 msgid "All Files"
 msgstr "å?¨ã?¦ã?®ã??ã?¡ã?¤ã?«"
 
-#: ../src/object-editor-image-page.c:283
+#: ../src/object-editor-image-page.c:307
 msgid "All Images"
 msgstr "å?¨ã?¦ã?®ç?»å??"
 
-#: ../src/object-editor-image-page.c:298
+#: ../src/object-editor-image-page.c:323
 #, c-format
 msgid "%s (*.%s)"
 msgstr "%s (*.%s)"
 
-#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:342
-#: ../src/ui-property-bar.c:304
+#: ../src/object-editor-line-page.c:79 ../src/prefs-dialog.c:338
+#: ../src/ui-property-bar.c:297
 #, fuzzy
 msgid "No Line"
 msgstr "ç·?ã??æ¶?ã??"
 
-#: ../src/prefs-dialog.c:172 ../data/ui/prefs-dialog.ui.h:21
+#: ../src/object-editor-size-page.c:89
+msgid "Lock aspect ratio."
+msgstr ""
+
+#: ../src/prefs-dialog.c:168 ../data/ui/prefs-dialog.ui.h:21
 msgid "gLabels Preferences"
 msgstr "gLabels �設�"
 
-#. ===================================================================
-#: ../src/print-op.c:205 ../src/print-op-dialog.c:217
+#. TODO: Is this the actual part #?
+#: ../src/print-op.c:205 ../src/print-op-dialog.c:215
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:4
-#: ../templates/misc-iso-templates.xml.h:34
+#: ../templates/misc-iso-templates.xml.h:24
 msgid "Labels"
 msgstr "ã?©ã??ã?«"
 
-#: ../src/stock.c:70
-msgid "_Select Mode"
-msgstr "é?¸æ??ã?¢ã?¼ã??(_S)"
-
-#: ../src/stock.c:71
-msgid "_Text"
-msgstr "æ??å­?(_T)"
-
-#: ../src/stock.c:72
-msgid "_Line"
-msgstr "ç?´ç·?(_L)"
-
-#: ../src/stock.c:73
-msgid "_Box"
-msgstr "ç?©å½¢(_B)"
-
-#: ../src/stock.c:74
-msgid "_Ellipse"
-msgstr "æ¥?å??(_E)"
-
-#: ../src/stock.c:75
-msgid "_Image"
-msgstr "ç?»å??(_I)"
-
-#: ../src/stock.c:76
-msgid "Bar_code"
-msgstr "ã??ã?¼ã?³ã?¼ã??(_C)"
-
-#: ../src/stock.c:77
-msgid "_Merge Properties"
-msgstr "çµ?å??ã??ã?­ã??ã??ã?£(_M)"
-
-#: ../src/stock.c:78
-msgid "Object _Properties"
-msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£(_P)"
-
-#: ../src/stock.c:79
-msgid "Bring to _Front"
-msgstr "å??ã?«æ??ã?£ã?¦ã??ã??(_F)"
-
-#: ../src/stock.c:80
-msgid "Send to _Back"
-msgstr "å¾?ã??ã?«ã?¾ã??ã??(_B)"
-
-#: ../src/stock.c:81
-msgid "Rotate _Left"
-msgstr "å·¦ã?«å??転(_L)"
-
-#: ../src/stock.c:82
-msgid "Rotate _Right"
-msgstr "å?³ã?«å??転(_R)"
-
-#: ../src/stock.c:83
-msgid "Flip _Horizontally"
-msgstr "æ°´å¹³æ?¹å??ã?«ã??ã?ªã??ã??(_H)"
-
-#: ../src/stock.c:84
-msgid "Flip _Vertically"
-msgstr "å??ç?´æ?¹å??ã?«ã??ã?ªã??ã??(_V)"
-
-#: ../src/stock.c:85
-msgid "_Lefts"
-msgstr "左端(_L)"
-
-#: ../src/stock.c:86
-msgid "_Rights"
-msgstr "�端(_R)"
-
-#: ../src/stock.c:87
-msgid "_Centers"
-msgstr "中央(_C)"
-
-#: ../src/stock.c:88
-msgid "_Tops"
-msgstr "�端(_T)"
-
-#: ../src/stock.c:89
-msgid "Bottoms"
-msgstr "��"
-
-#: ../src/stock.c:90
-msgid "Centers"
-msgstr "中央"
-
-#: ../src/stock.c:91 ../src/stock.c:92
-msgid "Label Ce_nter"
-msgstr "ã?©ã??ã?«ã?®ä¸­å¿?(_N)"
-
-#: ../src/stock.c:95 ../src/stock.c:97
-msgid "Linked"
-msgstr "çµ?å??æ¸?"
-
-#: ../src/stock.c:96 ../src/stock.c:98
-msgid "Not Linked"
-msgstr "çµ?å??ã?ªã??"
-
-#: ../src/template-designer.c:404
+#: ../src/template-designer.c:429
 #, fuzzy
 msgid "New gLabels Template"
 msgstr "gLabels ã??ã?³ã??ã?¬ã?¼ã??ã?»ã??ã?¶ã?¤ã??"
 
-#: ../src/template-designer.c:461
+#: ../src/template-designer.c:487
 msgid "Welcome"
 msgstr "ã??ã??ã??ã??"
 
-#: ../src/template-designer.c:500
+#: ../src/template-designer.c:526
 msgid "Name and Description"
 msgstr "å??å??ã?¨èª¬æ??"
 
-#: ../src/template-designer.c:548
+#: ../src/template-designer.c:575
 msgid "Page Size"
 msgstr "ç?¨ç´?ã?®å¤§ã??ã??"
 
-#: ../src/template-designer.c:614
+#: ../src/template-designer.c:642
 msgid "Label or Card Shape"
 msgstr "ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??ã?®å½¢ç?¶"
 
-#: ../src/template-designer.c:661
+#: ../src/template-designer.c:689 ../src/template-designer.c:790
 msgid "Label or Card Size"
 msgstr "ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??ã?®å¤§ã??ã??"
 
-#: ../src/template-designer.c:760
+#: ../src/template-designer.c:873
 msgid "Label Size (round)"
 msgstr "ã?©ã??ã?«ã?®å¤§ã??ã?? (å??)"
 
-#: ../src/template-designer.c:841
+#: ../src/template-designer.c:954
 msgid "Label Size (CD/DVD)"
 msgstr "ã?©ã??ã?«ã?®å¤§ã??ã?? (CD/DVD)"
 
-#: ../src/template-designer.c:932
+#: ../src/template-designer.c:1045
 msgid "Number of Layouts"
 msgstr "ã?¬ã?¤ã?¢ã?¦ã??ã?®æ?°"
 
-#: ../src/template-designer.c:1000
+#: ../src/template-designer.c:1113
 msgid "Layout(s)"
 msgstr "ã?¬ã?¤ã?¢ã?¦ã??"
 
-#: ../src/template-designer.c:1105
+#: ../src/template-designer.c:1218
 msgid "Design Completed"
 msgstr "ã??ã?¶ã?¤ã?³ã??å®?äº?ã??ã?¾ã??ã??"
 
-#: ../src/template-designer.c:1133
+#: ../src/template-designer.c:1246
 #, fuzzy
 msgid "Edit gLabels Template"
 msgstr "gLabels ã??ã?³ã??ã?¬ã?¼ã??ã?»ã??ã?¶ã?¤ã??"
 
-#: ../src/template-designer.c:1423
+#: ../src/template-designer.c:1549
 #, fuzzy
 msgid "Brand and part# match an existing template!"
 msgstr ""
@@ -1373,382 +1290,382 @@ msgstr ""
 "ã??ã?¬ã?¼ã??ã?¨å??ã??ã?§ã??ï¼?</span>"
 
 #. Menu entries.
-#: ../src/ui.c:93
+#: ../src/ui.c:91
 msgid "_File"
 msgstr "ã??ã?¡ã?¤ã?«(_F)"
 
-#: ../src/ui.c:94
+#: ../src/ui.c:92
 msgid "Open Recent _Files"
 msgstr "æ??è¿?é??ã??ã??ã??ã?¡ã?¤ã?«(_F)"
 
-#: ../src/ui.c:95
+#: ../src/ui.c:93
 msgid "_Edit"
 msgstr "ç·¨é??(_E)"
 
-#: ../src/ui.c:96
+#: ../src/ui.c:94
 msgid "_View"
 msgstr "表示(_V)"
 
-#: ../src/ui.c:97
+#: ../src/ui.c:95
 msgid "Customize Main Toolbar"
 msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼"
 
-#: ../src/ui.c:98
+#: ../src/ui.c:96
 msgid "Customize Drawing Toolbar"
 msgstr "æ??ç?»ã??ã?¼ã?«ã??ã?¼"
 
-#: ../src/ui.c:99
+#: ../src/ui.c:97
 msgid "Customize Properties Toolbar"
 msgstr "ã??ã?­ã??ã??ã?£ã?»ã??ã?¼ã?«ã??ã?¼"
 
-#: ../src/ui.c:100
+#: ../src/ui.c:98
 msgid "_Objects"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??(_O)"
 
-#: ../src/ui.c:101
+#: ../src/ui.c:99
 msgid "_Create"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®ç??æ??(_C)"
 
-#: ../src/ui.c:102
+#: ../src/ui.c:100
 msgid "_Order"
 msgstr "æ?´å??(_O)"
 
-#: ../src/ui.c:103
+#: ../src/ui.c:101
 msgid "_Rotate/Flip"
 msgstr "å??転/ã??ã?ªã??ã??(_R)"
 
-#: ../src/ui.c:104
+#: ../src/ui.c:102
 msgid "Align _Horizontal"
 msgstr "æ°´å¹³æ?¹å??ã?«é??ç½®(_H)"
 
-#: ../src/ui.c:105
+#: ../src/ui.c:103
 msgid "Align _Vertical"
 msgstr "å??ç?´æ?¹å??ã?«é??ç½®(_V)"
 
-#: ../src/ui.c:106
+#: ../src/ui.c:104
 msgid "_Help"
 msgstr "ã??ã?«ã??(_H)"
 
 #. Popup entries.
-#: ../src/ui.c:109 ../src/ui.c:110
+#: ../src/ui.c:107 ../src/ui.c:108
 msgid "Context Menu"
 msgstr "ã?³ã?³ã??ã?­ã?¹ã??ã?»ã?¡ã??ã?¥ã?¼"
 
-#: ../src/ui.c:115
+#: ../src/ui.c:113
 msgid "_New"
 msgstr "��(_N)"
 
-#: ../src/ui.c:117
+#: ../src/ui.c:115
 msgid "Create a new file"
 msgstr "æ?°ã??ã??ã??ã?¡ã?¤ã?«ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/ui.c:122
+#: ../src/ui.c:120
 msgid "_Open..."
 msgstr "é??ã??(_O)..."
 
-#: ../src/ui.c:124
+#: ../src/ui.c:122
 msgid "Open a file"
 msgstr "ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
 
-#: ../src/ui.c:129
+#: ../src/ui.c:127
 msgid "_Save"
 msgstr "ä¿?å­?(_S)"
 
-#: ../src/ui.c:131
+#: ../src/ui.c:129
 msgid "Save current file"
 msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??ä¿?å­?ã??ã?¾ã??"
 
-#: ../src/ui.c:136
+#: ../src/ui.c:134
 msgid "Save _As..."
 msgstr "å?¥å??ã?§ä¿?å­?(_A)..."
 
-#: ../src/ui.c:138
+#: ../src/ui.c:136
 msgid "Save the current file to a different name"
 msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã?«å?¥ã?®å??å??ã??ä»?ã??ã?¦ä¿?å­?ã??ã?¾ã??"
 
-#: ../src/ui.c:143
+#: ../src/ui.c:141
 msgid "_Print..."
 msgstr "å?°å?·(_P)..."
 
-#: ../src/ui.c:145
+#: ../src/ui.c:143
 msgid "Print the current file"
 msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??å?°å?·ã??ã?¾ã??"
 
-#: ../src/ui.c:150
+#: ../src/ui.c:148
 msgid "Properties..."
 msgstr "ã??ã?­ã??ã??ã?£..."
 
-#: ../src/ui.c:152
+#: ../src/ui.c:150
 msgid "Modify document properties"
 msgstr "ã??ã?­ã?¥ã?¡ã?³ã??ã?®ã??ã?­ã??ã??ã?£ã??修正ã??ã?¾ã??"
 
-#: ../src/ui.c:157
+#: ../src/ui.c:155
 msgid "Template _Designer..."
 msgstr "ã??ã?³ã??ã?¬ã?¼ã??ã?»ã??ã?¶ã?¤ã??(_D)..."
 
-#: ../src/ui.c:159
+#: ../src/ui.c:157
 msgid "Create a custom template"
 msgstr "ç?¬è?ªã?®ã??ã?³ã??ã?¬ã?¼ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/ui.c:164
+#: ../src/ui.c:162
 msgid "_Close"
 msgstr "é??ã??ã??(_C)"
 
-#: ../src/ui.c:166
+#: ../src/ui.c:164
 msgid "Close the current file"
 msgstr "ã??ã?®ã??ã?¡ã?¤ã?«ã??é??ã??ã?¾ã??"
 
-#: ../src/ui.c:171
+#: ../src/ui.c:169
 msgid "_Quit"
 msgstr "��(_Q)"
 
-#: ../src/ui.c:173
+#: ../src/ui.c:171
 msgid "Quit the program"
 msgstr "gLabels ã??çµ?äº?ã??ã?¾ã??"
 
-#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+#: ../src/ui.c:178 ../src/ui.c:180 ../src/ui.c:965
 msgid "Undo"
 msgstr ""
 
-#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
+#: ../src/ui.c:185 ../src/ui.c:187 ../src/ui.c:972
 msgid "Redo"
 msgstr ""
 
-#: ../src/ui.c:194
+#: ../src/ui.c:192
 msgid "Cut"
 msgstr "å??ã??å??ã??"
 
-#: ../src/ui.c:196
+#: ../src/ui.c:194
 msgid "Cut the selection"
 msgstr "é?¸æ??ç¯?å?²ã??å??ã??å??ã??ã?¾ã??"
 
-#: ../src/ui.c:201
+#: ../src/ui.c:199
 msgid "Copy"
 msgstr "ã?³ã??ã?¼"
 
-#: ../src/ui.c:203
+#: ../src/ui.c:201
 msgid "Copy the selection"
 msgstr "é?¸æ??ç¯?å?²ã??ã?³ã??ã?¼ã??ã?¾ã??"
 
-#: ../src/ui.c:210
+#: ../src/ui.c:208
 msgid "Paste the clipboard"
 msgstr "ã?¯ã?ªã??ã??ã??ã?¼ã??ã?®å??容ã??è²¼ã??ä»?ã??ã?¾ã??"
 
-#: ../src/ui.c:217
+#: ../src/ui.c:215
 msgid "Delete the selected objects"
 msgstr "é?¸æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã??å??é?¤ã??ã?¾ã??"
 
-#: ../src/ui.c:222
+#: ../src/ui.c:220
 msgid "Select All"
 msgstr "å?¨ã?¦é?¸æ??"
 
-#: ../src/ui.c:224
+#: ../src/ui.c:222
 msgid "Select all objects"
 msgstr "å?¨ã?¦ã?®ã?ªã??ã?¸ã?§ã?¯ã??ã??é?¸æ??ã??ã?¾ã??"
 
-#: ../src/ui.c:229
+#: ../src/ui.c:227
 msgid "Un-select All"
 msgstr "å?¨ã?¦é?¸æ??解é?¤"
 
-#: ../src/ui.c:231
+#: ../src/ui.c:229
 msgid "Remove all selections"
 msgstr "é?¸æ??ç¯?å?²ã??解é?¤ã??ã?¾ã??"
 
-#: ../src/ui.c:236
+#: ../src/ui.c:234
 msgid "Preferences"
 msgstr "gLabels �設�"
 
-#: ../src/ui.c:238
+#: ../src/ui.c:236
 msgid "Configure the application"
 msgstr "gLabels ã?®è¨­å®?ã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:245
+#: ../src/ui.c:243
 msgid "Zoom in"
 msgstr "�大"
 
-#: ../src/ui.c:247
+#: ../src/ui.c:245
 msgid "Increase magnification"
 msgstr "æ?¡å¤§ç??ã??ä¸?ã??ã?¾ã??"
 
-#: ../src/ui.c:252
+#: ../src/ui.c:250
 msgid "Zoom out"
 msgstr "縮�"
 
-#: ../src/ui.c:254
+#: ../src/ui.c:252
 msgid "Decrease magnification"
 msgstr "æ?¡å¤§ç??ã??ä¸?ã??ã?¾ã??"
 
-#: ../src/ui.c:259
+#: ../src/ui.c:257
 msgid "Zoom 1 to 1"
 msgstr "æ?¡å¤§ç?? 1:1"
 
-#: ../src/ui.c:261
+#: ../src/ui.c:259
 msgid "Restore scale to 100%"
 msgstr "æ?¡å¤§ç??ã?? 100% ã?«æ?»ã??ã?¾ã??"
 
-#: ../src/ui.c:266
+#: ../src/ui.c:264
 msgid "Zoom to fit"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã?«ã??ã??ã??ã??"
 
-#: ../src/ui.c:268
+#: ../src/ui.c:266
 msgid "Set scale to fit window"
 msgstr "ã?¦ã?£ã?³ã??ã?¦ã?®å¤§ã??ã??ã?«å??ã??ã??ã?¾ã??"
 
-#: ../src/ui.c:275
+#: ../src/ui.c:273
 msgid "Select Mode"
 msgstr "é?¸æ??ã?¢ã?¼ã??"
 
-#: ../src/ui.c:277
+#: ../src/ui.c:275
 msgid "Select, move and modify objects"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®é?¸æ??ã??移å??ã??ç·¨é??ã??è¡?ã??ã?¾ã??"
 
-#: ../src/ui.c:282 ../src/view-text.c:102 ../data/ui/object-editor.ui.h:28
+#: ../src/ui.c:280 ../src/view-text.c:94 ../data/ui/object-editor.ui.h:30
 #: ../data/ui/prefs-dialog.ui.h:17
 msgid "Text"
 msgstr "æ??å­?"
 
-#: ../src/ui.c:289
+#: ../src/ui.c:287
 msgid "Box"
 msgstr "ç?©å½¢"
 
-#: ../src/ui.c:291
+#: ../src/ui.c:289
 msgid "Create box/rectangle object"
 msgstr "å??è§?/ä¸?è§?ã?®ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/ui.c:296 ../data/ui/object-editor.ui.h:17
+#: ../src/ui.c:294 ../data/ui/object-editor.ui.h:19
 #: ../data/ui/prefs-dialog.ui.h:9
 msgid "Line"
 msgstr "ç?´ç·?"
 
-#: ../src/ui.c:303
+#: ../src/ui.c:301
 msgid "Ellipse"
 msgstr "æ¥?å??"
 
-#: ../src/ui.c:305
+#: ../src/ui.c:303
 msgid "Create ellipse/circle object"
 msgstr "æ¥?å??/å??ã?ªã??ã?¸ã?§ã?¯ã??ã??ä½?æ??ã??ã?¾ã??"
 
-#: ../src/ui.c:310 ../data/ui/object-editor.ui.h:14
+#: ../src/ui.c:308 ../data/ui/object-editor.ui.h:16
 msgid "Image"
 msgstr "ç?»å??"
 
-#: ../src/ui.c:317
+#: ../src/ui.c:315
 msgid "Barcode"
 msgstr "ã??ã?¼ã?³ã?¼ã??"
 
-#: ../src/ui.c:326
+#: ../src/ui.c:324
 msgid "Raise object to top"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å??é?¢ã?«æ??ã?£ã?¦ã??ã?¾ã??"
 
-#: ../src/ui.c:333
+#: ../src/ui.c:331
 msgid "Lower object to bottom"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å¾?ã??ã?«ã?¾ã??ã??ã?¾ã??"
 
-#: ../src/ui.c:340
+#: ../src/ui.c:338
 msgid "Rotate object 90 degrees counter-clockwise"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å??æ??è¨?å??ã??ã?« 90°å??転ã??ã??ã?¾ã??"
 
-#: ../src/ui.c:347
+#: ../src/ui.c:345
 msgid "Rotate object 90 degrees clockwise"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??æ??è¨?å??ã??ã?« 90°å??転ã??ã??ã?¾ã??"
 
-#: ../src/ui.c:354
+#: ../src/ui.c:352
 msgid "Flip object horizontally"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??æ°´å¹³æ?¹å??ã?«ã?²ã?£ã??ã??è¿?ã??ã?¾ã??"
 
-#: ../src/ui.c:361
+#: ../src/ui.c:359
 msgid "Flip object vertically"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å??ç?´æ?¹å??ã?«ã?²ã?£ã??ã??è¿?ã??ã?¾ã??"
 
-#: ../src/ui.c:368
+#: ../src/ui.c:366
 msgid "Align objects to left edges"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??左端ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:375
+#: ../src/ui.c:373
 msgid "Align objects to right edges"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å?³ç«¯ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:382
+#: ../src/ui.c:380
 msgid "Align objects to horizontal centers"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??æ°´å¹³æ?¹å??ã?®ä¸­å¿?ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:389
+#: ../src/ui.c:387
 msgid "Align objects to top edges"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??ä¸?端ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:396
+#: ../src/ui.c:394
 msgid "Align objects to bottom edges"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??ä¸?端ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:403
+#: ../src/ui.c:401
 msgid "Align objects to vertical centers"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??å??ç?´æ?¹å??ã?®ä¸­å¿?ã?«é??ç½®ã??ã?¾ã??"
 
-#: ../src/ui.c:410
+#: ../src/ui.c:408
 msgid "Center objects to horizontal label center"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??ã?©ã??ã?«ã?®ä¸­å¿?ã?«æ°´å¹³ç§»å??ã??ã?¾ã??"
 
-#: ../src/ui.c:417
+#: ../src/ui.c:415
 msgid "Center objects to vertical label center"
 msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã??ã?©ã??ã?«ã?®ä¸­å¿?ã?«å??ç?´ç§»å??ã??ã?¾ã??"
 
-#: ../src/ui.c:424
+#: ../src/ui.c:422
 msgid "Edit merge properties"
 msgstr "çµ?å??ã??ã??ã??ã?­ã??ã??ã?£ã??ç·¨é??ã??ã?¾ã??"
 
-#: ../src/ui.c:431
+#: ../src/ui.c:429
 msgid "Contents"
 msgstr "�次"
 
-#: ../src/ui.c:433
+#: ../src/ui.c:431
 msgid "Open glabels manual"
 msgstr "gLabels ã?®ã??ã??ã?¥ã?¢ã?«ã??é??ã??ã?¾ã??"
 
-#: ../src/ui.c:438
+#: ../src/ui.c:436
 msgid "About..."
 msgstr "æ??å ±..."
 
-#: ../src/ui.c:440
+#: ../src/ui.c:438 ../src/ui-commands.c:1198
 msgid "About glabels"
 msgstr "gLabels ã?«ã?¤ã??ã?¦"
 
-#: ../src/ui.c:450
+#: ../src/ui.c:448
 msgid "Property toolbar"
 msgstr "ã??ã?­ã??ã??ã?£ã?®ã??ã?¼ã?«ã??ã?¼"
 
-#: ../src/ui.c:452
+#: ../src/ui.c:450
 msgid "Change the visibility of the property toolbar in the current window"
 msgstr "ã??ã?­ã??ã??ã?£ã?»ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤º/é??表示ã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:458
+#: ../src/ui.c:456
 msgid "Grid"
 msgstr "ã?°ã?ªã??ã??"
 
-#: ../src/ui.c:460
+#: ../src/ui.c:458
 msgid "Change the visibility of the grid in the current window"
 msgstr "ã?©ã??ã?«ã?®ã?°ã?ªã??ã?? (æ ¼å­?ç·?) ã?®è¡¨ç¤º/é??表示ã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:466
+#: ../src/ui.c:464
 msgid "Markup"
 msgstr "ã??ã?¼ã?¯ã?¢ã??ã??"
 
-#: ../src/ui.c:468
+#: ../src/ui.c:466
 msgid "Change the visibility of markup lines in the current window"
 msgstr "ã?©ã??ã?«ã?®å¤?æ? ç·?ã?®è¡¨ç¤º/é??表示ã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:479
+#: ../src/ui.c:477
 msgid "Main toolbar"
 msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼"
 
-#: ../src/ui.c:481
+#: ../src/ui.c:479
 msgid "Change the visibility of the main toolbar in the current window"
 msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤º/é??表示ã??å¤?æ?´ã??ã?¾ã??"
 
-#: ../src/ui.c:487
+#: ../src/ui.c:485
 msgid "Drawing toolbar"
 msgstr "ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤ºæ?¹æ³?"
 
-#: ../src/ui.c:489
+#: ../src/ui.c:487
 msgid "Change the visibility of the drawing toolbar in the current window"
 msgstr "ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤º/é??表示ã??å¤?æ?´ã??ã?¾ã??"
 
@@ -1756,26 +1673,26 @@ msgstr "ã??ã?¼ã?«ã??ã?¼ã?®è¡¨ç¤º/é??表示ã??å¤?æ?´ã??ã?¾ã??"
 msgid "Glabels includes contributions from:"
 msgstr "gLabels ã?®é??ç?ºã?«è²¢ç?®ã??ã?¦ã??ã??ã??æ?¹ã??:"
 
-#: ../src/ui-commands.c:1141
+#: ../src/ui-commands.c:1144
 msgid "See the file AUTHORS for additional credits,"
 msgstr "è£?足ã?®ã?¯ã?¬ã?¸ã??ã??ã?«ã?¤ã??ã?¦ã?¯ AUTHORS ã??ã?¡ã?¤ã?«ã??ã??覧ã?«ã?ªã??ã??ã??"
 
-#: ../src/ui-commands.c:1142
+#: ../src/ui-commands.c:1145
 #, fuzzy
 msgid "or visit http://glabels.org/";
 msgstr "ã?¾ã??ã?¯ http://glabels.sourceforge.net/ ã??訪ã??ã?¦ã?¿ã?¦ä¸?ã??ã??ã??"
 
-#: ../src/ui-commands.c:1154
+#: ../src/ui-commands.c:1162
 msgid "A label and business card creation program.\n"
 msgstr "ã?©ã??ã?«ã?¨å??å?ºã??ã??ã?¶ã?¤ã?³ã??ã??ã??ã?­ã?°ã?©ã? ã?§ã??ã??\n"
 
-#: ../src/ui-commands.c:1158
+#: ../src/ui-commands.c:1166
 msgid "translator-credits"
 msgstr ""
 "�� � <takeshi aihana gmail com>\n"
 "��GNOME����� http://www.gnome.gr.jp";
 
-#: ../src/ui-commands.c:1161
+#: ../src/ui-commands.c:1169
 #, fuzzy
 msgid ""
 "gLabels is free software: you can redistribute it and/or modify\n"
@@ -1797,90 +1714,32 @@ msgstr ""
 "販売ç?®ç??ã?¾ã??ã?¯å??ç?¨ç?®ç??ã?®ä¿?証ã?¯ã??ã??ã?¾ã??ã??ã??\n"
 "詳細ã?«ã?¤ã??ã?¦ã?¯ GNU ä¸?è?¬å?¬è¡?使ç?¨è¨±è«¾å¥?ç´?æ?¸ã??ã??覧ä¸?ã??ã??ã??\n"
 
-#: ../src/ui-commands.c:1190
-msgid "glabels"
-msgstr "gLabels"
-
 #: ../src/warning-handler.c:69
 msgid "gLabels Error!"
 msgstr "gLabels ã?®ã?¨ã?©ã?¼ã?§ã??ï¼?"
 
-#: ../src/window.c:284
+#: ../src/window.c:281
 msgid "(none) - gLabels"
 msgstr "(ã?ªã??) - gLabels"
 
-#: ../src/window.c:485
+#: ../src/window.c:482
 msgid "(modified)"
 msgstr "(����)"
 
-#: ../src/xml-label-04.c:75 ../src/xml-label.c:333
-#, c-format
-msgid "Bad root node = \"%s\""
-msgstr "ã??ã??ã??ã?ª root ã?®ã??ã?¼ã?? = \"%s\""
-
-#: ../src/xml-label-04.c:123 ../src/xml-label.c:416
-#, c-format
-msgid "bad node =  \"%s\""
-msgstr "ã??ã??ã??ã?ªã??ã?¼ã?? = \"%s\""
-
-#: ../src/xml-label.c:199 ../src/xml-label.c:237
-msgid "xmlParseFile error"
-msgstr "xmlParseFile ���"
-
-#: ../src/xml-label.c:274
-msgid "No document root"
-msgstr "root ã??ã?­ã?¥ã?¡ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
-
-#: ../src/xml-label.c:282
-msgid "Importing from glabels 0.1 format"
-msgstr "gLabels 0.1 å½¢å¼?ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã??"
-
-#: ../src/xml-label.c:291
-msgid "Importing from glabels 0.4 format"
-msgstr "gLabels 0.4 å½¢å¼?ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã??"
-
-#: ../src/xml-label.c:301
-#, c-format
-msgid "Unknown glabels Namespace -- Using %s"
-msgstr "glabels ã?®å??å??空é??ã??ä¸?æ??ã?§ã?? -- %s ã??å?©ç?¨ã??ã?¦ä¸?ã??ã??"
-
-#: ../src/xml-label.c:370
-#, c-format
-msgid "bad node in Document node =  \"%s\""
-msgstr "Document ã??ã?¼ã??ã?«ã??ã??ã??ã?ª root ã?®ã??ã?¼ã?? = \"%s\""
-
-#: ../src/xml-label.c:868
-#, c-format
-msgid "bad node in Data node =  \"%s\""
-msgstr "Data ã??ã?¼ã??ã?«ã??ã??ã??ã?ªã??ã?¼ã?? = \"%s\""
-
-#: ../src/xml-label.c:944
-#, fuzzy, c-format
-msgid "Unknown embedded file format: \"%s\""
-msgstr "ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?® ID ã?¾ã??ã?¯å??å?? \"%s\" ã??ä¸?æ??ã?§ã??ã??"
-
-#: ../src/xml-label.c:1150 ../libglabels/xml-template.c:802
-msgid "Utf8 conversion error."
-msgstr "Utf8 å¤?æ??ã?¨ã?©ã?¼ã?§ã??ã??"
-
-#: ../src/xml-label.c:1157
-msgid "Problem saving xml file."
-msgstr "XML ã??ã?¡ã?¤ã?«ã?®ä¿?å­?ã?§å??é¡?ã??ã??ã??ã?¾ã??"
-
 #. Create and append an "Other" entry.
 #. Translators: "Other" here means other page size.  Meaning a page size
 #. * other than the standard ones that libglabels knows about such as
 #. * "letter", "A4", etc.
-#: ../libglabels/db.c:270
+#: ../libglabels/lgl-db.c:267
 msgid "Other"
 msgstr "ã??ã?®ä»?"
 
 #. Create and append a "User defined" entry.
-#: ../libglabels/db.c:279
+#: ../libglabels/lgl-db.c:276
 msgid "User defined"
 msgstr "æ??å®?ã??ã??"
 
-#: ../libglabels/db.c:665
+#: ../libglabels/lgl-db.c:663
 msgid ""
 "Unable to locate paper size definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1888,7 +1747,7 @@ msgstr ""
 "ç?¨ç´?ã?®å¤§ã??ã??ã??å®?義ã??ã??ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã?? (libglabels ã??æ­£ã??ã??ã?¤ã?³"
 "ã?¹ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)"
 
-#: ../libglabels/db.c:1057
+#: ../libglabels/lgl-db.c:1062
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
@@ -1896,7 +1755,7 @@ msgstr ""
 "ã?«ã??ã?´ã?ªã??å®?義ã??ã??ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã?? (libglabels ã??æ­£ã??ã??ã?¤ã?³ã?¹"
 "ã??ã?¼ã?«ã??ã??ã?¦ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)"
 
-#: ../libglabels/db.c:2097
+#: ../libglabels/lgl-db.c:1989
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
@@ -1904,34 +1763,29 @@ msgstr ""
 "ã??ã?³ã??ã?¬ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã??è¦?ã?¤ã??ã??ã?¾ã??ã??ã?§ã??ã?? (libglabels ã??æ­£ã??ã??ã?¤ã?³ã?¹ã??ã?¼ã?«"
 "ã??ã??ã?¦ã??ã?ªã??å?¯è?½æ?§ã??ã??ã??ã?¾ã??)"
 
-#: ../libglabels/db.c:2164
+#: ../libglabels/lgl-db.c:2056
 #, fuzzy, c-format
 msgid "%s full page label"
 msgstr "ä¸?è?¬ç??ã?ª %s ã?®å?¨ã??ã?¼ã?¸ã?»ã??ã?³ã??ã?¬ã?¼ã??"
 
-#: ../libglabels/template.c:156
-#, c-format
-msgid "Equivalent part (\"%s\") for \"%s\", not previously defined."
-msgstr ""
-
 #.
 #. * Translators: 1st %d = number of labels across a page,
 #. *              2nd %d = number of labels down a page,
 #. *              3rd %d = total number of labels on a page (sheet).
 #.
-#: ../libglabels/template.c:727
+#: ../libglabels/lgl-template.c:673
 #, fuzzy, c-format
 msgid "%d Ã? %d (%d per sheet)"
 msgstr "%d /ã?·ã?¼ã??"
 
 #. Translators: %d is the total number of labels on a page (sheet).
-#: ../libglabels/template.c:732
+#: ../libglabels/lgl-template.c:678
 #, c-format
 msgid "%d per sheet"
 msgstr "%d /ã?·ã?¼ã??"
 
-#: ../libglabels/template.c:802 ../libglabels/template.c:808
-#: ../libglabels/template.c:818 ../libglabels/template.c:824
+#: ../libglabels/lgl-template.c:759 ../libglabels/lgl-template.c:767
+#: ../libglabels/lgl-template.c:779 ../libglabels/lgl-template.c:787
 #, fuzzy
 msgid "diameter"
 msgstr "%s %s å??ç??"
@@ -1940,63 +1794,32 @@ msgstr "%s %s å??ç??"
 #. the CSS2 Specification (Section 4.3.2)
 #. This table must be sorted exactly as the enumerations in lglUnits
 #. [LGL_UNITS_POINT]
-#: ../libglabels/units.c:65 ../data/ui/object-editor.ui.h:39
+#: ../libglabels/lgl-units.c:65 ../data/ui/object-editor.ui.h:42
 #: ../data/ui/prefs-dialog.ui.h:22
 msgid "points"
 msgstr "ã??ã?¤ã?³ã??"
 
 #. [LGL_UNITS_INCH]
-#: ../libglabels/units.c:66 ../data/ui/object-editor.ui.h:38
-#: ../data/ui/template-designer.ui.h:62
+#: ../libglabels/lgl-units.c:66 ../data/ui/object-editor.ui.h:40
+#: ../data/ui/template-designer.ui.h:66
 msgid "inches"
 msgstr "[ã?¤ã?³ã??]"
 
 #. [LGL_UNITS_MM]
-#: ../libglabels/units.c:67
+#: ../libglabels/lgl-units.c:67
 msgid "mm"
 msgstr "[ã??ã?ª]"
 
 #. [LGL_UNITS_CM]
-#: ../libglabels/units.c:68
+#: ../libglabels/lgl-units.c:68
 msgid "cm"
 msgstr ""
 
 #. [LGL_UNITS_PICA]
-#: ../libglabels/units.c:69
+#: ../libglabels/lgl-units.c:69
 msgid "picas"
 msgstr ""
 
-#: ../libglabels/xml-template.c:223
-msgid "Missing name or brand/part attributes."
-msgstr "å??å??ã?¾ã??ã?¯ã??ã?©ã?³ã??/ã??ã?¼ã??ç?ªå?·ã?¨ã??ã?£ã??å±?æ?§ã??ã??ã??ã?¾ã??ã??ã??"
-
-#. This should always be an id, but just in case a name
-#. slips by!
-#: ../libglabels/xml-template.c:244
-#, c-format
-msgid "Unknown page size id \"%s\", trying as name"
-msgstr "ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?® ID \"%s\" ã??ä¸?æ??ã?ªã?®ã?§å??å??ã?¨ã??ã?¦æ?±ã??ã?¾ã??ã??"
-
-#: ../libglabels/xml-template.c:256
-#, c-format
-msgid "Unknown page size id or name \"%s\""
-msgstr "ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?® ID ã?¾ã??ã?¯å??å?? \"%s\" ã??ä¸?æ??ã?§ã??ã??"
-
-#: ../libglabels/xml-template.c:275
-msgid "Forward references not supported."
-msgstr ""
-
-#: ../libglabels/xml-template.c:747
-msgid ""
-"Missing required \"brand\" or \"part\" attribute, trying deprecated name."
-msgstr ""
-"å¿?é ?ã?¨ã?ªã?? \"ã??ã?©ã?³ã??å??\" ã?? \"ã??ã?¼ã??ç?ªå?·\" ã?¨ã??ã?£ã??å±?æ?§ã??è¦?ã?¤ã??ã??ã?¾ã??ã?? (å»?"
-"æ­¢ã??ã??å??å??ã??試ã??ã?¦ã?¿ã?¦ä¸?ã??ã??)"
-
-#: ../libglabels/xml-template.c:757
-msgid "Name attribute also missing."
-msgstr "å??å??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
-
 #.
 #. * Local Variables:       -- emacs
 #. * mode: C                -- emacs
@@ -2045,7 +1868,7 @@ msgid "Custom"
 msgstr "ã?«ã?¹ã?¿ã? "
 
 #: ../data/ui/media-select.ui.h:4 ../data/ui/new-label-dialog.ui.h:6
-#: ../data/ui/template-designer.ui.h:42
+#: ../data/ui/template-designer.ui.h:46
 msgid "Page size:"
 msgstr "ç?¨ç´?ã?®å¤§ã??ã??:"
 
@@ -2064,7 +1887,7 @@ msgid ""
 "your own."
 msgstr ""
 
-#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:27
+#: ../data/ui/new-label-dialog.ui.h:2 ../data/ui/template-designer.ui.h:29
 msgid "Description:"
 msgstr "説æ??:"
 
@@ -2083,7 +1906,7 @@ msgstr "ã?¬ã?¤ã?¢ã?¦ã??"
 msgid "Normal"
 msgstr "��:"
 
-#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:43
+#: ../data/ui/new-label-dialog.ui.h:7 ../data/ui/template-designer.ui.h:47
 msgid "Part #:"
 msgstr "ã??ã?¼ã??ç?ªå?·"
 
@@ -2108,136 +1931,150 @@ msgstr ""
 msgid "Vendor:"
 msgstr ""
 
-#: ../data/ui/object-editor.ui.h:2
+#: ../data/ui/object-editor.ui.h:1
+msgid " "
+msgstr ""
+
+#: ../data/ui/object-editor.ui.h:3
 #, no-c-format
 msgid "%"
 msgstr "%"
 
-#: ../data/ui/object-editor.ui.h:3 ../data/ui/prefs-dialog.ui.h:2
+#: ../data/ui/object-editor.ui.h:4 ../data/ui/prefs-dialog.ui.h:2
 msgid "Alignment:"
 msgstr "ä½?ç½®:"
 
-#: ../data/ui/object-editor.ui.h:4
+#: ../data/ui/object-editor.ui.h:5
 msgid "Allow merge to automatically shrink text"
 msgstr "è?ªå??ç??ã?«æ??å­?ã??å°?ã??ã??ã??ã?¦çµ?å??ã?§ã??ã??ã??ã??ã?«ã??ã??"
 
-#: ../data/ui/object-editor.ui.h:5
+#: ../data/ui/object-editor.ui.h:6
 msgid "Angle:"
 msgstr "�度:"
 
-#: ../data/ui/object-editor.ui.h:6
+#: ../data/ui/object-editor.ui.h:7
+#, fuzzy
+msgid "Backend:"
+msgstr "ã??ã?©ã?³ã??:"
+
+#: ../data/ui/object-editor.ui.h:8
 msgid "Checksum"
 msgstr "ã??ã?§ã??ã?¯ã?µã? "
 
-#: ../data/ui/object-editor.ui.h:7 ../data/ui/prefs-dialog.ui.h:3
+#: ../data/ui/object-editor.ui.h:9 ../data/ui/prefs-dialog.ui.h:3
 msgid "Color:"
 msgstr "è?²:"
 
-#: ../data/ui/object-editor.ui.h:9
+#: ../data/ui/object-editor.ui.h:11
 msgid "Enable shadow"
 msgstr "å½±ã??ä»?ã??ã??"
 
-#: ../data/ui/object-editor.ui.h:10
+#: ../data/ui/object-editor.ui.h:12
 msgid "Family:"
 msgstr "ã??ã?¡ã??ã?ª:"
 
-#: ../data/ui/object-editor.ui.h:11
+#: ../data/ui/object-editor.ui.h:13
 msgid "File:"
 msgstr "ã??ã?¡ã?¤ã?«:"
 
-#: ../data/ui/object-editor.ui.h:12 ../data/ui/prefs-dialog.ui.h:5
+#: ../data/ui/object-editor.ui.h:14 ../data/ui/prefs-dialog.ui.h:5
 msgid "Fill"
 msgstr "å¡?ã??ã?¤ã?¶ã??"
 
-#: ../data/ui/object-editor.ui.h:13 ../data/ui/template-designer.ui.h:30
+#: ../data/ui/object-editor.ui.h:15 ../data/ui/template-designer.ui.h:33
 msgid "Height:"
 msgstr "é«?ã??:"
 
-#: ../data/ui/object-editor.ui.h:15
+#: ../data/ui/object-editor.ui.h:17
 msgid "Key:"
 msgstr "ã?­ã?¼:"
 
-#: ../data/ui/object-editor.ui.h:16
+#: ../data/ui/object-editor.ui.h:18
 msgid "Length:"
 msgstr "é?·ã??:"
 
-#: ../data/ui/object-editor.ui.h:18 ../data/ui/prefs-dialog.ui.h:10
+#: ../data/ui/object-editor.ui.h:20 ../data/ui/prefs-dialog.ui.h:10
 msgid "Line Spacing:"
 msgstr "è¡?é??:"
 
-#: ../data/ui/object-editor.ui.h:19
+#: ../data/ui/object-editor.ui.h:21
 msgid "Literal:"
 msgstr "ã?ªã??ã?©ã?«:"
 
-#: ../data/ui/object-editor.ui.h:20
+#: ../data/ui/object-editor.ui.h:22
 msgid "Opacity:"
 msgstr "é??æ??度:"
 
-#: ../data/ui/object-editor.ui.h:21
+#: ../data/ui/object-editor.ui.h:23
 msgid "Position"
 msgstr "ä½?ç½®"
 
-#: ../data/ui/object-editor.ui.h:22
+#: ../data/ui/object-editor.ui.h:24
 msgid "Reset image size"
 msgstr "ç?»å??ã?µã?¤ã?ºã?®ã?ªã?»ã??ã??"
 
-#: ../data/ui/object-editor.ui.h:23
+#: ../data/ui/object-editor.ui.h:25
 msgid "Shadow"
 msgstr "å½±"
 
-#: ../data/ui/object-editor.ui.h:24
+#: ../data/ui/object-editor.ui.h:26
 msgid "Size"
 msgstr "大ã??ã??"
 
-#: ../data/ui/object-editor.ui.h:25
+#: ../data/ui/object-editor.ui.h:27
 msgid "Size:"
 msgstr "大ã??ã??:"
 
-#: ../data/ui/object-editor.ui.h:26
+#: ../data/ui/object-editor.ui.h:28
 msgid "Style"
 msgstr "����"
 
-#: ../data/ui/object-editor.ui.h:27
+#: ../data/ui/object-editor.ui.h:29
 msgid "Style:"
 msgstr "����:"
 
-#: ../data/ui/object-editor.ui.h:29 ../data/ui/prefs-dialog.ui.h:20
-#: ../data/ui/template-designer.ui.h:61
+#: ../data/ui/object-editor.ui.h:31 ../data/ui/prefs-dialog.ui.h:20
+#: ../data/ui/template-designer.ui.h:65
 msgid "Width:"
 msgstr "å¹?:"
 
-#: ../data/ui/object-editor.ui.h:30
+#: ../data/ui/object-editor.ui.h:32
 msgid "X Offset:"
 msgstr "横æ?¹å??ã?®ã?ºã?¬:"
 
-#: ../data/ui/object-editor.ui.h:31
+#: ../data/ui/object-editor.ui.h:33
 msgid "X:"
 msgstr "X:"
 
-#: ../data/ui/object-editor.ui.h:32
+#: ../data/ui/object-editor.ui.h:34
 msgid "Y Offset:"
 msgstr "縦æ?¹å??ã?®ã?ºã?¬:"
 
-#: ../data/ui/object-editor.ui.h:33
+#: ../data/ui/object-editor.ui.h:35
 msgid "Y:"
 msgstr "Y:"
 
-#: ../data/ui/object-editor.ui.h:34
+#: ../data/ui/object-editor.ui.h:36
 msgid "degrees"
 msgstr "度"
 
-#: ../data/ui/object-editor.ui.h:35
+#: ../data/ui/object-editor.ui.h:37
 msgid "dialog1"
 msgstr "dialog1"
 
-#: ../data/ui/object-editor.ui.h:36
+#: ../data/ui/object-editor.ui.h:38
 msgid "digits:"
 msgstr "æ¡?æ?°:"
 
-#: ../data/ui/object-editor.ui.h:37
+#: ../data/ui/object-editor.ui.h:39
 msgid "format:"
 msgstr "��:"
 
+#: ../data/ui/object-editor.ui.h:41
+#, fuzzy
+msgid "key:"
+msgstr "ã?­ã?¼:"
+
 #: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
@@ -2261,7 +2098,7 @@ msgstr "ã?¤ã?³ã??"
 
 #: ../data/ui/prefs-dialog.ui.h:11
 msgid "Locale"
-msgstr "����"
+msgstr "����"
 
 #: ../data/ui/prefs-dialog.ui.h:12
 msgid "Millimeters"
@@ -2357,34 +2194,44 @@ msgid "3. Round (radius of corner):"
 msgstr "3. ã?³ã?¼ã??ã?¼ (è§?度):"
 
 #: ../data/ui/template-designer.ui.h:13
+#, fuzzy
+msgid "3. Waste (overprint allowed):"
+msgstr "2. ä½?å??ã?ªé?¨å?? (é??ã?­å?·ã??å?¯):"
+
+#: ../data/ui/template-designer.ui.h:14
 msgid "4. Clipping height:"
 msgstr "4. ã?¯ã?ªã??ã??ã?³ã?°ã?®é«?ã??:"
 
-#: ../data/ui/template-designer.ui.h:14
+#: ../data/ui/template-designer.ui.h:15
 msgid "4. Horiz. waste (overprint allowed):"
 msgstr "4. æ°´å¹³æ?¹å??ã?®ä½?å??ã?ªé?¨å?? (é??ã?­å?·ã??å?¯):"
 
-#: ../data/ui/template-designer.ui.h:15
+#: ../data/ui/template-designer.ui.h:16
+#, fuzzy
+msgid "4. Margin"
+msgstr "3. ä½?ç?½"
+
+#: ../data/ui/template-designer.ui.h:17
 msgid "5. Vert. waste (overprint allowed):"
 msgstr "5. å??ç?´æ?¹å??ã?®ä½?å??ã?ªé?¨å?? (é??ã?­å?·ã??å?¯):"
 
-#: ../data/ui/template-designer.ui.h:16
+#: ../data/ui/template-designer.ui.h:18
 msgid "5. Waste (overprint allowed):"
 msgstr "5. ä½?å??ã?ªé?¨å?? (é??ã?­å?·ã??å?¯):"
 
-#: ../data/ui/template-designer.ui.h:17
+#: ../data/ui/template-designer.ui.h:19
 msgid "6. Margin"
 msgstr "6. ä½?ç?½"
 
-#: ../data/ui/template-designer.ui.h:18
+#: ../data/ui/template-designer.ui.h:20
 msgid "Brand/Manufacturer:"
 msgstr "ã??ã?©ã?³ã??/製é? å??:"
 
-#: ../data/ui/template-designer.ui.h:19
+#: ../data/ui/template-designer.ui.h:21
 msgid "CD/DVD (including credit card CDs)"
 msgstr "CD/DVD ã?®å½¢ (å?«ã??ã?¯ã?¬ã?¸ã??ã??ã?»ã?«ã?¼ã?? CD)"
 
-#: ../data/ui/template-designer.ui.h:20
+#: ../data/ui/template-designer.ui.h:22
 msgid ""
 "Congratulations!\n"
 "\n"
@@ -2402,19 +2249,24 @@ msgstr ""
 "[ã?­ã?£ã?³ã?»ã?«] ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã??ã?¶ã?¤ã?³ã??ç ´æ£?ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??\n"
 "ã?¾ã??ã?¯ [æ?»ã??] ã??ã?¯ã?ªã??ã?¯ã??ã??ã?¨ã??ã??ç?´ã??ã??ã?¨ã??å?¯è?½ã?§ã??ã??"
 
-#: ../data/ui/template-designer.ui.h:28
+#: ../data/ui/template-designer.ui.h:30
 msgid "Distance from left edge (x0):"
 msgstr "å·¦ä¸?é??ã??ã??ã?®è·?é?¢ (x0):"
 
-#: ../data/ui/template-designer.ui.h:29
+#: ../data/ui/template-designer.ui.h:31
 msgid "Distance from top edge (y0):"
 msgstr "å·¦ä¸?é??ã??ã??ã?®è·?é?¢ (y0):"
 
-#: ../data/ui/template-designer.ui.h:31
+#: ../data/ui/template-designer.ui.h:32
+#, fuzzy
+msgid "Elliptical"
+msgstr "å??ç?´æ?¹å??ã?«ã??ã?ªã??ã??ã??ã??"
+
+#: ../data/ui/template-designer.ui.h:34
 msgid "Horizontal pitch (dx):"
 msgstr "æ°´å¹³æ?¹å??ã?®ã??ã??ã?? (dx):"
 
-#: ../data/ui/template-designer.ui.h:32
+#: ../data/ui/template-designer.ui.h:35
 msgid ""
 "How many layouts will your template contain? \n"
 "\n"
@@ -2430,69 +2282,75 @@ msgstr ""
 "ã??ã??\n"
 "äº?ç?ªç?®ã?®ã?µã?³ã??ã?«ã?§ã?¯ã??äº?ã?¤ã?®ã?¬ã?¤ã?¢ã?¦ã??ã??å¿?è¦?ã?ªå ´å??ã??å?³ã?«ã??ã??ã??ã?®ã?§ã??ã??"
 
-#: ../data/ui/template-designer.ui.h:37
+#: ../data/ui/template-designer.ui.h:40
 msgid "Layout #1"
 msgstr "ã?¬ã?¤ã?¢ã?¦ã?? #1:"
 
-#: ../data/ui/template-designer.ui.h:38
+#: ../data/ui/template-designer.ui.h:41
 msgid "Layout #2"
 msgstr "ã?¬ã?¤ã?¢ã?¦ã?? #2:"
 
-#: ../data/ui/template-designer.ui.h:39
+#: ../data/ui/template-designer.ui.h:42
+msgid ""
+"Note: if more than 2 layouts are required, the template must be edited "
+"manually."
+msgstr ""
+
+#: ../data/ui/template-designer.ui.h:43
 msgid "Number across (nx):"
 msgstr "横æ?¹å??ã?®æ?° (nx):"
 
-#: ../data/ui/template-designer.ui.h:40
+#: ../data/ui/template-designer.ui.h:44
 msgid "Number down (ny):"
 msgstr "縦æ?¹å??ã?®æ?° (ny):"
 
-#: ../data/ui/template-designer.ui.h:41
+#: ../data/ui/template-designer.ui.h:45
 msgid "Number of layouts:"
 msgstr "ã?¬ã?¤ã?¢ã?¦ã??ã?®æ?°:"
 
-#: ../data/ui/template-designer.ui.h:44
+#: ../data/ui/template-designer.ui.h:48
 msgid ""
 "Please enter the following identifying information about the template "
 "stationery."
 msgstr "ã??ã?³ã??ã?¬ã?¼ã??ã?®è­?å?¥æ??å ±ã??å?¥å??ã??ã?¦ä¸?ã??ã??:"
 
-#: ../data/ui/template-designer.ui.h:45
+#: ../data/ui/template-designer.ui.h:49
 msgid "Please enter the following layout information."
 msgstr "ã?¬ã?¤ã?¢ã?¦ã??æ??å ±ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/ui/template-designer.ui.h:46
+#: ../data/ui/template-designer.ui.h:50
 msgid ""
 "Please enter the following size parameters of a single label in your "
 "template."
 msgstr "ã??ã?³ã??ã?¬ã?¼ã??ã?®ã?©ã??ã?«å??ä½?ã?®å¤§ã??ã??ã??ã??ã??ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/ui/template-designer.ui.h:47
+#: ../data/ui/template-designer.ui.h:51
 msgid ""
 "Please enter the following size parameters of a single label or card in your "
 "template."
 msgstr "ã??ã?³ã??ã?¬ã?¼ã??ã?®ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??å??ä½?ã?®å¤§ã??ã??ã??ã??ã??ã??ã??å?¥å??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/ui/template-designer.ui.h:48
+#: ../data/ui/template-designer.ui.h:52
 msgid "Please select the basic shape of the labels or cards."
 msgstr "ã?©ã??ã?«ã?¾ã??ã?¯ã?«ã?¼ã??ã?®å?ºæ?¬ç??ã?ªå½¢ç?¶ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/ui/template-designer.ui.h:49
+#: ../data/ui/template-designer.ui.h:53
 msgid "Please select the page size of the template stationery."
 msgstr "ã??ã?³ã??ã?¬ã?¼ã??ç?¨ç´?ã?®å¤§ã??ã??ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
 
-#: ../data/ui/template-designer.ui.h:50
+#: ../data/ui/template-designer.ui.h:54
 msgid "Print test sheet"
 msgstr "ç?¨ç´?ã?®ã??ã?¹ã??å?°å?·"
 
-#: ../data/ui/template-designer.ui.h:51
+#: ../data/ui/template-designer.ui.h:55
 msgid "Rectangular or square (can have rounded corners)"
 msgstr "é?·æ?¹å½¢ã?¾ã??ã?¯æ­£æ?¹å½¢ (ã?³ã?¼ã??ã?¼ã??丸ã??ã??ã??ã??ã?¨ã??å?¯)"
 
-#: ../data/ui/template-designer.ui.h:52
+#: ../data/ui/template-designer.ui.h:56
 msgid "Round"
 msgstr "å??"
 
-#: ../data/ui/template-designer.ui.h:53
+#: ../data/ui/template-designer.ui.h:57
 msgid ""
 "Templates needing\n"
 "two layouts."
@@ -2500,7 +2358,7 @@ msgstr ""
 "ã?¬ã?¤ã?¢ã?¦ã??ã??äº?ã?¤å¿?è¦?ã?ª\n"
 "ã??ã?³ã??ã?¬ã?¼ã??"
 
-#: ../data/ui/template-designer.ui.h:55
+#: ../data/ui/template-designer.ui.h:59
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -2508,11 +2366,11 @@ msgstr ""
 "ã?¬ã?¤ã?¢ã?¦ã??ã??ä¸?ã?¤ã? ã??ã?§\n"
 "å??å??ã?ªã?¬ã?¤ã?¢ã?¦ã??"
 
-#: ../data/ui/template-designer.ui.h:57
+#: ../data/ui/template-designer.ui.h:61
 msgid "Vertical pitch (dy):"
 msgstr "å??ç?´æ?¹å??ã?®ã??ã??ã?? (dy):"
 
-#: ../data/ui/template-designer.ui.h:58
+#: ../data/ui/template-designer.ui.h:62
 msgid ""
 "Welcome to the gLabels Template Designer.\n"
 "\n"
@@ -2565,6 +2423,206 @@ msgstr "(æ??å??ã?®ã?·ã?¼ã??)"
 msgid "to:"
 msgstr "��:"
 
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:1
+msgid "Controls maximum number of recent files tracked."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:2
+#, fuzzy
+msgid "Controls visibility of drawing toolbar."
+msgstr "ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??表示ã??ã?¾ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:3
+msgid "Controls visibility of grid."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:4
+#, fuzzy
+msgid "Controls visibility of main toolbar."
+msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??表示ã??ã?¾ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:5
+#, fuzzy
+msgid "Controls visibility of markup lines."
+msgstr "ã?©ã??ã?«ã?®å¤?æ? ç·?ã?®è¡¨ç¤º/é??表示ã??å¤?æ?´ã??ã?¾ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:6
+#, fuzzy
+msgid "Controls visibility of property toolbar."
+msgstr "ã??ã?­ã??ã??ã?£ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??表示ã??ã?¾ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:7
+#, fuzzy
+msgid "Default fill color."
+msgstr "ã??ã??ã?©ã?«ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:8
+#, fuzzy
+msgid "Default font family."
+msgstr "ã??ã?©ã?³ã??å??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:9
+msgid "Default font italic flag."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:10
+#, fuzzy
+msgid "Default font size."
+msgstr "ç?»å??ã?µã?¤ã?ºã?®ã?ªã?»ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:11
+#, fuzzy
+msgid "Default font weight."
+msgstr "å?³ã?«å??転ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:12
+#, fuzzy
+msgid "Default line color."
+msgstr "ã??ã??ã?©ã?«ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:13
+#, fuzzy
+msgid "Default line width."
+msgstr "ç·?å¹?"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:14
+#, fuzzy
+msgid "Default page size."
+msgstr "ç?»å??ã?µã?¤ã?ºã?®ã?ªã?»ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:15
+#, fuzzy
+msgid "Default text alignment."
+msgstr "ç?»å??ã?µã?¤ã?ºã?®ã?ªã?»ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:16
+#, fuzzy
+msgid "Default text color."
+msgstr "ã??ã??ã?©ã?«ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:17
+msgid "Default text line spacing."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:18
+msgid "Maximum recent files."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:19
+#, fuzzy
+msgid "Recent colors."
+msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:20
+#, fuzzy
+msgid "Recent fonts."
+msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:21
+#, fuzzy
+msgid "Recent templates."
+msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:22
+msgid "Recently created custom colors."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:23
+#, fuzzy
+msgid "Recently used font families."
+msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:24
+#, fuzzy
+msgid "Recently used templates."
+msgstr "æ??è¿?é??ã??ã??ã??ã?³ã??ã?¬ã?¼ã??ã?¯ã??ã??ã?¾ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:25
+#, fuzzy
+msgid "Show/hide drawing toolbar."
+msgstr "ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??表示ã??ã?¾ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:26
+msgid "Show/hide grid."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:27
+#, fuzzy
+msgid "Show/hide main toolbar."
+msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??表示ã??ã?¾ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:28
+msgid "Show/hide markup."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:29
+#, fuzzy
+msgid "Show/hide property toolbar."
+msgstr "ã??ã?­ã??ã??ã?£ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??表示ã??ã?¾ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:30
+#, fuzzy
+msgid "The default color of text for new text objects (0xRRGGBBAA)."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:31
+#, fuzzy
+msgid "The default fill color new objects (0xRRGGBBAA)."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:32
+#, fuzzy
+msgid "The default font family for new text objects."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:33
+#, fuzzy
+msgid "The default font italic state for new text objects."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:34
+#, fuzzy
+msgid "The default font size for new text objects."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:35
+#, fuzzy
+msgid "The default font weight for new text objects."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:36
+#, fuzzy
+msgid "The default line color new objects (0xRRGGBBAA)."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:37
+#, fuzzy
+msgid "The default line spacing for new text objects."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:38
+#, fuzzy
+msgid "The default line width for new objects."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:39
+#, fuzzy
+msgid "The default text alignment for new text objects."
+msgstr "æ?°è¦?ã?«ä½?æ??ã??ã??ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã??ã?©ã?«ã??å?¤ã??é?¸æ??ã??ã?¦ä¸?ã??ã??ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:40
+msgid "The default unit of measurement."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:41
+msgid "The preferred page size when searching templates."
+msgstr ""
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:42
+#, fuzzy
+msgid "Units."
+msgstr "ã?¿ã?¤ã??ã?«ã?ªã??"
+
 #: ../data/desktop/glabels-3.0.desktop.in.h:1
 msgid "Create labels, business cards and media covers"
 msgstr "ã?©ã??ã?«ã??å??å?ºã??ã?¡ã??ã?£ã?¢ã?®ã?¸ã?£ã?±ã??ã??ã??ã??ã?¶ã?¤ã?³ã??ã?¾ã??"
@@ -2708,7 +2766,12 @@ msgid "Any label"
 msgstr "ã??ã??ã??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/categories.xml.h:3 ../templates/pearl-iso-templates.xml.h:8
+#. ====================================================================
+#. ===================================================================
+#: ../templates/categories.xml.h:3 ../templates/dataline-iso-templates.xml.h:4
+#: ../templates/geha-iso-templates.xml.h:8
+#: ../templates/hama-iso-templates.xml.h:6
+#: ../templates/pearl-iso-templates.xml.h:8
 msgid "Business cards"
 msgstr "å??å?º"
 
@@ -2716,31 +2779,92 @@ msgstr "å??å?º"
 msgid "CD/DVD or other media"
 msgstr "CD/DVD ã?¾ã??ã?¯ã??ã?®ä»?ã?®ã?¡ã??ã?£ã?¢"
 
-#: ../templates/categories.xml.h:5
+#. ===================================================================
+#: ../templates/categories.xml.h:5 ../templates/pearl-iso-templates.xml.h:28
+#, fuzzy
+msgid "Elliptical labels"
+msgstr "å?ºè?·ã?©ã??ã?«"
+
+#: ../templates/categories.xml.h:6
+#, fuzzy
+msgid "Foldable cards"
+msgstr "å??å?º"
+
+#: ../templates/categories.xml.h:7
 msgid "Mailing/shipping products"
 msgstr "é?µé??/å?ºè?·ã??ã??製å??"
 
-#: ../templates/categories.xml.h:6
+#: ../templates/categories.xml.h:8
+msgid "Photo products"
+msgstr ""
+
+#. ===================================================================
+#. ====================================================================
+#. ===================================================================
+#. ********************************************************************
+#: ../templates/categories.xml.h:9 ../templates/ascom-iso-templates.xml.h:6
+#: ../templates/hama-iso-templates.xml.h:29
+#: ../templates/herma-iso-templates.xml.h:18
+#: ../templates/jac-iso-templates.xml.h:8
 msgid "Rectangular labels"
 msgstr "é?·æ?¹å½¢ã?®ã?©ã??ã?«"
 
+#. ====================================================================
 #. ===================================================================
-#: ../templates/categories.xml.h:7 ../templates/pearl-iso-templates.xml.h:46
+#: ../templates/categories.xml.h:10 ../templates/hama-iso-templates.xml.h:31
+#: ../templates/pearl-iso-templates.xml.h:54
 msgid "Round labels"
 msgstr "丸ã??ã?©ã??ã?«"
 
-#: ../templates/categories.xml.h:8
+#. ====================================================================
+#: ../templates/categories.xml.h:11 ../templates/hama-iso-templates.xml.h:33
 msgid "Square labels"
 msgstr "æ­£æ?¹å½¢ã?®ã?©ã??ã?«"
 
 #. ===================================================================
+#. ===============================================================
+#: ../templates/ascom-iso-templates.xml.h:2
+#: ../templates/avery-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:10
+msgid "CD Inlet"
+msgstr "CD ã?®ã?¤ã?³ã?¬ã??ã??"
+
+#. TODO: Is this the real part #?
+#. ============================================================
+#. ===================================================================
+#. ====================================================================
+#. ===================================================================
+#. TODO: What is the actual part #?
+#. ===================================================================
+#: ../templates/ascom-iso-templates.xml.h:4
+#: ../templates/avery-iso-templates.xml.h:30
+#: ../templates/databecker-iso-templates.xml.h:10
+#: ../templates/hama-iso-templates.xml.h:27
+#: ../templates/herma-iso-templates.xml.h:16
+#: ../templates/misc-iso-templates.xml.h:30
+#: ../templates/zweckform-iso-templates.xml.h:28
+msgid "Rectangular Labels"
+msgstr "é?·æ?¹å½¢ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/ascom-iso-templates.xml.h:8
+#: ../templates/avery-us-templates.xml.h:46
+#: ../templates/geha-iso-templates.xml.h:29
+#: ../templates/meritline-us-templates.xml.h:18
+#: ../templates/worldlabel-us-templates.xml.h:12
+msgid "Video Tape Spine Labels"
+msgstr "ã??ã??ã?ªã?»ã??ã?¼ã??ã?®è??é?¢ã?©ã??ã?«"
+
+#. ===================================================================
 #. ********************************************************************
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:2
 #: ../templates/avery-iso-templates.xml.h:2
+#: ../templates/databecker-iso-templates.xml.h:2
 #: ../templates/dymo-other-templates.xml.h:4
+#: ../templates/geha-iso-templates.xml.h:2
 #: ../templates/maco-us-templates.xml.h:2
-#: ../templates/misc-iso-templates.xml.h:2
+#: ../templates/meritline-us-templates.xml.h:2
 #: ../templates/pearl-iso-templates.xml.h:2
 #: ../templates/worldlabel-us-templates.xml.h:1
 #: ../templates/zweckform-iso-templates.xml.h:2
@@ -2750,12 +2874,15 @@ msgstr "å®?å??ã?®ã?©ã??ã?«"
 #. ===================================================================
 #. ============================================================
 #. ===================================================================
-#. ********************************************************************
-#. ===================================================================
+#. TODO: Is this the actual part #?
+#. ============================================================
 #: ../templates/avery-us-templates.xml.h:4
 #: ../templates/avery-iso-templates.xml.h:8
+#: ../templates/databecker-iso-templates.xml.h:4
+#: ../templates/dataline-iso-templates.xml.h:2
+#: ../templates/decadry-iso-templates.xml.h:2
 #: ../templates/misc-us-templates.xml.h:4
-#: ../templates/misc-iso-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:6
 #: ../templates/zweckform-iso-templates.xml.h:6
 msgid "Business Cards"
 msgstr "å??å?º"
@@ -2763,13 +2890,19 @@ msgstr "å??å?º"
 #. ===================================================================
 #. ===============================================================
 #. ===================================================================
+#. ********************************************************************
+#. ===================================================================
 #: ../templates/avery-us-templates.xml.h:6
 #: ../templates/avery-iso-templates.xml.h:14
+#: ../templates/geha-iso-templates.xml.h:11
+#: ../templates/herma-iso-templates.xml.h:10
+#: ../templates/jac-iso-templates.xml.h:2
 #: ../templates/misc-us-templates.xml.h:8
-#: ../templates/misc-iso-templates.xml.h:16
-#: ../templates/pearl-iso-templates.xml.h:20
+#: ../templates/misc-iso-templates.xml.h:10
+#: ../templates/misc-other-templates.xml.h:2
+#: ../templates/pearl-iso-templates.xml.h:24
 #: ../templates/worldlabel-us-templates.xml.h:2
-#: ../templates/zweckform-iso-templates.xml.h:8
+#: ../templates/zweckform-iso-templates.xml.h:12
 msgid "CD/DVD Labels"
 msgstr "CD/DVD ã?®ã?©ã??ã?«"
 
@@ -2786,6 +2919,7 @@ msgstr "CD/DVD ã?®ã?©ã??ã?« (Spine ã?©ã??ã?«)"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:12
 #: ../templates/avery-iso-templates.xml.h:16
+#: ../templates/meritline-us-templates.xml.h:4
 #: ../templates/worldlabel-us-templates.xml.h:3
 msgid "Diskette Labels"
 msgstr "ã??ã?­ã??ã??ã?¼ã?®ã?©ã??ã?«"
@@ -2810,6 +2944,7 @@ msgstr "ã??ã?¡ã?¤ã?«ã?»ã??ã?¤ã?³ã??ã?¼ã?®ã?©ã??ã?«"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:20
+#: ../templates/meritline-us-templates.xml.h:6
 #: ../templates/worldlabel-us-templates.xml.h:6
 msgid "Full Sheet Labels"
 msgstr "å?¨ç?¨ç´?ã?®ã?©ã??ã?«"
@@ -2843,6 +2978,7 @@ msgstr "ã?¯ã??ã??"
 #. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:32
 #: ../templates/dymo-other-templates.xml.h:12
+#: ../templates/meritline-us-templates.xml.h:10
 #: ../templates/worldlabel-us-templates.xml.h:8
 msgid "Return Address Labels"
 msgstr "è¿?ä¿¡ç?¨å®?å??ã?®ã?©ã??ã?«"
@@ -2850,6 +2986,7 @@ msgstr "è¿?ä¿¡ç?¨å®?å??ã?®ã?©ã??ã?«"
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:34
 #: ../templates/maco-us-templates.xml.h:3
+#: ../templates/meritline-us-templates.xml.h:12
 #: ../templates/misc-us-templates.xml.h:30
 #: ../templates/worldlabel-us-templates.xml.h:9
 msgid "Round Labels"
@@ -2858,6 +2995,8 @@ msgstr "è§?ã??丸ã??ã?©ã??ã?«"
 #. ===================================================================
 #. ********************************************************************
 #: ../templates/avery-us-templates.xml.h:36
+#: ../templates/dataline-iso-templates.xml.h:10
+#: ../templates/meritline-us-templates.xml.h:14
 #: ../templates/uline-us-templates.xml.h:2
 #: ../templates/worldlabel-us-templates.xml.h:10
 msgid "Shipping Labels"
@@ -2880,18 +3019,15 @@ msgstr "ã??ã?³ã??ã?®ã?«ã?¼ã??"
 
 #. ===================================================================
 #: ../templates/avery-us-templates.xml.h:44
+#: ../templates/geha-iso-templates.xml.h:27
+#: ../templates/meritline-us-templates.xml.h:16
 #: ../templates/worldlabel-us-templates.xml.h:11
 msgid "Video Tape Face Labels"
 msgstr "ã??ã??ã?ªã?»ã??ã?¼ã??ã?®è¡¨é?¢ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/avery-us-templates.xml.h:46
-#: ../templates/worldlabel-us-templates.xml.h:12
-msgid "Video Tape Spine Labels"
-msgstr "ã??ã??ã?ªã?»ã??ã?¼ã??ã?®è??é?¢ã?©ã??ã?«"
-
-#. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:4
+#: ../templates/misc-iso-templates.xml.h:2
 msgid "Address labels"
 msgstr "å®?å??ã?®ã?©ã??ã?«"
 
@@ -2902,45 +3038,51 @@ msgstr "æ±?ç?¨ç??ã?ªã?©ã??ã?«"
 
 #. ===============================================================
 #: ../templates/avery-iso-templates.xml.h:10
+#: ../templates/zweckform-iso-templates.xml.h:8
 msgid "CD Booklet"
 msgstr "CD ã?®å°?å??å­?"
 
-#. ===============================================================
-#: ../templates/avery-iso-templates.xml.h:12
-msgid "CD Inlet"
-msgstr "CD ã?®ã?¤ã?³ã?¬ã??ã??"
-
 #. ===================================================================
+#. ====================================================================
 #: ../templates/avery-iso-templates.xml.h:18
+#: ../templates/hama-iso-templates.xml.h:17
 msgid "Diskette labels"
 msgstr "ã??ã?­ã??ã??ã?¼ã?®ã?©ã??ã?«"
 
-#. ===============================================================
 #. ===================================================================
 #: ../templates/avery-iso-templates.xml.h:20
+msgid "Identification Labels"
+msgstr ""
+
+#. ===============================================================
+#. ===================================================================
+#: ../templates/avery-iso-templates.xml.h:22
+#: ../templates/decadry-iso-templates.xml.h:4
+#: ../templates/herma-iso-templates.xml.h:14
 #: ../templates/misc-us-templates.xml.h:20
-#: ../templates/misc-iso-templates.xml.h:36
-#: ../templates/zweckform-iso-templates.xml.h:16
+#: ../templates/misc-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:20
 msgid "Mailing Labels"
 msgstr "å°?ç­?ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:22
+#: ../templates/avery-iso-templates.xml.h:24
+#: ../templates/decadry-iso-templates.xml.h:6
 msgid "Mailing labels"
 msgstr "å°?ç­?ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:24
+#: ../templates/avery-iso-templates.xml.h:26
 msgid "Mini Address Labels"
 msgstr "å°?ã??ã?ªå®?å??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:26
+#: ../templates/avery-iso-templates.xml.h:28
 msgid "Mini Labels"
 msgstr "ã??ã??ã?»ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:28
+#: ../templates/avery-iso-templates.xml.h:32
 msgid "Shipping labels"
 msgstr "å?ºè?·ã?©ã??ã?«"
 
@@ -2973,6 +3115,36 @@ msgstr "å?ºè?·ã?©ã??ã?« 62mm x 100mm"
 msgid "Standard Address Labels 29mm x 90mm"
 msgstr "æ¨?æº?ç??ã?ªå®?å??ã?®ã?©ã??ã?« 29mm x 90mm"
 
+#: ../templates/brother-other-templates.xml.h:21
+#, fuzzy
+msgid "Standard Address Labels 38mm x 90mm"
+msgstr "æ¨?æº?ç??ã?ªå®?å??ã?®ã?©ã??ã?« 29mm x 90mm"
+
+#. ===================================================================
+#: ../templates/databecker-iso-templates.xml.h:6
+#: ../templates/misc-iso-templates.xml.h:8
+msgid "CD Labels"
+msgstr "CD ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/databecker-iso-templates.xml.h:8
+msgid "CD/DVD Labels Standard Format (face only)"
+msgstr "CD/DVD ã?®ã?©ã??ã?«æ¨?æº?æ?¸å¼? (å¤?å?´ã?®ã?¿)"
+
+#. ===================================================================
+#. ====================================================================
+#: ../templates/dataline-iso-templates.xml.h:6
+#: ../templates/hama-iso-templates.xml.h:13
+#, fuzzy
+msgid "CD/DVD labels"
+msgstr "CD/DVD ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/dataline-iso-templates.xml.h:8
+#: ../templates/pearl-iso-templates.xml.h:42
+msgid "Membership cards"
+msgstr ""
+
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:2
 msgid "3.5in Diskette"
@@ -2990,6 +3162,7 @@ msgstr "ã?¤ã??ä¸?ã??å¼?ã?®ã??ã?©ã?«ã??"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:10
+#: ../templates/geha-iso-templates.xml.h:19
 msgid "Large Address Labels"
 msgstr "大ã??ã?ªå®?å??ã?®ã?©ã??ã?«"
 
@@ -2999,29 +3172,204 @@ msgid "Shipping Address Labels"
 msgstr "å?ºè?·ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:2
-msgid "Business Card CD"
-msgstr "å??å?º CD"
-
+#. ====================================================================
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:6
-msgid "CD Template Rectangles"
-msgstr "CD ã??ã?³ã??ã?¬ã?¼ã?? (é?·æ?¹å½¢)"
+#: ../templates/geha-iso-templates.xml.h:4
+#: ../templates/hama-iso-templates.xml.h:2
+#: ../templates/herma-iso-templates.xml.h:4
+msgid "Arch File Labels"
+msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:10
-msgid "CD/DVD Labels (Face Only)"
-msgstr "CD/DVD ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
+#: ../templates/geha-iso-templates.xml.h:6
+#, fuzzy
+msgid "Arch File inserts"
+msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?«"
 
-#. ===================================================================
-#: ../templates/misc-us-templates.xml.h:12
-#: ../templates/misc-iso-templates.xml.h:18
-msgid "CD/DVD Labels (face only)"
-msgstr "CD/DVD ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
+#: ../templates/geha-iso-templates.xml.h:9
+#, fuzzy
+msgid "CD/DVD Inlet"
+msgstr "CD ã?®ã?¤ã?³ã?¬ã??ã??"
 
 #. ===================================================================
-#: ../templates/misc-us-templates.xml.h:14
-msgid "Cassette Labels"
+#. ====================================================================
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:13
+#: ../templates/hama-iso-templates.xml.h:15
+#: ../templates/pearl-iso-templates.xml.h:26
+#, fuzzy
+msgid "DVD inlet"
+msgstr "CD ã?®ã?¤ã?³ã?¬ã??ã??"
+
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:15
+msgid "Flyer paper"
+msgstr ""
+
+#. ===================================================================
+#. ====================================================================
+#: ../templates/geha-iso-templates.xml.h:17
+#: ../templates/hama-iso-templates.xml.h:19
+msgid "Greeting cards"
+msgstr ""
+
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:21
+#: ../templates/misc-other-templates.xml.h:4
+msgid "Multi-Purpose Labels"
+msgstr "å¤?ç?®ç??ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:23
+#, fuzzy
+msgid "Passport photo labels"
+msgstr "gLabels ã?«ã?¤ã??ã?¦"
+
+#. ===================================================================
+#. ====================================================================
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:25
+#: ../templates/hama-iso-templates.xml.h:23
+#: ../templates/pearl-iso-templates.xml.h:50
+#, fuzzy
+msgid "Photo labels"
+msgstr "gLabels ã?«ã?¤ã??ã?¦"
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:4
+#, fuzzy
+msgid "Arch File labels"
+msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?«"
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:8
+#, fuzzy
+msgid "CD inlet"
+msgstr "CD ã?®ã?¤ã?³ã?¬ã??ã??"
+
+#. ===================================================================
+#: ../templates/hama-iso-templates.xml.h:9
+#: ../templates/pearl-iso-templates.xml.h:20
+#, fuzzy
+msgid "CD inlet (back)"
+msgstr "CD ã?®ã?¤ã?³ã?¬ã??ã??"
+
+#. ====================================================================
+#. ===================================================================
+#: ../templates/hama-iso-templates.xml.h:11
+#: ../templates/pearl-iso-templates.xml.h:22
+#, fuzzy
+msgid "CD inlet (front)"
+msgstr "å??é?¢ã?«æ??ã?£ã?¦ã??ã??"
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:21
+#, fuzzy
+msgid "Mini Disc labels"
+msgstr "ã??ã??ã?»ã?©ã??ã?«"
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:25
+msgid "Printable mousepad"
+msgstr ""
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:35
+msgid "VHS inlet"
+msgstr ""
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:37
+#, fuzzy
+msgid "VHS-C inlet"
+msgstr "CD ã?®ã?¤ã?³ã?¬ã??ã??"
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:39
+msgid "Video-8 inlet"
+msgstr ""
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:41
+msgid "Zip disc inlet"
+msgstr ""
+
+#. ====================================================================
+#: ../templates/hama-iso-templates.xml.h:43
+#, fuzzy
+msgid "Zip disc labels"
+msgstr "æ±?ç?¨ç??ã?ªã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/herma-iso-templates.xml.h:2
+#: ../templates/zweckform-iso-templates.xml.h:4
+msgid "Allround Labels"
+msgstr "æ±?ç?¨ç??ã?ªã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/herma-iso-templates.xml.h:6
+msgid "Arch File Labels (large)"
+msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?« (大)"
+
+#. ===================================================================
+#: ../templates/herma-iso-templates.xml.h:8
+msgid "Arch File Labels (small)"
+msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?« (å°?)"
+
+#. ===================================================================
+#: ../templates/herma-iso-templates.xml.h:12
+msgid "Diskette Labels (face only)"
+msgstr "ã??ã?­ã??ã??ã?¼ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
+
+#. ===================================================================
+#: ../templates/herma-iso-templates.xml.h:20
+msgid "Video Labels (face only)"
+msgstr "ã??ã??ã?ªã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
+
+#. *******************************************************************
+#. ===================================================================
+#: ../templates/jac-iso-templates.xml.h:4
+#: ../templates/pearl-iso-templates.xml.h:36
+#, fuzzy
+msgid "Labels A4"
+msgstr "ã?©ã??ã?«"
+
+#. *******************************************************************
+#: ../templates/jac-iso-templates.xml.h:6
+#, fuzzy
+msgid "PVC labels"
+msgstr "CD ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/meritline-us-templates.xml.h:8
+msgid "Mini-CD Labels"
+msgstr "ã??ã?? CD ã?®ã?©ã??ã?«"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:2
+msgid "Business Card CD"
+msgstr "å??å?º CD"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:6
+msgid "CD Template Rectangles"
+msgstr "CD ã??ã?³ã??ã?¬ã?¼ã?? (é?·æ?¹å½¢)"
+
+#. ===================================================================
+#: ../templates/misc-us-templates.xml.h:10
+msgid "CD/DVD Labels (Face Only)"
+msgstr "CD/DVD ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
+
+#. ===================================================================
+#. TODO: Is this the actual part #?
+#: ../templates/misc-us-templates.xml.h:12
+#: ../templates/misc-iso-templates.xml.h:12
+msgid "CD/DVD Labels (face only)"
+msgstr "CD/DVD ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
+
+#. TODO: Is this the actual part #?
+#: ../templates/misc-us-templates.xml.h:14
+msgid "Cassette Labels"
 msgstr "ã?«ã?»ã??ã??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
@@ -3041,20 +3389,18 @@ msgstr "ã??ã?¤ã?¯ã?­ã??ã?¥ã?¼ã??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
 #: ../templates/misc-us-templates.xml.h:24
-msgid "Mini-CD Labels"
-msgstr "ã??ã?? CD ã?®ã?©ã??ã?«"
-
-#: ../templates/misc-us-templates.xml.h:25
 msgid "PRO CD Labels 2-up (CD spine only)"
 msgstr "PRO CD ã?®ã?©ã??ã?«äº?æ?? (CD æ ¼ç´?ã?±ã?¼ã?¹ã?®ã?¿)"
 
+#. ===================================================================
 #: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr "PRO CD ã?©ã??ã?«äº?æ?? (å¤?å?´ã?®ã?¿)"
 
 #. ===================================================================
+#. TODO: Is this the actual part #?
 #: ../templates/misc-us-templates.xml.h:28
-#: ../templates/misc-iso-templates.xml.h:42
+#: ../templates/misc-iso-templates.xml.h:28
 msgid "PRO CD Labels 2-up (face only)"
 msgstr "PRO CD ã?©ã??ã?«äº?æ?? (å¤?å?´ã?®ã?¿)"
 
@@ -3069,109 +3415,55 @@ msgstr "è??ã?? CD ã??ã?©ã?«ã?? (ä¸?å?´)"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:4
-#: ../templates/zweckform-iso-templates.xml.h:4
-msgid "Allround Labels"
-msgstr "æ±?ç?¨ç??ã?ªã?©ã??ã?«"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:6
-msgid "Arch File Labels"
-msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:8
-msgid "Arch File Labels (large)"
-msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?« (大)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:10
-msgid "Arch File Labels (small)"
-msgstr "ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?« (å°?)"
+#: ../templates/pearl-iso-templates.xml.h:6
+#, fuzzy
+msgid "Bottle labels"
+msgstr "ã??ã?­ã??ã??ã?¼ã?®ã?©ã??ã?«"
 
 #. ===================================================================
 #: ../templates/misc-iso-templates.xml.h:14
-msgid "CD Labels"
-msgstr "CD ã?®ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:20
-msgid "CD/DVD Labels Standard Format (face only)"
-msgstr "CD/DVD ã?®ã?©ã??ã?«æ¨?æº?æ?¸å¼? (å¤?å?´ã?®ã?¿)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:22
-msgid "Diskette Labels (face only)"
-msgstr "ã??ã?­ã??ã??ã?¼ã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:24
 msgid "EPSON Photo Stickers 16"
 msgstr "EPSON ã??ã?©ã??ã?»ã?¹ã??ã??ã?«ã?¼ 16"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:26
+#: ../templates/misc-iso-templates.xml.h:16
 msgid "Etiketten"
 msgstr "Etiketten"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:28
+#: ../templates/misc-iso-templates.xml.h:18
 msgid "Fridge Magnet Stickers"
 msgstr "å?·è?µåº«ã?«è²¼ã??ç£?æ°?ã?¹ã??ã??ã?«"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:30
+#: ../templates/misc-iso-templates.xml.h:20
 msgid "General Labels"
 msgstr "ä¸?è?¬ç??ã?ªã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:32
+#: ../templates/misc-iso-templates.xml.h:22
 msgid "Inkjet/Laser Labels 70x37mm"
 msgstr "ã?¤ã?³ã?¯ã?¸ã?§ã??ã??/ã?¬ã?¼ã?¶å?°å?·ç?¨ã?®ã?©ã??ã?« 70x37mm"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:38
-msgid "Mailing Labels-2 columns"
-msgstr "å°?ç­?ã?®ã?©ã??ã?« (äº?å??)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:40
-msgid "Mailing Labels-3 columns"
-msgstr "å°?ç­?ã?®ã?©ã??ã?« (ä¸?å??)"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:44
-#: ../templates/zweckform-iso-templates.xml.h:24
-msgid "Rectangular Labels"
-msgstr "é?·æ?¹å½¢ã?®ã?©ã??ã?«"
+#: ../templates/misc-iso-templates.xml.h:32
+#: ../templates/pearl-iso-templates.xml.h:62
+#, fuzzy
+msgid "Self-adhesive labels"
+msgstr "æ­£æ?¹å½¢ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:46
+#: ../templates/misc-iso-templates.xml.h:34
 msgid "Universal Labels"
 msgstr "æ?®é??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:48
-msgid "Video Labels (face only)"
-msgstr "ã??ã??ã?ªã?®ã?©ã??ã?« (å¤?å?´ã?®ã?¿)"
-
-#. ===================================================================
-#: ../templates/misc-other-templates.xml.h:2
-msgid "Multi-Purpose Labels"
-msgstr "å¤?ç?®ç??ã?©ã??ã?«"
-
-#. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:4
 #, fuzzy
 msgid "Address Labels (STAMPIT)"
 msgstr "å®?å??ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:6
-#, fuzzy
-msgid "Bottle labels"
-msgstr "ã??ã?­ã??ã??ã?¼ã?®ã?©ã??ã?«"
-
-#. ===================================================================
 #: ../templates/pearl-iso-templates.xml.h:10
 msgid "Business cards glossy, both sides printable"
 msgstr ""
@@ -3201,134 +3493,259 @@ msgid "Business cards punched glossy"
 msgstr "å??å?º"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:22
+#: ../templates/pearl-iso-templates.xml.h:30
 #, fuzzy
 msgid "Floppy disk labels"
 msgstr "æ±?ç?¨ç??ã?ªã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:24
+#: ../templates/pearl-iso-templates.xml.h:32
 #, fuzzy
 msgid "Foldable business cards"
 msgstr "å??å?º"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:26
+#: ../templates/pearl-iso-templates.xml.h:34
 msgid "Foldable business cards glossy/dull"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:28
-#, fuzzy
-msgid "Labels A4"
-msgstr "ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:30
+#: ../templates/pearl-iso-templates.xml.h:38
 #, fuzzy
 msgid "Labels A5"
 msgstr "ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:32
+#: ../templates/pearl-iso-templates.xml.h:40
 #, fuzzy
 msgid "Labels A6"
 msgstr "ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:34
-msgid "Membership cards"
-msgstr ""
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:36
+#: ../templates/pearl-iso-templates.xml.h:44
 msgid "Membership cards, both sides printable"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:38
+#: ../templates/pearl-iso-templates.xml.h:46
 #, fuzzy
 msgid "Name plates"
 msgstr "name_page"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:40
+#: ../templates/pearl-iso-templates.xml.h:48
 msgid "Passport photo labels glossy"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:42
-#, fuzzy
-msgid "Photo labels"
-msgstr "gLabels ã?«ã?¤ã??ã?¦"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:44
+#: ../templates/pearl-iso-templates.xml.h:52
 msgid "Photo labels semiglossy"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:48
+#: ../templates/pearl-iso-templates.xml.h:56
 #, fuzzy
 msgid "SD card labels"
 msgstr "æ­£æ?¹å½¢ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:50
+#: ../templates/pearl-iso-templates.xml.h:58
 msgid "Self-adhesive film transparent"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:52
+#: ../templates/pearl-iso-templates.xml.h:60
 msgid "Self-adhesive film weatherproof"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:54
-#, fuzzy
-msgid "Self-adhesive labels"
-msgstr "æ­£æ?¹å½¢ã?®ã?©ã??ã?«"
-
-#. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:56
+#: ../templates/pearl-iso-templates.xml.h:64
 msgid "Self-adhesive window film"
 msgstr ""
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:10
+#: ../templates/zweckform-iso-templates.xml.h:14
 msgid "Correction and Cover-up Labels"
 msgstr "ã?³ã?¬ã?¯ã?·ã?§ã?³ã?¨ã?«ã??ã?¼ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:12
+#: ../templates/zweckform-iso-templates.xml.h:16
 msgid "File Back Labels"
 msgstr "ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:14
+#: ../templates/zweckform-iso-templates.xml.h:18
 msgid "Lever Arch File Labels"
 msgstr "ã?¬ã??ã?¼ã?»ã?¢ã?¼ã??ã?»ã??ã?¡ã?¤ã?«ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:18
+#: ../templates/zweckform-iso-templates.xml.h:22
 msgid "Multi-purpose Stick+Lift Labels"
 msgstr "å¤?ç?®ç?? Stick+Lift ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:20
+#: ../templates/zweckform-iso-templates.xml.h:24
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr "QSL-Karten Etiketten (70mm x 50.8mm)"
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:22
+#: ../templates/zweckform-iso-templates.xml.h:26
 msgid "Rectangular Copier Labels"
 msgstr "é?·æ?¹å½¢ã?®ã?³ã??ã?¼æ©?ã?®ã?©ã??ã?«"
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:26
+#: ../templates/zweckform-iso-templates.xml.h:30
 msgid "Video Labels (back)"
 msgstr "ã??ã??ã?ªã?®ã?©ã??ã?« (è£?å?´)"
 
+#~ msgid "Couldn't construct query"
+#~ msgstr "ã?¯ã?¨ã?ªã??æ§?ç¯?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#~ msgid "Couldn't open addressbook."
+#~ msgstr "ã?¢ã??ã?¬ã?¹å¸³ã??é??ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#~ msgid "Couldn't list available fields."
+#~ msgstr "å?©ç?¨å?¯è?½ã?ªé ?å??ã?®ä¸?覧ã??ç??æ??ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#~ msgid "Couldn't get contacts."
+#~ msgstr "é?£çµ¡å??ã??å??å¾?ã?§ã??ã?¾ã??ã??ã?§ã??ã??"
+
+#~ msgid "_Select Mode"
+#~ msgstr "é?¸æ??ã?¢ã?¼ã??(_S)"
+
+#~ msgid "_Text"
+#~ msgstr "æ??å­?(_T)"
+
+#~ msgid "_Line"
+#~ msgstr "ç?´ç·?(_L)"
+
+#~ msgid "_Box"
+#~ msgstr "ç?©å½¢(_B)"
+
+#~ msgid "_Ellipse"
+#~ msgstr "æ¥?å??(_E)"
+
+#~ msgid "_Image"
+#~ msgstr "ç?»å??(_I)"
+
+#~ msgid "Bar_code"
+#~ msgstr "ã??ã?¼ã?³ã?¼ã??(_C)"
+
+#~ msgid "_Merge Properties"
+#~ msgstr "çµ?å??ã??ã?­ã??ã??ã?£(_M)"
+
+#~ msgid "Object _Properties"
+#~ msgstr "ã?ªã??ã?¸ã?§ã?¯ã??ã?®ã??ã?­ã??ã??ã?£(_P)"
+
+#~ msgid "Bring to _Front"
+#~ msgstr "å??ã?«æ??ã?£ã?¦ã??ã??(_F)"
+
+#~ msgid "Send to _Back"
+#~ msgstr "å¾?ã??ã?«ã?¾ã??ã??(_B)"
+
+#~ msgid "Rotate _Left"
+#~ msgstr "å·¦ã?«å??転(_L)"
+
+#~ msgid "Rotate _Right"
+#~ msgstr "å?³ã?«å??転(_R)"
+
+#~ msgid "Flip _Horizontally"
+#~ msgstr "æ°´å¹³æ?¹å??ã?«ã??ã?ªã??ã??(_H)"
+
+#~ msgid "Flip _Vertically"
+#~ msgstr "å??ç?´æ?¹å??ã?«ã??ã?ªã??ã??(_V)"
+
+#~ msgid "_Lefts"
+#~ msgstr "左端(_L)"
+
+#~ msgid "_Rights"
+#~ msgstr "�端(_R)"
+
+#~ msgid "_Centers"
+#~ msgstr "中央(_C)"
+
+#~ msgid "_Tops"
+#~ msgstr "�端(_T)"
+
+#~ msgid "Bottoms"
+#~ msgstr "��"
+
+#~ msgid "Centers"
+#~ msgstr "中央"
+
+#~ msgid "Label Ce_nter"
+#~ msgstr "ã?©ã??ã?«ã?®ä¸­å¿?(_N)"
+
+#~ msgid "Linked"
+#~ msgstr "çµ?å??æ¸?"
+
+#~ msgid "Not Linked"
+#~ msgstr "çµ?å??ã?ªã??"
+
+#~ msgid "glabels"
+#~ msgstr "gLabels"
+
+#~ msgid "Bad root node = \"%s\""
+#~ msgstr "ã??ã??ã??ã?ª root ã?®ã??ã?¼ã?? = \"%s\""
+
+#~ msgid "bad node =  \"%s\""
+#~ msgstr "ã??ã??ã??ã?ªã??ã?¼ã?? = \"%s\""
+
+#~ msgid "xmlParseFile error"
+#~ msgstr "xmlParseFile ���"
+
+#~ msgid "No document root"
+#~ msgstr "root ã??ã?­ã?¥ã?¡ã?³ã??ã?§ã?¯ã??ã??ã?¾ã??ã??"
+
+#~ msgid "Importing from glabels 0.1 format"
+#~ msgstr "gLabels 0.1 å½¢å¼?ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã??"
+
+#~ msgid "Importing from glabels 0.4 format"
+#~ msgstr "gLabels 0.4 å½¢å¼?ã??ã??ã?¤ã?³ã??ã?¼ã??ã??ã??"
+
+#~ msgid "Unknown glabels Namespace -- Using %s"
+#~ msgstr "glabels ã?®å??å??空é??ã??ä¸?æ??ã?§ã?? -- %s ã??å?©ç?¨ã??ã?¦ä¸?ã??ã??"
+
+#~ msgid "bad node in Document node =  \"%s\""
+#~ msgstr "Document ã??ã?¼ã??ã?«ã??ã??ã??ã?ª root ã?®ã??ã?¼ã?? = \"%s\""
+
+#~ msgid "bad node in Data node =  \"%s\""
+#~ msgstr "Data ã??ã?¼ã??ã?«ã??ã??ã??ã?ªã??ã?¼ã?? = \"%s\""
+
+#, fuzzy
+#~ msgid "Unknown embedded file format: \"%s\""
+#~ msgstr "ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?® ID ã?¾ã??ã?¯å??å?? \"%s\" ã??ä¸?æ??ã?§ã??ã??"
+
+#~ msgid "Utf8 conversion error."
+#~ msgstr "Utf8 å¤?æ??ã?¨ã?©ã?¼ã?§ã??ã??"
+
+#~ msgid "Problem saving xml file."
+#~ msgstr "XML ã??ã?¡ã?¤ã?«ã?®ä¿?å­?ã?§å??é¡?ã??ã??ã??ã?¾ã??"
+
+#~ msgid "Missing name or brand/part attributes."
+#~ msgstr "å??å??ã?¾ã??ã?¯ã??ã?©ã?³ã??/ã??ã?¼ã??ç?ªå?·ã?¨ã??ã?£ã??å±?æ?§ã??ã??ã??ã?¾ã??ã??ã??"
+
+#~ msgid "Unknown page size id \"%s\", trying as name"
+#~ msgstr "ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?® ID \"%s\" ã??ä¸?æ??ã?ªã?®ã?§å??å??ã?¨ã??ã?¦æ?±ã??ã?¾ã??ã??"
+
+#~ msgid "Unknown page size id or name \"%s\""
+#~ msgstr "ã??ã?¼ã?¸ã?»ã?µã?¤ã?ºã?® ID ã?¾ã??ã?¯å??å?? \"%s\" ã??ä¸?æ??ã?§ã??ã??"
+
+#~ msgid ""
+#~ "Missing required \"brand\" or \"part\" attribute, trying deprecated name."
+#~ msgstr ""
+#~ "å¿?é ?ã?¨ã?ªã?? \"ã??ã?©ã?³ã??å??\" ã?? \"ã??ã?¼ã??ç?ªå?·\" ã?¨ã??ã?£ã??å±?æ?§ã??è¦?ã?¤ã??ã??ã?¾ã??ã?? "
+#~ "(å»?æ­¢ã??ã??å??å??ã??試ã??ã?¦ã?¿ã?¦ä¸?ã??ã??)"
+
+#~ msgid "Name attribute also missing."
+#~ msgstr "å??å??ã??è¦?ã?¤ã??ã??ã?¾ã??ã??"
+
+#~ msgid "Mailing Labels-2 columns"
+#~ msgstr "å°?ç­?ã?®ã?©ã??ã?« (äº?å??)"
+
+#~ msgid "Mailing Labels-3 columns"
+#~ msgstr "å°?ç­?ã?®ã?©ã??ã?« (ä¸?å??)"
+
 #~ msgid "- gLabels label designer"
 #~ msgstr "- gLabels ã?©ã??ã?«ã?»ã??ã?¶ã?¤ã??"
 
@@ -3338,15 +3755,6 @@ msgstr "ã??ã??ã?ªã?®ã?©ã??ã?« (è£?å?´)"
 #~ msgid "Show tooltips"
 #~ msgstr "ã??ã?¼ã?«ã??ã??ã??ã?®è¡¨ç¤º"
 
-#~ msgid "Show tooltips for property toolbar"
-#~ msgstr "ã??ã?­ã??ã??ã?£ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??表示ã??ã?¾ã??"
-
-#~ msgid "Show tooltips for main toolbar"
-#~ msgstr "ã?¡ã?¤ã?³ã?»ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??表示ã??ã?¾ã??"
-
-#~ msgid "Show tooltips for drawing toolbar"
-#~ msgstr "ã??ã?¼ã?«ã??ã?¼ã?«ã??ã?¼ã?«ã??ã??ã??ã??表示ã??ã?¾ã??"
-
 #~ msgid "xmlParseDoc error"
 #~ msgstr "xmlParseDoc ���"