diff --git a/components/ideintf/languages/objinspstrconsts.ca.po b/components/ideintf/languages/objinspstrconsts.ca.po index 6633447a4e..1e47634551 100644 --- a/components/ideintf/languages/objinspstrconsts.ca.po +++ b/components/ideintf/languages/objinspstrconsts.ca.po @@ -618,6 +618,10 @@ msgstr "" msgid "Method" msgstr "Mètode" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "" diff --git a/components/ideintf/languages/objinspstrconsts.cs.po b/components/ideintf/languages/objinspstrconsts.cs.po index 24df6c4412..fcb552ac04 100644 --- a/components/ideintf/languages/objinspstrconsts.cs.po +++ b/components/ideintf/languages/objinspstrconsts.cs.po @@ -611,6 +611,10 @@ msgstr "Masky ..." msgid "Method" msgstr "Metoda" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "Přesunout &dolů" diff --git a/components/ideintf/languages/objinspstrconsts.de.po b/components/ideintf/languages/objinspstrconsts.de.po index 3499081e85..9c573613b3 100644 --- a/components/ideintf/languages/objinspstrconsts.de.po +++ b/components/ideintf/languages/objinspstrconsts.de.po @@ -614,6 +614,10 @@ msgstr "Masken..." msgid "Method" msgstr "Methode" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "Nach unten" diff --git a/components/ideintf/languages/objinspstrconsts.es.po b/components/ideintf/languages/objinspstrconsts.es.po index 47786c7568..1d315d7e46 100644 --- a/components/ideintf/languages/objinspstrconsts.es.po +++ b/components/ideintf/languages/objinspstrconsts.es.po @@ -153,9 +153,7 @@ msgstr "Esto borrará todas las columnas. ¿Desea continuar?" #: objinspstrconsts.dcewillreplacecontinue msgid "This will replace all captions from dataset. Continue?" -msgstr "" -"Esto reemplazará los títulos de columna actuales por los originales del " -"dataset. ¿Desea continuar?" +msgstr "Esto reemplazará los títulos de columna actuales por los originales del dataset. ¿Desea continuar?" #: objinspstrconsts.fescalculated msgid "&Calculated" @@ -617,6 +615,10 @@ msgstr "Máscaras..." msgid "Method" msgstr "Método" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "Mover Abajo" @@ -1127,46 +1129,27 @@ msgstr "Probar entrada" #: objinspstrconsts.oistheidentifierisnotamethodpresscanceltoundopressign #, fuzzy -#| msgid "" -#| "The identifier %s%s%s is not a method.%sPress Cancel to undo,%spress " -#| "Ignore to force it." -msgid "" -"The identifier \"%s\" is not a method.%sPress Cancel to undo,%spress Ignore " -"to force it." -msgstr "" -"El identificador %s%s%s no es un método.%sPresiona Cancelar para deshacer," -"%spresiona Ignorar para forzar." +#| msgid "The identifier %s%s%s is not a method.%sPress Cancel to undo,%spress Ignore to force it." +msgid "The identifier \"%s\" is not a method.%sPress Cancel to undo,%spress Ignore to force it." +msgstr "El identificador %s%s%s no es un método.%sPresiona Cancelar para deshacer,%spresiona Ignorar para forzar." #: objinspstrconsts.oisthemethodisincompatibletothiseventpresscanceltound #, fuzzy -#| msgid "" -#| "The method %s%s%s is incompatible to this event (%s).%sPress Cancel to " -#| "undo,%spress Ignore to force it." -msgid "" -"The method \"%s\" is incompatible to this event (%s).%sPress Cancel to undo," -"%spress Ignore to force it." -msgstr "" -"El método %s%s%s no es compatible con este evento (%s).%sPresiona Cancelar " -"para deshacer,%spresiona Ignorar para forzar." +#| msgid "The method %s%s%s is incompatible to this event (%s).%sPress Cancel to undo,%spress Ignore to force it." +msgid "The method \"%s\" is incompatible to this event (%s).%sPress Cancel to undo,%spress Ignore to force it." +msgstr "El método %s%s%s no es compatible con este evento (%s).%sPresiona Cancelar para deshacer,%spresiona Ignorar para forzar." #: objinspstrconsts.oisthemethodisnotpublishedpresscanceltoundopressignor #, fuzzy -#| msgid "" -#| "The method %s%s%s is not published.%sPress Cancel to undo,%spress Ignore " -#| "to force it." -msgid "" -"The method \"%s\" is not published.%sPress Cancel to undo,%spress Ignore to " -"force it." -msgstr "" -"El método %s%s%s no es de tipo publicado.%sPresiona Cancelar para deshacer," -"%spresiona Ignorar para forzar." +#| msgid "The method %s%s%s is not published.%sPress Cancel to undo,%spress Ignore to force it." +msgid "The method \"%s\" is not published.%sPress Cancel to undo,%spress Ignore to force it." +msgstr "El método %s%s%s no es de tipo publicado.%sPresiona Cancelar para deshacer,%spresiona Ignorar para forzar." #: objinspstrconsts.oisunabletochangeparentofcontroltonewparent #, fuzzy #| msgid "Unable to change parent of control %s%s%s to new parent %s%s%s.%s%s" msgid "Unable to change parent of control \"%s\" to new parent \"%s\".%s%s" -msgstr "" -"No se puede cambiar el padre del control %s%s%s al nuevo padre %s%s%s.%s%s" +msgstr "No se puede cambiar el padre del control %s%s%s al nuevo padre %s%s%s.%s%s" #: objinspstrconsts.oisundo msgctxt "objinspstrconsts.oisundo" @@ -1638,3 +1621,4 @@ msgstr "Mover pestaña a la izquierda" #: objinspstrconsts.tccesmovetabright msgid "Move tab right" msgstr "Mover pestaña a la derecha" + diff --git a/components/ideintf/languages/objinspstrconsts.fi.po b/components/ideintf/languages/objinspstrconsts.fi.po index f4ab0dd8da..d817f8112d 100644 --- a/components/ideintf/languages/objinspstrconsts.fi.po +++ b/components/ideintf/languages/objinspstrconsts.fi.po @@ -585,6 +585,10 @@ msgstr "Maskit ..." msgid "Method" msgstr "Metodi" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "&Siirrä alas" diff --git a/components/ideintf/languages/objinspstrconsts.fr.po b/components/ideintf/languages/objinspstrconsts.fr.po index ceb943fb5b..beec3dfc87 100644 --- a/components/ideintf/languages/objinspstrconsts.fr.po +++ b/components/ideintf/languages/objinspstrconsts.fr.po @@ -627,6 +627,10 @@ msgstr "Masques…" msgid "Method" msgstr "Méthode" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "" diff --git a/components/ideintf/languages/objinspstrconsts.he.po b/components/ideintf/languages/objinspstrconsts.he.po index a6c0687b24..80bed814fc 100644 --- a/components/ideintf/languages/objinspstrconsts.he.po +++ b/components/ideintf/languages/objinspstrconsts.he.po @@ -618,6 +618,10 @@ msgstr "מסכות ..." msgid "Method" msgstr "מתודה" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "הזז למטה" diff --git a/components/ideintf/languages/objinspstrconsts.hu.po b/components/ideintf/languages/objinspstrconsts.hu.po index 28da18d990..1e49ae1788 100644 --- a/components/ideintf/languages/objinspstrconsts.hu.po +++ b/components/ideintf/languages/objinspstrconsts.hu.po @@ -592,6 +592,10 @@ msgstr "Maszkok ..." msgid "Method" msgstr "Metódus" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "&Mozgatás le" @@ -1542,3 +1546,4 @@ msgstr "Fül mozgatása eggyel balra" #: objinspstrconsts.tccesmovetabright msgid "Move tab right" msgstr "Fül mozgatása eggyel jobbra" + diff --git a/components/ideintf/languages/objinspstrconsts.id.po b/components/ideintf/languages/objinspstrconsts.id.po index 41380de654..5e1f041695 100644 --- a/components/ideintf/languages/objinspstrconsts.id.po +++ b/components/ideintf/languages/objinspstrconsts.id.po @@ -620,6 +620,10 @@ msgstr "Masks..." msgid "Method" msgstr "Metode" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "" diff --git a/components/ideintf/languages/objinspstrconsts.it.po b/components/ideintf/languages/objinspstrconsts.it.po index 545bef8eb2..cd591b8d8e 100644 --- a/components/ideintf/languages/objinspstrconsts.it.po +++ b/components/ideintf/languages/objinspstrconsts.it.po @@ -593,6 +593,10 @@ msgstr "Maschere..." msgid "Method" msgstr "Metodo" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "Sposta &giù" diff --git a/components/ideintf/languages/objinspstrconsts.ja.po b/components/ideintf/languages/objinspstrconsts.ja.po index e60e2e5df8..18e8072dc9 100644 --- a/components/ideintf/languages/objinspstrconsts.ja.po +++ b/components/ideintf/languages/objinspstrconsts.ja.po @@ -598,6 +598,10 @@ msgstr "マスク ..." msgid "Method" msgstr "メソッド" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "下に移動(&D)" diff --git a/components/ideintf/languages/objinspstrconsts.lt.po b/components/ideintf/languages/objinspstrconsts.lt.po index eab75ad9f1..a7cc33d2ae 100644 --- a/components/ideintf/languages/objinspstrconsts.lt.po +++ b/components/ideintf/languages/objinspstrconsts.lt.po @@ -616,6 +616,10 @@ msgstr "Kaukės…" msgid "Method" msgstr "Metodas" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "Perkelti že&myn" diff --git a/components/ideintf/languages/objinspstrconsts.nl.po b/components/ideintf/languages/objinspstrconsts.nl.po index d6537d3067..35787c787e 100644 --- a/components/ideintf/languages/objinspstrconsts.nl.po +++ b/components/ideintf/languages/objinspstrconsts.nl.po @@ -609,6 +609,10 @@ msgstr "Maskers..." msgid "Method" msgstr "Methode" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "" diff --git a/components/ideintf/languages/objinspstrconsts.pl.po b/components/ideintf/languages/objinspstrconsts.pl.po index a60499728d..8267ac5a0c 100644 --- a/components/ideintf/languages/objinspstrconsts.pl.po +++ b/components/ideintf/languages/objinspstrconsts.pl.po @@ -619,6 +619,10 @@ msgstr "" msgid "Method" msgstr "" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "" diff --git a/components/ideintf/languages/objinspstrconsts.po b/components/ideintf/languages/objinspstrconsts.po index 57da38f3fe..67152434c0 100644 --- a/components/ideintf/languages/objinspstrconsts.po +++ b/components/ideintf/languages/objinspstrconsts.po @@ -585,6 +585,10 @@ msgstr "" msgid "Method" msgstr "" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "" diff --git a/components/ideintf/languages/objinspstrconsts.pt_BR.po b/components/ideintf/languages/objinspstrconsts.pt_BR.po index 9308d4e2db..0f5ce860c3 100644 --- a/components/ideintf/languages/objinspstrconsts.pt_BR.po +++ b/components/ideintf/languages/objinspstrconsts.pt_BR.po @@ -615,6 +615,10 @@ msgstr "Máscaras ..." msgid "Method" msgstr "Método" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "Mover A&baixo" diff --git a/components/ideintf/languages/objinspstrconsts.ru.po b/components/ideintf/languages/objinspstrconsts.ru.po index b8bae1fc28..5830a1a679 100644 --- a/components/ideintf/languages/objinspstrconsts.ru.po +++ b/components/ideintf/languages/objinspstrconsts.ru.po @@ -5,7 +5,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2014-10-02 03:39+0400\n" +"PO-Revision-Date: 2015-01-21 01:06+0300\n" "Last-Translator: Maxim Ganetsky \n" "Language-Team: \n" @@ -614,6 +614,10 @@ msgstr "Маски ..." msgid "Method" msgstr "Метод" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "(Смешанное)" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "Переместить в&низ" diff --git a/components/ideintf/languages/objinspstrconsts.sk.po b/components/ideintf/languages/objinspstrconsts.sk.po index 33130d728c..017feeb3f7 100644 --- a/components/ideintf/languages/objinspstrconsts.sk.po +++ b/components/ideintf/languages/objinspstrconsts.sk.po @@ -626,6 +626,10 @@ msgstr "Masky..." msgid "Method" msgstr "Metóda" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "" diff --git a/components/ideintf/languages/objinspstrconsts.uk.po b/components/ideintf/languages/objinspstrconsts.uk.po index e752019fee..31643d05c0 100644 --- a/components/ideintf/languages/objinspstrconsts.uk.po +++ b/components/ideintf/languages/objinspstrconsts.uk.po @@ -611,6 +611,10 @@ msgstr "Маски ..." msgid "Method" msgstr "Метод" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "Перемістити &Вниз" diff --git a/components/ideintf/languages/objinspstrconsts.zh_CN.po b/components/ideintf/languages/objinspstrconsts.zh_CN.po index f46a78fc2a..a743b562a9 100644 --- a/components/ideintf/languages/objinspstrconsts.zh_CN.po +++ b/components/ideintf/languages/objinspstrconsts.zh_CN.po @@ -627,6 +627,10 @@ msgstr "掩码..." msgid "Method" msgstr "方法" +#: objinspstrconsts.oismixed +msgid "(Mixed)" +msgstr "" + #: objinspstrconsts.oismovedown msgid "Move &Down" msgstr "" diff --git a/components/ideintf/objectinspector.pp b/components/ideintf/objectinspector.pp index 8480c2fb51..57d6b17205 100644 --- a/components/ideintf/objectinspector.pp +++ b/components/ideintf/objectinspector.pp @@ -1638,7 +1638,7 @@ end; procedure TOICustomPropertyGrid.SetCheckboxState(NewValue: string); begin ValueCheckBox.Caption:=NewValue; - if (NewValue='') or (NewValue='(Mixed)') then + if (NewValue='') or (NewValue=oisMixed) then ValueCheckBox.State:=cbGrayed else if NewValue='(True)' then ValueCheckBox.State:=cbChecked diff --git a/components/ideintf/objinspstrconsts.pas b/components/ideintf/objinspstrconsts.pas index 272f76063c..ba7db7ea22 100644 --- a/components/ideintf/objinspstrconsts.pas +++ b/components/ideintf/objinspstrconsts.pas @@ -15,6 +15,7 @@ resourcestring // Object Inspector oisObjectInspector = 'Object Inspector'; oisError = 'Error'; + oisMixed = '(Mixed)'; oisItemsSelected = '%u items selected'; oiscAdd = '&Add'; diff --git a/components/ideintf/propedits.pp b/components/ideintf/propedits.pp index 9c0ceb4637..0c478b0043 100644 --- a/components/ideintf/propedits.pp +++ b/components/ideintf/propedits.pp @@ -3234,7 +3234,7 @@ function TBoolPropertyEditor.GetVisualValue: ansistring; begin Result := inherited GetVisualValue; if Result = '' then - Result := '(Mixed)'; + Result := oisMixed; end; procedure TBoolPropertyEditor.GetValues(Proc: TGetStrProc); @@ -3276,7 +3276,7 @@ begin begin VisVal := GetVisualValue; // Draw the box using theme services. - if (VisVal = '') or (VisVal = '(Mixed)') then + if (VisVal = '') or (VisVal = oisMixed) then Check := tbCheckBoxMixedNormal else if GetOrdValue <> 0 then Check := tbCheckBoxCheckedNormal