Please log in to see the alerts.
| Project website | https://github.com/ubports | |
|---|---|---|
| Translation process |
|
|
| Translation license | Creative Commons Attribution Share Alike 4.0 International | |
| Repository |
git@gitlab.com:ubports/apps/teleports.git
|
|
| Repository branch | master | |
| Last remote commit |
Merge branch 'tg-url-invite-link-backend' into 'master'
b1205f4
 Flohack authored 6 days ago |
|
| Repository containing Weblate translations |
https://translate.ubports.com/git/ubports/teleports/
|
|
| Filemask | po/*.po |
|
| Number of strings | 5,208 | |
| Number of words | 18,564 | |
| Number of characters | 108,264 | |
| Number of languages | 24 | |
| Number of source strings | 217 | |
| Number of source words | 26 | |
| Number of source characters | 4,511 | |
None
ixavier
VistausFirst, rewinding head to replay your work on top of it...
Applying: Implement more message actions and refactor MessageActionItem
Using index info to reconstruct a base tree...
M app/messagecontentdelegatemap.cpp
M app/messagedelegatemap.cpp
M app/qml/delegates/MessageActionItem.qml
M app/qml/delegates/MessageBasicGroupChatCreate.qml
M app/qml/qml.qrc
M po/teleports.ubports.pot
.git/rebase-apply/patch:151: trailing whitespace.
return message.sender.username
.git/rebase-apply/patch:210: trailing whitespace.
return message.sender.username
.git/rebase-apply/patch:240: trailing whitespace.
return message.sender.username
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging po/teleports.ubports.pot
Auto-merging app/qml/qml.qrc
Auto-merging app/qml/delegates/MessageChatDeletePhoto.qml
CONFLICT (add/add): Merge conflict in app/qml/delegates/MessageChatDeletePhoto.qml
Auto-merging app/qml/delegates/MessageChatChangeTitle.qml
CONFLICT (add/add): Merge conflict in app/qml/delegates/MessageChatChangeTitle.qml
Auto-merging app/qml/delegates/MessageChatChangePhoto.qml
CONFLICT (add/add): Merge conflict in app/qml/delegates/MessageChatChangePhoto.qml
Auto-merging app/qml/delegates/MessageBasicGroupChatCreate.qml
CONFLICT (content): Merge conflict in app/qml/delegates/MessageBasicGroupChatCreate.qml
Auto-merging app/qml/delegates/MessageActionItem.qml
CONFLICT (content): Merge conflict in app/qml/delegates/MessageActionItem.qml
Auto-merging app/messagedelegatemap.cpp
CONFLICT (content): Merge conflict in app/messagedelegatemap.cpp
Auto-merging app/messagecontentdelegatemap.cpp
CONFLICT (content): Merge conflict in app/messagecontentdelegatemap.cpp
error: Failed to merge in the changes.
Patch failed at 0001 Implement more message actions and refactor MessageActionItem
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
(128)
5 days ago
First, rewinding head to replay your work on top of it...
Applying: Implement more message actions and refactor MessageActionItem
Using index info to reconstruct a base tree...
M app/messagecontentdelegatemap.cpp
M app/messagedelegatemap.cpp
M app/qml/delegates/MessageActionItem.qml
M app/qml/delegates/MessageBasicGroupChatCreate.qml
M app/qml/qml.qrc
M po/teleports.ubports.pot
.git/rebase-apply/patch:151: trailing whitespace.
return message.sender.username
.git/rebase-apply/patch:210: trailing whitespace.
return message.sender.username
.git/rebase-apply/patch:240: trailing whitespace.
return message.sender.username
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging po/teleports.ubports.pot
Auto-merging app/qml/qml.qrc
Auto-merging app/qml/delegates/MessageChatDeletePhoto.qml
CONFLICT (add/add): Merge conflict in app/qml/delegates/MessageChatDeletePhoto.qml
Auto-merging app/qml/delegates/MessageChatChangeTitle.qml
CONFLICT (add/add): Merge conflict in app/qml/delegates/MessageChatChangeTitle.qml
Auto-merging app/qml/delegates/MessageChatChangePhoto.qml
CONFLICT (add/add): Merge conflict in app/qml/delegates/MessageChatChangePhoto.qml
Auto-merging app/qml/delegates/MessageBasicGroupChatCreate.qml
CONFLICT (content): Merge conflict in app/qml/delegates/MessageBasicGroupChatCreate.qml
Auto-merging app/qml/delegates/MessageActionItem.qml
CONFLICT (content): Merge conflict in app/qml/delegates/MessageActionItem.qml
Auto-merging app/messagedelegatemap.cpp
CONFLICT (content): Merge conflict in app/messagedelegatemap.cpp
Auto-merging app/messagecontentdelegatemap.cpp
CONFLICT (content): Merge conflict in app/messagecontentdelegatemap.cpp
error: Failed to merge in the changes.
Patch failed at 0001 Implement more message actions and refactor MessageActionItem
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
(128)
5 days ago