Changes
Translation components API.
See the Weblate's Web API documentation for detailed description of the API.
GET /api/components/cacti/core/changes/?format=api&page=55
{ "count": 6246, "next": "http://translate.cacti.net/api/components/cacti/core/changes/?format=api&page=56", "previous": "http://translate.cacti.net/api/components/cacti/core/changes/?format=api&page=54", "results": [ { "unit": "http://translate.cacti.net/api/units/512726/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:23:18.926244Z", "action": 5, "target": "Шаблон Агрегації:", "id": 30058, "action_name": "New translation", "url": "http://translate.cacti.net/api/changes/30058/?format=api" }, { "unit": "http://translate.cacti.net/api/units/512727/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:24:06.735682Z", "action": 5, "target": "Наразі немає Шаблонів Агрегації, визначених для вибраних Сумісних Агрегацій.", "id": 30060, "action_name": "New translation", "url": "http://translate.cacti.net/api/changes/30060/?format=api" }, { "unit": "http://translate.cacti.net/api/units/512727/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:25:24.203053Z", "action": 2, "target": "Наразі немає Шаблонів Агрегації, визначених для вибраних Legacy Агрегацій.", "id": 30062, "action_name": "Translation changed", "url": "http://translate.cacti.net/api/changes/30062/?format=api" }, { "unit": "http://translate.cacti.net/api/units/512728/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:27:14.981743Z", "action": 5, "target": "Щоб мігрувати наступні Агреговані Графіки до Агрегації на основі Шаблону, спочатку створіть Шаблон Агрегації для Шаблону Графіка '%s'.", "id": 30064, "action_name": "New translation", "url": "http://translate.cacti.net/api/changes/30064/?format=api" }, { "unit": "http://translate.cacti.net/api/units/512731/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:29:11.349726Z", "action": 5, "target": "Ім'я Агрегованого:", "id": 30070, "action_name": "New translation", "url": "http://translate.cacti.net/api/changes/30070/?format=api" }, { "unit": "http://translate.cacti.net/api/units/512732/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:29:20.469404Z", "action": 5, "target": "Новий Агрегований", "id": 30072, "action_name": "New translation", "url": "http://translate.cacti.net/api/changes/30072/?format=api" }, { "unit": "http://translate.cacti.net/api/units/512734/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:30:28.896968Z", "action": 5, "target": "Ім'я Звіту", "id": 30076, "action_name": "New translation", "url": "http://translate.cacti.net/api/changes/30076/?format=api" }, { "unit": "http://translate.cacti.net/api/units/512735/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:30:43.986912Z", "action": 5, "target": "Проміжок часу", "id": 30077, "action_name": "New translation", "url": "http://translate.cacti.net/api/changes/30077/?format=api" }, { "unit": "http://translate.cacti.net/api/units/512736/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:30:56.951432Z", "action": 5, "target": "Вирівнювання", "id": 30078, "action_name": "New translation", "url": "http://translate.cacti.net/api/changes/30078/?format=api" }, { "unit": "http://translate.cacti.net/api/units/512738/?format=api", "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": "http://translate.cacti.net/api/translations/cacti/core/uk/?format=api", "user": "http://translate.cacti.net/api/users/nightflyza/?format=api", "author": "http://translate.cacti.net/api/users/nightflyza/?format=api", "timestamp": "2022-11-25T23:31:37.831539Z", "action": 5, "target": "Наразі у вас немає визначених звітів.", "id": 30081, "action_name": "New translation", "url": "http://translate.cacti.net/api/changes/30081/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-26T01:05:27.429553Z", "action": 18, "target": "", "id": 30093, "action_name": "Pushed changes", "url": "http://translate.cacti.net/api/changes/30093/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-26T01:05:28.807510Z", "action": 53, "target": "", "id": 30094, "action_name": "Received repository notification", "url": "http://translate.cacti.net/api/changes/30094/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-27T16:27:46.772897Z", "action": 53, "target": "", "id": 30099, "action_name": "Received repository notification", "url": "http://translate.cacti.net/api/changes/30099/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-27T16:27:49.782991Z", "action": 47, "target": "", "id": 30100, "action_name": "New alert", "url": "http://translate.cacti.net/api/changes/30100/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-27T16:27:49.790299Z", "action": 14, "target": "", "id": 30101, "action_name": "Component automatically locked", "url": "http://translate.cacti.net/api/changes/30101/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-27T16:28:07.083247Z", "action": 53, "target": "", "id": 30102, "action_name": "Received repository notification", "url": "http://translate.cacti.net/api/changes/30102/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-27T16:28:08.676589Z", "action": 15, "target": "", "id": 30103, "action_name": "Component automatically unlocked", "url": "http://translate.cacti.net/api/changes/30103/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-27T16:28:55.898956Z", "action": 23, "target": "First, rewinding head to replay your work on top of it...\nApplying: Correct header shebang\n.git/rebase-apply/patch:4106: trailing whitespace.\nWith that said, there are several changes that you MUST perform to MySQL/MariaDB \n.git/rebase-apply/patch:4160: trailing whitespace.\ndo \n.git/rebase-apply/patch:4269: trailing whitespace.\n### Check out the Cacti Group's Official YouTube channel \n.git/rebase-apply/patch:4425: trailing whitespace.\nIf a vulnerability is reproducible with evidence, please \n.git/rebase-apply/patch:4426: trailing whitespace.\ncontact us on [email protected]. We would appreciate \nwarning: squelched 2355 whitespace errors\nwarning: 2360 lines add whitespace errors.\nUsing index info to reconstruct a base tree...\nFalling back to patching base and 3-way merge...\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n msggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n Output of 'msggrep' might be incorrect.\n input file charset \"UTF-8\".\nPossible workarounds are:\n Output of 'msggrep' might be incorrect.\n - Set LC_ALL to a locale with encoding UTF-8.\n Possible workarounds are:\n - Convert the translation catalog to ASCII using 'msgconv',\n - Set LC_ALL to a locale with encoding UTF-8.\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\n- Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nmsggrep: warning: Locale charset \"ANSI_X3.4-1968\" is different from\n input file charset \"UTF-8\".\n Output of 'msggrep' might be incorrect.\n Possible workarounds are:\n - Set LC_ALL to a locale with encoding UTF-8.\n - Convert the translation catalog to ASCII using 'msgconv',\n then apply 'msggrep',\n then convert back to UTF-8 using 'msgconv'.\nwarning: Cannot merge binary files: locales/LC_MESSAGES/zh-TW.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/zh-CN.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/vi-VN.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/tr-TR.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/sv-SE.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/ru-RU.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/pt-PT.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/pt-BR.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/pl-PL.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/nl-NL.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/ko-KR.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/ja-JP.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/it-IT.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/hi-IN.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/he-IL.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/fr-FR.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/es-ES.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/el-GR.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/de-DE.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/bg-BG.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: locales/LC_MESSAGES/ar-SA.mo (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: install/templates/Windows_Device.xml.gz (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: install/templates/NetSNMP_Device.xml.gz (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: install/templates/Local_Linux_Machine.xml.gz (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: install/templates/Generic_SNMP_Device.xml.gz (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: install/templates/Cisco_Router.xml.gz (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: install/templates/Cacti_Stats.xml.gz (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: images/cacti_logo_new.gif (HEAD vs. Correct header shebang)\nwarning: Cannot merge binary files: images/cacti_logo.gif (HEAD vs. Correct header shebang)\nCONFLICT (add/add): Merge conflict in vdef.php\nAuto-merging vdef.php\nCONFLICT (add/add): Merge conflict in utilities.php\nAuto-merging utilities.php\nCONFLICT (add/add): Merge conflict in user_group_admin.php\nAuto-merging user_group_admin.php\nCONFLICT (add/add): Merge conflict in user_domains.php\nAuto-merging user_domains.php\nCONFLICT (add/add): Merge conflict in user_admin.php\nAuto-merging user_admin.php\nCONFLICT (add/add): Merge conflict in tree.php\nAuto-merging tree.php\nCONFLICT (add/add): Merge conflict in tests/tools/check_install_code.php\nAuto-merging tests/tools/check_install_code.php\nCONFLICT (add/add): Merge conflict in tests/tools/check_cli_version.sh\nAuto-merging tests/tools/check_cli_version.sh\nCONFLICT (add/add): Merge conflict in tests/tools/check_all_pages.sh\nAuto-merging tests/tools/check_all_pages.sh\nCONFLICT (add/add): Merge conflict in tests/tools/cacti.conf\nAuto-merging tests/tools/cacti.conf\nCONFLICT (add/add): Merge conflict in templates_import.php\nAuto-merging templates_import.php\nCONFLICT (add/add): Merge conflict in templates_export.php\nAuto-merging templates_export.php\nCONFLICT (add/add): Merge conflict in support.php\nAuto-merging support.php\nCONFLICT (add/add): Merge conflict in spikekill.php\nAuto-merging spikekill.php\nCONFLICT (add/add): Merge conflict in snmpagent_persist.php\nAuto-merging snmpagent_persist.php\nCONFLICT (add/add): Merge conflict in snmpagent_mibcachechild.php\nAuto-merging snmpagent_mibcachechild.php\nCONFLICT (add/add): Merge conflict in snmpagent_mibcache.php\nAuto-merging snmpagent_mibcache.php\nCONFLICT (add/add): Merge conflict in sites.php\nAuto-merging sites.php\nCONFLICT (add/add): Merge conflict in settings.php\nAuto-merging settings.php\nCONFLICT (add/add): Merge conflict in service/README.md\nAuto-merging service/README.md\nCONFLICT (add/add): Merge conflict in scripts/weatherbug.pl\nAuto-merging scripts/weatherbug.pl\nCONFLICT (add/add): Merge conflict in scripts/ss_webseer.php\nAuto-merging scripts/ss_webseer.php\nCONFLICT (add/add): Merge conflict in scripts/ss_sql.php\nAuto-merging scripts/ss_sql.php\nCONFLICT (add/add): Merge conflict in scripts/ss_poller.php\nAuto-merging scripts/ss_poller.php\nCONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_io.php\nAuto-merging scripts/ss_net_snmp_disk_io.php\nCONFLICT (add/add): Merge conflict in scripts/ss_net_snmp_disk_bytes.php\nAuto-merging scripts/ss_net_snmp_disk_bytes.php\nCONFLICT (add/add): Merge conflict in scripts/ss_hstats.php\nAuto-merging scripts/ss_hstats.php\nCONFLICT (add/add): Merge conflict in scripts/ss_host_disk.php\nAuto-merging scripts/ss_host_disk.php\nCONFLICT (add/add): Merge conflict in scripts/ss_host_cpu.php\nAuto-merging scripts/ss_host_cpu.php\nCONFLICT (add/add): Merge conflict in scripts/ss_gexport.php\nAuto-merging scripts/ss_gexport.php\nCONFLICT (add/add): Merge conflict in scripts/ss_fping.php\nAuto-merging scripts/ss_fping.php\nCONFLICT (add/add): Merge conflict in scripts/ss_cpoller.php\nAuto-merging scripts/ss_cpoller.php\nCONFLICT (add/add): Merge conflict in scripts/ss_count_oids.php\nAuto-merging scripts/ss_count_oids.php\nCONFLICT (add/add): Merge conflict in scripts/cacti_user_stats.php\nAuto-merging scripts/cacti_user_stats.php\nCONFLICT (add/add): Merge conflict in script_server.php\nAuto-merging script_server.php\nCONFLICT (add/add): Merge conflict in rrdcleaner.php\nAuto-merging rrdcleaner.php\nCONFLICT (add/add): Merge conflict in resource/snmp_queries/interface.xml\nAuto-merging resource/snmp_queries/interface.xml\nCONFLICT (add/add): Merge conflict in resource/script_server/webseer.xml\nAuto-merging resource/script_server/webseer.xml\nCONFLICT (add/add): Merge conflict in resource/script_server/host_disk.xml\nAuto-merging resource/script_server/host_disk.xml\nCONFLICT (add/add): Merge conflict in resource/script_server/host_cpu.xml\nAuto-merging resource/script_server/host_cpu.xml\nCONFLICT (add/add): Merge conflict in resource/script_server/gexport.xml\nAuto-merging resource/script_server/gexport.xml\nCONFLICT (add/add): Merge conflict in resource/script_server/cpoller.xml\nAuto-merging resource/script_server/cpoller.xml\nCONFLICT (add/add): Merge conflict in resource/script_queries/unix_disk.xml\nAuto-merging resource/script_queries/unix_disk.xml\nCONFLICT (add/add): Merge conflict in resource/script_queries/host_disk.xml\nAuto-merging resource/script_queries/host_disk.xml\nCONFLICT (add/add): Merge conflict in resource/script_queries/host_cpu.xml\nAuto-merging resource/script_queries/host_cpu.xml\nCONFLICT (add/add): Merge conflict in reports_user.php\nAuto-merging reports_user.php\nCONFLICT (add/add): Merge conflict in reports_admin.php\nAuto-merging reports_admin.php\nCONFLICT (add/add): Merge conflict in remote_agent.php\nAuto-merging remote_agent.php\nCONFLICT (add/add): Merge conflict in pollers.php\nAuto-merging pollers.php\nCONFLICT (add/add): Merge conflict in poller_spikekill.php\nAuto-merging poller_spikekill.php\nCONFLICT (add/add): Merge conflict in poller_reports.php\nAuto-merging poller_reports.php\nCONFLICT (add/add): Merge conflict in poller_recovery.php\nAuto-merging poller_recovery.php\nCONFLICT (add/add): Merge conflict in poller_realtime.php\nAuto-merging poller_realtime.php\nCONFLICT (add/add): Merge conflict in poller_maintenance.php\nAuto-merging poller_maintenance.php\nCONFLICT (add/add): Merge conflict in poller_dsstats.php\nAuto-merging poller_dsstats.php\nCONFLICT (add/add): Merge conflict in poller_commands.php\nAuto-merging poller_commands.php\nCONFLICT (add/add): Merge conflict in poller_boost.php\nAuto-merging poller_boost.php\nCONFLICT (add/add): Merge conflict in poller_automation.php\nAuto-merging poller_automation.php\nCONFLICT (add/add): Merge conflict in poller.php\nAuto-merging poller.php\nCONFLICT (add/add): Merge conflict in plugins.php\nAuto-merging plugins.php\nCONFLICT (add/add): Merge conflict in permission_denied.php\nAuto-merging permission_denied.php\nCONFLICT (add/add): Merge conflict in mibs/CACTI-SNMPAGENT-MIB\nAuto-merging mibs/CACTI-SNMPAGENT-MIB\nCONFLICT (add/add): Merge conflict in mibs/CACTI-MIB\nAuto-merging mibs/CACTI-MIB\nCONFLICT (add/add): Merge conflict in mibs/CACTI-BOOST-MIB\nAuto-merging mibs/CACTI-BOOST-MIB\nCONFLICT (add/add): Merge conflict in managers.php\nAuto-merging managers.php\nCONFLICT (add/add): Merge conflict in logout.php\nAuto-merging logout.php\nCONFLICT (add/add): Merge conflict in locales/po/zh-TW.po\nAuto-merging locales/po/zh-TW.po\nCONFLICT (add/add): Merge conflict in locales/po/zh-CN.po\nAuto-merging locales/po/zh-CN.po\nCONFLICT (add/add): Merge conflict in locales/po/vi-VN.po\nAuto-merging locales/po/vi-VN.po\nCONFLICT (add/add): Merge conflict in locales/po/tr-TR.po\nAuto-merging locales/po/tr-TR.po\nCONFLICT (add/add): Merge conflict in locales/po/sv-SE.po\nAuto-merging locales/po/sv-SE.po\nCONFLICT (add/add): Merge conflict in locales/po/ru-RU.po\nAuto-merging locales/po/ru-RU.po\nCONFLICT (add/add): Merge conflict in locales/po/pt-PT.po\nAuto-merging locales/po/pt-PT.po\nCONFLICT (add/add): Merge conflict in locales/po/pt-BR.po\nAuto-merging locales/po/pt-BR.po\nCONFLICT (add/add): Merge conflict in locales/po/pl-PL.po\nAuto-merging locales/po/pl-PL.po\nCONFLICT (add/add): Merge conflict in locales/po/nl-NL.po\nAuto-merging locales/po/nl-NL.po\nCONFLICT (add/add): Merge conflict in locales/po/ko-KR.po\nAuto-merging locales/po/ko-KR.po\nCONFLICT (add/add): Merge conflict in locales/po/ja-JP.po\nAuto-merging locales/po/ja-JP.po\nCONFLICT (add/add): Merge conflict in locales/po/it-IT.po\nAuto-merging locales/po/it-IT.po\nCONFLICT (add/add): Merge conflict in locales/po/hi-IN.po\nAuto-merging locales/po/hi-IN.po\nCONFLICT (add/add): Merge conflict in locales/po/he-IL.po\nAuto-merging locales/po/he-IL.po\nCONFLICT (add/add): Merge conflict in locales/po/fr-FR.po\nAuto-merging locales/po/fr-FR.po\nCONFLICT (add/add): Merge conflict in locales/po/es-ES.po\nAuto-merging locales/po/es-ES.po\nCONFLICT (add/add): Merge conflict in locales/po/el-GR.po\nAuto-merging locales/po/el-GR.po\nCONFLICT (add/add): Merge conflict in locales/po/de-DE.po\nAuto-merging locales/po/de-DE.po\nCONFLICT (add/add): Merge conflict in locales/po/cacti.pot\nAuto-merging locales/po/cacti.pot\nCONFLICT (add/add): Merge conflict in locales/po/bg-BG.po\nAuto-merging locales/po/bg-BG.po\nCONFLICT (add/add): Merge conflict in locales/po/ar-SA.po\nAuto-merging locales/po/ar-SA.po\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-TW.mo\nAuto-merging locales/LC_MESSAGES/zh-TW.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/zh-CN.mo\nAuto-merging locales/LC_MESSAGES/zh-CN.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/vi-VN.mo\nAuto-merging locales/LC_MESSAGES/vi-VN.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/tr-TR.mo\nAuto-merging locales/LC_MESSAGES/tr-TR.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/sv-SE.mo\nAuto-merging locales/LC_MESSAGES/sv-SE.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ru-RU.mo\nAuto-merging locales/LC_MESSAGES/ru-RU.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-PT.mo\nAuto-merging locales/LC_MESSAGES/pt-PT.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pt-BR.mo\nAuto-merging locales/LC_MESSAGES/pt-BR.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/pl-PL.mo\nAuto-merging locales/LC_MESSAGES/pl-PL.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/nl-NL.mo\nAuto-merging locales/LC_MESSAGES/nl-NL.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ko-KR.mo\nAuto-merging locales/LC_MESSAGES/ko-KR.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ja-JP.mo\nAuto-merging locales/LC_MESSAGES/ja-JP.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/it-IT.mo\nAuto-merging locales/LC_MESSAGES/it-IT.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/hi-IN.mo\nAuto-merging locales/LC_MESSAGES/hi-IN.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/he-IL.mo\nAuto-merging locales/LC_MESSAGES/he-IL.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/fr-FR.mo\nAuto-merging locales/LC_MESSAGES/fr-FR.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/es-ES.mo\nAuto-merging locales/LC_MESSAGES/es-ES.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/el-GR.mo\nAuto-merging locales/LC_MESSAGES/el-GR.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/de-DE.mo\nAuto-merging locales/LC_MESSAGES/de-DE.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/bg-BG.mo\nAuto-merging locales/LC_MESSAGES/bg-BG.mo\nCONFLICT (add/add): Merge conflict in locales/LC_MESSAGES/ar-SA.mo\nAuto-merging locales/LC_MESSAGES/ar-SA.mo\nCONFLICT (add/add): Merge conflict in links.php\nAuto-merging links.php\nCONFLICT (add/add): Merge conflict in link.php\nAuto-merging link.php\nCONFLICT (add/add): Merge conflict in lib/xml.php\nAuto-merging lib/xml.php\nCONFLICT (add/add): Merge conflict in lib/vdef.php\nAuto-merging lib/vdef.php\nCONFLICT (add/add): Merge conflict in lib/variables.php\nAuto-merging lib/variables.php\nCONFLICT (add/add): Merge conflict in lib/utility.php\nAuto-merging lib/utility.php\nCONFLICT (add/add): Merge conflict in lib/timespan_settings.php\nAuto-merging lib/timespan_settings.php\nCONFLICT (add/add): Merge conflict in lib/time.php\nAuto-merging lib/time.php\nCONFLICT (add/add): Merge conflict in lib/template.php\nAuto-merging lib/template.php\nCONFLICT (add/add): Merge conflict in lib/spikekill.php\nAuto-merging lib/spikekill.php\nCONFLICT (add/add): Merge conflict in lib/sort.php\nAuto-merging lib/sort.php\nCONFLICT (add/add): Merge conflict in lib/snmpagent.php\nAuto-merging lib/snmpagent.php\nCONFLICT (add/add): Merge conflict in lib/snmp.php\nAuto-merging lib/snmp.php\nCONFLICT (add/add): Merge conflict in lib/rrd.php\nAuto-merging lib/rrd.php\nCONFLICT (add/add): Merge conflict in lib/reports.php\nAuto-merging lib/reports.php\nCONFLICT (add/add): Merge conflict in lib/poller.php\nAuto-merging lib/poller.php\nCONFLICT (add/add): Merge conflict in lib/plugins.php\nAuto-merging lib/plugins.php\nCONFLICT (add/add): Merge conflict in lib/ping.php\nAuto-merging lib/ping.php\nCONFLICT (add/add): Merge conflict in lib/mib_cache.php\nAuto-merging lib/mib_cache.php\nCONFLICT (add/add): Merge conflict in lib/ldap.php\nAuto-merging lib/ldap.php\nCONFLICT (add/add): Merge conflict in lib/installer.php\nAuto-merging lib/installer.php\nCONFLICT (add/add): Merge conflict in lib/import.php\nAuto-merging lib/import.php\nCONFLICT (add/add): Merge conflict in lib/html_validate.php\nAuto-merging lib/html_validate.php\nCONFLICT (add/add): Merge conflict in lib/html_utility.php\nAuto-merging lib/html_utility.php\nCONFLICT (add/add): Merge conflict in lib/html_tree.php\nAuto-merging lib/html_tree.php\nCONFLICT (add/add): Merge conflict in lib/html_reports.php\nAuto-merging lib/html_reports.php\nCONFLICT (add/add): Merge conflict in lib/html_graph.php\nAuto-merging lib/html_graph.php\nCONFLICT (add/add): Merge conflict in lib/html_form_template.php\nAuto-merging lib/html_form_template.php\nCONFLICT (add/add): Merge conflict in lib/html_form.php\nAuto-merging lib/html_form.php\nCONFLICT (add/add): Merge conflict in lib/html_filter.php\nAuto-merging lib/html_filter.php\nCONFLICT (add/add): Merge conflict in lib/html.php\nAuto-merging lib/html.php\nCONFLICT (add/add): Merge conflict in lib/graphs.php\nAuto-merging lib/graphs.php\nCONFLICT (add/add): Merge conflict in lib/graph_variables.php\nAuto-merging lib/graph_variables.php\nCONFLICT (add/add): Merge conflict in lib/functions.php\nAuto-merging lib/functions.php\nCONFLICT (add/add): Merge conflict in lib/export.php\nAuto-merging lib/export.php\nCONFLICT (add/add): Merge conflict in lib/dsstats.php\nAuto-merging lib/dsstats.php\nCONFLICT (add/add): Merge conflict in lib/dsdebug.php\nAuto-merging lib/dsdebug.php\nCONFLICT (add/add): Merge conflict in lib/database.php\nAuto-merging lib/database.php\nCONFLICT (add/add): Merge conflict in lib/data_query.php\nAuto-merging lib/data_query.php\nCONFLICT (add/add): Merge conflict in lib/clog_webapi.php\nAuto-merging lib/clog_webapi.php\nCONFLICT (add/add): Merge conflict in lib/cdef.php\nAuto-merging lib/cdef.php\nCONFLICT (add/add): Merge conflict in lib/boost.php\nAuto-merging lib/boost.php\nCONFLICT (add/add): Merge conflict in lib/auth.php\nAuto-merging lib/auth.php\nCONFLICT (add/add): Merge conflict in lib/api_tree.php\nAuto-merging lib/api_tree.php\nCONFLICT (add/add): Merge conflict in lib/api_poller.php\nAuto-merging lib/api_poller.php\nCONFLICT (add/add): Merge conflict in lib/api_graph.php\nAuto-merging lib/api_graph.php\nCONFLICT (add/add): Merge conflict in lib/api_device.php\nAuto-merging lib/api_device.php\nCONFLICT (add/add): Merge conflict in lib/api_data_source.php\nAuto-merging lib/api_data_source.php\nCONFLICT (add/add): Merge conflict in lib/api_automation_tools.php\nAuto-merging lib/api_automation_tools.php\nCONFLICT (add/add): Merge conflict in lib/api_automation.php\nAuto-merging lib/api_automation.php\nCONFLICT (add/add): Merge conflict in lib/api_aggregate.php\nAuto-merging lib/api_aggregate.php\nCONFLICT (add/add): Merge conflict in lib/aggregate.php\nAuto-merging lib/aggregate.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_3_0.php\nAuto-merging install/upgrades/1_3_0.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_8.php\nAuto-merging install/upgrades/1_2_8.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_7.php\nAuto-merging install/upgrades/1_2_7.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_5.php\nAuto-merging install/upgrades/1_2_5.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_3.php\nAuto-merging install/upgrades/1_2_3.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_2.php\nAuto-merging install/upgrades/1_2_2.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_17.php\nAuto-merging install/upgrades/1_2_17.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_15.php\nAuto-merging install/upgrades/1_2_15.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_14.php\nAuto-merging install/upgrades/1_2_14.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_11.php\nAuto-merging install/upgrades/1_2_11.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_1.php\nAuto-merging install/upgrades/1_2_1.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_2_0.php\nAuto-merging install/upgrades/1_2_0.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_8.php\nAuto-merging install/upgrades/1_1_8.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_7.php\nAuto-merging install/upgrades/1_1_7.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_6.php\nAuto-merging install/upgrades/1_1_6.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_4.php\nAuto-merging install/upgrades/1_1_4.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_37.php\nAuto-merging install/upgrades/1_1_37.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_36.php\nAuto-merging install/upgrades/1_1_36.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_35.php\nAuto-merging install/upgrades/1_1_35.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_34.php\nAuto-merging install/upgrades/1_1_34.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_31.php\nAuto-merging install/upgrades/1_1_31.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_28.php\nAuto-merging install/upgrades/1_1_28.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_26.php\nAuto-merging install/upgrades/1_1_26.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_20.php\nAuto-merging install/upgrades/1_1_20.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_2.php\nAuto-merging install/upgrades/1_1_2.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_17.php\nAuto-merging install/upgrades/1_1_17.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_14.php\nAuto-merging install/upgrades/1_1_14.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_1_11.php\nAuto-merging install/upgrades/1_1_11.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_0_5.php\nAuto-merging install/upgrades/1_0_5.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_0_4.php\nAuto-merging install/upgrades/1_0_4.php\nCONFLICT (add/add): Merge conflict in install/upgrades/1_0_0.php\nAuto-merging install/upgrades/1_0_0.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_8.php\nAuto-merging install/upgrades/0_8_8.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_7h.php\nAuto-merging install/upgrades/0_8_7h.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_7c.php\nAuto-merging install/upgrades/0_8_7c.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_7b.php\nAuto-merging install/upgrades/0_8_7b.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_7a.php\nAuto-merging install/upgrades/0_8_7a.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_7.php\nAuto-merging install/upgrades/0_8_7.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_6i.php\nAuto-merging install/upgrades/0_8_6i.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_6h.php\nAuto-merging install/upgrades/0_8_6h.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_6g.php\nAuto-merging install/upgrades/0_8_6g.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_6e.php\nAuto-merging install/upgrades/0_8_6e.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_6d.php\nAuto-merging install/upgrades/0_8_6d.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_6a.php\nAuto-merging install/upgrades/0_8_6a.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_6.php\nAuto-merging install/upgrades/0_8_6.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_5.php\nAuto-merging install/upgrades/0_8_5.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_4.php\nAuto-merging install/upgrades/0_8_4.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_3.php\nAuto-merging install/upgrades/0_8_3.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_2a.php\nAuto-merging install/upgrades/0_8_2a.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_2.php\nAuto-merging install/upgrades/0_8_2.php\nCONFLICT (add/add): Merge conflict in install/upgrades/0_8_1.php\nAuto-merging install/upgrades/0_8_1.php\nCONFLICT (add/add): Merge conflict in install/templates/Windows_Device.xml.gz\nAuto-merging install/templates/Windows_Device.xml.gz\nCONFLICT (add/add): Merge conflict in install/templates/NetSNMP_Device.xml.gz\nAuto-merging install/templates/NetSNMP_Device.xml.gz\nCONFLICT (add/add): Merge conflict in install/templates/Local_Linux_Machine.xml.gz\nAuto-merging install/templates/Local_Linux_Machine.xml.gz\nCONFLICT (add/add): Merge conflict in install/templates/Generic_SNMP_Device.xml.gz\nAuto-merging install/templates/Generic_SNMP_Device.xml.gz\nCONFLICT (add/add): Merge conflict in install/templates/Cisco_Router.xml.gz\nAuto-merging install/templates/Cisco_Router.xml.gz\nCONFLICT (add/add): Merge conflict in install/templates/Cacti_Stats.xml.gz\nAuto-merging install/templates/Cacti_Stats.xml.gz\nCONFLICT (add/add): Merge conflict in install/step_json.php\nAuto-merging install/step_json.php\nCONFLICT (add/add): Merge conflict in install/install.php\nAuto-merging install/install.php\nCONFLICT (add/add): Merge conflict in install/install.js\nAuto-merging install/install.js\nCONFLICT (add/add): Merge conflict in install/install.css\nAuto-merging install/install.css\nCONFLICT (add/add): Merge conflict in install/index.php\nAuto-merging install/index.php\nCONFLICT (add/add): Merge conflict in install/functions.php\nAuto-merging install/functions.php\nCONFLICT (add/add): Merge conflict in install/cli_test.php\nAuto-merging install/cli_test.php\nCONFLICT (add/add): Merge conflict in install/cli_check.php\nAuto-merging install/cli_check.php\nCONFLICT (add/add): Merge conflict in install/background.php\nAuto-merging install/background.php\nCONFLICT (add/add): Merge conflict in index.php\nAuto-merging index.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/mib_parser.php\nAuto-merging include/vendor/phpsnmp/mib_parser.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/extension.php\nAuto-merging include/vendor/phpsnmp/extension.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpsnmp/classSNMP.php\nAuto-merging include/vendor/phpsnmp/classSNMP.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/bootstrap.php\nAuto-merging include/vendor/phpseclib/bootstrap.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/System/SSH/Agent.php\nAuto-merging include/vendor/phpseclib/System/SSH/Agent.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SSH2.php\nAuto-merging include/vendor/phpseclib/Net/SSH2.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Net/SFTP.php\nAuto-merging include/vendor/phpseclib/Net/SFTP.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Math/BigInteger.php\nAuto-merging include/vendor/phpseclib/Math/BigInteger.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/X509.php\nAuto-merging include/vendor/phpseclib/File/X509.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/File/ASN1.php\nAuto-merging include/vendor/phpseclib/File/ASN1.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Twofish.php\nAuto-merging include/vendor/phpseclib/Crypt/Twofish.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Rijndael.php\nAuto-merging include/vendor/phpseclib/Crypt/Rijndael.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RSA.php\nAuto-merging include/vendor/phpseclib/Crypt/RSA.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/RC2.php\nAuto-merging include/vendor/phpseclib/Crypt/RC2.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/DES.php\nAuto-merging include/vendor/phpseclib/Crypt/DES.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Blowfish.php\nAuto-merging include/vendor/phpseclib/Crypt/Blowfish.php\nCONFLICT (add/add): Merge conflict in include/vendor/phpseclib/Crypt/Base.php\nAuto-merging include/vendor/phpseclib/Crypt/Base.php\nCONFLICT (add/add): Merge conflict in include/vendor/gettext/tests/TranslatorTest.php\nAuto-merging include/vendor/gettext/tests/TranslatorTest.php\nCONFLICT (add/add): Merge conflict in include/vendor/gettext/src/translator_functions.php\nAuto-merging include/vendor/gettext/src/translator_functions.php\nCONFLICT (add/add): Merge conflict in include/vendor/gettext/CONTRIBUTING.md\nAuto-merging include/vendor/gettext/CONTRIBUTING.md\nCONFLICT (add/add): Merge conflict in include/vendor/csrf/csrf-conf.php\nAuto-merging include/vendor/csrf/csrf-conf.php\nCONFLICT (add/add): Merge conflict in include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules\nAuto-merging include/vendor/cldr-to-gettext-plural-rules/bin/export-plural-rules\nCONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/RuntimeException.php\nAuto-merging include/vendor/GoogleAuthenticator/RuntimeException.php\nCONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleQrUrl.php\nAuto-merging include/vendor/GoogleAuthenticator/GoogleQrUrl.php\nCONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php\nAuto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticatorInterface.php\nCONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/GoogleAuthenticator.php\nAuto-merging include/vendor/GoogleAuthenticator/GoogleAuthenticator.php\nCONFLICT (add/add): Merge conflict in include/vendor/GoogleAuthenticator/FixedBitNotation.php\nAuto-merging include/vendor/GoogleAuthenticator/FixedBitNotation.php\nCONFLICT (add/add): Merge conflict in include/top_header.php\nAuto-merging include/top_header.php\nCONFLICT (add/add): Merge conflict in include/top_graph_header.php\nAuto-merging include/top_graph_header.php\nCONFLICT (add/add): Merge conflict in include/top_general_header.php\nAuto-merging include/top_general_header.php\nCONFLICT (add/add): Merge conflict in include/themes/sunrise/main.js\nAuto-merging include/themes/sunrise/main.js\nCONFLICT (add/add): Merge conflict in include/themes/sunrise/main.css\nAuto-merging include/themes/sunrise/main.css\nCONFLICT (add/add): Merge conflict in include/themes/raspberry/main.js\nAuto-merging include/themes/raspberry/main.js\nCONFLICT (add/add): Merge conflict in include/themes/paw/main.js\nAuto-merging include/themes/paw/main.js\nCONFLICT (add/add): Merge conflict in include/themes/paw/main.css\nAuto-merging include/themes/paw/main.css\nCONFLICT (add/add): Merge conflict in include/themes/paw/jquery.timepicker.css\nAuto-merging include/themes/paw/jquery.timepicker.css\nCONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.js\nAuto-merging include/themes/paper-plane/main.js\nCONFLICT (add/add): Merge conflict in include/themes/paper-plane/main.css\nAuto-merging include/themes/paper-plane/main.css\nCONFLICT (add/add): Merge conflict in include/themes/paper-plane/billboard.css\nAuto-merging include/themes/paper-plane/billboard.css\nCONFLICT (add/add): Merge conflict in include/themes/modern/main.js\nAuto-merging include/themes/modern/main.js\nCONFLICT (add/add): Merge conflict in include/themes/modern/main.css\nAuto-merging include/themes/modern/main.css\nCONFLICT (add/add): Merge conflict in include/themes/midwinter/rrdtheme.php\nAuto-merging include/themes/midwinter/rrdtheme.php\nCONFLICT (add/add): Merge conflict in include/themes/midwinter/pace.css\nAuto-merging include/themes/midwinter/pace.css\nCONFLICT (add/add): Merge conflict in include/themes/midwinter/main.js\nAuto-merging include/themes/midwinter/main.js\nCONFLICT (add/add): Merge conflict in include/themes/midwinter/main.css\nAuto-merging include/themes/midwinter/main.css\nCONFLICT (add/add): Merge conflict in include/themes/midwinter/jquery.zoom.css\nAuto-merging include/themes/midwinter/jquery.zoom.css\nCONFLICT (add/add): Merge conflict in include/themes/hollyberry/main.js\nAuto-merging include/themes/hollyberry/main.js\nCONFLICT (add/add): Merge conflict in include/themes/dark/main.js\nAuto-merging include/themes/dark/main.js\nCONFLICT (add/add): Merge conflict in include/themes/dark/main.css\nAuto-merging include/themes/dark/main.css\nCONFLICT (add/add): Merge conflict in include/themes/classic/main.css\nAuto-merging include/themes/classic/main.css\nCONFLICT (add/add): Merge conflict in include/themes/carrot/main.js\nAuto-merging include/themes/carrot/main.js\nCONFLICT (add/add): Merge conflict in include/themes/cacti/main.js\nAuto-merging include/themes/cacti/main.js\nCONFLICT (add/add): Merge conflict in include/session.php\nAuto-merging include/session.php\nCONFLICT (add/add): Merge conflict in include/realtime.js\nAuto-merging include/realtime.js\nCONFLICT (add/add): Merge conflict in include/plugins.php\nAuto-merging include/plugins.php\nCONFLICT (add/add): Merge conflict in include/layout.js\nAuto-merging include/layout.js\nCONFLICT (add/add): Merge conflict in include/js/pace.js\nAuto-merging include/js/pace.js\nCONFLICT (add/add): Merge conflict in include/js/jstree.js\nAuto-merging include/js/jstree.js\nCONFLICT (add/add): Merge conflict in include/js/jquery.zoom.js\nAuto-merging include/js/jquery.zoom.js\nCONFLICT (add/add): Merge conflict in include/js/jquery.multiselect.js\nAuto-merging include/js/jquery.multiselect.js\nCONFLICT (add/add): Merge conflict in include/js/jquery.js\nAuto-merging include/js/jquery.js\nCONFLICT (add/add): Merge conflict in include/js/jquery.dropdown.js\nAuto-merging include/js/jquery.dropdown.js\nCONFLICT (add/add): Merge conflict in include/js/jquery-ui.js\nAuto-merging include/js/jquery-ui.js\nCONFLICT (add/add): Merge conflict in include/js/billboard.js\nAuto-merging include/js/billboard.js\nCONFLICT (add/add): Merge conflict in include/global_settings.php\nAuto-merging include/global_settings.php\nCONFLICT (add/add): Merge conflict in include/global_session.php\nAuto-merging include/global_session.php\nCONFLICT (add/add): Merge conflict in include/global_languages.php\nAuto-merging include/global_languages.php\nCONFLICT (add/add): Merge conflict in include/global_form.php\nAuto-merging include/global_form.php\nCONFLICT (add/add): Merge conflict in include/global_constants.php\nAuto-merging include/global_constants.php\nCONFLICT (add/add): Merge conflict in include/global_arrays.php\nAuto-merging include/global_arrays.php\nCONFLICT (add/add): Merge conflict in include/global.php\nAuto-merging include/global.php\nCONFLICT (add/add): Merge conflict in include/fa/css/all.css\nAuto-merging include/fa/css/all.css\nCONFLICT (add/add): Merge conflict in include/csrf.php\nAuto-merging include/csrf.php\nCONFLICT (add/add): Merge conflict in include/config.php.dist\nAuto-merging include/config.php.dist\nCONFLICT (add/add): Merge conflict in include/cli_check.php\nAuto-merging include/cli_check.php\nCONFLICT (add/add): Merge conflict in include/bottom_footer.php\nAuto-merging include/bottom_footer.php\nCONFLICT (add/add): Merge conflict in include/auth.php\nAuto-merging include/auth.php\nCONFLICT (add/add): Merge conflict in images/cacti_logo_new.gif\nAuto-merging images/cacti_logo_new.gif\nCONFLICT (add/add): Merge conflict in images/cacti_logo.gif\nAuto-merging images/cacti_logo.gif\nCONFLICT (add/add): Merge conflict in host_templates.php\nAuto-merging host_templates.php\nCONFLICT (add/add): Merge conflict in host.php\nAuto-merging host.php\nCONFLICT (add/add): Merge conflict in graphs_new.php\nAuto-merging graphs_new.php\nCONFLICT (add/add): Merge conflict in graphs_items.php\nAuto-merging graphs_items.php\nCONFLICT (add/add): Merge conflict in graphs.php\nAuto-merging graphs.php\nCONFLICT (add/add): Merge conflict in graph_xport.php\nAuto-merging graph_xport.php\nCONFLICT (add/add): Merge conflict in graph_view.php\nAuto-merging graph_view.php\nCONFLICT (add/add): Merge conflict in graph_templates_items.php\nAuto-merging graph_templates_items.php\nCONFLICT (add/add): Merge conflict in graph_templates_inputs.php\nAuto-merging graph_templates_inputs.php\nCONFLICT (add/add): Merge conflict in graph_templates.php\nAuto-merging graph_templates.php\nCONFLICT (add/add): Merge conflict in graph_realtime.php\nAuto-merging graph_realtime.php\nCONFLICT (add/add): Merge conflict in graph_json.php\nAuto-merging graph_json.php\nCONFLICT (add/add): Merge conflict in graph_image.php\nAuto-merging graph_image.php\nCONFLICT (add/add): Merge conflict in graph.php\nAuto-merging graph.php\nCONFLICT (add/add): Merge conflict in gprint_presets.php\nAuto-merging gprint_presets.php\nCONFLICT (add/add): Merge conflict in formats/cacti_monitor.format\nAuto-merging formats/cacti_monitor.format\nCONFLICT (add/add): Merge conflict in formats/cacti_group_dark.format\nAuto-merging formats/cacti_group_dark.format\nCONFLICT (add/add): Merge conflict in formats/cacti_group.format\nAuto-merging formats/cacti_group.format\nCONFLICT (add/add): Merge conflict in docs/index.php\nAuto-merging docs/index.php\nCONFLICT (add/add): Merge conflict in docs/audit_schema.sql\nAuto-merging docs/audit_schema.sql\nCONFLICT (add/add): Merge conflict in docs/README.md\nAuto-merging docs/README.md\nCONFLICT (add/add): Merge conflict in data_templates.php\nAuto-merging data_templates.php\nCONFLICT (add/add): Merge conflict in data_sources.php\nAuto-merging data_sources.php\nCONFLICT (add/add): Merge conflict in data_source_profiles.php\nAuto-merging data_source_profiles.php\nCONFLICT (add/add): Merge conflict in data_queries.php\nAuto-merging data_queries.php\nCONFLICT (add/add): Merge conflict in data_input.php\nAuto-merging data_input.php\nCONFLICT (add/add): Merge conflict in data_debug.php\nAuto-merging data_debug.php\nCONFLICT (add/add): Merge conflict in color_templates_items.php\nAuto-merging color_templates_items.php\nCONFLICT (add/add): Merge conflict in color_templates.php\nAuto-merging color_templates.php\nCONFLICT (add/add): Merge conflict in color.php\nAuto-merging color.php\nCONFLICT (add/add): Merge conflict in cmd_realtime.php\nAuto-merging cmd_realtime.php\nCONFLICT (add/add): Merge conflict in cmd.php\nAuto-merging cmd.php\nCONFLICT (add/add): Merge conflict in clog_user.php\nAuto-merging clog_user.php\nCONFLICT (add/add): Merge conflict in clog.php\nAuto-merging clog.php\nCONFLICT (add/add): Merge conflict in cli/version.php\nAuto-merging cli/version.php\nCONFLICT (add/add): Merge conflict in cli/upgrade_database.php\nAuto-merging cli/upgrade_database.php\nCONFLICT (add/add): Merge conflict in cli/structure_rra_paths.php\nAuto-merging cli/structure_rra_paths.php\nCONFLICT (add/add): Merge conflict in cli/sqltable_to_php.php\nAuto-merging cli/sqltable_to_php.php\nCONFLICT (add/add): Merge conflict in cli/splice_rrd.php\nAuto-merging cli/splice_rrd.php\nCONFLICT (add/add): Merge conflict in cli/show_perms.php\nAuto-merging cli/show_perms.php\nCONFLICT (add/add): Merge conflict in cli/rrdresize.php\nAuto-merging cli/rrdresize.php\nCONFLICT (add/add): Merge conflict in cli/repair_templates.php\nAuto-merging cli/repair_templates.php\nCONFLICT (add/add): Merge conflict in cli/repair_graphs.php\nAuto-merging cli/repair_graphs.php\nCONFLICT (add/add): Merge conflict in cli/repair_database.php\nAuto-merging cli/repair_database.php\nCONFLICT (add/add): Merge conflict in cli/reorder_data_query.php\nAuto-merging cli/reorder_data_query.php\nCONFLICT (add/add): Merge conflict in cli/removespikes.php\nAuto-merging cli/removespikes.php\nCONFLICT (add/add): Merge conflict in cli/remove_graphs.php\nAuto-merging cli/remove_graphs.php\nCONFLICT (add/add): Merge conflict in cli/remove_device.php\nAuto-merging cli/remove_device.php\nCONFLICT (add/add): Merge conflict in cli/refresh_csrf.php\nAuto-merging cli/refresh_csrf.php\nCONFLICT (add/add): Merge conflict in cli/rebuild_poller_cache.php\nAuto-merging cli/rebuild_poller_cache.php\nCONFLICT (add/add): Merge conflict in cli/poller_replicate.php\nAuto-merging cli/poller_replicate.php\nCONFLICT (add/add): Merge conflict in cli/poller_reindex_hosts.php\nAuto-merging cli/poller_reindex_hosts.php\nCONFLICT (add/add): Merge conflict in cli/poller_output_empty.php\nAuto-merging cli/poller_output_empty.php\nCONFLICT (add/add): Merge conflict in cli/poller_graphs_reapply_names.php\nAuto-merging cli/poller_graphs_reapply_names.php\nCONFLICT (add/add): Merge conflict in cli/poller_data_sources_reapply_names.php\nAuto-merging cli/poller_data_sources_reapply_names.php\nCONFLICT (add/add): Merge conflict in cli/md5sum.php\nAuto-merging cli/md5sum.php\nCONFLICT (add/add): Merge conflict in cli/install_cacti.php\nAuto-merging cli/install_cacti.php\nCONFLICT (add/add): Merge conflict in cli/input_whitelist.php\nAuto-merging cli/input_whitelist.php\nCONFLICT (add/add): Merge conflict in cli/import_template.php\nAuto-merging cli/import_template.php\nCONFLICT (add/add): Merge conflict in cli/import_package.php\nAuto-merging cli/import_package.php\nCONFLICT (add/add): Merge conflict in cli/host_update_template.php\nAuto-merging cli/host_update_template.php\nCONFLICT (add/add): Merge conflict in cli/fix_mediumint.php\nAuto-merging cli/fix_mediumint.php\nCONFLICT (add/add): Merge conflict in cli/copy_user.php\nAuto-merging cli/copy_user.php\nCONFLICT (add/add): Merge conflict in cli/convert_tables.php\nAuto-merging cli/convert_tables.php\nCONFLICT (add/add): Merge conflict in cli/change_device.php\nAuto-merging cli/change_device.php\nCONFLICT (add/add): Merge conflict in cli/audit_database.php\nAuto-merging cli/audit_database.php\nCONFLICT (add/add): Merge conflict in cli/apply_automation_rules.php\nAuto-merging cli/apply_automation_rules.php\nCONFLICT (add/add): Merge conflict in cli/analyze_database.php\nAuto-merging cli/analyze_database.php\nCONFLICT (add/add): Merge conflict in cli/add_tree.php\nAuto-merging cli/add_tree.php\nCONFLICT (add/add): Merge conflict in cli/add_site.php\nAuto-merging cli/add_site.php\nCONFLICT (add/add): Merge conflict in cli/add_perms.php\nAuto-merging cli/add_perms.php\nCONFLICT (add/add): Merge conflict in cli/add_graphs.php\nAuto-merging cli/add_graphs.php\nCONFLICT (add/add): Merge conflict in cli/add_graph_template.php\nAuto-merging cli/add_graph_template.php\nCONFLICT (add/add): Merge conflict in cli/add_device.php\nAuto-merging cli/add_device.php\nCONFLICT (add/add): Merge conflict in cli/add_datasource.php\nAuto-merging cli/add_datasource.php\nCONFLICT (add/add): Merge conflict in cli/add_data_query.php\nAuto-merging cli/add_data_query.php\nCONFLICT (add/add): Merge conflict in changelog.php\nAuto-merging changelog.php\nCONFLICT (add/add): Merge conflict in cdef.php\nAuto-merging cdef.php\nCONFLICT (add/add): Merge conflict in cactid.php\nAuto-merging cactid.php\nCONFLICT (add/add): Merge conflict in cacti.sql\nAuto-merging cacti.sql\nCONFLICT (add/add): Merge conflict in boost_rrdupdate.php\nAuto-merging boost_rrdupdate.php\nCONFLICT (add/add): Merge conflict in automation_tree_rules.php\nAuto-merging automation_tree_rules.php\nCONFLICT (add/add): Merge conflict in automation_templates.php\nAuto-merging automation_templates.php\nCONFLICT (add/add): Merge conflict in automation_snmp.php\nAuto-merging automation_snmp.php\nCONFLICT (add/add): Merge conflict in automation_networks.php\nAuto-merging automation_networks.php\nCONFLICT (add/add): Merge conflict in automation_graph_rules.php\nAuto-merging automation_graph_rules.php\nCONFLICT (add/add): Merge conflict in automation_devices.php\nAuto-merging automation_devices.php\nCONFLICT (add/add): Merge conflict in auth_profile.php\nAuto-merging auth_profile.php\nCONFLICT (add/add): Merge conflict in auth_login.php\nAuto-merging auth_login.php\nCONFLICT (add/add): Merge conflict in auth_changepassword.php\nAuto-merging auth_changepassword.php\nCONFLICT (add/add): Merge conflict in auth_2fa.php\nAuto-merging auth_2fa.php\nCONFLICT (add/add): Merge conflict in aggregate_templates.php\nAuto-merging aggregate_templates.php\nCONFLICT (add/add): Merge conflict in aggregate_items.php\nAuto-merging aggregate_items.php\nCONFLICT (add/add): Merge conflict in aggregate_graphs.php\nAuto-merging aggregate_graphs.php\nCONFLICT (add/add): Merge conflict in about.php\nAuto-merging about.php\nCONFLICT (add/add): Merge conflict in README.md\nAuto-merging README.md\nCONFLICT (add/add): Merge conflict in LICENSE\nAuto-merging LICENSE\nCONFLICT (add/add): Merge conflict in CHANGELOG\nAuto-merging CHANGELOG\nCONFLICT (add/add): Merge conflict in .travis.yml\nAuto-merging .travis.yml\nCONFLICT (add/add): Merge conflict in .gitignore\nAuto-merging .gitignore\nerror: Failed to merge in the changes.\nhint: Use 'git am --show-current-patch' to see the failed patch\nPatch failed at 0001 Correct header shebang\nResolve all conflicts manually, mark them as resolved with\n\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\nYou can instead skip this commit: run \"git rebase --skip\".\nTo abort and get back to the state before \"git rebase\", run \"git rebase --abort\".\n (1)", "id": 30104, "action_name": "Failed rebase on repository", "url": "http://translate.cacti.net/api/changes/30104/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-27T16:28:55.930017Z", "action": 47, "target": "", "id": 30105, "action_name": "New alert", "url": "http://translate.cacti.net/api/changes/30105/?format=api" }, { "unit": null, "component": "http://translate.cacti.net/api/components/cacti/core/?format=api", "translation": null, "user": null, "author": null, "timestamp": "2022-11-27T16:28:55.937551Z", "action": 14, "target": "", "id": 30106, "action_name": "Component automatically locked", "url": "http://translate.cacti.net/api/changes/30106/?format=api" } ] }