User avatar thewitness

Resource update

Cacti / wmiPortuguese (Brazil)

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiPolish

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiDutch

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiKorean

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiJapanese

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiItalian

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiHindi

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiHebrew (Israel)

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiFrench

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiSpanish

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiGreek

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiGerman

Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiBulgarian

Resource update 3 years ago
Resource update 3 years ago
User avatar thewitness

Resource update

Cacti / wmiEnglish

Resource update 3 years ago
User avatar None

Component automatically unlocked

Cacti / wmi

Component automatically unlocked 3 years ago
User avatar thewitness

Reset repository

Cacti / wmi

Reset repository 3 years ago
User avatar thewitness

Failed merge on repository

Cacti / wmi

/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)
3 years ago
User avatar None

Failed rebase on repository

Cacti / wmi

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)
3 years ago
User avatar None

Component automatically locked

Cacti / wmi

Component automatically locked 3 years ago

Search