Item9693: Restore WikiSyntaxSummary

It's translated, so good for non-English users. It's INCLUDED for the old wikitext editor, which isn't used when natedit is enabled. But when not enabled, it was generating INCLUDE errors and no help text. The other help topics are much too big. This is a reasonably summary. Rerun xgettext to merge in the strings. Most were already translated, so shouldn't be too painful.
foswiki · Mar 19, 2015 · d54fa8e · d54fa8e
1 parent 54d347b
commit d54fa8e
Show file tree

Hide file tree

Showing 25 changed files with 1,397 additions and 920 deletions.
diff --git a/core/data/System/WikiSyntaxSummary.txt b/core/data/System/WikiSyntaxSummary.txt
@@ -0,0 +1,19 @@
+%META:TOPICINFO{author="ProjectContributor" date="1426792401" format="1.1" version="1"}%
+%META:TOPICPARENT{name="UsersGuide"}%
+This page provides online help for new users of Foswiki when editing a page.  If there's some formatting that your contributors use often, you can customize this for your site's particular needs.
+
+Keeping this help text short and simple is important since this page is aimed at new users. It does include pop-up links for more detailed help.
+
+---
+%STARTINCLUDE% %MAKETEXT{"*Formatting help:*"}%
+   * %MAKETEXT{"*bold* put word/phrase in asterisks: =<nop>*your phrase*="}%
+   * %MAKETEXT{"*bullet list* 3 spaces, asterisk, 1 space: =&&nbsp;&&nbsp;&&nbsp;*&&nbsp;your text="}%
+   * %MAKETEXT{"*headings* 3 dashes, 1 to 6 pluses, 1 space: =---++&&nbsp;Your Heading="}%
+   * %MAKETEXT{"*italic* put word/phrase in underscores: =_<nop>your words_="}%
+   * %MAKETEXT{"*site links* use topic name: =[_1]= or =[<nop>[[_1]][Our homepage]]=" args="%HOMETOPIC%"}%
+   * %MAKETEXT{"*external links* =http://yahoo.com= or =~[<nop>~[http://yahoo.com/~]~[link to Yahoo~]~]="}%
+   * %MAKETEXT{"*monospaced* put word/phrase in equal signs: =<nop>=your words=="}%
+   * %MAKETEXT{"*paragraphs* separate with blank line"}%
+   * %POPUPWINDOW{"%SYSTEMWEB%.EditingShorthand" label="%MAKETEXT{"More formatting help"}%"}% %MAKETEXT{"and"}% %POPUPWINDOW{"%SYSTEMWEB%.GoodStyle" label="%MAKETEXT{"hints on good style"}%"}%
+%STOPINCLUDE%
+---
diff --git a/core/lib/Foswiki/Contrib/core/MANIFEST b/core/lib/Foswiki/Contrib/core/MANIFEST
@@ -360,6 +360,7 @@ data/System/WebTopicList.txt 0644
 data/System/WelcomeGuest.txt 0644
 data/System/WikiCulture.txt 0644
 data/System/WikiName.txt 0644
+data/System/WikiSyntaxSummary.txt 0644
 data/System/WikiWikiClones.txt 0644
 data/System/WikiWord.txt 0644
 data/System/WYSIWYG.txt 0644

diff --git a/core/locale/Foswiki.pot b/core/locale/Foswiki.pot
@@ -371,6 +371,10 @@ msgid ""
 "attachment history will be the comment when the file was uploaded."
 msgstr ""
 
+#: core/data/System/WikiSyntaxSummary.txt:8
+msgid "*Formatting help:*"
+msgstr ""
+
 #: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:448
 msgid ""
 "*Important:* the information provided in this form will be stored in a "
@@ -395,6 +399,42 @@ msgid ""
 "changed without uploading a file by pressing \"Change Properties only\"."
 msgstr ""
 
+#: core/data/System/WikiSyntaxSummary.txt:9
+msgid "*bold* put word/phrase in asterisks: =<nop>*your phrase*="
+msgstr ""
+
+#: core/data/System/WikiSyntaxSummary.txt:10
+msgid ""
+"*bullet list* 3 spaces, asterisk, 1 space: =&&nbsp;&&nbsp;&&nbsp;*&&nbsp;"
+"your text="
+msgstr ""
+
+#: core/data/System/WikiSyntaxSummary.txt:14
+msgid ""
+"*external links* =http://yahoo.com= or =[<nop>[http://yahoo.com/][link to "
+"Yahoo]]="
+msgstr ""
+
+#: core/data/System/WikiSyntaxSummary.txt:11
+msgid "*headings* 3 dashes, 1 to 6 pluses, 1 space: =---++&&nbsp;Your Heading="
+msgstr ""
+
+#: core/data/System/WikiSyntaxSummary.txt:12
+msgid "*italic* put word/phrase in underscores: =_<nop>your words_="
+msgstr ""
+
+#: core/data/System/WikiSyntaxSummary.txt:15
+msgid "*monospaced* put word/phrase in equal signs: =<nop>=your words=="
+msgstr ""
+
+#: core/data/System/WikiSyntaxSummary.txt:16
+msgid "*paragraphs* separate with blank line"
+msgstr ""
+
+#: core/data/System/WikiSyntaxSummary.txt:13
+msgid "*site links* use topic name: =%1= or =[<nop>[%1][Our homepage]]="
+msgstr ""
+
 #: core/lib/Foswiki/I18N/Extract.pm:98
 msgid "..."
 msgstr ""
@@ -2416,6 +2456,10 @@ msgstr ""
 msgid "More character formats"
 msgstr ""
 
+#: core/data/System/WikiSyntaxSummary.txt:17
+msgid "More formatting help"
+msgstr ""
+
 #: NatEditPlugin/templates/edittoolbar.natedit.tmpl:86
 msgid "More objects to insert"
 msgstr ""
@@ -5141,6 +5185,10 @@ msgstr ""
 msgid "accesskey='c'"
 msgstr ""
 
+#: core/data/System/WikiSyntaxSummary.txt:17
+msgid "and"
+msgstr ""
+
 #: PatternSkin/templates/search.pattern.tmpl:6 core/templates/search.tmpl:9
 msgid "by %1 "
 msgstr ""
@@ -5199,6 +5247,10 @@ msgstr ""
 msgid "help"
 msgstr ""
 
+#: core/data/System/WikiSyntaxSummary.txt:17
+msgid "hints on good style"
+msgstr ""
+
 #: NatEditPlugin/templates/editdialog.natedit.tmpl:24
 msgid "ignore case"
 msgstr ""

diff --git a/core/locale/bg.po b/core/locale/bg.po
@@ -398,6 +398,11 @@ msgstr ""
 "коментараът показан срещу историята на пртурката  ще си остане същия както е "
 "бил при качваненто на файла."
 
+#: core/data/System/WikiSyntaxSummary.txt:8
+#, fuzzy
+msgid "*Formatting help:*"
+msgstr "Още помощ при форматиране"
+
 #: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:448
 #, fuzzy
 msgid ""
@@ -437,6 +442,52 @@ msgstr ""
 "могат да бъдат променени без да се качва файл като щракнете върху  \"Change "
 "Properties only\"; вижте %1."
 
+#: core/data/System/WikiSyntaxSummary.txt:9
+msgid "*bold* put word/phrase in asterisks: =<nop>*your phrase*="
+msgstr "*удебелено* сложете звездички около думата/израза: =<nop>*думи*="
+
+#: core/data/System/WikiSyntaxSummary.txt:10
+msgid ""
+"*bullet list* 3 spaces, asterisk, 1 space: =&&nbsp;&&nbsp;&&nbsp;*&&nbsp;"
+"your text="
+msgstr ""
+"*списък с водачи* 3 паузи, звездичка, 1 пауза: =&&nbsp;&&nbsp;&&nbsp;*&&nbsp;"
+"вашия текст="
+
+#: core/data/System/WikiSyntaxSummary.txt:14
+msgid ""
+"*external links* =http://yahoo.com= or =[<nop>[http://yahoo.com/][link to "
+"Yahoo]]="
+msgstr ""
+"*външни връзки* =http://yahoo.com= или =[<nop>[http://yahoo.com/][връзка към "
+"Yahoo]]="
+
+#: core/data/System/WikiSyntaxSummary.txt:11
+msgid "*headings* 3 dashes, 1 to 6 pluses, 1 space: =---++&&nbsp;Your Heading="
+msgstr ""
+"*заглавия* 3 тирета, 1 до 6 плюса, 1 пауза: =---++&&nbsp;Вашето Заглавие="
+
+#: core/data/System/WikiSyntaxSummary.txt:12
+msgid "*italic* put word/phrase in underscores: =_<nop>your words_="
+msgstr ""
+"*италичен* поставете думата/фразата между подчертавки: =_<nop>вашите думи_="
+
+#: core/data/System/WikiSyntaxSummary.txt:15
+msgid "*monospaced* put word/phrase in equal signs: =<nop>=your words=="
+msgstr ""
+"*шрифт с фиксирана ширина*  сложете знак за равенство около думата/израза: "
+"=<nop>=вашите думи=="
+
+#: core/data/System/WikiSyntaxSummary.txt:16
+msgid "*paragraphs* separate with blank line"
+msgstr "*абзаци* разделете с празен ред"
+
+#: core/data/System/WikiSyntaxSummary.txt:13
+msgid "*site links* use topic name: =%1= or =[<nop>[%1][Our homepage]]="
+msgstr ""
+"*връзки в сайта* използвайте име на страница: =%1= или =[<nop>[%1][вашата "
+"страница]]="
+
 #: core/lib/Foswiki/I18N/Extract.pm:98
 msgid "..."
 msgstr "..."
@@ -2639,6 +2690,10 @@ msgstr "Още действия за страница %1"
 msgid "More character formats"
 msgstr "в суров текстов формат"
 
+#: core/data/System/WikiSyntaxSummary.txt:17
+msgid "More formatting help"
+msgstr "Още помощ при форматиране"
+
 #: NatEditPlugin/templates/edittoolbar.natedit.tmpl:86
 msgid "More objects to insert"
 msgstr ""
@@ -5522,6 +5577,10 @@ msgstr "достъпът до раздела е забранен"
 msgid "accesskey='c'"
 msgstr "accesskey='c'"
 
+#: core/data/System/WikiSyntaxSummary.txt:17
+msgid "and"
+msgstr "и"
+
 #: PatternSkin/templates/search.pattern.tmpl:6 core/templates/search.tmpl:9
 msgid "by %1 "
 msgstr ""
@@ -5583,6 +5642,10 @@ msgstr "полета са задължителни."
 msgid "help"
 msgstr "помощ"
 
+#: core/data/System/WikiSyntaxSummary.txt:17
+msgid "hints on good style"
+msgstr "съвети за добър стил"
+
 #: NatEditPlugin/templates/editdialog.natedit.tmpl:24
 msgid "ignore case"
 msgstr ""
@@ -5891,46 +5954,6 @@ msgstr ""
 #~ msgid "&Edit text"
 #~ msgstr "Редактиране на текста"
 
-#~ msgid "*bold* put word/phrase in asterisks: =<nop>*your phrase*="
-#~ msgstr "*удебелено* сложете звездички около думата/израза: =<nop>*думи*="
-
-#~ msgid ""
-#~ "*bullet list* 3 spaces, asterisk, 1 space: =&&nbsp;&&nbsp;&&nbsp;*&&nbsp;"
-#~ "your text="
-#~ msgstr ""
-#~ "*списък с водачи* 3 паузи, звездичка, 1 пауза: =&&nbsp;&&nbsp;&&nbsp;"
-#~ "*&&nbsp;вашия текст="
-
-#~ msgid ""
-#~ "*external links* =http://yahoo.com= or =[<nop>[http://yahoo.com/][link to "
-#~ "Yahoo]]="
-#~ msgstr ""
-#~ "*външни връзки* =http://yahoo.com= или =[<nop>[http://yahoo.com/][връзка "
-#~ "към Yahoo]]="
-
-#~ msgid ""
-#~ "*headings* 3 dashes, 1 to 6 pluses, 1 space: =---++&&nbsp;Your Heading="
-#~ msgstr ""
-#~ "*заглавия* 3 тирета, 1 до 6 плюса, 1 пауза: =---++&&nbsp;Вашето Заглавие="
-
-#~ msgid "*italic* put word/phrase in underscores: =_<nop>your words_="
-#~ msgstr ""
-#~ "*италичен* поставете думата/фразата между подчертавки: =_<nop>вашите "
-#~ "думи_="
-
-#~ msgid "*monospaced* put word/phrase in equal signs: =<nop>=your words=="
-#~ msgstr ""
-#~ "*шрифт с фиксирана ширина*  сложете знак за равенство около думата/"
-#~ "израза: =<nop>=вашите думи=="
-
-#~ msgid "*paragraphs* separate with blank line"
-#~ msgstr "*абзаци* разделете с празен ред"
-
-#~ msgid "*site links* use topic name: =%1= or =[<nop>[%1][Our homepage]]="
-#~ msgstr ""
-#~ "*връзки в сайта* използвайте име на страница: =%1= или =[<nop>[%1][вашата "
-#~ "страница]]="
-
 #, fuzzy
 #~ msgid ""
 #~ "A more extensive changes list is available via [[%1][Recent changes]]."
@@ -5967,9 +5990,6 @@ msgstr ""
 #~ msgid "Log on with your username and password"
 #~ msgstr "Моля, въведете вашето потребителско име и парола"
 
-#~ msgid "More formatting help"
-#~ msgstr "Още помощ при форматиране"
-
 #~ msgid "Quiet save"
 #~ msgstr "Тих запис"
 
@@ -5990,12 +6010,6 @@ msgstr ""
 #~ msgid "Warning: 'include' topic does not exist!"
 #~ msgstr "Внимание: 'include' страница не съществува"
 
-#~ msgid "and"
-#~ msgstr "и"
-
-#~ msgid "hints on good style"
-#~ msgstr "съвети за добър стил"
-
 #, fuzzy
 #~ msgid "later"
 #~ msgstr "Дата"