aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2015-09-07 10:04:52 +0200
committerChristian Grothoff <christian@grothoff.org>2015-09-07 10:04:52 +0200
commiteebb64bab27051c5c5af8061410abec3748f42df (patch)
tree77369203cfc73be6fa5668fdf8c2b46e299cdc8d
parent8cc25a9f519eeed70aed54be5cd69d6b3efde26d (diff)
downloadwww-eebb64bab27051c5c5af8061410abec3748f42df.tar.gz
www-eebb64bab27051c5c5af8061410abec3748f42df.zip
translating
Former-commit-id: c50e37f8778c7fdd27dfa96bfa9836c88cd0d990
-rw-r--r--citizens.html14
-rw-r--r--merchants.html18
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&auml;ndlers
220 der Taler unterst&uuml;tzt, wird Taler als zus&auml;tzliche
221 Bezahloption angezeigt. Wenn der Kunde diese ausw&auml;hlt,
222 zeigt die Geldb&ouml;rsenanwendung einen
223 vom H&auml;ndler sicher &uuml;bertragnen Vertragstext an
224 und fragt den Kunden diesen zu best&auml;tigen. Taler
225 &uuml;lbermittelt in beim Vertragsabschluss keine
226 personenbezogenen Daten. Historische Transaktionsinformationen
227 und der dazugeh&ouml;rige Vertragstext k&ouml;nnen von der
228 Geldb&ouml;rse lokal gespeichert werden, unter anderem zur
229 sp&auml;tern Durchsetzung von Vertr&auml;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&auml;ftssicht</h1> 227 <h2 lang="de">Taler aus H&auml;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&auml;nder die Taler als Bezahlsystem
236 anbieten wollen, m&uuml;ssen ein paar relativ einfache Erweiterungen
237 an ihrem Transaktionssystem vornehmen. Die typischen Schritte die
238 ein H&auml;ndler bei Taler durchf&uuml;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&auml;ndlerwebseite muss
254 pr&uuml;fen ob der Kunde eine Taler Geldb&ouml;rsenanwendung
255 benutzt und dieser einen kryptographisch unterzeichneten
256 Vertragstext in einem JSON-Format &uuml;bertragen. Der
257 Vertragstext muss auch einen Hash der Kontoinformationen
258 des H&auml;ndlers sowie Restriktionen f&uuml;r die vom
259 H&auml;ndler unterst&uuml;tzten M&uuml;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