merge conflict resolved.

2 years ago · ec4d4a9193
parent eaa9bb62ee
commit ec4d4a9193
2 changed files with 6 additions and 2 deletions
--- a/lib/l10n/app_ar.arb
+++ b/lib/l10n/app_ar.arb
@ -249,5 +249,7 @@
  "assetNo" : "رقم الجهاز",
  "manufacture" : "صناعة",
  "model" : "الطراز",
-  "serialNumber" : "الرقم التسلسلي"
+  "serialNumber" : "الرقم التسلسلي",
+  "device" : "الجهاز",
+  "pickAsset" : "إختر جهاز"
 }
--- a/lib/l10n/app_en.arb
+++ b/lib/l10n/app_en.arb
@ -249,5 +249,7 @@
  "assetNo" : "Asset No.",
  "manufacture" : "Manufacture",
  "model" : "Model",
-  "serialNumber" : "Serial Number"
+  "serialNumber" : "Serial Number",
+  "device" : "Device",
+  "pickAsset" : "Pick Asset"
 }