Merged revision(s) 48885 #aae4334209 from trunk:

LHelp: i18n-ed Open Dialog (bug #27977) and updated Russian translation
........

git-svn-id: branches/fixes_1_4@48886 -
This commit is contained in:
maxim 2015-04-28 23:03:51 +00:00
parent 223d77817a
commit 955e75ed6c
9 changed files with 52 additions and 1 deletions

View File

@ -49,6 +49,10 @@ msgstr "Hae"
msgid "&Help" msgid "&Help"
msgstr "Ohje" msgstr "Ohje"
#: lhelpstrconsts.slhelp_helpfileschmchmallfiles
msgid "Help files (*.chm)|*.chm|All files (*.*)|*"
msgstr ""
#: lhelpstrconsts.slhelp_helpshowthisinformation #: lhelpstrconsts.slhelp_helpshowthisinformation
msgid " --help : Show this information" msgid " --help : Show this information"
msgstr "" msgstr ""
@ -113,6 +117,10 @@ msgstr ""
msgid "&Open ..." msgid "&Open ..."
msgstr "Avaa..." msgstr "Avaa..."
#: lhelpstrconsts.slhelp_openexistingfile
msgid "Open existing file"
msgstr ""
#: lhelpstrconsts.slhelp_openrecent #: lhelpstrconsts.slhelp_openrecent
msgid "Open Recent" msgid "Open Recent"
msgstr "Avaa viimeksi käytetty" msgstr "Avaa viimeksi käytetty"

View File

@ -59,6 +59,10 @@ msgstr "Chercher"
msgid "&Help" msgid "&Help"
msgstr "&Aide" msgstr "&Aide"
#: lhelpstrconsts.slhelp_helpfileschmchmallfiles
msgid "Help files (*.chm)|*.chm|All files (*.*)|*"
msgstr ""
#: lhelpstrconsts.slhelp_helpshowthisinformation #: lhelpstrconsts.slhelp_helpshowthisinformation
msgid " --help : Show this information" msgid " --help : Show this information"
msgstr " --help : Afficher cette information" msgstr " --help : Afficher cette information"
@ -123,6 +127,10 @@ msgstr "Ok"
msgid "&Open ..." msgid "&Open ..."
msgstr "&Ouvrir..." msgstr "&Ouvrir..."
#: lhelpstrconsts.slhelp_openexistingfile
msgid "Open existing file"
msgstr ""
#: lhelpstrconsts.slhelp_openrecent #: lhelpstrconsts.slhelp_openrecent
msgid "Open Recent" msgid "Open Recent"
msgstr "Récemment ouvert" msgstr "Récemment ouvert"
@ -174,3 +182,4 @@ msgstr " Utilisation : lhelp [[filename] [--context id] [--hide] [--ipcname l
#: lhelpstrconsts.slhelp_view #: lhelpstrconsts.slhelp_view
msgid "&View" msgid "&View"
msgstr "&Afficher" msgstr "&Afficher"

View File

@ -59,6 +59,10 @@ msgstr "Keresés"
msgid "&Help" msgid "&Help"
msgstr "&Súgó" msgstr "&Súgó"
#: lhelpstrconsts.slhelp_helpfileschmchmallfiles
msgid "Help files (*.chm)|*.chm|All files (*.*)|*"
msgstr ""
#: lhelpstrconsts.slhelp_helpshowthisinformation #: lhelpstrconsts.slhelp_helpshowthisinformation
msgid " --help : Show this information" msgid " --help : Show this information"
msgstr " --help : Megjeleníti ezt a súgót" msgstr " --help : Megjeleníti ezt a súgót"
@ -123,6 +127,10 @@ msgstr "Ok"
msgid "&Open ..." msgid "&Open ..."
msgstr "&Megnyitás ..." msgstr "&Megnyitás ..."
#: lhelpstrconsts.slhelp_openexistingfile
msgid "Open existing file"
msgstr ""
#: lhelpstrconsts.slhelp_openrecent #: lhelpstrconsts.slhelp_openrecent
msgid "Open Recent" msgid "Open Recent"
msgstr "Legutóbbi megynyitása" msgstr "Legutóbbi megynyitása"
@ -174,3 +182,4 @@ msgstr " Használat: lhelp [[fájlnév] [--context azonosító] [--hide] [--i
#: lhelpstrconsts.slhelp_view #: lhelpstrconsts.slhelp_view
msgid "&View" msgid "&View"
msgstr "&Nézet" msgstr "&Nézet"

View File

@ -49,6 +49,10 @@ msgstr ""
msgid "&Help" msgid "&Help"
msgstr "" msgstr ""
#: lhelpstrconsts.slhelp_helpfileschmchmallfiles
msgid "Help files (*.chm)|*.chm|All files (*.*)|*"
msgstr ""
#: lhelpstrconsts.slhelp_helpshowthisinformation #: lhelpstrconsts.slhelp_helpshowthisinformation
msgid " --help : Show this information" msgid " --help : Show this information"
msgstr "" msgstr ""
@ -113,6 +117,10 @@ msgstr ""
msgid "&Open ..." msgid "&Open ..."
msgstr "" msgstr ""
#: lhelpstrconsts.slhelp_openexistingfile
msgid "Open existing file"
msgstr ""
#: lhelpstrconsts.slhelp_openrecent #: lhelpstrconsts.slhelp_openrecent
msgid "Open Recent" msgid "Open Recent"
msgstr "" msgstr ""

View File

@ -57,6 +57,10 @@ msgstr "Найти"
msgid "&Help" msgid "&Help"
msgstr "&Справка" msgstr "&Справка"
#: lhelpstrconsts.slhelp_helpfileschmchmallfiles
msgid "Help files (*.chm)|*.chm|All files (*.*)|*"
msgstr "Файлы справки (*.chm)|*.chm|Все файлы (*.*)|*"
#: lhelpstrconsts.slhelp_helpshowthisinformation #: lhelpstrconsts.slhelp_helpshowthisinformation
msgid " --help : Show this information" msgid " --help : Show this information"
msgstr " --help : Вывести данную информацию" msgstr " --help : Вывести данную информацию"
@ -122,6 +126,10 @@ msgstr "ОК"
msgid "&Open ..." msgid "&Open ..."
msgstr "О&ткрыть ..." msgstr "О&ткрыть ..."
#: lhelpstrconsts.slhelp_openexistingfile
msgid "Open existing file"
msgstr "Открыть существующий файл"
#: lhelpstrconsts.slhelp_openrecent #: lhelpstrconsts.slhelp_openrecent
msgid "Open Recent" msgid "Open Recent"
msgstr "Открыть недавний" msgstr "Открыть недавний"

View File

@ -103,6 +103,7 @@
<ComponentName Value="HelpForm"/> <ComponentName Value="HelpForm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<UnitName Value="lhelpcore"/>
</Unit4> </Unit4>
<Unit5> <Unit5>
<Filename Value="lnethttpdataprovider.pas"/> <Filename Value="lnethttpdataprovider.pas"/>
@ -111,14 +112,17 @@
<Unit6> <Unit6>
<Filename Value="basecontentprovider.pas"/> <Filename Value="basecontentprovider.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="BaseContentProvider"/>
</Unit6> </Unit6>
<Unit7> <Unit7>
<Filename Value="chmcontentprovider.pas"/> <Filename Value="chmcontentprovider.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="chmcontentprovider"/>
</Unit7> </Unit7>
<Unit8> <Unit8>
<Filename Value="httpcontentprovider.pas"/> <Filename Value="httpcontentprovider.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="HTTPContentProvider"/>
</Unit8> </Unit8>
<Unit9> <Unit9>
<Filename Value="lhelpstrconsts.pas"/> <Filename Value="lhelpstrconsts.pas"/>

View File

@ -299,7 +299,7 @@ object HelpForm: THelpForm
end end
end end
object OpenDialog1: TOpenDialog object OpenDialog1: TOpenDialog
Filter = 'HelpFiles(*.chm)|*.chm|All FIles(*.*)|*' Filter = 'Help files (*.chm)|*.chm|All files (*.*)|*'
FilterIndex = 0 FilterIndex = 0
left = 144 left = 144
top = 80 top = 80

View File

@ -328,6 +328,9 @@ begin
HelpMenuItem.Caption := slhelp_Help; HelpMenuItem.Caption := slhelp_Help;
AboutItem.Caption := slhelp_About2; AboutItem.Caption := slhelp_About2;
OpenDialog1.Title := slhelp_OpenExistingFile;
OpenDialog1.Filter := slhelp_HelpFilesChmChmAllFiles;
fContext := -1; fContext := -1;
// Safe default: // Safe default:
fHide := false; fHide := false;

View File

@ -22,6 +22,8 @@ resourcestring
slhelp_ShowContents = 'Show contents'; slhelp_ShowContents = 'Show contents';
slhelp_Help = '&Help'; slhelp_Help = '&Help';
slhelp_About2 = '&About ...'; slhelp_About2 = '&About ...';
slhelp_OpenExistingFile = 'Open existing file';
slhelp_HelpFilesChmChmAllFiles = 'Help files (*.chm)|*.chm|All files (*.*)|*';
slhelp_LHelp = 'LHelp'; slhelp_LHelp = 'LHelp';
slhelp_LHelp2 = 'LHelp - %s'; slhelp_LHelp2 = 'LHelp - %s';
slhelp_CannotHandleThisTypeOfContentForUrl = 'Cannot handle this type of content. "%s" for url:%s%s'; slhelp_CannotHandleThisTypeOfContentForUrl = 'Cannot handle this type of content. "%s" for url:%s%s';