Skip to content

Next

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Submit feedback
    • Contribute to GitLab
    • Switch to GitLab Next
  • Sign in / Register
Minds Mobile
Minds Mobile
  • Project
    • Project
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
    • Locked Files
  • Issues 190
    • Issues 190
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 9
    • Merge Requests 9
  • Registry
    • Registry
  • Packages
    • Packages
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Commits
  • Issue Boards
  • Minds
  • Minds MobileMinds Mobile
  • Merge Requests
  • !207

Open
Opened 1 hour ago by Ben Hayward@benhayward.ben
  • Report abuse
Report abuse

[Sprint/GiddyGiraffe](trivial): Changed oops to sorry, except for direct calls for ops #483

Closes #957

Changed it in locales @msantang78 , it appears that recently the strings have moved there?

Did not change for espaniol as Ooopppsss might be totally valid espaniol.

Edited 1 hour ago by Ben Hayward

Check out, review, and merge locally

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

git fetch https://gitlab.com/benhayward.ben/mobile-native.git changed-oops-messages-to-sorry-483
git checkout -b benhayward.ben/mobile-native-changed-oops-messages-to-sorry-483 FETCH_HEAD

Step 2. Review the changes locally

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

git fetch origin
git checkout origin/master
git merge --no-ff benhayward.ben/mobile-native-changed-oops-messages-to-sorry-483

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.

Request to merge benhayward.ben:changed-oops-messages-to-sorry-483 into master
Open in Web IDE
  • Email patches
  • Plain diff
Pipeline #64840309 passed for d12b3377 on benhayward.ben:changed-oops-messages-to-sorry-483
    No approval required
    Ready to be merged automatically. Ask someone with write access to this repository to merge this request
    Allows commits from members who can merge to the target branch

    Closes #957

    Deletes source branch

    • Discussion 3
    • Commits 2
    • Pipelines 2
    • Changes 2
    • Loading...
    • Ben Hayward @benhayward.ben changed the description 1 hour ago

      changed the description

    • Marcelo Rivera
      Marcelo Rivera @eiennohi · 1 hour ago
      Developer

      @benhayward.ben actually it's "ups" in spanish :stuck_out_tongue_winking_eye:

    • Ben Hayward
      Ben Hayward @benhayward.ben · 1 hour ago
      Developer

      No worries, I can add that quickly. Does Ups! make more sense than Lo siento? (google translate)

    • Ben Hayward @benhayward.ben added 1 commit 1 hour ago

      added 1 commit

      • d12b3377 - Changed spanish translation to Ups!

      Compare with previous version

    • Ben Hayward
      Ben Hayward @benhayward.ben · 56 minutes ago
      Developer

      Just changed it to Ups! Keep it simple.

    • You're only seeing other activity in the feed. To add a comment, switch to one of the following options.
    Please register or sign in to reply
    Assignee
    None
    Assign to
    None
    Milestone
    None
    Assign milestone
    None
    Time tracking
    No estimate or time spent
    0
    Labels
    None
    Assign labels
    • View project labels
    Lock merge request
    Unlocked
    3
    3 participants
    user avatar
    Ben Hayward
    user avatar
    Marcelo Rivera
    user avatar
    Martin Santangelo
    Reference: minds/mobile-native!207