diff --git a/.gitattributes b/.gitattributes index 0128417df3..c46c388022 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4981,19 +4981,6 @@ components/synedit/test/testwordwrap.pas svneol=native#text/pascal components/synunihighlighter/CHANGES.txt svneol=native#text/plain components/synunihighlighter/CREDITS.txt svneol=native#text/plain components/synunihighlighter/README.txt svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.cs.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.de.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.fr.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.hu.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.id.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.it.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.lt.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.pot svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.pt_BR.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.ru.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.uk.po svneol=native#text/plain -components/synunihighlighter/languages/synunidesigner.zh_CN.po svneol=native#text/plain -components/synunihighlighter/languages/synunireg.cs.po svneol=native#text/plain components/synunihighlighter/languages/synunireg.de.po svneol=native#text/plain components/synunihighlighter/languages/synunireg.fr.po svneol=native#text/plain components/synunihighlighter/languages/synunireg.hu.po svneol=native#text/plain @@ -5001,16 +4988,29 @@ components/synunihighlighter/languages/synunireg.id.po svneol=native#text/plain components/synunihighlighter/languages/synunireg.it.po svneol=native#text/plain components/synunihighlighter/languages/synunireg.lt.po svneol=native#text/plain components/synunihighlighter/languages/synunireg.pl.po svneol=native#text/plain -components/synunihighlighter/languages/synunireg.pot svneol=native#text/plain components/synunihighlighter/languages/synunireg.pt_BR.po svneol=native#text/plain components/synunihighlighter/languages/synunireg.ru.po svneol=native#text/plain components/synunihighlighter/languages/synunireg.uk.po svneol=native#text/plain components/synunihighlighter/languages/synunireg.zh_CN.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.cs.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.de.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.fr.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.hu.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.id.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.it.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.lt.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.pl.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.pot svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.pt_BR.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.ru.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.uk.po svneol=native#text/plain +components/synunihighlighter/languages/synunistrconst.zh_CN.po svneol=native#text/plain components/synunihighlighter/synuni.lpk svneol=native#text/pascal components/synunihighlighter/synuni.pas svneol=native#text/pascal components/synunihighlighter/synunidesigner.pas svneol=native#text/pascal components/synunihighlighter/synunihighlighter.pas svneol=native#text/pascal components/synunihighlighter/synunireg.pas svneol=native#text/pascal +components/synunihighlighter/synunistrconst.pas svneol=native#text/pascal components/tachart/Makefile svneol=native#text/plain components/tachart/Makefile.compiled svneol=native#text/plain components/tachart/Makefile.fpc svneol=native#text/plain diff --git a/components/synunihighlighter/languages/synunidesigner.fr.po b/components/synunihighlighter/languages/synunidesigner.fr.po deleted file mode 100644 index 2a3c89522e..0000000000 --- a/components/synunihighlighter/languages/synunidesigner.fr.po +++ /dev/null @@ -1,15 +0,0 @@ -msgid "" -msgstr "" -"Project-Id-Version: \n" -"POT-Creation-Date: \n" -"PO-Revision-Date: \n" -"Last-Translator: Beuselinck Vincent \n" -"Language-Team: \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" -"Content-Transfer-Encoding: 8bit\n" - -#: synunidesigner.sunifiledescription -msgid "UniHighlighter Syntax" -msgstr "Syntaxe UniHighlighter" - diff --git a/components/synunihighlighter/languages/synunidesigner.it.po b/components/synunihighlighter/languages/synunidesigner.it.po deleted file mode 100644 index eeaaf79313..0000000000 --- a/components/synunihighlighter/languages/synunidesigner.it.po +++ /dev/null @@ -1,10 +0,0 @@ -msgid "" -msgstr "" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: synunidesigner.sunifiledescription -msgid "UniHighlighter Syntax" -msgstr "Sintassi UniHighlighter" - diff --git a/components/synunihighlighter/languages/synunidesigner.lt.po b/components/synunihighlighter/languages/synunidesigner.lt.po deleted file mode 100644 index 131e09c4c3..0000000000 --- a/components/synunihighlighter/languages/synunidesigner.lt.po +++ /dev/null @@ -1,16 +0,0 @@ -msgid "" -msgstr "" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Project-Id-Version: synunidesigner\n" -"Language-Team: Lithuanian\n" -"X-Generator: KBabel 1.11.4\n" -"MIME-Version: 1.0\n" -"Last-Translator: Valdas Jankūnas \n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"PO-Revision-Date: 2008-06-12 21:47+0300\n" - -#: synunidesigner.sunifiledescription -msgid "UniHighlighter Syntax" -msgstr "UniHighlighter sintaksė" - diff --git a/components/synunihighlighter/languages/synunidesigner.pot b/components/synunihighlighter/languages/synunidesigner.pot deleted file mode 100644 index 4e653ed31b..0000000000 --- a/components/synunihighlighter/languages/synunidesigner.pot +++ /dev/null @@ -1,10 +0,0 @@ -msgid "" -msgstr "" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: synunidesigner.sunifiledescription -msgid "UniHighlighter Syntax" -msgstr "" - diff --git a/components/synunihighlighter/languages/synunireg.pot b/components/synunihighlighter/languages/synunireg.pot deleted file mode 100644 index 4dba3e3685..0000000000 --- a/components/synunihighlighter/languages/synunireg.pot +++ /dev/null @@ -1,10 +0,0 @@ -msgid "" -msgstr "" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: synunireg.sedituni -msgid "Edit ..." -msgstr "" - diff --git a/components/synunihighlighter/languages/synunidesigner.cs.po b/components/synunihighlighter/languages/synunistrconst.cs.po similarity index 78% rename from components/synunihighlighter/languages/synunidesigner.cs.po rename to components/synunihighlighter/languages/synunistrconst.cs.po index e52246414f..cef66aff50 100644 --- a/components/synunihighlighter/languages/synunidesigner.cs.po +++ b/components/synunihighlighter/languages/synunistrconst.cs.po @@ -10,7 +10,11 @@ msgstr "" "Language-Team: \n" "X-Generator: Poedit 1.5.4\n" -#: synunidesigner.sunifiledescription +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "Upravit..." + +#: synunistrconst.sunifiledescription msgid "UniHighlighter Syntax" msgstr "Syntax UniZvýrazňovače" diff --git a/components/synunihighlighter/languages/synunidesigner.de.po b/components/synunihighlighter/languages/synunistrconst.de.po similarity index 51% rename from components/synunihighlighter/languages/synunidesigner.de.po rename to components/synunihighlighter/languages/synunistrconst.de.po index 53edd433cd..2bb14b60d4 100644 --- a/components/synunihighlighter/languages/synunidesigner.de.po +++ b/components/synunihighlighter/languages/synunistrconst.de.po @@ -2,14 +2,19 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2007-01-10 21:21+0100\n" -"Last-Translator: Joerg Braun \n" +"PO-Revision-Date: 2013-09-24 11:21+0100\n" +"Last-Translator: Swen Heinig \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" -#: synunidesigner.sunifiledescription +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "Bearbeiten ..." + +#: synunistrconst.sunifiledescription msgid "UniHighlighter Syntax" msgstr "UniHighlighter-Syntax" diff --git a/components/synunihighlighter/languages/synunistrconst.fr.po b/components/synunihighlighter/languages/synunistrconst.fr.po new file mode 100644 index 0000000000..71f33d270a --- /dev/null +++ b/components/synunihighlighter/languages/synunistrconst.fr.po @@ -0,0 +1,21 @@ +msgid "" +msgstr "" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Vasseur Gilles \n" +"Language-Team: Vasseur Gilles \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: fr\n" +"X-Generator: Poedit 1.7.5\n" + +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "Éditer..." + +#: synunistrconst.sunifiledescription +msgid "UniHighlighter Syntax" +msgstr "Syntaxe UniHighlighter" + diff --git a/components/synunihighlighter/languages/synunidesigner.hu.po b/components/synunihighlighter/languages/synunistrconst.hu.po similarity index 78% rename from components/synunihighlighter/languages/synunidesigner.hu.po rename to components/synunihighlighter/languages/synunistrconst.hu.po index 1cbcc6c32f..100f6e038e 100644 --- a/components/synunihighlighter/languages/synunidesigner.hu.po +++ b/components/synunihighlighter/languages/synunistrconst.hu.po @@ -11,7 +11,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.4\n" -#: synunidesigner.sunifiledescription +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "Szerkesztés ..." + +#: synunistrconst.sunifiledescription msgid "UniHighlighter Syntax" msgstr "UniHighlighter szintaxiskiemelés" diff --git a/components/synunihighlighter/languages/synunidesigner.id.po b/components/synunihighlighter/languages/synunistrconst.id.po similarity index 75% rename from components/synunihighlighter/languages/synunidesigner.id.po rename to components/synunihighlighter/languages/synunistrconst.id.po index 810f016d60..3c2f721dcd 100644 --- a/components/synunihighlighter/languages/synunidesigner.id.po +++ b/components/synunihighlighter/languages/synunistrconst.id.po @@ -9,7 +9,13 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: synunidesigner.sunifiledescription +#: synunistrconst.sedituni +#, fuzzy +#| msgid "Edit..." +msgid "Edit ..." +msgstr "Edit..." + +#: synunistrconst.sunifiledescription msgid "UniHighlighter Syntax" msgstr "Sintaks UniHighlighter" diff --git a/components/synunihighlighter/languages/synunireg.cs.po b/components/synunihighlighter/languages/synunistrconst.it.po similarity index 51% rename from components/synunihighlighter/languages/synunireg.cs.po rename to components/synunihighlighter/languages/synunistrconst.it.po index 0d0125f87f..5ef2017eb6 100644 --- a/components/synunihighlighter/languages/synunireg.cs.po +++ b/components/synunihighlighter/languages/synunistrconst.it.po @@ -6,11 +6,14 @@ msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" "PO-Revision-Date: \n" -"Last-Translator: Václav Valíček \n" +"Last-Translator: Giuliano Colla \n" "Language-Team: \n" -"X-Generator: Poedit 1.5.4\n" -#: synunireg.sedituni +#: synunistrconst.sedituni msgid "Edit ..." -msgstr "Upravit..." +msgstr "Modifica..." + +#: synunistrconst.sunifiledescription +msgid "UniHighlighter Syntax" +msgstr "Sintassi UniHighlighter" diff --git a/components/synunihighlighter/languages/synunistrconst.lt.po b/components/synunihighlighter/languages/synunistrconst.lt.po new file mode 100644 index 0000000000..3700874928 --- /dev/null +++ b/components/synunihighlighter/languages/synunistrconst.lt.po @@ -0,0 +1,21 @@ +msgid "" +msgstr "" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"PO-Revision-Date: 2012-08-06 22:13+0300\n" +"Project-Id-Version: synunireg\n" +"Language-Team: Lithuanian \n" +"X-Generator: Lokalize 1.5\n" +"MIME-Version: 1.0\n" +"Last-Translator: Valdas Jankunas \n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Language: lt\n" + +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "Keisti…" + +#: synunistrconst.sunifiledescription +msgid "UniHighlighter Syntax" +msgstr "UniHighlighter sintaksė" + diff --git a/components/synunihighlighter/languages/synunistrconst.pl.po b/components/synunihighlighter/languages/synunistrconst.pl.po new file mode 100644 index 0000000000..07b2228e27 --- /dev/null +++ b/components/synunihighlighter/languages/synunistrconst.pl.po @@ -0,0 +1,22 @@ +msgid "" +msgstr "" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Project-Id-Version: \n" +"POT-Creation-Date: \n" +"PO-Revision-Date: \n" +"Last-Translator: Sławomir Niedziela \n" +"Language-Team: \n" +"Language: pl\n" +"X-Generator: Poedit 1.8.7.1\n" + +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "Edycja..." + +#: synunistrconst.sunifiledescription +msgid "UniHighlighter Syntax" +msgstr "" + diff --git a/components/synunihighlighter/languages/synunistrconst.pot b/components/synunihighlighter/languages/synunistrconst.pot new file mode 100644 index 0000000000..4cf865373c --- /dev/null +++ b/components/synunihighlighter/languages/synunistrconst.pot @@ -0,0 +1,11 @@ +msgid "" +msgstr "Content-Type: text/plain; charset=UTF-8" + +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "" + +#: synunistrconst.sunifiledescription +msgid "UniHighlighter Syntax" +msgstr "" + diff --git a/components/synunihighlighter/languages/synunidesigner.pt_BR.po b/components/synunihighlighter/languages/synunistrconst.pt_BR.po similarity index 56% rename from components/synunihighlighter/languages/synunidesigner.pt_BR.po rename to components/synunihighlighter/languages/synunistrconst.pt_BR.po index 3d1060cac1..7ef1822b8a 100644 --- a/components/synunihighlighter/languages/synunidesigner.pt_BR.po +++ b/components/synunihighlighter/languages/synunistrconst.pt_BR.po @@ -6,10 +6,16 @@ msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" "PO-Revision-Date: \n" -"Last-Translator: Marcelo Borges de Paula\n" +"Last-Translator: Marcelo B Paula \n" "Language-Team: \n" +"Language: pt_BR\n" +"X-Generator: Poedit 1.8.13\n" -#: synunidesigner.sunifiledescription +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "Editar .." + +#: synunistrconst.sunifiledescription msgid "UniHighlighter Syntax" msgstr "Sintaxe \"UniHighlighter\"" diff --git a/components/synunihighlighter/languages/synunidesigner.ru.po b/components/synunihighlighter/languages/synunistrconst.ru.po similarity index 67% rename from components/synunihighlighter/languages/synunidesigner.ru.po rename to components/synunihighlighter/languages/synunistrconst.ru.po index efe7dd9743..abfdb6b525 100644 --- a/components/synunihighlighter/languages/synunidesigner.ru.po +++ b/components/synunihighlighter/languages/synunistrconst.ru.po @@ -2,16 +2,18 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-08-30 01:14+0300\n" +"PO-Revision-Date: 2012-06-17 23:24+0400\n" "Last-Translator: Maxim Ganetsky \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" -"X-Generator: Poedit 2.2.1\n" -#: synunidesigner.sunifiledescription +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "Правка ..." + +#: synunistrconst.sunifiledescription msgid "UniHighlighter Syntax" msgstr "Синтаксис UniHighlighter" diff --git a/components/synunihighlighter/languages/synunidesigner.uk.po b/components/synunihighlighter/languages/synunistrconst.uk.po similarity index 54% rename from components/synunihighlighter/languages/synunidesigner.uk.po rename to components/synunihighlighter/languages/synunistrconst.uk.po index 79428e2728..fc549502eb 100644 --- a/components/synunihighlighter/languages/synunidesigner.uk.po +++ b/components/synunihighlighter/languages/synunistrconst.uk.po @@ -2,14 +2,20 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2011-06-04 22:37+0200\n" -"Last-Translator: Igor Paliychuk \n" +"PO-Revision-Date: 2016-05-27 09:49+0200\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: uk\n" +"X-Generator: Poedit 1.6.4\n" -#: synunidesigner.sunifiledescription +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "Змінити ..." + +#: synunistrconst.sunifiledescription msgid "UniHighlighter Syntax" msgstr "Синтаксис UniHighlighter" diff --git a/components/synunihighlighter/languages/synunidesigner.zh_CN.po b/components/synunihighlighter/languages/synunistrconst.zh_CN.po similarity index 82% rename from components/synunihighlighter/languages/synunidesigner.zh_CN.po rename to components/synunihighlighter/languages/synunistrconst.zh_CN.po index 30e4cb3c3c..9a117b558a 100644 --- a/components/synunihighlighter/languages/synunidesigner.zh_CN.po +++ b/components/synunihighlighter/languages/synunistrconst.zh_CN.po @@ -12,7 +12,11 @@ msgstr "" "Language: zh_CN\n" "X-Generator: Poedit 1.8.7.1\n" -#: synunidesigner.sunifiledescription +#: synunistrconst.sedituni +msgid "Edit ..." +msgstr "编辑..." + +#: synunistrconst.sunifiledescription msgid "UniHighlighter Syntax" msgstr "不高亮语法" diff --git a/components/synunihighlighter/synuni.lpk b/components/synunihighlighter/synuni.lpk index 367f97099a..996267c128 100644 --- a/components/synunihighlighter/synuni.lpk +++ b/components/synunihighlighter/synuni.lpk @@ -1,7 +1,8 @@ - + - + + @@ -18,9 +19,6 @@ - - - - + @@ -45,12 +43,16 @@ see http://www.mozilla.org/MPL/ + + + + + - @@ -71,7 +73,6 @@ see http://www.mozilla.org/MPL/ - diff --git a/components/synunihighlighter/synuni.pas b/components/synunihighlighter/synuni.pas index 7dfcb46b37..31dd2e59f9 100644 --- a/components/synunihighlighter/synuni.pas +++ b/components/synunihighlighter/synuni.pas @@ -8,7 +8,8 @@ unit SynUni; interface uses - SynUniDesigner, SynUniHighlighter, SynUniReg, LazarusPackageIntf; + SynUniDesigner, SynUniHighlighter, SynUniReg, synunistrconst, + LazarusPackageIntf; implementation diff --git a/components/synunihighlighter/synunidesigner.pas b/components/synunihighlighter/synunidesigner.pas index 0e3b7fd17e..92e68f74ea 100644 --- a/components/synunihighlighter/synunidesigner.pas +++ b/components/synunihighlighter/synunidesigner.pas @@ -65,7 +65,8 @@ uses SysUtils, SynEdit, SynEditHighlighter, - SynUniHighlighter; + SynUniHighlighter, + synunistrconst; type TNodeText = String; @@ -974,10 +975,6 @@ begin end; end; -////TL FPC wanted this global... moved from just inside the procedure below -resourcestring - sUniFileDescription = 'UniHighlighter Syntax'; - procedure TSynUniDesigner.LoadFromFileClick(Sender: TObject); ////TL resourcestring ////TL sUniFileDescription = 'UniHighlighter Syntax'; diff --git a/components/synunihighlighter/synunireg.pas b/components/synunihighlighter/synunireg.pas index f52444e7c2..b0ccec3739 100644 --- a/components/synunihighlighter/synunireg.pas +++ b/components/synunihighlighter/synunireg.pas @@ -16,7 +16,8 @@ uses componenteditors, ////TL added Classes, SynUniHighlighter, - SynUniDesigner; + SynUniDesigner, + synunistrconst; type ////TL! TDefaultEditor doesn't appear to exist... changed to TDefaultComponentEditor @@ -51,10 +52,6 @@ begin Edit; end; -////TL FPC wants resources defined globally... moved from the function below -resourcestring - sEditUni = 'Edit ...'; - function TSynUniEditor.GetVerb(Index: Integer): string; ////TL resourcestring ////TL sEditUni = 'Edit ...'; diff --git a/components/synunihighlighter/synunistrconst.pas b/components/synunihighlighter/synunistrconst.pas new file mode 100644 index 0000000000..4b88ad8937 --- /dev/null +++ b/components/synunihighlighter/synunistrconst.pas @@ -0,0 +1,14 @@ +unit synunistrconst; + +{$mode objfpc}{$H+} + +interface + +resourcestring + sUniFileDescription = 'UniHighlighter Syntax'; + sEditUni = 'Edit ...'; + +implementation + +end. +