The translation was automatically locked due to following alerts: Could not merge the repository.
| Language | Translated | Untranslated | Untranslated words | Checks | Suggestions | Comments | |
|---|---|---|---|---|---|---|---|
English
LGPL-2.1
|
|||||||
|
|
|||||||
|
French
LGPL-2.1
|
|||||||
|
|
|||||||
|
Russian
LGPL-2.1
|
|||||||
|
|
|||||||
|
Spanish
LGPL-2.1
|
1 | ||||||
|
|
|||||||
Please sign in to see the alerts.
| Project website | contrib.xwiki.org |
|---|---|
| Project maintainers |
 caubin
 vmassol
 evalica
 tmortagne
 acotiuga
 slauriere
 enygma
 atallahade
 ClemensRobbenhaar
 mleduc
 gdelhumeau
|
| Translation process |
|
| Translation license | GNU Lesser General Public License v2.1 only |
| Source code repository |
https://github.com/xwiki-contrib/application-notes
|
| Repository branch | master |
| Last remote commit |
[maven-release-plugin] prepare for next development iteration
19081bb
tmortagne authored a month ago |
| Weblate repository |
https://l10n.xwiki.org/git/xwiki-contrib/notes-application/
|
| Filemask | src/main/resources/NotesCode/Translations.*.xml |
| Monolingual base language file | src/main/resources/NotesCode/Translations.xml |
| Languages | 4 |
| Source strings | 2 |
| Source words | 10 |
| Source characters | 67 |
| Hosted strings | 8 |
| Hosted words | 40 |
| Hosted characters | 268 |
NoneFirst, rewinding head to replay your work on top of it... Applying: Added translation using Weblate (Spanish) .git/rebase-apply/patch:7: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging src/main/resources/NotesCode/Translations.es.xml CONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Added translation 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". (1)yesterday
First, rewinding head to replay your work on top of it... Applying: Added translation using Weblate (Spanish) .git/rebase-apply/patch:7: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging src/main/resources/NotesCode/Translations.es.xml CONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Added translation 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". (1)2 days ago
First, rewinding head to replay your work on top of it... Applying: Added translation using Weblate (Spanish) .git/rebase-apply/patch:7: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging src/main/resources/NotesCode/Translations.es.xml CONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Added translation 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". (1)3 days ago
First, rewinding head to replay your work on top of it... Applying: Added translation using Weblate (Spanish) .git/rebase-apply/patch:7: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging src/main/resources/NotesCode/Translations.es.xml CONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Added translation 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". (1)3 days ago
First, rewinding head to replay your work on top of it... Applying: Added translation using Weblate (Spanish) .git/rebase-apply/patch:7: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging src/main/resources/NotesCode/Translations.es.xml CONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Added translation 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". (1)3 days ago
First, rewinding head to replay your work on top of it... Applying: Added translation using Weblate (Spanish) .git/rebase-apply/patch:7: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging src/main/resources/NotesCode/Translations.es.xml CONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Added translation 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". (1)3 days ago
First, rewinding head to replay your work on top of it... Applying: Added translation using Weblate (Spanish) .git/rebase-apply/patch:7: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging src/main/resources/NotesCode/Translations.es.xml CONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Added translation 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". (1)4 days ago
First, rewinding head to replay your work on top of it... Applying: Added translation using Weblate (Spanish) .git/rebase-apply/patch:7: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging src/main/resources/NotesCode/Translations.es.xml CONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Added translation 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". (1)5 days ago
First, rewinding head to replay your work on top of it... Applying: Added translation using Weblate (Spanish) .git/rebase-apply/patch:7: new blank line at EOF. + warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging src/main/resources/NotesCode/Translations.es.xml CONFLICT (add/add): Merge conflict in src/main/resources/NotesCode/Translations.es.xml error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Added translation 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". (1)6 days ago