[glabels] update zh_CN translation



commit fdfa831e34fd57b8b4f288f69e7deb6377fccbb9
Author: du baodao <centerpoint 139 com>
Date:   Mon May 23 21:04:19 2011 +0800

    update zh_CN translation

 po/zh_CN.po | 2139 +++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 1259 insertions(+), 880 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 223fbf1..7294d4c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,388 +1,408 @@
 # German translation of glabels.
 # Copyright (C) 2001-2008 Jim Evins <evins snaught com>
-#
+# Careon <zzbusagain yahoo com cn>, 2009.
+# du baodao <centerpoint 139 com>,2010.
+# YunQiang Su <wzssyqa gmail com>, 2011.
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: glabels\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-10 00:37-0400\n"
-"PO-Revision-Date: 2009-05-19 20:16-0400\n"
-"Last-Translator: Careon <zzbusagain yahoo com cn>\n"
-"Language-Team: Careon <zzbusagain yahoo com cn>\n"
+"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?group_id=46122&ati\n";
+"POT-Creation-Date: 2011-05-21 14:26+0000\n"
+"PO-Revision-Date: 2011-05-23 20:33+0800\n"
+"Last-Translator: YunQiang Su <wzssyqa gmail com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=1; plural=0;\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 (����)"
 
-#: ../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 "Interleaved 2 of 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
-#, fuzzy
+#: ../src/bc-backends.c:199 ../src/bc-backends.c:257
 msgid "Code 93"
-msgstr "Code 39"
+msgstr "Code 93"
 
-#: ../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 ""
+msgstr "GS1-128"
 
-#: ../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
+#, fuzzy
 msgid "HIBC QR Code"
-msgstr ""
+msgstr "IEC18004 (QRCode)"
 
-#: ../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 ""
+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
+#, fuzzy
 msgid "Pharmacode 2-track"
-msgstr ""
+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 ""
+msgstr "IEC18004 (QRCode)"
 
 #: ../src/color-combo-button.c:198 ../src/color-combo.c:178
 msgid "Default Color"
@@ -550,7 +570,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 "�签��"
 
@@ -624,9 +644,8 @@ msgid "Close without saving"
 msgstr "��(���)"
 
 #: ../src/font-combo-menu.c:137
-#, fuzzy
 msgid "Recent fonts"
-msgstr "æ??è¿?ç??模æ?¿"
+msgstr "æ??è¿?ç??å­?ä½?"
 
 #: ../src/font-combo-menu.c:152
 msgid "Proportional fonts"
@@ -634,12 +653,11 @@ msgstr ""
 
 #: ../src/font-combo-menu.c:160
 msgid "Fixed-width fonts"
-msgstr ""
+msgstr "�宽��"
 
 #: ../src/font-combo-menu.c:168
-#, fuzzy
 msgid "All fonts"
-msgstr "å?¨é?¨æ??件"
+msgstr "����"
 
 #.
 #. * Allow text samples to be localized.
@@ -651,26 +669,26 @@ msgstr "å?¨é?¨æ??件"
 #: ../src/font-combo-menu-item.c:132
 msgctxt "Short sample text"
 msgid "Aa"
-msgstr ""
+msgstr "Aa"
 
 #: ../src/font-combo-menu-item.c:134
 msgctxt "Lower case sample text"
 msgid "abcdefghijklmnopqrstuvwxyz"
-msgstr ""
+msgstr "abcdefghijklmnopqrstuvwxyz"
 
 #: ../src/font-combo-menu-item.c:136
 msgctxt "Upper case sample text"
 msgid "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-msgstr ""
+msgstr "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
 
 #: ../src/font-combo-menu-item.c:138
 msgctxt "Numbers and special characters sample text"
 msgid "0123456789 .:,;(*!?)"
-msgstr ""
+msgstr "0123456789 .:,;(*!?)"
 
 #: ../src/font-combo-menu-item.c:157
 msgid "Sample text"
-msgstr ""
+msgstr "æ ·æ?¬æ??å­?"
 
 #: ../src/glabels-batch.c:53
 msgid "set output filename (default=\"output.pdf\")"
@@ -720,7 +738,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 "[æ??件...]"
 
@@ -728,7 +746,7 @@ msgstr "[æ??件...]"
 msgid "Print files created with gLabels."
 msgstr "æ??å?°gLabelsæ??件ã??"
 
-#: ../src/glabels-batch.c:107 ../src/glabels.c:89
+#: ../src/glabels-batch.c:107 ../src/glabels.c:87
 #, c-format
 msgid ""
 "%s\n"
@@ -747,44 +765,43 @@ msgstr "æ? æ³?å??并glabelsæ??件%s \n"
 msgid "cannot open glabels file %s\n"
 msgstr "æ? æ³?æ??å¼?glabelsæ??件 %s\n"
 
-#: ../src/glabels.c:81
+#: ../src/glabels.c:79
 msgid "Launch gLabels label and business card designer."
 msgstr "å?¯å?¨gLabelsæ ?ç­¾å??å??ç??设计软件ã??"
 
-#: ../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 "æ?¡å½¢ç ?æ?°æ?®æ? æ??"
 
 #: ../src/label-box.c:156
-#, fuzzy
 msgid "Create box object"
-msgstr "æ?°å»ºæ??å­?对象"
+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 "线���"
 
@@ -793,223 +810,216 @@ 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 "移���"
 
-#: ../src/label.c:1307
-#, fuzzy
+#: ../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:378
 msgid "Align right"
 msgstr "�对�"
 
-#: ../src/label.c:1603 ../src/ui.c:380
+#: ../src/label.c:1621
 msgid "Align horizontal center"
 msgstr "水平中��线"
 
-#: ../src/label.c:1679 ../src/ui.c:387
+#: ../src/label.c:1697
 msgid "Align tops"
 msgstr "顶端对�"
 
-#: ../src/label.c:1736 ../src/ui.c:394
+#: ../src/label.c:1754
 msgid "Align bottoms"
 msgstr "��对�"
 
-#: ../src/label.c:1797 ../src/ui.c:401
+#: ../src/label.c:1815
 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 "ç²?è´´"
 
 #: ../src/label-ellipse.c:160
-#, fuzzy
 msgid "Create ellipse object"
-msgstr "�建线�对象"
+msgstr "æ?°å»ºæ¤­å??对象"
 
-#: ../src/label-image.c:200 ../src/ui.c:312
+#: ../src/label-image.c:200 ../src/ui.c:310
 msgid "Create image object"
 msgstr "æ?°å»ºå?¾ç??对象"
 
 #: ../src/label-image.c:333 ../src/label-image.c:474
-#, fuzzy
 msgid "Set image"
-msgstr "æ?¢å¤?å?¾ç??大å°?"
+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 ""
+msgstr "移�"
 
-#: ../src/label-object.c:467
-#, fuzzy
+#: ../src/label-object.c:479
 msgid "Resize"
-msgstr "纸张大�"
+msgstr "æ?¹å??大å°?"
 
-#: ../src/label-object.c:1185
+#: ../src/label-object.c:1217
 #, fuzzy
 msgid "Shadow state"
 msgstr "é?´å½±"
 
-#: ../src/label-object.c:1228
-#, fuzzy
+#: ../src/label-object.c:1260
 msgid "Shadow offset"
-msgstr "é?´å½±"
+msgstr "é?´å½±å??移é??"
 
-#: ../src/label-object.c:1276
-#, fuzzy
+#: ../src/label-object.c:1308
 msgid "Shadow color"
-msgstr "é?´å½±"
+msgstr "�影��"
 
-#: ../src/label-object.c:1319
-#, fuzzy
+#: ../src/label-object.c:1351
 msgid "Shadow opacity"
-msgstr "é?´å½±"
+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
 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
-#, fuzzy
+#: ../src/label-text.c:657
 msgid "Font weight"
-msgstr "å??å?³æ??转"
+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
-#, fuzzy
+#: ../src/label-text.c:723
 msgid "Align text"
-msgstr "左对�"
+msgstr "对é½?æ??æ?¬"
 
-#: ../src/label-text.c:754
-#, fuzzy
+#: ../src/label-text.c:756
 msgid "Line spacing"
-msgstr "线æ?¡é?´é??ï¼?"
+msgstr "线æ?¡é?´é??"
 
-#: ../src/label-text.c:787 ../data/ui/property-bar.ui.h:11
-#, fuzzy
+#: ../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 ""
+msgstr "��缩�"
 
-#: ../src/media-select.c:349 ../src/media-select.c:353
-#: ../src/media-select.c:502 ../src/media-select.c:701
-#, fuzzy
+#: ../src/media-select.c:358 ../src/media-select.c:361
+#: ../src/media-select.c:506 ../src/media-select.c:723
 msgctxt "Brand"
 msgid "Any"
 msgstr "é??ç?¨"
 
-#: ../src/media-select.c:358 ../src/media-select.c:871
-#, fuzzy
+#: ../src/media-select.c:365 ../src/media-select.c:893
 msgctxt "Page size"
 msgid "Any"
 msgstr "é??ç?¨"
 
-#: ../src/media-select.c:367 ../src/media-select.c:370
-#: ../src/media-select.c:880
-#, fuzzy
+#: ../src/media-select.c:372 ../src/media-select.c:375
+#: ../src/media-select.c:902
 msgctxt "Category"
 msgid "Any"
 msgstr "é??ç?¨"
 
-#: ../src/media-select.c:968
+#: ../src/media-select.c:648
+#, c-format
+msgid "Delete template \"%s\"?"
+msgstr "å? é?¤æ¨¡ç??â??%sâ??ï¼?"
+
+#: ../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
-#, fuzzy
+#: ../src/media-select.c:992
 msgid "Try selecting a template in the \"Search all\" tab."
-msgstr "请ä»? \"æ?¥æ?¾å?¨é?¨æ¨¡æ?¿\" 页é?¢ä¸­é??æ?©ä¸?个模æ?¿ã??"
+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
-#, fuzzy
+#: ../src/media-select.c:1179
 msgid "No custom templates found."
-msgstr "æ??è¿?没æ??使ç?¨æ¨¡æ?¿ã??"
+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."
-msgstr ""
+msgstr "ä½ å?¯ä»¥å??建æ?°æ¨¡æ?¿æ??è??ä»?â??æ??ç´¢â??å?¨é?¨é¡µé?¢æ??ç´¢é¢?å®?ä¹?模æ?¿ã??"
 
 #. Translators: "None" here means that no document-merge source or
 #. * method has been selected.
@@ -1017,22 +1027,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 ""
@@ -1043,7 +1037,7 @@ msgstr ""
 
 #: ../src/merge-init.c:72
 msgid "Text: Tab Separated Values (TSV)"
-msgstr ""
+msgstr "æ??æ?¬ï¼?å?¶è¡¨ç¬¦å??é??ç??å?¼(TSV)"
 
 #: ../src/merge-init.c:79
 msgid "Text: Tab Separated Values (TSV) with keys on line 1"
@@ -1051,7 +1045,7 @@ msgstr ""
 
 #: ../src/merge-init.c:87
 msgid "Text: Colon separated values"
-msgstr ""
+msgstr "æ??æ?¬ï¼?å??å?·å??é??ç??å?¼"
 
 #: ../src/merge-init.c:94
 msgid "Text: Colon separated values with keys on line 1"
@@ -1066,36 +1060,34 @@ msgid "Text: Semicolon separated values with keys on line 1"
 msgstr ""
 
 #: ../src/merge-init.c:119
-#, fuzzy
 msgid "Evolution Addressbook"
-msgstr "ä»?Evolution导å?ºç??é??è¿?å½?"
+msgstr "Evolution é??è¿?å½?"
 
 #: ../src/merge-init.c:125
-#, fuzzy
 msgid "VCards"
-msgstr "夹纸�"
+msgstr "VCards"
 
-#: ../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 "æ? "
 
-#: ../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 "æ?°æ?®"
 
@@ -1103,59 +1095,58 @@ 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 ""
+msgstr "å??ä¸?"
 
 #: ../src/new-label-dialog.c:203
-#, fuzzy
 msgid "Select Product"
-msgstr "模å¼?é??æ?©"
+msgstr "é??æ?©äº§å??"
 
 #: ../src/new-label-dialog.c:215
 msgid "Choose Orientation"
-msgstr ""
+msgstr "é??æ?©æ?¹å??"
 
 #: ../src/new-label-dialog.c:229
 msgid "Review"
-msgstr ""
+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 "�形���"
 
@@ -1163,570 +1154,496 @@ 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
 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
 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
-#, fuzzy
+#: ../src/template-designer.c:429
 msgid "New gLabels Template"
-msgstr "gLabels 模�设计工�r"
+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
-#, fuzzy
+#: ../src/template-designer.c:1246
 msgid "Edit gLabels Template"
-msgstr "gLabels 模�设计工�r"
+msgstr "�� gLabels 模�"
 
-#: ../src/template-designer.c:1423
-#, fuzzy
+#: ../src/template-designer.c:1549
 msgid "Brand and part# match an existing template!"
-msgstr "<span foreground='red' weight='bold'>模æ?¿ä¸­å·²æ??ç??å??ç??å??è§?æ ¼</span>"
+msgstr ""
 
 #. 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
-msgid "Align _Horizontal"
-msgstr "水平对�(_H�"
+#: ../src/ui.c:102
+#, fuzzy
+msgid "_Alignment"
+msgstr "对��"
 
-#: ../src/ui.c:105
-msgid "Align _Vertical"
-msgstr "å??ç?´å¯¹é½?(_V)"
+#: ../src/ui.c:103
+#, fuzzy
+msgid "C_enter"
+msgstr "�中"
 
-#: ../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 "é??å?ºç¨?åº?"
 
-#: ../src/ui.c:180 ../src/ui.c:182 ../src/ui.c:967
+#: ../src/ui.c:178 ../src/ui.c:180 ../src/ui.c:976
 msgid "Undo"
-msgstr ""
+msgstr "æ?¤é??"
 
-#: ../src/ui.c:187 ../src/ui.c:189 ../src/ui.c:974
-#, fuzzy
+#: ../src/ui.c:185 ../src/ui.c:187 ../src/ui.c:983
 msgid "Redo"
-msgstr "红�"
+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 "å??æ?°"
 
-#: ../src/ui.c:238
+#: ../src/ui.c:236
 msgid "Configure the application"
 msgstr "对����设置"
 
-#: ../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
-msgid "Align objects to right edges"
-msgstr "å¤?个对象ä¸?左边ç??对é½?"
+#: ../src/ui.c:371
+#, fuzzy
+msgid "Align center"
+msgstr "左对�"
 
-#: ../src/ui.c:382
+#: ../src/ui.c:373
 msgid "Align objects to horizontal centers"
 msgstr "å¤?个对象ç??水平中å¿?å?±çº¿"
 
-#: ../src/ui.c:389
+#: ../src/ui.c:380
+msgid "Align objects to right edges"
+msgstr "å¤?个对象ä¸?左边ç??对é½?"
+
+#: ../src/ui.c:385
+#, fuzzy
+msgid "Align top"
+msgstr "顶端对�"
+
+#: ../src/ui.c:387
 msgid "Align objects to top edges"
 msgstr "å¤?个对象ä¸?ä¸?è¾¹ç??对é½?"
 
-#: ../src/ui.c:396
-msgid "Align objects to bottom edges"
-msgstr "å¤?个对象ä¸?ä¸?è¾¹ç??对é½?"
+#: ../src/ui.c:392
+#, fuzzy
+msgid "Align middle"
+msgstr "左对�"
 
-#: ../src/ui.c:403
+#: ../src/ui.c:394
 msgid "Align objects to vertical centers"
 msgstr "å¤?个对象ç??å??ç?´ä¸­å¿?å?±çº¿"
 
-#: ../src/ui.c:410
+#: ../src/ui.c:399
+#, fuzzy
+msgid "Align bottom"
+msgstr "��对�"
+
+#: ../src/ui.c:401
+msgid "Align objects to bottom edges"
+msgstr "å¤?个对象ä¸?ä¸?è¾¹ç??对é½?"
+
+#: ../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"
 
 # CHECK
-#: ../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 "æ?¹å??å½?å??çª?å?£ä¸­ç»?å?¾æ ?ç??å?¯è§?æ?§"
 
@@ -1734,20 +1651,19 @@ 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
-#, fuzzy
+#: ../src/ui-commands.c:1145
 msgid "or visit http://glabels.org/";
-msgstr "æ??è??访é?® http://glabels.sourceforge.net/";
+msgstr "æ??è??访é?® http://glabels.org/";
 
-#: ../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 ""
 "Marcus Bauer <m 7n7 de>\n"
@@ -1755,8 +1671,7 @@ msgstr ""
 "Mario Blättermann <mariobl gnome org>\n"
 "Careone <zzbusagain yahoo com cn>"
 
-#: ../src/ui-commands.c:1161
-#, fuzzy
+#: ../src/ui-commands.c:1169
 msgid ""
 "gLabels is free software: you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -1768,208 +1683,113 @@ msgid ""
 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 "GNU General Public License for more details.\n"
 msgstr ""
-"Glabels is free software; you can redistribute it and/or modify it\n"
-"under the terms of the GNU General Public License as published by\n"
-"the Free Software Foundation; either version 2 of the License, or\n"
-"(at your option) any later version.\n"
+"gLabels æ?¯è?ªç?±è½¯ä»¶ï¼?æ?¨å?¯ä»¥å?¨è?ªç?±è½¯ä»¶å?ºé??ä¼?\n"
+"å??å¸?ç?? GNU é??ç?¨å?¬å?±è®¸å?¯è¯?ç??æ?¡æ¬¾ä¸?é??æ?°å??å??å??(æ??)ä¿®æ?¹å®?ï¼?\n"
+"æ?¨å?¯ä»¥é??æ?©ä½¿ç?¨ GPL 第ä¸?ç??ï¼?æ??(æ??ç?§æ?¨ç??æ??æ?¿)ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??\n"
 "\n"
-"This program is distributed in the hope that it will be useful, but\n"
-"WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See\n"
-"the GNU General Public License for more details.\n"
-
-#: ../src/ui-commands.c:1190
-msgid "glabels"
-msgstr "glabels"
+"gLabels å??å??ç??ç?®ç??æ?¯å¸?æ??å®?ç?©æ??æ??ç?¨ï¼?ä½?æ?¯æ²¡æ??ä»»ä½?æ??ä¿?ï¼?\n"
+"没æ??对å?¶é??é??æ?§å??æ??ä¸?ç?¹å®?ç?®ç??ä¸?ç??é??ç?¨æ?§ç??ä»»ä½?å?³ä¾¿æ?¯æ??示ç??æ??ä¿?ã??\n"
+"请æ?¥é?? GNU é??ç?¨å?¬å?±è®¸å?¯è¯?以è?·å¾?æ?´å¤?ä¿¡æ?¯ã??\n"
 
 #: ../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 "é??误ç??æ ¹å?°å?? = \"%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 "xmlæ??件语æ³?é??误"
-
-#: ../src/xml-label.c:274
-msgid "No document root"
-msgstr "没æ??æ??档根"
-
-#: ../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 "æ??æ¡£å?°å??å??æ??é??误ç?¹ =  \"%s\""
-
-#: ../src/xml-label.c:868
-#, c-format
-msgid "bad node in Data node =  \"%s\""
-msgstr "æ?°æ?®å?°å??å??æ??é??误ç?¹ =  \"%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 "UTF-8ç¼?ç ?转æ?¢é??误ã??"
-
-#: ../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!"
 msgstr "æ?¾ä¸?å?°çº¸å¼ å°ºå¯¸å®?ä¹?æ??件ã??å?¯è?½æ?¯glabelsç??åº?æ??件没æ??正确å®?è£?ã??"
 
-#: ../libglabels/db.c:1057
+#: ../libglabels/lgl-db.c:1062
 msgid ""
 "Unable to locate category definitions.  Libglabels may not be installed "
 "correctly!"
 msgstr "æ?¾ä¸?å?°ç±»å??å®?ä¹?æ??件ã??å?¯è?½æ?¯glabelsç??åº?æ??件没æ??正确å®?è£?ã??"
 
-#: ../libglabels/db.c:2097
+#: ../libglabels/lgl-db.c:1989
 msgid ""
 "Unable to locate any template files.  Libglabels may not be installed "
 "correctly!"
 msgstr "æ?¾ä¸?å?°æ¨¡æ?¿æ??件ã??å?¯è?½æ?¯glabelsç??åº?æ??件没æ??正确å®?è£?ã??"
 
-#: ../libglabels/db.c:2164
-#, fuzzy, c-format
+#: ../libglabels/lgl-db.c:2056
+#, 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 ""
+msgstr "�页�签 %s"
 
 #.
 #. * 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
-#, fuzzy
+#: ../libglabels/lgl-template.c:759 ../libglabels/lgl-template.c:767
+#: ../libglabels/lgl-template.c:779 ../libglabels/lgl-template.c:787
 msgid "diameter"
-msgstr "%s %s ç?´å¾?"
+msgstr "ç?´å¾?"
 
 #. The ids are identical to the absolute length units supported in
 #. 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 "mm"
 
 #. [LGL_UNITS_CM]
-#: ../libglabels/units.c:68
+#: ../libglabels/lgl-units.c:68
 msgid "cm"
-msgstr ""
+msgstr "cm"
 
 #. [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
@@ -1987,18 +1807,16 @@ msgid "Location:"
 msgstr "�置�"
 
 #: ../data/ui/merge-properties-dialog.ui.h:3
-#, fuzzy
 msgid "Record selection/preview"
-msgstr "<b>è®°å½?é??æ?©/é¢?è§?</b>"
+msgstr "è®°å½?é??æ?©/é¢?è§?"
 
 #: ../data/ui/merge-properties-dialog.ui.h:4
 msgid "Select all"
 msgstr "å?¨é??"
 
 #: ../data/ui/merge-properties-dialog.ui.h:5
-#, fuzzy
 msgid "Source"
-msgstr "<b>��</b>"
+msgstr "��"
 
 #: ../data/ui/merge-properties-dialog.ui.h:6
 msgid "Unselect all"
@@ -2013,55 +1831,51 @@ msgid "Category:"
 msgstr "ç±»å??ï¼?"
 
 #: ../data/ui/media-select.ui.h:3
-#, fuzzy
 msgid "Custom"
-msgstr "å?ªå??"
+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 "纸张大�"
 
 #: ../data/ui/media-select.ui.h:5
 msgid "Recent"
-msgstr ""
+msgstr "æ??è¿?"
 
 #: ../data/ui/media-select.ui.h:6
-#, fuzzy
 msgid "Search all"
-msgstr "å?¨é??"
+msgstr "æ??ç´¢å?¨é?¨"
 
 #: ../data/ui/new-label-dialog.ui.h:1
 msgid ""
 "Choose label or card product from hundreds of predefined templates or define "
 "your own."
-msgstr ""
+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 "说æ??ï¼?"
 
 #: ../data/ui/new-label-dialog.ui.h:3
-#, fuzzy
 msgid "Label size:"
-msgstr "纸张大�"
+msgstr "�签大��"
 
 #: ../data/ui/new-label-dialog.ui.h:4
-#, fuzzy
 msgid "Layout:"
-msgstr "��"
+msgstr "���"
 
 #: ../data/ui/new-label-dialog.ui.h:5
 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 "�格 #:"
 
 #: ../data/ui/new-label-dialog.ui.h:8
 msgid "Please review and confirm your selection."
-msgstr ""
+msgstr "请æ£?æ?¥å¹¶ç¡®è®¤æ?¨ç??é??æ?©ã??"
 
 #: ../data/ui/new-label-dialog.ui.h:9
 msgid "Rotated"
@@ -2073,150 +1887,162 @@ msgstr ""
 
 #: ../data/ui/new-label-dialog.ui.h:11
 msgid "Similar products:"
-msgstr ""
+msgstr "ç?¸ä¼¼ç??产å??ï¼?"
 
 #: ../data/ui/new-label-dialog.ui.h:12
 msgid "Vendor:"
-msgstr ""
+msgstr "æ??ä¾?å??ï¼?"
+
+#: ../data/ui/object-editor.ui.h:1
+msgid " "
+msgstr " "
 
-#: ../data/ui/object-editor.ui.h:2
+#: ../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 "X å??移é??ï¼?"
 
-#: ../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 "Y å??移é??ï¼?"
 
-#: ../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 "对��1"
 
-#: ../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
+msgid "key:"
+msgstr "��"
+
 #: ../data/ui/prefs-dialog.ui.h:1
 msgid "   "
 msgstr "   "
 
 #: ../data/ui/prefs-dialog.ui.h:4
-#, fuzzy
 msgid "Default page size"
-msgstr "æ?¢å¤?å?¾ç??大å°?"
+msgstr "�认纸张大�"
 
 #: ../data/ui/prefs-dialog.ui.h:6
 msgid "Font:"
@@ -2224,7 +2050,7 @@ msgstr "å­?ä½?ï¼?"
 
 #: ../data/ui/prefs-dialog.ui.h:7
 msgid "ISO A4"
-msgstr ""
+msgstr "ISO A4"
 
 #: ../data/ui/prefs-dialog.ui.h:8
 msgid "Inches"
@@ -2259,9 +2085,8 @@ msgid "US Letter"
 msgstr "��信�"
 
 #: ../data/ui/prefs-dialog.ui.h:19
-#, fuzzy
 msgid "Units"
-msgstr "æ?ªå?½å??"
+msgstr "å??ä½?"
 
 #: ../data/ui/property-bar.ui.h:1
 msgid "Bold"
@@ -2328,34 +2153,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"
@@ -2373,19 +2208,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"
@@ -2399,69 +2239,75 @@ msgstr ""
 "ç»?大å¤?æ?°æ¨¡æ?¿å?ªé??è¦?1个å¸?å±?ï¼?å¦?第1个ä¾?å­?æ??示ã??\n"
 "第2个å?¾ä¾?说æ??äº?é??è¦?2个å¸?å±?ç??ä¾?å­?ã??"
 
-#: ../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."
@@ -2469,7 +2315,7 @@ msgstr ""
 "模æ?¿é??è¦?\n"
 "2个�� "
 
-#: ../data/ui/template-designer.ui.h:55
+#: ../data/ui/template-designer.ui.h:59
 msgid ""
 "Templates needing only\n"
 "one layout."
@@ -2477,11 +2323,11 @@ msgstr ""
 "模æ?¿é??è¦?\n"
 "1个�� "
 
-#: ../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"
@@ -2496,7 +2342,6 @@ msgid "Collate"
 msgstr "é??å??"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:2
-#, fuzzy
 msgid "Copies"
 msgstr "��"
 
@@ -2509,9 +2354,8 @@ msgid "Merge Control"
 msgstr ""
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:6
-#, fuzzy
 msgid "Options"
-msgstr "<b>é??项</b>"
+msgstr "é??项"
 
 #: ../data/ui/print-op-dialog-custom-widget.ui.h:7
 msgid "Sheets:"
@@ -2533,14 +2377,197 @@ msgstr "�第1页"
 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
+msgid "Default font size."
+msgstr "é»?认å­?ä½?大å°?ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:11
+msgid "Default font weight."
+msgstr "é»?认å­?ä½?ç²?ç»?ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:12
+msgid "Default line color."
+msgstr "é»?认线é¢?è?²ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:13
+msgid "Default line width."
+msgstr "é»?认线宽ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:14
+msgid "Default page size."
+msgstr "é»?认纸张大å°?ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:15
+msgid "Default text alignment."
+msgstr "é»?认æ??æ?¬å¯¹é½?ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:16
+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
+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
+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
+msgid "Recently used font families."
+msgstr "æ??è¿?使ç?¨ç??å­?ä½?æ??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:24
+msgid "Recently used templates."
+msgstr "æ??è¿?使ç?¨æ¨¡æ?¿ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:25
+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
+msgid "Show/hide main toolbar."
+msgstr "æ?¾ç¤º/é??è??主工å?·æ ?"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:28
+msgid "Show/hide markup."
+msgstr ""
+
+# CHECK
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:29
+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
+msgid "The default line width for new objects."
+msgstr "æ?°å¯¹è±¡ç??é»?认线宽ã??"
+
+#: ../data/schemas/org.gnome.glabels-3.gschema.xml.in.in.h:39
+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
+msgid "Units."
+msgstr "å??ä½?ã??"
+
 #: ../data/desktop/glabels-3.0.desktop.in.h:1
 msgid "Create labels, business cards and media covers"
 msgstr "å?¶ä½?æ ?ç­¾ï¼?å??ç??å??å??ç??ç??å°?é?¢"
 
 #: ../data/desktop/glabels-3.0.desktop.in.h:2
-#, fuzzy
 msgid "gLabels Label Designer 3"
-msgstr "gLabels�签设计工�"
+msgstr "gLabels�签设计工� 3"
 
 #: ../data/mime/glabels-3.0.xml.in.h:1
 msgid "gLabels Project File"
@@ -2549,7 +2576,7 @@ msgstr "gLabelså·¥ç¨?æ??件"
 #. Envelopes
 #: ../templates/paper-sizes.xml.h:2
 msgid "#10 Envelope"
-msgstr ""
+msgstr "10 å?·ä¿¡å°?"
 
 #. Other ISO A series sizes
 #: ../templates/paper-sizes.xml.h:4
@@ -2644,15 +2671,15 @@ msgstr "B9"
 
 #: ../templates/paper-sizes.xml.h:28
 msgid "C5"
-msgstr ""
+msgstr "C5"
 
 #: ../templates/paper-sizes.xml.h:29
 msgid "C6"
-msgstr ""
+msgstr "C6"
 
 #: ../templates/paper-sizes.xml.h:30
 msgid "DL"
-msgstr ""
+msgstr "DL"
 
 #: ../templates/paper-sizes.xml.h:31
 msgid "Monarch Envelope"
@@ -2676,7 +2703,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 "å??ç??"
 
@@ -2684,31 +2716,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
@@ -2718,12 +2811,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 "å??ç??"
@@ -2731,13 +2827,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 å??ç??æ ?ç­¾"
 
@@ -2754,6 +2856,7 @@ msgstr "CD/DVD å??ç??æ ?ç­¾(å??ç??ç??å??衬纸)"
 #. ===================================================================
 #: ../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 "软ç??æ ?ç­¾"
@@ -2778,6 +2881,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 "�页�签"
@@ -2811,6 +2915,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 "é??å??å?°å??æ ?ç­¾"
@@ -2818,6 +2923,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"
@@ -2826,6 +2932,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"
@@ -2848,18 +2956,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 "é??è¿?å½?æ ?ç­¾"
 
@@ -2870,46 +2975,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
-#, fuzzy
+#: ../templates/avery-iso-templates.xml.h:28
 msgid "Mini Labels"
-msgstr "å¾®å??CDç??æ ?ç­¾"
+msgstr "å¾®å??æ ?ç­¾"
 
 #. ===================================================================
-#: ../templates/avery-iso-templates.xml.h:28
+#: ../templates/avery-iso-templates.xml.h:32
 msgid "Shipping labels"
 msgstr "ç?©æµ?æ ?ç­¾"
 
@@ -2942,6 +3052,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"
@@ -2959,6 +3099,7 @@ msgstr "æ??èµ·ç??å?¬æ??夹"
 
 #. ===================================================================
 #: ../templates/dymo-other-templates.xml.h:10
+#: ../templates/geha-iso-templates.xml.h:19
 msgid "Large Address Labels"
 msgstr "大å?°å??æ ?ç­¾"
 
@@ -2968,6 +3109,181 @@ msgid "Shipping Address Labels"
 msgstr "ç?©æµ?å?°å??æ ?ç­¾"
 
 #. ===================================================================
+#. ====================================================================
+#. ===================================================================
+#: ../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/geha-iso-templates.xml.h:6
+#, fuzzy
+msgid "Arch File inserts"
+msgstr "档��签"
+
+#: ../templates/geha-iso-templates.xml.h:9
+#, fuzzy
+msgid "CD/DVD Inlet"
+msgstr "CDå??ç??"
+
+#. ===================================================================
+#. ====================================================================
+#. ===================================================================
+#: ../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
+#, fuzzy
+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 "é??è¡?è¯?ç?§ç??å??æ»?æ ?ç­¾"
+
+#. ===================================================================
+#. ====================================================================
+#. ===================================================================
+#: ../templates/geha-iso-templates.xml.h:25
+#: ../templates/hama-iso-templates.xml.h:23
+#: ../templates/pearl-iso-templates.xml.h:50
+msgid "Photo labels"
+msgstr "ç?§ç??æ ?ç­¾"
+
+#. ====================================================================
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+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
+msgid "Labels A4"
+msgstr "A4 æ ?ç­¾"
+
+#. *******************************************************************
+#: ../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"
@@ -2983,12 +3299,13 @@ 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:18
+#: ../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 "ç£?带ç??æ ?ç­¾"
@@ -3011,20 +3328,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 "è¶?级CDæ ?ç­¾ 2-å??ä¸?(å??ç??ç??é?¢)"
 
+#. ===================================================================
 #: ../templates/misc-us-templates.xml.h:26
 msgid "PRO CD Labels 2-up (Face only)"
 msgstr "è¶?级CDæ ?ç­¾ 2-å??ä¸?(å°?é?¢)"
 
 #. ===================================================================
+#. 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 "è¶?级CDæ ?ç­¾ 2-å??ä¸?(å°?é?¢)"
 
@@ -3039,110 +3354,52 @@ 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
+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)ç?¸ç??纸"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:26
+#: ../templates/misc-iso-templates.xml.h:16
 msgid "Etiketten"
 msgstr "å??è£?æ ?ç­¾"
 
 #. ===================================================================
-#: ../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 "ä¿¡å°?æ ?ç­¾-2æ ?"
-
-#. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:40
-msgid "Mailing Labels-3 columns"
-msgstr "ä¿¡å°?æ ?ç­¾-3æ ?"
-
-#. ===================================================================
-#: ../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
+msgid "Self-adhesive labels"
+msgstr "���签"
 
 #. ===================================================================
-#: ../templates/misc-iso-templates.xml.h:46
-#, fuzzy
+#: ../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 ""
@@ -3172,134 +3429,256 @@ msgid "Business cards punched glossy"
 msgstr "å??ç??"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:22
-#, fuzzy
+#: ../templates/pearl-iso-templates.xml.h:30
 msgid "Floppy disk labels"
-msgstr "é??ç?¨æ ?ç­¾"
+msgstr "软ç??æ ?ç­¾"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:24
-#, fuzzy
+#: ../templates/pearl-iso-templates.xml.h:32
 msgid "Foldable business cards"
-msgstr "å??ç??"
+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
-#, fuzzy
+#: ../templates/pearl-iso-templates.xml.h:38
 msgid "Labels A5"
-msgstr "æ ?ç­¾"
+msgstr "A5 æ ?ç­¾"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:32
-#, fuzzy
+#: ../templates/pearl-iso-templates.xml.h:40
 msgid "Labels A6"
-msgstr "æ ?ç­¾"
+msgstr "A6 æ ?ç­¾"
 
 #. ===================================================================
-#: ../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 ""
+msgstr "ä¼?å??å?¡ï¼?å??é?¢å?¯æ??å?°"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:38
+#: ../templates/pearl-iso-templates.xml.h:46
 #, fuzzy
 msgid "Name plates"
 msgstr "å??称"
 
 #. ===================================================================
-#: ../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"
+msgstr "é??è¡?è¯?ç?§ç??å??æ»?æ ?ç­¾"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:44
+#: ../templates/pearl-iso-templates.xml.h:52
 msgid "Photo labels semiglossy"
-msgstr ""
+msgstr "å??å??æ»?ç?§ç??æ ?ç­¾"
 
 #. ===================================================================
-#: ../templates/pearl-iso-templates.xml.h:48
-#, fuzzy
+#: ../templates/pearl-iso-templates.xml.h:56
 msgid "SD card labels"
-msgstr "正�形�签"
+msgstr "SD å?¡æ ?ç­¾"
 
 #. ===================================================================
-#: ../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 "å¤?ç?¨é?? æ??äº?è´´"
 
 #. ===================================================================
-#: ../templates/zweckform-iso-templates.xml.h:20
+#: ../templates/zweckform-iso-templates.xml.h:24
 msgid "QSL-Karten Etiketten 70mm x 50,8mm"
 msgstr ""
 
 #. ===================================================================
-#: ../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 "Label Ce_nter"
+#~ msgstr "�签中�(_N)"
+
+#~ msgid "Linked"
+#~ msgstr "��"
+
+#~ msgid "Not Linked"
+#~ msgstr "���"
+
+#~ msgid "Align _Horizontal"
+#~ msgstr "水平对�(_H�"
+
+#~ msgid "Align _Vertical"
+#~ msgstr "å??ç?´å¯¹é½?(_V)"
+
+#~ msgid "glabels"
+#~ msgstr "glabels"
+
+#~ msgid "Bad root node = \"%s\""
+#~ msgstr "é??误ç??æ ¹å?°å?? = \"%s\""
+
+#~ msgid "bad node =  \"%s\""
+#~ msgstr "é??误ç?¹ =  \"%s\""
+
+#~ msgid "xmlParseFile error"
+#~ msgstr "xmlæ??件语æ³?é??误"
+
+#~ msgid "No document root"
+#~ msgstr "没æ??æ??档根"
+
+#~ 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 "æ??æ¡£å?°å??å??æ??é??误ç?¹ =  \"%s\""
+
+#~ msgid "bad node in Data node =  \"%s\""
+#~ msgstr "æ?°æ?®å?°å??å??æ??é??误ç?¹ =  \"%s\""
+
+#, fuzzy
+#~| msgid "Unknown page size id or name \"%s\""
+#~ msgid "Unknown embedded file format: \"%s\""
+#~ msgstr "æ?ªç?¥ç??纸张大å°?idæ??è§?æ ¼ \"%s\""
+
+#~ msgid "Utf8 conversion error."
+#~ msgstr "UTF-8ç¼?ç ?转æ?¢é??误ã??"
+
+#~ 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 "ä¿¡å°?æ ?ç­¾-2æ ?"
+
+#~ msgid "Mailing Labels-3 columns"
+#~ msgstr "ä¿¡å°?æ ?ç­¾-3æ ?"
+
 #~ msgid "Text file with comma delimeters (CSV)"
 #~ msgstr "ç?¨é??å?·å??é??ç??æ??æ?¬æ??件 (CSV)"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]