aa-structures 2.8.0__py3-none-any.whl → 2.9.1__py3-none-any.whl

structures/locale/ru/LC_MESSAGES/django.po

@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-15 23:09+0100\n"
+"POT-Creation-Date: 2024-03-01 17:30+0100\n"
 "PO-Revision-Date: 2020-03-09 19:25+0000\n"
 "Last-Translator: - -, 2023\n"
 "Language-Team: Russian (https://app.transifex.com/kalkoken-apps/teams/107978/ru/)\n"
@@ -22,7 +22,7 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: admin.py:64 admin.py:920 models/notifications.py:145 models/owners.py:219
+#: admin.py:64 admin.py:920 models/notifications.py:147 models/owners.py:219
 #: models/owners.py:1307 models/structures_1.py:320
 msgid "owner"
 msgstr "Владелец"
@@ -37,12 +37,12 @@ msgstr "Discord"
 msgid "General"
 msgstr "Главное"
 
-#: admin.py:101 models/notifications.py:521 models/structures_1.py:210
+#: admin.py:101 models/notifications.py:523 models/structures_1.py:210
 #: models/structures_1.py:808
 msgid "id"
 msgstr "id"
 
-#: admin.py:105 models/notifications.py:720
+#: admin.py:105 models/notifications.py:722
 msgid "color"
 msgstr "цвет"
 
@@ -69,7 +69,7 @@ msgstr ""
 "что первое уведомление будет отправлено точно в час начала, а последнее "
 "уведомление будет отправлено за один раз до часа окончания."
 
-#: admin.py:161 models/notifications.py:851
+#: admin.py:161 models/notifications.py:853
 msgid "threshold"
 msgstr "порог"
 
@@ -89,7 +89,7 @@ msgstr "нет"
 msgid "notification ID"
 msgstr "ID оповещения"
 
-#: admin.py:235 admin.py:515 admin.py:950 models/notifications.py:112
+#: admin.py:235 admin.py:515 admin.py:950 models/notifications.py:114
 #: models/owners.py:212 models/structures_1.py:397
 msgid "webhooks"
 msgstr "вебхуки"
@@ -102,15 +102,15 @@ msgstr "N/A"
 msgid "Not configured"
 msgstr "Не настроено"
 
-#: admin.py:257 models/notifications.py:150 models/structures_1.py:410
+#: admin.py:257 models/notifications.py:152 models/structures_1.py:410
 msgid "structures"
 msgstr "структуры"
 
-#: admin.py:264 models/notifications.py:126
+#: admin.py:264 models/notifications.py:128
 msgid "is sent"
 msgstr "отправлено"
 
-#: admin.py:269 models/notifications.py:132
+#: admin.py:269 models/notifications.py:134
 msgid "is timer added"
 msgstr "таймер добавлен"
 
@@ -168,7 +168,7 @@ msgstr "персонажи"
 msgid "default pings"
 msgstr "общие пинги"
 
-#: admin.py:496 admin.py:1066 models/notifications.py:105 models/owners.py:197
+#: admin.py:496 admin.py:1066 models/notifications.py:107 models/owners.py:197
 msgid "ping groups"
 msgstr "пинг групп"
 
@@ -302,7 +302,7 @@ msgid "Position"
 msgstr "Позиция"
 
 #: admin.py:913 models/structures_1.py:64 models/structures_1.py:292
-#: models/structures_2.py:50 webhooks/models.py:40
+#: models/structures_2.py:50 webhooks/models.py:41
 msgid "name"
 msgstr "имя"
 
@@ -310,7 +310,7 @@ msgstr "имя"
 msgid "location"
 msgstr "локация"
 
-#: admin.py:938 models/notifications.py:139 models/structures_1.py:250
+#: admin.py:938 models/notifications.py:141 models/structures_1.py:250
 #: models/structures_1.py:822
 msgid "type"
 msgstr "тип"
@@ -363,7 +363,7 @@ msgid "Please add this webhook to an owner or structure to enable it."
 msgstr ""
 "Пожалуйста добавьте этот вебхук владельцу или структуре чтобы включить его."
 
-#: admin.py:1084 models/notifications.py:87 models/structures_1.py:94
+#: admin.py:1084 models/notifications.py:89 models/structures_1.py:94
 msgid "is default"
 msgstr "по умолчанию"
 
@@ -420,19 +420,19 @@ msgstr "Отправить сообщения в очереди выбранны
 msgid "Started sending queued messages for %d webhooks."
 msgstr "Началось отправление сообщений в очереди для %d вебхуков."
 
-#: core/notification_embeds/billing_embeds.py:25
+#: core/notification_embeds/billing_embeds.py:29
 msgid "Unknown Bill"
 msgstr "Неизвестный счёт"
 
-#: core/notification_embeds/billing_embeds.py:26
+#: core/notification_embeds/billing_embeds.py:30
 msgid "Infrastructure Hub Bill"
 msgstr "Счёт центра инфраструктуры"
 
-#: core/notification_embeds/billing_embeds.py:43
+#: core/notification_embeds/billing_embeds.py:47
 msgid "Insufficient Funds for Bill"
 msgstr "Недостаточно средств для оплаты счёта"
 
-#: core/notification_embeds/billing_embeds.py:45
+#: core/notification_embeds/billing_embeds.py:49
 #, python-format
 msgid ""
 "The selected corporation wallet division for automatic payments does not "
@@ -445,11 +445,11 @@ msgstr ""
 " дополнительные стредства на корпоративный счёт для закрытия открытых "
 "автоматических счетов."
 
-#: core/notification_embeds/billing_embeds.py:62
+#: core/notification_embeds/billing_embeds.py:66
 msgid "IHub Bill About to Expire"
 msgstr "У IHub счёт кончается срок действия"
 
-#: core/notification_embeds/billing_embeds.py:64
+#: core/notification_embeds/billing_embeds.py:68
 #, python-format
 msgid ""
 "Maintenance bill for Infrastructure Hub in %(solar_system)s expires at "
@@ -460,12 +460,12 @@ msgstr ""
 "оканчивается %(due_date)s. Если вы не заплатите вовремя, центр "
 "инфраструктуры самоуничтожится."
 
-#: core/notification_embeds/billing_embeds.py:84
+#: core/notification_embeds/billing_embeds.py:88
 #, python-format
 msgid "%s has self-destructed due to unpaid maintenance bills"
 msgstr "%s самоуничтожился ввиду неуплаты счетов обслуживания"
 
-#: core/notification_embeds/billing_embeds.py:88
+#: core/notification_embeds/billing_embeds.py:92
 #, python-format
 msgid ""
 "%(structure_type)s in %(solar_system)s has self-destructed, as the standard "
@@ -474,12 +474,23 @@ msgstr ""
 "%(structure_type)s в %(solar_system)s самоуничтожился ввиду неуплаты счетов "
 "обслуживания."
 
-#: core/notification_embeds/character_embeds.py:41
+#: core/notification_embeds/billing_embeds.py:111
+msgid "Bill issued"
+msgstr ""
+
+#: core/notification_embeds/billing_embeds.py:113
+#, python-format
+msgid ""
+"A bill of %(amount)s ISK, due %(due_date)s owed by %(debtor)s to "
+"%(creditor)s was issued %(current_date)s. This bill is for %(bill_type)s."
+msgstr ""
+
+#: core/notification_embeds/corporate_embeds.py:36
 #, python-format
 msgid "New application from %(character_name)s"
 msgstr "Новая заявка от %(character_name)s"
 
-#: core/notification_embeds/character_embeds.py:45
+#: core/notification_embeds/corporate_embeds.py:40
 #, python-format
 msgid ""
 "New application from %(character_name)s to join %(corporation_name)s:\n"
@@ -488,12 +499,12 @@ msgstr ""
 "Новая заявка по вступлению в %(corporation_name)s от%(character_name)s:\n"
 "> %(application_text)s"
 
-#: core/notification_embeds/character_embeds.py:59
+#: core/notification_embeds/corporate_embeds.py:54
 #, python-format
 msgid "%(character_name)s has been invited"
 msgstr "%(character_name)s был приглашен"
 
-#: core/notification_embeds/character_embeds.py:66
+#: core/notification_embeds/corporate_embeds.py:61
 #, python-format
 msgid ""
 "%(character_name)s has been invited to join %(corporation_name)s by %(inviting_character)s.\n"
@@ -504,12 +515,24 @@ msgstr ""
 "Заявка:\n"
 "> %(application_text)s"
 
-#: core/notification_embeds/character_embeds.py:83
+#: core/notification_embeds/corporate_embeds.py:78
+#, python-format
+msgid "%(character_name)s rejects invitation"
+msgstr ""
+
+#: core/notification_embeds/corporate_embeds.py:82
+#, python-format
+msgid ""
+"Application from %(character_name)s to join %(corporation_name)s has been "
+"rejected."
+msgstr ""
+
+#: core/notification_embeds/corporate_embeds.py:94
 #, python-format
 msgid "Rejected application from %(character_name)s"
 msgstr "Заявка %(character_name)s была отклонена"
 
-#: core/notification_embeds/character_embeds.py:87
+#: core/notification_embeds/corporate_embeds.py:98
 #, python-format
 msgid ""
 "Application from %(character_name)s to join %(corporation_name)s:\n"
@@ -522,12 +545,12 @@ msgstr ""
 "Была отклонена:\n"
 "> %(customMessage)s"
 
-#: core/notification_embeds/character_embeds.py:104
+#: core/notification_embeds/corporate_embeds.py:114
 #, python-format
 msgid "%(character_name)s withdrew his/her application"
 msgstr "%(character_name)s отозвал свою заявку"
 
-#: core/notification_embeds/character_embeds.py:108
+#: core/notification_embeds/corporate_embeds.py:118
 #, python-format
 msgid ""
 "%(character_name)s withdrew his/her application to join %(corporation_name)s:\n"
@@ -536,22 +559,22 @@ msgstr ""
 "%(character_name)s отозвал свою заявку по вступлению в %(corporation_name)s:\n"
 "> %(application_text)s"
 
-#: core/notification_embeds/character_embeds.py:123
+#: core/notification_embeds/corporate_embeds.py:133
 #, python-format
 msgid "%(character_name)s joins %(corporation_name)s"
 msgstr "%(character_name)s присоединяется в%(corporation_name)s"
 
-#: core/notification_embeds/character_embeds.py:128
+#: core/notification_embeds/corporate_embeds.py:138
 #, python-format
 msgid "%(character_name)s is now a member of %(corporation_name)s."
 msgstr "%(character_name)s новый член %(corporation_name)s."
 
-#: core/notification_embeds/character_embeds.py:139
+#: core/notification_embeds/corporate_embeds.py:149
 #, python-format
 msgid "%(character_name)s has left %(corporation_name)s"
 msgstr "%(character_name)s покинул %(corporation_name)s"
 
-#: core/notification_embeds/character_embeds.py:144
+#: core/notification_embeds/corporate_embeds.py:154
 #, python-format
 msgid "%(character_name)s is no longer a member of %(corporation_name)s."
 msgstr "%(character_name)s больше не член %(corporation_name)s."
@@ -568,17 +591,17 @@ msgstr "броня"
 msgid "hull"
 msgstr "корпус"
 
-#: core/notification_embeds/moonmining_embeds.py:41
+#: core/notification_embeds/moonmining_embeds.py:40
 #, python-format
 msgid "Estimated ore composition: %s"
 msgstr "Ожидаемое количество руды: %s"
 
-#: core/notification_embeds/moonmining_embeds.py:70
-#: core/notification_types.py:58
+#: core/notification_embeds/moonmining_embeds.py:69
+#: core/notification_types.py:66
 msgid "Moon mining extraction started"
 msgstr "Добыча лунной руды началась"
 
-#: core/notification_embeds/moonmining_embeds.py:72
+#: core/notification_embeds/moonmining_embeds.py:71
 #, python-format
 msgid ""
 "A moon mining extraction has been started for %(structure_name)s at %(moon)s in %(solar_system)s belonging to %(owner_link)s. Extraction was started by %(character)s.\n"
@@ -590,11 +613,11 @@ msgstr ""
 "Создание астероидного поля будет возможно %(ready_time)s, и автоматическое создание будет %(auto_time)s.\n"
 "%(ore_text)s "
 
-#: core/notification_embeds/moonmining_embeds.py:96
+#: core/notification_embeds/moonmining_embeds.py:95
 msgid "Extraction finished"
 msgstr "Извлечение завершено"
 
-#: core/notification_embeds/moonmining_embeds.py:98
+#: core/notification_embeds/moonmining_embeds.py:97
 #, python-format
 msgid ""
 "The extraction for %(structure_name)s at %(moon)s in %(solar_system)s belonging to %(owner_link)s is finished and the chunk is ready to be shot at.\n"
@@ -606,11 +629,11 @@ msgstr ""
 "Астероидное поле будет автоматически создано %(auto_time)s.\n"
 "%(ore_text)s"
 
-#: core/notification_embeds/moonmining_embeds.py:118
+#: core/notification_embeds/moonmining_embeds.py:117
 msgid "Automatic Fracture"
 msgstr "Автоматическое раздробление"
 
-#: core/notification_embeds/moonmining_embeds.py:120
+#: core/notification_embeds/moonmining_embeds.py:119
 #, python-format
 msgid ""
 "The moon drill fitted to %(structure_name)s at %(moon)s in %(solar_system)s belonging to %(owner_link)s has automatically been fired and the moon products are ready to be harvested.\n"
@@ -620,19 +643,19 @@ msgstr ""
 "Лунный бур, установленный в %(structure_name)s, принадлежащая %(owner_link)s, на %(moon)s в %(solar_system)s, автоматически выстрелил и лунная руда готова к сбору.\n"
 "%(ore_text)s"
 
-#: core/notification_embeds/moonmining_embeds.py:143
-#: core/notification_embeds/structures_embeds.py:38
-#: core/notification_embeds/structures_embeds.py:182
-#: core/notification_embeds/structures_embeds.py:296
+#: core/notification_embeds/moonmining_embeds.py:140
+#: core/notification_embeds/structures_embeds.py:37
+#: core/notification_embeds/structures_embeds.py:181
+#: core/notification_embeds/structures_embeds.py:289
 #: core/notification_embeds/tower_embeds.py:147
 msgid "(unknown)"
 msgstr "(неизвестно)"
 
-#: core/notification_embeds/moonmining_embeds.py:144
+#: core/notification_embeds/moonmining_embeds.py:141
 msgid "Extraction cancelled"
 msgstr "Извлечение завершено"
 
-#: core/notification_embeds/moonmining_embeds.py:146
+#: core/notification_embeds/moonmining_embeds.py:143
 #, python-format
 msgid ""
 "An ongoing extraction for %(structure_name)s at %(moon)s in %(solar_system)s"
@@ -641,11 +664,11 @@ msgstr ""
 "Начатое извлечение %(structure_name)s, принадлежащее %(owner_link)s, "
 "на%(moon)s в %(solar_system)s было отменено %(character)s."
 
-#: core/notification_embeds/moonmining_embeds.py:165
+#: core/notification_embeds/moonmining_embeds.py:160
 msgid "Moon drill fired"
 msgstr "Лунный бур выстрелил"
 
-#: core/notification_embeds/moonmining_embeds.py:167
+#: core/notification_embeds/moonmining_embeds.py:162
 #, python-format
 msgid ""
 "The moon drill fitted to %(structure_name)s at %(moon)s in %(solar_system)s belonging to %(owner_link)s has been fired by %(character)s and the moon products are ready to be harvested.\n"
@@ -655,11 +678,11 @@ msgstr ""
 "Лунный бур, установленный в %(structure_name)s, принадлежащий %(owner_link)s, на %(moon)s в %(solar_system)s, выстрелил по приказу %(character)s и лунная руда готова к сбору.\n"
 "%(ore_text)s"
 
-#: core/notification_embeds/orbital_embeds.py:46
+#: core/notification_embeds/orbital_embeds.py:43
 msgid "Orbital under attack"
 msgstr "Звездная база под атакой"
 
-#: core/notification_embeds/orbital_embeds.py:48
+#: core/notification_embeds/orbital_embeds.py:45
 #, python-format
 msgid ""
 "The %(structure_type)s at %(planet)s in %(solar_system)s belonging to "
@@ -668,11 +691,11 @@ msgstr ""
 "%(structure_type)s, принадлежащая %(owner_link)s, на %(planet)s в "
 "%(solar_system)s под атакой %(aggressor)s."
 
-#: core/notification_embeds/orbital_embeds.py:67
+#: core/notification_embeds/orbital_embeds.py:62
 msgid "Orbital reinforced"
 msgstr "Звездная база укреплена"
 
-#: core/notification_embeds/orbital_embeds.py:69
+#: core/notification_embeds/orbital_embeds.py:64
 #, python-format
 msgid ""
 "The %(structure_type)s at %(planet)s in %(solar_system)s belonging to "
@@ -683,12 +706,12 @@ msgstr ""
 "%(solar_system)s была укреплена при нападении %(aggressor)s и выйдет из "
 "укрепления: %(date)s."
 
-#: core/notification_embeds/sov_embeds.py:56
+#: core/notification_embeds/sov_embeds.py:60
 #, python-format
 msgid "%(structure_type)s in %(solar_system)s is being captured"
 msgstr "%(structure_type)s в %(solar_system)s захватывается"
 
-#: core/notification_embeds/sov_embeds.py:61
+#: core/notification_embeds/sov_embeds.py:65
 #, python-format
 msgid ""
 "A capsuleer has started to influence the %(type)s in %(solar_system)s "
@@ -697,7 +720,7 @@ msgstr ""
 "Капсулёр начал оказывать влияние Энтозом на %(type)s, принадлежащая "
 "%(owner)s, в %(solar_system)s."
 
-#: core/notification_embeds/sov_embeds.py:76
+#: core/notification_embeds/sov_embeds.py:80
 #, python-format
 msgid ""
 "Command nodes for %(structure_type)s in %(solar_system)s have begun to "
@@ -706,7 +729,7 @@ msgstr ""
 "Командные узлы для %(structure_type)s в %(solar_system)s начали выходить из "
 "маскировки"
 
-#: core/notification_embeds/sov_embeds.py:83
+#: core/notification_embeds/sov_embeds.py:87
 #, python-format
 msgid ""
 "Command nodes for %(structure_type)s in %(solar_system)s belonging to "
@@ -715,12 +738,12 @@ msgstr ""
 "Командные узлы для %(structure_type)s, принадлежащая %(owner)s, в "
 "%(solar_system)s могут быть найдены по всему созвездию %(constellation)s"
 
-#: core/notification_embeds/sov_embeds.py:101
+#: core/notification_embeds/sov_embeds.py:105
 #, python-format
 msgid "DED Sovereignty claim acknowledgment: %s"
 msgstr "Подтверждение претензии на сувернитет DED: %s"
 
-#: core/notification_embeds/sov_embeds.py:104
+#: core/notification_embeds/sov_embeds.py:108
 #, python-format
 msgid ""
 "DED now officially acknowledges that your member corporation %(corporation)s"
@@ -729,12 +752,12 @@ msgstr ""
 "DED официально признают, что ваш член-корпорация %(corporation)s заявил о "
 "сувернитете в %(solar_system)s от имени %(alliance)s"
 
-#: core/notification_embeds/sov_embeds.py:120
+#: core/notification_embeds/sov_embeds.py:124
 #, python-format
 msgid "Lost sovereignty in: %s"
 msgstr "Потеря сувернитета: %s"
 
-#: core/notification_embeds/sov_embeds.py:122
+#: core/notification_embeds/sov_embeds.py:126
 #, python-format
 msgid ""
 "DED acknowledges that member corporation %(corporation)s has lost its claim "
@@ -743,12 +766,12 @@ msgstr ""
 "DED признает, что член-корпорация %(corporation)s потерял претензии на "
 "сувернитет в %(solar_system)s от имени %(alliance)s."
 
-#: core/notification_embeds/sov_embeds.py:137
+#: core/notification_embeds/sov_embeds.py:141
 #, python-format
 msgid "%(structure_type)s in %(solar_system)s has entered reinforced mode"
 msgstr "%(structure_type)s в %(solar_system)s перешло в укрепленный режим "
 
-#: core/notification_embeds/sov_embeds.py:143
+#: core/notification_embeds/sov_embeds.py:147
 #, python-format
 msgid ""
 "The %(structure_type)s in %(solar_system)s belonging to %(owner)s has been "
@@ -758,12 +781,12 @@ msgstr ""
 "%(structure_type)s, принадлежащая %(owner)s, в %(solar_system)s укреплен(а) "
 "вражескими силами и командные центры выйдут из маскировки %(date)s."
 
-#: core/notification_embeds/sov_embeds.py:159
+#: core/notification_embeds/sov_embeds.py:163
 #, python-format
 msgid "%(structure_type)s in %(solar_system)s has been destroyed"
 msgstr "%(structure_type)s в %(solar_system)s был(а) уничтожена"
 
-#: core/notification_embeds/sov_embeds.py:164
+#: core/notification_embeds/sov_embeds.py:168
 #, python-format
 msgid ""
 "The command nodes for %(structure_type)s in %(solar_system)s belonging to "
@@ -772,17 +795,17 @@ msgstr ""
 "Командные узлы %(structure_type)s, принадлежащая %(owner)s, в "
 "%(solar_system)s были уничтожены вражескими силами."
 
-#: core/notification_embeds/sov_embeds.py:193
+#: core/notification_embeds/sov_embeds.py:195
 #, python-format
 msgid " near **%s**"
 msgstr "около **%s**"
 
-#: core/notification_embeds/sov_embeds.py:196
+#: core/notification_embeds/sov_embeds.py:198
 #, python-format
 msgid "%(structure_type)s anchored in %(solar_system)s"
 msgstr "%(structure_type)s встало на якорь в %(solar_system)s "
 
-#: core/notification_embeds/sov_embeds.py:201
+#: core/notification_embeds/sov_embeds.py:203
 #, python-format
 msgid ""
 "A %(structure_type)s from %(structure_owner)s has anchored in "
@@ -792,12 +815,12 @@ msgstr ""
 "%(solar_system)s%(location_text)s."
 
 #. Translators: Context is a location, e.g. a moon
-#: core/notification_embeds/structures_embeds.py:51
+#: core/notification_embeds/structures_embeds.py:50
 #, python-format
 msgid " at %s "
 msgstr "на %s"
 
-#: core/notification_embeds/structures_embeds.py:56
+#: core/notification_embeds/structures_embeds.py:55
 #, python-format
 msgid ""
 "The %(structure_type)s %(structure_name)s%(location)s in %(solar_system)s "
@@ -806,29 +829,29 @@ msgstr ""
 "%(structure_type)s %(structure_name)s %(location)s в %(solar_system)s "
 "принадлежит %(owner_link)s"
 
-#: core/notification_embeds/structures_embeds.py:76
+#: core/notification_embeds/structures_embeds.py:75
 msgid "Structure online"
 msgstr "Структура онлайн"
 
-#: core/notification_embeds/structures_embeds.py:77
+#: core/notification_embeds/structures_embeds.py:76
 msgid "is now online."
 msgstr "онлайн."
 
-#: core/notification_embeds/structures_embeds.py:88
+#: core/notification_embeds/structures_embeds.py:87
 msgid "Structure fuel alert"
 msgstr "Оповещение о топливе структуры"
 
-#: core/notification_embeds/structures_embeds.py:89
+#: core/notification_embeds/structures_embeds.py:88
 #: core/notification_embeds/tower_embeds.py:90
 #, python-format
 msgid "is running out of fuel in %s."
 msgstr "кончается топливо через%s."
 
-#: core/notification_embeds/structures_embeds.py:99
+#: core/notification_embeds/structures_embeds.py:98
 msgid "Jump gate low on Liquid Ozone"
 msgstr "В прыжковых воротах осталось мало Жидкого Озона"
 
-#: core/notification_embeds/structures_embeds.py:103
+#: core/notification_embeds/structures_embeds.py:102
 #, python-format
 msgid ""
 "is below %(threshold)s units on Liquid Ozone.\n"
@@ -837,55 +860,55 @@ msgstr ""
 "Жидкого Озона меньше %(threshold)s.\n"
 "Осталось: %(remaining)s."
 
-#: core/notification_embeds/structures_embeds.py:116
+#: core/notification_embeds/structures_embeds.py:115
 msgid "Structure refueled"
 msgstr "Структура заправлена"
 
-#: core/notification_embeds/structures_embeds.py:118
+#: core/notification_embeds/structures_embeds.py:117
 #: core/notification_embeds/tower_embeds.py:102
 #, python-format
 msgid "has been refueled. Fuel will last until %s."
 msgstr "заправлен(а). Топлива осталось до %s."
 
-#: core/notification_embeds/structures_embeds.py:126
+#: core/notification_embeds/structures_embeds.py:125
 msgid "Structure services off-line"
 msgstr "Служебные модули офлайн"
 
-#: core/notification_embeds/structures_embeds.py:127
+#: core/notification_embeds/structures_embeds.py:126
 msgid "has all services off-lined."
 msgstr "все модули офлайн."
 
-#: core/notification_embeds/structures_embeds.py:138
+#: core/notification_embeds/structures_embeds.py:137
 msgid "Structure low power"
 msgstr "Структура на малой мощности"
 
-#: core/notification_embeds/structures_embeds.py:139
+#: core/notification_embeds/structures_embeds.py:138
 msgid "went to low power mode."
 msgstr "перешла в режим малой мощности."
 
-#: core/notification_embeds/structures_embeds.py:146
+#: core/notification_embeds/structures_embeds.py:145
 msgid "Structure full power"
 msgstr "Структуро на полной мощности"
 
-#: core/notification_embeds/structures_embeds.py:147
+#: core/notification_embeds/structures_embeds.py:146
 msgid "went to full power mode."
 msgstr "перешла в режим полной мощности."
 
-#: core/notification_embeds/structures_embeds.py:154
+#: core/notification_embeds/structures_embeds.py:153
 msgid "Structure un-anchoring"
 msgstr "Структура снимается с якоря"
 
-#: core/notification_embeds/structures_embeds.py:159
+#: core/notification_embeds/structures_embeds.py:158
 #, python-format
 msgid "has started un-anchoring. It will be fully un-anchored at: %s"
 msgstr ""
 "начал(а) сниматься с якоря. Структура полностью снимется с якоря в: %s"
 
-#: core/notification_embeds/structures_embeds.py:167
+#: core/notification_embeds/structures_embeds.py:166
 msgid "Structure under attack"
 msgstr "Структура атакована"
 
-#: core/notification_embeds/structures_embeds.py:168
+#: core/notification_embeds/structures_embeds.py:167
 #, python-format
 msgid ""
 "is under attack by %(attacker)s.\n"
@@ -894,38 +917,38 @@ msgstr ""
 "под атакой %(attacker)s.\n"
 "%(damage_text)s"
 
-#: core/notification_embeds/structures_embeds.py:188
+#: core/notification_embeds/structures_embeds.py:187
 msgid "Structure lost shield"
 msgstr "Структура потеряла щит"
 
-#: core/notification_embeds/structures_embeds.py:193
+#: core/notification_embeds/structures_embeds.py:192
 #, python-format
 msgid "has lost its shields. Armor timer end at: %s"
 msgstr "потерял(а) щит. Таймер брони: %s"
 
-#: core/notification_embeds/structures_embeds.py:201
+#: core/notification_embeds/structures_embeds.py:200
 msgid "Structure lost armor"
 msgstr "Структура потеряла броню"
 
-#: core/notification_embeds/structures_embeds.py:206
+#: core/notification_embeds/structures_embeds.py:205
 #, python-format
 msgid "has lost its armor. Hull timer end at: %s"
 msgstr "потерял(а) броню. Таймер корпуса: %s"
 
-#: core/notification_embeds/structures_embeds.py:214
+#: core/notification_embeds/structures_embeds.py:213
 msgid "Structure destroyed"
 msgstr "Структура уничтожена"
 
-#: core/notification_embeds/structures_embeds.py:215
+#: core/notification_embeds/structures_embeds.py:214
 msgid "has been destroyed."
 msgstr "уничтожен(а)."
 
-#: core/notification_embeds/structures_embeds.py:224
+#: core/notification_embeds/structures_embeds.py:223
 #, python-format
 msgid "The %(structure_type)s %(structure_name)s in %(solar_system)s "
 msgstr "%(structure_type)s%(structure_name)s в %(solar_system)s"
 
-#: core/notification_embeds/structures_embeds.py:240
+#: core/notification_embeds/structures_embeds.py:235
 #, python-format
 msgid ""
 "has been transferred from %(from_corporation)s to %(to_corporation)s by "
@@ -934,11 +957,11 @@ msgstr ""
 "была передана от %(from_corporation)s к %(to_corporation)s персонажем "
 "%(character)s."
 
-#: core/notification_embeds/structures_embeds.py:247
+#: core/notification_embeds/structures_embeds.py:242
 msgid "Ownership transferred"
 msgstr "Правовладение передано"
 
-#: core/notification_embeds/structures_embeds.py:263
+#: core/notification_embeds/structures_embeds.py:256
 #, python-format
 msgid ""
 "A %(structure_type)s belonging to %(owner_link)s has started anchoring in "
@@ -947,21 +970,21 @@ msgstr ""
 "%(structure_type)s, принадлежащая %(owner_link)s, начала вставать на якорь в"
 " %(solar_system)s."
 
-#: core/notification_embeds/structures_embeds.py:270
+#: core/notification_embeds/structures_embeds.py:263
 msgid "Structure anchoring"
 msgstr "Структура встаёт на якорь"
 
-#: core/notification_embeds/structures_embeds.py:309
+#: core/notification_embeds/structures_embeds.py:302
 msgid "Structure reinforcement time changed"
 msgstr "Время укрепления структуры изменено"
 
-#: core/notification_embeds/structures_embeds.py:312
+#: core/notification_embeds/structures_embeds.py:305
 #, python-format
 msgid ""
 "Reinforcement hour has been changed to %s for the following structures:\n"
 msgstr "Для следующих структур было изменено время укрепление на%s:\n"
 
-#: core/notification_embeds/structures_embeds.py:321
+#: core/notification_embeds/structures_embeds.py:314
 #, python-format
 msgid ""
 "- %(structure_type)s %(structure_name)s in %(solar_system)s belonging to "
@@ -970,7 +993,7 @@ msgstr ""
 "- %(structure_type)s %(structure_name)s, принадлежащая %(owner_link)s, в "
 "%(solar_system)s"
 
-#: core/notification_embeds/structures_embeds.py:331
+#: core/notification_embeds/structures_embeds.py:324
 #, python-format
 msgid ""
 "\n"
@@ -1003,7 +1026,7 @@ msgstr ""
 "под атакой %(aggressor)s.\n"
 "%(damage_text)s"
 
-#: core/notification_embeds/tower_embeds.py:89 core/notification_types.py:52
+#: core/notification_embeds/tower_embeds.py:89 core/notification_types.py:51
 msgid "Starbase fuel alert"
 msgstr "Оповещение о топливе орбитальной станции"
 
@@ -1029,83 +1052,107 @@ msgstr "Орбитальная станция укреплена"
 msgid "has been reinforced and will come out at: %s."
 msgstr "укреплен(а) и выйдет в: %s."
 
-#: core/notification_embeds/war_embeds.py:42
-msgid "One party has surrendered"
-msgstr "Сторона капитулировала"
+#: core/notification_embeds/war_embeds.py:24
+msgid "Accepted Ally"
+msgstr ""
 
-#: core/notification_embeds/war_embeds.py:44
+#: core/notification_embeds/war_embeds.py:31
 #, python-format
 msgid ""
-"The war between %(against)s and %(declared_by)s is coming to an end as one "
-"party has surrendered. The war will be declared as being over after "
-"approximately 24 hours."
+"%(ally)s has been accepted in a war against %(enemy)s. The offer was "
+"accepted at %(time)s by %(character)s for %(isk_value)s ISK."
 msgstr ""
-"Война между %(against)s и %(declared_by)s подходит к концу ввиду капитуляции"
-" одной из сторон. Война будет считаться оконченной приблизительно через 24 "
-"часа."
 
-#: core/notification_embeds/war_embeds.py:58
+#: core/notification_embeds/war_embeds.py:49
+msgid "Corporation you are at war with is joining an alliance"
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:53
 #, python-format
-msgid "War update: %(against)s has left %(alliance)s"
-msgstr "Обновление войны: %(against)s покинул %(alliance)s"
+msgid ""
+"%(corporation)s is joining %(alliance)s alliance. Since you are at war with "
+"%(corporation)s, in 24 hours you will also be at war with %(alliance)s."
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:69
+msgid "Ally Has Joined a War"
+msgstr "Союзник присоединился к войне"
 
-#: core/notification_embeds/war_embeds.py:63
+#: core/notification_embeds/war_embeds.py:75
 #, python-format
 msgid ""
-"There has been a development in the war between %(declared_by)s and %(alliance)s.\n"
-"%(against)s is no longer a member of %(alliance)s, and therefore a new war between %(declared_by)s and %(against)s has begun."
+"%(ally)s has joined %(defender)s in a war against %(aggressor)s. Their "
+"participation in the war will start at %(start_time)s."
 msgstr ""
-"В войне между %(declared_by)s и %(alliance)s произошло развитие событий.\n"
-"%(against)s более не член %(alliance)s и следовательно началась новая война между %(declared_by)s и %(against)s."
+"%(ally)s присоединился к %(defender)s в войне против %(aggressor)s. Их "
+"участие в войне начнётся %(start_time)s."
 
-#: core/notification_embeds/war_embeds.py:78
+#: core/notification_embeds/war_embeds.py:94
 #, python-format
-msgid "%(declared_by)s Declares War Against %(against)s"
-msgstr "%(declared_by)s объявляет войну против %(against)s"
+msgid "%(entity)s Declares War Against %(defender)s"
+msgstr ""
 
-#: core/notification_embeds/war_embeds.py:83
+#: core/notification_embeds/war_embeds.py:99
 #, python-format
 msgid ""
-"%(declared_by)s has declared war on %(against)s with %(war_hq)s as the designated war headquarters.\n"
-"Within %(delay_hours)s hours fighting can legally occur between those involved."
+"%(entity)s has declared war on %(defender)s. Within 24 hours fighting can "
+"legally occur between those involved."
 msgstr ""
-"%(declared_by)s объявил(а) войну против %(against)s, %(war_hq)s выбран(а) военной штаб-квартирой.\n"
-"В течении %(delay_hours)s часов военные действия между вовлеченными будут легальны."
 
-#: core/notification_embeds/war_embeds.py:102
+#: core/notification_embeds/war_embeds.py:119
 #, python-format
-msgid "%(alliance)s inherits war against %(opponent)s"
-msgstr "%(alliance)s вступает в войну против %(opponent)s"
+msgid "%s has offered its services in one of your wars"
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:122
+#, python-format
+msgid ""
+"%(mercenary)s has offered %(defender)s it's services in it's war against "
+"%(aggressor)s for %(isk_value)s. "
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:138
+msgid "Mercenary offered services"
+msgstr ""
 
-#: core/notification_embeds/war_embeds.py:107
+#: core/notification_embeds/war_embeds.py:143
 #, python-format
 msgid ""
-"%(alliance)s has inherited the war between %(declared_by)s and %(against)s "
-"from newly joined %(quitter)s. Within **24** hours fighting can legally "
-"occur with %(alliance)s."
+"%(mercenary)s has retracted it's offer to support %(defender)s in a war "
+"against %(aggressor)s."
 msgstr ""
-"%(alliance)s вступает в войну между %(declared_by)s и %(against)s ввиду "
-"вступившей %(quitter)s. В пределах **24** часов станет возможна война с "
-"%(alliance)s."
 
-#: core/notification_embeds/war_embeds.py:122
-msgid "CONCORD invalidates war"
-msgstr "Конкорд аннулирует войну"
+#: core/notification_embeds/war_embeds.py:162
+#, python-format
+msgid "You have offered to ally with %s "
+msgstr ""
 
-#: core/notification_embeds/war_embeds.py:125
+#: core/notification_embeds/war_embeds.py:164
 #, python-format
 msgid ""
-"The war between %(declared_by)s and %(against)s has been retracted by CONCORD.\n"
-"After %(end_date)s CONCORD will again respond to any hostilities between those involved with full force."
+"%(character)s has offered to ally to %(defender)s in their war against "
+"%(aggressor)s. The offer asked for %(isk_value)s ISK as payment."
 msgstr ""
-"Война между %(declared_by)s и %(against)s была прекращена Конкордом.\n"
-"Спустя %(end_date)s Конкорд будет реагировать на любые враждебные действия между вовлеченными в полной мере."
 
-#: core/notification_embeds/war_embeds.py:141
+#: core/notification_embeds/war_embeds.py:185
+#, python-format
+msgid "%s offered to surrender"
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:187
+#, python-format
+msgid ""
+"%(character)s has offered to surrender to %(offered)s, offering "
+"%(isk_value)s ISK. If accepted, the war will end in 24 hours and neither "
+"organization will be able to declare new wars against the other for the next"
+" 2 weeks."
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:203
 msgid "Corporation or alliance is now eligible for formal war declarations"
 msgstr "Корпорация или альянс теперь имеет право для объявление войны"
 
-#: core/notification_embeds/war_embeds.py:144
+#: core/notification_embeds/war_embeds.py:206
 msgid ""
 "Your corporation or alliance is **now eligible** to participate in formal "
 "war declarations. This could be because your corporation and/or one of the "
@@ -1115,12 +1162,12 @@ msgstr ""
 "войны. Это могло произойти из-за того, что ваша корпораци и/или одна из "
 "корпораций вашего альянса имеет структуру в космосе."
 
-#: core/notification_embeds/war_embeds.py:156
+#: core/notification_embeds/war_embeds.py:218
 msgid ""
 "Corporation or alliance is no longer eligible for formal war declarations"
 msgstr "Корпорация или альянс более не имеет право для объявление войны"
 
-#: core/notification_embeds/war_embeds.py:159
+#: core/notification_embeds/war_embeds.py:221
 msgid ""
 "Your corporation or alliance is **no longer eligible** to participate in formal war declarations.\n"
 "Neither your corporation nor any of the corporations in your alliance own a structure deployed in space at this time. If your corporation or alliance is currently involved in a formal war, that war will end in 24 hours."
@@ -1128,34 +1175,126 @@ msgstr ""
 "Ваша корпорация или альянс более **не имеет прав** на участие в объявлении войны.\n"
 "Ни ваша корпорация, ни одна из корпорация вашего альянса на данный момент не имеет структур в космосе. Если ваша корпорация или альянс вовлечены в война, она окончится в течении 24 часов "
 
-#: core/notification_embeds/war_embeds.py:176
+#: core/notification_embeds/war_embeds.py:237
 #, python-format
 msgid "%s has offered a surrender"
 msgstr "%s предложил(а) капитуляцию"
 
-#: core/notification_embeds/war_embeds.py:178
+#: core/notification_embeds/war_embeds.py:239
 #, python-format
 msgid ""
-"%s has offered to end the war with %s in the exchange for %s ISK. If "
-"accepted, the war will end in 24 hours and your organizations will be unable"
-" to declare new wars against each other for the next 2 weeks."
+"%(owner_1)s has offered to end the war with %(owner_2)s in the exchange for "
+"%(isk_value)s ISK. If accepted, the war will end in 24 hours and your "
+"organizations will be unable to declare new wars against each other for the "
+"next 2 weeks."
 msgstr ""
-"%s предложили окончить войну с %s за %s ISK. Если предложение будет принято,"
-" война окончится в пределах 24 часов. В течении двух недель будет невозможно"
-" начать войну между сторонами."
 
-#: core/notification_embeds/war_embeds.py:188
-msgid "Ally Has Joined a War"
-msgstr "Союзник присоединился к войне"
+#: core/notification_embeds/war_embeds.py:269
+#, python-format
+msgid "%s has surrendered"
+msgstr ""
 
-#: core/notification_embeds/war_embeds.py:196
+#: core/notification_embeds/war_embeds.py:271
+#, python-format
+msgid "%(declared_by)s has surrendered in the war against  %(against)s."
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:282
+msgid "One party has surrendered"
+msgstr "Сторона капитулировала"
+
+#: core/notification_embeds/war_embeds.py:284
 #, python-format
 msgid ""
-"%(ally)s has joined %(defender)s in a war against %(aggressor)s. Their "
-"participation in the war will start at %(start_time)s."
+"The war between %(against)s and %(declared_by)s is coming to an end as one "
+"party has surrendered. The war will be declared as being over after "
+"approximately 24 hours."
+msgstr ""
+"Война между %(against)s и %(declared_by)s подходит к концу ввиду капитуляции"
+" одной из сторон. Война будет считаться оконченной приблизительно через 24 "
+"часа."
+
+#: core/notification_embeds/war_embeds.py:299
+#, python-format
+msgid "WarHQ %s lost"
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:301
+#, python-format
+msgid ""
+"The war HQ %(war_hq)s is no more. As a consequence, the war declared by "
+"%(declared_by)s against %(against)s on %(time_declared)s has been declared "
+"invalid by CONCORD and has entered its cooldown period."
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:318
+#, python-format
+msgid "War update: %(against)s has left %(alliance)s"
+msgstr "Обновление войны: %(against)s покинул %(alliance)s"
+
+#: core/notification_embeds/war_embeds.py:323
+#, python-format
+msgid ""
+"There has been a development in the war between %(declared_by)s and %(alliance)s.\n"
+"%(against)s is no longer a member of %(alliance)s, and therefore a new war between %(declared_by)s and %(against)s has begun."
+msgstr ""
+"В войне между %(declared_by)s и %(alliance)s произошло развитие событий.\n"
+"%(against)s более не член %(alliance)s и следовательно началась новая война между %(declared_by)s и %(against)s."
+
+#: core/notification_embeds/war_embeds.py:338
+#, python-format
+msgid "%(declared_by)s Declares War Against %(against)s"
+msgstr "%(declared_by)s объявляет войну против %(against)s"
+
+#: core/notification_embeds/war_embeds.py:343
+#, python-format
+msgid ""
+"%(declared_by)s has declared war on %(against)s with %(war_hq)s as the designated war headquarters.\n"
+"Within %(delay_hours)s hours fighting can legally occur between those involved."
+msgstr ""
+"%(declared_by)s объявил(а) войну против %(against)s, %(war_hq)s выбран(а) военной штаб-квартирой.\n"
+"В течении %(delay_hours)s часов военные действия между вовлеченными будут легальны."
+
+#: core/notification_embeds/war_embeds.py:362
+#, python-format
+msgid "%(alliance)s inherits war against %(opponent)s"
+msgstr "%(alliance)s вступает в войну против %(opponent)s"
+
+#: core/notification_embeds/war_embeds.py:367
+#, python-format
+msgid ""
+"%(alliance)s has inherited the war between %(declared_by)s and %(against)s "
+"from newly joined %(quitter)s. Within **24** hours fighting can legally "
+"occur with %(alliance)s."
+msgstr ""
+"%(alliance)s вступает в войну между %(declared_by)s и %(against)s ввиду "
+"вступившей %(quitter)s. В пределах **24** часов станет возможна война с "
+"%(alliance)s."
+
+#: core/notification_embeds/war_embeds.py:383
+msgid "CONCORD invalidates war"
+msgstr "Конкорд аннулирует войну"
+
+#: core/notification_embeds/war_embeds.py:385
+#, python-format
+msgid ""
+"The war between %(declared_by)s and %(against)s has been retracted by "
+"CONCORD, because at least one of the involved parties has become ineligible "
+"for war declarations.Fighting must cease on %(end_date)s."
+msgstr ""
+
+#: core/notification_embeds/war_embeds.py:401
+msgid "CONCORD retracts war"
 msgstr ""
-"%(ally)s присоединился к %(defender)s в войне против %(aggressor)s. Их "
-"участие в войне начнётся %(start_time)s."
+
+#: core/notification_embeds/war_embeds.py:404
+#, python-format
+msgid ""
+"The war between %(declared_by)s and %(against)s has been retracted by CONCORD.\n"
+"After %(end_date)s CONCORD will again respond to any hostilities between those involved with full force."
+msgstr ""
+"Война между %(declared_by)s и %(against)s была прекращена Конкордом.\n"
+"Спустя %(end_date)s Конкорд будет реагировать на любые враждебные действия между вовлеченными в полной мере."
 
 #: core/notification_timers.py:89
 msgid "Armor timer"
@@ -1174,162 +1313,158 @@ msgstr "Таймер сувернитета"
 msgid "Extraction ready"
 msgstr "Извлечение завершено"
 
-#: core/notification_types.py:15
-msgid "Upwell structure anchoring"
-msgstr "Постановка на якорь стуктуры Апвелл"
-
 #: core/notification_types.py:16
-msgid "Upwell structure went online"
-msgstr "Структура Апвелл онлайн"
+msgid "Upwell structure ownership transferred"
+msgstr "Правовладение структурой Апвелл передано"
 
 #: core/notification_types.py:18
-msgid "Upwell structure services went offline"
-msgstr "Служебные модули структуры Апвелл офлайн"
-
-#: core/notification_types.py:21
-msgid "Upwell structure went high power"
-msgstr "Структура Апвелл на полной мощности"
-
-#: core/notification_types.py:24
-msgid "Upwell structure went low power"
-msgstr "Структура Апвелл на малой мощности"
+msgid "Upwell structure anchoring"
+msgstr "Постановка на якорь стуктуры Апвелл"
 
-#: core/notification_types.py:26
-msgid "Upwell structure unanchoring"
-msgstr "Структура Апвелл снимается с якоря"
+#: core/notification_types.py:19
+msgid "Upwell structure destroyed"
+msgstr "Структура Апвелл уничтожена"
 
-#: core/notification_types.py:27
+#: core/notification_types.py:20
 msgid "Upwell structure fuel alert"
 msgstr "Оповещение о топливе структур Апвелл"
 
-#: core/notification_types.py:28
-msgid "Upwell structure refueled"
-msgstr "Структура Апвелл заправлена"
-
-#: core/notification_types.py:30
+#: core/notification_types.py:22
 msgid "Upwell structure jump fuel alert"
 msgstr "Оповещение о топливе навигационных структур Апвелл"
 
-#: core/notification_types.py:33
-msgid "Upwell structure is under attack"
-msgstr "Структура Апвелл под атакой"
+#: core/notification_types.py:24
+msgid "Upwell structure lost armor"
+msgstr "Структура Апвелл потеряла броню"
 
-#: core/notification_types.py:35
+#: core/notification_types.py:25
 msgid "Upwell structure lost shields"
 msgstr "Структура Апвелл потеряла щиты"
 
-#: core/notification_types.py:36
-msgid "Upwell structure lost armor"
-msgstr "Структура Апвелл потеряла броню"
+#: core/notification_types.py:26
+msgid "Upwell structure went online"
+msgstr "Структура Апвелл онлайн"
 
-#: core/notification_types.py:37
-msgid "Upwell structure destroyed"
-msgstr "Структура Апвелл уничтожена"
+#: core/notification_types.py:27
+msgid "Upwell structure refueled"
+msgstr "Структура Апвелл заправлена"
 
-#: core/notification_types.py:40
+#: core/notification_types.py:29
 msgid "Upwell structure reinforcement time changed"
 msgstr "Время укрепления структуры Апвелл изменено"
 
-#: core/notification_types.py:43
-msgid "Upwell structure ownership transferred"
-msgstr "Правовладение структурой Апвелл передано"
+#: core/notification_types.py:32
+msgid "Upwell structure services went offline"
+msgstr "Служебные модули структуры Апвелл офлайн"
 
-#: core/notification_types.py:47
+#: core/notification_types.py:34
+msgid "Upwell structure unanchoring"
+msgstr "Структура Апвелл снимается с якоря"
+
+#: core/notification_types.py:36
+msgid "Upwell structure is under attack"
+msgstr "Структура Апвелл под атакой"
+
+#: core/notification_types.py:39
+msgid "Upwell structure went high power"
+msgstr "Структура Апвелл на полной мощности"
+
+#: core/notification_types.py:42
+msgid "Upwell structure went low power"
+msgstr "Структура Апвелл на малой мощности"
+
+#: core/notification_types.py:46
 msgid "Customs office attacked"
 msgstr "Таможня атакована"
 
-#: core/notification_types.py:48
+#: core/notification_types.py:47
 msgid "Customs office reinforced"
 msgstr "Таможня укреплена"
 
-#: core/notification_types.py:51
+#: core/notification_types.py:50
 msgid "Starbase attacked"
 msgstr "Орбитальная станция атакована"
 
-#: core/notification_types.py:53
+#: core/notification_types.py:52
 msgid "Starbase refueled (BETA)"
 msgstr "Орбитальная станция заправлена (БЕТА)"
 
-#: core/notification_types.py:54
+#: core/notification_types.py:53
 msgid "Starbase reinforced (BETA)"
 msgstr "Орбитальная станция укреплена (БЕТА)"
 
-#: core/notification_types.py:60
-msgid "Moonmining laser fired"
-msgstr "Лунодобывающий лазер выстрелил"
+#: core/notification_types.py:57
+msgid "Moon mining automatic fracture triggered"
+msgstr "Лунная руда автоматически раздробилась"
 
-#: core/notification_types.py:62
+#: core/notification_types.py:60
 msgid "Moon mining extraction cancelled"
 msgstr "Извлечение лунной руды отменено"
 
-#: core/notification_types.py:65
+#: core/notification_types.py:63
 msgid "Moon mining extraction finished"
 msgstr "Извлечение лунной руды завершено"
 
 #: core/notification_types.py:68
-msgid "Moon mining automatic fracture triggered"
-msgstr "Лунная руда автоматически раздробилась"
+msgid "Moonmining laser fired"
+msgstr "Лунодобывающий лазер выстрелил"
 
-#: core/notification_types.py:73
-msgid "Sovereignty structure reinforced"
-msgstr "Структура сувернитета укреплена"
+#: core/notification_types.py:72
+msgid "Sovereignty claim acknowledgment"
+msgstr "Сувернитет получил признание"
+
+#: core/notification_types.py:74
+msgid "Sovereignty lost"
+msgstr "Потеря сувернитета"
 
 #: core/notification_types.py:76
-msgid "Sovereignty structure destroyed"
-msgstr "Структура сувернитета уничтожена"
+msgid "Structure anchoring in alliance space"
+msgstr "Структура ставится на якорь на территории альянса"
 
 #: core/notification_types.py:79
 msgid "Sovereignty entosis capture started"
 msgstr "Энтоз-захват сувернитетета начался"
 
 #: core/notification_types.py:82
-msgid "Sovereignty command node event started"
-msgstr "Ивент командных узлов сувернитета начался"
+msgid "Sovereignty structure destroyed"
+msgstr "Структура сувернитета уничтожена"
 
 #: core/notification_types.py:85
-msgid "Sovereignty claim acknowledgment"
-msgstr "Сувернитет получил признание"
+msgid "Sovereignty structure reinforced"
+msgstr "Структура сувернитета укреплена"
 
-#: core/notification_types.py:87
-msgid "Sovereignty lost"
-msgstr "Потеря сувернитета"
+#: core/notification_types.py:88
+msgid "Sovereignty command node event started"
+msgstr "Ивент командных узлов сувернитета начался"
 
-#: core/notification_types.py:89
-msgid "Structure anchoring in alliance space"
-msgstr "Структура ставится на якорь на территории альянса"
+#: core/notification_types.py:92
+msgid "War accepted ally"
+msgstr ""
 
-#: core/notification_types.py:93
-msgid "War declared"
-msgstr "Война объявлена"
+#: core/notification_types.py:94
+msgid "Alliance war corporation joined alliance message"
+msgstr ""
 
-#: core/notification_types.py:95
+#: core/notification_types.py:97
+msgid "Alliance war surrender message"
+msgstr ""
+
+#: core/notification_types.py:100
 msgid "War ally joined aggressor"
 msgstr "Военный союзник присоединился к агрессору"
 
-#: core/notification_types.py:97
+#: core/notification_types.py:102
 msgid "War ally joined ally"
 msgstr "Военный союзник присоединился к союзникам"
 
-#: core/notification_types.py:99
+#: core/notification_types.py:104
 msgid "War ally joined defender"
 msgstr "Военный союзник присоединился к стороне защиты"
 
-#: core/notification_types.py:101
-msgid "War adopted"
-msgstr "Война принята"
-
-#: core/notification_types.py:102
-msgid "War inherited"
-msgstr "Война передана"
-
-#: core/notification_types.py:103
+#: core/notification_types.py:106
 msgid "War party surrendered"
 msgstr "Военная компания капитулировала"
 
-#: core/notification_types.py:105
-msgid "War retracted by Concord"
-msgstr "Война отменена Конкордом"
-
 #: core/notification_types.py:108
 msgid "War corporation became eligible"
 msgstr "Корпорация получила право на войну"
@@ -1338,43 +1473,91 @@ msgstr "Корпорация получила право на войну"
 msgid "War corporation no longer eligible"
 msgstr "Корпорация больше не имеет прав на войну"
 
-#: core/notification_types.py:113
+#: core/notification_types.py:113 core/notification_types.py:125
+msgid "War declared"
+msgstr "Война объявлена"
+
+#: core/notification_types.py:114
+msgid "War HQ removed from space"
+msgstr ""
+
+#: core/notification_types.py:115
+msgid "War invalid"
+msgstr ""
+
+#: core/notification_types.py:117
+msgid "War mercenary offered negotiation message"
+msgstr ""
+
+#: core/notification_types.py:120
+msgid "War mercenary offer retracted message"
+msgstr ""
+
+#: core/notification_types.py:122
+msgid "War offered surrender"
+msgstr ""
+
+#: core/notification_types.py:123
+msgid "War offered to become ally"
+msgstr ""
+
+#: core/notification_types.py:124
+msgid "War adopted"
+msgstr "Война принята"
+
+#: core/notification_types.py:126
+msgid "War inherited"
+msgstr "Война передана"
+
+#: core/notification_types.py:128
+msgid "War retracted by Concord"
+msgstr "Война отменена Конкордом"
+
+#: core/notification_types.py:130
 msgid "War surrender offered"
 msgstr "Предлагается капитуляция в войне"
 
-#: core/notification_types.py:116
-msgid "Character submitted application"
-msgstr "Поданная заявка персонажа"
+#: core/notification_types.py:133
+msgid "Character joins corporation"
+msgstr "Персонаж вступает в корпорацию"
 
-#: core/notification_types.py:118
+#: core/notification_types.py:135
 msgid "Character invited to join corporation"
 msgstr "Персонажу предложено вступить в корпорацию"
 
-#: core/notification_types.py:121
-msgid "Corp application rejected"
-msgstr "Заявка в корпорацию отклонена"
+#: core/notification_types.py:137
+msgid "Character submitted application"
+msgstr "Поданная заявка персонажа"
+
+#: core/notification_types.py:138
+msgid "Corp application rejected message"
+msgstr ""
 
-#: core/notification_types.py:123
+#: core/notification_types.py:140
+msgid "Corp application rejected custom message"
+msgstr ""
+
+#: core/notification_types.py:142
 msgid "Character withdrew application"
 msgstr "Персонаж отозвал заявку"
 
-#: core/notification_types.py:124
-msgid "Character joins corporation"
-msgstr "Персонаж вступает в корпорацию"
-
-#: core/notification_types.py:125
+#: core/notification_types.py:143
 msgid "Character leaves corporation"
 msgstr "Персонаж покидает корпорацию"
 
-#: core/notification_types.py:128
+#: core/notification_types.py:146
+msgid "Corp alliance billing message"
+msgstr ""
+
+#: core/notification_types.py:147
 msgid "Bill out of money"
 msgstr "Закончились деньги"
 
-#: core/notification_types.py:131
+#: core/notification_types.py:150
 msgid "I-HUB bill about to expire"
 msgstr "Срок счёта центра инфраструктуры подходит к концу"
 
-#: core/notification_types.py:135
+#: core/notification_types.py:154
 msgid "I_HUB destroyed by bill failure"
 msgstr "Центр инфраструктуры уничтожен ввиду неуплаты"
 
@@ -1422,151 +1605,151 @@ msgstr "Нульсек"
 msgid "W-Space"
 msgstr "W-Пространство"
 
-#: models/notifications.py:50
+#: models/notifications.py:51
 msgid "English"
 msgstr "Английский"
 
-#: models/notifications.py:51
+#: models/notifications.py:52
 msgid "German"
 msgstr "Немецкий"
 
-#: models/notifications.py:52
+#: models/notifications.py:53
 msgid "Spanish"
 msgstr "Испанский"
 
-#: models/notifications.py:53
+#: models/notifications.py:54
 msgid "Chinese Simplified"
 msgstr "Китайский (упрощенный)"
 
-#: models/notifications.py:54
+#: models/notifications.py:55
 msgid "Russian"
 msgstr "Русский"
 
-#: models/notifications.py:55
+#: models/notifications.py:56
 msgid "Korean"
 msgstr "Корейский"
 
-#: models/notifications.py:71
+#: models/notifications.py:73
 msgid "notification types"
 msgstr "типы оповещений"
 
-#: models/notifications.py:73
+#: models/notifications.py:75
 msgid "Select which type of notifications should be forwarded to this webhook"
 msgstr "Выберите какой тип оповещений будет отсылаться по этому вебхуку"
 
-#: models/notifications.py:82
+#: models/notifications.py:84
 msgid "language"
 msgstr "язык"
 
-#: models/notifications.py:83
+#: models/notifications.py:85
 msgid "Language of notifications send to this webhook"
 msgstr "Язык оповещения, отправляемого по этому вебхуку"
 
-#: models/notifications.py:89
+#: models/notifications.py:91
 msgid "Whether owners have this webhook automatically pre-set when created"
 msgstr "Получают ли при создании владельцы этот вебхук автоматически"
 
-#: models/notifications.py:94 models/owners.py:151
+#: models/notifications.py:96 models/owners.py:151
 msgid "has default pings enabled"
 msgstr "включены базовые пинги"
 
-#: models/notifications.py:106
+#: models/notifications.py:108
 msgid "Groups to be pinged for each notification - "
 msgstr "Группы будет пропингованы по каждому оповещению - "
 
-#: models/notifications.py:111
+#: models/notifications.py:113
 msgid "webhook"
 msgstr "вебхук"
 
-#: models/notifications.py:127
+#: models/notifications.py:129
 msgid "True when this notification has been forwarded to Discord"
 msgstr "Галочка, если это оповещение было отправлено в Дискорд"
 
-#: models/notifications.py:133
+#: models/notifications.py:135
 msgid "True when a timer has been added for this notification"
 msgstr "Галочка, если был добавлен таймер по этому оповещению"
 
-#: models/notifications.py:140
+#: models/notifications.py:142
 msgid "Type of this notification"
 msgstr "Тип оповещения"
 
-#: models/notifications.py:146
+#: models/notifications.py:148
 msgid "Corporation that owns this notification"
 msgstr "Корпорация, которой принадлежит это уведомление"
 
-#: models/notifications.py:151
+#: models/notifications.py:153
 msgid "Structures this notification is about (if any)"
 msgstr "Структуры, о которых идёт речь (если есть)"
 
-#: models/notifications.py:525
+#: models/notifications.py:527
 msgid "created"
 msgstr "создано"
 
-#: models/notifications.py:526
+#: models/notifications.py:528
 msgid "Date when this notification was first received from ESI"
 msgstr "Дата, когда это оповещение было получено от ESI в первый раз"
 
-#: models/notifications.py:531
+#: models/notifications.py:533
 msgid "is read"
 msgstr "прочитано"
 
-#: models/notifications.py:532
+#: models/notifications.py:534
 msgid "True when this notification has read in the eve client"
 msgstr "Галочка, если это оповещение было прочтено в клиенте Eve"
 
-#: models/notifications.py:535
+#: models/notifications.py:537
 msgid "last updated"
 msgstr "последний раз обновлено"
 
-#: models/notifications.py:536
+#: models/notifications.py:538
 msgid "Date when this notification has last been updated from ESI"
 msgstr "Дата, когда это оповещение было обновлено ESI в последний раз "
 
-#: models/notifications.py:543
+#: models/notifications.py:545
 msgid "sender"
 msgstr "отправитель"
 
-#: models/notifications.py:550
+#: models/notifications.py:552
 msgid "text"
 msgstr "текст"
 
-#: models/notifications.py:551
+#: models/notifications.py:553
 msgid "Notification details in YAML"
 msgstr "Детали оповещения в YAML"
 
-#: models/notifications.py:553 models/notifications.py:672
+#: models/notifications.py:555 models/notifications.py:674
 msgid "timestamp"
 msgstr "временная метка"
 
-#: models/notifications.py:558
+#: models/notifications.py:560
 msgid "eve notification"
 msgstr "оповещение eve"
 
-#: models/notifications.py:559
+#: models/notifications.py:561
 msgid "eve notifications"
 msgstr "оповещения eve"
 
-#: models/notifications.py:670
+#: models/notifications.py:672
 msgid "details"
 msgstr "детали"
 
-#: models/notifications.py:671
+#: models/notifications.py:673
 msgid "last_updated"
 msgstr "last_updated"
 
-#: models/notifications.py:677
+#: models/notifications.py:679
 msgid "generated notification"
 msgstr "автоматическое оповещение"
 
-#: models/notifications.py:678
+#: models/notifications.py:680
 msgid "generated  notifications"
 msgstr "автоматические оповещения"
 
-#: models/notifications.py:708
+#: models/notifications.py:710
 msgid "channel pings"
 msgstr "канал пингов"
 
-#: models/notifications.py:710
+#: models/notifications.py:712
 msgid ""
 "Option to ping every member of the channel. This setting can be overruled by"
 " the respective owner or webhook configuration"
@@ -1574,109 +1757,109 @@ msgstr ""
 "Возможность пинговать каждого участника канала. Этот параметр может быть "
 "отменен соответствующим владельцем или конфигурацией вебхука"
 
-#: models/notifications.py:721
+#: models/notifications.py:723
 msgid "Context color of these notification on Discord"
 msgstr "Цвет контекста уведомлений в Дискорде"
 
-#: models/notifications.py:725
+#: models/notifications.py:727
 msgid "is_enabled"
 msgstr "is_enabled"
 
-#: models/notifications.py:726
+#: models/notifications.py:728
 msgid "Disabled configurations will not create any new alerts."
 msgstr "Выключеные конфигурации не будут создавать новые уведомления."
 
-#: models/notifications.py:749
+#: models/notifications.py:751
 msgid "end"
 msgstr "конец"
 
-#: models/notifications.py:749
+#: models/notifications.py:751
 msgid "End of alerts in hours before fuel expires"
 msgstr "Конец оповещений перед окончание топлива, в часах"
 
-#: models/notifications.py:752
+#: models/notifications.py:754
 msgid "repeat"
 msgstr "повтор"
 
-#: models/notifications.py:754
+#: models/notifications.py:756
 msgid "Notifications will be repeated every x hours. Set to 0 for no repeats"
 msgstr ""
 "Оповещения будут повторяться каждые x часов. Установите 0 чтобы не было "
 "повторов"
 
-#: models/notifications.py:758
+#: models/notifications.py:760
 msgid "start"
 msgstr "начало"
 
-#: models/notifications.py:759
+#: models/notifications.py:761
 msgid "Start of alerts in hours before fuel expires"
 msgstr "Начало оповещений перед окончанием топлива, в часах"
 
-#: models/notifications.py:763
+#: models/notifications.py:765
 msgid "structure fuel alert config"
 msgstr "конфиг оповещений о топливе структуры"
 
-#: models/notifications.py:764
+#: models/notifications.py:766
 msgid "structure fuel alert configs"
 msgstr "конфиги оповещений о топливе структуры"
 
-#: models/notifications.py:771
+#: models/notifications.py:773
 msgid "Start must be before end, i.e. have a larger value."
 msgstr "Начало должно быть до конца, то есть должно иметь выше значение."
 
-#: models/notifications.py:775
+#: models/notifications.py:777
 msgid "Repeat can not be larger that the interval size."
 msgstr "Число повторов не может быть больше интервала."
 
-#: models/notifications.py:784
+#: models/notifications.py:786
 msgid "This configuration may not overlap with an existing configuration."
 msgstr "Эта конфигурация не может пересекаться с существующей конфигурацией."
 
-#: models/notifications.py:853
+#: models/notifications.py:855
 msgid ""
 "Notifications will be sent once fuel level in units reaches this threshold"
 msgstr "Оповещение будет отправлено, когда количество топлива пересечёт порог"
 
-#: models/notifications.py:858
+#: models/notifications.py:860
 msgid "jump fuel alert config"
 msgstr "конфиг оповещений о топливе навигационных структур"
 
-#: models/notifications.py:859
+#: models/notifications.py:861
 msgid "jump fuel alert configs"
 msgstr "конфиги оповещений о топливе навигационных структур"
 
-#: models/notifications.py:911 models/notifications.py:961
+#: models/notifications.py:913 models/notifications.py:963
 #: models/structures_1.py:409 models/structures_1.py:814
 #: models/structures_2.py:46
 msgid "structure"
 msgstr "структура"
 
-#: models/notifications.py:917 models/notifications.py:967
+#: models/notifications.py:919 models/notifications.py:969
 msgid "configuration"
 msgstr "конфигурация"
 
-#: models/notifications.py:921
+#: models/notifications.py:923
 msgid "hours"
 msgstr "часы"
 
-#: models/notifications.py:922
+#: models/notifications.py:924
 msgid "Number of hours before fuel expiration this alert was sent"
 msgstr ""
 "Будет отправлено, когда останется x часов до опустошения топливного отсека"
 
-#: models/notifications.py:926
+#: models/notifications.py:928
 msgid "structure fuel alert"
 msgstr "оповещение о топливе структуры"
 
-#: models/notifications.py:927
+#: models/notifications.py:929
 msgid "structure fuel alerts"
 msgstr "оповещения о топливе структуры"
 
-#: models/notifications.py:971
+#: models/notifications.py:973
 msgid "jump fuel alert"
 msgstr "оповещение о топливе навигационной структуры"
 
-#: models/notifications.py:972
+#: models/notifications.py:974
 msgid "jump fuel alerts"
 msgstr "оповещения о топливе навигационной структуры"
 
@@ -1716,7 +1899,7 @@ msgstr ""
 "Для влючения или выключение пингов оповещений для этого владельца, например "
 "@everyone и @here"
 
-#: models/owners.py:159 webhooks/models.py:68
+#: models/owners.py:159 webhooks/models.py:69
 msgid "is active"
 msgstr "включено"
 
@@ -2249,7 +2432,7 @@ msgstr "служебный модуль структуры"
 msgid "structure services"
 msgstr "служебные модули структуры"
 
-#: models/structures_2.py:80 webhooks/models.py:16
+#: models/structures_2.py:80 webhooks/models.py:17
 msgid "none"
 msgstr "нет"
 
@@ -2859,63 +3042,63 @@ msgstr "модуль включен"
 msgid "service is down"
 msgstr "модуль выключен"
 
-#: webhooks/models.py:17
+#: webhooks/models.py:18
 msgid "here"
 msgstr "here"
 
-#: webhooks/models.py:18
+#: webhooks/models.py:19
 msgid "everyone"
 msgstr "everyone"
 
-#: webhooks/models.py:23
+#: webhooks/models.py:24
 msgid "danger"
 msgstr "опасно"
 
-#: webhooks/models.py:24
+#: webhooks/models.py:25
 msgid "info"
 msgstr "информация"
 
-#: webhooks/models.py:25
+#: webhooks/models.py:26
 msgid "success"
 msgstr "успешно"
 
-#: webhooks/models.py:26
+#: webhooks/models.py:27
 msgid "warning"
 msgstr "предостережение"
 
-#: webhooks/models.py:36
+#: webhooks/models.py:37
 msgid "Discord Webhook"
 msgstr "Discord Webhook"
 
-#: webhooks/models.py:43
+#: webhooks/models.py:44
 msgid "Short name to identify this webhook"
 msgstr "Короткое имя для определения вебхука"
 
-#: webhooks/models.py:46
+#: webhooks/models.py:47
 msgid "url"
 msgstr "url"
 
-#: webhooks/models.py:50
+#: webhooks/models.py:51
 msgid ""
 "URL of this webhook, e.g. https://discordapp.com/api/webhooks/123456/abcdef"
 msgstr "URL вебхука"
 
-#: webhooks/models.py:55
+#: webhooks/models.py:56
 msgid "notes"
 msgstr "заметки"
 
-#: webhooks/models.py:59
+#: webhooks/models.py:60
 msgid "Notes regarding this webhook"
 msgstr "Заметки для вебхука"
 
-#: webhooks/models.py:62
+#: webhooks/models.py:63
 msgid "webhook type"
 msgstr "тип вебхука"
 
-#: webhooks/models.py:65
+#: webhooks/models.py:66
 msgid "Type of this webhook"
 msgstr "Тип вебхука"
 
-#: webhooks/models.py:70
+#: webhooks/models.py:71
 msgid "Whether notifications are currently sent to this webhook"
 msgstr "Отправляются ли в данный момент уведомления на вебхук"