Merge from 5.3 to 6.0:

[7128] Fixes to merge tool.
[7129] Merge from branches/manual_2009_03 to versions/5.3 (multiple changesets)
[7131] Fixed language problems in the section on layout cell spacing.
[7132] Use 24 hour format instead of 12 hour for Eclipse Manual plugin timestamp.

svn changeset:7169/svn branch:6.0

1 files changed, 4 insertions, 4 deletions

diff --git a/src/com/itmill/toolkit/ui/ProgressIndicator.java b/src/com/itmill/toolkit/ui/ProgressIndicator.java
index ea788ac0b2..fc5b308b64 100644
--- a/src/com/itmill/toolkit/ui/ProgressIndicator.java
+++ b/src/com/itmill/toolkit/ui/ProgressIndicator.java
@@ -133,7 +133,7 @@ public class ProgressIndicator extends AbstractField implements Property,
     @Override
     public Object getValue() {
         if (dataSource == null) {
-            throw new IllegalStateException("Datasource must be se");
+            throw new IllegalStateException("Datasource must be set");
         }
         return dataSource.getValue();
     }
@@ -149,7 +149,7 @@ public class ProgressIndicator extends AbstractField implements Property,
     @Override
     public void setValue(Object newValue) {
         if (dataSource == null) {
-            throw new IllegalStateException("Datasource must be se");
+            throw new IllegalStateException("Datasource must be set");
         }
         dataSource.setValue(newValue);
     }
@@ -160,7 +160,7 @@ public class ProgressIndicator extends AbstractField implements Property,
     @Override
     public String toString() {
         if (dataSource == null) {
-            throw new IllegalStateException("Datasource must be se");
+            throw new IllegalStateException("Datasource must be set");
         }
         return dataSource.toString();
     }
@@ -171,7 +171,7 @@ public class ProgressIndicator extends AbstractField implements Property,
     @Override
     public Class getType() {
         if (dataSource == null) {
-            throw new IllegalStateException("Datasource must be se");
+            throw new IllegalStateException("Datasource must be set");
         }
         return dataSource.getType();
     }