From 910e37dfce31ccd6345590c488e510b3296d0b12 Mon Sep 17 00:00:00 2001 From: Alex Hsu Date: Mon, 10 Oct 2022 09:26:58 -0700 Subject: [PATCH] Juno: check in to lego/hb_04604851-bac4-4681-9f74-73de611d6e48_20221010154033643. (#20791) Co-authored-by: Alex Ma --- resources/localization/LCL/fr/sql.xlf.lcl | 6 ++++-- resources/localization/LCL/it/sql.xlf.lcl | 4 ++-- resources/localization/LCL/zh-Hans/sql.xlf.lcl | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/resources/localization/LCL/fr/sql.xlf.lcl b/resources/localization/LCL/fr/sql.xlf.lcl index 644c1cdc8b..0131f30309 100644 --- a/resources/localization/LCL/fr/sql.xlf.lcl +++ b/resources/localization/LCL/fr/sql.xlf.lcl @@ -7527,8 +7527,10 @@ - - +<<<<<<< lego/hb_04604851-bac4-4681-9f74-73de611d6e48_20221010154033643 + + += diff --git a/resources/localization/LCL/it/sql.xlf.lcl b/resources/localization/LCL/it/sql.xlf.lcl index 3e9c31640e..4d3ea35e59 100644 --- a/resources/localization/LCL/it/sql.xlf.lcl +++ b/resources/localization/LCL/it/sql.xlf.lcl @@ -7527,8 +7527,8 @@ - - + + diff --git a/resources/localization/LCL/zh-Hans/sql.xlf.lcl b/resources/localization/LCL/zh-Hans/sql.xlf.lcl index 58f16da737..f198c2ef53 100644 --- a/resources/localization/LCL/zh-Hans/sql.xlf.lcl +++ b/resources/localization/LCL/zh-Hans/sql.xlf.lcl @@ -7527,8 +7527,8 @@ - - + +