Author: shevek Date: 2008-12-18 21:56:21 +0100 (Thu, 18 Dec 2008) New Revision: 1000 Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java Log: Translation improved Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2008-12-18 18:31:33 UTC (rev 999) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2008-12-18 20:56:21 UTC (rev 1000) @@ -38,10 +38,10 @@ final FieldSet fieldSet = new FieldSet("license recommended"); fieldSet.setStyle("margin-left: 105px"); fieldSet.setWidth(250); - copyleftRadio = DefaultFormUtils.createRadio(fieldSet, i18n.t("Use a copyleft license (recommended)."), + copyleftRadio = DefaultFormUtils.createRadio(fieldSet, i18n.t("Use a copyleft license (recommended)"), RADIO_FIELD_NAME, null, RADIO_COPYLEFT_ID); anotherLicenseRadio = DefaultFormUtils.createRadio(fieldSet, - i18n.t("Use another kind of license (advanced use)."), RADIO_FIELD_NAME, null, RADIO_ANOTHER_ID); + i18n.t("Use another kind of license (advanced)"), RADIO_FIELD_NAME, null, RADIO_ANOTHER_ID); copyleftRadio.addListener(new CheckboxListenerAdapter() { @Override public void onCheck(Checkbox field, boolean checked) { @@ -69,14 +69,14 @@ Label whyALicense = new Label(); Label youCanChangeTheLicenseLater = new Label(); recommendCopyleft.setHtml(POINT - + i18n.t("We recommend [%s] licenses, specially for practical works.", TextUtils.generateHtmlLink( + + i18n.t("We recommend [%s] licenses, specially for practical works", TextUtils.generateHtmlLink( "http://en.wikipedia.org/wiki/Copyleft", i18n.t("copyleft"))) + DefaultFormUtils.br()); // FIXME whyALicense.setHtml(POINT + TextUtils.generateHtmlLink("http://mirrors.creativecommons.org/getcreative/", - i18n.t("Do we need a license?")) + DefaultFormUtils.br()); + i18n.t("Why do we need a license?")) + DefaultFormUtils.br()); youCanChangeTheLicenseLater.setHtml(POINT - + i18n.t("You can change this license later or select a per content license.") + DefaultFormUtils.br()); + + i18n.t("You can change this license later") + DefaultFormUtils.br()); add(intro); add(copyleftRadio); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java 2008-12-18 18:31:33 UTC (rev 999) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardSndForm.java 2008-12-18 20:56:21 UTC (rev 1000) @@ -30,18 +30,18 @@ super.setHeight(LicenseWizardView.HEIGHT); Label intro = new Label(); - intro.setHtml(i18n.t("Select the type of license:") + DefaultFormUtils.brbr()); + intro.setHtml(i18n.t("Select the license type:") + DefaultFormUtils.brbr()); final FieldSet fieldSet = new FieldSet("license type"); fieldSet.setStyle("margin-left: 105px"); fieldSet.setWidth(250); - commonLicensesRadio = DefaultFormUtils.createRadio(fieldSet, i18n.t("Common licenses"), RADIO_FIELD_NAME, + commonLicensesRadio = DefaultFormUtils.createRadio(fieldSet, i18n.t("Common licenses for cultural works"), RADIO_FIELD_NAME, i18n.t("Select a Creative Commons license (recommended for cultural works)"), COMMON_LICENSES_ID); otherLicensesRadio = DefaultFormUtils.createRadio( fieldSet, i18n.t("Other kind of licenses"), RADIO_FIELD_NAME, - i18n.t("Use other kind of licenses like the FSF licenses (recommended for free software works) and other kind of licenses"), + i18n.t("Use the GNU licenses (recommended for free software works) and other kind of licenses"), OTHER_LICENSES_ID); commonLicensesRadio.addListener(new CheckboxListenerAdapter() { @Override Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java 2008-12-18 18:31:33 UTC (rev 999) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java 2008-12-18 20:56:21 UTC (rev 1000) @@ -30,7 +30,7 @@ super.setAutoHeight(true); super.getFormPanel().setButtonAlign(Position.LEFT); Label intro = new Label(); - intro.setHtml(i18n.t("This is the default license of all the contents of this group (you can also select another different license per content):") + intro.setHtml(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):") + DefaultFormUtils.brbr()); licenseImage = new Image();