Skip to content

Commit 4f358a0

Browse files
TimidRobotTimidRobot
committed
Merge branch 'master' into dev2019
2 parents 825970f + 2d9c481 commit 4f358a0

163 files changed

Lines changed: 2330 additions & 312 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.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129

130130
<!-- Site Header End - DO NOT DELETE -->
131131
<!-- Language Selector Start - DO NOT DELETE -->
132-
<div id="language-selector-block" class="container"> <div class="language-selector-inner">This page is available in the following languages: <img class="language-icon" src="/images/language_icon_x2.png" alt="Languages" /> <select><option value="legalcode.ar">العربية</option><option value="legalcode.cs">čeština</option><option value="legalcode.de">Deutsch</option><option value="legalcode.el">Ελληνικά</option><option value="legalcode" selected="selected" >English</option><option value="legalcode" selected="selected" >English</option><option value="legalcode.es">Español</option><option value="legalcode.eu">euskara</option><option value="legalcode.fi">suomeksi</option><option value="legalcode.fr">français</option><option value="legalcode.hr">hrvatski</option><option value="legalcode.id">bahasa Indonesia</option><option value="legalcode.it">italiano</option><option value="legalcode.ja">日本語</option><option value="legalcode.ko">한국어</option><option value="legalcode.lt">Lietuvių</option><option value="legalcode.lv">latviski</option><option value="legalcode.mi">Te Reo Māori</option><option value="legalcode.nl">Nederlands</option><option value="legalcode.no">norsk</option><option value="legalcode.pl">polski</option><option value="legalcode.pt">Português</option><option value="legalcode.ru">русский</option><option value="legalcode.sv">svenska</option><option value="legalcode.tr">Türkçe</option><option value="legalcode.uk">українська</option><option value="legalcode.zh-Hans">中文</option> </select> </div></div>
132+
<div id="language-selector-block" class="container"> <div class="language-selector-inner">This page is available in the following languages: <img class="language-icon" src="/images/language_icon_x2.png" alt="Languages" /> <select><option value="legalcode.ar">العربية</option><option value="legalcode.cs">čeština</option><option value="legalcode.de">Deutsch</option><option value="legalcode.el">Ελληνικά</option><option value="legalcode" selected="selected" >English</option><option value="legalcode" selected="selected" >English</option><option value="legalcode.es">Español</option><option value="legalcode.eu">euskara</option><option value="legalcode.fi">suomeksi</option><option value="legalcode.fr">français</option><option value="legalcode.hr">hrvatski</option><option value="legalcode.id">bahasa Indonesia</option><option value="legalcode.it">italiano</option><option value="legalcode.ja">日本語</option><option value="legalcode.ko">한국어</option><option value="legalcode.lt">Lietuvių</option><option value="legalcode.lv">latviski</option><option value="legalcode.mi">Te Reo Māori</option><option value="legalcode.nl">Nederlands</option><option value="legalcode.no">norsk</option><option value="legalcode.pl">polski</option><option value="legalcode.pt">Português</option><option value="legalcode.ru">русский</option><option value="legalcode.sv">svenska</option><option value="legalcode.tr">Türkçe</option><option value="legalcode.uk">українська</option><option value="legalcode.zh-Hans">中文</option><option value="legalcode.zh-Hant">華語</option> </select> </div></div>
133133
<!-- Language Selector End - DO NOT DELETE -->
134134
<!-- Legalcode Start - DO NOT DELETE -->
135135
<div id="deed" class="yellow">
@@ -312,7 +312,7 @@ <h3>Creative Commons Attribution-NonCommercial-NoDerivatives 4.0 International P
312312
<p class="shaded">Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” The text of the Creative Commons public licenses is dedicated to the public domain under the <a href="//creativecommons.org/publicdomain/zero/1.0/legalcode">CC0 Public Domain Dedication</a>. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at <a href="//creativecommons.org/policies">creativecommons.org/policies</a>, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.<br><br>
313313
Creative Commons may be contacted at <a href="//creativecommons.org/">creativecommons.org</a>.</p>
314314

315-
<p class="shaded"><a name="languages"></a>Additional languages available: <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.id">Bahasa Indonesia</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.es">Español</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.eu">euskara</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.de">Deutsch</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.es">Español</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.fr">français</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.hr">hrvatski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.it">italiano</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.lv">latviski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.lt">Lietuvių</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.nl">Nederlands</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.pt">português</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.fi">suomeksi</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.mi">te reo Māori</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.cs">čeština</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.el">Ελληνικά</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ar">العربية</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ja">日本語</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ko">한국어</a>. Please read the <a href="//wiki.creativecommons.org/FAQ#officialtranslations">FAQ</a> for more information about official translations.</p>
315+
<p class="shaded"><a name="languages"></a>Additional languages available: <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.id">Bahasa Indonesia</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.es">Español</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.eu">euskara</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.de">Deutsch</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.es">Español</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.fr">français</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.hr">hrvatski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.it">italiano</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.lv">latviski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.lt">Lietuvių</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.nl">Nederlands</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.no">norsk</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.pl">polski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.pt">português</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.fi">suomeksi</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.mi">te reo Māori</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.cs">čeština</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.el">Ελληνικά</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ru">русский</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ar">العربية</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ja">日本語</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ko">한국어</a>. Please read the <a href="//wiki.creativecommons.org/FAQ#officialtranslations">FAQ</a> for more information about official translations.</p>
316316

317317
</div>
318318

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129

130130
<!-- Site Header End - DO NOT DELETE -->
131131
<!-- Language Selector Start - DO NOT DELETE -->
132-
<div id="language-selector-block" class="container"> <div class="language-selector-inner">هذة الصفحة متوفرة باللغات التالية: <img class="language-icon" src="/images/language_icon_x2.png" alt="Languages" /> <select><option value="legalcode.ar" selected="selected" >العربية</option><option value="legalcode.cs">čeština</option><option value="legalcode.de">Deutsch</option><option value="legalcode.el">Ελληνικά</option><option value="legalcode">English</option><option value="legalcode">English</option><option value="legalcode.es">Español</option><option value="legalcode.eu">euskara</option><option value="legalcode.fi">suomeksi</option><option value="legalcode.fr">français</option><option value="legalcode.hr">hrvatski</option><option value="legalcode.id">bahasa Indonesia</option><option value="legalcode.it">italiano</option><option value="legalcode.ja">日本語</option><option value="legalcode.ko">한국어</option><option value="legalcode.lt">Lietuvių</option><option value="legalcode.lv">latviski</option><option value="legalcode.mi">Te Reo Māori</option><option value="legalcode.nl">Nederlands</option><option value="legalcode.no">norsk</option><option value="legalcode.pl">polski</option><option value="legalcode.pt">Português</option><option value="legalcode.ru">русский</option><option value="legalcode.sv">svenska</option><option value="legalcode.tr">Türkçe</option><option value="legalcode.uk">українська</option><option value="legalcode.zh-Hans">中文</option> </select> </div></div>
132+
<div id="language-selector-block" class="container"> <div class="language-selector-inner">هذة الصفحة متوفرة باللغات التالية: <img class="language-icon" src="/images/language_icon_x2.png" alt="Languages" /> <select><option value="legalcode.ar" selected="selected" >العربية</option><option value="legalcode.cs">čeština</option><option value="legalcode.de">Deutsch</option><option value="legalcode.el">Ελληνικά</option><option value="legalcode">English</option><option value="legalcode">English</option><option value="legalcode.es">Español</option><option value="legalcode.eu">euskara</option><option value="legalcode.fi">suomeksi</option><option value="legalcode.fr">français</option><option value="legalcode.hr">hrvatski</option><option value="legalcode.id">bahasa Indonesia</option><option value="legalcode.it">italiano</option><option value="legalcode.ja">日本語</option><option value="legalcode.ko">한국어</option><option value="legalcode.lt">Lietuvių</option><option value="legalcode.lv">latviski</option><option value="legalcode.mi">Te Reo Māori</option><option value="legalcode.nl">Nederlands</option><option value="legalcode.no">norsk</option><option value="legalcode.pl">polski</option><option value="legalcode.pt">Português</option><option value="legalcode.ru">русский</option><option value="legalcode.sv">svenska</option><option value="legalcode.tr">Türkçe</option><option value="legalcode.uk">українська</option><option value="legalcode.zh-Hans">中文</option><option value="legalcode.zh-Hant">華語</option> </select> </div></div>
133133
<!-- Language Selector End - DO NOT DELETE -->
134134

135135
<div id="deed" class="yellow">
@@ -268,7 +268,7 @@ <h3>مؤسسة المشاع الإبداعي نَسْبُ الـمُصنَّف،
268268
<p class="shaded">إنَّ مؤسسة المشاع الإبداعي ليست طرفًا في رخصها العمومية. وعلى الرغم من ذلك، فإنه يجوز لمؤسسة المشاع الإبداعي اختيار تطبيق إحدى رخصها العمومية على ما تنشره من مواد، وفي تلك الحالات سوف تُعتبر بأنها "المرخِّص". أن نصوص رخص المشاع الإبداعي كرست للملك العام تحت رخصة <a href="//creativecommons.org/publicdomain/zero/1.0/legalcode">CC0 مكرس للملك العام</a>. وفيما عدا الغرض المحدود للإشارة إلى أنَّ المادة التي يتم مشاركتها بموجب رخصة المشاع الإبداعي العمومية، CC0 أو كما هو مسموح -بخلاف ذلك- بسياسات المشاع الإبداعي المنشورة في: <a href="//creativecommons.org/policies">creativecommons.org/policies</a>، لا تُجيز مؤسسة المشاع الإبداعي استعمال علامتها التجارية "Creative Commons" أو أي علامة تجارية أو شعار آخر للمشاع الإبداعي من دون موافقتها الكتابية المسبقة، <span dir="RTL">فيما عدا ذلك</span> -دون تقييد- ما يرتبط بأي تعديلات غير مُجازة لأي من رخصها العمومية أو أي ترتيبات أو تفاهمات أو اتفاقات بشأن استعمال المواد المرخَّصة. تفادياً للالتباس، هذه الفقرة لا تُشكِّل جزءًا من الرخصة العمومية.<br>
269269
<br>
270270
يمكن التواصل مع مؤسسة المشاع الإبداعي على: <a href="//creativecommons.org/">creativecommons.org</a>.</p>
271-
<p class="shaded a-nobreak"><a name="languages">تتوفر لغات إضافية</a>: <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.es">Español</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.eu">euskara</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.es">Español</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.lv">latviski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.cs">čeština</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.el">Ελληνικά</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ja">日本語</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ru">русский</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.mi">te reo Māori</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.fi">suomeksi</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.pt">português</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.pl">polski</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.no">norsk</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.nl">Nederlands</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.lt">Lietuvių</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.it">italiano</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.hr">hrvatski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.fr">français</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode">English</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.de">Deutsch</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.id">Bahasa Indonesia</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ko">한국어</a>.<br> يرجى قراءة <a href="//wiki.creativecommons.org/FAQ#officialtranslations">الأسئلة الأكثر تكرارًا</a> وذلك للمزيد من المعلومات حول الترجمات الرسمية. </p>
271+
<p class="shaded a-nobreak"><a name="languages">تتوفر لغات إضافية</a>: <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.es">Español</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.eu">euskara</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.es">Español</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.lv">latviski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.tr">Türkçe</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.cs">čeština</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.el">Ελληνικά</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.zh-Hans">中文</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ja">日本語</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.uk">українська</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ru">русский</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.mi">te reo Māori</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.sv">svenska</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.fi">suomeksi</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.pt">português</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.pl">polski</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.no">norsk</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.nl">Nederlands</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.lt">Lietuvių</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.it">italiano</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.hr">hrvatski</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.fr">français</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode">English</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.de">Deutsch</a> ،<a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.id">Bahasa Indonesia</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.zh-Hant">華語</a>, <a href="//creativecommons.org/licenses/by-nc-nd/4.0/legalcode.ko">한국어</a>.<br> يرجى قراءة <a href="//wiki.creativecommons.org/FAQ#officialtranslations">الأسئلة الأكثر تكرارًا</a> وذلك للمزيد من المعلومات حول الترجمات الرسمية. </p>
272272
</div>
273273
</div>
274274
<div id="deed-foot">

0 commit comments

Comments
 (0)