Failed merge on repository
Cacti / hmib
warning: Cannot merge binary files: locales/po/cacti.pot (HEAD vs. develop) Auto-merging locales/po/cacti.pot CONFLICT (content): Merge conflict in locales/po/cacti.pot Automatic merge failed; fix conflicts and then commit the result. (1)
New strings to translate
Cacti / mactrack — Chinese (Traditional)
Cacti / mactrack — Chinese (Simplified)
Cacti / mactrack — Vietnamese
Cacti / mactrack — Turkish
Cacti / mactrack — Swedish
Cacti / mactrack — Russian
Cacti / mactrack — Portuguese (Portugal)
Cacti / mactrack — Portuguese (Brazil)
Cacti / mactrack — Polish
Cacti / mactrack — Dutch
Cacti / mactrack — Korean
Cacti / mactrack — Japanese
Cacti / mactrack — Italian
Cacti / mactrack — Hindi
Cacti / mactrack — Hebrew (Israel)
Cacti / mactrack — French
Cacti / mactrack — Spanish
Cacti / mactrack — Greek
Cacti / mactrack — German
admin