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

Norwegian translation #201

Merged
merged 10 commits into from
Sep 20, 2017
Merged

Conversation

DandelionSprout
Copy link
Contributor

I created a Norwegian translation for DNS66, based on what I could see of how the other translations on GitHub did it.

Note: Language ISO codes for Norwegian are slightly messy, so I wasn't sure whether to name the folder "values-nb" or "values-no" in order for the translation to be used for Norwegian Android users.

@julian-klode
Copy link
Owner

Hmm, complicated. From the ISO side,

no – inclusive code
nb – Bokmål
nn – Nynorsk

But I'm not sure how Android maps those.

@julian-klode
Copy link
Owner

CI is failing, there's some issues in the xml. Please push updates and keep a look on the CI report here.

@DandelionSprout
Copy link
Contributor Author

DandelionSprout commented Sep 20, 2017

The CI report claims that a "resources" element is unclosed, despite how I can see that it indeed is closed (Lines 1 and 108 in the strings.xml).

It's written in the Bokmål standard, which rules out "nn". While I presume that both "no" and "nb" can be used, I suppose you could use "nb" for safety's sake?

@julian-klode
Copy link
Owner

I have not tried it, but maybe I could just symlink values-no and values-nn to values-nb in the meantime, so there's no fallback to English.

@julian-klode
Copy link
Owner

Here's the problem:

    <string name="translator_credits"/>Imre Kristoffer Eilertsen</string>

You are closing string twice, and it now matches the </string> to <resources> and complains that it should be closed with </resources> instead. Which is not particularly useful, as the problem is that the string is closed in the opening tag.

Seeing if removing an empty line at the bottom will fix the CI issue.
@DandelionSprout
Copy link
Contributor Author

Ah. I see. Brb.

@julian-klode
Copy link
Owner

Note that is says:

+    <!-- Translate with something like <Language> Translation: Your Name -->

It seems there's only your name in it? That looks weird in the about view.

@DandelionSprout
Copy link
Contributor Author

I think I should've got it right by now. I hope.

@julian-klode julian-klode merged commit 7f975ac into julian-klode:master Sep 20, 2017
@codecov-io
Copy link

Codecov Report

Merging #201 into master will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #201      +/-   ##
==========================================
+ Coverage   27.71%   27.72%   +0.01%     
==========================================
  Files          25       25              
  Lines        1761     1760       -1     
  Branches      213      213              
==========================================
  Hits          488      488              
+ Misses       1256     1255       -1     
  Partials       17       17
Impacted Files Coverage Δ
...va/org/jak_linux/dns66/main/WhitelistFragment.java 0% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fbd5404...2b5a458. Read the comment docs.

@julian-klode julian-klode added this to the 0.5.5 milestone Sep 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants