• This project
    • Loading...
  • Sign in

tome / Tales of MajEyal · Merge Requests

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Builds 0
  • Graphs
  • Milestones
  • Merge Requests 62
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !669 opened
2020-11-05 02:17:04 UTC by yutio888 @yutio888

Chinese localization

Chinese localization

Edited 2020-11-05 13:34:55 UTC
Request to merge otowakotori:i18n into master
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch https://git.net-core.org/otowakotori/t-engine4.git i18n
git checkout -b otowakotori/t-engine4-i18n FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout master
git merge --no-ff otowakotori/t-engine4-i18n

Step 4. Push the result of the merge to GitLab

git push origin master

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

CI build passed for 075076c2. View details
CI build skipped for 075076c2. View details
CI build canceled for 075076c2. View details
CI build failed for 075076c2. View details
CI build running for 075076c2. View details
CI build pending for 075076c2. View details

Merged by DarkGod 2020-11-05 13:34:55 UTC

  • Discussion 0
  • Commits 9
  • Builds 0
  • Changes 7
  • yutio888
    @yutio888 commented 2020-11-05 02:25:41 UTC

    Added 1 commit:

    • 8d3cd790 - i18n: fix some translation issue
  • yutio888
    @yutio888 commented 2020-11-05 02:27:11 UTC

    Unmarked this merge request as a Work In Progress

  • yutio888
    @yutio888 commented 2020-11-05 02:42:40 UTC

    Added 1 commit:

    • 889f68d1 - i18n: adjust chinese translation
  • Otowa Kotori
    @otowakotori commented 2020-11-05 05:09:52 UTC

    Added 1 commit:

    • 86494758 - i18n updates
  • Otowa Kotori
    @otowakotori commented 2020-11-05 05:14:41 UTC

    Added 1 commit:

    • 5f3ea5ab - zh_hant updates
  • yutio888
    @yutio888 commented 2020-11-05 09:22:45 UTC

    Added 1 commit:

    • fdc83f48 - i18n: fix translation text issue
  • Otowa Kotori
    @otowakotori commented 2020-11-05 13:05:10 UTC

    Added 5 commits:

    • fdc83f48...09ea439d - 2 commits from branch tome:master
    • 5916656d - Merge remote-tracking branch 'upstream/master' into i18n
    • 35015cb8 - Merge remote-tracking branch 'origin/i18n' into i18n
    • 075076c2 - further updates
  • DarkGod
    @darkgod commented 2020-11-05 13:34:55 UTC

    mentioned in commit c37f10a9

  • DarkGod
    @darkgod commented 2020-11-05 13:34:55 UTC

    Status changed to merged

  • Please register or login to post a comment
669 of 868
Prev Next
Assignee
No assignee
Assign to
No
Milestone
None
Assign milestone
0
Labels
None
Assign labels
  • View labels
3
3 participants
Reference: tome/t-engine4!669
×

Revert this merge request

Cancel
A new branch will be created in your fork and a new merge request will be started.