From ec4d4a919361dc3101c47ed293f944882313209b Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Thu, 19 Oct 2023 11:11:11 +0300 Subject: [PATCH] merge conflict resolved. --- lib/l10n/app_ar.arb | 4 +++- lib/l10n/app_en.arb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/l10n/app_ar.arb b/lib/l10n/app_ar.arb index 3bcd3f40..a07a6771 100644 --- a/lib/l10n/app_ar.arb +++ b/lib/l10n/app_ar.arb @@ -249,5 +249,7 @@ "assetNo" : "رقم الجهاز", "manufacture" : "صناعة", "model" : "الطراز", - "serialNumber" : "الرقم التسلسلي" + "serialNumber" : "الرقم التسلسلي", + "device" : "الجهاز", + "pickAsset" : "إختر جهاز" } \ No newline at end of file diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index f0c3681a..57522750 100644 --- 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" } \ No newline at end of file