Translate basic-css by focus-kfc · Pull Request #49 · FreeCodeCampChina/challenges

focus-kfc · 2018-08-01T05:49:07Z

进度10/43。

CatcherO · 2018-08-04T08:13:20Z

01-responsive-web-design/basic-css.json

-        }
+          "text": "<code>h2</code> 元素 <code>style</code> 属性的值应该以 <code>;</code> 结束。",
+          "testString": "assert(code.match(/<h2\\s+style\\s*=\\s*(\\'|\")\\s*color\\s*:\\s*(?:rgb\\(\\s*255\\s*,\\s*0\\s*,\\s*0\\s*\\)|rgb\\(\\s*100%\\s*,\\s*0%\\s*,\\s*0%\\s*\\)|red|#ff0000|#f00|hsl\\(\\s*0\\s*,\\s*100%\\s*,\\s*50%\\s*\\))\\s*\\;(\\'|\")>\\s*CatPhotoApp\\s*<\\/h2>/),'<code>h2</code> 元素 <code>style</code> 属性的值应该以 <code>;</code> 结束。');"
+


这个地方误删了 }

S1ngS1ng

@silentsvv 这个 PR 里好像包含了之前 merge 过的 PR 的改动？你再确认下吧。可能是你没有 rebase

focus-kfc · 2018-08-06T16:58:14Z

我先提交后面翻译的，我看看是啥问题。

S1ngS1ng

整体上不错。

注意，tests 里面的内容，翻译的时候尽量不要翻译成动作（行为），而应该是一种结果

给你的<code>div</code>元素添加<code>silver-background</code>class。

VS

<code>div</code>元素背景颜色应设置为<code>silver</code>。

后者稍好。不必逐字逐句翻译

S1ngS1ng · 2018-08-07T16:51:28Z

01-responsive-web-design/basic-css.json

-        "So, let's go ahead and import and apply a Google font (note that if Google is blocked in your country, you will need to skip this challenge).",
-        "To import a Google Font, you can copy the font(s) URL from the Google Fonts library and then paste it in your HTML. For this challenge, we'll import the <code>Lobster</code> font. To do this, copy the following code snippet and paste it into the top of your code editor(before the opening <code>style</code> element):",
+        "除了大多数系统提供的默认字体以外，我们也可以在我们的网站上使用自定义的字体。网络上有各种各样的字体，不过在这个例子中，我们将会尝试使用<code>Google</code>字体库。",
+        "<a href='https://fonts.google.com/' target='_blank'>Google 字体</a> 是一个免费的字体库，可以通过在 CSS 里面设置字体的 URL 来引用。",


这个 a 之后不需要空格

S1ngS1ng · 2018-08-07T16:53:20Z

01-responsive-web-design/basic-css.json

+        "除了大多数系统提供的默认字体以外，我们也可以在我们的网站上使用自定义的字体。网络上有各种各样的字体，不过在这个例子中，我们将会尝试使用<code>Google</code>字体库。",
+        "<a href='https://fonts.google.com/' target='_blank'>Google 字体</a> 是一个免费的字体库，可以通过在 CSS 里面设置字体的 URL 来引用。",
+        "因此，下一步，我们将引入和使用<code>Google</code>字体（注意：如果你所在国家禁止使用<code>Google</code>，则可以跳过这个挑战）。",
+        "引入<code>Google</code>字体，你需要复制<code>Google</code>字体的 URL，并粘贴到你的 HTML 里面。在这个挑战中，我们需要引入<code>Lobster</code>字体。因此，请复制以下代码段，并粘贴到你的代码编辑器顶部。（在<code>style</code>标签之前）。",


并粘贴到你的代码编辑器顶部。（在<code>style</code>标签之前）。 =>
并粘贴到你的代码编辑器顶部（<code>style</code>标签之前）。

或

并粘贴到你的代码编辑器顶部，即放到<code>style</code>标签之前。

推荐后者

S1ngS1ng · 2018-08-07T16:54:15Z

01-responsive-web-design/basic-css.json

+        "字体名区分大小写，并且如果字体名含有空格，需要用引号括起来。例如，使用<code>\"Open Sans\"</code>字体需要添加引号，而<code>Lobster</code>字体则不需要",
        "<hr>",
-        "Create a <code>font-family</code> CSS rule that uses the <code>Lobster</code> font, and ensure that it will be applied to your <code>h2</code> element."
+        "创建一个CSS规则，<code>font-family</code>属性里设置为<code>Lobster</code>字体，并确保适用于你所有的<code>h2</code>元素。"


空格！

并确保适用于你所有的<code>h2</code>元素。 =>
并把这个字体应用到所有的<code>h2</code>元素。

S1ngS1ng · 2018-08-07T16:55:28Z

01-responsive-web-design/basic-css.json

-        "There are several default fonts that are available in all browsers. These generic font families include <code>monospace</code>, <code>serif</code> and <code>sans-serif</code>",
-        "When one font isn't available, you can tell the browser to \"degrade\" to another font.",
-        "For example, if you wanted an element to use the <code>Helvetica</code> font, but degrade to the <code>sans-serif</code> font when <code>Helvetica</code> wasn't available, you will specify it as follows:",
+        "所有浏览器都有几种默认字体。这些通用字体包括<code>monospace</code>，<code>serif</code>和<code>sans-serif</code>",


S1ngS1ng · 2018-08-07T16:56:20Z

01-responsive-web-design/basic-css.json

-        "For example, if you wanted an element to use the <code>Helvetica</code> font, but degrade to the <code>sans-serif</code> font when <code>Helvetica</code> wasn't available, you will specify it as follows:",
+        "所有浏览器都有几种默认字体。这些通用字体包括<code>monospace</code>，<code>serif</code>和<code>sans-serif</code>",
+        "当字体不可用，你可以告诉浏览器通过 “降级” 去使用其他字体。",
+        "例如，如果你想将一个元素的字体设置成<code>Helvetica</code>，当<code>Helvetica</code>不可用时，降级使用<code>sans-serif</code>字体，可使用以下方法：",


可使用以下方法： =>
那么可以这样写：

S1ngS1ng · 2018-08-07T17:01:47Z

01-responsive-web-design/basic-css.json

        {
-          "text": "The border around your <code>img</code> element should be green.",
-          "testString": "assert($(\"img\").css(\"border-left-color\") === \"rgb(0, 128, 0)\", 'The border around your <code>img</code> element should be green.');"
+          "text": "你<code>img</code>元素的边框颜色应该为绿色。",


去掉你。下同

S1ngS1ng · 2018-08-07T17:02:05Z

01-responsive-web-design/basic-css.json

        "<hr>",
-        "You can specify a <code>border-radius</code> with pixels. Give your cat photo a <code>border-radius</code> of <code>10px</code>.",
-        "Note: this challenge allows for multiple possible solutions. For example, you may add <code>border-radius</code> to either the <code>.thick-green-border</code> class or the <code>.smaller-image</code> class."
+        "<code>border-radius</code>可以用<code>px</code>像素单位来赋值。 给你的猫咪图片设置 10px 的<code>border-radius</code>。",


多了个空格

S1ngS1ng · 2018-08-07T17:03:01Z

01-responsive-web-design/basic-css.json

        {
-          "text": "Give your <code>div</code> element the class <code>silver-background</code>.",
-          "testString": "assert($(\"div\").hasClass(\"silver-background\"), 'Give your <code>div</code> element the class <code>silver-background</code>.');"
+          "text": "给你的<code>div</code>元素添加<code>silver-background</code>class。",


你的<code>div</code>元素应有<code>silver-background</code>class。

S1ngS1ng · 2018-08-07T17:05:33Z

01-responsive-web-design/basic-css.json

-        "However, an <code>id</code> is not reusable and should only be applied to one element. An <code>id</code> also has a higher specificity (importance) than a class so if both are applied to the same element and have conflicting styles, the styles of the <code>id</code> will be applied.",
-        "Here's an example of how you can take your element with the <code>id</code> attribute of <code>cat-photo-element</code> and give it the background color of green. In your <code>style</code> element:",
+        "通过<code>id</code>属性，你可以做一些很酷的事情，例如，就像 class 一样，你可以使用CSS来设置他们的样式",
+        "可是，<code>id</code>不可以重用，只应用于一个元素上。同时，在 CSS 里，<code>id</code>的优先级要高于 <code>class</code>，如果一个元素同时应用了 <code>class</code> 和 <code>id</code>，并设置样式有冲突，会优先应用 <code>id</code> 的样式。",


空格有问题

S1ngS1ng · 2018-08-07T17:07:11Z

01-responsive-web-design/basic-css.json

      "id": "bad87fee1248bd9aedf08824",
      "title": "Add Different Margins to Each Side of an Element",
      "description": [
+        "有时候，你会想给一个元素每个方向的<code>margin</code>都设置成一个特定的值。",


底下的原文要删掉

focus-kfc · 2018-08-08T05:19:02Z

已经处理好了~ @S1ngS1ng 辛苦了！

S1ngS1ng

Thanks 👍

wu_ze_qing and others added 8 commits July 23, 2018 14:03

add: 完成BasicCSS的前4个教程。

87f8b09

alter: 修改调整翻译中文。

6162385

add: 继续翻译3小节。

b2979fa

fixed: 修复语义，以及翻译格式。

f62b7da

update: 替换空格&修改css class翻译。

571575a

remove extra whitespace

1ac9cbf

add: 翻译一部分字体教程。

4c6fc35

add: 添加三个翻译区段。

dd439c2

CatcherO reviewed Aug 4, 2018

View reviewed changes

S1ngS1ng suggested changes Aug 5, 2018

View reviewed changes

S1ngS1ng added the need update Use when a translation (?) PR has been reviewed and needs to address comments label Aug 5, 2018

add: 继续翻译10个小节。

f6f7155

wu_ze_qing and others added 3 commits August 7, 2018 13:31

add: 继续翻译2小节，进度22/43。

2e77ff4

fixed: 修复误删除的“{”

4ffe17b

Merge branch 'translate' into translate

ed795de

S1ngS1ng suggested changes Aug 7, 2018

View reviewed changes

fixed: 修正。

5c4d488

focus-kfc closed this Aug 8, 2018

focus-kfc reopened this Aug 8, 2018

S1ngS1ng approved these changes Aug 8, 2018

View reviewed changes

S1ngS1ng added ship it Use when a translation (?) PR is ready for shipping and removed need update Use when a translation (?) PR has been reviewed and needs to address comments labels Aug 8, 2018

Conversation

focus-kfc commented Aug 1, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

S1ngS1ng left a comment

Choose a reason for hiding this comment

Uh oh!

focus-kfc commented Aug 6, 2018

Uh oh!

S1ngS1ng left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

focus-kfc commented Aug 8, 2018

Uh oh!

S1ngS1ng left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

S1ngS1ng left a comment •

edited

Loading