[kune-commits] r988 - in trunk/src/main/java/org/ourproject/kune:
blogs/client blogs/client/cnt blogs/server chat/client
chat/client/cnt chat/client/ctx/room docs/client
platf/client/services platf/client/ui platf/client/ui/upload
platf/server/manager/file platf/server/state wiki/server
Samer .
shevek at ourproject.org
Sat Dec 6 20:36:59 CET 2008
Author: shevek
Date: 2008-12-06 20:36:56 +0100 (Sat, 06 Dec 2008)
New Revision: 988
Modified:
trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java
trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java
trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java
trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java
trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java
trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java
trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java
trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java
trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java
trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java
trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java
Log:
Translation improved
Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -87,7 +87,7 @@
createRefreshCxtAction(parentMenuTitleCtx, containers);
createUploadAction(i18n.t("Upload file"), "images/nav/upload.png",
- i18n.t("Upload some files (images, PDFs, ...)"), null, containersNoRoot);
+ i18n.t("Upload files (images, PDFs...)"), null, containersNoRoot);
createSetAsDefContent(parentMenuTitle, contents);
Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/blogs/client/cnt/BlogFolderContentPresenter.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -53,7 +53,7 @@
protected void setState(StateContainerDTO state) {
if (state.getTypeId().equals(BlogClientTool.TYPE_ROOT)) {
if (state.getRootContainer().getChilds().size() == 0) {
- view.setInfo(i18n.t("This group has no blogs."));
+ view.setInfo(i18n.t("This group has no blogs"));
} else {
view.setInfo("");
}
Modified: trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/blogs/server/BlogServerTool.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -100,7 +100,7 @@
content.setStatus(ContentStatus.publishedOnline);
contentManager.save(user, content,
- i18n.t("This is only a post sample. You can edit it, and rename this post and this blog"));
+ i18n.t("This is only a post sample. You can edit it, rename the post and this blog"));
return group;
}
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -69,8 +69,8 @@
final String httpDomain = WindowUtils.getLocation().getHostName();
if (!chatDomain.equals(httpDomain)) {
Log.error("Your http domain (" + httpDomain + ") is different from the chat domain (" + chatDomain
- + "). This will produce problems with the chat functionality. "
- + "Check kune.properties on the server.");
+ + "). This will cause problems with the chat functionality. "
+ + "Please check kune.properties on the server.");
}
}
});
@@ -113,7 +113,7 @@
+ chatOptions.userOptions.getUserJid().getNode());
emiteUIProvider.get().joinRoom(roomURI);
} else {
- ws.showAlertMessage(i18n.t("Error"), i18n.t("To join a chatroom you need to be 'online'."));
+ ws.showAlertMessage(i18n.t("Error"), i18n.t("To join a chatroom you need to be 'online'"));
}
}
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/cnt/ChatRoomPresenter.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -59,7 +59,7 @@
view.setInfo(i18n.t("Select a chat room"));
}
} else {
- view.setInfo("History of room conversations ..." + Site.IN_DEVELOPMENT);
+ view.setInfo("History of room conversations..." + Site.IN_DEVELOPMENT);
}
super.setState(state);
}
Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/chat/client/ctx/room/AddRoomPanel.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -82,7 +82,7 @@
roomName.setAllowBlank(false);
roomName.setValidationEvent(false);
roomName.setRegex(TextUtils.UNIX_NAME);
- roomName.setRegexText(i18n.t("Can only contain characters, numbers, and dashes"));
+ roomName.setRegexText(i18n.t("The name must contain only characters, numbers and dashes"));
roomName.setId(ROOM_NAME_ID);
formPanel.add(roomName);
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -90,7 +90,7 @@
createSetAsDefContent(parentMenuTitle, contents);
createUploadAction(i18n.t("Upload file"), "images/nav/upload.png",
- i18n.t("Upload some files (images, PDFs, ...)"), null, containers);
+ i18n.t("Upload files (images, PDFs...)"), null, containers);
createDownloadActions(TYPE_UPLOADEDFILE);
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-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -60,7 +60,7 @@
public void doSessionExpired() {
onSessionExpired.fire();
getWorkspaceSkeleton().showAlertMessage(i18n.t("Session expired"),
- i18n.t("Your session has expired. Please login again."));
+ i18n.t("Your session has expired. Please log in again."));
}
public WorkspaceSkeleton getWorkspaceSkeleton() {
@@ -77,7 +77,7 @@
throw caught;
} catch (final AccessViolationException e) {
logException(e);
- Site.error(i18n.t("You don't have rights to do that"));
+ Site.error(i18n.t("You do not have rights to perform that action"));
} catch (final SessionExpiredException e) {
logException(e);
doSessionExpired();
@@ -111,13 +111,13 @@
getWorkspaceSkeleton().showAlertMessage(
i18n.t("Warning"),
i18n.t("Sorry, you are the last admin of this group."
- + " Look for someone to substitute you appropriately as admin before unjoin this group."));
+ + " Look for someone to substitute you appropriately as admin before leaving this group."));
} catch (final AlreadyGroupMemberException e) {
logException(e);
Site.error(i18n.t("This group is already a group member"));
} catch (final AlreadyUserMemberException e) {
logException(e);
- Site.error(i18n.t("This user is already a member of this group"));
+ Site.error(i18n.t("This user is already a group member"));
} catch (final Throwable e) {
logException(e, true);
Site.error(i18n.t("Error performing operation"));
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/AbstractSearcherPanel.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -45,8 +45,8 @@
final PagingToolbar pag = new PagingToolbar(store);
pag.setPageSize(PAGINATION_SIZE);
pag.setDisplayInfo(true);
- pag.setDisplayMsg(i18n.tWithNT("Displaying results {0} - {1} of {2}", "Respect {} values in translations, "
- + "this will produce: 'Displaying results 1 - 25 of 95465' for instance"));
+ pag.setDisplayMsg(i18n.tWithNT("Displaying results {0} - {1} of {2}", "Respect {} values in translations. "
+ + "This will produce: 'Displaying results 1 - 25 of 95465' for instance"));
pag.setEmptyMsg(i18n.t("No results to display"));
pag.setAfterPageText(i18n.tWithNT("of {0}", "Used to show multiple results: '1 of 30'"));
pag.setBeforePageText(i18n.t("Page"));
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderDialog.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -58,7 +58,7 @@
public void destroy() {
if (hasUploadingFiles()) {
dialog.stopUpload();
- Site.important(i18n.t("Upload canceled after sign out"));
+ Site.important(i18n.t("Upload cancelled after signing out"));
}
if (dialog != null) {
dialog.destroy();
@@ -135,7 +135,7 @@
public boolean onBeforeAdd(final UploadDialog source, final String filename) {
boolean mustAdd = presenter.checkFolderChange();
if (!mustAdd) {
- Site.important(i18n.t("Wait until current uploads finish to upload files in other location"));
+ Site.important(i18n.t("Please, wait until current uploads are finished to upload new files into another location"));
}
return mustAdd;
}
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileJsonUploadManagerAbstract.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -62,6 +62,6 @@
@Override
protected void onSuccess(HttpServletResponse response) throws IOException {
- doResponse(response, createJsonResponse(true, i18n.t("Success uploading")).toString());
+ doResponse(response, createJsonResponse(true, i18n.t("Uploading was successful")).toString());
}
}
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/state/StateServiceDefault.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -114,7 +114,7 @@
state.setEnabledTools(groupManager.findEnabledTools(group.getId()));
setSocialNetwork(state, userLogged, group);
state.setStateToken(group.getStateToken());
- state.setTitle("<h2>" + i18n.t("This user doesn't have a homepage") + "</h2>");
+ state.setTitle("<h2>" + i18n.t("This user does not have a homepage") + "</h2>");
return state;
}
Modified: trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2008-12-05 21:15:09 UTC (rev 987)
+++ trunk/src/main/java/org/ourproject/kune/wiki/server/WikiServerTool.java 2008-12-06 19:36:56 UTC (rev 988)
@@ -98,7 +98,7 @@
descriptor.setTypeId(TYPE_WIKIPAGE);
descriptor.setStatus(ContentStatus.publishedOnline);
contentManager.save(user, descriptor,
- i18n.t("This is only a wiki page sample. You can edit or rename it but also any other user."));
+ i18n.t("This is only a wiki page sample. You can edit or rename it, as any other user."));
return group;
}
More information about the kune-commits
mailing list