• 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 57
  • Labels
  • Forks
  • Snippets
  • Network
Merged
MR Merge Request !724 opened
2021-05-24 03:20:25 UTC by yutio888 @yutio888

Translation Update for 1.7.4

update translation for 1.7.4

Edited 2021-06-14 16:43:36 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 0e42bf1b. View details
CI build skipped for 0e42bf1b. View details
CI build canceled for 0e42bf1b. View details
CI build failed for 0e42bf1b. View details
CI build running for 0e42bf1b. View details
CI build pending for 0e42bf1b. View details

Merged by DarkGod 2021-06-14 16:43:36 UTC

  • Discussion 0
  • Commits 12
  • Builds 0
  • Changes 36
  • yutio888
    @yutio888 commented 2021-05-24 04:14:44 UTC

    Added 1 commit:

    • 9d57f8aa - i18n: fix Sunder Arms description
  • yutio888
    @yutio888 commented 2021-05-24 06:56:46 UTC

    Added 1 commit:

    • d1cb7548 - adjust chs translation for evasion
  • yutio888
    @yutio888 commented 2021-05-24 08:00:38 UTC

    Added 1 commit:

    • 69cf964d - adjust chs translation for some egos
  • yutio888
    @yutio888 commented 2021-06-11 00:37:12 UTC

    Added 139 commits:

    • 69cf964d...c8a7ab2d - 138 commits from branch tome:master
    • 31a28ca9 - Merge remote-tracking branch 'upstream/master' into i18n
  • Otowa Kotori
    @otowakotori commented 2021-06-11 10:45:02 UTC

    Added 3 commits:

    • 0764d2ed - Merge branch 'i18n' of git.net-core.org:otowakotori/t-engine4 into i18n
    • 1ea6778a - needed change for merged korean texts
    • cfe60569 - Merge branch 'i18n' of git.net-core.org:otowakotori/t-engine4 into i18n
  • Otowa Kotori
    @otowakotori commented 2021-06-14 06:15:38 UTC

    Added 10 commits:

    • cfe60569...daccc078 - 6 commits from branch tome:master
    • 7b84ef74 - Merge remote-tracking branch 'upstream/master' into i18n
    • 71633c00 - Update Korean Translation
    • bc95e903 - Update Japanese Translation
    • 0e42bf1b - Update Chinese Translation
  • yutio888
    @yutio888 commented 2021-06-14 06:34:54 UTC

    Unmarked this merge request as a Work In Progress

  • DarkGod
    @darkgod commented 2021-06-14 16:43:36 UTC

    Status changed to merged

  • DarkGod
    @darkgod commented 2021-06-14 16:43:36 UTC

    mentioned in commit 428babd9

  • Please register or login to post a comment
724 of 849
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!724
×

Revert this merge request

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