The translation is temporarily closed for contributions due to maintenance, please come back later.
The translation was automatically locked due to following alerts: Could not merge the repository.
Please sign in to see the alerts.
Project website yunohost.org
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Any authenticated user can contribute.
  • The translation uses monolingual files.
  • The translation base language can not be edited.
Translation license GNU Affero General Public License v3.0 or later
Source code repository https://github.com/YunoHost/yunohost.git
Repository branch dev
Last remote commit Try to improve the catastrophic error management in domain_add ... 0616d632
Alexandre Aubin authored an hour ago
Weblate repository http://translate.yunohost.org/git/yunohost/core/
Filemask locales/*.json
Monolingual base language file locales/en.json
Languages 25
Source strings 629
Source words 7,235
Source characters 47,825
Hosted strings 15,725
Hosted words 180,875
Hosted characters 1,195,625
User avatar None

Failed rebase on repository

YunoHost / core

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (German)
Using index info to reconstruct a base tree...
M	locales/de.json
Falling back to patching base and 3-way merge...
Auto-merging locales/de.json
CONFLICT (content): Merge conflict in locales/de.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (German)

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)
an hour ago
User avatar None

Received repository notification

YunoHost / core

GitHub: https://github.com/YunoHost/yunohost, dev an hour ago
User avatar None

Failed rebase on repository

YunoHost / core

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (German)
Using index info to reconstruct a base tree...
M	locales/de.json
Falling back to patching base and 3-way merge...
Auto-merging locales/de.json
CONFLICT (content): Merge conflict in locales/de.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (German)

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)
12 hours ago
User avatar None

Received repository notification

YunoHost / core

GitHub: https://github.com/YunoHost/yunohost, dev 12 hours ago
User avatar None

Failed rebase on repository

YunoHost / core

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (German)
Using index info to reconstruct a base tree...
M	locales/de.json
Falling back to patching base and 3-way merge...
Auto-merging locales/de.json
CONFLICT (content): Merge conflict in locales/de.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (German)

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)
13 hours ago
User avatar None

Received repository notification

YunoHost / core

GitHub: https://github.com/YunoHost/yunohost, dev 13 hours ago
User avatar None

Failed rebase on repository

YunoHost / core

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (German)
Using index info to reconstruct a base tree...
M	locales/de.json
Falling back to patching base and 3-way merge...
Auto-merging locales/de.json
CONFLICT (content): Merge conflict in locales/de.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (German)

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)
15 hours ago
User avatar None

Failed rebase on repository

YunoHost / core

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (German)
Using index info to reconstruct a base tree...
M	locales/de.json
Falling back to patching base and 3-way merge...
Auto-merging locales/de.json
CONFLICT (content): Merge conflict in locales/de.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (German)

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)
19 hours ago
User avatar None

Received repository notification

YunoHost / core

GitHub: https://github.com/YunoHost/yunohost, dev 19 hours ago
User avatar None

Failed rebase on repository

YunoHost / core

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (German)
Using index info to reconstruct a base tree...
M	locales/de.json
Falling back to patching base and 3-way merge...
Auto-merging locales/de.json
CONFLICT (content): Merge conflict in locales/de.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (German)

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
Browse all component changes

Daily activity

Daily activity

Weekly activity

Weekly activity