paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-05 15:20:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 48889 #c6d6f8c7a6, 48899-48900 #f15b645703-#f15b645703 from trunk:

Browse Source 
IDEIntf, dbpropedits: check when retrieving fields definitions, issue #27962
........
IDEIntf: fixed typo
........
IDEIntf: regenerated translations and updated Russian translation
........

git-svn-id: branches/fixes_1_4@48950 -
This commit is contained in:
maxim 2015-05-06 22:31:23 +00:00
parent 04c1865cd6
commit 635f7360d0
22 changed files with 99 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/ideintf/dbpropedits.pas
View File

@ -17,9 +17,9 @@ unit DBPropEdits;
interface
uses
Classes, SysUtils, ObjInspStrConsts, PropEdits, PropEditUtils,
ComponentEditors,
TypInfo, DB, DbCtrls, DBGrids, Forms, DBGridColumnsPropEditForm;
Classes, SysUtils, ObjInspStrConsts, Dialogs, PropEdits, PropEditUtils,
ComponentEditors, TypInfo, DB, DbCtrls, DBGrids, Forms,
DBGridColumnsPropEditForm;
type
TFieldProperty = class(TStringPropertyEditor)
@ -78,7 +78,17 @@ begin
DataSet.GetFieldNames(List)
else
begin
DataSet.FieldDefs.Update;
try
DataSet.FieldDefs.Update;
except
// some FPC versions will fail here, but having persistent fields should
// actually work or else present an empty list of fields... but not crash/freeze
if Dataset.FieldDefs.Count=0 then begin
List.Clear;
ShowMessage(dpeUnableToRetrieveFieldsDefinitions);
exit;
end;
end;
for i := 0 to DataSet.FieldDefs.Count - 1 do
List.Add(DataSet.FieldDefs[i].Name);
end;

4
components/ideintf/languages/objinspstrconsts.ca.po
View File

@ -153,6 +153,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr ""

4
components/ideintf/languages/objinspstrconsts.cs.po
View File

@ -155,6 +155,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "&Spočítáno"

4
components/ideintf/languages/objinspstrconsts.de.po
View File

@ -156,6 +156,10 @@ msgstr "Dies wird alle Spalten löschen. Fortfahren?"
msgid "This will replace all captions from dataset. Continue?"
msgstr "Dies wird alle Titel aus dem Dataset ersetzen. Fortfahren?"
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "Bere&chnet"

4
components/ideintf/languages/objinspstrconsts.es.po
View File

@ -155,6 +155,10 @@ msgstr "Esto borrará todas las columnas. ¿Desea continuar?"
msgid "This will replace all captions from dataset. Continue?"
msgstr "Esto reemplazará los títulos (captions) de columna actuales por los originales del dataset. ¿Desea continuar?"
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "&Calculados"

4
components/ideintf/languages/objinspstrconsts.fi.po
View File

@ -148,6 +148,10 @@ msgstr "Tämä tuhoaa kaikki sarakkeet. Jatka?"
msgid "This will replace all captions from dataset. Continue?"
msgstr "Tämä hakee ja korvaa kaikki otsikot tietokannasta. Jatka?"
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "&Laskettu"

5
components/ideintf/languages/objinspstrconsts.fr.po
View File

@ -156,6 +156,10 @@ msgstr "Toutes les colonnes vont être supprimées. Voulez-vous continuer ?"
msgid "This will replace all captions from dataset. Continue?"
msgstr "Toutes les légendes vont être remplacées depuis l'ensemble de données. Voulez-vous continuer ?"
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "&Calculé"
@ -1551,3 +1555,4 @@ msgstr "Déplacer l'onglet vers la gauche"
#: objinspstrconsts.tccesmovetabright
msgid "Move tab right"
msgstr "Déplacer l'onglet vers la droite"

4
components/ideintf/languages/objinspstrconsts.he.po
View File

@ -152,6 +152,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "מחושב"

4
components/ideintf/languages/objinspstrconsts.hu.po
View File

@ -155,6 +155,10 @@ msgstr "Ez a művelet törli az összes oszlopot. Folytatás?"
msgid "This will replace all captions from dataset. Continue?"
msgstr "Ez a művelet lecseréli az összes feliratot az adatkészletben találhatókra. Folytatás?"
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "Számított"

4
components/ideintf/languages/objinspstrconsts.id.po
View File

@ -153,6 +153,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr ""

4
components/ideintf/languages/objinspstrconsts.it.po
View File

@ -156,6 +156,10 @@ msgstr "Verranno cancellate tutte le colonne. Continuare?"
msgid "This will replace all captions from dataset. Continue?"
msgstr "Questo sostituirà tutte le intestazioni dal dataset. Continuare?"
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "&Calcolato"

4
components/ideintf/languages/objinspstrconsts.ja.po
View File

@ -153,6 +153,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "計算済み(&C)"

4
components/ideintf/languages/objinspstrconsts.lt.po
View File

@ -155,6 +155,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "Ap&skaičiuota"

4
components/ideintf/languages/objinspstrconsts.nl.po
View File

@ -148,6 +148,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr ""

4
components/ideintf/languages/objinspstrconsts.pl.po
View File

@ -156,6 +156,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr ""

4
components/ideintf/languages/objinspstrconsts.po
View File

@ -148,6 +148,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr ""

4
components/ideintf/languages/objinspstrconsts.pt_BR.po
View File

@ -154,6 +154,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "&Calculado"

6
components/ideintf/languages/objinspstrconsts.ru.po
View File

@ -5,7 +5,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Project-Id-Version: \n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2015-01-28 01:03+0300\n"
"PO-Revision-Date: 2015-04-30 00:12+0300\n"
"Last-Translator: Maxim Ganetsky <maxkill@mail.ru>\n"
"Language-Team: \n"
@ -153,6 +153,10 @@ msgstr "Это действие приведёт к удалению всех с
msgid "This will replace all captions from dataset. Continue?"
msgstr "Это действие приведёт к замене всех заголовков набора данных. Продолжить?"
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr "Невозможно извлечь определение полей из набора данных."
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "&Вычисляемое"

4
components/ideintf/languages/objinspstrconsts.sk.po
View File

@ -155,6 +155,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr ""

4
components/ideintf/languages/objinspstrconsts.uk.po
View File

@ -156,6 +156,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr "Об&числено"

4
components/ideintf/languages/objinspstrconsts.zh_CN.po
View File

@ -156,6 +156,10 @@ msgstr ""
msgid "This will replace all captions from dataset. Continue?"
msgstr ""
#: objinspstrconsts.dpeunabletoretrievefieldsdefinitions
msgid "Unable to retrieve fields definition from dataset."
msgstr ""
#: objinspstrconsts.fescalculated
msgid "&Calculated"
msgstr ""

3
components/ideintf/objinspstrconsts.pas
View File

@ -445,6 +445,9 @@ resourcestring
// IDE Text Converter
itcsSearchAndReplace = 'Search and replace';
// DBPropedits
dpeUnableToRetrieveFieldsDefinitions = 'Unable to retrieve fields definition from dataset.';
implementation
end.