Skip to content

Commit b0e03c9

Browse files
committed
Cherry pick of 5347b58 failed
stdout: CONFLICT (modify/delete): locale/de/LC_MESSAGES/settings.po deleted in 5347b58 and modified in 1eba371fcb80619126419e6e396614a363885398. Version 1eba371fcb80619126419e6e396614a363885398 of locale/de/LC_MESSAGES/settings.po left in tree. CONFLICT (modify/delete): locale/es/LC_MESSAGES/settings.po deleted in 5347b58 and modified in 1eba371fcb80619126419e6e396614a363885398. Version 1eba371fcb80619126419e6e396614a363885398 of locale/es/LC_MESSAGES/settings.po left in tree. CONFLICT (modify/delete): locale/fr/LC_MESSAGES/settings.po deleted in 5347b58 and modified in 1eba371fcb80619126419e6e396614a363885398. Version 1eba371fcb80619126419e6e396614a363885398 of locale/fr/LC_MESSAGES/settings.po left in tree. CONFLICT (modify/delete): locale/nl/LC_MESSAGES/settings.po deleted in 5347b58 and modified in 1eba371fcb80619126419e6e396614a363885398. Version 1eba371fcb80619126419e6e396614a363885398 of locale/nl/LC_MESSAGES/settings.po left in tree. CONFLICT (modify/delete): locale/pt_BR/LC_MESSAGES/settings.po deleted in 5347b58 and modified in 1eba371fcb80619126419e6e396614a363885398. Version 1eba371fcb80619126419e6e396614a363885398 of locale/pt_BR/LC_MESSAGES/settings.po left in tree. CONFLICT (modify/delete): locale/zh_CN/LC_MESSAGES/settings.po deleted in 5347b58 and modified in 1eba371fcb80619126419e6e396614a363885398. Version 1eba371fcb80619126419e6e396614a363885398 of locale/zh_CN/LC_MESSAGES/settings.po left in tree. stderr:
1 parent 27f5e5e commit b0e03c9

File tree

20 files changed

+5998
-4740
lines changed

20 files changed

+5998
-4740
lines changed

.weblate.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@
6666
"filemask": "locale/*/LC_MESSAGES/studio.po",
6767
"new_base": "locale/sources/studio.pot"
6868
},
69-
{
70-
"name": "user_settings",
71-
"filemask": "locale/*/LC_MESSAGES/settings.po",
72-
"new_base": "locale/sources/settings.pot"
73-
},
7469
{
7570
"name": "websites",
7671
"filemask": "locale/*/LC_MESSAGES/websites.po",

locale/da/LC_MESSAGES/settings.po

Lines changed: 0 additions & 198 deletions
This file was deleted.

0 commit comments

Comments
 (0)