Author: shevek Date: 2008-12-05 20:10:49 +0100 (Fri, 05 Dec 2008) New Revision: 986 Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.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/socialnet/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java Log: Translation improved Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-12-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPanel.java 2008-12-05 19:10:49 UTC (rev 986) @@ -131,7 +131,7 @@ } public void showSaveBeforeDialog() { - MessageBox.confirm(i18n.t("Save confirmation"), i18n.t("Save before closing the editor?"), + MessageBox.confirm(i18n.t("Save confirmation"), i18n.t("Do you want to save before closing the editor?"), new MessageBox.ConfirmCallback() { public void execute(final String btnID) { if (btnID.equals("yes")) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-12-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2008-12-05 19:10:49 UTC (rev 986) @@ -391,7 +391,7 @@ private MenuBar createFontSizesMenu() { final MenuBar menu = new MenuBar(); final MenuBar submenu = new MenuBar(true); - final String fontSizes[] = { i18n.t("Extra small"), i18n.t("Very small"), i18n.t("small"), i18n.t("Medium"), + final String fontSizes[] = { i18n.t("Extra small"), i18n.t("Very small"), i18n.t("Small"), i18n.t("Medium"), i18n.t("Large"), i18n.t("Very large"), i18n.t("Extra large") }; KuneUiUtils.setQuickTip(menu, i18n.t("Font Size")); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePanel.java 2008-12-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensechoose/LicenseChoosePanel.java 2008-12-05 19:10:49 UTC (rev 986) @@ -66,7 +66,7 @@ final VerticalPanel licenseTypesVP = new VerticalPanel(); ccRB = new RadioButton("ccOrNot", i18n.t("Creative Commons")); - final RadioButton notCcRB = new RadioButton("ccOrNot", i18n.t("Others licenses")); + final RadioButton notCcRB = new RadioButton("ccOrNot", i18n.t("Other licenses")); options = new DeckPanel(); ccIntro = new Label( i18n.t("With a Creative Commons license, you keep your copyright but allow people to copy and distribute your work provided they give you credit — and only on the conditions you specify here. What do you want to do?")); @@ -75,10 +75,10 @@ final VerticalPanel ccOptionsVP = new VerticalPanel(); final VerticalPanel nonCcOptionsVP = new VerticalPanel(); - final Label comercialLabel = new Label(i18n.t("Allow commercial uses of your work?")); - commercialRB = new RadioButton("comercial", i18n.t("Yes")); - nonCommercialRB = new RadioButton("comercial", i18n.t("No")); - final Label allowModifLabel = new Label(i18n.t("Allow modifications of your work?")); + final Label comercialLabel = new Label(i18n.t("Do you want to allow commercial uses of your work?")); + commercialRB = new RadioButton("commercial", i18n.t("Yes")); + nonCommercialRB = new RadioButton("commercial", i18n.t("No")); + final Label allowModifLabel = new Label(i18n.t("Do you want to allow modifications of your work?")); allowModifRB = new RadioButton("allowModif", i18n.t("Yes")); allowModifShareAlikeRB = new RadioButton("allowModif", i18n.t("Yes, as long as others share alike")); noModifRB = new RadioButton("allowModif", i18n.t("No")); @@ -201,7 +201,7 @@ public void showNotCCoptions() { options.showWidget(1); - optionsBox.setTitle(i18n.t("Select one of these licenses:")); + optionsBox.setTitle(i18n.t("Please, select one of these licenses:")); } private void configureListeners(final LicenseChoosePresenter presenter) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2008-12-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2008-12-05 19:10:49 UTC (rev 986) @@ -270,12 +270,12 @@ tags.setName(TAGS_FIELD); tags.setWidth(BIG_FIELD_WIDTH); tags.setAllowBlank(false); - final ToolTip fieldToolTip = new ToolTip(i18n.t("Some words related to this group (separated with spaces).")); + final ToolTip fieldToolTip = new ToolTip(i18n.t("Please, write some keywords for this group (separated with spaces).")); fieldToolTip.applyTo(tags); tags.setValidationDelay(1000); form.add(tags); - final FieldSet groupTypeFieldSet = new FieldSet(i18n.t("Type of group")); + final FieldSet groupTypeFieldSet = new FieldSet(i18n.t("Group type")); groupTypeFieldSet.setStyle("margin-left: 105px"); groupTypeFieldSet.setWidth(BIG_FIELD_WIDTH); @@ -284,23 +284,23 @@ projectRadio = new Radio(); projectRadio.setTabIndex(5); createRadio(groupTypeFieldSet, projectRadio, "Project", - "A project is a kind of group in which new members inclusion " + "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 choose in the future as administrator too.", PROJ_GROUP_TYPE_ID); + + "and other people she/he chooses to be administrator as well.", PROJ_GROUP_TYPE_ID); projectRadio.setChecked(true); orgRadio = new Radio(); orgRadio.setTabIndex(6); - createRadio(groupTypeFieldSet, orgRadio, "Organization", "An organization is like a project, " + createRadio(groupTypeFieldSet, orgRadio, "Organization", "An organization works as a project, " + "but organizations must be a legal entity.", ORG_GROUP_TYPE_ID); communityRadio = new Radio(); communityRadio.setTabIndex(7); - createRadio(groupTypeFieldSet, communityRadio, "Community", "Communities are social group of persons " - + "with shared interests and they are open to new members " + createRadio(groupTypeFieldSet, communityRadio, "Community", "Communities are social groups of persons " + + "with shared interests, which are open to new members " + "(for instance the environmental community or the LGBT community). " - + "Normally they aren't a legal entity.", COMM_GROUP_TYPE_ID); + + "They rarely are a legal entity.", COMM_GROUP_TYPE_ID); groupTypeFieldSet.setCollapsible(false); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2008-12-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/SiteSearcherPanel.java 2008-12-05 19:10:49 UTC (rev 986) @@ -104,7 +104,7 @@ dialog.expand(); dialog.center(); if (traybarButton == null) { - traybarButton = new SiteBottomTrayButton("images/kune-search-ico-push.gif", i18n.t("Show/hide searcher"), + traybarButton = new SiteBottomTrayButton("images/kune-search-ico-push.gif", i18n.t("Show/hide search engine"), dialog, ws); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2008-12-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2008-12-05 19:10:49 UTC (rev 986) @@ -53,7 +53,7 @@ public BuddiesSummaryPanel(final BuddiesSummaryPresenter presenter, final WorkspaceSkeleton ws, I18nTranslationService i18n, ActionManager actionManager, ActionToolbarView<UserSimpleDTO> actionToolbarView) { - super(i18n.t("Buddies"), i18n.t("Buddies of this user"), ws); + super(i18n.t("Buddies"), i18n.t("This user buddies"), ws); this.actionManager = actionManager; menuItemsContainer = new MenuItemsContainer<UserSimpleDTO>(); this.i18n = i18n; 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-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2008-12-05 19:10:49 UTC (rev 986) @@ -171,7 +171,7 @@ } }); addAsBuddie.setMustBeAuthenticated(true); - addAsBuddie.setTextDescription(i18n.t("Add as buddie")); + addAsBuddie.setTextDescription(i18n.t("Add as a buddie")); addAsBuddie.setIconUrl("images/add-green.png"); addAsBuddie.setAddCondition(new ActionAddCondition<UserSimpleDTO>() { public boolean mustBeAdded(UserSimpleDTO item) { @@ -192,7 +192,7 @@ } }); go.setMustBeAuthenticated(false); - go.setTextDescription(i18n.t("Visit this user homepage")); + go.setTextDescription(i18n.t("Visit this user's homepage")); go.setIconUrl("images/group-home.gif"); actionRegistry.addAction(go); 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-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2008-12-05 19:10:49 UTC (rev 986) @@ -106,7 +106,7 @@ public void confirmAddCollab(final String groupShortName, final String groupLongName) { final String groupName = groupLongName + " (" + groupShortName + ")"; - MessageBox.confirm(i18n.t("Confirm addition of member"), i18n.t("Add [%s] as member?", groupName), + MessageBox.confirm(i18n.t("Confirm member joining"), i18n.t("Add [%s] as a member?", groupName), new MessageBox.ConfirmCallback() { public void execute(final String btnID) { if (btnID.equals("yes")) { 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-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2008-12-05 19:10:49 UTC (rev 986) @@ -112,7 +112,7 @@ chatEngineProvider.get().chat( XmppURI.jid(group.getShortName() + "@" + initData.getChatDomain())); } else { - Site.important(i18n.t("To start a chat you need to be 'online'.")); + Site.important(i18n.t("To start a chat you need to be 'online'")); } } }), true); @@ -163,7 +163,7 @@ }); addMember.setIconUrl("images/add-green.gif"); addMember.setTextDescription(i18n.t("Add member")); - addMember.setToolTip(i18n.t("Add a group or a person as member of this group")); + addMember.setToolTip(i18n.t("Add an user or a group as member of this group")); addMember.setParentMenuTitle(i18n.t("Options")); groupActionRegistry.addAction(addMember); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-12-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2008-12-05 19:10:49 UTC (rev 986) @@ -43,8 +43,8 @@ public ParticipationSummaryPanel(final ParticipationSummaryPresenter presenter, final I18nTranslationService i18n, final WorkspaceSkeleton ws, ActionToolbarView<StateToken> actionToolbarView) { - super(i18n.t("Participates in"), i18n.t("Groups in which participates"), ws); - gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user is not member of any group"), false, false, + super(i18n.t("Participates in"), i18n.t("Groups in which the user participates"), ws); + gridMenuPanel = new GridMenuPanel<GroupDTO>(i18n.t("This user does not belong to any group"), false, false, false, false, false); Listener<String> go = new Listener<String>() { public void onEvent(final String groupShortName) { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2008-12-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2008-12-05 19:10:49 UTC (rev 986) @@ -162,7 +162,7 @@ Site.important(i18n.t("Sorry this is a closed group")); break; case moderated: - Site.info(i18n.t("Requested. Waiting for admins decision")); + Site.info(i18n.t("Membership requested. Waiting for admins decision")); break; } } @@ -186,11 +186,11 @@ } }); unJoin.setIconUrl("images/del.gif"); - unJoin.setTextDescription(i18n.t("Unjoin")); - unJoin.setToolTip(i18n.t("Don't participate more in this group")); + unJoin.setTextDescription(i18n.t("Leave")); + unJoin.setToolTip(i18n.t("Do not participate anymore in this group")); unJoin.setParentMenuTitle(i18n.t("Options")); unJoin.setMustBeConfirmed(true); - unJoin.setConfirmationTitle(i18n.t("Unjoin this group")); + unJoin.setConfirmationTitle(i18n.t("Leave this group")); unJoin.setConfirmationText(i18n.t("Are you sure?")); } @@ -244,7 +244,7 @@ stateManager.gotoToken(groupDTO.getShortName()); } }); - unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Don't participate more in this group"), + unJoinMenuItem = new MenuItem<GroupDTO>("images/del.gif", i18n.t("Do not participate anymore in this group"), new Listener<GroupDTO>() { public void onEvent(final GroupDTO groupDTO) { removeMemberAction(groupDTO); @@ -259,7 +259,7 @@ new AsyncCallbackSimple<SocialNetworkDataDTO>() { public void onSuccess(final SocialNetworkDataDTO result) { Site.hideProgress(); - Site.info(i18n.t("Type of member changed")); + Site.info(i18n.t("Member type changed")); stateManager.setSocialNetwork(result); } }); @@ -297,7 +297,7 @@ new AsyncCallbackSimple<SocialNetworkDataDTO>() { public void onSuccess(final SocialNetworkDataDTO result) { Site.hideProgress(); - Site.info(i18n.t("Type of member changed")); + Site.info(i18n.t("Member type changed")); stateManager.setSocialNetwork(result); } }); @@ -318,7 +318,7 @@ }); } }); - denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Don't accept this member"), + denyJoinGroupMenuItem = new MenuItem<GroupDTO>("images/cancel.gif", i18n.t("Reject this member"), new Listener<GroupDTO>() { public void onEvent(final GroupDTO group) { Site.showProgressProcessing(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-12-05 17:53:45 UTC (rev 985) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPanel.java 2008-12-05 19:10:49 UTC (rev 986) @@ -58,9 +58,9 @@ final Label label = new Label(name); // i18n pluralization if (count > 1) { - KuneUiUtils.setQuickTip(label, i18n.t("[%d] items with this tag", count)); + KuneUiUtils.setQuickTip(label, i18n.t("There are [%d] items with this tag", count)); } else { - KuneUiUtils.setQuickTip(label, i18n.t("[%d] item with this tag", count)); + KuneUiUtils.setQuickTip(label, i18n.t("There are [%d] item with this tag", count)); } label.addClickListener(new ClickListener() { public void onClick(final Widget sender) {