User avatar None

Failed merge on repository

Cacti / core (v1.2.x)

/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
/bin/sh: warning: setlocale: LC_ALL: cannot change locale (UTF-8): No such file or directory
Auto-merging locales/po/zh-TW.po
Auto-merging locales/po/zh-CN.po
CONFLICT (content): Merge conflict in locales/po/zh-CN.po
Auto-merging locales/po/vi-VN.po
Auto-merging locales/po/tr-TR.po
Auto-merging locales/po/sv-SE.po
Auto-merging locales/po/ru-RU.po
CONFLICT (content): Merge conflict in locales/po/ru-RU.po
Auto-merging locales/po/pt-PT.po
Auto-merging locales/po/pt-BR.po
Auto-merging locales/po/pl-PL.po
Auto-merging locales/po/nl-NL.po
CONFLICT (content): Merge conflict in locales/po/nl-NL.po
Auto-merging locales/po/ko-KR.po
Auto-merging locales/po/ja-JP.po
Auto-merging locales/po/it-IT.po
Auto-merging locales/po/hi-IN.po
Auto-merging locales/po/he-IL.po
Auto-merging locales/po/fr-FR.po
Auto-merging locales/po/es-ES.po
CONFLICT (content): Merge conflict in locales/po/es-ES.po
Auto-merging locales/po/el-GR.po
Auto-merging locales/po/de-DE.po
CONFLICT (content): Merge conflict in locales/po/de-DE.po
Auto-merging locales/po/bg-BG.po
Auto-merging locales/po/ar-SA.po
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)Japanese

Resource update 3 years ago
User avatar None

Received repository notification

Cacti / core (v1.2.x)

GitHub: https://github.com/Cacti/cacti, 1.2.x 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)Italian

Resource update 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)Hindi

Resource update 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)Hebrew (Israel)

Resource update 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)French

Resource update 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)Spanish

Resource update 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)Greek

Resource update 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)German

Resource update 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)Bulgarian

Resource update 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)Arabic (Saudi Arabia)

Resource update 3 years ago
User avatar None

Resource update

Cacti / core (v1.2.x)English

Resource update 3 years ago
User avatar None

Merged repository

Cacti / core (v1.2.x)

Merged repository 3 years ago
User avatar None

Received repository notification

Cacti / core (v1.2.x)

GitHub: https://github.com/Cacti/cacti, 1.2.x 3 years ago
User avatar None

Merged repository

Cacti / core (v1.2.x)

Merged repository 3 years ago
User avatar None

Received repository notification

Cacti / core (v1.2.x)

GitHub: https://github.com/Cacti/cacti, 1.2.x 3 years ago
User avatar None

Received repository notification

Cacti / core (v1.2.x)

GitHub: https://github.com/Cacti/cacti, 1.2.x 3 years ago
User avatar None

Pushed changes

Cacti / core (v1.2.x)

Pushed changes 3 years ago
User avatar None

New strings to translate

Cacti / core (v1.2.x)Chinese (Traditional)

New strings to translate 3 years ago

Search