Skip to content

Commit

Permalink
Merge branch 'master' of github.com:laurent22/joplin
Browse files Browse the repository at this point in the history
  • Loading branch information
laurent22 committed Apr 11, 2018
2 parents 5deb8cf + d557409 commit ca112ec
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 30 deletions.
37 changes: 23 additions & 14 deletions CliClient/locales/da_DK.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Joplin-CLI 1.0.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Last-Translator: Morten Juhl-Johansen Zölde-Fejér <mjjzf@syntaktisk.dk>"
"Language-Team: \n"
"Language: da_DK\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -127,7 +127,7 @@ msgid ""
"Manages E2EE configuration. Commands are `enable`, `disable`, `decrypt`, "
"`status` and `target-status`."
msgstr ""
"Udfører E2EEE konfiguration. Kommandoer er `enable`(aktiver), "
"Udfører E2EE konfiguration. Kommandoer er `enable`(aktiver), "
"`disable`(sluk), `decrypt`(dekrypter), `status` og `target-status` (modtager-"
"status)."

Expand Down Expand Up @@ -163,7 +163,7 @@ msgstr "Rediger note."
msgid ""
"No text editor is defined. Please set it using `config editor <editor-path>`"
msgstr ""
"Ingen tekst editor er valgt. Vælg en ved at indstille `config editor "
"Ingen teksteditor er valgt. Vælg en ved at indstille `config editor "
"<editor-path>`"

msgid "No active notebook."
Expand Down Expand Up @@ -412,13 +412,13 @@ msgstr "Godkendelse blev ikke fuldført (modtog ikke godkendelses token)."

msgid ""
"To allow Joplin to synchronise with Dropbox, please follow the steps below:"
msgstr ""
msgstr "For at Joplin kan synkronisere med Dropbox, skal man igennem nedenstående trin:"

msgid "Step 1: Open this URL in your browser to authorise the application:"
msgstr ""
msgstr "Trin 1: Åben denne URL i din browser for at autorisere applikationen:"

msgid "Step 2: Enter the code provided by Dropbox:"
msgstr ""
msgstr "Trin 2: Indtast koden, som er oplyst af Dropbox:"

#, javascript-format
msgid "Not authentified with %s. Please provide any missing credentials."
Expand All @@ -433,8 +433,8 @@ msgid ""
"taking place, you may delete the lock file at \"%s\" and resume the "
"operation."
msgstr ""
"Låse fil er allerede i brug. Hvis du ved at ingen synkronisering er i gang "
"kan du slette låse-filen \"%s\" og genoptage synkroniseringen."
"Låsefil er allerede i brug. Hvis du ved at ingen synkronisering er i gang "
"kan du slette låsefilen \"%s\" og genoptage synkroniseringen."

#, javascript-format
msgid "Synchronisation target: %s (%s)"
Expand Down Expand Up @@ -689,7 +689,7 @@ msgid "Save"
msgstr "Gem"

msgid "Submit"
msgstr ""
msgstr "Gem"

msgid ""
"Disabling encryption means *all* your notes and attachments are going to be "
Expand Down Expand Up @@ -764,8 +764,10 @@ msgstr ""

msgid ""
"For more information about End-To-End Encryption (E2EE) and advices on how "
"to enable it please check the documentation:"
"to enable it please check the documentation"
msgstr ""
"Se dokumentationen for nærmere oplysninger om End-To-End-kryptering (E2EE) "
"og vejledning om hvordan det skal opsættes"

msgid "Status"
msgstr "Status"
Expand Down Expand Up @@ -885,7 +887,7 @@ msgid "OneDrive Login"
msgstr "OneDrive login"

msgid "Dropbox Login"
msgstr ""
msgstr "Dropbox Login"

msgid "Options"
msgstr "Muligheder"
Expand Down Expand Up @@ -923,7 +925,7 @@ msgid "Unknown flag: %s"
msgstr "Ukendt flag: %s"

msgid "Dropbox"
msgstr ""
msgstr "Dropbox"

msgid "File system"
msgstr "Fil system"
Expand Down Expand Up @@ -1313,10 +1315,10 @@ msgid "Cancel synchronisation"
msgstr "Afbryd synkronisering"

msgid "New tags:"
msgstr ""
msgstr "Nye tags:"

msgid "Type new tags or select from list"
msgstr ""
msgstr "Indtast nye tags eller vælg fra listen"

msgid "Joplin website"
msgstr "Joplin hjemmeside"
Expand All @@ -1342,6 +1344,13 @@ msgstr "Kodeord må ikke være tomt"
msgid "Enable"
msgstr "Tænd"

msgid ""
"For more information about End-To-End Encryption (E2EE) and advices on how "
"to enable it please check the documentation:"
msgstr ""
"Se dokumentationen for nærmere oplysninger om End-To-End-kryptering (E2EE) "
"og vejledning om hvordan det skal opsættes_"

#, javascript-format
msgid "The notebook could not be saved: %s"
msgstr "Notesbogen kan ikke gemmes: %s"
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@ For a more technical description, mostly relevant for development or to review t

Any kind of file can be attached to a note. In Markdown, links to these files are represented as a simple ID to the resource. In the note viewer, these files, if they are images, will be displayed or, if they are other files (PDF, text files, etc.) they will be displayed as links. Clicking on this link will open the file in the default application.

Resources that are not attached to any note will be automatically deleted after a day or two.

# Notifications

On the desktop and mobile apps, an alarm can be associated with any to-do. It will be triggered at the given time by displaying a notification. How the notification will be displayed depends on the operating system since each has a different way to handle this. Please see below for the requirements for the desktop applications:
Expand Down
15 changes: 8 additions & 7 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,7 @@ <h1 id="encryption">Encryption</h1>
<p>For a more technical description, mostly relevant for development or to review the method being used, please see the <a href="https://joplin.cozic.net/spec">Encryption specification</a>.</p>
<h1 id="attachments-resources">Attachments / Resources</h1>
<p>Any kind of file can be attached to a note. In Markdown, links to these files are represented as a simple ID to the resource. In the note viewer, these files, if they are images, will be displayed or, if they are other files (PDF, text files, etc.) they will be displayed as links. Clicking on this link will open the file in the default application.</p>
<p>Resources that are not attached to any note will be automatically deleted after a day or two.</p>
<h1 id="notifications">Notifications</h1>
<p>On the desktop and mobile apps, an alarm can be associated with any to-do. It will be triggered at the given time by displaying a notification. How the notification will be displayed depends on the operating system since each has a different way to handle this. Please see below for the requirements for the desktop applications:</p>
<ul>
Expand Down Expand Up @@ -463,14 +464,14 @@ <h1 id="localisation">Localisation</h1>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/hr.png" alt=""></td>
<td>Croatian</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/hr_HR.po">hr_HR</a></td>
<td>Hrvoje Mandić <a href="&#x6d;&#x61;&#105;&#x6c;&#116;&#x6f;&#58;&#116;&#114;&#x62;&#117;&#104;&#x6f;&#109;&#64;&#x6e;&#101;&#116;&#46;&#104;&#x72;">&#116;&#114;&#x62;&#117;&#104;&#x6f;&#109;&#64;&#x6e;&#101;&#116;&#46;&#104;&#x72;</a></td>
<td>Hrvoje Mandić <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#116;&#114;&#x62;&#x75;&#104;&#x6f;&#x6d;&#64;&#x6e;&#x65;&#116;&#x2e;&#x68;&#114;">&#116;&#114;&#x62;&#x75;&#104;&#x6f;&#x6d;&#64;&#x6e;&#x65;&#116;&#x2e;&#x68;&#114;</a></td>
<td>62%</td>
</tr>
<tr>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/cz.png" alt=""></td>
<td>Czech</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/cs_CZ.po">cs_CZ</a></td>
<td>Lukas Helebrandt <a href="&#109;&#x61;&#x69;&#108;&#116;&#111;&#58;&#108;&#x75;&#107;&#x61;&#115;&#64;&#x61;&#105;&#121;&#97;&#46;&#x63;&#122;">&#108;&#x75;&#107;&#x61;&#115;&#64;&#x61;&#105;&#121;&#97;&#46;&#x63;&#122;</a></td>
<td>Lukas Helebrandt <a href="&#x6d;&#x61;&#105;&#108;&#x74;&#111;&#58;&#x6c;&#x75;&#x6b;&#97;&#x73;&#64;&#x61;&#105;&#121;&#97;&#x2e;&#99;&#122;">&#x6c;&#x75;&#x6b;&#97;&#x73;&#64;&#x61;&#105;&#121;&#97;&#x2e;&#99;&#122;</a></td>
<td>97%</td>
</tr>
<tr>
Expand All @@ -484,7 +485,7 @@ <h1 id="localisation">Localisation</h1>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/de.png" alt=""></td>
<td>Deutsch</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/de_DE.po">de_DE</a></td>
<td>Tobias Grasse <a href="&#x6d;&#97;&#105;&#108;&#116;&#x6f;&#x3a;&#109;&#x61;&#x69;&#108;&#64;&#x74;&#x6f;&#x62;&#x69;&#x61;&#115;&#45;&#103;&#x72;&#97;&#115;&#x73;&#101;&#x2e;&#x6e;&#x65;&#x74;">&#109;&#x61;&#x69;&#108;&#64;&#x74;&#x6f;&#x62;&#x69;&#x61;&#115;&#45;&#103;&#x72;&#97;&#115;&#x73;&#101;&#x2e;&#x6e;&#x65;&#x74;</a></td>
<td>Tobias Grasse <a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#58;&#x6d;&#x61;&#x69;&#108;&#64;&#x74;&#x6f;&#x62;&#105;&#97;&#115;&#x2d;&#x67;&#x72;&#97;&#x73;&#x73;&#x65;&#x2e;&#x6e;&#x65;&#116;">&#x6d;&#x61;&#x69;&#108;&#64;&#x74;&#x6f;&#x62;&#105;&#97;&#115;&#x2d;&#x67;&#x72;&#97;&#x73;&#x73;&#x65;&#x2e;&#x6e;&#x65;&#116;</a></td>
<td>96%</td>
</tr>
<tr>
Expand All @@ -498,7 +499,7 @@ <h1 id="localisation">Localisation</h1>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/es.png" alt=""></td>
<td>Español</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/es_ES.po">es_ES</a></td>
<td>Fernando Martín <a href="&#109;&#97;&#105;&#x6c;&#x74;&#111;&#58;&#102;&#64;&#109;&#x72;&#x74;&#110;&#46;&#101;&#x73;">&#102;&#64;&#109;&#x72;&#x74;&#110;&#46;&#101;&#x73;</a></td>
<td>Fernando Martín <a href="&#x6d;&#x61;&#x69;&#108;&#116;&#x6f;&#x3a;&#102;&#x40;&#x6d;&#x72;&#116;&#110;&#x2e;&#101;&#115;">&#102;&#x40;&#x6d;&#x72;&#116;&#110;&#x2e;&#101;&#115;</a></td>
<td>96%</td>
</tr>
<tr>
Expand All @@ -512,7 +513,7 @@ <h1 id="localisation">Localisation</h1>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/es.png" alt=""></td>
<td>Galician</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/gl_ES.po">gl_ES</a></td>
<td>Marcos Lans <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#x3a;&#x6d;&#x61;&#114;&#x63;&#111;&#x73;&#x6c;&#97;&#110;&#115;&#103;&#97;&#x72;&#122;&#97;&#x40;&#x67;&#109;&#x61;&#x69;&#x6c;&#x2e;&#x63;&#111;&#x6d;">&#x6d;&#x61;&#114;&#x63;&#111;&#x73;&#x6c;&#97;&#110;&#115;&#103;&#97;&#x72;&#122;&#97;&#x40;&#x67;&#109;&#x61;&#x69;&#x6c;&#x2e;&#x63;&#111;&#x6d;</a></td>
<td>Marcos Lans <a href="&#x6d;&#x61;&#x69;&#x6c;&#116;&#x6f;&#x3a;&#x6d;&#x61;&#x72;&#x63;&#111;&#115;&#108;&#x61;&#x6e;&#x73;&#103;&#97;&#x72;&#x7a;&#x61;&#x40;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#x63;&#x6f;&#x6d;">&#x6d;&#x61;&#x72;&#x63;&#111;&#115;&#108;&#x61;&#x6e;&#x73;&#103;&#97;&#x72;&#x7a;&#x61;&#x40;&#103;&#x6d;&#97;&#105;&#108;&#x2e;&#x63;&#x6f;&#x6d;</a></td>
<td>97%</td>
</tr>
<tr>
Expand All @@ -533,14 +534,14 @@ <h1 id="localisation">Localisation</h1>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/br.png" alt=""></td>
<td>Português (Brasil)</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/pt_BR.po">pt_BR</a></td>
<td>Renato Nunes Bastos <a href="&#109;&#x61;&#105;&#x6c;&#x74;&#x6f;&#x3a;&#x72;&#x6e;&#x62;&#x61;&#x73;&#116;&#111;&#115;&#x40;&#103;&#x6d;&#x61;&#105;&#108;&#46;&#x63;&#x6f;&#109;">&#x72;&#x6e;&#x62;&#x61;&#x73;&#116;&#111;&#115;&#x40;&#103;&#x6d;&#x61;&#105;&#108;&#46;&#x63;&#x6f;&#109;</a></td>
<td>Renato Nunes Bastos <a href="&#109;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#x72;&#x6e;&#98;&#97;&#115;&#116;&#111;&#115;&#64;&#x67;&#x6d;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#x6d;">&#x72;&#x6e;&#98;&#97;&#115;&#116;&#111;&#115;&#64;&#x67;&#x6d;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#x6d;</a></td>
<td>95%</td>
</tr>
<tr>
<td><img src="https://joplin.cozic.net/images/flags/country-4x3/ru.png" alt=""></td>
<td>Русский</td>
<td><a href="https://github.com/laurent22/joplin/blob/master/CliClient/locales/ru_RU.po">ru_RU</a></td>
<td>Artyom Karlov <a href="&#x6d;&#97;&#105;&#108;&#x74;&#x6f;&#58;&#97;&#114;&#x74;&#121;&#111;&#x6d;&#46;&#107;&#97;&#114;&#x6c;&#x6f;&#x76;&#64;&#103;&#x6d;&#x61;&#105;&#108;&#46;&#99;&#111;&#x6d;">&#97;&#114;&#x74;&#121;&#111;&#x6d;&#46;&#107;&#97;&#114;&#x6c;&#x6f;&#x76;&#64;&#103;&#x6d;&#x61;&#105;&#108;&#46;&#99;&#111;&#x6d;</a></td>
<td>Artyom Karlov <a href="&#109;&#x61;&#105;&#108;&#116;&#111;&#58;&#x61;&#x72;&#x74;&#121;&#x6f;&#109;&#x2e;&#107;&#97;&#114;&#x6c;&#111;&#118;&#x40;&#103;&#x6d;&#97;&#x69;&#x6c;&#x2e;&#99;&#111;&#x6d;">&#x61;&#x72;&#x74;&#121;&#x6f;&#109;&#x2e;&#107;&#97;&#114;&#x6c;&#111;&#118;&#x40;&#103;&#x6d;&#97;&#x69;&#x6c;&#x2e;&#99;&#111;&#x6d;</a></td>
<td>96%</td>
</tr>
<tr>
Expand Down
27 changes: 18 additions & 9 deletions docs/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,26 @@
### Operating system

- [ ] Windows
- [ ] macOS
- [ ] Linux
- [ ] Android
- [ ] iOS
<!-- Please only leave those relevant to your request -->

- Windows
- macOS
- Linux
- Android
- iOS

### Application

- [ ] Desktop
- [ ] Mobile
- [ ] Terminal
<!-- Please only leave those relevant to your request -->

- Desktop
- Mobile
- Terminal

<!--
Please the guide first! https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md
Please read the guide first! https://github.com/laurent22/joplin/blob/master/CONTRIBUTING.md
Due to the number of issues and limited resources, those that have been created without searching first might be closed without an explanation.
If you are reporting a bug, did you try enabling debug mode? https://joplin.cozic.net/debugging/
If so, please post any error or warning.
-->

0 comments on commit ca112ec

Please sign in to comment.