Skip to content

Commit 27bd88e

Browse files
authored
Merge pull request #1 from ApolloZhu/PULL-17
3_1-497 初校
2 parents 54a87df + 746a970 commit 27bd88e

File tree

5 files changed

+331
-324
lines changed

5 files changed

+331
-324
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
如果您想支持我们,目前可以点击项目右上角的 <a class="github-button" href="https://github.com/ApolloZhu/Developing-iOS-10-Apps-with-Swift" data-icon="octicon-star" data-show-count="true" aria-label="Star ApolloZhu/Developing-iOS-10-Apps-with-Swift on GitHub">Star</a> 按钮来 Star 本项目。同时也希望您能够通过各种社交平台,如 微信公众号,微博,博客,开发者头条,简书,CocoaChina,CSDN 等为我们宣传推广,以帮助更多有需要的人。
1313

14-
如果您感兴趣,有能力,我们欢迎您参与项目。请提前阅读 [翻译指南/校对规则](./translation-instructions.md),在领取任务前阅读 [任务相关说明](https://github.com/ApolloZhu/Developing-iOS-10-Apps-with-Swift/issues/2)。不遵守该规定的翻译可能被直接关闭,请大家认真对待。
14+
如果您感兴趣,有能力,我们欢迎您参与项目。请提前阅读 [翻译标准/校对规则](./translation-style-guide.md),在领取任务前阅读 [任务相关说明](https://github.com/ApolloZhu/Developing-iOS-10-Apps-with-Swift/issues/2)。不遵守该规定的翻译可能被直接关闭,请大家认真对待。
1515

1616
### 下载字幕
1717

en/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ We have not yet finished translating. You may view our progress by
1111

1212
You may also support us by clicking the <a class="github-button" href="https://github.com/ApolloZhu/Developing-iOS-10-Apps-with-Swift" data-icon="octicon-star" data-show-count="true" aria-label="Star ApolloZhu/Developing-iOS-10-Apps-with-Swift on GitHub">Star</a> button on the upper right corner of this repository. Meanwhile, we'd like you to share this repository or website with your friends, through social media platforms, such as reddit, twitter, facebook, tumblr, etc., as well as other developer forums and websites, so we may help more people in need.
1313

14-
If you are interested in helping us translate, please read [Translation Instructions/Proofread Guidelines (Chinese)](../translation-instructions.md) carefully,and refer to [Must knows about collaboration (Chinese)](https://github.com/ApolloZhu/Developing-iOS-10-Apps-with-Swift/issues/2). We reserve rights to close any pull request that doesn't follow these regulations.
14+
If you are interested in helping us translate, please read [Translation Style Guide/Proofread Guidelines (Chinese)](../translation-style-guide.md) carefully,and refer to [Must knows about collaboration (Chinese)](https://github.com/ApolloZhu/Developing-iOS-10-Apps-with-Swift/issues/2). We reserve rights to close any pull request that doesn't follow these regulations.
1515

1616
### Download Subtitles
1717

subtitles/2. MVC; iOS, Xcode and Swift Demonstration.srt

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@ in the calculator case, it's the brains of the calculator,
7979

8080
17
8181
00:01:02,329 --> 00:01:04,496
82-
it's the thing that calculates, tha's the model,
82+
it's the thing that calculates, that's the model,
8383
负责计算的那个部分就是模型
8484

8585
18
8686
00:01:04,564 --> 00:01:08,500
87-
and tha's a UI independent part. It's what the app is,
87+
and that's a UI independent part. It's what the app is,
8888
和 UI 是没有关系的。仅仅是背后的逻辑
8989

9090
19
@@ -94,7 +94,7 @@ not how it displays or anything like that.
9494

9595
20
9696
00:01:10,637 --> 00:01:13,838
97-
How it displays is the controlle's job. So
97+
How it displays is the controller's job. So
9898
决定如何展示的是 Controller,控制器
9999

100100
21
@@ -3250,7 +3250,7 @@ private to the controller. Cuz you don't want someone else
32503250
651
32513251
00:33:02,015 --> 00:33:05,216
32523252
reaching in and messing with this controller's model. So
3253-
controler 里面的 model 实例
3253+
controller 里面的 model 实例
32543254

32553255
652
32563256
00:33:05,285 --> 00:33:06,851
@@ -3619,8 +3619,8 @@ modifies this CalculatorBrain. So this method,
36193619

36203620
725
36213621
00:36:49,777 --> 00:36:53,478
3622-
perfomOperation, also needs mutating in front of it,
3623-
所以 perfomOperation 方法需要增加 mutating 关键字
3622+
performOperation, also needs mutating in front of it,
3623+
所以 performOperation 方法需要增加 mutating 关键字
36243624

36253625
726
36263626
00:36:53,547 --> 00:36:55,881
@@ -6134,7 +6134,7 @@ if I have to do that, all of a sudden, I'm feeling like,
61346134
1328
61356135
01:09:35,743 --> 01:09:38,210
61366136
this whole table business really didn't buy me that
6137-
这个列表并不是那么能吸引我
6137+
这个列表并不是很好的设计
61386138

61396139
1329
61406140
01:09:38,278 --> 01:09:41,313
@@ -6174,7 +6174,7 @@ It's not really working out for me.
61746174
1336
61756175
01:09:56,864 --> 01:10:00,932
61766176
Okay, so how are we gonna fix this? Well, we're gonna use
6177-
那怎么改正呢?其实,我们要用到
6177+
那要怎么做呢?其实,我们要用到
61786178

61796179
1337
61806180
01:10:01,001 --> 01:10:04,736
@@ -6259,7 +6259,7 @@ needs to be at the beginning. So, we're going to
62596259
1353
62606260
01:10:50,417 --> 01:10:54,453
62616261
replace this open curly brace with the keyword in, and
6262-
然后把左大括号替换成关键字 in
6262+
我们把左大括号替换成关键字 in
62636263

62646264
1354
62656265
01:10:54,522 --> 01:10:56,855
@@ -6349,7 +6349,7 @@ this. Swift also knows that this returns something.
63496349
1371
63506350
01:12:01,021 --> 01:12:05,424
63516351
So we don't need return, okay. Swift also will let you have
6352-
所以不需要写 return。还有,不论又多少个参数
6352+
所以不需要写 return。还有,不论有多少个参数
63536353

63546354
1372
63556355
01:12:05,492 --> 01:12:09,594
@@ -6474,7 +6474,7 @@ it here. We just using as the associated value, but imagine
64746474
1396
64756475
01:13:37,517 --> 01:13:40,084
64766476
it as function, parameters and things like that. It's,
6477-
你可以想象一下,把闭包当作函数或参数使用
6477+
你可以想象一下,把闭包这种函数当作参数使用
64786478

64796479
1397
64806480
01:13:40,153 --> 01:13:43,922
@@ -6549,12 +6549,12 @@ if not a little bit better design point for
65496549
1411
65506550
01:14:41,615 --> 01:14:45,851
65516551
classes. All right, the last thing that I wanna do here.
6552-
最后要解决的是
6552+
最后要做的是
65536553

65546554
1412
65556555
01:14:45,919 --> 01:14:50,955
65566556
Let's go back to our simulator. Is talk about
6557-
让我把模拟器调出来
6557+
(先让我把模拟器调出来)
65586558

65596559
1413
65606560
01:14:51,024 --> 01:14:54,726
@@ -6684,7 +6684,7 @@ that as the device changes, that block of stuff, gets
66846684
1438
66856685
01:16:10,704 --> 01:16:13,939
66866686
stretched out, or whatever. And the stuff inside,
6687-
那一整坨会自动伸缩把界面填满
6687+
那一个部分会自动伸缩把界面填满
66886688

66896689
1439
66906690
01:16:14,007 --> 01:16:17,142
@@ -6709,7 +6709,7 @@ I'm gonna add one more button which you need for
67096709
1443
67106710
01:16:26,052 --> 01:16:29,487
67116711
your homework anyway. Which is a dot button. One of your
6712-
反正是你们作业里要有的——小数点
6712+
反正是你们作业里要有的小数点
67136713

67146714
1444
67156715
01:16:29,556 --> 01:16:33,324
@@ -7029,7 +7029,7 @@ Okay, so I'm gonna use the blue lines, actually, to put
70297029
1507
70307030
01:19:56,463 --> 01:19:59,164
70317031
this at the proper space on the left edge and top.
7032-
放置在左上角合适的位置s
7032+
放置在左上角合适的位置
70337033

70347034
1508
70357035
01:19:59,232 --> 01:20:03,435
@@ -7072,7 +7072,7 @@ the top? And, and really it's talking about the outer edge.
70727072
这里主要是指外层
70737073

70747074
1516
7075-
01:20:26,860 -- 01:20:28,626
7075+
01:20:26,860 --> 01:20:28,626
70767076
And you can try and make them the same width, or
70777077
你当然可以选择 Equal Widths 等宽
70787078

@@ -7279,7 +7279,7 @@ we didn't get the right attributes on.
72797279
1557
72807280
01:22:30,116 --> 01:22:32,951
72817281
So let's go back and check them all. We got fill equally,
7282-
让我们再都检查一遍
7282+
让我们再都检查一遍
72837283

72847284
1558
72857285
01:22:33,019 --> 01:22:36,187
@@ -7514,7 +7514,7 @@ that's due next Wednesday. I'm here if you have questions,
75147514
1604
75157515
01:25:02,969 --> 01:25:05,804
75167516
and I'll see you then. >> For more,
7517-
下周三见
7517+
下周三见
75187518

75197519
1605
75207520
01:25:05,873 --> 01:25:14,379

0 commit comments

Comments
 (0)