Author: vjrj_ Date: 2011-10-04 01:19:58 +0200 (Tue, 04 Oct 2011) New Revision: 1542 Added: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java trunk/src/main/resources/db/update-0018-i18nclean3.sql Removed: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java trunk/src/main/resources/db/liquibase_changelog.xml Log: CLOSED - # 122: To revise our UI English http://kune.ourproject.org/issues/ticket/122 Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -31,7 +31,7 @@ @Inject public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { - super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder here"), + super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder"), i18n.t("New folder"), BartersConstants.TYPE_FOLDER); } Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -53,7 +53,7 @@ private void registerIcons() { registerContentTypeIcon(TYPE_ROOM, res.groupChat()); registerEmptyMessages(TYPE_ROOM, - i18n.t("Here you will see the archive of old conversations" + TextUtils.IN_DEVELOPMENT_P)); + i18n.t("See the archive of old conversations" + TextUtils.IN_DEVELOPMENT_P)); } } Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -26,7 +26,7 @@ import cc.kune.chat.client.actions.OpenGroupPublicChatRoomAction; import cc.kune.chat.client.actions.StartAssemblyWithMembers; import cc.kune.chat.client.actions.StartChatWithMemberAction; -import cc.kune.chat.client.actions.StartChatWithThisBuddieAction; +import cc.kune.chat.client.actions.StartChatWithThisBuddyAction; import cc.kune.chat.client.actions.StartChatWithThisPersonAction; import cc.kune.chat.client.actions.conditions.IsBuddieCondition; import cc.kune.chat.client.actions.conditions.IsNotBuddieCondition; @@ -76,7 +76,7 @@ final Provider<StartChatWithMemberAction> startChatWithMemberAction, final IsLoggedCondition isLogged, final Provider<StartChatWithThisPersonAction> startChatWithPersonAction, - final Provider<StartChatWithThisBuddieAction> startChatWithBuddieAction, + final Provider<StartChatWithThisBuddyAction> startChatWithBuddieAction, final ChatClientActions chatActions, final Provider<StartAssemblyWithMembers> startAssembly, final Provider<OpenGroupPublicChatRoomAction> openGroupRoomAction, // final Provider<OpenGroupPublicChatRoomButton> openGroupRoom, Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatAboutContentBtn.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -80,7 +80,7 @@ public ChatAboutContentBtn(final ChatAboutContentAction action, final CoreResources res, final I18nTranslationService i18n) { super(action); - this.withIcon(res.emiteRoom()).withToolTip(i18n.t("Chat and comment this")).withText( + this.withIcon(res.emiteRoom()).withToolTip(i18n.t("Chat and comment on this")).withText( i18n.t("Chat about")).withStyles("k-def-docbtn, k-fl").withId(ID); } } Modified: trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/chat/client/actions/OpenGroupPublicChatRoomAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -70,7 +70,7 @@ // setState(session.getCurrentState()); } }); - putValue(Action.NAME, i18n.t("Group's public room")); + putValue(Action.NAME, i18n.t("Group's public chat room")); putValue(Action.TOOLTIP, i18n.t("Enter to this group public chat room")); putValue(Action.SMALL_ICON, res.groupChat()); setInviteMembersImpl(false); Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -41,7 +41,7 @@ final Provider<ChatClient> chatClient) { this.i18n = i18n; this.chatClient = chatClient; - putValue(NAME, i18n.t("Chat with this member")); + putValue(NAME, i18n.t("Chat with this group member")); putValue(Action.SMALL_ICON, res.newChat()); } Deleted: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -1,36 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.chat.client.actions; - -import cc.kune.chat.client.ChatClient; -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; - -import com.google.inject.Inject; -import com.google.inject.Provider; - -public class StartChatWithThisBuddieAction extends StartChatWithMemberAction { - @Inject - public StartChatWithThisBuddieAction(final I18nTranslationService i18n, final CoreResources res, - final Provider<ChatClient> chatClient) { - super(i18n, res, chatClient); - putValue(NAME, i18n.t("Chat with your buddie")); - } -} Copied: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java (from rev 1538, trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddieAction.java) =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithThisBuddyAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -0,0 +1,36 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.chat.client.actions; + +import cc.kune.chat.client.ChatClient; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.i18n.I18nTranslationService; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class StartChatWithThisBuddyAction extends StartChatWithMemberAction { + @Inject + public StartChatWithThisBuddyAction(final I18nTranslationService i18n, final CoreResources res, + final Provider<ChatClient> chatClient) { + super(i18n, res, chatClient); + putValue(NAME, i18n.t("Chat with your buddy")); + } +} Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -164,30 +164,34 @@ form.add(groupTypeFieldSet); - projectRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Project"), TYPEOFGROUP_FIELD, - i18n.t("A project is a kind of group in which new members joining " - + "is moderated by the project administrators. " - + "An administrator is the person who creates the project " - + "and other people she/he chooses to be administrator as well."), PROJ_GROUP_TYPE_ID); + projectRadio = DefaultFormUtils.createRadio( + groupTypeFieldSet, + i18n.t("Project"), + TYPEOFGROUP_FIELD, + i18n.t("A project is a kind of group in which the joining of new members is moderated by the project administrators."), + PROJ_GROUP_TYPE_ID); projectRadio.setTabIndex(6); projectRadio.setValue(true); orgRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Organization"), - TYPEOFGROUP_FIELD, i18n.t("An organization works as a project, " - + "but organizations must be a legal entity."), ORG_GROUP_TYPE_ID); + TYPEOFGROUP_FIELD, i18n.t("An organization works the same way as a project, " + + "except that it must be a legal entity."), ORG_GROUP_TYPE_ID); orgRadio.setTabIndex(7); - closedRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Closed"), TYPEOFGROUP_FIELD, - i18n.t("Closed groups are social groups of persons " - + "like family, friends, buddies, etc, which are moderated to new members " - + "and with private contents (by default)"), CLOSED_GROUP_TYPE_ID); + closedRadio = DefaultFormUtils.createRadio( + groupTypeFieldSet, + i18n.t("Closed"), + TYPEOFGROUP_FIELD, + i18n.t("A Closed group is a private project, which contents are only accessible to its members (by default)."), + CLOSED_GROUP_TYPE_ID); closedRadio.setTabIndex(8); - communityRadio = DefaultFormUtils.createRadio(groupTypeFieldSet, i18n.t("Community"), - TYPEOFGROUP_FIELD, i18n.t("Communities are social groups of persons " - + "with shared interests, which are open to new members " - + "(for instance the environmental community or the LGBT community). " - + "They rarely are a legal entity."), COMM_GROUP_TYPE_ID); + communityRadio = DefaultFormUtils.createRadio( + groupTypeFieldSet, + i18n.t("Community"), + TYPEOFGROUP_FIELD, + i18n.t("A community is a group of users with shared interests (for instance the environmental community or the LGBT community). It is open to any new member to join freely without the moderation of the administrators."), + COMM_GROUP_TYPE_ID); communityRadio.setTabIndex(9); return form; Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreMessages.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -25,7 +25,7 @@ public final static String EMAIL_IN_USE = "This email address is being used by another user. Please, try with another one"; public final static String ENT_LOGO_SELECTOR_NORMAL_TITLE = "Logo"; public final static String ENT_LOGO_SELECTOR_PERSON_TITLE = "Avatar"; - public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase characters. It can only contain Western characters and numbers"; + public final static String FIELD_MUST_BE_BETWEEN_3_AND_15 = "The name must be between 3 and 15 lowercase Western characters and/or numbers"; public final static String FIELD_MUST_BE_BETWEEN_3_AND_15_NO_CHARS = "The name must be between 3 and 15 lowercase characters."; public final static String GROUP_OPTIONS_DIALOG_TITLE = "Group options"; public final static String GROUPNAME_RESTRICTED = "This group name can not be used. Please try with a different name"; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -65,7 +65,6 @@ @Override public void onExactMatch(final String match) { NotifyUser.info(match); - NotifyUser.info("kk"); } }) { @@ -86,7 +85,7 @@ }; }; suggestBox = multivalueSBox.getSuggestBox(); - Tooltip.to(suggestBox, i18n.t("Type something to search users and groups in this site")); + Tooltip.to(suggestBox, i18n.t("Type something to search for users and groups in this site")); searchTextBox = suggestBox.getTextBox(); searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); searchTextBox.addStyleName("k-fr"); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -60,14 +60,14 @@ armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0); // homeButton.setVisible(false); homeSpaceTooltip = Tooltip.to(homeButton, i18n.t("Your home page in this site")); - userSpaceTooltip = Tooltip.to(userButton, - i18n.t("User space: it shows a list of all your documents and contents " - + "in which you participate")); + userSpaceTooltip = Tooltip.to( + userButton, + i18n.t("User space: it shows a list of all documents and contents " + "in which you participate")); groupSpaceTooltip = Tooltip.to(groupButton, i18n.t("Group and personal space: Where you can create " + "and publish contents for your personal or group web spaces")); publicSpaceTooltip = Tooltip.to(publicButton, - i18n.t("Public space: In this space you can see a preview of how the Personal o" - + "r Group Space looks like on the web, outside this site")); + i18n.t("Public space: Where you can see a preview of how your Personal or " + + "Group Space looks like on the web, outside this site")); // homeSpaceTooltip.setWidth(0); userSpaceTooltip.setWidth(190); groupSpaceTooltip.setWidth(170); Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNPanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -45,14 +45,15 @@ super(i18n, guiProvider, armor, avatarDecorator, dragController, notDrop); setVisibleImpl(false); mainTitle.setText(i18n.t("Group members")); - Tooltip.to(mainTitle, i18n.t("People and groups collaborating in this group")); - firstCategoryLabel.setText(i18n.t("Admins")); - setTooltip(firstCategoryLabel, i18n.t("People that can admin this group")); + Tooltip.to(mainTitle, i18n.t("Users and groups collaborating in this group")); + firstCategoryLabel.setText(i18n.t("Administrators")); + setTooltip(firstCategoryLabel, i18n.t("Users who can administrate this group")); sndCategoryLabel.setText(i18n.t("Collaborators")); - setTooltip(sndCategoryLabel, i18n.t("Other people that collaborate with this group")); + setTooltip(sndCategoryLabel, i18n.t("Others who collaborate with this group")); trdCategoryLabel.setText(i18n.t("Pending")); - setTooltip(trdCategoryLabel, i18n.t("People pending to be accepted in this group by the admins")); - sndDeckLabel.setText(i18n.t("This is an orphaned project, if you are interested please request to join to work on it")); + setTooltip(trdCategoryLabel, + i18n.t("Users pending to be accepted in this group by the administrators")); + sndDeckLabel.setText(i18n.t("This is an orphaned project, if you are interested in contributing please request to join")); firstDeckLabel.setText(i18n.t("The members of this group are not public")); bottomActionsToolbar = new ActionFlowPanel(guiProvider); bottomPanel.add(bottomActionsToolbar); Modified: trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/UserSNPanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -51,11 +51,11 @@ setVisibleImpl(false); mainTitle.setText(i18n.t("His/her network:")); - mainTitle.setTitle(i18n.t("This user buddies and groups where participes")); + mainTitle.setTitle(i18n.t("This user's groups and buddies")); firstCategoryLabel.setText(i18n.t("Buddies")); - setTooltip(firstCategoryLabel, i18n.t("This user buddies")); - sndCategoryLabel.setText(i18n.t("Participates in")); - setTooltip(sndCategoryLabel, i18n.t("Groups in which this user participates")); + setTooltip(firstCategoryLabel, i18n.t("This user's buddies")); + sndCategoryLabel.setText(i18n.t("Joins in")); + setTooltip(sndCategoryLabel, i18n.t("Groups which this user Joined")); trdCategoryLabel.setText("NOT USED"); setTooltip(trdCategoryLabel, "NOT USED"); super.setTrdCategoryVisible(false); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/ChangeToAdminAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -36,35 +36,36 @@ import com.google.inject.Provider; public class ChangeToAdminAction extends AbstractExtendedAction { - private final I18nTranslationService i18n; - private final Session session; - private final Provider<SocialNetworkServiceAsync> snServiceProvider; - private final StateManager stateManager; + private final I18nTranslationService i18n; + private final Session session; + private final Provider<SocialNetworkServiceAsync> snServiceProvider; + private final StateManager stateManager; - @Inject - public ChangeToAdminAction(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final CoreResources res, - final Provider<SocialNetworkServiceAsync> snServiceProvider) { - this.stateManager = stateManager; - this.session = session; - this.i18n = i18n; - this.snServiceProvider = snServiceProvider; - putValue(NAME, i18n.t("Change to admin")); - putValue(Action.SMALL_ICON, res.arrowUpGreen()); - } + @Inject + public ChangeToAdminAction(final StateManager stateManager, final Session session, + final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetworkServiceAsync> snServiceProvider) { + this.stateManager = stateManager; + this.session = session; + this.i18n = i18n; + this.snServiceProvider = snServiceProvider; + putValue(NAME, i18n.t("Change to administrator")); + putValue(Action.SMALL_ICON, res.arrowUpGreen()); + } - @Override - public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgressProcessing(); - snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), session.getCurrentState().getStateToken(), - ((GroupDTO) event.getTarget()).getShortName(), new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member type changed")); - stateManager.setSocialNetwork(result); - } - }); - } + @Override + public void actionPerformed(final ActionEvent event) { + NotifyUser.showProgressProcessing(); + snServiceProvider.get().setCollabAsAdmin(session.getUserHash(), + session.getCurrentState().getStateToken(), ((GroupDTO) event.getTarget()).getShortName(), + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member type changed")); + stateManager.setSocialNetwork(result); + } + }); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoGroupAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -36,7 +36,7 @@ public GotoGroupAction(final StateManager stateManager, final I18nTranslationService i18n, final CoreResources res) { this.stateManager = stateManager; - putValue(NAME, i18n.t("Visit this group homepage")); + putValue(NAME, i18n.t("Visit this group's homepage")); putValue(Action.SMALL_ICON, res.groupHome()); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/GotoMemberAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -27,10 +27,11 @@ public class GotoMemberAction extends GotoGroupAction { - @Inject - public GotoMemberAction(final StateManager stateManager, final I18nTranslationService i18n, final CoreResources res) { - super(stateManager, i18n, res); - putValue(NAME, i18n.t("Visit this member homepage")); - } + @Inject + public GotoMemberAction(final StateManager stateManager, final I18nTranslationService i18n, + final CoreResources res) { + super(stateManager, i18n, res); + putValue(NAME, i18n.t("Visit this member's homepage")); + } } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -52,8 +52,8 @@ super(stateManager, session, i18n, res, snServiceProvider, rightsClientManager, AccessRolDTO.Viewer, false, true, false); this.signIn = signIn; - putValue(NAME, i18n.t("Participate")); - putValue(TOOLTIP, i18n.t("Request to participate in this group")); + putValue(NAME, i18n.t("Join")); + putValue(TOOLTIP, i18n.t("Request to Join in this group")); putValue(Action.SMALL_ICON, res.addGreen()); putValue(Action.STYLES, "k-sn-join"); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -45,7 +45,7 @@ super(stateManager, session, i18n, res, snServiceProvider, rightsClientManager, AccessRolDTO.Editor, true, false, true); putValue(NAME, i18n.t("Leave this group")); - putValue(TOOLTIP, i18n.t("Do not participate anymore in this group")); + // putValue(TOOLTIP, i18n.t("I want to leave this group")); putValue(Action.SMALL_ICON, res.del()); putValue(Action.STYLES, "k-sn-join"); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -55,7 +55,7 @@ this.i18n = i18n; this.snServiceProvider = snServiceProvider; putValue(NAME, i18n.t("Leave this group")); - putValue(TOOLTIP, i18n.t("Do not participate anymore in this group")); + // putValue(TOOLTIP, i18n.t("I want to leave this group")); putValue(Action.SMALL_ICON, res.del()); putValue(Action.STYLES, "k-sn-join"); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAction.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -49,7 +49,7 @@ NotifyUser.askConfirmation( i18n.t("Confirm, please:"), isPerson ? i18n.t("Do you want to write a message to your buddy?") - : onlyToAdmins ? i18n.t("Do you want to write a message to the admins of this group?") + : onlyToAdmins ? i18n.t("Do you want to write a message to the administrators of this group?") : i18n.t("Do you want to write a message to the members of this group?"), new SimpleResponseCallback() { @Override Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/WriteToAdmins.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -31,7 +31,7 @@ public WriteToAdmins(final WriteToAction action, final I18nTranslationService i18n) { super(action); action.setOnlyToAdmin(true); - withText(i18n.t("Write to the admins of this group")); + withText(i18n.t("Write to the administrators of this group")); setParent(GroupSNConfActions.OPTIONS_MENU); setPosition(0); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -87,11 +87,11 @@ addImpl(OPTIONS_MENU); new MenuTitleItemDescriptor(i18n.t("Options")).withParent(OPTIONS_MENU); - VISIBILITY_SUBMENU.withText(i18n.t("Those who can view this member list")).withParent(OPTIONS_MENU); + VISIBILITY_SUBMENU.withText(i18n.t("Users who can view this member list")).withParent(OPTIONS_MENU); MODERATION_SUBMENU.withText(i18n.t("New members policy")).withParent(OPTIONS_MENU); anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone")); onlyMembersItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only members")); - onlyAdminsItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only admins")); + onlyAdminsItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only administrators")); moderatedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("moderate request to join")); openItem.withParent(MODERATION_SUBMENU).withText(i18n.t("auto accept request to join")); closedItem.withParent(MODERATION_SUBMENU).withText(i18n.t("closed for new members")); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNConfActions.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -69,7 +69,7 @@ assert anyoneItem.getAction() != onlyYourBuddiesItem.getAction(); assert anyoneItem.getAction() != onlyYou.getAction(); addImpl(OPTIONS_MENU); - VISIBILITY_SUBMENU.withText(i18n.t("Those who can view your network")).withParent(OPTIONS_MENU); + VISIBILITY_SUBMENU.withText(i18n.t("Users who can view your network")).withParent(OPTIONS_MENU); anyoneItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("anyone")); onlyYourBuddiesItem.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only your buddies")); onlyYou.withParent(VISIBILITY_SUBMENU).withText(i18n.t("only you")); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/UserSNMenuItemsRegistry.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -81,7 +81,7 @@ public MenuItemDescriptor get() { final MenuItemDescriptor item = new MenuItemDescriptor(writeToAction); item.add(isPerson); - item.withText(i18n.t("Write to your buddie")); + item.withText(i18n.t("Write to your buddy")); item.add(isBuddie); item.add(isNotMe); item.add(isLogged); @@ -112,7 +112,7 @@ public MenuItemDescriptor get() { writeToActionOnlyAdmins.setOnlyToAdmin(true); final MenuItemDescriptor item = new MenuItemDescriptor(writeToActionOnlyAdmins); - item.withText(i18n.t("Write to the admins of this group")); + item.withText(i18n.t("Write to the administrators of this group")); item.add(isLogged); item.add(isGroup); item.add(imPartOfGroup); Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -34,7 +34,7 @@ public NewDocIconBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.pageAdd(), shorcutReg, "", i18n.t("Create a New Document. " - + "This document will be a new 'Page' in the public web if you publish it"), + + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), i18n.t("New document"), DocsConstants.TYPE_DOCUMENT); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -34,9 +34,14 @@ public NewDocMenuItem(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg, final DocsFolderNewMenu docsFolderNewMenu) { - super(i18n, action, res.pageAdd(), shorcutReg, i18n.t("New document"), + super( + i18n, + action, + res.pageAdd(), + shorcutReg, + i18n.t("New document"), i18n.t("Create a New Document here. " - + "This document will be a new 'Page' in the public web if you publish it"), + + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), i18n.t("New document"), DocsConstants.TYPE_DOCUMENT, docsFolderNewMenu.get()); } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -32,7 +32,7 @@ public NewFolderMenuItem(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res, final DocsFolderNewMenu docsFolderNewMenu) { super(i18n, action, res.folderAdd(), i18n.t("New folder"), - i18n.t("Create a new folder here. A folder will be a 'section' in the public web"), + i18n.t("Create a new folder. A folder will be a 'section' in the public web"), i18n.t("New folder"), DocsConstants.TYPE_FOLDER, docsFolderNewMenu.get()); } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -67,8 +67,8 @@ public void actionPerformed(final ActionEvent event) { final StateToken token = ((AbstractContentSimpleDTO) event.getTarget()).getStateToken(); ConfirmAskEvent.fire(eventBus, i18n.t("Please confirm"), - i18n.t("You will delete it with all its contents. Are you sure?"), i18n.t("Yes"), - i18n.t("No"), null, null, new OnAcceptCallback() { + i18n.t("Are you sure you want this? It will be deleted with all its contents."), + i18n.t("Yes"), i18n.t("No"), null, null, new OnAcceptCallback() { @Override public void onSuccess() { NotifyUser.showProgress(); Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nToTranslateGridPanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -16,7 +16,7 @@ @Inject public I18nToTranslateGridPanel(final I18nTranslationService i18n, final I18nCellList list) { this.list = list; - tabTitle = new Label(i18n.t("Untranslated")); + tabTitle = new Label(i18n.t("Not translated")); initWidget(list); } Modified: trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/i18n/I18nTranslatorForm.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -130,7 +130,7 @@ toTranslateTitle.setText(i18n.t("translate this:")); noteForTranslatorsTittle.setText(i18n.t("Notes:")); keyboardRecomendationTitle.setText(i18n.t("Tip:")); - keyboardRecomendation.setText(i18n.t("Pulse Alt+PageUp or Alt+PageDown to move up/down in the list while translating, and Alt-V to copy the original text. The translations are autosaved")); + keyboardRecomendation.setText(i18n.t("Click Alt+PageUp or Alt+PageDown to move up/down in the list while translating, and Alt-V to copy the original text. The translations are autosaved")); } private void saveIfNeeded() { Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -54,7 +54,7 @@ // super.setHeight(LicenseWizardView.HEIGHT); final Label intro = new Label(); - intro.setText(i18n.t("Select a license to share your group contents with other people:")); + intro.setText(i18n.t("Select the license you prefer using for sharing your group contents with other people:")); intro.addStyleName("kune-Margin-10-b"); final FieldSet fieldSet = new FieldSet(); // fieldSet.setTitle(i18n.t("license recommended")); Modified: trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -138,7 +138,7 @@ modificationsGroup, i18n.t("Yes"), RADIO_MODIF_FIELD_NAME, - i18n.t("The licensor permits others to copy, distribute, display and perform the work, as well as make derivative works based on it"), + i18n.t("The licensor permits others to copy, distribute, display and perform the work, as well as to make derivative works based on it"), RADIO_PERMIT_MOD_ID); permitModSaRadio = createRadio( modificationsGroup, Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/EntityOptGeneralPanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -49,7 +49,7 @@ super.getFormPanel().setLabelWidth(100); super.addStyleName("k-overflow-y-auto"); final Label label = new Label(); - label.setText(i18n.t("Here you can change this values:")); + label.setText(i18n.t("Change this values:")); label.addStyleName("kune-Margin-10-tb"); super.add(label); } Modified: trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/options/license/EntityOptDefLicensePanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -46,7 +46,7 @@ final FlowPanel flow = new FlowPanel(); final Label intro = new Label(); intro.setWordWrap(true); - intro.setText(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):")); + intro.setText(i18n.t("This is the default license for all the contents of this group (although you can choose a different license for specific contents):")); intro.addStyleName("kune-Margin-20-tb"); flow.add(intro); licenseImage = new Image(); Modified: trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/options/logo/EntityOptLogoPanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -97,16 +97,16 @@ @Override public void setNormalGroupsLabels() { - uploader.setLabelText(i18n.t("Select an image in your computer as the logo for this group. " - + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.", + uploader.setLabelText(i18n.t("Select an image from your computer as the logo for this group. " + + "For best results use a [%d]x[%d] pixel image. Bigger images will be automatically resized.", FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT)); tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_NORMAL_TITLE); } @Override public void setPersonalGroupsLabels() { - uploader.setLabelText(i18n.t("Select an image in your computer as your avatar. " - + "For best results use a [%d]x[%d] pixel image. We will automatically resize bigger images.", + uploader.setLabelText(i18n.t("Select an image from your computer as your avatar. " + + "For best results use a [%d]x[%d] pixel image. Bigger images will be automatically resized.", FileConstants.LOGO_DEF_HEIGHT, FileConstants.LOGO_DEF_HEIGHT)); tabTitle.setText(CoreMessages.ENT_LOGO_SELECTOR_PERSON_TITLE); } Modified: trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/options/style/EntityOptStylePanel.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -75,7 +75,7 @@ flow.add(wsThemeInfo); flow.add(styleSelector); hasBackLabel = i18n.t("Current background image: "); - noHasBacklabel = i18n.t("Also you can upload a background:"); + noHasBacklabel = i18n.t("You can also upload a background:"); backgroundLabel = new Label(hasBackLabel); backgroundLabel.addStyleName("k-clear"); chooseImage = i18n.t("Choose"); Modified: trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/gspace/client/options/tools/GroupOptToolsPresenter.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -36,8 +36,7 @@ import com.google.inject.Inject; import com.google.inject.Provider; -public class GroupOptToolsPresenter extends EntityOptToolsPresenter implements - GroupOptTools { +public class GroupOptToolsPresenter extends EntityOptToolsPresenter implements GroupOptTools { @Inject public GroupOptToolsPresenter(final StateManager stateManager, final Session session, @@ -72,7 +71,7 @@ @Override protected String getDefContentTooltip() { // FIXME - return i18n.t("You cannot disable this tool because it's where the current group home page is located. To do that you have to select other content as the default group home page but in another tool."); + return i18n.t("This tool cannot be disabled as long as it’s where the group’s home page is located. Change the default home page to another tool then try again."); } @Override Modified: trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java =================================================================== --- trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/pspace/client/PSpacePresenter.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -96,19 +96,19 @@ private void setContentNotPublic() { getView().getTitle().setText(i18n.t("Not Published yet") + TextUtils.IN_DEVELOPMENT_P); getView().getDescription().setText( - i18n.t("This is only a preview of how this page will looks like to the general public if you want to publish it")); + i18n.t("This is only a preview of how this webpage would look like to the general public on the internet.")); } private void setContentNotPublicable() { - getView().getTitle().setText(i18n.t("Not Publicable") + TextUtils.IN_DEVELOPMENT_P); - getView().getDescription().setText(i18n.t("This page is not publicable")); + getView().getTitle().setText(i18n.t("Not Publisable") + TextUtils.IN_DEVELOPMENT_P); + getView().getDescription().setText(i18n.t("This page is not publisable")); getView().setContentGotoPublicUrl("about:blank"); } private void setContentPublic() { getView().getTitle().setText(i18n.t("Preview") + TextUtils.IN_DEVELOPMENT_P); getView().getDescription().setText( - i18n.t("This is only a preview of how this page looks like to the general public on the web, outside this site.")); + i18n.t("This is only a preview of how this page would look like to the general public on the internet.")); } public void setState(final StateAbstractDTO state) { Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -32,7 +32,7 @@ public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res, final WikiFolderNewMenu wikiFolderNewMenu) { super(i18n, action, res.wikiAdd(), i18n.t("New folder"), - i18n.t("Create a new folder here. A folder will be a 'section' in the public web"), + i18n.t("Create a new folder. A folder will be a 'section' in the public web"), i18n.t("New folder"), WikiConstants.TYPE_FOLDER, wikiFolderNewMenu.get()); } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -34,7 +34,7 @@ public NewWikiIconBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.wikipageAdd(), shorcutReg, "", i18n.t("Create a New Wikipage here. " - + "This document will be a new 'Page' in the public web if you publish it"), + + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), i18n.t("New wikipage"), WikiConstants.TYPE_WIKIPAGE); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2011-10-03 23:19:58 UTC (rev 1542) @@ -34,9 +34,14 @@ public NewWikiMenuItem(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg, final WikiFolderNewMenu wikiFolderNewMenu) { - super(i18n, action, res.wikipageAdd(), shorcutReg, i18n.t("New wikipage"), + super( + i18n, + action, + res.wikipageAdd(), + shorcutReg, + i18n.t("New wikipage"), i18n.t("Create a New Wikipage here. " - + "This document will be a new 'Page' in the public web if you publish it"), + + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), i18n.t("New wikipage"), WikiConstants.TYPE_WIKIPAGE, wikiFolderNewMenu.get()); } Modified: trunk/src/main/resources/db/liquibase_changelog.xml =================================================================== --- trunk/src/main/resources/db/liquibase_changelog.xml 2011-10-03 12:31:04 UTC (rev 1541) +++ trunk/src/main/resources/db/liquibase_changelog.xml 2011-10-03 23:19:58 UTC (rev 1542) @@ -149,4 +149,10 @@ encoding="utf8" stripComments="1" /> <rollback>SELECT * FROM globalize_countries;</rollback> </changeSet> + <changeSet id="23" author="vjrj"> + <comment>I18n translations cleanup 3</comment> + <sqlFile path="src/main/resources/db/update-0017-i18nclean3.sql" + encoding="utf8" stripComments="1" /> + <rollback>SELECT * FROM globalize_countries;</rollback> + </changeSet> </databaseChangeLog> Added: trunk/src/main/resources/db/update-0018-i18nclean3.sql =================================================================== --- trunk/src/main/resources/db/update-0018-i18nclean3.sql (rev 0) +++ trunk/src/main/resources/db/update-0018-i18nclean3.sql 2011-10-03 23:19:58 UTC (rev 1542) @@ -0,0 +1,3 @@ +BEGIN WORK; +TRUNCATE TABLE globalize_translations; +COMMIT; \ No newline at end of file