-
Notifications
You must be signed in to change notification settings - Fork 6.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix: labels and translations #34896
fix: labels and translations #34896
Conversation
CI is failing because of some translation files with bad structure, which was not caused by this PR. Will this fix in a separate PR: #34897 |
This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
@barredterra Can you resolve conflicts on this PR? |
Done, @deepeshgarg007 |
This pull request has been automatically marked as inactive because it has not had recent activity. It will be closed within 3 days if no further activity occurs, but it only takes a comment to keep a contribution alive :) Also, even if it is closed, you can always reopen the PR when you're ready. Thank you for contributing. |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #34896 +/- ##
===========================================
- Coverage 63.99% 63.77% -0.22%
===========================================
Files 815 814 -1
Lines 60762 60464 -298
===========================================
- Hits 38885 38562 -323
- Misses 21877 21902 +25 |
* fix: german translation of expense claim * fix: consistent labels and translations in project Costing and Billing * fix: german translation of Stock Entry --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 1f08330) # Conflicts: # erpnext/translations/cz.csv # erpnext/translations/de.csv # erpnext/translations/es-PE.csv # erpnext/translations/pl.csv # erpnext/translations/ro.csv # erpnext/translations/sr-SP.csv # erpnext/translations/tr.csv # erpnext/translations/zh-TW.csv
* fix: german translation of expense claim * fix: consistent labels and translations in project Costing and Billing * fix: german translation of Stock Entry --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> (cherry picked from commit 1f08330) # Conflicts: # erpnext/projects/doctype/project/project.json # erpnext/projects/doctype/task/task.json # erpnext/translations/cz.csv # erpnext/translations/de.csv # erpnext/translations/es-PE.csv # erpnext/translations/pl.csv # erpnext/translations/ro.csv # erpnext/translations/sr-SP.csv # erpnext/translations/tr.csv # erpnext/translations/zh-TW.csv
Fix some german translations of Expense Claim
Consistent labels and translations in Project/Task (sections "Start and End Dates", "Costing and Billing")
For example, we used to have "Total Costing Amount (via Timesheets)" in Project and "Total Costing Amount (via Time Sheet)" in Task. This is merged to become "Total Costing Amount (via Timesheet)" in both Project and Task.
The source strings are updated for all languages, while the translation stays the same.
Fix some german translations of Stock Entry