Skip to content

Commit

Permalink
Merge branch 'release/2.6.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-anne committed Feb 7, 2020
2 parents 3737a5b + d9dfff9 commit 671bd78
Show file tree
Hide file tree
Showing 13 changed files with 722 additions and 104 deletions.
149 changes: 75 additions & 74 deletions composer.lock

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions inc/model.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,7 @@ function rawSearchOptions() {
'name' => __('Name'),
'datatype' => 'itemlink',
'itemlink_type' => $this->getType(),
'autocomplete' => true,
];

$tab[] = [
Expand Down
Binary file modified locales/en_GB.mo
Binary file not shown.
30 changes: 15 additions & 15 deletions locales/en_GB.po
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# English translations for PACKAGE package.
# Copyright (C) 2019 THE PACKAGE'S COPYRIGHT HOLDER
# Copyright (C) 2020 THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# Automatically generated, 2019.
# Automatically generated, 2020.
#
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-07-08 13:22+0000\n"
"PO-Revision-Date: 2019-07-08 13:22+0000\n"
"POT-Creation-Date: 2020-02-07 10:16+0000\n"
"PO-Revision-Date: 2020-02-07 10:16+0000\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en_GB\n"
Expand Down Expand Up @@ -53,11 +53,11 @@ msgstr "Location preferences"
msgid "Replace status dropdown by plugin actions"
msgstr "Replace status dropdown by plugin actions"

#: inc/model.class.php:106 inc/model.class.php:986 inc/model.class.php:1028
#: inc/model.class.php:106 inc/model.class.php:987 inc/model.class.php:1029
msgid "Uninstallation"
msgstr "Uninstallation"

#: inc/model.class.php:108 inc/model.class.php:988 inc/model.class.php:1030
#: inc/model.class.php:108 inc/model.class.php:989 inc/model.class.php:1031
#: inc/replace.class.php:61 inc/replace.class.php:108
msgid "Replacement"
msgstr "Replacement"
Expand Down Expand Up @@ -86,19 +86,19 @@ msgstr "Keep + Comment"
msgid "Replacing data"
msgstr "Replacing data"

#: inc/model.class.php:210 inc/model.class.php:829
#: inc/model.class.php:210 inc/model.class.php:830
msgid "Type of template"
msgstr "Type of template"

#: inc/model.class.php:219 inc/model.class.php:793
#: inc/model.class.php:219 inc/model.class.php:794
msgid "Transfer's model to use"
msgstr "Transfer's model to use"

#: inc/model.class.php:239 inc/replace.class.php:603
msgid "New status of the computer"
msgstr "New status of the computer"

#: inc/model.class.php:251 inc/model.class.php:839
#: inc/model.class.php:251 inc/model.class.php:840
msgid "Action on group"
msgstr "Action on group"

Expand All @@ -118,11 +118,11 @@ msgstr "Manage templates"
msgid "Erase datas"
msgstr "Erase datas"

#: inc/model.class.php:301 inc/model.class.php:701
#: inc/model.class.php:301 inc/model.class.php:702
msgid "Delete software history (computers)"
msgstr "Delete software history (computers)"

#: inc/model.class.php:306 inc/model.class.php:859
#: inc/model.class.php:306 inc/model.class.php:860
msgid "Delete the whole history"
msgstr "Delete the whole history"

Expand All @@ -138,7 +138,7 @@ msgstr "General informations"
msgid "Overwrite informations (from old item to the new)"
msgstr "Overwrite informations (from old item to the new)"

#: inc/model.class.php:418 inc/model.class.php:849 inc/replace.class.php:567
#: inc/model.class.php:418 inc/model.class.php:850 inc/replace.class.php:567
msgid "Archiving method of the old material"
msgstr "Archiving method of the old material"

Expand Down Expand Up @@ -172,11 +172,11 @@ msgstr[1] "OCSNG links"
msgid "These options only apply to computers coming from OCSNG"
msgstr "These options only apply to computers coming from OCSNG"

#: inc/model.class.php:592 inc/model.class.php:812
#: inc/model.class.php:592 inc/model.class.php:813
msgid "Delete computer in OCSNG"
msgstr "Delete computer in OCSNG"

#: inc/model.class.php:598 inc/model.class.php:820
#: inc/model.class.php:598 inc/model.class.php:821
msgid "Delete link with computer in OCSNG"
msgstr "Delete link with computer in OCSNG"

Expand All @@ -192,7 +192,7 @@ msgstr "Additionnal fields"
msgid "Delete Fields plugin informations"
msgstr "Delete Fields plugin informations"

#: inc/model.class.php:993 inc/uninstall.class.php:762
#: inc/model.class.php:994 inc/uninstall.class.php:762
msgid "Keep in the current group"
msgstr "Keep in the current group"

Expand Down
Binary file added locales/en_US.mo
Binary file not shown.
Loading

0 comments on commit 671bd78

Please sign in to comment.