The translation is temporarily closed for contributions due to maintenance, please come back later.
The translation was automatically locked due to following alerts: Could not merge the repository.
Language Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
English This language is used for source strings. Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 2,201 0 37
Afrikaans Fix this component to clear its alerts. This translation is locked. MIT 94% 140 895 5,689 139 1,827 0 0
Albanian Fix this component to clear its alerts. This translation is locked. MIT 1% 2,736 12,195 74,923 2,736 0 3 0
Arabic Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 2
Arabic (Najdi) Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 2,018 0 0
Aragonese Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 2,017 0 0
Armenian Fix this component to clear its alerts. This translation is locked. MIT 76% 640 3,906 24,098 565 966 0 0
Asturian Fix this component to clear its alerts. This translation is locked. MIT 84% 428 2,697 16,743 391 1,429 0 0
Azerbaijani Fix this component to clear its alerts. This translation is locked. MIT 82% 490 3,217 19,981 424 886 0 0
Basque Fix this component to clear its alerts. This translation is locked. MIT 87% 340 2,391 14,659 301 640 0 0
Belarusian Fix this component to clear its alerts. This translation is locked. MIT 87% 357 2,913 17,855 289 12 0 0
Bengali Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 2,007 0 0
Bosnian Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 1,991 0 0
Breton Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 2,026 0 0
Bulgarian Fix this component to clear its alerts. This translation is locked. MIT 80% 533 3,456 21,303 442 1,023 0 0
Burmese Fix this component to clear its alerts. This translation is locked. MIT 27% 2,004 9,885 60,758 1,924 426 7 0
Catalan Fix this component to clear its alerts. This translation is locked. MIT 79% 570 3,937 24,145 505 22 0 5
Chinese (Simplified) Fix this component to clear its alerts. This translation is locked. MIT 67% 898 5,802 34,886 852 15 0 0
Chinese (Traditional) Fix this component to clear its alerts. This translation is locked. MIT 76% 640 4,353 26,245 576 12 1 0
Croatian Fix this component to clear its alerts. This translation is locked. MIT 74% 699 4,316 26,618 573 1,289 0 0
Czech Fix this component to clear its alerts. This translation is locked. MIT 99% 13 203 1,299 13 0 0 1
Danish Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Dutch Fix this component to clear its alerts. This translation is locked. MIT 77% 623 4,604 27,782 542 173 282 0
English (United Kingdom) Fix this component to clear its alerts. This translation is locked. MIT 72% 773 4,622 28,490 600 54 0 0
Esperanto Fix this component to clear its alerts. This translation is locked. MIT 90% 266 2,067 12,603 234 633 0 0
Estonian Fix this component to clear its alerts. This translation is locked. MIT 85% 412 2,723 16,731 333 13 0 3
Finnish Fix this component to clear its alerts. This translation is locked. MIT 82% 495 3,272 20,271 418 539 1 0
French Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 8
Galician Fix this component to clear its alerts. This translation is locked. MIT 64% 973 6,226 37,797 923 218 1 0
Georgian Fix this component to clear its alerts. This translation is locked. MIT 78% 602 4,169 25,675 513 838 0 0
German Fix this component to clear its alerts. This translation is locked. MIT 99% 6 29 180 6 4 0 13
Greek Fix this component to clear its alerts. This translation is locked. MIT 56% 1,217 7,554 45,858 1,177 32 0 0
Hebrew Fix this component to clear its alerts. This translation is locked. MIT 89% 303 2,260 13,925 267 624 0 0
Hindi Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 2,018 0 0
Hungarian Fix this component to clear its alerts. This translation is locked. MIT 81% 518 3,871 23,464 464 30 0 1
Icelandic Fix this component to clear its alerts. This translation is locked. MIT 95% 134 1,011 6,200 60 16 0 5
Indonesian Fix this component to clear its alerts. This translation is locked. MIT 90% 261 2,035 12,352 234 611 0 0
Interlingua Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 65 0 0
Italian Fix this component to clear its alerts. This translation is locked. MIT 99% 16 210 1,342 15 1 0 2
Japanese Fix this component to clear its alerts. This translation is locked. MIT 89% 295 2,346 14,297 225 54 0 2
Kabyle Fix this component to clear its alerts. This translation is locked. MIT 27% 2,012 10,977 67,637 1,995 33 0 0
Kannada Fix this component to clear its alerts. This translation is locked. MIT 72% 768 4,621 28,500 600 1,504 0 0
Korean Fix this component to clear its alerts. This translation is locked. MIT 49% 1,401 7,457 45,136 1,353 55 0 0
Kurdish Fix this component to clear its alerts. This translation is locked. MIT 5% 2,616 12,002 73,866 2,609 2 0 0
Kurdish (Central) Fix this component to clear its alerts. This translation is locked. MIT 79% 557 3,395 20,920 356 1,836 0 0
Latvian Fix this component to clear its alerts. This translation is locked. MIT 78% 590 3,809 23,432 525 816 0 0
Lithuanian Fix this component to clear its alerts. This translation is locked. MIT 83% 448 3,554 21,617 370 882 0 0
Macedonian Fix this component to clear its alerts. This translation is locked. MIT 97% 63 430 2,732 62 853 0 0
Malayalam Fix this component to clear its alerts. This translation is locked. MIT 76% 646 4,065 24,980 568 998 0 0
Marathi Fix this component to clear its alerts. This translation is locked. MIT 72% 764 4,622 28,505 599 1,492 0 0
Mongolian Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 2,012 0 0
Norwegian Bokmål Fix this component to clear its alerts. This translation is locked. MIT 88% 316 3,167 19,121 243 388 43 2
Norwegian Nynorsk Fix this component to clear its alerts. This translation is locked. MIT 94% 141 895 5,671 140 1,964 0 0
Occitan Fix this component to clear its alerts. This translation is locked. MIT 84% 434 3,342 20,744 316 51 0 0
Persian Fix this component to clear its alerts. This translation is locked. MIT 71% 781 5,356 32,590 720 208 14 2
Polish Fix this component to clear its alerts. This translation is locked. MIT 90% 270 2,250 13,702 194 6 0 1
Portuguese Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 1
Portuguese (Brazil) Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 7 0 9
Punjabi (Pakistan) Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 2,018 0 0
Romanian Fix this component to clear its alerts. This translation is locked. MIT 99% 7 160 1,023 7 0 0 0
Russian Fix this component to clear its alerts. This translation is locked. MIT 89% 285 2,176 13,278 192 22 10 1
Santali Fix this component to clear its alerts. This translation is locked. MIT 95% 117 684 4,391 116 1,787 0 0
Sardinian Fix this component to clear its alerts. This translation is locked. MIT 98% 38 319 1,982 38 7 0 1
Serbian Fix this component to clear its alerts. This translation is locked. MIT 93% 174 1,316 8,043 173 2 0 0
Serbian (latin) Fix this component to clear its alerts. This translation is locked. MIT 87% 344 2,370 14,632 305 634 0 0
Slovak Fix this component to clear its alerts. This translation is locked. MIT 80% 532 3,920 23,652 488 0 0 1
Slovenian Fix this component to clear its alerts. This translation is locked. MIT 71% 796 5,611 33,689 739 15 1 1
Spanish Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 7 2 1
Spanish (American) Fix this component to clear its alerts. This translation is locked. MIT 99% 18 85 539 18 0 0 0
Spanish (Argentina) Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 0
Swedish Fix this component to clear its alerts. This translation is locked. MIT 88% 330 2,605 15,869 273 659 0 0
Tamazight (Central Atlas) Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 2,018 0 0
Tamil Fix this component to clear its alerts. This translation is locked. MIT 74% 700 4,360 26,853 588 1,324 0 0
Tatar Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 1,981 0 0
Telugu Fix this component to clear its alerts. This translation is locked. MIT 94% 141 896 5,686 140 1,992 0 0
Turkish Fix this component to clear its alerts. This translation is locked. MIT 91% 225 1,547 9,488 162 12 0 0
Ukrainian Fix this component to clear its alerts. This translation is locked. MIT 0 0 0 0 0 0 6
Upper Sorbian Fix this component to clear its alerts. This translation is locked. MIT 51% 1,334 7,496 46,033 1,260 536 0 0
Urdu Fix this component to clear its alerts. This translation is locked. MIT 94% 142 897 5,692 141 2,013 0 0
Uzbek (uz_CYRL) Fix this component to clear its alerts. This translation is locked. MIT 1% 2,765 12,248 75,215 2,765 2 0 0
Vietnamese Fix this component to clear its alerts. This translation is locked. MIT 73% 748 4,548 28,024 588 1,514 0 0
Welsh Fix this component to clear its alerts. This translation is locked. MIT 86% 377 2,525 15,581 322 713 0 0
Please sign in to see the alerts.

Overview

Project website www.osmand.net
Instructions for translators

https://docs.osmand.net/docs/technical/contributions/translating-osmand#what-languages-will-be-included-in-osmand-
Project maintainers User avatar pavolzibrita User avatar vshcherb User avatar andygol User avatar crimean User avatar dmpr0 User avatar TatianaRud User avatar pstets User avatar nnngrach User avatar ivan.pirogovsky
Translation license MIT License
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Any authenticated user can contribute.
  • The translation uses monolingual files.
  • The translation base language can not be edited.
Source code repository https://github.com/osmandapp/OsmAnd-ios.git
Repository branch master
Last remote commit Fix Weblate conflicts 62979296b
User avatar dmpr0 authored 9 hours ago
Last commit in Weblate Translated using Weblate (Swedish) 58a342955
User avatar deob83 authored yesterday
Weblate repository https://hosted.weblate.org/git/osmand/ios/
File mask Resources/Localizations/*.lproj/Localizable.strings
Monolingual base language file Resources/Localizations/en.lproj/Localizable.strings

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 227,222 1,005,648 6,177,060
Source 2,771 12,264 75,330
Approved 1% 76 1% 212 1% 1,354
Waiting for review 81% 184,551 74% 752,435 74% 4,622,772
Translated 82% 187,398 76% 764,911 76% 4,699,456
Needs editing 1% 3,567 2% 24,943 2% 153,257
Read-only 1% 2,771 1% 12,264 1% 75,330
Failing checks 25% 57,093 29% 294,292 29% 1,804,681
Strings with suggestions 1% 365 1% 1,677 1% 10,131
Untranslated strings 15% 36,257 21% 215,794 21% 1,324,347
Last 12 months Previous

Activity in last 12 months

2,500 changes 1,790 changes 2,254 changes 16,197 changes 1,037 changes 4,679 changes 2,043 changes 14,696 changes 1,021 changes 2,068 changes 2,821 changes 10,528 changes 687 changes 5,400 changes 1,209 changes 3,813 changes 2,533 changes 4,598 changes 4,123 changes 5,205 changes 1,086 changes 1,958 changes 6,816 changes 117,755 changes
Mar Apr May Jun Jul Aug Sep Oct Nov Dec Jan Feb

Quick numbers

1,005 k
Hosted words
227 k
Hosted strings
82%
Translated
41
Contributors
and previous 30 days

Trends of last 30 days

+2%
Hosted words
+21%
+1%
Hosted strings
+21%
−1%
Translated
+1%
+21%
Contributors
−15%
User avatar dmpr0

Failed merge on repository

OsmAnd / iOS 

Auto-merging Resources/Localizations/uk.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/uk.lproj/Localizable.strings
Auto-merging Resources/Localizations/sv.lproj/Localizable.strings
Auto-merging Resources/Localizations/sr.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt-BR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt-BR.lproj/Localizable.strings
Auto-merging Resources/Localizations/ja.lproj/Localizable.strings
Auto-merging Resources/Localizations/fr.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/fr.lproj/Localizable.strings
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
Auto-merging Resources/Localizations/es-AR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es-AR.lproj/Localizable.strings
Auto-merging Resources/Localizations/da.lproj/Localizable.strings
Auto-merging Resources/Localizations/cs.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/cs.lproj/Localizable.strings
Auto-merging Resources/Localizations/be.lproj/Localizable.strings
Auto-merging Resources/Localizations/ar.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/ar.lproj/Localizable.strings
Automatic merge failed; fix conflicts and then commit the result.
 (1)
6 hours ago
User avatar dmpr0

Failed rebase on repository

OsmAnd / iOS 

Rebasing (1/13)
error: could not apply a699059bd... Translated using Weblate (Spanish)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a699059bd... Translated using Weblate (Spanish)
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
 (1)
6 hours ago
User avatar dmpr0

Failed rebase on repository

OsmAnd / iOS 

Rebasing (1/13)
error: could not apply a699059bd... Translated using Weblate (Spanish)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a699059bd... Translated using Weblate (Spanish)
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
 (1)
9 hours ago
User avatar dmpr0

Failed rebase on repository

OsmAnd / iOS 

Rebasing (1/13)
error: could not apply a699059bd... Translated using Weblate (Spanish)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a699059bd... Translated using Weblate (Spanish)
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
 (1)
9 hours ago
User avatar dmpr0

Failed merge on repository

OsmAnd / iOS 

Auto-merging Resources/Localizations/uk.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/uk.lproj/Localizable.strings
Auto-merging Resources/Localizations/sv.lproj/Localizable.strings
Auto-merging Resources/Localizations/sr.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt-BR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt-BR.lproj/Localizable.strings
Auto-merging Resources/Localizations/ja.lproj/Localizable.strings
Auto-merging Resources/Localizations/fr.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/fr.lproj/Localizable.strings
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
Auto-merging Resources/Localizations/es-AR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es-AR.lproj/Localizable.strings
Auto-merging Resources/Localizations/da.lproj/Localizable.strings
Auto-merging Resources/Localizations/cs.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/cs.lproj/Localizable.strings
Auto-merging Resources/Localizations/be.lproj/Localizable.strings
Auto-merging Resources/Localizations/ar.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/ar.lproj/Localizable.strings
Automatic merge failed; fix conflicts and then commit the result.
 (1)
9 hours ago
User avatar dmpr0

Failed merge on repository

OsmAnd / iOS 

Auto-merging Resources/Localizations/uk.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/uk.lproj/Localizable.strings
Auto-merging Resources/Localizations/sv.lproj/Localizable.strings
Auto-merging Resources/Localizations/sr.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt-BR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt-BR.lproj/Localizable.strings
Auto-merging Resources/Localizations/ja.lproj/Localizable.strings
Auto-merging Resources/Localizations/fr.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/fr.lproj/Localizable.strings
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
Auto-merging Resources/Localizations/es-AR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es-AR.lproj/Localizable.strings
Auto-merging Resources/Localizations/da.lproj/Localizable.strings
Auto-merging Resources/Localizations/cs.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/cs.lproj/Localizable.strings
Auto-merging Resources/Localizations/be.lproj/Localizable.strings
Auto-merging Resources/Localizations/ar.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/ar.lproj/Localizable.strings
Automatic merge failed; fix conflicts and then commit the result.
 (1)
9 hours ago
User avatar dmpr0

Failed merge on repository

OsmAnd / iOS 

Auto-merging Resources/Localizations/uk.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/uk.lproj/Localizable.strings
Auto-merging Resources/Localizations/sv.lproj/Localizable.strings
Auto-merging Resources/Localizations/sr.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt-BR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt-BR.lproj/Localizable.strings
Auto-merging Resources/Localizations/ja.lproj/Localizable.strings
Auto-merging Resources/Localizations/fr.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/fr.lproj/Localizable.strings
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
Auto-merging Resources/Localizations/es-AR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es-AR.lproj/Localizable.strings
Auto-merging Resources/Localizations/da.lproj/Localizable.strings
Auto-merging Resources/Localizations/cs.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/cs.lproj/Localizable.strings
Auto-merging Resources/Localizations/be.lproj/Localizable.strings
Auto-merging Resources/Localizations/ar.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/ar.lproj/Localizable.strings
Automatic merge failed; fix conflicts and then commit the result.
 (1)
9 hours ago
User avatar dmpr0

Failed rebase on repository

OsmAnd / iOS 

Rebasing (1/13)
error: could not apply a699059bd... Translated using Weblate (Spanish)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a699059bd... Translated using Weblate (Spanish)
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
 (1)
9 hours ago
User avatar dmpr0

Failed merge on repository

OsmAnd / iOS 

Auto-merging Resources/Localizations/uk.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/uk.lproj/Localizable.strings
Auto-merging Resources/Localizations/sv.lproj/Localizable.strings
Auto-merging Resources/Localizations/sr.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt.lproj/Localizable.strings
Auto-merging Resources/Localizations/pt-BR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/pt-BR.lproj/Localizable.strings
Auto-merging Resources/Localizations/ja.lproj/Localizable.strings
Auto-merging Resources/Localizations/fr.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/fr.lproj/Localizable.strings
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
Auto-merging Resources/Localizations/es-AR.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es-AR.lproj/Localizable.strings
Auto-merging Resources/Localizations/da.lproj/Localizable.strings
Auto-merging Resources/Localizations/cs.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/cs.lproj/Localizable.strings
Auto-merging Resources/Localizations/be.lproj/Localizable.strings
Auto-merging Resources/Localizations/ar.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/ar.lproj/Localizable.strings
Automatic merge failed; fix conflicts and then commit the result.
 (1)
9 hours ago
User avatar dmpr0

Failed rebase on repository

OsmAnd / iOS 

Rebasing (1/13)
error: could not apply a699059bd... Translated using Weblate (Spanish)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply a699059bd... Translated using Weblate (Spanish)
Auto-merging Resources/Localizations/es.lproj/Localizable.strings
CONFLICT (content): Merge conflict in Resources/Localizations/es.lproj/Localizable.strings
 (1)
9 hours ago
Browse all component changes