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.

Sign up for GitHub

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

Jump to bottom

Updated Spanish and add Catalan translations #153

Merged
merged 22 commits into from
Apr 30, 2024
Merged

Updated Spanish and add Catalan translations #153

merged 22 commits into from
Apr 30, 2024

Conversation

Sappstal
Copy link
Contributor

No description provided.

@ShortDevelopment ShortDevelopment changed the title Updated Spanish and Catalan translations Updated Spanish and add Catalan translations Apr 22, 2024
@Sappstal
Copy link
Contributor Author

Hi! Sorry, I had some trouble with the branch and some files' older versions were duplicated. I'll close this PR and fix it.

@Sappstal Sappstal closed this Apr 22, 2024
@ShortDevelopment ShortDevelopment mentioned this pull request Apr 26, 2024
Closed
ShortDevelopment
ShortDevelopment requested changes Apr 26, 2024
View reviewed changes
src/Resources/values-ca/strings.xml Outdated Show resolved Hide resolved
src/Resources/values-es/strings.xml Outdated Show resolved Hide resolved
@ShortDevelopment
Copy link
Member

@Sappstal No problem!
I recommend you delete your fork AFTER this is merged and create a fresh fork.
Then you can modify stuff by creating a new branch and open a PullRequests for your feature- / patch-branch.
It's also possible to create / edit a file directly in the GitHub UI!

This way you wont have merge-conflicts all the time.

Sappstal and others added 2 commits April 28, 2024 19:27
@Sappstal @ShortDevelopment
Update src/Resources/values-ca/strings.xml
f8a9f8d 
Co-authored-by: Lukas Kurz <lukas@shortdev.de>
@Sappstal @ShortDevelopment
Update src/Resources/values-es/strings.xml
b7a67bb 
Co-authored-by: Lukas Kurz <lukas@shortdev.de>
ShortDevelopment

This comment was marked as outdated.

Sign in to view

ShortDevelopment
ShortDevelopment approved these changes Apr 30, 2024
View reviewed changes
Copy link
Member

@ShortDevelopment ShortDevelopment left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sry, everything is fine!
Thank you for your contribution!

@ShortDevelopment ShortDevelopment enabled auto-merge (squash) April 30, 2024 20:12
@ShortDevelopment ShortDevelopment merged commit 1ecec7b into nearby-sharing:main Apr 30, 2024
3 checks passed
@Sappstal Sappstal deleted the master branch May 1, 2024 21:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ShortDevelopment ShortDevelopment ShortDevelopment approved these changes

Assignees
No one assigned
Labels
area::translation area::UI-UX App user interface type::feature-request New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Sappstal @ShortDevelopment