diff --git a/allianceauth/locale/de/LC_MESSAGES/django.mo b/allianceauth/locale/de/LC_MESSAGES/django.mo index 18274065..bc356343 100644 Binary files a/allianceauth/locale/de/LC_MESSAGES/django.mo and b/allianceauth/locale/de/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/de/LC_MESSAGES/django.po b/allianceauth/locale/de/LC_MESSAGES/django.po index 034a710a..8e8298fb 100644 --- a/allianceauth/locale/de/LC_MESSAGES/django.po +++ b/allianceauth/locale/de/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-29 04:56+0000\n" +"POT-Creation-Date: 2020-09-21 01:35+0000\n" "PO-Revision-Date: 2020-02-18 03:14+0000\n" "Last-Translator: Rounon Dax , 2020\n" "Language-Team: German (https://www.transifex.com/alliance-auth/teams/107430/de/)\n" @@ -44,7 +44,7 @@ msgstr "Dein Nutzerstatus ist nun %(state)s" #: allianceauth/authentication/templates/authentication/dashboard.html:5 #: allianceauth/authentication/templates/authentication/dashboard.html:8 -#: allianceauth/templates/allianceauth/side-menu.html:12 +#: allianceauth/templates/allianceauth/side-menu.html:11 msgid "Dashboard" msgstr "Dashboard" @@ -552,6 +552,11 @@ msgstr "Flottenteilnahme registriert." msgid "FAT link has expired." msgstr "FAT-Link ist abgelaufen." +#: allianceauth/groupmanagement/auth_hooks.py:16 +#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 +msgid "Group Management" +msgstr "Gruppenverwaltung" + #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:5 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:13 msgid "Audit Log" @@ -624,7 +629,7 @@ msgstr "Gruppenmitgliedschaft" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40 -#: allianceauth/templates/allianceauth/side-menu.html:17 +#: allianceauth/templates/allianceauth/side-menu.html:16 msgid "Groups" msgstr "Gruppen" @@ -638,7 +643,7 @@ msgstr "Beschreibung" #: allianceauth/hrapplications/templates/hrapplications/management.html:85 #: allianceauth/hrapplications/templates/hrapplications/management.html:130 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:27 -#: allianceauth/srp/templates/srp/data.html:97 +#: allianceauth/srp/templates/srp/data.html:98 msgid "Status" msgstr "Status" @@ -738,11 +743,6 @@ msgstr "Keine Gruppenaustrittsanfragen" msgid "Toggle navigation" msgstr "Toggle Navigation" -#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 -#: allianceauth/templates/allianceauth/side-menu.html:25 -msgid "Group Management" -msgstr "Gruppenverwaltung" - #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:21 msgid "Group Requests" msgstr "Gruppenanfragen" @@ -825,7 +825,7 @@ msgstr "Du hast Dich bereits für diese Gruppe beworben." #: allianceauth/hrapplications/templates/hrapplications/management.html:144 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38 #: allianceauth/hrapplications/templates/hrapplications/view.html:20 -#: allianceauth/srp/templates/srp/data.html:125 +#: allianceauth/srp/templates/srp/data.html:128 #: allianceauth/srp/templates/srp/management.html:81 msgid "Pending" msgstr "Beantragt" @@ -852,7 +852,7 @@ msgstr "Du hast bereits ein ausstehendes Austrittsgesuch für diese Gruppe." msgid "Applied to leave group %(group)s." msgstr "Austrittsgesuch für Gruppe %(group)s gesendet." -#: allianceauth/hrapplications/auth_hooks.py:10 +#: allianceauth/hrapplications/auth_hooks.py:13 msgid "Applications" msgstr "Bewerbungen" @@ -909,7 +909,7 @@ msgstr "Benutzername" #: allianceauth/hrapplications/templates/hrapplications/management.html:131 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:28 #: allianceauth/hrapplications/templates/hrapplications/view.html:75 -#: allianceauth/srp/templates/srp/data.html:99 +#: allianceauth/srp/templates/srp/data.html:100 #: allianceauth/srp/templates/srp/management.html:46 msgid "Actions" msgstr "Aktionen" @@ -919,7 +919,7 @@ msgstr "Aktionen" #: allianceauth/hrapplications/templates/hrapplications/management.html:147 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40 #: allianceauth/hrapplications/templates/hrapplications/view.html:16 -#: allianceauth/srp/templates/srp/data.html:117 +#: allianceauth/srp/templates/srp/data.html:120 msgid "Approved" msgstr "Akzeptiert" @@ -927,7 +927,7 @@ msgstr "Akzeptiert" #: allianceauth/hrapplications/templates/hrapplications/management.html:104 #: allianceauth/hrapplications/templates/hrapplications/management.html:149 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42 -#: allianceauth/srp/templates/srp/data.html:121 +#: allianceauth/srp/templates/srp/data.html:124 msgid "Rejected" msgstr "Abgelehnt" @@ -1033,7 +1033,7 @@ msgstr "Ungelesen" #: allianceauth/notifications/templates/notifications/list.html:18 msgid "Read" -msgstr "Lesen" +msgstr "Gelesen" #: allianceauth/notifications/templates/notifications/list.html:22 msgid "Mark All Read" @@ -1628,7 +1628,7 @@ msgstr "Dienst" msgid "Domain" msgstr "Domain" -#: allianceauth/srp/auth_hooks.py:9 +#: allianceauth/srp/auth_hooks.py:12 msgid "Ship Replacement" msgstr "Schiffserstattung" @@ -1642,7 +1642,7 @@ msgstr "Flottenzeit" msgid "Fleet Doctrine" msgstr "Flottendoktrin" -#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:89 +#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:90 msgid "Additional Info" msgstr "Zusätzliche Info" @@ -1671,65 +1671,65 @@ msgstr "SRP-Flotte erstellen" msgid "Give this link to the line members" msgstr "Gib diesen Link an Deine Piloten weiter" -#: allianceauth/srp/templates/srp/data.html:48 +#: allianceauth/srp/templates/srp/data.html:49 msgid "SRP Fleet Data" msgstr "SRP-Flotte Daten" -#: allianceauth/srp/templates/srp/data.html:53 +#: allianceauth/srp/templates/srp/data.html:54 msgid "Mark Incomplete" msgstr "Als unvollständig markieren" -#: allianceauth/srp/templates/srp/data.html:57 +#: allianceauth/srp/templates/srp/data.html:58 msgid "Mark Completed" msgstr "Als vollständig markieren" -#: allianceauth/srp/templates/srp/data.html:69 -#: allianceauth/srp/templates/srp/data.html:145 +#: allianceauth/srp/templates/srp/data.html:70 +#: allianceauth/srp/templates/srp/data.html:150 msgid "Total Losses:" msgstr "Verluste insgesamt:" -#: allianceauth/srp/templates/srp/data.html:70 -#: allianceauth/srp/templates/srp/data.html:146 +#: allianceauth/srp/templates/srp/data.html:71 +#: allianceauth/srp/templates/srp/data.html:151 #: allianceauth/srp/templates/srp/management.html:30 msgid "Total ISK Cost:" msgstr "ISK-Kosten insgesamt:" -#: allianceauth/srp/templates/srp/data.html:78 -#: allianceauth/srp/templates/srp/data.html:154 +#: allianceauth/srp/templates/srp/data.html:79 +#: allianceauth/srp/templates/srp/data.html:159 msgid "Are you sure you want to delete SRP requests?" msgstr "Bist Du sicher das Du SRP Anfragen löschen willst?" -#: allianceauth/srp/templates/srp/data.html:87 +#: allianceauth/srp/templates/srp/data.html:88 msgid "Pilot Name" msgstr "Name des Piloten" -#: allianceauth/srp/templates/srp/data.html:88 +#: allianceauth/srp/templates/srp/data.html:89 msgid "Killboard Link" msgstr "Killboard Link" -#: allianceauth/srp/templates/srp/data.html:90 +#: allianceauth/srp/templates/srp/data.html:91 msgid "Ship Type" msgstr "Schiffstyp" -#: allianceauth/srp/templates/srp/data.html:91 +#: allianceauth/srp/templates/srp/data.html:92 msgid "Killboard Loss Amt" msgstr "Summe Killboard Verluste" -#: allianceauth/srp/templates/srp/data.html:92 +#: allianceauth/srp/templates/srp/data.html:93 msgid "SRP ISK Cost" msgstr "SRP ISK-Kosten" -#: allianceauth/srp/templates/srp/data.html:93 +#: allianceauth/srp/templates/srp/data.html:94 msgid "Click value to edit Enter to save & next ESC to cancel" msgstr "" "Klicke auf den Wert um diesen zu bearbeiten, Enter zum Speichern und um zum " "nächsten Wert zu springen, ESC zum Beenden." -#: allianceauth/srp/templates/srp/data.html:96 +#: allianceauth/srp/templates/srp/data.html:97 msgid "Post Time" msgstr "Veröffentlichungszeit" -#: allianceauth/srp/templates/srp/data.html:163 +#: allianceauth/srp/templates/srp/data.html:168 msgid "No SRP requests for this fleet." msgstr "Keine SRP Anfragen für diese Flotte." diff --git a/allianceauth/locale/en/LC_MESSAGES/django.po b/allianceauth/locale/en/LC_MESSAGES/django.po index 55395801..c172b7fc 100644 --- a/allianceauth/locale/en/LC_MESSAGES/django.po +++ b/allianceauth/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-29 04:56+0000\n" +"POT-Creation-Date: 2020-09-21 01:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,7 +38,7 @@ msgstr "" #: allianceauth/authentication/templates/authentication/dashboard.html:5 #: allianceauth/authentication/templates/authentication/dashboard.html:8 -#: allianceauth/templates/allianceauth/side-menu.html:12 +#: allianceauth/templates/allianceauth/side-menu.html:11 msgid "Dashboard" msgstr "" @@ -535,6 +535,11 @@ msgstr "" msgid "FAT link has expired." msgstr "" +#: allianceauth/groupmanagement/auth_hooks.py:16 +#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 +msgid "Group Management" +msgstr "" + #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:5 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:13 msgid "Audit Log" @@ -607,7 +612,7 @@ msgstr "" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40 -#: allianceauth/templates/allianceauth/side-menu.html:17 +#: allianceauth/templates/allianceauth/side-menu.html:16 msgid "Groups" msgstr "" @@ -621,7 +626,7 @@ msgstr "" #: allianceauth/hrapplications/templates/hrapplications/management.html:85 #: allianceauth/hrapplications/templates/hrapplications/management.html:130 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:27 -#: allianceauth/srp/templates/srp/data.html:97 +#: allianceauth/srp/templates/srp/data.html:98 msgid "Status" msgstr "" @@ -721,11 +726,6 @@ msgstr "" msgid "Toggle navigation" msgstr "" -#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 -#: allianceauth/templates/allianceauth/side-menu.html:25 -msgid "Group Management" -msgstr "" - #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:21 msgid "Group Requests" msgstr "" @@ -804,7 +804,7 @@ msgstr "" #: allianceauth/hrapplications/templates/hrapplications/management.html:144 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38 #: allianceauth/hrapplications/templates/hrapplications/view.html:20 -#: allianceauth/srp/templates/srp/data.html:125 +#: allianceauth/srp/templates/srp/data.html:128 #: allianceauth/srp/templates/srp/management.html:81 msgid "Pending" msgstr "" @@ -831,7 +831,7 @@ msgstr "" msgid "Applied to leave group %(group)s." msgstr "" -#: allianceauth/hrapplications/auth_hooks.py:10 +#: allianceauth/hrapplications/auth_hooks.py:13 msgid "Applications" msgstr "" @@ -888,7 +888,7 @@ msgstr "" #: allianceauth/hrapplications/templates/hrapplications/management.html:131 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:28 #: allianceauth/hrapplications/templates/hrapplications/view.html:75 -#: allianceauth/srp/templates/srp/data.html:99 +#: allianceauth/srp/templates/srp/data.html:100 #: allianceauth/srp/templates/srp/management.html:46 msgid "Actions" msgstr "" @@ -898,7 +898,7 @@ msgstr "" #: allianceauth/hrapplications/templates/hrapplications/management.html:147 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40 #: allianceauth/hrapplications/templates/hrapplications/view.html:16 -#: allianceauth/srp/templates/srp/data.html:117 +#: allianceauth/srp/templates/srp/data.html:120 msgid "Approved" msgstr "" @@ -906,7 +906,7 @@ msgstr "" #: allianceauth/hrapplications/templates/hrapplications/management.html:104 #: allianceauth/hrapplications/templates/hrapplications/management.html:149 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42 -#: allianceauth/srp/templates/srp/data.html:121 +#: allianceauth/srp/templates/srp/data.html:124 msgid "Rejected" msgstr "" @@ -1595,7 +1595,7 @@ msgstr "" msgid "Domain" msgstr "" -#: allianceauth/srp/auth_hooks.py:9 +#: allianceauth/srp/auth_hooks.py:12 msgid "Ship Replacement" msgstr "" @@ -1607,7 +1607,7 @@ msgstr "" msgid "Fleet Doctrine" msgstr "" -#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:89 +#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:90 msgid "Additional Info" msgstr "" @@ -1636,63 +1636,63 @@ msgstr "" msgid "Give this link to the line members" msgstr "" -#: allianceauth/srp/templates/srp/data.html:48 +#: allianceauth/srp/templates/srp/data.html:49 msgid "SRP Fleet Data" msgstr "" -#: allianceauth/srp/templates/srp/data.html:53 +#: allianceauth/srp/templates/srp/data.html:54 msgid "Mark Incomplete" msgstr "" -#: allianceauth/srp/templates/srp/data.html:57 +#: allianceauth/srp/templates/srp/data.html:58 msgid "Mark Completed" msgstr "" -#: allianceauth/srp/templates/srp/data.html:69 -#: allianceauth/srp/templates/srp/data.html:145 +#: allianceauth/srp/templates/srp/data.html:70 +#: allianceauth/srp/templates/srp/data.html:150 msgid "Total Losses:" msgstr "" -#: allianceauth/srp/templates/srp/data.html:70 -#: allianceauth/srp/templates/srp/data.html:146 +#: allianceauth/srp/templates/srp/data.html:71 +#: allianceauth/srp/templates/srp/data.html:151 #: allianceauth/srp/templates/srp/management.html:30 msgid "Total ISK Cost:" msgstr "" -#: allianceauth/srp/templates/srp/data.html:78 -#: allianceauth/srp/templates/srp/data.html:154 +#: allianceauth/srp/templates/srp/data.html:79 +#: allianceauth/srp/templates/srp/data.html:159 msgid "Are you sure you want to delete SRP requests?" msgstr "" -#: allianceauth/srp/templates/srp/data.html:87 +#: allianceauth/srp/templates/srp/data.html:88 msgid "Pilot Name" msgstr "" -#: allianceauth/srp/templates/srp/data.html:88 +#: allianceauth/srp/templates/srp/data.html:89 msgid "Killboard Link" msgstr "" -#: allianceauth/srp/templates/srp/data.html:90 +#: allianceauth/srp/templates/srp/data.html:91 msgid "Ship Type" msgstr "" -#: allianceauth/srp/templates/srp/data.html:91 +#: allianceauth/srp/templates/srp/data.html:92 msgid "Killboard Loss Amt" msgstr "" -#: allianceauth/srp/templates/srp/data.html:92 +#: allianceauth/srp/templates/srp/data.html:93 msgid "SRP ISK Cost" msgstr "" -#: allianceauth/srp/templates/srp/data.html:93 +#: allianceauth/srp/templates/srp/data.html:94 msgid "Click value to edit Enter to save & next ESC to cancel" msgstr "" -#: allianceauth/srp/templates/srp/data.html:96 +#: allianceauth/srp/templates/srp/data.html:97 msgid "Post Time" msgstr "" -#: allianceauth/srp/templates/srp/data.html:163 +#: allianceauth/srp/templates/srp/data.html:168 msgid "No SRP requests for this fleet." msgstr "" diff --git a/allianceauth/locale/es/LC_MESSAGES/django.mo b/allianceauth/locale/es/LC_MESSAGES/django.mo index f83c7794..f203b6cc 100644 Binary files a/allianceauth/locale/es/LC_MESSAGES/django.mo and b/allianceauth/locale/es/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/es/LC_MESSAGES/django.po b/allianceauth/locale/es/LC_MESSAGES/django.po index d7c4250b..3d7307be 100644 --- a/allianceauth/locale/es/LC_MESSAGES/django.po +++ b/allianceauth/locale/es/LC_MESSAGES/django.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-08 00:57+0000\n" +"POT-Creation-Date: 2020-09-21 01:35+0000\n" "PO-Revision-Date: 2020-02-18 03:14+0000\n" "Last-Translator: frank1210 , 2020\n" "Language-Team: Spanish (https://www.transifex.com/alliance-auth/teams/107430/es/)\n" @@ -31,55 +31,53 @@ msgstr "" msgid "Email" msgstr "E-mail" -#: allianceauth/authentication/models.py:76 -msgid "State Changed" -msgstr "Estado Cambiado" - -#: allianceauth/authentication/models.py:77 +#: allianceauth/authentication/models.py:78 #, python-format -msgid "Your user state has been changed to %(state)s" -msgstr "Tu estado de usuario fue cambiado a %(state)s" +msgid "State changed to: %s" +msgstr "" + +#: allianceauth/authentication/models.py:79 +#, python-format +msgid "Your user's state is now: %(state)s" +msgstr "" #: allianceauth/authentication/templates/authentication/dashboard.html:5 #: allianceauth/authentication/templates/authentication/dashboard.html:8 -#: allianceauth/templates/allianceauth/side-menu.html:10 +#: allianceauth/templates/allianceauth/side-menu.html:11 msgid "Dashboard" msgstr "Pagina Principal" -#: allianceauth/authentication/templates/authentication/dashboard.html:17 -#: allianceauth/corputils/templates/corputils/corpstats.html:116 -#: allianceauth/corputils/templates/corputils/search.html:16 -#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22 -#: allianceauth/hrapplications/templates/hrapplications/management.html:83 -#: allianceauth/hrapplications/templates/hrapplications/management.html:128 -#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25 -#: allianceauth/hrapplications/templates/hrapplications/view.html:32 -msgid "Main Character" -msgstr "Personaje Principal" +#: allianceauth/authentication/templates/authentication/dashboard.html:18 +#, python-format +msgid "" +"\n" +" Main Character (State: %(state)s)\n" +" " +msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.html:77 +#: allianceauth/authentication/templates/authentication/dashboard.html:81 msgid "No main character set." msgstr "No se ha seleccionado un personaje principal." -#: allianceauth/authentication/templates/authentication/dashboard.html:84 +#: allianceauth/authentication/templates/authentication/dashboard.html:88 msgid "Add Character" msgstr "Agregar Personaje" -#: allianceauth/authentication/templates/authentication/dashboard.html:88 +#: allianceauth/authentication/templates/authentication/dashboard.html:92 msgid "Change Main" msgstr "Cambiar Personaje Principal" -#: allianceauth/authentication/templates/authentication/dashboard.html:97 +#: allianceauth/authentication/templates/authentication/dashboard.html:101 msgid "Group Memberships" msgstr "" -#: allianceauth/authentication/templates/authentication/dashboard.html:117 +#: allianceauth/authentication/templates/authentication/dashboard.html:121 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:23 #: allianceauth/hrapplications/templates/hrapplications/view.html:41 msgid "Characters" msgstr "Personajes" -#: allianceauth/authentication/templates/authentication/dashboard.html:125 +#: allianceauth/authentication/templates/authentication/dashboard.html:129 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:73 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:22 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:15 @@ -88,13 +86,13 @@ msgstr "Personajes" msgid "Name" msgstr "Nombre" -#: allianceauth/authentication/templates/authentication/dashboard.html:126 +#: allianceauth/authentication/templates/authentication/dashboard.html:130 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:23 #: allianceauth/hrapplications/templates/hrapplications/view.html:46 msgid "Corp" msgstr "Corporación" -#: allianceauth/authentication/templates/authentication/dashboard.html:127 +#: allianceauth/authentication/templates/authentication/dashboard.html:131 #: allianceauth/corputils/templates/corputils/corpstats.html:77 #: allianceauth/hrapplications/templates/hrapplications/view.html:47 msgid "Alliance" @@ -231,8 +229,8 @@ msgstr "Ultima Actualizacion:" #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:28 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:27 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:37 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:96 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:51 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:110 msgid "Character" msgstr "Personaje" @@ -254,6 +252,16 @@ msgstr "Corporacion" msgid "Killboard" msgstr "Killboard" +#: allianceauth/corputils/templates/corputils/corpstats.html:116 +#: allianceauth/corputils/templates/corputils/search.html:16 +#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22 +#: allianceauth/hrapplications/templates/hrapplications/management.html:83 +#: allianceauth/hrapplications/templates/hrapplications/management.html:128 +#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25 +#: allianceauth/hrapplications/templates/hrapplications/view.html:32 +msgid "Main Character" +msgstr "Personaje Principal" + #: allianceauth/corputils/templates/corputils/corpstats.html:117 #: allianceauth/corputils/templates/corputils/search.html:17 msgid "Main Corporation" @@ -538,6 +546,11 @@ msgstr "Participacion de flota registrada." msgid "FAT link has expired." msgstr "Enlace de participacion expirado." +#: allianceauth/groupmanagement/auth_hooks.py:16 +#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 +msgid "Group Management" +msgstr "Manejo de Grupo" + #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:5 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:13 msgid "Audit Log" @@ -590,8 +603,8 @@ msgid "Portrait" msgstr "Retrato" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:30 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:38 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:52 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:111 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:23 msgid "Organization" msgstr "" @@ -610,7 +623,7 @@ msgstr "Membresia de grupos" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40 -#: allianceauth/templates/allianceauth/side-menu.html:15 +#: allianceauth/templates/allianceauth/side-menu.html:16 msgid "Groups" msgstr "Grupos" @@ -624,7 +637,7 @@ msgstr "Descripcion" #: allianceauth/hrapplications/templates/hrapplications/management.html:85 #: allianceauth/hrapplications/templates/hrapplications/management.html:130 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:27 -#: allianceauth/srp/templates/srp/data.html:97 +#: allianceauth/srp/templates/srp/data.html:98 msgid "Status" msgstr "Estado" @@ -654,7 +667,7 @@ msgid "Audit Members" msgstr "Auditar Miembros" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:56 -msgid "Copy Direrct Join Link" +msgid "Copy Direct Join Link" msgstr "" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:68 @@ -686,37 +699,37 @@ msgstr "No hay grupos disponibles" msgid "Groups Management" msgstr "Manejo de Grupos" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:23 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:25 msgid "Join Requests" msgstr "" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:24 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:33 msgid "Leave Requests" msgstr "" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:39 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:98 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:53 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:20 #: allianceauth/services/modules/openfire/forms.py:6 msgid "Group" msgstr "Grupo" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:71 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:130 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:85 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:144 msgid "Accept" msgstr "Aceptar" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:74 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:133 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:88 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:147 #: allianceauth/hrapplications/templates/hrapplications/view.html:85 msgid "Reject" msgstr "Rechazar" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:83 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97 msgid "No group add requests." msgstr "No hay solicitudes de ingreso." -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:142 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:156 msgid "No group leave requests." msgstr "No hay solicitudes paradejar el grupo." @@ -724,11 +737,6 @@ msgstr "No hay solicitudes paradejar el grupo." msgid "Toggle navigation" msgstr "Navegacion" -#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 -#: allianceauth/templates/allianceauth/side-menu.html:23 -msgid "Group Management" -msgstr "Manejo de Grupo" - #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:21 msgid "Group Requests" msgstr "Solicitudes de Grupo" @@ -737,26 +745,26 @@ msgstr "Solicitudes de Grupo" msgid "Group Membership" msgstr "Membresia de Grupo" -#: allianceauth/groupmanagement/views.py:166 +#: allianceauth/groupmanagement/views.py:162 #, python-format msgid "Removed user %(user)s from group %(group)s." msgstr "El usuario %(user)s fue removido del grupo %(group)s" -#: allianceauth/groupmanagement/views.py:168 +#: allianceauth/groupmanagement/views.py:164 msgid "User does not exist in that group" msgstr "El usuario no existe en ese grupos" -#: allianceauth/groupmanagement/views.py:171 +#: allianceauth/groupmanagement/views.py:167 msgid "Group does not exist" msgstr "El grupo no existe" -#: allianceauth/groupmanagement/views.py:198 +#: allianceauth/groupmanagement/views.py:194 #, python-format msgid "Accepted application from %(mainchar)s to %(group)s." msgstr "Solicitud aceptada de %(mainchar)s a %(group)s" -#: allianceauth/groupmanagement/views.py:205 -#: allianceauth/groupmanagement/views.py:238 +#: allianceauth/groupmanagement/views.py:201 +#: allianceauth/groupmanagement/views.py:234 #, python-format msgid "" "An unhandled error occurred while processing the application from " @@ -765,79 +773,79 @@ msgstr "" "Ocurrio un error cuando se intento procesar la informacion de %(mainchar)s " "al grupo %(group)s." -#: allianceauth/groupmanagement/views.py:231 +#: allianceauth/groupmanagement/views.py:227 #, python-format msgid "Rejected application from %(mainchar)s to %(group)s." msgstr "Se rechazo la solicitud de %(mainchar)s al grupo %(group)s." -#: allianceauth/groupmanagement/views.py:267 +#: allianceauth/groupmanagement/views.py:263 #, python-format msgid "Accepted application from %(mainchar)s to leave %(group)s." msgstr "Se acepto la solicitud de %(mainchar)s para dejar el grupo %(group)s." -#: allianceauth/groupmanagement/views.py:273 -#: allianceauth/groupmanagement/views.py:307 +#: allianceauth/groupmanagement/views.py:269 +#: allianceauth/groupmanagement/views.py:303 #, python-format msgid "" "An unhandled error occurred while processing the application from " "%(mainchar)s to leave %(group)s." msgstr "" -#: allianceauth/groupmanagement/views.py:300 +#: allianceauth/groupmanagement/views.py:296 #, python-format msgid "Rejected application from %(mainchar)s to leave %(group)s." msgstr "" "Se rechazo la solicitud de %(mainchar)s para dejar el grupo %(group)s." -#: allianceauth/groupmanagement/views.py:346 -#: allianceauth/groupmanagement/views.py:358 +#: allianceauth/groupmanagement/views.py:342 +#: allianceauth/groupmanagement/views.py:354 msgid "You cannot join that group" msgstr "No puedes unirte a ese grupo" -#: allianceauth/groupmanagement/views.py:352 +#: allianceauth/groupmanagement/views.py:348 msgid "You are already a member of that group." msgstr "" -#: allianceauth/groupmanagement/views.py:367 +#: allianceauth/groupmanagement/views.py:363 msgid "You already have a pending application for that group." msgstr "" -#: allianceauth/groupmanagement/views.py:370 -#: allianceauth/groupmanagement/views.py:408 +#: allianceauth/groupmanagement/views.py:366 +#: allianceauth/groupmanagement/views.py:404 #: allianceauth/hrapplications/templates/hrapplications/management.html:37 #: allianceauth/hrapplications/templates/hrapplications/management.html:72 #: allianceauth/hrapplications/templates/hrapplications/management.html:99 #: allianceauth/hrapplications/templates/hrapplications/management.html:144 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38 #: allianceauth/hrapplications/templates/hrapplications/view.html:20 -#: allianceauth/srp/templates/srp/data.html:125 +#: allianceauth/srp/templates/srp/data.html:128 #: allianceauth/srp/templates/srp/management.html:81 msgid "Pending" msgstr "Pendiente" -#: allianceauth/groupmanagement/views.py:376 +#: allianceauth/groupmanagement/views.py:372 #, python-format msgid "Applied to group %(group)s." msgstr "Solicitud enviada al grupo %(group)s." -#: allianceauth/groupmanagement/views.py:387 +#: allianceauth/groupmanagement/views.py:383 msgid "You cannot leave that group" msgstr "No puedes dejar el grupos" -#: allianceauth/groupmanagement/views.py:392 +#: allianceauth/groupmanagement/views.py:388 msgid "You are not a member of that group" msgstr "No eres miembro de ese grupo" -#: allianceauth/groupmanagement/views.py:401 +#: allianceauth/groupmanagement/views.py:397 msgid "You already have a pending leave request for that group." msgstr "" -#: allianceauth/groupmanagement/views.py:414 +#: allianceauth/groupmanagement/views.py:410 #, python-format msgid "Applied to leave group %(group)s." msgstr "Solicitaste dejar el grupo %(group)s." -#: allianceauth/hrapplications/auth_hooks.py:10 +#: allianceauth/hrapplications/auth_hooks.py:13 msgid "Applications" msgstr "Solicitudes" @@ -894,7 +902,7 @@ msgstr "Usuario" #: allianceauth/hrapplications/templates/hrapplications/management.html:131 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:28 #: allianceauth/hrapplications/templates/hrapplications/view.html:75 -#: allianceauth/srp/templates/srp/data.html:99 +#: allianceauth/srp/templates/srp/data.html:100 #: allianceauth/srp/templates/srp/management.html:46 msgid "Actions" msgstr "Acciones" @@ -904,7 +912,7 @@ msgstr "Acciones" #: allianceauth/hrapplications/templates/hrapplications/management.html:147 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40 #: allianceauth/hrapplications/templates/hrapplications/view.html:16 -#: allianceauth/srp/templates/srp/data.html:117 +#: allianceauth/srp/templates/srp/data.html:120 msgid "Approved" msgstr "Aprovado" @@ -912,7 +920,7 @@ msgstr "Aprovado" #: allianceauth/hrapplications/templates/hrapplications/management.html:104 #: allianceauth/hrapplications/templates/hrapplications/management.html:149 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42 -#: allianceauth/srp/templates/srp/data.html:121 +#: allianceauth/srp/templates/srp/data.html:124 msgid "Rejected" msgstr "Rechazado" @@ -1295,22 +1303,49 @@ msgstr "Contraseña" msgid "Password must be at least 8 characters long." msgstr "La contraseña tiene que tener 8 caracteres de largo minimo" -#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:23 +#: allianceauth/services/modules/discord/models.py:224 +msgid "Discord Account Disabled" +msgstr "" + +#: allianceauth/services/modules/discord/models.py:226 +msgid "" +"Your Discord account was disabeled automatically by Auth. If you think this " +"was a mistake, please contact an admin." +msgstr "" + +#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:18 +msgid "Join the Discord server" +msgstr "" + +#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:22 +msgid "Leave- and rejoin the Discord Server (Reset)" +msgstr "" + +#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:25 +msgid "Leave the Discord server" +msgstr "" + +#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:32 msgid "Link Discord Server" msgstr "Enlace a servidor de Discord" -#: allianceauth/services/modules/discord/views.py:26 +#: allianceauth/services/modules/discord/views.py:30 msgid "Deactivated Discord account." msgstr "" -#: allianceauth/services/modules/discord/views.py:29 -#: allianceauth/services/modules/discord/views.py:41 -#: allianceauth/services/modules/discord/views.py:65 +#: allianceauth/services/modules/discord/views.py:36 +#: allianceauth/services/modules/discord/views.py:59 msgid "An error occurred while processing your Discord account." msgstr "" -#: allianceauth/services/modules/discord/views.py:62 -msgid "Activated Discord account." +#: allianceauth/services/modules/discord/views.py:102 +msgid "Your Discord account has been successfully activated." +msgstr "" + +#: allianceauth/services/modules/discord/views.py:108 +msgid "" +"An error occurred while trying to activate your Discord account. Please try " +"again." msgstr "" #: allianceauth/services/modules/discourse/views.py:37 @@ -1575,7 +1610,7 @@ msgstr "Servicio" msgid "Domain" msgstr "Dominio" -#: allianceauth/srp/auth_hooks.py:9 +#: allianceauth/srp/auth_hooks.py:12 msgid "Ship Replacement" msgstr "Reemplazo de Nave" @@ -1589,7 +1624,7 @@ msgstr "Hora de flota" msgid "Fleet Doctrine" msgstr "Doctrina" -#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:89 +#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:90 msgid "Additional Info" msgstr "Informacion Adicional" @@ -1618,63 +1653,63 @@ msgstr "Crear SRP" msgid "Give this link to the line members" msgstr "Entregar este enlace a los miembros" -#: allianceauth/srp/templates/srp/data.html:48 +#: allianceauth/srp/templates/srp/data.html:49 msgid "SRP Fleet Data" msgstr "Informacion de SRP de la flota" -#: allianceauth/srp/templates/srp/data.html:53 +#: allianceauth/srp/templates/srp/data.html:54 msgid "Mark Incomplete" msgstr "Marcar como Incompleto" -#: allianceauth/srp/templates/srp/data.html:57 +#: allianceauth/srp/templates/srp/data.html:58 msgid "Mark Completed" msgstr "Marcar como Completo" -#: allianceauth/srp/templates/srp/data.html:69 -#: allianceauth/srp/templates/srp/data.html:145 +#: allianceauth/srp/templates/srp/data.html:70 +#: allianceauth/srp/templates/srp/data.html:150 msgid "Total Losses:" msgstr "Perdidas Totales:" -#: allianceauth/srp/templates/srp/data.html:70 -#: allianceauth/srp/templates/srp/data.html:146 +#: allianceauth/srp/templates/srp/data.html:71 +#: allianceauth/srp/templates/srp/data.html:151 #: allianceauth/srp/templates/srp/management.html:30 msgid "Total ISK Cost:" msgstr "Costo Total:" -#: allianceauth/srp/templates/srp/data.html:78 -#: allianceauth/srp/templates/srp/data.html:154 +#: allianceauth/srp/templates/srp/data.html:79 +#: allianceauth/srp/templates/srp/data.html:159 msgid "Are you sure you want to delete SRP requests?" msgstr "Estas seguro que quiere borrar las solicitudes de SRP" -#: allianceauth/srp/templates/srp/data.html:87 +#: allianceauth/srp/templates/srp/data.html:88 msgid "Pilot Name" msgstr "Nombre del Piloto" -#: allianceauth/srp/templates/srp/data.html:88 +#: allianceauth/srp/templates/srp/data.html:89 msgid "Killboard Link" msgstr "Enlace de la Muerte" -#: allianceauth/srp/templates/srp/data.html:90 +#: allianceauth/srp/templates/srp/data.html:91 msgid "Ship Type" msgstr "Tipo" -#: allianceauth/srp/templates/srp/data.html:91 +#: allianceauth/srp/templates/srp/data.html:92 msgid "Killboard Loss Amt" msgstr "Monto de la perdida en ZKB" -#: allianceauth/srp/templates/srp/data.html:92 +#: allianceauth/srp/templates/srp/data.html:93 msgid "SRP ISK Cost" msgstr "Costo del SRP" -#: allianceauth/srp/templates/srp/data.html:93 +#: allianceauth/srp/templates/srp/data.html:94 msgid "Click value to edit Enter to save & next ESC to cancel" msgstr "" -#: allianceauth/srp/templates/srp/data.html:96 +#: allianceauth/srp/templates/srp/data.html:97 msgid "Post Time" msgstr "Tiempo" -#: allianceauth/srp/templates/srp/data.html:163 +#: allianceauth/srp/templates/srp/data.html:168 msgid "No SRP requests for this fleet." msgstr "No hay solicitudes de SRP para esta flota." @@ -1866,32 +1901,30 @@ msgid "Current" msgstr "Actual" #: allianceauth/templates/allianceauth/admin-status/overview.html:40 -msgid "Latest Major" -msgstr "Ultimo Importante" +msgid "Latest Stable" +msgstr "" #: allianceauth/templates/allianceauth/admin-status/overview.html:46 -#: allianceauth/templates/allianceauth/admin-status/overview.html:56 -#: allianceauth/templates/allianceauth/admin-status/overview.html:66 msgid "Update available" msgstr "Actualizacion Disponible" -#: allianceauth/templates/allianceauth/admin-status/overview.html:50 -msgid "Latest Minor" -msgstr "Ultimo no importante" +#: allianceauth/templates/allianceauth/admin-status/overview.html:51 +msgid "Latest Pre-Release" +msgstr "" -#: allianceauth/templates/allianceauth/admin-status/overview.html:60 -msgid "Latest Patch" -msgstr "Ultimo Parche" +#: allianceauth/templates/allianceauth/admin-status/overview.html:57 +msgid "Pre-Release available" +msgstr "" -#: allianceauth/templates/allianceauth/admin-status/overview.html:73 +#: allianceauth/templates/allianceauth/admin-status/overview.html:65 msgid "Task Queue" msgstr "Cola de Tareas" -#: allianceauth/templates/allianceauth/admin-status/overview.html:90 +#: allianceauth/templates/allianceauth/admin-status/overview.html:82 msgid "Error retrieving task queue length" msgstr "Error al conseguir la cola de tareas" -#: allianceauth/templates/allianceauth/admin-status/overview.html:92 +#: allianceauth/templates/allianceauth/admin-status/overview.html:84 #, python-format msgid "%(tasks)s task" msgid_plural "%(tasks)s tasks" diff --git a/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo b/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo index 46b18838..2923f1b1 100644 Binary files a/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo and b/allianceauth/locale/ko_KR/LC_MESSAGES/django.mo differ diff --git a/allianceauth/locale/ko_KR/LC_MESSAGES/django.po b/allianceauth/locale/ko_KR/LC_MESSAGES/django.po index 29a02601..0445121d 100644 --- a/allianceauth/locale/ko_KR/LC_MESSAGES/django.po +++ b/allianceauth/locale/ko_KR/LC_MESSAGES/django.po @@ -4,19 +4,19 @@ # FIRST AUTHOR , YEAR. # # Translators: -# Lahty , 2020 -# Kim Hyundong , 2020 +# None None , 2020 # Seowon Jung , 2020 # Olgeda Choi , 2020 +# Lahty , 2020 # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-08 00:57+0000\n" +"POT-Creation-Date: 2020-09-21 01:35+0000\n" "PO-Revision-Date: 2020-02-18 03:14+0000\n" -"Last-Translator: Olgeda Choi , 2020\n" +"Last-Translator: Lahty , 2020\n" "Language-Team: Korean (Korea) (https://www.transifex.com/alliance-auth/teams/107430/ko_KR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,55 +32,56 @@ msgstr "해당 기능을 수행하려면 주 캐릭터가 요구됨. 아래에 msgid "Email" msgstr "이메일" -#: allianceauth/authentication/models.py:76 -msgid "State Changed" -msgstr "상태 변경됨" - -#: allianceauth/authentication/models.py:77 +#: allianceauth/authentication/models.py:78 #, python-format -msgid "Your user state has been changed to %(state)s" -msgstr "사용자의 상태가 %(state)s변경됨" +msgid "State changed to: %s" +msgstr "상태가 %s로 변경됐습니다." + +#: allianceauth/authentication/models.py:79 +#, python-format +msgid "Your user's state is now: %(state)s" +msgstr "사용자의 상태는 %(state)s입니다." #: allianceauth/authentication/templates/authentication/dashboard.html:5 #: allianceauth/authentication/templates/authentication/dashboard.html:8 -#: allianceauth/templates/allianceauth/side-menu.html:10 +#: allianceauth/templates/allianceauth/side-menu.html:11 msgid "Dashboard" msgstr "대시보드" -#: allianceauth/authentication/templates/authentication/dashboard.html:17 -#: allianceauth/corputils/templates/corputils/corpstats.html:116 -#: allianceauth/corputils/templates/corputils/search.html:16 -#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22 -#: allianceauth/hrapplications/templates/hrapplications/management.html:83 -#: allianceauth/hrapplications/templates/hrapplications/management.html:128 -#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25 -#: allianceauth/hrapplications/templates/hrapplications/view.html:32 -msgid "Main Character" -msgstr "주 캐릭터" +#: allianceauth/authentication/templates/authentication/dashboard.html:18 +#, python-format +msgid "" +"\n" +" Main Character (State: %(state)s)\n" +" " +msgstr "" +"\n" +" 메인 캐릭터 (상태: %(state)s)\n" +" " -#: allianceauth/authentication/templates/authentication/dashboard.html:77 +#: allianceauth/authentication/templates/authentication/dashboard.html:81 msgid "No main character set." msgstr "주 캐릭터가 지정되지 않음" -#: allianceauth/authentication/templates/authentication/dashboard.html:84 +#: allianceauth/authentication/templates/authentication/dashboard.html:88 msgid "Add Character" msgstr "캐릭터 추가" -#: allianceauth/authentication/templates/authentication/dashboard.html:88 +#: allianceauth/authentication/templates/authentication/dashboard.html:92 msgid "Change Main" msgstr "주 캐릭터 변경" -#: allianceauth/authentication/templates/authentication/dashboard.html:97 +#: allianceauth/authentication/templates/authentication/dashboard.html:101 msgid "Group Memberships" msgstr "그룹 멤버쉽" -#: allianceauth/authentication/templates/authentication/dashboard.html:117 +#: allianceauth/authentication/templates/authentication/dashboard.html:121 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:23 #: allianceauth/hrapplications/templates/hrapplications/view.html:41 msgid "Characters" msgstr "캐릭터" -#: allianceauth/authentication/templates/authentication/dashboard.html:125 +#: allianceauth/authentication/templates/authentication/dashboard.html:129 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:73 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:22 #: allianceauth/groupmanagement/templates/groupmanagement/groups.html:15 @@ -89,13 +90,13 @@ msgstr "캐릭터" msgid "Name" msgstr "이름" -#: allianceauth/authentication/templates/authentication/dashboard.html:126 +#: allianceauth/authentication/templates/authentication/dashboard.html:130 #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticsview.html:23 #: allianceauth/hrapplications/templates/hrapplications/view.html:46 msgid "Corp" msgstr "콥" -#: allianceauth/authentication/templates/authentication/dashboard.html:127 +#: allianceauth/authentication/templates/authentication/dashboard.html:131 #: allianceauth/corputils/templates/corputils/corpstats.html:77 #: allianceauth/hrapplications/templates/hrapplications/view.html:47 msgid "Alliance" @@ -151,12 +152,12 @@ msgstr "주 캐릭터가 %(char)s로 변경됨" #: allianceauth/authentication/views.py:89 #, python-format msgid "Added %(name)s to your account." -msgstr "%(name)s을(를) 계정에 추가함" +msgstr "계정에 %(name)s를 추가했습니다." #: allianceauth/authentication/views.py:91 #, python-format msgid "Failed to add %(name)s to your account: they already have an account." -msgstr "%(name)s을(를) 계정에 추가하는데 실패함. 이미 추가되어있음." +msgstr "계정에 %(name)s를 추가하지 못했습니다. 이미 추가된 계정입니다." #: allianceauth/authentication/views.py:130 msgid "Unable to authenticate as the selected character." @@ -227,8 +228,8 @@ msgstr "마지막 업데이트" #: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkview.html:28 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:27 #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:29 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:37 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:96 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:51 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:110 msgid "Character" msgstr "캐릭터" @@ -250,6 +251,16 @@ msgstr "콥" msgid "Killboard" msgstr "킬보드" +#: allianceauth/corputils/templates/corputils/corpstats.html:116 +#: allianceauth/corputils/templates/corputils/search.html:16 +#: allianceauth/fleetactivitytracking/templates/fleetactivitytracking/fatlinkstatisticscorpview.html:22 +#: allianceauth/hrapplications/templates/hrapplications/management.html:83 +#: allianceauth/hrapplications/templates/hrapplications/management.html:128 +#: allianceauth/hrapplications/templates/hrapplications/searchview.html:25 +#: allianceauth/hrapplications/templates/hrapplications/view.html:32 +msgid "Main Character" +msgstr "주 캐릭터" + #: allianceauth/corputils/templates/corputils/corpstats.html:117 #: allianceauth/corputils/templates/corputils/search.html:17 msgid "Main Corporation" @@ -531,6 +542,11 @@ msgstr "플릿 참여 등록됨" msgid "FAT link has expired." msgstr "플릿활동추적 링크 기한만료" +#: allianceauth/groupmanagement/auth_hooks.py:16 +#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 +msgid "Group Management" +msgstr "그룹 관리" + #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:5 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:13 msgid "Audit Log" @@ -583,8 +599,8 @@ msgid "Portrait" msgstr "포트레잇" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembers.html:30 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:38 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:52 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:111 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:23 msgid "Organization" msgstr "조직" @@ -603,7 +619,7 @@ msgstr "그룹 멤버쉽" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40 -#: allianceauth/templates/allianceauth/side-menu.html:15 +#: allianceauth/templates/allianceauth/side-menu.html:16 msgid "Groups" msgstr "그룹" @@ -617,7 +633,7 @@ msgstr "설명" #: allianceauth/hrapplications/templates/hrapplications/management.html:85 #: allianceauth/hrapplications/templates/hrapplications/management.html:130 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:27 -#: allianceauth/srp/templates/srp/data.html:97 +#: allianceauth/srp/templates/srp/data.html:98 msgid "Status" msgstr "상태" @@ -647,8 +663,8 @@ msgid "Audit Members" msgstr "멤버 검사" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:56 -msgid "Copy Direrct Join Link" -msgstr "" +msgid "Copy Direct Join Link" +msgstr "직접 참여 링크 복사" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:68 msgid "No groups to list." @@ -679,37 +695,37 @@ msgstr "사용 가능한 그룹 없음." msgid "Groups Management" msgstr "그룹 관리" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:23 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:25 msgid "Join Requests" msgstr "가입 요청" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:24 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:33 msgid "Leave Requests" msgstr "탈퇴 요청" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:39 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:98 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:53 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:112 #: allianceauth/permissions_tool/templates/permissions_tool/audit.html:20 #: allianceauth/services/modules/openfire/forms.py:6 msgid "Group" msgstr "그룹" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:71 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:130 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:85 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:144 msgid "Accept" msgstr "수락" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:74 -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:133 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:88 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:147 #: allianceauth/hrapplications/templates/hrapplications/view.html:85 msgid "Reject" msgstr "거절" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:83 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:97 msgid "No group add requests." msgstr "가입 요청 없음" -#: allianceauth/groupmanagement/templates/groupmanagement/index.html:142 +#: allianceauth/groupmanagement/templates/groupmanagement/index.html:156 msgid "No group leave requests." msgstr "탈퇴 요청 없음" @@ -717,11 +733,6 @@ msgstr "탈퇴 요청 없음" msgid "Toggle navigation" msgstr "네비게이션 전환" -#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 -#: allianceauth/templates/allianceauth/side-menu.html:23 -msgid "Group Management" -msgstr "그룹 관리" - #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:21 msgid "Group Requests" msgstr "그룹 요청" @@ -730,104 +741,104 @@ msgstr "그룹 요청" msgid "Group Membership" msgstr "그룹 멤버쉽" -#: allianceauth/groupmanagement/views.py:166 +#: allianceauth/groupmanagement/views.py:162 #, python-format msgid "Removed user %(user)s from group %(group)s." msgstr "유저 %(user)s이(가) %(group)s에서 제거됨." -#: allianceauth/groupmanagement/views.py:168 +#: allianceauth/groupmanagement/views.py:164 msgid "User does not exist in that group" msgstr "유저가 해당 그룹에 존재하지 않음." -#: allianceauth/groupmanagement/views.py:171 +#: allianceauth/groupmanagement/views.py:167 msgid "Group does not exist" msgstr "그룹이 존재하지 않음." -#: allianceauth/groupmanagement/views.py:198 +#: allianceauth/groupmanagement/views.py:194 #, python-format msgid "Accepted application from %(mainchar)s to %(group)s." msgstr "%(mainchar)s의 %(group)s 그룹 신청 수락" -#: allianceauth/groupmanagement/views.py:205 -#: allianceauth/groupmanagement/views.py:238 +#: allianceauth/groupmanagement/views.py:201 +#: allianceauth/groupmanagement/views.py:234 #, python-format msgid "" "An unhandled error occurred while processing the application from " "%(mainchar)s to %(group)s." msgstr "%(mainchar)s의 %(group)s 그룹 신청을 처리하는 중 알 수 없는 에러 발생" -#: allianceauth/groupmanagement/views.py:231 +#: allianceauth/groupmanagement/views.py:227 #, python-format msgid "Rejected application from %(mainchar)s to %(group)s." msgstr "%(mainchar)s의 %(group)s 그룹 신청 거절" -#: allianceauth/groupmanagement/views.py:267 +#: allianceauth/groupmanagement/views.py:263 #, python-format msgid "Accepted application from %(mainchar)s to leave %(group)s." msgstr "%(mainchar)s의 %(group)s 그룹 탈퇴 수락" -#: allianceauth/groupmanagement/views.py:273 -#: allianceauth/groupmanagement/views.py:307 +#: allianceauth/groupmanagement/views.py:269 +#: allianceauth/groupmanagement/views.py:303 #, python-format msgid "" "An unhandled error occurred while processing the application from " "%(mainchar)s to leave %(group)s." msgstr "%(mainchar)s의 %(group)s 그룹 탈퇴를 처리하는 중 알 수 없는 에러 발생" -#: allianceauth/groupmanagement/views.py:300 +#: allianceauth/groupmanagement/views.py:296 #, python-format msgid "Rejected application from %(mainchar)s to leave %(group)s." msgstr "%(mainchar)s의 %(group)s 그룹 탈퇴 거절" -#: allianceauth/groupmanagement/views.py:346 -#: allianceauth/groupmanagement/views.py:358 +#: allianceauth/groupmanagement/views.py:342 +#: allianceauth/groupmanagement/views.py:354 msgid "You cannot join that group" msgstr "해당 그룹에 참여할 수 없습니다." -#: allianceauth/groupmanagement/views.py:352 +#: allianceauth/groupmanagement/views.py:348 msgid "You are already a member of that group." msgstr "이미 해당 그룹에 가입되어 있습니다." -#: allianceauth/groupmanagement/views.py:367 +#: allianceauth/groupmanagement/views.py:363 msgid "You already have a pending application for that group." msgstr "해당 그룹에 대한 참여신청이 보류되었습니다." -#: allianceauth/groupmanagement/views.py:370 -#: allianceauth/groupmanagement/views.py:408 +#: allianceauth/groupmanagement/views.py:366 +#: allianceauth/groupmanagement/views.py:404 #: allianceauth/hrapplications/templates/hrapplications/management.html:37 #: allianceauth/hrapplications/templates/hrapplications/management.html:72 #: allianceauth/hrapplications/templates/hrapplications/management.html:99 #: allianceauth/hrapplications/templates/hrapplications/management.html:144 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38 #: allianceauth/hrapplications/templates/hrapplications/view.html:20 -#: allianceauth/srp/templates/srp/data.html:125 +#: allianceauth/srp/templates/srp/data.html:128 #: allianceauth/srp/templates/srp/management.html:81 msgid "Pending" msgstr "보류 중" -#: allianceauth/groupmanagement/views.py:376 +#: allianceauth/groupmanagement/views.py:372 #, python-format msgid "Applied to group %(group)s." msgstr "%(group)s그룹에 지원하였음." -#: allianceauth/groupmanagement/views.py:387 +#: allianceauth/groupmanagement/views.py:383 msgid "You cannot leave that group" msgstr "해당 그룹을 떠날 수 없습니다." -#: allianceauth/groupmanagement/views.py:392 +#: allianceauth/groupmanagement/views.py:388 msgid "You are not a member of that group" msgstr "해당그룹의 멤버가 아닙니다." -#: allianceauth/groupmanagement/views.py:401 +#: allianceauth/groupmanagement/views.py:397 msgid "You already have a pending leave request for that group." msgstr "해당 그룹의 탈퇴 신청이 접수된 상태입니다." -#: allianceauth/groupmanagement/views.py:414 +#: allianceauth/groupmanagement/views.py:410 #, python-format msgid "Applied to leave group %(group)s." msgstr "%(group)s그룹의 탈퇴가 신청됨." -#: allianceauth/hrapplications/auth_hooks.py:10 +#: allianceauth/hrapplications/auth_hooks.py:13 msgid "Applications" msgstr "지원" @@ -884,7 +895,7 @@ msgstr "사용자명" #: allianceauth/hrapplications/templates/hrapplications/management.html:131 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:28 #: allianceauth/hrapplications/templates/hrapplications/view.html:75 -#: allianceauth/srp/templates/srp/data.html:99 +#: allianceauth/srp/templates/srp/data.html:100 #: allianceauth/srp/templates/srp/management.html:46 msgid "Actions" msgstr "활동" @@ -894,7 +905,7 @@ msgstr "활동" #: allianceauth/hrapplications/templates/hrapplications/management.html:147 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40 #: allianceauth/hrapplications/templates/hrapplications/view.html:16 -#: allianceauth/srp/templates/srp/data.html:117 +#: allianceauth/srp/templates/srp/data.html:120 msgid "Approved" msgstr "승인" @@ -902,7 +913,7 @@ msgstr "승인" #: allianceauth/hrapplications/templates/hrapplications/management.html:104 #: allianceauth/hrapplications/templates/hrapplications/management.html:149 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42 -#: allianceauth/srp/templates/srp/data.html:121 +#: allianceauth/srp/templates/srp/data.html:124 msgid "Rejected" msgstr "거절" @@ -1285,23 +1296,50 @@ msgstr "비밀번호" msgid "Password must be at least 8 characters long." msgstr "비밀번호는 8글자 이상이어야 합니다." -#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:23 +#: allianceauth/services/modules/discord/models.py:224 +msgid "Discord Account Disabled" +msgstr "디스코드 계정 비활성화" + +#: allianceauth/services/modules/discord/models.py:226 +msgid "" +"Your Discord account was disabeled automatically by Auth. If you think this " +"was a mistake, please contact an admin." +msgstr "Auth에 의해 자동으로 디스코드 계정이 비활성화됐습니다. 원치 않는 사항일 경우, 관리자에게 문의해 주세요." + +#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:18 +msgid "Join the Discord server" +msgstr "디스코드 서버 입장" + +#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:22 +msgid "Leave- and rejoin the Discord Server (Reset)" +msgstr "디스코드 서버를 나가고 다시 입장하기 (리셋)" + +#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:25 +msgid "Leave the Discord server" +msgstr "디스코드 서버 나가기" + +#: allianceauth/services/modules/discord/templates/services/discord/discord_service_ctrl.html:32 msgid "Link Discord Server" msgstr "디스코드 서버 링크" -#: allianceauth/services/modules/discord/views.py:26 +#: allianceauth/services/modules/discord/views.py:30 msgid "Deactivated Discord account." msgstr "디스코드 계정 해제 완료" -#: allianceauth/services/modules/discord/views.py:29 -#: allianceauth/services/modules/discord/views.py:41 -#: allianceauth/services/modules/discord/views.py:65 +#: allianceauth/services/modules/discord/views.py:36 +#: allianceauth/services/modules/discord/views.py:59 msgid "An error occurred while processing your Discord account." msgstr "디스코드 계정 처리 중 오류가 발생했습니다." -#: allianceauth/services/modules/discord/views.py:62 -msgid "Activated Discord account." -msgstr "디스코드 계정 활성화 완료" +#: allianceauth/services/modules/discord/views.py:102 +msgid "Your Discord account has been successfully activated." +msgstr "디스코드 계정과 성공적으로 연동됐습니다." + +#: allianceauth/services/modules/discord/views.py:108 +msgid "" +"An error occurred while trying to activate your Discord account. Please try " +"again." +msgstr "디스코드 계정 연동 중 오류가 발생했습니다. 다시 시도해 주세요." #: allianceauth/services/modules/discourse/views.py:37 msgid "You are not authorized to access Discourse." @@ -1565,7 +1603,7 @@ msgstr "서드파티" msgid "Domain" msgstr "도메인" -#: allianceauth/srp/auth_hooks.py:9 +#: allianceauth/srp/auth_hooks.py:12 msgid "Ship Replacement" msgstr "SRP" @@ -1579,7 +1617,7 @@ msgstr "플릿 시간" msgid "Fleet Doctrine" msgstr "플릿 독트린" -#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:89 +#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:90 msgid "Additional Info" msgstr "추가 기재 사항" @@ -1608,63 +1646,63 @@ msgstr "SRP 보상 플릿 생성" msgid "Give this link to the line members" msgstr "이 링크를 직계 멤버들에게 전달" -#: allianceauth/srp/templates/srp/data.html:48 +#: allianceauth/srp/templates/srp/data.html:49 msgid "SRP Fleet Data" msgstr "SRP 보상 플릿 데이터" -#: allianceauth/srp/templates/srp/data.html:53 +#: allianceauth/srp/templates/srp/data.html:54 msgid "Mark Incomplete" msgstr "표시 미완료" -#: allianceauth/srp/templates/srp/data.html:57 +#: allianceauth/srp/templates/srp/data.html:58 msgid "Mark Completed" msgstr "표시 완료" -#: allianceauth/srp/templates/srp/data.html:69 -#: allianceauth/srp/templates/srp/data.html:145 +#: allianceauth/srp/templates/srp/data.html:70 +#: allianceauth/srp/templates/srp/data.html:150 msgid "Total Losses:" msgstr "전체 손실:" -#: allianceauth/srp/templates/srp/data.html:70 -#: allianceauth/srp/templates/srp/data.html:146 +#: allianceauth/srp/templates/srp/data.html:71 +#: allianceauth/srp/templates/srp/data.html:151 #: allianceauth/srp/templates/srp/management.html:30 msgid "Total ISK Cost:" msgstr "전체 ISK 비용:" -#: allianceauth/srp/templates/srp/data.html:78 -#: allianceauth/srp/templates/srp/data.html:154 +#: allianceauth/srp/templates/srp/data.html:79 +#: allianceauth/srp/templates/srp/data.html:159 msgid "Are you sure you want to delete SRP requests?" msgstr "SRP 보상 요청을 삭제하시겠습니까?" -#: allianceauth/srp/templates/srp/data.html:87 +#: allianceauth/srp/templates/srp/data.html:88 msgid "Pilot Name" msgstr "파일럿 이름" -#: allianceauth/srp/templates/srp/data.html:88 +#: allianceauth/srp/templates/srp/data.html:89 msgid "Killboard Link" msgstr "킬보드 링크" -#: allianceauth/srp/templates/srp/data.html:90 +#: allianceauth/srp/templates/srp/data.html:91 msgid "Ship Type" msgstr "함선 종류" -#: allianceauth/srp/templates/srp/data.html:91 +#: allianceauth/srp/templates/srp/data.html:92 msgid "Killboard Loss Amt" msgstr "킬보드상 손실 금액" -#: allianceauth/srp/templates/srp/data.html:92 +#: allianceauth/srp/templates/srp/data.html:93 msgid "SRP ISK Cost" msgstr "SRP 보상 비용" -#: allianceauth/srp/templates/srp/data.html:93 +#: allianceauth/srp/templates/srp/data.html:94 msgid "Click value to edit Enter to save & next ESC to cancel" msgstr "금액을 수정하려면 클릭, 저장을 하고 다음으로 가려면 엔터, 취소를 하려면 ESC를 누르세요. " -#: allianceauth/srp/templates/srp/data.html:96 +#: allianceauth/srp/templates/srp/data.html:97 msgid "Post Time" msgstr "작성 시간" -#: allianceauth/srp/templates/srp/data.html:163 +#: allianceauth/srp/templates/srp/data.html:168 msgid "No SRP requests for this fleet." msgstr "이 플릿에는 SRP 보상 요청이 없습니다." @@ -1856,32 +1894,30 @@ msgid "Current" msgstr "현재" #: allianceauth/templates/allianceauth/admin-status/overview.html:40 -msgid "Latest Major" -msgstr "최근 주요 사항" +msgid "Latest Stable" +msgstr "최신 안정화 버전" #: allianceauth/templates/allianceauth/admin-status/overview.html:46 -#: allianceauth/templates/allianceauth/admin-status/overview.html:56 -#: allianceauth/templates/allianceauth/admin-status/overview.html:66 msgid "Update available" msgstr "업데이트 가능" -#: allianceauth/templates/allianceauth/admin-status/overview.html:50 -msgid "Latest Minor" -msgstr "최근 기타 사항" +#: allianceauth/templates/allianceauth/admin-status/overview.html:51 +msgid "Latest Pre-Release" +msgstr "최신 사전 출시 버전" -#: allianceauth/templates/allianceauth/admin-status/overview.html:60 -msgid "Latest Patch" -msgstr "최근 패치" +#: allianceauth/templates/allianceauth/admin-status/overview.html:57 +msgid "Pre-Release available" +msgstr "사전 출시 사용 가능" -#: allianceauth/templates/allianceauth/admin-status/overview.html:73 +#: allianceauth/templates/allianceauth/admin-status/overview.html:65 msgid "Task Queue" msgstr "대기 중인 할 일" -#: allianceauth/templates/allianceauth/admin-status/overview.html:90 +#: allianceauth/templates/allianceauth/admin-status/overview.html:82 msgid "Error retrieving task queue length" msgstr "대기 중인 할 일 목록 회수 에러" -#: allianceauth/templates/allianceauth/admin-status/overview.html:92 +#: allianceauth/templates/allianceauth/admin-status/overview.html:84 #, python-format msgid "%(tasks)s task" msgid_plural "%(tasks)s tasks" diff --git a/allianceauth/locale/ru/LC_MESSAGES/django.po b/allianceauth/locale/ru/LC_MESSAGES/django.po index a217d09a..65fbd34b 100644 --- a/allianceauth/locale/ru/LC_MESSAGES/django.po +++ b/allianceauth/locale/ru/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-29 04:56+0000\n" +"POT-Creation-Date: 2020-09-21 01:35+0000\n" "PO-Revision-Date: 2020-02-18 03:14+0000\n" "Last-Translator: Alexander Gess , 2020\n" "Language-Team: Russian (https://www.transifex.com/alliance-auth/teams/107430/ru/)\n" @@ -41,7 +41,7 @@ msgstr "Статус пилота: %(state)s" #: allianceauth/authentication/templates/authentication/dashboard.html:5 #: allianceauth/authentication/templates/authentication/dashboard.html:8 -#: allianceauth/templates/allianceauth/side-menu.html:12 +#: allianceauth/templates/allianceauth/side-menu.html:11 msgid "Dashboard" msgstr "Панель показателей" @@ -548,6 +548,11 @@ msgstr "Флотовое участие зарегистрированно." msgid "FAT link has expired." msgstr "ФлАк ссылка устарела" +#: allianceauth/groupmanagement/auth_hooks.py:16 +#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 +msgid "Group Management" +msgstr "Управление Группой" + #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:5 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:13 msgid "Audit Log" @@ -620,7 +625,7 @@ msgstr "Участники группы" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40 -#: allianceauth/templates/allianceauth/side-menu.html:17 +#: allianceauth/templates/allianceauth/side-menu.html:16 msgid "Groups" msgstr "Группы" @@ -634,7 +639,7 @@ msgstr "Описание" #: allianceauth/hrapplications/templates/hrapplications/management.html:85 #: allianceauth/hrapplications/templates/hrapplications/management.html:130 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:27 -#: allianceauth/srp/templates/srp/data.html:97 +#: allianceauth/srp/templates/srp/data.html:98 msgid "Status" msgstr "Статус" @@ -734,11 +739,6 @@ msgstr "Нет групповых запросов на выход" msgid "Toggle navigation" msgstr "Проложить маршрут" -#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 -#: allianceauth/templates/allianceauth/side-menu.html:25 -msgid "Group Management" -msgstr "Управление Группой" - #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:21 msgid "Group Requests" msgstr "Групповой запрос" @@ -821,7 +821,7 @@ msgstr "Вы уже подали заявку на вступление этой #: allianceauth/hrapplications/templates/hrapplications/management.html:144 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38 #: allianceauth/hrapplications/templates/hrapplications/view.html:20 -#: allianceauth/srp/templates/srp/data.html:125 +#: allianceauth/srp/templates/srp/data.html:128 #: allianceauth/srp/templates/srp/management.html:81 msgid "Pending" msgstr "Ожидание" @@ -848,7 +848,7 @@ msgstr "Ваш запрос находится на рассмотрении" msgid "Applied to leave group %(group)s." msgstr "Запрос на выход из группы %(group)s." -#: allianceauth/hrapplications/auth_hooks.py:10 +#: allianceauth/hrapplications/auth_hooks.py:13 msgid "Applications" msgstr "Запросы" @@ -905,7 +905,7 @@ msgstr "Пользователь" #: allianceauth/hrapplications/templates/hrapplications/management.html:131 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:28 #: allianceauth/hrapplications/templates/hrapplications/view.html:75 -#: allianceauth/srp/templates/srp/data.html:99 +#: allianceauth/srp/templates/srp/data.html:100 #: allianceauth/srp/templates/srp/management.html:46 msgid "Actions" msgstr "Действия" @@ -915,7 +915,7 @@ msgstr "Действия" #: allianceauth/hrapplications/templates/hrapplications/management.html:147 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40 #: allianceauth/hrapplications/templates/hrapplications/view.html:16 -#: allianceauth/srp/templates/srp/data.html:117 +#: allianceauth/srp/templates/srp/data.html:120 msgid "Approved" msgstr "Проверено" @@ -923,7 +923,7 @@ msgstr "Проверено" #: allianceauth/hrapplications/templates/hrapplications/management.html:104 #: allianceauth/hrapplications/templates/hrapplications/management.html:149 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42 -#: allianceauth/srp/templates/srp/data.html:121 +#: allianceauth/srp/templates/srp/data.html:124 msgid "Rejected" msgstr "Отменено " @@ -1623,7 +1623,7 @@ msgstr "Сервис" msgid "Domain" msgstr "Домен" -#: allianceauth/srp/auth_hooks.py:9 +#: allianceauth/srp/auth_hooks.py:12 msgid "Ship Replacement" msgstr "Замена корабля" @@ -1637,7 +1637,7 @@ msgstr "Флотовое время" msgid "Fleet Doctrine" msgstr "Флотовая Доктрина" -#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:89 +#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:90 msgid "Additional Info" msgstr "Дополнительная информация" @@ -1666,63 +1666,63 @@ msgstr "Создать SRP Флот" msgid "Give this link to the line members" msgstr "Поделиться ссылкой с рядовыми участниками" -#: allianceauth/srp/templates/srp/data.html:48 +#: allianceauth/srp/templates/srp/data.html:49 msgid "SRP Fleet Data" msgstr "SRP данные флота" -#: allianceauth/srp/templates/srp/data.html:53 +#: allianceauth/srp/templates/srp/data.html:54 msgid "Mark Incomplete" msgstr "Пометить незаконченным" -#: allianceauth/srp/templates/srp/data.html:57 +#: allianceauth/srp/templates/srp/data.html:58 msgid "Mark Completed" msgstr "Пометить законченным" -#: allianceauth/srp/templates/srp/data.html:69 -#: allianceauth/srp/templates/srp/data.html:145 +#: allianceauth/srp/templates/srp/data.html:70 +#: allianceauth/srp/templates/srp/data.html:150 msgid "Total Losses:" msgstr "Суммарные потери:" -#: allianceauth/srp/templates/srp/data.html:70 -#: allianceauth/srp/templates/srp/data.html:146 +#: allianceauth/srp/templates/srp/data.html:71 +#: allianceauth/srp/templates/srp/data.html:151 #: allianceauth/srp/templates/srp/management.html:30 msgid "Total ISK Cost:" msgstr "Оценочная стоимость (ISK):" -#: allianceauth/srp/templates/srp/data.html:78 -#: allianceauth/srp/templates/srp/data.html:154 +#: allianceauth/srp/templates/srp/data.html:79 +#: allianceauth/srp/templates/srp/data.html:159 msgid "Are you sure you want to delete SRP requests?" msgstr "Вы уверенны что хотите удалить запрос на SRP?" -#: allianceauth/srp/templates/srp/data.html:87 +#: allianceauth/srp/templates/srp/data.html:88 msgid "Pilot Name" msgstr "Имя Пилота" -#: allianceauth/srp/templates/srp/data.html:88 +#: allianceauth/srp/templates/srp/data.html:89 msgid "Killboard Link" msgstr "zKillBoard ссылка" -#: allianceauth/srp/templates/srp/data.html:90 +#: allianceauth/srp/templates/srp/data.html:91 msgid "Ship Type" msgstr "Тип корабля" -#: allianceauth/srp/templates/srp/data.html:91 +#: allianceauth/srp/templates/srp/data.html:92 msgid "Killboard Loss Amt" msgstr "потерь по zKillBoard на данный момент" -#: allianceauth/srp/templates/srp/data.html:92 +#: allianceauth/srp/templates/srp/data.html:93 msgid "SRP ISK Cost" msgstr "SRP ISK Стоимость" -#: allianceauth/srp/templates/srp/data.html:93 +#: allianceauth/srp/templates/srp/data.html:94 msgid "Click value to edit Enter to save & next ESC to cancel" msgstr "Нажмите на значение для редактирования и ESC для отмены" -#: allianceauth/srp/templates/srp/data.html:96 +#: allianceauth/srp/templates/srp/data.html:97 msgid "Post Time" msgstr "Опубликованно" -#: allianceauth/srp/templates/srp/data.html:163 +#: allianceauth/srp/templates/srp/data.html:168 msgid "No SRP requests for this fleet." msgstr "SRP запросы отсутствуют" diff --git a/allianceauth/locale/zh_Hans/LC_MESSAGES/django.po b/allianceauth/locale/zh_Hans/LC_MESSAGES/django.po index 3bacb433..235734cd 100644 --- a/allianceauth/locale/zh_Hans/LC_MESSAGES/django.po +++ b/allianceauth/locale/zh_Hans/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-07-29 03:24+0000\n" +"POT-Creation-Date: 2020-09-21 01:35+0000\n" "PO-Revision-Date: 2020-02-18 03:14+0000\n" "Last-Translator: Aaron BuBu <351793078@qq.com>, 2020\n" "Language-Team: Chinese Simplified (https://www.transifex.com/alliance-auth/teams/107430/zh-Hans/)\n" @@ -43,7 +43,7 @@ msgstr "" #: allianceauth/authentication/templates/authentication/dashboard.html:5 #: allianceauth/authentication/templates/authentication/dashboard.html:8 -#: allianceauth/templates/allianceauth/side-menu.html:12 +#: allianceauth/templates/allianceauth/side-menu.html:11 msgid "Dashboard" msgstr "账户总览" @@ -538,6 +538,11 @@ msgstr "成功注册舰队PAP" msgid "FAT link has expired." msgstr "PAP链接已过期" +#: allianceauth/groupmanagement/auth_hooks.py:16 +#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 +msgid "Group Management" +msgstr "用户组管理" + #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:5 #: allianceauth/groupmanagement/templates/groupmanagement/audit.html:13 msgid "Audit Log" @@ -610,7 +615,7 @@ msgstr "用户组成员" #: allianceauth/groupmanagement/templates/groupmanagement/groupmembership.html:14 #: allianceauth/permissions_tool/templates/permissions_tool/overview.html:40 -#: allianceauth/templates/allianceauth/side-menu.html:17 +#: allianceauth/templates/allianceauth/side-menu.html:16 msgid "Groups" msgstr "群组" @@ -624,7 +629,7 @@ msgstr "描述" #: allianceauth/hrapplications/templates/hrapplications/management.html:85 #: allianceauth/hrapplications/templates/hrapplications/management.html:130 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:27 -#: allianceauth/srp/templates/srp/data.html:97 +#: allianceauth/srp/templates/srp/data.html:98 msgid "Status" msgstr "状态" @@ -724,11 +729,6 @@ msgstr "没有离开用户组的请求，小老弟你人缘可以啊？" msgid "Toggle navigation" msgstr "打开导航栏" -#: allianceauth/groupmanagement/templates/groupmanagement/menu.html:15 -#: allianceauth/templates/allianceauth/side-menu.html:25 -msgid "Group Management" -msgstr "用户组管理" - #: allianceauth/groupmanagement/templates/groupmanagement/menu.html:21 msgid "Group Requests" msgstr "用户组请求" @@ -807,7 +807,7 @@ msgstr "你已经有了该组的未决申请" #: allianceauth/hrapplications/templates/hrapplications/management.html:144 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:38 #: allianceauth/hrapplications/templates/hrapplications/view.html:20 -#: allianceauth/srp/templates/srp/data.html:125 +#: allianceauth/srp/templates/srp/data.html:128 #: allianceauth/srp/templates/srp/management.html:81 msgid "Pending" msgstr "待定" @@ -834,7 +834,7 @@ msgstr "你已经有了该组的未决离开请求" msgid "Applied to leave group %(group)s." msgstr "已经离开群组%(group)s" -#: allianceauth/hrapplications/auth_hooks.py:10 +#: allianceauth/hrapplications/auth_hooks.py:13 msgid "Applications" msgstr "申请" @@ -891,7 +891,7 @@ msgstr "用户名" #: allianceauth/hrapplications/templates/hrapplications/management.html:131 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:28 #: allianceauth/hrapplications/templates/hrapplications/view.html:75 -#: allianceauth/srp/templates/srp/data.html:99 +#: allianceauth/srp/templates/srp/data.html:100 #: allianceauth/srp/templates/srp/management.html:46 msgid "Actions" msgstr "操作" @@ -901,7 +901,7 @@ msgstr "操作" #: allianceauth/hrapplications/templates/hrapplications/management.html:147 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:40 #: allianceauth/hrapplications/templates/hrapplications/view.html:16 -#: allianceauth/srp/templates/srp/data.html:117 +#: allianceauth/srp/templates/srp/data.html:120 msgid "Approved" msgstr "通过" @@ -909,7 +909,7 @@ msgstr "通过" #: allianceauth/hrapplications/templates/hrapplications/management.html:104 #: allianceauth/hrapplications/templates/hrapplications/management.html:149 #: allianceauth/hrapplications/templates/hrapplications/searchview.html:42 -#: allianceauth/srp/templates/srp/data.html:121 +#: allianceauth/srp/templates/srp/data.html:124 msgid "Rejected" msgstr "拒绝" @@ -1599,7 +1599,7 @@ msgstr "服务" msgid "Domain" msgstr "域名" -#: allianceauth/srp/auth_hooks.py:9 +#: allianceauth/srp/auth_hooks.py:12 msgid "Ship Replacement" msgstr "补损" @@ -1613,7 +1613,7 @@ msgstr "集结时间" msgid "Fleet Doctrine" msgstr "舰队船型" -#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:89 +#: allianceauth/srp/form.py:12 allianceauth/srp/templates/srp/data.html:90 msgid "Additional Info" msgstr "其他信息" @@ -1642,63 +1642,63 @@ msgstr "创建补损舰队" msgid "Give this link to the line members" msgstr "把这个链接发送给火力狗们" -#: allianceauth/srp/templates/srp/data.html:48 +#: allianceauth/srp/templates/srp/data.html:49 msgid "SRP Fleet Data" msgstr "舰队补损信息" -#: allianceauth/srp/templates/srp/data.html:53 +#: allianceauth/srp/templates/srp/data.html:54 msgid "Mark Incomplete" msgstr "标记为未完成" -#: allianceauth/srp/templates/srp/data.html:57 +#: allianceauth/srp/templates/srp/data.html:58 msgid "Mark Completed" msgstr "标记为已完成" -#: allianceauth/srp/templates/srp/data.html:69 -#: allianceauth/srp/templates/srp/data.html:145 +#: allianceauth/srp/templates/srp/data.html:70 +#: allianceauth/srp/templates/srp/data.html:150 msgid "Total Losses:" msgstr "损失总额：" -#: allianceauth/srp/templates/srp/data.html:70 -#: allianceauth/srp/templates/srp/data.html:146 +#: allianceauth/srp/templates/srp/data.html:71 +#: allianceauth/srp/templates/srp/data.html:151 #: allianceauth/srp/templates/srp/management.html:30 msgid "Total ISK Cost:" msgstr "ISK花费总额：" -#: allianceauth/srp/templates/srp/data.html:78 -#: allianceauth/srp/templates/srp/data.html:154 +#: allianceauth/srp/templates/srp/data.html:79 +#: allianceauth/srp/templates/srp/data.html:159 msgid "Are you sure you want to delete SRP requests?" msgstr "老哥，你确定要删了补损请求么？" -#: allianceauth/srp/templates/srp/data.html:87 +#: allianceauth/srp/templates/srp/data.html:88 msgid "Pilot Name" msgstr "玩家ID" -#: allianceauth/srp/templates/srp/data.html:88 +#: allianceauth/srp/templates/srp/data.html:89 msgid "Killboard Link" msgstr "KB网链接" -#: allianceauth/srp/templates/srp/data.html:90 +#: allianceauth/srp/templates/srp/data.html:91 msgid "Ship Type" msgstr "船型" -#: allianceauth/srp/templates/srp/data.html:91 +#: allianceauth/srp/templates/srp/data.html:92 msgid "Killboard Loss Amt" msgstr "KB网总损失" -#: allianceauth/srp/templates/srp/data.html:92 +#: allianceauth/srp/templates/srp/data.html:93 msgid "SRP ISK Cost" msgstr "补损ISK花费" -#: allianceauth/srp/templates/srp/data.html:93 +#: allianceauth/srp/templates/srp/data.html:94 msgid "Click value to edit Enter to save & next ESC to cancel" msgstr "点击数值就可以编辑啦，按回车确认，按ESC取消" -#: allianceauth/srp/templates/srp/data.html:96 +#: allianceauth/srp/templates/srp/data.html:97 msgid "Post Time" msgstr "发布时间" -#: allianceauth/srp/templates/srp/data.html:163 +#: allianceauth/srp/templates/srp/data.html:168 msgid "No SRP requests for this fleet." msgstr "这次起队没有补损请求！大捷"