diff options
author | Christian Grothoff <christian@grothoff.org> | 2015-09-07 10:04:52 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2015-09-07 10:04:52 +0200 |
commit | a368caeaf3dbff0aa97657764a02bb49b025da69 (patch) | |
tree | 29eaea8dec18dc96a49dfd23228f4042019d2aa2 | |
parent | 71a29764eab1c87ec27d309b476590a6ca254802 (diff) | |
download | www-a368caeaf3dbff0aa97657764a02bb49b025da69.tar.gz www-a368caeaf3dbff0aa97657764a02bb49b025da69.zip |
translating
-rw-r--r-- | citizens.html | 14 | ||||
-rw-r--r-- | merchants.html | 18 |
2 files changed, 26 insertions, 6 deletions
diff --git a/citizens.html b/citizens.html index ca051c43..3cc8a11f 100644 --- a/citizens.html +++ b/citizens.html | |||
@@ -208,7 +208,7 @@ | |||
208 | il suo bilancio. Può anche effettuare copie di sicurezza come | 208 | il suo bilancio. Può anche effettuare copie di sicurezza come |
209 | prevenzione verso malfunzionamenti o danni alla sua macchina.</li> | 209 | prevenzione verso malfunzionamenti o danni alla sua macchina.</li> |
210 | <li lang="en">When visiting a merchant that supports Taler, | 210 | <li lang="en">When visiting a merchant that supports Taler, |
211 | a new payment option is available in the checkout system. | 211 | an additional payment option for Taler is enabled in the checkout system. |
212 | If the customer selects payments via Taler, the wallet | 212 | If the customer selects payments via Taler, the wallet |
213 | displays the secured contract from the merchant and asks | 213 | displays the secured contract from the merchant and asks |
214 | for confirmation. Taler does not require the customer | 214 | for confirmation. Taler does not require the customer |
@@ -216,7 +216,17 @@ | |||
216 | Transaction histories and digitally | 216 | Transaction histories and digitally |
217 | signed contracts can be preserved in the wallet for future | 217 | signed contracts can be preserved in the wallet for future |
218 | review by the customer, or even use in court.</li> | 218 | review by the customer, or even use in court.</li> |
219 | <li lang="de" note="outdated"></li> | 219 | <li lang="de">Beim Besuch eines Händlers |
220 | der Taler unterstützt, wird Taler als zusätzliche | ||
221 | Bezahloption angezeigt. Wenn der Kunde diese auswählt, | ||
222 | zeigt die Geldbörsenanwendung einen | ||
223 | vom Händler sicher übertragnen Vertragstext an | ||
224 | und fragt den Kunden diesen zu bestätigen. Taler | ||
225 | ülbermittelt in beim Vertragsabschluss keine | ||
226 | personenbezogenen Daten. Historische Transaktionsinformationen | ||
227 | und der dazugehörige Vertragstext können von der | ||
228 | Geldbörse lokal gespeichert werden, unter anderem zur | ||
229 | spätern Durchsetzung von Verträgen vor Gericht.</li> | ||
220 | <li lang="fr" note="outdated"></li> | 230 | <li lang="fr" note="outdated"></li> |
221 | <li lang="it">Se un certo venditore supporta Taler, il suo | 231 | <li lang="it">Se un certo venditore supporta Taler, il suo |
222 | sito mostrerà una nuova opzione di pagamento. Se il cliente | 232 | sito mostrerà una nuova opzione di pagamento. Se il cliente |
diff --git a/merchants.html b/merchants.html index c9b307f3..6ce7075d 100644 --- a/merchants.html +++ b/merchants.html | |||
@@ -224,7 +224,7 @@ | |||
224 | </div> | 224 | </div> |
225 | <div class="col-lg-12"> | 225 | <div class="col-lg-12"> |
226 | <h2 lang="en" id="overview">Taler as seen by merchants</h1> | 226 | <h2 lang="en" id="overview">Taler as seen by merchants</h1> |
227 | <h2 lang="de">Taler aus Geschäftssicht</h1> | 227 | <h2 lang="de">Taler aus Händlerperspektive</h1> |
228 | <h2 lang="fr" note="outdated"></h2> | 228 | <h2 lang="fr" note="outdated"></h2> |
229 | <h2 lang="it">Come i negozianti vedono Taler</h2> | 229 | <h2 lang="it">Come i negozianti vedono Taler</h2> |
230 | <p lang="en">Merchants supporting the Taler system need to integrate | 230 | <p lang="en">Merchants supporting the Taler system need to integrate |
@@ -232,7 +232,10 @@ | |||
232 | system. | 232 | system. |
233 | Typical steps performed by the merchant system are: | 233 | Typical steps performed by the merchant system are: |
234 | </p> | 234 | </p> |
235 | <p lang="de" note="outdated"></p> | 235 | <p lang="de" note="outdated">Händer die Taler als Bezahlsystem |
236 | anbieten wollen, müssen ein paar relativ einfache Erweiterungen | ||
237 | an ihrem Transaktionssystem vornehmen. Die typischen Schritte die | ||
238 | ein Händler bei Taler durchfüren muss sind:</p> | ||
236 | <p lang="fr" note="outdated"></p> | 239 | <p lang="fr" note="outdated"></p> |
237 | <p lang="it">Al fine di supportare Taler, i negozianti | 240 | <p lang="it">Al fine di supportare Taler, i negozianti |
238 | dovranno integrare alcune semplici procedure nei loro sistemi di ricezione | 241 | dovranno integrare alcune semplici procedure nei loro sistemi di ricezione |
@@ -241,13 +244,20 @@ | |||
241 | <img src="images/merchant.svg" alt="merchant perspective" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> | 244 | <img src="images/merchant.svg" alt="merchant perspective" style="float: right; margin: 50px 5px 5px 5px;" width="50%"> |
242 | <ol> | 245 | <ol> |
243 | <li lang="en">The new logic detects when a customer's system | 246 | <li lang="en">The new logic detects when a customer's system |
244 | supports Taler and then needs to send a digitally signed | 247 | supports Taler and then needs to send a cryptographically signed |
245 | version of the proposed contract in a simple JSON format to | 248 | version of the proposed contract in a simple JSON format to |
246 | the customer. | 249 | the customer. |
247 | The message also includes salted, hashed wire details for | 250 | The message also includes salted, hashed wire details for |
248 | the merchant, as well as restrictions as to which mint operators | 251 | the merchant, as well as restrictions as to which mint operators |
249 | the merchant is willing to deal with.</li> | 252 | the merchant is willing to deal with.</li> |
250 | <li lang="de" note="outdated"></li> | 253 | <li lang="de">Die Händlerwebseite muss |
254 | prüfen ob der Kunde eine Taler Geldbörsenanwendung | ||
255 | benutzt und dieser einen kryptographisch unterzeichneten | ||
256 | Vertragstext in einem JSON-Format übertragen. Der | ||
257 | Vertragstext muss auch einen Hash der Kontoinformationen | ||
258 | des Händlers sowie Restriktionen für die vom | ||
259 | Händler unterstützten Münzanstalten beinhalten. | ||
260 | </li> | ||
251 | <li lang="fr" note="outdated"></li> | 261 | <li lang="fr" note="outdated"></li> |
252 | <li lang="it">La nuova procedura rileva il caso in cui un cliente | 262 | <li lang="it">La nuova procedura rileva il caso in cui un cliente |
253 | supporta Taler, e procede ad inviarvi un contratto digitale firmato | 263 | supporta Taler, e procede ad inviarvi un contratto digitale firmato |