Skip to content

Commit ba9a060

Browse files
authored
After-merge: reverting string resources deleted by mistake (#349)
1 parent 2816e94 commit ba9a060

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

Orm/Xtensive.Orm/Strings.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2612,6 +2612,15 @@ Error: {1}</value>
26122612
<data name="ExMaxNumberOfConditionsShouldBeBetweenXAndY" xml:space="preserve">
26132613
<value>DomainConfiguration.MaxNumberOfConditions should be between {0} and {1} (included).</value>
26142614
</data>
2615+
<data name="ExNestedTransactionTimeout" xml:space="preserve">
2616+
<value>Nested transaction cannot have timeout</value>
2617+
</data>
2618+
<data name="ExTransactionTimeout" xml:space="preserve">
2619+
<value>Transaction is longer than {0}</value>
2620+
</data>
2621+
<data name="ExWithIndexHintDoesNotSupportQueryProviderOfTypeX" xml:space="preserve">
2622+
<value>'WithIndexHint' does not support query provider of type '{0}'.</value>
2623+
</data>
26152624
<data name="LogKeyGeneratorKindForHierarchyWithRootXHasChangedToNone" xml:space="preserve">
26162625
<value>Key generator kind for hierarchy with root '{0}' has changed to None. Make sure that all key values are recieved by constructor and passed to one of Entity constructors.</value>
26172626
</data>

0 commit comments

Comments
 (0)