summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Pelz <pelzflorian@pelzflorian.de>2017-12-15 09:26:36 +0100
committerFlorian Pelz <pelzflorian@pelzflorian.de>2017-12-15 09:26:36 +0100
commit26e4ff53e2aec3dea77e5664f9dcc426ba933ea4 (patch)
tree119bbf37cfa276207fc05f2c0efc1f929859e2d0
parent3bfd7b1934ca671b9479f434b3dfc3854bdc064f (diff)
Make use of multipart translations with __.
-rw-r--r--haunt.scm182
-rw-r--r--po/de.po235
-rw-r--r--po/en.po221
3 files changed, 300 insertions, 338 deletions
diff --git a/haunt.scm b/haunt.scm
index e80e12d..ce5e292 100644
--- a/haunt.scm
+++ b/haunt.scm
@@ -250,10 +250,14 @@ list."
(split-along-unescaped-matches
msgstr-part
"\\\|"))
+ (from-assoc (assoc-ref assoc (car subparts)))
(part-lambda (assoc-ref assoc (car subparts)))
(args (cdr subparts)))
(if part-lambda
- (apply part-lambda args)
+ (if (procedure? part-lambda)
+ (apply part-lambda args)
+ ;; if in assoc but not a procedure, just insert it:
+ from-assoc)
msgstr-part)))
msgstr-parts)))
@@ -311,6 +315,11 @@ German language orthographic preferences."
"Make a string from path-list with a slash before each component."
(string-join path-list "/" 'prefix))
+(define (a-href url link-content)
+ "A hyperlink."
+ `(a (@ (href ,url))
+ ,link-content))
+
(define (a-href-list-element url link-content)
"A list element with a link."
`(li
@@ -335,11 +344,9 @@ each consisting of a file extension and a url."
"("
(span
(@ (class "file-extension"))
- (a
- (@ (href ,(cdr pair)))
- ,(car pair)))
+ ,(a-href (cdr pair) (car pair))
")"))
- pairs)))
+ pairs))))
(define (screenshot src title)
"SXML for a screenshot; should use a thumbnail." ; TODO
@@ -360,10 +367,10 @@ each consisting of a file extension and a url."
(define (recent-post-link-for-lingua lingua)
"SXML for a link to all other posts in this lingua."
(let ((current-lingua lingua))
- `(a (@ (href ,(build-url posts-dir
- current-lingua
- "index.html")))
- ,(_ "See other posts"))))
+ (a-href (build-url posts-dir
+ current-lingua
+ "index.html")
+ (_ "See other posts."))))
(define (recent-post-link-for-tag-for-lingua tag description lingua)
"SXML for a link to posts with a certain tag."
@@ -373,8 +380,8 @@ each consisting of a file extension and a url."
(string-append
tag
".xml"))))
- ,(_ "See other posts about ")
- ,description)))
+ ,@(__ "See other posts about ||descrip_||."
+ `(("descrip_" . ,description))))))
(define (tags-for-post-for-lingua post lingua)
"SXML for a list of tags of a post."
@@ -425,6 +432,9 @@ back button."
`(link
(@ (rel "alternate")
(type "application/atom+xml")
+ ;; TODO Gettext *should* pass the following on into the
+ ;; pot file but does not. Why?
+ ;; TRANSLATORS: This should be the current language.
(title ,(_ "My blog in English"))
(hreflang ,lingua)
(href
@@ -529,30 +539,28 @@ back button."
"xmpp:pelzflorian@chat.pelzflorian.de?message"))
"pelzflorian@chat.pelzflorian.de"))
(div
- ,(_ "GnuPG key:")
- " "
- (a (@ (href "/files/key.asc"))
- "0x4947055B")
- " ("
- ,(_ "valid until")
- " 01/27/2019)"))
+ ,@(__ "GnuPG key: ||gnupglink_|| (valid until \
+||gnupgexp_||)"
+ `(("gnupglink_" .
+ ,(a-href
+ "/files/key.asc"
+ "0x4947055B"))
+ ("gnupgexp_" .
+ "01/27/2019")))))
(div (@ (id "source-code-link"))
- ,(_ "Find the source code for this website")
- " "
- (a (@ (href ,(build-url "git" "pelzfloriande-website")))
- ,(_ "here"))
- ".")
+ ,@(__ "Find the source code for this website \
+||link_|here||."
+ `(("link_" .
+ ,(lambda (text)
+ `(a (@ (href ,(build-url
+ "git"
+ "pelzfloriande-website")))
+ ,text))))))
(div (@ (id "powered-by"))
- ,(_ "Powered by")
- " "
- (a (@ (href "https://www.gnu.org/software/guile/"))
- "GNU Guile")
- " "
- ,(_ "and")
- " "
- (a (@ (href "https://haunt.dthompson.us/"))
- "Haunt")
- ".")))))))))
+ ,@(__ "Powered by \
+||link_|https://www.gnu.org/software/guile/|GNU Guile|| and \
+||link_|https://haunt.dthompson.us/|Haunt||."
+ `(("link_" . ,a-href))))))))))))
(define (pelzflorian-blue-theme current-lingua)
"Returns the blog’s theme for the lingua."
@@ -681,14 +689,19 @@ support")))
,(a-href-list-element
"/git/dont-hang/"
(_ "Current development version."))
- (li (a (@ (href
- "https://aur.archlinux.org/packages/dont-hang"))
- ,(_ "“Don’t Hang” for Arch Linux"))
- ,(_ " and derivative GNU distributions such as ")
- (a (@ (href
- "https://www.parabola.nu"))
- ,(_ "Parabola GNU/Linux-libre"))
- ".")
+ (li ,@(__ "aurlink_|“Don’t Hang” for Arch Linux|| and \
+derivative GNU distributions such as \
+||parabolalink_|Parabola GNU/Linux-libre||."
+ `(("aurlink_" .
+ ,(lambda (text)
+ (a-href
+ "https://aur.archlinux.org/packages/dont-hang"
+ text)))
+ ("parabolalink_" .
+ ,(lambda (text)
+ (a-href
+ "https://www.parabola.nu"
+ text))))))
(li
;; (a (@ (href
;; "binaries/windows/dont-hang-1.1.msi"))
@@ -710,26 +723,34 @@ home page."))
;; macOS trust the binaries)."))
)
(h1 ,(_ "Word lists"))
- (p ,(_ "“Don’t Hang” by default uses the words from the ")
- (span (@ (class "inline-code"))
- "/usr/share/dict")
- ,(_ " directory, but it can deal with any list of expressions \
-in a text file with one expression per line. ")
- (a (@ (href
- "sample-word-lists/english-words.txt"))
- ,(_ "Here"))
- ,(_ " is an example word list file compiled with words from ")
- (a (@ (href
- "https://en.wiktionary.org/wiki/Appendix:1000_basic_Engli\
-sh_words"))
- ,(_ "Wiktionary’s list of 1000 basic English words"))
- ,(_ " which you can use if you want simpler words. This sample \
-word list is available under the terms of ")
- (a (@ (href
- "sample-word-lists/CCBYSA-3.0-UNPORTED.txt"))
- ,(_ "the CC-BY-SA 3.0 Unported license"))
- ,(_ ", because Wiktionary uses this license and the words are \
-taken from there."))
+ (p ,@(__ "“Don’t Hang” by default uses the words from \
+the ||ic_|/usr/share/dict|| directory, but it can deal with any list of \
+expressions in a text file with one expression per line. ||samplelink_|Here|| \
+is an example word list file compiled with words from \
+||wiktionarylink_|Wiktionary’s list of 1000 basic English words|| which you \
+can use if you want simpler words. This sample word list is available under \
+the terms of ||ccbysalink_|the CC-BY-SA 3.0 Unported license||, because \
+Wiktionary uses this license and the words are taken from there."
+ `(("ic_" .
+ ,(lambda (text)
+ `(span (@ (class "inline-code"))
+ ,text)))
+ ("samplelink_" .
+ ,(lambda (text)
+ (a-href
+ "sample-word-lists/english-words.txt"
+ text)))
+ ("wiktionarylink_" .
+ ,(lambda (text)
+ (a-href
+ "https://en.wiktionary.org/wiki/Appendix: 1000_b\
+asic_English_words"
+ text)))
+ ("ccbysalink_" .
+ ,(lambda (text)
+ (a-href
+ "sample-word-lists/CCBYSA-3.0-UNPORTED.txt"
+ text))))))
(p ,(_ "Please note that all words in the sample word list have \
been deliberately converted to upper case. The reason is that “Don’t Hang” \
displays words in upper case and storing the words in lower case would lead to \
@@ -815,10 +836,9 @@ Turkish locale."))
(p ,english-links)
(p "Deutsch:" ,german-links)))
(p
- (a (@ (href
- "/git/gui-prog-gtk/tree/?id=f2fb450d34b8fd3b47420315547a61f7f7a6c\
-d71"))
- ,(_ "All source code for the workshop."))))))
+ (a-href
+ "/git/gui-prog-gtk/tree/?id=f2fb450d34b8fd3b47420315547a61f7f7a6cd71"
+ ,(_ "All source code for the workshop."))))))
(define (gui-prog-gtk-2017-body-for-lingua lingua)
(let ((current-lingua lingua)
@@ -897,21 +917,25 @@ d71"))
(lambda (site posts)
(let ((body
`(div
- (p ,(_ "Thank you for your interest in my workshop
-“GUI Programming with GTK+”. ")
- ,(if enable-registration
- `(span
- ,(_ "To register please go ")
- (a (@ (href "/gui-prog-anmelden/"))
- ,(_ "here"))
- ". ")
- `(span))
- ,(_ "For more information see ")
- (a (@ (href ,(poster-url-for-lingua lingua)))
- ,(_ "here"))
- ".")
+ (p ,@(__ "Thank you for your interest in my workshop
+“GUI Programming with GTK+”. ||register_|To register please go |here|. ||For \
+more information see ||link_|here||."
+ `(("register_" .
+ ,(lambda (before-link link-text after-link)
+ (if enable-registration
+ `(span
+ ,before-link
+ ,(a-href
+ "/gui-prog-anmelden/"
+ link-text)
+ ,after-link))))
+ ("link_" .
+ ,(lambda (text)
+ (a-href
+ (poster-url-for-lingua lingua)
+ text))))))
,(gui-prog-gtk-body-for-lingua current-lingua)
- ,(back-button-for-lingua lingua))))
+ ,(back-button-for-lingua current-lingua))))
(make-page
(string-append "gui-prog-gtk-" year "/index" "-" lingua ".html")
(with-layout
diff --git a/po/de.po b/po/de.po
index c7d5a83..71cf5b4 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pelzfloriande-website\n"
"Report-Msgid-Bugs-To: pelzflorian@pelzflorian.de\n"
-"POT-Creation-Date: 2017-12-14 12:52+0100\n"
-"PO-Revision-Date: 2017-12-14 14:32+0100\n"
+"POT-Creation-Date: 2017-12-15 09:07+0100\n"
+"PO-Revision-Date: 2017-12-15 09:08+0100\n"
"Last-Translator: Florian Pelz <pelzflorian@pelzflorian.de>\n"
"Language-Team: English <pelzflorian@pelzflorian.de>\n"
"Language: de\n"
@@ -18,273 +18,248 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: haunt.scm:358
+#: haunt.scm:365
msgid "← Back to home page"
msgstr "← Zurück zur hauptseite"
-#: haunt.scm:366
-msgid "See other posts"
-msgstr "Andere einträge ansehen"
+#: haunt.scm:373
+msgid "See other posts."
+msgstr "Andere einträge ansehen."
-#: haunt.scm:376
-msgid "See other posts about "
-msgstr "Andere einträge ansehen über "
+#: haunt.scm:383
+msgid "See other posts about ||descrip_||."
+msgstr "Andere einträge ansehen über ||descrip_||."
-#: haunt.scm:385
+#: haunt.scm:394
msgid "Tags:"
msgstr "Schlüsselwörter:"
-#: haunt.scm:428
+#: haunt.scm:440
msgid "My blog in English"
msgstr "Mein blog auf deutsch"
-#: haunt.scm:434
+#: haunt.scm:446
msgid "@ietf-lang-tag"
msgstr "de"
-#: haunt.scm:483
+#: haunt.scm:495
msgid "Git Projects"
msgstr "Git-projecte"
-#: haunt.scm:489 haunt.scm:634 haunt.scm:743
+#: haunt.scm:501 haunt.scm:644 haunt.scm:766
msgid "Don’t Hang"
msgstr "Don’t Hang"
-#: haunt.scm:495 haunt.scm:625
+#: haunt.scm:507 haunt.scm:635
msgid "Old stuff"
msgstr "Alter kram"
-#: haunt.scm:501
+#: haunt.scm:513
msgid "GTK+ Workshop 2017"
msgstr "GTK+-Workshop 2017"
-#: haunt.scm:507
+#: haunt.scm:519
msgid "GTK+ Workshop 2016"
msgstr "GTK+-Workshop 2016"
-#: haunt.scm:510
+#: haunt.scm:522
msgid "Subscribe to Atom feed"
msgstr "Als Atom-feed abonnieren"
-#: haunt.scm:517
+#: haunt.scm:529
msgid "Contact me:"
msgstr "So erreichen Sie mich:"
-#: haunt.scm:519
+#: haunt.scm:531
msgid "Mail:"
msgstr "E-mail:"
-#: haunt.scm:532
-msgid "GnuPG key:"
-msgstr "GnuPG-schlüssel:"
-
-#: haunt.scm:537
-msgid "valid until"
-msgstr "gültig bis"
-
-#: haunt.scm:540
-msgid "Find the source code for this website"
-msgstr "Den quellcode dieser Web-seite gibt es"
+#: haunt.scm:544
+msgid "GnuPG key: ||gnupglink_|| (valid until ||gnupgexp_||)"
+msgstr "GnuPG-schlüssel: ||gnupglink_|| (gültig bis ||gnupgexp_||)"
-#: haunt.scm:543 haunt.scm:906 haunt.scm:911
-msgid "here"
-msgstr "hier"
+#: haunt.scm:553
+msgid "Find the source code for this website ||link_|here||."
+msgstr "Den quellcode dieser Web-seite gibt es ||link_|hier||."
-#: haunt.scm:546
-msgid "Powered by"
-msgstr "Sie läuft dank"
-
-#: haunt.scm:551
-msgid "and"
-msgstr "und"
+#: haunt.scm:562
+msgid ""
+"Powered by ||link_|https://www.gnu.org/software/guile/|GNU Guile|| and ||"
+"link_|https://haunt.dthompson.us/|Haunt||."
+msgstr ""
+"Sie läuft dank ||link_|https://www.gnu.org/software/guile/|GNU Guile|| und ||"
+"link_|https://haunt.dthompson.us/|Haunt||."
-#: haunt.scm:576 haunt.scm:979 haunt.scm:987
+#: haunt.scm:586 haunt.scm:1005 haunt.scm:1013
msgid "Recent posts"
msgstr "Neue einträge"
-#: haunt.scm:601
+#: haunt.scm:611
msgid "Lecture notes"
msgstr "Vorlesungsnoticen"
-#: haunt.scm:602
+#: haunt.scm:612
msgid "Some German lecture summaries I made for lectures I heard in 2013:"
msgstr ""
"Ein paar selbst erstellte zusammenfassungen zu vorlesungen, die ich im "
"sommersemester 2013 gehört habe:"
-#: haunt.scm:613
+#: haunt.scm:623
msgid "C exercises (German)"
msgstr "C-übungen (deutsch)"
-#: haunt.scm:614
+#: haunt.scm:624
msgid "Includes a cheat sheet for working with C."
msgstr "Enthält einen spickzettel für die arbeit mit C."
-#: haunt.scm:618
+#: haunt.scm:628
msgid "C Exercises"
msgstr "C-übungen"
-#: haunt.scm:640
+#: haunt.scm:650
msgid "A simple GTK+ hangman game inspired by bsd-games’ hangman."
msgstr "Ein einfaches GTK+-galgenmännchen-spiel, inspiriert von bsd-games."
-#: haunt.scm:642
+#: haunt.scm:652
msgid ""
"“Don’t Hang” is a simple hangman game for acquiring and consolidating a "
"basic vocabulary in a foreign language. It supports loading custom word "
"lists and works with Unicode and bidirectional text. It also supports "
"pasting characters from the clipboard."
-msgstr "„Don’t Hang“ soll beim erlernen und festigen eines grundwortschatzes in einer fremdsprache helfen. Das spiel unterstützt eigene wortlisten sowie Unicode und bidirectionalen text. Außerdem bietet es die möglichkeit, zeichen aus der zwischenablage einzufügen."
+msgstr ""
+"„Don’t Hang“ soll beim erlernen und festigen eines grundwortschatzes in "
+"einer fremdsprache helfen. Das spiel unterstützt eigene wortlisten sowie "
+"Unicode und bidirectionalen text. Außerdem bietet es die möglichkeit, "
+"zeichen aus der zwischenablage einzufügen."
-#: haunt.scm:646
+#: haunt.scm:656
msgid "It is free software and also publicly available at no cost."
msgstr "Es ist freie software und kostenlos verfügbar."
-#: haunt.scm:649
+#: haunt.scm:659
msgid "Screenshots"
msgstr "Screenshots"
-#: haunt.scm:651
+#: haunt.scm:661
msgid "Guessing an expression"
msgstr "Beim erraten eines ausdrucks"
-#: haunt.scm:653
+#: haunt.scm:663
msgid "Right-to-left support"
msgstr "Rechts-nach-links-unterstützung"
-#: haunt.scm:666
+#: haunt.scm:676
msgid "News"
msgstr "Neuigkeiten"
-#: haunt.scm:672
+#: haunt.scm:682
msgid "“Don’t Hang”"
msgstr "„Don’t Hang“"
-#: haunt.scm:676
+#: haunt.scm:686
msgid "Downloads"
msgstr "Herunterladen"
-#: haunt.scm:680
+#: haunt.scm:690
msgid "“Don’t Hang” version 1.1 Source code."
msgstr "„Don’t Hang“: Quellcode von version 1.1."
-#: haunt.scm:683
+#: haunt.scm:693
msgid "Current development version."
msgstr "Momentaner entwicklungsstand."
-#: haunt.scm:686
-msgid "“Don’t Hang” for Arch Linux"
-msgstr "„Don’t Hang“ für Arch Linux"
-
-#: haunt.scm:687
-msgid " and derivative GNU distributions such as "
-msgstr " und abgeleitete GNU-distributionen wie "
-
-#: haunt.scm:690
-msgid "Parabola GNU/Linux-libre"
-msgstr "Parabola GNU/Linux-libre"
+#: haunt.scm:694
+msgid ""
+"aurlink_|“Don’t Hang” for Arch Linux|| and derivative GNU distributions such "
+"as ||parabolalink_|Parabola GNU/Linux-libre||."
+msgstr ""
+"aurlink_|„Don’t Hang“ für Arch Linux|| und abgeleitete GNU-distributionen "
+"wie ||parabolalink_|Parabola GNU/Linux-libre||."
-#: haunt.scm:699
+#: haunt.scm:714
msgid "“portable” binaries without installer"
msgstr "„portable“ binärdateien ohne installation"
-#: haunt.scm:700
+#: haunt.scm:715
msgid " if you are still using Windows, all built using "
msgstr ""
" stehen zur verfügung, falls Sie noch immer Windows benutzen, gebaut mit "
-#: haunt.scm:702
+#: haunt.scm:717
msgid ""
" for which the source files are available at their\n"
"home page."
msgstr ", dessen quelldateien auf deren homepage zu finden sind."
-#: haunt.scm:712
+#: haunt.scm:727
msgid "Word lists"
msgstr "Wortlisten"
-#: haunt.scm:713
-msgid "“Don’t Hang” by default uses the words from the "
-msgstr "„Don’t Hang“ benutzt standardmäßig die wörter aus dem verzeichnis "
-
-#: haunt.scm:716
-msgid ""
-" directory, but it can deal with any list of expressions in a text file with "
-"one expression per line. "
-msgstr ", kann aber auch beliebige andere zeilenweise listen von ausdrücken aus einer textdatei lesen. "
-
-#: haunt.scm:720
-msgid "Here"
-msgstr "Hier"
-
-#: haunt.scm:721
-msgid " is an example word list file compiled with words from "
-msgstr " ist eine beispiel-wortlistendatei, zusammengestellt mit wörtern aus "
-
-#: haunt.scm:725
-msgid "Wiktionary’s list of 1000 basic English words"
-msgstr "Wiktionarys liste von 1000 grundlegenden englischen wörtern"
-
-#: haunt.scm:726
+#: haunt.scm:728
msgid ""
-" which you can use if you want simpler words. This sample word list is "
-"available under the terms of "
-msgstr ", welche einfachere wörter enthält. Diese beispiel-wortliste ist zu den bedingungen "
-
-#: haunt.scm:730
-msgid "the CC-BY-SA 3.0 Unported license"
-msgstr "der CC-BY-SA-3.0-Unported-licenz"
-
-#: haunt.scm:731
-msgid ""
-", because Wiktionary uses this license and the words are taken from there."
+"“Don’t Hang” by default uses the words from the ||ic_|/usr/share/dict|| "
+"directory, but it can deal with any list of expressions in a text file with "
+"one expression per line. ||samplelink_|Here|| is an example word list file "
+"compiled with words from ||wiktionarylink_|Wiktionary’s list of 1000 basic "
+"English words|| which you can use if you want simpler words. This sample "
+"word list is available under the terms of ||ccbysalink_|the CC-BY-SA 3.0 "
+"Unported license||, because Wiktionary uses this license and the words are "
+"taken from there."
msgstr ""
-" verfügbar, da diese licenz von Wiktionary benutzt wird und die wörter von "
-"dort genommen wurden."
-
-#: haunt.scm:733
+"„Don’t Hang“ benutzt standardmäßig die wörter aus dem verzeichnis ||ic_|/usr/"
+"share/dict||, kann aber auch beliebige andere zeilenweise listen von "
+"ausdrücken aus einer textdatei lesen. ||samplelink_|Hier|| ist eine beispiel-"
+"wortlistendatei, zusammengestellt mit wörtern aus ||wiktionarylink_|"
+"Wiktionarys liste von 1000 grundlegenden englischen wörtern||, welche "
+"einfachere wörter enthält. Diese beispiel-wortliste ist zu den bedingungen ||"
+"ccbysalink_|der CC-BY-SA-3.0-Unported-licenz|| verfügbar, da diese licenz "
+"von Wiktionary benutzt wird und die wörter von dort genommen wurden."
+
+#: haunt.scm:756
msgid ""
"Please note that all words in the sample word list have been deliberately "
"converted to upper case. The reason is that “Don’t Hang” displays words in "
"upper case and storing the words in lower case would lead to errors in some "
"locales, e.g. the English word “is” would become “İS” in a Turkish locale."
-msgstr "Zu beachten ist, dass in der beispiel-wortliste alle wörter mit absicht in großbuchstaben geschrieben wurden, weil „Don’t Hang“ wörter in großbuchstaben anzeigt und das speichern der wörter in kleinbuchstaben zu fehlern in manchen regionalen varianten führen würde, z.b. würde das englische wort „is“ mit türkischer spracheinstellung zu „İS“ werden."
+msgstr ""
+"Zu beachten ist, dass in der beispiel-wortliste alle wörter mit absicht in "
+"großbuchstaben geschrieben wurden, weil „Don’t Hang“ wörter in "
+"großbuchstaben anzeigt und das speichern der wörter in kleinbuchstaben zu "
+"fehlern in manchen regionalen varianten führen würde, z.b. würde das "
+"englische wort „is“ mit türkischer spracheinstellung zu „İS“ werden."
-#: haunt.scm:821 haunt.scm:888
+#: haunt.scm:843 haunt.scm:910
msgid "All source code for the workshop."
msgstr "Aller Quellcode zum Workshop."
-#: haunt.scm:900
+#: haunt.scm:922
msgid ""
"Thank you for your interest in my workshop\n"
-"“GUI Programming with GTK+”. "
+"“GUI Programming with GTK+”. ||register_|To register please go |here|. ||For "
+"more information see ||link_|here||."
msgstr ""
"Vielen Dank für Ihr Interesse an meinem Workshop „GUI-Programmierung mit GTK"
-"+”. "
-
-#: haunt.scm:904
-msgid "To register please go "
-msgstr "Zur Anmeldung geht es "
+"+”. ||register_|Zur Anmeldung geht es |hier|. ||Weitere Informationen siehe "
+"||link_|hier||.\n"
-#: haunt.scm:909
-msgid "For more information see "
-msgstr "Weitere Informationen siehe "
-
-#: haunt.scm:920
+#: haunt.scm:946
msgid "GUI Programming with GTK+ "
msgstr "GUI-Programmierung mit GTK+ "
-#: haunt.scm:937
+#: haunt.scm:963
msgid "Home page"
msgstr "Hauptseite"
-#: haunt.scm:940
+#: haunt.scm:966
msgid "Welcome"
msgstr "Willkommen"
-#: haunt.scm:941
+#: haunt.scm:967
msgid ""
"Welcome to my personal web site. My name is Florian Pelz and I live in "
"Kaiserslautern in Germany. When I have interesting things to share, I’ll put "
"them up here."
-msgstr "Willkommen auf meiner Web-seite. Ich heiße Florian Pelz und wohne in Kaiserslautern. Wenn ich interessante sachen teilen möchte, lade ich sie hier hoch."
+msgstr ""
+"Willkommen auf meiner Web-seite. Ich heiße Florian Pelz und wohne in "
+"Kaiserslautern. Wenn ich interessante sachen teilen möchte, lade ich sie "
+"hier hoch."
diff --git a/po/en.po b/po/en.po
index 7b488a9..9bb279b 100644
--- a/po/en.po
+++ b/po/en.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pelzfloriande-website\n"
"Report-Msgid-Bugs-To: pelzflorian@pelzflorian.de\n"
-"POT-Creation-Date: 2017-12-14 12:52+0100\n"
-"PO-Revision-Date: 2017-12-14 14:28+0100\n"
+"POT-Creation-Date: 2017-12-15 09:07+0100\n"
+"PO-Revision-Date: 2017-12-15 09:08+0100\n"
"Last-Translator: Florian Pelz <pelzflorian@pelzflorian.de>\n"
"Language-Team: English <pelzflorian@pelzflorian.de>\n"
"Language: en\n"
@@ -18,179 +18,167 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: haunt.scm:358
+#: haunt.scm:365
msgid "← Back to home page"
msgstr "← Back to home page"
-#: haunt.scm:366
-msgid "See other posts"
-msgstr "See other posts"
+#: haunt.scm:373
+msgid "See other posts."
+msgstr "See other posts."
-#: haunt.scm:376
-msgid "See other posts about "
-msgstr "See other posts about "
+#: haunt.scm:383
+msgid "See other posts about ||descrip_||."
+msgstr "See other posts about ||descrip_||."
-#: haunt.scm:385
+#: haunt.scm:394
msgid "Tags:"
msgstr "Tags:"
-#: haunt.scm:428
+#: haunt.scm:440
msgid "My blog in English"
msgstr "My blog in English"
-#: haunt.scm:434
+#: haunt.scm:446
msgid "@ietf-lang-tag"
msgstr "en"
-#: haunt.scm:483
+#: haunt.scm:495
msgid "Git Projects"
msgstr "Git Projects"
-#: haunt.scm:489 haunt.scm:634 haunt.scm:743
+#: haunt.scm:501 haunt.scm:644 haunt.scm:766
msgid "Don’t Hang"
msgstr "Don’t Hang"
-#: haunt.scm:495 haunt.scm:625
+#: haunt.scm:507 haunt.scm:635
msgid "Old stuff"
msgstr "Old stuff"
-#: haunt.scm:501
+#: haunt.scm:513
msgid "GTK+ Workshop 2017"
msgstr "GTK+ Workshop 2017"
-#: haunt.scm:507
+#: haunt.scm:519
msgid "GTK+ Workshop 2016"
msgstr "GTK+ Workshop 2016"
-#: haunt.scm:510
+#: haunt.scm:522
msgid "Subscribe to Atom feed"
msgstr "Subscribe to Atom feed"
-#: haunt.scm:517
+#: haunt.scm:529
msgid "Contact me:"
msgstr "Contact me:"
-#: haunt.scm:519
+#: haunt.scm:531
msgid "Mail:"
msgstr "Mail:"
-#: haunt.scm:532
-msgid "GnuPG key:"
-msgstr "GnuPG key:"
-
-#: haunt.scm:537
-msgid "valid until"
-msgstr "valid until"
-
-#: haunt.scm:540
-msgid "Find the source code for this website"
-msgstr "Find the source code for this website"
-
-#: haunt.scm:543 haunt.scm:906 haunt.scm:911
-msgid "here"
-msgstr "here"
+#: haunt.scm:544
+msgid "GnuPG key: ||gnupglink_|| (valid until ||gnupgexp_||)"
+msgstr "GnuPG key: ||gnupglink_|| (valid until ||gnupgexp_||)"
-#: haunt.scm:546
-msgid "Powered by"
-msgstr "Powered by"
+#: haunt.scm:553
+msgid "Find the source code for this website ||link_|here||."
+msgstr "Find the source code for this website ||link_|here||."
-#: haunt.scm:551
-msgid "and"
-msgstr "and"
+#: haunt.scm:562
+msgid ""
+"Powered by ||link_|https://www.gnu.org/software/guile/|GNU Guile|| and ||"
+"link_|https://haunt.dthompson.us/|Haunt||."
+msgstr "Powered by ||link_|https://www.gnu.org/software/guile/|GNU Guile|| and ||link_|https://haunt.dthompson.us/|Haunt||."
-#: haunt.scm:576 haunt.scm:979 haunt.scm:987
+#: haunt.scm:586 haunt.scm:1005 haunt.scm:1013
msgid "Recent posts"
msgstr "Recent posts"
-#: haunt.scm:601
+#: haunt.scm:611
msgid "Lecture notes"
msgstr "Lecture notes"
-#: haunt.scm:602
+#: haunt.scm:612
msgid "Some German lecture summaries I made for lectures I heard in 2013:"
msgstr "Some German lecture summaries I made for lectures I heard in 2013:"
-#: haunt.scm:613
+#: haunt.scm:623
msgid "C exercises (German)"
msgstr "C exercises (German)"
-#: haunt.scm:614
+#: haunt.scm:624
msgid "Includes a cheat sheet for working with C."
msgstr "Includes a cheat sheet for working with C."
-#: haunt.scm:618
+#: haunt.scm:628
msgid "C Exercises"
msgstr "C Exercises"
-#: haunt.scm:640
+#: haunt.scm:650
msgid "A simple GTK+ hangman game inspired by bsd-games’ hangman."
msgstr "A simple GTK+ hangman game inspired by bsd-games’ hangman."
-#: haunt.scm:642
+#: haunt.scm:652
msgid ""
"“Don’t Hang” is a simple hangman game for acquiring and consolidating a "
"basic vocabulary in a foreign language. It supports loading custom word "
"lists and works with Unicode and bidirectional text. It also supports "
"pasting characters from the clipboard."
-msgstr "“Don’t Hang” is a simple hangman game for acquiring and consolidating a basic vocabulary in a foreign language. It supports loading custom word lists and works with Unicode and bidirectional text. It also supports pasting characters from the clipboard."
+msgstr ""
+"“Don’t Hang” is a simple hangman game for acquiring and consolidating a "
+"basic vocabulary in a foreign language. It supports loading custom word "
+"lists and works with Unicode and bidirectional text. It also supports "
+"pasting characters from the clipboard."
-#: haunt.scm:646
+#: haunt.scm:656
msgid "It is free software and also publicly available at no cost."
msgstr "It is free software and also publicly available at no cost."
-#: haunt.scm:649
+#: haunt.scm:659
msgid "Screenshots"
msgstr "Screenshots"
-#: haunt.scm:651
+#: haunt.scm:661
msgid "Guessing an expression"
msgstr "Guessing an expression"
-#: haunt.scm:653
+#: haunt.scm:663
msgid "Right-to-left support"
msgstr "Right-to-left support"
-#: haunt.scm:666
+#: haunt.scm:676
msgid "News"
msgstr "News"
-#: haunt.scm:672
+#: haunt.scm:682
msgid "“Don’t Hang”"
msgstr "“Don’t Hang”"
-#: haunt.scm:676
+#: haunt.scm:686
msgid "Downloads"
msgstr "Downloads"
-#: haunt.scm:680
+#: haunt.scm:690
msgid "“Don’t Hang” version 1.1 Source code."
msgstr "“Don’t Hang” version 1.1 Source code."
-#: haunt.scm:683
+#: haunt.scm:693
msgid "Current development version."
msgstr "Current development version."
-#: haunt.scm:686
-msgid "“Don’t Hang” for Arch Linux"
-msgstr "“Don’t Hang” for Arch Linux"
-
-#: haunt.scm:687
-msgid " and derivative GNU distributions such as "
-msgstr " and derivative GNU distributions such as "
-
-#: haunt.scm:690
-msgid "Parabola GNU/Linux-libre"
-msgstr "Parabola GNU/Linux-libre"
+#: haunt.scm:694
+msgid ""
+"aurlink_|“Don’t Hang” for Arch Linux|| and derivative GNU distributions such "
+"as ||parabolalink_|Parabola GNU/Linux-libre||."
+msgstr "aurlink_|“Don’t Hang” for Arch Linux|| and derivative GNU distributions such as ||parabolalink_|Parabola GNU/Linux-libre||."
-#: haunt.scm:699
+#: haunt.scm:714
msgid "“portable” binaries without installer"
msgstr "“portable” binaries without installer"
-#: haunt.scm:700
+#: haunt.scm:715
msgid " if you are still using Windows, all built using "
msgstr " if you are still using Windows, all built using "
-#: haunt.scm:702
+#: haunt.scm:717
msgid ""
" for which the source files are available at their\n"
"home page."
@@ -198,91 +186,66 @@ msgstr ""
" for which the source files are available at their\n"
"home page."
-#: haunt.scm:712
+#: haunt.scm:727
msgid "Word lists"
msgstr "Word lists"
-#: haunt.scm:713
-msgid "“Don’t Hang” by default uses the words from the "
-msgstr "“Don’t Hang” by default uses the words from the "
-
-#: haunt.scm:716
-msgid ""
-" directory, but it can deal with any list of expressions in a text file with "
-"one expression per line. "
-msgstr " directory, but it can deal with any list of expressions in a text file with one expression per line. "
-
-#: haunt.scm:720
-msgid "Here"
-msgstr "Here"
-
-#: haunt.scm:721
-msgid " is an example word list file compiled with words from "
-msgstr " is an example word list file compiled with words from "
-
-#: haunt.scm:725
-msgid "Wiktionary’s list of 1000 basic English words"
-msgstr "Wiktionary’s list of 1000 basic English words"
-
-#: haunt.scm:726
+#: haunt.scm:728
msgid ""
-" which you can use if you want simpler words. This sample word list is "
-"available under the terms of "
-msgstr " which you can use if you want simpler words. This sample word list is available under the terms of "
-
-#: haunt.scm:730
-msgid "the CC-BY-SA 3.0 Unported license"
-msgstr "the CC-BY-SA 3.0 Unported license"
-
-#: haunt.scm:731
+"“Don’t Hang” by default uses the words from the ||ic_|/usr/share/dict|| "
+"directory, but it can deal with any list of expressions in a text file with "
+"one expression per line. ||samplelink_|Here|| is an example word list file "
+"compiled with words from ||wiktionarylink_|Wiktionary’s list of 1000 basic "
+"English words|| which you can use if you want simpler words. This sample "
+"word list is available under the terms of ||ccbysalink_|the CC-BY-SA 3.0 "
+"Unported license||, because Wiktionary uses this license and the words are "
+"taken from there."
+msgstr "“Don’t Hang” by default uses the words from the ||ic_|/usr/share/dict|| directory, but it can deal with any list of expressions in a text file with one expression per line. ||samplelink_|Here|| is an example word list file compiled with words from ||wiktionarylink_|Wiktionary’s list of 1000 basic English words|| which you can use if you want simpler words. This sample word list is available under the terms of ||ccbysalink_|the CC-BY-SA 3.0 Unported license||, because Wiktionary uses this license and the words are taken from there."
+
+#: haunt.scm:756
msgid ""
-", because Wiktionary uses this license and the words are taken from there."
+"Please note that all words in the sample word list have been deliberately "
+"converted to upper case. The reason is that “Don’t Hang” displays words in "
+"upper case and storing the words in lower case would lead to errors in some "
+"locales, e.g. the English word “is” would become “İS” in a Turkish locale."
msgstr ""
-", because Wiktionary uses this license and the words are taken from there."
-
-#: haunt.scm:733
-msgid ""
"Please note that all words in the sample word list have been deliberately "
"converted to upper case. The reason is that “Don’t Hang” displays words in "
"upper case and storing the words in lower case would lead to errors in some "
"locales, e.g. the English word “is” would become “İS” in a Turkish locale."
-msgstr "Please note that all words in the sample word list have been deliberately converted to upper case. The reason is that “Don’t Hang” displays words in upper case and storing the words in lower case would lead to errors in some locales, e.g. the English word “is” would become “İS” in a Turkish locale."
-#: haunt.scm:821 haunt.scm:888
+#: haunt.scm:843 haunt.scm:910
msgid "All source code for the workshop."
msgstr "All source code for the workshop."
-#: haunt.scm:900
+#: haunt.scm:922
msgid ""
"Thank you for your interest in my workshop\n"
-"“GUI Programming with GTK+”. "
+"“GUI Programming with GTK+”. ||register_|To register please go |here|. ||For "
+"more information see ||link_|here||."
msgstr ""
"Thank you for your interest in my workshop\n"
-"“GUI Programming with GTK+”. "
-
-#: haunt.scm:904
-msgid "To register please go "
-msgstr "To register please go "
+"“GUI Programming with GTK+”. ||register_|To register please go |here|. ||For "
+"more information see ||link_|here||."
-#: haunt.scm:909
-msgid "For more information see "
-msgstr "For more information see "
-
-#: haunt.scm:920
+#: haunt.scm:946
msgid "GUI Programming with GTK+ "
msgstr "GUI Programming with GTK+ "
-#: haunt.scm:937
+#: haunt.scm:963
msgid "Home page"
msgstr "Home page"
-#: haunt.scm:940
+#: haunt.scm:966
msgid "Welcome"
msgstr "Welcome"
-#: haunt.scm:941
+#: haunt.scm:967
msgid ""
"Welcome to my personal web site. My name is Florian Pelz and I live in "
"Kaiserslautern in Germany. When I have interesting things to share, I’ll put "
"them up here."
-msgstr "Welcome to my personal web site. My name is Florian Pelz and I live in Kaiserslautern in Germany. When I have interesting things to share, I’ll put them up here."
+msgstr ""
+"Welcome to my personal web site. My name is Florian Pelz and I live in "
+"Kaiserslautern in Germany. When I have interesting things to share, I’ll put "
+"them up here."