User avatar thewitness

Resource updated
The “locales/po/pl-PL.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/nl-NL.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/ko-KR.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/ja-JP.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/it-IT.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/hi-IN.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/he-IL.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/fr-FR.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/es-ES.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/el-GR.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/de-DE.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/bg-BG.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/ar-SA.po” file was changed. 4 years ago
User avatar thewitness

Resource updated
The “locales/po/cacti.pot” file was changed. 4 years ago
User avatar None

Component unlocked
Fixing an alert automatically unlocked the component. 4 years ago
User avatar thewitness

Repository reset
Repository reset 4 years ago
User avatar None

Repository rebase failed

 
First, rewinding head to replay your work on top of it...
Applying: Update translation files
Using index info to reconstruct a base tree...
M	locales/po/cacti.pot
Falling back to patching base and 3-way merge...
Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Update translation files
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 years ago
User avatar None

Component locked
The component was automatically locked because of an alert. 4 years ago
User avatar None

Alert triggered
Could not merge the repository. 4 years ago
User avatar None

Repository rebase failed

 
First, rewinding head to replay your work on top of it...
Applying: Update translation files
Using index info to reconstruct a base tree...
M	locales/po/cacti.pot
Falling back to patching base and 3-way merge...
Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Update translation files
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 years ago

Search