Merge branch 'mergeWithoutLocalization' into new_fixes_may30

GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailHeaderView.swift

@@ -55,8 +55,11 @@ class BeneficiaryDetailHeaderView: UITableViewHeaderFooterView {
         nameInitialsLabel.layer.cornerRadius = self.nameInitialsLabel.frame.width/2
         updateButton.set(cornerRadius: 10)
         nameTitleLabel.text = "name_title_text".localized()
+        mobileTitleLabel.text = "mobileNumber_text".localized()
         relationshipTitleLabel.text = "relationship_text".localized()
+        locationTitleLabel.text = "country".localized()
         updateButton.setTitle("update_text".localized(), for: .normal)
+        
 //        DispatchQueue.main.async {
         self.updateButton.titleLabel?.font = .sanfrancisco(.bold, size: 14)
         self.updateButton.titleLabel?.textAlignment = .center

GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift

@@ -107,6 +107,7 @@ class BeneficiaryDetailViewController: UIViewController {
         tableView.dataSource = self
         tableView.register(UINib(nibName: BeneficiaryDetailHeaderView.identifier, bundle: nil), forHeaderFooterViewReuseIdentifier: BeneficiaryDetailHeaderView.identifier)
         continueButton.set(cornerRadius: 10)
+        continueButton.setTitle("continue_text".localized(), for: .normal)
         //updateButton.set(cornerRadius: 10)
         //updateButton.set(borderWidth: 2, of: .init(hex: "#2E89FF"))
     }
@@ -128,7 +129,7 @@ extension BeneficiaryDetailViewController: UITableViewDataSource, UITableViewDel
 
         cell.isSelected(status)
         cell.onClickDeleteButton = {
-            self.alertWithOkCancel(type: .normal,message: "Are you sure, You want to delete beneficiary?", title: "Delete Beneficiary", okTitle: "Yes", cancelTitle: "No",
+            self.alertWithOkCancel(type: .normal,message: "delete_beneficiary_confirmation_text".localized(), title: "delete_beneficiary_text".localized(), okTitle: "yes_text".localized(), cancelTitle: "no_text".localized(),
             okAction: {
                 self.presenter?.makeApiRequest(recipientID: self.reciptent?.paymentMethods?.elementAt(index: indexPath.row)?.receiverId ?? "")
             }) {

GME Remit/Modules/Home/User Interface/View/Custom/HomeExchangeRateView.swift

@@ -308,7 +308,7 @@ class HomeExchangeRateView: UIView {
         let exchangeRate = model.exchangeRate ?? ""
         let exchangeRateAttributed = ("\(exchangeRate) ").attributedText(color: .themeBlack, font: .sanfrancisco(.semibold, size: 14))
         
-        let exchangeRateInfo = ("current_exchange_rate".localized()).attributedText(color: .theme2E89FF, font: .sanfrancisco(.semibold, size: 14))
+        let exchangeRateInfo = ("current_exchange_rate_text".localized()).attributedText(color: .theme2E89FF, font: .sanfrancisco(.semibold, size: 14))
         
         let gurrantedText = NSMutableAttributedString()
         

GME Remit/Modules/Home/User Interface/View/HomeViewController.swift

@@ -348,6 +348,7 @@ class HomeViewController: UIViewController {
         setupDelegates()
         setupNotifications()
         addRefreshControlTableView()
+        self.configureText()
         
         let tap = UITapGestureRecognizer(target: self, action: #selector(openProfile(_:)))
         self.profileImage.isUserInteractionEnabled = true
@@ -502,7 +503,6 @@ class HomeViewController: UIViewController {
     }
     
     func setupUserInfo() {
-        accountTitleLabel.text = "membership_id".localized()
         let availableBalance = GMEDB.shared.user.string(.availableBalance)
         self.amountLabel.text = (availableBalance?.getIntegersString() ?? "") + " " + "JPY"
         let walletNumber = GMEDB.shared.user.string(.referralCode) ?? ""
@@ -520,7 +520,7 @@ class HomeViewController: UIViewController {
     
     private func configureText() {
         balaceTitleLabel.text = "domestic_available_balance_text".localized()
-        accountTitleLabel.text = "account_number_text".localized()
+        accountTitleLabel.text = "memberShipId_text".localized()
         
     }
 
@@ -543,9 +543,9 @@ class HomeViewController: UIViewController {
     }
     
     @IBAction func didPressCopyButton(_ sender: Any) {
-        let copyString = "\("membership_id".localized()): \(walletNumberLabel.text ?? "")"
+        let copyString = "\("memberShipId_text".localized()): \(walletNumberLabel.text ?? "")"
         UIPasteboard.general.string = copyString
-        self.alertWithOk(message: "membership_id".localized() + " " + "copied".localized())
+        self.alertWithOk(message: "memberShipId_text".localized() + " " + "copied".localized())
     }
     
     

GME Remit/Modules/Home/User Interface/View/HomeViewControllerNew.swift

@@ -28,6 +28,7 @@ class HomeViewControllerNew: UIViewController {
     
     private let accountDetailView: HomeAccountDetailView = {
         let view = HomeAccountDetailView()
+        view.setup()
         view.backgroundColor = .themeWhite
         view.translatesAutoresizingMaskIntoConstraints = false
         return view

GME Remit/Modules/Loyality Points/User Interface/View/LoyalityPointsViewController.swift

@@ -33,7 +33,7 @@ class LoyalityPointsViewController: UIViewController {
         super.viewDidLoad()
         self.setup()
         self.fetchData()
-        self.title = "Loyality Points"
+        self.title = "loyalty_points".localized()
 //        self.presenter?.viewInitiated()
     }
     
@@ -59,7 +59,7 @@ class LoyalityPointsViewController: UIViewController {
         containerView.set(borderWidth: 1, of: .themeWhite)
         
         sendBtn.set(cornerRadius: 8)
-        sendBtn.setTitle("SEND MONEY", for: .normal)
+        sendBtn.setTitle("send_money_title_text".localized(), for: .normal)
 
 //        sendBtn.setTitle("loyalty_points_btn_link_text".localized(), for: .normal)
     }

GME Remit/Modules/SideMenu/Setting.storyboard

@@ -402,7 +402,7 @@
                                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kgd-fs-i9q">
                                                                                 <rect key="frame" x="0.0" y="0.0" width="30" height="55"/>
                                                                                 <subviews>
-                                                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="google_translate" translatesAutoresizingMaskIntoConstraints="NO" id="Rwr-eA-mSz">
+                                                                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="account" translatesAutoresizingMaskIntoConstraints="NO" id="Rwr-eA-mSz">
                                                                                         <rect key="frame" x="0.0" y="12.5" width="30" height="30"/>
                                                                                         <constraints>
                                                                                             <constraint firstAttribute="height" constant="30" id="aA5-1b-wke"/>
@@ -722,11 +722,11 @@
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MCI-h0-0pJ">
                                                         <rect key="frame" x="0.0" y="1395" width="375" height="110"/>
                                                         <subviews>
-                                                            <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="xb8-n1-VS1">
+                                                            <stackView opaque="NO" contentMode="scaleToFill" distribution="equalCentering" alignment="center" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="xb8-n1-VS1">
                                                                 <rect key="frame" x="8" y="16" width="359" height="20"/>
                                                                 <subviews>
                                                                     <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yij-V4-T3Z">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="101" height="20"/>
+                                                                        <rect key="frame" x="0.0" y="0.0" width="71" height="20"/>
                                                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="10"/>
                                                                         <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
                                                                         <state key="normal" title="Privacy Policy">
@@ -736,66 +736,76 @@
                                                                             <action selector="privacyPolicy:" destination="XWE-Lo-Wrc" eventType="touchUpInside" id="MtE-pJ-fGE"/>
                                                                         </connections>
                                                                     </button>
-                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Q3-YQ-PHv">
-                                                                        <rect key="frame" x="109" y="0.0" width="8" height="20"/>
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="42g-fu-INs">
+                                                                        <rect key="frame" x="108" y="0.0" width="115" height="20"/>
                                                                         <subviews>
-                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eJr-zw-D8V">
-                                                                                <rect key="frame" x="0.0" y="6" width="8" height="8"/>
-                                                                                <color key="backgroundColor" red="0.1803921568627451" green="0.53725490196078429" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1Q3-YQ-PHv">
+                                                                                <rect key="frame" x="0.0" y="0.0" width="8" height="20"/>
+                                                                                <subviews>
+                                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eJr-zw-D8V">
+                                                                                        <rect key="frame" x="0.0" y="6" width="8" height="8"/>
+                                                                                        <color key="backgroundColor" red="0.1803921568627451" green="0.53725490196078429" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                                                        <constraints>
+                                                                                            <constraint firstAttribute="width" constant="8" id="A83-KX-pUq"/>
+                                                                                            <constraint firstAttribute="height" constant="8" id="l2s-cB-EWA"/>
+                                                                                        </constraints>
+                                                                                    </view>
+                                                                                </subviews>
                                                                                 <constraints>
-                                                                                    <constraint firstAttribute="width" constant="8" id="A83-KX-pUq"/>
-                                                                                    <constraint firstAttribute="height" constant="8" id="l2s-cB-EWA"/>
+                                                                                    <constraint firstAttribute="width" constant="8" id="2XP-WX-FDU"/>
+                                                                                    <constraint firstItem="eJr-zw-D8V" firstAttribute="centerX" secondItem="1Q3-YQ-PHv" secondAttribute="centerX" id="fZA-Rw-yIi"/>
+                                                                                    <constraint firstAttribute="height" constant="20" id="hjd-Ai-fgb"/>
+                                                                                    <constraint firstItem="eJr-zw-D8V" firstAttribute="centerY" secondItem="1Q3-YQ-PHv" secondAttribute="centerY" id="z9M-GK-gDf"/>
                                                                                 </constraints>
                                                                             </view>
+                                                                            <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1L9-no-QDs">
+                                                                                <rect key="frame" x="16" y="0.0" width="99" height="20"/>
+                                                                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="10"/>
+                                                                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                                                <state key="normal" title="Terms &amp; Conditions">
+                                                                                    <color key="titleColor" white="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                </state>
+                                                                                <connections>
+                                                                                    <action selector="termsAndConditions:" destination="XWE-Lo-Wrc" eventType="touchUpInside" id="fJS-kF-zTh"/>
+                                                                                </connections>
+                                                                            </button>
                                                                         </subviews>
-                                                                        <constraints>
-                                                                            <constraint firstAttribute="width" constant="8" id="2XP-WX-FDU"/>
-                                                                            <constraint firstItem="eJr-zw-D8V" firstAttribute="centerX" secondItem="1Q3-YQ-PHv" secondAttribute="centerX" id="fZA-Rw-yIi"/>
-                                                                            <constraint firstAttribute="height" constant="20" id="hjd-Ai-fgb"/>
-                                                                            <constraint firstItem="eJr-zw-D8V" firstAttribute="centerY" secondItem="1Q3-YQ-PHv" secondAttribute="centerY" id="z9M-GK-gDf"/>
-                                                                        </constraints>
-                                                                    </view>
-                                                                    <button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1L9-no-QDs">
-                                                                        <rect key="frame" x="125" y="0.0" width="99" height="20"/>
-                                                                        <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="10"/>
-                                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                                                        <state key="normal" title="Terms &amp; Conditions">
-                                                                            <color key="titleColor" white="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                        </state>
-                                                                        <connections>
-                                                                            <action selector="termsAndConditions:" destination="XWE-Lo-Wrc" eventType="touchUpInside" id="fJS-kF-zTh"/>
-                                                                        </connections>
-                                                                    </button>
-                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LwY-Vy-tER">
-                                                                        <rect key="frame" x="232" y="0.0" width="8" height="20"/>
+                                                                    </stackView>
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="hXZ-Am-q73">
+                                                                        <rect key="frame" x="232" y="0.0" width="127" height="20"/>
                                                                         <subviews>
-                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TCV-Ob-Lxi">
-                                                                                <rect key="frame" x="0.0" y="6" width="8" height="8"/>
-                                                                                <color key="backgroundColor" red="0.18039215689999999" green="0.53725490200000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LwY-Vy-tER">
+                                                                                <rect key="frame" x="0.0" y="0.0" width="8" height="20"/>
+                                                                                <subviews>
+                                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TCV-Ob-Lxi">
+                                                                                        <rect key="frame" x="0.0" y="6" width="8" height="8"/>
+                                                                                        <color key="backgroundColor" red="0.18039215689999999" green="0.53725490200000003" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                                                        <constraints>
+                                                                                            <constraint firstAttribute="width" constant="8" id="Ad9-OJ-r4a"/>
+                                                                                            <constraint firstAttribute="height" constant="8" id="wN0-hN-cfa"/>
+                                                                                        </constraints>
+                                                                                    </view>
+                                                                                </subviews>
                                                                                 <constraints>
-                                                                                    <constraint firstAttribute="width" constant="8" id="Ad9-OJ-r4a"/>
-                                                                                    <constraint firstAttribute="height" constant="8" id="wN0-hN-cfa"/>
+                                                                                    <constraint firstItem="TCV-Ob-Lxi" firstAttribute="centerX" secondItem="LwY-Vy-tER" secondAttribute="centerX" id="LOk-ol-SIr"/>
+                                                                                    <constraint firstAttribute="width" constant="8" id="bHb-uc-hQc"/>
+                                                                                    <constraint firstAttribute="height" constant="20" id="dAq-Bp-YWG"/>
+                                                                                    <constraint firstItem="TCV-Ob-Lxi" firstAttribute="centerY" secondItem="LwY-Vy-tER" secondAttribute="centerY" id="mHC-s4-OPd"/>
                                                                                 </constraints>
                                                                             </view>
+                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="quP-5g-BId">
+                                                                                <rect key="frame" x="16" y="0.0" width="111" height="20"/>
+                                                                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="10"/>
+                                                                                <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
+                                                                                <state key="normal" title="Fraud Gurantee Policy">
+                                                                                    <color key="titleColor" white="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                                </state>
+                                                                                <connections>
+                                                                                    <action selector="fraudGuranteePolicy:" destination="XWE-Lo-Wrc" eventType="touchUpInside" id="QHp-2f-dbD"/>
+                                                                                </connections>
+                                                                            </button>
                                                                         </subviews>
-                                                                        <constraints>
-                                                                            <constraint firstItem="TCV-Ob-Lxi" firstAttribute="centerX" secondItem="LwY-Vy-tER" secondAttribute="centerX" id="LOk-ol-SIr"/>
-                                                                            <constraint firstAttribute="width" constant="8" id="bHb-uc-hQc"/>
-                                                                            <constraint firstAttribute="height" constant="20" id="dAq-Bp-YWG"/>
-                                                                            <constraint firstItem="TCV-Ob-Lxi" firstAttribute="centerY" secondItem="LwY-Vy-tER" secondAttribute="centerY" id="mHC-s4-OPd"/>
-                                                                        </constraints>
-                                                                    </view>
-                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="quP-5g-BId">
-                                                                        <rect key="frame" x="248" y="0.0" width="111" height="20"/>
-                                                                        <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="10"/>
-                                                                        <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/>
-                                                                        <state key="normal" title="Fraud Gurantee Policy">
-                                                                            <color key="titleColor" white="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                                                        </state>
-                                                                        <connections>
-                                                                            <action selector="fraudGuranteePolicy:" destination="XWE-Lo-Wrc" eventType="touchUpInside" id="QHp-2f-dbD"/>
-                                                                        </connections>
-                                                                    </button>
+                                                                    </stackView>
                                                                 </subviews>
                                                             </stackView>
                                                         </subviews>

GME Remit/Modules/SideMenu/SettingViewController.swift

@@ -221,6 +221,7 @@ class SettingViewController: UIViewController {
         contactUsLabel.text = "contact_us".localized()
         aboutUsLabel.text = "about_us".localized()
         logoutLabel.setTitle("logout_text".localized(), for: .normal)
+        fraudGuranteeLabel.setTitle("fraud_guarantee_policy_text".localized(), for: .normal)
         logoutLabel.backgroundColor = .lightBlueColor
         
     

GME Remit/MultiLanguages/bn.lproj/Localizable.strings

@@ -111,7 +111,7 @@
 "transfer_reason_error" = "অর্থ প্রেরণের কারণ";
 
 "todays_rate_title_text" = "আজকের রেট ";
-"you_send_text" = " আপনি পাঠাচ্ছেন ";
+"you_send_text" = " আপনি পাঠাবেন ";
 "recepient_gets_text" = "প্রাপক পাবে";
 "select_payment_mode_text" = "প্রেরণের ধরণ বাছাই করুণ";
 "transfer_fee_included_text" = "ট্রান্সফার ফি অন্তর্ভুক্ত";
@@ -631,7 +631,6 @@
 // Domestic Remittance
 "local_transfer_text" = "     লোকাল ট্রান্সফার ";
 "select_auto_debit_account_text" = "অটো ডেবিট একাউন্ট নির্বাচন করুণ";
-"domestic_available_balance_text" = "   পর্যাপ্ত ব্যালেন্স ";
 "enter_send_amount_text" = "প্রেরণের পরিমাণ (KRW)";
 "select_korea_bank" = "কোরিয়ান ব্যাংক নির্বাচন করুণ";
 "enter_account_text" = "একাউন্ট নাম্বার";
@@ -766,7 +765,7 @@
 
 //Change Profile
 "change_personal_information_title_text" = "ব্যক্তিগত তথ্য";
-"name_title_text" = "নাম";
+"name_title_text" = "আপনার নাম";
 "nationality_title_text" = "জাতীয়তা";
 "birthday_title_text" = "জান্মতারিখ";
 "phonenumber_title_text" = "ফোন নাম্বার";
@@ -929,7 +928,6 @@
 "received_amount_text"="প্রাপ্ত অর্থের পরিমান";
 
 
-
 "another_id_information_text"="অন্য কোনো আইডি থাকলে ( অপশনাল)";
 "frontIdSample_text"="সামনের আইডি নমুনা";
 "backIdSample_text"="পিছনের আইডি ID নমুনা";
@@ -1426,24 +1424,30 @@
 "baisc_information" = "মৌলিক তথ্য";
 "loyalty_points" = "লয়্যালিটি পয়েন্ট";
 "payment_information" = "পেমেন্ট তথ্য";
-"account" = "হিসাব";
+"account" = "অ্যাকাউন্ট";
 "language_selection" = "ভাষা নির্বাচন";
 "security_setting" = "নিরাপত্তা বিন্যাস";
-"enable_biometrics" = "বায়োমেট্রিক্স সক্ষম করুন";
+"enable_biometrics" = "বায়োমেট্রিক্স সক্রিয় করুন";
 "use_fingerprint_for_login" = "লগইন করার জন্য ফিঙ্গারপ্রিন্ট ব্যবহার করুন";
 "contact_us" = "যোগাযোগ করুন";
 "about_us" = "আমাদের সম্পর্কে";
 "ac_number" = "Ac Number";
+"country" = "দেশ";
 
-"upload_slip" = "স্লিপ আপলোড করুন";
+"upload_slip" = "লিপ আপলোড করুন";
 "search_your_transfer_text" = "আপনার স্থানান্তর অনুসন্ধান করুন";
 "registered_beneficiaries_text" = "নিবন্ধিত সুবিধাভোগী";
 "recent_transactions" = "সাম্প্রতিক লেনদেন";
-"see_all_text" = "সবগুলো দেখ";
+"see_all_text" = "সব দেখুন";
 "add_new_text" = "নতুন যোগ করুন";
 "hi_text" = "ওহে";
-"all_beneficiaries" = "সকল সুবিধাভোগী";
-"search_beneficiary_text" = "সুবিধাভোগী অনুসন্ধান করুন";
-"edit_details_text" = "তথ্য সংশোধন কর";
-"view_status_text" = "স্ট্যাটাস দেখুন";
+"all_beneficiaries" = "সমস্ত সুবিধাভোগী";
+"search_beneficiary_text" = "অনুসন্ধান সুবিধাভোগী";
+"edit_details_text" = "তথ্য সংশোধন করুন";
+"view_status_text" = "অবস্থা দেখুন";
 "relationship_text" = "সম্পর্ক";
+"beneficiary_detail" = "সুবিধাভোগী বিস্তারিত";
+"delete_beneficiary_text" = "বেনিফিশিয়ারি মুছে ফেলুন";
+"delete_beneficiary_confirmation_text" = "আপনি কি নিশ্চিত, আপনি বেনিফিশিয়ারি মুছে ফেলতে চান?";
+"support_text" = "";
+

GME Remit/MultiLanguages/en.lproj/Localizable.strings

@@ -1016,8 +1016,6 @@
 "ac_number" = "Ac Number";
 
 //ui design
-"membership_id" = "Membership ID";
-"current_exchange_rate" = "Current Exchange Rate";
 "country" = "Country";
 "copied" = "Copied";
 
@@ -1040,3 +1038,5 @@
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
 "beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";

GME Remit/MultiLanguages/en_PH.lproj/Localizable.strings

@@ -540,6 +540,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -553,3 +554,7 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+

GME Remit/MultiLanguages/id.lproj/Localizable.strings

@@ -832,6 +832,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -845,3 +846,7 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+

GME Remit/MultiLanguages/ja.lproj/Localizable.strings

@@ -146,7 +146,7 @@
 "transfer_reason_error" = "Please select a transfer reason";
 
 "todays_rate_title_text" = "本日のレート";
-"you_send_text" = "送金します";
+"you_send_text" = "送金額";
 "select_payment_mode_text" = "支払い方法の選択";
 "transfer_fee_included_text" = "送金手数料含む";
 "current_exchange_rate_text" = "現在の為替レート";
@@ -853,7 +853,7 @@
 //Profile
 "change_personal_information_title_text" = "個人情報";
 
-"name_title_text" = "Name";
+"name_title_text" = "名前";
 "nationality_title_text" = "Nationality";
 "birthday_title_text" = "Birthday";
 "phonenumber_title_text" = "Phone Number";
@@ -928,7 +928,7 @@
 "password_error_text" = "パスワードは、少なくとも1つの特殊文字、1つの大文字、1つの数字、1つの小文字を含み、8文字以上でなければなりません。";
 "select_purpose_of_registration_text" = "登録目的の選択";
 "purpose_of_registration_text" = "登録の目的";
-"support_text" = "Support";
+"support_text" = "サポート";
 "request_summary_text" = "送金明細の要求";
 "send_money_success_header_text" = "送金依頼を受け取りました。";
 "send_money_success_body_text" = "お支払いをお願い致します。";
@@ -1012,18 +1012,23 @@
 "enable_biometrics" = "生体認証を有効にする";
 "use_fingerprint_for_login" = "ログインに指紋を使用する";
 "contact_us" = "お問い合わせ";
-"about_us" = "私たちに関しては";
+"about_us" = "私たちについて";
 "ac_number" = "Ac Number";
+"country" = "国";
 
 "upload_slip" = "スリップのアップロード";
-"search_your_transfer_text" = "転送を検索する";
-"registered_beneficiaries_text" = "登録受益者";
+"search_your_transfer_text" = "取引を検索する";
+"registered_beneficiaries_text" = "登録済受取人";
 "recent_transactions" = "最近の取引";
 "see_all_text" = "すべてを見る";
-"add_new_text" = "新しく追加する";
-"hi_text" = "やあ";
-"all_beneficiaries" = "すべての受益者";
-"search_beneficiary_text" = "受益者の検索";
-"edit_details_text" = "詳細を編集する";
+"add_new_text" = "新規受取人を追加する。";
+"hi_text" = "こんにちは";
+"all_beneficiaries" = "すべての受取人";
+"search_beneficiary_text" = "受取人を検索";
+"edit_details_text" = "詳細を編集";
 "view_status_text" = "ステータスの表示";
 "relationship_text" = "関係";
+"beneficiary_detail" = "送金受取人";
+"delete_beneficiary_text" = "受取人の削除";
+"delete_beneficiary_confirmation_text" = "本当に受取人を削除してよいですか？";
+

GME Remit/MultiLanguages/km.lproj/Localizable.strings

@@ -833,6 +833,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -846,3 +847,7 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+

GME Remit/MultiLanguages/ko.lproj/Localizable.strings

@@ -831,6 +831,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -844,3 +845,7 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+

GME Remit/MultiLanguages/mn.lproj/Localizable.strings

@@ -828,6 +828,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -841,3 +842,7 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+

GME Remit/MultiLanguages/my-MM.lproj/Localizable.strings

@@ -801,6 +801,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -814,3 +815,7 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+

GME Remit/MultiLanguages/my.lproj/Localizable.strings

@@ -837,6 +837,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -850,3 +851,7 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+

GME Remit/MultiLanguages/ne.lproj/Localizable.strings

@@ -117,7 +117,7 @@
 "recepient_gets_text" = "प्रापक ले प्राप्त गर्ने ";
 "select_payment_mode_text" = "भुक्तानी कसरी लिनु हुन्छ ? ";
 "transfer_fee_included_text" = "सेवा शुल्क ";
-"current_exchange_rate_text" = "अहिलेको विनिमय दर ";
+//"current_exchange_rate_text" = "अहिलेको विनिमय दर ";
 "receipient_gets_text" = "प्रापक ले पाउने ";
 "calculate_text" = "हिसाब गर्नुहोस ";
 "sending_amount_error" = "पठाउने रकम भर्नुहोस ";
@@ -639,7 +639,6 @@
 // Domestic Remittance
 "local_transfer_text" = "कोरियाको बैंकमा  पठाउनुहोस";
 "select_auto_debit_account_text" = "अटो डेबिट खाता छान्नुहोस";
-"domestic_available_balance_text" = "बाँकी रकम";
 "enter_send_amount_text" = "पठाउने रकम लेख्नुहोस्(KRW)";
 "select_korea_bank" = "कोरियाको बैंक छान्नुहोस";
 "enter_account_text" = "खाता नम्बर राख्नुहोस";
@@ -831,7 +830,7 @@
 
 
 "new_update_is_available_text"="नयाँ अद्यावधिक गर्नुहोस्(Update) उपलब्ध छ";
-"update_text"="अद्यावधिक गर्नुहोस्(Update)";
+//"update_text"="अद्यावधिक गर्नुहोस्(Update)";
 "not_now_text"="अहिले होइन";
 "appVersionOutOfDate_text"="अनुप्रयोगको यो संस्करणको मिति सकिएको छ र चाँडै काम गर्न रोकिनेछ। JME  प्रयोग जारी राख्नको लागि कृपया भर्खरको अद्यावधिक(Update) गर्नुहोस्। ";
 
@@ -916,7 +915,7 @@
 "jme_wallet_no_text"="JME खाता नम्बर";
 "jme_wallet_no_text_1"="JME Remittance Card नम्बर";
 
-"domestic_available_balance_text"="उपलब्ध मौजाद  रकम";
+"domestic_available_balance_text"="उपलब्ध मौजाद रकम";
 "renewUrAutoDebitAcc_text"="तपाईंको स्वत: डेबिट खाता नवीकरण गर्नुहोस्";
 "required_to_renew_debit_text"="यो खातामा तपाइँको आफै  डेबिट खाता  नवीकरण गर्न आवश्यक छ। त्यसोभए कृपया लेनदेन गर्नु भन्दा पहिले तपाईंको खाता नविकरण गर्नुहोस्।";
 "kyc_fill_text"="तपाईको खाता प्रमाणित गर्नुहोस्";
@@ -928,6 +927,7 @@
 
 
 "inbound_receipt_text"="नियम भित्रको रसिद  ";
+"support_text" = "सप्पोर्ट";
 "you_have_to_register_text"="तपाईंले जापान मनी एक्सप्रेसमा खाता दर्ता गर्नुपर्नेछ";
 "transfer_processing_text"="स्थानान्तरण प्रक्रिया";
 "transfer_canceled_text"="स्थानान्तरण रद्द गरियो";
@@ -1445,6 +1445,7 @@
 "contact_us" = "सम्पर्क गर्नुहोस";
 "about_us" = "हाम्रोबारे";
 "ac_number" = "Ac Number";
+"country" = "देश";
 
 "upload_slip" = "स्लिप अपलोड";
 "search_your_transfer_text" = "यहाँ खोज्नुहोस्";
@@ -1455,7 +1456,11 @@
 "hi_text" = "नमस्ते";
 "all_beneficiaries" = "सबै लाभार्थीहरू";
 "search_beneficiary_text" = "लाभार्थीहरू खोज्नुहोस्";
-"edit_details_text" = "विवरणहरू सम्पादन गर्नुहोस्";
+"edit_details_text" = "विवरणहरू सम्पादन";
 "view_status_text" = "स्थिति हेर्नुहोस्";
 "relationship_text" = "सम्बन्ध";
+"beneficiary_detail" = "लाभार्थी विवरण";
+"delete_beneficiary_text" = "प्राप्तकर्ता हटाउनुहोस्‌";
+"delete_beneficiary_confirmation_text" = "के तपाईं निश्चित हुनुहुन्छ, तपाईं प्राप्तकर्ता हटाउन चाहनुहुन्छ?";
+
 

GME Remit/MultiLanguages/ru-RU.lproj/Localizable.strings

@@ -829,6 +829,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -842,3 +843,8 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+
+

GME Remit/MultiLanguages/si.lproj/Localizable.strings

@@ -405,7 +405,7 @@
 "estimated_earning_points_text" = "ඇස්තමේන්තුගත ඉපැයීම් ලකුණු";
 "InvalidSourceOfFund_text" = "මුදල් ලැබුන ආකාරය වලංගු නොමැත";
 "specifySourceOfFund_text" = "මුදල් උපයාගත් ආකාරය සඳහන් කරන්න";
-"you_send_text" = "ඔබ යවන්නේ";
+"you_send_text" = "යවන ගණන";
 "receipient_gets_text" = "ප්‍රතිලාභියාට ලැබේවි";
 "select_source_of_fund_text" = "මුදල් උපයාගත් ආකාරය තෝරන්න";
 "i_have_read_to_text_consent_text" = "මම JME නියම සහ කොන්දේසි කියවා එකඟ වෙමි";
@@ -672,28 +672,27 @@
 
 "setup_new_pin_title" = "ගනුදෙනු PIN සකසන්න";
 "setup_new_pin_body" = "කරුණාකර නව ගනුදෙනු පින් පිහිටුවීමට මෙතන ක්ලික් කරන්න";
-<<<<<<< HEAD
 "how_to_deposit_text" = "තැන්පත් කරන්නේ කෙසේද";
-=======
 
 //profile new text
 "baisc_information" = "මූලික තොරතුරු";
 "loyalty_points" = "ලොයල්ටි ලකුණු";
 "payment_information" = "ගෙවීම් තොරතුරු";
 "account" = "ගිණුම";
-"language_selection" = "භාෂා තේරීම";
+"language_selection" = "භාෂාව තෝරාගැනීම";
 "security_setting" = "ආරක්ෂක සැකසුම්";
-"enable_biometrics" = "ජෛවමිතික සබල කරන්න";
+"enable_biometrics" = "ජෛව ආරක්ෂණය සකසන්න";
 "use_fingerprint_for_login" = "පුරනය වීමට ඇඟිලි සලකුණ භාවිතා කරන්න";
-"contact_us" = "අපව අමතන්න";
+"contact_us" = "අපව සම්බන්ධ කරගන්න";
 "about_us" = "අපි ගැන";
 "ac_number" = "Ac Number";
+"country" = "රට";
 
-"upload_slip" = "ස්ලිප් උඩුගත කරන්න";
-"search_your_transfer_text" = "ඔබගේ මාරුවීම් සොයන්න";
-"registered_beneficiaries_text" = "ලියාපදිංචි ප්රතිලාභීන්";
-"recent_transactions" = "මෑත ගනුදෙනු";
-"see_all_text" = "ඔක්කොම බලන්න";
+"upload_slip" = "රිසිට් පත අමුණන්න";
+"search_your_transfer_text" = " ඔබේ ගනුදෙනු සොයන්න";
+"registered_beneficiaries_text" = " ලියාපදිංචි ප්‍රතිලාභීන්";
+"recent_transactions" = "ආසන්නතම ගනුදෙනු";
+"see_all_text" = "සියලු ගනුදෙනු";
 "add_new_text" = "අලුතින් එකතු කරන්න";
 "hi_text" = "ආයුබෝවන්";
 "all_beneficiaries" = "සියලුම ප්‍රතිලාභීන්";
@@ -701,4 +700,8 @@
 "edit_details_text" = "විස්තර සංස්කරණය කරන්න";
 "view_status_text" = "තත්ත්වය බලන්න";
 "relationship_text" = "සම්බන්ධතාවය";
->>>>>>> 6eb7a6fadcb76655ac1a656c152e886a7b14550b
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "මුදල් ලබන්නා මකන්න";
+"delete_beneficiary_confirmation_text" = "ඔබට මුදල් ලබන්නා මැකීමට අවශ්‍යද?";
+"support_text" = "";
+

GME Remit/MultiLanguages/th.lproj/Localizable.strings

@@ -825,6 +825,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -838,3 +839,6 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";

GME Remit/MultiLanguages/ur-PK.lproj/Localizable.strings

@@ -755,6 +755,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -768,3 +769,7 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+

GME Remit/MultiLanguages/uz.lproj/Localizable.strings

@@ -829,6 +829,7 @@
 "contact_us" = "Contact us";
 "about_us" = "About Us";
 "ac_number" = "Ac Number";
+"country" = "Country";
 
 "upload_slip" = "UPLOAD SLIP";
 "search_your_transfer_text" = "Search your transfers";
@@ -842,3 +843,7 @@
 "edit_details_text" = "Edit Details";
 "view_status_text" = "View Status";
 "relationship_text" = "Relationship";
+"beneficiary_detail" = "Beneficiary Detail";
+"delete_beneficiary_text" = "Delete Beneficiary";
+"delete_beneficiary_confirmation_text" = "Are you sure, You want to delete beneficiary?";
+

GME Remit/MultiLanguages/vi-VN.lproj/Localizable.strings

@@ -113,7 +113,7 @@
 "transfer_reason_error" = "Vui lòng chọn lý do chuyển khoản";
 
 "todays_rate_title_text" = "Tỷ giá hôm nay";
-"you_send_text" = "Bạn gửi";
+"you_send_text" = "Gửi tiền";
 "recepient_gets_text" = "Người nhận nhận ";
 "select_payment_mode_text" = "Chọn hình thức nhận tiền";
 "transfer_fee_included_text" = "Bao gồm phí chuyển tiền";
@@ -632,7 +632,6 @@
 // Domestic Remittance
 "local_transfer_text" = "Chuyển khoản nội địa";
 "select_auto_debit_account_text" = "Chọn tài khoản trừ tiền tự động của bạn";
-"domestic_available_balance_text" = "Số dư hiện có";
 "enter_send_amount_text" = "Nhập số tiền muốn chuyển (KRW)";
 "select_korea_bank" = "Chọn ngân hàng tại Hàn Quốc";
 "enter_account_text" = "Nhập số tài khoản";
@@ -768,7 +767,7 @@ Chúng tôi đang xác minh thông tin của bạn.";
 
 //Change Profile
 "change_personal_information_title_text" = "Thông tin cá nhân";
-"name_title_text" = "Tên";
+"name_title_text" = "Họ và tên người nhận";
 "nationality_title_text" = "Quốc tịch";
 "birthday_title_text" = "Ngày tháng năm sinh";
 "phonenumber_title_text" = "Số điện thoại";
@@ -928,6 +927,7 @@ Chúng tôi đang xác minh thông tin của bạn.";
 "bank_text"="Ngân hàng";
 "received_amount_text"="Số tiền nhận được";
 
+"support_text" = "Ủng hộ";
 
 
 "another_id_information_text"="Thẻ ID khác (tùy chọn)";
@@ -1433,25 +1433,30 @@ Chúng tôi đang xác minh thông tin của bạn.";
 "baisc_information" = "Thông tin cơ bản";
 "loyalty_points" = "Điểm thưởng tích lỹ";
 "payment_information" = "Thông tin thanh toán";
-"account" = "Tài khoản";
-"language_selection" = "Sự lựa chọn ngôn ngữ";
+"account" = "Số tài khoản";
+"language_selection" = "Chọn ngôn ngữ";
 "security_setting" = "Cài đặt hệ thống bảo vệ";
 "enable_biometrics" = "Bật sinh trắc học";
 "use_fingerprint_for_login" = "Sử dụng dấu vân tay để đăng nhập";
-"contact_us" = "Liên hệ chúng tôi";
-"about_us" = "Về chúng tôi";
+"contact_us" = "Liện hệ";
+"about_us" = "Thông tin công ty ";
 "ac_number" = "Ac Number";
+"country" = "Quốc gia";
 
-"upload_slip" = "TẢI LÊN SLIP";
+"upload_slip" = "Tải hóa đơn lên";
 "search_your_transfer_text" = "Tìm kiếm chuyển khoản của bạn";
-"registered_beneficiaries_text" = "người thụ hưởng đã đăng ký";
+"registered_beneficiaries_text" = "Người nhận đã đăng kí";
 "recent_transactions" = "Giao dịch gần đây";
-"see_all_text" = "Nhìn thấy tất cả";
+"see_all_text" = "Tất cả ";
 "add_new_text" = "Thêm mới";
-"hi_text" = "CHÀO";
-"all_beneficiaries" = "Tất cả những người thụ hưởng";
-"search_beneficiary_text" = "Tìm kiếm người thụ hưởng";
+"hi_text" = "Xin chào";
+"all_beneficiaries" = "Tất cả người nhận";
+"search_beneficiary_text" = "Tìm kiếm người nhận";
 "edit_details_text" = "Chỉnh sửa chi tiết";
 "view_status_text" = "Trạng thái xem";
-"relationship_text" = "mối quan hệ";
+"relationship_text" = "Mối quan hệ";
+"beneficiary_detail" = "Chi tiết người thụ hưởng";
+"delete_beneficiary_text" = "Xóa người thụ hưởng";
+"delete_beneficiary_confirmation_text" = "Bạn có chắc chắn, bạn muốn xóa người thụ hưởng?";
+