Merge branch 'bookmarks-add-infocalypse-pyfreenet' into next

Signed-off-by: Arne Babenhauserheide <[email protected]>

src/freenet/clients/http/staticfiles/defaultbookmarks.dat

@@ -59,7 +59,7 @@ BookmarkCategory1.Content.Bookmark6.ShortDescription=L10N:Sharesite
 BookmarkCategory1.Content.Bookmark6.hasAnActivelink=true
 BookmarkCategory2.Name=L10N:categoryDocumentation
 BookmarkCategory2.Content.BookmarkCategory=0
-BookmarkCategory2.Content.Bookmark=10
+BookmarkCategory2.Content.Bookmark=11
 BookmarkCategory2.Content.Bookmark0.URI=USK@0iU87PXyodL2nm6kCpmYntsteViIbMwlJE~wlqIVvZ0,nenxGvjXDElX5RIZxMvwSnOtRzUKJYjoXEDgkhY6Ljw,AQACAAE/freenetproject-mirror/515/
 BookmarkCategory2.Content.Bookmark0.Name=Freenetproject Website Mirror
 BookmarkCategory2.Content.Bookmark0.Description=L10N:freenetprojectorg
@@ -110,6 +110,11 @@ BookmarkCategory2.Content.Bookmark9.hasAnActivelink=true
 BookmarkCategory2.Content.Bookmark9.Name=Sharesite Documentation
 BookmarkCategory2.Content.Bookmark9.Description=L10N:sharesitedocumentation
 BookmarkCategory2.Content.Bookmark9.ShortDescription=L10N:sharesitedocumentation
+BookmarkCategory2.Content.Bookmark10.URI=USK@~osOPnNLdMLVrYVNTahLufdwOuMhhC4GkpIHulnSm04,bwAmjkK-BZZnj-bujBQehwgGqUM1AUFhzTW4hcDGXQ0,AQACAAE/infocalypse_and_pyFreenet/6/
+BookmarkCategory2.Content.Bookmark10.Name=Infocalypse and pyFreenet
+BookmarkCategory2.Content.Bookmark10.Description=L10N:InfocalypsePyFreenet
+BookmarkCategory2.Content.Bookmark10.ShortDescription=L10N:InfocalypsePyFreenet
+BookmarkCategory2.Content.Bookmark10.hasAnActivelink=true
 BookmarkCategory3.Name=L10N:categoryBlogs
 BookmarkCategory3.Content.BookmarkCategory=0
 BookmarkCategory3.Content.Bookmark=5

src/freenet/l10n/freenet.l10n.en.properties

@@ -113,6 +113,7 @@ Bookmarks.Defaults.Description.PrivacyAndSoftware=Techniques for protecting your
 Bookmarks.Defaults.Description.freenetprojectorg=A mirror of the official Freenet Website with news and documentation
 Bookmarks.Defaults.Description.Shoeshop=A plugin to provide Sneakernet over Freenet: Download and upload sites and keys as fblobs
 Bookmarks.Defaults.Description.FLIP=External program to provide IRC over Freenet
+Bookmarks.Defaults.Description.InfocalypsePyFreenet=Tool for source control management and libraries to control Freenet from Python
 Bookmarks.Defaults.Description.Publish=Simple guide to publishing web sites to Freenet
 Bookmarks.Defaults.Description.FreesiteHOWTO=A more detailed explanation of publishing freesites
 Bookmarks.Defaults.Description.Sone=Fast anonymous social chat over Freenet
@@ -139,6 +140,7 @@ Bookmarks.Defaults.ShortDescription.PrivacyAndSoftware=Best Practices for Freene
 Bookmarks.Defaults.ShortDescription.freenetprojectorg=The official Freenet Project website
 Bookmarks.Defaults.ShortDescription.Shoeshop=Sneakernet
 Bookmarks.Defaults.ShortDescription.FLIP=IRC Chat
+Bookmarks.Defaults.ShortDescription.InfocalypsePyFreenet=DVCS and Python libraries
 Bookmarks.Defaults.ShortDescription.Publish=How to publish web sites on freenet
 Bookmarks.Defaults.ShortDescription.FreesiteHOWTO=Another guide to publishing a website to Freenet
 Bookmarks.Defaults.ShortDescription.Sone=Social chat over Freenet