![]() Resource updated |
|
![]() Resource updated |
The “
locales/po/ar-SA.po ” file was changed.
4 years ago
|
![]() Resource updated |
The “
locales/po/cacti.pot ” file was changed.
4 years ago
|
![]() Repository reset |
Repository reset
4 years ago
|
![]() Component unlocked |
Component unlocked
4 years ago
|
![]() 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 |
![]() Component locked |
The component was automatically locked because of an alert.
4 years ago
|
![]() Alert triggered |
Could not merge the repository.
4 years ago
|
![]() 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 |
![]() Repository notification received |
GitHub: https://github.com/Cacti/plugin_syslog, develop
4 years ago
|
![]() Translation changed |
|
![]() Contributor joined |
Contributor joined
4 years ago
|
![]() Resource updated |
The “
locales/po/zh-TW.po ” file was changed.
4 years ago
|
![]() Resource updated |
The “
locales/po/zh-CN.po ” file was changed.
4 years ago
|
![]() Resource updated |
The “
locales/po/vi-VN.po ” file was changed.
4 years ago
|
![]() Resource updated |
The “
locales/po/tr-TR.po ” file was changed.
4 years ago
|
![]() Resource updated |
The “
locales/po/sv-SE.po ” file was changed.
4 years ago
|
![]() Resource updated |
The “
locales/po/ru-RU.po ” file was changed.
4 years ago
|
![]() Resource updated |
The “
locales/po/pt-PT.po ” file was changed.
4 years ago
|
![]() Resource updated |
The “
locales/po/pt-BR.po ” file was changed.
4 years ago
|
locales/po/bg-BG.po
” file was changed. 4 years ago