Skip to content

Commit 6448eef

Browse files
authored
Merge release/21.1 into trunk (#14428)
2 parents cac1fca + 35b4a7e commit 6448eef

File tree

22 files changed

+94
-8
lines changed

22 files changed

+94
-8
lines changed

WooCommerce/Resources/de.lproj/Localizable.strings

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2024-11-06 09:54:03+0000 */
1+
/* Translation-Revision-Date: 2024-11-14 09:54:03+0000 */
22
/* Plural-Forms: nplurals=2; plural=n != 1; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: de */
@@ -3113,6 +3113,9 @@ which should be translated separately and considered part of this sentence. */
31133113
/* Hint regarding available/pending balances shown in the WooPayments Deposits View%1$d will be replaced by the number of days balances pend, and will be one of 2/4/5/7. */
31143114
"Funds become available after pending for %1$d days." = "Guthaben, das seit %1$d Tagen aussteht, wird zur Verfügung gestellt.";
31153115

3116+
/* Format of the Global Unique Identifier on the Inventory Settings row */
3117+
"GTIN, UPC, EAN, ISBN: %@" = "GTIN, UPC, EAN oder ISBN: %@";
3118+
31163119
/* Country option for a site address. */
31173120
"Gabon" = "Gabun";
31183121

@@ -3657,6 +3660,9 @@ which should be translated separately and considered part of this sentence. */
36573660
/* Error message for invalid format of ITN in Customs screen of Shipping Label flow */
36583661
"Invalid ITN format" = "Ungültiges ITN-Format";
36593662

3663+
/* Error when an empty Identifier is returned from the barcode scanner */
3664+
"Invalid Identifier" = "Ungültige ID";
3665+
36603666
/* The title of the alert when there is an error with the package name */
36613667
"Invalid Package Name" = "Ungültiger Paketname";
36623668

@@ -5559,6 +5565,12 @@ which should be translated separately and considered part of this sentence. */
55595565
/* Title of the Product Type row on Product main screen */
55605566
"Product type" = "Produkttyp";
55615567

5568+
/* Error message when the scanner found a product but isn't purchasable.%@ is the Identifier code. */
5569+
"Product with Identifier \"%@\" is not purchasable." = "Das Produkt mit der ID „%@“ ist nicht käuflich.";
5570+
5571+
/* Error message when the scanner cannot find a matching product.%@ is the Identifier barcode. */
5572+
"Product with Identifier \"%@\" not found." = "Das Produkt mit der ID „%@“ wurde nicht gefunden.";
5573+
55625574
/* The instruction text below the scan area in the barcode scanner for product barcode. */
55635575
"ProductBarcodeInputScanner.instructionText" = "Produkt-Barcode oder QR-Code scannen";
55645576

WooCommerce/Resources/fr.lproj/Localizable.strings

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2024-11-05 15:54:04+0000 */
1+
/* Translation-Revision-Date: 2024-11-13 15:54:04+0000 */
22
/* Plural-Forms: nplurals=2; plural=n > 1; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: fr */
@@ -3113,6 +3113,9 @@ which should be translated separately and considered part of this sentence. */
31133113
/* Hint regarding available/pending balances shown in the WooPayments Deposits View%1$d will be replaced by the number of days balances pend, and will be one of 2/4/5/7. */
31143114
"Funds become available after pending for %1$d days." = "Les fonds sont disponibles après avoir passé %1$d jours en attente.";
31153115

3116+
/* Format of the Global Unique Identifier on the Inventory Settings row */
3117+
"GTIN, UPC, EAN, ISBN: %@" = "GTIN, UPC, EAN, ISBN : %@";
3118+
31163119
/* Country option for a site address. */
31173120
"Gabon" = "Gabon";
31183121

@@ -3657,6 +3660,9 @@ which should be translated separately and considered part of this sentence. */
36573660
/* Error message for invalid format of ITN in Customs screen of Shipping Label flow */
36583661
"Invalid ITN format" = "Format de NTI non valide";
36593662

3663+
/* Error when an empty Identifier is returned from the barcode scanner */
3664+
"Invalid Identifier" = "Identifiant non valide";
3665+
36603666
/* The title of the alert when there is an error with the package name */
36613667
"Invalid Package Name" = "Nom de colis non valide";
36623668

@@ -5559,6 +5565,12 @@ which should be translated separately and considered part of this sentence. */
55595565
/* Title of the Product Type row on Product main screen */
55605566
"Product type" = "Type de produit";
55615567

5568+
/* Error message when the scanner found a product but isn't purchasable.%@ is the Identifier code. */
5569+
"Product with Identifier \"%@\" is not purchasable." = "Le produit avec l’identifiant « %@ » ne peut pas être acheté.";
5570+
5571+
/* Error message when the scanner cannot find a matching product.%@ is the Identifier barcode. */
5572+
"Product with Identifier \"%@\" not found." = "Le produit avec l’identifiant « %@ » n’a pas été trouvé.";
5573+
55625574
/* The instruction text below the scan area in the barcode scanner for product barcode. */
55635575
"ProductBarcodeInputScanner.instructionText" = "Scanner le code-barres ou le code QR du produit";
55645576

WooCommerce/Resources/he.lproj/Localizable.strings

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2024-11-06 15:54:04+0000 */
1+
/* Translation-Revision-Date: 2024-11-14 09:54:04+0000 */
22
/* Plural-Forms: nplurals=2; plural=n != 1; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: he_IL */
@@ -3113,6 +3113,9 @@ which should be translated separately and considered part of this sentence. */
31133113
/* Hint regarding available/pending balances shown in the WooPayments Deposits View%1$d will be replaced by the number of days balances pend, and will be one of 2/4/5/7. */
31143114
"Funds become available after pending for %1$d days." = "כספים נעשים זמינים לאחר תקופת המתנה בת ⁦%1$d⁩ ימים.";
31153115

3116+
/* Format of the Global Unique Identifier on the Inventory Settings row */
3117+
"GTIN, UPC, EAN, ISBN: %@" = "GTIN, ‏UPC, ‏EAN, ‏ISBN‏: %@";
3118+
31163119
/* Country option for a site address. */
31173120
"Gabon" = "גאבון";
31183121

@@ -3657,6 +3660,9 @@ which should be translated separately and considered part of this sentence. */
36573660
/* Error message for invalid format of ITN in Customs screen of Shipping Label flow */
36583661
"Invalid ITN format" = "פורמט לא חוקי ל-ITN";
36593662

3663+
/* Error when an empty Identifier is returned from the barcode scanner */
3664+
"Invalid Identifier" = "מזהה לא תקף";
3665+
36603666
/* The title of the alert when there is an error with the package name */
36613667
"Invalid Package Name" = "שם חבילה לא תקף";
36623668

@@ -5559,6 +5565,12 @@ which should be translated separately and considered part of this sentence. */
55595565
/* Title of the Product Type row on Product main screen */
55605566
"Product type" = "סוג מוצר";
55615567

5568+
/* Error message when the scanner found a product but isn't purchasable.%@ is the Identifier code. */
5569+
"Product with Identifier \"%@\" is not purchasable." = "לא ניתן לרכוש מוצר עם המזהה \"%@\".";
5570+
5571+
/* Error message when the scanner cannot find a matching product.%@ is the Identifier barcode. */
5572+
"Product with Identifier \"%@\" not found." = "לא ניתן למצוא מוצר עם המזהה \"%@\".";
5573+
55625574
/* The instruction text below the scan area in the barcode scanner for product barcode. */
55635575
"ProductBarcodeInputScanner.instructionText" = "יש לסרוק את הברקוד או קוד ה-QR של המוצר";
55645576

WooCommerce/Resources/ja.lproj/Localizable.strings

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2024-11-05 09:54:19+0000 */
1+
/* Translation-Revision-Date: 2024-11-12 09:54:04+0000 */
22
/* Plural-Forms: nplurals=1; plural=0; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: ja_JP */
@@ -3113,6 +3113,9 @@ which should be translated separately and considered part of this sentence. */
31133113
/* Hint regarding available/pending balances shown in the WooPayments Deposits View%1$d will be replaced by the number of days balances pend, and will be one of 2/4/5/7. */
31143114
"Funds become available after pending for %1$d days." = "資金は%1$d日間保留された後に利用可能になります。";
31153115

3116+
/* Format of the Global Unique Identifier on the Inventory Settings row */
3117+
"GTIN, UPC, EAN, ISBN: %@" = "GTIN、UPC、EAN、ISBN: %@";
3118+
31163119
/* Country option for a site address. */
31173120
"Gabon" = "ガボン";
31183121

@@ -3657,6 +3660,9 @@ which should be translated separately and considered part of this sentence. */
36573660
/* Error message for invalid format of ITN in Customs screen of Shipping Label flow */
36583661
"Invalid ITN format" = "無効な ITN フォーマットです";
36593662

3663+
/* Error when an empty Identifier is returned from the barcode scanner */
3664+
"Invalid Identifier" = "間違った ID";
3665+
36603666
/* The title of the alert when there is an error with the package name */
36613667
"Invalid Package Name" = "無効な荷物名";
36623668

@@ -5559,6 +5565,12 @@ which should be translated separately and considered part of this sentence. */
55595565
/* Title of the Product Type row on Product main screen */
55605566
"Product type" = "商品タイプ";
55615567

5568+
/* Error message when the scanner found a product but isn't purchasable.%@ is the Identifier code. */
5569+
"Product with Identifier \"%@\" is not purchasable." = "識別子 \"%@\" の商品は購入できません。";
5570+
5571+
/* Error message when the scanner cannot find a matching product.%@ is the Identifier barcode. */
5572+
"Product with Identifier \"%@\" not found." = "識別子 \"%@\" の商品が見つかりません。";
5573+
55625574
/* The instruction text below the scan area in the barcode scanner for product barcode. */
55635575
"ProductBarcodeInputScanner.instructionText" = "商品のバーコードまたは QR コードをスキャン";
55645576

WooCommerce/Resources/zh-Hans.lproj/Localizable.strings

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2024-11-05 09:54:19+0000 */
1+
/* Translation-Revision-Date: 2024-11-12 09:54:04+0000 */
22
/* Plural-Forms: nplurals=1; plural=0; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: zh_CN */
@@ -3113,6 +3113,9 @@ which should be translated separately and considered part of this sentence. */
31133113
/* Hint regarding available/pending balances shown in the WooPayments Deposits View%1$d will be replaced by the number of days balances pend, and will be one of 2/4/5/7. */
31143114
"Funds become available after pending for %1$d days." = "资金将在等待 %1$d 天后到账。";
31153115

3116+
/* Format of the Global Unique Identifier on the Inventory Settings row */
3117+
"GTIN, UPC, EAN, ISBN: %@" = "GTIN、UPC、EAN、ISBN:%@";
3118+
31163119
/* Country option for a site address. */
31173120
"Gabon" = "加蓬";
31183121

@@ -3657,6 +3660,9 @@ which should be translated separately and considered part of this sentence. */
36573660
/* Error message for invalid format of ITN in Customs screen of Shipping Label flow */
36583661
"Invalid ITN format" = "ITN 格式无效";
36593662

3663+
/* Error when an empty Identifier is returned from the barcode scanner */
3664+
"Invalid Identifier" = "无效标识符";
3665+
36603666
/* The title of the alert when there is an error with the package name */
36613667
"Invalid Package Name" = "包裹名称无效";
36623668

@@ -5559,6 +5565,12 @@ which should be translated separately and considered part of this sentence. */
55595565
/* Title of the Product Type row on Product main screen */
55605566
"Product type" = "产品类型";
55615567

5568+
/* Error message when the scanner found a product but isn't purchasable.%@ is the Identifier code. */
5569+
"Product with Identifier \"%@\" is not purchasable." = "无法购买标识符为“%@”的产品。";
5570+
5571+
/* Error message when the scanner cannot find a matching product.%@ is the Identifier barcode. */
5572+
"Product with Identifier \"%@\" not found." = "未找到标识符为“%@”的产品。";
5573+
55625574
/* The instruction text below the scan area in the barcode scanner for product barcode. */
55635575
"ProductBarcodeInputScanner.instructionText" = "扫描产品条形码或二维码";
55645576

WooCommerce/Resources/zh-Hant.lproj/Localizable.strings

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* Translation-Revision-Date: 2024-11-06 11:54:04+0000 */
1+
/* Translation-Revision-Date: 2024-11-13 11:54:04+0000 */
22
/* Plural-Forms: nplurals=1; plural=0; */
33
/* Generator: GlotPress/2.4.0-alpha */
44
/* Language: zh_TW */
@@ -3113,6 +3113,9 @@ which should be translated separately and considered part of this sentence. */
31133113
/* Hint regarding available/pending balances shown in the WooPayments Deposits View%1$d will be replaced by the number of days balances pend, and will be one of 2/4/5/7. */
31143114
"Funds become available after pending for %1$d days." = "款項待確認 %1$d 天後,現在已可提供。";
31153115

3116+
/* Format of the Global Unique Identifier on the Inventory Settings row */
3117+
"GTIN, UPC, EAN, ISBN: %@" = "GTIN、UPC、EAN、ISBN:%@";
3118+
31163119
/* Country option for a site address. */
31173120
"Gabon" = "加彭";
31183121

@@ -3657,6 +3660,9 @@ which should be translated separately and considered part of this sentence. */
36573660
/* Error message for invalid format of ITN in Customs screen of Shipping Label flow */
36583661
"Invalid ITN format" = "ITN 格式無效";
36593662

3663+
/* Error when an empty Identifier is returned from the barcode scanner */
3664+
"Invalid Identifier" = "識別碼無效";
3665+
36603666
/* The title of the alert when there is an error with the package name */
36613667
"Invalid Package Name" = "無效的包裹名稱";
36623668

@@ -5559,6 +5565,12 @@ which should be translated separately and considered part of this sentence. */
55595565
/* Title of the Product Type row on Product main screen */
55605566
"Product type" = "產品類型";
55615567

5568+
/* Error message when the scanner found a product but isn't purchasable.%@ is the Identifier code. */
5569+
"Product with Identifier \"%@\" is not purchasable." = "無法購買識別碼為「%@」的商品。";
5570+
5571+
/* Error message when the scanner cannot find a matching product.%@ is the Identifier barcode. */
5572+
"Product with Identifier \"%@\" not found." = "找不到識別碼為「%@」的商品。";
5573+
55625574
/* The instruction text below the scan area in the barcode scanner for product barcode. */
55635575
"ProductBarcodeInputScanner.instructionText" = "掃描商品條碼或 QR 碼";
55645576

config/Version.Public.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
CURRENT_PROJECT_VERSION = $VERSION_LONG
22
MARKETING_VERSION = $VERSION_SHORT
3-
VERSION_LONG = 21.1.0.1
3+
VERSION_LONG = 21.1.0.2
44
VERSION_SHORT = 21.1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Genieße ein reibungsloseres WooCommerce-Erlebnis! Wir haben die Watch-App optimiert, damit deine Bestelldetails einwandfrei angezeigt werden. Außerdem haben Fehlermeldungen bei Zahlungslesegeräten jetzt ein klareres Erscheinungsbild. Führe für ein besseres Erlebnis sowohl auf deiner Watch als auch auf deinem Smartphone ein Update durch.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Sumérgete en una experiencia de WooCommerce más fluida. Hemos perfeccionado la aplicación Watch para que muestre los detalles de tu pedido a la perfección. Además, hemos añadido mensajes de error más claros para las conexiones de lectores de pagos. Actualízate para tener un pulso empresarial aún mejor en tu muñeca y en tu bolsillo.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Plongez-vous dans une expérience WooCommerce plus fluide ! Nous avons peaufiné l’application Watch pour mettre parfaitement en vitrine les détails de vos commandes. Par ailleurs, nous avons ajouté des messages d’erreur plus clairs pour les connexions de lecteurs de paiement. Mettez à jour pour mieux prendre le pouls de votre activité à votre poignet et dans votre poche.

0 commit comments

Comments
 (0)