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

Update Dutch translation #297

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update Dutch translation #297

wants to merge 3 commits into from
+13 −14

Conversation

feikedonia
Copy link
Contributor

No description provided.

@jackpot51
Copy link
Member

Can you fix the conflicts here?

@feikedonia
Copy link
Contributor Author

I don't know what to do ...

@feikedonia
Copy link
Contributor Author 

select-all = Alles selecteren
find = Zoeken
<<<<<<< master
find-in-project = Project doorzoeken...
=======
find-in-project = Project doorzoeken
replace = Vervangen
>>>>>>> master
spell-check = Spellingscontrole...

## View
view = Beeld

I don't know what it is telling me

@leviport
Copy link
Member

That is the conflict that needs to be resolved. This documentation might be helpful: https://git.github.io/git-reference/branching/#merge-conflicts

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackpot51 jackpot51 jackpot51 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@feikedonia @jackpot51 @leviport