Skip to content
This repository has been archived by the owner on Oct 11, 2019. It is now read-only.

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@cute
cute committed Jul 26, 2016
2 parents 74a56b7 + aa2d17a commit 6006bb2
Showing 1 changed file with 70 additions and 48 deletions.
118 changes: 70 additions & 48 deletions SketchI18N.sketchplugin/Contents/Resources/i18n/zh-Hans.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"Show Colors": "显示颜色",
"Image": "图片",
"Feedback...": "反馈...",
"Feedback...": "反馈",
"Open…": "打开...",
"Pick Color": "拾色器",
"Show Inspector": "显示查看器",
Expand Down Expand Up @@ -50,7 +49,6 @@
"Close All": "全部关闭",
"View Plugins Documentation": "查看插件文档",
"Create Symbol": "创建组件",
"The selected layers will be replaced by a single layer. A new Symbol will be created in your document. Whenever this Symbol is edited, all its layers will update to reflect the changes.": "已选中的图层将被替换为单个图层。一个新的组件将在你的文档中创建。当这个组件被编辑的时候，和它相关的图层将自动同步修改。",
"Lock Layer": "锁定图层",
"Unlock Layer": "解锁图层",
"Lock Layers": "锁定图层",
Expand All @@ -76,11 +74,11 @@
"Custom Plugin…": "自定义插件…",
"Select All": "全选",
"Untitled": "未命名",
"Revert to Saved": "恢复至已储存",
"Revert to Saved": "恢复至已保存",
"Center": "居中",
"Save": "存储",
"Save": "保存",
"Cancel": "取消",
"Don't Save": "不存储",
"Don’t Save": "不保存",
"Hide Sidebars": "隐藏侧边栏",
"Artboard": "画板",
"Registration...": "注册...",
Expand Down Expand Up @@ -130,6 +128,7 @@
"Type": "类型",
"File": "文件",
"Group Layers": "分组图层",
"Ungroup Layers": "取消分组图层",
"Layer": "图层",
"Presentation Mode": "演示模式",
"Make Exportable": "导出图层",
Expand All @@ -156,7 +155,6 @@
"Mask with Selected Shape": "用所选图形做为蒙版",
"Center Canvas": "居中画布",
"Underline": "下划线",
"Ungroup Layers": "取消图层分组",
"Layer List": "图层列表",
"Spelling": "拼写",
"Redo": "重做",
Expand Down Expand Up @@ -407,12 +405,12 @@
"Darken": "加深",
"Overlay": "叠加",
"Resize to Fit": "适配画板",
"Rotate -90º": "逆时针90º",
"Rotate -90º": "逆时针90°",
"Rename": "重命名",
"Move Backward": "后移",
"Lock": "锁定",
"Group Selection": "分组选择",
"Rotate +90º": "顺时针90º",
"Rotate +90º": "顺时针90°",
"Move Forward": "前移",
"Hide": "隐藏",
"Paste Over": "粘贴过来",
Expand All @@ -439,7 +437,7 @@
"Rename duplicated layers": "重命名复制的图层",
"Sketch Mirror:": "Sketch Mirror:",
"Enabled": "启用",
"Holding down the Option key reverses the behaviour.": "按住 Option 键反转的行为。",
"Holding down the Option key reverses the behaviour.": "按住 Option 键反转行为。",
"Text Layers:": "文字图层：",
"Enable click-through for new groups": "启用点击新建分组",
"Animate zoom": "自动缩放",
Expand Down Expand Up @@ -509,7 +507,7 @@
"Scale from bottom left": "左下角固定缩放",
"Scale from bottom right": "右下角固定缩放",
"Do not show this message again": "不再显示此消息",
"Your changes will be lost if you don’t save them.": "如果不存储，你更改的内容将会丢失。",
"Your changes will be lost if you don’t save them.": "如果不保存，你更改的内容将会丢失。",
"Auto": "自动",
"Paragraph": "段落",
"Alignment": "对齐",
Expand Down Expand Up @@ -539,14 +537,16 @@
"Fill Grid": "填充网格",
"Stroke Outline": "描边轮廓",
"Open": "打开",
"Don’t Save": "不保存",
"Enter a name...": "输入名字...",
"Do you want to save the changes made to the document": "你想保存对文档所做的更改",
"Run Plugin": "运行插件",
"clear": "清除",
"No Selection": "没有选择",
"Save As:": "另存为：",
"Tags:": "标记：",
"Bitmaps:": "位图：",
"Save for Web": "用于网页",
"Color profile and EXIF metadata will\nbe discarded.": "色彩配置文件和 EXIF 元数据将被删除。",
"Tags": "标记",
"Hide extension": "隐藏扩展名",
"New Folder": "新建文件夹",
Expand All @@ -567,7 +567,7 @@
"Create New %@": "新建 %@",
"Organize %@s": "管理 %@",
"Organize %@s…": "管理 %@",
"Do you want to save the changes made to the document “%@”?": "你要存储对文稿“%@”所做的更改吗？",
"Do you want to save the changes made to the document “%@”?": "你要保存对文稿“%@”所做的更改吗？",
"(A Document Being Saved By %@)": "(文档将被保存为 %@)",
"Run ‘%@’ Again": "再次运行 ‘%@’",
"untitled script": "untitled script",
Expand All @@ -582,8 +582,10 @@
"List Type": "列表类型",
"Global Colors": "全局颜色",
"Global Gradients": "全局渐变",
"Global Patterns": "全局图案",
"Document Colors": "文档颜色",
"Document Gradients": "文档渐变",
"Document Patterns": "文档图案",
"Light Oblique": "细体倾斜",
"Underlined": "下划线",
"Bold Oblique": "粗体倾斜",
Expand All @@ -599,7 +601,7 @@
"Duplicate layers to fill missing cells": "复制图层填充缺失的元素",
"Margin": "外边距",
"Grid Tool": "网格工具",
"A new version of %@ is available!": "新版本 %@ 已经提供下载了!",
"A new version of %@ is available!": "新的 %@ 版本已经提供下载了!",
"Software Update": "软件更新",
"%1$@ %2$@ is now available—you have %3$@. Would you like to download it now?": "%1$@ %2$@ 已经可供下载，你当前版本是 %3$@。你现在要下载它吗?",
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?": "%1$@ %2$@ 已下载完毕并可以使用！你想要现在安装 %1$@ 吗？",
Expand All @@ -624,7 +626,7 @@
"Downloading update...": "正在下载更新…",
"Extracting update...": "正在解压更新…",
"GB": "GB",
"Install and Relaunch": "安装并重启应用",
"Install and Relaunch": "安装并重新启动",
"Installing update...": "正在安装更新…",
"KB": "KB",
"MB": "MB",
Expand Down Expand Up @@ -678,16 +680,6 @@
"Resizing": "改变大小",
"Sign in to Sketch Cloud Beta": "登录到 Sketch Cloud Beta",
"Cloud": "云分享",
"1. Overlay": "1. 遮盖",
"2. Size": "2. 尺寸",
"3. Spacing": "3. 距离",
"4. Property": "4. 属性",
"5. Note": "5. 笔记",
"Color names": "颜色名称",
"💎 Spec Export": "💎 规范导出",
"Hide marks": "隐藏标注",
"Lock marks": "锁定标注",
"Clear marks": "清理标注",
"License Registration": "许可证注册",
"SK3-0000-0000-0000-0000-0000": "SK3-0000-0000-0000-0000-0000",
"Register": "注册",
Expand All @@ -710,42 +702,72 @@
"The plugin has been installed successfully. You can now access it via the Plugins menu.": "此插件已成功安装，现在你可以通过插件菜单来使用它。",
"Do you want to replace it with “%@”?": "你想把它替换成 “%@” 吗？",
"Dismiss": "忽略",
"CUSTOM": "自定义",
"WEB": "网页",
"Library": "资源库",
"Hide Page List": "Hide Page List",
"Generic RGB": "Generic RGB",
"Strength": "Strength",
"Multiple Values": "Multiple Values",
"Pencils": "Pencils",
"Generic Gray": "Generic Gray",
"Color Palettes": "Color Palettes",
"Color Wheel": "Color Wheel",
"Not Applicable": "Not Applicable",
"Detach from Symbol": "Detach from Symbol",
"Distance": "Distance",
"Image Palettes": "Image Palettes",
"Show Page List": "Show Page List",
"Choose Image...": "选择图片...",
"Don't Check'": "不要检查",
"Check Automatically": "自动检查",
"Check for updates automatically?": "要自动检查更新吗？",
"1. Overlay": "1. 遮盖",
"2. Size": "2. 尺寸",
"3. Spacing": "3. 距离",
"4. Property": "4. 属性",
"5. Note": "5. 笔记",
"Color names": "颜色名称",
"💎 Spec Export": "💎 规范导出",
"Hide marks": "隐藏标注",
"Lock marks": "锁定标注",
"Clear marks": "清理标注",
"Generic RGB": "通用 RGB",
"Strength": "强度",
"Intensity": "强度",
"Original": "原始",
"Black": "黑色",
"White": "白色",
"Add a new preset": "添加一个预设值",
"Multiple Values": "多个值",
"Pencils": "铅笔",
"Generic Gray": "通用灰色",
"Color Palettes": "色彩图案",
"Color Wheel": "色轮",
"Not Applicable": "不适用",
"Detach from Symbol": "从组件分离",
"Distance": "距离",
"Image Palettes": "图片图案",
"Show Page List": "显示页面列表",
"Hide Page List": "隐藏页面列表",
"Color Sliders": "Color Sliders",
"The selected layers will be replaced by a single layer. A new \nSymbol will be created in your document. Whenever this Symbol is edited, all its layers will update to reflect the changes.": "The selected layers will be replaced by a single layer. A new \nSymbol will be created in your document. Whenever this Symbol is edited, all its layers will update to reflect the changes.",
"The selected layers will be replaced by a single layer. A new \nSymbol will be created in your document. Whenever this Symbol is edited, all its layers will update to reflect the changes.": "已选中的图层将被替换为单个图层。一个新的组件将创建到你的文档中。每当这个组件被编辑的时候，和它相关的图层将自动同步修改。",
"Item 1": "Item 1",
"Toggle Craft": "切换Craft",
"pick color": "pick color",
"Toggle Craft": "切换 Craft",
"pick color": "取色",
"No Value": "没有值",
"CUSTOM": "自定义",
"WEB": "网页",
"Library": "资源库",
"Struck through": "Struck through",
"DUPLICATE CONTENT": "复制内容",
"Help Center": "帮助中心",
"JSON": "JSON",
"Toggle Panel": "切换面板",
"Dropbox Link": "Dropbox链接",
"Random Unsplash": "Random Unsplash",
"Dropbox Link": "Dropbox 链接",
"Random Unsplash": "随机 Unsplash",
"Sync Styles": "同步样式",
"Craft": "Craft",
"Folder": "文件夹",
"Data": "数据",
"Duplicate inside selection": "复制内部选择",
"Shadowed": "阴影",
"Toggle Click-through" : "切换穿透选择",
"Preview Setup..." : "预览设置…",
"First Create an Artboard..." : "先创建一个画板…"
"Toggle Click-through": "切换穿透选择",
"Preview Setup...": "预览设置…",
"First Create an Artboard...": "先创建一个画板…",
"PaintCode Plugin": "PaintCode 插件",
"Choose Drawings": "选择图形",
"Platform & Language": "平台 & 语言",
"Get Code Files": "生成代码文件",
"Support:": "支持：",
"Artboards & Slices": "画板 & 切片",
"Class Name": "类名",
"Project": "项目",
"Author": "作者",
"Company": "公司",
"Change Code Settings...": "修改代码设置..."
}

0 comments on commit 6006bb2

Please sign in to comment.