[go: up one dir, main page]
Skip to content

fix: sync translations from crowdin by frappe-pr-bot [frappe] PR#43796

Bot Dokosrequested to merge
ft-pr-43796 into develop

From: https://github.com/frappe/erpnext/pull/43796
Date: 2024-10-23 08:18:54+05:30

  • fix: Russian translations
  • fix: Polish translations
  • fix: Swedish translations
  • fix: Spanish translations
  • fix: German translations


Diagnostics

Suspicious changes found (Dokos Only / shipping_rule):
* 6a2f3d2dd14fabdc56df3b0f6cb04c6352288643 fix: Russian translations
```diff

```
* b2268487e4bef3ee8be97f756724b9b19c32994e fix: Polish translations
```diff
a/erpnext/locale/ru.po
@@ -1374,6 +867,7 @@ msgstr ""
+#: erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -2350 +1501,13 @@ msgstr "Счет: {0} с валютой: {1} не может быть выбра
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -2354,45 +1517,38 @@ msgstr "Бухгалтерия"
-#: accounts/doctype/shipping_rule/shipping_rule.json
@@ -2524 +1592,127 @@ msgstr ""
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -2526,288 +1719,0 @@ msgid "Accounting Dimensions"
-#: accounts/doctype/shipping_rule/shipping_rule.json
@@ -2993,75 +1864,79 @@ msgstr "Аккаунты заморожены до даты"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -3184,83 +2038,87 @@ msgstr "Настройка счетов"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -11812,5 +8549,0 @@ msgstr "Закупки"
-#: accounts/doctype/shipping_rule/shipping_rule.json
@@ -11818,2 +8551,15 @@ msgstr "Закупки"
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -11966,3 +8663,22 @@ msgstr "CWIP-аккаунт"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -14418,508 +10498,13 @@ msgstr "Организация"
-#: accounts/doctype/shipping_rule/shipping_rule.json
@@ -14927,2 +10512,334 @@ msgstr "Организация"
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -17083,289 +12134 @@ msgstr "Центр затрат"
-#: accounts/doctype/shipping_rule/shipping_rule.json
@@ -17373,2 +12136,149 @@ msgstr "Центр затрат"
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -17636,2 +12528,22 @@ msgstr ""
+#: erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
@@ -17641,61 +12553 @@ msgstr "Страна"
-#: accounts/doctype/shipping_rule_country/shipping_rule_country.json
@@ -23677,3 +16762,56 @@ msgstr ""
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -23683,145 +16821 @@ msgstr "Отключено"
-#: accounts/doctype/shipping_rule/shipping_rule.json
@@ -28342,2 +20335 @@ msgstr "Финансовый год {0} требуется"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -29288,3 +21152,2 @@ msgstr "От времени должно быть меньше времени"
-#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+#: erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -29366 +21207 @@ msgstr "С даты не может быть больше, чем к дате"
-#: accounts/doctype/shipping_rule/shipping_rule.py:74
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:74
@@ -42814,5 +31064,0 @@ msgstr "Чистая всего"
-#: accounts/doctype/shipping_rule/shipping_rule.json
@@ -42829,2 +31073,34 @@ msgstr "Чистая всего"
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -42902,2 +31133,5 @@ msgstr "Вес нетто"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -45839,44 +33559,0 @@ msgid "Overdue Tasks"
-#: accounts/doctype/shipping_rule/shipping_rule.py:198
@@ -45885,3 +33562,37 @@ msgstr ""
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:199
@@ -50765,5 +37369,54 @@ msgstr "Время публикации должно быть после {0}"
-#: accounts/doctype/shipping_rule/shipping_rule_dashboard.py:9
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:9
@@ -53540,35 +39191,3 @@ msgstr "Дата публикации"
-#: accounts/doctype/shipping_rule/shipping_rule_dashboard.py:11
@@ -53590,2 +39199,20 @@ msgstr "Купить"
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:11
@@ -59448,3 +43328,3 @@ msgstr ""
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -61364,23 +44934 @@ msgid "Salary Mode"
-#: accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
@@ -61408,2 +44939,22 @@ msgstr "Продажи"
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule_dashboard.py:10
@@ -61652,16 +45145,16 @@ msgstr "Менеджер продаж"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -62427,37 +45666,43 @@ msgstr ""
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -63504,5 +46560,0 @@ msgstr "Продажа"
-#: accounts/doctype/shipping_rule/shipping_rule.json
@@ -63510,2 +46562,17 @@ msgstr "Продажа"
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -65351,3 +47898,2 @@ msgstr "Поставки"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -65479 +47974 @@ msgstr ""
-#: accounts/doctype/shipping_rule/shipping_rule.py:130
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:129
@@ -65483,3 +47978,5 @@ msgstr "Адрес доставки не имеет страны, которая
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -65489,9 +47986,2 @@ msgstr "Сумма доставки"
-#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -65512,0 +48001,3 @@ msgstr "Доставка округ"
+#. Label of the shipping_rule (Link) field in DocType 'POS Invoice'
+#. Label of the shipping_rule (Link) field in DocType 'Purchase Invoice'
+#. Label of the shipping_rule (Link) field in DocType 'Sales Invoice'
@@ -65514,52 +48005,4 @@ msgstr "Доставка округ"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#. Label of the shipping_rule (Link) field in DocType 'Purchase Order'
+#. Label of the shipping_rule (Link) field in DocType 'Supplier Quotation'
+#. Label of the shipping_rule (Link) field in DocType 'Quotation'
+#. Label of the shipping_rule (Link) field in DocType 'Sales Order'
@@ -65566,0 +48010,2 @@ msgstr "Правило доставки"
+#. Label of the shipping_rule (Link) field in DocType 'Delivery Note'
+#. Label of the shipping_rule (Link) field in DocType 'Purchase Receipt'
@@ -65568,2 +48013,12 @@ msgstr "Правило доставки"
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -65580 +48029 @@ msgstr "Правило доставки"
-#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+#: erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -65584,4 +48033,4 @@ msgstr "Правило Начальные"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -65592 +48041 @@ msgstr "Правило перевозки груза"
-#: accounts/doctype/shipping_rule_country/shipping_rule_country.json
+#: erpnext/accounts/doctype/shipping_rule_country/shipping_rule_country.json
@@ -65596,3 +48045,2 @@ msgstr "Правило Доставка Страна"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -65602,3 +48050,2 @@ msgstr "Метка правила доставки"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#. Label of the shipping_rule_type (Select) field in DocType 'Shipping Rule'
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -65620 +48065 @@ msgstr "Доставка индекс"
-#: accounts/doctype/shipping_rule/shipping_rule.py:134
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:133
@@ -65624 +48069 @@ msgstr "Правило доставки неприменимо для стран
-#: accounts/doctype/shipping_rule/shipping_rule.py:151
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:152
@@ -65628 +48073 @@ msgstr "Правило доставки применимо только для 
-#: accounts/doctype/shipping_rule/shipping_rule.py:146
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:147
@@ -66321 +48691,14 @@ msgstr "Трещина"
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -72291 +53014 @@ msgstr "Там может быть только 1 аккаунт на компа
-#: accounts/doctype/shipping_rule/shipping_rule.py:80
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:81
@@ -73626,3 +53935,2 @@ msgstr "Отслеживать входящие покупки"
-#: accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
+#: erpnext/accounts/doctype/shipping_rule_condition/shipping_rule_condition.json
@@ -77121,41 +56599,2 @@ msgstr "Действителен до"
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -80340 +59015 @@ msgstr ""
-#: accounts/doctype/shipping_rule/shipping_rule.py:204
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.py:204
@@ -80388,2 +59073 @@ msgstr "например, \"Летние каникулы 2019 Предложе
-#: accounts/doctype/shipping_rule/shipping_rule.json
+#: erpnext/accounts/doctype/shipping_rule/shipping_rule.json
```


Suspicious changes found (Create Payment Request in Draft status / create_pr_in_draft_status):
* 6a2f3d2dd14fabdc56df3b0f6cb04c6352288643 fix: Russian translations
```diff

```
* b2268487e4bef3ee8be97f756724b9b19c32994e fix: Polish translations
```diff
a/erpnext/locale/ru.po
@@ -18249,3 +12986,4 @@ msgstr "Создание котировки клиентов"
+#. Label of the create_pr_in_draft_status (Check) field in DocType 'Accounts
```


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-43796

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-43796

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports