Clone
 

behrouz nematipour <bnematipour@diality.com> in ui.config

Merge branch 'release/p1b/staging' into release/p1b/master

Merge branch 'leahi/features/LEAH-1924-UI-AM-S4-Translation' into leahi/staging

Merge branch 'leahi/features/LEAH-1924-UI-AM-S4-Translation' into leahi/develop

LEAH-1937: UI: Translation

- Moved the configurations folders in a folder with the same name.

- That makes it easier to collect them like the scripts folder.

    • binary
    /Instructions/10_install acid line.png
    • binary
    /Instructions/11_install bicarb line.png
    • binary
    /Instructions/12_replace dialysate line cap.png
    • binary
    /Instructions/13_remove acid and bicarb connect.png
    • binary
    /Instructions/15_disconnect PAA.png
    • binary
    /Instructions/16_connect dialysate lines to DG.png
  1. … 161 more files in changeset.
Merge branch 'leahi/features/LEAH-1924-UI-AM-S4-Translation' into leahi/develop

LEAH-1937: UI: Translation

- updated the es and renamed the en to be by default no local appended to the configurations file name.

    • -0
    • +180
    /Alarms/Rejections.conf
    • -0
    • +180
    /Alarms/Rejections_es.conf
    • -110
    • +0
    /Configurations/DataList_en.conf
    • -110
    • +0
    /Configurations/DataList_es.conf
    • -134
    • +0
    /Instructions/Instructions_en.conf
  1. … 4 more files in changeset.
LEAH-1937: UI: Translation

- Added locale to the settings files.

- Added some example translation for Spanish

- NOTE:

The System.{conf, dflt} does not have localization for now.

later we need to separate some if needed, or we can keep all the different localization in this file, but switch between them [later discussion].

    • -0
    • +1823
    /Alarms/Alarms_en.conf
    • -0
    • +1823
    /Alarms/Alarms_es.conf
    • -0
    • +66
    /Alarms/Events_en.conf
    • -0
    • +66
    /Alarms/Events_es.conf
    • -0
    • +110
    /Configurations/DataList_en.conf
    • -0
    • +110
    /Configurations/DataList_es.conf
    • -0
    • +55
    /Confirm/Confirm_en.conf
    • -0
    • +55
    /Confirm/Confirm_es.conf
    • -0
    • +134
    /Instructions/Instructions_en.conf
    • -0
    • +134
    /Instructions/Instructions_es.conf
Merge branch 'release/p1b/staging' into release/p1b/master

Merge branch 'release/stagingmerge-DEN-17017-ui-bn-release-17' into release/p1b/staging

Merge branch 'staging' - DEN-17017: Release 17

Release 17 Code Review branch

- added the missing commit from staging for Alarm 301.

Release 17 Code Review branch

git checkout release/stagingmerge-DEN-17017-ui-bn-release-17

git diff HEAD staging > ../stagingmerge-DEN-17017-ui-bn-release-17.patch

git apply ../stagingmerge-DEN-17017-ui-bn-release-17.patch

Merge branch 'staging'

Merge branch 'DEN-16953-ui-dn-release-15' into staging

Merge branch 'staging'

Merge branch 'DEN-16953-ui-dn-release-15' into develop

Merge branch 'release/p1_staging' into release/p1

Merge branch 'staging'

Merge branch 'staging' into develop

staging merge cherry pick

Bamboo Commit: Updated Alarms.conf

Bamboo Commit: Updated Alarms.conf

Bamboo Commit: Updated Alarms.conf

Bamboo Commit: Updated Alarms.conf

Bamboo Commit: Updated Alarms.conf

Bamboo Commit: Updated Alarms.conf

Merge branch 'staging' into develop

Merge branch 'staging'

Merge branch 'staging' into develop

Updated the wording requested by system

Merge branch 'staging' into develop

Merge branch 'staging' into develop

Merge branch 'DEN-16419-UI-BN-S106' into staging

Merge branch 'DEN-16419-UI-BN-S106' into develop

Merge branch 'staging' into develop

DEN-16286: UI: CS: In the Treatment log map the Alarm/Event ID to the description