| Project website | www.libreoffice.org |
|---|---|
| Mailing list for translators | l10n@global.libreoffice.org |
| Translation process |
|
| Translation license | Mozilla Public License 2.0 |
| Source code repository |
https://git.libreoffice.org/online
|
| Repository branch | master |
| Last remote commit |
tdf#133279: Use CollaboraOnlineWebViewKeyboardManager also for hw keyboards
d0edfeabbd
Tor Lillqvist authored 5 months ago |
| Filemask | loleaflet/po/ui-*.po |
| Languages | 136 |
| Source strings | 274 |
| Source words | 1,277 |
| Source characters | 8,036 |
| Hosted strings | 34,620 |
| Hosted words | 159,276 |
| Hosted characters | 1,016,550 |
First, rewinding head to replay your work on top of it... Applying: LibreOffice Online/loleaflet-ui (Danish) Using index info to reconstruct a base tree... M loleaflet/po/ui-da.po Falling back to patching base and 3-way merge... Auto-merging loleaflet/po/ui-da.po CONFLICT (content): Merge conflict in loleaflet/po/ui-da.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 LibreOffice Online/loleaflet-ui (Danish) 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". (1)8 months ago
None
SteenRønnow