organicmaps/website
13
Fork 1
Code Issues 31 Pull requests 8 Projects Releases Wiki Activity Actions

New Crowdin updates #276

Open
rtsisyk wants to merge 4297 commits from l10n into master
pull from: l10n
merge into: organicmaps:master
Conversation 2 Commits 4297 Files changed 4246 +114915 -2448
rtsisyk commented 2025-02-22 18:21:39 +00:00
Owner
Copy link
No description provided.
cloudflare-workers-and-pages[bot] commented 2025-02-22 18:21:45 +00:00 (Migrated from github.com)
Copy link

Deploying organicmaps with  Cloudflare Pages  Cloudflare Pages

Latest commit: 52fd831
Status:🚫  Build failed.

View logs

## Deploying organicmaps with &nbsp;<a href="https://pages.dev"><img alt="Cloudflare Pages" src="https://user-images.githubusercontent.com/23264/106598434-9e719e00-654f-11eb-9e59-6167043cfa01.png" width="16"></a> &nbsp;Cloudflare Pages <table><tr><td><strong>Latest commit:</strong> </td><td> <code>52fd831</code> </td></tr> <tr><td><strong>Status:</strong></td><td>🚫&nbsp; Build failed.</td></tr> </table> [View logs](https://dash.cloudflare.com/462f578f0939f041e2c24ec99adce458/pages/view/organicmaps/db399cc9-7e54-4706-b9a2-d35078db35c7)
pastk commented 2025-02-23 05:07:17 +00:00
Member
Copy link

4k+ commits look scary :)

But in reality it just dupes EN texts to all languages? (is it really necessary?)

4k+ commits look scary :) But in reality it just dupes EN texts to all languages? (is it really necessary?)
This pull request has changes conflicting with the target branch.
  • content/_index.af.md
  • content/_index.ar.md
  • content/_index.ca.md
  • content/_index.cs.md
  • content/_index.cy.md
  • content/_index.de.md
  • content/_index.et.md
  • content/_index.eu.md
  • content/_index.hi.md
  • content/_index.lt.md
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin l10n:l10n
git checkout l10n

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git checkout master
git merge --no-ff l10n
git checkout l10n
git rebase master
git checkout master
git merge --ff-only l10n
git checkout l10n
git rebase master
git checkout master
git merge --no-ff l10n
git checkout master
git merge --squash l10n
git checkout master
git merge --ff-only l10n
git checkout master
git merge l10n
git push origin master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
about page

About Page of the website

  
bug

Something isn't working

  
community page

Community Page of the website

  
documentation

Improvements or additions to documentation

  
donate page

Donate Page of the website

  
duplicate

This issue or pull request already exists

  
enhancement

New feature or request

  
feature page

Feature Page of the website

  
good first issue

Good for newcomers

  
Google Season of Docs

Google Season of Docs

  
help wanted

Extra attention is needed

  
invalid

This doesn't seem right

  
landing page

Landing Page of website

  
news page

News Page of the website

  
question

Further information is requested

  
support page

Support Page of the website

  
wontfix

This will not be worked on

No labels
about page
bug
community page
documentation
donate page
duplicate
enhancement
feature page
good first issue
Google Season of Docs
help wanted
invalid
landing page
news page
question
support page
wontfix
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: organicmaps/website#276
No description provided.
Delete branch "l10n"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?