mirror of https://github.com/MISP/MISP
fix: [i18n] Variables are in no need to be translated, it will break stuff, horribly.
upd: [i18n] Update default.pot againpull/3579/head
parent
407ab26027
commit
1bac3749c5
|
|
@ -463,9 +463,9 @@ class AppController extends Controller
|
|||
public function blackhole($type)
|
||||
{
|
||||
if ($type === 'csrf') {
|
||||
throw new BadRequestException(__d('cake_dev', $type));
|
||||
throw new BadRequestException($type);
|
||||
}
|
||||
throw new BadRequestException(__d('cake_dev', 'The request has been black-holed'));
|
||||
throw new BadRequestException('The request has been black-holed');
|
||||
}
|
||||
|
||||
public $userRole = null;
|
||||
|
|
|
|||
|
|
@ -3190,6 +3190,11 @@ msgstr ""
|
|||
msgid "Add"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:20
|
||||
#: View/Pages/doc/general.ctp:20
|
||||
msgid "Event Actions"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:24
|
||||
#: View/Elements/side_menu.ctp:174;188
|
||||
#: View/Events/export_alternate.ctp:87
|
||||
|
|
@ -3231,6 +3236,12 @@ msgstr ""
|
|||
msgid "View Proposals"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:33
|
||||
#: View/Elements/side_menu.ctp:242
|
||||
#: View/Pages/doc/general.ctp:39
|
||||
msgid "Events with proposals"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:35
|
||||
#: View/Elements/side_menu.ctp:446
|
||||
#: View/Pages/doc/general.ctp:40
|
||||
|
|
@ -3318,6 +3329,11 @@ msgstr ""
|
|||
msgid "List Noticelists"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:86
|
||||
#: View/Pages/doc/general.ctp:22;54
|
||||
msgid "Global Actions"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:90
|
||||
#: View/News/index.ctp:2
|
||||
#: View/Pages/doc/general.ctp:56
|
||||
|
|
@ -3406,6 +3422,11 @@ msgstr ""
|
|||
msgid "Start Discussion"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:121
|
||||
#: View/Pages/doc/general.ctp:23;66
|
||||
msgid "Sync Actions"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:125
|
||||
#: View/Elements/side_menu.ctp:354
|
||||
#: View/Pages/doc/general.ctp:68
|
||||
|
|
@ -3456,15 +3477,22 @@ msgid "Add Organisation"
|
|||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:149
|
||||
#: View/Elements/side_menu.ctp:395
|
||||
#: View/Pages/doc/general.ctp:76
|
||||
msgid "List Roles"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:151
|
||||
#: View/Elements/side_menu.ctp:393
|
||||
#: View/Roles/admin_add.ctp:4
|
||||
msgid "Add Role"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:155
|
||||
#: View/Pages/doc/general.ctp:79
|
||||
msgid "Server Settings"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:155
|
||||
msgid "Maintenance"
|
||||
msgstr ""
|
||||
|
|
@ -3484,6 +3512,10 @@ msgstr ""
|
|||
msgid "Scheduled Tasks"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:164
|
||||
msgid "Blacklist Event"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/global_menu.ctp:165
|
||||
#: View/Elements/side_menu.ctp:407
|
||||
msgid "Manage Event Blacklists"
|
||||
|
|
@ -3652,11 +3684,6 @@ msgstr ""
|
|||
msgid "Download results as CSV"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/side_menu.ctp:242
|
||||
#: View/Pages/doc/general.ctp:39
|
||||
msgid "Events with proposals"
|
||||
msgstr ""
|
||||
|
||||
#: View/Elements/side_menu.ctp:259
|
||||
msgid "List Regexp"
|
||||
msgstr ""
|
||||
|
|
@ -9440,10 +9467,6 @@ msgstr ""
|
|||
msgid "This button will return you to the start screen of the application, which is the event index page (more about this later)."
|
||||
msgstr ""
|
||||
|
||||
#: View/Pages/doc/general.ctp:20
|
||||
msgid "Event Actions"
|
||||
msgstr ""
|
||||
|
||||
#: View/Pages/doc/general.ctp:20
|
||||
msgid "All the malware data entered into MISP is made up of an event object that is described by its connected attributes. The Event actions menu gives access to all the functionality that has to do with the creation, modification, deletion, publishing, searching and listing of events and attributes."
|
||||
msgstr ""
|
||||
|
|
@ -9452,18 +9475,10 @@ msgstr ""
|
|||
msgid "Input filters alter what and how data can be entered into this instance. Apart from the basic validation of attribute entry by type, it is possible for the site administrators to define regular expression replacements and blacklists for certain values in addition to blocking certain values from being exportable. Users can view these replacement and blacklist rules here whilst administrator can alter them."
|
||||
msgstr ""
|
||||
|
||||
#: View/Pages/doc/general.ctp:22;54
|
||||
msgid "Global Actions"
|
||||
msgstr ""
|
||||
|
||||
#: View/Pages/doc/general.ctp:22
|
||||
msgid "This menu gives you access to information about MISP and this instance. You can view and edit your own profile, view the manual, read the news or the terms of use again, see a list of the active organisations on this instance and a histogram of their contributions by attribute type."
|
||||
msgstr ""
|
||||
|
||||
#: View/Pages/doc/general.ctp:23;66
|
||||
msgid "Sync Actions"
|
||||
msgstr ""
|
||||
|
||||
#: View/Pages/doc/general.ctp:23
|
||||
msgid "With administrator access rights, shows a list of the connected instances and allows the initiation of a push and a pull (more about the synchronisation mechanisms later)."
|
||||
msgstr ""
|
||||
|
|
@ -9637,10 +9652,6 @@ msgstr ""
|
|||
msgid "Various tools, upgrade scripts that can help a site-admin run the instance."
|
||||
msgstr ""
|
||||
|
||||
#: View/Pages/doc/general.ctp:79
|
||||
msgid "Server Settings"
|
||||
msgstr ""
|
||||
|
||||
#: View/Pages/doc/general.ctp:79
|
||||
msgid "Set up and diagnose your MISP installation."
|
||||
msgstr ""
|
||||
|
|
|
|||
|
|
@ -3474,7 +3474,7 @@ class Server extends AppModel
|
|||
public function stixDiagnostics(&$diagnostic_errors, &$stixVersion, &$cyboxVersion, &$mixboxVersion, &$maecVersion, &$pymispVersion)
|
||||
{
|
||||
$result = array();
|
||||
$expected = array('stix' => '1.2.0.6', 'cybox' => '2.1.0.17', 'mixbox' => '1.0.3', 'maec' => '4.1.0.13', 'pymisp' => '>2.4.93');
|
||||
$expected = array('stix' => '1.2.0.6', 'cybox' => '2.1.0.17', 'mixbox' => '1.0.3', 'maec' => '4.1.0.14', 'pymisp' => '>2.4.93');
|
||||
// check if the STIX and Cybox libraries are working using the test script stixtest.py
|
||||
$scriptResult = shell_exec('python3 ' . APP . 'files' . DS . 'scripts' . DS . 'stixtest.py');
|
||||
$scriptResult = json_decode($scriptResult, true);
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ class OrphansProtectableBehavior extends ModelBehavior {
|
|||
foreach ($possibleOrphans as $model => $ids) {
|
||||
$count = count($ids);
|
||||
$modelName = $count > 1 ? Inflector::pluralize($model) : $model;
|
||||
$errorParts[] = $count.' '.__($modelName, true).' (ID: '.$Model->createDeletionErrorIds($model, $ids).')';
|
||||
$errorParts[] = $count.' '.$modelName.' (ID: '.$Model->createDeletionErrorIds($model, $ids).')';
|
||||
}
|
||||
return __('it has the following dependent items', true).': '.implode($errorParts, ', ');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
'type' => 'textarea'
|
||||
));
|
||||
|
||||
echo $this->Form->button(__($action));
|
||||
echo $this->Form->button($action);
|
||||
echo $this->Form->end();
|
||||
?>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in New Issue