User avatar jkuehn

Resource updated

The “installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po” file was changed. a year ago
User avatar jkuehn

Resource updated

The “installer/Localizations/fr/LC_MESSAGES/DMXControl3_Installer.po” file was changed. a year ago
User avatar jkuehn

Resource updated

The “installer/Localizations/de/LC_MESSAGES/DMXControl3_Installer.po” file was changed. a year ago
User avatar jkuehn

Resource updated

The “installer/Localizations/DMXControl3_Installer.pot” file was changed. a year ago
User avatar None

Component unlocked

Fixing an alert automatically unlocked the component. a year ago
User avatar jkuehn

Repository reset

Repository reset a year ago
User avatar jkuehn

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Japanese)
Using index info to reconstruct a base tree...
M	installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
Falling back to patching base and 3-way merge...
Auto-merging installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
CONFLICT (content): Merge conflict in installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
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 (Japanese)

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)
a year ago
User avatar jkuehn

Repository merge failed

Auto-merging installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
CONFLICT (content): Merge conflict in installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
Automatic merge failed; fix conflicts and then commit the result.
 (1)
a year ago
User avatar jkuehn

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Japanese)
Using index info to reconstruct a base tree...
M	installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
Falling back to patching base and 3-way merge...
Auto-merging installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
CONFLICT (content): Merge conflict in installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
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 (Japanese)

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)
a year ago
User avatar None

Component locked

The component was automatically locked because of an alert. a year ago
User avatar None

Alert triggered

Could not merge the repository. a year ago
User avatar jkuehn

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Japanese)
Using index info to reconstruct a base tree...
M	installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
Falling back to patching base and 3-way merge...
Auto-merging installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
CONFLICT (content): Merge conflict in installer/Localizations/ja/LC_MESSAGES/DMXControl3_Installer.po
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 (Japanese)

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)
a year ago
User avatar koichiro_saito

Translation changed

a year ago
User avatar koichiro_saito

Translation changed

a year ago
User avatar koichiro_saito

Translation changed

a year ago
User avatar koichiro_saito

Translation changed

a year ago
User avatar koichiro_saito

Translation changed

a year ago
User avatar koichiro_saito

Translation added

a year ago
User avatar koichiro_saito

Translation added

a year ago
User avatar koichiro_saito

Translation added

a year ago

Search