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 nl_NL.po #1709

Merged
merged 2 commits into from
Jul 5, 2019
Merged

Update nl_NL.po #1709

merged 2 commits into from
Jul 5, 2019

Conversation

metbril
Copy link
Contributor

@metbril metbril commented Jul 5, 2019

No description provided.

@metbril
Copy link
Contributor Author

metbril commented Jul 5, 2019

There are some menu item descriptions like &File that have an ampersand in the name. I did not know how to embed those properly in the translation. For now I have left the ampersand away. So &File becomes Bestand and NOT &Bestand. If there are any guidelines or instructions what the ampersand does, I can always add another commit to this PR.

@tessus
Copy link
Collaborator

tessus commented Jul 5, 2019 •
edited
Loading

Yes, the ampersands are there for a reason.

Due to an issue with Electron, the main menu items must include an ampersand to denote the shortcut. @laurent22 would be able to describe this better.

So in fact it must be &Bestand or whatever is the correct shortcut for this menu item in other apps.

Here's the explanation in the source code:

	/* `&` before one of the char in the label name mean, that
	 * <Alt + F> will open this menu. It's needed becase electron
	 * opens the first menu on Alt press if no hotkey assigned.
	 * Issue: https://github.com/laurent22/joplin/issues/934 */

Therefore, please add another commit to include the & for the menu items, but make sure that none use the same character. e.g.

msgid "&View"
msgstr "Beeld"

You can't use the B again, because you have already used it in &Bestand, thus I'd suggest to use the B&eeld. But you would know better, because you have been using menus in nl_NL, so you should know what the default shortcuts for these menu items are....

tessus
tessus requested changes Jul 5, 2019
View reviewed changes
Copy link
Collaborator

@tessus tessus left a comment

Choose a reason for hiding this comment

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

Please add the & back.

@tessus tessus added the translation i18n and l10n label Jul 5, 2019
@metbril
Copy link
Contributor Author

metbril commented Jul 5, 2019

Please add the & back.

Just to prevent misunderstandings, I did not remove it from a previous translation, but simply left it out for the mentioned reason. Those strings were not translated yet.

I'll have a look at other apps and come up with some proper suggestions through an additional commit.

@metbril
Added ampersands to main menu items
9cdf918 
for the nl-nl translation
@metbril
Copy link
Contributor Author

metbril commented Jul 5, 2019

Microsoft Word uses:

  • File: &Bestand
  • Edit: Be&werken
  • View: Beel&d
  • Tools: E&xtra
  • Help: &Help

52791-sup-52605-002

Added commit.

@tessus
Copy link
Collaborator

tessus commented Jul 5, 2019

Awesome, thank you for your contribution.

Those strings were not translated yet.

Yep, but this means that the strings with the ampersands were used. After your change the ampersands were gone. Anyway, all good. Thanks again.

@tessus tessus merged commit 966aca7 into laurent22:master Jul 5, 2019
tessus added a commit to tessus/joplin that referenced this pull request Dec 5, 2020
@tessus
Update Mermaid: 8.8.1 -> 8.8.4
42fcd36 
```
Release Notes 8.8.4

    Re-align gantt chart dateFormat table with spaces (laurent22#1764) @AloisMahdal
    Docs/update edit this page (laurent22#1774) @sy-records
    Fixed typo in the docs (laurent22#1780) @manicki
    Move babel-eslint to devDependencies (laurent22#1772) @glensc
    Add Doscy to list of integrations (laurent22#1784) @gwatts
    Changed regex for multi-line state notes (laurent22#1773) @tomatoman25
    Add different id generators (laurent22#1787) @julianbei
    Bump highlight.js from 9.18.1 to 9.18.5 (laurent22#1789) @dependabot
    Fixed markdown error in Relationship Syntax (laurent22#1796) @kciter
    remove classDiagram duplicate options (laurent22#1786) @JiChao99
    Update copyright years (laurent22#1805) @BastianZim

🐛 Bug Fixes

    Add sans-serif to default font settings (laurent22#1776) @GDFaber
    ignore build files in dist folder (laurent22#1777) @GDFaber
    Narrow down console logging when flowchart subgraphs are added (laurent22#1782) @GDFaber
    Apply style settings to subgraphs in "flowchart" diagrams (laurent22#1781) @GDFaber

Release Notes 8.8.3

    Fix styling of links for new beta flowchart (laurent22#1730) @knsv
    Fix typo in pie.md (laurent22#1705) @hwine
    Fixing broken links and misspellings (laurent22#1727) @deining
    Fixed empty code examples (laurent22#1729) @Eraledm
    README: use stateDiagram-v2 (laurent22#1728) @alexislefebvre
    laurent22#1724 Adding fontawesome to edge labels (laurent22#1731) @knsv
    Fix broken links in gantt.md (laurent22#1703) @wontonst
    Replace fregante/setup-git-token with setup-git-user (laurent22#1735) @fregante
    Updated docs (laurent22#1739) @BastianZim
    1740 nested subgraps directions (laurent22#1741) @knsv
    Switching to Docsify and adding search (laurent22#1746) @NeilCuzon
    Fixed bad tertiary operator (laurent22#1743) @lishid
    fix broken links in README (laurent22#1749) @levlas

Release Notes 8.8.2

    1704 Revert to original behavior of nodes and subgraphs (laurent22#1709) @knsv

    There is some ambiguity about what subgraph a node belongs to when it appears in several subgraphs. Should it stick to the first subgraph it appears in, or should the last subgraph it gets added to be the one it belongs to. With this change the original behavior is retained.
```
laurent22 pushed a commit that referenced this pull request Dec 9, 2020
@tessus
Desktop, Mobile: Update Mermaid: 8.8.1 -> 8.8.4 (#4193)
a278c2c 
```
Release Notes 8.8.4

    Re-align gantt chart dateFormat table with spaces (#1764) @AloisMahdal
    Docs/update edit this page (#1774) @sy-records
    Fixed typo in the docs (#1780) @manicki
    Move babel-eslint to devDependencies (#1772) @glensc
    Add Doscy to list of integrations (#1784) @gwatts
    Changed regex for multi-line state notes (#1773) @tomatoman25
    Add different id generators (#1787) @julianbei
    Bump highlight.js from 9.18.1 to 9.18.5 (#1789) @dependabot
    Fixed markdown error in Relationship Syntax (#1796) @kciter
    remove classDiagram duplicate options (#1786) @JiChao99
    Update copyright years (#1805) @BastianZim

🐛 Bug Fixes

    Add sans-serif to default font settings (#1776) @GDFaber
    ignore build files in dist folder (#1777) @GDFaber
    Narrow down console logging when flowchart subgraphs are added (#1782) @GDFaber
    Apply style settings to subgraphs in "flowchart" diagrams (#1781) @GDFaber

Release Notes 8.8.3

    Fix styling of links for new beta flowchart (#1730) @knsv
    Fix typo in pie.md (#1705) @hwine
    Fixing broken links and misspellings (#1727) @deining
    Fixed empty code examples (#1729) @Eraledm
    README: use stateDiagram-v2 (#1728) @alexislefebvre
    #1724 Adding fontawesome to edge labels (#1731) @knsv
    Fix broken links in gantt.md (#1703) @wontonst
    Replace fregante/setup-git-token with setup-git-user (#1735) @fregante
    Updated docs (#1739) @BastianZim
    1740 nested subgraps directions (#1741) @knsv
    Switching to Docsify and adding search (#1746) @NeilCuzon
    Fixed bad tertiary operator (#1743) @lishid
    fix broken links in README (#1749) @levlas

Release Notes 8.8.2

    1704 Revert to original behavior of nodes and subgraphs (#1709) @knsv

    There is some ambiguity about what subgraph a node belongs to when it appears in several subgraphs. Should it stick to the first subgraph it appears in, or should the last subgraph it gets added to be the one it belongs to. With this change the original behavior is retained.
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tessus tessus tessus approved these changes

Assignees
No one assigned
Labels
translation i18n and l10n
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@metbril @tessus