And again (again, again, again) all depend on context. Here it's quite obvious
that there are no labels changes, only tabs replaced by spaces.
I though agree that it should have been another commit, just that I missed that
because I automate (too?) much things.
I'll not apologize :p
Le 03/02/2022 à 09:27, Michael Brohl a écrit :
I did not confirm that.
My response was targeted to the wrong assumptions that the changes were only removes/same additions and the result of an unclean state of the
working copy.
It is generally better to separate formatting / cleanup from real changes, which I did not mention here. For pull requests and patches, separation
helps the reviewer to see through and makes it possible to only merge commits which contain wanted changes.
Not sure if this warrants a mail to dev, at least you were the one lately who
complained to not play the blame game [1].
Michael
[1] https://lists.apache.org/thread/93ptk5nfrf2pjfwnl6ovm0lc6l42yb85
Am 03.02.22 um 08:18 schrieb Pierre Smits:
Good to see that the two of you confirm that cleanup can be combined with
other improvements .
Op do 3 feb. 2022 07:15 schreef Jacques Le Roux <
[email protected]>:
Yep, thanks Michael,
Jacques
Le 02/02/2022 à 23:33, Michael Brohl a écrit :
If I see it right, he has corrected wrong indentations. Nothing wrong
with that...
Michael
Am 02.02.22 um 18:00 schrieb Pierre Smits:
Hi Jacques,
With this commit 8a9596be849f6709cb17c24a598c4862e8df867c you deleted
and
reinserted a lot of german translations (without any changes in the
translation at first glance).
Were these necessary, or an unfortunate combination of circumstances
leading to you not working with a clean dev branch? It is a pity this
happened. Luckily, the impact is trivial. But people tend to get
confused
by this, and it could lead to complaints or heated arguments.
Can you be a bit more careful next time around?
Atentamente
Met vriendelijke groet,
Pierre Smits
*Proud* *contributor** of* Apache OFBiz <https://ofbiz.apache.org/>
since
2008 (without privileges)
Proud contributor to the ASF since 2006
*Apache Directory <https://directory.apache.org>, PMC Member*
Anyone could have been you, whereas I've always been anyone.
On Sun, Jan 16, 2022 at 8:52 AM <[email protected]> wrote:
This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 8a9596b Improved: no functional change, labels improvements
8a9596b is described below
commit 8a9596be849f6709cb17c24a598c4862e8df867c
Author: Jacques Le Roux <[email protected]>
AuthorDate: Sun Jan 16 08:51:03 2022 +0100
Improved: no functional change, labels improvements
In French, and maybe other languages, there is not only one word
for
new.
There are nouveau (masculine), nouvelle (féminine) and nouvel
(masculine followed
by a word starting with a vowel)
Here are few related changes with existing AccountingUiLabels,
HumanResUiLabel
changes and a new CommonUiLabels French labels improvements and
use of
HumanResNew* labels in MainActionMenu of HumanresMenus.xml
Also alongside replaces tabs by spaces in HumanResUiLabel
---
.../accounting/config/AccountingUiLabels.xml | 2 +-
applications/humanres/config/HumanResUiLabels.xml | 104
++++++++++-----------
applications/humanres/widget/HumanresMenus.xml | 10 +-
framework/common/config/CommonUiLabels.xml | 1 +
4 files changed, 59 insertions(+), 58 deletions(-)
diff --git a/applications/accounting/config/AccountingUiLabels.xml
b/applications/accounting/config/AccountingUiLabels.xml
index 7c34628..b87f294 100644
--- a/applications/accounting/config/AccountingUiLabels.xml
+++ b/applications/accounting/config/AccountingUiLabels.xml
@@ -22296,7 +22296,7 @@
<value xml:lang="de">Hauptbuch Transaktion</value>
<value xml:lang="en">a Gl Transaction</value>
<value xml:lang="es">uno Transaccione GL</value>
- <value xml:lang="fr">une opération comptable</value>
+ <value xml:lang="fr">une transaction comptable</value>
<value xml:lang="ja">GLトランザクション</value>
<value xml:lang="pt">Transaçõe contábei</value>
</property>
diff --git a/applications/humanres/config/HumanResUiLabels.xml
b/applications/humanres/config/HumanResUiLabels.xml
index 92d73e9..b77036a 100644
--- a/applications/humanres/config/HumanResUiLabels.xml
+++ b/applications/humanres/config/HumanResUiLabels.xml
@@ -856,7 +856,7 @@
<value xml:lang="zh-TW">技能等級</value>
</property>
<property key="FormFieldTitle_skillTypeId">
- <value xml:lang="de">Fähigkeit Typ ID</value>
+ <value xml:lang="de">Fähigkeit Typ ID</value>
<value xml:lang="en">Skill Type ID</value>
<value xml:lang="es">Id tipo de habilidad</value>
<value xml:lang="fr">Compétence</value>
@@ -882,7 +882,7 @@
<value xml:lang="zh-TW">技能掌握日期</value>
</property>
<property key="FormFieldTitle_temporaryFlag">
- <value xml:lang="de">temporäres Kennzeichen</value>
+ <value xml:lang="de">temporäres Kennzeichen</value>
<value xml:lang="en">Temporary Flag</value>
<value xml:lang="es">Indicador Principal</value>
<value xml:lang="fr">Balise temporaire</value>
@@ -895,7 +895,7 @@
<value xml:lang="zh-TW">是否為臨時</value>
</property>
<property key="FormFieldTitle_terminationReasonId">
- <value xml:lang="de">Nummer des Kündigungsgrundes</value>
+ <value xml:lang="de">Nummer des Kündigungsgrundes</value>
<value xml:lang="en">Termination Reason ID</value>
<value xml:lang="es">Id de razón de finiquito</value>
<value xml:lang="fr">Motif de la fin de contrat</value>
@@ -908,7 +908,7 @@
<value xml:lang="zh-TW">雇佣終止原因識別</value>
</property>
<property key="FormFieldTitle_terminationTypeId">
- <value xml:lang="de">Kündigungsart ID</value>
+ <value xml:lang="de">Kündigungsart ID</value>
<value xml:lang="en">Termination Type ID</value>
<value xml:lang="es">Id tipo de finiquito</value>
<value xml:lang="fr">Type de fin de contrat</value>
@@ -921,7 +921,7 @@
<value xml:lang="zh-TW">雇佣終止類型識別</value>
</property>
<property key="FormFieldTitle_title">
- <value xml:lang="de">Titel</value>
+ <value xml:lang="de">Titel</value>
<value xml:lang="en">Title</value>
<value xml:lang="es">Título</value>
<value xml:lang="fr">Titre</value>
@@ -931,7 +931,7 @@
<value xml:lang="zh-TW">標題</value>
</property>
<property key="FormFieldTitle_trainingClassTypeId">
- <value xml:lang="de">Nummer der Schulungsklasse</value>
+ <value xml:lang="de">Nummer der Schulungsklasse</value>
<value xml:lang="en">Training Class Type ID</value>
<value xml:lang="es">ID de tipo de clase de
capacitación</value>
<value xml:lang="fr">Type de formation</value>
@@ -943,7 +943,7 @@
<value xml:lang="zh-TW">教育訓練課程類型識別</value>
</property>
<property key="FormFieldTitle_trainingRequestId">
- <value xml:lang="de">Anfragenummer der Schulung</value>
+ <value xml:lang="de">Anfragenummer der Schulung</value>
<value xml:lang="en">Training Request ID</value>
<value xml:lang="es">ID de solicitud de capacitación</value>
<value xml:lang="fr">Approbation</value>
@@ -953,7 +953,7 @@
<value xml:lang="zh-TW">教育訓練請求標識</value>
</property>
<property key="FormFieldTitle_unemploymentClaimDate">
- <value xml:lang="de">Datum des Arbeitslosenanspruches</value>
+ <value xml:lang="de">Datum des Arbeitslosenanspruches</value>
<value xml:lang="en">Unemployment Claim Date</value>
<value xml:lang="es">Fecha de reclamación por
desempleo</value>
<value xml:lang="fr">Date de demande du chômage</value>
@@ -966,7 +966,7 @@
<value xml:lang="zh-TW">解除雇佣聲明日期</value>
</property>
<property key="FormFieldTitle_unemploymentClaimId">
- <value xml:lang="de">Nummer Arbeitslosenanspruch</value>
+ <value xml:lang="de">Nummer Arbeitslosenanspruch</value>
<value xml:lang="en">Unemployment Claim ID</value>
<value xml:lang="es">ID de reclamo de desempleo</value>
<value xml:lang="fr">Date de demande du chômage</value>
@@ -979,7 +979,7 @@
<value xml:lang="zh-TW">解除雇佣聲明識別</value>
</property>
<property key="FormFieldTitle_verifStatusId">
- <value xml:lang="de">Nummer des Überprüfungsstatus</value>
+ <value xml:lang="de">Nummer des Überprüfungsstatus</value>
<value xml:lang="en">Verif Status ID</value>
<value xml:lang="es">Id estado de verificación</value>
<value xml:lang="fr">Verifié</value>
@@ -1004,7 +1004,7 @@
<value xml:lang="zh-TW">工作經驗(年)</value>
</property>
<property key="HumanHolidayName">
- <value xml:lang="de">Name des Feiertages</value>
+ <value xml:lang="de">Name des Feiertages</value>
<value xml:lang="en">Holiday Name</value>
<value xml:lang="es">Nombre del día de festivo</value>
<value xml:lang="ja">休日名</value>
@@ -1013,7 +1013,7 @@
<value xml:lang="zh-TW">假日名稱</value>
</property>
<property key="HumanResAddEmplLeave">
- <value xml:lang="de">einfügen Urlaubsantrag</value>
+ <value xml:lang="de">einfügen Urlaubsantrag</value>
<value xml:lang="en">Add Employee Leave</value>
<value xml:lang="es">Agregar permiso de Empleado</value>
<value xml:lang="fr">Ajouter le congé</value>
@@ -1025,7 +1025,7 @@
<value xml:lang="zh-TW">新建員工請假</value>
</property>
<property key="HumanResAddEmplLeaveReasonType">
- <value xml:lang="de">einfügen Urlaubsgrund Typ</value>
+ <value xml:lang="de">einfügen Urlaubsgrund Typ</value>
<value xml:lang="en">Add Employee Leave Reason</value>
<value xml:lang="es">Añadir rason de permiso</value>
<value xml:lang="fr">Ajouter un type de congé</value>
@@ -1036,7 +1036,7 @@
<value xml:lang="zh-TW">增加員工離職原因</value>
</property>
<property key="HumanResAddEmplLeaveType">
- <value xml:lang="de">einfügen Urlaub Typ</value>
+ <value xml:lang="de">einfügen Urlaub Typ</value>
<value xml:lang="en">Add EmplLeave Types</value>
<value xml:lang="es">Agregar Tipo de permiso</value>
<value xml:lang="fr">Ajouter un type de congé</value>
@@ -1048,7 +1048,7 @@
<value xml:lang="zh-TW">新建員工請假類型</value>
</property>
<property key="HumanResAddEmplPositionFulfillment">
- <value xml:lang="de">einfügen Erfüllung der
Arbeitsposition</value>
+ <value xml:lang="de">einfügen Erfüllung der
Arbeitsposition</value>
<value xml:lang="en">Add Position Fulfillment</value>
<value xml:lang="es">Añadir cumplimiento de cargo</value>
<value xml:lang="fr">Ajouter l'acquisition de
position</value>
@@ -1060,7 +1060,7 @@
<value xml:lang="zh-TW">新建屬於該職位員工</value>
</property>
<property key="HumanResAddEmplPositionResponsibility">
- <value xml:lang="de">einfügen einer Verantwortung durch eine
Arbeitsposition</value>
+ <value xml:lang="de">einfügen einer Verantwortung durch eine
Arbeitsposition</value>
<value xml:lang="en">Add Position Responsibility</value>
<value xml:lang="es">Añadir Cargo Responsabilidad</value>
<value xml:lang="fr">Ajouter la responsabilité de la
position</value>
@@ -1072,7 +1072,7 @@
<value xml:lang="zh-TW">新建職位職責</value>
</property>
<property key="HumanResAddJobInterviewType">
- <value xml:lang="de">einfügen Bewerbungsgespäch</value>
+ <value xml:lang="de">einfügen Bewerbungsgespäch</value>
<value xml:lang="en">Add Job Interview Type</value>
<value xml:lang="es">Añadir tipo de entrevista de
trabajo</value>
<value xml:lang="fr">Ajouter un type d'entretien</value>
@@ -1083,7 +1083,7 @@
<value xml:lang="zh-TW">增加工作面試類型</value>
</property>
<property key="HumanResAddPartyBenefit">
- <value xml:lang="de">einfügen Akteur Vorteil</value>
+ <value xml:lang="de">einfügen Akteur Vorteil</value>
<value xml:lang="en">Add Party Benefit</value>
<value xml:lang="es">Agregar beneficios de
Participante</value>
<value xml:lang="fr">Ajouter l'avantage</value>
@@ -1095,7 +1095,7 @@
<value xml:lang="zh-TW">新建團體福利</value>
</property>
<property key="HumanResAddPartyQual">
- <value xml:lang="de">einfügen Akteurqualifikation</value>
+ <value xml:lang="de">einfügen Akteurqualifikation</value>
<value xml:lang="en">Add Party Qualification</value>
<value xml:lang="es">Agregar calificación de
participante</value>
<value xml:lang="fr">Ajouter la qualification</value>
@@ -1107,7 +1107,7 @@
<value xml:lang="zh-TW">增加團體資格</value>
</property>
<property key="HumanResAddPartySkill">
- <value xml:lang="de">einfügen Akteurfähigkeit</value>
+ <value xml:lang="de">einfügen Akteurfähigkeit</value>
<value xml:lang="en">Add Party Skill</value>
<value xml:lang="es">Añadir habilidad del
participante</value>
<value xml:lang="fr">Ajoutez la compétence</value>
@@ -1119,7 +1119,7 @@
<value xml:lang="zh-TW">增加團體技能</value>
</property>
<property key="HumanResAddPayrollPreference">
- <value xml:lang="de">einfügen einer
Abrechnungspräferenz</value>
+ <value xml:lang="de">einfügen einer
Abrechnungspräferenz</value>
<value xml:lang="en">Add Payroll Preference</value>
<value xml:lang="es">Agregar preferencia de nómina</value>
<value xml:lang="fr">Ajouter la préférence de registre du
personnel</value>
@@ -1131,7 +1131,7 @@
<value xml:lang="zh-TW">新建薪水支付方式</value>
</property>
<property key="HumanResAddPerfNote">
- <value xml:lang="de">einfügen Leistungsnotiz</value>
+ <value xml:lang="de">einfügen Leistungsnotiz</value>
<value xml:lang="en">Add Performance Note</value>
<value xml:lang="es">Añadir nota de rendimiento</value>
<value xml:lang="fr">Ajouter la note de performance</value>
@@ -1143,7 +1143,7 @@
<value xml:lang="zh-TW">新建績效注釋</value>
</property>
<property key="HumanResAddPerfReviewItems">
- <value xml:lang="de">einfügen einer Leistungsbewertung</value>
+ <value xml:lang="de">einfügen einer Leistungsbewertung</value>
<value xml:lang="en">Add PerfReview Items</value>
<value xml:lang="es">Agregar artículos de PerfReview</value>
<value xml:lang="fr">Ajouter des lignes d'évaluation de
performance</value>
@@ -1155,7 +1155,7 @@
<value xml:lang="zh-TW">新建績效評定細項</value>
</property>
<property key="HumanResAddReportedToEmplPositionReportingStruct">
- <value xml:lang="de">einfügen einer
Arbeitspositionsreportstruktur
[erstattet Bericht an ${parameters.emplPositionId}]</value>
+ <value xml:lang="de">einfügen einer
Arbeitspositionsreportstruktur [erstattet Bericht an
${parameters.emplPositionId}]</value>
<value xml:lang="en">Add Empl Position Reporting Struct
[Reported
To ${parameters.emplPositionId}]</value>
<value xml:lang="es">Añadir estructura de informes de cargo
de
empleado [Reportar a ${parameters.emplPositionId}]</value>
<value xml:lang="fr">Ajouter le compte-rendu de position [en
rapport avec ${parameters.emplPositionId}</value>
@@ -1167,7 +1167,7 @@
<value xml:lang="zh-TW">新建員工職位級別結構 [上級為
${parameters.emplPositionId}]</value>
</property>
<property key="HumanResAddReportsToEmplPositionReportingStruct">
- <value xml:lang="de">einfügen einer
Arbeitspositionsreportstruktur
[${parameters.emplPositionId} erstattet Bericht an]</value>
+ <value xml:lang="de">einfügen einer
Arbeitspositionsreportstruktur [${parameters.emplPositionId} erstattet
Bericht an]</value>
<value xml:lang="en">Add Empl Position Reporting Struct
[${parameters.emplPositionId} Reports To]</value>
<value xml:lang="es">Añadir estructura de informes de cargo
de
empleado [${parameters.emplPositionId} Reportes a]</value>
<value xml:lang="fr">Ajouter le compte-rendu de position
[${parameters.emplPositionId} qui se rapporte à]</value>
@@ -1690,7 +1690,7 @@
<value xml:lang="de">Stellenkürzel</value>
<value xml:lang="en">EmployeePosition ID</value>
<value xml:lang="es">Identificador del cargo del
empleado</value>
- <value xml:lang="fr">Position d'employé</value>
+ <value xml:lang="fr">Poste</value>
<value xml:lang="it">Codice Posizione Impiegato</value>
<value xml:lang="ja">従業員職位ID</value>
<value xml:lang="pt-BR">Id da posição do empregado</value>
@@ -1703,7 +1703,7 @@
<value xml:lang="de">Stellen Typ ID</value>
<value xml:lang="en">EmployeePosition Type ID</value>
<value xml:lang="es">Identificador del cargo del
empleado</value>
- <value xml:lang="fr">Type de position d'employé</value>
+ <value xml:lang="fr">Type de poste</value>
<value xml:lang="it">Codice Tipo Posizione Impiegato</value>
<value xml:lang="ja">従業員職位種類ID</value>
<value xml:lang="pt-BR">Id de tipo de posição do
empregado</value>
@@ -2136,7 +2136,7 @@
<value xml:lang="zh-TW">離職請求新建成功</value>
</property>
<property key="HumanResLeaveStatus">
- <value xml:lang="de">Urlaubsstatus</value>
+ <value xml:lang="de">Urlaubsstatus</value>
<value xml:lang="en">Leave</value>
<value xml:lang="es">Evento</value>
<value xml:lang="ja">休職</value>
@@ -2146,7 +2146,7 @@
<value xml:lang="zh-TW">離職</value>
</property>
<property key="HumanResListEmployments">
- <value xml:lang="de">Liste der Anstellungen</value>
+ <value xml:lang="de">Liste der Anstellungen</value>
<value xml:lang="en">List Employment</value>
<value xml:lang="es">Lista de empleados</value>
<value xml:lang="fr">Liste d'emplois</value>
@@ -2159,7 +2159,7 @@
<value xml:lang="zh-TW">雇佣列表</value>
</property>
<property key="HumanResListPartyBenefits">
- <value xml:lang="de">Liste Akteurvorteile</value>
+ <value xml:lang="de">Liste Akteurvorteile</value>
<value xml:lang="en">List Party Benefits</value>
<value xml:lang="es">List de Beneficios de
Participante</value>
<value xml:lang="fr">Liste d'avantages de l'acteur</value>
@@ -2172,7 +2172,7 @@
<value xml:lang="zh-TW">團體福利清單</value>
</property>
<property key="HumanResListPayHistories">
- <value xml:lang="de">Liste der Zahlhistorie</value>
+ <value xml:lang="de">Liste der Zahlhistorie</value>
<value xml:lang="en">List Pay Histories</value>
<value xml:lang="es">Lista de historial de pago</value>
<value xml:lang="fr">Liste d'historique de salaires</value>
@@ -2185,7 +2185,7 @@
<value xml:lang="zh-TW">薪水歷史清單</value>
</property>
<property key="HumanResListPayrollPreferences">
- <value xml:lang="de">Liste der Lohnzahlungspräferenzen</value>
+ <value xml:lang="de">Liste der Lohnzahlungspräferenzen</value>
<value xml:lang="en">List Payroll Preferences</value>
<value xml:lang="es">Lista de preferencias de nómina</value>
<value xml:lang="fr">Liste des préférences de registre du
personnel</value>
@@ -2198,7 +2198,7 @@
<value xml:lang="zh-TW">薪水支付方式清單</value>
</property>
<property key="HumanResListSkillTypes">
- <value xml:lang="de">Liste der Fähigkeiten</value>
+ <value xml:lang="de">Liste der Fähigkeiten</value>
<value xml:lang="en">List Skill Types</value>
<value xml:lang="es">Lista de tipos de habilidades</value>
<value xml:lang="fr">Liste de types de compétence</value>
@@ -2211,7 +2211,7 @@
<value xml:lang="zh-TW">技能類型清單</value>
</property>
<property key="HumanResListValidResponsibility">
- <value xml:lang="de">Liste der gültigen Zuständigkeiten</value>
+ <value xml:lang="de">Liste der gültigen
Zuständigkeiten</value>
<value xml:lang="en">List Valid Responsibility</value>
<value xml:lang="es">Lista de validadeción de
responsabilidades</value>
<value xml:lang="fr">Liste de responsabilité valide</value>
@@ -2224,7 +2224,7 @@
<value xml:lang="zh-TW">有效責任清單</value>
</property>
<property key="HumanResLookupAgreement">
- <value xml:lang="de">ersuchte Vereinbarung</value>
+ <value xml:lang="de">ersuchte Vereinbarung</value>
<value xml:lang="en">Lookup Agreement</value>
<value xml:lang="es">Búsqueda de contrato</value>
<value xml:lang="fr">Consultation d'accord</value>
@@ -2236,7 +2236,7 @@
<value xml:lang="zh-TW">查詢合約</value>
</property>
<property key="HumanResLookupAgreementEmploymentAppl">
- <value xml:lang="de">Beratung bzgl des Arbeitsvertrages</value>
+ <value xml:lang="de">Beratung bzgl des
Arbeitsvertrages</value>
<value xml:lang="en">Lookup AgreementEmploymentAppl</value>
<value xml:lang="es">Busqueda AgreementEmploymentAppl</value>
<value xml:lang="fr">Consultation d'accord sur demande
d'emploi</value>
@@ -2248,7 +2248,7 @@
<value xml:lang="zh-TW">查詢雇佣合約</value>
</property>
<property key="HumanResLookupAgreementId">
- <value xml:lang="de">Beratungsnummer des Vertrages</value>
+ <value xml:lang="de">Beratungsnummer des Vertrages</value>
<value xml:lang="en">Lookup AgreementId</value>
<value xml:lang="es">Id Contrato de busqueda</value>
<value xml:lang="fr">Consultation d'accord</value>
@@ -2260,7 +2260,7 @@
<value xml:lang="zh-TW">查詢合約識別</value>
</property>
<property key="HumanResLookupAgreementItemSeqId">
- <value xml:lang="de">Beratungsindex des Vertrages</value>
+ <value xml:lang="de">Beratungsindex des Vertrages</value>
<value xml:lang="en">Lookup AgreementItemSeqId</value>
<value xml:lang="es">Ver AgreementItemSeqId</value>
<value xml:lang="fr">Consultation de ligne séq.
d'accord</value>
@@ -2272,7 +2272,7 @@
<value xml:lang="zh-TW">查詢合約細項序號</value>
</property>
<property key="HumanResLookupApplicationId">
- <value xml:lang="de">Einsicht der Bewerbungnummer</value>
+ <value xml:lang="de">Einsicht der Bewerbungnummer</value>
<value xml:lang="en">Lookup ApplicationId</value>
<value xml:lang="es">Ver solicitud Id</value>
<value xml:lang="es-CL">ver solicitud Id</value>
@@ -2285,7 +2285,7 @@
<value xml:lang="zh-TW">查詢應聘求職識別</value>
</property>
<property key="HumanResLookupBudgetByName">
- <value xml:lang="de">Einsicht Budget nach Name </value>
+ <value xml:lang="de">Einsicht Budget nach Name </value>
<value xml:lang="en">Lookup Budget by Name</value>
<value xml:lang="es">Ver presupuesto por nombre</value>
<value xml:lang="fr">Consultation de budget par nom</value>
@@ -2298,7 +2298,7 @@
<value xml:lang="zh-TW">按名稱查詢預算</value>
</property>
<property key="HumanResLookupBudgetItemByName">
- <value xml:lang="de">Einsicht Budgetobjekt nach Name</value>
+ <value xml:lang="de">Einsicht Budgetobjekt nach Name</value>
<value xml:lang="en">Lookup Budget Item by Name</value>
<value xml:lang="es">Ver un Item presupuesto por
nombre</value>
<value xml:lang="es-CL">ver un Item presupuesto por
nombre</value>
@@ -2312,7 +2312,7 @@
<value xml:lang="zh-TW">按名稱查詢預算細項</value>
</property>
<property key="HumanResLookupEmploymentApp">
- <value xml:lang="de"></value>
+ <value xml:lang="de"></value>
<value xml:lang="en">Lookup EmploymentApp</value>
<value xml:lang="es">Busqueda EmploymentApp</value>
<value xml:lang="fr">Consultation des demandes
d'emploi</value>
@@ -2510,7 +2510,7 @@
<value xml:lang="zh-TW">人力資源管理系統</value>
</property>
<property key="HumanResMyLeaves">
- <value xml:lang="de">Mein Urlaub</value>
+ <value xml:lang="de">Mein Urlaub</value>
<value xml:lang="en">My Leaves</value>
<value xml:lang="es">Mis salidas</value>
<value xml:lang="fr">Mes congés</value>
@@ -2571,7 +2571,7 @@
<value xml:lang="de">Stelle anlegen</value>
<value xml:lang="en">New Employee Position</value>
<value xml:lang="es">Nuevo cargo de empleado</value>
- <value xml:lang="fr">Nouvelle position d'employé</value>
+ <value xml:lang="fr">Nouveau poste</value>
<value xml:lang="it">Nuova Posizione Impiegato</value>
<value xml:lang="ja">新規従業員職位</value>
<value xml:lang="pt-BR">Nova posição de empregado</value>
@@ -2584,7 +2584,7 @@
<value xml:lang="de">Neue Stellenvorraussetzung</value>
<value xml:lang="en">New Employee Position
Fulfillment</value>
<value xml:lang="es">Nuevo cumplimiento de cargo</value>
- <value xml:lang="fr">Nouveau pourvoiement de position
d'employé</value>
+ <value xml:lang="fr">Nouvelle offre d'emploi</value>
<value xml:lang="it">Nuova Posizione Impiegato
Adempimento</value>
<value xml:lang="ja">新規従業員職位遂行</value>
<value xml:lang="pt-BR">Novo Preenchimento de posição de
empregado</value>
@@ -2665,7 +2665,7 @@
<value xml:lang="zh-TW">新建工作單</value>
</property>
<property key="HumanResNewLeave">
- <value xml:lang="de">Neu Urlaub</value>
+ <value xml:lang="de">Neu Urlaub</value>
<value xml:lang="en">New Leave</value>
<value xml:lang="es">Nuevo Evento</value>
<value xml:lang="fr">Nouveau congé</value>
@@ -3097,7 +3097,7 @@
<value xml:lang="de">Stellenkriterien</value>
<value xml:lang="en">Fulfillments</value>
<value xml:lang="es">Cumplimientos</value>
- <value xml:lang="fr">"Pourvoiements"</value>
+ <value xml:lang="fr">Offres de postes</value>
<value xml:lang="it">Adempimento</value>
<value xml:lang="ja">遂行</value>
<value xml:lang="pt-BR">Execuções</value>
@@ -3128,7 +3128,7 @@
<value xml:lang="zh-TW">招聘</value>
</property>
<property key="HumanResRelocation">
- <value xml:lang="de">Standortwechsel</value>
+ <value xml:lang="de">Standortwechsel</value>
<value xml:lang="en">Relocation</value>
<value xml:lang="es">Reubicación</value>
<value xml:lang="ja">配置転換</value>
@@ -3459,7 +3459,7 @@
<value xml:lang="zh-TW">編輯面試</value>
</property>
<property key="PageTitleEditJobInterviewType">
- <value xml:lang="de">Bearbeitung Typ des
Bewerbungsgespräches</value>
+ <value xml:lang="de">Bearbeitung Typ des
Bewerbungsgespräches</value>
<value xml:lang="en">Edit Job Interview Type</value>
<value xml:lang="es">Editar tipo de entrevista de
trabajo</value>
<value xml:lang="fr">Modifier les types d'entretiens</value>
@@ -3566,7 +3566,7 @@
<value xml:lang="zh-TW">尋找核准</value>
</property>
<property key="PageTitleFindInternalJobPosting">
- <value xml:lang="de">Suchmaske interne
Stellenausschreibung</value>
+ <value xml:lang="de">Suchmaske interne
Stellenausschreibung</value>
<value xml:lang="en">Find Internal Job Posting</value>
<value xml:lang="es">Buscar publicaciones internas de
trabajo</value>
<value xml:lang="fr">Rechercher des offres d'emploi
internes</value>
@@ -3599,7 +3599,7 @@
<value xml:lang="zh-TW">尋找工作單</value>
</property>
<property key="PageTitleFindRelocationDetails">
- <value xml:lang="de">Suchmaske Standortwechsel</value>
+ <value xml:lang="de">Suchmaske Standortwechsel</value>
<value xml:lang="en">Find Relocation Details</value>
<value xml:lang="es">Buscar detalles de reubicaión</value>
<value xml:lang="ja">配置転換詳細を検索</value>
@@ -3669,7 +3669,7 @@
<value xml:lang="de">Übersicht
Stellenvorraussetzungen</value>
<value xml:lang="en">List EmplPosition Fulfillments</value>
<value xml:lang="es">Lista de cumplimientos de cargo</value>
- <value xml:lang="fr">Liste des "pourvoiements" de
position</value>
+ <value xml:lang="fr">Liste des offres de postes</value>
<value xml:lang="it">Lista Posizione Impiegato
Adempimenti</value>
<value xml:lang="ja">従業員職位遂行一覧</value>
<value xml:lang="pt-BR">Listar preenchimento de posições de
empregado</value>
diff --git a/applications/humanres/widget/HumanresMenus.xml
b/applications/humanres/widget/HumanresMenus.xml
index 8d35dde..8cd5959 100644
--- a/applications/humanres/widget/HumanresMenus.xml
+++ b/applications/humanres/widget/HumanresMenus.xml
@@ -35,7 +35,7 @@
<menu-item name="GlobalHRSettings"
title="${uiLabelMap.HumanResGlobalHRSettings}"
selected-style="selected"><link target="globalHRSettings"/></menu-item>
</menu>
<menu name="MainActionMenu" menu-container-style="button-bar
button-style-2" default-selected-style="selected">
- <menu-item name="NewEmployee" title="${uiLabelMap.CommonNew}
${uiLabelMap.Employee}">
+ <menu-item name="NewEmployee"
title="${uiLabelMap.HumanResNewEmployee}">
<condition>
<or>
<if-has-permission permission="HUMANRES"
action="_CREATE"/>
@@ -43,7 +43,7 @@
</condition>
<link target="NewEmployee"/>
</menu-item>
- <menu-item name="NewPosition" title="${uiLabelMap.CommonNew}
${uiLabelMap.Position}">
+ <menu-item name="NewPosition"
title="${uiLabelMap.HumanResNewEmplPosition}">
<condition>
<or>
<if-has-permission permission="HUMANRES"
action="_CREATE"/>
@@ -51,7 +51,7 @@
</condition>
<link target="EditEmplPosition"/>
</menu-item>
- <menu-item name="NewFulfilmennt"
title="${uiLabelMap.CommonNew}
${uiLabelMap.Fulfilmnent}">
+ <menu-item name="NewFulfilmennt"
title="${uiLabelMap.HumanResNewEmplPositionFulfillment}">
<condition>
<or>
<if-has-permission permission="HUMANRES"
action="_CREATE"/>
@@ -59,7 +59,7 @@
</condition>
<link target="EditEmplPositionFulfillments"/>
</menu-item>
- <menu-item name="NewPerformanceReview"
title="${uiLabelMap.CommonNew} ${uiLabelMap.CommonReview}">
+ <menu-item name="NewPerformanceReview"
title="${uiLabelMap.HumanResNewPartyReview}">
<condition>
<or>
<if-has-permission permission="HUMANRES"
action="_CREATE"/>
@@ -67,7 +67,7 @@
</condition>
<link target="EditPerfReview"/>
</menu-item>
- <menu-item name="NewLeave" title="${uiLabelMap.CommonNew}
${uiLabelMap.HumanResEmplLeave}">
+ <menu-item name="NewLeave"
title="${uiLabelMap.HumanResAddEmplLeave}">
<condition>
<or>
<if-has-permission permission="HUMANRES"
action="_CREATE"/>
diff --git a/framework/common/config/CommonUiLabels.xml
b/framework/common/config/CommonUiLabels.xml
index 624275a..8d427ac 100644
--- a/framework/common/config/CommonUiLabels.xml
+++ b/framework/common/config/CommonUiLabels.xml
@@ -5957,6 +5957,7 @@
<value xml:lang="en">Invoice</value>
<value xml:lang="es">Factura</value>
<value xml:lang="es-MX">Factura</value>
+ <value xml:lang="fr">Facture</value>
<value xml:lang="nl">Factuur</value>
</property>
<property key="CommonIsA">
