update translations for master

and force-fix errors using pocheck

Change-Id: I5e201f8d1c7746b1612ff10f592d611f402dc72c

3 files changed, 321 insertions, 79 deletions

diff --git a/source/zh-CN/svx/inc.po b/source/zh-CN/svx/inc.po
index a52ce9898e5..c83cee62628 100644
--- a/source/zh-CN/svx/inc.po
+++ b/source/zh-CN/svx/inc.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-06-24 17:06+0200\n"
+"POT-Creation-Date: 2015-08-25 12:33+0200\n"
 "PO-Revision-Date: 2015-08-04 08:19+0000\n"
 "Last-Translator: 琨珑 锁 <suokunlong@126.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -363,14 +363,6 @@ msgstr "粘贴(~P)"
 #: globlmn_tmpl.hrc
 msgctxt ""
 "globlmn_tmpl.hrc\n"
-"ITEM_EDIT_IMAP\n"
-"#define.text"
-msgid "ImageMap"
-msgstr "图像映射"
-
-#: globlmn_tmpl.hrc
-msgctxt ""
-"globlmn_tmpl.hrc\n"
 "ITEM_EXTERNAL_EDIT\n"
 "#define.text"
 msgid "Edit with External Tool..."
@@ -455,6 +447,24 @@ msgstr "相交(~N)"
 #: globlmn_tmpl.hrc
 msgctxt ""
 "globlmn_tmpl.hrc\n"
+"ITEM_POLY_MERGE.ITEM_POLY_SUBSTRACT.ITEM_POLY_INTERSECT.ITEM_EQUALIZEWIDTH\n"
+"SID_EQUALIZEWIDTH\n"
+"menuitem.text"
+msgid "Equalize ~Width"
+msgstr ""
+
+#: globlmn_tmpl.hrc
+msgctxt ""
+"globlmn_tmpl.hrc\n"
+"ITEM_POLY_MERGE.ITEM_POLY_SUBSTRACT.ITEM_POLY_INTERSECT.ITEM_EQUALIZEWIDTH.ITEM_EQUALIZEHEIGHT\n"
+"SID_EQUALIZEHEIGHT\n"
+"menuitem.text"
+msgid "Equalize ~Height"
+msgstr ""
+
+#: globlmn_tmpl.hrc
+msgctxt ""
+"globlmn_tmpl.hrc\n"
 "MNSUB_FORMEN\n"
 "SID_POLY_FORMEN\n"
 "menuitem.text"
@@ -615,3 +625,10 @@ msgctxt ""
 "#define.text"
 msgid "Open ~Smart Tag Menu"
 msgstr "打开智能标记菜单(~S)"
+
+msgctxt ""
+"globlmn_tmpl.hrc\n"
+"ITEM_EDIT_IMAP\n"
+"#define.text"
+msgid "ImageMap"
+msgstr "图像映射"
diff --git a/source/zh-CN/svx/source/svdraw.po b/source/zh-CN/svx/source/svdraw.po
index 72d518c9ba0..1558e8831c4 100644
--- a/source/zh-CN/svx/source/svdraw.po
+++ b/source/zh-CN/svx/source/svdraw.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-04-22 23:41+0200\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
 "PO-Revision-Date: 2015-08-07 04:41+0000\n"
 "Last-Translator: 琨珑 锁 <suokunlong@126.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1563,6 +1563,22 @@ msgstr "分配选中的对象"
 #: svdstr.src
 msgctxt ""
 "svdstr.src\n"
+"STR_EqualizeWidthMarkedObjects\n"
+"string.text"
+msgid "Equalize Width %1"
+msgstr ""
+
+#: svdstr.src
+msgctxt ""
+"svdstr.src\n"
+"STR_EqualizeHeightMarkedObjects\n"
+"string.text"
+msgid "Equalize Height %1"
+msgstr ""
+
+#: svdstr.src
+msgctxt ""
+"svdstr.src\n"
 "STR_EditCombine_OnePoly\n"
 "string.text"
 msgid "Combine %1"
@@ -4891,6 +4907,14 @@ msgstr "分布列"
 #: svdstr.src
 msgctxt ""
 "svdstr.src\n"
+"STR_TABLE_DELETE_CELL_CONTENTS\n"
+"string.text"
+msgid "Delete cell contents"
+msgstr ""
+
+#: svdstr.src
+msgctxt ""
+"svdstr.src\n"
 "STR_TABLE_STYLE\n"
 "string.text"
 msgid "Table style"
diff --git a/source/zh-CN/svx/uiconfig/ui.po b/source/zh-CN/svx/uiconfig/ui.po
index cbca53a9844..e0c65f5c61d 100644
--- a/source/zh-CN/svx/uiconfig/ui.po
+++ b/source/zh-CN/svx/uiconfig/ui.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: https://bugs.libreoffice.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
-"POT-Creation-Date: 2015-06-24 17:06+0200\n"
+"POT-Creation-Date: 2015-09-01 20:20+0200\n"
 "PO-Revision-Date: 2015-08-07 04:42+0000\n"
 "Last-Translator: 琨珑 锁 <suokunlong@126.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1403,12 +1403,13 @@ msgid "Convert to 3D"
 msgstr "转换成三维"
 
 #: docking3deffects.ui
+#, fuzzy
 msgctxt ""
 "docking3deffects.ui\n"
 "tolathe\n"
 "tooltip_text\n"
 "string.text"
-msgid "Convert to Lathe Object"
+msgid "Convert to Rotation Object"
 msgstr "转换成旋转体"
 
 #: docking3deffects.ui
@@ -4374,24 +4375,6 @@ msgstr "填充(_F)："
 #: sidebararea.ui
 msgctxt ""
 "sidebararea.ui\n"
-"fillstyle\n"
-"tooltip_markup\n"
-"string.text"
-msgid "Select the fill type to apply."
-msgstr "选择要应用的填充类型。"
-
-#: sidebararea.ui
-msgctxt ""
-"sidebararea.ui\n"
-"fillstyle\n"
-"tooltip_text\n"
-"string.text"
-msgid "Select the fill type to apply."
-msgstr "选择要应用的填充类型。"
-
-#: sidebararea.ui
-msgctxt ""
-"sidebararea.ui\n"
 "color\n"
 "tooltip_markup\n"
 "string.text"
@@ -4428,29 +4411,56 @@ msgstr "选择要应用的效果。"
 #: sidebararea.ui
 msgctxt ""
 "sidebararea.ui\n"
-"transparencylabel\n"
+"fillgrad1\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Transparency"
-msgstr "透明"
+msgid "Fill gradient from."
+msgstr ""
 
 #: sidebararea.ui
 msgctxt ""
 "sidebararea.ui\n"
-"transparencylabel\n"
+"fillgrad1\n"
 "tooltip_text\n"
 "string.text"
-msgid "Transparency"
-msgstr "透明"
+msgid "Fill gradient from."
+msgstr ""
 
 #: sidebararea.ui
 msgctxt ""
 "sidebararea.ui\n"
-"transparencylabel\n"
-"label\n"
+"fillstyle\n"
+"tooltip_markup\n"
 "string.text"
-msgid "_Transparency:"
-msgstr "透明(_T)："
+msgid "Select the fill type to apply."
+msgstr "选择要应用的填充类型。"
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"fillstyle\n"
+"tooltip_text\n"
+"string.text"
+msgid "Select the fill type to apply."
+msgstr "选择要应用的填充类型。"
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"gradient\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Specify the variation of gradient transparency."
+msgstr "指定渐变透明的变化。"
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"gradient\n"
+"tooltip_text\n"
+"string.text"
+msgid "Specify the variation of gradient transparency."
+msgstr "指定渐变透明的变化。"
 
 #: sidebararea.ui
 msgctxt ""
@@ -4545,20 +4555,163 @@ msgstr "正方形"
 #: sidebararea.ui
 msgctxt ""
 "sidebararea.ui\n"
-"gradient\n"
+"transparencylabel\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Specify the variation of gradient transparency."
-msgstr "指定渐变透明的变化。"
+msgid "Transparency"
+msgstr "透明"
 
 #: sidebararea.ui
 msgctxt ""
 "sidebararea.ui\n"
-"gradient\n"
+"transparencylabel\n"
 "tooltip_text\n"
 "string.text"
-msgid "Specify the variation of gradient transparency."
-msgstr "指定渐变透明的变化。"
+msgid "Transparency"
+msgstr "透明"
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"transparencylabel\n"
+"label\n"
+"string.text"
+msgid "_Transparency:"
+msgstr "透明(_T)："
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"fillgrad2\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Fill gradient to."
+msgstr ""
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"fillgrad2\n"
+"tooltip_text\n"
+"string.text"
+msgid "Fill gradient to."
+msgstr ""
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"gradangle\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Select the gradient angle."
+msgstr ""
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"gradangle\n"
+"tooltip_text\n"
+"string.text"
+msgid "Select the gradient angle."
+msgstr ""
+
+#: sidebararea.ui
+#, fuzzy
+msgctxt ""
+"sidebararea.ui\n"
+"gradientstyle\n"
+"0\n"
+"stringlist.text"
+msgid "Linear"
+msgstr "线性"
+
+#: sidebararea.ui
+#, fuzzy
+msgctxt ""
+"sidebararea.ui\n"
+"gradientstyle\n"
+"1\n"
+"stringlist.text"
+msgid "Axial"
+msgstr "轴向"
+
+#: sidebararea.ui
+#, fuzzy
+msgctxt ""
+"sidebararea.ui\n"
+"gradientstyle\n"
+"2\n"
+"stringlist.text"
+msgid "Radial"
+msgstr "放射"
+
+#: sidebararea.ui
+#, fuzzy
+msgctxt ""
+"sidebararea.ui\n"
+"gradientstyle\n"
+"3\n"
+"stringlist.text"
+msgid "Ellipsoid"
+msgstr "椭圆"
+
+#: sidebararea.ui
+#, fuzzy
+msgctxt ""
+"sidebararea.ui\n"
+"gradientstyle\n"
+"4\n"
+"stringlist.text"
+msgid "Quadratic"
+msgstr "立方体"
+
+#: sidebararea.ui
+#, fuzzy
+msgctxt ""
+"sidebararea.ui\n"
+"gradientstyle\n"
+"5\n"
+"stringlist.text"
+msgid "Square"
+msgstr "正方形"
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"gradientstyle\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Select the gradient style."
+msgstr ""
+
+#: sidebararea.ui
+msgctxt ""
+"sidebararea.ui\n"
+"gradientstyle\n"
+"tooltip_text\n"
+"string.text"
+msgid "Select the gradient style."
+msgstr ""
+
+#: sidebararea.ui
+#, fuzzy
+msgctxt ""
+"sidebararea.ui\n"
+"transparencyslider\n"
+"tooltip_markup\n"
+"string.text"
+msgid "Specify 0% for fully opaque through 100% for fully transparent."
+msgstr "指定0%为完全不透明，100%为完全透明。"
+
+#: sidebararea.ui
+#, fuzzy
+msgctxt ""
+"sidebararea.ui\n"
+"transparencyslider\n"
+"tooltip_text\n"
+"string.text"
+msgid "Specify 0% for fully opaque through 100% for fully transparent."
+msgstr "指定0%为完全不透明，100%为完全透明。"
 
 #: sidebararea.ui
 msgctxt ""
@@ -4995,56 +5148,65 @@ msgstr "星形"
 #: sidebarline.ui
 msgctxt ""
 "sidebarline.ui\n"
-"widthlabel\n"
+"stylelabel\n"
 "label\n"
 "string.text"
-msgid "_Width:"
-msgstr "宽度(_W)："
+msgid "_Style:"
+msgstr "样式(_S)："
 
 #: sidebarline.ui
 msgctxt ""
 "sidebarline.ui\n"
-"width\n"
+"linestyle\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Select the width of the line."
-msgstr "选取线条的宽度。"
+msgid "Select the style of the line."
+msgstr "选取线条的样式。"
 
 #: sidebarline.ui
 msgctxt ""
 "sidebarline.ui\n"
-"width\n"
+"linestyle\n"
 "tooltip_text\n"
 "string.text"
-msgid "Select the width of the line."
-msgstr "选取线条的宽度。 "
+msgid "Select the style of the line."
+msgstr "选取线条的样式。"
 
 #: sidebarline.ui
 msgctxt ""
 "sidebarline.ui\n"
-"colorlabel\n"
+"widthlabel\n"
 "label\n"
 "string.text"
-msgid "_Color:"
-msgstr "颜色(_C)："
+msgid "_Width:"
+msgstr "宽度(_W)："
 
 #: sidebarline.ui
 msgctxt ""
 "sidebarline.ui\n"
-"linetransparency\n"
+"width\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Specify the transparency of the line."
-msgstr "指定线条的透明度。"
+msgid "Select the width of the line."
+msgstr "选取线条的宽度。"
 
 #: sidebarline.ui
 msgctxt ""
 "sidebarline.ui\n"
-"linetransparency\n"
+"width\n"
 "tooltip_text\n"
 "string.text"
-msgid "Specify the transparency of the line."
-msgstr "指定线条的透明度。"
+msgid "Select the width of the line."
+msgstr "选取线条的宽度。 "
+
+#: sidebarline.ui
+msgctxt ""
+"sidebarline.ui\n"
+"colorlabel\n"
+"label\n"
+"string.text"
+msgid "_Color:"
+msgstr "颜色(_C)："
 
 #: sidebarline.ui
 msgctxt ""
@@ -5094,29 +5256,20 @@ msgstr "透明(_T)："
 #: sidebarline.ui
 msgctxt ""
 "sidebarline.ui\n"
-"stylelabel\n"
-"label\n"
-"string.text"
-msgid "_Style:"
-msgstr "样式(_S)："
-
-#: sidebarline.ui
-msgctxt ""
-"sidebarline.ui\n"
-"linestyle\n"
+"linetransparency\n"
 "tooltip_markup\n"
 "string.text"
-msgid "Select the style of the line."
-msgstr "选取线条的样式。"
+msgid "Specify the transparency of the line."
+msgstr "指定线条的透明度。"
 
 #: sidebarline.ui
 msgctxt ""
 "sidebarline.ui\n"
-"linestyle\n"
+"linetransparency\n"
 "tooltip_text\n"
 "string.text"
-msgid "Select the style of the line."
-msgstr "选取线条的样式。"
+msgid "Specify the transparency of the line."
+msgstr "指定线条的透明度。"
 
 #: sidebarline.ui
 msgctxt ""
@@ -5685,6 +5838,54 @@ msgctxt ""
 msgid "Flip the selected object horizontally."
 msgstr "沿水平方向翻转选择的对象。"
 
+#: sidebarshadow.ui
+msgctxt ""
+"sidebarshadow.ui\n"
+"SHOW_SHADOW\n"
+"label\n"
+"string.text"
+msgid "Enable"
+msgstr ""
+
+#: sidebarshadow.ui
+msgctxt ""
+"sidebarshadow.ui\n"
+"angle\n"
+"label\n"
+"string.text"
+msgid "Angle"
+msgstr ""
+
+#: sidebarshadow.ui
+#, fuzzy
+msgctxt ""
+"sidebarshadow.ui\n"
+"distance\n"
+"label\n"
+"string.text"
+msgid "Distance"
+msgstr "间隔"
+
+#: sidebarshadow.ui
+#, fuzzy
+msgctxt ""
+"sidebarshadow.ui\n"
+"transparency_label\n"
+"label\n"
+"string.text"
+msgid "Transparency:"
+msgstr "透明(_T)："
+
+#: sidebarshadow.ui
+#, fuzzy
+msgctxt ""
+"sidebarshadow.ui\n"
+"color\n"
+"label\n"
+"string.text"
+msgid "Color:"
+msgstr "颜色(_C)："
+
 #: textcontrolchardialog.ui
 msgctxt ""
 "textcontrolchardialog.ui\n"