Code

Correct conflicts for Masami#1

Code

Merged

masamiy merged 76 commits intomasamiy:toc-editmasamiy/i18n:toc-editfrom TomKellyGenetics:masamiTomKellyGenetics/i18n:masamiCopy head branch name to clipboardAug 30, 2020

+689-678

Commits

Commits on Nov 30, 2018

• More readable Japanese

  manabuishii

  authored
  ef26c2e

  Copy full SHA for ef26c2e

• Little bit fluent Japanese

  manabuishii

  authored
  309078b

  Copy full SHA for 309078b

• Update TranslatorGuidelines.md

  manabuishii

  authored
  4cdcc57

  Copy full SHA for 4cdcc57

• Update TranslatorGuidelines.md

  manabuishii

  authored
  50c04d2

  Copy full SHA for 50c04d2

• Unification of notation

  manabuishii

  authored
  3013b00

  Copy full SHA for 3013b00

Commits on Jul 19, 2019

• add translation in background

  

  megane0-0

  committed
  4760815

  Copy full SHA for 4760815

Commits on Aug 8, 2019

• translated writing data

  atusy

  committed
  bac9739

  Copy full SHA for bac9739

Commits on Mar 25, 2020

• Update po/r-novice-gapminder.ja.po

  Show description for 89dc642
  

  atusy

  and

  masamiy

  authored
  89dc642

  Copy full SHA for 89dc642

• Update po/r-novice-gapminder.ja.po

  Show description for 7cbf186
  

  atusy

  and

  masamiy

  authored
  7cbf186

  Copy full SHA for 7cbf186

• Update po/r-novice-gapminder.ja.po

  Show description for 8a5df49
  

  atusy

  and

  masamiy

  authored
  8a5df49

  Copy full SHA for 8a5df49

• Update po/r-novice-gapminder.ja.po

  Show description for ee26302
  

  atusy

  and

  masamiy

  authored
  ee26302

  Copy full SHA for ee26302

• Update po/r-novice-gapminder.ja.po

  Show description for feb4e7f
  

  atusy

  and

  masamiy

  authored
  feb4e7f

  Copy full SHA for feb4e7f

• Update po/r-novice-gapminder.ja.po

  Show description for 1a614e7
  

  atusy

  and

  masamiy

  authored
  1a614e7

  Copy full SHA for 1a614e7

• Update po/r-novice-gapminder.ja.po

  Show description for 96c14b4
  

  atusy

  and

  masamiy

  authored
  96c14b4

  Copy full SHA for 96c14b4

• Update po/r-novice-gapminder.ja.po

  Show description for 242d965
  

  atusy

  and

  masamiy

  authored
  242d965

  Copy full SHA for 242d965

Commits on Mar 26, 2020

• Merge branch 'ja' into r-novice-gapminder/writing-data

  TomKellyGenetics

  authored
  2390a4d

  Copy full SHA for 2390a4d

• Merge pull request #50 from atusy/r-novice-gapminder/writing-data

  Show description for edad522
  TomKellyGenetics

  authored
  edad522

  Copy full SHA for edad522

• Revert "Translated writing data - r-novice-gapminder"

  TomKellyGenetics

  authored
  9aef0a6

  Copy full SHA for 9aef0a6

• Merge pull request #85 from swcarpentry-ja/revert-50-r-novice-gapminder/writing-data

  Show description for c739423
  TomKellyGenetics

  authored
  c739423

  Copy full SHA for c739423

• Update po/r-novice-gapminder.ja.po

  Show description for 1a4fea7
  

  2 peopleauthored and

  TomKellyGenetics

  committed
  1a4fea7

  Copy full SHA for 1a4fea7

• Update po/r-novice-gapminder.ja.po

  Show description for 64bc8fe
  

  2 peopleauthored and

  TomKellyGenetics

  committed
  64bc8fe

  Copy full SHA for 64bc8fe

• Update po/r-novice-gapminder.ja.po

  Show description for cd3658a
  

  2 peopleauthored and

  TomKellyGenetics

  committed
  cd3658a

  Copy full SHA for cd3658a

• Update po/r-novice-gapminder.ja.po

  Show description for 0e3575b
  

  2 peopleauthored and

  TomKellyGenetics

  committed
  0e3575b

  Copy full SHA for 0e3575b

• Update po/r-novice-gapminder.ja.po

  Show description for 98d0a4b
  

  2 peopleauthored and

  TomKellyGenetics

  committed
  98d0a4b

  Copy full SHA for 98d0a4b

• Update po/r-novice-gapminder.ja.po

  Show description for 1767136
  

  2 peopleauthored and

  TomKellyGenetics

  committed
  1767136

  Copy full SHA for 1767136

• Update po/r-novice-gapminder.ja.po

  Show description for c0d499c
  

  2 peopleauthored and

  TomKellyGenetics

  committed
  c0d499c

  Copy full SHA for c0d499c

• revert changes to restore PR swcarpentry-ja#50 with proposed changes in review

  TomKellyGenetics

  committed
  7e56a53

  Copy full SHA for 7e56a53

Commits on Mar 28, 2020

• Review for r-novice-gapminder: episode 6

  rikutakei

  committed
  58cf063

  Copy full SHA for 58cf063

Commits on Mar 29, 2020

• Merge branch 'ja' of github.com:swcarpentry-ja/i18n into riku-review-6

  rikutakei

  committed
  de34840

  Copy full SHA for de34840

Commits on Apr 4, 2020

• Review for r-novice-gapminder: episode 7

  rikutakei

  committed
  e0dae76

  Copy full SHA for e0dae76

Commits on Apr 7, 2020

• Update po/r-novice-gapminder.ja.po

  TomKellyGenetics

  authored
  400afbd

  Copy full SHA for 400afbd

• Update po/r-novice-gapminder.ja.po

  TomKellyGenetics

  authored
  4f317f0

  Copy full SHA for 4f317f0

Commits on Apr 10, 2020

• Merge pull request #87 from TomKellyGenetics/r-novice-gapminder/writing-data

  Show description for 6385741
  mergify[bot]

  authored
  6385741

  Copy full SHA for 6385741

• Update TranslatorGuidelines.md

  Show description for ac2ed56
  

  TomKellyGenetics

  and

  joelnitta

  authored
  ac2ed56

  Copy full SHA for ac2ed56

• Merge pull request carpentries-i18n#33 from manabuishii/patch-6

  Show description for a28cadd
  mergify[bot]

  authored
  a28cadd

  Copy full SHA for a28cadd

• Merge pull request #88 from rikutakei/riku-review-6

  Show description for d6c7d78
  rkkmk

  authored
  d6c7d78

  Copy full SHA for d6c7d78

• Merge pull request #90 from rikutakei/riku-review-7

  Show description for f4aed5e
  rkkmk

  authored
  f4aed5e

  Copy full SHA for f4aed5e

• 1/2 of Section 12 in R for Rep

  rkkmk

  committed
  e70f3ce

  Copy full SHA for e70f3ce

Commits on Apr 11, 2020

• translated:2/2 of Section 12 in R for Rep

  rkkmk

  committed
  cb1611f

  Copy full SHA for cb1611f

• translated:2/2 of Section 12 in R for Rep

  rkkmk

  committed
  291c712

  Copy full SHA for 291c712

Commits on Apr 19, 2020

• Translated:Section 13 in R for Rep

  rkkmk

  committed
  974a5c7

  Copy full SHA for 974a5c7

Commits on Apr 26, 2020

• Translated:Section 14 in R for Rep

  rkkmk

  committed
  8845716

  Copy full SHA for 8845716

• Merge branch 'ja' into rkkmk-edit

  rkkmk

  authored
  4f6a70f

  Copy full SHA for 4f6a70f

Commits on Apr 29, 2020

• Move all docs except README to docs/

  joelnitta

  committed
  de25b0d

  Copy full SHA for de25b0d

• Update README

  Show description for 0787b4c
  joelnitta

  committed
  0787b4c

  Copy full SHA for 0787b4c

Commits on Apr 30, 2020

• Merge pull request #92 from joelnitta/organize-docs

  Show description for 31219ce
  mergify[bot]

  authored
  31219ce

  Copy full SHA for 31219ce

Commits on May 13, 2020

• Add files via upload

  megane0-0

  authored
  acb0876

  Copy full SHA for acb0876

Commits on May 14, 2020

• Update .gitignore

  Show description for a037550
  joelnitta

  authored
  a037550

  Copy full SHA for a037550

Commits on Jul 3, 2020

• Merge branch 'rkkmk-edit' of github.com:rkkmk/i18n into rkmkk-edit

  joelnitta

  committed
  724ccf2

  Copy full SHA for 724ccf2

Commits on Jul 8, 2020

• Add files via upload

  Show description for cecf7a0
  megane0-0

  authored
  cecf7a0

  Copy full SHA for cecf7a0

Commits on Jul 29, 2020

• Delete shell-novice.ja.po

  Show description for a30aa68
  TomKellyGenetics

  authored
  a30aa68

  Copy full SHA for a30aa68

• Update .gitmodules

  TomKellyGenetics

  authored
  da54275

  Copy full SHA for da54275

• Update .gitmodules

  TomKellyGenetics

  authored
  eb1cf7b

  Copy full SHA for eb1cf7b

• Update .gitmodules

  TomKellyGenetics

  authored
  4800328

  Copy full SHA for 4800328

• Merge branch 'ja' of https://github.com/megane0-0/i18n into satoshi

  TomKellyGenetics

  committed
  35b7264

  Copy full SHA for 35b7264

• revert changes not needed for translations

  TomKellyGenetics

  committed
  2227f8c

  Copy full SHA for 2227f8c

Commits on Aug 11, 2020

• Merge branch 'ja' of github.com:swcarpentry-ja/i18n into ja

  TomKellyGenetics

  committed
  f16cb3c

  Copy full SHA for f16cb3c

• update parsing inputs

  TomKellyGenetics

  committed
  988f7ef

  Copy full SHA for 988f7ef

• update PO files

  TomKellyGenetics

  committed
  f7431c7

  Copy full SHA for f7431c7

• fix syntax

  TomKellyGenetics

  committed
  91cc6b2

  Copy full SHA for 91cc6b2

Commits on Aug 14, 2020

• Revise translation according to review comments

  joelnitta

  committed
  4474d47

  Copy full SHA for 4474d47

• Merge pull request #109 from joelnitta/rkmkk-edit-revise

  Show description for b9e02d8
  joelnitta

  authored
  b9e02d8

  Copy full SHA for b9e02d8

• change account to passes parameter for testing

  TomKellyGenetics

  committed
  d9646ac

  Copy full SHA for d9646ac

• correct handling of submodule updates

  TomKellyGenetics

  committed
  00d4714

  Copy full SHA for 00d4714

• Update admin.md

  TomKellyGenetics

  authored
  17db8a6

  Copy full SHA for 17db8a6

• Merge branch 'ja' of github.com:swcarpentry-ja/i18n into ja

  TomKellyGenetics

  committed
  33e0c0b

  Copy full SHA for 33e0c0b

• update PO files

  TomKellyGenetics

  committed
  8d623ee

  Copy full SHA for 8d623ee

• update PO files

  TomKellyGenetics

  committed
  927f229

  Copy full SHA for 927f229

• Update admin.md

  TomKellyGenetics

  committed
  5564da1

  Copy full SHA for 5564da1

• update PO files

  TomKellyGenetics

  committed
  a8f9511

  Copy full SHA for a8f9511

• update PO files

  TomKellyGenetics

  committed
  d24c464

  Copy full SHA for d24c464

• Merge branch 'ja' of github.com:swcarpentry-ja/i18n into ja

  TomKellyGenetics

  committed
  ffba6f3

  Copy full SHA for ffba6f3

• reset submodules after rendering webpages

  TomKellyGenetics

  committed
  67079f6

  Copy full SHA for 67079f6

• correct rendering translated webpages

  TomKellyGenetics

  committed
  e8e5ac3

  Copy full SHA for e8e5ac3

Commits on Aug 29, 2020

• Merge branch 'toc-edit' of https://github.com/masamiy/i18n into branch 'master' and resolve conflicts

  TomKellyGenetics

  committed
  925942c

  Copy full SHA for 925942c

• migrate changes to lesson template to lang.md

  TomKellyGenetics

  committed
  9cd9432

  Copy full SHA for 9cd9432