i18n: Fix strings

FEA: ItEr76S04BugFixing
This commit is contained in:
Diego Pino 2012-07-04 03:44:21 +02:00
parent af8e6476c2
commit f50bbac150
59 changed files with 66 additions and 66 deletions

View file

@ -241,7 +241,7 @@ public class AdvanceType extends BaseEntity implements IHumanIdentifiable{
return unitName;
}
@AssertTrue(message = "the advance type name has to be unique. It is already used")
@AssertTrue(message = "Advance Type name already used. It must be unique")
public boolean checkConstraintUniqueName() {
if (StringUtils.isBlank(unitName)) {
return true;

View file

@ -104,7 +104,7 @@ public class EntitySequence extends BaseEntity {
return lastValue;
}
@AssertTrue(message = "prefix must not contain white spaces")
@AssertTrue(message = "Prefix cannot contain whitespaces")
public boolean checkConstraintPrefixWithoutWhiteSpaces() {
if ((prefix == null) || (prefix.isEmpty())) {
return false;

View file

@ -219,7 +219,7 @@ public class MaterialCategory extends IntegrationEntity {
}
@SuppressWarnings("unused")
@AssertTrue(message = "The subcategories names must be unique.")
@AssertTrue(message = "Subcategory names must be unique.")
public boolean checkConstraintUniqueSubcategoryName() {
Set<String> subcategoriesNames = new HashSet<String>();
for (MaterialCategory mc : this.getAllSubcategories()) {

View file

@ -323,7 +323,7 @@ public class OrderLine extends OrderElement {
return lastHoursGroupSequenceCode;
}
@AssertTrue(message = "some code is repeated between hours group codes")
@AssertTrue(message = "Code already included in Hours Group codes")
public boolean checkConstraintHoursGroupsCodeNotRepeated() {
Set<String> codes = new HashSet<String>();

View file

@ -122,4 +122,4 @@ public class SubcontractorCommunication extends BaseEntity {
SubcontractorCommunicationValue value = getLastSubcontractorCommunicationValues();
return (value == null) ? null : value.getDate();
}
}
}

View file

@ -44,4 +44,4 @@ public enum TaskDeadlineViolationStatusEnum {
public String toString() {
return value;
}
}
}

View file

@ -66,7 +66,7 @@ public class TaskQualityFormItem implements INewObject {
private Date date;
@NotEmpty(message = "task quality form item name not specified")
@NotEmpty(message = "Task Quality Form item name not specified")
public String getName() {
return name;
}

View file

@ -442,7 +442,7 @@ public class CriterionType extends IntegrationEntity implements
}
@AssertTrue(message="criterion type name is already being used")
@AssertTrue(message="Criterion Type name is already being used")
public boolean checkConstraintUniqueCriterionTypeName() {
/* Check if it makes sense to check the constraint .*/

View file

@ -492,7 +492,7 @@ public class WorkReport extends IntegrationEntity implements
return true;
}
@AssertTrue(message = "all timesheet lines have to be in the same month in monthly timesheets")
@AssertTrue(message = "In monthly timesheets, all timesheet lines should be in the same month")
public boolean checkConstraintAllWorkReportLinesInTheSameMonthInMonthlyTimesheet() {
if (!getWorkReportType().isMonthlyTimesheetsType()) {
return true;

View file

@ -420,7 +420,7 @@ public class WorkReportLine extends IntegrationEntity implements Comparable,
return true;
}
@AssertTrue(message = "number of hours is not properly calculated based on clock")
@AssertTrue(message = "Number of hours is not properly calculated according to start date and end date")
public boolean checkConstraintHoursCalculatedByClock() {
if (!firstLevelValidationsPassed()) {
return true;

View file

@ -195,7 +195,7 @@ public class WorkReportType extends IntegrationEntity implements IHumanIdentifia
}
@SuppressWarnings("unused")
@AssertTrue(message = "the assigned label type can not repeat in the timeshet template.")
@AssertTrue(message = "Assigned Label Type cannot be repeated in a Timesheet Template.")
public boolean checkConstraintNotExistRepeatedLabelTypes() {
for (WorkReportLabelTypeAssigment assignedLabelType : this.workReportLabelTypeAssigments) {
if (existRepeatedLabelType(assignedLabelType)) {
@ -532,4 +532,4 @@ public class WorkReportType extends IntegrationEntity implements IHumanIdentifia
.getName());
}
}
}

View file

@ -78,7 +78,7 @@ public class AdvanceTypeCRUDController extends BaseCRUDController<AdvanceType> {
if (!(advanceTypeModel.isPrecisionValid((BigDecimal) value))) {
throw new WrongValueException(
comp,
_("Value is not valid, the Precision value must be less than the defalt max value."));
_("Invalid value. Precission value must be lower than the Default Max value."));
}
}
};
@ -92,7 +92,7 @@ public class AdvanceTypeCRUDController extends BaseCRUDController<AdvanceType> {
throws WrongValueException {
if (((BigDecimal) value) == null) {
throw new WrongValueException(comp,
_("Value is not valid, the default max value must not be empty "));
_("Invalid value. Default Max Value cannot be empty"));
}
if (!(advanceTypeModel
.isDefaultMaxValueValid((BigDecimal) value))) {

View file

@ -659,7 +659,7 @@ public class ConfigurationController extends GenericForwardComposer {
private String validPrefix(EntitySequence sequence, String prefixValue) {
sequence.setPrefix(prefixValue);
if (!configurationModel.checkFrefixFormat(sequence)) {
String message = _("format prefix invalid. It cannot be empty or contain '_' or whitespaces.");
String message = _("Invalid format prefix. Format prefix cannot be empty, contain '_' or contain whitespaces.");
if (sequence.getEntityName().canContainLowBar()) {
message = _("format prefix invalid. It cannot be empty or contain whitespaces.");
}

View file

@ -690,4 +690,4 @@ public class CustomMenuController extends Div implements IMenuItemsRegister {
.isScenariosVisible();
}
}
}

View file

@ -76,7 +76,7 @@ public abstract class IntegrationEntityModel implements IIntegrationEntityModel
String code = getEntitySequenceDAO().getNextEntityCode(getEntityName());
if (code == null) {
throw new ConcurrentModificationException(
_("Could not get code, please try again later"));
_("Could not retrieve Code. Please, try again later"));
}
getCurrentEntity().setCode(code);
}
@ -124,4 +124,4 @@ public abstract class IntegrationEntityModel implements IIntegrationEntityModel
return entitySequenceDAO;
}
}
}

View file

@ -47,4 +47,4 @@ public enum OrderFilterEnum implements IFilterEnum {
return this.description;
}
}
}

View file

@ -342,7 +342,7 @@ public class CostCategoryCRUDController extends BaseCRUDController<CostCategory>
private void appendDateboxInitDate(final Row row) {
Datebox initDateBox = new Datebox();
bindDateboxInitDate(initDateBox, (HourCost) row.getValue());
initDateBox.setConstraint("no empty:" + _("The init date cannot be empty"));
initDateBox.setConstraint("no empty:" + _("Init date cannot be empty"));
row.appendChild(initDateBox);
initDateBox.addEventListener("onChange", new EventListener() {

View file

@ -177,7 +177,7 @@ public class ResourcesCostCategoryAssignmentController extends GenericForwardCom
private void appendDateboxInitDate(final Row row) {
Datebox initDateBox = new Datebox();
bindDateboxInitDate(initDateBox, (ResourcesCostCategoryAssignment) row.getValue());
initDateBox.setConstraint("no empty:" + _("The init date cannot be empty"));
initDateBox.setConstraint("no empty:" + _("Init date cannot be empty"));
row.appendChild(initDateBox);
initDateBox.addEventListener("onChange", new EventListener() {

View file

@ -164,7 +164,7 @@ public class DashboardController extends GenericForwardComposer {
relativeMargin.doubleValue() * 100));
} else {
lblAbsolute
.setValue(_("It has not been defined a project deadline"));
.setValue(_("Project Deadline not set"));
}
}

View file

@ -126,7 +126,7 @@ public class UnitTypeController extends BaseCRUDController<UnitType> {
String strValue = (String) value;
if (StringUtils.isBlank(strValue)) {
throw new WrongValueException(comp,
_("Unit type name cannot be empty")
_("Unit Type name cannot be empty")
);
}

View file

@ -248,4 +248,4 @@ public class CriterionRequirementWrapper implements INewObject {
public boolean isOldDirectOrException() {
return (!isNewDirect() && !isNewException());
}
}
}

View file

@ -146,7 +146,7 @@ public class DynamicDatebox extends GenericForwardComposer {
} catch (ParseException e) {
throw new WrongValueException(
dateTextBox,
_("date format is wrong, please use the right format (for example for today the format would be: {0})",
_("Date format is wrong. Please, use the following format: {0}",
asString(new Date())));
}
}

View file

@ -837,7 +837,7 @@ public class OrderCRUDController extends GenericForwardComposer {
}
else {
try {
Messagebox.show(_("You don't have permissions to edit this project"),
Messagebox.show(_("Not enough permissions to edit this project"),
_("Information"), Messagebox.OK, Messagebox.INFORMATION);
} catch (InterruptedException e) {
throw new RuntimeException(e);
@ -869,7 +869,7 @@ public class OrderCRUDController extends GenericForwardComposer {
try {
if (Messagebox
.show(
_("This is a subcontracted project, if you delete it you can not report progress anymore. Are you sure?"),
_("This project is a subcontracted project. If you delete it, you won't be able to report progress anymore. Are you sure?"),
_("Confirm"), Messagebox.OK
| Messagebox.CANCEL,
Messagebox.QUESTION) == Messagebox.CANCEL) {

View file

@ -289,7 +289,7 @@ public class ProjectDetailsController extends GenericForwardComposer {
setCodeAutogenerated(true);
generateCode.setDisabled(true);
generateCode
.setTooltiptext(_("Code has to be autogenerated to create a new project from templates"));
.setTooltiptext(_("Set Code as autogenerated to create a new project from templates"));
generateCode.setChecked(true);
calculateProjectDates(template);
setCalendarFromTemplate(template);
@ -306,4 +306,4 @@ public class ProjectDetailsController extends GenericForwardComposer {
}
}
}
}

View file

@ -261,4 +261,4 @@ class OrderElementOperations extends TreeElementOperationsController<OrderElemen
}
}
}
}

View file

@ -125,7 +125,7 @@ public class StretchesFunctionController extends GenericForwardComposer {
public void cancel() throws InterruptedException {
int status = Messagebox.show(
_("You will lose the changes. Are you sure?"),
_("All changes will be lost. Are you sure?"),
_("Confirm cancel"), Messagebox.YES | Messagebox.NO,
Messagebox.QUESTION);
if (Messagebox.YES == status) {

View file

@ -287,4 +287,4 @@ public abstract class EarnedValueChartFiller extends ChartFiller {
}
}
}
}

View file

@ -512,9 +512,9 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
public String infoMessages() {
if (getAdvances().size() > 0) {
return _("It is not allowed to consolidate progress.");
return _("Progress cannot be consolidated.");
}
return _("There are not any assigned progress to current task");
return _("There is not any assigned progress to current task");
}
public void setConsolidationDTOs(

View file

@ -318,7 +318,7 @@ public class QualityFormCRUDController extends BaseCRUDController<QualityForm> {
.getFellowIfAny("checkBoxReportProgress");
throw new WrongValueException(
checkBoxReportProgress,
_("The quality form must have an item with 100% value to report progress"));
_("Quality form should include an item with a value of 100% in order to report progress"));
}
}

View file

@ -133,7 +133,7 @@ public class CompletedEstimatedHoursPerTaskController extends LibrePlanReportCon
.addSelectedLabel(label);
if (!result) {
throw new WrongValueException(bdLabels,
_("This label has already been added."));
_("Label has already been added."));
} else {
Util.reloadBindings(lbLabels);
}

View file

@ -310,7 +310,7 @@ public class HoursWorkedPerWorkerController extends LibrePlanReportController {
boolean result = hoursWorkedPerWorkerModel.addSelectedLabel(label);
if (!result) {
throw new WrongValueException(bdLabels,
_("This label has already been added."));
_("Label has already been added."));
} else {
Util.reloadBindings(lbLabels);
}

View file

@ -149,4 +149,4 @@ public class HoursWorkedPerWorkerInAMonthController extends LibrePlanReportContr
return months[number - 1];
}
}
}

View file

@ -176,7 +176,7 @@ public class OrderCostsPerResourceController extends LibrePlanReportController {
boolean result = orderCostsPerResourceModel.addSelectedLabel(label);
if (!result) {
throw new WrongValueException(bdLabels,
_("This label has already been added."));
_("Label has already been added."));
} else {
Util.reloadBindings(lbLabels);
}

View file

@ -206,7 +206,7 @@ public class SchedulingProgressPerOrderController extends LibrePlanReportControl
final Date endingDate = (Date) dbEnding.getValue();
if (endingDate != null && startingDate != null && startingDate.compareTo(endingDate) > 0) {
throw new WrongValueException(dbStarting, _("Cannot be higher than Ending date"));
throw new WrongValueException(dbStarting, _("Cannot be higher than Ending Date"));
}
}

View file

@ -171,7 +171,7 @@ public class WorkingArrangementsPerOrderController extends LibrePlanReportContro
.addSelectedLabel(label);
if (!result) {
throw new WrongValueException(bdLabels,
_("This label has already been added."));
_("Label has already been added."));
} else {
Util.reloadBindings(lbLabels);
}

View file

@ -128,7 +128,7 @@ public class WorkingProgressPerTaskController extends LibrePlanReportController
.addSelectedLabel(label);
if (!result) {
throw new WrongValueException(bdLabels,
_("This label has already been added."));
_("Label has already been added."));
} else {
Util.reloadBindings(lbLabels);
}

View file

@ -141,7 +141,7 @@ public class TransferOrdersModel implements ITransferOrdersModel {
if (sourceScenario == null) {
throw new ValidationException(
_("You should select a source scenario"));
_("Please select a source scenario"));
}
if (destinationScenario == null) {
throw new ValidationException(

View file

@ -48,4 +48,4 @@ public enum FilterCommunicationEnum {
public String toString() {
return displayName;
}
}
}

View file

@ -398,4 +398,4 @@ public class SubcontractedTasksModel implements ISubcontractedTasksModel {
return xml.toString();
}
}
}

View file

@ -308,7 +308,7 @@ public class OrderTemplatesModel implements IOrderTemplatesModel {
public void validateTemplateName(String name)
throws IllegalArgumentException {
if ((name == null) || (name.isEmpty())) {
throw new IllegalArgumentException(_("the name cannot be empty"));
throw new IllegalArgumentException(_("name cannot be empty"));
}
getTemplate().setName(name);

View file

@ -1076,7 +1076,7 @@ public abstract class TreeController<T extends ITreeNode<T>> extends
if (!getHoursGroupHandler().isTotalHoursValid(line, ((Integer) value))) {
throw new WrongValueException(
comp,
_("Value is not valid, taking into account the current list of HoursGroup"));
_("Value is not valid in current list of Hours Group"));
}
}

View file

@ -253,7 +253,7 @@ public class UserCRUDController extends BaseCRUDController<User> implements
userModel.initCreate();
//password is compulsory when creating
passwordBox.setConstraint("no empty:" +
_("The password for a new user cannot be empty"));
_("Password cannot be empty"));
//clean the password boxes, they are not cleared automatically
//because they are not directly associated to an attribute
passwordBox.setRawValue("");

View file

@ -394,7 +394,7 @@ public class WorkReportTypeModel extends IntegrationEntityModel implements
throws IllegalArgumentException {
if ((name == null) || (name.isEmpty())) {
throw new IllegalArgumentException(
_("the name cannot be empty"));
_("name cannot be empty"));
}
getWorkReportType().setName(name);

View file

@ -20,7 +20,7 @@
-->
<window visible="@{calendarController.editionController.creatingNewVersion}"
id="createNewVersion" title="${i18n:_('Create new work week')}" width="450px"
id="createNewVersion" title="${i18n:_('Create new Workweek')}" width="450px"
closable="true" border="normal"
onClose = "calendarController.editionController.cancelNewVersion();">
@ -60,4 +60,4 @@
sclass="cancel-button global-action"/>
</hbox>
</window>
</window>

View file

@ -234,7 +234,7 @@
<button
onClick="calendarController.editionController.createNewVersion();"
label="${i18n:_('Create new work week')}"
label="${i18n:_('Create new Workweek')}"
visible="@{calendarController.editionController.isEditing}"
style="margin-left: 5px;" />

View file

@ -40,7 +40,7 @@
<label value="${i18n:_('Please try to contact with any administrator in order to review your permissions in LibrePlan.')}" />
<hbox>
<label value="${i18n:_('If you want to go to the initial page you can use the following link: ')}" />
<label value="${i18n:_('Click the following link to return to home page: ')}" />
<n:a href="${contextPath}/">
<label value="${i18n:_('Go to init')}" />
</n:a>

View file

@ -117,7 +117,7 @@
checked="@{configurationController.checkNewVersionEnabled}" />
<checkbox
label="${i18n:_('Help the project developers to collect information about which LibrePlan version you are using')}"
tooltiptext="${i18n:_('Check this option to send this information to LibrePlan developers in order to generate usage statistics')}"
tooltiptext="${i18n:_('Check this option if you would like to send feedback to LibrePlan developers about program usage')}"
checked="@{configurationController.allowToGatherUsageStatsEnabled}" />
</vbox>
</row>

View file

@ -30,7 +30,7 @@
<columns>
<newdatasortablecolumn label="${i18n:_('Name')}" sort="auto(lower(name))" sortDirection="ascending" />
<newdatasortablecolumn label="${i18n:_('Color')}"/>
<newdatasortablecolumn label="${i18n:_('Over assignable')}" />
<newdatasortablecolumn label="${i18n:_('Overallocated')}" />
<newdatasortablecolumn label="${i18n:_('Standard Effort')}" />
<newdatasortablecolumn label="${i18n:_('Overtime Effort')}" />
<newdatasortablecolumn label="${i18n:_('Operations')}" />

View file

@ -87,7 +87,7 @@
value="@{controller.company.ourCompanyLogin}" />
</row>
<row>
<label value="${i18n:_('Our company password')}:" />
<label value="${i18n:_('Company password')}:" />
<textbox id="ourCompanyPassword"
value="@{controller.company.ourCompanyPassword}" />
</row>

View file

@ -44,4 +44,4 @@
<button label="${i18n:_('New expense sheet')}"
onClick="controller.newExpenseSheet();" />
</groupbox>
</groupbox>

View file

@ -132,4 +132,4 @@
</window>
</zk>
</zk>

View file

@ -25,7 +25,7 @@
<columns width="100%">
<newdatasortablecolumn label="${i18n:_('Code')}" />
<newdatasortablecolumn label="${i18n:_('Name')}" hflex="1" />
<newdatasortablecolumn label="${i18n:_('Receipt date')}" />
<newdatasortablecolumn label="${i18n:_('Reception date')}" />
<newdatasortablecolumn label="${i18n:_('Units')}" />
<newdatasortablecolumn label="${i18n:_('Unit type')}" align="center" />
<newdatasortablecolumn label="${i18n:_('Unit price')}" />

View file

@ -240,7 +240,7 @@
<separator spacing="20px"/>
<groupbox style="margin-top: 5px" sclass="assignedresources" closable="false"
visible="@{controller.subcontractedProject}" hflex="1">
<caption label="${i18n:_('Delivery dates requested by the customer. ')}" />
<caption label="${i18n:_('Delivery dates requested by customer. ')}" />
<grid id="gridDeliveryDates"
model="@{controller.deliverDates}"
mold="paging" pageSize="4" fixedLayout="true" width="400px"

View file

@ -100,4 +100,4 @@
</panel>
</vbox>
</vbox>
</zk>
</zk>

View file

@ -137,4 +137,4 @@
</tabbox>
</vbox>
</zk>
</zk>

View file

@ -113,7 +113,7 @@
</groupbox>
<groupbox style="margin-top: 5px" sclass="assignedresources" closable="false">
<caption label="${i18n:_('Ended date communicated by the subcontractor.')}" />
<caption label="${i18n:_('End date communicated by the subcontractor.')}" />
<separator spacing="10px"/>

View file

@ -69,4 +69,4 @@
</panel>
</vbox>
</vbox>
</zk>
</zk>

View file

@ -54,4 +54,4 @@
</row>
</rows>
</grid>
</window>
</window>

View file

@ -66,4 +66,4 @@
</rows>
</newdatasortablegrid>
</panelchildren>
</panel>
</panel>