Skip to content

Commit 5353fa4

Browse files
baumannsvenbaumannsven
committed
Merge tag '2.2.1'
Hotfix release 2.2.1 - Merge translations
2 parents 28b703a + c8c2bf4 commit 5353fa4

4 files changed

Lines changed: 105 additions & 30 deletions

File tree

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"extra": {
6060
"contao-manager-plugin": "MetaModels\\FilterRangeBundle\\ContaoManager\\Plugin",
6161
"branch-alias": {
62-
"dev-feature/2.2.0": "2.2.x-dev"
62+
"dev-hotfix/2.2.1": "2.2.1-dev"
6363
}
6464
},
6565
"config": {

‎src/Resources/contao/languages/de/explain.php‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
<?php
2+
/**
3+
* This file is part of MetaModels/filter_range.
4+
*
5+
* (c) 2012-2022 The MetaModels team.
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
9+
*
10+
* This project is provided in good faith and hope to be usable by anyone.
11+
*
12+
* Translations are managed automatically using Transifex. To create a new translation
13+
* or to help to maintain an existing one, please register at transifex.com.
14+
*
15+
* Last-updated: 2022-11-20T13:47:29+01:00
16+
*
17+
* @copyright 2012-2022 The MetaModels team.
18+
* @license https://github.com/MetaModels/filter_range/blob/master/LICENSE LGPL-3.0-or-later
19+
* @link https://www.transifex.com/metamodels/public/
20+
* @link https://www.transifex.com/signup/?join_project=metamodels
21+
*/
22+
23+
24+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['0']['0'] = 'Typ der Filterbereichs-Option';
25+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['0']['1'] = 'Für den Filterbereich gibt es mehrere Optionen, wie der Vergleich zwischen den Eingrenzungswerten und den Filterwerten gehandhabt werden soll.<br />
26+
Als Beispiel sind folgende Werte in der Datenbank:<br />
27+
die Daten der Attribute 1 (=15) und 2 (=20) und ein Beispiel bei jeder Option, um einen Treffer zu finden.
28+
<pre>DB: ---------15---------20-----</pre>
29+
';
30+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['1']['0'] = 'S1<br />Beide Werte müssen in dem Bereich sein.';
31+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['1']['1'] = '<pre>S1: -----------16-----18-------</pre>';
32+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['2']['0'] = 'S2<br />Der zweite Wert muss in dem Bereich sein.';
33+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['2']['1'] = 'Der erste Wert muss kleiner als die rechte Grenze des Bereichs sein, kann aber auch kleiner als die linke Grenze sein - der zweite Wert muss innerhalb des Bereichs liegen.
34+
<pre>S2: ------13----------18-------</pre>';
35+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['3']['0'] = 'S3<br />Der erste Wert muss in dem Bereich sein.';
36+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['3']['1'] = 'Der zweite Wert muss größer sein als die linke Grenze des Bereichs, kann aber auch größer sein als die rechte Grenze - der erste Wert muss innerhalb des Bereichs liegen.
37+
<pre>S3: -----------16----------22--<pre>';
38+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['4']['0'] = 'S4<br />Der erste oder der zweite Wert muss in dem Bereich sein.';
39+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['4']['1'] = 'Mindestens ein Wert muss innerhalb des Bereichs liegen - dies ist eine Kombination der Optionen "S2" und "S3".
40+
<pre>S2: ------13----------18-------</pre>
41+
<pre>S3: -----------16----------22--<pre>';
42+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['5']['0'] = 'S5<br />Der Bereich muss zwischen dem ersten und dem zweiten Wert liegen.';
43+
$GLOBALS['TL_LANG']['XPL']['filterrangetypeOptions']['5']['1'] = 'Der erste Wert muss kleiner und der zweite Wert muss größer als der Bereich sein - dies ist die umgekehrte Option "S1".
44+
<pre>S5: ------13---------------22--<pre>';
45+

‎src/Resources/contao/languages/de/tl_metamodel_filtersetting.php‎

Lines changed: 42 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,50 @@
11
<?php
22
/**
3-
* Translations are managed using Transifex. To create a new translation
4-
* or to help to maintain an existing one, please register at transifex.com.
3+
* This file is part of MetaModels/filter_range.
4+
*
5+
* (c) 2012-2022 The MetaModels team.
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
59
*
6-
* @link http://help.transifex.com/intro/translating.html
7-
* @link https://www.transifex.com/projects/p/metamodels/language/de/
10+
* This project is provided in good faith and hope to be usable by anyone.
811
*
9-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
12+
* Translations are managed automatically using Transifex. To create a new translation
13+
* or to help to maintain an existing one, please register at transifex.com.
14+
*
15+
* Last-updated: 2022-11-20T13:47:33+01:00
1016
*
11-
* last-updated: 2015-09-18T12:15:50+02:00
17+
* @copyright 2012-2022 The MetaModels team.
18+
* @license https://github.com/MetaModels/filter_range/blob/master/LICENSE LGPL-3.0-or-later
19+
* @link https://www.transifex.com/metamodels/public/
20+
* @link https://www.transifex.com/signup/?join_project=metamodels
1221
*/
1322

14-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2']['0'] = 'Zweites Attribut';
15-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2']['1'] = 'Das Zweite Attribut auf das sich die Einstellung bezieht.';
16-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield']['0'] = 'Feld für Wert 1';
17-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield']['1'] = 'Zeige Frontend-Feld für Wert 1.';
18-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['lessequal']['0'] = 'Wert 2 einbeziehen';
19-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['lessequal']['1'] = 'Standard: Wert nicht eingeschlossen.';
20-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal']['0'] = 'Wert 1 einbeziehen';
21-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal']['1'] = 'Standard: Wert nicht eingeschlossen.';
22-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype']['0'] = 'Schema';
23-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype']['1'] = 'Hier können die das gewünschte Schema auswählen.';
24-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['date'] = 'Datum';
25-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['datim'] = 'Datum und Uhrzeit';
26-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['time'] = 'Zeit';
27-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield']['0'] = 'Feld für Wert 2';
28-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield']['1'] = 'Zeige Frontend-Feld für Wert 2.';
29-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['typenames']['range'] = 'Wert von/bis für zwei Felder';
30-
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['typenames']['rangedate'] = 'Wert von/bis für zwei Datumsfelder';
23+
24+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2']['0'] = 'Zweites Attribut';
25+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2']['1'] = 'Das Zweite Attribut auf das sich die Einstellung bezieht.';
26+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['filterrange_type']['0'] = 'Filtertyp';
27+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['filterrange_type']['1'] = 'Hier können Sie den Typ der Filterung auswählen.';
28+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['filterrangetypeOptions']['s1'] = 'Beide Werte müssen in dem Bereich sein. (S1)';
29+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['filterrangetypeOptions']['s2'] = 'Der zweite Wert muss in dem Bereich sein. (S2)';
30+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['filterrangetypeOptions']['s3'] = 'Der erste Wert muss in dem Bereich sein. (S3)';
31+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['filterrangetypeOptions']['s4'] = 'Der erste oder der zweite Wert muss in dem Bereich sein. (S4)';
32+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['filterrangetypeOptions']['s5'] = 'Der Bereich muss zwischen dem ersten und dem zweiten Wert liegen. (S5)';
33+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield']['0'] = 'Feld für Wert 1';
34+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield']['1'] = 'Zeige Frontend-Feld für Wert 1.';
35+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['lessequal']['0'] = 'Wert 2 einbeziehen';
36+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['lessequal']['1'] = 'Standard: Wert nicht eingeschlossen.';
37+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal']['0'] = 'Wert 1 einbeziehen';
38+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal']['1'] = 'Standard: Wert nicht eingeschlossen.';
39+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['placeholder']['0'] = 'Platzhalter';
40+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['placeholder']['1'] = 'Zeigen Sie diesen Platzhaltertext an, solange das Feld leer ist.';
41+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype']['0'] = 'Schema';
42+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype']['1'] = 'Hier können Sie das gewünschte Schema auswählen.';
43+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['date'] = 'Datum';
44+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['datim'] = 'Datum und Uhrzeit';
45+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['time'] = 'Zeit';
46+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield']['0'] = 'Feld für Wert 2';
47+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['tofield']['1'] = 'Zeige Frontend-Feld für Wert 2.';
48+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['typenames']['range'] = 'Wert von/bis für zwei Felder';
49+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['typenames']['rangedate'] = 'Wert von/bis für zwei Datumsfelder';
3150

‎src/Resources/contao/languages/ru/tl_metamodel_filtersetting.php‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,26 @@
11
<?php
22
/**
3-
* Translations are managed using Transifex. To create a new translation
4-
* or to help to maintain an existing one, please register at transifex.com.
3+
* This file is part of MetaModels/filter_range.
4+
*
5+
* (c) 2012-2022 The MetaModels team.
6+
*
7+
* For the full copyright and license information, please view the LICENSE
8+
* file that was distributed with this source code.
59
*
6-
* @link http://help.transifex.com/intro/translating.html
7-
* @link https://www.transifex.com/projects/p/metamodels/language/ru/
10+
* This project is provided in good faith and hope to be usable by anyone.
811
*
9-
* @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
12+
* Translations are managed automatically using Transifex. To create a new translation
13+
* or to help to maintain an existing one, please register at transifex.com.
14+
*
15+
* Last-updated: 2022-11-20T13:47:33+01:00
1016
*
11-
* last-updated: 2015-07-11T08:02:28+02:00
17+
* @copyright 2012-2022 The MetaModels team.
18+
* @license https://github.com/MetaModels/filter_range/blob/master/LICENSE LGPL-3.0-or-later
19+
* @link https://www.transifex.com/metamodels/public/
20+
* @link https://www.transifex.com/signup/?join_project=metamodels
1221
*/
1322

23+
1424
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2']['0'] = 'Второй атрибут';
1525
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['attr_id2']['1'] = 'Второй атрибут, этот параметр относится к.';
1626
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['fromfield']['0'] = 'Поле для значения 1';
@@ -19,6 +29,7 @@
1929
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['lessequal']['1'] = 'Стандарт: исключено.';
2030
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal']['0'] = 'Значение 1 включено';
2131
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['moreequal']['1'] = 'Стандарт: исключено.';
32+
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['placeholder']['0'] = 'Заполнитель';
2233
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype']['0'] = 'Схема';
2334
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetype']['1'] = 'Вы можете выбрать желаемую схему.';
2435
$GLOBALS['TL_LANG']['tl_metamodel_filtersetting']['timetypeOptions']['date'] = 'Дата';

0 commit comments

Comments
 (0)