upgrade DOMpurify to 2.1.1 - obsoleting the SAFE_FOR_JQUERY flag

.gitattributes

@@ -16,13 +16,11 @@ js/test/ export-ignore
 .jshintrc export-ignore
 .nsprc export-ignore
 .php_cs export-ignore
-.scrutinizer.yml export-ignore
 .styleci.yml export-ignore
 .travis.yml export-ignore
-codacy-analysis.yml export-ignore
-crowdin.yml export-ignore
 composer.json export-ignore
 composer.lock export-ignore
+crowdin.yml export-ignore
 BADGES.md export-ignore
 CODE_OF_CONDUCT.md export-ignore
 Makefile export-ignore

.github/dependabot.yml

@@ -1,14 +0,0 @@
-version: 2
-updates:
-  # Maintain dependencies for GitHub Actions
-  # src: https://github.com/marketplace/actions/build-and-push-docker-images#keep-up-to-date-with-github-dependabot
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    schedule:
-      interval: "daily"
-  # Also keep PHP (Composer) dependencies up-to-date
-  # see: https://docs.github.com/en/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file#package-ecosystem
-  - package-ecosystem: "composer"
-    directory: "/"
-    schedule:
-      interval: "daily"

.github/workflows/codeql-analysis.yml

@@ -1,49 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# Currently can only check JS.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '28 22 * * 5'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'javascript' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
-        # Learn more:
-        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2

.github/workflows/refresh-php8.yml

@@ -1,37 +0,0 @@
-name: Refresh PHP 8 branch
-
-on:
-  push:
-    branches: [ master ]
-  schedule:
-      - cron: '42 2 * * *'
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout php8 branch
-        uses: actions/checkout@v3
-        with:
-          # directly checkout the php8 branch
-          ref: php8
-          # Number of commits to fetch. 0 indicates all history for all branches and tags.
-          # Default: 1
-          fetch-depth: 0
-
-      - name: Merge master changes into php8
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git merge origin/master
-
-      - name: Push new changes
-        uses: github-actions-x/commit@v2.9
-        with:
-          name: github-actions[bot]
-          email: 41898282+github-actions[bot]@users.noreply.github.com
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          push-branch: 'php8'
-

.github/workflows/snyk-scan.yml

@@ -1,29 +0,0 @@
-# This is a basic workflow to help you get started with Actions
-
-name: Snyk scan
-
-on:
-  # Triggers the workflow on push or pull request events but only for the master branch
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-jobs:
-  # https://github.com/snyk/actions/tree/master/php
-  snyk-php:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install Google Cloud Storage
-        run: composer require --no-update google/cloud-storage && composer update --no-dev
-      - name: Run Snyk to check for vulnerabilities
-        uses: snyk/actions/php@master
-        continue-on-error: true # To make sure that SARIF upload gets called
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          args: --sarif-file-output=snyk.sarif
-      - name: Upload result to GitHub Code Scanning
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: snyk.sarif

.github/workflows/tests.yml

@@ -1,120 +1,52 @@
 name: Tests
-on:
-  push:
-  workflow_dispatch:
+on: [push]
 
 jobs:
-
   Composer:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v2
     - name: Validate composer.json and composer.lock
       run: composer validate
     - name: Install dependencies
-      run: composer install --prefer-dist --no-dev
-
+      run: composer install --prefer-dist --no-progress --no-suggest
   PHPunit:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2']
+        php-versions: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4']
     name: PHP ${{ matrix.php-versions }} unit tests on ${{ matrix.operating-system }}
-    env:
-      extensions: gd, sqlite3
-      extensions-cache-key-name: phpextensions
-
     steps:
-
-    # let's get started!
     - name: Checkout
-      uses: actions/checkout@v3
-
-    # cache PHP extensions
-    - name: Setup cache environment
-      id: extcache
-      uses: shivammathur/cache-extensions@v1
-      with:
-        php-version: ${{ matrix.php-versions }}
-        extensions: ${{ env.extensions }}
-        key: ${{ runner.os }}-${{ env.extensions-cache-key }}
-
-    - name: Cache extensions
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.extcache.outputs.dir }}
-        key: ${{ steps.extcache.outputs.key }}
-        restore-keys: ${{ runner.os }}-${{ env.extensions-cache-key }}
-
+      uses: actions/checkout@v2
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
       with:
         php-version: ${{ matrix.php-versions }}
-        extensions: ${{ env.extensions }}
-
-    # Setup GitHub CI PHP problem matchers
-    # https://github.com/shivammathur/setup-php#problem-matchers
-    - name: Setup problem matchers for PHP
-      run: echo "::add-matcher::${{ runner.tool_cache }}/php.json"
-
-    - name: Setup problem matchers for PHPUnit
-      run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
-
-    # composer cache
+        extensions: gd, sqlite3
     - name: Remove composer lock
       run: rm composer.lock
-
-    - name: Get composer cache directory
-      id: composer-cache
-      run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-    # http://man7.org/linux/man-pages/man1/date.1.html
-    # https://github.com/actions/cache#creating-a-cache-key
-    - name: Get Date
-      id: get-date
-      run: echo "date=$(/bin/date -u "+%Y%m%d")" >> $GITHUB_OUTPUT
-      shell: bash
-
-    - name: Cache dependencies
-      uses: actions/cache@v3
-      with:
-        path: ${{ steps.composer-cache.outputs.dir }}
-        key: ${{ runner.os }}-composer-${{ steps.get-date.outputs.date }}-${{ hashFiles('**/composer.json') }}
-        restore-keys: ${{ runner.os }}-composer-${{ steps.get-date.outputs.date }}-
-
-    # composer installation
     - name: Setup PHPunit
       run: composer install -n
-
-    - name: Install Google Cloud Storage
-      run: composer require google/cloud-storage
-
-    # testing
     - name: Run unit tests
       run: ../vendor/bin/phpunit --no-coverage
       working-directory: tst
-
   Mocha:
     runs-on: ubuntu-latest
     steps:
-
     - name: Checkout
-      uses: actions/checkout@v3
-
+      uses: actions/checkout@v2
     - name: Setup Node
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@v1
       with:
-        node-version: '16'
-        cache: 'npm'
-        cache-dependency-path: 'js/package-lock.json'
-
+        node-version: '12'
     - name: Setup Mocha
       run: npm install -g mocha
-
     - name: Setup Node modules
-      run: npm ci
+      run: npm install
+      working-directory: js
+    - name: Run unit tests
+      run: mocha
       working-directory: js
 
-    - name: Run unit tests
-      run: npm test
-      working-directory: js

.gitignore

@@ -6,7 +6,7 @@ cfg/*
 !cfg/.htaccess
 
 # Ignore data/
-/data/
+data/
 
 # Ignore PhpDoc
 doc/*
@@ -36,5 +36,3 @@ tst/ConfigurationCombinationsTest.php
 .project
 .externalToolBuilders
 .c9
-/.idea/
-*.iml

.scrutinizer.yml

@@ -1,36 +0,0 @@
-checks:
-    php: true
-    javascript: true
-filter:
-    paths:
-        - "css/privatebin.css"
-        - "css/bootstrap/privatebin.css"
-        - "js/privatebin.js"
-        - "lib/*.php"
-        - "index.php"
-coding_style:
-    php:
-        spaces:
-            around_operators:
-                additive: false
-                concatenation: true
-build:
-    environment:
-        php:
-            version: '7.2'
-    tests:
-        override:
-            -
-                command: 'composer require google/cloud-storage && cd tst && ../vendor/bin/phpunit'
-                coverage:
-                    file: 'tst/log/coverage-clover.xml'
-                    format: 'clover'
-    nodes:
-        tests: true
-        analysis:
-            tests:
-                override:
-                    -
-                        command: phpcs-run
-                        use_website_config: true
-                    - php-scrutinizer-run

.styleci.yml

@@ -29,9 +29,3 @@ disabled:
   - short_array_syntax
   - single_line_after_imports
   - unalign_equals
-
-finder:
-  path:
-    - "lib/"
-    - "tpl/"
-    - "tst/"

CHANGELOG.md

@@ -1,51 +1,8 @@
 # PrivateBin version history
 
-  * **1.4.1 (not yet released)**
-    * ADDED: Translations for Turkish, Slovak and Greek
-    * ADDED: S3 Storage backend (#994)
-    * CHANGED: Switched to Jdenticons as the default for comment icons (#793)
-    * CHANGED: Avoid `SUPER` privilege for setting the `sql_mode` for MariaDB/MySQL (#919)
-    * CHANGED: Upgrading libraries to: zlib 1.2.13
-    * FIXED: Revert to CREATE INDEX without IF NOT EXISTS clauses, to support MySQL (#943)
-    * FIXED: Apply table prefix to indexes as well, to support multiple instances sharing a single database (#943)
-    * FIXED: YOURLS integration via new proxy, storing signature in configuration (#725)
-  * **1.4 (2022-04-09)**
-    * ADDED: Translations for Corsican, Estonian, Finnish and Lojban
-    * ADDED: new HTTP headers improving security (#765)
-    * ADDED: Download button for paste text (#774)
-    * ADDED: Opt-out of federated learning of cohorts (FLoC) (#776)
-    * ADDED: Configuration option to exempt IPs from the rate-limiter (#787)
-    * ADDED: Google Cloud Storage backend support (#795)
-    * ADDED: Oracle database support (#868)
-    * ADDED: Configuration option to limit paste creation and commenting to certain IPs (#883)
-    * ADDED: Set CSP also as meta tag, to deal with misconfigured webservers mangling the HTTP header
-    * ADDED: Sanitize SVG preview, preventing script execution in instance context
-    * CHANGED: Language selection cookie only transmitted over HTTPS (#472)
-    * CHANGED: Upgrading libraries to: base-x 4.0.0, bootstrap 3.4.1 (JS), DOMpurify 2.3.6, ip-lib 1.18.0, jQuery 3.6.0, random_compat 2.0.21, Showdown 2.0.3 & zlib 1.2.12
-    * CHANGED: Removed automatic `.ini` configuration file migration (#808)
-    * CHANGED: Removed configurable `dir` for `traffic` & `purge` limiters (#419)
-    * CHANGED: Server salt, traffic and purge limiter now stored in the storage backend (#419)
-    * CHANGED: Drop support for attachment download in IE
-    * FIXED: Error when attachments are disabled, but paste with attachment gets displayed
-  * **1.3.5 (2021-04-05)**
-    * ADDED: Translations for Hebrew, Lithuanian, Indonesian and Catalan
-    * ADDED: Make the project info configurable (#681)
-    * CHANGED: Upgrading libraries to: DOMpurify 2.2.7, kjua 0.9.0 & random_compat 2.0.18
-    * CHANGED: Open all links in new window (#630)
-    * FIXED: PDF display in Firefox (#630)
-    * FIXED: Allow pasting into password input dialog (#630)
-    * FIXED: Display of expiration date in email (#630)
-    * FIXED: Allow display of durations in weeks (#630)
-    * FIXED: Avoid exposing burn-after-reading messages from cache (#630)
-    * FIXED: Only display the dropzone when it should (#630)
-    * FIXED: Detect delete token properly (#630)
-    * FIXED: Sanitize output from `Helper.urls2links()` (#630)
-    * FIXED: Avoid recreation of existing pasteurl element when calling URL shortener (#630)
-    * FIXED: Downloads in Chrome >= 83 (#634)
-    * FIXED: Display of empty files (#663)
-    * FIXED: Improve OpenGraph attributes (#651)
-    * FIXED: Reset to configured burn-after-reading, discussion and expiration settings (#682)
-    * FIXED: Italic segment of project information (#756)
+  * **1.4 (not yet released)**
+    * ADDED: Translation for Hebrew
+    * CHANGED: Upgrading libraries to: DOMpurify 2.1.1
   * **1.3.4 (2020-03-22)**
     * CHANGED: Minimum required PHP version is 5.6, due to a change in the identicon library and to use php's native hash_equals()
     * CHANGED: Upgrading libraries to: identicon 2.0.0
@@ -69,7 +26,7 @@
     * FIXED: HTML injection via unescaped attachment filename (#554)
     * FIXED: Password disabling option (#527)
   * **1.2.2 (2020-01-11)**
-    * CHANGED: Upgrading libraries to: bootstrap 3.4.1 (CSS), DOMpurify 2.0.7, jQuery 3.4.1, kjua 0.6.0, Showdown 1.9.1 & SJCL 1.0.8
+    * CHANGED: Upgrading libraries to: bootstrap 3.4.1, DOMpurify 2.0.7, jQuery 3.4.1, kjua 0.6.0, Showdown 1.9.1 & SJCL 1.0.8
     * FIXED: HTML injection via unescaped attachment filename (#554)
   * **1.3.1 (2019-09-22)**
     * ADDED: Translation for Bulgarian (#455)
@@ -80,7 +37,7 @@
     * CHANGED: Upgrading libraries to: DOMpurify 2.0.1
     * FIXED: Enabling browsers without WASM to create pastes and read uncompressed ones (#454)
     * FIXED: Cloning related issues (#489, #491, #493, #494)
-    * FIXED: Enable file operation only when editing (#497)
+    * FIXED: Enable file operation only when editing (#497) 
     * FIXED: Clicking 'New' on a previously submitted paste does not blank address bar (#354)
     * FIXED: Clear address bar when create new paste from existing paste (#479)
     * FIXED: Discussion section not hiding when new/clone paste is clicked on (#484)
@@ -243,7 +200,7 @@ encryption), i18n (translation, counterpart of i18n.php) and helper (stateless u
     * FIXED: 2 minor corrections to avoid notices in php log.
     * FIXED: Sources converted to UTF-8.
   * **Alpha 0.14 (2012-04-20):**
-    * ADDED: GD presence is checked.
+    * ADDED: GD presence is checked. 
     * CHANGED: Traffic limiter data files moved to data/ (→easier rights management)
     * ADDED: "Burn after reading" implemented. Opening the URL will display the paste and immediately destroy it on server.
   * **Alpha 0.13 (2012-04-18):**
@@ -251,16 +208,16 @@ encryption), i18n (translation, counterpart of i18n.php) and helper (stateless u
     * FIXED: $error not properly initialized in index.php
   * **Alpha 0.12 (2012-04-18):**
     * **DISCUSSIONS !** Now you can enable discussions on your pastes. Of course, posted comments and nickname are also encrypted and the server cannot see them.
-    * This feature implies a change in storage format. You will have to delete all previous pastes in your ZeroBin.
+    * This feature implies a change in storage format. You will have to delete all previous pastes in your ZeroBin. 
     * Added [[php:vizhash_gd|Vizhash]] as avatars, so you can match posters IP addresses without revealing them. (Same image = same IP). Of course the IP address cannot be deduced from the Vizhash.
     * Remaining time before expiration is now displayed.
-    * Explicit tags were added to CSS and jQuery selectors (eg. div#aaa instead of #aaa) to speed up browser.
+    * Explicit tags were added to CSS and jQuery selectors (eg. div#aaa instead of #aaa) to speed up browser. 
     * Better cleaning of the URL (to make sure the key is not broken by some stupid redirection service)
   * **Alpha 0.11 (2012-04-12):**
     * Automatically ignore parameters (such as &utm_source=...) added //after// the anchor by some stupid Web 2.0 services.
     * First public release.
   * **Alpha 0.10 (2012-04-12):**
-    * IE9 does not seem to correctly support ''pre-wrap'' either. Special handling mode activated for all version of IE<10. (Note: **ALL other browsers** correctly support this feature.)
+    * IE9 does not seem to correctly support ''pre-wrap'' either. Special handling mode activated for all version of IE<10. (Note: **ALL other browsers** correctly support this feature.) 
   * **Alpha 0.9 (2012-04-11):**
     * Oh bummer... IE 8 is as shitty as IE6/7: Its does not seem to support ''white-space:pre-wrap'' correctly. I had to activate the special handling mode. I still have to test IE 9.
   * **Alpha 0.8 (2012-04-11):**

CREDITS.md

@@ -2,17 +2,18 @@
 
 ## Active contributors
 
-* Simon Rupf - current developer and maintainer
-* rugk - security review, doc improvment, JS refactoring & various other stuff
-* R4SAS - python client, compression, blob URI to support larger attachments
+Simon Rupf - current developer and maintainer  
+rugk - security review, doc improvment, JS refactoring & various other stuff  
+R4SAS - python client, compression, blob URI to support larger attachments
 
 ## Past contributions
 
-* Sébastien Sauvage - original idea and main developer
+Sébastien Sauvage - original idea and main developer
+
 * Alexey Gladkov - syntax highlighting
 * Greg Knaddison - robots.txt
 * MrKooky - HTML5 markup, CSS cleanup
-* Simon Rupf - WebCrypto, unit tests, container images, database backend, MVC, configuration, i18n
+* Simon Rupf - WebCrypto, unit tests, current docker containers, MVC, configuration, i18n
 * Hexalyse - Password protection
 * Viktor Stanchev - File upload support
 * azlux - Tab character input support
@@ -26,11 +27,6 @@
 * Harald Leithner - base58 encoding of key
 * Haocen - lots of bugfixes and UI improvements
 * Lucas Savva - configurable config file location, NixOS packaging
-* rodehoed - option to exempt ips from the rate-limiter
-* Mark van Holsteijn - Google Cloud Storage backend
-* Austin Huang - Oracle database support
-* Felix J. Ogris - S3 Storage backend
-* Mounir Idrassi & J. Mozdzen - secure YOURLS integration
 
 ## Translations
 * Hexalyse - French
@@ -51,13 +47,3 @@
 * BigWax - Bulgarian
 * AndriiZ - Ukrainian
 * Yaron Shahrabani - Hebrew
-* Moo - Lithuanian
-* whenwesober - Indonesian
-* retiolus - Catalan
-* sarnane - Estonian
-* foxsouns - Lojban
-* Patriccollu di Santa Maria è Sichè - Corsican
-* Markus Mikkonen - Finnish
-* Emir Ensar Rahmanlar - Turkish
-* Stevo984 - Slovak
-* Christos Karamolegkos - Greek

INSTALL.md

@@ -2,46 +2,38 @@
 
 **TL;DR:** Download the
 [latest release archive](https://github.com/PrivateBin/PrivateBin/releases/latest)
-(with the link labelled as "Source code (…)") and extract it in your web hosts
-folder where you want to install your PrivateBin instance. We try to provide a
-mostly safe default configuration, but we urge you to check the
-[security section](#hardening-and-security) below and the
-[configuration options](#configuration) to adjust as you see fit.
+and extract it in your web hosts folder where you want to install your PrivateBin
+instance. We try to provide a mostly safe default configuration, but we urge you to
+check the [security section](#hardening-and-security) below and the [configuration
+options](#configuration) to adjust as you see fit.
 
-**NOTE:** See our [FAQ entry on securely downloading release files](https://github.com/PrivateBin/PrivateBin/wiki/FAQ#how-can-i-securely-clonedownload-your-project)
-for more information.
+**NOTE:** See [our FAQ](https://github.com/PrivateBin/PrivateBin/wiki/FAQ#how-can-i-securely-clonedownload-your-project) for information how to securely download the PrivateBin release files.
 
-**NOTE:** There is a [ansible](https://ansible.com) role by @e1mo available to
-install and configure PrivateBin on your server. It's available on
-[ansible galaxy](https://galaxy.ansible.com/e1mo/privatebin)
-([source code](https://git.sr.ht/~e1mo/ansible-role-privatebin)).
+### Minimal requirements
 
-### Minimal Requirements
+- PHP version 5.5 or above
+- _one_ of the following sources of cryptographically safe randomness is required:
+  - PHP 7 or higher
+  - [Libsodium](https://download.libsodium.org/libsodium/content/installation/) and it's [PHP extension](https://paragonie.com/book/pecl-libsodium/read/00-intro.md#installing-libsodium)
+  - open_basedir access to `/dev/urandom`
+  - mcrypt extension
+  - com_dotnet extension
 
-- PHP version 7.0 or above
-  - Or PHP version 5.6 AND _one_ of the following sources of cryptographically
-    safe randomness:
-    - [Libsodium](https://download.libsodium.org/libsodium/content/installation/)
-      and it's [PHP extension](https://paragonie.com/book/pecl-libsodium/read/00-intro.md#installing-libsodium)
-    - `open_basedir` access to `/dev/urandom`
-    - mcrypt extension AND `open_basedir` access to `/dev/urandom`
-    - com_dotnet extension
+  Mcrypt needs to be able to access `/dev/urandom`. This means if `open_basedir` is set, it must include this file.
 - GD extension
-- zlib extension
-- some disk space or a database supported by [PDO](https://php.net/manual/book.pdo.php)
-- ability to create files and folders in the installation directory and the PATH
-  defined in index.php
-- A web browser with JavaScript and (optional) WebAssembly support
+- some disk space or (optionally) a database supported by [PDO](https://secure.php.net/manual/book.pdo.php)
+- ability to create files and folders in the installation directory and the PATH defined in index.php
+- A web browser with javascript support
 
-## Hardening and Security
+## Hardening and security
 
-### Changing the Path
+### Changing the path
 
-In the index.php you can define a different `PATH`. This is useful to secure
-your installation. You can move the configuration, data files, templates and PHP
+In the index.php you can define a different `PATH`. This is useful to secure your
+installation. You can move the configuration, data files, templates and PHP
 libraries (directories cfg, doc, data, lib, tpl, tst and vendor) outside of your
-document root. This new location must still be accessible to your webserver and
-PHP process (see also
+document root. This new location must still be accessible to your webserver / PHP
+process (see also
 [open_basedir setting](https://secure.php.net/manual/en/ini.core.php#ini.open-basedir)).
 
 > #### PATH Example
@@ -50,25 +42,24 @@ PHP process (see also
 > http://example.com/paste/
 >
 > The full path of PrivateBin on your webserver is:
-> /srv/example.com/htdocs/paste
+> /home/example.com/htdocs/paste
 >
 > When setting the path like this:
 > define('PATH', '../../secret/privatebin/');
 >
-> PrivateBin will look for your includes and data here:
-> /srv/example.com/secret/privatebin
+> PrivateBin will look for your includes / data here:
+> /home/example.com/secret/privatebin
 
 ### Changing the config path only
 
 In situations where you want to keep the PrivateBin static files separate from the
 rest of your data, or you want to reuse the installation files on multiple vhosts,
-you may only want to change the `conf.php`. In this case, you can set the
+you may only want to change the `conf.php`. In this instance, you can set the
 `CONFIG_PATH` environment variable to the absolute path to the `conf.php` file.
 This can be done in your web server's virtual host config, the PHP config, or in
-the index.php, if you choose to customize it.
+the index.php if you choose to customize it.
 
-Note that your PHP process will need read access to the configuration file,
-wherever it may be.
+Note that your PHP process will need read access to the config wherever it may be.
 
 > #### CONFIG_PATH example
 > Setting the value in an Apache Vhost:
@@ -82,27 +73,23 @@ wherever it may be.
 
 ### Transport security
 
-When setting up PrivateBin, also set up HTTPS, if you haven't already. Without
-HTTPS PrivateBin is not secure, as the JavaScript or WebAssembly files could be
-manipulated during transmission. For more information on this, see our
-[FAQ entry on HTTPS setup recommendations](https://github.com/PrivateBin/PrivateBin/wiki/FAQ#how-should-i-setup-https).
+When setting up PrivateBin, also set up HTTPS, if you haven't already. Without HTTPS
+PrivateBin is not secure, as the javascript files could be manipulated during transmission.
+For more information on this, see our [FAQ entry on HTTPS setup](https://github.com/PrivateBin/PrivateBin/wiki/FAQ#how-should-i-setup-https).
 
 ### File-level permissions
 
-After completing the installation, you should make sure, that other users on the
-system cannot read the config file or the `data/` directory, as – depending on
-your configuration – potentially sensitive information may be stored in there.
+After completing the installation, you should make sure, other users on the system cannot read the config file or the `data/` directory, as – depending on your configuration – potential secret information are saved there.
 
-See our [FAQ entry on permissions](https://github.com/PrivateBin/PrivateBin/wiki/FAQ#what-are-the-recommended-file-and-folder-permissions-for-privatebin)
-for a detailed guide on how to "harden" access to files and folders.
+See [this FAQ item](https://github.com/PrivateBin/PrivateBin/wiki/FAQ#what-are-the-recommended-file-and-folder-permissions-for-privatebin) for a detailed guide on how to "harden" the permissions of files and folders.
 
 ## Configuration
 
 In the file `cfg/conf.php` you can configure PrivateBin. A `cfg/conf.sample.php`
-is provided containing all options and their default values. You can copy it to
-`cfg/conf.php` and change it as needed. Alternatively you can copy it anywhere
-and set the `CONFIG_PATH` environment variable (see above notes). The config
-file is divided into multiple sections, which are enclosed in square brackets.
+is provided containing all options and default values. You can copy it to
+`cfg/conf.php` and adapt it as needed. Alternatively you can copy it anywhere and
+set the `CONFIG_PATH` environment variable (see above notes). The config file is
+divided into multiple sections, which are enclosed in square brackets.
 
 In the `[main]` section you can enable or disable the discussion feature, set
 the limit of stored pastes and comments in bytes. The `[traffic]` section lets
@@ -120,28 +107,28 @@ A `robots.txt` file is provided in the root dir of PrivateBin. It disallows all
 robots from accessing your pastes. It is recommend to place it into the root of
 your web directory if you have installed PrivateBin in a subdirectory. Make sure
 to adjust it, so that the file paths match your installation. Of course also
-adjust the file, if you already use a `robots.txt`.
+adjust the file if you already use a `robots.txt`.
 
 A `.htaccess.disabled` file is provided in the root dir of PrivateBin. It blocks
 some known robots and link-scanning bots. If you use Apache, you can rename the
 file to `.htaccess` to enable this feature. If you use another webserver, you
 have to configure it manually to do the same.
 
-### On using Cloudflare
+### When using Cloudflare
 
-If you want to use PrivateBin behind Cloudflare, make sure you have disabled the
-Rocket loader and unchecked "Javascript" for Auto Minify, found in your domain
-settings, under "Speed". More information can be found in our
-[FAQ entry on Cloudflare related issues](https://github.com/PrivateBin/PrivateBin/wiki/FAQ#user-content-how-to-make-privatebin-work-when-using-cloudflare-for-ddos-protection).
+If you want to use PrivateBin behind Cloudflare, make sure you have disabled the Rocket
+loader and unchecked "Javascript" for Auto Minify, found in your domain settings,
+under "Speed". (More information
+[in this FAQ entry](https://github.com/PrivateBin/PrivateBin/wiki/FAQ#user-content-how-to-make-privatebin-work-when-using-cloudflare-for-ddos-protection))
 
-### Using a Database Instead of Flat Files
+### Using a database instead of flat files
 
 In the configuration file the `[model]` and `[model_options]` sections let you
 configure your favourite way of storing the pastes and discussions on your
 server.
 
 `Filesystem` is the default model, which stores everything in files in the
-data folder. This is the recommended setup for most sites on single hosts.
+data folder. This is the recommended setup for most sites.
 
 Under high load, in distributed setups or if you are not allowed to store files
 locally, you might want to switch to the `Database` model. This lets you
@@ -155,26 +142,21 @@ to use a prefix for
 The table prefix option is called `tbl`.
 
 > #### Note
-> The `Database` model has only been tested with SQLite, MariaDB/MySQL and
-> PostgreSQL, although it would not be recommended to use SQLite in a production
-> environment. If you gain any experience running PrivateBin on other RDBMS,
-> please let us know.
+> The `Database` model has only been tested with SQLite, MySQL and PostgreSQL,
+> although it would not be recommended to use SQLite in a production environment.
+> If you gain any experience running PrivateBin on other RDBMS, please let us
+> know.
 
-The following GRANTs (privileges) are required for the PrivateBin user in
-**MariaDB/MySQL**. In normal operation:
+The following GRANTs (privileges) are required for the PrivateBin user in **MySQL**. In normal operation:
 - INSERT, SELECT, DELETE on the paste and comment tables
 - SELECT on the config table
 
-If you want PrivateBin to handle table creation (when you create the first paste)
-and updates (after you update PrivateBin to a new release), you need to give the
-user these additional privileges:
+If you want PrivateBin to handle table creation (when you create the first paste) and updates (after you update PrivateBin to a new release), you need to give the user these additional privileges:
 - CREATE, INDEX and ALTER on the database
 - INSERT and UPDATE on the config table
 
-For reference or if you want to create the table schema for yourself to avoid
-having to give PrivateBin too many permissions (replace `prefix_` with your own
-table prefix and create the table schema with your favourite MariaDB/MySQL
-client):
+For reference or if you want to create the table schema for yourself to avoid having to give PrivateBin too many permissions (replace
+`prefix_` with your own table prefix and create the table schema with your favourite MySQL console):
 
 ```sql
 CREATE TABLE prefix_paste (
@@ -205,69 +187,7 @@ CREATE INDEX parent ON prefix_comment(pasteid);
 CREATE TABLE prefix_config (
     id CHAR(16) NOT NULL, value TEXT, PRIMARY KEY (id)
 );
-INSERT INTO prefix_config VALUES('VERSION', '1.4.0');
+INSERT INTO prefix_config VALUES('VERSION', '1.3.4');
 ```
 
-In **PostgreSQL**, the `data`, `attachment`, `nickname` and `vizhash` columns
-need to be `TEXT` and not `BLOB` or `MEDIUMBLOB`. The key names in brackets,
-after `PRIMARY KEY`, need to be removed.
-
-In **Oracle**, the `data`, `attachment`, `nickname` and `vizhash` columns need
-to be `CLOB` and not `BLOB` or `MEDIUMBLOB`, the `id` column in the `config`
-table needs to be `VARCHAR2(16)` and the `meta` column in the `paste` table
-and the `value` column in the `config` table need to be `VARCHAR2(4000)`.
-
-#### Using Google Cloud Storage
-If you want to deploy PrivateBin in a serverless manner in the Google Cloud, you
-can choose the `GoogleCloudStorage` as backend. To use this backend, you create
-a GCS bucket and specify the name as the model option `bucket`. Alternatively,
-you can set the name through the environment variable `PRIVATEBIN_GCS_BUCKET`.
-
-The default prefix for pastes stored in the bucket is `pastes`. To change the
-prefix, specify the option `prefix`.
-
-Google Cloud Storage buckets may be significantly slower than a `FileSystem` or
-`Database` backend. The big advantage is that the deployment on Google Cloud
-Platform using Google Cloud Run is easy and cheap.
-
-To use the Google Cloud Storage backend you have to install the suggested
-library using the command `composer require google/cloud-storage`.
-
-#### Using S3 Storage
-Similar to Google Cloud Storage, you can choose S3 as storage backend. It uses
-the AWS SDK for PHP, but can also talk to a Rados gateway as part of a CEPH
-cluster. To use this backend, you first have to install the SDK in the
-document root of PrivateBin: `composer require aws/aws-sdk-php`. You have to
-create the S3 bucket on the CEPH cluster before using the S3 backend.
-
-In the `[model]` section of cfg/conf.php, set `class` to `S3Storage`.
-
-You can set any combination of the following options in the `[model_options]`
-section:
-
-  * region
-  * version
-  * endpoint
-  * bucket
-  * prefix
-  * accesskey
-  * secretkey
-  * use_path_style_endpoint
-
-By default, prefix is empty. If set, the S3 backend will place all PrivateBin
-data beneath this prefix.
-
-For AWS, you have to provide at least `region`, `bucket`, `accesskey`, and
-`secretkey`.
-
-For CEPH, follow this example:
-
-```
-region = ""
-version = "2006-03-01"
-endpoint = "https://s3.my-ceph.invalid"
-use_path_style_endpoint = true
-bucket = "my-bucket"
-accesskey = "my-rados-user"
-secretkey = "my-rados-pass"
-```
+In **PostgreSQL**, the data, attachment, nickname and vizhash columns needs to be TEXT and not BLOB or MEDIUMBLOB.

Makefile

@@ -1,16 +1,13 @@
 .PHONY: all coverage coverage-js coverage-php doc doc-js doc-php increment sign test test-js test-php help
 
-CURRENT_VERSION = 1.4.0
-VERSION ?= 1.4.1
-VERSION_FILES = index.php cfg/ *.md css/ i18n/ img/ js/package.json js/privatebin.js lib/ Makefile tpl/ tst/
+CURRENT_VERSION = 1.3.4
+VERSION ?= 1.3.5
+VERSION_FILES = index.php cfg/ *.md css/ i18n/ img/ js/privatebin.js lib/ Makefile tpl/ tst/
 REGEX_CURRENT_VERSION := $(shell echo $(CURRENT_VERSION) | sed "s/\./\\\./g")
 REGEX_VERSION := $(shell echo $(VERSION) | sed "s/\./\\\./g")
 
 all: coverage doc ## Equivalent to running `make coverage doc`.
 
-composer: ## Update composer dependencies (only production ones, optimize the autoloader)
-	composer update --no-dev --optimize-autoloader
-
 coverage: coverage-js coverage-php ## Run all unit tests and generate code coverage reports.
 
 coverage-js: ## Run JS unit tests and generate code coverage reports.
@@ -18,7 +15,7 @@ coverage-js: ## Run JS unit tests and generate code coverage reports.
 
 coverage-php: ## Run PHP unit tests and generate code coverage reports.
 	cd tst && phpunit 2> /dev/null
-	cd tst/log/php-coverage-report && sed -i "s#$(CURDIR)##g" *.html */*.html
+	cd log/php-coverage-report && sed -i "s#$(CURDIR)##g" *.html */*.html
 
 doc: doc-js doc-php ## Generate all code documentation.
 
@@ -33,13 +30,12 @@ increment: ## Increment and commit new version number, set target version using
 	do \
 		sed -i "s/$(REGEX_CURRENT_VERSION)/$(REGEX_VERSION)/g" $$F; \
 	done
-	cd tst && phpunit --no-coverage && cd ..
-	git add $(VERSION_FILES) tpl/
+	git add $(VERSION_FILES)
 	git commit -m "incrementing version"
 
 sign: ## Sign a release.
 	git tag $(VERSION)
-	git push origin $(VERSION)
+	git push --tags
 	signrelease.sh
 
 test: test-js test-php ## Run all unit tests.

Procfile

@@ -1 +0,0 @@
-web: vendor/bin/heroku-php-apache2

README.md

@@ -1,27 +1,25 @@
 # [![PrivateBin](https://cdn.rawgit.com/PrivateBin/assets/master/images/preview/logoSmall.png)](https://privatebin.info/)
 
-*Current version: 1.4.0*
+*Current version: 1.3.4*
 
-**PrivateBin** is a minimalist, open source online
-[pastebin](https://en.wikipedia.org/wiki/Pastebin)
+**PrivateBin** is a minimalist, open source online [pastebin](https://en.wikipedia.org/wiki/Pastebin)
 where the server has zero knowledge of pasted data.
 
-Data is encrypted and decrypted in the browser using 256bit AES in
-[Galois Counter mode](https://en.wikipedia.org/wiki/Galois/Counter_Mode).
+Data is encrypted and decrypted in the browser using 256bit AES in [Galois Counter mode](https://en.wikipedia.org/wiki/Galois/Counter_Mode).
 
 This is a fork of ZeroBin, originally developed by
-[Sébastien Sauvage](https://github.com/sebsauvage/ZeroBin). PrivateBin was
-refactored to allow easier and cleaner extensions and has many additional
-features. It is, however, still fully compatible to the original ZeroBin 0.19
+[Sébastien Sauvage](https://github.com/sebsauvage/ZeroBin). ZeroBin was refactored
+to allow easier and cleaner extensions. PrivateBin has many more features than the
+original ZeroBin. It is, however, still fully compatible to the original ZeroBin 0.19
 data storage scheme. Therefore, such installations can be upgraded to PrivateBin
 without losing any data.
 
 ## What PrivateBin provides
 
 + As a server administrator you don't have to worry if your users post content
-  that is considered illegal in your country. You have plausible deniability of
-  any of the pastes content. If requested or enforced, you can delete any paste
-  from your system.
+  that is considered illegal in your country. You have no knowledge of any
+  of the pastes content. If requested or enforced, you can delete any paste from
+  your system.
 
 + Pastebin-like system to store text documents, code samples, etc.
 
@@ -33,13 +31,15 @@ without losing any data.
 
 ## What it doesn't provide
 
-- As a user you have to trust the server administrator not to inject any
-  malicious code. For security, a PrivateBin installation *has to be used over*
-  *HTTPS*! Otherwise you would also have to trust your internet provider, and
-  any jurisdiction the traffic passes through. Additionally the instance should
-  be secured by
-  [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security). It can
-  use traditional certificate authorities and/or use a
+- As a user you have to trust the server administrator not to inject any malicious
+  javascript code.
+  For basic security, the PrivateBin installation *has to provide HTTPS*!
+  Otherwise you would also have to trust your internet provider, and any country
+  the traffic passes through.
+  Additionally the instance should be secured by
+  [HSTS](https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security) and
+  ideally by [HPKP](https://en.wikipedia.org/wiki/HTTP_Public_Key_Pinning) using a
+  certificate. It can use traditional certificate authorities and/or use
   [DNSSEC](https://en.wikipedia.org/wiki/Domain_Name_System_Security_Extensions)
   protected
   [DANE](https://en.wikipedia.org/wiki/DNS-based_Authentication_of_Named_Entities)
@@ -47,17 +47,18 @@ without losing any data.
 
 - The "key" used to encrypt the paste is part of the URL. If you publicly post
   the URL of a paste that is not password-protected, anyone can read it.
-  Use a password if you want your paste to remain private. In that case, make
-  sure to use a strong password and share it privately and end-to-end-encrypted.
+  Use a password if you want your paste to be private. In this case, make sure to
+  use a strong password and only share it privately and end-to-end-encrypted.
 
-- A server admin can be forced to hand over access logs to the authorities.
+- A server admin might be forced to hand over access logs to the authorities.
   PrivateBin encrypts your text and the discussion contents, but who accessed a
   paste (first) might still be disclosed via access logs.
 
 - In case of a server breach your data is secure as it is only stored encrypted
-  on the server. However, the server could be absused or the server admin could
-  be legally forced into sending malicious code to their users, which logs
-  the decryption key and sends it to a server when a user accesses a paste.
+  on the server. However, the server could be misused or the server admin could
+  be legally forced into sending malicious JavaScript to all web users, which
+  grabs the decryption key and sends it to the server when a user accesses a
+  PrivateBin.  
   Therefore, do not access any PrivateBin instance if you think it has been
   compromised. As long as no user accesses this instance with a previously
   generated URL, the content can't be decrypted.
@@ -78,8 +79,8 @@ file](https://github.com/PrivateBin/PrivateBin/wiki/Configuration):
 * Syntax highlighting for source code using prettify.js, including 4 prettify
   themes
 
-* File upload support, image, media and PDF preview (disabled by default, size
-  limit adjustable)
+* File upload support, images get displayed (disabled by default, possibility
+  to adjust size limit)
 
 * Templates: By default there are bootstrap CSS, darkstrap and "classic ZeroBin"
   to choose from and it is easy to adapt these to your own websites layout or
@@ -90,7 +91,7 @@ file](https://github.com/PrivateBin/PrivateBin/wiki/Configuration):
 
 * Language selection (disabled by default, as it uses a session cookie)
 
-* QR code for paste URLs, to easily transfer them over to mobile devices
+* QR code generation of URL, to easily transfer pastes over to a mobile device
 
 ## Further resources
 

SECURITY.md

@@ -4,8 +4,8 @@
 
 | Version | Supported          |
 | ------- | ------------------ |
-| 1.4.0   | :heavy_check_mark: |
-| < 1.4.0 | :x:                |
+| 1.3.4   | :heavy_check_mark: |
+| < 1.3.4 | :x:                |
 
 ## Reporting a Vulnerability
 

cfg/conf.sample.php

@@ -7,10 +7,9 @@
 ; (optional) set a project name to be displayed on the website
 ; name = "PrivateBin"
 
-; The full URL, with the domain name and directories that point to the
-; PrivateBin files, including an ending slash (/). This URL is essential to
-; allow Opengraph images to be displayed on social networks.
-; basepath = "https://privatebin.example.com/"
+; The full URL, with the domain name and directories that point to the PrivateBin files
+; This URL is essential to allow Opengraph images to be displayed on social networks
+; basepath = ""
 
 ; enable or disable the discussion feature, defaults to true
 discussion = true
@@ -40,10 +39,6 @@ sizelimit = 10485760
 ; template to include, default is "bootstrap" (tpl/bootstrap.php)
 template = "bootstrap"
 
-; (optional) info text to display
-; use single, instead of double quotes for HTML attributes
-;info = "More information on the <a href='https://privatebin.info/'>project page</a>."
-
 ; (optional) notice to display
 ; notice = "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service."
 
@@ -56,9 +51,9 @@ languageselection = false
 ; if this is set and language selection is disabled, this will be the only language
 ; languagedefault = "en"
 
-; (optional) URL shortener address to offer after a new paste is created.
-; It is suggested to only use this with self-hosted shorteners as this will leak
-; the pastes encryption key.
+; (optional) URL shortener address to offer after a new paste is created
+; it is suggested to only use this with self-hosted shorteners as this will leak
+; the pastes encryption key
 ; urlshortener = "https://shortener.example.com/api?link="
 
 ; (optional) Let users create a QR code for sharing the paste URL with one click.
@@ -66,11 +61,10 @@ languageselection = false
 ; qrcode = true
 
 ; (optional) IP based icons are a weak mechanism to detect if a comment was from
-; a different user when the same username was used in a comment. It might get
-; used to get the IP of a comment poster if the server salt is leaked and a
-; SHA512 HMAC rainbow table is generated for all (relevant) IPs.
-; Can be set to one these values:
-; "none" / "vizhash" / "identicon" / "jdenticon" (default).
+; a different user when the same username was used in a comment. It might be
+; used to get the IP of a non anonymous comment poster if the server salt is
+; leaked and a SHA256 HMAC rainbow table is generated for all (relevant) IPs.
+; Can be set to one these values: "none" / "vizhash" / "identicon" (default).
 ; icon = "none"
 
 ; Content Security Policy headers allow a website to restrict what sources are
@@ -89,7 +83,7 @@ languageselection = false
 ;   async functions and display an error if not and for Chrome to enable
 ;   webassembly support (used for zlib compression). You can remove it if Chrome
 ;   doesn't need to be supported and old browsers don't need to be warned.
-; cspheader = "default-src 'none'; base-uri 'self'; form-action 'none'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'unsafe-eval'; style-src 'self'; font-src 'self'; frame-ancestors 'none'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads"
+; cspheader = "default-src 'none'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'unsafe-eval' resource:; style-src 'self'; font-src 'self'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads"
 
 ; stay compatible with PrivateBin Alpha 0.19, less secure
 ; if enabled will use base64.js version 1.7 instead of 2.1.9 and sha1 instead of
@@ -137,22 +131,13 @@ markdown = "Markdown"
 ; Set this to 0 to disable rate limiting.
 limit = 10
 
-; (optional) Set IPs addresses (v4 or v6) or subnets (CIDR) which are exempted
-; from the rate-limit. Invalid IPs will be ignored. If multiple values are to
-; be exempted, the list needs to be comma separated. Leave unset to disable
-; exemptions.
-; exempted = "1.2.3.4,10.10.10/24"
-
-; (optional) If you want only some source IP addresses (v4 or v6) or subnets
-; (CIDR) to be allowed to create pastes, set these here. Invalid IPs will be
-; ignored. If multiple values are to be exempted, the list needs to be comma
-; separated. Leave unset to allow anyone to create pastes.
-; creators = "1.2.3.4,10.10.10/24"
-
 ; (optional) if your website runs behind a reverse proxy or load balancer,
 ; set the HTTP header containing the visitors IP address, i.e. X_FORWARDED_FOR
 ; header = "X_FORWARDED_FOR"
 
+; directory to store the traffic limits in
+dir = PATH "data"
+
 [purge]
 ; minimum time limit between two purgings of expired pastes, it is only
 ; triggered when pastes are created
@@ -164,6 +149,9 @@ limit = 300
 ; site
 batchsize = 10
 
+; directory to store the purge limit in
+dir = PATH "data"
+
 [model]
 ; name of data model class to load and directory for storage
 ; the default model "Filesystem" stores everything in the filesystem
@@ -171,14 +159,6 @@ class = Filesystem
 [model_options]
 dir = PATH "data"
 
-;[model]
-; example of a Google Cloud Storage configuration
-;class = GoogleCloudStorage
-;[model_options]
-;bucket = "my-private-bin"
-;prefix = "pastes"
-;uniformacl = false
-
 ;[model]
 ; example of DB configuration for MySQL
 ;class = Database
@@ -197,52 +177,3 @@ dir = PATH "data"
 ;usr = null
 ;pwd = null
 ;opt[12] = true	; PDO::ATTR_PERSISTENT
-
-;[model]
-; example of DB configuration for PostgreSQL
-;class = Database
-;[model_options]
-;dsn = "pgsql:host=localhost;dbname=privatebin"
-;tbl = "privatebin_"     ; table prefix
-;usr = "privatebin"
-;pwd = "Z3r0P4ss"
-;opt[12] = true    ; PDO::ATTR_PERSISTENT
-
-;[model]
-; example of S3 configuration for Rados gateway / CEPH
-;class = S3Storage
-;[model_options]
-;region = ""
-;version = "2006-03-01"
-;endpoint = "https://s3.my-ceph.invalid"
-;use_path_style_endpoint = true
-;bucket = "my-bucket"
-;accesskey = "my-rados-user"
-;secretkey = "my-rados-pass"
-
-;[model]
-; example of S3 configuration for AWS
-;class = S3Storage
-;[model_options]
-;region = "eu-central-1"
-;version = "latest"
-;bucket = "my-bucket"
-;accesskey = "access key id"
-;secretkey = "secret access key"
-
-[yourls]
-; When using YOURLS as a "urlshortener" config item:
-; - By default, "urlshortener" will point to the YOURLS API URL, with or without
-;   credentials, and will be visible in public on the PrivateBin web page.
-;   Only use this if you allow short URL creation without credentials.
-; - Alternatively, using the parameters in this section ("signature" and
-;   "apiurl"), "urlshortener" needs to point to the base URL of your PrivateBin
-;   instance with "shortenviayourls?link=" appended. For example:
-;   urlshortener = "${basepath}shortenviayourls?link="
-;   This URL will in turn call YOURLS on the server side, using the URL from
-;   "apiurl" and the "access signature" from the "signature" parameters below.
-
-; (optional) the "signature" (access key) issued by YOURLS for the using account
-; signature = ""
-; (optional) the URL of the YOURLS API, called to shorten a PrivateBin URL
-; apiurl = "https://yourls.example.com/yourls-api.php"

codacy-analysis.yml

@@ -1,49 +0,0 @@
-# This workflow checks out code, performs a Codacy security scan
-# and integrates the results with the
-# GitHub Advanced Security code scanning feature.  For more information on
-# the Codacy security scan action usage and parameters, see
-# https://github.com/codacy/codacy-analysis-cli-action.
-# For more information on Codacy Analysis CLI in general, see
-# https://github.com/codacy/codacy-analysis-cli.
-
-name: Codacy Security Scan
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '45 16 * * 1'
-
-jobs:
-  codacy-security-scan:
-    name: Codacy Security Scan
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout the repository to the GitHub Actions runner
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
-      - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@1.1.0
-        with:
-          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
-          # You can also omit the token and run the tools that support default configurations
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          verbose: true
-          output: results.sarif
-          format: sarif
-          # Adjust severity of non-security issues
-          gh-code-scanning-compat: true
-          # Force 0 exit code to allow SARIF file generation
-          # This will handover control about PR rejection to the GitHub side
-          max-allowed-issues: 2147483647
-
-      # Upload the SARIF file generated in the previous step
-      - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v1
-        with:
-          sarif_file: results.sarif

composer.json

@@ -24,18 +24,12 @@
 		"docs" : "https://privatebin.info/codedoc/"
 	},
 	"require" : {
-		"php" : "^5.6.0 || ^7.0 || ^8.0",
-		"paragonie/random_compat" : "2.0.21",
-		"yzalis/identicon" : "2.0.0",
-		"mlocati/ip-lib" : "1.18.0",
-		"jdenticon/jdenticon": "^1.0"
-	},
-	"suggest" : {
-		"google/cloud-storage" : "1.26.1",
-		"aws/aws-sdk-php" : "3.239.0"
+		"php" : "^5.6.0 || ^7.0",
+		"paragonie/random_compat" : "2.0.18",
+		"yzalis/identicon" : "2.0.0"
 	},
 	"require-dev" : {
-		"phpunit/phpunit" : "^9"
+		"phpunit/phpunit" : "^4.6 || ^5.0"
 	},
 	"autoload" : {
 		"psr-4" : {

css/bootstrap/privatebin.css

@@ -6,7 +6,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 body {
@@ -205,3 +205,43 @@ li.L0, li.L1, li.L2, li.L3, li.L5, li.L6, li.L7, li.L8 {
 .modal .modal-content button {
 	margin: 0.5em 0;
 }
+
+/* sidebar */
+#menu-toggle {
+	position: relative;
+	bottom: -94px;
+	left: -61px;
+	margin-bottom: -12px;
+	transform: rotate(90deg);
+}
+
+@media (max-width: 768px) {
+	#menu-toggle {
+		position: static;
+		margin-bottom: 1em;
+		transform: rotate(0);
+	}
+}
+
+main {
+	transition: all 0.5s ease;
+}
+
+main.toggled {
+	padding-left: 450px;
+}
+
+#sidebar-wrapper {
+	position: fixed;
+	width: 450px;
+	height: 100%;
+	left: -450px;
+	padding-left: 4ch;
+	overflow-y: scroll;
+	overflow-x: hidden;
+	transition: all 0.5s ease;
+}
+
+main.toggled #sidebar-wrapper {
+	left: 0;
+}

css/noscript.css

@@ -6,7 +6,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 /* When there is no script at all other */

css/privatebin.css

@@ -6,7 +6,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 /*  CSS Reset from YUI 3.4.1 (build 4118) - Copyright 2011 Yahoo! Inc. All rights reserved.
@@ -249,10 +249,6 @@ button img {
 	padding: 1px 0 1px 0;
 }
 
-#downloadtextbutton img {
-	padding: 1px 0 1px 0;
-}
-
 #remainingtime, #password {
 	color: #94a3b4;
 	display: inline;

i18n/ar.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "More information on the <a href=\"https://privatebin.info/\">project page</a>.",
-    "Because ignorance is bliss": "Because ignorance is bliss",
-    "en": "ar",
-    "Paste does not exist, has expired or has been deleted.": "Paste does not exist, has expired or has been deleted.",
-    "%s requires php %s or above to work. Sorry.": "%s requires php %s or above to work. Sorry.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.",
-    "Please wait %d seconds between each post.": [
-        "Please wait %d second between each post. (singular)",
-        "Please wait %d seconds between each post. (1st plural)",
-        "Please wait %d seconds between each post. (2nd plural)",
-        "Please wait %d seconds between each post. (3rd plural)"
-    ],
-    "Paste is limited to %s of encrypted data.": "Paste is limited to %s of encrypted data.",
-    "Invalid data.": "Invalid data.",
-    "You are unlucky. Try again.": "You are unlucky. Try again.",
-    "Error saving comment. Sorry.": "Error saving comment. Sorry.",
-    "Error saving paste. Sorry.": "Error saving paste. Sorry.",
-    "Invalid paste ID.": "Invalid paste ID.",
-    "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.",
-    "Wrong deletion token. Paste was not deleted.": "Wrong deletion token. Paste was not deleted.",
-    "Paste was properly deleted.": "Paste was properly deleted.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.",
-    "%s requires a modern browser to work.": "%s requires a modern browser to work.",
-    "New": "New",
-    "Send": "Send",
-    "Clone": "Clone",
-    "Raw text": "Raw text",
-    "Expires": "Expires",
-    "Burn after reading": "Burn after reading",
-    "Open discussion": "Open discussion",
-    "Password (recommended)": "Password (recommended)",
-    "Discussion": "Discussion",
-    "Toggle navigation": "Toggle navigation",
-    "%d seconds": [
-        "%d second (singular)",
-        "%d seconds (1st plural)",
-        "%d seconds (2nd plural)",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d minute (singular)",
-        "%d minutes (1st plural)",
-        "%d minutes (2nd plural)",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d hour (singular)",
-        "%d hours (1st plural)",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d day (singular)",
-        "%d days (1st plural)",
-        "%d days (2nd plural)",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d week (singular)",
-        "%d weeks (1st plural)",
-        "%d weeks (2nd plural)",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d month (singular)",
-        "%d months (1st plural)",
-        "%d months (2nd plural)",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%d year (singular)",
-        "%d years (1st plural)",
-        "%d years (2nd plural)",
-        "%d years (3rd plural)"
-    ],
-    "Never": "Never",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
-    "This document will expire in %d seconds.": [
-        "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds. (1st plural)",
-        "This document will expire in %d seconds. (2nd plural)",
-        "This document will expire in %d seconds. (3rd plural)"
-    ],
-    "This document will expire in %d minutes.": [
-        "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes. (1st plural)",
-        "This document will expire in %d minutes. (2nd plural)",
-        "This document will expire in %d minutes. (3rd plural)"
-    ],
-    "This document will expire in %d hours.": [
-        "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours. (1st plural)",
-        "This document will expire in %d hours. (2nd plural)",
-        "This document will expire in %d hours. (3rd plural)"
-    ],
-    "This document will expire in %d days.": [
-        "This document will expire in %d day. (singular)",
-        "This document will expire in %d days. (1st plural)",
-        "This document will expire in %d days. (2nd plural)",
-        "This document will expire in %d days. (3rd plural)"
-    ],
-    "This document will expire in %d months.": [
-        "This document will expire in %d month. (singular)",
-        "This document will expire in %d months. (1st plural)",
-        "This document will expire in %d months. (2nd plural)",
-        "This document will expire in %d months. (3rd plural)"
-    ],
-    "Please enter the password for this paste:": "Please enter the password for this paste:",
-    "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
-    "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?",
-    "Reply": "Reply",
-    "Anonymous": "Anonymous",
-    "Avatar generated from IP address": "Avatar generated from IP address",
-    "Add comment": "Add comment",
-    "Optional nickname…": "Optional nickname…",
-    "Post comment": "Post comment",
-    "Sending comment…": "Sending comment…",
-    "Comment posted.": "Comment posted.",
-    "Could not refresh display: %s": "Could not refresh display: %s",
-    "unknown status": "unknown status",
-    "server error or not responding": "server error or not responding",
-    "Could not post comment: %s": "Could not post comment: %s",
-    "Sending paste…": "Sending paste…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>",
-    "Delete data": "Delete data",
-    "Could not create paste: %s": "Could not create paste: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Plain Text",
-    "Source Code": "Source Code",
-    "Markdown": "Markdown",
-    "Download attachment": "Download attachment",
-    "Cloned: '%s'": "Cloned: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
-    "Attach a file": "Attach a file",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Remove attachment",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "Invalid attachment.",
-    "Options": "Options",
-    "Shorten URL": "Shorten URL",
-    "Editor": "Editor",
-    "Preview": "Preview",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Decrypt",
-    "Enter password": "Enter password",
-    "Loading…": "Loading…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
-    "QR code": "QR code",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
-    "waiting on user to provide a password": "waiting on user to provide a password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
-    "Retry": "Retry",
-    "Showing raw text…": "Showing raw text…",
-    "Notice:": "Notice:",
-    "This link will expire after %s.": "This link will expire after %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
-    "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
-    "Use Current Timezone": "Use Current Timezone",
-    "Convert To UTC": "Convert To UTC",
-    "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/bg.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s е изчистен и изцяло достъпен като отворен код, онлайн \"paste\" услуга, където сървъра не знае подадената информация. Тя се шифрова/дешифрова %sвъв браузъра%s използвайки 256 битов AES алгоритъм.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Повече информация може да намерите на <a href=\"https://privatebin.info/\">страницата на проекта (Английски)</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s е изчистен и изцяло достъпен като отворен код, онлайн \"paste\" услуга, където сървъра не знае подадената информация. Тя се шифрова/дешифрова <i>във браузъра</i> използвайки 256 битов AES алгоритъм. Повече информация може да намерите на <a href=\"https://privatebin.info/\">страницата на проекта (Английски)</a>",
     "Because ignorance is bliss": "Невежеството е блаженство",
     "en": "bg",
     "Paste does not exist, has expired or has been deleted.": "Информацията не съществува, срокът и е изтекъл или е била изтрита.",
     "%s requires php %s or above to work. Sorry.": "%s има нужда от PHP %s или по-нова, за да работи. Съжалявам.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s задължава отдела от настройките [%s] да съществува във файла със настройките.",
-    "Please wait %d seconds between each post.": [
-        "Моля изчакайте една секунда между всяка публикация.",
-        "Моля изчакайте %d секунди между всяка публикация.",
-        "Моля изчакайте %d секунди между всяка публикация.",
-        "Моля изчакайте %d секунди между всяка публикация."
-    ],
+    "Please wait %d seconds between each post.": "Моля изчакайте %d секунди между всяка публикация.",
     "Paste is limited to %s of encrypted data.": "Съдържанието е ограничено до %s криптирана информация.",
     "Invalid data.": "Невалидна информация.",
     "You are unlucky. Try again.": "Нямаш късмет. Пробвай отново.",
@@ -37,76 +31,76 @@
     "%d seconds": [
         "%d секунди",
         "%d секунда",
-        "%d секунда",
-        "%d секунда"
+        "%d seconds (2nd plural)",
+        "%d seconds (3rd plural)"
     ],
     "%d minutes": [
         "%d минути",
         "%d минута",
-        "%d минута",
-        "%d минута"
+        "%d minutes (2nd plural)",
+        "%d minutes (3rd plural)"
     ],
     "%d hours": [
         "%d часа",
         "%d час",
-        "%d час",
-        "%d час"
+        "%d hours (2nd plural)",
+        "%d hours (3rd plural)"
     ],
     "%d days": [
         "%d дни",
         "%d ден",
-        "%d ден",
-        "%d ден"
+        "%d days (2nd plural)",
+        "%d days (3rd plural)"
     ],
     "%d weeks": [
         "%d седмици",
         "%d седмица",
-        "%d седмица",
-        "%d седмица"
+        "%d weeks (2nd plural)",
+        "%d weeks (3rd plural)"
     ],
     "%d months": [
         "%d месеци",
         "%d месец",
-        "%d месец",
-        "%d месец"
+        "%d months (2nd plural)",
+        "%d months (3rd plural)"
     ],
     "%d years": [
         "%d години",
         "%d година",
-        "%d година",
-        "%d година"
+        "%d years (2nd plural)",
+        "%d years (3rd plural)"
     ],
     "Never": "Никога",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Забележка: Това е пробна услуга: Информацията може да бъде изтрита по всяко време. Котета ще измрат ако злоупотребиш с услугата.",
     "This document will expire in %d seconds.": [
         "Този документ изтича след една секунда.",
         "Този документ изтича след %d секунди.",
-        "Този документ изтича след %d секунди.",
-        "Този документ изтича след %d секунди."
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Този документ изтича след една минута.",
         "Този документ изтича след %d минути.",
-        "Този документ изтича след %d минути.",
-        "Този документ изтича след %d минути."
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Този документ изтича след един час.",
         "Този документ изтича след %d часа.",
-        "Този документ изтича след %d часа.",
-        "Този документ изтича след %d часа."
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Този документ изтича след един ден.",
         "Този документ изтича след %d дни.",
-        "Този документ изтича след %d дни.",
-        "Този документ изтича след %d дни."
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Този документ изтича след една година.",
         "Този документ изтича след %d години.",
-        "Този документ изтича след %d години.",
-        "Този документ изтича след %d години."
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Моля въведете паролата за това съдържание:",
     "Could not decrypt data (Wrong key?)": "Информацията не можеше да се дешифрова (Грешен ключ?)",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Use Current Timezone",
     "Convert To UTC": "Convert To UTC",
     "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/ca.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s és un pastebin en línia de codi obert i minimalista on el servidor no té coneixement de les dades enganxades. Les dades estan encriptades/desxifrades %sen el navegador%s utilitzant AES de 256 bits.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Més informació a la <a href=\"https://privatebin.info/\">pàgina del projecte</a>.",
-    "Because ignorance is bliss": "Perquè la ignorància és felicitat",
-    "en": "ca",
-    "Paste does not exist, has expired or has been deleted.": "El paste no existeix, ha caducat o s'ha eliminat.",
-    "%s requires php %s or above to work. Sorry.": "%s requereix php %s o superior per funcionar. Ho sento.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s requereix que la secció de configuració [%s] sigui present al fitxer de configuració.",
-    "Please wait %d seconds between each post.": [
-        "Espereu %d segon entre cada entrada.",
-        "Espereu %d segons entre cada entrada.",
-        "Please wait %d seconds between each post. (2nd plural)",
-        "Please wait %d seconds between each post. (3rd plural)"
-    ],
-    "Paste is limited to %s of encrypted data.": "L'enganxat està limitat a %s de dades encriptades.",
-    "Invalid data.": "Dades no vàlides.",
-    "You are unlucky. Try again.": "Mala sort. Torna-ho a provar.",
-    "Error saving comment. Sorry.": "S'ha produït un error en desar el comentari. Ho sento.",
-    "Error saving paste. Sorry.": "S'ha produït un error en desar l'enganxat. Ho sento.",
-    "Invalid paste ID.": "Identificador d'enganxament no vàlid.",
-    "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.",
-    "Wrong deletion token. Paste was not deleted.": "El token d'eliminació és incorrecte. El Paste no s'ha eliminat.",
-    "Paste was properly deleted.": "El Paste s'ha esborrat correctament.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "Cal JavaScript perquè %s funcioni. Em sap greu les molèsties.",
-    "%s requires a modern browser to work.": "%s requereix un navegador modern per funcionar.",
-    "New": "Nou",
-    "Send": "Enviar",
-    "Clone": "Clona",
-    "Raw text": "Text sense processar",
-    "Expires": "Caducitat",
-    "Burn after reading": "Esborra després de ser llegit",
-    "Open discussion": "Discussió oberta",
-    "Password (recommended)": "Contrasenya (recomanat)",
-    "Discussion": "Discussió",
-    "Toggle navigation": "Alternar navegació",
-    "%d seconds": [
-        "%d segon",
-        "%d segons",
-        "%d seconds (2nd plural)",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d minut",
-        "%d minuts",
-        "%d minutes (2nd plural)",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d hora",
-        "%d hores",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d dia",
-        "%d dies",
-        "%d days (2nd plural)",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d setmana",
-        "%d setmanes",
-        "%d weeks (2nd plural)",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d mes",
-        "%d mesos",
-        "%d months (2nd plural)",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%d any",
-        "%d anys",
-        "%d years (2nd plural)",
-        "%d years (3rd plural)"
-    ],
-    "Never": "Mai",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
-    "This document will expire in %d seconds.": [
-        "Aquest document caducarà d'aquí %d segon.",
-        "Aquest document caducarà d'aquí %d segons.",
-        "Aquest document caducarà d'aquí %d segons.",
-        "Aquest document caducarà d'aquí %d segons."
-    ],
-    "This document will expire in %d minutes.": [
-        "Aquest document caducarà d'aquí %d minut.",
-        "Aquest document caducarà d'aquí %d minuts.",
-        "Aquest document caducarà d'aquí %d minuts.",
-        "Aquest document caducarà d'aquí %d minuts."
-    ],
-    "This document will expire in %d hours.": [
-        "Aquest document caducarà d'aquí %d hora.",
-        "Aquest document caducarà d'aquí %d hores.",
-        "Aquest document caducarà d'aquí %d hores.",
-        "Aquest document caducarà d'aquí %d hores."
-    ],
-    "This document will expire in %d days.": [
-        "Aquest document caducarà d'aquí %d dia.",
-        "Aquest document caducarà d'aquí %d dies.",
-        "Aquest document caducarà d'aquí %d dies.",
-        "Aquest document caducarà d'aquí %d dies."
-    ],
-    "This document will expire in %d months.": [
-        "Aquest document caducarà d'aquí %d mes.",
-        "Aquest document caducarà d'aquí %d mesos.",
-        "Aquest document caducarà d'aquí %d mesos.",
-        "Aquest document caducarà d'aquí %d mesos."
-    ],
-    "Please enter the password for this paste:": "Si us plau, introdueix la contrasenya per aquest paste:",
-    "Could not decrypt data (Wrong key?)": "No s'han pogut desxifrar les dades (Clau incorrecte?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
-    "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?",
-    "Reply": "Respondre",
-    "Anonymous": "Anònim",
-    "Avatar generated from IP address": "Avatar generat a partir de l'adreça IP",
-    "Add comment": "Afegir comentari",
-    "Optional nickname…": "Pseudònim opcional…",
-    "Post comment": "Publicar comentari",
-    "Sending comment…": "Enviant comentari…",
-    "Comment posted.": "Comentari publicat.",
-    "Could not refresh display: %s": "Could not refresh display: %s",
-    "unknown status": "estat desconegut",
-    "server error or not responding": "server error or not responding",
-    "Could not post comment: %s": "No s'ha pogut publicar el comentari: %s",
-    "Sending paste…": "Enviant paste…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>",
-    "Delete data": "Esborrar les dades",
-    "Could not create paste: %s": "Could not create paste: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Text sense format",
-    "Source Code": "Codi font",
-    "Markdown": "Markdown",
-    "Download attachment": "Baixar els adjunts",
-    "Cloned: '%s'": "Cloned: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
-    "Attach a file": "Adjuntar un fitxer",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Remove attachment",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "Invalid attachment.",
-    "Options": "Options",
-    "Shorten URL": "Shorten URL",
-    "Editor": "Editor",
-    "Preview": "Preview",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Decrypt",
-    "Enter password": "Enter password",
-    "Loading…": "Loading…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
-    "QR code": "QR code",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
-    "waiting on user to provide a password": "waiting on user to provide a password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
-    "Retry": "Retry",
-    "Showing raw text…": "Showing raw text…",
-    "Notice:": "Notice:",
-    "This link will expire after %s.": "This link will expire after %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
-    "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
-    "Use Current Timezone": "Use Current Timezone",
-    "Convert To UTC": "Convert To UTC",
-    "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/co.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s hè un serviziu in linea di tipu « pastebin » (ghjestiunariu d’appiccicu di pezzi di testu è di codice di fonte) minimalistu è à fonte aperta induve u servitore ùn hà micca cunnuscenza di i dati mandati. I dati sò cifrati è dicifrati %sin u navigatore%s cù una cifratura AES di 256 bit.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Più d’infurmazione annant’à a <a href=\"https://privatebin.info/\">pagina di u prughjettu</a>.",
-    "Because ignorance is bliss": "Perchè l’ignurenza hè una campa",
-    "en": "co",
-    "Paste does not exist, has expired or has been deleted.": "L’appiccicu ùn esiste micca, hè scadutu o hè statu squassatu.",
-    "%s requires php %s or above to work. Sorry.": "Per disgrazzia, %s richiede php %s o più recente per funziunà.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s richiede a presenza di a sezzione di cunfigurazione [%s] in a schedariu di cunfigurazione.",
-    "Please wait %d seconds between each post.": [
-        "Aspettate %d seconda trà dui publicazioni.",
-        "Aspettate %d seconde trà dui publicazioni.",
-        "Aspettate %d seconde trà dui publicazioni.",
-        "Aspettate %d seconde trà dui publicazioni."
-    ],
-    "Paste is limited to %s of encrypted data.": "L’appiccicu hè limitatu à %s di dati cifrati.",
-    "Invalid data.": "Dati inaccetevule.",
-    "You are unlucky. Try again.": "Pruvate torna, Serete più furtunati.",
-    "Error saving comment. Sorry.": "Per disgrazzia, ci hè un sbagliu à l’arregistramentu di u cummentu.",
-    "Error saving paste. Sorry.": "Per disgrazzia, ci hè un sbagliu à l’arregistramentu di l’appiccicu.",
-    "Invalid paste ID.": "N° di l’appiccicu inaccettevule.",
-    "Paste is not of burn-after-reading type.": "L’appiccicu ùn hè micca di tipu « Squassà dopu a lettura ».",
-    "Wrong deletion token. Paste was not deleted.": "Gettone di squassatura incurrettu. L’appiccicu ùn hè micca statu squassatu.",
-    "Paste was properly deleted.": "L’appiccicu hè statu squassatu currettamente.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript hè richiestu per fà funziunà %s. Scusate per stu penseru.",
-    "%s requires a modern browser to work.": "%s richiede un navigatore mudernu per funziunà.",
-    "New": "Novu",
-    "Send": "Mandà",
-    "Clone": "Duppione",
-    "Raw text": "Testu grossu",
-    "Expires": "Scadenza",
-    "Burn after reading": "Squassà dopu a lettura",
-    "Open discussion": "Apre una chjachjarata",
-    "Password (recommended)": "Parolla d’intesa (ricumandata)",
-    "Discussion": "Chjachjarata",
-    "Toggle navigation": "Invertisce a navigazione",
-    "%d seconds": [
-        "%d seconda",
-        "%d seconde",
-        "%d seconde",
-        "%d seconde"
-    ],
-    "%d minutes": [
-        "%d minutu",
-        "%d minuti",
-        "%d minuti",
-        "%d minuti"
-    ],
-    "%d hours": [
-        "%d ora",
-        "%d ore",
-        "%d ore",
-        "%d ore"
-    ],
-    "%d days": [
-        "%d ghjornu",
-        "%d ghjorni",
-        "%d ghjorni",
-        "%d ghjorni"
-    ],
-    "%d weeks": [
-        "%d settimana",
-        "%d settimane",
-        "%d settimane",
-        "%d settimane"
-    ],
-    "%d months": [
-        "%d mese",
-        "%d mesi",
-        "%d mesi",
-        "%d mesi"
-    ],
-    "%d years": [
-        "%d annu",
-        "%d anni",
-        "%d anni",
-        "%d anni"
-    ],
-    "Never": "Mai",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Nota : Què hè un serviziu di prova ; i dati ponu esse squassati à ogni mumentu. Parechji catorni anu da esse tombi s’è vò impiegate troppu stu serviziu.",
-    "This document will expire in %d seconds.": [
-        "Stu ducumentu serà scadutu in %d seconda.",
-        "Stu ducumentu serà scadutu in %d seconde.",
-        "Stu ducumentu serà scadutu in %d seconde.",
-        "Stu ducumentu serà scadutu in %d seconde."
-    ],
-    "This document will expire in %d minutes.": [
-        "Stu ducumentu serà scadutu in %d minutu.",
-        "Stu ducumentu serà scadutu in %d minuti.",
-        "Stu ducumentu serà scadutu in %d minuti.",
-        "Stu ducumentu serà scadutu in %d minuti."
-    ],
-    "This document will expire in %d hours.": [
-        "Stu ducumentu serà scadutu in %d ora.",
-        "Stu ducumentu serà scadutu in %d ore.",
-        "Stu ducumentu serà scadutu in %d ore.",
-        "Stu ducumentu serà scadutu in %d ore."
-    ],
-    "This document will expire in %d days.": [
-        "Stu ducumentu serà scadutu in %d ghjornu.",
-        "Stu ducumentu serà scadutu in %d ghjorni.",
-        "Stu ducumentu serà scadutu in %d ghjorni.",
-        "Stu ducumentu serà scadutu in %d ghjorni."
-    ],
-    "This document will expire in %d months.": [
-        "Stu ducumentu serà scadutu in %d mese.",
-        "Stu ducumentu serà scadutu in %d mesi.",
-        "Stu ducumentu serà scadutu in %d mesi.",
-        "Stu ducumentu serà scadutu in %d mesi."
-    ],
-    "Please enter the password for this paste:": "Stampittate a parolla d’intesa per st’appiccicu :",
-    "Could not decrypt data (Wrong key?)": "Ùn si pò micca dicifrà i dati ; seria incurretta a chjave ?",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Ùn si pò micca squassà l’appiccicu, ùn hè micca statu in u modu « Squassà dopu a lettura ».",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "SOLU CÙ L’OCHJI. Ùn chjudite micca sta finestra, stu messaghju un puderà più esse affissatu torna.",
-    "Could not decrypt comment; Wrong key?": "Ùn si pò micca dicifrà u cummentu. Seria incurretta a chjave ?",
-    "Reply": "Risponde",
-    "Anonymous": "Anonimu",
-    "Avatar generated from IP address": "Avatar ingeneratu da l’indirizzu IP",
-    "Add comment": "Aghjunghje un cummentu",
-    "Optional nickname…": "Cugnome ozzionale…",
-    "Post comment": "Impustà u cummentu",
-    "Sending comment…": "Inviu di u cummentu…",
-    "Comment posted.": "Cummentu inviatu.",
-    "Could not refresh display: %s": "Ùn si pò micca attualizà l’affissera : %s",
-    "unknown status": "statu scunnisciutu",
-    "server error or not responding": "sbagliu di u servitore o u servitore ùn risponde micca",
-    "Could not post comment: %s": "Ùn si pò micca impustà u cummentu : %s",
-    "Sending paste…": "Inviu di l’appiccicu…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "U vostru appiccicu si trova à l’indirizzu<a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Appughjate [Ctrl]+[c] per cupià u liame)</span>",
-    "Delete data": "Squassà i dati",
-    "Could not create paste: %s": "Ùn si pò micca creà l’appiccicu : %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Ùn si pò micca dicifrà l’appiccicu : A chjave di dicifratura hè assente in l’indirizzu. Averiate impiegatu un orientadore d’indirizzu o un riduttore chì ammuzzeghja una parte di l’indirizzu ?",
-    "B": "o",
-    "KiB": "Ko",
-    "MiB": "Mo",
-    "GiB": "Go",
-    "TiB": "To",
-    "PiB": "Po",
-    "EiB": "Eo",
-    "ZiB": "Zo",
-    "YiB": "Yo",
-    "Format": "Furmatu",
-    "Plain Text": "Testu in chjaru",
-    "Source Code": "Codice di fonte",
-    "Markdown": "Markdown",
-    "Download attachment": "Scaricà a pezza aghjunta",
-    "Cloned: '%s'": "Duppiatu : « %s »",
-    "The cloned file '%s' was attached to this paste.": "U schedariu duppiatu  « %s » hè statu aghjuntu à st’appiccicu.",
-    "Attach a file": "Aghjunghje un schedariu",
-    "alternatively drag & drop a file or paste an image from the clipboard": "in alternanza, sguillà è depone un schedariu o incullà una fiura da u preme’papei",
-    "File too large, to display a preview. Please download the attachment.": "Schedariu troppu maiò per affissà una fighjulata. Scaricate a pezza aghjunta.",
-    "Remove attachment": "Caccià a pezza aghjunta",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "U vostru navigatore ùn accetta micca l’inviu di i schedarii cifrati. Impiegate un navigatore più recente.",
-    "Invalid attachment.": "A pezza aghjunta hè inaccettevule.",
-    "Options": "Ozzioni",
-    "Shorten URL": "Ammuzzà l’indirizzu",
-    "Editor": "Editore",
-    "Preview": "Fighjulata",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s richiede chì a variabile PATH si compii cù « %s ». Mudificate a variabile PATH in u vostru index.php.",
-    "Decrypt": "Dicifrà",
-    "Enter password": "Stampittate a parolla d’intesa",
-    "Loading…": "Caricamentu…",
-    "Decrypting paste…": "Dicifratura di l’appiccicu…",
-    "Preparing new paste…": "Approntu di u novu appiccicu…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "S’è stu messaghju ùn smarisce micca, lighjite <a href=\"%s\">sta FAQ per ottene infurmazioni annant’à a risuluzione di i prublemi</a>.",
-    "+++ no paste text +++": "+++ nisunu testu incullatu +++",
-    "Could not get paste data: %s": "Ùn si pò micca ottene i dati di l’appiccicu : %s",
-    "QR code": "Codice QR",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Stu situ web impiegheghja una cunnessione HTTP non sicura ! impiegatelu solu per una prova.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Per sapene di più, <a href=\"%s\">lighjite sta rubrica di a FAQ</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "U vostru navigatore pò richiede una cunnessione HTTPS per permette l’usu di l’API WebCrypto. Pruvate di <a href=\"%s\">passà à HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "U vostru navigatore ùn accetta micca WebAssembly, impiegatu per a cumpressione zlib. Pudete creà ducumenti micca cumpressi, ma ùn pudete micca leghje quelli chì sò cumpressi.",
-    "waiting on user to provide a password": "in attesa di l’utilizatore per furnisce una parolla d’intesa",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Ùn si pò micca dicifrà i dati. Avete stampittatu una parolla d’intesa incurretta ? Pruvate torna cù u buttone insù.",
-    "Retry": "Pruvà torna",
-    "Showing raw text…": "Affissera di u testu grossu…",
-    "Notice:": "Avertimentu :",
-    "This link will expire after %s.": "Stu liame hà da scade dopu à %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Stu liame pò esse accessu solu una volta, ùn impiegate micca i buttoni Precedente o Attualizà di u vostru navigatore.",
-    "Link:": "Liame :",
-    "Recipient may become aware of your timezone, convert time to UTC?": "U destinatariu pò cunnnosce u vostru fusu orariu. Vulete cunvertisce l’ora in u furmatu UTC ?",
-    "Use Current Timezone": "Impiegà u fusu orariu attuale",
-    "Convert To UTC": "Cunvertisce in UTC",
-    "Close": "Chjode",
-    "Encrypted note on %s": "Nota cifrata nant’à %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visitate stu liame per vede a nota. Date l’indirizzu à qualunque li permette d’accede à a nota dinù.",
-    "URL shortener may expose your decrypt key in URL.": "Un ammuzzatore d’indirizzu pò palisà a vostra chjave di dicifratura in l’indirizzu.",
-    "Save paste": "Arregistrà l’appiccicu",
-    "Your IP is not authorized to create pastes.": "U vostru indirizzu IP ùn hè micca auturizatu à creà l’appiccichi.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Pruvate d’ammuzzà un indirizzu web chì ùn punta micca versu a vostra instanza.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Sbagliu à a chjama di YOURLS. Seria forse una cunfigurazione gattiva, tale una \"apiurl\" o \"signature\" falsa o assente.",
-    "Error parsing YOURLS response.": "Sbagliu durante l’analisa di a risposta di YOURLS."
-}

i18n/cs.json

@@ -1,28 +1,22 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s je minimalistický open source 'pastebin' server, který neanalyzuje vložená data. Data jsou šifrována %sv prohlížeči%s pomocí 256 bitů AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Více informací na <a href=\"https://privatebin.info/\">stránce projetu</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s je minimalistický open source 'pastebin' server, který neanalyzuje vložená data. Data jsou šifrována <i>v prohlížeči</i> pomocí 256 bitů AES. Více informací na <a href=\"https://privatebin.info/\">stránce projetu</a>.",
     "Because ignorance is bliss": "Protože nevědomost je sladká",
     "en": "cs",
     "Paste does not exist, has expired or has been deleted.": "Vložený text neexistuje, expiroval nebo byl odstraněn.",
     "%s requires php %s or above to work. Sorry.": "%s vyžaduje php %s nebo vyšší. Lituji.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s vyžaduje, aby byla v konfiguračním souboru přítomna sekce [%s].",
-    "Please wait %d seconds between each post.": [
-        "Počet sekund do dalšího příspěvku: %d.",
-        "Počet sekund do dalšího příspěvku: %d.",
-        "Počet sekund do dalšího příspěvku: %d.",
-        "Počet sekund do dalšího příspěvku: %d."
-    ],
+    "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.",
+    "Please wait %d seconds between each post.": "Počet sekund do dalšího příspěvku: %d.",
     "Paste is limited to %s of encrypted data.": "Příspěvek je limitován na %s šífrovaných dat",
     "Invalid data.": "Chybná data.",
     "You are unlucky. Try again.": "Lituji, zkuste to znovu.",
     "Error saving comment. Sorry.": "Chyba při ukládání komentáře.",
     "Error saving paste. Sorry.": "Chyba při ukládání příspěvku.",
     "Invalid paste ID.": "Chybně vložené ID.",
-    "Paste is not of burn-after-reading type.": "Příspěvek není nastaven na smazaní po přečtení.",
-    "Wrong deletion token. Paste was not deleted.": "Chybný token pro odstranění. Příspěvek nebyl smazán.",
-    "Paste was properly deleted.": "Příspěvek byl řádně smazán.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "Pro fungování %s je vyžadován JavaScript. Omlouváme se za nepříjemnosti.",
+    "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.",
+    "Wrong deletion token. Paste was not deleted.": "Wrong deletion token. Paste was not deleted.",
+    "Paste was properly deleted.": "Paste was properly deleted.",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.",
     "%s requires a modern browser to work.": "%%s requires a modern browser to work.",
     "New": "Nový",
     "Send": "Odeslat",
@@ -33,7 +27,7 @@
     "Open discussion": "Povolit komentáře",
     "Password (recommended)": "Heslo (doporučeno)",
     "Discussion": "Komentáře",
-    "Toggle navigation": "Přepnout navigaci",
+    "Toggle navigation": "Toggle navigation",
     "%d seconds": [
         "%d sekuda",
         "%d sekundy",
@@ -77,51 +71,51 @@
         "%d years (3rd plural)"
     ],
     "Never": "Nikdy",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Poznámka: Tato služba slouží k vyzkoušení: Data mohou být kdykoliv smazána. Při zneužití této služby zemřou koťátka.",
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
     "This document will expire in %d seconds.": [
         "Tento dokument expiruje za %d sekundu.",
         "Tento dokument expiruje za %d sekundy.",
         "Tento dokument expiruje za %d sekund.",
-        "Tento dokument expiruje za %d sekund."
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Tento dokument expiruje za %d minutu.",
         "Tento dokument expiruje za %d minuty.",
         "Tento dokument expiruje za %d minut.",
-        "Tento dokument expiruje za %d minut."
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Tento dokument expiruje za %d hodinu.",
         "Tento dokument expiruje za %d hodiny.",
         "Tento dokument expiruje za %d hodin.",
-        "Tento dokument expiruje za %d hodin."
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Tento dokument expiruje za %d den.",
         "Tento dokument expiruje za %d dny.",
         "Tento dokument expiruje za %d dny.",
-        "Tento dokument expiruje za %d dny."
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Tento dokument expiruje za %d měsíc.",
         "Tento dokument expiruje za %d měsíce.",
         "Tento dokument expiruje za %d měsíců.",
-        "Tento dokument expiruje za %d měsíců."
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Zadejte prosím heslo:",
-    "Could not decrypt data (Wrong key?)": "Nepodařilo se dešifrovat data (Špatný klíč?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Nepodařilo se odstranit příspěvek, nebyl uložen v režimu smazání po přečtení.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "POUZE PRO VAŠE OČI. Nezavírejte toto okno, tuto zprávu nelze znovu zobrazit.",
-    "Could not decrypt comment; Wrong key?": "Nepodařilo se dešifrovat komentář; Špatný klíč?",
-    "Reply": "Odpovědět",
+    "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)",
+    "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.",
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
+    "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?",
+    "Reply": "Reply",
     "Anonymous": "Anonym",
-    "Avatar generated from IP address": "Avatar vygenerován z IP adresy",
+    "Avatar generated from IP address": "Avatar generated from IP address",
     "Add comment": "Přidat komentář",
     "Optional nickname…": "Volitelný nickname…",
     "Post comment": "Odeslat komentář",
     "Sending comment…": "Odesílání komentáře…",
     "Comment posted.": "Komentář odeslán.",
-    "Could not refresh display: %s": "Nepodařilo se obnovit zobrazení: %s",
+    "Could not refresh display: %s": "Could not refresh display: %s",
     "unknown status": "neznámý stav",
     "server error or not responding": "Chyba na serveru nebo server neodpovídá",
     "Could not post comment: %s": "Nelze odeslat komentář: %s",
@@ -145,49 +139,43 @@
     "Markdown": "Markdown",
     "Download attachment": "Stáhnout přílohu",
     "Cloned: '%s'": "Klonováno: '%s'",
-    "The cloned file '%s' was attached to this paste.": "Naklonovaný soubor '%s' byl připojen k tomuto příspěvku.",
+    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
     "Attach a file": "Připojit soubor",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternativně přetáhněte soubor nebo vložte obrázek ze schránky",
+    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
     "File too large, to display a preview. Please download the attachment.": "Soubor je příliš velký pro zobrazení náhledu. Stáhněte si přílohu.",
     "Remove attachment": "Odstranit přílohu",
     "Your browser does not support uploading encrypted files. Please use a newer browser.": "Váš prohlížeč nepodporuje nahrávání šifrovaných souborů. Použijte modernější verzi prohlížeče.",
     "Invalid attachment.": "Chybná příloha.",
     "Options": "Volby",
-    "Shorten URL": "Zkrátit URL",
+    "Shorten URL": "Shorten URL",
     "Editor": "Editor",
     "Preview": "Náhled",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s vyžaduje, aby PATH skončil s \"%s\". Aktualizujte PATH ve vašem souboru index.php.",
-    "Decrypt": "Dešifrovat",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
+    "Decrypt": "Decrypt",
     "Enter password": "Zadejte heslo",
-    "Loading…": "Načítání…",
-    "Decrypting paste…": "Dešifruji příspěvek…",
-    "Preparing new paste…": "Připravuji nový příspěvek…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "V případě, že tato zpráva nezmizí, se podívejte na <a href=\"%s\">tyto často kladené otázky pro řešení</a>.",
+    "Loading…": "Loading…",
+    "Decrypting paste…": "Decrypting paste…",
+    "Preparing new paste…": "Preparing new paste…",
+    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
     "+++ no paste text +++": "+++ žádný vložený text +++",
-    "Could not get paste data: %s": "Nepodařilo se získat data příspěvku: %s",
-    "QR code": "QR kód",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Tato stránka používá nezabezpečený připojení HTTP! Použijte ji prosím jen pro testování.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Více informací naleznete <a href=\"%s\">v této položce FAQ</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Váš prohlížeč může vyžadovat připojení HTTPS pro podporu WebCrypto API. Zkuste <a href=\"%s\">přepnout na HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Váš prohlížeč nepodporuje WebAssembly, který se používá pro zlib kompresi. Můžete vytvořit nekomprimované dokumenty, ale nebudete moct číst ty komprimované.",
-    "waiting on user to provide a password": "čekám na zadání hesla",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Nepodařilo se dešifrovat data. Zadali jste špatné heslo? Zkuste to znovu pomocí tlačítka nahoře.",
-    "Retry": "Opakovat",
-    "Showing raw text…": "Zobrazuji surový text…",
-    "Notice:": "Upozornění:",
-    "This link will expire after %s.": "Tento odkaz vyprší za %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Tento odkaz je přístupný pouze jednou, nepoužívejte tlačítko zpět ani neobnovujte tuto stránku ve vašem prohlížeči.",
-    "Link:": "Odkaz:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Příjemce se může dozvědět o vašem časovém pásmu, převést čas na UTC?",
-    "Use Current Timezone": "Použít aktuální časové pásmo",
-    "Convert To UTC": "Převést na UTC",
-    "Close": "Zavřít",
-    "Encrypted note on %s": "Šifrovaná poznámka ve službě %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Navštivte tento odkaz pro zobrazení poznámky. Přeposláním URL umožníte také jiným lidem přístup.",
-    "URL shortener may expose your decrypt key in URL.": "Zkracovač URL může odhalit váš dešifrovací klíč v URL.",
-    "Save paste": "Uložit příspěvek",
-    "Your IP is not authorized to create pastes.": "Vaše IP adresa nemá oprávnění k vytvoření vložení.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Could not get paste data: %s": "Could not get paste data: %s",
+    "QR code": "QR code",
+    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
+    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
+    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
+    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
+    "waiting on user to provide a password": "waiting on user to provide a password",
+    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
+    "Retry": "Retry",
+    "Showing raw text…": "Showing raw text…",
+    "Notice:": "Notice:",
+    "This link will expire after %s.": "This link will expire after %s.",
+    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
+    "Link:": "Link:",
+    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
+    "Use Current Timezone": "Use Current Timezone",
+    "Convert To UTC": "Convert To UTC",
+    "Close": "Close",
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/de.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s ist ein minimalistischer, quelloffener \"Pastebin\"-artiger Dienst, bei dem der Server keinerlei Kenntnis der Inhalte hat. Die Daten werden %sim Browser%s mit 256 Bit AES ver- und entschlüsselt.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Weitere Informationen sind auf der <a href=\"https://privatebin.info/\">Projektseite</a> zu finden.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s ist ein minimalistischer, quelloffener \"Pastebin\"-artiger Dienst, bei dem der Server keinerlei Kenntnis der Inhalte hat. Die Daten werden <i>im Browser</i> mit 256 Bit AES ver- und entschlüsselt. Weitere Informationen sind auf der <a href=\"https://privatebin.info/\">Projektseite</a> zu finden.",
     "Because ignorance is bliss": "Unwissenheit ist ein Segen",
     "en": "de",
     "Paste does not exist, has expired or has been deleted.": "Diesen Text gibt es nicht, er ist abgelaufen oder wurde gelöscht.",
     "%s requires php %s or above to work. Sorry.": "%s benötigt PHP %s oder höher, um zu funktionieren. Sorry.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s benötigt den Konfigurationsabschnitt [%s] in der Konfigurationsdatei um zu funktionieren.",
-    "Please wait %d seconds between each post.": [
-        "Bitte warte eine Sekunde zwischen dem Absenden zweier Beiträge.",
-        "Bitte warte %d Sekunden zwischen dem Absenden zweier Beiträge.",
-        "Bitte warte %d Sekunden zwischen dem Absenden zweier Beiträge.",
-        "Bitte warte %d Sekunden zwischen dem Absenden zweier Beiträge."
-    ],
+    "Please wait %d seconds between each post.": "Bitte warte %d Sekunden zwischen dem Absenden.",
     "Paste is limited to %s of encrypted data.": "Texte sind auf %s verschlüsselte Datenmenge beschränkt.",
     "Invalid data.": "Ungültige Daten.",
     "You are unlucky. Try again.": "Du hast Pech. Versuchs nochmal.",
@@ -81,14 +75,14 @@
     "This document will expire in %d seconds.": [
         "Dieses Dokument läuft in einer Sekunde ab.",
         "Dieses Dokument läuft in %d Sekunden ab.",
-        "Dieses Dokument läuft in %d Sekunden ab.",
-        "Dieses Dokument läuft in %d Sekunden ab."
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Dieses Dokument läuft in einer Minute ab.",
         "Dieses Dokument läuft in %d Minuten ab.",
-        "Dieses Dokument läuft in %d Minuten ab.",
-        "Dieses Dokument läuft in %d Minuten ab."
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Dieses Dokument läuft in einer Stunde ab.",
@@ -99,14 +93,14 @@
     "This document will expire in %d days.": [
         "Dieses Dokument läuft in einem Tag ab.",
         "Dieses Dokument läuft in %d Tagen ab.",
-        "Dieses Dokument läuft in %d Tagen ab.",
-        "Dieses Dokument läuft in %d Tagen ab."
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Dieses Dokument läuft in einem Monat ab.",
         "Dieses Dokument läuft in %d Monaten ab.",
-        "Dieses Dokument läuft in %d Monaten ab.",
-        "Dieses Dokument läuft in %d Monaten ab."
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Bitte gib das Passwort für diesen Text ein:",
     "Could not decrypt data (Wrong key?)": "Konnte Daten nicht entschlüsseln (Falscher Schlüssel?)",
@@ -147,7 +141,7 @@
     "Cloned: '%s'": "Geklont: '%s'",
     "The cloned file '%s' was attached to this paste.": "Die geklonte Datei '%s' wurde angehängt.",
     "Attach a file": "Datei anhängen",
-    "alternatively drag & drop a file or paste an image from the clipboard": "Eine Datei kann auch durch ziehen und loslassen ausgewählt oder ein Bild aus der Zwischenablage einfügt werden.",
+    "alternatively drag & drop a file or paste an image from the clipboard": "Alternativ Drag & Drop einer Datei oder einfügen eines Bildes aus der Zwischenablage",
     "File too large, to display a preview. Please download the attachment.": "Datei zu groß, um als Vorschau angezeigt zu werden. Bitte Anhang herunterladen.",
     "Remove attachment": "Anhang entfernen",
     "Your browser does not support uploading encrypted files. Please use a newer browser.": "Dein Browser unterstützt das hochladen von verschlüsselten Dateien nicht. Bitte verwende einen neueren Browser.",
@@ -162,7 +156,7 @@
     "Loading…": "Lädt…",
     "Decrypting paste…": "Entschlüssle Text…",
     "Preparing new paste…": "Bereite neuen Text vor…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Wenn diese Nachricht nicht mehr verschwindet, schau bitte in <a href=\"%s\">die FAQ</a> (Englisch), um zu sehen, wie der Fehler behoben werden kann.",
+    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Wenn diese Nachricht nicht mehr verschwindet, schau bitte in <a href=\"%s\">die FAQ</a> (englisch), um zu sehen, wie der Fehler behoben werden kann.",
     "+++ no paste text +++": "+++ kein Paste-Text +++",
     "Could not get paste data: %s": "Text konnte nicht geladen werden: %s",
     "QR code": "QR code",
@@ -173,21 +167,15 @@
     "waiting on user to provide a password": "warte auf Passworteingabe durch Benutzer",
     "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Konnte Daten nicht entschlüsseln. Hast Du das falsche Passwort eingegeben? Wiederhole den Vorgang mit dem oben stehenden Knopf.",
     "Retry": "Wiederholen",
-    "Showing raw text…": "Rohtext wird angezeigt…",
+    "Showing raw text…": "Zeige reinen Text an…",
     "Notice:": "Hinweis:",
-    "This link will expire after %s.": "Dieser Link wird am %s ablaufen.",
+    "This link will expire after %s.": "Dieser Link wird um %s ablaufen.",
     "This link can only be accessed once, do not use back or refresh button in your browser.": "Dieser Link kann nur einmal geöffnet werden, verwende nicht den Zurück- oder Neu-laden-Knopf Deines Browsers.",
     "Link:": "Link:",
     "Recipient may become aware of your timezone, convert time to UTC?": "Der Empfänger könnte Deine Zeitzone erfahren, möchtest Du die Zeit in UTC umwandeln?",
     "Use Current Timezone": "Aktuelle Zeitzone verwenden",
-    "Convert To UTC": "In UTC umwandeln",
+    "Convert To UTC": "In UTC Umwandeln",
     "Close": "Schliessen",
-    "Encrypted note on %s": "Verschlüsselte Notiz auf %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Besuche diesen Link um das Dokument zu sehen. Wird die URL an eine andere Person gegeben, so kann diese Person ebenfalls auf dieses Dokument zugreifen.",
-    "URL shortener may expose your decrypt key in URL.": "Der URL-Verkürzer kann den Schlüssel in der URL enthüllen.",
-    "Save paste": "Text speichern",
-    "Your IP is not authorized to create pastes.": "Deine IP ist nicht berechtigt, Texte zu erstellen.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Versuch eine URL zu verkürzen, die nicht auf unsere Instanz zeigt.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Fehler beim Aufruf von YOURLS. Wahrscheinlich ein Konfigurationsproblem, wie eine falsche oder fehlende \"apiurl\" oder \"signature\".",
-    "Error parsing YOURLS response.": "Fehler beim Verarbeiten der YOURLS-Antwort."
+    "Encrypted note on PrivateBin": "Verschlüsselte Notiz auf PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Besuche diesen Link um das Dokument zu sehen. Wird die URL an eine andere Person gegeben, so kann diese Person ebenfalls auf diese Notiz zugreifen."
 }

i18n/el.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s είναι ένα λιτό, ανοικτού λογισμικού διαδικτυακής υπηρεσίας επικόλλησης όπου ο διακομιστής έχει πλήρη άγνια του περιεχομένου που επικολλήθηκαν. Τα Δεδομένα κρυπτογραφούνται και αποκρυπτογραφούνται %sστον φιλομετρητή (browser)%s χρησιμοποιόντας 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Περισσότερες πληροφορίες στον <a href=\"https://privatebin.info/\">ιστότοπο του εργαλείου</a>.",
-    "Because ignorance is bliss": "Επειδή η άγνοια είναι ευτυχία",
-    "en": "el",
-    "Paste does not exist, has expired or has been deleted.": "Η επικόλληση δεν υπάρχει, έληξε ή διαγράφηκε",
-    "%s requires php %s or above to work. Sorry.": "%s απαιτεί php %s ή νεότερη για να λειτουργήσει. Συγγνώμη.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s απαιτεί οι ρυθμίσεις [%s] να υπάρχουν στο αρχείο ρυθμίσεων.",
-    "Please wait %d seconds between each post.": [
-        "Παρακαλώ περιμένετε %d δευτερόλεπτο μεταξύ κάθε επικόλλησης.",
-        "Παρακαλώ περιμένετε %d δευτερόλεπτα μεταξύ κάθε επικόλλησης.",
-        "Παρακαλώ περιμένετε %d δευτερόλεπτα μεταξύ κάθε επικόλλησης.",
-        "Παρακαλώ περιμένετε %d δευτερόλεπτα μεταξύ κάθε επικόλλησης."
-    ],
-    "Paste is limited to %s of encrypted data.": "Η επικόλληση είναι περιορισμένη σε %s κρυπτογραφημένων δεδομένων.",
-    "Invalid data.": "Λάθος δεδομένα.",
-    "You are unlucky. Try again.": "Ατυχήσατε. Προσπαθήστε πάλι.",
-    "Error saving comment. Sorry.": "Λάθος στην αποθήκευση του σχόλιου. Συγγνώμη.",
-    "Error saving paste. Sorry.": "Λάθος στην αποθήκευση της επικόλλησης. Συγγνώμη.",
-    "Invalid paste ID.": "Λάθος αναγνωριστικό επικόλλησης.",
-    "Paste is not of burn-after-reading type.": "Η επικόληση δεν είναι τύπου καταστροφή-μετά-το-διάβασμα.",
-    "Wrong deletion token. Paste was not deleted.": "Λάθος αναγνωριστικό διαγραφής. Η επικόλληση δεν διαγράφηκε.",
-    "Paste was properly deleted.": "Η επικόλληση διαγράφηκε επιτυχώς.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "Η JavaScript είναι απαραίτητη για να λειτουργήσει το %s. Συγγνώμη για την ταλαιπωρία.",
-    "%s requires a modern browser to work.": "%s απαιτεί σύγχρονο φυλλομετρητή (browser) για να λειτουργήσει.",
-    "New": "Νέο",
-    "Send": "Αποστολή",
-    "Clone": "Κλωνοποίηση",
-    "Raw text": "Κείμενο",
-    "Expires": "Λήγει",
-    "Burn after reading": "Διαγραφή μετά την ανάγνωση",
-    "Open discussion": "Ανοικτή συζήτηση",
-    "Password (recommended)": "Κωδικός (προτείνεται)",
-    "Discussion": "Συζήτηση",
-    "Toggle navigation": "Εναλλαγή πλοήγησης",
-    "%d seconds": [
-        "%d δευτερόλεπτο",
-        "%d δευτερόλεπτα",
-        "%d δευτερόλεπτα",
-        "%d δευτερόλεπτα"
-    ],
-    "%d minutes": [
-        "%d λεπτό",
-        "%d λεπτά",
-        "%d λεπτά",
-        "%d λεπτά"
-    ],
-    "%d hours": [
-        "%d ώρα",
-        "%d ώρες",
-        "%d ώρες",
-        "%d ώρες"
-    ],
-    "%d days": [
-        "%d ημέρα",
-        "%d ημέρες",
-        "%d ημέρες",
-        "%d ημέρες"
-    ],
-    "%d weeks": [
-        "%d εβδομάδα",
-        "%d εβδομάδες",
-        "%d εβδομάδες",
-        "%d εβδομάδες"
-    ],
-    "%d months": [
-        "%d μήνας",
-        "%d μήνες",
-        "%d μήνες",
-        "%d μήνες"
-    ],
-    "%d years": [
-        "%d χρόνο",
-        "%d χρόνια",
-        "%d χρόνια",
-        "%d χρόνια"
-    ],
-    "Never": "Ποτέ",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Σημείωση: αυτή είναι μία δοκιμαστική υπηρεσία. Τα δεδομένα μπορεί να σβηστούν ανά πάσα στιγμή.",
-    "This document will expire in %d seconds.": [
-        "Αυτό το έγγραφο θα λήξει σε %d δευτερόλεπτο.",
-        "Αυτό το έγγραφο θα λήξει σε %d δευτερόλεπτα.",
-        "Αυτό το έγγραφο θα λήξει σε %d δευτερόλεπτα.",
-        "Αυτό το έγγραφο θα λήξει σε %d δευτερόλεπτα."
-    ],
-    "This document will expire in %d minutes.": [
-        "Αυτό το έγγραφο θα λήξει σε %d λεπτό.",
-        "Αυτό το έγγραφο θα λήξει σε %d λεπτά.",
-        "Αυτό το έγγραφο θα λήξει σε %d λεπτά.",
-        "Αυτό το έγγραφο θα λήξει σε %d λεπτά."
-    ],
-    "This document will expire in %d hours.": [
-        "Αυτό το έγγραφο θα λήξει σε %d ώρα.",
-        "Αυτό το έγγραφο θα λήξει σε %d ώρες.",
-        "Αυτό το έγγραφο θα λήξει σε %d ώρες.",
-        "Αυτό το έγγραφο θα λήξει σε %d ώρες."
-    ],
-    "This document will expire in %d days.": [
-        "Αυτό το έγγραφο θα λήξει σε %d ημέρα.",
-        "Αυτό το έγγραφο θα λήξει σε %d ημέρες.",
-        "Αυτό το έγγραφο θα λήξει σε %d ημέρες.",
-        "Αυτό το έγγραφο θα λήξει σε %d ημέρες."
-    ],
-    "This document will expire in %d months.": [
-        "Αυτό το έγγραφο θα λήξει σε %d μήνα.",
-        "Αυτό το έγγραφο θα λήξει σε %d μήνες.",
-        "Αυτό το έγγραφο θα λήξει σε %d μήνες.",
-        "Αυτό το έγγραφο θα λήξει σε %d μήνες."
-    ],
-    "Please enter the password for this paste:": "Παρακαλώ εισάγετε τον κωδικό για αυτή την επικόληση:",
-    "Could not decrypt data (Wrong key?)": "Δεν ήταν δυνατή η αποκρυπτογράφηση των δεδομένων (πιθανώς λανθασμένο κλειδί;)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Δεν ήταν δυνατή η διαγραφή της επικόλλησης, δεν ήταν αποθηκευμένη σε μορφή διαγραφής μετά την ανάγνωση.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "ΜΟΝΟ ΓΙΑ ΕΣΑΣ. Μην κλείσετε το αυτό το παράθυρο, αυτό το μήνυμα δεν μπορεί να εμφανιστεί ξανά.",
-    "Could not decrypt comment; Wrong key?": "Δεν ήταν δυνατή η αποκρυπτογράφηση του σχολίου. Λάθος κλειδί;",
-    "Reply": "Απάντηση",
-    "Anonymous": "Ανώνυμος",
-    "Avatar generated from IP address": "το avatar δημιουργήθηκε από τη διεύθυνση IP",
-    "Add comment": "Σχολιάστε",
-    "Optional nickname…": "Προαιρετικό ψευδώνυμο…",
-    "Post comment": "Αποστολή σχολίου",
-    "Sending comment…": "Το σχόλιο αποστέλλεται…",
-    "Comment posted.": "Το σχόλιο δημοσιεύτηκε.",
-    "Could not refresh display: %s": "Δεν ήταν δυνατή η ανανέωση της σελίδας: %s",
-    "unknown status": "άγνωστη κατάσταση",
-    "server error or not responding": "Πρόβλημα του διακομιστή ή δεν υπάρχει απάντηση",
-    "Could not post comment: %s": "Δεν ήταν δυνατή η δημοσίευση του σχολίου: %s",
-    "Sending paste…": "Η επικόλληση αποστέλλεται…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Η επικόλλησή σας είναι <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Πληκτρολογήστε [Ctrl]+[c] για αντιγραφή)</span>",
-    "Delete data": "Διαγραφή δεδομένων",
-    "Could not create paste: %s": "Δεν ήταν δυνατή η δημιουργία επικόλλησης: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Δεν ήταν δυνατή η αποκρυπτογράφηση της επικόλλησης: Το κλειδί αποκρυπτογράφησης λείπει από τον σύνδεσμο (Μήπως χρησιμοποιήσατε ανακατεύθυνση συνδέσμου ή υπηρεσία συντόμευσης συνδέσμου;)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Μορφοποίηση",
-    "Plain Text": "Απλό κείμενο",
-    "Source Code": "Πηγαίος Κώδικας",
-    "Markdown": "Markdown",
-    "Download attachment": "Λήψη επισυναπτόμενου",
-    "Cloned: '%s'": "Κλώνος: '%s'",
-    "The cloned file '%s' was attached to this paste.": "Το κλωνοποιημένο αρχείο '%s' επισυνάφθηκε στ αυτή την επικόλληση.",
-    "Attach a file": "Επισύναψη αρχείου",
-    "alternatively drag & drop a file or paste an image from the clipboard": "εναλλακτικά σύρετε το αρχείο ή επικολλήστε μία εικόνα από το clipboard",
-    "File too large, to display a preview. Please download the attachment.": "Πολύ μεγάλο αρχείο για προεπισκόπηση. Παρακαλώ κατεβάστε το επισυναπτόμενο.",
-    "Remove attachment": "Αφαίρεση επισυναπτόμενου",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Ο φυλλομετρητής (browser) σας δεν υποστηρίζει κρυπτογραφημένα αρχεία. Παρακαλώ χρησιμοποιήστε νεότερο φιλομετρητή.",
-    "Invalid attachment.": "Λάθος επισυναπτόμενο.",
-    "Options": "Επιλογές",
-    "Shorten URL": "Συντόμευση σύνδεσμου",
-    "Editor": "Διορθωτής",
-    "Preview": "Προεπισκόπηση",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s απαιτεί το PATH να τελειώνει σε \"%s\". Παρακαλώ ενημερώστε το PATH στο index.php σας.",
-    "Decrypt": "Αποκρυπτογράφηση",
-    "Enter password": "Εισαγωγή κωδικού",
-    "Loading…": "Φόρτωση…",
-    "Decrypting paste…": "Η επικόλληση αποκρυπτογραφείται…",
-    "Preparing new paste…": "Προετοιμασία νέας επικόλλησης…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Σε περίπτωση που αυτό το μήνυμα δεν εξαφανίζεται παρακαλώ κοιτάξτε στις <a href=\"%s\">Ερωταποκρίσεις για πληροφορίες στην αντιμετώπιση προβλημάτων</a>.",
-    "+++ no paste text +++": "+++ Δεν υπάρχει επικόλληση +++",
-    "Could not get paste data: %s": "Δεν ήταν δυνατή η λήψη της επικόλλησης: %s",
-    "QR code": "QR εικονοστοιχειοσειρά",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Αυτός ο ιστότοπος χρησιμοποιεί μη ασφαλή HTTP σύνδεση! Παρακαλώ χρησιμοποιήστε το μόνο δοκιμαστικά.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Για περισσότερες πληροφορίες <a href=\"%s\">δείτε τις ερωταπαντήσεις</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Ο φυλλομετρητής σας μπορεί να απαιτεί HTTPS σύνδεση για να υποστηρίξει το WebCrypto API. Δοκιμάστε <a href=\"%s\">το HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Ο φυλλομετρητής σας δεν υποστηρίζει WebAssembly, που χρησιμοποιήθηκε για zlib συμπίεση. Μπορείτε να δημιουργήσετε ασυμπίεστα αρχεία αλλά δεν μπορείτε να διαβάσετε συμπιεσμένα.",
-    "waiting on user to provide a password": "Αναμονή ο χρήστης να δώσει τον κωδικό",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Δεν ήταν δυνατή η αποκρυπτογράφηση των δεδομένων. Μήπως εισάγατε λάθος κωδικό; Προσπαθήστε με το κουμπί στο επάνω μέρος.",
-    "Retry": "Επαναπροσπάθεια",
-    "Showing raw text…": "Προβολή κειμένου…",
-    "Notice:": "Επισήμανση:",
-    "This link will expire after %s.": "Ο σύνδεσμος θα λήξει σε %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Αυτός ο σύνδεσμος μπορεί να προσπελαστεί μόνο μία φορά, μην χρησιμοποιήσετε το κουμπί επιστροφή ή ανανέωση στον φυλλομετρητή σας.",
-    "Link:": "Σύνδεσμος:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Ο παραλήπτης μπορεί να αναγνωρίσει τη ζώνη ώρας σας, θέλετε μετατροπή της ώρας σε UTC;",
-    "Use Current Timezone": "Χρήση τρέχουσας ζώνης ώρας",
-    "Convert To UTC": "Μετατροπή σε UTC",
-    "Close": "Κλείσιμο",
-    "Encrypted note on %s": "Κρυπτογραφημένο μήνυμα από το %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Επισκεφτείτε αυτόν τον σύνδεσμο για να δείτε το μήνυμα. Δίνοντας τον σύνδεσμο σε οποιονδήποτε, του επιτρέπετε να επισκεφτεί το μήνυμα επίσης.",
-    "URL shortener may expose your decrypt key in URL.": "Συντομευτές συνδέσμων πιθανώς να δημοσιοποιήσουν το κλειδί αποκρυπτογράφισης στον σύνδεσμο.",
-    "Save paste": "Αποθήκευση επικόλλησης",
-    "Your IP is not authorized to create pastes.": "Η IP σας δεν επιτρέπεται να δημιουργεί επικολλήσεις.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/en.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "More information on the <a href=\"https://privatebin.info/\">project page</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.",
     "Because ignorance is bliss": "Because ignorance is bliss",
     "en": "en",
     "Paste does not exist, has expired or has been deleted.": "Paste does not exist, has expired or has been deleted.",
     "%s requires php %s or above to work. Sorry.": "%s requires php %s or above to work. Sorry.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.",
-    "Please wait %d seconds between each post.": [
-        "Please wait %d second between each post. (singular)",
-        "Please wait %d seconds between each post. (1st plural)",
-        "Please wait %d seconds between each post. (2nd plural)",
-        "Please wait %d seconds between each post. (3rd plural)"
-    ],
+    "Please wait %d seconds between each post.": "Please wait %d seconds between each post.",
     "Paste is limited to %s of encrypted data.": "Paste is limited to %s of encrypted data.",
     "Invalid data.": "Invalid data.",
     "You are unlucky. Try again.": "You are unlucky. Try again.",
@@ -80,33 +74,33 @@
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
     "This document will expire in %d seconds.": [
         "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds. (1st plural)",
-        "This document will expire in %d seconds. (2nd plural)",
-        "This document will expire in %d seconds. (3rd plural)"
+        "This document will expire in %d seconds (1st plural)",
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes. (1st plural)",
-        "This document will expire in %d minutes. (2nd plural)",
-        "This document will expire in %d minutes. (3rd plural)"
+        "This document will expire in %d minutes (1st plural)",
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours. (1st plural)",
-        "This document will expire in %d hours. (2nd plural)",
-        "This document will expire in %d hours. (3rd plural)"
+        "This document will expire in %d hours (1st plural)",
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "This document will expire in %d day. (singular)",
-        "This document will expire in %d days. (1st plural)",
-        "This document will expire in %d days. (2nd plural)",
-        "This document will expire in %d days. (3rd plural)"
+        "This document will expire in %d days (1st plural)",
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "This document will expire in %d month. (singular)",
-        "This document will expire in %d months. (1st plural)",
-        "This document will expire in %d months. (2nd plural)",
-        "This document will expire in %d months. (3rd plural)"
+        "This document will expire in %d months (1st plural)",
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Please enter the password for this paste:",
     "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Use Current Timezone",
     "Convert To UTC": "Convert To UTC",
     "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/es.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s es un \"pastebin\" en línea minimalista de código abierto, donde el servidor no tiene ningún conocimiento de los datos guardados. Los datos son cifrados/descifrados %sen el navegador%s usando 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Más información en la <a href=\"https://privatebin.info/\">página del proyecto</a>.",
-    "Because ignorance is bliss": "Porque la ignorancia es felicidad",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s es un \"pastebin\" en línea minimalista de código abierto, donde el servidor no tiene ningún conocimiento de los datos guardados. Los datos son cifrados/descifrados <i>en el navegador</i> usando 256 bits AES. Más información en la <a href=\"https://privatebin.info/\">página del proyecto</a>.",
+    "Because ignorance is bliss": "Porque la ignorancia es dicha",
     "en": "es",
     "Paste does not exist, has expired or has been deleted.": "El \"paste\" no existe, ha caducado o ha sido eliminado.",
     "%s requires php %s or above to work. Sorry.": "%s requiere php %s o superior para funcionar. Lo siento.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s requiere que la sección de configuración [%s] esté presente en el archivo de configuración.",
-    "Please wait %d seconds between each post.": [
-        "Por favor espere %d segundo entre cada publicación.",
-        "Por favor espere %d segundos entre cada publicación.",
-        "Por favor espere %d segundos entre cada publicación.",
-        "Por favor espere %d segundos entre cada publicación."
-    ],
+    "Please wait %d seconds between each post.": "Por favor espere %d segundos entre cada publicación.",
     "Paste is limited to %s of encrypted data.": "El \"paste\" está limitado a %s de datos cifrados.",
     "Invalid data.": "Datos inválidos.",
     "You are unlucky. Try again.": "Tienes mala suerte. Inténtalo de nuevo",
@@ -37,76 +31,76 @@
     "%d seconds": [
         "%d segundo",
         "%d segundos",
-        "%d segundos",
-        "%d segundos"
+        "%d seconds (2nd plural)",
+        "%d seconds (3rd plural)"
     ],
     "%d minutes": [
         "%d minuto",
         "%d minutos",
-        "%d minutos",
-        "%d minutos"
+        "%d minutes (2nd plural)",
+        "%d minutes (3rd plural)"
     ],
     "%d hours": [
         "%d hora",
         "%d horas",
-        "%d horas",
-        "%d horas"
+        "%d hours (2nd plural)",
+        "%d hours (3rd plural)"
     ],
     "%d days": [
         "%d día",
         "%d días",
-        "%d días",
-        "%d días"
+        "%d days (2nd plural)",
+        "%d days (3rd plural)"
     ],
     "%d weeks": [
         "%d semana",
         "%d semanas",
-        "%d semanas",
-        "%d semanas"
+        "%d weeks (2nd plural)",
+        "%d weeks (3rd plural)"
     ],
     "%d months": [
         "%d mes",
         "%d meses",
-        "%d minutos",
-        "%d meses"
+        "%d months (2nd plural)",
+        "%d months (3rd plural)"
     ],
     "%d years": [
         "%d año",
         "%d años",
-        "%d años",
-        "%d años"
+        "%d years (2nd plural)",
+        "%d years (3rd plural)"
     ],
     "Never": "Nunca",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Nota: Este es un servicio de prueba. Los datos pueden ser eliminados en cualquier momento. Morirán gatitos si abusas de este servicio.",
     "This document will expire in %d seconds.": [
         "Este documento caducará en un segundo.",
         "Este documento caducará en %d segundos.",
-        "Este documento caducará en %d segundos",
-        "Este documento caducará en %d segundos"
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Este documento caducará en un minuto.",
         "Este documento caducará en %d minutos.",
-        "Este documento caducará en %d minutos",
-        "Este documento caducará en %d minutos"
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Este documento caducará en una hora.",
         "Este documento caducará en %d horas.",
-        "Este documento caducará en %d horas",
-        "Este documento caducará en %d horas"
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Este documento caducará en un día.",
         "Este documento caducará en %d días.",
-        "Este documento caducará en %d días",
-        "Este documento caducará en %d días"
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Este documento caducará en un mes.",
         "Este documento caducará en %d meses.",
-        "Este documento caducará en %d meses",
-        "Este documento caducará en %d meses"
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Por favor ingrese la contraseña para este \"paste\":",
     "Could not decrypt data (Wrong key?)": "No fue posible descifrar los datos (¿Clave errónea?)",
@@ -147,8 +141,8 @@
     "Cloned: '%s'": "Clonado: '%s'.",
     "The cloned file '%s' was attached to this paste.": "El archivo clonado '%s' ha sido adjuntado a este texto.",
     "Attach a file": "Adjuntar archivo",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternativamente, arrastre y suelte un archivo o pegue una imagen desde el portapapeles",
-    "File too large, to display a preview. Please download the attachment.": "Archivo demasiado grande para mostrar una vista previa. Por favor, descargue el archivo adjunto.",
+    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
+    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
     "Remove attachment": "Remover adjunto",
     "Your browser does not support uploading encrypted files. Please use a newer browser.": "Tu navegador no admite la carga de archivos cifrados. Utilice un navegador más reciente.",
     "Invalid attachment.": "Adjunto inválido.",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Usar Zona Horaria Actual",
     "Convert To UTC": "Convertir A UTC",
     "Close": "Cerrar",
-    "Encrypted note on %s": "Nota cifrada en %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visite este enlace para ver la nota. Dar la URL a cualquier persona también les permite acceder a la nota.",
-    "URL shortener may expose your decrypt key in URL.": "El acortador de URL puede exponer su clave de descifrado en el URL.",
-    "Save paste": "Guardar \"paste\"",
-    "Your IP is not authorized to create pastes.": "Tu IP no está autorizada para crear contenido.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Nota cifrada en PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visite este enlace para ver la nota. Dar la URL a cualquier persona también les permite acceder a la nota."
 }

i18n/et.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s on minimalistlik, avatud lähtekoodiga online pastebin, kus serveril pole kleebitud andmete kohta teadmist. Andmed krüpteeritakse/dekrüpteeritakse %sbrauseris%s kasutades 256-bitist AES-i.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Lisateave <a href=\"https://privatebin.info/\">projekti lehel</a>.",
-    "Because ignorance is bliss": "Kuna teadmatus on õndsus",
-    "en": "et",
-    "Paste does not exist, has expired or has been deleted.": "Kleebet ei eksisteeri, on aegunud või on kustutatud.",
-    "%s requires php %s or above to work. Sorry.": "%s vajab, et oleks php %s või kõrgem, et töötada. Vabandame.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s vajab, et [%s] seadistamise jaotis oleks olemas konfiguratsioonifailis.",
-    "Please wait %d seconds between each post.": [
-        "Palun oota %d sekund iga postituse vahel.",
-        "Palun oota %d sekundit iga postituse vahel.",
-        "Palun oota %d sekundit iga postituse vahel.",
-        "Palun oota %d sekundit iga postituse vahel."
-    ],
-    "Paste is limited to %s of encrypted data.": "Kleepe limiit on %s krüpteeritud andmeid.",
-    "Invalid data.": "Valed andmed.",
-    "You are unlucky. Try again.": "Sul ei vea. Proovi uuesti.",
-    "Error saving comment. Sorry.": "Viga kommentaari salvestamisel. Vabandame.",
-    "Error saving paste. Sorry.": "Viga kleepe salvestamisel. Vabandame.",
-    "Invalid paste ID.": "Vale kleepe ID.",
-    "Paste is not of burn-after-reading type.": "Kleebe ei ole põleta-pärast-lugemist tüüpi.",
-    "Wrong deletion token. Paste was not deleted.": "Vale kustutamiskood. Kleebet ei kustutatud.",
-    "Paste was properly deleted.": "Kleebe kustutati korralikult.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript on vajalik %s'i töötamiseks. Vabandame ebamugavuste pärast.",
-    "%s requires a modern browser to work.": "%s vajab töötamiseks kaasaegset brauserit.",
-    "New": "Uus",
-    "Send": "Saada",
-    "Clone": "Klooni",
-    "Raw text": "Lähtetekst",
-    "Expires": "Aegub",
-    "Burn after reading": "Põleta pärast lugemist",
-    "Open discussion": "Avatud arutelu",
-    "Password (recommended)": "Parool (soovitatav)",
-    "Discussion": "Arutelu",
-    "Toggle navigation": "Näita menüüd",
-    "%d seconds": [
-        "%d sekund",
-        "%d sekundit",
-        "%d sekundit",
-        "%d sekundit"
-    ],
-    "%d minutes": [
-        "%d minut",
-        "%d minutit",
-        "%d minutit",
-        "%d minutit"
-    ],
-    "%d hours": [
-        "%d tund",
-        "%d tundi",
-        "%d tundi",
-        "%d tundi"
-    ],
-    "%d days": [
-        "%d päev",
-        "%d päeva",
-        "%d päeva",
-        "%d päeva"
-    ],
-    "%d weeks": [
-        "%d nädal",
-        "%d nädalat",
-        "%d nädalat",
-        "%d nädalat"
-    ],
-    "%d months": [
-        "%d kuu",
-        "%d kuud",
-        "%d kuud",
-        "%d kuud"
-    ],
-    "%d years": [
-        "%d aasta",
-        "%d aastat",
-        "%d aastat",
-        "%d aastat"
-    ],
-    "Never": "Mitte kunagi",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Märge: See on testimisteenus: Andmeid võidakse igal ajal kustutada. Kiisupojad hukuvad, kui seda teenust kuritarvitad.",
-    "This document will expire in %d seconds.": [
-        "See dokument aegub %d sekundi pärast.",
-        "See dokument aegub %d sekundi pärast.",
-        "See dokument aegub %d sekundi pärast.",
-        "See dokument aegub %d sekundi pärast."
-    ],
-    "This document will expire in %d minutes.": [
-        "See dokument aegub %d minuti pärast.",
-        "See dokument aegub %d minuti pärast.",
-        "See dokument aegub %d minuti pärast.",
-        "See dokument aegub %d minuti pärast."
-    ],
-    "This document will expire in %d hours.": [
-        "See dokument aegub %d tunni pärast.",
-        "See dokument aegub %d tunni pärast.",
-        "See dokument aegub %d tunni pärast.",
-        "See dokument aegub %d tunni pärast."
-    ],
-    "This document will expire in %d days.": [
-        "See dokument aegub %d päeva pärast.",
-        "See dokument aegub %d päeva pärast.",
-        "See dokument aegub %d päeva pärast.",
-        "See dokument aegub %d päeva pärast."
-    ],
-    "This document will expire in %d months.": [
-        "See dokument aegub %d kuu pärast.",
-        "See dokument aegub %d kuu pärast.",
-        "See dokument aegub %d kuu pärast.",
-        "See dokument aegub %d kuu pärast."
-    ],
-    "Please enter the password for this paste:": "Palun sisesta selle kleepe parool:",
-    "Could not decrypt data (Wrong key?)": "Ei suutnud andmeid dekrüpteerida (Vale võti?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Ei suutnud kleebet kustutada, seda ei salvestatud põleta pärast lugemist režiimis.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "AINULT SINU SILMADELE. Ära sulge seda akent, seda sõnumit ei saa enam kuvada.",
-    "Could not decrypt comment; Wrong key?": "Ei suutnud kommentaari dekrüpteerida; Vale võti?",
-    "Reply": "Vasta",
-    "Anonymous": "Anonüümne",
-    "Avatar generated from IP address": "Avatar genereeritud IP aadressi põhjal",
-    "Add comment": "Lisa kommentaar",
-    "Optional nickname…": "Valikuline hüüdnimi…",
-    "Post comment": "Postita kommentaar",
-    "Sending comment…": "Kommentaari saatmine…",
-    "Comment posted.": "Kommentaar postitatud.",
-    "Could not refresh display: %s": "Ei suutnud kuva värskendada: %s",
-    "unknown status": "tundmatu staatus",
-    "server error or not responding": "serveri viga või ei vasta",
-    "Could not post comment: %s": "Ei suutnud kommentaari postitada: %s",
-    "Sending paste…": "Kleepe saatmine…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Sinu kleebe on <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Kopeerimiseks vajuta [Ctrl]+[c])</span>",
-    "Delete data": "Kustuta andmed",
-    "Could not create paste: %s": "Ei suutnud kleebet luua: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Ei suutnud kleebet dekrüpteerida: Dekrüpteerimisvõti on URL-ist puudu (Kas kasutasid ümbersuunajat või URL-i lühendajat, mis eemaldab osa URL-ist?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Formaat",
-    "Plain Text": "Lihttekst",
-    "Source Code": "Lähtekood",
-    "Markdown": "Markdown",
-    "Download attachment": "Laadi manus alla",
-    "Cloned: '%s'": "Kloonitud: '%s'",
-    "The cloned file '%s' was attached to this paste.": "Kloonitud fail '%s' manustati sellele kleepele.",
-    "Attach a file": "Manusta fail",
-    "alternatively drag & drop a file or paste an image from the clipboard": "teise võimalusena lohista fail või kleebi pilt lõikelaualt",
-    "File too large, to display a preview. Please download the attachment.": "Fail on eelvaate kuvamiseks liiga suur. Palun laadi manus alla.",
-    "Remove attachment": "Eemalda manus",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Sinu brauser ei toeta krüpteeritud failide üleslaadimist. Palun kasuta uuemat brauserit.",
-    "Invalid attachment.": "Sobimatu manus.",
-    "Options": "Valikud",
-    "Shorten URL": "Lühenda URL",
-    "Editor": "Toimetaja",
-    "Preview": "Eelvaade",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s vajab, et PATH lõppeks järgmisega: \"%s\". Palun uuenda PATH-i oma index.php failis.",
-    "Decrypt": "Dekrüpteeri",
-    "Enter password": "Sisesta parool",
-    "Loading…": "Laadimine…",
-    "Decrypting paste…": "Kleepe dekrüpteerimine…",
-    "Preparing new paste…": "Uue kleepe ettevalmistamine…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Kui see sõnum ei kao, palun vaata <a href=\"%s\">seda KKK-d, et saada tõrkeotsinguks teavet.</a>.",
-    "+++ no paste text +++": "+++ kleepe tekst puudub +++",
-    "Could not get paste data: %s": "Ei suutnud saada kleepe andmeid: %s",
-    "QR code": "QR kood",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "See veebisait kasutab ebaturvalist HTTP ühendust! Palun kasuta seda ainult katsetamiseks.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Lisateabe saamiseks <a href=\"%s\">vaata seda KKK sissekannet</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Sinu brauser võib vajada HTTPS ühendust, et toetada WebCrypto API-d. Proovi <a href=\"%s\">üle minna HTTPS-ile</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Sinu brauser ei toeta WebAssembly't, mida kasutatakse zlib tihendamiseks. Sa saad luua tihendamata dokumente, kuid ei saa lugeda tihendatuid.",
-    "waiting on user to provide a password": "ootan parooli sisestamist kasutajalt",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Ei suutnud andmeid dekrüpteerida. Kas sisestasid vale parooli? Proovi uuesti üleval asuva nupuga.",
-    "Retry": "Proovi uuesti",
-    "Showing raw text…": "Lähteteksti näitamine…",
-    "Notice:": "Teade:",
-    "This link will expire after %s.": "See link aegub: %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Sellele lingile saab vaid üks kord ligi pääseda, ära kasuta tagasi või värskenda nuppe sinu brauseris.",
-    "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Saaja võib saada teada sinu ajavööndi, kas teisendada aeg UTC-ks?",
-    "Use Current Timezone": "Kasuta praegust ajavööndit",
-    "Convert To UTC": "Teisenda UTC-ks",
-    "Close": "Sulge",
-    "Encrypted note on %s": "Krüpteeritud kiri %s-is",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Kirja nägemiseks külasta seda linki. Teistele URL-i andmine lubab ka neil ligi pääseda kirjale.",
-    "URL shortener may expose your decrypt key in URL.": "URL-i lühendaja võib paljastada sinu dekrüpteerimisvõtme URL-is.",
-    "Save paste": "Salvesta kleebe",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/fi.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s on minimalistinen, avoimen lähdekoodin online pastebin jossa palvelimella ei ole tietoa syötetystä datasta. Data salataan/puretaan %sselaimessa%s käyttäen 256-bittistä AES:ää.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Enemmän tietoa <a href=\"https://privatebin.info/\">projektisivulla</a>.",
-    "Because ignorance is bliss": "Koska tieto lisää tuskaa",
-    "en": "fi",
-    "Paste does not exist, has expired or has been deleted.": "Pastea ei ole olemassa, se on vanhentunut, tai se on poistettu.",
-    "%s requires php %s or above to work. Sorry.": "%s tarvitsee php %s-versiota tai uudempaa toimiakseen. Anteeksi.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s vaatii konfiguraatio-osion [%s] olevan läsnä konfiguraatiotiedostossa.",
-    "Please wait %d seconds between each post.": [
-        "Odotathan %d sekuntin jokaisen lähetyksen välillä.",
-        "Odotathan %d sekuntia jokaisen lähetyksen välillä.",
-        "Odotathan %d sekuntia jokaisen lähetyksen välillä.",
-        "Odotathan %d sekuntia jokaisen lähetyksen välillä."
-    ],
-    "Paste is limited to %s of encrypted data.": "Paste on rajoitettu kokoon %s salattua dataa.",
-    "Invalid data.": "Virheellinen data.",
-    "You are unlucky. Try again.": "Olet epäonnekas. Yritä uudelleen.",
-    "Error saving comment. Sorry.": "Virhe kommenttia tallentaessa. Anteeksi.",
-    "Error saving paste. Sorry.": "Virhe pastea tallentaessa. Anteeksi.",
-    "Invalid paste ID.": "Virheellinen paste ID.",
-    "Paste is not of burn-after-reading type.": "Paste ei ole polta-lukemisen-jälkeen-tyyppiä.",
-    "Wrong deletion token. Paste was not deleted.": "Virheellinen poistotunniste. Pastea ei poistettu.",
-    "Paste was properly deleted.": "Paste poistettiin kunnolla.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScriptiä tarvitaan jotta %s toimisi. Anteeksi haitasta.",
-    "%s requires a modern browser to work.": "%s tarvitsee modernia selainta toimiakseen.",
-    "New": "Uusi",
-    "Send": "Lähetä",
-    "Clone": "Kloonaa",
-    "Raw text": "Raaka teksti",
-    "Expires": "Vanhenee",
-    "Burn after reading": "Polta lukemisen jälkeen",
-    "Open discussion": "Avaa keskustelu",
-    "Password (recommended)": "Salasana (suositeltu)",
-    "Discussion": "Keskustelu",
-    "Toggle navigation": "Navigointi päällä/pois",
-    "%d seconds": [
-        "%d sekunti",
-        "%d sekuntia",
-        "%d sekuntia",
-        "%d sekuntia"
-    ],
-    "%d minutes": [
-        "%d minuutti",
-        "%d minuuttia",
-        "%d minuuttia",
-        "%d minuuttia"
-    ],
-    "%d hours": [
-        "%d tunti",
-        "%d tuntia",
-        "%d tuntia",
-        "%d tuntia"
-    ],
-    "%d days": [
-        "%d päivä",
-        "%d päivää",
-        "%d päivää",
-        "%d päivää"
-    ],
-    "%d weeks": [
-        "%d viikko",
-        "%d viikkoa",
-        "%d viikkoa",
-        "%d viikkoa"
-    ],
-    "%d months": [
-        "%d kuukausi",
-        "%d kuukautta",
-        "%d kuukautta",
-        "%d kuukautta"
-    ],
-    "%d years": [
-        "%d vuosi",
-        "%d vuotta",
-        "%d vuotta",
-        "%d vuotta"
-    ],
-    "Never": "Ei koskaan",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Huomaa: Tämä on testipalvelu: Data voidaan poistaa milloin tahansa. Kissanpennut kuolevat jos väärinkäytät tätä palvelua.",
-    "This document will expire in %d seconds.": [
-        "Tämä dokumentti vanhenee %d sekuntissa.",
-        "Tämä dokumentti vanhenee %d sekunnissa.",
-        "Tämä dokumentti vanhenee %d sekunnissa.",
-        "Tämä dokumentti vanhenee %d sekunnissa."
-    ],
-    "This document will expire in %d minutes.": [
-        "Tämä dokumentti vanhenee %d minuutissa.",
-        "Tämä dokumentti vanhenee %d minuutissa.",
-        "Tämä dokumentti vanhenee %d minuutissa.",
-        "Tämä dokumentti vanhenee %d minuutissa."
-    ],
-    "This document will expire in %d hours.": [
-        "Tämä dokumentti vanhenee %d tunnissa.",
-        "Tämä dokumentti vanhenee %d tunnissa.",
-        "Tämä dokumentti vanhenee %d tunnissa.",
-        "Tämä dokumentti vanhenee %d tunnissa."
-    ],
-    "This document will expire in %d days.": [
-        "Tämä dokumentti vanhenee %d päivässä.",
-        "Tämä dokumentti vanhenee %d päivässä.",
-        "Tämä dokumentti vanhenee %d päivässä.",
-        "Tämä dokumentti vanhenee %d päivässä."
-    ],
-    "This document will expire in %d months.": [
-        "Tämä dokumentti vanhenee %d kuukaudessa.",
-        "Tämä dokumentti vanhenee %d kuukaudessa.",
-        "Tämä dokumentti vanhenee %d kuukaudessa.",
-        "Tämä dokumentti vanhenee %d kuukaudessa."
-    ],
-    "Please enter the password for this paste:": "Syötä salasana tälle pastelle:",
-    "Could not decrypt data (Wrong key?)": "Dataa ei voitu purkaa (Väärä avain?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Pastea ei voitu poistaa, sitä ei säilytetty \"Polta lukemisen jälkeen\" -tilassa.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "VAIN SINUN SILMILLESI. Älä sulje tätä ikkunaa, tätä viestiä ei voida näyttää uudelleen.",
-    "Could not decrypt comment; Wrong key?": "Kommenttia ei voitu purkaa; väärä avain?",
-    "Reply": "Vastaa",
-    "Anonymous": "Anonyymi",
-    "Avatar generated from IP address": "Avatar generoitu IP-osoitteesta",
-    "Add comment": "Lisää kommentti",
-    "Optional nickname…": "Valinnainen nimimerkki…",
-    "Post comment": "Lähetä kommentti",
-    "Sending comment…": "Lähetetään kommenttia…",
-    "Comment posted.": "Kommentti lähetetty.",
-    "Could not refresh display: %s": "Näyttöä ei voitu päivittää: %s",
-    "unknown status": "tuntematon status",
-    "server error or not responding": "palvelinvirhe tai palvelin ei vastaa",
-    "Could not post comment: %s": "Kommenttia ei voitu lähettää: %s",
-    "Sending paste…": "Lähetetään pastea…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Pastesi on <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Paina [Ctrl]+[c] kopioidaksesi)</span>",
-    "Delete data": "Poista data",
-    "Could not create paste: %s": "Pastea ei voitu luoda: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Pastea ei voitu purkaa: Purkausavain puuttuu URL:stä (Käytitkö uudelleenohjaajaa tai URL-lyhentäjää joka poistaa osan URL:stä?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Formaatti",
-    "Plain Text": "Perusteksti",
-    "Source Code": "Lähdekoodi",
-    "Markdown": "Markdown",
-    "Download attachment": "Lataa liite",
-    "Cloned: '%s'": "Kloonattu: '%s'",
-    "The cloned file '%s' was attached to this paste.": "Kloonattu tiedosto '%s' liitettiin tähän pasteen",
-    "Attach a file": "Liitä tiedosto",
-    "alternatively drag & drop a file or paste an image from the clipboard": "vaihtoehtoisesti vedä & pudota tiedosto tai liitä kuva leikepöydältä",
-    "File too large, to display a preview. Please download the attachment.": "Tiedosto on liian iso esikatselun näyttämiseksi. Lataathan liitteen.",
-    "Remove attachment": "Poista liite",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Selaimesi ei tue salattujen tiedostojen lataamista. Käytäthän uudempaa selainta.",
-    "Invalid attachment.": "Virheellinen liite.",
-    "Options": "Asetukset",
-    "Shorten URL": "Lyhennä URL",
-    "Editor": "Muokkaaja",
-    "Preview": "Esikatselu",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s vaatii PATH:in loppuvan \"%s\"-merkkiin. Päivitäthän PATH:in index.php:ssäsi.",
-    "Decrypt": "Pura",
-    "Enter password": "Syötä salasana",
-    "Loading…": "Ladataan…",
-    "Decrypting paste…": "Puretaan pastea…",
-    "Preparing new paste…": "Valmistellaan uutta pastea",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Jos tämä viesti ei katoa koskaan, katsothan <a href=\"%s\">tämän FAQ:n ongelmanratkaisutiedon löytämiseksi</a>.",
-    "+++ no paste text +++": "+++ ei paste-tekstiä +++",
-    "Could not get paste data: %s": "Paste-tietoja ei löydetty: %s",
-    "QR code": "QR-koodi",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Tämä sivusto käyttää epäturvallista HTTP-yhteyttä! Käytäthän sitä vain testaukseen.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Lisätietoja varten <a href=\"%s\">lue tämä FAQ-kohta</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Selaimesi ehkä tarvitsee HTTPS-yhteyden tukeakseen WebCrypto API:a. Yritä <a href=\"%s\">vaihtamista HTTPS:ään</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Selaimesi ei tue WebAssemblyä jota käytetään zlib-pakkaamiseen. Voit luoda pakkaamattomia dokumentteja, mutta et voi lukea pakattuja dokumentteja.",
-    "waiting on user to provide a password": "odotetaan käyttäjän antavan salasanan",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Dataa ei voitu purkaa. Syötitkö väärän salasanan? Yritä uudelleen ylhäällä olevalla painikkeella.",
-    "Retry": "Yritä uudelleen",
-    "Showing raw text…": "Näytetään raaka reksti…",
-    "Notice:": "Huomautus:",
-    "This link will expire after %s.": "Tämä linkki vanhenee ajan %s jälkeen.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Tätä linkkiä voidaan käyttää vain kerran, älä käytä taaksepäin- tai päivityspainiketta selaimessasi.",
-    "Link:": "Linkki:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Vastaanottaja saattaa tulla tietoiseksi aikavyöhykkeestäsi, muutetaanko aika UTC:ksi?",
-    "Use Current Timezone": "Käytä nykyistä aikavyöhykettä",
-    "Convert To UTC": "Muuta UTC:ksi",
-    "Close": "Sulje",
-    "Encrypted note on %s": "Salattu viesti %sissä",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Käy tässä linkissä nähdäksesi viestin. URL:n antaminen kenellekään antaa heidänkin päästä katsomeen viestiä. ",
-    "URL shortener may expose your decrypt key in URL.": "URL-lyhentäjä voi paljastaa purkuavaimesi URL:ssä.",
-    "Save paste": "Tallenna paste",
-    "Your IP is not authorized to create pastes.": "IP:llesi ei ole annettu oikeutta luoda pasteja.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/fr.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s est un 'pastebin' (ou gestionnaire d'extraits de texte et de code source) minimaliste et open source, dans lequel le serveur n'a aucune connaissance des données envoyées. Les données sont chiffrées/déchiffrées %sdans le navigateur%s par un chiffrement AES 256 bits.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Plus d'informations sur <a href=\"https://privatebin.info/\">la page du projet</a>.",
-    "Because ignorance is bliss": "Vivons heureux, vivons cachés",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s est un 'pastebin' (ou gestionnaire d'extraits de texte et de code source) minimaliste et open source, dans lequel le serveur n'a aucune connaissance des données envoyées. Les données sont chiffrées/déchiffrées <i>dans le navigateur</i> par un chiffrement AES 256 bits. Plus d'informations sur <a href=\"https://privatebin.info/\">la page du projet</a>.",
+    "Because ignorance is bliss": "Parce que l'ignorance c'est le bonheur",
     "en": "fr",
     "Paste does not exist, has expired or has been deleted.": "Le paste n'existe pas, a expiré, ou a été supprimé.",
     "%s requires php %s or above to work. Sorry.": "Désolé, %s nécessite php %s ou supérieur pour fonctionner.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s a besoin de la section de configuration [%s] dans le fichier de configuration pour fonctionner.",
-    "Please wait %d seconds between each post.": [
-        "Merci d'attendre %d seconde entre chaque publication.",
-        "Merci d'attendre %d secondes entre chaque publication.",
-        "Merci d'attendre %d secondes entre chaque publication.",
-        "Merci d'attendre %d secondes entre chaque publication."
-    ],
+    "Please wait %d seconds between each post.": "Merci d'attendre %d secondes entre chaque publication.",
     "Paste is limited to %s of encrypted data.": "Le paste est limité à %s de données chiffrées.",
     "Invalid data.": "Données invalides.",
     "You are unlucky. Try again.": "Pas de chance. Essayez encore.",
@@ -87,26 +81,26 @@
     "This document will expire in %d minutes.": [
         "Ce document expirera dans %d minute.",
         "Ce document expirera dans %d minutes.",
-        "Ce document expirera dans %d minutes.",
-        "Ce document expirera dans %d minutes."
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Ce document expirera dans %d heure.",
         "Ce document expirera dans %d heures.",
-        "Ce document expirera dans %d heures.",
-        "Ce document expirera dans %d heures."
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Ce document expirera dans %d jour.",
         "Ce document expirera dans %d jours.",
-        "Ce document expirera dans %d jours.",
-        "Ce document expirera dans %d jours."
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Ce document expirera dans %d mois.",
         "Ce document expirera dans %d mois.",
-        "Ce document expirera dans %d mois.",
-        "Ce document expirera dans %d mois."
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Entrez le mot de passe pour ce paste:",
     "Could not decrypt data (Wrong key?)": "Impossible de déchiffrer les données (mauvaise clé ?)",
@@ -146,7 +140,7 @@
     "Download attachment": "Télécharger la pièce jointe",
     "Cloned: '%s'": "Cloner '%s'",
     "The cloned file '%s' was attached to this paste.": "Le fichier cloné '%s' a été attaché à ce paste.",
-    "Attach a file": "Attacher un fichier",
+    "Attach a file": "Attacher un fichier ",
     "alternatively drag & drop a file or paste an image from the clipboard": "au choix, glisser & déposer un fichier ou coller une image à partir du presse-papiers",
     "File too large, to display a preview. Please download the attachment.": "Fichier trop volumineux, pour afficher un aperçu. Veuillez télécharger la pièce jointe.",
     "Remove attachment": "Enlever la pièce jointe",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Conserver l'actuel",
     "Convert To UTC": "Convertir en UTC",
     "Close": "Fermer",
-    "Encrypted note on %s": "Message chiffré sur %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visiter ce lien pour voir la note. Donner l'URL à une autre personne lui permet également d'accéder à la note.",
-    "URL shortener may expose your decrypt key in URL.": "Raccourcir l'URL peut exposer votre clé de déchiffrement dans l'URL.",
-    "Save paste": "Sauver le paste",
-    "Your IP is not authorized to create pastes.": "Votre adresse IP n'est pas autorisée à créer des pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Message chiffré sur PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visiter ce lien pour voir la note. Donner l'URL à une autre personne lui permet également d'accéder à la note."
 }

i18n/he.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "More information on the <a href=\"https://privatebin.info/\">project page</a>.",
-    "Because ignorance is bliss": "כיוון שבורות היא ברכה",
-    "en": "he",
-    "Paste does not exist, has expired or has been deleted.": "ההדבקה לא קיימת, פגה או נמחקה.",
-    "%s requires php %s or above to work. Sorry.": "%s דורש PHP %s כדי לפעול.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s דורש שסעיף ההגדרות [%s] יהיה קיים בקובץ ההגדרות.",
-    "Please wait %d seconds between each post.": [
-        "נא להמתין שנייה אחת בין פרסום לפרסום.",
-        "נא להמתין %d שניות בין פרסום לפרסום.",
-        "נא להמתין %d שניות בין פרסום לפרסום.",
-        "נא להמתין %d שניות בין פרסום לפרסום."
-    ],
-    "Paste is limited to %s of encrypted data.": "ההדבקה מוגבלת ל־%s של נתונים מוצפנים.",
-    "Invalid data.": "נתונים שגויים.",
-    "You are unlucky. Try again.": "אין לך מזל. נא לנסות שוב.",
-    "Error saving comment. Sorry.": "שגיאה בשמירת המסמך. סליחה.",
-    "Error saving paste. Sorry.": "שגיאה בשמירת ההדבקה. סליחה.",
-    "Invalid paste ID.": "מזהה ההדבקה שגוי.",
-    "Paste is not of burn-after-reading type.": "ההדבקה היא לא מסוג קוראים-שורפים.",
-    "Wrong deletion token. Paste was not deleted.": "אסימון מחיקה שגוי. ההדבקה לא נמחקה.",
-    "Paste was properly deleted.": "ההדבקה נמחקה כראוי.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "צריך JavaScript כדי לאפשר ל־%s לפעול. סליחה על חוסר הנוחות.",
-    "%s requires a modern browser to work.": "%s דורש דפדפן מודרני כדי לפעול.",
-    "New": "חדש",
-    "Send": "שליחה",
-    "Clone": "שכפול",
-    "Raw text": "טקסט גולמי",
-    "Expires": "Expires",
-    "Burn after reading": "קוראים-שורפים",
-    "Open discussion": "פתיחת דיון",
-    "Password (recommended)": "ססמה (מומלץ)",
-    "Discussion": "דיון",
-    "Toggle navigation": "החלפת מצב ניווט",
-    "%d seconds": [
-        "שנייה אחת",
-        "%d שניות",
-        "%d שניות (צורת ריבוי 2)",
-        "%d שניות"
-    ],
-    "%d minutes": [
-        "דקה אחת",
-        "%d דקות",
-        "%d דקות",
-        "%d דקות"
-    ],
-    "%d hours": [
-        "שעה אחת",
-        "%d hours (1st plural)",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "יום אחד",
-        "%d ימים",
-        "%d ימים",
-        "%d ימים"
-    ],
-    "%d weeks": [
-        "שבוע אחד",
-        "%d שבועות",
-        "%d שבועות",
-        "%d שבועות"
-    ],
-    "%d months": [
-        "חודש אחד",
-        "%d חודשים",
-        "%d חודשים",
-        "%d חודשים"
-    ],
-    "%d years": [
-        "שנה אחת",
-        "%d שנים",
-        "%d שנים",
-        "%d שנים"
-    ],
-    "Never": "לעולם לא",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "הערה: זהו שירות בדקה: המידע לא ישמר.",
-    "This document will expire in %d seconds.": [
-        "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds. (1st plural)",
-        "This document will expire in %d seconds. (2nd plural)",
-        "This document will expire in %d seconds. (3rd plural)"
-    ],
-    "This document will expire in %d minutes.": [
-        "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes. (1st plural)",
-        "This document will expire in %d minutes. (2nd plural)",
-        "This document will expire in %d minutes. (3rd plural)"
-    ],
-    "This document will expire in %d hours.": [
-        "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours. (1st plural)",
-        "This document will expire in %d hours. (2nd plural)",
-        "This document will expire in %d hours. (3rd plural)"
-    ],
-    "This document will expire in %d days.": [
-        "This document will expire in %d day. (singular)",
-        "This document will expire in %d days. (1st plural)",
-        "This document will expire in %d days. (2nd plural)",
-        "This document will expire in %d days. (3rd plural)"
-    ],
-    "This document will expire in %d months.": [
-        "This document will expire in %d month. (singular)",
-        "This document will expire in %d months. (1st plural)",
-        "This document will expire in %d months. (2nd plural)",
-        "This document will expire in %d months. (3rd plural)"
-    ],
-    "Please enter the password for this paste:": "נא למלא את הססמה להדבקה הזו:",
-    "Could not decrypt data (Wrong key?)": "לא ניתן לפענח את הנתונים (מפתח שגוי?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "לא ניתן למחוק את ההדבקה, היא לא אוחסנה במצב קוראים-שורפים.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "לעיניך בלבד. לא לסגור את החלון הזה, ההודעה הזאת לא תופיע שוב.",
-    "Could not decrypt comment; Wrong key?": "לא ניתן לפענח את ההערה, מפתח שגוי?",
-    "Reply": "תגובה",
-    "Anonymous": "אלמוני",
-    "Avatar generated from IP address": "התמונה הייצוגית נוצרה מכתובת ה־IP",
-    "Add comment": "הוספת תגובה",
-    "Optional nickname…": "כינוי כרשות…",
-    "Post comment": "פרסום תגובה",
-    "Sending comment…": "התגובה נשלחת…",
-    "Comment posted.": "פורסמה תגובה.",
-    "Could not refresh display: %s": "לא ניתן לרענן תצוגה: %s",
-    "unknown status": "מצב לא ידוע",
-    "server error or not responding": "שגיאת שרת או שהשרת לא מגיב",
-    "Could not post comment: %s": "לא ניתן לפרסם תגובה: %s",
-    "Sending paste…": "ההדבקה נשלחת…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "ההדבקה שלך היא <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(יש ללחוץ [Ctrl]+[c] כדי להעתיק)</span>",
-    "Delete data": "מחיקת נתונים",
-    "Could not create paste: %s": "לא ניתן ליצור הדבקה: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "לא ניתן לפענח הדבקה: מפתח הפענוח חסר בכתובת (השתמשת במערכת הפנייה או מקצר כתובות שחותכים חלק מהכתובת?)",
-    "B": "ב׳",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "פורמט",
-    "Plain Text": "טקסט פשוט",
-    "Source Code": "קוד מקור",
-    "Markdown": "Markdown",
-    "Download attachment": "הורדת קובץ מצורף",
-    "Cloned: '%s'": "שוכפל: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
-    "Attach a file": "צירוף קובץ",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Remove attachment",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "קובץ מצורף שגוי.",
-    "Options": "אפשרויות",
-    "Shorten URL": "קיצור כתובת",
-    "Editor": "עורך",
-    "Preview": "תצוגה מקדימה",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "פענוח",
-    "Enter password": "נא למלא ססמה",
-    "Loading…": "בטעינה…",
-    "Decrypting paste…": "ההדבקה מפוענחת…",
-    "Preparing new paste…": "ההדבקה החדשה בהכנות…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ אין טקסט להדבקה +++",
-    "Could not get paste data: %s": "לא ניתן לקבל את נתוני ההדבקה: %s",
-    "QR code": "קוד QR",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "האתר הזה משתמש בחיבור HTTP בלתי מאובטח! נא להשתמש בזה לבדיקות בלבד.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "יש מידע נוסף <a href=\"%s\">ברשומה הזאת בשו״ת</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "יכול להיות שהדפדפן שלך ידרוש חיבור HTTPS כדי לתמוך ב־API של WebCrypto. כדי לנסות <a href=\"%s\">לעבור ל־HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "הדפדפן שלך לא תומך ב־WebAssembly שמשמש לדחיסת zlib. אפשר ליצור מסמכים בלתי מוצפנים אך אין אפשרות לקרוא מסמכים מוצפנים.",
-    "waiting on user to provide a password": "בהמתנה למילוי הססמה מצד המשתמש",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "לא ניתן לפענח את הנתונים. יכול להיות שמילאת ססמה שגויה? כדאי לנסות עם הכפתור שלמעלה.",
-    "Retry": "לנסות שוב",
-    "Showing raw text…": "מוצג טקסט גולמי…",
-    "Notice:": "לתשומת לבך:",
-    "This link will expire after %s.": "הקישור הזה יפוג לאחר %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "אפשר לגשת לקישור הזה פעם אחת בלבד, לא לחזור אחורה או לרענן את הדפדפן.",
-    "Link:": "קישור:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "הנמען יוכל לדעת מה אזור הזמן שלך, להמיר ל־UTC?",
-    "Use Current Timezone": "להשתמש באזור הזמן הנוכחי",
-    "Convert To UTC": "המרה ל־UTC",
-    "Close": "סגירה",
-    "Encrypted note on %s": "%sהערה מוצפנת ב־",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "נא לבקר בקישור כדי לצפות בהערה. מסירת הקישור לאנשים כלשהם תאפשר גם להם לגשת להערה.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/hi.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "More information on the <a href=\"https://privatebin.info/\">project page</a>.",
-    "Because ignorance is bliss": "Because ignorance is bliss",
-    "en": "hi",
-    "Paste does not exist, has expired or has been deleted.": "Paste does not exist, has expired or has been deleted.",
-    "%s requires php %s or above to work. Sorry.": "%s requires php %s or above to work. Sorry.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.",
-    "Please wait %d seconds between each post.": [
-        "Please wait %d second between each post. (singular)",
-        "Please wait %d seconds between each post. (1st plural)",
-        "Please wait %d seconds between each post. (2nd plural)",
-        "Please wait %d seconds between each post. (3rd plural)"
-    ],
-    "Paste is limited to %s of encrypted data.": "Paste is limited to %s of encrypted data.",
-    "Invalid data.": "Invalid data.",
-    "You are unlucky. Try again.": "You are unlucky. Try again.",
-    "Error saving comment. Sorry.": "Error saving comment. Sorry.",
-    "Error saving paste. Sorry.": "Error saving paste. Sorry.",
-    "Invalid paste ID.": "Invalid paste ID.",
-    "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.",
-    "Wrong deletion token. Paste was not deleted.": "Wrong deletion token. Paste was not deleted.",
-    "Paste was properly deleted.": "Paste was properly deleted.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.",
-    "%s requires a modern browser to work.": "%s requires a modern browser to work.",
-    "New": "New",
-    "Send": "Send",
-    "Clone": "Clone",
-    "Raw text": "Raw text",
-    "Expires": "Expires",
-    "Burn after reading": "Burn after reading",
-    "Open discussion": "Open discussion",
-    "Password (recommended)": "Password (recommended)",
-    "Discussion": "Discussion",
-    "Toggle navigation": "Toggle navigation",
-    "%d seconds": [
-        "%d second (singular)",
-        "%d seconds (1st plural)",
-        "%d seconds (2nd plural)",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d minute (singular)",
-        "%d minutes (1st plural)",
-        "%d minutes (2nd plural)",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d hour (singular)",
-        "%d hours (1st plural)",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d day (singular)",
-        "%d days (1st plural)",
-        "%d days (2nd plural)",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d week (singular)",
-        "%d weeks (1st plural)",
-        "%d weeks (2nd plural)",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d month (singular)",
-        "%d months (1st plural)",
-        "%d months (2nd plural)",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%d year (singular)",
-        "%d years (1st plural)",
-        "%d years (2nd plural)",
-        "%d years (3rd plural)"
-    ],
-    "Never": "Never",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
-    "This document will expire in %d seconds.": [
-        "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds. (1st plural)",
-        "This document will expire in %d seconds. (2nd plural)",
-        "This document will expire in %d seconds. (3rd plural)"
-    ],
-    "This document will expire in %d minutes.": [
-        "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes. (1st plural)",
-        "This document will expire in %d minutes. (2nd plural)",
-        "This document will expire in %d minutes. (3rd plural)"
-    ],
-    "This document will expire in %d hours.": [
-        "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours. (1st plural)",
-        "This document will expire in %d hours. (2nd plural)",
-        "This document will expire in %d hours. (3rd plural)"
-    ],
-    "This document will expire in %d days.": [
-        "This document will expire in %d day. (singular)",
-        "This document will expire in %d days. (1st plural)",
-        "This document will expire in %d days. (2nd plural)",
-        "This document will expire in %d days. (3rd plural)"
-    ],
-    "This document will expire in %d months.": [
-        "This document will expire in %d month. (singular)",
-        "This document will expire in %d months. (1st plural)",
-        "This document will expire in %d months. (2nd plural)",
-        "This document will expire in %d months. (3rd plural)"
-    ],
-    "Please enter the password for this paste:": "Please enter the password for this paste:",
-    "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
-    "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?",
-    "Reply": "Reply",
-    "Anonymous": "Anonymous",
-    "Avatar generated from IP address": "Avatar generated from IP address",
-    "Add comment": "Add comment",
-    "Optional nickname…": "Optional nickname…",
-    "Post comment": "Post comment",
-    "Sending comment…": "Sending comment…",
-    "Comment posted.": "Comment posted.",
-    "Could not refresh display: %s": "Could not refresh display: %s",
-    "unknown status": "unknown status",
-    "server error or not responding": "server error or not responding",
-    "Could not post comment: %s": "Could not post comment: %s",
-    "Sending paste…": "Sending paste…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>",
-    "Delete data": "Delete data",
-    "Could not create paste: %s": "Could not create paste: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Plain Text",
-    "Source Code": "Source Code",
-    "Markdown": "Markdown",
-    "Download attachment": "Download attachment",
-    "Cloned: '%s'": "Cloned: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
-    "Attach a file": "Attach a file",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Remove attachment",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "Invalid attachment.",
-    "Options": "Options",
-    "Shorten URL": "Shorten URL",
-    "Editor": "Editor",
-    "Preview": "Preview",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Decrypt",
-    "Enter password": "Enter password",
-    "Loading…": "Loading…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
-    "QR code": "QR code",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
-    "waiting on user to provide a password": "waiting on user to provide a password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
-    "Retry": "Retry",
-    "Showing raw text…": "Showing raw text…",
-    "Notice:": "Notice:",
-    "This link will expire after %s.": "This link will expire after %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
-    "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
-    "Use Current Timezone": "Use Current Timezone",
-    "Convert To UTC": "Convert To UTC",
-    "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/hu.json

@@ -1,24 +1,18 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "A %s egy minimalista, nyílt forráskódú adattároló szoftver, ahol a szerver semmilyen információt nem tárol a feltett adatról. Azt ugyanis a %sböngésződ%s segítségével titkosítja és oldja fel 256 bit hosszú titkosítási kulcsú AES-t használva.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "További információt a <a href=\"https://privatebin.info/\">projekt oldalán</a> találsz.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "A %s egy minimalista, nyílt forráskódú adattároló szoftver, ahol a szerver semmilyen információt nem tárol a feltett adatról. Azt ugyanis a <i>böngésződ</i> segítségével titkosítja és oldja fel 256 bit hosszú titkosítási kulcsú AES-t használva. További információt a <a href=\"https://privatebin.info/\">projekt oldalán</a> találsz.",
     "Because ignorance is bliss": "A titok egyfajta hatalom.",
     "en": "hu",
     "Paste does not exist, has expired or has been deleted.": "A bejegyzés nem létezik, lejárt vagy törölve lett.",
     "%s requires php %s or above to work. Sorry.": "Bocs, de a %s működéséhez %s vagy ezt meghaladó verziójú php-s környezet szükséges.",
     "%s requires configuration section [%s] to be present in configuration file.": "A %s megfelelő működéséhez a konfigurációs fájlban a [%s] résznek léteznie kell.",
-    "Please wait %d seconds between each post.": [
-        "Kérlek várj %d másodpercet két beküldés között.",
-        "Kérlek várj %d másodpercet két beküldés között.",
-        "Kérlek várj %d másodpercet két beküldés között.",
-        "Kérlek várj %d másodpercet két beküldés között."
-    ],
+    "Please wait %d seconds between each post.": "Kérlek várj %d másodpercet két beküldés között.",
     "Paste is limited to %s of encrypted data.": "A bejegyzés maximális hossza: %s",
     "Invalid data.": "Érvénytelen adat.",
     "You are unlucky. Try again.": "Peched volt, próbáld újra.",
     "Error saving comment. Sorry.": "Nem sikerült menteni a hozzászólást. Bocs.",
     "Error saving paste. Sorry.": "Nem sikerült menteni a bejegyzést. Bocs.",
-    "Invalid paste ID.": "Érvénytelen bejegyzésazonosító.",
+    "Invalid paste ID.": "Érvénytelen bejegyzés azonosító.",
     "Paste is not of burn-after-reading type.": "A bejegyzés nem semmisül meg azonnal olvasás után.",
     "Wrong deletion token. Paste was not deleted.": "Hibás törlési azonosító. A bejegyzés nem lett törölve.",
     "Paste was properly deleted.": "A bejegyzés sikeresen törölve.",
@@ -79,42 +73,42 @@
     "Never": "Soha",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Megjegyzés: ez egy teszt szolgáltatás, az adatok bármikor törlődhetnek. Ha visszaélsz vele, kiscicák bánhatják! :)",
     "This document will expire in %d seconds.": [
+        "Ez a bejegyzés %d másodperc után megsemmisül.",
         "Ez a bejegyzés %d másodperc múlva megsemmisül.",
-        "Ez a bejegyzés %d másodperc múlva megsemmisül.",
-        "Ez a bejegyzés %d másodperc múlva megsemmisül.",
-        "Ez a bejegyzés %d másodperc múlva megsemmisül."
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
+        "Ez a bejegyzés %d perc után megsemmisül.",
         "Ez a bejegyzés %d perc múlva megsemmisül.",
-        "Ez a bejegyzés %d perc múlva megsemmisül.",
-        "Ez a bejegyzés %d perc múlva megsemmisül.",
-        "Ez a bejegyzés %d perc múlva megsemmisül."
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
+        "Ez a bejegyzés %d óra után megsemmisül.",
         "Ez a bejegyzés %d óra múlva megsemmisül.",
-        "Ez a bejegyzés %d óra múlva megsemmisül.",
-        "Ez a bejegyzés %d óra múlva megsemmisül.",
-        "Ez a bejegyzés %d óra múlva megsemmisül."
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
+        "Ez a bejegyzés %d nap után megsemmisül.",
         "Ez a bejegyzés %d nap múlva megsemmisül.",
-        "Ez a bejegyzés %d nap múlva megsemmisül.",
-        "Ez a bejegyzés %d nap múlva megsemmisül.",
-        "Ez a bejegyzés %d nap múlva megsemmisül."
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Ez a bejegyzés %d hónap múlva megsemmisül.",
         "Ez a bejegyzés %d hónap múlva megsemmisül.",
-        "Ez a bejegyzés %d hónap múlva megsemmisül.",
-        "Ez a bejegyzés %d hónap múlva megsemmisül."
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Add meg a szükséges jelszót a bejegyzés megtekintéséhez:",
-    "Could not decrypt data (Wrong key?)": "Nem tudtuk visszfejteni az adatot. Talán rossz kulcsot adtál meg?",
+    "Could not decrypt data (Wrong key?)": "Nem tudtuk dekódolni az adatot. Talán rossz kulcsot adtál meg?",
     "Could not delete the paste, it was not stored in burn after reading mode.": "Nem tudtuk törölni a bejegyzést, mivel az olvasás után egyből megsemmisült. Így nem is volt tárolva.",
     "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "EZT A BEJEGYZÉST CSAK TE LÁTHATOD!!! Ne csukd be ezt az ablakot, mivel nem tudod újra megnézni. Az ugyanis az első olvasás után rögtön megsemmisül.",
-    "Could not decrypt comment; Wrong key?": "Nem tudtuk visszafejteni a hozzászólást. Talán rossz kulcsot adtál meg?",
+    "Could not decrypt comment; Wrong key?": "Nem tudtuk dekódolni a hozzászólást. Talán rossz kulcsot adtál meg?",
     "Reply": "Válasz",
-    "Anonymous": "Névtelen",
+    "Anonymous": "Anonymous",
     "Avatar generated from IP address": "Avatar (az IP cím alapján generáljuk)",
     "Add comment": "Hozzászólok",
     "Optional nickname…": "Becenév (már ha meg akarod adni)",
@@ -129,7 +123,7 @@
     "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "A bejegyzésed a <a id=\"pasteurl\" href=\"%s\">%s</a> címen elérhető. <span id=\"copyhint\"> [Ctrl]+[c]-vel tudod vágólapra másolni.</span>",
     "Delete data": "Adat törlése",
     "Could not create paste: %s": "Nem tudtuk létrehozni a bejegyzést: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nem tudjuk visszafejteni a bejegyzést: a dekódoláshoz szükséges kulcs hiányzik a címből. Talán URL rövidítőt használtál ami kivágta azt belőle?",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nem tudjuk dekódolni a bejegyzést: a dekódoláshoz szükséges kulcs hiányzik a címből. Talán URL rövidítőt használtál ami kivágta azt belőle?",
     "B": "B",
     "KiB": "KiB",
     "MiB": "MiB",
@@ -157,37 +151,31 @@
     "Editor": "Szerkesztő felület",
     "Preview": "Előnézet",
     "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s számára szükséges, hogy a PATH itt végződjön: \"%s\". Kérlek frissítsd a PATH értékét az index.php fájlban.",
-    "Decrypt": "Visszafejtés",
+    "Decrypt": "Dekódolás",
     "Enter password": "Jelszó",
     "Loading…": "Folyamatban...",
-    "Decrypting paste…": "Bejegyzés visszafejtése...",
+    "Decrypting paste…": "Bejegyzés dekódolása...",
     "Preparing new paste…": "Új bejegyzés előkészítése...",
     "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Abban az esetben, ha ez az üzenet mindig látható lenne, látogass el a <a href=\"%s\">Gyakran Ismételt Kérdések szekcióba a megoldásához</a>.",
     "+++ no paste text +++": "+++ nincs beillesztett szöveg +++",
-    "Could not get paste data: %s": "Az adat megszerzése nem sikerült: %s",
-    "QR code": "QR kód",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Ez a weboldal nem biztonságos HTTP kapcsolatot használ! Emiatt csak teszt célokra ajánljuk.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "További információ <a href=\"%s\">ebben a GyIK bejegyzésben</a> található (angolul).",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "A WebCrypto API használatához a böngésződ számára esetleg HTTPS kapcsolat szükséges. Ezért próbálj meg <a href=\"%s\">HTTPS-re váltani</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "A böngésződ nem támogatja a WebAssemblyt, ami a zlib tömörítéshez kell. Létre tudsz hozni tömörítetlen dokumentumokat, de tömörítetteket nem tudsz olvasni.",
-    "waiting on user to provide a password": "Várakozás a felhasználóra jelszó megadása okán",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Nem lehetett visszafejteni az adatot. Rossz jelszót ütöttél be? Ismételd meg a fent található gombbal.",
-    "Retry": "Újrapróbálkozás",
-    "Showing raw text…": "Nyers szöveg mutatása…",
-    "Notice:": "Megjegyzés:",
-    "This link will expire after %s.": "Ez a hivatkozás %s múlva megsemmisül.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Ez a hivatkozás csak egyszeri alkalommal érhető el, ne használd a böngésződ \"Visszalépés\" vagy \"Újratöltés\" gombját.",
-    "Link:": "Hivatkozás:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "A címzett esetleg megtudhatja az időzónádat, átalakítsuk azt UTC-re?",
-    "Use Current Timezone": "Az aktuális időzóna használata",
-    "Convert To UTC": "Átalakítás UTC időzónára",
-    "Close": "Bezárás",
-    "Encrypted note on %s": "Titkosított jegyzet a %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Látogasd meg ezt a hivatkozást a bejegyzés megtekintéséhez. Ha mások számára is megadod ezt a linket, azzal hozzáférnek ők is.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Could not get paste data: %s": "Could not get paste data: %s",
+    "QR code": "QR code",
+    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
+    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
+    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
+    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
+    "waiting on user to provide a password": "waiting on user to provide a password",
+    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
+    "Retry": "Retry",
+    "Showing raw text…": "Showing raw text…",
+    "Notice:": "Notice:",
+    "This link will expire after %s.": "This link will expire after %s.",
+    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
+    "Link:": "Link:",
+    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
+    "Use Current Timezone": "Use Current Timezone",
+    "Convert To UTC": "Convert To UTC",
+    "Close": "Close",
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/id.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s adalah sebuah pastebin online sumber terbuka dan minimalis, dimana servernya tersebut tidak punya pengetahuan tentang data yang ditempelkan. Data tersebut di enkrip/dekrip %sdi dalam browser%s menggunakan metode enkrip AES 256 bit.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Infomasi lebih lanjut pada <a href=\"https://privatebin.info/\">halaman proyek</a>.",
-    "Because ignorance is bliss": "Karena ketidaktahuan adalah kebahagiaan, gitu loh",
-    "en": "id",
-    "Paste does not exist, has expired or has been deleted.": "Paste tidak ada, telah kedaluwarsa atau telah dihapus.",
-    "%s requires php %s or above to work. Sorry.": "%s memerlukan php %s atau versi diatasnya untuk dapat dijalankan. Maaf.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s membutuhkan bagian konfigurasi [%s] untuk ada di file konfigurasi.",
-    "Please wait %d seconds between each post.": [
-        "Silahkan menunggu %d detik antara masing-masing postingan.",
-        "Silahkan menunggu %d detik antara masing-masing postingan.",
-        "Silahkan menunggu %d detik antara masing-masing postingan.",
-        "Silahkan menunggu %d detik antara masing-masing postingan."
-    ],
-    "Paste is limited to %s of encrypted data.": "Paste dibatasi sampai %s dari data yang dienskripsi.",
-    "Invalid data.": "Data tidak valid.",
-    "You are unlucky. Try again.": "Anda belum beruntung. Coba kembali ya Kaka.",
-    "Error saving comment. Sorry.": "Terjadi kesalahan saat menyimpan komentar. Maaf ya Kaka.",
-    "Error saving paste. Sorry.": "Terjadi kesalahan saat menyimpan paste. Maaf ya Kaka.",
-    "Invalid paste ID.": "ID paste tidak valid.",
-    "Paste is not of burn-after-reading type.": "Paste bukan tipe hapus-setelah-membaca.",
-    "Wrong deletion token. Paste was not deleted.": "Token penghapusan salah. Paste belum terhapus.",
-    "Paste was properly deleted.": "Paste telah dihapus dengan benar.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript diperlukan agar %s bekerja. Maaf untuk ketidaknyamanannya.",
-    "%s requires a modern browser to work.": "%s memerlukan sebuah browser modern untuk bekerja.",
-    "New": "Baru",
-    "Send": "Kirim",
-    "Clone": "Klon",
-    "Raw text": "Teks mentah",
-    "Expires": "Kadaluarsa",
-    "Burn after reading": "Hapus setelah membaca",
-    "Open discussion": "Diskusi terbuka",
-    "Password (recommended)": "Kata Sandi (direkomendasikan)",
-    "Discussion": "Diskusi",
-    "Toggle navigation": "Alihkan navigasi",
-    "%d seconds": [
-        "%d detik",
-        "%d detik",
-        "%d detik",
-        "%d detik"
-    ],
-    "%d minutes": [
-        "%d menit",
-        "%d menit",
-        "%d menit",
-        "%d menit"
-    ],
-    "%d hours": [
-        "%d jam",
-        "%d jam",
-        "%d jam",
-        "%d jam"
-    ],
-    "%d days": [
-        "%d hari",
-        "%d hari",
-        "%d hari",
-        "%d hari"
-    ],
-    "%d weeks": [
-        "%d minggu",
-        "%d minggu",
-        "%d minggu",
-        "%d minggu"
-    ],
-    "%d months": [
-        "%d bulan",
-        "%d bulan",
-        "%d bulan",
-        "%d bulan"
-    ],
-    "%d years": [
-        "%d tahun",
-        "%d tahun",
-        "%d tahun",
-        "%d tahun"
-    ],
-    "Never": "Jangan pernah",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Catatan: Ini adalah layanan percobaan: Data mungkin bisa terhapus kapanpun juga. Anak-anak kucing akan mati jika Anda mengekploitasi layanan ini.",
-    "This document will expire in %d seconds.": [
-        "Dokumen ini kadaluarsa dalam %d detik.",
-        "Dokumen ini kadaluarsa dalam %d detik.",
-        "Dokumen ini kadaluarsa dalam %d detik.",
-        "Dokumen ini kadaluarsa dalam %d detik."
-    ],
-    "This document will expire in %d minutes.": [
-        "Dokumen ini akan kadaluarsa dalam %d menit.",
-        "Dokumen ini akan kadaluarsa dalam %d menit.",
-        "Dokumen ini akan kadaluarsa dalam %d menit.",
-        "Dokumen ini akan kadaluarsa dalam %d menit."
-    ],
-    "This document will expire in %d hours.": [
-        "Dokumen ini akan kadaluarsa dalam %d jam.",
-        "Dokumen ini akan kadaluarsa dalam %d jam.",
-        "Dokumen ini akan kadaluarsa dalam %d jam.",
-        "Dokumen ini akan kadaluarsa dalam %d jam."
-    ],
-    "This document will expire in %d days.": [
-        "Dokumen ini akan kadaluarsa dalam %d hari.",
-        "Dokumen ini akan kadaluarsa dalam %d hari.",
-        "Dokumen ini akan kadaluarsa dalam %d hari.",
-        "Dokumen ini akan kadaluarsa dalam %d hari."
-    ],
-    "This document will expire in %d months.": [
-        "Dokumen ini akan kadaluarsa dalam %d bulan.",
-        "Dokumen ini akan kadaluarsa dalam %d bulan.",
-        "Dokumen ini akan kadaluarsa dalam %d bulan.",
-        "Dokumen ini akan kadaluarsa dalam %d bulan."
-    ],
-    "Please enter the password for this paste:": "Silahkan masukkan kata sandi untuk paste ini:",
-    "Could not decrypt data (Wrong key?)": "Tidak dapat mendekrip data (Salah kunci?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Tidak dapat menghapus paste, ini dikarenakan data tidak tersimpan dalam mode hapus setelah membaca.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "HANYA UNTUK ANDA SAJA. Jangan tutup kolom jendela ini, pesan ini tidak akan dapat ditampilkan lagi.",
-    "Could not decrypt comment; Wrong key?": "Tidak dapat mendekrip komentar; Salah kunci?",
-    "Reply": "Balas",
-    "Anonymous": "Tanpa Nama",
-    "Avatar generated from IP address": "Avatar dihasilkan dari alamat IP",
-    "Add comment": "Tambah komentar",
-    "Optional nickname…": "Nama julukan tambahan…",
-    "Post comment": "Posting komentar",
-    "Sending comment…": "Mengirim komentar…",
-    "Comment posted.": "Komentar telah diposting.",
-    "Could not refresh display: %s": "Tidak dapat menyegarkan tampilan: %s",
-    "unknown status": "status tidak diketahui",
-    "server error or not responding": "kesalahan server atau server tidak merespon",
-    "Could not post comment: %s": "Tidak dapat memposting komentar: %s",
-    "Sending paste…": "Mengirim paste…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Paste Anda adalah <a id=\"pasteurl\" href=\"%s\">%s</a><span id=\"copyhint\">(Tekan [Ctrl]+[c] untuk menyalin)</span>",
-    "Delete data": "Hapus data",
-    "Could not create paste: %s": "Tidak dapat membuat paste: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Tidak dapat mendekripsi paste: Kunci dekripsi tidak ada di URL (Apakah Anda menggunakan redirector atau penyingkat URL yang menghapus bagian dari URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Teks Biasa",
-    "Source Code": "Kode Sumber",
-    "Markdown": "Markdown",
-    "Download attachment": "Unduh lampiran",
-    "Cloned: '%s'": "Diklon: '%s'",
-    "The cloned file '%s' was attached to this paste.": "Berkas yang di-klon '%s' telah dilampirkan pada paste ini.",
-    "Attach a file": "Lampirkan sebuah berkas",
-    "alternatively drag & drop a file or paste an image from the clipboard": "sebagai alternatif, seret & jatuhkan berkas atau tempel sebuah gambar dari papan klip",
-    "File too large, to display a preview. Please download the attachment.": "File terlalu besar untuk menampilkan pratinjau. Silakan unduh lampirannya.",
-    "Remove attachment": "Hapus lampiran",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Browser Anda tidak mendukung pengunggahan file terenkripsi. Harap gunakan browser yang lebih baru.",
-    "Invalid attachment.": "Lampiran tidak valid.",
-    "Options": "Pilihan",
-    "Shorten URL": "Pendekkan alamat URL",
-    "Editor": "Penyunting",
-    "Preview": "Pratinjau",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s memerlukan PATH berakhir dalam sebuah \"%s\". Silahkan perbarui PATH dalam index.php Anda.",
-    "Decrypt": "Dekrip",
-    "Enter password": "Masukkan kata sandi",
-    "Loading…": "Memuat…",
-    "Decrypting paste…": "Men-dekrip paste…",
-    "Preparing new paste…": "Menyiapkan paste baru…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Jika pesan ini tidak pernah menghilang, silahkan kunjungi dan lihat pada <a href=\"%s\">FAQ ini untuk informasi bagaimana menyelesaikan masalah tersebut</a>.",
-    "+++ no paste text +++": "+++ tidak ada teks paste +++",
-    "Could not get paste data: %s": "Tidak dapat mengambil/menampilkan data paste: %s",
-    "QR code": "Kode QR",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Situs web ini menggunakan koneksi HTTP yang tidak aman! Silahkan gunakan hanya untuk pengujian.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Untuk informasi lebih lanjut, <a href=\"%s\"> lihat entri FAQ ini </a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Browser Anda mungkin memerlukan koneksi HTTPS untuk mendukung API Webcrypto. Coba <a href=\"%s\"> beralih ke HTTPS </a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Browser Anda tidak mendukung Webassembly, yang digunakan untuk kompresi zlib. Anda dapat membuat dokumen yang tidak terkompresi, tetapi tidak akan dapat membaca berkas yang terkompresi.",
-    "waiting on user to provide a password": "menunggu pengguna untuk menyediakan kata sandi",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Tidak dapat mendekrip data. Apakah Anda memasukkan kata sandi yang salah? Silahkan coba lagi dengan tombol di bagian atas.",
-    "Retry": "Coba lagi",
-    "Showing raw text…": "Menampilkan teks mentah…",
-    "Notice:": "Pengumuman:",
-    "This link will expire after %s.": "Tautan ini akan kadaluarsa setelah %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Tautan ini hanya dapat diakses satu kali, jangan gunakan tombol Kembali atau tombol Segarkan di browser Anda.",
-    "Link:": "Tautan:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Penerima dapat mengetahui zona waktu Anda, ubah waktu menjadi UTC?",
-    "Use Current Timezone": "Gunakan Zonawaktu Saat Ini",
-    "Convert To UTC": "Konversi Ke UTC",
-    "Close": "Tutup",
-    "Encrypted note on %s": "Catatan ter-ekrip di %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Kunjungi tautan ini untuk melihat catatan. Memberikan alamat URL pada siapapun juga, akan mengizinkan mereka untuk mengakses catatan, so pasti gitu loh Kaka.",
-    "URL shortener may expose your decrypt key in URL.": "Pemendek URL mungkin akan menampakkan kunci dekrip Anda dalam URL.",
-    "Save paste": "Simpan paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/it.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s è un sistema di tipo \"Pastebin\" online, open source, minimalista. Il server non possiede alcuna conoscenza (\"Zero Knowledge\") del contenuto dei dati inviati. I dati sono cifrati/decifrati %snel Browser%s con algoritmo AES a 256 Bit.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Per ulteriori informazioni, vedi <a href=\"https://privatebin.info/\">Sito del progetto</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s è un sistema di tipo \"Pastebin\" online, open source, minimalista. Il server non possiede alcuna conoscenza (\"Zero Knowledge\") del contenuto dei dati inviati. I dati sono cifrati/decifrati <i>nel Browser</i> con algoritmo AES a 256 Bit. Per ulteriori informazioni, vedi <a href=\"https://privatebin.info/\">Sito del progetto</a>.",
     "Because ignorance is bliss": "Perché l'ignoranza è una benedizione (Because ignorance is bliss)",
     "en": "it",
     "Paste does not exist, has expired or has been deleted.": "Questo messaggio non esiste, è scaduto o è stato cancellato.",
     "%s requires php %s or above to work. Sorry.": "%s richiede php %s o superiore per funzionare. Ci spiace.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s richiede la presenza della sezione [%s] nei file di configurazione.",
-    "Please wait %d seconds between each post.": [
-        "Attendi per favore un secondo prima di ciascun invio.",
-        "Attendi per favore %d secondi prima di ciascun invio.",
-        "Attendi per favore %d secondi prima di ciascun invio.",
-        "Attendi per favore %d secondi prima di ciascun invio."
-    ],
+    "Please wait %d seconds between each post.": "Attendi per favore %d secondi prima di ciascun invio.",
     "Paste is limited to %s of encrypted data.": "La dimensione del messaggio è limitata a %s di dati cifrati.",
     "Invalid data.": "Dati non validi.",
     "You are unlucky. Try again.": "Ritenta, sarai più fortunato.",
@@ -81,41 +75,41 @@
     "This document will expire in %d seconds.": [
         "Questo documento scadrà tra un secondo.",
         "Questo documento scadrà in %d secondi.",
-        "Questo documento scadrà in %d secondi.",
-        "Questo documento scadrà in %d secondi."
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Questo documento scadrà tra un minuto.",
         "Questo documento scadrà in %d minuti.",
-        "Questo documento scadrà in %d minuti.",
-        "Questo documento scadrà in %d minuti."
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Questo documento scadrà tra un'ora.",
         "Questo documento scadrà in %d ore.",
-        "Questo documento scadrà in %d ore.",
-        "Questo documento scadrà in %d ore."
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Questo documento scadrà tra un giorno.",
         "Questo documento scadrà in %d giorni.",
-        "Questo documento scadrà in %d giorni.",
-        "Questo documento scadrà in %d giorni."
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Questo documento scadrà tra un mese.",
         "Questo documento scadrà in %d mesi.",
-        "Questo documento scadrà in %d mesi.",
-        "Questo documento scadrà in %d mesi."
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Inserisci la password per questo messaggio:",
-    "Could not decrypt data (Wrong key?)": "Non riesco a decifrare i dati (chiave sbagliata?)",
+    "Could not decrypt data (Wrong key?)": "Non riesco a decifrari i dati (Chiave errata?)",
     "Could not delete the paste, it was not stored in burn after reading mode.": "Non riesco a cancellare il messaggio, non è stato salvato in modalità Distruggi-dopo-lettora.",
     "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Non chiudere questa finestra, il messaggio non può essere visualizzato una seconda volta.",
-    "Could not decrypt comment; Wrong key?": "Non riesco a decifrare il commento (Chiave sbagliata?)",
+    "Could not decrypt comment; Wrong key?": "Non riesco a decifrare il commento (Chiave errata?)",
     "Reply": "Rispondi",
     "Anonymous": "Anonimo",
-    "Avatar generated from IP address": "Avatar generato dall'indirizzo IP",
+    "Avatar generated from IP address": "Avatar generato dall'indirizzo IP)",
     "Add comment": "Aggiungi un commento",
     "Optional nickname…": "Nickname opzionale…",
     "Post comment": "Invia commento",
@@ -147,15 +141,15 @@
     "Cloned: '%s'": "Clonato: '%s'",
     "The cloned file '%s' was attached to this paste.": "Il file clonato '%s' era allegato a questo messaggio.",
     "Attach a file": "Allega un file",
-    "alternatively drag & drop a file or paste an image from the clipboard": "in alternativa trascina e rilascia un file o incolla un'immagine dagli appunti",
-    "File too large, to display a preview. Please download the attachment.": "File troppo grande, per visualizzare un'anteprima. Sei pregato di scaricare l'allegato.",
+    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
+    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
     "Remove attachment": "Rimuovi allegato",
     "Your browser does not support uploading encrypted files. Please use a newer browser.": "Il tuo browser non supporta l'invio di file cifrati. Utilizza un browser più recente.",
     "Invalid attachment.": "Allegato non valido.",
     "Options": "Opzioni",
     "Shorten URL": "Accorcia URL",
     "Editor": "Editor",
-    "Preview": "Anteprima",
+    "Preview": "Preview",
     "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s necessita che PATH termini con \"%s\". Aggiorna la variabile PATH nel tuo index.php.",
     "Decrypt": "Decifra",
     "Enter password": "Inserisci la password",
@@ -164,30 +158,24 @@
     "Preparing new paste…": "Preparo il nuovo messaggio…",
     "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Nel caso questo messaggio non scompaia, controlla questa <a href=\"%s\">FAQ</a> per trovare informazioni su come risolvere il problema (in Inglese).",
     "+++ no paste text +++": "+++ nessun testo nel messaggio +++",
-    "Could not get paste data: %s": "Impossibile ottenere i dati di incolla: %s",
+    "Could not get paste data: %s": "Could not get paste data: %s",
     "QR code": "QR code",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Questo sito web sta usando una connessione HTTP non sicura! Si prega di usarlo solo per il test.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Per ulteriori informazioni <a href=\"%s\">vedi questa voce della FAQ</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Il tuo browser potrebbe richiedere una connessione HTTPS per supportare l'API WebCrypto. Prova <a href=\"%s\">a passare a HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Il tuo browser non supporta WebAssembly, utilizzato per la compressione di zlib. Puoi creare documenti non compressi, ma non è possibile leggere quelli compressi.",
-    "waiting on user to provide a password": "in attesa sull'utente di fornire una password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Impossibile decrittografare i dati. Hai inserito una password errata? Riprova con il pulsante in alto.",
-    "Retry": "Riprova",
-    "Showing raw text…": "Mostrando il testo grezzo…",
-    "Notice:": "Avviso:",
-    "This link will expire after %s.": "Questo collegamento scadrà dopo %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Questo collegamento è accessibile una sola volta, non usare il pulsante indietro o aggiorna nel tuo browser.",
+    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
+    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
+    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
+    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
+    "waiting on user to provide a password": "waiting on user to provide a password",
+    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
+    "Retry": "Retry",
+    "Showing raw text…": "Showing raw text…",
+    "Notice:": "Notice:",
+    "This link will expire after %s.": "This link will expire after %s.",
+    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
     "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Il destinatario può essere a conoscenza del tuo fuso orario, convertire l'orario in UTC?",
-    "Use Current Timezone": "Usa Fuso Orario Corrente",
-    "Convert To UTC": "Converti a UTC",
-    "Close": "Chiudi",
-    "Encrypted note on %s": "Nota crittografata su %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visita questo collegamento per vedere la nota. Dare l'URL a chiunque consente anche a loro di accedere alla nota.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener può esporre la tua chiave decrittografata nell'URL.",
-    "Save paste": "Salva il messagio",
-    "Your IP is not authorized to create pastes.": "Il tuo IP non è autorizzato a creare dei messaggi.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
+    "Use Current Timezone": "Use Current Timezone",
+    "Convert To UTC": "Convert To UTC",
+    "Close": "Close",
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/ja.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "More information on the <a href=\"https://privatebin.info/\">project page</a>.",
-    "Because ignorance is bliss": "Because ignorance is bliss",
-    "en": "ja",
-    "Paste does not exist, has expired or has been deleted.": "Paste does not exist, has expired or has been deleted.",
-    "%s requires php %s or above to work. Sorry.": "%s requires php %s or above to work. Sorry.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.",
-    "Please wait %d seconds between each post.": [
-        "Please wait %d second between each post. (singular)",
-        "Please wait %d seconds between each post. (1st plural)",
-        "Please wait %d seconds between each post. (2nd plural)",
-        "Please wait %d seconds between each post. (3rd plural)"
-    ],
-    "Paste is limited to %s of encrypted data.": "Paste is limited to %s of encrypted data.",
-    "Invalid data.": "Invalid data.",
-    "You are unlucky. Try again.": "You are unlucky. Try again.",
-    "Error saving comment. Sorry.": "Error saving comment. Sorry.",
-    "Error saving paste. Sorry.": "Error saving paste. Sorry.",
-    "Invalid paste ID.": "Invalid paste ID.",
-    "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.",
-    "Wrong deletion token. Paste was not deleted.": "Wrong deletion token. Paste was not deleted.",
-    "Paste was properly deleted.": "Paste was properly deleted.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.",
-    "%s requires a modern browser to work.": "%s requires a modern browser to work.",
-    "New": "New",
-    "Send": "Send",
-    "Clone": "Clone",
-    "Raw text": "Raw text",
-    "Expires": "Expires",
-    "Burn after reading": "Burn after reading",
-    "Open discussion": "Open discussion",
-    "Password (recommended)": "Password (recommended)",
-    "Discussion": "Discussion",
-    "Toggle navigation": "Toggle navigation",
-    "%d seconds": [
-        "%d second (singular)",
-        "%d seconds (1st plural)",
-        "%d seconds (2nd plural)",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d minute (singular)",
-        "%d minutes (1st plural)",
-        "%d minutes (2nd plural)",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d hour (singular)",
-        "%d hours (1st plural)",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d day (singular)",
-        "%d days (1st plural)",
-        "%d days (2nd plural)",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d week (singular)",
-        "%d weeks (1st plural)",
-        "%d weeks (2nd plural)",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d month (singular)",
-        "%d months (1st plural)",
-        "%d months (2nd plural)",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%d year (singular)",
-        "%d years (1st plural)",
-        "%d years (2nd plural)",
-        "%d years (3rd plural)"
-    ],
-    "Never": "Never",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
-    "This document will expire in %d seconds.": [
-        "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds. (1st plural)",
-        "This document will expire in %d seconds. (2nd plural)",
-        "This document will expire in %d seconds. (3rd plural)"
-    ],
-    "This document will expire in %d minutes.": [
-        "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes. (1st plural)",
-        "This document will expire in %d minutes. (2nd plural)",
-        "This document will expire in %d minutes. (3rd plural)"
-    ],
-    "This document will expire in %d hours.": [
-        "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours. (1st plural)",
-        "This document will expire in %d hours. (2nd plural)",
-        "This document will expire in %d hours. (3rd plural)"
-    ],
-    "This document will expire in %d days.": [
-        "This document will expire in %d day. (singular)",
-        "This document will expire in %d days. (1st plural)",
-        "This document will expire in %d days. (2nd plural)",
-        "This document will expire in %d days. (3rd plural)"
-    ],
-    "This document will expire in %d months.": [
-        "This document will expire in %d month. (singular)",
-        "This document will expire in %d months. (1st plural)",
-        "This document will expire in %d months. (2nd plural)",
-        "This document will expire in %d months. (3rd plural)"
-    ],
-    "Please enter the password for this paste:": "Please enter the password for this paste:",
-    "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
-    "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?",
-    "Reply": "Reply",
-    "Anonymous": "Anonymous",
-    "Avatar generated from IP address": "Avatar generated from IP address",
-    "Add comment": "Add comment",
-    "Optional nickname…": "Optional nickname…",
-    "Post comment": "Post comment",
-    "Sending comment…": "Sending comment…",
-    "Comment posted.": "Comment posted.",
-    "Could not refresh display: %s": "Could not refresh display: %s",
-    "unknown status": "unknown status",
-    "server error or not responding": "server error or not responding",
-    "Could not post comment: %s": "Could not post comment: %s",
-    "Sending paste…": "Sending paste…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>",
-    "Delete data": "Delete data",
-    "Could not create paste: %s": "Could not create paste: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Plain Text",
-    "Source Code": "Source Code",
-    "Markdown": "Markdown",
-    "Download attachment": "Download attachment",
-    "Cloned: '%s'": "Cloned: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
-    "Attach a file": "Attach a file",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Remove attachment",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "Invalid attachment.",
-    "Options": "Options",
-    "Shorten URL": "Shorten URL",
-    "Editor": "Editor",
-    "Preview": "Preview",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Decrypt",
-    "Enter password": "Enter password",
-    "Loading…": "Loading…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
-    "QR code": "QR code",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
-    "waiting on user to provide a password": "waiting on user to provide a password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
-    "Retry": "Retry",
-    "Showing raw text…": "Showing raw text…",
-    "Notice:": "Notice:",
-    "This link will expire after %s.": "This link will expire after %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
-    "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
-    "Use Current Timezone": "Use Current Timezone",
-    "Convert To UTC": "Convert To UTC",
-    "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/jbo.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "sivlolnitvanku'a",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": ".i la %s mupli lo sorcu lo'e se setca kibro .i ji'a zo'e se zancari gi'e fingubni .i lo samse'u na djuno lo datni selru'e cu .i ba'e %sle brauzero%s ku mipri le do datni ku fi la'oi AES poi bitni li 256",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "More information on the <a href=\"https://privatebin.info/\">project page</a>.",
-    "Because ignorance is bliss": ".i ki'u le ka na djuno cu ka saxfri",
-    "en": "jbo",
-    "Paste does not exist, has expired or has been deleted.": "Paste does not exist, has expired or has been deleted.",
-    "%s requires php %s or above to work. Sorry.": "%s requires php %s or above to work. Sorry.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.",
-    "Please wait %d seconds between each post.": [
-        "Please wait %d second between each post. (singular)",
-        "Please wait %d seconds between each post. (1st plural)",
-        "Please wait %d seconds between each post. (2nd plural)",
-        "Please wait %d seconds between each post. (3rd plural)"
-    ],
-    "Paste is limited to %s of encrypted data.": "Paste is limited to %s of encrypted data.",
-    "Invalid data.": ".i le selru'e cu na drani",
-    "You are unlucky. Try again.": "You are unlucky. Try again.",
-    "Error saving comment. Sorry.": "Error saving comment. Sorry.",
-    "Error saving paste. Sorry.": "Error saving paste. Sorry.",
-    "Invalid paste ID.": "Invalid paste ID.",
-    "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.",
-    "Wrong deletion token. Paste was not deleted.": "Wrong deletion token. Paste was not deleted.",
-    "Paste was properly deleted.": "Paste was properly deleted.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.",
-    "%s requires a modern browser to work.": "%s requires a modern browser to work.",
-    "New": "cnino",
-    "Send": "benji",
-    "Clone": "fukpi",
-    "Raw text": "vlapoi nalselrucyzu'e",
-    "Expires": "vimcu",
-    "Burn after reading": "vimcu ba la tcidu",
-    "Open discussion": "lo zbasu cu casnu",
-    "Password (recommended)": "japyvla (nelti'i)",
-    "Discussion": "casnu",
-    "Toggle navigation": "Toggle navigation",
-    "%d seconds": [
-        "%d second (singular)",
-        "%d seconds (1st plural)",
-        "%d seconds (2nd plural)",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d minute (singular)",
-        "%d minutes (1st plural)",
-        "%d minutes (2nd plural)",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d hour (singular)",
-        "%d hours (1st plural)",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d day (singular)",
-        "%d days (1st plural)",
-        "%d days (2nd plural)",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d week (singular)",
-        "%d weeks (1st plural)",
-        "%d weeks (2nd plural)",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d month (singular)",
-        "%d months (1st plural)",
-        "%d months (2nd plural)",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%d year (singular)",
-        "%d years (1st plural)",
-        "%d years (2nd plural)",
-        "%d years (3rd plural)"
-    ],
-    "Never": "Never",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
-    "This document will expire in %d seconds.": [
-        "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds. (1st plural)",
-        "This document will expire in %d seconds. (2nd plural)",
-        "This document will expire in %d seconds. (3rd plural)"
-    ],
-    "This document will expire in %d minutes.": [
-        "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes. (1st plural)",
-        "This document will expire in %d minutes. (2nd plural)",
-        "This document will expire in %d minutes. (3rd plural)"
-    ],
-    "This document will expire in %d hours.": [
-        "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours. (1st plural)",
-        "This document will expire in %d hours. (2nd plural)",
-        "This document will expire in %d hours. (3rd plural)"
-    ],
-    "This document will expire in %d days.": [
-        "This document will expire in %d day. (singular)",
-        "This document will expire in %d days. (1st plural)",
-        "This document will expire in %d days. (2nd plural)",
-        "This document will expire in %d days. (3rd plural)"
-    ],
-    "This document will expire in %d months.": [
-        "This document will expire in %d month. (singular)",
-        "This document will expire in %d months. (1st plural)",
-        "This document will expire in %d months. (2nd plural)",
-        "This document will expire in %d months. (3rd plural)"
-    ],
-    "Please enter the password for this paste:": "Please enter the password for this paste:",
-    "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
-    "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?",
-    "Reply": "Reply",
-    "Anonymous": "Anonymous",
-    "Avatar generated from IP address": "Avatar generated from IP address",
-    "Add comment": "Add comment",
-    "Optional nickname…": "Optional nickname…",
-    "Post comment": "Post comment",
-    "Sending comment…": "Sending comment…",
-    "Comment posted.": "Comment posted.",
-    "Could not refresh display: %s": "Could not refresh display: %s",
-    "unknown status": "unknown status",
-    "server error or not responding": "server error or not responding",
-    "Could not post comment: %s": "Could not post comment: %s",
-    "Sending paste…": "Sending paste…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>",
-    "Delete data": "Delete data",
-    "Could not create paste: %s": "Could not create paste: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Plain Text",
-    "Source Code": "Source Code",
-    "Markdown": "Markdown",
-    "Download attachment": "Download attachment",
-    "Cloned: '%s'": "Cloned: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
-    "Attach a file": "Attach a file",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Remove attachment",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "Invalid attachment.",
-    "Options": "Options",
-    "Shorten URL": "Shorten URL",
-    "Editor": "Editor",
-    "Preview": "Preview",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Decrypt",
-    "Enter password": "Enter password",
-    "Loading…": "Loading…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
-    "QR code": "ky.bu ry termifra",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
-    "waiting on user to provide a password": "waiting on user to provide a password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
-    "Retry": "refcfa",
-    "Showing raw text…": "Showing raw text…",
-    "Notice:": "Notice:",
-    "This link will expire after %s.": "This link will expire after %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
-    "Link:": "urli:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
-    "Use Current Timezone": "Use Current Timezone",
-    "Convert To UTC": "galfi lo cabni la utc",
-    "Close": "ganlo",
-    "Encrypted note on %s": ".i lo lo notci ku mifra cu zvati %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "rejgau fukpi",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/ku.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "More information on the <a href=\"https://privatebin.info/\">project page</a>.",
-    "Because ignorance is bliss": "Because ignorance is bliss",
-    "en": "ku",
-    "Paste does not exist, has expired or has been deleted.": "Paste does not exist, has expired or has been deleted.",
-    "%s requires php %s or above to work. Sorry.": "%s requires php %s or above to work. Sorry.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.",
-    "Please wait %d seconds between each post.": [
-        "Please wait %d second between each post. (singular)",
-        "Please wait %d seconds between each post. (1st plural)",
-        "Please wait %d seconds between each post. (2nd plural)",
-        "Please wait %d seconds between each post. (3rd plural)"
-    ],
-    "Paste is limited to %s of encrypted data.": "Paste is limited to %s of encrypted data.",
-    "Invalid data.": "Invalid data.",
-    "You are unlucky. Try again.": "You are unlucky. Try again.",
-    "Error saving comment. Sorry.": "Error saving comment. Sorry.",
-    "Error saving paste. Sorry.": "Error saving paste. Sorry.",
-    "Invalid paste ID.": "Invalid paste ID.",
-    "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.",
-    "Wrong deletion token. Paste was not deleted.": "Wrong deletion token. Paste was not deleted.",
-    "Paste was properly deleted.": "Paste was properly deleted.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.",
-    "%s requires a modern browser to work.": "%s requires a modern browser to work.",
-    "New": "New",
-    "Send": "Send",
-    "Clone": "Clone",
-    "Raw text": "Raw text",
-    "Expires": "Expires",
-    "Burn after reading": "Burn after reading",
-    "Open discussion": "Open discussion",
-    "Password (recommended)": "Password (recommended)",
-    "Discussion": "Discussion",
-    "Toggle navigation": "Toggle navigation",
-    "%d seconds": [
-        "%d second (singular)",
-        "%d seconds (1st plural)",
-        "%d seconds (2nd plural)",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d minute (singular)",
-        "%d minutes (1st plural)",
-        "%d minutes (2nd plural)",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d hour (singular)",
-        "%d hours (1st plural)",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d day (singular)",
-        "%d days (1st plural)",
-        "%d days (2nd plural)",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d week (singular)",
-        "%d weeks (1st plural)",
-        "%d weeks (2nd plural)",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d month (singular)",
-        "%d months (1st plural)",
-        "%d months (2nd plural)",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%d year (singular)",
-        "%d years (1st plural)",
-        "%d years (2nd plural)",
-        "%d years (3rd plural)"
-    ],
-    "Never": "Never",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
-    "This document will expire in %d seconds.": [
-        "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds. (1st plural)",
-        "This document will expire in %d seconds. (2nd plural)",
-        "This document will expire in %d seconds. (3rd plural)"
-    ],
-    "This document will expire in %d minutes.": [
-        "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes. (1st plural)",
-        "This document will expire in %d minutes. (2nd plural)",
-        "This document will expire in %d minutes. (3rd plural)"
-    ],
-    "This document will expire in %d hours.": [
-        "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours. (1st plural)",
-        "This document will expire in %d hours. (2nd plural)",
-        "This document will expire in %d hours. (3rd plural)"
-    ],
-    "This document will expire in %d days.": [
-        "This document will expire in %d day. (singular)",
-        "This document will expire in %d days. (1st plural)",
-        "This document will expire in %d days. (2nd plural)",
-        "This document will expire in %d days. (3rd plural)"
-    ],
-    "This document will expire in %d months.": [
-        "This document will expire in %d month. (singular)",
-        "This document will expire in %d months. (1st plural)",
-        "This document will expire in %d months. (2nd plural)",
-        "This document will expire in %d months. (3rd plural)"
-    ],
-    "Please enter the password for this paste:": "Please enter the password for this paste:",
-    "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
-    "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?",
-    "Reply": "Reply",
-    "Anonymous": "Anonymous",
-    "Avatar generated from IP address": "Avatar generated from IP address",
-    "Add comment": "Add comment",
-    "Optional nickname…": "Optional nickname…",
-    "Post comment": "Post comment",
-    "Sending comment…": "Sending comment…",
-    "Comment posted.": "Comment posted.",
-    "Could not refresh display: %s": "Could not refresh display: %s",
-    "unknown status": "unknown status",
-    "server error or not responding": "server error or not responding",
-    "Could not post comment: %s": "Could not post comment: %s",
-    "Sending paste…": "Sending paste…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>",
-    "Delete data": "Delete data",
-    "Could not create paste: %s": "Could not create paste: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Plain Text",
-    "Source Code": "Source Code",
-    "Markdown": "Markdown",
-    "Download attachment": "Download attachment",
-    "Cloned: '%s'": "Cloned: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
-    "Attach a file": "Attach a file",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Remove attachment",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "Invalid attachment.",
-    "Options": "Options",
-    "Shorten URL": "Shorten URL",
-    "Editor": "Editor",
-    "Preview": "Preview",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Decrypt",
-    "Enter password": "Enter password",
-    "Loading…": "Loading…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
-    "QR code": "QR code",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
-    "waiting on user to provide a password": "waiting on user to provide a password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
-    "Retry": "Retry",
-    "Showing raw text…": "Showing raw text…",
-    "Notice:": "Notice:",
-    "This link will expire after %s.": "This link will expire after %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
-    "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
-    "Use Current Timezone": "Use Current Timezone",
-    "Convert To UTC": "Convert To UTC",
-    "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/la.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivatumVinariam",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "More information on the <a href=\"https://privatebin.info/\">project page</a>.",
-    "Because ignorance is bliss": "Because ignorance is bliss",
-    "en": "la",
-    "Paste does not exist, has expired or has been deleted.": "Paste does not exist, has expired or has been deleted.",
-    "%s requires php %s or above to work. Sorry.": "%s requires php %s or above to work. Sorry.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.",
-    "Please wait %d seconds between each post.": [
-        "Please wait %d second between each post. (singular)",
-        "Please wait %d seconds between each post. (1st plural)",
-        "Please wait %d seconds between each post. (2nd plural)",
-        "Please wait %d seconds between each post. (3rd plural)"
-    ],
-    "Paste is limited to %s of encrypted data.": "Paste is limited to %s of encrypted data.",
-    "Invalid data.": "Invalid data.",
-    "You are unlucky. Try again.": "You are unlucky. Try again.",
-    "Error saving comment. Sorry.": "Error saving comment. Sorry.",
-    "Error saving paste. Sorry.": "Error saving paste. Sorry.",
-    "Invalid paste ID.": "Invalid paste ID.",
-    "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.",
-    "Wrong deletion token. Paste was not deleted.": "Wrong deletion token. Paste was not deleted.",
-    "Paste was properly deleted.": "Paste was properly deleted.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.",
-    "%s requires a modern browser to work.": "%s requires a modern browser to work.",
-    "New": "New",
-    "Send": "Send",
-    "Clone": "Clone",
-    "Raw text": "Raw text",
-    "Expires": "Expires",
-    "Burn after reading": "Burn after reading",
-    "Open discussion": "Open discussion",
-    "Password (recommended)": "Password (recommended)",
-    "Discussion": "Discussion",
-    "Toggle navigation": "Toggle navigation",
-    "%d seconds": [
-        "%d second (singular)",
-        "%d seconds (1st plural)",
-        "%d seconds (2nd plural)",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d minute (singular)",
-        "%d minutes (1st plural)",
-        "%d minutes (2nd plural)",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d hour (singular)",
-        "%d hours (1st plural)",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d day (singular)",
-        "%d days (1st plural)",
-        "%d days (2nd plural)",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d week (singular)",
-        "%d weeks (1st plural)",
-        "%d weeks (2nd plural)",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d month (singular)",
-        "%d months (1st plural)",
-        "%d months (2nd plural)",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%d year (singular)",
-        "%d years (1st plural)",
-        "%d years (2nd plural)",
-        "%d years (3rd plural)"
-    ],
-    "Never": "Never",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
-    "This document will expire in %d seconds.": [
-        "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds. (1st plural)",
-        "This document will expire in %d seconds. (2nd plural)",
-        "This document will expire in %d seconds. (3rd plural)"
-    ],
-    "This document will expire in %d minutes.": [
-        "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes. (1st plural)",
-        "This document will expire in %d minutes. (2nd plural)",
-        "This document will expire in %d minutes. (3rd plural)"
-    ],
-    "This document will expire in %d hours.": [
-        "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours. (1st plural)",
-        "This document will expire in %d hours. (2nd plural)",
-        "This document will expire in %d hours. (3rd plural)"
-    ],
-    "This document will expire in %d days.": [
-        "This document will expire in %d day. (singular)",
-        "This document will expire in %d days. (1st plural)",
-        "This document will expire in %d days. (2nd plural)",
-        "This document will expire in %d days. (3rd plural)"
-    ],
-    "This document will expire in %d months.": [
-        "This document will expire in %d month. (singular)",
-        "This document will expire in %d months. (1st plural)",
-        "This document will expire in %d months. (2nd plural)",
-        "This document will expire in %d months. (3rd plural)"
-    ],
-    "Please enter the password for this paste:": "Please enter the password for this paste:",
-    "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
-    "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?",
-    "Reply": "Reply",
-    "Anonymous": "Anonymous",
-    "Avatar generated from IP address": "Avatar generated from IP address",
-    "Add comment": "Add comment",
-    "Optional nickname…": "Optional nickname…",
-    "Post comment": "Post comment",
-    "Sending comment…": "Sending comment…",
-    "Comment posted.": "Comment posted.",
-    "Could not refresh display: %s": "Could not refresh display: %s",
-    "unknown status": "unknown status",
-    "server error or not responding": "server error or not responding",
-    "Could not post comment: %s": "Could not post comment: %s",
-    "Sending paste…": "Sending paste…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>",
-    "Delete data": "Delete data",
-    "Could not create paste: %s": "Could not create paste: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Plain Text",
-    "Source Code": "Source Code",
-    "Markdown": "Markdown",
-    "Download attachment": "Download attachment",
-    "Cloned: '%s'": "Cloned: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
-    "Attach a file": "Attach a file",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Remove attachment",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "Invalid attachment.",
-    "Options": "Options",
-    "Shorten URL": "Shorten URL",
-    "Editor": "Editor",
-    "Preview": "Preview",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Decrypt",
-    "Enter password": "Enter password",
-    "Loading…": "Loading…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
-    "QR code": "QR code",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
-    "waiting on user to provide a password": "waiting on user to provide a password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
-    "Retry": "Retry",
-    "Showing raw text…": "Showing raw text…",
-    "Notice:": "Notice:",
-    "This link will expire after %s.": "This link will expire after %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
-    "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
-    "Use Current Timezone": "Use Current Timezone",
-    "Convert To UTC": "Convert To UTC",
-    "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/languages.json

@@ -63,7 +63,6 @@
     "ho": ["Hiri Motu", "Hiri Motu"],
     "hu": ["magyar", "Hungarian"],
     "ia": ["Interlingua", "Interlingua"],
-    "id": ["bahasa Indonesia","Indonesian"],
     "ie": ["Interlingue", "Interlingue"],
     "ga": ["Gaeilge", "Irish"],
     "ig": ["Asụsụ Igbo", "Igbo"],
@@ -89,7 +88,6 @@
     "ku": ["Kurdî", "Kurdish"],
     "kj": ["Kuanyama", "Kwanyama"],
     "la": ["lingua latina", "Latin"],
-    "jbo":["jbobau", "Lojban"],
     "lb": ["Lëtzebuergesch", "Luxembourgish"],
     "lg": ["Luganda", "Ganda"],
     "li": ["Limburgs", "Limburgish"],

i18n/lt.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s yra minimalistinis, atvirojo kodo internetinis įdėjimų dėklas, kurį naudojant, serveris nieko nenutuokia apie įdėtus duomenis. Duomenys yra šifruojami/iššifruojami %snaršyklėje%s naudojant 256 bitų AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Daugiau informacijos rasite <a href=\"https://privatebin.info/\">projekto puslapyje</a>.",
-    "Because ignorance is bliss": "Nes nežinojimas yra palaima",
-    "en": "lt",
-    "Paste does not exist, has expired or has been deleted.": "Įdėjimo nėra, jis nebegalioja arba buvo ištrintas.",
-    "%s requires php %s or above to work. Sorry.": "%s savo darbui reikalauja php %s arba naujesnės versijos. Apgailestaujame.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s reikalauja, kad konfigūracijos faile būtų [%s] konfigūracijos sekcija.",
-    "Please wait %d seconds between each post.": [
-        "Tarp kiekvieno įrašo palaukite %d sekundę.",
-        "Tarp kiekvieno įrašo palaukite %d sekundes.",
-        "Tarp kiekvieno įrašo palaukite %d sekundžių.",
-        "Tarp kiekvieno įrašo palaukite %d sekundę."
-    ],
-    "Paste is limited to %s of encrypted data.": "Įdėjimas yra apribotas iki %s šifruotų duomenų.",
-    "Invalid data.": "Neteisingi duomenys.",
-    "You are unlucky. Try again.": "Jums nesiseka. Bandykite dar kartą.",
-    "Error saving comment. Sorry.": "Klaida įrašant komentarą. Apgailestaujame.",
-    "Error saving paste. Sorry.": "Klaida įrašant įdėjimą. Apgailestaujame.",
-    "Invalid paste ID.": "Neteisingas įdėjimo ID.",
-    "Paste is not of burn-after-reading type.": "Įdėjimo tipas nėra „Perskaičius sudeginti“.",
-    "Wrong deletion token. Paste was not deleted.": "Neteisingas ištrynimo prieigos raktas. Įdėjimas nebuvo ištrintas.",
-    "Paste was properly deleted.": "Įdėjimas buvo tinkamai ištrintas.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "%s darbui reikalinga JavaScript. Atsiprašome už nepatogumus.",
-    "%s requires a modern browser to work.": "%s savo darbui reikalauja šiuolaikinės naršyklės.",
-    "New": "Naujas",
-    "Send": "Siųsti",
-    "Clone": "Dubliuoti",
-    "Raw text": "Neapdorotas tekstas",
-    "Expires": "Baigs galioti po",
-    "Burn after reading": "Perskaičius sudeginti",
-    "Open discussion": "Atvira diskusija",
-    "Password (recommended)": "Slaptažodis (rekomenduojama)",
-    "Discussion": "Diskusija",
-    "Toggle navigation": "Perjungti naršymą",
-    "%d seconds": [
-        "%d sekundės",
-        "%d sekundžių",
-        "%d sekundžių",
-        "%d sekundės"
-    ],
-    "%d minutes": [
-        "%d minutės",
-        "%d minučių",
-        "%d minučių",
-        "%d minutės"
-    ],
-    "%d hours": [
-        "%d valandos",
-        "%d valandų",
-        "%d valandų",
-        "%d valandos"
-    ],
-    "%d days": [
-        "%d dienos",
-        "%d dienų",
-        "%d dienų",
-        "%d dienos"
-    ],
-    "%d weeks": [
-        "%d savaitės",
-        "%d savaičių",
-        "%d savaičių",
-        "%d savaitės"
-    ],
-    "%d months": [
-        "%d mėnesio",
-        "%d mėnesių",
-        "%d mėnesių",
-        "%d mėnesio"
-    ],
-    "%d years": [
-        "%d metų",
-        "%d metų",
-        "%d metų",
-        "%d metų"
-    ],
-    "Never": "Niekada",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Pastaba: Tai yra bandomoji paslauga. Duomenys bet kuriuo metu gali būti ištrinti. Kačiukai mirs, jei piktnaudžiausite šia paslauga.",
-    "This document will expire in %d seconds.": [
-        "Šis dokumentas nustos galioti po %d sekundės.",
-        "Šis dokumentas nustos galioti po %d sekundžių.",
-        "Šis dokumentas nustos galioti po %d sekundžių.",
-        "Šis dokumentas nustos galioti po %d sekundės."
-    ],
-    "This document will expire in %d minutes.": [
-        "Šis dokumentas nustos galioti po %d minutės.",
-        "Šis dokumentas nustos galioti po %d minučių.",
-        "Šis dokumentas nustos galioti po %d minučių.",
-        "Šis dokumentas nustos galioti po %d minutės."
-    ],
-    "This document will expire in %d hours.": [
-        "Šis dokumentas nustos galioti po %d valandos.",
-        "Šis dokumentas nustos galioti po %d valandų.",
-        "Šis dokumentas nustos galioti po %d valandų.",
-        "Šis dokumentas nustos galioti po %d valandos."
-    ],
-    "This document will expire in %d days.": [
-        "Šis dokumentas nustos galioti po %d dienos.",
-        "Šis dokumentas nustos galioti po %d dienų.",
-        "Šis dokumentas nustos galioti po %d dienų.",
-        "Šis dokumentas nustos galioti po %d dienos."
-    ],
-    "This document will expire in %d months.": [
-        "Šis dokumentas nustos galioti po %d mėnesio.",
-        "Šis dokumentas nustos galioti po %d mėnesių.",
-        "Šis dokumentas nustos galioti po %d mėnesių.",
-        "Šis dokumentas nustos galioti po %d mėnesio."
-    ],
-    "Please enter the password for this paste:": "Įveskite šio įdėjimo slaptažodį:",
-    "Could not decrypt data (Wrong key?)": "Nepavyko iššifruoti duomenų (Neteisingas raktas?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Nepavyko ištrinti įdėjimo, jis nebuvo saugomas „Perskaičius sudeginti“ veiksenoje.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "SKIRTA TIK JŪSŲ AKIMS. Neužverkite šio lango, šis pranešimas negalės būti rodomas dar kartą.",
-    "Could not decrypt comment; Wrong key?": "Nepavyko iššifruoti komentaro; Neteisingas raktas?",
-    "Reply": "Atsakyti",
-    "Anonymous": "Anonimas",
-    "Avatar generated from IP address": "Avataras sukurtas iš IP adreso",
-    "Add comment": "Pridėti komentarą",
-    "Optional nickname…": "Nebūtinas slapyvardis…",
-    "Post comment": "Skelbti komentarą",
-    "Sending comment…": "Siunčiamas komentaras…",
-    "Comment posted.": "Komentaras paskelbtas.",
-    "Could not refresh display: %s": "Nepavyko įkelti rodinio iš naujo: %s",
-    "unknown status": "nežinoma būsena",
-    "server error or not responding": "serverio klaida arba jis neatsako",
-    "Could not post comment: %s": "Nepavyko paskelbti komentaro: %s",
-    "Sending paste…": "Siunčiamas įdėjimas…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Jūsų įdėjimas yra <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Paspauskite [Vald]+[c] norėdami nukopijuoti)</span>",
-    "Delete data": "Ištrinti duomenis",
-    "Could not create paste: %s": "Nepavyko sukurti įdėjimo: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nepavyksta iššifruoti įdėjimo: URL adrese trūksta iššifravimo rakto (Ar naudojote peradresavimo ar URL trumpinimo įrankį, kuris pašalina URL dalį?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Formatas",
-    "Plain Text": "Grynasis tekstas",
-    "Source Code": "Pirminis kodas",
-    "Markdown": "„Markdown“",
-    "Download attachment": "Atsisiųsti priedą",
-    "Cloned: '%s'": "Dubliuota: „%s“",
-    "The cloned file '%s' was attached to this paste.": "Dubliuotas failas „%s“ buvo pridėtas į šį įdėjimą.",
-    "Attach a file": "Pridėti failą",
-    "alternatively drag & drop a file or paste an image from the clipboard": "arba kitaip - tempkite failą arba įdėkite paveikslą iš iškarpinės",
-    "File too large, to display a preview. Please download the attachment.": "Failas per didelis, kad būtų rodoma peržiūra. Atsisiųskite priedą.",
-    "Remove attachment": "Šalinti priedą",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Jūsų naršyklė nepalaiko šifruotų failų įkėlimo. Naudokite naujesnę naršyklę.",
-    "Invalid attachment.": "Neteisingas priedas.",
-    "Options": "Parinktys",
-    "Shorten URL": "Sutrumpinti URL",
-    "Editor": "Redaktorius",
-    "Preview": "Peržiūra",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s reikalauja, kad PATH baigtųsi „%s“. Atnaujinkite PATH savo index.php.",
-    "Decrypt": "Iššifruoti",
-    "Enter password": "Įveskite slaptažodį",
-    "Loading…": "Įkeliama…",
-    "Decrypting paste…": "Iššifruojamas įdėjimas…",
-    "Preparing new paste…": "Ruošiamas naujas įdėjimas…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Jeigu šis pranešimas niekada nedingsta, pasižiūrėkite <a href=\"%s\">šį DUK skyrių, kuriame yra informacija apie nesklandumų šalinimą</a>.",
-    "+++ no paste text +++": "+++ nėra įdėjimo teksto +++",
-    "Could not get paste data: %s": "Nepavyko gauti įdėjimo duomenų: %s",
-    "QR code": "QR kodas",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Ši internetinė svetainė naudoja nesaugų HTTP ryšį! Naudokite ją tik bandymams.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Išsamesnei informacijai, <a href=\"%s\">žiūrėkite šį DUK įrašą</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Jūsų naršyklei gali prireikti HTTPS ryšio, kad palaikytų „WebCrypto“ API. Pabandykite <a href=\"%s\">persijungti į HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Jūsų naršyklė nepalaiko „WebAssembly“, kuri naudojama zlib glaudinimui. Jūs galite kurti neglaudintus dokumentus, tačiau negalite skaityti glaudintų dokumentų.",
-    "waiting on user to provide a password": "laukiama, kol naudotojas pateiks slaptažodį",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Nepavyko iššifruoti duomenų. Ar įvedėte teisingą slaptažodį? Bandykite iš naujo pasinaudodami mygtuku viršuje.",
-    "Retry": "Bandyti dar kartą",
-    "Showing raw text…": "Rodomas neapdorotas tekstas…",
-    "Notice:": "Pranešimas:",
-    "This link will expire after %s.": "Ši nuoroda nustos galioti po %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Ši nuoroda gali būti atverta tik vieną kartą, nenaudokite savo naršyklėje mygtuko „Grįžti“ ar „Įkelti iš naujo“.",
-    "Link:": "Nuoroda:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Gavėjas gali sužinoti jūsų laiko juostą, konvertuoti laiką į suderintąjį pasaulinį laiką (UTC)?",
-    "Use Current Timezone": "Naudoti esamą laiko juostą",
-    "Convert To UTC": "Konvertuoti į UTC",
-    "Close": "Užverti",
-    "Encrypted note on %s": "Šifruoti užrašai ties %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Norėdami matyti užrašus, aplankykite šį tinklalapį. Pasidalinus šiuo URL adresu su kitais žmonėmis, jiems taip pat bus leidžiama prieiga prie šių užrašų.",
-    "URL shortener may expose your decrypt key in URL.": "URL trumpinimo įrankis gali atskleisti URL adrese jūsų iššifravimo raktą.",
-    "Save paste": "Įrašyti įdėjimą",
-    "Your IP is not authorized to create pastes.": "Jūsų IP adresas neturi įgaliojimų kurti įdėjimų.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/nl.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is een minimalistische, open source online pastebin waarbij de server geen kennis heeft van de geplakte gegevens. Gegevens worden gecodeerd/gedecodeerd %s in de browser %s met behulp van 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Meer informatie is te vinden op de <a href=\"https://privatebin.info/\">projectpagina</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s is een minimalistische, open source online pastebin waarbij de server geen kennis heeft van de geplakte gegevens. Gegevens worden gecodeerd/gedecodeerd <i> in de browser </i> met behulp van 256 bits AES. Meer informatie is te vinden op de <a href=\"https://privatebin.info/\">projectpagina</a>.",
     "Because ignorance is bliss": "Onwetendheid is een zegen",
     "en": "nl",
     "Paste does not exist, has expired or has been deleted.": "Geplakte tekst bestaat niet, is verlopen of verwijderd.",
     "%s requires php %s or above to work. Sorry.": "%s vereist PHP %s of hoger om te kunnen werken. Sorry",
     "%s requires configuration section [%s] to be present in configuration file.": "%s vereist dat de configuratiesectie [%s] aanwezig is in het configuratiebestand",
-    "Please wait %d seconds between each post.": [
-        "Alstublieft %d second wachten tussen elk bericht.",
-        "Alstublieft %d seconden wachten tussen elk bericht.",
-        "Alstublieft %d seconden wachten tussen elk bericht.",
-        "Alstublieft %d seconden wachten tussen elk bericht."
-    ],
+    "Please wait %d seconds between each post.": "Alstublieft %d seconden wachten tussen elk bericht",
     "Paste is limited to %s of encrypted data.": "Geplakte tekst is beperkt tot %s aan versleutelde gegevens",
     "Invalid data.": "Ongeldige gegevens",
     "You are unlucky. Try again.": "Helaas. Probeer het nog eens",
@@ -35,7 +29,7 @@
     "Discussion": "Discussie",
     "Toggle navigation": "Navigatie openen/sluiten",
     "%d seconds": [
-        "%d seconde",
+        "%d second",
         "%d seconden",
         "%d seconds (2nd plural)",
         "%d seconds (3rd plural)"
@@ -48,7 +42,7 @@
     ],
     "%d hours": [
         "%d uur",
-        "%d uren",
+        "%d hours (1st plural)",
         "%d hours (2nd plural)",
         "%d hours (3rd plural)"
     ],
@@ -72,43 +66,43 @@
     ],
     "%d years": [
         "%d jaar",
-        "%d jaren",
+        "%d years (1st plural)",
         "%d years (2nd plural)",
         "%d years (3rd plural)"
     ],
     "Never": "Nooit",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Opmerking: Dit is een testservice: Gegevens kunnen op elk gegeven moment verwijderd worden.",
     "This document will expire in %d seconds.": [
-        "Dit document verloopt over %d seconde.",
+        "Dit document verloopt over %d second.",
         "Dit document verloopt over %d seconden.",
-        "Dit document verloopt over %d seconden.",
-        "Dit document verloopt over %d seconden."
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Dit document verloopt over %d minuut.",
-        "Dit document verloopt over %d minuten.",
-        "Dit document verloopt over %d minuten.",
-        "Dit document verloopt over %d minuten."
+        "Dit document verloopt over %d minuten",
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Dit document verloopt over %d uur.",
-        "Dit document verloopt over %d uren.",
-        "Dit document verloopt over %d uren.",
-        "Dit document verloopt over %d uren."
+        "This document will expire in %d hours (1st plural)",
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Dit document verloopt over %d dag.",
         "Dit document verloopt over %d dagen.",
-        "Dit document verloopt over %d dagen.",
-        "Dit document verloopt over %d dagen."
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Dit document verloopt over %d maand.",
         "Dit document verloopt over %d maanden.",
-        "Dit document verloopt over %d maanden.",
-        "Dit document verloopt over %d maanden."
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
-    "Please enter the password for this paste:": "Voer het wachtwoord in voor deze geplakte tekst:",
+    "Please enter the password for this paste:": "Voer het wachtwoord in voor deze  geplakte tekst:",
     "Could not decrypt data (Wrong key?)": "Kon de gegevens niet decoderen (verkeerde sleutel?)",
     "Could not delete the paste, it was not stored in burn after reading mode.": "Verwijderen van de geplakte tekst niet mogelijk, deze werd niet opgeslagen in 'vernietig na lezen' modus.",
     "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Sluit dit venster niet, dit bericht kan niet opnieuw worden weergegeven.",
@@ -129,7 +123,7 @@
     "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Uw geplakte tekst is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Druk [Ctrl]+[c] om te kopiëren)</span>",
     "Delete data": "Gegevens wissen",
     "Could not create paste: %s": "Kon de geplakte tekst niet aanmaken: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Kon de geplakte tekst niet decoderen: Decoderingssleutel ontbreekt in URL (Hebt u een redirector of een URL-verkorter gebruikt die een deel van de URL verwijdert?)",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Kon de  geplakte tekst niet decoderen: Decoderingssleutel ontbreekt in URL (Hebt u een redirector of een URL-verkorter gebruikt die een deel van de URL verwijdert?)",
     "B": "B",
     "KiB": "KiB",
     "MiB": "MiB",
@@ -164,30 +158,24 @@
     "Preparing new paste…": "Nieuwe geplakte tekst voorbereiden…",
     "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In het geval dat dit bericht nooit verdwijnt, kijkt u dan eens naar <a href=\"%s\"> veelgestelde vragen voor informatie over het oplossen van problemen </a>.",
     "+++ no paste text +++": "+++ geen geplakte tekst +++",
-    "Could not get paste data: %s": "Kon geen klembordgegevens verkrijgen: %s",
-    "QR code": "QR-code",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Deze website gebruikt een onveilige HTTP-verbinding! Gelieve deze enkel te gebruiken om te testen.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Voor meer informatie <a href=\"%s\">zie dit FAQ-artikel</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Uw browser kan een HTTPS-verbinding nodig hebben om de WebCrypto API te ondersteunen. Probeer <a href=\"%s\">het met HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Uw browser ondersteunt WebAssembly niet, wat wordt gebruikt voor zlib compressie. U kunt niet-gecomprimeerde documenten maken, maar geen gecomprimeerde documenten lezen.",
-    "waiting on user to provide a password": "wachtend op gebruiker om een wachtwoord te geven",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Kon de gegevens niet decoderen. Heeft u een verkeerd wachtwoord ingevoerd? Probeer het opnieuw met de knop bovenaan.",
-    "Retry": "Opnieuw proberen",
-    "Showing raw text…": "Platte tekst tonen…",
-    "Notice:": "Let op:",
-    "This link will expire after %s.": "Deze link vervalt na %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Deze link kan slechts eenmaal worden geopend, gebruik niet de terug- of verversknop in uw browser.",
+    "Could not get paste data: %s": "Could not get paste data: %s",
+    "QR code": "QR code",
+    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
+    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
+    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
+    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
+    "waiting on user to provide a password": "waiting on user to provide a password",
+    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
+    "Retry": "Retry",
+    "Showing raw text…": "Showing raw text…",
+    "Notice:": "Notice:",
+    "This link will expire after %s.": "This link will expire after %s.",
+    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
     "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Ontvanger kan zich bewust worden van uw tijdzone, tijd omzetten naar UTC?",
-    "Use Current Timezone": "Gebruik huidige tijdzone",
-    "Convert To UTC": "Omzetten naar UTC",
-    "Close": "Sluiten",
-    "Encrypted note on %s": "Versleutelde notitie op %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Bezoek deze link om de notitie te bekijken. Als je de URL aan iemand geeft, kan die de notitie ook bekijken.",
-    "URL shortener may expose your decrypt key in URL.": "URL-verkorter kan uw ontcijferingssleutel in URL blootleggen.",
-    "Save paste": "Notitie opslaan",
-    "Your IP is not authorized to create pastes.": "Uw IP-adres is niet gemachtigd om geplakte tekst te maken.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
+    "Use Current Timezone": "Use Current Timezone",
+    "Convert To UTC": "Convert To UTC",
+    "Close": "Close",
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/no.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s er en minimalistisk, åpen kildekode, elektronisk tilgjengelig pastebin hvor serveren ikke har kunnskap om dataene som limes inn. Dataene krypteres/dekrypteres %si nettleseren%s ved hjelp av 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Mer informasjon om prosjektet på <a href=\"https://privatebin.info/\">prosjektsiden</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s er en minimalistisk, åpen kildekode, elektronisk tilgjengelig pastebin hvor serveren ikke har kunnskap om dataene som limes inn. Dataene krypteres/dekrypteres <i>i nettleseren</i> ved hjelp av 256 bits AES. Mer informasjon om prosjektet på  <a href=\"https://privatebin.info/\">prosjektsiden</a>.",
     "Because ignorance is bliss": "Fordi uvitenhet er lykke",
     "en": "no",
     "Paste does not exist, has expired or has been deleted.": "Innlegget eksisterer ikke, er utløpt eller har blitt slettet.",
     "%s requires php %s or above to work. Sorry.": "Beklager, %s krever php %s eller nyere for å kjøre.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s krever konfigurasjonsdel [%s] å være til stede i konfigurasjonsfilen .",
-    "Please wait %d seconds between each post.": [
-        "Vennligst vent %d sekund mellom hvert innlegg.",
-        "Vennligst vent %d sekunder mellom hvert innlegg.",
-        "Vennligst vent %d sekunder mellom hvert innlegg.",
-        "Vennligst vent %d sekunder mellom hvert innlegg."
-    ],
+    "Please wait %d seconds between each post.": "Vennligst vent %d sekunder mellom hvert innlegg.",
     "Paste is limited to %s of encrypted data.": "Innlegg er begrenset til %s av kryptert data.",
     "Invalid data.": "Ugyldige data.",
     "You are unlucky. Try again.": "Du er uheldig. Prøv igjen.",
@@ -37,76 +31,76 @@
     "%d seconds": [
         "%d sekund",
         "%d sekunder",
-        "%d sekunder",
-        "%d sekunder"
+        "%d seconds (2nd plural)",
+        "%d seconds (3rd plural)"
     ],
     "%d minutes": [
         "%d minutt",
         "%d minutter",
-        "%d minutter",
-        "%d minutter"
+        "%d minutes (2nd plural)",
+        "%d minutes (3rd plural)"
     ],
     "%d hours": [
         "%d time",
         "%d timer",
-        "%d timer",
-        "%d timer"
+        "%d hours (2nd plural)",
+        "%d hours (3rd plural)"
     ],
     "%d days": [
         "%d dag",
         "%d dager",
-        "%d dager",
-        "%d dager"
+        "%d days (2nd plural)",
+        "%d days (3rd plural)"
     ],
     "%d weeks": [
         "%d uke",
         "%d uker",
-        "%d uker",
-        "%d uker"
+        "%d weeks (2nd plural)",
+        "%d weeks (3rd plural)"
     ],
     "%d months": [
         "%d måned",
         "%d måneder",
-        "%d måneder",
-        "%d måneder"
+        "%d months (2nd plural)",
+        "%d months (3rd plural)"
     ],
     "%d years": [
         "%d år",
         "%d år",
-        "%d år",
-        "%d år"
+        "%d years (2nd plural)",
+        "%d years (3rd plural)"
     ],
     "Never": "Aldri",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Merk: Dette er en test tjeneste: Data kan slettes når som helst. Kattunger vil dø hvis du misbruker denne tjenesten.",
     "This document will expire in %d seconds.": [
         "Dette dokumentet vil utløpe om %d sekund.",
         "Dette dokumentet vil utløpe om %d sekunder.",
-        "Dette dokumentet vil utløpe om %d sekunder.",
-        "Dette dokumentet vil utløpe om %d sekunder."
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Dette dokumentet vil utløpe om %d minutt.",
         "Dette dokumentet vil utløpe om %d minutter.",
-        "Dette dokumentet vil utløpe om %d minutter.",
-        "Dette dokumentet vil utløpe om %d minutter."
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Dette dokumentet vil utløpe om %d time.",
         "Dette dokumentet vil utløpe om %d timer.",
-        "Dette dokumentet vil utløpe om %d timer.",
-        "Dette dokumentet vil utløpe om %d timer."
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Dette dokumentet vil utløpe om %d dag.",
         "Dette dokumentet vil utløpe om %d dager.",
-        "Dette dokumentet vil utløpe om %d dager.",
-        "Dette dokumentet vil utløpe om %d dager."
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Dette dokumentet vil utløpe om %d måned.",
         "Dette dokumentet vil utløpe om %d måneder.",
-        "Dette dokumentet vil utløpe om %d måneder.",
-        "Dette dokumentet vil utløpe om %d måneder."
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Vennligst skriv inn passordet for dette innlegget:",
     "Could not decrypt data (Wrong key?)": "Kunne ikke dekryptere data (Feil nøkkel?)",
@@ -145,10 +139,10 @@
     "Markdown": "Oppmerket",
     "Download attachment": "Last ned vedlegg",
     "Cloned: '%s'": "Kopiert: '%s'",
-    "The cloned file '%s' was attached to this paste.": "Den klonede filen '%s' var koblet til denne innlimingen.",
+    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
     "Attach a file": "Legg til fil",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternativt dra og slipp en fil, eller lim inn et bilde fra utklippstavlen",
-    "File too large, to display a preview. Please download the attachment.": "Filen er for stor, for å vise en forhåndsvisning. Last ned vedlegget.",
+    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
+    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
     "Remove attachment": "Slett vedlegg",
     "Your browser does not support uploading encrypted files. Please use a newer browser.": "Nettleseren din støtter ikke å laste opp krypterte filer. Vennligst bruk en nyere nettleser.",
     "Invalid attachment.": "Ugyldig vedlegg.",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Bruk gjeldende tidssone",
     "Convert To UTC": "Konverter til UTC",
     "Close": "Steng",
-    "Encrypted note on %s": "Kryptert notat på %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Besøk denne lenken for å se notatet. Hvis lenken deles med andre, vil de også kunne se notatet.",
-    "URL shortener may expose your decrypt key in URL.": "URL forkorter kan avsløre dekrypteringsnøkkelen.",
-    "Save paste": "Lagre utklipp",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Kryptert notat på PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Besøk denne lenken for å se notatet. Hvis lenken deles med andre, vil de også kunne se notatet."
 }

i18n/oc.json

@@ -1,29 +1,23 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s es un 'pastebin' (o gestionari d’extrachs de tèxte e còdi font) minimalista e open source, dins lo qual lo servidor a pas cap de coneissença de las donadas mandadas. Las donadas son chifradas/deschifradas %sdins lo navigator%s per un chiframent AES 256 bits.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Mai informacions sus <a href=\"https://privatebin.info/\">la pagina del projècte</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s es un 'pastebin' (o gestionari d’extrachs de tèxte e còdi font) minimalista e open source, dins lo qual lo servidor a pas cap de coneissença de las donadas mandadas. Las donadas son chifradas/deschifradas <i>dins lo navigator</i> per un chiframent AES 256 bits. Mai informacions sus <a href=\"https://privatebin.info/\">la pagina del projècte</a>.",
     "Because ignorance is bliss": "Perque lo bonaür es l’ignorància",
     "en": "oc",
     "Paste does not exist, has expired or has been deleted.": "Lo tèxte existís pas, a expirat, o es estat suprimit.",
     "%s requires php %s or above to work. Sorry.": "O planhèm, %s necessita php %s o superior per foncionar.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s fa besonh de la seccion de configuracion [%s] dins lo fichièr de configuracion per foncionar.",
-    "Please wait %d seconds between each post.": [
-        "Mercés d'esperar %d segonda entre cada publicacion.",
-        "Mercés d'esperar %d segondas entre cada publicacion.",
-        "Mercés d'esperar %d segondas entre cada publicacion.",
-        "Mercés d'esperar %d segondas entre cada publicacion."
-    ],
+    "Please wait %d seconds between each post.": "Mercés d'esperar %d segondas entre cada publicacion.",
     "Paste is limited to %s of encrypted data.": "Lo tèxte es limitat a %s de donadas chifradas.",
     "Invalid data.": "Donadas invalidas.",
     "You are unlucky. Try again.": "Pas cap de fortuna. Tornatz ensajar.",
     "Error saving comment. Sorry.": "Error al moment de salvagardar lo comentari. O planhèm.",
     "Error saving paste. Sorry.": "Error al moment de salvagardar lo tèxte. O planhèm.",
     "Invalid paste ID.": "ID del tèxte invalid.",
-    "Paste is not of burn-after-reading type.": "Lo tèxte es pas del tipe « Escafar aprèp lectura ».",
+    "Paste is not of burn-after-reading type.": "Lo tèxte es pas del tip \"Escafar aprèp lectura\".",
     "Wrong deletion token. Paste was not deleted.": "Geton de supression incorrècte. Lo tèxte es pas estat suprimit.",
-    "Paste was properly deleted.": "Lo tèxte es estat corrèctament suprimit.",
+    "Paste was properly deleted.": "Lo tèxte es estat corrèctament  suprimit.",
     "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript es requesit per far foncionar %s. O planhèm per l’inconvenient.",
-    "%s requires a modern browser to work.": "%s requerís un navigator modèrn per foncionar.",
+    "%s requires a modern browser to work.": "%s necessita un navigator modèrn per foncionar.",
     "New": "Nòu",
     "Send": "Mandar",
     "Clone": "Clonar",
@@ -37,76 +31,76 @@
     "%d seconds": [
         "%d segonda",
         "%d segondas",
-        "%d segondas",
-        "%d segondas"
+        "%d seconds (2nd plural)",
+        "%d seconds (3rd plural)"
     ],
     "%d minutes": [
         "%d minuta",
         "%d minutas",
-        "%d minutas",
-        "%d minutas"
+        "%d minutes (2nd plural)",
+        "%d minutes (3rd plural)"
     ],
     "%d hours": [
         "%d ora",
         "%d oras",
-        "%d oras",
-        "%d oras"
+        "%d hours (2nd plural)",
+        "%d hours (3rd plural)"
     ],
     "%d days": [
         "%d jorn",
         "%d jorns",
-        "%d jorns",
-        "%d jorns"
+        "%d days (2nd plural)",
+        "%d days (3rd plural)"
     ],
     "%d weeks": [
         "%d setmana",
         "%d setmanas",
-        "%d setmanas",
-        "%d setmanas"
+        "%d weeks (2nd plural)",
+        "%d weeks (3rd plural)"
     ],
     "%d months": [
         "%d mes",
         "%d meses",
-        "%d meses",
-        "%d meses"
+        "%d months (2nd plural)",
+        "%d months (3rd plural)"
     ],
     "%d years": [
         "%d an",
         "%d ans",
-        "%d ans",
-        "%d ans"
+        "%d years (2nd plural)",
+        "%d years (3rd plural)"
     ],
     "Never": "Jamai",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Nota : Aquò es un servici d’espròva : las donadas pòdon èsser suprimidas a cada moment. De catons moriràn s’abusatz d’aqueste servici.",
     "This document will expire in %d seconds.": [
-        "Aqueste document expirarà d’aquí %d segonda.",
-        "Aqueste document expirarà d’aquí %d segondas.",
-        "Aqueste document expirarà d’aquí %d segondas.",
-        "Aqueste document expirarà d’aquí %d segondas."
+        "Ce document expirera dans %d seconde.",
+        "Aqueste document expirarà dins %d segondas.",
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
-        "Aqueste document expirarà d’aquí %d minuta.",
-        "Aqueste document expirarà d’aquí %d minutas.",
-        "Aqueste document expirarà d’aquí %d minutas.",
-        "Aqueste document expirarà d’aquí %d minutas."
+        "Ce document expirera dans %d minute.",
+        "Aqueste document expirarà dins %d minutas.",
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
-        "Aqueste document expirarà d’aquí %d ora.",
-        "Aqueste document expirarà d’aquí %d oras.",
-        "Aqueste document expirarà d’aquí %d oras.",
-        "Aqueste document expirarà d’aquí %d oras."
+        "Ce document expirera dans %d heure.",
+        "Aqueste document expirarà dins %d oras.",
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
-        "Aqueste document expirarà d’aquí %d jorn.",
-        "Aqueste document expirarà d’aquí %d jorns.",
-        "Aqueste document expirarà d’aquí %d jorns.",
-        "Aqueste document expirarà d’aquí %d jorns."
+        "Ce document expirera dans %d jour.",
+        "Aqueste document expirarà dins %d jorns.",
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
-        "Aqueste document expirarà d’aquí %d mes.",
-        "Aqueste document expirarà d’aquí %d meses.",
-        "Aqueste document expirarà d’aquí %d meses.",
-        "Aqueste document expirarà d’aquí %d meses."
+        "Ce document expirera dans %d mois.",
+        "Aqueste document expirarà dins %d meses.",
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Picatz lo senhal per aqueste tèxte :",
     "Could not decrypt data (Wrong key?)": "Impossible de deschifrar las donadas (marrida clau ?)",
@@ -156,7 +150,7 @@
     "Shorten URL": "Acorchir l’URL",
     "Editor": "Editar",
     "Preview": "Previsualizar",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s demanda que lo PATH termine en « %s ». Mercés de metre a jorn lo PATH dins vòstre index.php.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s demanda que lo PATH termine en \"%s\". Mercés de metre a jorn lo PATH dins vòstre index.php.",
     "Decrypt": "Deschifrar",
     "Enter password": "Picatz lo senhal",
     "Loading…": "Cargament…",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Utilizar l’actual",
     "Convert To UTC": "Convertir en UTC",
     "Close": "Tampar",
-    "Encrypted note on %s": "Nòtas chifradas sus %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visitatz aqueste ligam per veire la nòta. Fornir lo ligam a qualqu’un mai li permet tanben d’accedir a la nòta.",
-    "URL shortener may expose your decrypt key in URL.": "Los espleches d’acorchiment d’URL pòdon expausar la clau de deschiframent dins l’URL.",
-    "Save paste": "Enregistrar lo tèxt",
-    "Your IP is not authorized to create pastes.": "Vòstra adreça IP a pas l’autorizacion de crear de tèxtes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Nòtas chifradas sus PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visitatz aqueste ligam per veire la nòta. Fornir lo ligam a qualqu’un mai li permet tanben d’accedir a la nòta."
 }

i18n/pl.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s jest minimalistycznym, otwartoźródłowym serwisem typu pastebin, w którym serwer nie ma jakichkolwiek informacji o tym, co jest wklejane. Dane są szyfrowane i deszyfrowane %sw przeglądarce%s z użyciem 256-bitowego klucza AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Więcej informacji na <a href=\"https://privatebin.info/\">stronie projektu</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s jest minimalistycznym, otwartoźródłowym serwisem typu pastebin, w którym serwer nie ma jakichkolwiek informacji o tym, co jest wklejane. Dane są szyfrowane i deszyfrowane <i>w przeglądarce</i> z użyciem 256-bitowego klucza AES. Więcej informacji na <a href=\"https://privatebin.info/\">stronie projektu</a>.",
     "Because ignorance is bliss": "Ponieważ ignorancja jest cnotą",
     "en": "pl",
     "Paste does not exist, has expired or has been deleted.": "Wklejka nie istnieje, wygasła albo została usunięta.",
     "%s requires php %s or above to work. Sorry.": "%s wymaga PHP w wersji %s lub nowszej. Przykro mi.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s wymaga obecności sekcji [%s] w pliku konfiguracyjnym.",
-    "Please wait %d seconds between each post.": [
-        "Poczekaj %d sekundę pomiędzy każdą wklejką.",
-        "Poczekaj %d sekund pomiędzy każdą wklejką.",
-        "Poczekaj %d sekund pomiędzy każdą wklejką.",
-        "Poczekaj %d sekund pomiędzy każdą wklejką."
-    ],
+    "Please wait %d seconds between each post.": "Poczekaj %d sekund pomiędzy każdą wklejką.",
     "Paste is limited to %s of encrypted data.": "Wklejka jest limitowana do %s zaszyfrowanych danych.",
     "Invalid data.": "Nieprawidłowe dane.",
     "You are unlucky. Try again.": "Miałeś pecha. Spróbuj ponownie.",
@@ -38,75 +32,75 @@
         "%d second",
         "%d second",
         "%d second",
-        "%d second"
+        "%d seconds (3rd plural)"
     ],
     "%d minutes": [
         "%d minut",
         "%d minut",
         "%d minut",
-        "%d minut"
+        "%d minutes (3rd plural)"
     ],
     "%d hours": [
         "%d godzina",
         "%d godzina",
         "%d godzinę",
-        "%d godzinę"
+        "%d hours (3rd plural)"
     ],
     "%d days": [
         "%d dzień",
         "%d dzień",
         "%d dzień",
-        "%d dzień"
+        "%d days (3rd plural)"
     ],
     "%d weeks": [
         "%d tydzień",
         "%d tydzień",
         "%d tydzień",
-        "%d tydzień"
+        "%d weeks (3rd plural)"
     ],
     "%d months": [
         "%d miesiąc",
         "%d miesiąc",
         "%d miesiąc",
-        "%d miesiąc"
+        "%d months (3rd plural)"
     ],
     "%d years": [
         "%d rok",
         "%d rok",
         "%d rok",
-        "%d rok"
+        "%d years (3rd plural)"
     ],
     "Never": "nigdy",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Notka: To jest usługa testowa. Dane mogą zostać usunięte w dowolnym momencie. Kociątka umrą, jeśli nadużyjesz tej usługi.",
     "This document will expire in %d seconds.": [
         "Ten dokument wygaśnie za %d sekundę.",
         "Ten dokument wygaśnie za %d sekund.",
-        "Ten dokument wygaśnie za %d sekund.",
-        "Ten dokument wygaśnie za %d sekund."
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Ten dokument wygaśnie za %d minutę.",
         "Ten dokument wygaśnie za %d minut.",
-        "Ten dokument wygaśnie za %d minut.",
-        "Ten dokument wygaśnie za %d minut."
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Ten dokument wygaśnie za godzinę.",
         "Ten dokument wygaśnie za %d godzin.",
-        "Ten dokument wygaśnie za %d godzin.",
-        "Ten dokument wygaśnie za %d godzin."
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Ten dokument wygaśnie za %d dzień.",
         "Ten dokument wygaśnie za %d dni.",
-        "Ten dokument wygaśnie za %d dni.",
-        "Ten dokument wygaśnie za %d dni."
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Ten dokument wygaśnie za miesiąc.",
         "Ten dokument wygaśnie za %d miesięcy.",
-        "Ten dokument wygaśnie za %d miesięcy.",
-        "Ten dokument wygaśnie za %d miesięcy."
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Wpisz hasło dla tej wklejki:",
     "Could not decrypt data (Wrong key?)": "Nie udało się odszyfrować danych (zły klucz?)",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Use Current Timezone",
     "Convert To UTC": "Convert To UTC",
     "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/pt.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s é um serviço minimalista e de código aberto do tipo \"pastebin\", em que o servidor tem zero conhecimento dos dados copiados. Os dados são cifrados e decifrados %sno navegador%s usando 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Mais informações na <a href=\"https://privatebin.info/\">página do projeto</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s é um serviço minimalista e de código aberto do tipo \"pastebin\", em que o servidor tem zero conhecimento dos dados copiados. Os dados são cifrados e decifrados <i>no navegador</i> usando 256 bits AES. Mais informações na <a href=\"https://privatebin.info/\">página do projeto</a>.",
     "Because ignorance is bliss": "Porque a ignorância é uma benção",
     "en": "pt",
     "Paste does not exist, has expired or has been deleted.": "A cópia não existe, expirou ou já foi excluída.",
     "%s requires php %s or above to work. Sorry.": "%s requer php %s ou superior para funcionar. Desculpa.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s requer que a seção de configuração [% s] esteja no arquivo de configuração.",
-    "Please wait %d seconds between each post.": [
-        "Por favor espere %d segundo entre cada publicação.",
-        "Por favor espere %d segundos entre cada publicação.",
-        "Por favor espere %d segundos entre cada publicação.",
-        "Por favor espere %d segundos entre cada publicação."
-    ],
+    "Please wait %d seconds between each post.": "Por favor espere %d segundos entre cada publicação.",
     "Paste is limited to %s of encrypted data.": "A cópia está limitada a %s de dados cifrados.",
     "Invalid data.": "Dados inválidos.",
     "You are unlucky. Try again.": "Você é azarado. Tente novamente",
@@ -37,76 +31,76 @@
     "%d seconds": [
         "%d segundo",
         "%d segundos",
-        "%d segundos",
-        "%d segundos"
+        "%d seconds (2nd plural)",
+        "%d seconds (3rd plural)"
     ],
     "%d minutes": [
         "%d minuto",
         "%d minutos",
-        "%d minutos",
-        "%d minutos"
+        "%d minutes (2nd plural)",
+        "%d minutes (3rd plural)"
     ],
     "%d hours": [
         "%d hora",
         "%d horas",
-        "%d horas (2° plural)",
-        "%d horas"
+        "%d hours (2nd plural)",
+        "%d hours (3rd plural)"
     ],
     "%d days": [
         "%d dia",
         "%d dias",
-        "%d dias",
-        "%d dias"
+        "%d days (2nd plural)",
+        "%d days (3rd plural)"
     ],
     "%d weeks": [
         "%d semana",
         "%d semanas",
-        "%d semanas",
-        "%d semanas"
+        "%d weeks (2nd plural)",
+        "%d weeks (3rd plural)"
     ],
     "%d months": [
         "%d mês",
         "%d meses",
-        "%d meses",
-        "%d meses"
+        "%d months (2nd plural)",
+        "%d months (3rd plural)"
     ],
     "%d years": [
         "%d ano",
         "%d anos",
-        "%d anos",
-        "%d anos"
+        "%d years (2nd plural)",
+        "%d years (3rd plural)"
     ],
     "Never": "Nunca",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Nota: Este é um serviço de teste. Dados podem ser perdidos a qualquer momento. Gatinhos morrerão se você abusar desse serviço.",
     "This document will expire in %d seconds.": [
         "Este documento irá expirar em um segundo.",
         "Este documento irá expirar em %d segundos.",
-        "Este documento irá expirar em %d segundos.",
-        "Este documento irá expirar em %d segundos."
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Este documento irá expirar em um minuto.",
         "Este documento irá expirar em %d minutos.",
-        "Este documento irá expirar em %d minutos.",
-        "Este documento irá expirar em %d minutos."
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Este documento irá expirar em uma hora.",
         "Este documento irá expirar em %d horas.",
-        "Este documento irá expirar em %d horas.",
-        "Este documento irá expirar em %d horas."
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Este documento irá expirar em um dia.",
         "Este documento irá expirar em %d dias.",
-        "Este documento irá expirar em %d dias.",
-        "Este documento irá expirar em %d dias."
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Este documento irá expirar em um mês.",
         "Este documento irá expirar em %d meses.",
-        "Este documento irá expirar em %d meses.",
-        "Este documento irá expirar em %d meses."
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Por favor, digite a senha para essa cópia:",
     "Could not decrypt data (Wrong key?)": "Não foi possível decifrar os dados (Chave errada?)",
@@ -147,8 +141,8 @@
     "Cloned: '%s'": "Clonado: '%s'",
     "The cloned file '%s' was attached to this paste.": "O arquivo clonado '%s' foi anexado a essa cópia.",
     "Attach a file": "Anexar um arquivo",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternativamente, arraste e solte um arquivo ou cole uma imagem da área de transferência",
-    "File too large, to display a preview. Please download the attachment.": "Arquivo muito grande para exibir uma prévia. Por favor, faça o download do anexo.",
+    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
+    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
     "Remove attachment": "Remover anexo",
     "Your browser does not support uploading encrypted files. Please use a newer browser.": "Seu navegador não permite subir arquivos cifrados. Por favor, utilize um navegador mais recente.",
     "Invalid attachment.": "Anexo inválido.",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Usar Fuso Horário Atual",
     "Convert To UTC": "Converter para UTC",
     "Close": "Fechar",
-    "Encrypted note on %s": "Nota criptografada no %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visite esse link para ver a nota. Dar a URL para qualquer um permite que eles também acessem a nota.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/ru.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s это минималистичный Open Source проект для создания заметок, где сервер не знает ничего о сохраняемых данных. Данные шифруются/расшифровываются %sв браузере%s с использованием 256 битного шифрования AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Подробнее можно узнать на <a href=\"https://privatebin.info/\">сайте проекта</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s это минималистичный Open Source проект для создания заметок, где сервер не знает ничего о сохраняемых данных. Данные шифруются/расшифровываются <i>в браузере</i> с использованием 256 битного шифрования AES. Подробнее можно узнать на <a href=\"https://privatebin.info/\">сайте проекта</a>.",
     "Because ignorance is bliss": "Потому что неведение - благо",
     "en": "ru",
     "Paste does not exist, has expired or has been deleted.": "Запись не существует, просрочена или была удалена.",
     "%s requires php %s or above to work. Sorry.": "Для работы %s требуется php %s или выше. Извините.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s необходимо наличие секции [%s] в конфигурационном файле.",
-    "Please wait %d seconds between each post.": [
-        "Пожалуйста, ожидайте %d секунду между каждыми записями.",
-        "Пожалуйста, ожидайте %d секунды между каждыми записями.",
-        "Пожалуйста, ожидайте %d секунд между каждыми записями.",
-        "Пожалуйста, ожидайте %d секунд между каждыми записями."
-    ],
+    "Please wait %d seconds between each post.": "Please wait %d seconds between each post.",
     "Paste is limited to %s of encrypted data.": "Размер записи ограничен %s зашифрованных данных.",
     "Invalid data.": "Неверные данные.",
     "You are unlucky. Try again.": "Вам не повезло. Попробуйте еще раз.",
@@ -38,75 +32,75 @@
         "%d секунду",
         "%d секунды",
         "%d секунд",
-        "%d секунд"
+        "%d seconds (3rd plural)"
     ],
     "%d minutes": [
         "%d минуту",
         "%d минуты",
         "%d минут",
-        "%d минут"
+        "%d minutes (3rd plural)"
     ],
     "%d hours": [
         "%d час",
         "%d часа",
         "%d часов",
-        "%d часов"
+        "%d hours (3rd plural)"
     ],
     "%d days": [
         "%d день",
         "%d дня",
         "%d дней",
-        "%d дней"
+        "%d days (3rd plural)"
     ],
     "%d weeks": [
         "%d неделю",
         "%d недели",
         "%d недель",
-        "%d недель"
+        "%d weeks (3rd plural)"
     ],
     "%d months": [
         "%d месяц",
         "%d месяца",
         "%d месяцев",
-        "%d месяцев"
+        "%d months (3rd plural)"
     ],
     "%d years": [
         "%d год",
         "%d года",
         "%d лет",
-        "%d лет"
+        "%d years (3rd plural)"
     ],
     "Never": "Никогда",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Примечание: Этот сервис тестовый: Данные могут быть удалены в любое время. Котята умрут, если вы будете злоупотреблять сервисом.",
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Примечание: Этот сервис тестовый: Данные могут быть удалены в любое время. Котята умрут, если вы будете злоупотреблять серсисом.",
     "This document will expire in %d seconds.": [
         "Документ будет удален через %d секунду.",
         "Документ будет удален через %d секунды.",
         "Документ будет удален через %d секунд.",
-        "Документ будет удален через %d секунд."
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Документ будет удален через %d минуту.",
         "Документ будет удален через %d минуты.",
         "Документ будет удален через %d минут.",
-        "Документ будет удален через %d минут."
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Документ будет удален через %d час.",
         "Документ будет удален через %d часа.",
         "Документ будет удален через %d часов.",
-        "Документ будет удален через %d часов."
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Документ будет удален через %d день.",
         "Документ будет удален через %d дня.",
         "Документ будет удален через %d дней.",
-        "Документ будет удален через %d дней."
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Документ будет удален через %d месяц.",
         "Документ будет удален через %d месяца.",
         "Документ будет удален через %d месяцев.",
-        "Документ будет удален через %d месяцев."
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Пожалуйста, введите пароль от записи:",
     "Could not decrypt data (Wrong key?)": "Невозможно расшифровать данные (Неверный ключ?)",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Использовать текущий часовой пояс",
     "Convert To UTC": "Конвертировать в UTC",
     "Close": "Закрыть",
-    "Encrypted note on %s": "Зашифрованная запись на %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Посетите эту ссылку чтобы просмотреть запись. Передача ссылки кому либо позволит им получить доступ к записи тоже.",
-    "URL shortener may expose your decrypt key in URL.": "Сервис сокращения ссылок может получить ваш ключ расшифровки из ссылки.",
-    "Save paste": "Сохранить запись",
-    "Your IP is not authorized to create pastes.": "Вашему IP адресу не разрешено создавать записи.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Зашифрованная запиь на PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Посетите эту ссылку чтобы просмотреть запись. Передача ссылки кому либо позволит им получить доступ к записи тоже."
 }

i18n/sk.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s je minimalistický, open source online pastebin, kde server nemá žiadne znalosti o vložených údajoch. Údaje sú šifrované/dešifrované %sv prehliadači%s pomocou 256-bitového AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Viac informácií na <a href=\"https://privatebin.info/\">stránke projektu</a>.",
-    "Because ignorance is bliss": "Pretože nevedomosť je sladká",
-    "en": "sk",
-    "Paste does not exist, has expired or has been deleted.": "Vložený text neexistuje, jeho platnosť vypršala alebo bol vymazaný.",
-    "%s requires php %s or above to work. Sorry.": "%s vyžaduje php %s alebo vyššie. Prepáčte.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s vyžaduje, aby bola v konfiguračnom súbore prítomná sekcia [%s].",
-    "Please wait %d seconds between each post.": [
-        "Počet sekúnd do ďalšieho príspevku: %d",
-        "Počet sekúnd do ďalšieho príspevku: %d",
-        "Počet sekúnd do ďalšieho príspevku: %d",
-        "Počet sekúnd do ďalšieho príspevku: %d"
-    ],
-    "Paste is limited to %s of encrypted data.": "Príspevok je obmedzený na %s zašifrovaných údajov.",
-    "Invalid data.": "Neplatné údaje.",
-    "You are unlucky. Try again.": "Ľutujem. Skúste to znova.",
-    "Error saving comment. Sorry.": "Pri ukladaní komentára sa vyskytla chyba.",
-    "Error saving paste. Sorry.": "Pri ukladaní príspevku sa vyskytla chyba.",
-    "Invalid paste ID.": "Chybne vložené ID.",
-    "Paste is not of burn-after-reading type.": "Príspevok nieje nastavený na zmazanie po prečítaní.",
-    "Wrong deletion token. Paste was not deleted.": "Nesprávny token odstránenia. Príspevok nebol odstránený.",
-    "Paste was properly deleted.": "Príspevok bol správne vymazaný.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "Na fungovanie %s je potrebný JavaScript. Ospravedlňujeme sa za nepríjemnosti.",
-    "%s requires a modern browser to work.": "%s vyžaduje na fungovanie moderný prehliadač.",
-    "New": "Nový",
-    "Send": "Odoslať",
-    "Clone": "Klonovať",
-    "Raw text": "Surový text",
-    "Expires": "Expirácia",
-    "Burn after reading": "Po prečítaní zmazať",
-    "Open discussion": "Povoliť komentáre",
-    "Password (recommended)": "Heslo (doporučené)",
-    "Discussion": "Komentáre",
-    "Toggle navigation": "Prepnúť navigáciu",
-    "%d seconds": [
-        "%d sekunda",
-        "%d sekundy",
-        "%d sekúnd",
-        "%d sekúnd"
-    ],
-    "%d minutes": [
-        "%d minúta",
-        "%d minúty",
-        "%d minút",
-        "%d minút"
-    ],
-    "%d hours": [
-        "%d hodina",
-        "%d hodiny",
-        "%d hodín",
-        "%d hodín"
-    ],
-    "%d days": [
-        "%d deň",
-        "%d dni",
-        "%d dní",
-        "%d dní"
-    ],
-    "%d weeks": [
-        "%d týždeň",
-        "%d týždne",
-        "%d týždňov",
-        "%d týždňov"
-    ],
-    "%d months": [
-        "%d mesiac",
-        "%d mesiace",
-        "%d mesiacov",
-        "%d mesiacov"
-    ],
-    "%d years": [
-        "%d rok",
-        "%d roky",
-        "%d rokov",
-        "%d rokov"
-    ],
-    "Never": "Nikdy",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Poznámka: Toto je testovacia služba: Údaje môžu byť kedykoľvek vymazané. Pri zneužití tejto služby zomrú mačiatka.",
-    "This document will expire in %d seconds.": [
-        "Platnosť tohto dokumentu vyprší o %d sekundu.",
-        "Platnosť tohto dokumentu vyprší o %d sekundy.",
-        "Platnosť tohto dokumentu vyprší o %d sekúnd.",
-        "Platnosť tohto dokumentu vyprší o %d sekúnd."
-    ],
-    "This document will expire in %d minutes.": [
-        "Platnosť tohto dokumentu vyprší o %d minútu.",
-        "Platnosť tohto dokumentu vyprší o %d minúty.",
-        "Platnosť tohto dokumentu vyprší o %d minút.",
-        "Platnosť tohto dokumentu vyprší o %d minút."
-    ],
-    "This document will expire in %d hours.": [
-        "Platnosť tohto dokumentu vyprší o %d hodinu.",
-        "Platnosť tohto dokumentu vyprší o %d hodiny.",
-        "Platnosť tohto dokumentu vyprší o %d hodín.",
-        "Platnosť tohto dokumentu vyprší o %d hodín."
-    ],
-    "This document will expire in %d days.": [
-        "Platnosť tohto dokumentu vyprší o %d deň.",
-        "Platnosť tohto dokumentu vyprší o %d dni.",
-        "Platnosť tohto dokumentu vyprší o %d dní.",
-        "Platnosť tohto dokumentu vyprší o %d dní."
-    ],
-    "This document will expire in %d months.": [
-        "Platnosť tohto dokumentu vyprší o %d mesiac.",
-        "Platnosť tohto dokumentu vyprší o %d mesiace.",
-        "Platnosť tohto dokumentu vyprší o %d mesiacov.",
-        "Platnosť tohto dokumentu vyprší o %d mesiacov."
-    ],
-    "Please enter the password for this paste:": "Zadajte prosím heslo:",
-    "Could not decrypt data (Wrong key?)": "Nepodarilo sa dešifrovať údaje (nesprávny kľúč?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Nepodarilo sa odstrániť príspevok, nebol uložený v režime zmazania po prečítaní.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "IBA PRE VAŠE OČI. Toto okno nezatvárajte, táto správa sa nedá znova zobraziť.",
-    "Could not decrypt comment; Wrong key?": "Nepodarilo sa dešifrovať komentár. Nesprávny kľúč?",
-    "Reply": "Odpovedať",
-    "Anonymous": "Anonymný",
-    "Avatar generated from IP address": "Avatar vygenerovaný z IP adresy",
-    "Add comment": "Pridať komentár",
-    "Optional nickname…": "Voliteľná prezývka…",
-    "Post comment": "Odoslať komentár",
-    "Sending comment…": "Odosielanie komentára…",
-    "Comment posted.": "Komentár odoslaný.",
-    "Could not refresh display: %s": "Nepodarilo sa obnoviť zobrazenie: %s",
-    "unknown status": "neznámy stav",
-    "server error or not responding": "chyba servera alebo server neodpovedá",
-    "Could not post comment: %s": "Nepodarilo sa pridať komentár: %s",
-    "Sending paste…": "Odosiela sa príspevok…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Váš príspevok je <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(skopírujte stlačením [Ctrl]+[c])</span>",
-    "Delete data": "Odstrániť dáta",
-    "Could not create paste: %s": "Nepodarilo sa vytvoriť príspevok: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nie je možné dešifrovať príspevok: V URL adrese chýba dešifrovací kľúč (Použili ste presmerovač alebo skracovač adresy, ktorý odstráni časť adresy URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Formát",
-    "Plain Text": "Čistý text",
-    "Source Code": "Zdrojový kód",
-    "Markdown": "Markdown",
-    "Download attachment": "Stiahnuť prílohu",
-    "Cloned: '%s'": "Naklonované: '%s'",
-    "The cloned file '%s' was attached to this paste.": "K tomuto príspevku bol pripojený klonovaný súbor '%s'.",
-    "Attach a file": "Priložiť súbor",
-    "alternatively drag & drop a file or paste an image from the clipboard": "prípadne presuňte súbor myšou alebo vložte obrázok zo schránky",
-    "File too large, to display a preview. Please download the attachment.": "Súbor je príliš veľký na zobrazenie ukážky. Stiahnite si prosím prílohu.",
-    "Remove attachment": "Odstrániť prílohu",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Váš prehliadač nepodporuje nahrávanie šifrovaných súborov. Použite prosím novší prehliadač.",
-    "Invalid attachment.": "Neplatná príloha.",
-    "Options": "Možnosti",
-    "Shorten URL": "Skrátiť URL",
-    "Editor": "Editor",
-    "Preview": "Náhľad",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s vyžaduje, aby PATH končila na \"%s\". Aktualizujte prosím PATH vo svojom index.php.",
-    "Decrypt": "Dešifrovať",
-    "Enter password": "Zadajte heslo",
-    "Loading…": "Načítava sa…",
-    "Decrypting paste…": "Dešifrovanie príspevku…",
-    "Preparing new paste…": "Príprava nového príspevku…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "V prípade, že táto správa nezmizne, pozrite si <a href=\"%s\">tieto často kladené otázky, kde nájdete informácie na riešenie problémov</a>.",
-    "+++ no paste text +++": "+++ žiadny vložený text +++",
-    "Could not get paste data: %s": "Nepodarilo sa načítať údaje príspevku: %s",
-    "QR code": "QR kód",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Táto webová stránka používa nezabezpečené pripojenie HTTP! Používajte ju len na testovanie.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Pre viac informácií si pozrite <a href=\"%s\">tento záznam FAQ</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Váš prehliadač môže na podporu rozhrania WebCrypto API vyžadovať pripojenie HTTPS. Skúste <a href=\"%s\">prepnúť na HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Váš prehliadač nepodporuje WebAssembly, ktorý sa používa na kompresiu zlib. Môžete vytvárať nekomprimované dokumenty, ale nemôžete čítať komprimované.",
-    "waiting on user to provide a password": "čakám na zadanie hesla",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Údaje sa nepodarilo dešifrovať. Zadali ste nesprávne heslo? Skúste to znova pomocou tlačidla v hornej časti.",
-    "Retry": "Opakovať",
-    "Showing raw text…": "Zobrazuje sa surový text…",
-    "Notice:": "Upozornenie:",
-    "This link will expire after %s.": "Platnosť odkazu vyprší za %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Tento odkaz je prístupný iba raz, nepoužívajte v prehliadači tlačidlo Späť ani Obnoviť.",
-    "Link:": "Odkaz:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Príjemca sa môže dozvedieť o vašom časovom pásme, previesť čas na UTC?",
-    "Use Current Timezone": "Použiť aktuálne časové pásmo",
-    "Convert To UTC": "Previesť na UTC",
-    "Close": "Zavrieť",
-    "Encrypted note on %s": "Zašifrovaná poznámka na %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Ak chcete zobraziť poznámku, navštívte tento odkaz. Poskytnutie adresy URL komukoľvek im umožní prístup aj k poznámke.",
-    "URL shortener may expose your decrypt key in URL.": "Skracovač adries URL môže odhaliť váš dešifrovací kľúč v adrese URL.",
-    "Save paste": "Uložiť príspevok",
-    "Your IP is not authorized to create pastes.": "Vaša IP adresa nie je oprávnená vytvárať príspevky.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Pokúšate sa skrátiť adresu URL, ktorá neukazuje na túto inštanciu.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/sl.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s je minimalističen, odprtokodni spletni 'pastebin', kjer server ne ve ničesar o prilepljenih podatkih. Podatki so zakodirani/odkodirani %sv brskalniku%s z uporabo 256 bitnega AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Več informacij na <a href=\"https://privatebin.info/\">spletni strani projekta.</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s je minimalističen, odprtokodni spletni 'pastebin', kjer server ne ve ničesar o prilepljenih podatkih. Podatki so zakodirani/odkodirani <i>v brskalniku</i> z uporabo 256 bitnega AES. Več informacij na <a href=\"https://privatebin.info/\">spletni strani projekta.</a>.",
     "Because ignorance is bliss": "Ker kar ne veš ne boli.",
     "en": "sl",
     "Paste does not exist, has expired or has been deleted.": "Prilepek ne obstaja, mu je potekla življenjska doba, ali pa je izbrisan.",
     "%s requires php %s or above to work. Sorry.": "Oprosti, %s za delovanje potrebuje vsaj php %s.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s potrebuje sekcijo konfiguracij [%s] v konfiguracijski datoteki.",
-    "Please wait %d seconds between each post.": [
-        "Prosim počakaj vsaj %d sekundo pred vsako naslednjo objavo.",
-        "Prosim počakaj vsaj %d sekundi pred vsako naslednjo objavo.",
-        "Prosim počakaj vsaj %d sekunde pred vsako naslednjo objavo.",
-        "Prosim počakaj vsaj %d sekund pred vsako naslednjo objavo."
-    ],
+    "Please wait %d seconds between each post.": "Prosim počakaj vsaj %d sekund pred vsako naslednjo objavo.",
     "Paste is limited to %s of encrypted data.": "Velikost prilepka je omejena na %s zakodiranih podatkov.",
     "Invalid data.": "Neveljavni podatki.",
     "You are unlucky. Try again.": "Nimaš sreče, poskusi ponovno.",
@@ -182,12 +176,6 @@
     "Use Current Timezone": "Use Current Timezone",
     "Convert To UTC": "Convert To UTC",
     "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/sv.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "More information on the <a href=\"https://privatebin.info/\">project page</a>.",
-    "Because ignorance is bliss": "Because ignorance is bliss",
-    "en": "sv",
-    "Paste does not exist, has expired or has been deleted.": "Paste does not exist, has expired or has been deleted.",
-    "%s requires php %s or above to work. Sorry.": "%s requires php %s or above to work. Sorry.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s requires configuration section [%s] to be present in configuration file.",
-    "Please wait %d seconds between each post.": [
-        "Please wait %d second between each post. (singular)",
-        "Please wait %d seconds between each post. (1st plural)",
-        "Please wait %d seconds between each post. (2nd plural)",
-        "Please wait %d seconds between each post. (3rd plural)"
-    ],
-    "Paste is limited to %s of encrypted data.": "Paste is limited to %s of encrypted data.",
-    "Invalid data.": "Invalid data.",
-    "You are unlucky. Try again.": "You are unlucky. Try again.",
-    "Error saving comment. Sorry.": "Error saving comment. Sorry.",
-    "Error saving paste. Sorry.": "Error saving paste. Sorry.",
-    "Invalid paste ID.": "Invalid paste ID.",
-    "Paste is not of burn-after-reading type.": "Paste is not of burn-after-reading type.",
-    "Wrong deletion token. Paste was not deleted.": "Wrong deletion token. Paste was not deleted.",
-    "Paste was properly deleted.": "Paste was properly deleted.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript is required for %s to work. Sorry for the inconvenience.",
-    "%s requires a modern browser to work.": "%s requires a modern browser to work.",
-    "New": "New",
-    "Send": "Send",
-    "Clone": "Clone",
-    "Raw text": "Raw text",
-    "Expires": "Expires",
-    "Burn after reading": "Burn after reading",
-    "Open discussion": "Open discussion",
-    "Password (recommended)": "Password (recommended)",
-    "Discussion": "Discussion",
-    "Toggle navigation": "Toggle navigation",
-    "%d seconds": [
-        "%d second (singular)",
-        "%d seconds (1st plural)",
-        "%d seconds (2nd plural)",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d minute (singular)",
-        "%d minutes (1st plural)",
-        "%d minutes (2nd plural)",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d hour (singular)",
-        "%d hours (1st plural)",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d day (singular)",
-        "%d days (1st plural)",
-        "%d days (2nd plural)",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d week (singular)",
-        "%d weeks (1st plural)",
-        "%d weeks (2nd plural)",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d month (singular)",
-        "%d months (1st plural)",
-        "%d months (2nd plural)",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%d year (singular)",
-        "%d years (1st plural)",
-        "%d years (2nd plural)",
-        "%d years (3rd plural)"
-    ],
-    "Never": "Never",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
-    "This document will expire in %d seconds.": [
-        "This document will expire in %d second. (singular)",
-        "This document will expire in %d seconds. (1st plural)",
-        "This document will expire in %d seconds. (2nd plural)",
-        "This document will expire in %d seconds. (3rd plural)"
-    ],
-    "This document will expire in %d minutes.": [
-        "This document will expire in %d minute. (singular)",
-        "This document will expire in %d minutes. (1st plural)",
-        "This document will expire in %d minutes. (2nd plural)",
-        "This document will expire in %d minutes. (3rd plural)"
-    ],
-    "This document will expire in %d hours.": [
-        "This document will expire in %d hour. (singular)",
-        "This document will expire in %d hours. (1st plural)",
-        "This document will expire in %d hours. (2nd plural)",
-        "This document will expire in %d hours. (3rd plural)"
-    ],
-    "This document will expire in %d days.": [
-        "This document will expire in %d day. (singular)",
-        "This document will expire in %d days. (1st plural)",
-        "This document will expire in %d days. (2nd plural)",
-        "This document will expire in %d days. (3rd plural)"
-    ],
-    "This document will expire in %d months.": [
-        "This document will expire in %d month. (singular)",
-        "This document will expire in %d months. (1st plural)",
-        "This document will expire in %d months. (2nd plural)",
-        "This document will expire in %d months. (3rd plural)"
-    ],
-    "Please enter the password for this paste:": "Please enter the password for this paste:",
-    "Could not decrypt data (Wrong key?)": "Could not decrypt data (Wrong key?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Could not delete the paste, it was not stored in burn after reading mode.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.",
-    "Could not decrypt comment; Wrong key?": "Could not decrypt comment; Wrong key?",
-    "Reply": "Reply",
-    "Anonymous": "Anonymous",
-    "Avatar generated from IP address": "Avatar generated from IP address",
-    "Add comment": "Add comment",
-    "Optional nickname…": "Optional nickname…",
-    "Post comment": "Post comment",
-    "Sending comment…": "Sending comment…",
-    "Comment posted.": "Comment posted.",
-    "Could not refresh display: %s": "Could not refresh display: %s",
-    "unknown status": "unknown status",
-    "server error or not responding": "server error or not responding",
-    "Could not post comment: %s": "Could not post comment: %s",
-    "Sending paste…": "Sending paste…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>",
-    "Delete data": "Delete data",
-    "Could not create paste: %s": "Could not create paste: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Plain Text",
-    "Source Code": "Source Code",
-    "Markdown": "Markdown",
-    "Download attachment": "Download attachment",
-    "Cloned: '%s'": "Cloned: '%s'",
-    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
-    "Attach a file": "Attach a file",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatively drag & drop a file or paste an image from the clipboard",
-    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Remove attachment",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Your browser does not support uploading encrypted files. Please use a newer browser.",
-    "Invalid attachment.": "Invalid attachment.",
-    "Options": "Options",
-    "Shorten URL": "Shorten URL",
-    "Editor": "Editor",
-    "Preview": "Preview",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Decrypt",
-    "Enter password": "Enter password",
-    "Loading…": "Loading…",
-    "Decrypting paste…": "Decrypting paste…",
-    "Preparing new paste…": "Preparing new paste…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
-    "QR code": "QR code",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
-    "waiting on user to provide a password": "waiting on user to provide a password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
-    "Retry": "Retry",
-    "Showing raw text…": "Showing raw text…",
-    "Notice:": "Notice:",
-    "This link will expire after %s.": "This link will expire after %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
-    "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
-    "Use Current Timezone": "Use Current Timezone",
-    "Convert To UTC": "Convert To UTC",
-    "Close": "Close",
-    "Encrypted note on %s": "Encrypted note on %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.",
-    "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.",
-    "Save paste": "Save paste",
-    "Your IP is not authorized to create pastes.": "Your IP is not authorized to create pastes.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/tr.json

@@ -1,193 +0,0 @@
-{
-    "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s sunucunun burada paylaştığınız veriyi görmediği, minimal, açık kaynak bir pastebindir. Veriler tarayıcıda 256 bit AES kullanılarak şifrelenir/çözülür.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Daha fazla bilgi için <a href=\"https://privatebin.info/\">proje sayfası</a>'na göz atabilirsiniz.",
-    "Because ignorance is bliss": "Çünkü, cehalet mutluluktur",
-    "en": "tr",
-    "Paste does not exist, has expired or has been deleted.": "Paste does not exist, has expired or has been deleted.",
-    "%s requires php %s or above to work. Sorry.": "%s PHP %s veya daha üstünü gerektirir.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s konfigürasyon bölümünün [%s] bulunmasını gerektir.",
-    "Please wait %d seconds between each post.": [
-        "Lütfen paylaşımlar arasında %d saniye bekleyiniz.",
-        "Lütfen paylaşımlar arasında %d saniye bekleyiniz.",
-        "Lütfen paylaşımlar arasında %d saniye bekleyiniz.",
-        "Lütfen paylaşımlar arasında %d saniye bekleyiniz."
-    ],
-    "Paste is limited to %s of encrypted data.": "Yazılar %s şifreli veriyle sınırlıdır.",
-    "Invalid data.": "Geçersiz veri.",
-    "You are unlucky. Try again.": "Lütfen tekrar deneyiniz.",
-    "Error saving comment. Sorry.": "Yorum kaydedilemedi.",
-    "Error saving paste. Sorry.": "Yazı kaydedilemedi. Üzgünüz.",
-    "Invalid paste ID.": "Geçersiz yazı ID'si.",
-    "Paste is not of burn-after-reading type.": "Yazı okunduğunda silinmeyecek şekilde ayarlanmış.",
-    "Wrong deletion token. Paste was not deleted.": "Yanlış silme anahtarı. Yazı silinemedi.",
-    "Paste was properly deleted.": "Yazı başarıyla silindi.",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript %s 'in çalışması için gereklidir. Rahatsızlıktan dolayı özür dileriz.",
-    "%s requires a modern browser to work.": "%s çalışmak için çağdaş bir tarayıcı gerektirir.",
-    "New": "Yeni",
-    "Send": "Gönder",
-    "Clone": "Kopyala",
-    "Raw text": "Açık yazı",
-    "Expires": "Süre Sonu",
-    "Burn after reading": "Okuduktan sonra sil",
-    "Open discussion": "Açık Tartışmalar",
-    "Password (recommended)": "Şifre (önerilir)",
-    "Discussion": "Tartışma",
-    "Toggle navigation": "Gezinmeyi değiştir",
-    "%d seconds": [
-        "%d saniye",
-        "%d saniye",
-        "%d saniye",
-        "%d saniye"
-    ],
-    "%d minutes": [
-        "%d dakika",
-        "%d dakika",
-        "%d dakika",
-        "%d dakika"
-    ],
-    "%d hours": [
-        "%d saat",
-        "%d saat",
-        "%d saat",
-        "%d saat"
-    ],
-    "%d days": [
-        "%d gün",
-        "%d gün",
-        "%d gün",
-        "%d gün"
-    ],
-    "%d weeks": [
-        "%d hafta",
-        "%d haftalar",
-        "%d hafta",
-        "%d hafta"
-    ],
-    "%d months": [
-        "%d ay",
-        "%d ay",
-        "%d ay",
-        "%d ay"
-    ],
-    "%d years": [
-        "%d yıl",
-        "%d yıl",
-        "%d yıl",
-        "%d yıl"
-    ],
-    "Never": "Asla",
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.",
-    "This document will expire in %d seconds.": [
-        "Bu belge %d saniyede silinecektir.",
-        "Bu belge %d saniyede silinecektir.",
-        "Bu belge %d saniyede silinecektir.",
-        "Bu belge %d saniyede silinecektir."
-    ],
-    "This document will expire in %d minutes.": [
-        "Bu belge %d dakikada silinecektir.",
-        "Bu belge %d dakikada silinecektir.",
-        "Bu belge %d dakikada silinecektir.",
-        "Bu belge %d dakikada silinecektir."
-    ],
-    "This document will expire in %d hours.": [
-        "Bu belge %d saatte silinecektir.",
-        "Bu belge %d saatte silinecektir.",
-        "Bu belge %d saatte silinecektir.",
-        "Bu belge %d saatte silinecektir."
-    ],
-    "This document will expire in %d days.": [
-        "Bu belge %d günde silinecektir.",
-        "Bu belge %d günde silinecektir.",
-        "Bu belge %d günde silinecektir.",
-        "Bu belge %d günde silinecektir."
-    ],
-    "This document will expire in %d months.": [
-        "Bu belge %d ayda silinecektir.",
-        "Bu belge %d ayda silinecektir.",
-        "Bu belge %d ayda silinecektir.",
-        "Bu belge %d ayda silinecektir."
-    ],
-    "Please enter the password for this paste:": "Lütfen bu yazı için şifrenizi girin:",
-    "Could not decrypt data (Wrong key?)": "Şifre çözülemedi (Yanlış anahtar mı kullandınız?)",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Yazı silinemedi, okunduktan sonra silinmek için ayarlanmadı.",
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "BU DOSYAYI SADECE SİZ GÖRÜNTÜLEYEBİLİRSİNİZ. Bu pencereyi kapatmayın, yazıyı tekrar görüntüleyemeyeceksiniz.",
-    "Could not decrypt comment; Wrong key?": "Dosya şifresi çözülemedi, doğru anahtarı girdiğinizden emin misiniz?",
-    "Reply": "Cevapla",
-    "Anonymous": "Anonim",
-    "Avatar generated from IP address": "IP adresinden oluşturulmuş avatar",
-    "Add comment": "Yorum ekle",
-    "Optional nickname…": "İsteğe bağlı takma isim…",
-    "Post comment": "Yorumu gönder",
-    "Sending comment…": "Yorum gönderiliyor…",
-    "Comment posted.": "Yorum gönderildi.",
-    "Could not refresh display: %s": "Görüntü yenilenemedi: %s",
-    "unknown status": "bilinmeyen durum",
-    "server error or not responding": "sunucu hatası veya yanıt vermiyor",
-    "Could not post comment: %s": "Yorum paylaşılamadı: %s",
-    "Sending paste…": "Yazı gönderiliyor…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Yazınız: <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">([Ctrl]+[c] tuşlarına basarak kopyalayın.)</span>",
-    "Delete data": "Veriyi sil",
-    "Could not create paste: %s": "Yazı oluşturulamadı: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Yazı şifresi çözülemedi, çözme anahtarı URL'de bulunamadı. (Buraya bir yönlendirici veya URL kısaltıcı kullanarak gelmiş olabilirsiniz.)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Format",
-    "Plain Text": "Düz Yazı",
-    "Source Code": "Kaynak Kodu",
-    "Markdown": "Markdown",
-    "Download attachment": "Eki indir",
-    "Cloned: '%s'": "Klonlandı: '%s'",
-    "The cloned file '%s' was attached to this paste.": "Klonlanmış dosya '%s' bu yazıya eklendi.",
-    "Attach a file": "Dosya ekle",
-    "alternatively drag & drop a file or paste an image from the clipboard": "alternatif olarak dosyasyı yapıştırabilir veya sürükleyip bırakabilirsin",
-    "File too large, to display a preview. Please download the attachment.": "Dosya önizleme için çok büyük. Lütfen eki indirin.",
-    "Remove attachment": "Eki sil",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Tarayıcınız şifreli dosyaları desteklemiyor.",
-    "Invalid attachment.": "Geçersiz ek.",
-    "Options": "Seçenekler",
-    "Shorten URL": "URL kısaltma",
-    "Editor": "Düzenleyici",
-    "Preview": "Ön izleme",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Şifreyi çöz",
-    "Enter password": "Şifreyi girin",
-    "Loading…": "Yükleniyor…",
-    "Decrypting paste…": "Yazı şifresi çözülüyor…",
-    "Preparing new paste…": "Yeni yazı hazırlanıyor…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.",
-    "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Yazı verisi alınamıyor: %s",
-    "QR code": "QR kodu",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "This website is using an insecure HTTP connection! Please use it only for testing.",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.",
-    "waiting on user to provide a password": "waiting on user to provide a password",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Dosya şifresi çözülemedi, doğru şifreyi kullandığınıza emin misiniz? Üstteki buton ile tekrar deneyin.",
-    "Retry": "Yeniden Dene",
-    "Showing raw text…": "Açık yazı gösteriliyor…",
-    "Notice:": "Bildirim:",
-    "This link will expire after %s.": "Bu bağlantı şu kadar zaman sonra etkisiz kalacaktır: %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Bu bağlantı sadece bir kere erişilebilir, lütfen sayfayı yenilemeyiniz.",
-    "Link:": "Bağlantı:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Alıcı zaman dilmini öğrenebilir, zaman dilimini UTC'ye çevirmek ister misin?",
-    "Use Current Timezone": "Şuanki zaman dilimini kullan",
-    "Convert To UTC": "UTC zaman dilimine çevir",
-    "Close": "Kapat",
-    "Encrypted note on %s": "%s üzerinde şifrelenmiş not",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Notu görmek için bu bağlantıyı ziyaret et. Bağlantıya sahip olan birisi notu görebilir.",
-    "URL shortener may expose your decrypt key in URL.": "URL kısaltıcı şifreleme anahtarınızı URL içerisinde gösterebilir.",
-    "Save paste": "Yazıyı kaydet",
-    "Your IP is not authorized to create pastes.": "IP adresinizin yazı oluşturmaya yetkisi yoktur.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
-}

i18n/uk.json

@@ -1,18 +1,12 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s це мінімалістичний Open Source проєкт для створення нотаток, де сервер не знає нічого про дані, що зберігаються. Дані шифруються/розшифровуються %sу переглядачі%s з використанням 256-бітного шифрувания AES.",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "Подробиці можна дізнатися на <a href=\"https://privatebin.info/\">сайті проєкту</a>.",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s це мінімалістичний Open Source проєкт для створення нотаток, де сервер не знає нічого про дані, що зберігаються. Дані шифруються/розшифровуються <i>у переглядачі</i> з використанням 256-бітного шифрувания AES. Подробиці можна дізнатися на <a href=\"https://privatebin.info/\">сайті проєкту</a>.",
     "Because ignorance is bliss": "Бо незнання - благо",
     "en": "uk",
     "Paste does not exist, has expired or has been deleted.": "Допис не існує, протермінований чи був видалений.",
     "%s requires php %s or above to work. Sorry.": "Для роботи %s потрібен php %s и вище. Вибачте.",
     "%s requires configuration section [%s] to be present in configuration file.": "%s потрібна секція [%s] в конфігураційному файлі.",
-    "Please wait %d seconds between each post.": [
-        "Будь ласка, зачекайте %d секунду між створеннями.",
-        "Будь ласка, зачекайте %d секунди між створеннями.",
-        "Будь ласка, зачекайте %d секунд між створеннями.",
-        "Будь ласка, зачекайте %d секунд між створеннями."
-    ],
+    "Please wait %d seconds between each post.": "Please wait %d seconds between each post.",
     "Paste is limited to %s of encrypted data.": "Розмір допису обмежений %s зашифрованих даних.",
     "Invalid data.": "Неправильні дані.",
     "You are unlucky. Try again.": "Вам не пощастило. Спробуйте ще раз.",
@@ -38,43 +32,43 @@
         "%d секунду",
         "%d секунди",
         "%d секунд",
-        "%d секунд"
+        "%d seconds (3rd plural)"
     ],
     "%d minutes": [
         "%d хвилину",
         "%d хвилини",
         "%d хвилин",
-        "%d хвилин"
+        "%d minutes (3rd plural)"
     ],
     "%d hours": [
         "%d годину",
         "%d години",
         "%d годин",
-        "%d годин"
+        "%d hours (3rd plural)"
     ],
     "%d days": [
         "%d день",
         "%d дні",
         "%d днів",
-        "%d днів"
+        "%d days (3rd plural)"
     ],
     "%d weeks": [
         "%d тиждень",
         "%d тижні",
         "%d тижнів",
-        "%d тижнів"
+        "%d weeks (3rd plural)"
     ],
     "%d months": [
         "%d місяць",
         "%d місяці",
         "%d місяців",
-        "%d місяців"
+        "%d months (3rd plural)"
     ],
     "%d years": [
         "%d рік",
         "%d роки",
         "%d років",
-        "%d років"
+        "%d years (3rd plural)"
     ],
     "Never": "Ніколи",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Примітка: Це тестовий сервіс: Дані можуть бути вилучені в будь який момент. Кошенята помруть, якщо ви будете зловживати сервісом.",
@@ -82,31 +76,31 @@
         "Документ буде вилучений через %d секунду.",
         "Документ буде вилучений через %d секунди.",
         "Документ буде вилучений через %d секунд.",
-        "Документ буде вилучений через %d секунд."
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "Документ буде вилучений через %d хвилину.",
         "Документ буде вилучений через %d хвилини.",
         "Документ буде вилучений через %d хвилин.",
-        "Документ буде вилучений через %d хвилин."
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "Документ буде вилучений через %d годину.",
         "Документ буде вилучений через %d години.",
         "Документ буде вилучений через %d годин.",
-        "Документ буде вилучений через %d годин."
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "Документ буде вилучений через %d день.",
         "Документ буде вилучений через %d дні.",
         "Документ буде вилучений через %d днів.",
-        "Документ буде вилучений через %d днів."
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "Документ буде вилучений через %d місяць.",
         "Документ буде вилучений через %d місяці.",
         "Документ буде вилучений через %d місяців.",
-        "Документ буде вилучений через %d місяців."
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "Будь ласка, введіть пароль від допису:",
     "Could not decrypt data (Wrong key?)": "Неможливо розшифрувати дані (Неправильний  ключ?)",
@@ -170,24 +164,18 @@
     "For more information <a href=\"%s\">see this FAQ entry</a>.": "Для подробиць <a href=\"%s\">дивіться інформацію в FAQ</a>.",
     "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Ваш переглядач вимагає підключення HTTPS для підтримки  WebCrypto API. Спробуйте <a href=\"%s\">перемкнутися на HTTPS</a>.",
     "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Ваш переглядач не підтримує WebAssembly, що використовується для стиснення zlib. Ви можете створювати нестиснені документи, але не зможете читати стиснені.",
-    "waiting on user to provide a password": "очікування користувача для вводу паролю",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Не вдалося розшифрувати дані. Може, ви ввели неправильний пароль? Спробуйте знову за допомогою верхньої кнопки.",
-    "Retry": "Спробуйте ще раз",
-    "Showing raw text…": "Відображається неформатований текст…",
-    "Notice:": "Зверніть увагу:",
-    "This link will expire after %s.": "Термін дії цього посилання сплине через %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Дане посилання доступна тільки один раз, не натискайте кнопку назад та не обновляйте сторінку браузера.",
-    "Link:": "Посилання:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Отримувач дізнається ваш часовий пояс, перетворити час в UTC?",
-    "Use Current Timezone": "Використовувати поточний часовий пояс",
-    "Convert To UTC": "Конвертувати в UTC",
-    "Close": "Закрити",
-    "Encrypted note on %s": "Зашифрована нотатка на %s",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Відвідайте посилання, щоб переглянути нотатку. Передача посилання будь-кому дозволить їм переглянути нотатку.",
-    "URL shortener may expose your decrypt key in URL.": "Сервіс скорочення посилань може викрити ваш ключ дешифрування з URL.",
-    "Save paste": "Зберегти вставку",
-    "Your IP is not authorized to create pastes.": "Вашому IP не дозволено створювати вставки.",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "waiting on user to provide a password": "waiting on user to provide a password",
+    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.",
+    "Retry": "Retry",
+    "Showing raw text…": "Showing raw text…",
+    "Notice:": "Notice:",
+    "This link will expire after %s.": "This link will expire after %s.",
+    "This link can only be accessed once, do not use back or refresh button in your browser.": "This link can only be accessed once, do not use back or refresh button in your browser.",
+    "Link:": "Link:",
+    "Recipient may become aware of your timezone, convert time to UTC?": "Recipient may become aware of your timezone, convert time to UTC?",
+    "Use Current Timezone": "Use Current Timezone",
+    "Convert To UTC": "Convert To UTC",
+    "Close": "Close",
+    "Encrypted note on PrivateBin": "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/zh.json

@@ -1,29 +1,23 @@
 {
     "PrivateBin": "PrivateBin",
-    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted %sin the browser%s using 256 bits AES.": "%s 是一个极简、开源、对粘贴内容毫不知情的在线粘贴板，数据%s在浏览器内%s进行 AES-256 加密和解密。",
-    "More information on the <a href=\"https://privatebin.info/\">project page</a>.": "更多信息请查看<a href=\"https://privatebin.info/\">项目主页</a>。",
+    "%s is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted <i>in the browser</i> using 256 bits AES. More information on the <a href=\"https://privatebin.info/\">project page</a>.": "%s是一个极简、开源、对粘贴内容毫不知情的在线粘贴板，数据<i>在浏览器内</i>进行AES-256加密。更多信息请查看<a href=\"https://privatebin.info/\">项目主页</a>。",
     "Because ignorance is bliss": "因为无知是福",
     "en": "zh",
-    "Paste does not exist, has expired or has been deleted.": "粘贴内容不存在、已过期或已被删除。",
-    "%s requires php %s or above to work. Sorry.": "抱歉，%s 需要 PHP %s 及以上版本才能运行。",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s 需要设置配置文件中的 [%s] 部分。",
-    "Please wait %d seconds between each post.": [
-        "每 %d 秒只能粘贴一次。",
-        "每 %d 秒只能粘贴一次。",
-        "每 %d 秒只能粘贴一次。",
-        "每 %d 秒只能粘贴一次。"
-    ],
-    "Paste is limited to %s of encrypted data.": "对于加密数据，上限为 %s。",
+    "Paste does not exist, has expired or has been deleted.": "粘贴内容不存在，已过期或已被删除。",
+    "%s requires php %s or above to work. Sorry.": "%s需要PHP %s及以上版本来工作，抱歉。",
+    "%s requires configuration section [%s] to be present in configuration file.": "%s需要设置配置文件中 [%s] 部分。",
+    "Please wait %d seconds between each post.": "每 %d 秒只能粘贴一次。",
+    "Paste is limited to %s of encrypted data.": "粘贴受限于 %s 加密数据。",
     "Invalid data.": "无效的数据。",
     "You are unlucky. Try again.": "请再试一次。",
     "Error saving comment. Sorry.": "保存评论时出现错误，抱歉。",
     "Error saving paste. Sorry.": "保存粘贴内容时出现错误，抱歉。",
-    "Invalid paste ID.": "无效的 ID。",
+    "Invalid paste ID.": "无效的ID。",
     "Paste is not of burn-after-reading type.": "粘贴内容不是阅后即焚类型。",
     "Wrong deletion token. Paste was not deleted.": "错误的删除token，粘贴内容没有被删除。",
     "Paste was properly deleted.": "粘贴内容已被正确删除。",
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "%s 需要 JavaScript 来进行加解密。 给你带来的不便敬请谅解。",
-    "%s requires a modern browser to work.": "%s 需要在现代浏览器上工作。",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.": "%s需要JavaScript来进行加解密。 给你带来的不便敬请谅解。",
+    "%s requires a modern browser to work.": "%s需要在现代浏览器上工作。",
     "New": "新建",
     "Send": "送出",
     "Clone": "复制",
@@ -37,82 +31,82 @@
     "%d seconds": [
         "%d 秒",
         "%d 秒",
-        "%d 秒",
-        "%d 秒"
+        "%d seconds (2nd plural)",
+        "%d seconds (3rd plural)"
     ],
     "%d minutes": [
         "%d 分钟",
         "%d 分钟",
-        "%d 秒",
-        "%d 秒"
+        "%d minutes (2nd plural)",
+        "%d minutes (3rd plural)"
     ],
     "%d hours": [
         "%d 小时",
         "%d 小时",
-        "%d 小时",
-        "%d 小时"
+        "%d hours (2nd plural)",
+        "%d hours (3rd plural)"
     ],
     "%d days": [
         "%d 天",
         "%d 天",
-        "%d 天",
-        "%d 天"
+        "%d days (2nd plural)",
+        "%d days (3rd plural)"
     ],
     "%d weeks": [
         "%d 周",
         "%d 周",
-        "%d 周",
-        "%d 周"
+        "%d weeks (2nd plural)",
+        "%d weeks (3rd plural)"
     ],
     "%d months": [
         "%d 个月",
         "%d 个月",
-        "%d 个月",
-        "%d 个月"
+        "%d months (2nd plural)",
+        "%d months (3rd plural)"
     ],
     "%d years": [
         "%d 年",
         "%d 年",
-        "%d 年",
-        "%d 年"
+        "%d years (2nd plural)",
+        "%d years (3rd plural)"
     ],
     "Never": "永不过期",
     "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "注意：这是一个测试服务，数据随时可能被删除。如果你滥用这个服务的话，小猫咪会死的。",
     "This document will expire in %d seconds.": [
         "这份文档将在一秒后过期。",
-        "这份文档将在 %d 秒后过期。",
-        "这份文档将在 %d 秒后过期。",
-        "这份文档将在 %d 秒后过期。"
+        "这份文档将在 %d 秒后过期",
+        "This document will expire in %d seconds (2nd plural)",
+        "This document will expire in %d seconds (3rd plural)"
     ],
     "This document will expire in %d minutes.": [
         "这份文档将在一分钟后过期。",
         "这份文档将在 %d 分钟后过期。",
-        "这份文档将在 %d 分钟后过期。",
-        "这份文档将在 %d 分钟后过期。"
+        "This document will expire in %d minutes (2nd plural)",
+        "This document will expire in %d minutes (3rd plural)"
     ],
     "This document will expire in %d hours.": [
         "这份文档将在一小时后过期。",
         "这份文档将在 %d 小时后过期。",
-        "这份文档将在 %d 小时后过期。",
-        "这份文档将在 %d 小时后过期。"
+        "This document will expire in %d hours (2nd plural)",
+        "This document will expire in %d hours (3rd plural)"
     ],
     "This document will expire in %d days.": [
         "这份文档将在一天后过期。",
         "这份文档将在 %d 天后过期。",
-        "这份文档将在 %d 天后过期。",
-        "这份文档将在 %d 天后过期。"
+        "This document will expire in %d days (2nd plural)",
+        "This document will expire in %d days (3rd plural)"
     ],
     "This document will expire in %d months.": [
         "这份文档将在一个月后过期。",
         "这份文档将在 %d 个月后过期。",
-        "这份文档将在 %d 个月后过期。",
-        "这份文档将在 %d 个月后过期。"
+        "This document will expire in %d months (2nd plural)",
+        "This document will expire in %d months (3rd plural)"
     ],
     "Please enter the password for this paste:": "请输入这份粘贴内容的密码：",
     "Could not decrypt data (Wrong key?)": "无法解密数据（密钥错误？）",
     "Could not delete the paste, it was not stored in burn after reading mode.": "无法删除此粘贴内容，它没有以阅后即焚模式保存。",
     "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "看！仔！细！了！不要关闭窗口，否则你再也见不到这条消息了。",
-    "Could not decrypt comment; Wrong key?": "无法解密评论；密钥错误？",
+    "Could not decrypt comment; Wrong key?": "无法解密评论; 密钥错误？",
     "Reply": "回复",
     "Anonymous": "匿名",
     "Avatar generated from IP address": "由IP生成的头像",
@@ -126,7 +120,7 @@
     "server error or not responding": "服务器错误或无回应",
     "Could not post comment: %s": "无法发送评论： %s",
     "Sending paste…": "粘贴内容提交中…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "您粘贴内容的链接是 <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">（按下 [Ctrl]+[C] 以复制）</span>",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "您粘贴内容的链接是<a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(按下 [Ctrl]+[c] 以复制)</span>",
     "Delete data": "删除数据",
     "Could not create paste: %s": "无法创建粘贴：%s",
     "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "无法解密粘贴：URL中缺失解密密钥（是否使用了重定向或者短链接导致密钥丢失？）",
@@ -144,50 +138,44 @@
     "Source Code": "源代码",
     "Markdown": "Markdown",
     "Download attachment": "下载附件",
-    "Cloned: '%s'": "副本：“%s”",
-    "The cloned file '%s' was attached to this paste.": "副本“%s”已附加到此粘贴内容。",
+    "Cloned: '%s'": "副本: '%s'",
+    "The cloned file '%s' was attached to this paste.": "副本 '%s' 已附加到此粘贴内容。",
     "Attach a file": "添加一个附件",
     "alternatively drag & drop a file or paste an image from the clipboard": "拖放文件或从剪贴板粘贴图片",
-    "File too large, to display a preview. Please download the attachment.": "文件过大，无法显示预览。请下载附件。",
+    "File too large, to display a preview. Please download the attachment.": "文件过大。要显示预览，请下载附件。",
     "Remove attachment": "移除附件",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "您的浏览器不支持上传加密的文件，请使用新版本的浏览器。",
+    "Your browser does not support uploading encrypted files. Please use a newer browser.": "您的浏览器不支持上传加密的文件，请使用更新的浏览器。",
     "Invalid attachment.": "无效的附件",
     "Options": "选项",
     "Shorten URL": "缩短链接",
     "Editor": "编辑",
     "Preview": "预览",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s 的 PATH 变量必须结束于“%s”。 请修改你的 index.php 中的 PATH 变量。",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s 的 PATH 变量必须结束于 \"%s\"。 请修改你的 index.php 中的 PATH 变量。",
     "Decrypt": "解密",
     "Enter password": "输入密码",
     "Loading…": "载入中…",
     "Decrypting paste…": "正在解密",
     "Preparing new paste…": "正在准备新的粘贴内容",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "如果此消息一直存在，请参考 <a href=\"%s\">这里的 FAQ（英文版）</a>排除故障。",
-    "+++ no paste text +++": "+++ 无粘贴内容 +++",
+    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "如果这个消息一直存在，请参考 <a href=\"%s\">这里的 FAQ （英文版）</a>进行故障排除。",
+    "+++ no paste text +++": "+++ 没有粘贴内容 +++",
     "Could not get paste data: %s": "无法获取粘贴数据：%s",
     "QR code": "二维码",
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "该网站使用了不安全的 HTTP 连接！请仅将其用于测试。",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "有关更多信息，请参阅<a href=\"%s\">此常见问题解答</a>。",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "您的浏览器可能需要 HTTPS 连接才能支持 WebCrypto API。 尝试<a href=\"%s\">切换到 HTTPS</a>。",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "您的浏览器不支持用于 zlib 压缩的 WebAssembly。 您可以创建未压缩的文档，但不能读取压缩的文档。",
+    "This website is using an insecure HTTP connection! Please use it only for testing.": "该网站使用了不安全的HTTP连接！ 请仅将其用于测试。",
+    "For more information <a href=\"%s\">see this FAQ entry</a>.": "有关更多信息，<a href=\"%s\">请参阅此常见问题解答</a>。",
+    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "您的浏览器可能需要HTTPS连接才能支持WebCrypto API。 尝试<a href=\"%s\">切换到HTTPS </a>。",
+    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "您的浏览器不支持用于zlib压缩的WebAssembly。 您可以创建未压缩的文档，但不能读取压缩的文档。",
     "waiting on user to provide a password": "请输入密码",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "无法解密数据。您是否输入了错误的密码？按顶部的按钮重试。",
+    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "无法解密数据。 您输入了错误的密码吗？ 点顶部的按钮重试。",
     "Retry": "重试",
     "Showing raw text…": "显示原始文字…",
-    "Notice:": "注意：",
+    "Notice:": "注意:",
     "This link will expire after %s.": "这个链接将会在 %s 过期。",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "此链接只能被访问一次，请勿使用浏览器中的返回和刷新按钮。",
-    "Link:": "链接：",
-    "Recipient may become aware of your timezone, convert time to UTC?": "收件人可能会知道您的时区，将时间转换为 UTC？",
+    "This link can only be accessed once, do not use back or refresh button in your browser.": "这个链接只能被访问一次，请勿使用浏览器中的返回和刷新按钮。",
+    "Link:": "链接地址:",
+    "Recipient may become aware of your timezone, convert time to UTC?": "收件人可能会知道您的时区，将时间转换为UTC？",
     "Use Current Timezone": "使用当前时区",
-    "Convert To UTC": "转换为 UTC",
+    "Convert To UTC": "转换为UTC",
     "Close": "关闭",
-    "Encrypted note on %s": "%s 上的加密笔记",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "访问此链接来查看该笔记。将此 URL 发送给任何人即可允许其访问该笔记。",
-    "URL shortener may expose your decrypt key in URL.": "短链接服务可能会暴露您在 URL 中的解密密钥。",
-    "Save paste": "保存内容",
-    "Your IP is not authorized to create pastes.": "您的 IP 无权创建粘贴。",
-    "Trying to shorten a URL that isn't pointing at our instance.": "Trying to shorten a URL that isn't pointing at our instance.",
-    "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".": "Error calling YOURLS. Probably a configuration issue, like wrong or missing \"apiurl\" or \"signature\".",
-    "Error parsing YOURLS response.": "Error parsing YOURLS response."
+    "Encrypted note on PrivateBin": "PrivateBin上的加密笔记",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "访问这个链接来查看该笔记。 将这个URL发送给任何人即可允许其访问该笔记。"
 }

index.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 // change this, if your php files and data is outside of your webservers document root

js/base-x-3.0.7.js

@@ -1,16 +1,17 @@
 'use strict';
 // base-x encoding / decoding
+// based on https://github.com/cryptocoinjs/base-x 3.0.7
+// modification: removed Buffer dependency and node.modules entry
 // Copyright (c) 2018 base-x contributors
 // Copyright (c) 2014-2018 The Bitcoin Core developers (base58.cpp)
 // Distributed under the MIT software license, see the accompanying
 // file LICENSE or http://www.opensource.org/licenses/mit-license.php.
+
 (function(){
 this.baseX = function base (ALPHABET) {
   if (ALPHABET.length >= 255) { throw new TypeError('Alphabet too long') }
   var BASE_MAP = new Uint8Array(256)
-  for (var j = 0; j < BASE_MAP.length; j++) {
-    BASE_MAP[j] = 255
-  }
+  BASE_MAP.fill(255)
   for (var i = 0; i < ALPHABET.length; i++) {
     var x = ALPHABET.charAt(i)
     var xc = x.charCodeAt(0)
@@ -22,13 +23,6 @@ this.baseX = function base (ALPHABET) {
   var FACTOR = Math.log(BASE) / Math.log(256) // log(BASE) / log(256), rounded up
   var iFACTOR = Math.log(256) / Math.log(BASE) // log(256) / log(BASE), rounded up
   function encode (source) {
-    if (source instanceof Uint8Array) {
-    } else if (ArrayBuffer.isView(source)) {
-      source = new Uint8Array(source.buffer, source.byteOffset, source.byteLength)
-    } else if (Array.isArray(source)) {
-      source = Uint8Array.from(source)
-    }
-    if (!(source instanceof Uint8Array)) { throw new TypeError('Expected Uint8Array') }
     if (source.length === 0) { return '' }
         // Skip & count leading zeroes.
     var zeroes = 0
@@ -68,8 +62,10 @@ this.baseX = function base (ALPHABET) {
   }
   function decodeUnsafe (source) {
     if (typeof source !== 'string') { throw new TypeError('Expected String') }
-    if (source.length === 0) { return new Uint8Array() }
+    if (source.length === 0) { return '' }
     var psz = 0
+        // Skip leading spaces.
+    if (source[psz] === ' ') { return }
         // Skip and count leading '1's.
     var zeroes = 0
     var length = 0
@@ -96,12 +92,14 @@ this.baseX = function base (ALPHABET) {
       length = i
       psz++
     }
+        // Skip trailing spaces.
+    if (source[psz] === ' ') { return }
         // Skip leading zeroes in b256.
     var it4 = size - length
     while (it4 !== size && b256[it4] === 0) {
       it4++
     }
-    var vch = new Uint8Array(zeroes + (size - it4))
+    var vch = []
     var j = zeroes
     while (it4 !== size) {
       vch[j++] = b256[it4++]

js/common.js

@@ -8,19 +8,21 @@ global.cleanup = global.jsdom();
 global.URL = require('jsdom-url').URL;
 global.fs = require('fs');
 global.WebCrypto = require('@peculiar/webcrypto').Crypto;
+require('fake-indexeddb/auto');
+global.FDBFactory = require('fake-indexeddb/lib/FDBFactory');
 
 // application libraries to test
-global.$ = global.jQuery = require('./jquery-3.6.0');
+global.$ = global.jQuery = require('./jquery-3.4.1');
 global.RawDeflate = require('./rawinflate-0.3').RawDeflate;
-global.zlib = require('./zlib-1.2.13').zlib;
+global.zlib = require('./zlib-1.2.11').zlib;
 require('./prettify');
 global.prettyPrint = window.PR.prettyPrint;
 global.prettyPrintOne = window.PR.prettyPrintOne;
-global.showdown = require('./showdown-2.0.3');
-global.DOMPurify = require('./purify-2.3.6');
-global.baseX = require('./base-x-4.0.0').baseX;
+global.showdown = require('./showdown-1.9.1');
+global.DOMPurify = require('./purify-2.1.1');
+global.baseX = require('./base-x-3.0.7').baseX;
 global.Legacy = require('./legacy').Legacy;
-require('./bootstrap-3.4.1');
+require('./bootstrap-3.3.7');
 require('./privatebin');
 
 // internal variables
@@ -131,3 +133,4 @@ exports.jscMimeTypes = function() {
 exports.jscFormats = function() {
     return jsc.elements(formats);
 };
+

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "privatebin",
-  "version": "1.4.0",
+  "version": "1.3.0",
   "description": "PrivateBin is a minimalist, open source online pastebin where the server has zero knowledge of pasted data. Data is encrypted/decrypted in the browser using 256 bit AES in Galois Counter mode (GCM).",
   "main": "privatebin.js",
   "directories": {
@@ -8,11 +8,12 @@
   },
   "dependencies": {},
   "devDependencies": {
+    "@peculiar/webcrypto": "^1.1.1",
+    "fake-indexeddb": "^3.0.2",
     "jsdom": "^9.12.0",
     "jsdom-global": "^2.1.1",
     "jsdom-url": "^2.2.1",
-    "jsverify": "^0.8.3",
-    "@peculiar/webcrypto": "^1.1.1"
+    "jsverify": "^0.8.3"
   },
   "scripts": {
     "test": "mocha"

js/privatebin.js

@@ -6,15 +6,15 @@
  * @see       {@link https://github.com/PrivateBin/PrivateBin}
  * @copyright 2012 Sébastien SAUVAGE ({@link http://sebsauvage.net})
  * @license   {@link https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License}
- * @version   1.4.0
+ * @version   1.3.4
  * @name      PrivateBin
  * @namespace
  */
 
 // global Base64, DOMPurify, FileReader, RawDeflate, history, navigator, prettyPrint, prettyPrintOne, showdown, kjua
+'use strict';
 
 jQuery.fn.draghover = function() {
-    'use strict';
     return this.each(function() {
         let collection = $(),
             self = $(this);
@@ -37,14 +37,11 @@ jQuery.fn.draghover = function() {
 
 // main application start, called when DOM is fully loaded
 jQuery(document).ready(function() {
-    'use strict';
     // run main controller
     $.PrivateBin.Controller.init();
 });
 
 jQuery.PrivateBin = (function($, RawDeflate) {
-    'use strict';
-
     /**
      * zlib library interface
      *
@@ -52,31 +49,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
      */
     let z;
 
-    /**
-     * DOMpurify settings for HTML content
-     *
-     * @private
-     */
-     const purifyHtmlConfig = {
-        ALLOWED_URI_REGEXP: /^(?:(?:(?:f|ht)tps?|mailto|magnet):)/i,
-        SAFE_FOR_JQUERY: true,
-        USE_PROFILES: {
-            html: true
-        }
-    };
-
-    /**
-     * DOMpurify settings for SVG content
-     *
-     * @private
-     */
-     const purifySvgConfig = {
-        USE_PROFILES: {
-            svg: true,
-            svgFilters: true
-        }
-    };
-
     /**
      * CryptoData class
      *
@@ -434,8 +406,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
                     element.html().replace(
                         /(((https?|ftp):\/\/[\w?!=&.\/-;#@~%+*-]+(?![\w\s?!&.\/;#~%"=-]>))|((magnet):[\w?=&.\/-;#@~%+*-]+))/ig,
                         '<a href="$1" rel="nofollow noopener noreferrer">$1</a>'
-                    ),
-                    purifyHtmlConfig
+                    )
                 )
             );
         };
@@ -591,10 +562,11 @@ jQuery.PrivateBin = (function($, RawDeflate) {
          *
          * @name   Helper.reset
          * @function
+         * @param  {string} uri - (optional) URI to reset to
          */
-        me.reset = function()
+        me.reset = function(uri)
         {
-            baseUri = null;
+            baseUri = typeof uri === 'string' ? uri : null;
         };
 
         return me;
@@ -627,7 +599,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
          * @prop   {string[]}
          * @readonly
          */
-        const supportedLanguages = ['bg', 'ca', 'co', 'cs', 'de', 'el', 'es', 'et', 'fi', 'fr', 'he', 'hu', 'id', 'it', 'jbo', 'lt', 'no', 'nl', 'pl', 'pt', 'oc', 'ru', 'sk', 'sl', 'tr', 'uk', 'zh'];
+        const supportedLanguages = ['bg', 'cs', 'de', 'es', 'fr', 'it', 'hu', 'no', 'nl', 'pl', 'pt', 'oc', 'ru', 'sl', 'uk', 'zh'];
 
         /**
          * built in language
@@ -793,7 +765,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
         /**
          * per language functions to use to determine the plural form
          *
-         * @see    {@link https://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html}
+         * @see    {@link http://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html}
          * @name   I18n.getPluralForm
          * @function
          * @param  {int} n
@@ -803,29 +775,19 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             switch (language)
             {
                 case 'cs':
-                case 'sk':
-                    return n === 1 ? 0 : (n >= 2 && n <= 4 ? 1 : 2);
-                case 'co':
+                    return n === 1 ? 0 : (n >= 2 && n <=4 ? 1 : 2);
                 case 'fr':
                 case 'oc':
-                case 'tr':
                 case 'zh':
                     return n > 1 ? 1 : 0;
-                case 'he':
-                    return n === 1 ? 0 : (n === 2 ? 1 : ((n < 0 || n > 10) && (n % 10 === 0) ? 2 : 3));
-                case 'id':
-                case 'jbo':
-                    return 0;
-                case 'lt':
-                    return n % 10 === 1 && n % 100 !== 11 ? 0 : ((n % 10 >= 2 && n % 100 < 10 || n % 100 >= 20) ? 1 : 2);
                 case 'pl':
-                    return n === 1 ? 0 : (n % 10 >= 2 && n %10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2);
+                    return n === 1 ? 0 : (n % 10 >= 2 && n %10 <=4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2);
                 case 'ru':
                 case 'uk':
                     return n % 10 === 1 && n % 100 !== 11 ? 0 : (n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 10 || n % 100 >= 20) ? 1 : 2);
                 case 'sl':
                     return n % 100 === 1 ? 1 : (n % 100 === 2 ? 2 : (n % 100 === 3 || n % 100 === 4 ? 3 : 0));
-                // bg, ca, de, el, en, es, et, fi, hu, it, nl, no, pt
+                // bg, de, en, es, hu, it, nl, no, pt
                 default:
                     return n !== 1 ? 1 : 0;
             }
@@ -2564,8 +2526,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
                 // let showdown convert the HTML and sanitize HTML *afterwards*!
                 $plainText.html(
                     DOMPurify.sanitize(
-                        converter.makeHtml(text),
-                        purifyHtmlConfig
+                        converter.makeHtml(text)
                     )
                 );
                 // add table classes from bootstrap css
@@ -2781,34 +2742,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             $dropzone;
 
         /**
-         * get blob URL from string data and mime type
-         *
-         * @name   AttachmentViewer.getBlobUrl
-         * @private
-         * @function
-         * @param {string} data - raw data of attachment
-         * @param {string} data - mime type of attachment
-         * @return {string} objectURL
-         */
-         function getBlobUrl(data, mimeType)
-         {
-            // Transform into a Blob
-            const buf = new Uint8Array(data.length);
-            for (let i = 0; i < data.length; ++i) {
-                buf[i] = data.charCodeAt(i);
-            }
-            const blob = new window.Blob(
-                [buf],
-                {
-                    type: mimeType
-                }
-            );
-
-            // Get blob URL
-            return window.URL.createObjectURL(blob);
-         }
-
-         /**
          * sets the attachment but does not yet show it
          *
          * @name   AttachmentViewer.setAttachment
@@ -2818,42 +2751,44 @@ jQuery.PrivateBin = (function($, RawDeflate) {
          */
         me.setAttachment = function(attachmentData, fileName)
         {
-            // skip, if attachments got disabled
-            if (!$attachmentLink || !$attachmentPreview) return;
-
-            // data URI format: data:[<mimeType>][;base64],<data>
+            // data URI format: data:[<mediaType>][;base64],<data>
 
             // position in data URI string of where data begins
             const base64Start = attachmentData.indexOf(',') + 1;
-            // position in data URI string of where mimeType ends
-            const mimeTypeEnd = attachmentData.indexOf(';');
+            // position in data URI string of where mediaType ends
+            const mediaTypeEnd = attachmentData.indexOf(';');
 
-            // extract mimeType
-            const mimeType = attachmentData.substring(5, mimeTypeEnd);
+            // extract mediaType
+            const mediaType = attachmentData.substring(5, mediaTypeEnd);
             // extract data and convert to binary
             const rawData = attachmentData.substring(base64Start);
             const decodedData = rawData.length > 0 ? atob(rawData) : '';
 
-            let blobUrl = getBlobUrl(decodedData, mimeType);
-            $attachmentLink.attr('href', blobUrl);
+            // Transform into a Blob
+            const buf = new Uint8Array(decodedData.length);
+            for (let i = 0; i < decodedData.length; ++i) {
+                buf[i] = decodedData.charCodeAt(i);
+            }
+            const blob = new window.Blob([ buf ], { type: mediaType });
+
+            // Get Blob URL
+            const blobUrl = window.URL.createObjectURL(blob);
+
+            // IE does not support setting a data URI on an a element
+            // Using msSaveBlob to download
+            if (window.Blob && navigator.msSaveBlob) {
+                $attachmentLink.off('click').on('click', function () {
+                    navigator.msSaveBlob(blob, fileName);
+                });
+            } else {
+                $attachmentLink.attr('href', blobUrl);
+            }
 
             if (typeof fileName !== 'undefined') {
                 $attachmentLink.attr('download', fileName);
             }
 
-            // sanitize SVG preview
-            // prevents executing embedded scripts when CSP is not set and user
-            // right-clicks/long-taps and opens the SVG in a new tab - prevented
-            // in the preview by use of an img tag, which disables scripts, too
-            if (mimeType.match(/^image\/.*svg/i)) {
-                const sanitizedData = DOMPurify.sanitize(
-                    decodedData,
-                    purifySvgConfig
-                );
-                blobUrl = getBlobUrl(sanitizedData, mimeType);
-            }
-
-            me.handleBlobAttachmentPreview($attachmentPreview, blobUrl, mimeType);
+            me.handleBlobAttachmentPreview($attachmentPreview, blobUrl, mediaType);
         };
 
         /**
@@ -2864,9 +2799,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
          */
         me.showAttachment = function()
         {
-            // skip, if attachments got disabled
-            if (!$attachment || !$attachmentPreview) return;
-
             $attachment.removeClass('hidden');
 
             if (attachmentHasPreview) {
@@ -3074,13 +3006,13 @@ jQuery.PrivateBin = (function($, RawDeflate) {
         me.handleBlobAttachmentPreview = function ($targetElement, blobUrl, mimeType) {
             if (blobUrl) {
                 attachmentHasPreview = true;
-                if (mimeType.match(/^image\//i)) {
+                if (mimeType.match(/image\//i)) {
                     $targetElement.html(
                         $(document.createElement('img'))
                             .attr('src', blobUrl)
                             .attr('class', 'img-thumbnail')
                     );
-                } else if (mimeType.match(/^video\//i)) {
+                } else if (mimeType.match(/video\//i)) {
                     $targetElement.html(
                         $(document.createElement('video'))
                             .attr('controls', 'true')
@@ -3091,7 +3023,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
                             .attr('type', mimeType)
                             .attr('src', blobUrl))
                     );
-                } else if (mimeType.match(/^audio\//i)) {
+                } else if (mimeType.match(/audio\//i)) {
                     $targetElement.html(
                         $(document.createElement('audio'))
                             .attr('controls', 'true')
@@ -3568,8 +3500,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
 
         let createButtonsDisplayed = false,
             viewButtonsDisplayed = false,
-            burnAfterReadingDefault = false,
-            openDiscussionDefault = false,
             $attach,
             $burnAfterReading,
             $burnAfterReadingOption,
@@ -3585,11 +3515,11 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             $password,
             $passwordInput,
             $rawTextButton,
-            $downloadTextButton,
             $qrCodeLink,
             $emailLink,
             $sendButton,
             $retryButton,
+            $rememberButton,
             pasteExpiration = null,
             retryButtonCallback;
 
@@ -3723,41 +3653,10 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             for (let i = 0; i < $head.length; ++i) {
                 newDoc.write($head[i].outerHTML);
             }
-            newDoc.write(
-                '</head><body><pre>' +
-                DOMPurify.sanitize(
-                    Helper.htmlEntities(paste),
-                    purifyHtmlConfig
-                ) +
-                '</pre></body></html>'
-            );
+            newDoc.write('</head><body><pre>' + DOMPurify.sanitize(Helper.htmlEntities(paste)) + '</pre></body></html>');
             newDoc.close();
         }
 
-        /**
-         * download text
-         *
-         * @name   TopNav.downloadText
-         * @private
-         * @function
-         */
-        function downloadText()
-        {
-            var filename='paste-' + Model.getPasteId() + '.txt';
-            var text = PasteViewer.getText();
-
-            var element = document.createElement('a');
-            element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text));
-            element.setAttribute('download', filename);
-
-            element.style.display = 'none';
-            document.body.appendChild(element);
-
-            element.click();
-
-            document.body.removeChild(element);
-        }
-
         /**
          * saves the language in a cookie and reloads the page
          *
@@ -3768,7 +3667,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
          */
         function setLanguage(event)
         {
-            document.cookie = 'lang=' + $(event.target).data('lang') + ';secure';
+            document.cookie = 'lang=' + $(event.target).data('lang');
             UiHelper.reloadHome();
         }
 
@@ -3984,8 +3883,8 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             $newButton.removeClass('hidden');
             $cloneButton.removeClass('hidden');
             $rawTextButton.removeClass('hidden');
-            $downloadTextButton.removeClass('hidden');
             $qrCodeLink.removeClass('hidden');
+            $rememberButton.removeClass('hidden');
 
             viewButtonsDisplayed = true;
         };
@@ -4005,8 +3904,8 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             $cloneButton.addClass('hidden');
             $newButton.addClass('hidden');
             $rawTextButton.addClass('hidden');
-            $downloadTextButton.addClass('hidden');
             $qrCodeLink.addClass('hidden');
+            $rememberButton.addClass('hidden');
             me.hideEmailButton();
 
             viewButtonsDisplayed = false;
@@ -4072,17 +3971,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             createButtonsDisplayed = false;
         };
 
-        /**
-         * only shows the "new paste" button
-         *
-         * @name   TopNav.showNewPasteButton
-         * @function
-         */
-        me.showNewPasteButton = function()
-        {
-            $newButton.removeClass('hidden');
-        };
-
         /**
          * only shows the "retry" button
          *
@@ -4145,17 +4033,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             $emailLink.off('click.sendEmail');
         }
 
-        /**
-         * only hides the clone button
-         *
-         * @name   TopNav.hideCloneButton
-         * @function
-         */
-        me.hideCloneButton = function()
-        {
-            $cloneButton.addClass('hidden');
-        };
-
         /**
          * only hides the raw text button
          *
@@ -4167,28 +4044,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             $rawTextButton.addClass('hidden');
         };
 
-        /**
-         * only hides the download text button
-         *
-         * @name   TopNav.hideRawButton
-         * @function
-         */
-        me.hideDownloadButton = function()
-        {
-            $downloadTextButton.addClass('hidden');
-        };
-
-        /**
-         * only hides the qr code button
-         *
-         * @name   TopNav.hideQrCodeButton
-         * @function
-         */
-        me.hideQrCodeButton = function()
-        {
-            $qrCodeLink.addClass('hidden');
-        }
-
         /**
          * hide all irrelevant buttons when viewing burn after reading paste
          *
@@ -4197,8 +4052,8 @@ jQuery.PrivateBin = (function($, RawDeflate) {
          */
         me.hideBurnAfterReadingButtons = function()
         {
-            me.hideCloneButton();
-            me.hideQrCodeButton();
+            $cloneButton.addClass('hidden');
+            $qrCodeLink.addClass('hidden');
             me.hideEmailButton();
         }
 
@@ -4259,18 +4114,13 @@ jQuery.PrivateBin = (function($, RawDeflate) {
         me.resetInput = function()
         {
             clearAttachmentInput();
-            $burnAfterReading.prop('checked', burnAfterReadingDefault);
-            $openDiscussion.prop('checked', openDiscussionDefault);
-            if (openDiscussionDefault || !burnAfterReadingDefault) $openDiscussionOption.removeClass('buttondisabled');
-            if (burnAfterReadingDefault || !openDiscussionDefault) $burnAfterReadingOption.removeClass('buttondisabled');
 
-            pasteExpiration = Model.getExpirationDefault() || pasteExpiration;
-            $('#pasteExpiration>option').each(function() {
-                const $this = $(this);
-                if ($this.val() === pasteExpiration) {
-                    $('#pasteExpirationDisplay').text($this.text());
-                }
-            });
+            $openDiscussion.prop('checked', false);
+            $burnAfterReading.prop('checked', false);
+            $openDiscussionOption.removeClass('buttondisabled');
+            $burnAfterReadingOption.removeClass('buttondisabled');
+
+            // TODO: reset expiration time
         };
 
         /**
@@ -4439,11 +4289,11 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             $password = $('#password');
             $passwordInput = $('#passwordinput');
             $rawTextButton = $('#rawtextbutton');
-            $downloadTextButton = $('#downloadtextbutton');
             $retryButton = $('#retrybutton');
             $sendButton = $('#sendbutton');
             $qrCodeLink = $('#qrcodelink');
             $emailLink = $('#emaillink');
+            $rememberButton = $('#rememberbutton');
 
             // bootstrap template drop down
             $('#language ul.dropdown-menu li a').click(setLanguage);
@@ -4457,7 +4307,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             $sendButton.click(PasteEncrypter.sendPaste);
             $cloneButton.click(Controller.clonePaste);
             $rawTextButton.click(rawText);
-            $downloadTextButton.click(downloadText);
             $retryButton.click(clickRetryButton);
             $fileRemoveButton.click(removeAttachment);
             $qrCodeLink.click(displayQrCode);
@@ -4470,9 +4319,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             changeBurnAfterReading();
             changeOpenDiscussion();
 
-            // get default values from template or fall back to set value
-            burnAfterReadingDefault = me.getBurnAfterReading();
-            openDiscussionDefault = me.getOpenDiscussion();
+            // get default value from template or fall back to set value
             pasteExpiration = Model.getExpirationDefault() || pasteExpiration;
 
             createButtonsDisplayed = false;
@@ -4482,6 +4329,312 @@ jQuery.PrivateBin = (function($, RawDeflate) {
         return me;
     })(window, document);
 
+    /**
+     * (view) Handles the memory, storing paste URLs in the browser
+     *
+     * @name   Memory
+     * @class
+     */
+    const Memory = (function (document, window) {
+        const me = {};
+
+        let pastes = [],
+            db;
+
+        /**
+         * checks if the given URL was already memorized
+         *
+         * @name   Memory.isInMemory
+         * @private
+         * @function
+         * @param  {string} pasteUrl
+         * @return {bool}
+         */
+        function isInMemory(pasteUrl)
+        {
+            return pastes.filter(
+                function(memorizedPaste) {
+                    return memorizedPaste.url === pasteUrl;
+                }
+            ).length > 0;
+        }
+
+        /**
+         * sort the memory list by the given column offset
+         *
+         * @name   Memory.sort
+         * @private
+         * @function
+         * @param  {int} column
+         */
+        function sort(column)
+        {
+            let i, x, y, shouldSwitch, dir, switchcount = 0;
+            let table = $('#sidebar-wrapper table')[0];
+            let header = $('#sidebar-wrapper table thead tr th')[column];
+            let switching = true;
+            if (header.dataset.direction == 'asc') {
+                header.dataset.direction = 'desc';
+            } else {
+                header.dataset.direction = 'asc';
+            }
+            while (switching) {
+                switching = false;
+                let rows = table.rows;
+                // skip first row, containing headers
+                for (i = 1; i < (rows.length - 1); i++) {
+                    shouldSwitch = false;
+                    x = rows[i].getElementsByTagName("td")[column];
+                    y = rows[i + 1].getElementsByTagName("td")[column];
+                    if (header.dataset.direction == 'asc') {
+                        if (x.innerHTML.toLowerCase() > y.innerHTML.toLowerCase()) {
+                            shouldSwitch = true;
+                            break;
+                        }
+                    } else if (header.dataset.direction == 'desc') {
+                        if (x.innerHTML.toLowerCase() < y.innerHTML.toLowerCase()) {
+                            shouldSwitch = true;
+                            break;
+                        }
+                    }
+                }
+                if (shouldSwitch) {
+                    rows[i].parentNode.insertBefore(rows[i + 1], rows[i]);
+                    switching = true;
+                    switchcount ++;
+                }
+            }
+        }
+
+        /**
+         * called after successfully connecting to the indexedDB
+         *
+         * @name   Memory.updateCacheFromDb
+         * @private
+         * @function
+         */
+        function updateCacheFromDb()
+        {
+            const memory = db.transaction('pastes').objectStore('pastes');
+            memory.openCursor().onsuccess = function(e) {
+                let cursor = e.target.result;
+                if (cursor) {
+                    pastes.push(cursor.value);
+                    cursor.continue();
+                } else {
+                    me.refreshList();
+                }
+            };
+        }
+
+        /**
+         * adds a paste URL to the memory
+         *
+         * @name   Memory.add
+         * @function
+         * @param  {string} pasteUrl
+         * @return {bool}
+         */
+        me.add = function(pasteUrl)
+        {
+            const url = new URL(pasteUrl),
+                  newPaste = {
+                      'https': url.protocol == 'https:',
+                      'service': url.hostname + (url.pathname.length > 1 ? url.pathname : ''),
+                      'pasteid': url.search.replace(/^\?+/, ''),
+                      'key': url.hash.replace(/^#+/, ''),
+                      // we store the full URL as it may contain additonal information
+                      // required to open the paste, like port, username and password
+                      'url': pasteUrl
+                  };
+            // don't add an already memorized paste
+            if (isInMemory(pasteUrl)) {
+                return false;
+            }
+            pastes.push(newPaste);
+            if (!window.indexedDB || !db) {
+                return false;
+            }
+            const memory = db.transaction('pastes', 'readwrite').objectStore('pastes'),
+                  request = memory.add(newPaste);
+            request.onsuccess = function(e) {
+                me.refreshList();
+            }
+            return true;
+        };
+
+        /**
+         * open a given paste URL using the current instance
+         *
+         * @name   Memory.open
+         * @function
+         * @param  {string} pasteUrl
+         */
+        me.open = function(pasteUrl)
+        {
+            // parse URL
+            const url = new URL(pasteUrl);
+            const baseUri = Helper.baseUri();
+            history.pushState({type: 'viewpaste'}, document.title, url.search + url.hash);
+            Helper.reset(url.origin);
+            Model.reset();
+            PasteDecrypter.run();
+            Helper.reset(baseUri);
+        };
+
+        /**
+         * refresh the state of the remember button
+         *
+         * @name   Memory.refreshButton
+         * @function
+         */
+        me.refreshButton = function()
+        {
+            if (isInMemory(window.location.href)) {
+                $('#rememberbutton').addClass('disabled');
+            } else {
+                $('#rememberbutton').removeClass('disabled');
+            }
+        };
+
+        /**
+         * refresh the displayed list from memory
+         *
+         * @name   Memory.refreshList
+         * @function
+         */
+        me.refreshList = function()
+        {
+            me.refreshButton();
+            const $tbody = $('#sidebar-wrapper table tbody')[0];
+            if (!$tbody) {
+                return;
+            }
+            $tbody.textContent = '';
+            pastes.forEach(function(paste) {
+                const row  = document.createElement('tr');
+
+                let cell = document.createElement('td');
+                let input = document.createElement('input');
+                input.setAttribute('type', 'checkbox');
+                input.setAttribute('name', 'memoryselect');
+                input.setAttribute('value', paste.pasteid);
+                cell.appendChild(input);
+                row.appendChild(cell);
+
+                cell = document.createElement('td');
+                cell.textContent = paste.https ? '✔' : '✘';
+                row.appendChild(cell);
+
+                cell = document.createElement('td');
+                cell.textContent = paste.service;
+                row.appendChild(cell);
+
+                cell = document.createElement('td');
+                cell.textContent = paste.pasteid;
+                row.appendChild(cell);
+
+                cell = document.createElement('td');
+                cell.addEventListener('click', function () {
+                    navigator.clipboard.writeText(paste.url);
+                });
+                let button = document.createElement('button');
+                button.setAttribute('class', 'btn btn-info btn-xs');
+                button.setAttribute('title', I18n._('Copy paste URL'));
+                let span = document.createElement('span');
+                span.setAttribute('class', 'glyphicon glyphicon-duplicate');
+                span.setAttribute('aria-hidden', 'true');
+                button.appendChild(span);
+                cell.appendChild(button);
+                row.appendChild(cell);
+
+                $tbody.appendChild(row);
+                row.addEventListener('click', function () {
+                    me.open(paste.url);
+                });
+            });
+        };
+
+        /**
+         * initiate
+         *
+         * attaches click event to toggle memory sidepanel
+         *
+         * @name   Memory.init
+         * @function
+         */
+        me.init = function()
+        {
+            pastes = [];
+            if (!window.indexedDB) {
+                $('#menu-toggle').hide();
+                return;
+            }
+            const request = window.indexedDB.open('privatebin', 1);
+            request.onerror = function(e) {
+                Alert.showWarning('Unable to open indexedDB, memory will not be available in this session.');
+                $('#menu-toggle').hide();
+            };
+            request.onupgradeneeded = function(event) { 
+                const newDb = event.target.result;
+                const objectStore = newDb.createObjectStore('pastes', {keyPath: 'pasteid'});
+                objectStore.createIndex('https', 'https', {unique: false});
+                objectStore.createIndex('service', 'service', {unique: false});
+                objectStore.createIndex('pasteid', 'pasteid', {unique: true});
+                objectStore.transaction.oncomplete = function(e) {
+                    db = newDb;
+                    updateCacheFromDb();
+                };
+            };
+            request.onsuccess = function(e) {
+                db = request.result;
+                db.onerror = function(e) {
+                    Alert.showError(e.target.error.message);
+                }
+                updateCacheFromDb();
+            };
+            
+            $('#forgetbutton').on('click', function(e) {
+                const memory = db.transaction('pastes', 'readwrite').objectStore('pastes');
+                for (const checkbox of document.getElementsByName('memoryselect')) {
+                    if (checkbox.checked) {
+                        const request = memory.delete(checkbox.value);
+                        request.onsuccess = function(e) {
+                            pastes = [];
+                            $('#sidebar-wrapper table tbody').empty();
+                            updateCacheFromDb();
+                        }
+                    }
+                }
+            });
+
+            $('#memoryselectall').on('click', function(e) {
+                const checkedState = document.getElementById('memoryselectall').checked;
+                for (const checkbox of document.getElementsByName('memoryselect')) {
+                    checkbox.checked = checkedState;
+                }
+            });
+
+            $('#menu-toggle').on('click', function(e) {
+                $('main').toggleClass('toggled');
+                $('#menu-toggle .glyphicon').toggleClass('glyphicon glyphicon-menu-down glyphicon glyphicon-menu-up')
+            });
+
+            $('#rememberbutton').on('click', function(e) {
+                if (me.add(window.location.href))
+                    $('#menu-toggle').click();
+            });
+            const headers = $('#sidebar-wrapper table thead tr th');
+            for (let i = 1; i < headers.length; i++) {
+                headers[i].addEventListener('click', function(e) {
+                    sort(i);
+                });
+            }
+        };
+
+        return me;
+    })(document, window);
+
     /**
      * Responsible for AJAX requests, transparently handles encryption…
      *
@@ -4789,6 +4942,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
 
             // show new URL in browser bar
             history.pushState({type: 'newpaste'}, document.title, url);
+            Memory.refreshButton();
 
             TopNav.showViewButtons();
 
@@ -4796,7 +4950,6 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             TopNav.showEmailButton();
 
             TopNav.hideRawButton();
-            TopNav.hideDownloadButton();
             Editor.hide();
 
             // parse and show text
@@ -5459,6 +5612,10 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             // first load translations
             I18n.loadTranslations();
 
+            DOMPurify.setConfig({
+                ALLOWED_URI_REGEXP: /^(?:(?:(?:f|ht)tps?|mailto|magnet):)/i
+            });
+
             // Add a hook to make all links open a new window
             DOMPurify.addHook('afterSanitizeAttributes', function(node) {
                 // set all elements owning target to target=_blank
@@ -5466,8 +5623,8 @@ jQuery.PrivateBin = (function($, RawDeflate) {
                     node.setAttribute('target', '_blank');
                 }
                 // set non-HTML/MathML links to xlink:show=new
-                if (!node.hasAttribute('target')
-                    && (node.hasAttribute('xlink:href')
+                if (!node.hasAttribute('target') 
+                    && (node.hasAttribute('xlink:href') 
                         || node.hasAttribute('href'))) {
                     node.setAttribute('xlink:show', 'new');
                 }
@@ -5494,6 +5651,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
             Prompt.init();
             TopNav.init();
             UiHelper.init();
+            Memory.init();
 
             // check for legacy browsers before going any further
             if (!Legacy.Check.getInit()) {
@@ -5547,6 +5705,7 @@ jQuery.PrivateBin = (function($, RawDeflate) {
         AttachmentViewer: AttachmentViewer,
         DiscussionViewer: DiscussionViewer,
         TopNav: TopNav,
+        Memory: Memory,
         ServerInteraction: ServerInteraction,
         PasteEncrypter: PasteEncrypter,
         PasteDecrypter: PasteDecrypter,

js/test/DiscussionViewer.js

@@ -110,3 +110,4 @@ describe('DiscussionViewer', function () {
         );
     });
 });
+

js/test/Editor.js

@@ -52,12 +52,12 @@ describe('Editor', function () {
                     !$.PrivateBin.Editor.isPreview() &&
                     !$('#message').hasClass('hidden')
                 );
-                $('#messagepreview').trigger('click');
+                $('#messagepreview').click();
                 results.push(
                     $.PrivateBin.Editor.isPreview() &&
                     $('#message').hasClass('hidden')
                 );
-                $('#messageedit').trigger('click');
+                $('#messageedit').click();
                 results.push(
                     !$.PrivateBin.Editor.isPreview() &&
                     !$('#message').hasClass('hidden')
@@ -68,3 +68,4 @@ describe('Editor', function () {
         );
     });
 });
+

js/test/Memory.js

@@ -0,0 +1,60 @@
+'use strict';
+const common = require('../common');
+
+describe('Memory', function () {
+    describe('add & refreshList', function () {
+        this.timeout(30000);
+
+        jsc.property(
+            'allows adding valid paste URLs',
+            common.jscSchemas(),
+            jsc.nearray(common.jscA2zString()),
+            jsc.array(common.jscQueryString()),
+            'string',
+            function (schema, address, query, fragment) {
+                const expectedQuery = encodeURI(
+                          query.join('').replace(/^&+|&+$/gm,'')
+                      ),
+                      expected = schema + '://' + address.join('') + '/?' +
+                      expectedQuery + '#' + fragment,
+                      clean = jsdom();
+                $('body').html(
+                    '<main><div id="sidebar-wrapper"><table><tbody>' +
+                    '</tbody></table></div></main>'
+                );
+                // clear cache, then the first cell will match what we add
+                $.PrivateBin.Memory.init();
+                $.PrivateBin.Memory.add(expected);
+                $.PrivateBin.Memory.refreshList();
+                const result = $('#sidebar-wrapper table tbody tr td')[3].textContent;
+                clean();
+                return result === expectedQuery;
+            }
+        );
+    });
+    
+    describe('init', function () {
+        it(
+            'enables toggling the memory sidebar',
+            function() {
+                $('body').html(
+                    '<main><div id="sidebar-wrapper"></div>' +
+                    '<button id="menu-toggle"></button></main>'
+                );
+                assert.ok(!$('main').hasClass('toggled'));
+
+                $('#menu-toggle').click();
+                assert.ok(!$('main').hasClass('toggled'));
+
+                $.PrivateBin.Memory.init();
+                assert.ok(!$('main').hasClass('toggled'));
+
+                $('#menu-toggle').click();
+                assert.ok($('main').hasClass('toggled'));
+
+                $('#menu-toggle').click();
+                assert.ok(!$('main').hasClass('toggled'));
+            }
+        );
+    });
+});

js/test/TopNav.js

@@ -118,62 +118,6 @@ describe('TopNav', function () {
         );
     });
 
-    describe('showNewPasteButton', function () {
-        before(function () {
-            cleanup();
-        });
-
-        it(
-            'displays the button for creating a paste',
-            function () {
-                var results = [];
-                $('body').html(
-                    '<nav><div id="navbar"><ul><li><button id="newbutton" type=' +
-                    '"button" class="hidden">New</button></li></ul></div></nav>'
-                );
-                $.PrivateBin.TopNav.init();
-                results.push(
-                    $('#newbutton').hasClass('hidden')
-                );
-                $.PrivateBin.TopNav.showNewPasteButton();
-                results.push(
-                    !$('#newbutton').hasClass('hidden')
-                );
-                cleanup();
-                assert.ok(results.every(element => element));
-            }
-        );
-    });
-
-    describe('hideCloneButton', function () {
-        before(function () {
-            cleanup();
-        });
-
-        it(
-            'hides the button for cloning a paste',
-            function () {
-                var results = [];
-                $('body').html(
-                    '<nav><div id="navbar"><ul><li><button id="clonebutton" ' +
-                    'type="button" class="btn btn-warning navbar-btn">' +
-                    '<span class="glyphicon glyphicon-duplicate" aria-hidden=' +
-                    '"true"></span> Clone</button></li></ul></div></nav>'
-                );
-                $.PrivateBin.TopNav.init();
-                results.push(
-                    !$('#clonebutton').hasClass('hidden')
-                );
-                $.PrivateBin.TopNav.hideCloneButton();
-                results.push(
-                    $('#clonebutton').hasClass('hidden')
-                );
-                cleanup();
-                assert.ok(results.every(element => element));
-            }
-        );
-    });
-
     describe('hideRawButton', function () {
         before(function () {
             cleanup();
@@ -280,8 +224,7 @@ describe('TopNav', function () {
         it(
             'collapses the navigation when displayed on a small screen',
             function () {
-                var clean = jsdom(),
-                    results = [];
+                var results = [];
                 $('body').html(
                     '<nav><div class="navbar-header"><button type="button" ' +
                     'class="navbar-toggle collapsed" data-toggle="collapse" ' +
@@ -302,11 +245,7 @@ describe('TopNav', function () {
                     $('.navbar-toggle').hasClass('collapsed') &&
                     $('#navbar').attr('aria-expanded') != 'true'
                 );
-                /*
-                with the upgrade for bootstrap-3.3.7.js to bootstrap-3.4.1.js
-                the mobile interface detection changed to check if the
-                ontouchstart event exists, which broke this section of the test
-                $('.navbar-toggle').trigger('click');
+                $('.navbar-toggle').click();
                 results.push(
                     !$('.navbar-toggle').hasClass('collapsed') &&
                     $('#navbar').attr('aria-expanded') == 'true'
@@ -316,132 +255,6 @@ describe('TopNav', function () {
                     $('.navbar-toggle').hasClass('collapsed') &&
                     $('#navbar').attr('aria-expanded') == 'false'
                 );
-                */
-                clean();
-                assert.ok(results.every(element => element));
-            }
-        );
-    });
-
-    describe('resetInput', function () {
-        before(function () {
-            cleanup();
-        });
-
-        it(
-            'reset inputs to defaults (options off)',
-            function () {
-                var results = [];
-                $('body').html(
-                    '<nav><div id="navbar"><ul><li id="burnafterreadingoption" ' +
-                    'class="hidden"><label><input type="checkbox" ' +
-                    'id="burnafterreading" name="burnafterreading" /> ' +
-                    'Burn after reading</label></li><li id="opendiscussionoption" ' +
-                    'class="hidden"><label><input type="checkbox" ' +
-                    'id="opendiscussion" name="opendiscussion" /> ' +
-                    'Open discussion</label></li></ul></div></nav>'
-                );
-                $.PrivateBin.TopNav.init();
-                results.push(
-                    !$.PrivateBin.TopNav.getBurnAfterReading()
-                );
-                results.push(
-                    !$.PrivateBin.TopNav.getOpenDiscussion()
-                );
-                $('#burnafterreading').attr('checked', 'checked');
-                $('#opendiscussion').attr('checked', 'checked');
-                results.push(
-                    $.PrivateBin.TopNav.getBurnAfterReading()
-                );
-                results.push(
-                    $.PrivateBin.TopNav.getOpenDiscussion()
-                );
-                $.PrivateBin.TopNav.resetInput();
-                results.push(
-                    !$.PrivateBin.TopNav.getBurnAfterReading()
-                );
-                results.push(
-                    !$.PrivateBin.TopNav.getOpenDiscussion()
-                );
-                cleanup();
-                assert.ok(results.every(element => element));
-            }
-        );
-
-        it(
-            'reset inputs to defaults (burnafterreading on)',
-            function () {
-                var results = [];
-                $('body').html(
-                    '<nav><div id="navbar"><ul><li id="burnafterreadingoption" ' +
-                    'class="hidden"><label><input type="checkbox" ' +
-                    'id="burnafterreading" name="burnafterreading" checked="checked" /> ' +
-                    'Burn after reading</label></li><li id="opendiscussionoption" ' +
-                    'class="hidden"><label><input type="checkbox" ' +
-                    'id="opendiscussion" name="opendiscussion" checked="checked" /> ' +
-                    'Open discussion</label></li></ul></div></nav>'
-                );
-                $.PrivateBin.TopNav.init();
-                results.push(
-                    $.PrivateBin.TopNav.getBurnAfterReading()
-                );
-                results.push(
-                    !$.PrivateBin.TopNav.getOpenDiscussion()
-                );
-                $('#burnafterreading').removeAttr('checked');
-                results.push(
-                    !$.PrivateBin.TopNav.getBurnAfterReading()
-                );
-                results.push(
-                    !$.PrivateBin.TopNav.getOpenDiscussion()
-                );
-                $.PrivateBin.TopNav.resetInput();
-                results.push(
-                    $.PrivateBin.TopNav.getBurnAfterReading()
-                );
-                results.push(
-                    !$.PrivateBin.TopNav.getOpenDiscussion()
-                );
-                cleanup();
-                assert.ok(results.every(element => element));
-            }
-        );
-
-        it(
-            'reset inputs to defaults (opendiscussion on)',
-            function () {
-                var results = [];
-                $('body').html(
-                    '<nav><div id="navbar"><ul><li id="burnafterreadingoption" ' +
-                    'class="hidden"><label><input type="checkbox" ' +
-                    'id="burnafterreading" name="burnafterreading" /> ' +
-                    'Burn after reading</label></li><li id="opendiscussionoption" ' +
-                    'class="hidden"><label><input type="checkbox" ' +
-                    'id="opendiscussion" name="opendiscussion" checked="checked" /> ' +
-                    'Open discussion</label></li></ul></div></nav>'
-                );
-                $.PrivateBin.TopNav.init();
-                results.push(
-                    !$.PrivateBin.TopNav.getBurnAfterReading()
-                );
-                results.push(
-                    $.PrivateBin.TopNav.getOpenDiscussion()
-                );
-                $('#opendiscussion').removeAttr('checked');
-                $('#burnafterreading').prop('checked', true);
-                results.push(
-                    $.PrivateBin.TopNav.getBurnAfterReading()
-                );
-                results.push(
-                    !$.PrivateBin.TopNav.getOpenDiscussion()
-                );
-                $.PrivateBin.TopNav.resetInput();
-                results.push(
-                    !$.PrivateBin.TopNav.getBurnAfterReading()
-                );
-                results.push(
-                    $.PrivateBin.TopNav.getOpenDiscussion()
-                );
                 cleanup();
                 assert.ok(results.every(element => element));
             }
@@ -676,3 +489,4 @@ describe('TopNav', function () {
         );
     });
 });
+

js/zlib-1.2.11.js

@@ -26,9 +26,9 @@
 
         let buff;
         if (typeof fetch === 'undefined') {
-            buff = fs.readFileSync('zlib-1.2.13.wasm');
+            buff = fs.readFileSync('zlib-1.2.11.wasm');
         } else {
-            const resp = await fetch('js/zlib-1.2.13.wasm');
+            const resp = await fetch('js/zlib-1.2.11.wasm');
             buff = await resp.arrayBuffer();
         }
         const module = await WebAssembly.compile(buff);

lib/Configuration.php

@@ -7,13 +7,14 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin;
 
 use Exception;
 use PDO;
+use PrivateBin\Persistence\DataStore;
 
 /**
  * Configuration
@@ -44,17 +45,16 @@ class Configuration
             'fileupload'               => false,
             'burnafterreadingselected' => false,
             'defaultformatter'         => 'plaintext',
-            'syntaxhighlightingtheme'  => '',
+            'syntaxhighlightingtheme'  => null,
             'sizelimit'                => 10485760,
             'template'                 => 'bootstrap',
-            'info'                     => 'More information on the <a href=\'https://privatebin.info/\'>project page</a>.',
             'notice'                   => '',
             'languageselection'        => false,
             'languagedefault'          => '',
             'urlshortener'             => '',
             'qrcode'                   => true,
-            'icon'                     => 'jdenticon',
-            'cspheader'                => 'default-src \'none\'; base-uri \'self\'; form-action \'none\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\'; style-src \'self\'; font-src \'self\'; frame-ancestors \'none\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads',
+            'icon'                     => 'identicon',
+            'cspheader'                => 'default-src \'none\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\' resource:; style-src \'self\'; font-src \'self\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads',
             'zerobincompatibility'     => false,
             'httpwarning'              => true,
             'compression'              => 'zlib',
@@ -78,14 +78,14 @@ class Configuration
             'markdown'           => 'Markdown',
         ),
         'traffic' => array(
-            'limit'     => 10,
-            'header'    => '',
-            'exempted'  => '',
-            'creators'  => '',
+            'limit'  => 10,
+            'header' => null,
+            'dir'    => 'data',
         ),
         'purge' => array(
             'limit'     => 300,
             'batchsize' => 10,
+            'dir'       => 'data',
         ),
         'model' => array(
             'class' => 'Filesystem',
@@ -93,10 +93,6 @@ class Configuration
         'model_options' => array(
             'dir' => 'data',
         ),
-        'yourls' => array(
-            'signature' => '',
-            'apiurl'    => '',
-        ),
     );
 
     /**
@@ -106,23 +102,28 @@ class Configuration
      */
     public function __construct()
     {
-        $basePaths  = array();
         $config     = array();
-        $configPath = getenv('CONFIG_PATH');
-        if ($configPath !== false && !empty($configPath)) {
-            $basePaths[] = $configPath;
+        $basePath   = (getenv('CONFIG_PATH') !== false ? getenv('CONFIG_PATH') : PATH . 'cfg') . DIRECTORY_SEPARATOR;
+        $configIni  = $basePath . 'conf.ini';
+        $configFile = $basePath . 'conf.php';
+
+        // rename INI files to avoid configuration leakage
+        if (is_readable($configIni)) {
+            DataStore::prependRename($configIni, $configFile, ';');
+
+            // cleanup sample, too
+            $configIniSample = $configIni . '.sample';
+            if (is_readable($configIniSample)) {
+                DataStore::prependRename($configIniSample, $basePath . 'conf.sample.php', ';');
+            }
         }
-        $basePaths[] = PATH . 'cfg';
-        foreach ($basePaths as $basePath) {
-            $configFile = $basePath . DIRECTORY_SEPARATOR . 'conf.php';
-            if (is_readable($configFile)) {
-                $config = parse_ini_file($configFile, true);
-                foreach (array('main', 'model', 'model_options') as $section) {
-                    if (!array_key_exists($section, $config)) {
-                        throw new Exception(I18n::_('PrivateBin requires configuration section [%s] to be present in configuration file.', $section), 2);
-                    }
+
+        if (is_readable($configFile)) {
+            $config = parse_ini_file($configFile, true);
+            foreach (array('main', 'model', 'model_options') as $section) {
+                if (!array_key_exists($section, $config)) {
+                    throw new Exception(I18n::_('PrivateBin requires configuration section [%s] to be present in configuration file.', $section), 2);
                 }
-                break;
             }
         }
 
@@ -150,33 +151,6 @@ class Configuration
                     'pwd' => null,
                     'opt' => array(PDO::ATTR_PERSISTENT => true),
                 );
-            } elseif (
-                $section == 'model_options' && in_array(
-                    $this->_configuration['model']['class'],
-                    array('GoogleCloudStorage')
-                )
-            ) {
-                $values = array(
-                    'bucket'     => getenv('PRIVATEBIN_GCS_BUCKET') ? getenv('PRIVATEBIN_GCS_BUCKET') : null,
-                    'prefix'     => 'pastes',
-                    'uniformacl' => false,
-                );
-            } elseif (
-                $section == 'model_options' && in_array(
-                    $this->_configuration['model']['class'],
-                    array('S3Storage')
-                )
-            ) {
-                $values = array(
-                    'region'                  => null,
-                    'version'                 => null,
-                    'endpoint'                => null,
-                    'accesskey'               => null,
-                    'secretkey'               => null,
-                    'use_path_style_endpoint' => null,
-                    'bucket'                  => null,
-                    'prefix'                  => '',
-                );
             }
 
             // "*_options" sections don't require all defaults to be set
@@ -236,14 +210,6 @@ class Configuration
         if (!array_key_exists($this->_configuration['expire']['default'], $this->_configuration['expire_options'])) {
             $this->_configuration['expire']['default'] = key($this->_configuration['expire_options']);
         }
-
-        // ensure the basepath ends in a slash, if one is set
-        if (
-            strlen($this->_configuration['main']['basepath']) &&
-            substr_compare($this->_configuration['main']['basepath'], '/', -1) !== 0
-        ) {
-            $this->_configuration['main']['basepath'] .= '/';
-        }
     }
 
     /**

lib/Controller.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin;
@@ -28,7 +28,7 @@ class Controller
      *
      * @const string
      */
-    const VERSION = '1.4.0';
+    const VERSION = '1.3.4';
 
     /**
      * minimal required PHP version
@@ -136,9 +136,6 @@ class Controller
             case 'jsonld':
                 $this->_jsonld($this->_request->getParam('jsonld'));
                 return;
-            case 'yourlsproxy':
-                $this->_yourlsproxy($this->_request->getParam('link'));
-                break;
         }
 
         // output JSON or HTML
@@ -165,6 +162,7 @@ class Controller
         $this->_model   = new Model($this->_conf);
         $this->_request = new Request;
         $this->_urlBase = $this->_request->getRequestUri();
+        ServerSalt::setPath($this->_conf->getKey('dir', 'traffic'));
 
         // set default language
         $lang = $this->_conf->getKey('languagedefault');
@@ -172,7 +170,7 @@ class Controller
         // force default language, if language selection is disabled and a default is set
         if (!$this->_conf->getKey('languageselection') && strlen($lang) == 2) {
             $_COOKIE['lang'] = $lang;
-            setcookie('lang', $lang, 0, '', '', true);
+            setcookie('lang', $lang);
         }
     }
 
@@ -198,14 +196,20 @@ class Controller
      */
     private function _create()
     {
-        // Ensure last paste from visitors IP address was more than configured amount of seconds ago.
-        ServerSalt::setStore($this->_model->getStore());
-        TrafficLimiter::setConfiguration($this->_conf);
-        TrafficLimiter::setStore($this->_model->getStore());
         try {
-            TrafficLimiter::canPass();
+            // Ensure last paste from visitors IP address was more than configured amount of seconds ago.
+            TrafficLimiter::setConfiguration($this->_conf);
+            if (!TrafficLimiter::canPass()) {
+                $this->_return_message(
+                    1, I18n::_(
+                        'Please wait %d seconds between each post.',
+                        $this->_conf->getKey('limit', 'traffic')
+                    )
+                );
+                return;
+            }
         } catch (Exception $e) {
-            $this->_return_message(1, $e->getMessage());
+            $this->_return_message(1, I18n::_($e->getMessage()));
             return;
         }
 
@@ -342,17 +346,10 @@ class Controller
         header('Last-Modified: ' . $time);
         header('Vary: Accept');
         header('Content-Security-Policy: ' . $this->_conf->getKey('cspheader'));
-        header('Cross-Origin-Resource-Policy: same-origin');
-        header('Cross-Origin-Embedder-Policy: require-corp');
-        // disabled, because it prevents links from a paste to the same site to
-        // be opened. Didn't work with `same-origin-allow-popups` either.
-        // See issue https://github.com/PrivateBin/PrivateBin/issues/970 for details.
-        // header('Cross-Origin-Opener-Policy: same-origin');
-        header('Permissions-Policy: browsing-topics=()');
         header('Referrer-Policy: no-referrer');
+        header('X-Xss-Protection: 1; mode=block');
+        header('X-Frame-Options: DENY');
         header('X-Content-Type-Options: nosniff');
-        header('X-Frame-Options: deny');
-        header('X-XSS-Protection: 1; mode=block');
 
         // label all the expiration options
         $expire = array();
@@ -367,29 +364,13 @@ class Controller
         $languageselection = '';
         if ($this->_conf->getKey('languageselection')) {
             $languageselection = I18n::getLanguage();
-            setcookie('lang', $languageselection, 0, '', '', true);
+            setcookie('lang', $languageselection);
         }
 
-        // strip policies that are unsupported in meta tag
-        $metacspheader = str_replace(
-            array(
-                'frame-ancestors \'none\'; ',
-                '; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads',
-            ),
-            '',
-            $this->_conf->getKey('cspheader')
-        );
-
         $page = new View;
-        $page->assign('CSPHEADER', $metacspheader);
-        $page->assign('ERROR', I18n::_($this->_error));
         $page->assign('NAME', $this->_conf->getKey('name'));
-        if ($this->_request->getOperation() === 'yourlsproxy') {
-            $page->assign('SHORTURL', $this->_status);
-            $page->draw('yourlsproxy');
-            return;
-        }
         $page->assign('BASEPATH', I18n::_($this->_conf->getKey('basepath')));
+        $page->assign('ERROR', I18n::_($this->_error));
         $page->assign('STATUS', I18n::_($this->_status));
         $page->assign('VERSION', self::VERSION);
         $page->assign('DISCUSSION', $this->_conf->getKey('discussion'));
@@ -399,7 +380,6 @@ class Controller
         $page->assign('SYNTAXHIGHLIGHTINGTHEME', $this->_conf->getKey('syntaxhighlightingtheme'));
         $page->assign('FORMATTER', $formatters);
         $page->assign('FORMATTERDEFAULT', $this->_conf->getKey('defaultformatter'));
-        $page->assign('INFO', I18n::_(str_replace("'", '"', $this->_conf->getKey('info'))));
         $page->assign('NOTICE', I18n::_($this->_conf->getKey('notice')));
         $page->assign('BURNAFTERREADINGSELECTED', $this->_conf->getKey('burnafterreadingselected'));
         $page->assign('PASSWORD', $this->_conf->getKey('password'));
@@ -447,22 +427,6 @@ class Controller
         echo $content;
     }
 
-    /**
-     * proxies link to YOURLS, updates status or error with response
-     *
-     * @access private
-     * @param string $link
-     */
-    private function _yourlsproxy($link)
-    {
-        $yourls = new YourlsProxy($this->_conf, $link);
-        if ($yourls->isError()) {
-            $this->_error = $yourls->getError();
-        } else {
-            $this->_status = $yourls->getUrl();
-        }
-    }
-
     /**
      * prepares JSON encoded status message
      *

lib/Data/AbstractData.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin\Data;
@@ -15,12 +15,12 @@ namespace PrivateBin\Data;
 /**
  * AbstractData
  *
- * Abstract model for data access, implemented as a singleton.
+ * Abstract model for PrivateBin data access, implemented as a singleton.
  */
 abstract class AbstractData
 {
     /**
-     * Singleton instance
+     * singleton instance
      *
      * @access protected
      * @static
@@ -29,18 +29,9 @@ abstract class AbstractData
     protected static $_instance = null;
 
     /**
-     * cache for the traffic limiter
+     * enforce singleton, disable constructor
      *
-     * @access private
-     * @static
-     * @var    array
-     */
-    protected static $_last_cache = array();
-
-    /**
-     * Enforce singleton, disable constructor
-     *
-     * Instantiate using {@link getInstance()}, this object implements the singleton pattern.
+     * Instantiate using {@link getInstance()}, privatebin is a singleton object.
      *
      * @access protected
      */
@@ -49,9 +40,9 @@ abstract class AbstractData
     }
 
     /**
-     * Enforce singleton, disable cloning
+     * enforce singleton, disable cloning
      *
-     * Instantiate using {@link getInstance()}, this object implements the singleton pattern.
+     * Instantiate using {@link getInstance()}, privatebin is a singleton object.
      *
      * @access private
      */
@@ -60,7 +51,7 @@ abstract class AbstractData
     }
 
     /**
-     * Get instance of singleton
+     * get instance of singleton
      *
      * @access public
      * @static
@@ -139,46 +130,6 @@ abstract class AbstractData
      */
     abstract public function existsComment($pasteid, $parentid, $commentid);
 
-    /**
-     * Purge outdated entries.
-     *
-     * @access public
-     * @param  string $namespace
-     * @param  int $time
-     * @return void
-     */
-    public function purgeValues($namespace, $time)
-    {
-        if ($namespace === 'traffic_limiter') {
-            foreach (self::$_last_cache as $key => $last_submission) {
-                if ($last_submission <= $time) {
-                    unset(self::$_last_cache[$key]);
-                }
-            }
-        }
-    }
-
-    /**
-     * Save a value.
-     *
-     * @access public
-     * @param  string $value
-     * @param  string $namespace
-     * @param  string $key
-     * @return bool
-     */
-    abstract public function setValue($value, $namespace, $key = '');
-
-    /**
-     * Load a value.
-     *
-     * @access public
-     * @param  string $namespace
-     * @param  string $key
-     * @return string
-     */
-    abstract public function getValue($namespace, $key = '');
-
     /**
      * Returns up to batch size number of paste ids that have expired
      *

lib/Data/Database.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin\Data;
@@ -97,11 +97,6 @@ class Database extends AbstractData
             self::$_type = strtolower(
                 substr($options['dsn'], 0, strpos($options['dsn'], ':'))
             );
-            // MySQL uses backticks to quote identifiers by default,
-            // tell it to expect ANSI SQL double quotes
-            if (self::$_type === 'mysql' && defined('PDO::MYSQL_ATTR_INIT_COMMAND')) {
-                $options['opt'][PDO::MYSQL_ATTR_INIT_COMMAND] = "SET SESSION sql_mode='ANSI_QUOTES'";
-            }
             $tableQuery = self::_getTableQuery(self::$_type);
             self::$_db  = new PDO(
                 $options['dsn'],
@@ -203,25 +198,21 @@ class Database extends AbstractData
             $opendiscussion   = $paste['adata'][2];
             $burnafterreading = $paste['adata'][3];
         }
-        try {
-            return self::_exec(
-                'INSERT INTO "' . self::_sanitizeIdentifier('paste') .
-                '" VALUES(?,?,?,?,?,?,?,?,?)',
-                array(
-                    $pasteid,
-                    $isVersion1 ? $paste['data'] : Json::encode($paste),
-                    $created,
-                    $expire_date,
-                    (int) $opendiscussion,
-                    (int) $burnafterreading,
-                    Json::encode($meta),
-                    $attachment,
-                    $attachmentname,
-                )
-            );
-        } catch (Exception $e) {
-            return false;
-        }
+        return self::_exec(
+            'INSERT INTO ' . self::_sanitizeIdentifier('paste') .
+            ' VALUES(?,?,?,?,?,?,?,?,?)',
+            array(
+                $pasteid,
+                $isVersion1 ? $paste['data'] : Json::encode($paste),
+                $created,
+                $expire_date,
+                (int) $opendiscussion,
+                (int) $burnafterreading,
+                Json::encode($meta),
+                $attachment,
+                $attachmentname,
+            )
+        );
     }
 
     /**
@@ -238,14 +229,11 @@ class Database extends AbstractData
         }
 
         self::$_cache[$pasteid] = false;
-        try {
-            $paste = self::_select(
-                'SELECT * FROM "' . self::_sanitizeIdentifier('paste') .
-                '" WHERE "dataid" = ?', array($pasteid), true
-            );
-        } catch (Exception $e) {
-            $paste = false;
-        }
+        $paste                  = self::_select(
+            'SELECT * FROM ' . self::_sanitizeIdentifier('paste') .
+            ' WHERE dataid = ?', array($pasteid), true
+        );
+
         if ($paste === false) {
             return false;
         }
@@ -277,9 +265,9 @@ class Database extends AbstractData
         }
 
         // support v1 attachments
-        if (array_key_exists('attachment', $paste) && !empty($paste['attachment'])) {
+        if (array_key_exists('attachment', $paste) && strlen($paste['attachment'])) {
             self::$_cache[$pasteid]['attachment'] = $paste['attachment'];
-            if (array_key_exists('attachmentname', $paste) && !empty($paste['attachmentname'])) {
+            if (array_key_exists('attachmentname', $paste) && strlen($paste['attachmentname'])) {
                 self::$_cache[$pasteid]['attachmentname'] = $paste['attachmentname'];
             }
         }
@@ -302,12 +290,12 @@ class Database extends AbstractData
     public function delete($pasteid)
     {
         self::_exec(
-            'DELETE FROM "' . self::_sanitizeIdentifier('paste') .
-            '" WHERE "dataid" = ?', array($pasteid)
+            'DELETE FROM ' . self::_sanitizeIdentifier('paste') .
+            ' WHERE dataid = ?', array($pasteid)
         );
         self::_exec(
-            'DELETE FROM "' . self::_sanitizeIdentifier('comment') .
-            '" WHERE "pasteid" = ?', array($pasteid)
+            'DELETE FROM ' . self::_sanitizeIdentifier('comment') .
+            ' WHERE pasteid = ?', array($pasteid)
         );
         if (
             array_key_exists($pasteid, self::$_cache)
@@ -360,23 +348,19 @@ class Database extends AbstractData
                 $meta[$key] = null;
             }
         }
-        try {
-            return self::_exec(
-                'INSERT INTO "' . self::_sanitizeIdentifier('comment') .
-                '" VALUES(?,?,?,?,?,?,?)',
-                array(
-                    $commentid,
-                    $pasteid,
-                    $parentid,
-                    $data,
-                    $meta['nickname'],
-                    $meta[$iconKey],
-                    $meta[$createdKey],
-                )
-            );
-        } catch (Exception $e) {
-            return false;
-        }
+        return self::_exec(
+            'INSERT INTO ' . self::_sanitizeIdentifier('comment') .
+            ' VALUES(?,?,?,?,?,?,?)',
+            array(
+                $commentid,
+                $pasteid,
+                $parentid,
+                $data,
+                $meta['nickname'],
+                $meta[$iconKey],
+                $meta[$createdKey],
+            )
+        );
     }
 
     /**
@@ -389,13 +373,13 @@ class Database extends AbstractData
     public function readComments($pasteid)
     {
         $rows = self::_select(
-            'SELECT * FROM "' . self::_sanitizeIdentifier('comment') .
-            '" WHERE "pasteid" = ?', array($pasteid)
+            'SELECT * FROM ' . self::_sanitizeIdentifier('comment') .
+            ' WHERE pasteid = ?', array($pasteid)
         );
 
         // create comment list
         $comments = array();
-        if (is_array($rows) && count($rows)) {
+        if (count($rows)) {
             foreach ($rows as $row) {
                 $i    = $this->getOpenSlot($comments, (int) $row['postdate']);
                 $data = Json::decode($row['data']);
@@ -432,85 +416,13 @@ class Database extends AbstractData
      */
     public function existsComment($pasteid, $parentid, $commentid)
     {
-        try {
-            return (bool) self::_select(
-                'SELECT "dataid" FROM "' . self::_sanitizeIdentifier('comment') .
-                '" WHERE "pasteid" = ? AND "parentid" = ? AND "dataid" = ?',
-                array($pasteid, $parentid, $commentid), true
-            );
-        } catch (Exception $e) {
-            return false;
-        }
-    }
-
-    /**
-     * Save a value.
-     *
-     * @access public
-     * @param  string $value
-     * @param  string $namespace
-     * @param  string $key
-     * @return bool
-     */
-    public function setValue($value, $namespace, $key = '')
-    {
-        if ($namespace === 'traffic_limiter') {
-            self::$_last_cache[$key] = $value;
-            try {
-                $value = Json::encode(self::$_last_cache);
-            } catch (Exception $e) {
-                return false;
-            }
-        }
-        return self::_exec(
-            'UPDATE "' . self::_sanitizeIdentifier('config') .
-            '" SET "value" = ? WHERE "id" = ?',
-            array($value, strtoupper($namespace))
+        return (bool) self::_select(
+            'SELECT dataid FROM ' . self::_sanitizeIdentifier('comment') .
+            ' WHERE pasteid = ? AND parentid = ? AND dataid = ?',
+            array($pasteid, $parentid, $commentid), true
         );
     }
 
-    /**
-     * Load a value.
-     *
-     * @access public
-     * @param  string $namespace
-     * @param  string $key
-     * @return string
-     */
-    public function getValue($namespace, $key = '')
-    {
-        $configKey = strtoupper($namespace);
-        $value     = $this->_getConfig($configKey);
-        if ($value === '') {
-            // initialize the row, so that setValue can rely on UPDATE queries
-            self::_exec(
-                'INSERT INTO "' . self::_sanitizeIdentifier('config') .
-                '" VALUES(?,?)',
-                array($configKey, '')
-            );
-
-            // migrate filesystem based salt into database
-            $file = 'data' . DIRECTORY_SEPARATOR . 'salt.php';
-            if ($namespace === 'salt' && is_readable($file)) {
-                $value = Filesystem::getInstance(array('dir' => 'data'))->getValue('salt');
-                $this->setValue($value, 'salt');
-                @unlink($file);
-                return $value;
-            }
-        }
-        if ($value && $namespace === 'traffic_limiter') {
-            try {
-                self::$_last_cache = Json::decode($value);
-            } catch (Exception $e) {
-                self::$_last_cache = array();
-            }
-            if (array_key_exists($key, self::$_last_cache)) {
-                return self::$_last_cache[$key];
-            }
-        }
-        return (string) $value;
-    }
-
     /**
      * Returns up to batch size number of paste ids that have expired
      *
@@ -522,12 +434,11 @@ class Database extends AbstractData
     {
         $pastes = array();
         $rows   = self::_select(
-            'SELECT "dataid" FROM "' . self::_sanitizeIdentifier('paste') .
-            '" WHERE "expiredate" < ? AND "expiredate" != ? ' .
-            (self::$_type === 'oci' ? 'FETCH NEXT ? ROWS ONLY' : 'LIMIT ?'),
+            'SELECT dataid FROM ' . self::_sanitizeIdentifier('paste') .
+            ' WHERE expiredate < ? AND expiredate != ? LIMIT ?',
             array(time(), 0, $batchsize)
         );
-        if (is_array($rows) && count($rows)) {
+        if (count($rows)) {
             foreach ($rows as $row) {
                 $pastes[] = $row['dataid'];
             }
@@ -548,17 +459,7 @@ class Database extends AbstractData
     private static function _exec($sql, array $params)
     {
         $statement = self::$_db->prepare($sql);
-        foreach ($params as $key => &$parameter) {
-            $position = $key + 1;
-            if (is_int($parameter)) {
-                $statement->bindParam($position, $parameter, PDO::PARAM_INT);
-            } elseif (is_string($parameter) && strlen($parameter) >= 4000) {
-                $statement->bindParam($position, $parameter, PDO::PARAM_STR, strlen($parameter));
-            } else {
-                $statement->bindParam($position, $parameter);
-            }
-        }
-        $result = $statement->execute();
+        $result    = $statement->execute($params);
         $statement->closeCursor();
         return $result;
     }
@@ -578,24 +479,10 @@ class Database extends AbstractData
     {
         $statement = self::$_db->prepare($sql);
         $statement->execute($params);
-        if ($firstOnly) {
-            $result = $statement->fetch(PDO::FETCH_ASSOC);
-        } elseif (self::$_type === 'oci') {
-            // workaround for https://bugs.php.net/bug.php?id=46728
-            $result = array();
-            while ($row = $statement->fetch(PDO::FETCH_ASSOC)) {
-                $result[] = array_map('PrivateBin\Data\Database::_sanitizeClob', $row);
-            }
-        } else {
-            $result = $statement->fetchAll(PDO::FETCH_ASSOC);
-        }
+        $result = $firstOnly ?
+            $statement->fetch(PDO::FETCH_ASSOC) :
+            $statement->fetchAll(PDO::FETCH_ASSOC);
         $statement->closeCursor();
-        if (self::$_type === 'oci' && is_array($result)) {
-            // returned CLOB values are streams, convert these into strings
-            $result = $firstOnly ?
-                array_map('PrivateBin\Data\Database::_sanitizeClob', $result) :
-                $result;
-        }
         return $result;
     }
 
@@ -628,15 +515,14 @@ class Database extends AbstractData
     {
         switch ($type) {
             case 'ibm':
-                $sql = 'SELECT "tabname" FROM "SYSCAT"."TABLES"';
+                $sql = 'SELECT tabname FROM SYSCAT.TABLES ';
                 break;
             case 'informix':
-                $sql = 'SELECT "tabname" FROM "systables"';
+                $sql = 'SELECT tabname FROM systables ';
                 break;
             case 'mssql':
-                // U: tables created by the user
-                $sql = 'SELECT "name" FROM "sysobjects" '
-                     . 'WHERE "type" = \'U\' ORDER BY "name"';
+                $sql = 'SELECT name FROM sysobjects '
+                     . "WHERE type = 'U' ORDER BY name";
                 break;
             case 'mysql':
                 $sql = 'SHOW TABLES';
@@ -645,23 +531,23 @@ class Database extends AbstractData
                 $sql = 'SELECT table_name FROM all_tables';
                 break;
             case 'pgsql':
-                $sql = 'SELECT c."relname" AS "table_name" '
-                     . 'FROM "pg_class" c, "pg_user" u '
-                     . 'WHERE c."relowner" = u."usesysid" AND c."relkind" = \'r\' '
-                     . 'AND NOT EXISTS (SELECT 1 FROM "pg_views" WHERE "viewname" = c."relname") '
-                     . "AND c.\"relname\" !~ '^(pg_|sql_)' "
+                $sql = 'SELECT c.relname AS table_name '
+                     . 'FROM pg_class c, pg_user u '
+                     . "WHERE c.relowner = u.usesysid AND c.relkind = 'r' "
+                     . 'AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) '
+                     . "AND c.relname !~ '^(pg_|sql_)' "
                      . 'UNION '
-                     . 'SELECT c."relname" AS "table_name" '
-                     . 'FROM "pg_class" c '
-                     . "WHERE c.\"relkind\" = 'r' "
-                     . 'AND NOT EXISTS (SELECT 1 FROM "pg_views" WHERE "viewname" = c."relname") '
-                     . 'AND NOT EXISTS (SELECT 1 FROM "pg_user" WHERE "usesysid" = c."relowner") '
-                     . "AND c.\"relname\" !~ '^pg_'";
+                     . 'SELECT c.relname AS table_name '
+                     . 'FROM pg_class c '
+                     . "WHERE c.relkind = 'r' "
+                     . 'AND NOT EXISTS (SELECT 1 FROM pg_views WHERE viewname = c.relname) '
+                     . 'AND NOT EXISTS (SELECT 1 FROM pg_user WHERE usesysid = c.relowner) '
+                     . "AND c.relname !~ '^pg_'";
                 break;
             case 'sqlite':
-                $sql = 'SELECT "name" FROM "sqlite_master" WHERE "type"=\'table\' '
-                     . 'UNION ALL SELECT "name" FROM "sqlite_temp_master" '
-                     . 'WHERE "type"=\'table\' ORDER BY "name"';
+                $sql = "SELECT name FROM sqlite_master WHERE type='table' "
+                     . 'UNION ALL SELECT name FROM sqlite_temp_master '
+                     . "WHERE type='table' ORDER BY name";
                 break;
             default:
                 throw new Exception(
@@ -677,19 +563,16 @@ class Database extends AbstractData
      * @access private
      * @static
      * @param  string $key
+     * @throws PDOException
      * @return string
      */
     private static function _getConfig($key)
     {
-        try {
-            $row = self::_select(
-                'SELECT "value" FROM "' . self::_sanitizeIdentifier('config') .
-                '" WHERE "id" = ?', array($key), true
-            );
-        } catch (PDOException $e) {
-            return '';
-        }
-        return $row ? $row['value'] : '';
+        $row = self::_select(
+            'SELECT value FROM ' . self::_sanitizeIdentifier('config') .
+            ' WHERE id = ?', array($key), true
+        );
+        return $row['value'];
     }
 
     /**
@@ -703,14 +586,10 @@ class Database extends AbstractData
     private static function _getPrimaryKeyClauses($key = 'dataid')
     {
         $main_key = $after_key = '';
-        switch (self::$_type) {
-            case 'mysql':
-            case 'oci':
-                $after_key = ", PRIMARY KEY (\"$key\")";
-                break;
-            default:
-                $main_key = ' PRIMARY KEY';
-                break;
+        if (self::$_type === 'mysql') {
+            $after_key = ", PRIMARY KEY ($key)";
+        } else {
+            $main_key = ' PRIMARY KEY';
         }
         return array($main_key, $after_key);
     }
@@ -718,7 +597,7 @@ class Database extends AbstractData
     /**
      * get the data type, depending on the database driver
      *
-     * PostgreSQL and OCI uses a different API for BLOBs then SQL, hence we use TEXT and CLOB
+     * PostgreSQL uses a different API for BLOBs then SQL, hence we use TEXT
      *
      * @access private
      * @static
@@ -726,20 +605,13 @@ class Database extends AbstractData
      */
     private static function _getDataType()
     {
-        switch (self::$_type) {
-            case 'oci':
-                return 'CLOB';
-            case 'pgsql':
-                return 'TEXT';
-            default:
-                return 'BLOB';
-        }
+        return self::$_type === 'pgsql' ? 'TEXT' : 'BLOB';
     }
 
     /**
      * get the attachment type, depending on the database driver
      *
-     * PostgreSQL and OCI use different APIs for BLOBs then SQL, hence we use TEXT and CLOB
+     * PostgreSQL uses a different API for BLOBs then SQL, hence we use TEXT
      *
      * @access private
      * @static
@@ -747,33 +619,7 @@ class Database extends AbstractData
      */
     private static function _getAttachmentType()
     {
-        switch (self::$_type) {
-            case 'oci':
-                return 'CLOB';
-            case 'pgsql':
-                return 'TEXT';
-            default:
-                return 'MEDIUMBLOB';
-        }
-    }
-
-    /**
-     * get the meta type, depending on the database driver
-     *
-     * OCI doesn't accept TEXT so it has to be VARCHAR2(4000)
-     *
-     * @access private
-     * @static
-     * @return string
-     */
-    private static function _getMetaType()
-    {
-        switch (self::$_type) {
-            case 'oci':
-                return 'VARCHAR2(4000)';
-            default:
-                return 'TEXT';
-        }
+        return self::$_type === 'pgsql' ? 'TEXT' : 'MEDIUMBLOB';
     }
 
     /**
@@ -787,18 +633,17 @@ class Database extends AbstractData
         list($main_key, $after_key) = self::_getPrimaryKeyClauses();
         $dataType                   = self::_getDataType();
         $attachmentType             = self::_getAttachmentType();
-        $metaType                   = self::_getMetaType();
         self::$_db->exec(
-            'CREATE TABLE "' . self::_sanitizeIdentifier('paste') . '" ( ' .
-            "\"dataid\" CHAR(16) NOT NULL$main_key, " .
-            "\"data\" $attachmentType, " .
-            '"postdate" INT, ' .
-            '"expiredate" INT, ' .
-            '"opendiscussion" INT, ' .
-            '"burnafterreading" INT, ' .
-            "\"meta\" $metaType, " .
-            "\"attachment\" $attachmentType, " .
-            "\"attachmentname\" $dataType$after_key )"
+            'CREATE TABLE ' . self::_sanitizeIdentifier('paste') . ' ( ' .
+            "dataid CHAR(16) NOT NULL$main_key, " .
+            "data $attachmentType, " .
+            'postdate INT, ' .
+            'expiredate INT, ' .
+            'opendiscussion INT, ' .
+            'burnafterreading INT, ' .
+            'meta TEXT, ' .
+            "attachment $attachmentType, " .
+            "attachmentname $dataType$after_key );"
         );
     }
 
@@ -813,37 +658,19 @@ class Database extends AbstractData
         list($main_key, $after_key) = self::_getPrimaryKeyClauses();
         $dataType                   = self::_getDataType();
         self::$_db->exec(
-            'CREATE TABLE "' . self::_sanitizeIdentifier('comment') . '" ( ' .
-            "\"dataid\" CHAR(16) NOT NULL$main_key, " .
-            '"pasteid" CHAR(16), ' .
-            '"parentid" CHAR(16), ' .
-            "\"data\" $dataType, " .
-            "\"nickname\" $dataType, " .
-            "\"vizhash\" $dataType, " .
-            "\"postdate\" INT$after_key )"
+            'CREATE TABLE ' . self::_sanitizeIdentifier('comment') . ' ( ' .
+            "dataid CHAR(16) NOT NULL$main_key, " .
+            'pasteid CHAR(16), ' .
+            'parentid CHAR(16), ' .
+            "data $dataType, " .
+            "nickname $dataType, " .
+            "vizhash $dataType, " .
+            "postdate INT$after_key );"
+        );
+        self::$_db->exec(
+            'CREATE INDEX IF NOT EXISTS comment_parent ON ' .
+            self::_sanitizeIdentifier('comment') . '(pasteid);'
         );
-        if (self::$_type === 'oci') {
-            self::$_db->exec(
-                'declare
-                    already_exists  exception;
-                    columns_indexed exception;
-                    pragma exception_init( already_exists, -955 );
-                    pragma exception_init(columns_indexed, -1408);
-                begin
-                    execute immediate \'create index "comment_parent" on "' . self::_sanitizeIdentifier('comment') . '" ("pasteid")\';
-                exception
-                    when already_exists or columns_indexed then
-                    NULL;
-                end;'
-            );
-        } else {
-            // CREATE INDEX IF NOT EXISTS not supported as of Oracle MySQL <= 8.0
-            self::$_db->exec(
-                'CREATE INDEX "' .
-                self::_sanitizeIdentifier('comment_parent') . '" ON "' .
-                self::_sanitizeIdentifier('comment') . '" ("pasteid")'
-            );
-        }
     }
 
     /**
@@ -855,37 +682,17 @@ class Database extends AbstractData
     private static function _createConfigTable()
     {
         list($main_key, $after_key) = self::_getPrimaryKeyClauses('id');
-        $charType                   = self::$_type === 'oci' ? 'VARCHAR2(16)' : 'CHAR(16)';
-        $textType                   = self::_getMetaType();
         self::$_db->exec(
-            'CREATE TABLE "' . self::_sanitizeIdentifier('config') .
-            "\" ( \"id\" $charType NOT NULL$main_key, \"value\" $textType$after_key )"
+            'CREATE TABLE ' . self::_sanitizeIdentifier('config') .
+            " ( id CHAR(16) NOT NULL$main_key, value TEXT$after_key );"
         );
         self::_exec(
-            'INSERT INTO "' . self::_sanitizeIdentifier('config') .
-            '" VALUES(?,?)',
+            'INSERT INTO ' . self::_sanitizeIdentifier('config') .
+            ' VALUES(?,?)',
             array('VERSION', Controller::VERSION)
         );
     }
 
-    /**
-     * sanitizes CLOB values used with OCI
-     *
-     * From: https://stackoverflow.com/questions/36200534/pdo-oci-into-a-clob-field
-     *
-     * @access public
-     * @static
-     * @param  int|string|resource $value
-     * @return int|string
-     */
-    public static function _sanitizeClob($value)
-    {
-        if (is_resource($value)) {
-            $value = stream_get_contents($value);
-        }
-        return $value;
-    }
-
     /**
      * sanitizes identifiers
      *
@@ -914,50 +721,43 @@ class Database extends AbstractData
             case '0.21':
                 // create the meta column if necessary (pre 0.21 change)
                 try {
-                    self::$_db->exec(
-                        'SELECT "meta" FROM "' . self::_sanitizeIdentifier('paste') . '" ' .
-                        (self::$_type === 'oci' ? 'FETCH NEXT 1 ROWS ONLY' : 'LIMIT 1')
-                    );
+                    self::$_db->exec('SELECT meta FROM ' . self::_sanitizeIdentifier('paste') . ' LIMIT 1;');
                 } catch (PDOException $e) {
-                    self::$_db->exec('ALTER TABLE "' . self::_sanitizeIdentifier('paste') . '" ADD COLUMN "meta" TEXT');
+                    self::$_db->exec('ALTER TABLE ' . self::_sanitizeIdentifier('paste') . ' ADD COLUMN meta TEXT;');
                 }
                 // SQLite only allows one ALTER statement at a time...
                 self::$_db->exec(
-                    'ALTER TABLE "' . self::_sanitizeIdentifier('paste') .
-                    "\" ADD COLUMN \"attachment\" $attachmentType"
+                    'ALTER TABLE ' . self::_sanitizeIdentifier('paste') .
+                    " ADD COLUMN attachment $attachmentType;"
                 );
                 self::$_db->exec(
-                    'ALTER TABLE "' . self::_sanitizeIdentifier('paste') . "\" ADD COLUMN \"attachmentname\" $dataType"
+                    'ALTER TABLE ' . self::_sanitizeIdentifier('paste') . " ADD COLUMN attachmentname $dataType;"
                 );
                 // SQLite doesn't support MODIFY, but it allows TEXT of similar
                 // size as BLOB, so there is no need to change it there
                 if (self::$_type !== 'sqlite') {
                     self::$_db->exec(
-                        'ALTER TABLE "' . self::_sanitizeIdentifier('paste') .
-                        "\" ADD PRIMARY KEY (\"dataid\"), MODIFY COLUMN \"data\" $dataType"
+                        'ALTER TABLE ' . self::_sanitizeIdentifier('paste') .
+                        " ADD PRIMARY KEY (dataid), MODIFY COLUMN data $dataType;"
                     );
                     self::$_db->exec(
-                        'ALTER TABLE "' . self::_sanitizeIdentifier('comment') .
-                        "\" ADD PRIMARY KEY (\"dataid\"), MODIFY COLUMN \"data\" $dataType, " .
-                        "MODIFY COLUMN \"nickname\" $dataType, MODIFY COLUMN \"vizhash\" $dataType"
+                        'ALTER TABLE ' . self::_sanitizeIdentifier('comment') .
+                        " ADD PRIMARY KEY (dataid), MODIFY COLUMN data $dataType, " .
+                        "MODIFY COLUMN nickname $dataType, MODIFY COLUMN vizhash $dataType;"
                     );
                 } else {
                     self::$_db->exec(
-                        'CREATE UNIQUE INDEX IF NOT EXISTS "' .
-                        self::_sanitizeIdentifier('paste_dataid') . '" ON "' .
-                        self::_sanitizeIdentifier('paste') . '" ("dataid")'
+                        'CREATE UNIQUE INDEX IF NOT EXISTS paste_dataid ON ' .
+                        self::_sanitizeIdentifier('paste') . '(dataid);'
                     );
                     self::$_db->exec(
-                        'CREATE UNIQUE INDEX IF NOT EXISTS "' .
-                        self::_sanitizeIdentifier('comment_dataid') . '" ON "' .
-                        self::_sanitizeIdentifier('comment') . '" ("dataid")'
+                        'CREATE UNIQUE INDEX IF NOT EXISTS comment_dataid ON ' .
+                        self::_sanitizeIdentifier('comment') . '(dataid);'
                     );
                 }
-                // CREATE INDEX IF NOT EXISTS not supported as of Oracle MySQL <= 8.0
                 self::$_db->exec(
-                    'CREATE INDEX "' .
-                    self::_sanitizeIdentifier('comment_parent') . '" ON "' .
-                    self::_sanitizeIdentifier('comment') . '" ("pasteid")'
+                    'CREATE INDEX IF NOT EXISTS comment_parent ON ' .
+                    self::_sanitizeIdentifier('comment') . '(pasteid);'
                 );
                 // no break, continue with updates for 0.22 and later
             case '1.3':
@@ -966,15 +766,15 @@ class Database extends AbstractData
                 // to change it there
                 if (self::$_type !== 'sqlite' && self::$_type !== 'pgsql') {
                     self::$_db->exec(
-                        'ALTER TABLE "' . self::_sanitizeIdentifier('paste') .
-                        "\" MODIFY COLUMN \"data\" $attachmentType"
+                        'ALTER TABLE ' . self::_sanitizeIdentifier('paste') .
+                        " MODIFY COLUMN data $attachmentType;"
                     );
                 }
                 // no break, continue with updates for all newer versions
             default:
                 self::_exec(
-                    'UPDATE "' . self::_sanitizeIdentifier('config') .
-                    '" SET "value" = ? WHERE "id" = ?',
+                    'UPDATE ' . self::_sanitizeIdentifier('config') .
+                    ' SET value = ? WHERE id = ?',
                     array(Controller::VERSION, 'VERSION')
                 );
         }

lib/Data/Filesystem.php

@@ -7,13 +7,12 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin\Data;
 
-use Exception;
-use PrivateBin\Json;
+use PrivateBin\Persistence\DataStore;
 
 /**
  * Filesystem
@@ -22,29 +21,6 @@ use PrivateBin\Json;
  */
 class Filesystem extends AbstractData
 {
-    /**
-     * first line in paste or comment files, to protect their contents from browsing exposed data directories
-     *
-     * @const string
-     */
-    const PROTECTION_LINE = '<?php http_response_code(403); /*';
-
-    /**
-     * line in generated .htaccess files, to protect exposed directories from being browsable on apache web servers
-     *
-     * @const string
-     */
-    const HTACCESS_LINE = 'Require all denied';
-
-    /**
-     * path in which to persist something
-     *
-     * @access private
-     * @static
-     * @var    string
-     */
-    private static $_path = 'data';
-
     /**
      * get instance of singleton
      *
@@ -64,7 +40,7 @@ class Filesystem extends AbstractData
             is_array($options) &&
             array_key_exists('dir', $options)
         ) {
-            self::$_path = $options['dir'];
+            DataStore::setPath($options['dir']);
         }
         return self::$_instance;
     }
@@ -87,7 +63,7 @@ class Filesystem extends AbstractData
         if (!is_dir($storagedir)) {
             mkdir($storagedir, 0700, true);
         }
-        return self::_store($file, $paste);
+        return DataStore::store($file, $paste);
     }
 
     /**
@@ -99,13 +75,12 @@ class Filesystem extends AbstractData
      */
     public function read($pasteid)
     {
-        if (
-            !$this->exists($pasteid) ||
-            !$paste = self::_get(self::_dataid2path($pasteid) . $pasteid . '.php')
-        ) {
+        if (!$this->exists($pasteid)) {
             return false;
         }
-        return self::upgradePreV1Format($paste);
+        return self::upgradePreV1Format(
+            DataStore::get(self::_dataid2path($pasteid) . $pasteid . '.php')
+        );
     }
 
     /**
@@ -152,7 +127,7 @@ class Filesystem extends AbstractData
         $pastePath = $basePath . '.php';
         // convert to PHP protected files if needed
         if (is_readable($basePath)) {
-            self::_prependRename($basePath, $pastePath);
+            DataStore::prependRename($basePath, $pastePath);
 
             // convert comments, too
             $discdir = self::_dataid2discussionpath($pasteid);
@@ -161,7 +136,7 @@ class Filesystem extends AbstractData
                 while (false !== ($filename = $dir->read())) {
                     if (substr($filename, -4) !== '.php' && strlen($filename) >= 16) {
                         $commentFilename = $discdir . $filename . '.php';
-                        self::_prependRename($discdir . $filename, $commentFilename);
+                        DataStore::prependRename($discdir . $filename, $commentFilename);
                     }
                 }
                 $dir->close();
@@ -190,7 +165,7 @@ class Filesystem extends AbstractData
         if (!is_dir($storagedir)) {
             mkdir($storagedir, 0700, true);
         }
-        return self::_store($file, $comment);
+        return DataStore::store($file, $comment);
     }
 
     /**
@@ -212,7 +187,7 @@ class Filesystem extends AbstractData
                 // - commentid is the comment identifier itself.
                 // - parentid is the comment this comment replies to (It can be pasteid)
                 if (is_file($discdir . $filename)) {
-                    $comment = self::_get($discdir . $filename);
+                    $comment = DataStore::get($discdir . $filename);
                     $items   = explode('.', $filename);
                     // Add some meta information not contained in file.
                     $comment['id']       = $items[1];
@@ -248,97 +223,6 @@ class Filesystem extends AbstractData
         );
     }
 
-    /**
-     * Save a value.
-     *
-     * @access public
-     * @param  string $value
-     * @param  string $namespace
-     * @param  string $key
-     * @return bool
-     */
-    public function setValue($value, $namespace, $key = '')
-    {
-        switch ($namespace) {
-            case 'purge_limiter':
-                return self::_storeString(
-                    self::$_path . DIRECTORY_SEPARATOR . 'purge_limiter.php',
-                    '<?php' . PHP_EOL . '$GLOBALS[\'purge_limiter\'] = ' . $value . ';'
-                );
-            case 'salt':
-                return self::_storeString(
-                    self::$_path . DIRECTORY_SEPARATOR . 'salt.php',
-                    '<?php # |' . $value . '|'
-                );
-            case 'traffic_limiter':
-                self::$_last_cache[$key] = $value;
-                return self::_storeString(
-                    self::$_path . DIRECTORY_SEPARATOR . 'traffic_limiter.php',
-                    '<?php' . PHP_EOL . '$GLOBALS[\'traffic_limiter\'] = ' . var_export(self::$_last_cache, true) . ';'
-                );
-        }
-        return false;
-    }
-
-    /**
-     * Load a value.
-     *
-     * @access public
-     * @param  string $namespace
-     * @param  string $key
-     * @return string
-     */
-    public function getValue($namespace, $key = '')
-    {
-        switch ($namespace) {
-            case 'purge_limiter':
-                $file = self::$_path . DIRECTORY_SEPARATOR . 'purge_limiter.php';
-                if (is_readable($file)) {
-                    require $file;
-                    return $GLOBALS['purge_limiter'];
-                }
-                break;
-            case 'salt':
-                $file = self::$_path . DIRECTORY_SEPARATOR . 'salt.php';
-                if (is_readable($file)) {
-                    $items = explode('|', file_get_contents($file));
-                    if (is_array($items) && count($items) == 3) {
-                        return $items[1];
-                    }
-                }
-                break;
-            case 'traffic_limiter':
-                $file = self::$_path . DIRECTORY_SEPARATOR . 'traffic_limiter.php';
-                if (is_readable($file)) {
-                    require $file;
-                    self::$_last_cache = $GLOBALS['traffic_limiter'];
-                    if (array_key_exists($key, self::$_last_cache)) {
-                        return self::$_last_cache[$key];
-                    }
-                }
-                break;
-        }
-        return '';
-    }
-
-    /**
-     * get the data
-     *
-     * @access public
-     * @static
-     * @param  string $filename
-     * @return array|false $data
-     */
-    private static function _get($filename)
-    {
-        return Json::decode(
-            substr(
-                file_get_contents($filename),
-                strlen(self::PROTECTION_LINE . PHP_EOL)
-            )
-        );
-    }
-
     /**
      * Returns up to batch size number of paste ids that have expired
      *
@@ -349,17 +233,18 @@ class Filesystem extends AbstractData
     protected function _getExpiredPastes($batchsize)
     {
         $pastes     = array();
+        $mainpath   = DataStore::getPath();
         $firstLevel = array_filter(
-            scandir(self::$_path),
-            'PrivateBin\Data\Filesystem::_isFirstLevelDir'
+            scandir($mainpath),
+            'self::_isFirstLevelDir'
         );
         if (count($firstLevel) > 0) {
             // try at most 10 times the $batchsize pastes before giving up
             for ($i = 0, $max = $batchsize * 10; $i < $max; ++$i) {
                 $firstKey    = array_rand($firstLevel);
                 $secondLevel = array_filter(
-                    scandir(self::$_path . DIRECTORY_SEPARATOR . $firstLevel[$firstKey]),
-                    'PrivateBin\Data\Filesystem::_isSecondLevelDir'
+                    scandir($mainpath . DIRECTORY_SEPARATOR . $firstLevel[$firstKey]),
+                    'self::_isSecondLevelDir'
                 );
 
                 // skip this folder in the next checks if it is empty
@@ -369,7 +254,7 @@ class Filesystem extends AbstractData
                 }
 
                 $secondKey = array_rand($secondLevel);
-                $path      = self::$_path . DIRECTORY_SEPARATOR .
+                $path      = $mainpath . DIRECTORY_SEPARATOR .
                     $firstLevel[$firstKey] . DIRECTORY_SEPARATOR .
                     $secondLevel[$secondKey];
                 if (!is_dir($path)) {
@@ -429,9 +314,10 @@ class Filesystem extends AbstractData
      */
     private static function _dataid2path($dataid)
     {
-        return self::$_path . DIRECTORY_SEPARATOR .
+        return DataStore::getPath(
             substr($dataid, 0, 2) . DIRECTORY_SEPARATOR .
-            substr($dataid, 2, 2) . DIRECTORY_SEPARATOR;
+            substr($dataid, 2, 2) . DIRECTORY_SEPARATOR
+        );
     }
 
     /**
@@ -461,7 +347,7 @@ class Filesystem extends AbstractData
     private static function _isFirstLevelDir($element)
     {
         return self::_isSecondLevelDir($element) &&
-            is_dir(self::$_path . DIRECTORY_SEPARATOR . $element);
+            is_dir(DataStore::getPath($element));
     }
 
     /**
@@ -476,97 +362,4 @@ class Filesystem extends AbstractData
     {
         return (bool) preg_match('/^[a-f0-9]{2}$/', $element);
     }
-
-    /**
-     * store the data
-     *
-     * @access public
-     * @static
-     * @param  string $filename
-     * @param  array  $data
-     * @return bool
-     */
-    private static function _store($filename, array $data)
-    {
-        try {
-            return self::_storeString(
-                $filename,
-                self::PROTECTION_LINE . PHP_EOL . Json::encode($data)
-            );
-        } catch (Exception $e) {
-            return false;
-        }
-    }
-
-    /**
-     * store a string
-     *
-     * @access public
-     * @static
-     * @param  string $filename
-     * @param  string $data
-     * @return bool
-     */
-    private static function _storeString($filename, $data)
-    {
-        // Create storage directory if it does not exist.
-        if (!is_dir(self::$_path)) {
-            if (!@mkdir(self::$_path, 0700)) {
-                return false;
-            }
-        }
-        $file = self::$_path . DIRECTORY_SEPARATOR . '.htaccess';
-        if (!is_file($file)) {
-            $writtenBytes = 0;
-            if ($fileCreated = @touch($file)) {
-                $writtenBytes = @file_put_contents(
-                    $file,
-                    self::HTACCESS_LINE . PHP_EOL,
-                    LOCK_EX
-                );
-            }
-            if (
-                $fileCreated === false ||
-                $writtenBytes === false ||
-                $writtenBytes < strlen(self::HTACCESS_LINE . PHP_EOL)
-            ) {
-                return false;
-            }
-        }
-
-        $fileCreated  = true;
-        $writtenBytes = 0;
-        if (!is_file($filename)) {
-            $fileCreated = @touch($filename);
-        }
-        if ($fileCreated) {
-            $writtenBytes = @file_put_contents($filename, $data, LOCK_EX);
-        }
-        if ($fileCreated === false || $writtenBytes === false || $writtenBytes < strlen($data)) {
-            return false;
-        }
-        @chmod($filename, 0640); // protect file from access by other users on the host
-        return true;
-    }
-
-    /**
-     * rename a file, prepending the protection line at the beginning
-     *
-     * @access public
-     * @static
-     * @param  string $srcFile
-     * @param  string $destFile
-     * @return void
-     */
-    private static function _prependRename($srcFile, $destFile)
-    {
-        // don't overwrite already converted file
-        if (!is_readable($destFile)) {
-            $handle = fopen($srcFile, 'r', false, stream_context_create());
-            file_put_contents($destFile, self::PROTECTION_LINE . PHP_EOL);
-            file_put_contents($destFile, $handle, FILE_APPEND);
-            fclose($handle);
-        }
-        unlink($srcFile);
-    }
 }

lib/Data/GoogleCloudStorage.php

@@ -1,364 +0,0 @@
-<?php
-
-namespace PrivateBin\Data;
-
-use Exception;
-use Google\Cloud\Core\Exception\NotFoundException;
-use Google\Cloud\Storage\Bucket;
-use Google\Cloud\Storage\StorageClient;
-use PrivateBin\Json;
-
-class GoogleCloudStorage extends AbstractData
-{
-    /**
-     * GCS client
-     *
-     * @access private
-     * @static
-     * @var    StorageClient
-     */
-    private static $_client = null;
-
-    /**
-     * GCS bucket
-     *
-     * @access private
-     * @static
-     * @var    Bucket
-     */
-    private static $_bucket = null;
-
-    /**
-     * object prefix
-     *
-     * @access private
-     * @static
-     * @var    string
-     */
-    private static $_prefix = 'pastes';
-
-    /**
-     * bucket acl type
-     *
-     * @access private
-     * @static
-     * @var    bool
-     */
-    private static $_uniformacl = false;
-
-    /**
-     * returns a Google Cloud Storage data backend.
-     *
-     * @access public
-     * @static
-     * @param array $options
-     * @return GoogleCloudStorage
-     */
-    public static function getInstance(array $options)
-    {
-        // if needed initialize the singleton
-        if (!(self::$_instance instanceof self)) {
-            self::$_instance = new self;
-        }
-
-        $bucket = null;
-        if (getenv('PRIVATEBIN_GCS_BUCKET')) {
-            $bucket = getenv('PRIVATEBIN_GCS_BUCKET');
-        }
-        if (is_array($options) && array_key_exists('bucket', $options)) {
-            $bucket = $options['bucket'];
-        }
-        if (is_array($options) && array_key_exists('prefix', $options)) {
-            self::$_prefix = $options['prefix'];
-        }
-        if (is_array($options) && array_key_exists('uniformacl', $options)) {
-            self::$_uniformacl = $options['uniformacl'];
-        }
-
-        if (empty(self::$_client)) {
-            self::$_client = class_exists('StorageClientStub', false) ?
-                new \StorageClientStub(array()) :
-                new StorageClient(array('suppressKeyFileNotice' => true));
-        }
-        self::$_bucket = self::$_client->bucket($bucket);
-
-        return self::$_instance;
-    }
-
-    /**
-     * returns the google storage object key for $pasteid in self::$_bucket.
-     *
-     * @access private
-     * @param $pasteid string to get the key for
-     * @return string
-     */
-    private function _getKey($pasteid)
-    {
-        if (self::$_prefix != '') {
-            return self::$_prefix . '/' . $pasteid;
-        }
-        return $pasteid;
-    }
-
-    /**
-     * Uploads the payload in the self::$_bucket under the specified key.
-     * The entire payload is stored as a JSON document. The metadata is replicated
-     * as the GCS object's metadata except for the fields attachment, attachmentname
-     * and salt.
-     *
-     * @param $key string to store the payload under
-     * @param $payload array to store
-     * @return bool true if successful, otherwise false.
-     */
-    private function _upload($key, $payload)
-    {
-        $metadata = array_key_exists('meta', $payload) ? $payload['meta'] : array();
-        unset($metadata['attachment'], $metadata['attachmentname'], $metadata['salt']);
-        foreach ($metadata as $k => $v) {
-            $metadata[$k] = strval($v);
-        }
-        try {
-            $data = array(
-                'name'          => $key,
-                'chunkSize'     => 262144,
-                'metadata'      => array(
-                    'content-type' => 'application/json',
-                    'metadata'     => $metadata,
-                ),
-            );
-            if (!self::$_uniformacl) {
-                $data['predefinedAcl'] = 'private';
-            }
-            self::$_bucket->upload(Json::encode($payload), $data);
-        } catch (Exception $e) {
-            error_log('failed to upload ' . $key . ' to ' . self::$_bucket->name() . ', ' .
-                trim(preg_replace('/\s\s+/', ' ', $e->getMessage())));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function create($pasteid, array $paste)
-    {
-        if ($this->exists($pasteid)) {
-            return false;
-        }
-
-        return $this->_upload($this->_getKey($pasteid), $paste);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function read($pasteid)
-    {
-        try {
-            $o    = self::$_bucket->object($this->_getKey($pasteid));
-            $data = $o->downloadAsString();
-            return Json::decode($data);
-        } catch (NotFoundException $e) {
-            return false;
-        } catch (Exception $e) {
-            error_log('failed to read ' . $pasteid . ' from ' . self::$_bucket->name() . ', ' .
-                trim(preg_replace('/\s\s+/', ' ', $e->getMessage())));
-            return false;
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function delete($pasteid)
-    {
-        $name = $this->_getKey($pasteid);
-
-        try {
-            foreach (self::$_bucket->objects(array('prefix' => $name . '/discussion/')) as $comment) {
-                try {
-                    self::$_bucket->object($comment->name())->delete();
-                } catch (NotFoundException $e) {
-                    // ignore if already deleted.
-                }
-            }
-        } catch (NotFoundException $e) {
-            // there are no discussions associated with the paste
-        }
-
-        try {
-            self::$_bucket->object($name)->delete();
-        } catch (NotFoundException $e) {
-            // ignore if already deleted
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function exists($pasteid)
-    {
-        $o = self::$_bucket->object($this->_getKey($pasteid));
-        return $o->exists();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function createComment($pasteid, $parentid, $commentid, array $comment)
-    {
-        if ($this->existsComment($pasteid, $parentid, $commentid)) {
-            return false;
-        }
-        $key = $this->_getKey($pasteid) . '/discussion/' . $parentid . '/' . $commentid;
-        return $this->_upload($key, $comment);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function readComments($pasteid)
-    {
-        $comments = array();
-        $prefix   = $this->_getKey($pasteid) . '/discussion/';
-        try {
-            foreach (self::$_bucket->objects(array('prefix' => $prefix)) as $key) {
-                $comment         = JSON::decode(self::$_bucket->object($key->name())->downloadAsString());
-                $comment['id']   = basename($key->name());
-                $slot            = $this->getOpenSlot($comments, (int) $comment['meta']['created']);
-                $comments[$slot] = $comment;
-            }
-        } catch (NotFoundException $e) {
-            // no comments found
-        }
-        return $comments;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function existsComment($pasteid, $parentid, $commentid)
-    {
-        $name = $this->_getKey($pasteid) . '/discussion/' . $parentid . '/' . $commentid;
-        $o    = self::$_bucket->object($name);
-        return $o->exists();
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function purgeValues($namespace, $time)
-    {
-        $path = 'config/' . $namespace;
-        try {
-            foreach (self::$_bucket->objects(array('prefix' => $path)) as $object) {
-                $name = $object->name();
-                if (strlen($name) > strlen($path) && substr($name, strlen($path), 1) !== '/') {
-                    continue;
-                }
-                $info = $object->info();
-                if (key_exists('metadata', $info) && key_exists('value', $info['metadata'])) {
-                    $value = $info['metadata']['value'];
-                    if (is_numeric($value) && intval($value) < $time) {
-                        try {
-                            $object->delete();
-                        } catch (NotFoundException $e) {
-                            // deleted by another instance.
-                        }
-                    }
-                }
-            }
-        } catch (NotFoundException $e) {
-            // no objects in the bucket yet
-        }
-    }
-
-    /**
-     * For GoogleCloudStorage, the value will also be stored in the metadata for the
-     * namespaces traffic_limiter and purge_limiter.
-     * @inheritDoc
-     */
-    public function setValue($value, $namespace, $key = '')
-    {
-        if ($key === '') {
-            $key = 'config/' . $namespace;
-        } else {
-            $key = 'config/' . $namespace . '/' . $key;
-        }
-
-        $metadata = array('namespace' => $namespace);
-        if ($namespace != 'salt') {
-            $metadata['value'] = strval($value);
-        }
-        try {
-            $data = array(
-                'name'          => $key,
-                'chunkSize'     => 262144,
-                'metadata'      => array(
-                    'content-type' => 'application/json',
-                    'metadata'     => $metadata,
-                ),
-            );
-            if (!self::$_uniformacl) {
-                $data['predefinedAcl'] = 'private';
-            }
-            self::$_bucket->upload($value, $data);
-        } catch (Exception $e) {
-            error_log('failed to set key ' . $key . ' to ' . self::$_bucket->name() . ', ' .
-                trim(preg_replace('/\s\s+/', ' ', $e->getMessage())));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getValue($namespace, $key = '')
-    {
-        if ($key === '') {
-            $key = 'config/' . $namespace;
-        } else {
-            $key = 'config/' . $namespace . '/' . $key;
-        }
-        try {
-            $o = self::$_bucket->object($key);
-            return $o->downloadAsString();
-        } catch (NotFoundException $e) {
-            return '';
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function _getExpiredPastes($batchsize)
-    {
-        $expired = array();
-
-        $now    = time();
-        $prefix = self::$_prefix;
-        if ($prefix != '') {
-            $prefix .= '/';
-        }
-        try {
-            foreach (self::$_bucket->objects(array('prefix' => $prefix)) as $object) {
-                $metadata = $object->info()['metadata'];
-                if ($metadata != null && array_key_exists('expire_date', $metadata)) {
-                    $expire_at = intval($metadata['expire_date']);
-                    if ($expire_at != 0 && $expire_at < $now) {
-                        array_push($expired, basename($object->name()));
-                    }
-                }
-
-                if (count($expired) > $batchsize) {
-                    break;
-                }
-            }
-        } catch (NotFoundException $e) {
-            // no objects in the bucket yet
-        }
-        return $expired;
-    }
-}

lib/Data/S3Storage.php

@@ -1,464 +0,0 @@
-<?php
-/**
- * S3.php
- *
- * an S3 compatible data backend for PrivateBin with CEPH/RadosGW in mind
- * see https://docs.ceph.com/en/latest/radosgw/s3/php/
- * based on lib/Data/GoogleCloudStorage.php from PrivateBin version 1.4.0
- *
- * @link      https://github.com/PrivateBin/PrivateBin
- * @copyright 2022 Felix J. Ogris (https://ogris.de/)
- * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.1
- *
- * Installation:
- *   1. Make sure you have composer.lock and composer.json in the document root of your PasteBin
- *   2. If not, grab a copy from https://github.com/PrivateBin/PrivateBin
- *   3. As non-root user, install the AWS SDK for PHP:
- *      composer require aws/aws-sdk-php
- *      (On FreeBSD, install devel/php-composer2 prior, e.g.: make -C /usr/ports/devel/php-composer2 install clean)
- *   4. In cfg/conf.php, comment out all [model] and [model_options] settings
- *   5. Still in cfg/conf.php, add a new [model] section:
- *      [model]
- *      class = S3Storage
- *   6. Add a new [model_options] as well, e.g. for a Rados gateway as part of your CEPH cluster:
- *      [model_options]
- *      region = ""
- *      version = "2006-03-01"
- *      endpoint = "https://s3.my-ceph.invalid"
- *      use_path_style_endpoint = true
- *      bucket = "my-bucket"
- *      prefix = "privatebin"  (place all PrivateBin data beneath this prefix)
- *      accesskey = "my-rados-user"
- *      secretkey = "my-rados-pass"
- */
-
-namespace PrivateBin\Data;
-
-use Aws\S3\Exception\S3Exception;
-use Aws\S3\S3Client;
-use PrivateBin\Json;
-
-class S3Storage extends AbstractData
-{
-    /**
-     * S3 client
-     *
-     * @access private
-     * @static
-     * @var    S3Client
-     */
-    private static $_client = null;
-
-    /**
-     * S3 client options
-     *
-     * @access private
-     * @static
-     * @var    array
-     */
-    private static $_options = array();
-
-    /**
-     * S3 bucket
-     *
-     * @access private
-     * @static
-     * @var    string
-     */
-    private static $_bucket = null;
-
-    /**
-     * S3 prefix for all PrivateBin data in this bucket
-     *
-     * @access private
-     * @static
-     * @var    string
-     */
-    private static $_prefix = '';
-
-    /**
-     * returns an S3 data backend.
-     *
-     * @access public
-     * @static
-     * @param array $options
-     * @return S3Storage
-     */
-    public static function getInstance(array $options)
-    {
-        // if needed initialize the singleton
-        if (!(self::$_instance instanceof self)) {
-            self::$_instance = new self;
-        }
-
-        self::$_options                = array();
-        self::$_options['credentials'] = array();
-
-        if (is_array($options) && array_key_exists('region', $options)) {
-            self::$_options['region'] = $options['region'];
-        }
-        if (is_array($options) && array_key_exists('version', $options)) {
-            self::$_options['version'] = $options['version'];
-        }
-        if (is_array($options) && array_key_exists('endpoint', $options)) {
-            self::$_options['endpoint'] = $options['endpoint'];
-        }
-        if (is_array($options) && array_key_exists('accesskey', $options)) {
-            self::$_options['credentials']['key'] = $options['accesskey'];
-        }
-        if (is_array($options) && array_key_exists('secretkey', $options)) {
-            self::$_options['credentials']['secret'] = $options['secretkey'];
-        }
-        if (is_array($options) && array_key_exists('use_path_style_endpoint', $options)) {
-            self::$_options['use_path_style_endpoint'] = filter_var($options['use_path_style_endpoint'], FILTER_VALIDATE_BOOLEAN);
-        }
-        if (is_array($options) && array_key_exists('bucket', $options)) {
-            self::$_bucket = $options['bucket'];
-        }
-        if (is_array($options) && array_key_exists('prefix', $options)) {
-            self::$_prefix = $options['prefix'];
-        }
-
-        if (empty(self::$_client)) {
-            self::$_client = new S3Client(self::$_options);
-        }
-
-        return self::$_instance;
-    }
-
-    /**
-     * returns all objects in the given prefix.
-     *
-     * @access private
-     * @param $prefix string with prefix
-     * @return array all objects in the given prefix
-     */
-    private function _listAllObjects($prefix)
-    {
-        $allObjects = array();
-        $options    = array(
-            'Bucket' => self::$_bucket,
-            'Prefix' => $prefix,
-        );
-
-        do {
-            $objectsListResponse = self::$_client->listObjects($options);
-            $objects             = $objectsListResponse['Contents'] ?? array();
-            foreach ($objects as $object) {
-                $allObjects[]      = $object;
-                $options['Marker'] = $object['Key'];
-            }
-        } while ($objectsListResponse['IsTruncated']);
-
-        return $allObjects;
-    }
-
-    /**
-     * returns the S3 storage object key for $pasteid in self::$_bucket.
-     *
-     * @access private
-     * @param $pasteid string to get the key for
-     * @return string
-     */
-    private function _getKey($pasteid)
-    {
-        if (self::$_prefix != '') {
-            return self::$_prefix . '/' . $pasteid;
-        }
-        return $pasteid;
-    }
-
-    /**
-     * Uploads the payload in the self::$_bucket under the specified key.
-     * The entire payload is stored as a JSON document. The metadata is replicated
-     * as the S3 object's metadata except for the fields attachment, attachmentname
-     * and salt.
-     *
-     * @param $key string to store the payload under
-     * @param $payload array to store
-     * @return bool true if successful, otherwise false.
-     */
-    private function _upload($key, $payload)
-    {
-        $metadata = array_key_exists('meta', $payload) ? $payload['meta'] : array();
-        unset($metadata['attachment'], $metadata['attachmentname'], $metadata['salt']);
-        foreach ($metadata as $k => $v) {
-            $metadata[$k] = strval($v);
-        }
-        try {
-            self::$_client->putObject(array(
-                'Bucket'      => self::$_bucket,
-                'Key'         => $key,
-                'Body'        => Json::encode($payload),
-                'ContentType' => 'application/json',
-                'Metadata'    => $metadata,
-            ));
-        } catch (S3Exception $e) {
-            error_log('failed to upload ' . $key . ' to ' . self::$_bucket . ', ' .
-                trim(preg_replace('/\s\s+/', ' ', $e->getMessage())));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function create($pasteid, array $paste)
-    {
-        if ($this->exists($pasteid)) {
-            return false;
-        }
-
-        return $this->_upload($this->_getKey($pasteid), $paste);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function read($pasteid)
-    {
-        try {
-            $object = self::$_client->getObject(array(
-                'Bucket' => self::$_bucket,
-                'Key'    => $this->_getKey($pasteid),
-            ));
-            $data = $object['Body']->getContents();
-            return Json::decode($data);
-        } catch (S3Exception $e) {
-            error_log('failed to read ' . $pasteid . ' from ' . self::$_bucket . ', ' .
-                trim(preg_replace('/\s\s+/', ' ', $e->getMessage())));
-            return false;
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function delete($pasteid)
-    {
-        $name = $this->_getKey($pasteid);
-
-        try {
-            $comments = $this->_listAllObjects($name . '/discussion/');
-            foreach ($comments as $comment) {
-                try {
-                    self::$_client->deleteObject(array(
-                        'Bucket' => self::$_bucket,
-                        'Key'    => $comment['Key'],
-                    ));
-                } catch (S3Exception $e) {
-                    // ignore if already deleted.
-                }
-            }
-        } catch (S3Exception $e) {
-            // there are no discussions associated with the paste
-        }
-
-        try {
-            self::$_client->deleteObject(array(
-                'Bucket' => self::$_bucket,
-                'Key'    => $name,
-            ));
-        } catch (S3Exception $e) {
-            // ignore if already deleted
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function exists($pasteid)
-    {
-        return self::$_client->doesObjectExistV2(self::$_bucket, $this->_getKey($pasteid));
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function createComment($pasteid, $parentid, $commentid, array $comment)
-    {
-        if ($this->existsComment($pasteid, $parentid, $commentid)) {
-            return false;
-        }
-        $key = $this->_getKey($pasteid) . '/discussion/' . $parentid . '/' . $commentid;
-        return $this->_upload($key, $comment);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function readComments($pasteid)
-    {
-        $comments = array();
-        $prefix   = $this->_getKey($pasteid) . '/discussion/';
-        try {
-            $entries = $this->_listAllObjects($prefix);
-            foreach ($entries as $entry) {
-                $object = self::$_client->getObject(array(
-                    'Bucket' => self::$_bucket,
-                    'Key'    => $entry['Key'],
-                ));
-                $body             = JSON::decode($object['Body']->getContents());
-                $items            = explode('/', $entry['Key']);
-                $body['id']       = $items[3];
-                $body['parentid'] = $items[2];
-                $slot             = $this->getOpenSlot($comments, (int) $object['Metadata']['created']);
-                $comments[$slot]  = $body;
-            }
-        } catch (S3Exception $e) {
-            // no comments found
-        }
-        return $comments;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function existsComment($pasteid, $parentid, $commentid)
-    {
-        $name = $this->_getKey($pasteid) . '/discussion/' . $parentid . '/' . $commentid;
-        return self::$_client->doesObjectExistV2(self::$_bucket, $name);
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function purgeValues($namespace, $time)
-    {
-        $path = self::$_prefix;
-        if ($path != '') {
-            $path .= '/';
-        }
-        $path .= 'config/' . $namespace;
-
-        try {
-            foreach ($this->_listAllObjects($path) as $object) {
-                $name = $object['Key'];
-                if (strlen($name) > strlen($path) && substr($name, strlen($path), 1) !== '/') {
-                    continue;
-                }
-                $head = self::$_client->headObject(array(
-                    'Bucket' => self::$_bucket,
-                    'Key'    => $name,
-                ));
-                if (array_key_exists('Metadata', $head) && array_key_exists('value', $head['Metadata'])) {
-                    $value = $head['Metadata']['value'];
-                    if (is_numeric($value) && intval($value) < $time) {
-                        try {
-                            self::$_client->deleteObject(array(
-                                'Bucket' => self::$_bucket,
-                                'Key'    => $name,
-                            ));
-                        } catch (S3Exception $e) {
-                            // deleted by another instance.
-                        }
-                    }
-                }
-            }
-        } catch (S3Exception $e) {
-            // no objects in the bucket yet
-        }
-    }
-
-    /**
-     * For S3, the value will also be stored in the metadata for the
-     * namespaces traffic_limiter and purge_limiter.
-     * @inheritDoc
-     */
-    public function setValue($value, $namespace, $key = '')
-    {
-        $prefix = self::$_prefix;
-        if ($prefix != '') {
-            $prefix .= '/';
-        }
-
-        if ($key === '') {
-            $key = $prefix . 'config/' . $namespace;
-        } else {
-            $key = $prefix . 'config/' . $namespace . '/' . $key;
-        }
-
-        $metadata = array('namespace' => $namespace);
-        if ($namespace != 'salt') {
-            $metadata['value'] = strval($value);
-        }
-        try {
-            self::$_client->putObject(array(
-                'Bucket'      => self::$_bucket,
-                'Key'         => $key,
-                'Body'        => $value,
-                'ContentType' => 'application/json',
-                'Metadata'    => $metadata,
-            ));
-        } catch (S3Exception $e) {
-            error_log('failed to set key ' . $key . ' to ' . self::$_bucket . ', ' .
-                trim(preg_replace('/\s\s+/', ' ', $e->getMessage())));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * @inheritDoc
-     */
-    public function getValue($namespace, $key = '')
-    {
-        $prefix = self::$_prefix;
-        if ($prefix != '') {
-            $prefix .= '/';
-        }
-
-        if ($key === '') {
-            $key = $prefix . 'config/' . $namespace;
-        } else {
-            $key = $prefix . 'config/' . $namespace . '/' . $key;
-        }
-
-        try {
-            $object = self::$_client->getObject(array(
-                'Bucket' => self::$_bucket,
-                'Key'    => $key,
-            ));
-            return $object['Body']->getContents();
-        } catch (S3Exception $e) {
-            return '';
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function _getExpiredPastes($batchsize)
-    {
-        $expired = array();
-        $now     = time();
-        $prefix  = self::$_prefix;
-        if ($prefix != '') {
-            $prefix .= '/';
-        }
-
-        try {
-            foreach ($this->_listAllObjects($prefix) as $object) {
-                $head = self::$_client->headObject(array(
-                    'Bucket' => self::$_bucket,
-                    'Key'    => $object['Key'],
-                ));
-                if (array_key_exists('Metadata', $head) && array_key_exists('expire_date', $head['Metadata'])) {
-                    $expire_at = intval($head['Metadata']['expire_date']);
-                    if ($expire_at != 0 && $expire_at < $now) {
-                        array_push($expired, $object['Key']);
-                    }
-                }
-
-                if (count($expired) > $batchsize) {
-                    break;
-                }
-            }
-        } catch (S3Exception $e) {
-            // no objects in the bucket yet
-        }
-        return $expired;
-    }
-}

lib/Filter.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin;

lib/FormatV2.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin;
@@ -52,11 +52,6 @@ class FormatV2
             }
         }
 
-        // Make sure adata is an array.
-        if (!is_array($message['adata'])) {
-            return false;
-        }
-
         $cipherParams = $isComment ? $message['adata'] : $message['adata'][0];
 
         // Make sure some fields are base64 data:

lib/I18n.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin;
@@ -84,7 +84,7 @@ class I18n
      */
     public static function _($messageId)
     {
-        return forward_static_call_array('PrivateBin\I18n::translate', func_get_args());
+        return forward_static_call_array('self::translate', func_get_args());
     }
 
     /**
@@ -195,7 +195,7 @@ class I18n
         if (count(self::$_availableLanguages) == 0) {
             $i18n = dir(self::_getPath());
             while (false !== ($file = $i18n->read())) {
-                if (preg_match('/^([a-z]{2,3}).json$/', $file, $match) === 1) {
+                if (preg_match('/^([a-z]{2}).json$/', $file, $match) === 1) {
                     self::$_availableLanguages[] = $match[1];
                 }
             }
@@ -305,7 +305,7 @@ class I18n
     /**
      * determines the plural form to use based on current language and given number
      *
-     * From: https://docs.translatehouse.org/projects/localization-guide/en/latest/l10n/pluralforms.html
+     * From: http://localization-guide.readthedocs.org/en/latest/l10n/pluralforms.html
      *
      * @access protected
      * @static
@@ -316,31 +316,21 @@ class I18n
     {
         switch (self::$_language) {
             case 'cs':
-            case 'sk':
-                return $n === 1 ? 0 : ($n >= 2 && $n <= 4 ? 1 : 2);
-            case 'co':
+                return $n == 1 ? 0 : ($n >= 2 && $n <= 4 ? 1 : 2);
             case 'fr':
             case 'oc':
-            case 'tr':
             case 'zh':
                 return $n > 1 ? 1 : 0;
-            case 'he':
-                return $n === 1 ? 0 : ($n === 2 ? 1 : (($n < 0 || $n > 10) && ($n % 10 === 0) ? 2 : 3));
-            case 'id':
-            case 'jbo':
-                return 0;
-            case 'lt':
-                return $n % 10 === 1 && $n % 100 !== 11 ? 0 : (($n % 10 >= 2 && $n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
             case 'pl':
-                return $n === 1 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+                return $n == 1 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
             case 'ru':
             case 'uk':
-                return $n % 10 === 1 && $n % 100 != 11 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
+                return $n % 10 == 1 && $n % 100 != 11 ? 0 : ($n % 10 >= 2 && $n % 10 <= 4 && ($n % 100 < 10 || $n % 100 >= 20) ? 1 : 2);
             case 'sl':
-                return $n % 100 === 1 ? 1 : ($n % 100 === 2 ? 2 : ($n % 100 === 3 || $n % 100 === 4 ? 3 : 0));
-            // bg, ca, de, el, en, es, et, fi, hu, it, nl, no, pt
+                return $n % 100 == 1 ? 1 : ($n % 100 == 2 ? 2 : ($n % 100 == 3 || $n % 100 == 4 ? 3 : 0));
+            // bg, de, en, es, hu, it, nl, no, pt
             default:
-                return $n !== 1 ? 1 : 0;
+                return $n != 1 ? 1 : 0;
         }
     }
 

lib/Json.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin;
@@ -44,13 +44,13 @@ class Json
      * @static
      * @param  string $input
      * @throws Exception
-     * @return mixed
+     * @return array
      */
     public static function decode($input)
     {
-        $output = json_decode($input, true);
+        $array = json_decode($input, true);
         self::_detectError();
-        return $output;
+        return $array;
     }
 
     /**

lib/Model.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin;
@@ -54,7 +54,7 @@ class Model
      */
     public function getPaste($pasteId = null)
     {
-        $paste = new Paste($this->_conf, $this->getStore());
+        $paste = new Paste($this->_conf, $this->_getStore());
         if ($pasteId !== null) {
             $paste->setId($pasteId);
         }
@@ -67,9 +67,8 @@ class Model
     public function purge()
     {
         PurgeLimiter::setConfiguration($this->_conf);
-        PurgeLimiter::setStore($this->getStore());
         if (PurgeLimiter::canPurge()) {
-            $this->getStore()->purge($this->_conf->getKey('batchsize', 'purge'));
+            $this->_getStore()->purge($this->_conf->getKey('batchsize', 'purge'));
         }
     }
 
@@ -78,7 +77,7 @@ class Model
      *
      * @return Data\AbstractData
      */
-    public function getStore()
+    private function _getStore()
     {
         if ($this->_store === null) {
             $this->_store = forward_static_call(

lib/Model/AbstractModel.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin\Model;

lib/Model/Comment.php

@@ -7,14 +7,13 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin\Model;
 
 use Exception;
 use Identicon\Identicon;
-use Jdenticon\Identicon as Jdenticon;
 use PrivateBin\Persistence\TrafficLimiter;
 use PrivateBin\Vizhash16x16;
 
@@ -165,17 +164,7 @@ class Comment extends AbstractModel
         if ($icon != 'none') {
             $pngdata = '';
             $hmac    = TrafficLimiter::getHash();
-            if ($icon == 'jdenticon') {
-                $jdenticon = new Jdenticon(array(
-                    'hash'  => $hmac,
-                    'size'  => 16,
-                    'style' => array(
-                        'backgroundColor'   => '#fff0', // fully transparent, for dark mode
-                        'padding'           => 0,
-                    ),
-                ));
-                $pngdata   = $jdenticon->getImageDataUri('png');
-            } elseif ($icon == 'identicon') {
+            if ($icon == 'identicon') {
                 $identicon = new Identicon();
                 $pngdata   = $identicon->getImageDataUri($hmac, 16);
             } elseif ($icon == 'vizhash') {

lib/Model/Paste.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin\Model;
@@ -93,7 +93,7 @@ class Paste extends AbstractModel
         }
 
         $this->_data['meta']['created'] = time();
-        $this->_data['meta']['salt']    = ServerSalt::generate();
+        $this->_data['meta']['salt']    = serversalt::generate();
 
         // store paste
         if (

lib/Persistence/AbstractPersistence.php

@@ -7,12 +7,12 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin\Persistence;
 
-use PrivateBin\Data\AbstractData;
+use Exception;
 
 /**
  * AbstractPersistence
@@ -22,23 +22,104 @@ use PrivateBin\Data\AbstractData;
 abstract class AbstractPersistence
 {
     /**
-     * data storage to use to persist something
+     * path in which to persist something
      *
      * @access private
      * @static
-     * @var AbstractData
+     * @var    string
      */
-    protected static $_store;
+    private static $_path = 'data';
 
     /**
      * set the path
      *
      * @access public
      * @static
-     * @param  AbstractData $store
+     * @param  string $path
      */
-    public static function setStore(AbstractData $store)
+    public static function setPath($path)
     {
-        self::$_store = $store;
+        self::$_path = $path;
+    }
+
+    /**
+     * get the path
+     *
+     * @access public
+     * @static
+     * @param  string $filename
+     * @return string
+     */
+    public static function getPath($filename = null)
+    {
+        if (strlen($filename)) {
+            return self::$_path . DIRECTORY_SEPARATOR . $filename;
+        } else {
+            return self::$_path;
+        }
+    }
+
+    /**
+     * checks if the file exists
+     *
+     * @access protected
+     * @static
+     * @param  string $filename
+     * @return bool
+     */
+    protected static function _exists($filename)
+    {
+        self::_initialize();
+        return is_file(self::$_path . DIRECTORY_SEPARATOR . $filename);
+    }
+
+    /**
+     * prepares path for storage
+     *
+     * @access protected
+     * @static
+     * @throws Exception
+     */
+    protected static function _initialize()
+    {
+        // Create storage directory if it does not exist.
+        if (!is_dir(self::$_path)) {
+            if (!@mkdir(self::$_path, 0700)) {
+                throw new Exception('unable to create directory ' . self::$_path, 10);
+            }
+        }
+        $file = self::$_path . DIRECTORY_SEPARATOR . '.htaccess';
+        if (!is_file($file)) {
+            $writtenBytes = @file_put_contents(
+                $file,
+                'Require all denied' . PHP_EOL,
+                LOCK_EX
+            );
+            if ($writtenBytes === false || $writtenBytes < 19) {
+                throw new Exception('unable to write to file ' . $file, 11);
+            }
+        }
+    }
+
+    /**
+     * store the data
+     *
+     * @access protected
+     * @static
+     * @param  string $filename
+     * @param  string $data
+     * @throws Exception
+     * @return string
+     */
+    protected static function _store($filename, $data)
+    {
+        self::_initialize();
+        $file         = self::$_path . DIRECTORY_SEPARATOR . $filename;
+        $writtenBytes = @file_put_contents($file, $data, LOCK_EX);
+        if ($writtenBytes === false || $writtenBytes < strlen($data)) {
+            throw new Exception('unable to write to file ' . $file, 13);
+        }
+        @chmod($file, 0640); // protect file access
+        return $file;
     }
 }

lib/Persistence/DataStore.php

@@ -0,0 +1,97 @@
+<?php
+/**
+ * PrivateBin
+ *
+ * a zero-knowledge paste bin
+ *
+ * @link      https://github.com/PrivateBin/PrivateBin
+ * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
+ * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
+ * @version   1.3.4
+ */
+
+namespace PrivateBin\Persistence;
+
+use Exception;
+use PrivateBin\Json;
+
+/**
+ * DataStore
+ *
+ * Handles data storage for Data\Filesystem.
+ */
+class DataStore extends AbstractPersistence
+{
+    /**
+     * first line in file, to protect its contents
+     *
+     * @const string
+     */
+    const PROTECTION_LINE = '<?php http_response_code(403); /*';
+
+    /**
+     * store the data
+     *
+     * @access public
+     * @static
+     * @param  string $filename
+     * @param  array  $data
+     * @return bool
+     */
+    public static function store($filename, $data)
+    {
+        $path = self::getPath();
+        if (strpos($filename, $path) === 0) {
+            $filename = substr($filename, strlen($path));
+        }
+        try {
+            self::_store(
+                $filename,
+                self::PROTECTION_LINE . PHP_EOL . Json::encode($data)
+            );
+            return true;
+        } catch (Exception $e) {
+            return false;
+        }
+    }
+
+    /**
+     * get the data
+     *
+     * @access public
+     * @static
+     * @param  string $filename
+     * @return array|false $data
+     */
+    public static function get($filename)
+    {
+        return Json::decode(
+            substr(
+                file_get_contents($filename),
+                strlen(self::PROTECTION_LINE . PHP_EOL)
+            )
+        );
+    }
+
+    /**
+     * rename a file, prepending the protection line at the beginning
+     *
+     * @access public
+     * @static
+     * @param  string $srcFile
+     * @param  string $destFile
+     * @param  string $prefix (optional)
+     * @return void
+     */
+    public static function prependRename($srcFile, $destFile, $prefix = '')
+    {
+        // don't overwrite already converted file
+        if (!is_readable($destFile)) {
+            $handle = fopen($srcFile, 'r', false, stream_context_create());
+            file_put_contents($destFile, $prefix . self::PROTECTION_LINE . PHP_EOL);
+            file_put_contents($destFile, $handle, FILE_APPEND);
+            fclose($handle);
+        }
+        unlink($srcFile);
+    }
+}

lib/Persistence/PurgeLimiter.php

@@ -7,7 +7,7 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin\Persistence;
@@ -52,6 +52,7 @@ class PurgeLimiter extends AbstractPersistence
     public static function setConfiguration(Configuration $conf)
     {
         self::setLimit($conf->getKey('limit', 'purge'));
+        self::setPath($conf->getKey('dir', 'purge'));
     }
 
     /**
@@ -59,6 +60,7 @@ class PurgeLimiter extends AbstractPersistence
      *
      * @access public
      * @static
+     * @throws \Exception
      * @return bool
      */
     public static function canPurge()
@@ -69,14 +71,17 @@ class PurgeLimiter extends AbstractPersistence
         }
 
         $now  = time();
-        $pl   = (int) self::$_store->getValue('purge_limiter');
-        if ($pl + self::$_limit >= $now) {
-            return false;
+        $file = 'purge_limiter.php';
+        if (self::_exists($file)) {
+            require self::getPath($file);
+            $pl = $GLOBALS['purge_limiter'];
+            if ($pl + self::$_limit >= $now) {
+                return false;
+            }
         }
-        $hasStored = self::$_store->setValue((string) $now, 'purge_limiter');
-        if (!$hasStored) {
-            error_log('failed to store the purge limiter, skipping purge cycle to avoid getting stuck in a purge loop');
-        }
-        return $hasStored;
+
+        $content = '<?php' . PHP_EOL . '$GLOBALS[\'purge_limiter\'] = ' . $now . ';';
+        self::_store($file, $content);
+        return true;
     }
 }

lib/Persistence/ServerSalt.php

@@ -7,12 +7,12 @@
  * @link      https://github.com/PrivateBin/PrivateBin
  * @copyright 2012 Sébastien SAUVAGE (sebsauvage.net)
  * @license   https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License
- * @version   1.4.0
+ * @version   1.3.4
  */
 
 namespace PrivateBin\Persistence;
 
-use PrivateBin\Data\AbstractData;
+use Exception;
 
 /**
  * ServerSalt
@@ -26,6 +26,15 @@ use PrivateBin\Data\AbstractData;
  */
 class ServerSalt extends AbstractPersistence
 {
+    /**
+     * file where salt is saved to
+     *
+     * @access private
+     * @static
+     * @var    string
+     */
+    private static $_file = 'salt.php';
+
     /**
      * generated salt
      *
@@ -44,7 +53,8 @@ class ServerSalt extends AbstractPersistence
      */
     public static function generate()
     {
-        return bin2hex(random_bytes(256));
+        $randomSalt = bin2hex(random_bytes(256));
+        return $randomSalt;
     }
 
     /**
@@ -52,6 +62,7 @@ class ServerSalt extends AbstractPersistence
      *
      * @access public
      * @static
+     * @throws Exception
      * @return string
      */
     public static function get()
@@ -60,14 +71,20 @@ class ServerSalt extends AbstractPersistence
             return self::$_salt;
         }
 
-        $salt = self::$_store->getValue('salt');
-        if ($salt) {
-            self::$_salt = $salt;
+        if (self::_exists(self::$_file)) {
+            if (is_readable(self::getPath(self::$_file))) {
+                $items = explode('|', file_get_contents(self::getPath(self::$_file)));
+            }
+            if (!isset($items) || !is_array($items) || count($items) != 3) {
+                throw new Exception('unable to read file ' . self::getPath(self::$_file), 20);
+            }
+            self::$_salt = $items[1];
         } else {
             self::$_salt = self::generate();
-            if (!self::$_store->setValue(self::$_salt, 'salt')) {
-                error_log('failed to store the server salt, delete tokens, traffic limiter and user icons won\'t work');
-            }
+            self::_store(
+                self::$_file,
+                '<?php # |' . self::$_salt . '|'
+            );
         }
         return self::$_salt;
     }
@@ -77,11 +94,11 @@ class ServerSalt extends AbstractPersistence
      *
      * @access public
      * @static
-     * @param  AbstractData $store
+     * @param  string $path
      */
-    public static function setStore(AbstractData $store)
+    public static function setPath($path)
     {
         self::$_salt = '';
-        parent::setStore($store);
+        parent::setPath($path);
     }
 }