[glabels/glabels_2_2: 16/16] Moved files to top-level of branch.

[Jim Evins <jimevins src gnome org>]

commit 3a3f0f3859c7ddeeeb9b2251fddf2c066ee9ca99
Author: Jim Evins <evins snaught com>
Date:   Mon Oct 5 20:19:02 2009 -0400

    Moved files to top-level of branch.
    
    Moved files to top-level directory of glabels_2_2 branch.  This is an artifact
    of the old SVN layout.  Fixed problems with zh_CN.po that prevented push.

 {glabels2/help => help}/de/de.po                   |    0
 .../help => help}/de/figures/main-window-empty.png |  Bin 33093 -> 33093 bytes
 {glabels2/help => help}/de/figures/merge-ex1-1.png |  Bin 39810 -> 39810 bytes
 {glabels2/help => help}/de/figures/merge-ex1-2.png |  Bin 69379 -> 69379 bytes
 {glabels2/help => help}/de/figures/merge-ex1-3.png |  Bin 35172 -> 35172 bytes
 {glabels2/help => help}/de/figures/merge-ex1-4.png |  Bin 43315 -> 43315 bytes
 {glabels2/help => help}/de/figures/merge-ex2-1.png |  Bin 42168 -> 42168 bytes
 {glabels2/help => help}/de/figures/merge-ex2-2.png |  Bin 62037 -> 62037 bytes
 {glabels2/help => help}/de/figures/merge-ex2-3.png |  Bin 34780 -> 34780 bytes
 {glabels2/help => help}/de/figures/merge-ex2-4.png |  Bin 49083 -> 49083 bytes
 .../de/figures/object-editor-sidebar.png           |  Bin 11132 -> 11132 bytes
 .../help => help}/de/figures/print-copies.png      |  Bin 9196 -> 9196 bytes
 {glabels2/help => help}/de/figures/print-merge.png |  Bin 9722 -> 9722 bytes
 {glabels2/help => help}/glabels-help.pot           |    0
 {glabels2/help => help}/glabels.omf.in             |    0
 {glabels2/po => po}/LINGUAS                        |    0
 {glabels2/po => po}/ca.po                          |    0
 {glabels2/po => po}/zh_CN.po                       |   22 ++++++++++----------
 18 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/glabels2/help/de/de.po b/help/de/de.po
similarity index 100%
rename from glabels2/help/de/de.po
rename to help/de/de.po
diff --git a/glabels2/help/de/figures/main-window-empty.png b/help/de/figures/main-window-empty.png
similarity index 100%
rename from glabels2/help/de/figures/main-window-empty.png
rename to help/de/figures/main-window-empty.png
diff --git a/glabels2/help/de/figures/merge-ex1-1.png b/help/de/figures/merge-ex1-1.png
similarity index 100%
rename from glabels2/help/de/figures/merge-ex1-1.png
rename to help/de/figures/merge-ex1-1.png
diff --git a/glabels2/help/de/figures/merge-ex1-2.png b/help/de/figures/merge-ex1-2.png
similarity index 100%
rename from glabels2/help/de/figures/merge-ex1-2.png
rename to help/de/figures/merge-ex1-2.png
diff --git a/glabels2/help/de/figures/merge-ex1-3.png b/help/de/figures/merge-ex1-3.png
similarity index 100%
rename from glabels2/help/de/figures/merge-ex1-3.png
rename to help/de/figures/merge-ex1-3.png
diff --git a/glabels2/help/de/figures/merge-ex1-4.png b/help/de/figures/merge-ex1-4.png
similarity index 100%
rename from glabels2/help/de/figures/merge-ex1-4.png
rename to help/de/figures/merge-ex1-4.png
diff --git a/glabels2/help/de/figures/merge-ex2-1.png b/help/de/figures/merge-ex2-1.png
similarity index 100%
rename from glabels2/help/de/figures/merge-ex2-1.png
rename to help/de/figures/merge-ex2-1.png
diff --git a/glabels2/help/de/figures/merge-ex2-2.png b/help/de/figures/merge-ex2-2.png
similarity index 100%
rename from glabels2/help/de/figures/merge-ex2-2.png
rename to help/de/figures/merge-ex2-2.png
diff --git a/glabels2/help/de/figures/merge-ex2-3.png b/help/de/figures/merge-ex2-3.png
similarity index 100%
rename from glabels2/help/de/figures/merge-ex2-3.png
rename to help/de/figures/merge-ex2-3.png
diff --git a/glabels2/help/de/figures/merge-ex2-4.png b/help/de/figures/merge-ex2-4.png
similarity index 100%
rename from glabels2/help/de/figures/merge-ex2-4.png
rename to help/de/figures/merge-ex2-4.png
diff --git a/glabels2/help/de/figures/object-editor-sidebar.png b/help/de/figures/object-editor-sidebar.png
similarity index 100%
rename from glabels2/help/de/figures/object-editor-sidebar.png
rename to help/de/figures/object-editor-sidebar.png
diff --git a/glabels2/help/de/figures/print-copies.png b/help/de/figures/print-copies.png
similarity index 100%
rename from glabels2/help/de/figures/print-copies.png
rename to help/de/figures/print-copies.png
diff --git a/glabels2/help/de/figures/print-merge.png b/help/de/figures/print-merge.png
similarity index 100%
rename from glabels2/help/de/figures/print-merge.png
rename to help/de/figures/print-merge.png
diff --git a/glabels2/help/glabels-help.pot b/help/glabels-help.pot
similarity index 100%
rename from glabels2/help/glabels-help.pot
rename to help/glabels-help.pot
diff --git a/glabels2/help/glabels.omf.in b/help/glabels.omf.in
similarity index 100%
rename from glabels2/help/glabels.omf.in
rename to help/glabels.omf.in
diff --git a/glabels2/po/LINGUAS b/po/LINGUAS
similarity index 100%
rename from glabels2/po/LINGUAS
rename to po/LINGUAS
diff --git a/glabels2/po/ca.po b/po/ca.po
similarity index 100%
rename from glabels2/po/ca.po
rename to po/ca.po
diff --git a/glabels2/po/zh_CN.po b/po/zh_CN.po
similarity index 99%
rename from glabels2/po/zh_CN.po
rename to po/zh_CN.po
index af9acb4..d33a27e 100644
--- a/glabels2/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: glabels\n"
 "Report-Msgid-Bugs-To: \n" 
 "POT-Creation-Date: 2009-05-17 14:09+0800\n" 
-"PO-Revision-Date: 2009-05-19 20:16-0400\n"
+"PO-Revision-Date: 2009-10-05 20:26-0400\n"
 "Last-Translator: Careon <zzbusagain yahoo com cn>\n" 
 "Language-Team: Careon <zzbusagain yahoo com cn>\n" 
 "MIME-Version: 1.0\n" 
@@ -1302,28 +1302,28 @@ msgstr "��"
 
 #: ../src/color-combo-menu.c:119
 #, c-format
-msgid "10% Gray"
-msgstr "10% ç?°è?²"
+msgid "10%% Gray"
+msgstr "10%% ç?°è?²"
 
 #: ../src/color-combo-menu.c:120
 #, c-format
-msgid "25% Gray"
-msgstr "25% ç?°è?²"
+msgid "25%% Gray"
+msgstr "25%% ç?°è?²"
 
 #: ../src/color-combo-menu.c:121
 #, c-format
-msgid "40% Gray"
-msgstr "40% ç?°è?²"
+msgid "40%% Gray"
+msgstr "40%% ç?°è?²"
 
 #: ../src/color-combo-menu.c:122
 #, c-format
-msgid "50% Gray"
-msgstr "50% ç?°è?²"
+msgid "50%% Gray"
+msgstr "50%% ç?°è?²"
 
 #: ../src/color-combo-menu.c:123
 #, c-format
-msgid "60% Gray"
-msgstr "60% ç?°è?²"
+msgid "60%% Gray"
+msgstr "60%% ç?°è?²"
 
 #: ../src/color-combo-menu.c:124
 msgid "Black"