Skip to content
This repository was archived by the owner on Nov 3, 2023. It is now read-only.

Commit 2474ff9

Browse files
leofeyerleofeyer
committed
Merge branch 'hotfix/3.5.30'
2 parents 759c57b + f17a7e4 commit 2474ff9

File tree

1,582 files changed

+374202
-17
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,582 files changed

+374202
-17
lines changed

‎assets/mootools/chosen/chosen-uncompressed.css

+2-2
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ select.chzn-select {
257257
/* @group Results */
258258
.chzn-container .chzn-results {
259259
margin: 0 4px 4px 0;
260-
max-height: 228px; /* PATCH: 228px instead of 190px */
260+
max-height: 192px; /* PATCH: 192px instead of 190px (.chzn-results li == 16px) */
261261
padding: 0 0 0 4px;
262262
position: relative;
263263
overflow-x: hidden;
@@ -268,7 +268,7 @@ select.chzn-select {
268268
padding: 0;
269269
}
270270
.chzn-container .chzn-results li {
271-
line-height: 1.2; /* PATCH: 1.2 instead of 80% */
271+
line-height: 13px; /* PATCH: 13px instead of 80% */
272272
padding: 1px 7px 2px; /* PATCH: 1px 7px 2px instead of 7px 7px 8px */
273273
margin: 0;
274274
list-style: none;

‎assets/mootools/chosen/chosen.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<project name="Contao Open Source CMS" default="build" basedir=".">
33
<exec executable="system/bin/version" outputProperty="version" />
44

5-
<target name="build" depends="clone, update, languages, purge, pack, cleanup">
5+
<target name="build" depends="clone, update, purge, pack, cleanup">
66
<echo message="Contao ${version} build complete" />
77
</target>
88

@@ -33,10 +33,6 @@
3333
</exec>
3434
</target>
3535

36-
<target name="languages">
37-
<exec executable="txget" dir="contao-${version}" passthru="true" />
38-
</target>
39-
4036
<target name="purge">
4137
<delete dir="contao-${version}/.tx" />
4238
<delete dir="contao-${version}/.git" />

‎system/config/constants.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Core version
1414
*/
1515
define('VERSION', '3.5');
16-
define('BUILD', '29');
16+
define('BUILD', '30');
1717
define('LONG_TERM_SUPPORT', true);
1818

1919

‎system/docs/CHANGELOG.md

+9-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
Contao Open Source CMS changelog
22
================================
33

4-
Version 3.5.29 (2017-09-27)
4+
Version 3.5.30 (2017-10-06)
55
---------------------------
66

77
### Fixed
8-
Correctly handle unencoded data images in the Combiner (see #8788).
8+
Filter multi-day events outside the scope in the event list (see #8792).
99

1010
### Fixed
1111
Correctly show multi-day events if the shortened view is disabled (see #8782).
1212

13+
14+
Version 3.5.29 (2017-09-27)
15+
---------------------------
16+
17+
### Fixed
18+
Correctly handle unencoded data images in the Combiner (see #8788).
19+
1320
### Fixed
1421
Do not add a suffix when copying if the "doNotCopy" flag is set (see #8610).
1522

‎system/modules/calendar/languages/cs/default.xlf

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" ?><xliff version="1.1">
2+
<file datatype="php" original="system/modules/calendar/languages/en/default.php" source-language="en" target-language="cs">
3+
<body>
4+
<trans-unit id="MSC.cal_events">
5+
<source>%d event(s)</source>
6+
<target>%d událostí</target>
7+
</trans-unit>
8+
<trans-unit id="MSC.cal_previous">
9+
<source>&amp;lt;</source>
10+
<target>&lt;</target>
11+
</trans-unit>
12+
<trans-unit id="MSC.cal_next">
13+
<source>&amp;gt;</source>
14+
<target>&gt;</target>
15+
</trans-unit>
16+
<trans-unit id="MSC.cal_timeSeparator">
17+
<source>–</source>
18+
<target>–</target>
19+
</trans-unit>
20+
<trans-unit id="MSC.cal_emptyDay">
21+
<source>There are no events on this day.</source>
22+
<target>Tento den nejsou žádné události.</target>
23+
</trans-unit>
24+
<trans-unit id="MSC.cal_emptyWeek">
25+
<source>There are no events for this week.</source>
26+
<target>Žádné události pro tento týden.</target>
27+
</trans-unit>
28+
<trans-unit id="MSC.cal_emptyMonth">
29+
<source>There are no events for this month.</source>
30+
<target>Žádné události pro tento měsíc.</target>
31+
</trans-unit>
32+
<trans-unit id="MSC.cal_emptyYear">
33+
<source>There are no events for this year.</source>
34+
<target>Žádné události pro tento rok.</target>
35+
</trans-unit>
36+
<trans-unit id="MSC.cal_empty">
37+
<source>Currently there are no events.</source>
38+
<target>Žádné budoucí události.</target>
39+
</trans-unit>
40+
<trans-unit id="MSC.cal_days">
41+
<source>This event is repeated every %s. day</source>
42+
<target>Tato událost se opakuje každý %s. den</target>
43+
</trans-unit>
44+
<trans-unit id="MSC.cal_weeks">
45+
<source>This event is repeated every %s. week</source>
46+
<target>Tato událost se opakuje každý %s. týden</target>
47+
</trans-unit>
48+
<trans-unit id="MSC.cal_months">
49+
<source>This event is repeated every %s. month</source>
50+
<target>Tato událost se opakuje každý %s. měsíc</target>
51+
</trans-unit>
52+
<trans-unit id="MSC.cal_years">
53+
<source>This event is repeated every %s. year</source>
54+
<target>Tato událost se opakuje každý %s. rok</target>
55+
</trans-unit>
56+
<trans-unit id="MSC.cal_until">
57+
<source>until %s</source>
58+
<target>do %s</target>
59+
</trans-unit>
60+
</body>
61+
</file>
62+
</xliff>

‎system/modules/calendar/languages/cs/modules.xlf

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" ?><xliff version="1.1">
2+
<file datatype="php" original="system/modules/calendar/languages/en/modules.php" source-language="en" target-language="cs">
3+
<body>
4+
<trans-unit id="MOD.calendar.0">
5+
<source>Events</source>
6+
<target>Kalendář/Události</target>
7+
</trans-unit>
8+
<trans-unit id="MOD.calendar.1">
9+
<source>Manage events and display them in a calendar or event list</source>
10+
<target>Tento modul vám umožní spravovat události z různých kalendářů</target>
11+
</trans-unit>
12+
<trans-unit id="MOD.tl_calendar_feed">
13+
<source>Calendar feeds</source>
14+
<target>Kanály Kalendáře</target>
15+
</trans-unit>
16+
<trans-unit id="FMD.events">
17+
<source>Events</source>
18+
<target>Kalendář/Události</target>
19+
</trans-unit>
20+
<trans-unit id="FMD.calendar.0">
21+
<source>Calendar</source>
22+
<target>Kalendář</target>
23+
</trans-unit>
24+
<trans-unit id="FMD.calendar.1">
25+
<source>Adds a calendar to the page</source>
26+
<target>Tento modul přidá kalendář do vašeho webu.</target>
27+
</trans-unit>
28+
<trans-unit id="FMD.eventlist.0">
29+
<source>Event list</source>
30+
<target>Seznam událostí</target>
31+
</trans-unit>
32+
<trans-unit id="FMD.eventlist.1">
33+
<source>Adds a list of events to the page</source>
34+
<target>Tento modul vrací seznam událostí měsíce, týdne nebo dne.</target>
35+
</trans-unit>
36+
<trans-unit id="FMD.eventreader.0">
37+
<source>Event reader</source>
38+
<target>Čtečka událostí</target>
39+
</trans-unit>
40+
<trans-unit id="FMD.eventreader.1">
41+
<source>Shows the details of an event</source>
42+
<target>Tento modul zobrazuje podrobnosti jednotlivých modulů.</target>
43+
</trans-unit>
44+
<trans-unit id="FMD.eventmenu.0">
45+
<source>Event list menu</source>
46+
<target>Menu seznamu událostí</target>
47+
</trans-unit>
48+
<trans-unit id="FMD.eventmenu.1">
49+
<source>Generates a navigation menu to browse the event list</source>
50+
<target>Tento modul vytvoří navigační menu, kterým se pak můžou procházet záznamy podle různé doby (např. podle let).</target>
51+
</trans-unit>
52+
</body>
53+
</file>
54+
</xliff>

‎system/modules/calendar/languages/cs/tl_calendar.xlf

+202
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
<?xml version="1.0" ?><xliff version="1.1">
2+
<file datatype="php" original="system/modules/calendar/languages/en/tl_calendar.php" source-language="en" target-language="cs">
3+
<body>
4+
<trans-unit id="tl_calendar.title.0">
5+
<source>Title</source>
6+
<target>Titulek</target>
7+
</trans-unit>
8+
<trans-unit id="tl_calendar.title.1">
9+
<source>Please enter the calendar title.</source>
10+
<target>Prosím zadejte název kalendáře</target>
11+
</trans-unit>
12+
<trans-unit id="tl_calendar.jumpTo.0">
13+
<source>Redirect page</source>
14+
<target>Přesměrovat na stránku</target>
15+
</trans-unit>
16+
<trans-unit id="tl_calendar.jumpTo.1">
17+
<source>Please choose the event reader page to which visitors will be redirected when clicking an event.</source>
18+
<target>Prosím zvolte stránku, na kterou budou přesměrování návštěvníci po kliknutí na událost.</target>
19+
</trans-unit>
20+
<trans-unit id="tl_calendar.allowComments.0">
21+
<source>Enable comments</source>
22+
<target>Povolit komentáře</target>
23+
</trans-unit>
24+
<trans-unit id="tl_calendar.allowComments.1">
25+
<source>Allow visitors to comment events.</source>
26+
<target>Dovolí návštěvníkům komentovat události.</target>
27+
</trans-unit>
28+
<trans-unit id="tl_calendar.notify.0">
29+
<source>Notify</source>
30+
<target>Zaslat upozornění</target>
31+
</trans-unit>
32+
<trans-unit id="tl_calendar.notify.1">
33+
<source>Please choose who to notify when comments are added.</source>
34+
<target>Zvolte prosím osobu, která dostane vyrozumění mailem, že byl přidán komentář.</target>
35+
</trans-unit>
36+
<trans-unit id="tl_calendar.sortOrder.0">
37+
<source>Sort order</source>
38+
<target>Seřadit podle</target>
39+
</trans-unit>
40+
<trans-unit id="tl_calendar.sortOrder.1">
41+
<source>By default, comments are sorted ascending, starting with the oldest one.</source>
42+
<target>Podle výchozího nastavení budou komentáře řazeny vzestupně, tedy od nejstaršího po nejnovější.</target>
43+
</trans-unit>
44+
<trans-unit id="tl_calendar.perPage.0">
45+
<source>Comments per page</source>
46+
<target>Počet komentářů na stránku</target>
47+
</trans-unit>
48+
<trans-unit id="tl_calendar.perPage.1">
49+
<source>Number of comments per page. Set to 0 to disable pagination.</source>
50+
<target>Počet komentářů na stránku. Zadejte 0, abyste jste vypli zalamování stránky.</target>
51+
</trans-unit>
52+
<trans-unit id="tl_calendar.moderate.0">
53+
<source>Moderate comments</source>
54+
<target>Moderovat komentáře</target>
55+
</trans-unit>
56+
<trans-unit id="tl_calendar.moderate.1">
57+
<source>Approve comments before they are published on the website.</source>
58+
<target>Schvalování komentářů před jejich publikováním na webové stránce.</target>
59+
</trans-unit>
60+
<trans-unit id="tl_calendar.bbcode.0">
61+
<source>Allow BBCode</source>
62+
<target>Povolit BBCode</target>
63+
</trans-unit>
64+
<trans-unit id="tl_calendar.bbcode.1">
65+
<source>Allow visitors to format their comments with BBCode.</source>
66+
<target>Umožnit návštěvníkům formátovat jejich komentáře pomocí BBCode.</target>
67+
</trans-unit>
68+
<trans-unit id="tl_calendar.requireLogin.0">
69+
<source>Require login to comment</source>
70+
<target>Vyžadovat přihlášení pro přidávání komentářů</target>
71+
</trans-unit>
72+
<trans-unit id="tl_calendar.requireLogin.1">
73+
<source>Allow only authenticated users to create comments.</source>
74+
<target>Povolit přidávat komentáře jen přihlášeným uživatelům.</target>
75+
</trans-unit>
76+
<trans-unit id="tl_calendar.disableCaptcha.0">
77+
<source>Disable the security question</source>
78+
<target>Vypnout bezpečnostní otázku.</target>
79+
</trans-unit>
80+
<trans-unit id="tl_calendar.disableCaptcha.1">
81+
<source>Use this option only if you have limited comments to authenticated users.</source>
82+
<target>Použít tuto volbu jen tehdy, pokud smí přidávat komentáře jen autorizovaní uživatelé. V jiném případě je doporučeno nechat bezpečnostní otázku zapnutou.</target>
83+
</trans-unit>
84+
<trans-unit id="tl_calendar.protected.0">
85+
<source>Protect calendar</source>
86+
<target>Chránit kalendář</target>
87+
</trans-unit>
88+
<trans-unit id="tl_calendar.protected.1">
89+
<source>Show events to certain member groups only.</source>
90+
<target>Zobrazit údalost pouze určitému členu skupiny.</target>
91+
</trans-unit>
92+
<trans-unit id="tl_calendar.groups.0">
93+
<source>Allowed member groups</source>
94+
<target>Povolené členské skupiny</target>
95+
</trans-unit>
96+
<trans-unit id="tl_calendar.groups.1">
97+
<source>These groups will be able to see the events in this calendar.</source>
98+
<target>Zde můžete vybrat skupiny, kterým bude povoleno vidět tuto událost.</target>
99+
</trans-unit>
100+
<trans-unit id="tl_calendar.tstamp.0">
101+
<source>Revision date</source>
102+
<target>Datum změny</target>
103+
</trans-unit>
104+
<trans-unit id="tl_calendar.tstamp.1">
105+
<source>Date and time of the latest revision</source>
106+
<target>Datum a čas poslední změny</target>
107+
</trans-unit>
108+
<trans-unit id="tl_calendar.title_legend">
109+
<source>Title and redirect page</source>
110+
<target>Název a přesměrování</target>
111+
</trans-unit>
112+
<trans-unit id="tl_calendar.comments_legend">
113+
<source>Comments</source>
114+
<target>Komentáře</target>
115+
</trans-unit>
116+
<trans-unit id="tl_calendar.protected_legend">
117+
<source>Access protection</source>
118+
<target>Chráněný přístup</target>
119+
</trans-unit>
120+
<trans-unit id="tl_calendar.feed_legend">
121+
<source>RSS/Atom feed</source>
122+
<target>Kanál RSS</target>
123+
</trans-unit>
124+
<trans-unit id="tl_calendar.notify_admin">
125+
<source>System administrator</source>
126+
<target>Administrátor systému</target>
127+
</trans-unit>
128+
<trans-unit id="tl_calendar.notify_author">
129+
<source>Author of the event</source>
130+
<target>Autor události</target>
131+
</trans-unit>
132+
<trans-unit id="tl_calendar.notify_both">
133+
<source>Author and system administrator</source>
134+
<target>Autor a administrátor systému</target>
135+
</trans-unit>
136+
<trans-unit id="tl_calendar.source_teaser">
137+
<source>Event teasers</source>
138+
<target>Ukázka událostí</target>
139+
</trans-unit>
140+
<trans-unit id="tl_calendar.source_text">
141+
<source>Full articles</source>
142+
<target>Plné znění</target>
143+
</trans-unit>
144+
<trans-unit id="tl_calendar.new.0">
145+
<source>New calendar</source>
146+
<target>Nový kalendář</target>
147+
</trans-unit>
148+
<trans-unit id="tl_calendar.new.1">
149+
<source>Create a new calendar</source>
150+
<target>Vytvořit nový kalendář</target>
151+
</trans-unit>
152+
<trans-unit id="tl_calendar.show.0">
153+
<source>Calendar details</source>
154+
<target>Zobrazit podrobnosti</target>
155+
</trans-unit>
156+
<trans-unit id="tl_calendar.show.1">
157+
<source>Show the details of calendar ID %s</source>
158+
<target>Zobrazit podrobnosti ke kalendáři ID %s</target>
159+
</trans-unit>
160+
<trans-unit id="tl_calendar.edit.0">
161+
<source>Edit calendar</source>
162+
<target>Editovat kalendář</target>
163+
</trans-unit>
164+
<trans-unit id="tl_calendar.edit.1">
165+
<source>Edit calendar ID %s</source>
166+
<target>Editovat kalendář ID %s</target>
167+
</trans-unit>
168+
<trans-unit id="tl_calendar.editheader.0">
169+
<source>Edit calendar</source>
170+
<target>Editovat kalendář</target>
171+
</trans-unit>
172+
<trans-unit id="tl_calendar.editheader.1">
173+
<source>Edit the calendar settings</source>
174+
<target>Editovat tento kalendář</target>
175+
</trans-unit>
176+
<trans-unit id="tl_calendar.copy.0">
177+
<source>Duplicate calendar</source>
178+
<target>Kopírovat kalendář</target>
179+
</trans-unit>
180+
<trans-unit id="tl_calendar.copy.1">
181+
<source>Duplicate calendar ID %s</source>
182+
<target>Kopírovat kalendář ID %s</target>
183+
</trans-unit>
184+
<trans-unit id="tl_calendar.delete.0">
185+
<source>Delete calendar</source>
186+
<target>Smazat kalendář</target>
187+
</trans-unit>
188+
<trans-unit id="tl_calendar.delete.1">
189+
<source>Delete calendar ID %s</source>
190+
<target>Smazat kalendář ID %s</target>
191+
</trans-unit>
192+
<trans-unit id="tl_calendar.feeds.0">
193+
<source>RSS feeds</source>
194+
<target>Kanály RSS</target>
195+
</trans-unit>
196+
<trans-unit id="tl_calendar.feeds.1">
197+
<source>Manage RSS feeds</source>
198+
<target>Spravovat kanály RSS</target>
199+
</trans-unit>
200+
</body>
201+
</file>
202+
</xliff>

0 commit comments

Comments
 (0)