[kune-commits] r992 - in trunk/src/main/java/org/ourproject/kune: platf/client platf/client/services platf/server/domain workspace/client/cnt workspace/client/cxt workspace/client/socialnet workspace/client/title

Samer . shevek at ourproject.org
Sat Dec 13 18:46:34 CET 2008


Author: shevek
Date: 2008-12-13 18:46:32 +0100 (Sat, 13 Dec 2008)
New Revision: 992

Modified:
   trunk/src/main/java/org/ourproject/kune/platf/client/PlatfMessages.java
   trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java
   trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java
   trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java
Log:
Translation improved

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/PlatfMessages.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/PlatfMessages.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/PlatfMessages.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -7,7 +7,7 @@
     String SIGN_IN_TITLE = "Sign in";
     String EMAIL_IN_USE = "This email address is being used by another user. Please, try with another one";
     String NAME_IN_USE = "This name in already in use. Please try with a different name";
-    String INCORRECT_NICKNAME_EMAIL_OR_PASSWORD = "The nickname/email or password is incorrect";
+    String INCORRECT_NICKNAME_EMAIL_OR_PASSWORD = "The nickname/email/password is incorrect";
     String YOUR_HOMEPAGE = "Your homepage";
     String USER_DOESN_T_HAVE_A_HOMEPAGE = "This user does not have a homepage";
     String ENT_LOGO_SELECTOR_NORMAL_TITLE = "Logo";

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -93,7 +93,7 @@
             Site.veryImportant(i18n.t("Group not found"));
             stateManagerProvider.get().gotoToken("");
         } catch (final IncompatibleRemoteServiceException e) {
-            Site.error(i18n.t("Your browser is outdated from the server software. Please reload this page."));
+            Site.error(i18n.t("Your browser is outdated with the server software. Please reload this page."));
         } catch (final ContentNotFoundException e) {
             logException(e);
             Site.veryImportant(i18n.t("Content not found"));

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/Group.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -74,13 +74,13 @@
 
     @Field(index = Index.TOKENIZED, store = Store.NO)
     @Column(unique = true)
-    @Length(min = 3, max = 15, message = "Shortname between 3 and 15 chars of lenght")
-    @Pattern(regex = "^[a-z0-9_\\-]+$", message = "Must be between 3 and 15 lowercase characters. Can only contain characters, numbers, and dashes")
+    @Length(min = 3, max = 15, message = "The shortname must be between 3 and 15 characters of length")
+    @Pattern(regex = "^[a-z0-9_\\-]+$", message = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers, and dashes")
     private String shortName;
 
     @Field(index = Index.TOKENIZED, store = Store.NO)
     @Column(unique = true)
-    @Length(min = 3, max = 50, message = "longName between 3 and 50 chars of lenght")
+    @Length(min = 3, max = 50, message = "The longName must be between 3 and 50 characters of length")
     private String longName;
 
     @OneToOne

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/User.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -85,7 +85,7 @@
     @Column(unique = true)
     // http://www.hibernate.org/hib_docs/validator/reference/en/html/validator-defineconstraints.html
     @Length(min = 3, max = 15)
-    @Pattern(regex = "^[a-z0-9_\\-]+$", message = "Must be between 3 and 15 lowercase characters. Can only contain characters, numbers, and dashes")
+    @Pattern(regex = "^[a-z0-9_\\-]+$", message = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters, numbers, and dashes")
     private String shortName;
 
     @ManyToOne

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -75,7 +75,7 @@
             }
         } else {
             if ((contentBody == null || contentBody.length() == 0) && state.getContentRights().isEditable()) {
-                view.setInfoMessage(i18n.t("There is currently no text in this page, you can edit this page"));
+                view.setInfoMessage(i18n.t("There is no text in this page. Feel free to edit this page"));
             } else {
                 view.setRawContent(contentBody);
             }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/AccessListsPanel.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -43,11 +43,11 @@
     public AccessListsPanel(final I18nTranslationService i18n, Images img) {
         this.i18n = i18n;
         this.img = img;
-        final Label adminsLabel = new Label(i18n.t("Who can admin this:"));
+        final Label adminsLabel = new Label(i18n.t("Those who can admin this:"));
         adminsVP = new VerticalPanel();
-        final Label editorsLabel = new Label(i18n.t("Who more can edit:"));
+        final Label editorsLabel = new Label(i18n.t("Those who can edit as well:"));
         editorsVP = new VerticalPanel();
-        final Label viewersLabel = new Label(i18n.t("Who more can view:"));
+        final Label viewersLabel = new Label(i18n.t("Those who can view as well:"));
         viewersVP = new VerticalPanel();
 
         // Layout

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/ContextPropEditorPanel.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -137,7 +137,7 @@
     public void setAccessLists(final AccessListsDTO accessLists) {
         if (aclComponent == null) {
             accessListsPanel = new AccessListsPanel(i18n, images);
-            aclComponent = new ContextPropertyPanel(i18n.t("Permissions"), i18n.t("Who can admin/edit/view this work"),
+            aclComponent = new ContextPropertyPanel(i18n.t("Permissions"), i18n.t("Those who can admin/edit/view this work"),
                     true, ACL_PROP, accessListsPanel);
             addComponent(aclComponent);
         }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -171,7 +171,7 @@
                 });
         buddiesVisibilityAction.setTextDescription(textDescription);
         buddiesVisibilityAction.setParentMenuTitle(i18n.t("Options"));
-        buddiesVisibilityAction.setParentSubMenuTitle(i18n.t("Who can view your buddies list"));
+        buddiesVisibilityAction.setParentSubMenuTitle(i18n.t("Those who can view your buddies list"));
         actionRegistry.addAction(buddiesVisibilityAction);
     }
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -57,7 +57,7 @@
         this.i18n = i18n;
 
         final GridDragConfiguration dragConf = new GridDragConfiguration(UserGridPanel.USER_GROUP_DD,
-                i18n.t("Drop in the chat area to start a chat.") + "<br/>"
+                i18n.t("Drop into the chat area to start a chat.") + "<br/>"
                         + i18n.t("Drop into a room to invite the user to join the chat room"));
         gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This is an orphaned project, if you are interested "
                 + "please request to join to work on it"), dragConf, true, true, false, true, false);

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -202,7 +202,7 @@
                 });
         showMembers.setTextDescription(textDescription);
         showMembers.setParentMenuTitle(i18n.t("Options"));
-        showMembers.setParentSubMenuTitle(i18n.t("Who can view this member list"));
+        showMembers.setParentSubMenuTitle(i18n.t("Those who can view this member list"));
         groupActionRegistry.addAction(showMembers);
     }
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java	2008-12-11 02:39:23 UTC (rev 991)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java	2008-12-13 17:46:32 UTC (rev 992)
@@ -46,10 +46,10 @@
                         throw caught;
                     } catch (final NameInUseException e) {
                         Site.error(i18n.tWithNT("This name already exists",
-                                "Used when a file or a folder with the same name already exists"));
+                                "It is used when a file or a folder with the same name already exists"));
                     } catch (final NameNotPermittedException e) {
                         Site.error(i18n.tWithNT("This name is not permitted",
-                                "Used when a file or a folder has a not permitted name"));
+                                "It is uUsed when a file or a folder does not have a permitted name"));
                     } catch (final Throwable e) {
                         Site.error(i18n.t("Error renaming"));
                     }




More information about the kune-commits mailing list