nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-07 07:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,770 Commits 490 Branches 1,768 Tags
v13.48.1
Commit Graph

236 Commits

Author SHA1 Message Date
Raffael Meyer
10ac8d6e67 chore: resolve merge conflicts 2022-12-15 00:11:35 +01:00
barredterra
b13ee4fc8c fix: translation for warning on Overbilling/-receipt/-delivery 
(cherry picked from commit 36997d9788)

# Conflicts:
#	erpnext/controllers/status_updater.py
#	erpnext/translations/de.csv
 2022-12-14 17:55:29 +00:00
barredterra
550f5f280c chore: resolve merge conflicts 2022-11-07 13:15:38 +01:00
Raffael Meyer
a8bf17e560 chore: add german translations (#32846) 
Mostly for balance sheet

(cherry picked from commit d2b6490bca)

# Conflicts:
#	erpnext/translations/de.csv
 2022-11-06 04:53:43 +00:00
Florian HENRY
39ce3756c8 chore: fr translation 2022-10-06 22:39:40 +02:00
Florian HENRY
69b3145be4 chore: update fr translation 
(cherry picked from commit 299da5d596)
 2022-08-25 07:37:26 +00:00
Florian HENRY
5e1d367d7a chore: update fr translation 
(cherry picked from commit 1f6f2747d4)
 2022-08-25 07:37:25 +00:00
Florian HENRY
10f0baf6ad chore: update french translation 
(cherry picked from commit 264f98af14)
 2022-08-25 07:37:25 +00:00
marination
6fbb06a878 chore: Merge Conflict 2022-07-27 17:30:46 +05:30
HENRY Florian
89348c1bb4 fix: update fr translations (#31687) 
* fix: update fr translations

* fix: update fr translation

* fix: update fr translation

* chore: Replace apostrophe encoding by symbol

Co-authored-by: marination <maricadsouza221197@gmail.com>
(cherry picked from commit cc1f837685)

# Conflicts:
#	erpnext/translations/fr.csv
 2022-07-27 11:52:03 +00:00
mergify[bot]
95e1021caf fix: update fr translations (backport #31526) (#31666) 
fix: update fr translations (#31526)

* fix: update fr translations

* fix: update fr translations

* fix: update fr translations

* fix: update fr translations

* chore: Update french translation

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 3ba0d6cc5c)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
 2022-07-21 18:11:32 +05:30
mergify[bot]
7d50f8798a Update de.csv (backport #31596) (#31667) 
Update de.csv (#31596)

IN,IM to IN,EIN

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 8629d01dd5)

Co-authored-by: billy995 <48571007+billy995@users.noreply.github.com>
 2022-07-21 18:10:46 +05:30
mergify[bot]
794fd0819f fix: correct Brazilian portuguese translations (backport #31498) (#31660) 
fix: correct Brazilian portuguese translations (#31498)

* fix brazilian portuguese translations

* minor adjustments

* fix minor adjustments

* fix: remove legacy pt_br.csv

* chore: Fix translation quotation marks

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit d30f8387d9)

Co-authored-by: Marco Fonseca <62901164+treasuryesc@users.noreply.github.com>
 2022-07-21 13:47:18 +05:30
mergify[bot]
12d3d6ab49 fix: added Section translation in German for Salary Slip (backport #31608) (#31616) 
Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2022-07-18 13:41:42 +05:30
mergify[bot]
8b78a122e7 fix: update ru translate (backport #31404) (#31417) 
* fix: update ru translate (#31404)

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

fix logic

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

(cherry picked from commit ce1b4e40a1)

# Conflicts:
#	erpnext/translations/ru.csv

* chore: Fix merge conflicts

Co-authored-by: Vladislav <integration.into.society@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-06-21 20:14:13 +05:30
mergify[bot]
5d0f271451 fix: update fr translation (backport #31232) (#31334) 
* fix: update fr translation (#31232)

* update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* fix:update fr translation

* Update fr.csv

update typo

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* update fr translation

* fix: Use elision instead of HTML code equivalent

* fix: Use elision instead of HTML code equivalent (pt 2)

* fix: Use elision/single quote instead of HTML code equivalent (pt 3)

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit 83367bfe5e)

* fix: Accidental '=' instead of comma

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-06-13 12:18:46 +05:30
Deepesh Garg
309bdf257d Merge pull request #31139 from frappe/mergify/bp/version-13-hotfix/pr-31102 
feat: Add german translations (backport #31102)
 2022-06-10 12:42:10 +05:30
Deepesh Garg
95f8784ea9 chore: Resolve conflicts 2022-06-10 10:59:46 +05:30
mergify[bot]
77e4755c1f fix: update ru translate (backport #31200) (#31304) 
* fix: update ru translate (#31200)

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

fix logic

* Update ru.csv

* Update ru.csv

* Update ru.csv

(cherry picked from commit 2675751d6c)

# Conflicts:
#	erpnext/translations/ru.csv

* fix: Merge conflicts

Co-authored-by: Vladislav <integration.into.society@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-06-09 19:16:48 +05:30
meaziz
9347cbbc9f chore: Asset Arabic translation Fix (#31221) 
Update ar.csv

Fix Translation arabic translation that caused an error when submitting an asset if user language was arabic
 2022-06-09 17:43:31 +05:30
mergify[bot]
7767dc1ee3 chore: update translation fr for BOM (backport #31126) (#31165) 
* chore: update translation fr for BOM (#31126)

* fix: update translation

* fix: fr translation for BOM

(cherry picked from commit ce8e05146e)

* chore: format

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-05-29 22:10:46 +05:30
mergify[bot]
d891394dc8 fix: Improve button labels in Warehouse (backport #31101) (#31150) 
* style: format warehouse js

(cherry picked from commit c704ad889d)

* fix: improve labels, simplify logic

(cherry picked from commit a6ddd86d31)

* fix: german translations

(cherry picked from commit 9356eb11de)

* fix: remove unsupported arguments

Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
(cherry picked from commit e77c379cbb)

* refactor: set queries during setup

(cherry picked from commit 1b16eb7667)

* style: format

(cherry picked from commit 1e9f9c452f)

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
 2022-05-27 12:11:12 +05:30
barredterra
a3f2cf3917 feat: Add german translations 
(cherry picked from commit 2388d86623)

# Conflicts:
#	erpnext/translations/de.csv
 2022-05-26 06:20:15 +00:00
mergify[bot]
ddee0893e6 fix translation German "Designation" (backport #31082) (#31093) 
fix translation German "Designation" (#31082)

changed "Bezeichnung" to "Position" as the is more precice in the field of employment which erpnext refers to here

(cherry picked from commit 348a674df9)

Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
 2022-05-23 12:02:30 +05:30
Marica
3abf26428c fix: Merge Conflicts 2022-05-16 17:13:00 +05:30
Vladislav
f797005384 fix(translations): Update ru translations (#30992) 
* fix incorrect translation

* Update ru.csv

* Update ru.csv

* Update erpnext/translations/ru.csv

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
(cherry picked from commit af1eab5d54)

# Conflicts:
#	erpnext/translations/ru.csv
 2022-05-16 09:49:23 +00:00
mergify[bot]
6adeaa1de6 test: check translation files (backport #31006) (#31007) 
This is an automatic backport of pull request #31006 done by [Mergify](https://mergify.com).


---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the [documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on `<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com/) you can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>
 2022-05-16 06:13:32 +00:00
barredterra
b9bda04a83 fix: german translations for Employee 
(cherry picked from commit 02b38a439f)
 2022-05-13 06:54:02 +00:00
mergify[bot]
8335ca6331 fix: translation (#30781) (#30783) 
fixed the short word for March in german language

(cherry picked from commit 43c1d63ab2)

Co-authored-by: Wolfram Schmidt <wolfram.schmidt@phamos.eu>
 2022-04-22 17:39:15 +05:30
mergify[bot]
b585262842 fix: update translation (#30725) (#30776) 
* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

(cherry picked from commit e088e65871)

Co-authored-by: Vladislav <integration.into.society@gmail.com>
 2022-04-22 11:18:29 +05:30
HENRY Florian
fb127da489 fix: update translation (#30716) 
* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

(cherry picked from commit e6aa28ea14)
 2022-04-14 16:07:40 +00:00
mergify[bot]
e91dea62b8 fix: update translation (#30654) (#30676) 
(cherry picked from commit 03c631d723)

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
 2022-04-11 14:48:17 +05:30
mergify[bot]
4b77a4de28 fix: update translation (backport #30474) (#30593) 
* fix: update translation (#30474)

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

* fix: update translation

(cherry picked from commit 4895761d89)

* chore: fix translation csv file

Co-authored-by: HENRY Florian <florian.henry@open-concept.pro>
Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-04-07 13:24:48 +05:30
Samuel Danieli
29fa902b33 feat: add German translations 
(cherry picked from commit bbe5739547)
 2022-03-16 05:24:45 +00:00
Suraj Shetty
cebe8888af fix: Email translations 
(cherry picked from commit aaa84a21ba)
 2022-02-23 05:31:15 +00:00
mergify[bot]
43bc612f07 fix: wrong german translation of abbreviation PAN (#28804) 
Wrong german translation of abbreviation: PAN

(cherry picked from commit f043f59324)

Co-authored-by: Michael Köller <michael.koeller@greenbytes.de>
 2021-12-09 11:39:05 +05:30
Frappe PR Bot
7915a3acae chore: Update translations (#23856) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-11-09 18:37:28 +05:30
Frappe PR Bot
f4e410af5f chore: Update translations (#23787) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-11-04 12:17:40 +05:30
Frappe PR Bot
33881fd7e2 chore: Update translations (#23717) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
 2020-10-25 12:36:35 +05:30
Frappe PR Bot
083f3fd981 chore: Update translations (#23677) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-10-19 11:19:27 +05:30
Frappe PR Bot
d8ddc321f8 chore: Update translations (#23577) 
Co-authored-by: frappe <frappe@scw-dazzling-elgamal>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-10-14 10:28:21 +05:30
justmejust
ed779a416c Update ar.csv (#23490) 
these changes made to the file is critical and important for Arabic user of the this software .the changes made to make appropriate and more correct meaning fro example in the Blanket Orders from Costumers the previous translation meaning امر بطانية) ) which mean you have an order to get ta Blanket which used when  you want to sleep.
so i decided to make this changes and will continue update this translation file in the future.
 2020-10-13 11:46:02 +05:30
Suraj Shetty
5dc0432cff chore: Update translations 2020-10-03 08:52:07 +00:00
Suraj Shetty
70c06512d2 chore: Update translations 2020-10-02 03:57:15 +00:00
totolouis
596b3dbeee fix: translation from HTML code to apostrophe 
For French translation, the apostrophe was in HTML code and thus is not displayed correctly.
Issue reported a few times: https://discuss.erpnext.com/t/apostrophe-is-showed-as-39-is-not-interpreted/49954/3 and https://discuss.erpnext.com/t/mega-thread-version-12-release-bugs/50987/49.
 2020-05-27 22:51:03 -07:00
Suraj Shetty
7c5f43d794 chore: Update Translations 2020-04-29 18:11:03 +00:00
Suraj Shetty
4632379636 chore: Update Translations 2020-04-28 18:04:41 +00:00
Suraj Shetty
edc31d51da chore: Add CSV imported translations 2020-03-10 20:51:01 +05:30
Suraj Shetty
b868c379a7 chore: Update translations 2020-03-10 18:21:33 +05:30
Frappe PR Bot
eb2f79b16e feat: Updated translation (#20784) 2020-03-02 16:52:42 +05:30