Item618: Copyright symbol inside a Maketext requires the && instead o…

…f & as the single & means something else git-svn-id: http://svn.foswiki.org/trunk@1688 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
foswiki · Jan 1, 2009 · 3c948da · 3c948da
1 parent f6f05b8
commit 3c948da
Show file tree

Hide file tree

Showing 21 changed files with 25 additions and 26 deletions.
diff --git a/core/data/System/WebPreferences.txt b/core/data/System/WebPreferences.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev: 15648 $"}%
+%META:TOPICINFO{author="ProjectContributor" date="1111929255" format="1.0" version="$Rev$"}%
 ---+!! <nop>%WEB% Web Preferences
 
 The following settings are *web preferences* of the [[%WEB%.%HOMETOPIC%][%WEB%]] web. These preferences overwrite the *site-level preferences* in [[%SYSTEMWEB%.%WIKIPREFSTOPIC%]] and [[%LOCALSITEPREFS%]], and can be overwritten by *user preferences* (your personal topic, eg: %USERSWEB%.%WIKINAME% in the [[%USERSWEB%.%HOMETOPIC%][%USERSWEB%]] web).
@@ -31,7 +31,7 @@ These [[%SYSTEMWEB%.PreferenceSettings][preference settings]] override the defau
       * Set WEBFORMS = DefaultPreferencesForm
 
    * Copyright notice for the web.
-      * Set WEBCOPYRIGHT = <span class="foswikiRight"> <a href="http://foswiki.org/"><img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/badge.gif" alt="This site is powered by Foswiki" title="This site is powered by Foswiki" border="0" /></a></span>%MAKETEXT{"Copyright &copy; by the contributing authors. All material on this site is the property of the contributing authors." args="1999-%GMTIME{$year}%"}% <br /> %MAKETEXT{"Ideas, requests, problems regarding [_1]? <a href='[_2]'>Send feedback</a>" args="<nop>%WIKITOOLNAME%,mailto:%WIKIWEBMASTER%?subject=%WIKITOOLNAME%%20Feedback%20on%20%BASEWEB%.%BASETOPIC%"}% %IF{"$ WEB= $ SYSTEMWEB" then=""}%
+      * Set WEBCOPYRIGHT = <span class="foswikiRight"> <a href="http://foswiki.org/"><img src="%PUBURLPATH%/%SYSTEMWEB%/ProjectLogos/badge.gif" alt="This site is powered by Foswiki" title="This site is powered by Foswiki" border="0" /></a></span>%MAKETEXT{"Copyright &&copy; by the contributing authors. All material on this site is the property of the contributing authors." args="1999-%GMTIME{$year}%"}% <br /> %MAKETEXT{"Ideas, requests, problems regarding [_1]? <a href='[_2]'>Send feedback</a>" args="<nop>%WIKITOOLNAME%,mailto:%WIKIWEBMASTER%?subject=%WIKITOOLNAME%%20Feedback%20on%20%BASEWEB%.%BASETOPIC%"}% %IF{"$ WEB= $ SYSTEMWEB" then=""}%
 
    * Users or groups who *are not* / *are* allowed to *view* / *change* / *rename* topics in the <nop>%WEB% web: (See %SYSTEMWEB%.AccessControl).
       * Set ALLOWWEBCHANGE = %USERSWEB%.AdminGroup

diff --git a/core/locale/Foswiki.pot b/core/locale/Foswiki.pot
@@ -940,7 +940,7 @@ msgstr ""
 
 #: core/data/System/WebPreferences.txt:34
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 

diff --git a/core/locale/bg.po b/core/locale/bg.po
@@ -1036,7 +1036,7 @@ msgstr ""
 #: core/data/System/WebPreferences.txt:34
 #, fuzzy
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Авторските права &&copy; принадлежат на сътрудничещите автори. Всички "

diff --git a/core/locale/cs.po b/core/locale/cs.po
@@ -1034,7 +1034,7 @@ msgstr ""
 #: core/data/System/WebPreferences.txt:34
 #, fuzzy
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Copyright &&copy; podle přispívajících autorů. Všechen materiál na této "

diff --git a/core/locale/da.po b/core/locale/da.po
@@ -1026,7 +1026,7 @@ msgstr ""
 
 #: core/data/System/WebPreferences.txt:34
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Copyright &&copy; ved de deltagende brugere. Alt indhold i denne e-"

diff --git a/core/locale/de.po b/core/locale/de.po
@@ -1032,10 +1032,10 @@ msgstr ""
 
 #: core/data/System/WebPreferences.txt:34
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
-"Das Urheberrecht &copy; liegt bei den mitwirkenden Autoren. Alle Inhalte "
+"Das Urheberrecht &&copy; liegt bei den mitwirkenden Autoren. Alle Inhalte "
 "dieser Kollaborations-Plattform sind Eigentum der Autoren."
 
 #: core/templates/messages.tmpl:140

diff --git a/core/locale/es.po b/core/locale/es.po
@@ -1029,7 +1029,7 @@ msgstr ""
 
 #: core/data/System/WebPreferences.txt:34
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Derechos reservados &&copy; por los autores contribuyentes. Todo el material "

diff --git a/core/locale/fi.po b/core/locale/fi.po
@@ -947,7 +947,7 @@ msgstr ""
 
 #: core/data/System/WebPreferences.txt:34
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 

diff --git a/core/locale/fr.po b/core/locale/fr.po
@@ -916,8 +916,8 @@ msgid "Copyright &&copy; by the contributing authors. All material on this colla
 msgstr "Copyright &&copy; par les auteurs. Le contenu de cette plateforme collaborative est la propriété des auteurs qui y ont contribué."
 
 #: ../core/data/System/WebPreferences.txt:34
-msgid "Copyright &copy; by the contributing authors. All material on this site is the property of the contributing authors."
-msgstr "Copyright &copy; par les auteurs contributeurs. Le contenu de ce site est la propriété des auteurs qui y ont contribué."
+msgid "Copyright &&copy; by the contributing authors. All material on this site is the property of the contributing authors."
+msgstr "Copyright &&copy; par les auteurs contributeurs. Le contenu de ce site est la propriété des auteurs qui y ont contribué."
 
 #: ../core/templates/messages.tmpl:140
 msgid "Could not create the new web %1"

diff --git a/core/locale/it.po b/core/locale/it.po
@@ -1038,9 +1038,8 @@ msgstr ""
 "piattaforma sono di proprietà dei rispettivi autori."
 
 #: core/data/System/WebPreferences.txt:34
-#, fuzzy
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Copyright &&copy; di chi contribuisce. Tutti i materiali presenti su questa "

diff --git a/core/locale/ja.po b/core/locale/ja.po
@@ -1011,7 +1011,7 @@ msgstr ""
 #: core/data/System/WebPreferences.txt:34
 #, fuzzy
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "コピーライト &&copy; 著作者。本プラットフォームにある全ての物は本プラット"

diff --git a/core/locale/nl.po b/core/locale/nl.po
@@ -1014,7 +1014,7 @@ msgstr ""
 
 #: core/data/System/WebPreferences.txt:34
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Copyright &&copy; de contribueren-de auteurs. Al het materiaal op dit "

diff --git a/core/locale/no.po b/core/locale/no.po
@@ -1002,7 +1002,7 @@ msgstr ""
 
 #: core/data/System/WebPreferences.txt:34
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Copyright &&copy; av de bidragende forfattere. Alt materiale i denne "

diff --git a/core/locale/pl.po b/core/locale/pl.po
@@ -1041,7 +1041,7 @@ msgstr ""
 #: core/data/System/WebPreferences.txt:34
 #, fuzzy
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Copyright &&copy;. Zawartość tej strony jest własnością osób "

diff --git a/core/locale/pt-br.po b/core/locale/pt-br.po
@@ -1025,7 +1025,7 @@ msgstr ""
 
 #: core/data/System/WebPreferences.txt:34
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Copyright &&copy; pelos autores contribuintes. Todo material nessa "

diff --git a/core/locale/pt.po b/core/locale/pt.po
@@ -1024,7 +1024,7 @@ msgstr ""
 
 #: core/data/System/WebPreferences.txt:34
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Copyright &&copy; pelos autores contribuintes. Todo material nessa "

diff --git a/core/locale/ru.po b/core/locale/ru.po
@@ -1059,7 +1059,7 @@ msgstr ""
 #: core/data/System/WebPreferences.txt:34
 #, fuzzy
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Авторские права &&copy; закреплены за авторами проекта. Все материалы по "

diff --git a/core/locale/sv.po b/core/locale/sv.po
@@ -918,8 +918,8 @@ msgid "Copyright &&copy; by the contributing authors. All material on this colla
 msgstr "Copyright &&copy; bidragande författare. Allt innehåll på denna sammarbetsplattform tillhör författarna."
 
 #: core/data/System/WebPreferences.txt:34
-msgid "Copyright &copy; by the contributing authors. All material on this site is the property of the contributing authors."
-msgstr "Copyright &copy; bidragande författare. Allt innehåll på denna webbplats tillhör författarna."
+msgid "Copyright &&copy; by the contributing authors. All material on this site is the property of the contributing authors."
+msgstr "Copyright &&copy; bidragande författare. Allt innehåll på denna webbplats tillhör författarna."
 
 #: core/templates/messages.tmpl:140
 msgid "Could not create the new web %1"

diff --git a/core/locale/uk.po b/core/locale/uk.po
@@ -1033,7 +1033,7 @@ msgstr ""
 #: core/data/System/WebPreferences.txt:34
 #, fuzzy
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr ""
 "Авторські права &&copy; закріплені за авторами проекту. Всі матеріали по цій "

diff --git a/core/locale/zh-cn.po b/core/locale/zh-cn.po
@@ -985,7 +985,7 @@ msgstr "版权所有 &&copy; 作者 在协作平台上的所有资料归于内
 #: core/data/System/WebPreferences.txt:34
 #, fuzzy
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr "版权所有 &&copy; 作者 在协作平台上的所有资料归于内容贡献者所有"
 

diff --git a/core/locale/zh-tw.po b/core/locale/zh-tw.po
@@ -986,7 +986,7 @@ msgstr "版權所有 &&copy; 作者 在協作平臺上的所有資料歸於內
 #: core/data/System/WebPreferences.txt:34
 #, fuzzy
 msgid ""
-"Copyright &copy; by the contributing authors. All material on this site is "
+"Copyright &&copy; by the contributing authors. All material on this site is "
 "the property of the contributing authors."
 msgstr "版權所有 &&copy; 作者 在協作平臺上的所有資料歸於內容貢獻者所有"