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

Add capital info for Canary Islands #233

Merged
merged 2 commits into from
Apr 2, 2020
Merged

Add capital info for Canary Islands #233

merged 2 commits into from
Apr 2, 2020

Conversation

josealberto4444
Copy link
Collaborator

@josealberto4444 josealberto4444 commented Mar 26, 2020

Fixes #226 and a typo.

Edit: maybe we should wait until we get a reply in #229 and #230.

@axelboc
Copy link
Collaborator

axelboc commented Mar 26, 2020

Little typo in French: partagée should be partagé.

Also, sorry but now that I read it again, I think entre les deux villes de can be simplified to entre les villes de. It's clear that there are two cities. (A bit like when we had both "Formerly" and a date in the past in the capital info of Kazakhstan.)

@axelboc
Copy link
Collaborator

axelboc commented Mar 26, 2020

No need to wait for the translations. We can fix them later on. I'll hold off publishing a version 3.3 of the deck, though.

@aplaice
Copy link
Collaborator

aplaice commented Mar 26, 2020

In the German, I think we can skip the "(Autonomen Gemeinschaft der)" part.

(I had intended it to be an optional part, which I wasn't sure whether to include ("Autonomous Community of"), though didn't really make it clear — sorry!)

@Erim24
Copy link
Collaborator

Erim24 commented Mar 30, 2020

In the German, I think we can skip the "(Autonomen Gemeinschaft der)" part.

(I had intended it to be an optional part, which I wasn't sure whether to include ("Autonomous Community of"), though didn't really make it clear — sorry!)

I was thinking about your comment about skipping the "(Autonomen Gemeinschaft der)" and I think it's good to keep it. Having it in there keeps it clear that it is not a sovereign country (at least I wasn't sure about that anymore). Having it there doesn't really tell that it isn't a sovereign country, but it is a remainder that there "was something"

@axelboc
Copy link
Collaborator

axelboc commented Apr 2, 2020

FYI, I figured out why I couldn't force push, I was using git with a different account on my machine... I'll quickly fix the French translation, rebase and then merge. Thanks @josealberto4444!

@axelboc
Copy link
Collaborator

axelboc commented Apr 2, 2020

Oh and I've removed the parens around Autonomen Gemeinschaft der. 👍

@axelboc axelboc merged commit f00552a into anki-geo:master Apr 2, 2020
@axelboc
Copy link
Collaborator

axelboc commented Apr 2, 2020

Arf, I missed the typo that @Erim24 had identified in #229. I've just pushed a fix to master.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

Add capital info for Canary Islands
4 participants