UPD: Use native language name

This commit is contained in:
Alexander Koblov 2015-02-15 13:39:26 +00:00
commit 8b14f2dcd6
26 changed files with 35 additions and 42 deletions

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Bulgarian\n"
"X-Native-Language: български\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Catalan\n"
"X-Native-Language: Català\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Czech\n"
"X-Native-Language: čeština\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Danish\n"
"X-Native-Language: Dansk\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -8,7 +8,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: German\n"
"X-Native-Language: Deutsch\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Spanish\n"
"X-Native-Language: Español\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,8 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: French\n"
"X-Poedit-Country: BELGIUM\n"
"X-Native-Language: Français\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -10,8 +10,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: hu\n"
"X-Poedit-Language: Hungarian\n"
"X-Generator: Poedit 1.5.4\n"
"X-Generator: Poedit 1.5.4\n"
"X-Native-Language: Magyar\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,8 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Italiano\n"
"X-Poedit-Country: ITALY\n"
"X-Native-Language: Italiano\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Korean\n"
"X-Native-Language: 한국의\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Dutch\n"
"X-Native-Language: Nederlands\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Polish\n"
"X-Native-Language: Polski\n"
#: fsyncdirsdlg.rscomparingpercent
#, fuzzy

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: English\n"
"X-Native-Language: English\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -12,7 +12,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.5.4\n"
"X-Poedit-Language: Portuguese\n"
"X-Native-Language: Português\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -11,8 +11,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);;\n"
"X-Poedit-Language: Romanian\n"
"X-Generator: Virtaal 0.7.1\n"
"X-Native-Language: Român\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -8,7 +8,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Russian\n"
"X-Native-Language: Русский\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,9 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Slovak\n"
"X-Poedit-Country: SLOVAKIA\n"
"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,444,-1,-1\n"
"X-Native-Language: Slovenčina\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Generator: Poedit 1.5.4\n"
"X-Poedit-Language: Slovenian\n"
"X-Native-Language: Slovenščina\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -14,7 +14,7 @@ msgstr ""
"X-Generator: Poedit 1.5.4\n"
"X-Language: sr_RS\n"
"X-Source-Language: C\n"
"X-Poedit-Language: Serbian\n"
"X-Native-Language: српски\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -13,7 +13,7 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Poedit 1.5.4\n"
"X-Language: sr_RS\n"
"X-Poedit-Language: Serbian\n"
"X-Native-Language: srpski\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Turkish\n"
"X-Native-Language: Türk\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Ukrainian\n"
"X-Native-Language: Український\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -8,8 +8,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Chinese\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Native-Language: 中国\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -9,9 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-Language: Chinese Traditional\n"
"X-Poedit-SourceCharset: utf-8\n"
"X-Poedit-Country: TAIWAN\n"
"X-Native-Language: 中國傳統\n"
#: fsyncdirsdlg.rscomparingpercent
msgid "Comparing... %d%% (ESC to cancel)"

View file

@ -51,20 +51,20 @@ implementation
{$R *.lfm}
uses
uDebug, uFindEx, uGlobs, uGlobsPaths, uLng;
LazUTF8Classes, uDebug, uFindEx, uGlobs, uGlobsPaths, uLng;
{ TfrmOptionsLanguage }
procedure TfrmOptionsLanguage.FillLngListBox;
var
fr: TSearchRecEx;
iIndex: Integer;
fr: TSearchRecEx;
sLangName: String;
LanguageFileList: TStringList;
LanguageFileList: TStringListUtf8;
begin
LanguageFileList:=TStringList.Create;
LanguageFileList.Sorted:=True;
LanguageFileList.Duplicates:=dupAccept;
LanguageFileList:= TStringListUtf8.Create;
LanguageFileList.Sorted:= True;
LanguageFileList.Duplicates:= dupAccept;
try
lngList.Clear;
DCDebug('Language directory: ' + gpLngDir);
@ -75,10 +75,10 @@ begin
until FindNextEx(fr) <> 0;
FindCloseEx(fr);
for iIndex:=0 to pred(LanguageFileList.Count) do
for iIndex:= 0 to pred(LanguageFileList.Count) do
begin
lngList.Items.add(LanguageFileList.Strings[iIndex]);
if (gPOFileName = Trim(lngList.Items.ValueFromIndex[iIndex])) then lngList.ItemIndex:=iIndex;
if (gPOFileName = Trim(lngList.Items.ValueFromIndex[iIndex])) then lngList.ItemIndex:= iIndex;
end;
finally

View file

@ -725,7 +725,7 @@ begin
repeat
FileReadLn(poFile, sLine);
// find language name line
if Pos('X-Poedit-Language:', sLine) <> 0 then
if Pos('X-Native-Language:', sLine) <> 0 then
begin
iPos1 := Pos(':', sLine) + 2;
iPos2 := Pos('\n', sLine) - 1;
@ -735,7 +735,7 @@ begin
end;
until Pos('msgid', sLine) = 1;
FileClose(poFile);
Result := 'Language name not found';
Result := 'Unknown';
end;
procedure TranslateLCL(poFileName: String);