From ceb1b61d84b77d8459ebed27e931e38b3ff6ddd4 Mon Sep 17 00:00:00 2001 From: "marco.locatelli@steamware.net" Date: Tue, 11 Aug 2020 12:49:37 +0200 Subject: [PATCH 1/3] further translation --- NKC_WF/WebUserControls/cmp_KS_OkibBin.ascx | 5 +++-- NKC_WF/WebUserControls/cmp_KS_OkibCart.ascx | 4 ++-- NKC_WF/WebUserControls/cmp_KS_OkibSum.ascx | 4 ++-- NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx | 4 ++-- NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx | 4 ++-- NKC_WF/WebUserControls/cmp_KS_OkoiSum.ascx | 4 ++-- NKC_WF/WebUserControls/cmp_ML_ShDet.ascx | 6 ++++-- NKC_WF/WebUserControls/cmp_MU_bins.ascx | 2 +- NKC_WF/WebUserControls/cmp_MU_carts.ascx | 2 +- NKC_WF/WebUserControls/cmp_batchList.ascx | 2 +- NKC_WF/WebUserControls/cmp_kitImpCheck.ascx | 2 +- NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs | 2 +- NKC_WF/WebUserControls/cmp_offlineOrders.ascx | 4 ++-- NKC_WF/WebUserControls/cmp_paint_bins.ascx | 2 +- NKC_WF/WebUserControls/cmp_scrapList.ascx | 2 +- NKC_WF/WebUserControls/cmp_searchItems.ascx | 8 ++++---- NKC_WF/WebUserControls/cmp_searchItems.ascx.cs | 2 +- 17 files changed, 31 insertions(+), 28 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_KS_OkibBin.ascx b/NKC_WF/WebUserControls/cmp_KS_OkibBin.ascx index 5ce0ce5..6df9b19 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkibBin.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkibBin.ascx @@ -15,11 +15,12 @@
- Picked: + # <%: traduci("Picked") %> +
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkibCart.ascx b/NKC_WF/WebUserControls/cmp_KS_OkibCart.ascx index 91edfa9..1a58eaa 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkibCart.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkibCart.ascx @@ -16,11 +16,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkibSum.ascx b/NKC_WF/WebUserControls/cmp_KS_OkibSum.ascx index dd92441..4dac19f 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkibSum.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkibSum.ascx @@ -13,11 +13,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx index b9a519f..c9341f4 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkoiCart.ascx @@ -16,11 +16,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx index 1efd1b8..0385b6f 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkoiOI.ascx @@ -15,11 +15,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_KS_OkoiSum.ascx b/NKC_WF/WebUserControls/cmp_KS_OkoiSum.ascx index f46f7e0..f6f1ea0 100644 --- a/NKC_WF/WebUserControls/cmp_KS_OkoiSum.ascx +++ b/NKC_WF/WebUserControls/cmp_KS_OkoiSum.ascx @@ -13,11 +13,11 @@
- Picked: + # <%: traduci("Picked") %>
- Total: + # <%: traduci("Total") %>
diff --git a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx index 1c41ad0..014e858 100644 --- a/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx +++ b/NKC_WF/WebUserControls/cmp_ML_ShDet.ascx @@ -16,14 +16,16 @@
- stack: + # <%: traduci("Stack") %> +
- sheet: + # <%: traduci("Sheet") %> +
diff --git a/NKC_WF/WebUserControls/cmp_MU_bins.ascx b/NKC_WF/WebUserControls/cmp_MU_bins.ascx index 34f24ea..af33047 100644 --- a/NKC_WF/WebUserControls/cmp_MU_bins.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_bins.ascx @@ -11,7 +11,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_MU_carts.ascx b/NKC_WF/WebUserControls/cmp_MU_carts.ascx index 32aa808..74fae2a 100644 --- a/NKC_WF/WebUserControls/cmp_MU_carts.ascx +++ b/NKC_WF/WebUserControls/cmp_MU_carts.ascx @@ -11,7 +11,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_batchList.ascx b/NKC_WF/WebUserControls/cmp_batchList.ascx index d4a5bc9..d97befa 100644 --- a/NKC_WF/WebUserControls/cmp_batchList.ascx +++ b/NKC_WF/WebUserControls/cmp_batchList.ascx @@ -12,7 +12,7 @@
-

Call List

+

# <%: traduci("CallList") %>

# <%: traduci("FilterStatus") %> diff --git a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx index 981591e..03d83ac 100644 --- a/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx +++ b/NKC_WF/WebUserControls/cmp_kitImpCheck.ascx @@ -15,7 +15,7 @@
- Last Action
+ # <%: traduci("LastAction") %>
diff --git a/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs b/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs index 8e68db6..7f8c3ba 100644 --- a/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_kittingBin.ascx.cs @@ -2,7 +2,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_kittingBin : System.Web.UI.UserControl + public partial class cmp_kittingBin : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { diff --git a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx index d2db403..8ad74c1 100644 --- a/NKC_WF/WebUserControls/cmp_offlineOrders.ascx +++ b/NKC_WF/WebUserControls/cmp_offlineOrders.ascx @@ -6,14 +6,14 @@
-

Offline Orders

+

# <%: traduci("OfflineOrders") %>

- No Data Available + # <%: traduci("NoDataAvaible") %> diff --git a/NKC_WF/WebUserControls/cmp_paint_bins.ascx b/NKC_WF/WebUserControls/cmp_paint_bins.ascx index 571a5fc..dd28ef9 100644 --- a/NKC_WF/WebUserControls/cmp_paint_bins.ascx +++ b/NKC_WF/WebUserControls/cmp_paint_bins.ascx @@ -16,7 +16,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_scrapList.ascx b/NKC_WF/WebUserControls/cmp_scrapList.ascx index 8221bf4..8d75674 100644 --- a/NKC_WF/WebUserControls/cmp_scrapList.ascx +++ b/NKC_WF/WebUserControls/cmp_scrapList.ascx @@ -4,7 +4,7 @@
-

Scrap List (Items to process)

+

#<%: traduci("ScrapList") %>

diff --git a/NKC_WF/WebUserControls/cmp_searchItems.ascx b/NKC_WF/WebUserControls/cmp_searchItems.ascx index 857bf82..c8f5f77 100644 --- a/NKC_WF/WebUserControls/cmp_searchItems.ascx +++ b/NKC_WF/WebUserControls/cmp_searchItems.ascx @@ -29,19 +29,19 @@
- Ord: + # <%: traduci("Order") %>
- Kit: + # <%: traduci("Kit") %>
- Cart: + # <%: traduci("Cart") %>
- Bin: + # <%: traduci("Bin") %>
diff --git a/NKC_WF/WebUserControls/cmp_searchItems.ascx.cs b/NKC_WF/WebUserControls/cmp_searchItems.ascx.cs index 83cdbfc..b3cdfc6 100644 --- a/NKC_WF/WebUserControls/cmp_searchItems.ascx.cs +++ b/NKC_WF/WebUserControls/cmp_searchItems.ascx.cs @@ -2,7 +2,7 @@ namespace NKC_WF.WebUserControls { - public partial class cmp_searchItems : System.Web.UI.UserControl + public partial class cmp_searchItems : BaseUserControl { protected void Page_Load(object sender, EventArgs e) { From 4dd0f70f6cfe1c6f32ae9d76a51f30007a3d3471 Mon Sep 17 00:00:00 2001 From: "marco.locatelli@steamware.net" Date: Tue, 11 Aug 2020 13:02:15 +0200 Subject: [PATCH 2/3] translation progress1 --- NKC_WF/WebUserControls/cmp_stackBuilding.ascx | 4 +- NKC_WF/WebUserControls/cmp_stackList.ascx | 4 +- NKC_WF/WebUserControls/cmp_stackLoading.ascx | 96 +++++++++---------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx index 3263614..8139630 100644 --- a/NKC_WF/WebUserControls/cmp_stackBuilding.ascx +++ b/NKC_WF/WebUserControls/cmp_stackBuilding.ascx @@ -6,7 +6,7 @@
-

BUNK BUILDING

+

# <%: traduci("BunkBuilding") %>

@@ -29,4 +29,4 @@
-
+
\ No newline at end of file diff --git a/NKC_WF/WebUserControls/cmp_stackList.ascx b/NKC_WF/WebUserControls/cmp_stackList.ascx index bda5b84..7d1aaec 100644 --- a/NKC_WF/WebUserControls/cmp_stackList.ascx +++ b/NKC_WF/WebUserControls/cmp_stackList.ascx @@ -4,7 +4,7 @@
- BUNK List + # <%: traduci("BunkList") %>
@@ -19,7 +19,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_stackLoading.ascx b/NKC_WF/WebUserControls/cmp_stackLoading.ascx index 23e3d90..07b32b2 100644 --- a/NKC_WF/WebUserControls/cmp_stackLoading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackLoading.ascx @@ -3,53 +3,53 @@ <%@ Register Src="~/WebUserControls/cmp_stackNextloading.ascx" TagPrefix="uc1" TagName="cmp_stackNextloading" %>
-
-
-
-

PROD simul

-
-
- ADVANCE prod -
-
-
-
- - - - <%: traduci("StackLoaded") %> - - -
-
- BATCH: - -
- TOT BUNK: - -
-
- <%: traduci("BatchCurrent") %> -
- TOT SHEETS: - -
-
- Due Date: - -
- TOT ITEMS: - -
+
+
+
+

# <%: traduci("ProdSimul") %>

+
+
+ ADVANCE prod +
- - - -
-
- -
-
- -
+
+
+ + + + <%: traduci("StackLoaded") %> + + +
+
+ # <%: traduci("Batch") %> + +
+ # <%: traduci("TotBunk") %> + +
+
+ <%: traduci("BatchCurrent") %> +
+ # <%: traduci("TotSheets") %> + +
+
+ # <%: traduci("DueDate") %> + +
+ # <%: traduci("TotItems") %> + +
+
+
+
+ +
+
+ +
+
+ +
From b2b1e34e5f3a1f34e3b92074059db4540271b2e0 Mon Sep 17 00:00:00 2001 From: "marco.locatelli@steamware.net" Date: Tue, 11 Aug 2020 14:49:06 +0200 Subject: [PATCH 3/3] Translation phase1 completed --- .../WebUserControls/cmp_stackNextloading.ascx | 33 +++++++++---------- NKC_WF/WebUserControls/cmp_taktList.ascx | 4 +-- .../cmp_validationSummary.ascx | 2 +- NKC_WF/WebUserControls/tpl_WIP.ascx | 2 +- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx index 6c43c1d..9d858c5 100644 --- a/NKC_WF/WebUserControls/cmp_stackNextloading.ascx +++ b/NKC_WF/WebUserControls/cmp_stackNextloading.ascx @@ -6,10 +6,10 @@
- NO CURRENT BUNK + # <%: traduci("NoCurrentBunk") %>
- ...waiting + # <%: traduci("Waiting") %>
@@ -18,40 +18,40 @@
- PREVIOUS BUNK: + # <%: traduci("Previous") %> # <%: traduci("Bunk") %> ()
- CURRENT BUNK: + # <%: traduci("Current") %># <%: traduci("Bunk") %> ()
- sheets: + # <%: traduci("Sheets") %>
- printed: + # <%: traduci("Printed") %>
- worked: + # <%: traduci("Worked") %>
- To Redo: + # <%: traduci("ToRedo") %>
- Items: + # <%: traduci("Items") %>
- Items: + # <%: traduci("Items") %>
@@ -68,17 +68,17 @@
- NEXT BUNK: + # <%: traduci("Next") %> # <%: traduci("Bunk") %> ()
- sheets: | printed: + # <%: traduci("Sheets") %> | printed: | worked:
- Items: + # <%: traduci("Items") %>
@@ -86,10 +86,10 @@
- NO NEXT BUNK + # <%: traduci("NoNextBunk") %>
- BATCH complete + # <%: traduci("BatchComplete") %>
@@ -99,8 +99,7 @@ - - +
<%: traduci("CollectRedoOnEnd") %> diff --git a/NKC_WF/WebUserControls/cmp_taktList.ascx b/NKC_WF/WebUserControls/cmp_taktList.ascx index 86c28f0..cd747fa 100644 --- a/NKC_WF/WebUserControls/cmp_taktList.ascx +++ b/NKC_WF/WebUserControls/cmp_taktList.ascx @@ -5,7 +5,7 @@
- BATCH List + # <%: traduci("BatchList") %>
@@ -20,7 +20,7 @@ - No Record + # <%: traduci("NoRecord") %> diff --git a/NKC_WF/WebUserControls/cmp_validationSummary.ascx b/NKC_WF/WebUserControls/cmp_validationSummary.ascx index 605f330..91acab9 100644 --- a/NKC_WF/WebUserControls/cmp_validationSummary.ascx +++ b/NKC_WF/WebUserControls/cmp_validationSummary.ascx @@ -1,7 +1,7 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_validationSummary.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_validationSummary" %>
-

Validation Summary

+

# <%: traduci("ValidationSummary") %>

FORCE REVALIDATE diff --git a/NKC_WF/WebUserControls/tpl_WIP.ascx b/NKC_WF/WebUserControls/tpl_WIP.ascx index f11d17a..1ab200c 100644 --- a/NKC_WF/WebUserControls/tpl_WIP.ascx +++ b/NKC_WF/WebUserControls/tpl_WIP.ascx @@ -2,7 +2,7 @@
-

Work In Progress

+

# <%: traduci("WorkInProgress") %>