Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

'ls' and 'cd' #153

Merged
merged 23 commits into from
Aug 10, 2021
Merged

'ls' and 'cd' #153

merged 23 commits into from
Aug 10, 2021

Conversation

megane0-0
Copy link
Collaborator

Translation #94

rikutakei and others added 19 commits October 11, 2020 20:19
Translation of Git episode 4
Merging after one review
Translation of Git episode 6
Merging after one review
@TomKellyGenetics
Copy link
Member

PR appears to cover both lessons 1 (#93) and lesson 2 (#94). Nice job Satoshi, I will resolve conflicts so we can proceed with review.

@TomKellyGenetics
Copy link
Member

Note that CONTRIBUTING.md (#123), CONDUCT.md (#122), and LICENSE.md (#127 #131) have already been translated for the R lesson and migrated to other lessons (#11). This is the cause for some conflicts. For now, let's keep the R version for consistency but if you have suggestions for changes we can compare them to your translation.

@TomKellyGenetics
Copy link
Member

Please hold off on reivewing for now. Kids woke up, I will resolve rest of conflicts locally and update

@TomKellyGenetics
Copy link
Member

TomKellyGenetics commented Aug 8, 2021

I've corrected a formatting issue with the English source so it is compatible with automated translation of lessons. Please wait while I resolve remaining conflicts. I'm not sure if this is a windows/unix issue, a text editor automatically shortening lines or me copying partially resolved conflicts from GItHub GUI to the terminal. Anyway it is fixed.

@TomKellyGenetics
Copy link
Member

TomKellyGenetics commented Aug 8, 2021

@megan0-0 please use git pull https://github.com/megane0-0/i18n.git ja to update your local version from GitHub before making further changes. (for example before translating another shell lesson)

@TomKellyGenetics
Copy link
Member

TomKellyGenetics commented Aug 8, 2021

Minor nitpick: "solution" (to challenge questions) is inconsistent. I've translated the missing one to 解答 (used in shell and R) but it is translated as 回答 in git lessons. Please discuss and ensure we are consistent across lessons.

cc: @joelnitta @rikutakei @kozo2

Copy link
Member

@TomKellyGenetics TomKellyGenetics left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conflicts resolved. Please proceed to review translations.

@@ -943,7 +964,7 @@ msgstr ""
# header
#: shell-novice/_episodes/01-intro.md:54
msgid "### The Shell"
msgstr "### The Shell"
msgstr "### シェル"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
msgstr "### シェル"
ザ・シェル

@@ -3418,6 +3801,17 @@ msgstr ""
"> 9. `cd ..`\n"
">\n"
"> > ## Solution\n"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"> > ## Solution\n"
"> > ## 解答\n"

@TomKellyGenetics TomKellyGenetics merged commit 87171c0 into swcarpentry-ja:ja Aug 10, 2021
@TomKellyGenetics
Copy link
Member

Accidentally closed. Reopened here: #173

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Translation: shell-novice Episode 2 Translation: shell-novice Episode 1
5 participants