Index: /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 10096)
+++ /trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 10097)
@@ -18,4 +18,5 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.lang.Character.UnicodeBlock;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -503,7 +504,21 @@
         }
 
+        static boolean isUploadCommentTooShort(String comment) {
+            String s = comment.trim();
+            boolean result = true;
+            if (!s.isEmpty()) {
+                UnicodeBlock block = Character.UnicodeBlock.of(s.charAt(0));
+                if (block.toString().contains("CJK")) {
+                    result = s.length() < 4;
+                } else {
+                    result = s.length() < 10;
+                }
+            }
+            return result;
+        }
+
         @Override
         public void actionPerformed(ActionEvent e) {
-            if (dialog.getUploadComment().trim().length() < 10 && warnUploadComment()) {
+            if (isUploadCommentTooShort(dialog.getUploadComment()) && warnUploadComment()) {
                 // abort for missing comment
                 dialog.handleMissingComment();
Index: /trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java	(revision 10096)
+++ /trunk/test/unit/org/openstreetmap/josm/gui/io/UploadDialogTest.java	(revision 10097)
@@ -1,4 +1,7 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.io;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.util.Map;
@@ -90,3 +93,15 @@
         new UploadDialog.UploadAction(newUploadDialog("a comment long enough", "a source long enough")).actionPerformed(null);
     }
+
+    /**
+     * Test of {@link UploadDialog.UploadAction#isUploadCommentTooShort} method.
+     */
+    @Test
+    public void testIsUploadCommentTooShort() {
+        assertTrue(UploadDialog.UploadAction.isUploadCommentTooShort(""));
+        assertTrue(UploadDialog.UploadAction.isUploadCommentTooShort("test"));
+        assertTrue(UploadDialog.UploadAction.isUploadCommentTooShort("测试"));
+        assertFalse(UploadDialog.UploadAction.isUploadCommentTooShort("geometric corrections"));
+        assertFalse(UploadDialog.UploadAction.isUploadCommentTooShort("几何校正"));
+    }
 }