Skip to content
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

Merged
merged 6 commits into from
May 29, 2023

Conversation

barredterra
Copy link
Collaborator

@barredterra barredterra commented Apr 17, 2023

  • 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

no-docs

@barredterra barredterra changed the title german translations fix: translations Apr 17, 2023
@barredterra barredterra changed the title fix: translations fix: labels and translations Apr 17, 2023
@barredterra
Copy link
Collaborator Author

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

@barredterra barredterra requested a review from ankush April 17, 2023 20:37
@stale
Copy link

stale bot commented May 2, 2023

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.

@stale stale bot added the inactive label May 2, 2023
@deepeshgarg007
Copy link
Member

@barredterra Can you resolve conflicts on this PR?

@barredterra barredterra self-assigned this May 6, 2023
@barredterra barredterra removed their assignment May 6, 2023
@barredterra
Copy link
Collaborator Author

Done, @deepeshgarg007

@stale
Copy link

stale bot commented May 21, 2023

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.

@stale stale bot added the inactive label May 21, 2023
@barredterra barredterra self-assigned this May 21, 2023
@barredterra barredterra removed their assignment May 24, 2023
@codecov
Copy link

codecov bot commented May 24, 2023

Codecov Report

Merging #34896 (f22467a) into develop (336ff5b) will decrease coverage by 0.22%.
The diff coverage is n/a.

❗ Current head f22467a differs from pull request most recent head b5acf0d. Consider uploading reports for the commit b5acf0d to get more accurate results

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     

see 14 files with indirect coverage changes

@deepeshgarg007 deepeshgarg007 merged commit 1f08330 into frappe:develop May 29, 2023
9 of 10 checks passed
@barredterra barredterra deleted the german-translations branch May 29, 2023 10:53
mergify bot pushed a commit that referenced this pull request Jun 6, 2023
* 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
mergify bot pushed a commit that referenced this pull request Jun 6, 2023
* 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
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 2, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants