Translation from en to zh #58

symbolic · 2014-04-27T09:17:14Z

Created zh.text

dtto · 2014-04-27T14:42:21Z

pages/vpn/zh.text

@@ -5,11 +5,11 @@ p（警告警报）。当我们过渡到新系统，我们会撤下关于如何

 h2. 什么是 RiseupVPN？

-虚拟专用网（VPN） (VPN) 通常用于远程工作人员连接到主办公室网络。RiseupVPN是不同的：它 <%= 连接 ‘sends all your internet traffic through an encrypted connection’ => ‘how-vpn-works’ %>到 riseup.net，然后发送到公共网络。有时，这种VPN也叫做“个人VPN”。个人VPN的目的不是为了安全地与专用网络连接，而是要你安全地连接到整个互联网。
+虚拟专用网（VPN）通常用于远程工作人员连接到主办公室网络。RiseupVPN是不同的：它 <%= 连接 ‘sends all your internet traffic through an encrypted connection’ => ‘how-vpn-works’ %>到 riseup.net，然后发送到公共网络。有时，这种 VPN也叫做“个人 VPN”。个人 VPN的目的不是为了安全地与专用网络连接，而是要你安全地连接到整个互联网。


I changed this earlier because it was causing amber rebuild to fail. Links should be in the format [[LINK NAME => URL]] so this

<%= 连接 ‘sends all your internet traffic through an encrypted connection’ => ‘how-vpn-works’ %>

Appears to make amber rebuild fail.

dtto · 2014-04-27T14:44:34Z

I think you'll need to update your remote repo and try correcting a few things.

dtto · 2014-04-28T01:37:59Z

Hi!
I'm new to git as well. What I did was to read this help page
https://help.github.com/articles/fork-a-repo
And follow the instructions for Step 3. Basically, you'll need to setup riseup_help as an upstream by running
git remote add upstream https://github.com/riseupnet/riseup_help.git
Then, you should run
git pull upstream master
to merge in the changes that I made.

Copied from en.text. Replaced [[LINK NAME -> URL]] with [LINK NAME => URL]]

Replaced [[LINK NAME -> URL]] with [LINK NAME => URL]]

elijh · 2014-04-28T07:07:09Z

that seems overly complicated. I would just correct the way links are formatted in the zh.text files, and then re-issue this pull request.

how are you editing files? through this website, or via a local git clone?

symbolic · 2014-04-28T07:11:38Z

through this website,

edited it on github.

elijh · 2014-04-28T07:47:03Z

ok. what happens if you edit the files again and re-issue the pull request?

symbolic · 2014-04-28T08:25:08Z

Maybe it works like this:

If it has been 'Merged', a new 'Proposed' will be made.
If I pulled a requset, when the state was 'Proposed' , and the files
about "pull request" is edited again, it will be a "update" merged with
the last "pull request".

What happened? Dose it serious? I am so sorry...

Elijah Sparrow wrote:

ok. what happens if you edit the files again and re-issue the pull
request?

—
Reply to this email directly or view it on GitHub
#58 (comment).

dtto · 2014-05-01T03:52:05Z

So I think this is what you need to do. You need to make the changes made by this commit to the vpn/zh.text file:

Go to dtto@75da1d8

Look at the changes to the vpn/zh.text file. You need to make the version of the file in your repo identical to the one above. You can find the file here:

https://github.com/xxxyyyzzz/riseup_help/blob/master/pages/vpn/zh.text

Your file has to be identical to the version on the upstream repo.

Then maybe you can resubmit your pull request and it will work?

- 它 <%= 连接 ‘sends all your internet traffic through an encrypted connection’ => ‘how-vpn-works’ %>到 riseup.net， + 它 [[sends all your internet traffic through an encrypted connection => how-vpn-works]] 到 riseup.net， -p（警告警报）。当我们过渡到新系统，我们会撤下关于如何使用 RiseupVPN的说明。当准备就绪，我们将会张贴使用新系统的说明。 +p. 当我们过渡到新系统，我们会撤下关于如何使用 RiseupVPN的说明。当准备就绪，我们将会张贴使用新系统的说明。

symbolic · 2014-05-01T12:13:10Z

fixed it.

dtto · 2014-05-01T14:07:01Z

Hmmm... I see that you've made the change. I wonder if you have to re-issue the pull request?

dtto · 2014-05-01T14:26:42Z

pages/vpn/zh.text

@@ -1,15 +1,15 @@
 @nav_title = 'VPN'


I think you need to reverse these two lines to make it look like this:
https://github.com/riseupnet/riseup_help/blob/46523c41a31179d7b246aedc9fbc68ba3760cacd/pages/vpn/zh.text

dtto · 2014-05-01T15:01:04Z

One other thing. If you fix these things and it still won't merge, you might just want to copy and paste the files that you've changed to your local machine and then delete your fork and re-fork. You can do this on the "settings" tab in the right side of the screen when you're looking at your version of the repo.

If you decide to go this route, you can just re-fork the repo and then make your edits from there, then issue a new pull request.

Sorry this is such a pain and thanks for your help with translations!

dtto · 2014-05-01T18:05:04Z

Hi.

I went ahead and resolved the conflict in a different merge.

FYI, there's no need to substitute => for -> ... Sorry if that was confusing. I'm still learning this myself.

elijh · 2014-05-01T18:32:39Z

I have merged in these changes, after a little cleanup. One of the primary problems is that textile links only work with straight double quotes like so: "label":url

if those quotes are curly quotes, then it doesn't work. in general, it is easier to use the amber specific markup of [[label => url]], because it is more clear and less liable to have the quotes mess up.

the only downside to using the amber way is that it is specific to amber. but i am ok with that :)

symbolic · 2014-05-04T05:02:09Z

Hi. I want to use git and amber tools for editing language pages.
Following the "Advanced method", I installed ruby, git and amber.
Edited "\riseup_help\pages\zh.text" file, Running "amber rebuild" and
"amber server", displaying this:

E:\Users\Documents\GitHub\riseup_help>amber server
[deprecated] I18n.enforce_available_locales will default to true in the
future.
If you really want to skip validation of your locale you can set
I18n.enforce_av
ailable_locales = false to avoid this message.
[2014-05-04 12:45:08] INFO WEBrick 1.3.1
[2014-05-04 12:45:08] INFO ruby 1.9.3 (2013-11-22) [i386-mingw32]
[2014-05-04 12:45:08] INFO WEBrick::HTTPServer#start: pid=3876 port=8000

Everything seems like ok.

But, when browsing to http://localhost:8000, it automatically jumps to
http://localhost:8000/en.
The termimal displays this:

[2014-05-04 12:47:40] INFO Redirect / ==> http://localhost:8000/en
www.gilisoft.com - - [04/May/2014:12:47:40 ��] "GET /
HTTP/1.1" 307 0

-> /
[2014-05-04 12:47:41] INFO Serving Page
..www.gilisoft.com - - [04/May/2014:12:47:40 ��] "GET /en
HTTP/1.1" 20
0 0
-> /en
[2014-05-04 12:47:41] ERROR NotImplementedError: symlink() function is
unimpleme
nted on this machine
C:/RailsInstaller/Ruby1.9.3/lib/ruby/1.9.1/fileutils.rb:351:in
`symlink'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/1.9.1/fileutils.rb:351:in
block in ln_s' C:/RailsInstaller/Ruby1.9.3/lib/ruby/1.9.1/fileutils.rb:1531:in fu_each
_src_dest0'
C:/RailsInstaller/Ruby1.9.3/lib/ruby/1.9.1/fileutils.rb:349:in `ln_s'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/amber-0.2.6/lib/amb
er/static_page/render.rb:95:in `block in link_page_aliases'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/amber-0.2.6/lib/amb
er/static_page/render.rb:78:in `each'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/amber-0.2.6/lib/amb
er/static_page/render.rb:78:in `link_page_aliases'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/amber-0.2.6/lib/amb
er/static_page/render.rb:38:in `render_to_file'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/amber-0.2.6/lib/amb
er/site.rb:40:in `block in render'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/amber-0.2.6/lib/amb
er/site.rb:39:in `each'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/amber-0.2.6/lib/amb
er/site.rb:39:in `render'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/gems/1.9.1/gems/amber-0.2.6/lib/amb
er/server.rb:67:in `do_GET'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/1.9.1/webrick/httpservlet/abstract.
rb:106:in `service'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/1.9.1/webrick/httpservlet/filehandl
er.rb:198:in `service'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/1.9.1/webrick/httpserver.rb:138:in
`service'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/1.9.1/webrick/httpserver.rb:94:in `
run'

C:/RailsInstaller/Ruby1.9.3/lib/ruby/1.9.1/webrick/server.rb:191:in blo ck in start_thread' [2014-05-04 12:47:42] INFO Serve static file E:/Users/Documents/GitHub/riseup_h elp/public/E:/favicon.ico [2014-05-04 12:47:42] ERROR/favicon.ico' not found.
www.gilisoft.com - - [04/May/2014:12:47:41 ��] "GET
/favicon.ico HTTP/
1.1" 404 281

-> /favicon.ico
[2014-05-04 12:47:43] INFO Serve static file
E:/Users/Documents/GitHub/riseup_h
elp/public/E:/favicon.ico
[2014-05-04 12:47:43] ERROR `/favicon.ico' not found.
www.gilisoft.com - - [04/May/2014:12:47:42 ��] "GET
/favicon.ico HTTP/
1.1" 404 281
-> /favicon.ico
Whatis wrong whit it

dtto · 2014-05-04T18:32:29Z

It may just be defaulting to en. What happens if you click the link for Chinese language? Will it load okay then?

elijh · 2014-05-04T20:31:17Z

darn. The problem is that amber is only written with linux and mac in mind. I haven't tried to get it working on Windows. It should not be too hard, I just don't have a Windows machine to test on. I think I can fire up a windows virtual machine.

I have created issue for this leapcode/amber#1

vr added 3 commits April 27, 2014 10:25

Update zh.text

c3fe47b

Update zh.text

afaf0e0

Update zh.text

ace8fc0

dtto reviewed Apr 27, 2014
View reviewed changes

fork added 5 commits April 28, 2014 10:45

Create zh.text

e07242e

Create zh.text

6730c64

Copied from en.text. Replaced [[LINK NAME -> URL]] with [LINK NAME => URL]]

Update en.text

e368b86

Replaced [[LINK NAME -> URL]] with [LINK NAME => URL]]

Update zh.text

b53a0fd

Replaced [[LINK NAME -> URL]] with [LINK NAME => URL]]

Update zh.text

183a14a

Replaced [[LINK NAME -> URL]] with [LINK NAME => URL]]

dtto reviewed May 1, 2014
View reviewed changes

dtto closed this May 1, 2014

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Translation from en to zh #58

Translation from en to zh #58

symbolic commented Apr 27, 2014

dtto Apr 27, 2014

dtto commented Apr 27, 2014

dtto commented Apr 28, 2014

elijh commented Apr 28, 2014

symbolic commented Apr 28, 2014

elijh commented Apr 28, 2014

symbolic commented Apr 28, 2014

dtto commented May 1, 2014

symbolic commented May 1, 2014

dtto commented May 1, 2014

dtto May 1, 2014

dtto commented May 1, 2014

dtto commented May 1, 2014

elijh commented May 1, 2014

symbolic commented May 4, 2014

dtto commented May 4, 2014

elijh commented May 4, 2014

Translation from en to zh #58

Translation from en to zh #58

Conversation

symbolic commented Apr 27, 2014

dtto Apr 27, 2014

Choose a reason for hiding this comment

dtto commented Apr 27, 2014

dtto commented Apr 28, 2014

elijh commented Apr 28, 2014

symbolic commented Apr 28, 2014

elijh commented Apr 28, 2014

symbolic commented Apr 28, 2014

dtto commented May 1, 2014

symbolic commented May 1, 2014

dtto commented May 1, 2014

dtto May 1, 2014

Choose a reason for hiding this comment

dtto commented May 1, 2014

dtto commented May 1, 2014

elijh commented May 1, 2014

symbolic commented May 4, 2014

dtto commented May 4, 2014

elijh commented May 4, 2014