From b4a3f66ce7f829a70a9c74092b0b8679515662a6 Mon Sep 17 00:00:00 2001 From: yeet648 Date: Sat, 24 Aug 2019 12:43:23 -0700 Subject: [PATCH 1/7] tokens for selfhosted OS, and corred missing token for OS warning in OS page. --- _i18n/en.yml | 8 ++++++++ _includes/sections/operating-systems.html | 2 +- _includes/sections/selfhosted-cloud.html | 20 +++++++++++--------- 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 6143c92e..a1915995 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -331,3 +331,11 @@ live_os: worth_mentioning: "Worth Mentioning" tiny_core_linux: "Tiny Core Linux" tiny_core_linux_descr: "A minimal Linux operating system focusing on providing a base system using BusyBox and FLTK. The distribution is notable for its size (15 MB) and minimalism, with additional functionality provided by extensions." +selfhosted_cloud: + software: "Self-Hosted Cloud Server Software" + warning: "If you are currently using a Cloud Storage Services like Dropbox, Google Drive, Microsoft OneDrive or Apple iCloud, you should think about hosting it on your own." + pydio_descr: "Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs." + tahoe_descr: "Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security." + nextcloud_descr: "Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients." + worth_mentioning: "Worth Mentioning" + cryptpad_descr: "- End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source)." diff --git a/_includes/sections/operating-systems.html b/_includes/sections/operating-systems.html index f7f7b433..ca5db582 100644 --- a/_includes/sections/operating-systems.html +++ b/_includes/sections/operating-systems.html @@ -1,7 +1,7 @@

{% t pc_os.pc_operating_systems %}

{%- capture pc_os_qubesos_labels -%}warning:contrib:{% t global.contrib %}{%- endcapture -%} diff --git a/_includes/sections/selfhosted-cloud.html b/_includes/sections/selfhosted-cloud.html index ca02b5d0..2efc8597 100644 --- a/_includes/sections/selfhosted-cloud.html +++ b/_includes/sections/selfhosted-cloud.html @@ -1,9 +1,13 @@ -

Self-Hosted Cloud Server Software

+

{% t selfhosted_cloud.software %}

+{%- capture selfhosted_cloud_pydio_descr -%}{% t selfhosted_cloud.pydio_descr %}{%- endcapture -%} +{%- capture selfhosted_cloud_tahoe_descr -%}{% t selfhosted_cloud.tahoe_descr %}{%- endcapture -%} +{%- capture selfhosted_cloud_nextcloud_descr -%}{% t selfhosted_cloud.nextcloud_descr %}{%- endcapture -%} +
{% include card.html color="success" @@ -11,8 +15,7 @@ image="/assets/img/tools/Pydio.png" url="https://pydio.com/" footer="OS: Windows, macOS, Linux, iOS, Android." - description="Pydio is open source software that turns instantly any server (on-premise, NAS, cloud IaaS or PaaS) into a file sharing platform for your company. It is an alternative - to SaaS Boxes and Drives, with more control, safety and privacy, and favorable TCOs." + description=selfhosted_cloud_pydio_descr %} {% include card.html color="primary" @@ -20,8 +23,7 @@ image="/assets/img/tools/Tahoe-LAFS.png" url="https://www.tahoe-lafs.org/" footer="OS: Windows, macOS, Linux." - description="Tahoe-LAFS is a Free and Open decentralized cloud storage system. It distributes your data across multiple servers. Even if some of the servers fail or are - taken over by an attacker, the entire file store continues to function correctly, preserving your privacy and security." + description=selfhosted_cloud_tahoe_descr %} {% include card.html color="warning" @@ -29,12 +31,12 @@ image="/assets/img/provider/Nextcloud.png" url="https://nextcloud.com/" footer="Client OS: Windows, macOS, Linux, BSD, Unix, iOS, Android, Fire OS. Server: Linux." - description="Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients." + description=selfhosted_cloud_nextcloud_descr %}
-

Worth Mentioning

+

{% t selfhosted_cloud.worth_mentioning %}

-- 2.47.2 From 1526ef2ba2d227344985564286e43045aff2b6f3 Mon Sep 17 00:00:00 2001 From: yeet648 Date: Sat, 24 Aug 2019 13:28:40 -0700 Subject: [PATCH 2/7] added tokens for self contained networks --- _i18n/en.yml | 18 ++++++++++ .../sections/self-contained-networks.html | 33 ++++++++++--------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index a1915995..53aa5392 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -339,3 +339,21 @@ selfhosted_cloud: nextcloud_descr: "Similar functionally to the widely used Dropbox, with the difference being that Nextcloud is free and open-source, and thereby allowing anyone to install and operate it without charge on a private server, with no limits on storage space or the number of connected clients." worth_mentioning: "Worth Mentioning" cryptpad_descr: "- End-to-end encrypted real time collaboration sharing folders, media, and documents (open-source)." +selfcontained_networks: + networks: "Self-contained Networks" + warning: "If you are currently browsing clearnet and want to access the dark web, this section is for you." + tor_descr: "The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool." + i2p_descr: "The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous Web surfing, chatting, blogging and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open source and is published under multiple licenses." + freenet_descr: "Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech on the Internet with strong anonymity protection." + related_information: "Related Information" + true_stories: "- True stories from the dark side of the Internet." + worth_mentioning: "Worth Mentioning" + zeronet_descr: "- Open, free and uncensorable websites, using Bitcoin cryptography and BitTorrent network." + retroshare_descr: "- Open Source cross-platform, Friend-2-Friend and secure decentralized communication platform." + gnunet_descr: "- GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy." + ipfs_descr: "- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. (important privacy warning)" + yggdrasil_descr: "- An early-stage implementation of a fully end-to-end encrypted IPv6 network. It is lightweight, self-arranging, supported on multiple platforms and allows pretty much any IPv6-capable application to communicate securely with other Yggdrasil nodes. Yggdrasil does not require you to have IPv6 Internet connectivity - it also works over IPv4." + yggdrasil_warning: "The project is currently in early stages but it is being actively developed." + yggdrasil_danger: "Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers." + experimental: "experimental" + privacy_warning: "privacy warning" \ No newline at end of file diff --git a/_includes/sections/self-contained-networks.html b/_includes/sections/self-contained-networks.html index fe96cff1..b5582121 100644 --- a/_includes/sections/self-contained-networks.html +++ b/_includes/sections/self-contained-networks.html @@ -1,9 +1,13 @@ -

Self-contained Networks

+

{% t selfcontained_networks.networks %}

+{%- capture selfcontained_networks_tor_descr -%}{% t selfcontained_networks.tor_descr %}{%- endcapture -%} +{%- capture selfcontained_networks_i2p_descr -%}{% t selfcontained_networks.i2p_descr %}{%- endcapture -%} +{%- capture selfcontained_networks_freenet_descr -%}{% t selfcontained_networks.freenet_descr %}{%- endcapture -%} +
{% include card.html color="success" @@ -12,7 +16,7 @@ url="https://www.torproject.org/" tor="http://expyuzz4wqqyqhjn.onion" footer='OS: Windows, macOS, Linux, iOS, Android (Tor Browser, Proxy other apps with Orbot), OpenBSD.' - description="The Tor network is a group of volunteer-operated servers that allows people to improve their privacy and security on the Internet. Tor's users employ this network by connecting through a series of virtual tunnels rather than making a direct connection, thus allowing both organizations and individuals to share information over public networks without compromising their privacy. Tor is an effective censorship circumvention tool." + description=selfcontained_networks_tor_descr %} {% include card.html color="primary" @@ -20,8 +24,7 @@ image="/assets/img/tools/I2P.png" url="https://geti2p.net/" footer="OS: Windows, macOS, Linux, Android, BSD / Solaris." - description="The Invisible Internet Project (I2P) is a computer network layer that allows applications to send messages to each other pseudonymously and securely. Uses include anonymous - Web surfing, chatting, blogging and file transfers. The software that implements this layer is called an I2P router and a computer running I2P is called an I2P node. The software is free and open source and is published under multiple licenses." + description=selfcontained_networks_i2p_descr %} {% include card.html color="warning" @@ -29,25 +32,23 @@ image="/assets/img/tools/Freenet.png" url="https://freenetproject.org/" footer="OS: Windows, macOS, Linux." - description="Freenet is a peer-to-peer platform for censorship-resistant communication. It uses a decentralized distributed data store to keep and deliver information, and - has a suite of free software for publishing and communicating on the Web without fear of censorship. Both Freenet and some of its associated tools were originally designed by Ian Clarke, who defined Freenet's goal as providing freedom of speech - on the Internet with strong anonymity protection." + description=selfcontained_networks_freenet_descr %}
-

Related Information

+

{% t selfcontained_networks.related_information %}

-

Worth Mentioning

+

{% t selfcontained_networks.worth_mentioning %}

-- 2.47.2 From f506ad1c7bbc6eb11a225281ff4c0f0055801354 Mon Sep 17 00:00:00 2001 From: yeet648 Date: Wed, 28 Aug 2019 21:40:11 -0700 Subject: [PATCH 3/7] added tokens to file sync page --- _i18n/en.yml | 8 +++++++- _includes/sections/file-sync.html | 20 +++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index bdbec683..c9e349a5 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -359,4 +359,10 @@ selfcontained_networks: yggdrasil_warning: "The project is currently in early stages but it is being actively developed." yggdrasil_danger: "Yggdrasil doesn't have a goal of providing anonymity and your peers know your IP address unless you are only using Tor/I2P peers." experimental: "experimental" - privacy_warning: "privacy warning" \ No newline at end of file + privacy_warning: "privacy warning" +filesync: + software: "Secure File Sync Software" + sparkleshare_descr: "SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file." + syncthing_descr: "Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet." + worth_mentioning: "Worth Mentioning" + gitannex_descr: "- Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space." \ No newline at end of file diff --git a/_includes/sections/file-sync.html b/_includes/sections/file-sync.html index e7a8fd77..7aef0010 100644 --- a/_includes/sections/file-sync.html +++ b/_includes/sections/file-sync.html @@ -1,4 +1,7 @@ -

Secure File Sync Software

+

{% t filesync.software %}

+ +{%- capture filesync_sparkleshare_descr -%}{% t filesync.sparkleshare_descr %}{%- endcapture -%} +{%- capture filesync_syncthing_descr -%}{% t filesync.syncthing_descr %}{%- endcapture -%}
@@ -7,24 +10,23 @@ image="/assets/img/tools/SparkleShare.png" url="https://sparkleshare.org/" footer="OS: Windows, macOS, Linux." - description="SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically - kept in sync with both the host and all of your peers when someone adds, removes or edits a file." - %} {% include card.html color="primary" + description=filesync_sparkleshare_descr + %} + + {% include card.html color="primary" title="Syncthing" image="/assets/img/tools/Syncthing.png" url="https://syncthing.net/" footer="OS: Windows, macOS, Linux, Android, BSD, Solaris." - description="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to - choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet." + description=filesync_syncthing_descr %}
-

Worth Mentioning

+

{% t filesync.worth_mentioning %}

  • - git-annex - Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, - whether due to limitations in memory, time, or disk space. + git-annex {% t filesync.gitannex_descr %}
-- 2.47.2 From d552fd75b8f5f57363ad61d62d0cd7df414b350f Mon Sep 17 00:00:00 2001 From: yeet648 Date: Thu, 5 Sep 2019 15:34:14 -0700 Subject: [PATCH 4/7] tokens for real time communications --- _i18n/en.yml | 5 ++++- pages/software/real-time-communication.html | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index c9e349a5..a536bc15 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -365,4 +365,7 @@ filesync: sparkleshare_descr: "SparkleShare creates a special folder on your computer. You can add remotely hosted folders (or \"projects\") to this folder. These projects will be automatically kept in sync with both the host and all of your peers when someone adds, removes or edits a file." syncthing_descr: "Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third-party and how it's transmitted over the Internet." worth_mentioning: "Worth Mentioning" - gitannex_descr: "- Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space." \ No newline at end of file + gitannex_descr: "- Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space." +real_time_communication: + title: "Real-Time Communication" + descr: "Discover secure and private ways to communicate with others online without letting any third parties read your messages." \ No newline at end of file diff --git a/pages/software/real-time-communication.html b/pages/software/real-time-communication.html index 9a28ab8b..77ebfe2f 100644 --- a/pages/software/real-time-communication.html +++ b/pages/software/real-time-communication.html @@ -1,8 +1,8 @@ --- layout: page permalink: /software/real-time-communication/ -title: "Real-Time Communication" -description: "Discover secure and private ways to communicate with others online without letting any third parties read your messages." +title: "{% t real_time_communication.title %}" +description: "{% t real_time_communication.descr %}" --- {% include sections/instant-messenger.html %} -- 2.47.2 From fb8df86e06e9bd73dcb4bff5841ea3ff3180bee5 Mon Sep 17 00:00:00 2001 From: yeet648 Date: Tue, 10 Sep 2019 15:43:46 -0700 Subject: [PATCH 5/7] added tokens for instant messenger --- _i18n/en.yml | 37 +++++++++++++- _includes/sections/instant-messenger.html | 62 ++++++++++++----------- 2 files changed, 68 insertions(+), 31 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index a536bc15..94edfaa9 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -7,6 +7,9 @@ global: download: "Download" related_information: "Related Information" contrib: "This software may depend on or recommend non-free software." + warning: "Warning" + experimental: "Experimental" + voip: "VoIP" aria: nav_toggle: "Toggle navigation" service_descriptions: @@ -368,4 +371,36 @@ filesync: gitannex_descr: "- Allows managing files with git, without checking the file contents into git. While that may seem paradoxical, it is useful when dealing with files larger than git can currently easily handle, whether due to limitations in memory, time, or disk space." real_time_communication: title: "Real-Time Communication" - descr: "Discover secure and private ways to communicate with others online without letting any third parties read your messages." \ No newline at end of file + descr: "Discover secure and private ways to communicate with others online without letting any third parties read your messages." +instant_messenger: + anchor: "Encrypted Instant Messenger" + warning: "If you are currently using an Instant Messenger like Telegram, LINE, Viber, WhatsApp, or plain SMS you should pick an alternative here." + signal_descr: "Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling. All communications are end-to-end encrypted. Signal is free and open source." + wire_descr: "A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available." + wire_warning: "Warning:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations." + compare: "Complete Comparison" + compare_descr1: " - Guide to Choosing a Messenger." + compare_descr2: " - Secure Messaging Apps Comparison." + compare_descr3: " - Simple Secure Messaging Apps Comparison." + worth_mentioning: "Worth Mentioning" + briar: " - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship." + retroshare: " - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P." + xmpp: " - Federated instant messaging protocol with OMEMO, OTR, or OpenPGP end-to-end encryption:" + conversations: " - An open source Jabber/XMPP client for Android 4.4+ smartphones. " + gajim: " - An open source fully featured XMPP client. " + monal: " - An XMPP client in active development. " + other_omemo: "Other OMEMO ready clients" + kontalk: " - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted." + keybase: " End-to-end encrypted messaging with social verification." + keybase_tooltip: "This software relies on a closed-source central server." + status: " A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs." + tox: " A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. " + jami: " - Gives you full control over your communications and an unmatched level of privacy. Jami has text messaging, video and audio calls, file transfer, video conferencing. " + formerly: "formerly" + related: "Related Information" + related_firstlook: "Chatting in Secret While We're All Being Watched - firstlook.org" + related_signal: "Advanced users with special needs can download the Signal APK directly. Most users should not do this under normal circumstances." + audits: "Independent security audits" + audits_eprint: "A Formal Security Analysis of the Signal Messaging Protocol (2019) by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila" + audits_wire: "Independent security audits on Wire's website" + audits_keybase: "Keybase's Protocol Security Review (2019) by NCC Group" \ No newline at end of file diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html index cca3e64f..8131c126 100644 --- a/_includes/sections/instant-messenger.html +++ b/_includes/sections/instant-messenger.html @@ -1,15 +1,17 @@ -

Encrypted Instant Messenger

+

{% t instant_messenger.anchor %}

+{%- capture instant_messenger_signal_descr -%}{% t instant_messenger.signal_descr %}{%- endcapture -%} +{%- capture instant_messenger_wire_descr -%}{% t instant_messenger.wire_descr %}{%- endcapture -%} +{%- capture instant_messenger_wire_warning -%}warning:{% t instant_messenger.wire_warning %}|success:{% t global.voip %}{%- endcapture -%} {% include cardv2.html title="Signal" image="/assets/img/tools/Signal.png" -description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling. -All communications are end-to-end encrypted. Signal is free and open source." +description=instant_messenger_signal_descr labels="success:VoIP" website="https://signal.org/" forum="https://forum.privacytools.io/t/discussion-signal/664" @@ -22,8 +24,8 @@ ios="" {% include cardv2.html title="Wire" image="/assets/img/tools/wire.png" -description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available." -labels="warning:Warning:Wire stores some plaintext metadata about its users on their servers. This data includes profile names, profile pictures, usernames, and users' lists of connections and conversations.|success:VoIP" +description=instant_messenger_wire_descr +labels=instant_messenger_wire_warning website="https://wire.com/" forum="https://forum.privacytools.io/t/discussion-wire/750" github="https://github.com/wireapp/" @@ -35,44 +37,44 @@ linux="" web="" %} -

Complete Comparison

+

{% t instant_messenger.compare %}

-

Worth Mentioning

+

{% t instant_messenger.worth_mentioning %}

    -
  • Briar - An ultra-secure peer-to-peer instant messenger that connects to contacts via Direct Wi-Fi, Bluetooth, or Tor over the internet, keeping its users protected from surveillance and censorship. -
  • RetroShare - An E2E encrypted instant messaging and voice/video call client. RetroShare supports both TOR and I2P.
    • -
  • XMPP - Federated instant messaging protocol with OMEMO, OTR, or OpenPGP end-to-end encryption:
    • +
  • Briar{% t instant_messenger.briar %}
    • +
  • RetroShare{% t instant_messenger.retroshare %}
    • +
  • XMPP{% t instant_messenger.xmpp %}
    • -
  • Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
    • -
  • Keybase - Warning End-to-end encrypted messaging with social verification.
    • -
  • Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
    • -
  • Tox - Experimental A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. VoIP
    • -
  • Jami (formerly Ring/SFLphone) - Gives you full control over your communications and an unmatched level of privacy. Jami has text messaging, video and audio calls, file transfer, video conferencing. VoIP
    • +
  • Kontalk{% t instant_messenger.kontalk %}
    • +
  • Keybase - {% t global.warning %}{% t instant_messenger.keybase %}
    • +
  • Status - {% t global.experimental %}{% t instant_messenger.status %}
    • +
  • Tox - {% t global.experimental %}{% t instant_messenger.tox %}{% t global.voip %}
    • +
  • Jami ({% t instant_messenger.formerly %} Ring/SFLphone){% t instant_messenger.jami %}{% t global.voip %}
-

Related Information

+

{% t instant_messenger.related %}

-- 2.47.2 From 71dc61e59437c971f32021e4e3c0909b0d3218d2 Mon Sep 17 00:00:00 2001 From: yeet648 Date: Wed, 16 Oct 2019 14:28:29 -0700 Subject: [PATCH 6/7] added tokens for video/voice page --- _i18n/en.yml | 15 +++++++++++- _includes/sections/voice-video-messenger.html | 23 +++++++++++-------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 94edfaa9..1b86c432 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -403,4 +403,17 @@ instant_messenger: audits: "Independent security audits" audits_eprint: "A Formal Security Analysis of the Signal Messaging Protocol (2019) by Katriel Cohn-Gordon, Cas Cremers, Benjamin Dowling, Luke Garratt and Douglas Stebila" audits_wire: "Independent security audits on Wire's website" - audits_keybase: "Keybase's Protocol Security Review (2019) by NCC Group" \ No newline at end of file + audits_keybase: "Keybase's Protocol Security Review (2019) by NCC Group" +video_voice_call: + title: "Video\/Voice Calling" + alert: "If you are currently using a Video/Voice Calling app like Skype, Viber or Google Hangouts, you should pick an alternative here. Please note that many of the above instant messengers also support VoIP. The software listed below are primarily Voice/Video focused." + linphone_descr: "Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication." + mumble_descr: "Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, it's missing end-to-end encryption, so self-hosting is recommended." + worth_mentioning: "Worth Mentioning" + jitsi_descr: "Jitsi Meet is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application." + webrtc_warning: "Our Firefox tweaks recommend disabling WebRTC as it can be used to leak your IP address even behind a VPN, which is why Tor Browser disables it." + requires_webrtc: "Requires WebRTC" + related_information: "Related Information" + more_info_mumble: "More information about Mumble:" + running_mumble: "Running Mumble Server and its config file, particularly obfuscating IPv4 addresses and logging" + torifying_mumble: "Torifying Mumble" \ No newline at end of file diff --git a/_includes/sections/voice-video-messenger.html b/_includes/sections/voice-video-messenger.html index 51f10040..7d819b34 100644 --- a/_includes/sections/voice-video-messenger.html +++ b/_includes/sections/voice-video-messenger.html @@ -1,14 +1,17 @@ -

Video/Voice Calling

+

{% t video_voice_call.title %}

+{%- capture video_voice_call_linphone_descr -%}{% t video_voice_call.linphone_descr %}{%- endcapture -%} +{%- capture video_voice_call_mumble_descr -%}{% t video_voice_call.mumble_descr %}{%- endcapture -%} + {% include cardv2.html title="Linphone" image="/assets/img/tools/Linphone.png" website="https://www.linphone.org/" -description="Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication." +description=video_voice_call_linphone_descr forum="https://forum.privacytools.io/t/discussion-linphone/751" github="https://github.com/BelledonneCommunications" ios="" @@ -23,7 +26,7 @@ web="" title="Mumble" image="/assets/img/tools/Mumble.png" website="https://mumble.info/" -description="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, it's missing end-to-end encryption, so self-hosting is recommended." +description=video_voice_call_mumble_descr forum="https://forum.privacytools.io/t/discussion-mumble/1289" github="https://github.com/mumble-voip/" windows="" @@ -31,18 +34,18 @@ linux="" mac="" %} -

Worth Mentioning

+

{% t video_voice_call.worth_mentioning %}

    -
  • Jitsi Meet - Jitsi Meet is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application. Requires WebRTC
    • +
  • Jitsi Meet - {% t video_voice_call.jitsi_descr %} {% t video_voice_call.requires_webrtc %}
-

Related Information

+

{% t video_voice_call.related_information %}

-- 2.47.2 From 3176f44cdfa70cfa22a02a301bd14ee2718902f0 Mon Sep 17 00:00:00 2001 From: yeet648 Date: Wed, 16 Oct 2019 14:33:38 -0700 Subject: [PATCH 7/7] removed extra escape character --- _i18n/en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_i18n/en.yml b/_i18n/en.yml index 1b86c432..a33022f2 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -405,7 +405,7 @@ instant_messenger: audits_wire: "Independent security audits on Wire's website" audits_keybase: "Keybase's Protocol Security Review (2019) by NCC Group" video_voice_call: - title: "Video\/Voice Calling" + title: "Video/Voice Calling" alert: "If you are currently using a Video/Voice Calling app like Skype, Viber or Google Hangouts, you should pick an alternative here. Please note that many of the above instant messengers also support VoIP. The software listed below are primarily Voice/Video focused." linphone_descr: "Linphone is an open source SIP Phone and a free voice over IP service, available on mobile and desktop environments and on web browsers. It supports ZRTP for end-to-end encrypted voice and video communication." mumble_descr: "Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, it's missing end-to-end encryption, so self-hosting is recommended." -- 2.47.2