The translation was automatically locked due to the following alert:
| Language | Translated | Unfinished | Unfinished words | Unfinished characters | Untranslated | Checks | Suggestions | Comments | |
|---|---|---|---|---|---|---|---|---|---|
| English GPL-2.0-or-later | 100% | 0 | 0 | 0 | 0 | 821 | 0 | 1 | |
| Bulgarian GPL-2.0-or-later | 96% | 65 | 403 | 2,516 | 8 | 122 | 0 | 0 | |
| Catalan GPL-2.0-or-later | 19% | 1,599 | 9,851 | 59,067 | 1,575 | 35 | 1 | 0 | |
| Chinese (Simplified Han script) GPL-2.0-or-later | 100% | 0 | 0 | 0 | 0 | 7 | 0 | 0 | |
| Chinese (Traditional Han script) GPL-2.0-or-later | 86% | 278 | 1,633 | 9,849 | 97 | 50 | 0 | 0 | |
| Croatian GPL-2.0-or-later | 20% | 1,585 | 10,672 | 64,035 | 1,518 | 30 | 0 | 0 | |
| Czech GPL-2.0-or-later | 100% | 0 | 0 | 0 | 0 | 65 | 0 | 0 | |
| Danish GPL-2.0-or-later | 4% | 1,893 | 11,277 | 67,700 | 1,858 | 25 | 8 | 0 | |
| Dutch GPL-2.0-or-later | 90% | 188 | 1,158 | 6,972 | 70 | 119 | 1 | 0 | |
| Finnish GPL-2.0-or-later | 32% | 1,346 | 9,523 | 56,960 | 1,133 | 62 | 0 | 0 | |
| French GPL-2.0-or-later | 97% | 58 | 351 | 2,194 | 0 | 124 | 24 | 6 | |
| German GPL-2.0-or-later | 100% | 0 | 0 | 0 | 0 | 21 | 0 | 0 | |
| Greek GPL-2.0-or-later | 18% | 1,616 | 10,715 | 64,358 | 1,471 | 58 | 0 | 0 | |
| Hebrew GPL-2.0-or-later | 14% | 1,707 | 10,961 | 65,774 | 1,538 | 60 | 0 | 0 | |
| Hungarian GPL-2.0-or-later | 82% | 356 | 2,504 | 15,085 | 144 | 118 | 2 | 0 | |
| Italian GPL-2.0-or-later | 94% | 110 | 620 | 3,838 | 31 | 136 | 0 | 0 | |
| Japanese GPL-2.0-or-later | 86% | 276 | 1,631 | 9,838 | 91 | 565 | 0 | 0 | |
| Korean GPL-2.0-or-later | 93% | 139 | 715 | 4,393 | 31 | 80 | 39 | 0 | |
| Lithuanian GPL-2.0-or-later | 9% | 1,799 | 10,965 | 65,782 | 1,731 | 42 | 1 | 0 | |
| Norwegian Bokmål GPL-2.0-or-later | 61% | 765 | 4,867 | 29,182 | 546 | 168 | 0 | 0 | |
| Polish GPL-2.0-or-later | 85% | 282 | 1,672 | 10,072 | 88 | 419 | 20 | 0 | |
| Portuguese GPL-2.0-or-later | 69% | 598 | 4,093 | 24,709 | 384 | 172 | 0 | 0 | |
| Portuguese (Brazil) GPL-2.0-or-later | 69% | 609 | 4,102 | 24,759 | 417 | 123 | 2 | 0 | |
| Romanian GPL-2.0-or-later | 13% | 1,721 | 10,041 | 60,023 | 1,608 | 97 | 11 | 0 | |
| Russian GPL-2.0-or-later | 70% | 594 | 3,688 | 22,146 | 365 | 245 | 4 | 0 | |
| Serbian GPL-2.0-or-later | 14% | 1,694 | 11,099 | 66,692 | 1,604 | 54 | 1 | 0 | |
| Slovak GPL-2.0-or-later | 86% | 276 | 1,631 | 9,837 | 88 | 122 | 0 | 1 | |
| Slovenian GPL-2.0-or-later | 9% | 1,795 | 10,537 | 63,361 | 1,736 | 30 | 0 | 0 | |
| Spanish GPL-2.0-or-later | 100% | 0 | 0 | 0 | 0 | 6 | 0 | 0 | |
| Swedish GPL-2.0-or-later | 94% | 108 | 615 | 3,804 | 31 | 38 | 26 | 2 | |
| Telugu GPL-2.0-or-later | 2% | 1,932 | 11,181 | 67,225 | 1,932 | 2 | 0 | 0 | |
| Turkish GPL-2.0-or-later | 5% | 1,884 | 11,133 | 66,911 | 1,845 | 25 | 0 | 0 | |
| Ukrainian GPL-2.0-or-later | 81% | 362 | 2,752 | 16,689 | 192 | 162 | 0 | 0 | |
| Vietnamese GPL-2.0-or-later | 8% | 1,828 | 11,350 | 68,137 | 1,736 | 22 | 0 | 0 | |
Please sign in to see the alerts.
Summary
| Project website | xcsoar.org | |
|---|---|---|
| Project maintainers3 |
|
|
| Translation license | GNU General Public License v2.0 or later | |
| Translation process |
|
|
| Source code repository |
https://github.com/XCSoar/XCSoar.git
|
|
| Repository branch | master | |
| Last remote commit |
Merge pull request #2195 from lordfolken/fix/profile-save-2171
29827ad0ec
|
|
| Last commit in Weblate |
Merge branch 'origin/master' into Weblate.
576774b826
Hosted Weblate authored 11/07/2025 |
|
| Weblate repository |
https://hosted.weblate.org/git/xcsoar/translations/
|
|
| File mask |
po/*.po
|
|
02/06/2026
String statistics
| Strings percent | Hosted strings | Words percent | Hosted words | Characters percent | Hosted characters | |
|---|---|---|---|---|---|---|
| Total | 67,592 | 395,080 | 2,371,840 | |||
| Source | 1,988 | 11,620 | 69,760 | |||
| Translated | 59% | 40,129 | 56% | 223,340 | 56% | 1,339,932 |
| Needs editing | 5% | 3,595 | 4% | 16,624 | 4% | 101,785 |
| Read-only | 2% | 1,988 | 2% | 11,620 | 2% | 69,760 |
| Failing checks | 6% | 4,225 | 7% | 29,733 | 7% | 180,757 |
| Strings with suggestions | 1% | 140 | 1% | 1,026 | 1% | 6,183 |
| Untranslated strings | 35% | 23,868 | 39% | 155,116 | 39% | 930,123 |
Quick numbers
395 k
Hosted words
67,592
Hosted strings
59%
Translated
0
Components
34
Languages
34
Translations
0
Screenshots
and previous 30 days
Trends of last 30 days
—
Hosted words
+100%
—
Hosted strings
+100%
—
Translated
+59%
—
Contributors
—
|
Repository merge failed |
02/14/2026
|
|
Repository notification received |
GitHub: https://api.github.com/repos/XCSoar/XCSoar, master
02/14/2026
|
|
Repository merge failed |
.merge_file_58rdRb:12159: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_58rdRb:12171: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_58rdRb:12187: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_58rdRb:12187: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_58rdRb:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_58rdRb:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_58rdRb:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yc5liZ:12102: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yc5liZ:12114: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yc5liZ:12130: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yc5liZ:12130: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yc5liZ:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yc5liZ:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yc5liZ:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nDinBX:12108: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nDinBX:12120: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nDinBX:12136: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nDinBX:12136: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nDinBX:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nDinBX:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nDinBX:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/base:12102: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/base:12114: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/base:12130: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/base:12130: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12108: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12120: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12158: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13733: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13745: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13761: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13761: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12108: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12120: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/unchanged:13721: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/unchanged:13733: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/unchanged:13749: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/unchanged:13749: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge1:13744: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge1:13756: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge1:13772: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge1:13772: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge2:13713: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge2:13725: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge2:13741: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge2:13741: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.0lm0z5/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_YVDX0U:9031: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_YVDX0U:9031: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Xkvf39:9034: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Xkvf39:9034: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_phtMqA:9011: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_phtMqA:9011: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_YVDX0U:11693: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_YVDX0U:11693: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_phtMqA:11669: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_phtMqA:11669: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Xkvf39:11763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Xkvf39:11763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_phtMqA:12099: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_YVDX0U:12123: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Xkvf39:12190: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/base:9031: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/base:9031: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:12103: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/base:11693: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/base:11693: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/base:12123: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:12191: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:9390: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:9390: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:9013: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13575: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13575: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:14005: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:12191: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/other:12103: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/unchanged:8961: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/unchanged:8961: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/unchanged:13035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/unchanged:13035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/unchanged:13465: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/local:12191: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge1:8996: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge1:8996: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge1:13135: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge1:13135: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge1:13565: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge2:9318: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge2:9318: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge2:13488: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge2:13488: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.IiimjU/merge2:13915: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_0lzTPD:12302: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Nqhzk9:12233: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nvyeO1:12253: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.6NAoiv/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.6NAoiv/other:12233: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.6NAoiv/base:12253: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.6NAoiv/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.6NAoiv/other:12233: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:14913: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.6NAoiv/unchanged:12700: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.6NAoiv/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.6NAoiv/merge1:13594: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.6NAoiv/merge2:13983: warning: internationalized messages should not contain the '\r' escape sequence Auto-merging po/cs.po CONFLICT (content): Merge conflict in po/cs.po Auto-merging po/de.po CONFLICT (content): Merge conflict in po/de.po Auto-merging po/es.po CONFLICT (content): Merge conflict in po/es.po Auto-merging po/fr.po CONFLICT (content): Merge conflict in po/fr.po Auto-merging po/zh_CN.po CONFLICT (content): Merge conflict in po/zh_CN.po Automatic merge failed; fix conflicts and then commit the result. (1)02/14/2026 |
|
Repository notification received |
GitHub: https://api.github.com/repos/XCSoar/XCSoar, master
02/14/2026
|
|
Repository merge failed |
.merge_file_nTcDNn:12159: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nTcDNn:12171: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nTcDNn:12187: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nTcDNn:12187: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nTcDNn:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nTcDNn:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_nTcDNn:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_7avAyp:12108: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_7avAyp:12120: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_7avAyp:12136: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_7avAyp:12136: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_7avAyp:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_7avAyp:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_7avAyp:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_oJCMHO:12102: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_oJCMHO:12114: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_oJCMHO:12130: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_oJCMHO:12130: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_oJCMHO:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_oJCMHO:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_oJCMHO:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12108: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12120: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/base:12102: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/base:12114: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/base:12130: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/base:12130: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12108: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12120: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/other:12158: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13733: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13745: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13761: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13761: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/unchanged:13721: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/unchanged:13733: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/unchanged:13749: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/unchanged:13749: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge1:13744: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge1:13756: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge1:13772: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge1:13772: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge2:13713: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge2:13725: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge2:13741: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge2:13741: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.ymcERX/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_BlsWAn:9034: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_BlsWAn:9034: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_ZoN5Hr:9011: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_ZoN5Hr:9011: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eUiDg8:9031: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eUiDg8:9031: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_BlsWAn:11763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_BlsWAn:11763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_ZoN5Hr:11669: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_ZoN5Hr:11669: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_BlsWAn:12190: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_ZoN5Hr:12099: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eUiDg8:11693: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eUiDg8:11693: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eUiDg8:12123: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:12103: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:12191: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/base:9031: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/base:9031: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/base:11693: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/base:11693: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/base:12123: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:9013: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:9390: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:9390: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/other:12103: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13575: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13575: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:14005: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:12191: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/unchanged:8961: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/unchanged:8961: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/unchanged:13035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/unchanged:13035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/unchanged:13465: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/local:12191: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge1:8996: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge1:8996: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge1:13135: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge1:13135: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge1:13565: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge2:9318: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge2:9318: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge2:13488: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge2:13488: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.xHJ2wF/merge2:13915: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Mmw9VT:12253: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_wmMyQG:12302: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_6WHwmm:12233: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.zRW9w3/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.zRW9w3/other:12233: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.zRW9w3/base:12253: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:14913: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.zRW9w3/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.zRW9w3/other:12233: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.zRW9w3/unchanged:12700: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.zRW9w3/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.zRW9w3/merge1:13594: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.zRW9w3/merge2:13983: warning: internationalized messages should not contain the '\r' escape sequence Auto-merging po/cs.po CONFLICT (content): Merge conflict in po/cs.po Auto-merging po/de.po CONFLICT (content): Merge conflict in po/de.po Auto-merging po/es.po CONFLICT (content): Merge conflict in po/es.po Auto-merging po/fr.po CONFLICT (content): Merge conflict in po/fr.po Auto-merging po/zh_CN.po CONFLICT (content): Merge conflict in po/zh_CN.po Automatic merge failed; fix conflicts and then commit the result. (1)02/14/2026 |
|
Repository notification received |
GitHub: https://api.github.com/repos/XCSoar/XCSoar, master
02/14/2026
|
|
Repository merge failed |
.merge_file_eIy8oa:12159: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eIy8oa:12171: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eIy8oa:12187: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eIy8oa:12187: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eIy8oa:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eIy8oa:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_eIy8oa:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dUK1SX:12102: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dUK1SX:12114: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dUK1SX:12130: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dUK1SX:12130: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dUK1SX:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dUK1SX:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dUK1SX:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_NXlFne:12108: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_NXlFne:12120: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_NXlFne:12136: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_NXlFne:12136: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_NXlFne:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_NXlFne:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_NXlFne:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/base:12102: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/base:12114: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/base:12130: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/base:12130: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12108: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12120: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12209: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13733: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13745: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13761: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13761: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12108: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12120: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/unchanged:13721: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/unchanged:13733: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/unchanged:13749: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/unchanged:13749: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge1:13744: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge1:13756: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge1:13772: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge1:13772: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge2:13713: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge2:13725: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge2:13741: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge2:13741: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.W4Ex2d/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dRJLQS:9034: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dRJLQS:9034: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_73ItDU:9031: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_73ItDU:9031: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yRNPy7:9011: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yRNPy7:9011: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_73ItDU:11693: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_73ItDU:11693: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dRJLQS:11763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dRJLQS:11763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_73ItDU:12123: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_dRJLQS:12190: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yRNPy7:11669: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yRNPy7:11669: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yRNPy7:12099: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/base:9031: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/base:9031: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:12191: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/base:11693: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/base:11693: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/base:12123: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:12103: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:12191: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:9390: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:9390: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13575: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13575: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:14005: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/other:12103: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/unchanged:8961: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/unchanged:8961: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/unchanged:13035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/unchanged:13035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/unchanged:13465: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/local:12191: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge1:8996: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge1:8996: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge1:13135: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge1:13135: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge1:13565: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge2:9318: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge2:9318: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge2:13488: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge2:13488: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.P7drfi/merge2:13915: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_8ODKoY:12253: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_gyLVhq:12302: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_qGgE48:12233: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.KwQqDw/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.KwQqDw/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.KwQqDw/base:12253: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.KwQqDw/other:12233: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:14913: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.KwQqDw/other:12233: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.KwQqDw/unchanged:12700: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.KwQqDw/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.KwQqDw/merge1:13594: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.KwQqDw/merge2:13983: warning: internationalized messages should not contain the '\r' escape sequence Auto-merging po/cs.po CONFLICT (content): Merge conflict in po/cs.po Auto-merging po/de.po CONFLICT (content): Merge conflict in po/de.po Auto-merging po/es.po CONFLICT (content): Merge conflict in po/es.po Auto-merging po/fr.po CONFLICT (content): Merge conflict in po/fr.po Auto-merging po/zh_CN.po CONFLICT (content): Merge conflict in po/zh_CN.po Automatic merge failed; fix conflicts and then commit the result. (1)02/12/2026 |
|
Repository notification received |
GitHub: https://api.github.com/repos/XCSoar/XCSoar, master
02/12/2026
|
|
Repository merge failed |
.merge_file_0vFblW:12108: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_0vFblW:12120: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_0vFblW:12136: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_0vFblW:12136: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_0vFblW:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_0vFblW:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_0vFblW:12158: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_aaqDLP:12102: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_aaqDLP:12114: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_aaqDLP:12130: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_aaqDLP:12130: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_aaqDLP:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_OV4k7k:12159: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_aaqDLP:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_aaqDLP:12152: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_OV4k7k:12171: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_OV4k7k:12187: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_OV4k7k:12187: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_OV4k7k:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_OV4k7k:12209: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_OV4k7k:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12108: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12120: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12108: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12120: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12136: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/other:12158: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/base:12102: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/base:12114: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/base:12130: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/base:12130: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/base:12152: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/base:12152: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13733: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13745: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13761: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13761: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13783: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/unchanged:13721: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/unchanged:13733: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/unchanged:13749: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/unchanged:13749: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/unchanged:13771: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12159: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12171: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12187: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/local:12209: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge1:13744: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge1:13756: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge1:13772: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge1:13772: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge1:13794: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge2:13713: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge2:13725: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge2:13741: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge2:13741: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.yanQQW/merge2:13763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Lacw73:9031: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Lacw73:9031: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Lacw73:11693: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Lacw73:11693: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_Lacw73:12123: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_jKOqQG:9034: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_jKOqQG:9034: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_CKnQe3:9011: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_CKnQe3:9011: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_CKnQe3:11669: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_CKnQe3:11669: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_jKOqQG:11763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_jKOqQG:11763: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_CKnQe3:12099: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_jKOqQG:12190: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:12191: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:12103: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/base:9031: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/base:9031: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:9013: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/base:11693: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/base:11693: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/base:12123: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:11673: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/other:12103: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:12191: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:9390: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:9390: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13575: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:13575: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:14005: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/unchanged:8961: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/unchanged:8961: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/unchanged:13035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/unchanged:13035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/unchanged:13465: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:9035: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:11764: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/local:12191: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge1:8996: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge1:8996: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge1:13135: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge1:13135: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge1:13565: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge2:9318: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge2:9318: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge2:13488: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge2:13488: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.K6XDdD/merge2:13915: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_yoRbdY:12302: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_9LlymO:12253: warning: internationalized messages should not contain the '\r' escape sequence .merge_file_5YuHFu:12233: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.OWSIsD/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.OWSIsD/base:12253: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.OWSIsD/other:12233: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.OWSIsD/local:12302: warning: internationalized messages should not contain the '\r' escape sequence <stdin>:14913: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.OWSIsD/other:12233: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.OWSIsD/unchanged:12700: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.OWSIsD/local:12302: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.OWSIsD/merge1:13594: warning: internationalized messages should not contain the '\r' escape sequence /tmp/merge-po.OWSIsD/merge2:13983: warning: internationalized messages should not contain the '\r' escape sequence Auto-merging po/cs.po CONFLICT (content): Merge conflict in po/cs.po Auto-merging po/de.po CONFLICT (content): Merge conflict in po/de.po Auto-merging po/es.po CONFLICT (content): Merge conflict in po/es.po Auto-merging po/fr.po CONFLICT (content): Merge conflict in po/fr.po Auto-merging po/zh_CN.po CONFLICT (content): Merge conflict in po/zh_CN.po Automatic merge failed; fix conflicts and then commit the result. (1)02/11/2026 |
|
Repository notification received |
GitHub: https://api.github.com/repos/XCSoar/XCSoar, master
02/11/2026
|