Skip to content

Commit 84d51ae

Browse files
TimidRobotTimidRobot
committed
Merge branch 'master' into cc0-hr-legalcode
2 parents 68f54fa + ec7e360 commit 84d51ae

200 files changed

Lines changed: 7545 additions & 1793 deletions

File tree

Some content is hidden

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

‎Pipfile.lock‎

Lines changed: 0 additions & 639 deletions
This file was deleted.

‎config/creativecommons.org.conf‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@
135135

136136
Redirect permanent /remix /use-remix/ideas
137137
#Redirect permanent /about/store https://store.creativecommons.org/
138-
Redirect permanent /about/faq /faq
138+
Redirect permanent /FAQ /faq
139+
Redirect permanent /about/faq /faq
139140

140141
Redirect permanent /participate /about/get-involved
141142
#Redirect permanent /store https://store.creativecommons.org/
@@ -267,6 +268,9 @@
267268

268269
RewriteEngine on
269270

271+
# WordPress XML-RPC
272+
RewriteRule ^/xmlrpc.php /wordpress/xmlrpc.php [L]
273+
270274
# Make sure the Bassel memorial donation page has the right utm_campaign
271275
# Ideally we would set this in Gravity Forms - Rob.
272276

@@ -510,7 +514,6 @@
510514
RewriteRule ^/audio/publish-website http://wiki.creativecommons.org/HOWTO_Publish#Adding_a_license_to_your_audio_page [L,NE,R=301]
511515
RewriteRule ^/education/publish-website http://wiki.creativecommons.org/HOWTO_Publish#Adding_a_license_to_your_existing_website_2 [L,NE,R=301]
512516
RewriteRule ^.*/embedding$ http://wiki.creativecommons.org/Embedded_Metadata [L,R=301]
513-
#RewriteRule ^/faq.*$ http://wiki.creativecommons.org/FAQ [L,R=301]
514517
RewriteRule ^/image/publish-buzznet http://wiki.creativecommons.org/HOWTO_Publish#Buzznet [L,NE,R=301]
515518
RewriteRule ^/image/publish-flickr http://wiki.creativecommons.org/HOWTO_Publish#Flickr [L,NE,R=301]
516519
RewriteRule ^/image/publish-website http://wiki.creativecommons.org/HOWTO_Publish#Adding_a_license_to_your_photo_pages [L,NE,R=301]

‎docroot/legalcode/by-nc-nd_4.0.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@
155155
<option value="legalcode.no">norsk</option>
156156
<option value="legalcode.pl">polski</option>
157157
<option value="legalcode.pt">português</option>
158+
<option value="legalcode.ro">română</option>
158159
<option value="legalcode.ru">русский</option>
160+
<option value="legalcode.sl">Slovenščina</option>
159161
<option value="legalcode.sv">svenska</option>
160162
<option value="legalcode.tr">Türkçe</option>
161163
<option value="legalcode.uk">українська</option>
@@ -367,14 +369,16 @@ <h3>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International P
367369
<a href="/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>,
368370
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
369371
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
372+
<a href="/licenses/by-nc-nd/4.0/legalcode.ro">română</a>,
370373
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
374+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
371375
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
372376
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
373377
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,
374378
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
375379
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
376380
<!-- Language Footer End - DO NOT DELETE -->
377-
Please read the <a href="/FAQ#officialtranslations">FAQ</a> for more information about official translations.</p>
381+
Please read the <a href="/faq/#officialtranslations">FAQ</a> for more information about official translations.</p>
378382
</div>
379383

380384
</div>

‎docroot/legalcode/by-nc-nd_4.0_ar.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@
155155
<option value="legalcode.no">norsk</option>
156156
<option value="legalcode.pl">polski</option>
157157
<option value="legalcode.pt">português</option>
158+
<option value="legalcode.ro">română</option>
158159
<option value="legalcode.ru">русский</option>
160+
<option value="legalcode.sl">Slovenščina</option>
159161
<option value="legalcode.sv">svenska</option>
160162
<option value="legalcode.tr">Türkçe</option>
161163
<option value="legalcode.uk">українська</option>
@@ -327,14 +329,16 @@ <h3>مؤسسة المشاع الإبداعي نَسْبُ الـمُصنَّف،
327329
<a href="/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>,
328330
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
329331
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
332+
<a href="/licenses/by-nc-nd/4.0/legalcode.ro">română</a>,
330333
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
334+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
331335
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
332336
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
333337
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,
334338
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
335339
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
336340
<!-- Language Footer End - DO NOT DELETE -->
337-
<br> يرجى قراءة <a href="/FAQ#officialtranslations">الأسئلة الأكثر تكرارًا</a> وذلك للمزيد من المعلومات حول الترجمات الرسمية. </p>
341+
<br> يرجى قراءة <a href="/faq/#officialtranslations">الأسئلة الأكثر تكرارًا</a> وذلك للمزيد من المعلومات حول الترجمات الرسمية. </p>
338342
</div>
339343
</div>
340344
<div id="deed-foot">

‎docroot/legalcode/by-nc-nd_4.0_cs.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@
152152
<option value="legalcode.no">norsk</option>
153153
<option value="legalcode.pl">polski</option>
154154
<option value="legalcode.pt">português</option>
155+
<option value="legalcode.ro">română</option>
155156
<option value="legalcode.ru">русский</option>
157+
<option value="legalcode.sl">Slovenščina</option>
156158
<option value="legalcode.sv">svenska</option>
157159
<option value="legalcode.tr">Türkçe</option>
158160
<option value="legalcode.uk">українська</option>
@@ -326,14 +328,16 @@ <h3>Creative Commons Uveďte původ-Neužívejte komerčně-Nezpracovávejte 4.0
326328
<a href="/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>,
327329
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
328330
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
331+
<a href="/licenses/by-nc-nd/4.0/legalcode.ro">română</a>,
329332
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
333+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
330334
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
331335
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
332336
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,
333337
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
334338
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
335339
<!-- Language Footer End - DO NOT DELETE -->
336-
Pro další informace ohledně oficiálních překladů si prosím přečtěte <a href="/FAQ#officialtranslations">FAQ</a>.
340+
Pro další informace ohledně oficiálních překladů si prosím přečtěte <a href="/faq/#officialtranslations">FAQ</a>.
337341
</div>
338342
</div>
339343
<div id="deed-foot">

‎docroot/legalcode/by-nc-nd_4.0_de.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@
151151
<option value="legalcode.no">norsk</option>
152152
<option value="legalcode.pl">polski</option>
153153
<option value="legalcode.pt">português</option>
154+
<option value="legalcode.ro">română</option>
154155
<option value="legalcode.ru">русский</option>
156+
<option value="legalcode.sl">Slovenščina</option>
155157
<option value="legalcode.sv">svenska</option>
156158
<option value="legalcode.tr">Türkçe</option>
157159
<option value="legalcode.uk">українська</option>
@@ -326,14 +328,16 @@ <h3>Creative Commons Namensnennung-Nicht kommerziell-Keine Bearbeitungen 4.0 Int
326328
<a href="/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>,
327329
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
328330
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
331+
<a href="/licenses/by-nc-nd/4.0/legalcode.ro">română</a>,
329332
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
333+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
330334
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
331335
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
332336
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,
333337
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
334338
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
335339
<!-- Language Footer End - DO NOT DELETE -->
336-
Bitte lesen Sie die <a href="/FAQ#officialtranslations">FAQ</a> für eingehendere Informationen zu offiziellen Übersetzungen.</p>
340+
Bitte lesen Sie die <a href="/faq/#officialtranslations">FAQ</a> für eingehendere Informationen zu offiziellen Übersetzungen.</p>
337341
</div>
338342
</div>
339343
<div id="deed-foot">

‎docroot/legalcode/by-nc-nd_4.0_el.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@
154154
<option value="legalcode.no">norsk</option>
155155
<option value="legalcode.pl">polski</option>
156156
<option value="legalcode.pt">português</option>
157+
<option value="legalcode.ro">română</option>
157158
<option value="legalcode.ru">русский</option>
159+
<option value="legalcode.sl">Slovenščina</option>
158160
<option value="legalcode.sv">svenska</option>
159161
<option value="legalcode.tr">Türkçe</option>
160162
<option value="legalcode.uk">українська</option>
@@ -664,16 +666,17 @@ <h3>Creative Commons Αναφορά-Μη Εμπορική Χρήση-Όχι Πα
664666
<a href="/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>,
665667
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
666668
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
669+
<a href="/licenses/by-nc-nd/4.0/legalcode.ro">română</a>,
667670
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
671+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
668672
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
669673
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
670674
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,
671675
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
672676
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
673677
<!-- Language Footer End - DO NOT DELETE -->
674678

675-
Παρακαλώ διαβάστε το <a href=
676-
"/FAQ#officialtranslations">FAQ</a> για
679+
Παρακαλώ διαβάστε το <a href="/faq/#officialtranslations">FAQ</a> για
677680
περαιτέρω πληροφορίες σχετικά με τις επίσημες μεταφράσεις.</p>
678681
</div>
679682
</div>

‎docroot/legalcode/by-nc-nd_4.0_es.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,9 @@
149149
<option value="legalcode.no">norsk</option>
150150
<option value="legalcode.pl">polski</option>
151151
<option value="legalcode.pt">português</option>
152+
<option value="legalcode.ro">română</option>
152153
<option value="legalcode.ru">русский</option>
154+
<option value="legalcode.sl">Slovenščina</option>
153155
<option value="legalcode.sv">svenska</option>
154156
<option value="legalcode.tr">Türkçe</option>
155157
<option value="legalcode.uk">українська</option>
@@ -325,14 +327,16 @@ <h3>Creative Commons Atribución/Reconocimiento-NoComercial-SinDerivados 4.0 Lic
325327
<a href="/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>,
326328
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
327329
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
330+
<a href="/licenses/by-nc-nd/4.0/legalcode.ro">română</a>,
328331
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
332+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
329333
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
330334
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
331335
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,
332336
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
333337
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
334338
<!-- Language Footer End - DO NOT DELETE -->
335-
Por favor lea las <a href="/FAQ#officialtranslations">Preguntas Frecuentes</a> para obtener más información acerca de las traducciones oficiales.</p>
339+
Por favor lea las <a href="/faq/#officialtranslations">Preguntas Frecuentes</a> para obtener más información acerca de las traducciones oficiales.</p>
336340
</div>
337341
</div>
338342
<div id="deed-foot">

‎docroot/legalcode/by-nc-nd_4.0_eu.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,9 @@
151151
<option value="legalcode.no">norsk</option>
152152
<option value="legalcode.pl">polski</option>
153153
<option value="legalcode.pt">português</option>
154+
<option value="legalcode.ro">română</option>
154155
<option value="legalcode.ru">русский</option>
156+
<option value="legalcode.sl">Slovenščina</option>
155157
<option value="legalcode.sv">svenska</option>
156158
<option value="legalcode.tr">Türkçe</option>
157159
<option value="legalcode.uk">українська</option>
@@ -328,15 +330,17 @@ <h3>Creative Commons Aitortu-EzKomertziala-LanEratorririkGabe 4.0 Nazioartekoa L
328330
<a href="/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>,
329331
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
330332
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
333+
<a href="/licenses/by-nc-nd/4.0/legalcode.ro">română</a>,
331334
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
335+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
332336
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
333337
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
334338
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,
335339
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
336340
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
337341
<!-- Language Footer End - DO NOT DELETE -->
338342

339-
Irakurri <a href="/FAQ#officialtranslations">FAQ</a> atala itzulpen ofizialen inguruko informazio gehiago izateko.
343+
Irakurri <a href="/faq/#officialtranslations">FAQ</a> atala itzulpen ofizialen inguruko informazio gehiago izateko.
340344
</div>
341345
</div>
342346
<div id="deed-foot">

‎docroot/legalcode/by-nc-nd_4.0_fi.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@
155155
<option value="legalcode.no">norsk</option>
156156
<option value="legalcode.pl">polski</option>
157157
<option value="legalcode.pt">português</option>
158+
<option value="legalcode.ro">română</option>
158159
<option value="legalcode.ru">русский</option>
160+
<option value="legalcode.sl">Slovenščina</option>
159161
<option value="legalcode.sv">svenska</option>
160162
<option value="legalcode.tr">Türkçe</option>
161163
<option value="legalcode.uk">українська</option>
@@ -375,14 +377,16 @@ <h3>Creative Commons Nimeä-EiKaupallinen-EiMuutoksia 4.0 Kansainvälinen Julkin
375377
<a href="/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>,
376378
<a href="/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>,
377379
<a href="/licenses/by-nc-nd/4.0/legalcode.pt">português</a>,
380+
<a href="/licenses/by-nc-nd/4.0/legalcode.ro">română</a>,
378381
<a href="/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>,
382+
<a href="/licenses/by-nc-nd/4.0/legalcode.sl">Slovenščina</a>,
379383
<a href="/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>,
380384
<a href="/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>,
381385
<a href="/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>,
382386
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>,
383387
<a href="/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>.
384388
<!-- Language Footer End - DO NOT DELETE -->
385-
Lisätietoa virallisista käännöksistä <a href="/FAQ#officialtranslations">FAQ</a>-sivulla.</p>
389+
Lisätietoa virallisista käännöksistä <a href="/faq/#officialtranslations">FAQ</a>-sivulla.</p>
386390
</div>
387391
</div>
388392
<div id="deed-foot">

0 commit comments

Comments
 (0)