2. Cacti
3. wmi
4. Changes

The “locales/po/ja-JP.po” file was changed. 4 years ago

The “locales/po/it-IT.po” file was changed. 4 years ago

The “locales/po/hi-IN.po” file was changed. 4 years ago

The “locales/po/he-IL.po” file was changed. 4 years ago

The “locales/po/fr-FR.po” file was changed. 4 years ago

The “locales/po/es-ES.po” file was changed. 4 years ago

The “locales/po/el-GR.po” file was changed. 4 years ago

The “locales/po/de-DE.po” file was changed. 4 years ago

The “locales/po/bg-BG.po” file was changed. 4 years ago

The “locales/po/ar-SA.po” file was changed. 4 years ago

The “locales/po/cacti.pot” file was changed. 4 years ago

Fixing an alert automatically unlocked the component. 4 years ago

Repository reset 4 years ago

/bin/sh: warning: setlocale: LC_ALL: cannot change locale (C.UTF-8)
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (C.UTF-8)
warning: Cannot merge binary files: locales/LC_MESSAGES/fr-FR.mo (HEAD vs. develop)
Auto-merging locales/po/fr-FR.po
CONFLICT (content): Merge conflict in locales/po/fr-FR.po
Auto-merging locales/po/cacti.pot
CONFLICT (content): Merge conflict in locales/po/cacti.pot
Auto-merging locales/LC_MESSAGES/fr-FR.mo
CONFLICT (content): Merge conflict in locales/LC_MESSAGES/fr-FR.mo
Automatic merge failed; fix conflicts and then commit the result.
 (1)

4 years ago

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

The component was automatically locked because of an alert. 4 years ago

Could not merge the repository. 4 years ago

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

GitHub: https://github.com/Cacti/plugin_wmi, develop 4 years ago

English French 5 characters edited 4 years ago