Resolve pr merge conflicts develop with main #2675
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Update translation files Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ Translation: pgRouting/pgRouting
Currently translated at 99.9% (5168 of 5173 strings) Co-authored-by: Celia Virginia Vergara Castillo <[email protected]> Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ Translation: pgRouting/pgRouting
Currently translated at 99.9% (5168 of 5173 strings) Co-authored-by: Zuochenwei <[email protected]> Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ Translation: pgRouting/pgRouting
Currently translated at 99.9% (5168 of 5173 strings) Co-authored-by: DeepL <[email protected]> Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/ Translation: pgRouting/pgRouting
Currently translated at 99.9% (5172 of 5173 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Currently translated at 99.9% (5172 of 5173 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Currently translated at 100.0% (5173 of 5173 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Currently translated at 100.0% (5173 of 5173 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/
Currently translated at 89.4% (4650 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 89.4% (4650 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 90.3% (4697 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/es/
Currently translated at 99.5% (5175 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Currently translated at 99.5% (5178 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Currently translated at 99.5% (5178 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Currently translated at 99.9% (5197 of 5199 strings) Translation: pgRouting/pgRouting Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/zh_Hans/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate. Co-authored-by: Weblate <[email protected]> Translate-URL: https://weblate.osgeo.org/projects/pgrouting/pgrouting-develop/ Translation: pgRouting/pgRouting
robe2
approved these changes
Oct 24, 2024
cvvergara
requested review from
sanak,
rahulworld,
omshinde,
iosefa and
krashish8
and removed request for
rahulworld
krashish8
approved these changes
Oct 25, 2024
iosefa
approved these changes
Oct 29, 2024
sanak
approved these changes
Oct 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR #2674 has conflicts
@pgRouting/admins