incrementing version

* remove old ZeroBin 0.19 guide, this is so old already, few people will benefit from a direct link in the Readme. It stays in the wiki for those, who need it.
* add direct link to the FAQ - it's one of our best documentation/sources, so it's a shame it is not featured more prominently 😉

.dockerignore

@@ -0,0 +1,18 @@
+# Documentation, might leak version number
+CHANGELOG.md
+LICENSE.md
+CREDITS.md
+INSTALL.md
+README.md
+doc/
+
+# Dotfiles, pointless
+.codeclimate.yml
+.csslintrc
+.editorconfig
+.eslint*
+.git*
+.php_cs
+.styleci.yml
+.travis.yml
+.github

.eslintrc

@@ -1,7 +1,3 @@
----
-parserOptions:
-  ecmaVersion: 2017
-
 ecmaFeatures:
   modules: true
   jsx: true
@@ -12,16 +8,18 @@ env:
   es6: true
   jquery: true
   node: true
-  mocha: true
 
 globals:
-  DOMPurify: readonly
+  sjcl: false
-  cleanup: writable
+  DOMPurify: false
-  describe: readonly
+  after: true
-  jsc: readonly
+  before: true
-  jsdom: writable
+  cleanup: true
-  kjua: writable
+  describe: false
-  WebCrypto: writable
+  it: false
+  jsc: false
+  jsdom: true
+  kjua: true
 
 # http://eslint.org/docs/rules/
 rules:

.gitattributes

@@ -1,12 +1,10 @@
 doc/ export-ignore
 tst/ export-ignore
-img/browserstack.svg export-ignore
 js/.istanbul.yml export-ignore
-js/.nycrc.yml export-ignore
-js/common.js export-ignore
 js/test/ export-ignore
 .codeclimate.yml export-ignore
 .csslintrc export-ignore
+.dockerignore export-ignore
 .editorconfig export-ignore
 .eslintignore export-ignore
 .eslintrc export-ignore
@@ -18,9 +16,7 @@ js/test/ export-ignore
 .php_cs export-ignore
 .styleci.yml export-ignore
 .travis.yml export-ignore
+Dockerfile export-ignore
+docker-compose.yml export-ignore
+docker/ 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/workflows/tests.yml

@@ -1,52 +0,0 @@
-name: Tests
-on: [push]
-
-jobs:
-  Composer:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Validate composer.json and composer.lock
-      run: composer validate
-    - name: Install dependencies
-      run: composer install --prefer-dist --no-progress --no-suggest
-  PHPunit:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        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 }}
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: ${{ matrix.php-versions }}
-        extensions: gd, sqlite3
-    - name: Remove composer lock
-      run: rm composer.lock
-    - name: Setup PHPunit
-      run: composer install -n
-    - name: Run unit tests
-      run: ../vendor/bin/phpunit --no-coverage
-      working-directory: tst
-  Mocha:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Setup Node
-      uses: actions/setup-node@v1
-      with:
-        node-version: '12'
-    - name: Setup Mocha
-      run: npm install -g mocha
-    - name: Setup Node modules
-      run: npm install
-      working-directory: js
-    - name: Run unit tests
-      run: mocha
-      working-directory: js
-

.gitignore

@@ -12,6 +12,10 @@ data/
 doc/*
 !doc/*.md
 
+# Ignore developers composer status so it isn't accidentally checked in,
+# see https://github.com/PrivateBin/PrivateBin/issues/84
+composer.lock
+
 # Ignore vendor dir of Composer except PHP files
 vendor/*.*
 vendor/*/*.*

.htaccess.disabled

@@ -1,12 +1,3 @@
 RewriteEngine on
-RewriteCond !%{HTTP_USER_AGENT} "Let's Encrypt validation server" [NC]
 RewriteCond %{HTTP_USER_AGENT} ^.*(bot|spider|crawl|https?://|WhatsApp|SkypeUriPreview|facebookexternalhit) [NC]
 RewriteRule .* - [R=403,L]
-
-<IfModule mod_php7.c>
-php_value max_execution_time 30
-php_value post_max_size 10M
-php_value upload_max_size 10M
-php_value upload_max_filesize 10M
-php_value max_file_uploads 100
-</IfModule>

.jshintrc

@@ -2,7 +2,7 @@
     "bitwise": true,
     "curly": true,
     "eqeqeq": true,
-    "esversion": 6,
+    "esversion": 5,
     "forin": true,
     "freeze": true,
     "futurehostile": true,
@@ -39,6 +39,7 @@
       "window": true
     },
     "globals": {
+      "sjcl": true,
       "DOMPurify": true,
       "kjua": true
     }

.styleci.yml

@@ -17,7 +17,7 @@ disabled:
   - concat_without_spaces
   - declare_equal_normalize
   - heredoc_to_nowdoc
-  - method_argument_space_strict
+  - method_argument_space
   - new_with_braces
   - no_alternative_syntax
   - phpdoc_align

.travis.yml

@@ -0,0 +1,38 @@
+language: php
+sudo: false
+# only needed for PHP 5.5 support as of 2019-07
+dist: trusty
+php:
+  - '5.4'
+  - '5.5'
+  - '5.6'
+  - '7.0'
+  - '7.1'
+  - '7.2'
+  - '7.3'
+
+# as this is a php project, node.js (for JS unit testing) isn't installed
+install:
+  - if [ ! -d "$HOME/.nvm" ]; then mkdir -p $HOME/.nvm && curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.34.0/install.sh | NVM_METHOD=script bash; fi
+  - source ~/.nvm/nvm.sh && nvm install --lts
+
+before_script:
+  - composer install -n
+  - npm install -g mocha
+  - cd js && npm install
+
+script:
+  - mocha
+  - cd ../tst && ../vendor/bin/phpunit
+
+after_script:
+  - ../vendor/bin/test-reporter --coverage-report log/coverage-clover.xml
+  - cd .. && vendor/bin/codacycoverage clover tst/log/coverage-clover.xml
+
+cache:
+  directories:
+    - $HOME/.composer/cache/files
+    - $HOME/.composer/cache/vcs
+    - $HOME/.nvm
+    - $HOME/.npm
+    - js/node_modules

BADGES.md

@@ -1,11 +0,0 @@
-# Badges
-
-[![Build Status](https://travis-ci.org/PrivateBin/PrivateBin.svg?branch=master)](https://travis-ci.org/PrivateBin/PrivateBin) [![Build Status](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/badges/build.png?b=master)](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/build-status/master)  
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/094500f62abf4c9aa0c8a8a4520e4789)](https://www.codacy.com/app/PrivateBin/PrivateBin)
-[![Code Climate](https://codeclimate.com/github/PrivateBin/PrivateBin/badges/gpa.svg)](https://codeclimate.com/github/PrivateBin/PrivateBin)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/?branch=master)
-[![SensioLabsInsight](https://insight.sensiolabs.com/projects/57c9e74e-c6f9-4de6-a876-df66ec2ea1ff/mini.png)](https://insight.sensiolabs.com/projects/57c9e74e-c6f9-4de6-a876-df66ec2ea1ff)  
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/094500f62abf4c9aa0c8a8a4520e4789)](https://www.codacy.com/app/PrivateBin/PrivateBin)
-[![Test Coverage](https://codeclimate.com/github/PrivateBin/PrivateBin/badges/coverage.svg)](https://codeclimate.com/github/PrivateBin/PrivateBin/coverage) [![Code Coverage](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/?branch=master)
-
-[![BrowserStack - cross browser testing](img/browserstack.svg)](https://www.browserstack.com/)

CHANGELOG.md

@@ -1,68 +1,12 @@
 # PrivateBin version history
 
-  * **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
-    * FIXED: Support custom expiration options in email function (#586)
-    * FIXED: Regression with encoding of HTML entities (#588)
-    * FIXED: Unable to paste password on paste with attachment (#565 & #595)
-  * **1.3.3 (2020-02-16)**
-    * CHANGED: Upgrading libraries to: DOMpurify 2.0.8
-    * CHANGED: Several translations got updated with missing messages
-    * CHANGED: Introduce HTML entity encoding on server side (#581)
-    * FIXED: HTML entity double encoding issues introduced in 1.3.2 (#560)
   * **1.2.3 (2020-02-16)**
     * CHANGED: Upgrading libraries to: DOMpurify 2.0.8
     * CHANGED: Introduce HTML entity encoding on server side (#581)
     * FIXED: HTML entity double encoding issues introduced in 1.3.2 (#560)
-  * **1.3.2 (2020-01-11)**
-    * ADDED: Translation for Ukrainian (#533)
-    * ADDED: Option to send a mail with the link, when creating a paste (#398)
-    * ADDED: Add support for CONFIG_PATH environment variable (#552)
-    * CHANGED: Upgrading libraries to: base-x 3.0.7, DOMpurify 2.0.7 & Showdown 1.9.1
-    * 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, 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)
-    * CHANGED: Improved mobile UI - obscured send button and hard to click shortener button (#477)
-    * CHANGED: Enhanced URL shortener integration (#479)
-    * CHANGED: Improved file upload drag & drop UI (#317)
-    * CHANGED: Increased default size limit from 2 to 10 MiB, switch data from BLOB to MEDIUMBLOB in MySQL (#458)
-    * 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: 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)
-    * FIXED: Showdown.js error when posting svg qrcode (#485)
-    * FIXED: Failed to handle the case where user cancelled attachment selection properly (#487)
-    * FIXED: Displaying the appropriate errors in older browsers (#508)
-  * **1.3 (2019-07-09)**
-    * ADDED: Translation for Czech (#424)
-    * ADDED: Threat modeled the application (#177)
-    * ADDED: Made compression configurable (#38)
-    * CHANGED: Minimum required PHP version is 5.5, due to a change in the identicon library
-    * CHANGED: Minimum required browser versions are Firefox 54, Chrome 57, Opera 44, Safari 11, Edge 16, due to use of WebCrypto API, async/await, ES6 & WebAssembly features - all Internet Explorer versions are incompatible
-    * CHANGED: JSON and encryption formats were changed to replace SJCL library by browser integrated WebCrypto API (#28, #74)
-    * CHANGED: Replaced rawdeflate.js with zlib.wasm to resolve decompression failures and gain compatibility with standard deflate implementations (#193, #260, #328, #434, #440)
-    * CHANGED: Increase PBKDF2 iterations to 100k (#350)
-    * CHANGED: Replaced last use of MD5 with Fowler–Noll–Vo checksum which produces the exact length we need for the paste ID (#49)
-    * CHANGED: Simplified some PHP code & renamed PrivateBin class into Controller, to make MVC pattern use more obvious (#342)
-    * CHANGED: Upgrading libraries to: identicon 1.2.0, random_compat 2.0.18, jQuery 3.4.1, Showdown 1.9.0, DOMpurify 1.0.11 & kjua 0.6.0
-    * FIXED: Prevent Chrome from sending content of paste to Google for translation (#378)
-    * FIXED: To support attachments larger then 2 MiB in newer Chrome versions, we switched to blob instead of data URIs (#432)
-    * FIXED: Since Outlook strips trailing equal signs in links, the key in URL hash is now base58 encoded, instead of base64 (#377)
-    * FIXED: Facebooks started injecting parameters into shared URLs for tracking that lead to inaccessible pastes (#396)
-    * FIXED: Properly escaped HTML in raw text mode (#358)
-    * FIXED: Made download links better readable in the dark bootstrap theme (#364)
-    * FIXED: Allow Letsencrypt bot to access on apache servers (#413)
   * **1.2.1 (2018-08-11)**
     * ADDED: Add support for mega.nz links in pastes and comments (#331)
     * CHANGED: Added some missing Russian translations (#348)

CODE_OF_CONDUCT.md

@@ -1,9 +0,0 @@
-# Netiquette
-
-As suggested by the current project hoster, we are hereby referring to
-[RFC 1855](https://tools.ietf.org/html/rfc1855) as a minimum set of guidelines
-of Network Etiquette for individuals interacting on this project.
-
-The maintainers of this project reserve the right to remove unlawful or
-disrupting content and block users that repeatedly disturb the project at their
-discretion.

CREDITS.md

@@ -3,8 +3,7 @@
 ## Active contributors
 
 Simon Rupf - current developer and maintainer  
-rugk - security review, doc improvment, JS refactoring & various other stuff  
+rugk - security review, doc improvment, JS refactoring & various other stuff
-R4SAS - python client, compression, blob URI to support larger attachments
 
 ## Past contributions
 
@@ -13,7 +12,7 @@ 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, current docker containers, MVC, configuration, i18n
+* Simon Rupf - MVC refactoring, configuration, i18n and unit tests
 * Hexalyse - Password protection
 * Viktor Stanchev - File upload support
 * azlux - Tab character input support
@@ -22,11 +21,8 @@ Sébastien Sauvage - original idea and main developer
 * Sobak - PSR-4 and PSR-2 refactoring
 * Nathaniel Olsen - jQuery upgrade
 * Alexander Demenshin - modal password dialog
-* PunKeel - first docker container
+* PunKeel - Dockerfile
 * thororm - Display of video, audio & PDF, drag & drop, preview of attachments
-* Harald Leithner - base58 encoding of key
-* Haocen - lots of bugfixes and UI improvements
-* Lucas Savva - configurable config file location, NixOS packaging
 
 ## Translations
 * Hexalyse - French
@@ -43,7 +39,3 @@ Sébastien Sauvage - original idea and main developer
 * Tulio Leao - Portuguese
 * Michael van Schaik - Dutch
 * Péter Tabajdi - Hungarian
-* info-path - Czech
-* BigWax - Bulgarian
-* AndriiZ - Ukrainian
-* Yaron Shahrabani - Hebrew

Dockerfile

@@ -0,0 +1,26 @@
+FROM php:apache
+
+RUN apt-get update && apt-get install -y \
+        libfreetype6-dev \
+        libjpeg62-turbo-dev \
+        libpng-dev \
+        wget \
+        zip \
+        unzip && \
+    # We install and enable php-gd
+    docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ &&\
+    docker-php-ext-install -j$(nproc) gd && \
+    # We enable Apache's mod_rewrite
+    a2enmod rewrite
+
+
+# Copy app content
+COPY . /var/www/html
+
+# Copy start script
+RUN mv /var/www/html/docker/entrypoint.sh / && \
+    rm -r /var/www/html/docker
+
+VOLUME /var/www/html/data
+
+CMD /entrypoint.sh

INSTALL.md

@@ -11,14 +11,14 @@ options](#configuration) to adjust as you see fit.
 
 ### Minimal requirements
 
-- PHP version 5.5 or above
+- PHP version 5.4 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
-
+  
   Mcrypt needs to be able to access `/dev/urandom`. This means if `open_basedir` is set, it must include this file.
 - GD extension
 - some disk space or (optionally) a database supported by [PDO](https://secure.php.net/manual/book.pdo.php)
@@ -43,34 +43,13 @@ process (see also
 >
 > The full path of PrivateBin on your webserver is:
 > /home/example.com/htdocs/paste
->
+> 
 > When setting the path like this:
 > define('PATH', '../../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 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.
-
-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:
-> SetEnv CONFIG_PATH /var/lib/privatebin/conf.php
->
-> In a php-fpm pool config:
-> env[CONFIG_PATH] = /var/lib/privatebin/conf.php
->
-> In the index.php, near the top:
-> putenv('CONFIG_PATH=/var/lib/privatebin/conf.php');
-
 ### Transport security
 
 When setting up PrivateBin, also set up HTTPS, if you haven't already. Without HTTPS
@@ -87,9 +66,8 @@ See [this FAQ item](https://github.com/PrivateBin/PrivateBin/wiki/FAQ#what-are-t
 
 In the file `cfg/conf.php` you can configure PrivateBin. A `cfg/conf.sample.php`
 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
+`cfg/conf.php` and adapt it as needed. The config file is divided into multiple
-set the `CONFIG_PATH` environment variable (see above notes). The config file is
+sections, which are enclosed in square brackets.
-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
@@ -161,7 +139,7 @@ For reference or if you want to create the table schema for yourself to avoid ha
 ```sql
 CREATE TABLE prefix_paste (
     dataid CHAR(16) NOT NULL,
-    data MEDIUMBLOB,
+    data BLOB,
     postdate INT,
     expiredate INT,
     opendiscussion INT,
@@ -187,7 +165,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.3.4');
+INSERT INTO prefix_config VALUES('VERSION', '1.2.3');
 ```
 
 In **PostgreSQL**, the data, attachment, nickname and vizhash columns needs to be TEXT and not BLOB or MEDIUMBLOB.

LICENSE.md

@@ -2,15 +2,15 @@
 
 PrivateBin consists of PHP and JS code which was originally written by Sébastien
 Sauvage in 2012 and falls unter the Zlib/libpng license. Also included are
-libraries that fall under the GPLv2 (rawinflate), BSD 3-clause (Showdown), MIT
+libraries that fall under the GPLv2 (SJCL, rawinflate, rawdeflate), BSD
-(base64.js version 1.7, Bootstrap, Identicon, random_compat, composer, kjua,
+2-clause (SJCL), BSD 3-clause (base64.js version 2.1.9, Showdown), MIT
-base-x), Apache (prettify.js) and CC-BY (favicon, icon, logo) licenses. All of
+(base64.js version 1.7, Bootstrap, Identicon, random_compat), Apache
-these license terms can be found here below:
+(prettify.js) and CC-BY (favicon, icon, logo) licenses. All of these license
+terms can be found here below:
 
-## Zlib/libpng license for PrivateBin and zlib
+## Zlib/libpng license for PrivateBin
 
 Copyright © 2012 Sébastien Sauvage
-Copyright © 1995-2017 Jean-loup Gailly and Mark Adler
 
 This software is provided 'as-is', without any express or implied warranty. In
 no event will the authors be held liable for any damages arising from the use
@@ -30,7 +30,17 @@ the following restrictions:
 
 3. This notice may not be removed or altered from any source distribution.
 
-## GNU General Public License, version 2.0, for rawinflate
+### MIT license for kjua
+
+Copyright (c) 2016 Lars Jung (https://larsjung.de)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+## GNU General Public License, version 2.0, for SJCL, rawdeflate and rawinflate
 
 _Version 2, June 1991_
 _Copyright © 1989, 1991 Free Software Foundation, Inc.,_
@@ -307,6 +317,31 @@ POSSIBILITY OF SUCH DAMAGES.
 
 END OF TERMS AND CONDITIONS
 
+## BSD 2-Clause License for SJCL
+
+_Copyright © 2009-2015, Emily Stark, Mike Hamburg and Dan Boneh at Stanford University._
+_All rights reserved._
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS “AS IS” AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 ## BSD 3-Clause License for Showdown
 
 Showdown Copyright © 2007, John Fraser
@@ -342,16 +377,39 @@ any theory of liability, whether in contract, strict liability, or tort
 (including negligence or otherwise) arising in any way out of the use of this
 software, even if advised of the possibility of such damage.
 
-## MIT License for base64.js version 1.7, Bootstrap, Identicon, random_compat, Composer, kjua and base-x
+## BSD 3-Clause License for base64.js version 2.1.9
+
+Copyright © 2014, Dan Kogai
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of base64.js nor the names of its contributors may be used
+  to endorse or promote products derived from this software without specific
+  prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## MIT License for base64.js version 1.7
 
 Copyright © 2012 Dan Kogai
-Copyright © 2011-2016 Twitter, Inc.
-Copyright © 2013 Benjamin Laugueux <benjamin@yzalis.com>
-Copyright © 2015 Paragon Initiative Enterprises
-Copyright © 2016 Nils Adermann, Jordi Boggiano
-Copyright © 2016 Lars Jung (https://larsjung.de)
-Copyright © 2018 base-x contributors
-Copyright © 2014-2018 The Bitcoin Core developers
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -371,6 +429,94 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
+## MIT License for Bootstrap
+
+Copyright © 2011-2016 Twitter, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## MIT License for Identicon
+
+Copyright © 2013 Benjamin Laugueux <benjamin@yzalis.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+## MIT License for random_compat
+
+Copyright © 2015 Paragon Initiative Enterprises
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+## MIT license for Composer
+
+Copyright (c) 2016 Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
 ## Apache License for prettify.js
 
 _Version 2.0, January 2004_

Makefile

@@ -1,53 +0,0 @@
-.PHONY: all coverage coverage-js coverage-php doc doc-js doc-php increment sign test test-js test-php help
-
-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`.
-
-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.
-	cd js && nyc mocha
-
-coverage-php: ## Run PHP unit tests and generate code coverage reports.
-	cd tst && phpunit 2> /dev/null
-	cd log/php-coverage-report && sed -i "s#$(CURDIR)##g" *.html */*.html
-
-doc: doc-js doc-php ## Generate all code documentation.
-
-doc-js: ## Generate JS code documentation.
-	jsdoc -p -d doc/jsdoc js/privatebin.js js/legacy.js
-
-doc-php: ## Generate JS code documentation.
-	phpdoc --visibility public,protected,private -t doc/phpdoc -d lib/
-
-increment: ## Increment and commit new version number, set target version using `make increment VERSION=1.2.3`.
-	for F in `grep -l -R $(REGEX_CURRENT_VERSION) $(VERSION_FILES) | grep -v -e tst/log/ -e ":0" -e CHANGELOG.md`; \
-	do \
-		sed -i "s/$(REGEX_CURRENT_VERSION)/$(REGEX_VERSION)/g" $$F; \
-	done
-	git add $(VERSION_FILES)
-	git commit -m "incrementing version"
-
-sign: ## Sign a release.
-	git tag $(VERSION)
-	git push --tags
-	signrelease.sh
-
-test: test-js test-php ## Run all unit tests.
-
-test-js: ## Run JS unit tests.
-	cd js && mocha
-
-test-php: ## Run PHP unit tests.
-	cd tst && phpunit --no-coverage
-
-help: ## Displays these usage instructions.
-	@echo "Usage: make <target(s)>"
-	@echo
-	@echo "Specify one or multiple of the following targets and they will be processed in the given order:"
-	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "%-16s%s\n", $$1, $$2}' $(MAKEFILE_LIST)

README.md

@@ -1,6 +1,13 @@
-# [![PrivateBin](https://cdn.rawgit.com/PrivateBin/assets/master/images/preview/logoSmall.png)](https://privatebin.info/)
+# [<img alt="PrivateBin" src="https://cdn.rawgit.com/PrivateBin/assets/master/images/minified/logo.svg" width="500" />](https://privatebin.info/)
+[![Build Status](https://travis-ci.org/PrivateBin/PrivateBin.svg?branch=master)](https://travis-ci.org/PrivateBin/PrivateBin) [![Build Status](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/badges/build.png?b=master)](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/build-status/master)  
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/094500f62abf4c9aa0c8a8a4520e4789)](https://www.codacy.com/app/PrivateBin/PrivateBin)
+[![Code Climate](https://codeclimate.com/github/PrivateBin/PrivateBin/badges/gpa.svg)](https://codeclimate.com/github/PrivateBin/PrivateBin)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/?branch=master)
+[![SensioLabsInsight](https://insight.sensiolabs.com/projects/57c9e74e-c6f9-4de6-a876-df66ec2ea1ff/mini.png)](https://insight.sensiolabs.com/projects/57c9e74e-c6f9-4de6-a876-df66ec2ea1ff)  
+[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/094500f62abf4c9aa0c8a8a4520e4789)](https://www.codacy.com/app/PrivateBin/PrivateBin)
+[![Test Coverage](https://codeclimate.com/github/PrivateBin/PrivateBin/badges/coverage.svg)](https://codeclimate.com/github/PrivateBin/PrivateBin/coverage) [![Code Coverage](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/PrivateBin/PrivateBin/?branch=master)
 
-*Current version: 1.3.4*
+*Current version: 1.2.3*
 
 **PrivateBin** is a minimalist, open source online [pastebin](https://en.wikipedia.org/wiki/Pastebin)
 where the server has zero knowledge of pasted data.

SECURITY.md

@@ -1,18 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 1.3.4   | :heavy_check_mark: |
-| < 1.3.4 | :x:                |
-
-## Reporting a Vulnerability
-
-You can send us email at security@privatebin.org. You should be able to get
-a response within a week (usually during the next weekend). The respondee will
-reply from their personal address and can offer you their GPG public key to
-support end-to-end encrypted communication on sensitive topics or attachments.
-
-You can also contact us via the regular issue tracker if the risk of early
-publication is low or you would request input from other PrivateBin users.

cfg/conf.sample.php

@@ -7,10 +7,6 @@
 ; (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
-; 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
 
@@ -33,8 +29,8 @@ defaultformatter = "plaintext"
 ; (optional) set a syntax highlighting theme, as found in css/prettify/
 ; syntaxhighlightingtheme = "sons-of-obsidian"
 
-; size limit per paste or comment in bytes, defaults to 10 Mebibytes
+; size limit per paste or comment in bytes, defaults to 2 Mebibytes
-sizelimit = 10485760
+sizelimit = 2097152
 
 ; template to include, default is "bootstrap" (tpl/bootstrap.php)
 template = "bootstrap"
@@ -64,43 +60,22 @@ languageselection = false
 ; 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).
+; Can be set to one these values: none / vizhash / identicon (default).
-; icon = "none"
+; icon = none
 
 ; Content Security Policy headers allow a website to restrict what sources are
 ; allowed to be accessed in its context. You need to change this if you added
 ; custom scripts from third-party domains to your templates, e.g. tracking
 ; scripts or run your site behind certain DDoS-protection services.
 ; Check the documentation at https://content-security-policy.com/
-; Notes:
+; Note: If you use a bootstrap theme, you can remove the allow-popups from the sandbox restrictions.
-; - If you use a bootstrap theme, you can remove the allow-popups from the
+; By default this disallows to load images from third-party servers, e.g. when they are embedded in pastes. If you wish to allow that, you can adjust the policy here. See https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-it-load-embedded-images for details.
-;   sandbox restrictions.
+; cspheader = "default-src 'none'; manifest-src 'self'; connect-src *; script-src 'self'; style-src 'self'; font-src 'self'; img-src 'self' data:; media-src data:; object-src data:; Referrer-Policy: 'no-referrer'; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals"
-; - By default this disallows to load images from third-party servers, e.g. when
-;   they are embedded in pastes. If you wish to allow that, you can adjust the
-;   policy here. See https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-it-load-embedded-images
-;   for details.
-; - The 'unsafe-eval' is used in two cases; to check if the browser supports
-;   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'; 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
 ; sha256 in HMAC for the deletion token
-; zerobincompatibility = false
+zerobincompatibility = false
-
-; Enable or disable the warning message when the site is served over an insecure
-; connection (insecure HTTP instead of HTTPS), defaults to true.
-; Secure transport methods like Tor and I2P domains are automatically whitelisted.
-; It is **strongly discouraged** to disable this.
-; See https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-it-show-me-an-error-about-an-insecure-connection for more information.
-; httpwarning = true
-
-; Pick compression algorithm or disable it. Only applies to pastes/comments
-; created after changing the setting.
-; Can be set to one these values: "none" / "zlib" (default).
-; compression = "zlib"
 
 [expire]
 ; expire value that is selected per default

composer.json

@@ -1,42 +1,32 @@
 {
-	"name" : "privatebin/privatebin",
+    "name": "privatebin/privatebin",
-	"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).",
+    "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).",
-	"type" : "project",
+    "type": "project",
-	"keywords" : [
+    "keywords": ["private", "secure", "end-to-end-encrypted", "e2e", "paste", "pastebin", "zero", "zero-knowledge", "encryption", "encrypted", "AES"],
-		"private",
+    "homepage": "https://privatebin.info/",
-		"secure",
+    "license":"zlib-acknowledgement",
-		"end-to-end-encrypted",
+    "support": {
-		"e2e",
+        "issues": "https://github.com/PrivateBin/PrivateBin/issues",
-		"paste",
+        "wiki": "https://github.com/PrivateBin/PrivateBin/wiki",
-		"pastebin",
+        "source": "https://github.com/PrivateBin/PrivateBin",
-		"zero",
+        "docs": "https://privatebin.info/codedoc/"
-		"zero-knowledge",
+    },
-		"encryption",
+    "require": {
-		"encrypted",
+        "php": "^5.4.0 || ^7.0",
-		"AES"
+        "paragonie/random_compat": "2.0.15",
-	],
+        "yzalis/identicon": "1.1.0"
-	"homepage" : "https://privatebin.info/",
+    },
-	"license" : "zlib-acknowledgement",
+    "require-dev": {
-	"support" : {
+        "codacy/coverage": "dev-master",
-		"issues" : "https://github.com/PrivateBin/PrivateBin/issues",
+        "codeclimate/php-test-reporter": "dev-master",
-		"wiki" : "https://github.com/PrivateBin/PrivateBin/wiki",
+        "phpunit/phpunit": "^4.6 || ^5.0"
-		"source" : "https://github.com/PrivateBin/PrivateBin",
+    },
-		"docs" : "https://privatebin.info/codedoc/"
+    "autoload": {
-	},
+        "psr-4": {
-	"require" : {
+            "PrivateBin\\": "lib/"
-		"php" : "^5.6.0 || ^7.0",
+        }
-		"paragonie/random_compat" : "2.0.18",
+    },
-		"yzalis/identicon" : "2.0.0"
+    "config": {
-	},
+        "autoloader-suffix": "DontChange"
-	"require-dev" : {
+    }
-		"phpunit/phpunit" : "^4.6 || ^5.0"
-	},
-	"autoload" : {
-		"psr-4" : {
-			"PrivateBin\\" : "lib/"
-		}
-	},
-	"config" : {
-		"autoloader-suffix" : "DontChange"
-	}
 }

crowdin.yml

@@ -1,3 +0,0 @@
-files:
-  - source: /i18n/en.json
-    translation: /i18n/%two_letters_code%.json

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.3.4
+ * @version   1.2.3
  */
 
 body {
@@ -80,30 +80,12 @@ body.loading {
 	margin-bottom: 20px;
 }
 
-#dropzone {
+.dragAndDropFile{
-	text-align: center;
+        color:#777;
-	position: fixed;
+        font-size:1em;
-	top: 0;
+        display:inline;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 1000;
-	opacity: 0.6;
-	background-color: #99ccff;
-	background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z'/%3E%3C/svg%3E");
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: 25vh;
-	outline: 2px dashed #228bff;
-	outline-offset: -50px;
 }
 
-.dragAndDropFile{
-	color: #777;
-	font-size: 1em;
-	display: inline;
-	white-space: normal;
-}
 
 #deletelink {
 	float: right;
@@ -131,9 +113,8 @@ body.loading {
 	margin-bottom: 10px;
 }
 
-#message, .replymessage {
+#message {
 	font-family: monospace;
-	resize: vertical;
 }
 
 #nickname {
@@ -144,10 +125,6 @@ body.loading {
 	margin-bottom: 10px;
 }
 
-#filewrap {
-	transition: background-color 0.75s ease-out;
-}
-
 .comment {
 	border-left: 1px solid #ccc;
 	padding: 5px 0 5px 10px;
@@ -155,7 +132,7 @@ body.loading {
 	transition: background-color 0.75s ease-out;
 }
 
-.highlight {
+.comment.highlight {
 	background-color: #ffdd86;
 	transition: background-color 0.2s ease-in;
 }
@@ -167,81 +144,3 @@ footer h4 {
 li.L0, li.L1, li.L2, li.L3, li.L5, li.L6, li.L7, li.L8 {
 	list-style-type: decimal !important;
 }
-
-.dark-theme .alert-info .alert-link {
-	color: #fff;
-}
-
-/* address 2K or 4K monitors when using bootstrap 3 */
-@media (min-width: 1280px) {
-	.container {
-		width: 100%;
-		padding-left: 4ch;
-		padding-right: 4ch;
-	}
-}
-
-.modal-dialog {
-	margin: auto !important;
-}
-
-/* makeup for the original margin on modal-dialog */
-@media (min-width: 768px) {
-	.modal-content {
-		margin: 30px 0;
-	}
-}
-
-.modal-content {
-	margin: 10px;
-}
-
-.modal-body {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-}
-
-.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.3.4
+ * @version   1.2.3
  */
 
 /* 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.3.4
+ * @version   1.2.3
  */
 
 /*  CSS Reset from YUI 3.4.1 (build 4118) - Copyright 2011 Yahoo! Inc. All rights reserved.
@@ -102,7 +102,6 @@ h3.title {
 	padding: 5px;
 	white-space: pre-wrap;
 	font-family: Consolas, "Lucida Console", "DejaVu Sans Mono", Monaco, monospace;
-	resize: vertical;
 }
 
 #attachmentPreview img {
@@ -116,29 +115,10 @@ h3.title {
 	margin-bottom: 20px;
 }
 
-#dropzone {
-	text-align: center;
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	z-index: 1000;
-	opacity: 0.6;
-	background-color: #99ccff;
-	background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='24' height='24' viewBox='0 0 24 24'%3E%3Cpath d='M0 0h24v24H0z' fill='none'/%3E%3Cpath d='M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96zM14 13v4h-4v-4H7l5-5 5 5h-3z'/%3E%3C/svg%3E");
-	background-repeat: no-repeat;
-	background-position: center;
-	background-size: 25vh;
-	outline: 2px dashed #228bff;
-	outline-offset: -50px;
-}
-
 .dragAndDropFile{
-	color: #777;
+        color:#777;
-	font-size: 1em;
+        font-size:1em;
-	display: inline;
+        display:inline;
-	white-space: normal;
 }
 
 #status {
@@ -310,9 +290,9 @@ input {
 
 #ienotice a { color: #000; }
 
-#oldnotice, #httpnotice { display: none; }
+#oldienotice { display: none; }
 
-#errormessage, .errorMessage {
+.errorMessage {
 	background-color: #f77 !important;
 	color:#ff0;
 }
@@ -425,15 +405,6 @@ h4.title {
 
 .commentdate { color: #bfcede; }
 
-#filewrap {
-	transition: background-color 0.75s ease-out;
-}
-
-.highlight {
-	background-color: #ffdd86;
-	transition: background-color 0.2s ease-in;
-}
-
 img.vizhash {
 	width: 16px;
 	height: 16px;

doc/README.md

@@ -20,7 +20,7 @@ $ sudo pear install phpdoc/phpDocumentor
 To generate the documentation, change into the main directory and run phpdoc:
 ```console
 $ cd PrivateBin
-$ phpdoc --visibility public,protected,private -t doc/phpdoc -d lib/
+$ phpdoc -t doc/phpdoc -d lib/
 ```
 
 **Note:** When used with PHP 7, the prerelease of phpDocumentator 2.9 needs to be
@@ -55,6 +55,6 @@ $ ln -s /usr/bin/nodejs /usr/local/bin/node
 To generate the documentation, change into the main directory and run phpdoc:
 ```console
 $ cd PrivateBin
-$ jsdoc -p -d doc/jsdoc js/privatebin.js js/legacy.js
+$ jsdoc -d doc/jsdoc js/privatebin.js
 ```
 

docker-compose.yml

@@ -0,0 +1,15 @@
+version: '3'
+
+services:
+  privatebin:
+    build: .
+    ports:
+      - "3000:80"
+    volumes:
+      - data:/var/www/html/data
+      # Optionally mount a custom config file
+      #- /srv/docker/privatebin/conf.php:/var/www/html/cfg/conf.php
+    
+volumes:
+  data:
+

docker/entrypoint.sh

@@ -0,0 +1,4 @@
+#! /bin/sh
+
+chown -R www-data /var/www/html/data
+apache2-foreground

i18n/bg.json

@@ -1,181 +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 <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 секунди между всяка публикация.",
-    "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.": "Услугата %s се нуждае от JavaScript, за да работи. Съжаляваме за неудобството.",
-    "%s requires a modern browser to work.": "%s се нуждае от съвременен браузър за да работи.",
-    "New": "Създаване",
-    "Send": "Изпрати",
-    "Clone": "Дублирай",
-    "Raw text": "Чист текст",
-    "Expires": "Изтича",
-    "Burn after reading": "Унищожи след преглед",
-    "Open discussion": "Отворена дискусия",
-    "Password (recommended)": "Парола (препоръчва се)",
-    "Discussion": "Коментари",
-    "Toggle navigation": "Включи или Изключи навигацията",
-    "%d seconds": [
-        "%d секунди",
-        "%d секунда",
-        "%d seconds (2nd plural)",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d минути",
-        "%d минута",
-        "%d minutes (2nd plural)",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d часа",
-        "%d час",
-        "%d hours (2nd plural)",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d дни",
-        "%d ден",
-        "%d days (2nd plural)",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d седмици",
-        "%d седмица",
-        "%d weeks (2nd plural)",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d месеци",
-        "%d месец",
-        "%d months (2nd plural)",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%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 секунди.",
-        "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 минути.",
-        "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 часа.",
-        "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 дни.",
-        "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 години.",
-        "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": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "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": "Също можеш да пуснеш файла върху този прозорец или да поставиш изображение от клипборда",
-    "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.": "Браузърът ви не поддържа прикачване на шифровани файлове. Моля, използвайте по-нов браузър",
-    "Invalid attachment.": "Невалидно прикачване.",
-    "Options": "Настройки",
-    "Shorten URL": "Скъси връзката",
-    "Editor": "Редактор",
-    "Preview": "Визуализация",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "PATH трябва да е във края на \"%s\" за да може %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\">този FAQ (Английски)</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.": "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/cs.json

@@ -1,181 +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 <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 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.": "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",
-    "Clone": "Klonovat",
-    "Raw text": "Pouze Text",
-    "Expires": "Expirace",
-    "Burn after reading": "Po přečtení smazat",
-    "Open discussion": "Povolit komentáře",
-    "Password (recommended)": "Heslo (doporučeno)",
-    "Discussion": "Komentáře",
-    "Toggle navigation": "Toggle navigation",
-    "%d seconds": [
-        "%d sekuda",
-        "%d sekundy",
-        "%d sekund",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d minuta",
-        "%d minuty",
-        "%d minut",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d hodin",
-        "%d hodiny",
-        "%d hodin",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d den",
-        "%d dny",
-        "%d dní",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d týden",
-        "%d týdeny",
-        "%d týdnů",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d měsíc",
-        "%d měsíce",
-        "%d měsíců",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%d rok",
-        "%d roky",
-        "%d roků",
-        "%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.": "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.",
-        "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.",
-        "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.",
-        "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.",
-        "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ů.",
-        "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?)": "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 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": "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",
-    "Sending paste…": "Odesílání příspěvku…",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Váš link je <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Stiskněte [Ctrl]+[c] pro zkopírování)</span>",
-    "Delete data": "Odstranit data",
-    "Could not create paste: %s": "Nelze vytvořit příspěvek: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Nepodařilo se dešifrovat příspěvek: V adrese chybí dešifrovací klíč (Možnou příčinou může být URL shortener?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
-    "Format": "Formát",
-    "Plain Text": "Prostý Text",
-    "Source Code": "Zdrojový kód",
-    "Markdown": "Markdown",
-    "Download attachment": "Stáhnout přílohu",
-    "Cloned: '%s'": "Klonováno: '%s'",
-    "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": "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": "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 requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Decrypt": "Decrypt",
-    "Enter password": "Zadejte heslo",
-    "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": "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,138 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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.",
+    "%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": "Unwissenheit ist ein Segen",
+        "%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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "%s benötigt PHP %s oder höher, um zu funktionieren. Sorry.",
+        "Diesen Text gibt es nicht, er ist abgelaufen oder wurde gelöscht.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s benötigt den Konfigurationsabschnitt [%s] in der Konfigurationsdatei um zu funktionieren.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Bitte warte %d Sekunden zwischen dem Absenden.",
+        "%s benötigt PHP %s oder höher, um zu funktionieren. Sorry.",
-    "Paste is limited to %s of encrypted data.": "Texte sind auf %s verschlüsselte Datenmenge beschränkt.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Ungültige Daten.",
+        "%s benötigt den Konfigurationsabschnitt [%s] in der Konfigurationsdatei um zu funktionieren.",
-    "You are unlucky. Try again.": "Du hast Pech. Versuchs nochmal.",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Fehler beim Speichern des Kommentars. Sorry.",
+        "Bitte warte %d Sekunden zwischen dem Absenden.",
-    "Error saving paste. Sorry.": "Fehler beim Speichern des Textes. Sorry.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "Ungültige Text-ID.",
+        "Texte sind auf %s verschlüsselte Datenmenge beschränkt.",
-    "Paste is not of burn-after-reading type.": "Text ist kein \"Einmal\"-Typ.",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Falscher Lösch-Code. Text wurde nicht gelöscht.",
+        "Ungültige Daten.",
-    "Paste was properly deleted.": "Text wurde erfolgreich gelöscht.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript ist eine Voraussetzung, um %s zu nutzen. Bitte entschuldige die Unannehmlichkeiten.",
+        "Du hast Pech. Versuchs nochmal.",
-    "%s requires a modern browser to work.": "%s setzt einen modernen Browser voraus, um funktionieren zu können.",
+    "Error saving comment. Sorry.":
-    "New": "Neu",
+        "Fehler beim Speichern des Kommentars. Sorry.",
-    "Send": "Senden",
+    "Error saving paste. Sorry.":
-    "Clone": "Klonen",
+        "Fehler beim Speichern des Textes. Sorry.",
-    "Raw text": "Reiner Text",
+    "Invalid paste ID.":
-    "Expires": "Ablaufzeit",
+        "Ungültige Text-ID.",
-    "Burn after reading": "Nach dem Lesen löschen",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Kommentare aktivieren",
+        "Text ist kein \"Einmal\"-Typ.",
-    "Password (recommended)": "Passwort (empfohlen)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Kommentare",
+        "Falscher Lösch-Code. Text wurde nicht gelöscht.",
-    "Toggle navigation": "Navigation umschalten",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "Text wurde erfolgreich gelöscht.",
-        "%d Sekunde",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d Sekunden",
+        "JavaScript ist eine Voraussetzung, um %s zu nutzen. Bitte entschuldige die Unannehmlichkeiten.",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s setzt einen modernen Browser voraus, um funktionieren zu können.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Du benutzt immer noch den Internet Explorer? Tu Dir einen Gefallen und wechsle zu einem moderneren Browser:",
-        "%d Minute",
+    "New":
-        "%d Minuten",
+        "Neu",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Senden",
-    ],
+    "Clone":
-    "%d hours": [
+        "Klonen",
-        "%d Stunde",
+    "Raw text":
-        "%d Stunden",
+        "Reiner Text",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Ablaufzeit",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Einmal-Text",
-        "%d Tag",
+    "Open discussion":
-        "%d Tage",
+        "Diskussion eröffnen",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Passwort (empfohlen)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Diskussion",
-        "%d Woche",
+    "Toggle navigation":
-        "%d Wochen",
+        "Navigation umschalten",
-        "%d weeks (2nd plural)",
+    "%d seconds": ["%d Sekunde", "%d Sekunden"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d Minute", "%d Minuten"],
-    ],
+    "%d hours": ["%d Stunde", "%d Stunden"],
-    "%d months": [
+    "%d days": ["%d Tag", "%d Tage"],
-        "%d Monat",
+    "%d weeks": ["%d Woche", "%d Wochen"],
-        "%d Monate",
+    "%d months": ["%d Monat", "%d Monate"],
-        "%d months (2nd plural)",
+    "%d years": ["%d Jahr", "%d Jahre"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Nie",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d Jahr",
+        "Hinweis: Dies ist ein Versuchsdienst. Daten können jederzeit gelöscht werden. Kätzchen werden sterben wenn du diesen Dienst missbrauchst.",
-        "%d Jahre",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["Dieses Dokument läuft in einer Sekunde ab.", "Dieses Dokument läuft in %d Sekunden ab."],
-        "%d years (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."],
-    "Never": "Nie",
+    "This document will expire in %d hours.":
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Hinweis: Dies ist ein Versuchsdienst. Daten können jederzeit gelöscht werden. Kätzchen werden sterben, wenn du diesen Dienst missbrauchst.",
+        ["Dieses Dokument läuft in einer Stunde ab.", "Dieses Dokument läuft in %d Stunden ab."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Dieses Dokument läuft in einer Sekunde ab.",
+        ["Dieses Dokument läuft in einem Tag ab.", "Dieses Dokument läuft in %d Tagen ab."],
-        "Dieses Dokument läuft in %d Sekunden ab.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["Dieses Dokument läuft in einem Monat ab.", "Dieses Dokument läuft in %d Monaten ab."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Bitte gib das Passwort für diesen Text ein:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Dieses Dokument läuft in einer Minute ab.",
+        "Konnte Daten nicht entschlüsseln (Falscher Schlüssel?)",
-        "Dieses Dokument läuft in %d Minuten ab.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "Konnte das Paste nicht löschen, es wurde nicht im Einmal-Modus gespeichert.",
-        "This document will expire in %d minutes (3rd plural)"
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "DIESER TEXT IST NUR FÜR DICH GEDACHT. Schließe das Fenster nicht, diese Nachricht kann nur einmal geöffnet werden.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Dieses Dokument läuft in einer Stunde ab.",
+        "Konnte Kommentar nicht entschlüsseln; Falscher Schlüssel?",
-        "Dieses Dokument läuft in %d Stunden ab.",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Antworten",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anonym",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Dieses Dokument läuft in einem Tag ab.",
+        "Avatar (generiert aus der IP-Adresse)",
-        "Dieses Dokument läuft in %d Tagen ab.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Kommentar hinzufügen",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Optionales Pseudonym…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Dieses Dokument läuft in einem Monat ab.",
+        "Kommentar absenden",
-        "Dieses Dokument läuft in %d Monaten ab.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Sende Kommentar…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Kommentar gesendet.",
-    "Please enter the password for this paste:": "Bitte gib das Passwort für diesen Text ein:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Konnte Daten nicht entschlüsseln (Falscher Schlüssel?)",
+        "Konnte Ansicht nicht aktualisieren: %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Konnte das Paste nicht löschen, es wurde nicht im Einmal-Modus gespeichert.",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "DIESER TEXT IST NUR FÜR DICH GEDACHT. Schließe das Fenster nicht, diese Nachricht kann nur einmal geöffnet werden.",
+        "Unbekannter Grund",
-    "Could not decrypt comment; Wrong key?": "Konnte Kommentar nicht entschlüsseln; Falscher Schlüssel?",
+    "server error or not responding":
-    "Reply": "Antworten",
+        "Fehler auf dem Server oder keine Antwort vom Server",
-    "Anonymous": "Anonym",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Avatar (generiert aus der IP-Adresse)",
+        "Konnte Kommentar nicht senden: %s",
-    "Add comment": "Kommentar hinzufügen",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Optionales Pseudonym…",
+        "Bitte bewege Deine Maus um die Entropie zu erhöhen…",
-    "Post comment": "Kommentar absenden",
+    "Sending paste…":
-    "Sending comment…": "Sende Kommentar…",
+        "Sende Paste…",
-    "Comment posted.": "Kommentar gesendet.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Ansicht konnte nicht aktualisiert werden: %s",
+        "Dein Paste ist unter <a id=\"pasteurl\" href=\"%s\">%s</a> zu finden <span id=\"copyhint\">(Drücke [Strg]+[c] um den Link zu kopieren)</span>",
-    "unknown status": "Unbekannter Grund",
+    "Delete data":
-    "server error or not responding": "Fehler auf dem Server oder keine Antwort vom Server",
+        "Lösche Daten",
-    "Could not post comment: %s": "Konnte Kommentar nicht senden: %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Sende Paste…",
+        "Konnte Paste nicht erstellen: %s",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Dein Text ist unter <a id=\"pasteurl\" href=\"%s\">%s</a> zu finden <span id=\"copyhint\">(Drücke [Strg]+[c] um den Link zu kopieren)</span>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Lösche Daten",
+        "Konnte Paste nicht entschlüsseln: Der Schlüssel fehlt in der Adresse (Hast du eine Umleitung oder einen URL-Verkürzer benutzt, der Teile der Adresse entfernt?)",
-    "Could not create paste: %s": "Text konnte nicht erstellt werden: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Konnte Paste nicht entschlüsseln: Der Schlüssel fehlt in der Adresse (Hast du eine Umleitung oder einen URL-Verkürzer benutzt, der Teile der Adresse entfernt?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "Format": "Format",
     "Plain Text": "Nur Text",
     "Source Code": "Quellcode",
@@ -144,38 +135,25 @@
     "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.",
+    "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.",
     "Invalid attachment.": "Ungültiger Datei-Anhang.",
     "Options": "Optionen",
     "Shorten URL": "URL verkürzen",
     "Editor": "Bearbeiten",
     "Preview": "Vorschau",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "Der PATH muss bei %s mit einem \"%s\" enden. Bitte passe Deinen PATH in Deiner index.php an.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Entschlüsseln",
+        "Der PATH muss bei %s mit einem \"%s\" enden. Bitte passe Deinen PATH in Deiner index.php an.",
-    "Enter password": "Passwort eingeben",
+    "Decrypt":
+        "Entschlüsseln",
+    "Enter password":
+        "Passwort eingeben",
     "Loading…": "Lädt…",
-    "Decrypting paste…": "Entschlüssle Text…",
+    "Decrypting paste…": "Entschlüssle Paste…",
-    "Preparing new paste…": "Bereite neuen Text vor…",
+    "Preparing new paste…": "Bereite neues Paste 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=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "Wenn diese Nachricht nicht mehr verschwindet, schau bitte in <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">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",
+    "Could not get paste data: %s":
-    "QR code": "QR code",
+        "Konnte Paste nicht laden: %s"
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Diese Webseite verwendet eine unsichere HTTP Verbindung! Bitte benutze sie nur zum Testen.",
+}
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "<a href=\"%s\">Besuche diesen FAQ Eintrag</a> für weitere Informationen dazu.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Dein Browser benötigt möglicherweise eine HTTPS Verbindung um das WebCrypto API nutzen zu können. Versuche <a href=\"%s\">auf HTTPS zu wechseln</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Dein Browser unterstützt WebAssembly nicht, welches für zlib Komprimierung benötigt wird. Du kannst unkomprimierte Dokumente erzeugen, aber keine komprimierten lesen.",
-    "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…": "Zeige reinen Text an…",
-    "Notice:": "Hinweis:",
-    "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",
-    "Close": "Schliessen",
-    "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/en.json

@@ -1,181 +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 <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 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.",
-    "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 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,138 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Porque la ignorancia es dicha",
+        "%s es un servicio de tipo \"Pastebin\" 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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "%s requiere php %s o superior para funcionar. Lo siento.",
+        "El texto no existe, ha caducado o ha sido eliminado.",
-    "%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.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Por favor espere %d segundos entre cada publicación.",
+        "%s requiere php %s o superior para funcionar. Lo siento.",
-    "Paste is limited to %s of encrypted data.": "El \"paste\" está limitado a %s de datos cifrados.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Datos inválidos.",
+        "%s requiere que la sección de configuración [%s] esté presente en el archivo de configuración.",
-    "You are unlucky. Try again.": "Tienes mala suerte. Inténtalo de nuevo",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Error al guardar el comentario. Lo siento.",
+        "Por favor espere %d segundos entre cada publicación.",
-    "Error saving paste. Sorry.": "Error al guardar el \"paste\". Lo siento",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "ID del \"paste\" inválido.",
+        "El texto está limitado a %s de datos cifrados.",
-    "Paste is not of burn-after-reading type.": "El \"paste\" no es del tipo \"destruir despues de leer\".",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Token de eliminación erróneo. El \"paste\" no fue eliminado.",
+        "Datos inválidos.",
-    "Paste was properly deleted.": "El \"paste\" se ha eliminado correctamente.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript es necesario para que %s funcione. Sentimos los inconvenientes ocasionados.",
+        "Tienes mala suerte. Inténtalo de nuevo",
-    "%s requires a modern browser to work.": "%s requiere un navegador moderno para funcionar.",
+    "Error saving comment. Sorry.":
-    "New": "Nuevo",
+        "Error al guardar el comentario. Lo siento.",
-    "Send": "Enviar",
+    "Error saving paste. Sorry.":
-    "Clone": "Clonar",
+        "Error al guardar el texto. Lo siento",
-    "Raw text": "Texto sin formato",
+    "Invalid paste ID.":
-    "Expires": "Caducar en",
+        "ID del texto inválido.",
-    "Burn after reading": "Destruir después de leer",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Discusión abierta",
+        "El texto no es del tipo \"destruir despues de leer\".",
-    "Password (recommended)": "Contraseña (recomendado)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Discusión",
+        "Token de eliminación erróneo. El texto no fue eliminado.",
-    "Toggle navigation": "Cambiar navegación",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "El texto se ha eliminado correctamente.",
-        "%d segundo",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d segundos",
+        "JavaScript es necesario para que %s funcione. Sentimos los inconvenientes ocasionados.",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s requiere un navegador moderno para funcionar.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "¿Sigues usando Internet Explorer? Hazte un favor, cambia a un navegador moderno:",
-        "%d minuto",
+    "New":
-        "%d minutos",
+        "Nuevo",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Enviar",
-    ],
+    "Clone":
-    "%d hours": [
+        "Clonar",
-        "%d hora",
+    "Raw text":
-        "%d horas",
+        "Texto sin formato",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Caducar en",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Destruir después de leer",
-        "%d día",
+    "Open discussion":
-        "%d días",
+        "Discusión abierta",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Contraseña (recomendado)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Discusión",
-        "%d semana",
+    "Toggle navigation":
-        "%d semanas",
+        "Cambiar navegación",
-        "%d weeks (2nd plural)",
+    "%d seconds": ["%d segundo", "%d segundos"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d minuto", "%d minutos"],
-    ],
+    "%d hours": ["%d hora", "%d horas"],
-    "%d months": [
+    "%d days": ["%d día", "%d días"],
-        "%d mes",
+    "%d weeks": ["%d semana", "%d semanas"],
-        "%d meses",
+    "%d months": ["%d mes", "%d meses"],
-        "%d months (2nd plural)",
+    "%d years": ["%d año", "%d años"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Nunca",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d año",
+        "Nota: Este es un servicio de prueba. Los datos pueden ser eliminados en cualquier momento. Gatitos morirán si se abusa de este servicio.",
-        "%d años",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["Este documento caducará en un segundo.", "Este documento caducará en %d segundos."],
-        "%d years (3rd plural)"
+    "This document will expire in %d minutes.":
-    ],
+        ["Este documento caducará en un minuto.", "Este documento caducará en %d minutos."],
-    "Never": "Nunca",
+    "This document will expire in %d hours.":
-    "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.",
+        ["Este documento caducará en una hora.", "Este documento caducará en %d horas."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Este documento caducará en un segundo.",
+        ["Este documento caducará en un día.", "Este documento caducará en %d días."],
-        "Este documento caducará en %d segundos.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["Este documento caducará en un mes.", "Este documento caducará en %d meses."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Por favor ingrese la contraseña para este documento:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Este documento caducará en un minuto.",
+        "No fue posible descifrar los datos (¿Clave errónea?)",
-        "Este documento caducará en %d minutos.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "No fue posible eliminar el documento, no fue guardado en modo \"destruir despues de leer\".",
-        "This document will expire in %d minutes (3rd plural)"
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "SÓLO PARA TUS OJOS. No cierre esta ventana, este mensaje no se puede volver a mostrar.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Este documento caducará en una hora.",
+        "No se pudo descifrar el comentario; ¿Llave incorrecta?",
-        "Este documento caducará en %d horas.",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Responder",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anónimo",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Este documento caducará en un día.",
+        "Avatar generado a partir de la dirección IP",
-        "Este documento caducará en %d días.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Añadir comentario",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Seudónimo opcional…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Este documento caducará en un mes.",
+        "Publicar comentario",
-        "Este documento caducará en %d meses.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Enviando comentario…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Comentario publicado.",
-    "Please enter the password for this paste:": "Por favor ingrese la contraseña para este \"paste\":",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "No fue posible descifrar los datos (¿Clave errónea?)",
+        "No se pudo actualizar la vista: %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "No fue posible eliminar el documento, no fue guardado en modo \"destruir despues de leer\".",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "SÓLO PARA TUS OJOS. No cierres esta ventana, este mensaje no se puede volver a mostrar.",
+        "Estado desconocido",
-    "Could not decrypt comment; Wrong key?": "No se pudo descifrar el comentario; ¿Llave incorrecta?",
+    "server error or not responding":
-    "Reply": "Responder",
+        "Error del servidor o el servidor no responde",
-    "Anonymous": "Anónimo",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Avatar generado a partir de la dirección IP",
+        "No fue posible publicar comentario: %s",
-    "Add comment": "Añadir comentario",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Seudónimo opcional…",
+        "Por favor, mueva el ratón para mayor entropía…",
-    "Post comment": "Publicar comentario",
+    "Sending paste…":
-    "Sending comment…": "Enviando comentario…",
+        "Enviando texto…",
-    "Comment posted.": "Comentario publicado.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "No se pudo actualizar la vista: %s",
+        "Su texto está en <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Presione [Ctrl]+[c] para copiar)</span>",
-    "unknown status": "Estado desconocido",
+    "Delete data":
-    "server error or not responding": "Error del servidor o el servidor no responde",
+        "Eliminar datos",
-    "Could not post comment: %s": "No fue posible publicar comentario: %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Enviando \"paste\"…",
+        "No fue posible crear el archivo: %s",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Su texto está en <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Presione [Ctrl]+[c] para copiar)</span>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Eliminar datos",
+        "No es posible descifrar el documento: Falta la clave de descifrado en la URL (¿Utilizó un redirector o un acortador de URL que quite parte de la URL?)",
-    "Could not create paste: %s": "No fue posible crear el archivo: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "No es posible descifrar el documento: Falta la clave de descifrado en la URL (¿Utilizó un redirector o un acortador de URL que quite parte de la URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "Format": "Formato",
     "Plain Text": "Texto sin formato",
     "Source Code": "Código fuente",
@@ -144,38 +135,25 @@
     "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.",
+    "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.",
     "Options": "Opciones",
     "Shorten URL": "Acortar URL",
     "Editor": "Editor",
     "Preview": "Previsualización",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requiere que el PATH termine en \"%s\". Por favor, actualice el PATH en su index.php.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Descifrar",
+        "%s requiere que el PATH termine en \"%s\". Por favor, actualice el PATH en su index.php.",
-    "Enter password": "Ingrese contraseña",
+    "Decrypt":
+        "Descifrar",
+    "Enter password":
+        "Ingrese contraseña",
     "Loading…": "Cargando…",
-    "Decrypting paste…": "Descifrando \"paste\"…",
+    "Decrypting paste…": "Descifrando texto…",
-    "Preparing new paste…": "Preparando \"paste\" nuevo…",
+    "Preparing new paste…": "Preparando texto nuevo…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "En caso de que este mensaje nunca desaparezca por favor revise <a href=\"%s\">este FAQ para obtener información para solucionar problemas</a>.",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
-    "+++ no paste text +++": "+++ \"paste\" sin texto +++",
+        "En caso de que este mensaje nunca desaparezca por favor revise <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">este FAQ para obtener información para solucionar problemas</a>.",
-    "Could not get paste data: %s": "No se pudieron obtener los datos: %s",
+    "+++ no paste text +++": "+++ sin texto +++",
-    "QR code": "Código QR",
+    "Could not get paste data: %s":
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "¡Este sitio está usando una conexión HTTP insegura! Por favor úselo solo para pruebas.",
+        "Could not get paste data: %s"
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Para más información <a href=\"%s\">consulte esta entrada de las preguntas frecuentes</a>.",
+}
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Su navegador puede requerir una conexión HTTPS para soportar la API de WebCrypto. Intente <a href=\"%s\">cambiar a HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Su navegador no es compatible con WebAssembly, que se utiliza para la compresión zlib. Puede crear documentos sin comprimir, pero no puede leer los comprimidos.",
-    "waiting on user to provide a password": "esperando que el usuario proporcione una contraseña",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "No se pudieron descifrar los datos. ¿Ingresó una contraseña incorrecta? Vuelva a intentarlo con el botón de la parte superior.",
-    "Retry": "Reintentar",
-    "Showing raw text…": "Mostrando texto sin formato…",
-    "Notice:": "Aviso:",
-    "This link will expire after %s.": "Este enlace expirará después de %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Solo se puede acceder a este enlace una vez, no use el botón Atrás o Actualizar en su navegador.",
-    "Link:": "Enlace:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "El destinatario puede descubrir su zona horaria, ¿convertir la hora a UTC?",
-    "Use Current Timezone": "Usar Zona Horaria Actual",
-    "Convert To UTC": "Convertir A UTC",
-    "Close": "Cerrar",
-    "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/fr.json

@@ -1,129 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Parce que l'ignorance c'est le bonheur",
+        "%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é.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "Désolé, %s nécessite php %s ou supérieur pour fonctionner.",
+        "Le paste n'existe pas, a expiré, ou a été supprimé.",
-    "%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.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Merci d'attendre %d secondes entre chaque publication.",
+        "Désolé, %s nécessite php %s ou supérieur pour fonctionner.",
-    "Paste is limited to %s of encrypted data.": "Le paste est limité à %s de données chiffrées.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Données invalides.",
+        "%s a besoin de la section de configuration [%s] dans le fichier de configuration pour fonctionner.",
-    "You are unlucky. Try again.": "Pas de chance. Essayez encore.",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Erreur lors de la sauvegarde du commentaire.",
+        "Merci d'attendre %d secondes entre chaque publication.",
-    "Error saving paste. Sorry.": "Erreur lors de la sauvegarde du paste. Désolé.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "ID du paste invalide.",
+        "Le paste est limité à %s de données chiffrées.",
-    "Paste is not of burn-after-reading type.": "Le paste n'est pas de type \"Effacer après lecture\".",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Jeton de suppression incorrect. Le paste n'a pas été supprimé.",
+        "Données invalides.",
-    "Paste was properly deleted.": "Le paste a été correctement supprimé.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript est requis pour faire fonctionner %s. Désolé pour cet inconvénient.",
+        "Pas de chance. Essayez encore.",
-    "%s requires a modern browser to work.": "%s nécessite un navigateur moderne pour fonctionner.",
+    "Error saving comment. Sorry.":
-    "New": "Nouveau",
+        "Erreur lors de la sauvegarde du commentaire.",
-    "Send": "Envoyer",
+    "Error saving paste. Sorry.":
-    "Clone": "Cloner",
+        "Erreur lors de la sauvegarde du paste. Désolé.",
-    "Raw text": "Texte brut",
+    "Invalid paste ID.":
-    "Expires": "Expire",
+        "ID du paste invalide.",
-    "Burn after reading": "Effacer après lecture",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Autoriser la discussion",
+        "Le paste n'est pas de type \"Effacer après lecture\".",
-    "Password (recommended)": "Mot de passe (recommandé)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Discussion",
+        "Jeton de suppression incorrect. Le paste n'a pas été supprimé.",
-    "Toggle navigation": "Basculer la navigation",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "Le paste a été correctement supprimé.",
-        "%d seconde",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d secondes",
+        "JavaScript est requis pour faire fonctionner %s. Désolé pour cet inconvénient.",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s nécessite un navigateur moderne pour fonctionner.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Encore sur Internet Explorer ? Faites-vous une faveur, passez à un navigateur moderne :",
-        "%d minute",
+    "New":
-        "%d minutes",
+        "Nouveau",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Envoyer",
-    ],
+    "Clone":
-    "%d hours": [
+        "Cloner",
-        "%d heure",
+    "Raw text":
-        "%d heures",
+        "Texte brut",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Expire",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Effacer après lecture",
-        "%d jour",
+    "Open discussion":
-        "%d jours",
+        "Autoriser la discussion",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Mot de passe (recommandé)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Discussion",
-        "%d semaine",
+    "Toggle navigation":
-        "%d semaines",
+        "Basculer la navigation",
-        "%d weeks (2nd plural)",
+    "%d seconds": ["%d seconde", "%d secondes"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d minute", "%d minutes"],
-    ],
+    "%d hours": ["%d heure", "%d heures"],
-    "%d months": [
+    "%d days": ["%d jour", "%d jours"],
-        "%d mois",
+    "%d weeks": ["%d semaine", "%d semaines"],
-        "%d mois",
+    "%d months": ["%d mois", "%d mois"],
-        "%d months (2nd plural)",
+    "%d years": ["%d an", "%d ans"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Jamais",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d an",
+        "Note : Ceci est un service de test : les données peuvent être supprimées à tout moment. Des chatons mourront si vous utilisez ce service de manière abusive.",
-        "%d ans",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["Ce document expirera dans %d seconde.", "Ce document expirera dans %d secondes."],
-        "%d years (3rd plural)"
+    "This document will expire in %d minutes.":
-    ],
+        ["Ce document expirera dans %d minute.", "Ce document expirera dans %d minutes."],
-    "Never": "Jamais",
+    "This document will expire in %d hours.":
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Note : Ceci est un service de test : les données peuvent être supprimées à tout moment. Des chatons mourront si vous utilisez ce service de manière abusive.",
+        ["Ce document expirera dans %d heure.", "Ce document expirera dans %d heures."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Ce document expirera dans %d seconde.",
+        ["Ce document expirera dans %d jour.", "Ce document expirera dans %d jours."],
-        "Ce document expirera dans %d secondes.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["Ce document expirera dans %d mois.", "Ce document expirera dans %d mois."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Entrez le mot de passe pour ce paste:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Ce document expirera dans %d minute.",
+        "Impossible de déchiffrer les données (mauvaise clé ?)",
-        "Ce document expirera dans %d minutes.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "Impossible de supprimer le paste, car il n'a pas été stocké en mode \"Effacer après lecture\".",
-        "This document will expire in %d minutes (3rd plural)"
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "POUR VOS YEUX UNIQUEMENT. Ne fermez pas cette fenêtre, ce paste ne pourra plus être affiché.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Ce document expirera dans %d heure.",
+        "Impossible de déchiffrer le commentaire ; mauvaise clé ?",
-        "Ce document expirera dans %d heures.",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Répondre",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anonyme",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Ce document expirera dans %d jour.",
+        "Avatar généré à partir de l'adresse IP",
-        "Ce document expirera dans %d jours.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Ajouter un commentaire",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Pseudonyme optionnel…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Ce document expirera dans %d mois.",
+        "Poster le commentaire",
-        "Ce document expirera dans %d mois.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Envoi du commentaire…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Commentaire posté.",
-    "Please enter the password for this paste:": "Entrez le mot de passe pour ce paste:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Impossible de déchiffrer les données (mauvaise clé ?)",
+        "Impossible de rafraichir l'affichage : %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Impossible de supprimer le paste, car il n'a pas été stocké en mode \"Effacer après lecture\".",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "POUR VOS YEUX UNIQUEMENT. Ne fermez pas cette fenêtre, ce paste ne pourra plus être affiché.",
+        "Statut inconnu",
-    "Could not decrypt comment; Wrong key?": "Impossible de déchiffrer le commentaire; mauvaise clé ?",
+    "server error or not responding":
-    "Reply": "Répondre",
+        "Le serveur ne répond pas ou a rencontré une erreur",
-    "Anonymous": "Anonyme",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Avatar généré à partir de l'adresse IP",
+        "Impossible de poster le commentaire : %s",
-    "Add comment": "Ajouter un commentaire",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Pseudonyme optionnel…",
+        "Merci de bouger votre souris pour plus d'entropie…",
-    "Post comment": "Poster le commentaire",
+    "Sending paste…":
-    "Sending comment…": "Envoi du commentaire…",
+        "Envoi du paste…",
-    "Comment posted.": "Commentaire posté.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Impossible de rafraichir l'affichage : %s",
+        "Votre paste est disponible à l'adresse <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Appuyez sur [Ctrl]+[c] pour copier)</span>",
-    "unknown status": "Statut inconnu",
+    "Delete data":
-    "server error or not responding": "Le serveur ne répond pas ou a rencontré une erreur",
+        "Supprimer les données du paste",
-    "Could not post comment: %s": "Impossible de poster le commentaire : %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Envoi du paste…",
+        "Impossible de créer le paste : %s",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Votre paste est disponible à l'adresse <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Appuyez sur [Ctrl]+[c] pour copier)</span>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Supprimer les données du paste",
+        "Impossible de déchiffrer le paste : Clé de déchiffrement manquante dans l'URL (Avez-vous utilisé un redirecteur ou un site de réduction d'URL qui supprime une partie de l'URL ?)",
-    "Could not create paste: %s": "Impossible de créer le 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?)": "Impossible de déchiffrer le paste : Clé de déchiffrement manquante dans l'URL (Avez-vous utilisé un redirecteur ou un site de réduction d'URL qui supprime une partie de l'URL ?)",
     "B": "o",
     "KiB": "Kio",
     "MiB": "Mio",
@@ -141,41 +141,28 @@
     "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 ",
-    "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",
+    "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.": "Fichier trop volumineux, pour afficher un aperçu. Veuillez télécharger la pièce jointe.",
+    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
-    "Remove attachment": "Enlever la pièce jointe",
+    "Remove attachment": "Enlever l'attachement",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Votre navigateur ne supporte pas l'envoi de fichiers chiffrés. Merci d'utiliser un navigateur plus récent.",
+    "Your browser does not support uploading encrypted files. Please use a newer browser.":
-    "Invalid attachment.": "Pièce jointe invalide.",
+        "Votre navigateur ne supporte pas l'envoi de fichiers chiffrés. Merci d'utiliser un navigateur plus récent.",
+    "Invalid attachment.": "Attachement invalide.",
     "Options": "Options",
     "Shorten URL": "Raccourcir URL",
     "Editor": "Éditer",
     "Preview": "Prévisualiser",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requiert que le PATH se termine dans un \"%s\". Veuillez mettre à jour le PATH dans votre index.php.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Déchiffrer",
+        "%s requiert que le PATH se termine dans un \"%s\". Veuillez mettre à jour le PATH dans votre index.php.",
-    "Enter password": "Entrez le mot de passe",
+    "Decrypt":
+        "Déchiffrer",
+    "Enter password":
+        "Entrez le mot de passe",
     "Loading…": "Chargement…",
     "Decrypting paste…": "Déchiffrement du paste…",
     "Preparing new paste…": "Préparation du paste…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Si ce message ne disparaîssait pas, jetez un oeil à <a href=\"%s\">cette FAQ pour des idées de résolution</a> (en Anglais).",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
-    "+++ no paste text +++": "+++ pas de texte copié +++",
+        "Si ce message ne disparaîssait pas, jetez un oeil à <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">cette FAQ pour des idées de résolution</a> (en Anglais).",
-    "Could not get paste data: %s": "Impossible d'obtenir les données du paste: %s",
+    "+++ no paste text +++": "+++ pas de paste-text +++",
-    "QR code": "QR code",
+    "Could not get paste data: %s":
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Ce site web utilise une connexion HTTP non sécurisée ! Veuillez l’utiliser uniquement pour des tests.",
+        "Could not get paste data: %s"
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Pour plus d'informations <a href=\"%s\">consultez cette rubrique de la FAQ</a>.",
+}
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Votre navigateur peut nécessiter une connexion HTTPS pour prendre en charge l’API WebCrypto. Essayez <a href=\"%s\">de passer en HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Votre navigateur ne prend pas en charge WebAssembly, utilisé pour la compression zlib. Vous pouvez créer des documents non compressés, mais vous ne pouvez pas lire les documents compressés.",
-    "waiting on user to provide a password": "en attendant que l'utilisateur fournisse un mot de passe",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Impossible de décrypter les données. Vous avez saisi un mot de passe incorrect ? Réessayez avec le bouton en haut.",
-    "Retry": "Réessayer",
-    "Showing raw text…": "Affichage du texte brut…",
-    "Notice:": "Avertissement :",
-    "This link will expire after %s.": "Ce lien expire après le %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Vous ne pouvez accéder à ce lien qu'une seule fois, n'utilisez pas le bouton précédent ou rafraîchir de votre navigateur.",
-    "Link:": "Lien :",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Le destinataire peut connaître votre fuseau horaire, convertir l'heure au format UTC ?",
-    "Use Current Timezone": "Conserver l'actuel",
-    "Convert To UTC": "Convertir en UTC",
-    "Close": "Fermer",
-    "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/hu.json

@@ -1,138 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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.",
+    "%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": "A titok egyfajta hatalom.",
+        "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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%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.",
+        "A bejegyzés nem létezik, lejárt vagy törölve lett.",
-    "%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.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Kérlek várj %d másodpercet két beküldés között.",
+        "Bocs, de a %s működéséhez %s vagy ezt meghaladó verziójú php-s környezet szükséges.",
-    "Paste is limited to %s of encrypted data.": "A bejegyzés maximális hossza: %s",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Érvénytelen adat.",
+        "A %s megfelelő működéséhez a konfigurációs fájlban a [%s] résznek léteznie kell.",
-    "You are unlucky. Try again.": "Peched volt, próbáld újra.",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Nem sikerült menteni a hozzászólást. Bocs.",
+        "Kérlek várj %d másodpercet két beküldés között.",
-    "Error saving paste. Sorry.": "Nem sikerült menteni a bejegyzést. Bocs.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "Érvénytelen bejegyzés azonosító.",
+        "A bejegyzés maximális hossza: %s",
-    "Paste is not of burn-after-reading type.": "A bejegyzés nem semmisül meg azonnal olvasás után.",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Hibás törlési azonosító. A bejegyzés nem lett törölve.",
+        "Érvénytelen adat.",
-    "Paste was properly deleted.": "A bejegyzés sikeresen törölve.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript szükséges a %s működéséhez. Elnézést a fennakadásért.",
+        "Peched volt, próbáld újra.",
-    "%s requires a modern browser to work.": "A %s működéséhez a jelenleginél újabb böngészőre van szükség.",
+    "Error saving comment. Sorry.":
-    "New": "Új",
+        "Nem sikerült menteni a hozzászólást. Bocs.",
-    "Send": "Beküldöm!",
+    "Error saving paste. Sorry.":
-    "Clone": "Másol",
+        "Nem sikerült menteni a bejegyzést. Bocs.",
-    "Raw text": "A nyers szöveg",
+    "Invalid paste ID.":
-    "Expires": "Lejárati idő",
+        "Érvénytelen bejegyzés azonosító.",
-    "Burn after reading": "Törlés az első olvasás után",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Hozzászólások engedélyezése",
+        "A bejegyzés nem semmisül meg azonnal olvasás után.",
-    "Password (recommended)": "Jelszó (ajánlott)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Hozzászólások",
+        "Hibás törlési azonosító. A bejegyzés nem lett törölve.",
-    "Toggle navigation": "Navigáció",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "A bejegyzés sikeresen törölve.",
-        "%d másodperc",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d másodperc",
+        "JavaScript szükséges a %s működéséhez. Elnézést a fennakadásért.",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "A %s működéséhez a jelenleginél újabb böngészőre van szükség.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Még mindig Internet Explorert használsz? Ideje váltani:",
-        "%d perc",
+    "New":
-        "%d perc",
+        "Új",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Beküldöm!",
-    ],
+    "Clone":
-    "%d hours": [
+        "Másol",
-        "%d óra",
+    "Raw text":
-        "%d óra",
+        "A nyers szöveg",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Lejárati idő",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Törlés az első olvasás után",
-        "%d nap",
+    "Open discussion":
-        "%d nap",
+        "Hozzászólások engedélyezése",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Jelszó (ajánlott)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Hozzászólások",
-        "%d hét",
+    "Toggle navigation":
-        "%d hét",
+        "Navigáció",
-        "%d weeks (2nd plural)",
+    "%d seconds": ["%d másodperc", "%d másodperc"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d perc", "%d perc"],
-    ],
+    "%d hours": ["%d óra", "%d óra"],
-    "%d months": [
+    "%d days": ["%d nap", "%d nap"],
-        "%d hónap",
+    "%d weeks": ["%d hét", "%d hét"],
-        "%d hónap",
+    "%d months": ["%d hónap", "%d hónap"],
-        "%d months (2nd plural)",
+    "%d years": ["%d év", "%d év"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Soha",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d év",
+        "Megjegyzés: ez egy teszt szolgáltatás, az adatok bármikor törlődhetnek. Ha visszaélsz vele, kiscicák bánhatják! :)",
-        "%d év",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["Ez a bejegyzés %d másodperc után megsemmisül.", "Ez a bejegyzés %d másodperc múlva megsemmisül."],
-        "%d years (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."],
-    "Never": "Soha",
+    "This document will expire in %d hours.":
-    "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! :)",
+        ["Ez a bejegyzés %d óra után megsemmisül.", "Ez a bejegyzés %d óra múlva megsemmisül."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Ez a bejegyzés %d másodperc után megsemmisül.",
+        ["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 másodperc múlva megsemmisül.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["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 seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Add meg a szükséges jelszót a bejegyzés megtekintéséhez:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Ez a bejegyzés %d perc után megsemmisül.",
+        "Nem tudtuk dekódolni az adatot. Talán rossz kulcsot adtál meg?",
-        "Ez a bejegyzés %d perc múlva megsemmisül.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "Nem tudtuk törölni a bejegyzést, mivel az olvasás után egyből megsemmisült. Így nem is volt tárolva.",
-        "This document will expire in %d minutes (3rd plural)"
+    "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.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Ez a bejegyzés %d óra után megsemmisül.",
+        "Nem tudtuk dekódolni a hozzászólást. Talán rossz kulcsot adtál meg?",
-        "Ez a bejegyzés %d óra múlva megsemmisül.",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Válasz",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anonymous",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Ez a bejegyzés %d nap után megsemmisül.",
+        "Avatar (az IP cím alapján generáljuk)",
-        "Ez a bejegyzés %d nap múlva megsemmisül.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Hozzászólok",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Becenév (már ha meg akarod adni)",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Ez a bejegyzés %d hónap múlva megsemmisül.",
+        "Beküld",
-        "Ez a bejegyzés %d hónap múlva megsemmisül.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Beküldés alatt...",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "A hozzászólás beküldve.",
-    "Please enter the password for this paste:": "Add meg a szükséges jelszót a bejegyzés megtekintéséhez:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Nem tudtuk dekódolni az adatot. Talán rossz kulcsot adtál meg?",
+        "Nem tudtuk frissíteni: %s",
-    "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.",
+    "unknown status":
-    "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.",
+        "Ismeretlen státusz.",
-    "Could not decrypt comment; Wrong key?": "Nem tudtuk dekódolni a hozzászólást. Talán rossz kulcsot adtál meg?",
+    "server error or not responding":
-    "Reply": "Válasz",
+        "A szerveren hiba lépett fel vagy nem válaszol.",
-    "Anonymous": "Anonymous",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Avatar (az IP cím alapján generáljuk)",
+        "Nem tudtuk beküldeni a hozzászólást: %s",
-    "Add comment": "Hozzászólok",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Becenév (már ha meg akarod adni)",
+        "Nincs elég véletlenszerűség a rendszerben. Mozgasd az egered, hogy növeld az entrópiát.",
-    "Post comment": "Beküld",
+    "Sending paste…":
-    "Sending comment…": "Beküldés alatt...",
+        "Bejegyzés elküldése...",
-    "Comment posted.": "A hozzászólás beküldve.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Nem tudtuk frissíteni: %s",
+        "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>",
-    "unknown status": "Ismeretlen státusz.",
+    "Delete data":
-    "server error or not responding": "A szerveren hiba lépett fel vagy nem válaszol.",
+        "Adat törlése",
-    "Could not post comment: %s": "Nem tudtuk beküldeni a hozzászólást: %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Bejegyzés elküldése...",
+        "Nem tudtuk létrehozni a bejegyzést: %s",
-    "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>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Adat törlése",
+        "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?",
-    "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 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",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "Format": "Formátum",
     "Plain Text": "Egyszerű szöveg",
     "Source Code": "Forráskód",
@@ -144,38 +135,25 @@
     "alternatively drag & drop a file or paste an image from the clipboard": "vagy húzz ide egy fájlt, netán illessz be egy képet a vágólapról.",
     "File too large, to display a preview. Please download the attachment.": "A fájl túl nagy ahhoz, hogy előnézete legyen. Töltsd le, hogy megtekinthesd.",
     "Remove attachment": "Csatolmány eltávolítása",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "A böngésződ nem támogatja titkosított fájlok feltöltését. Használj újabbat.",
+    "Your browser does not support uploading encrypted files. Please use a newer browser.":
+        "A böngésződ nem támogatja titkosított fájlok feltöltését. Használj újabbat.",
     "Invalid attachment.": "Érvénytelen csatolmány.",
     "Options": "Opciók",
     "Shorten URL": "URL rövidítés",
     "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.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Dekódolás",
+        "%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.",
-    "Enter password": "Jelszó",
+    "Decrypt":
+        "Dekódolás",
+    "Enter password":
+        "Jelszó",
     "Loading…": "Folyamatban...",
     "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>.",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "Abban az esetben, ha ez az üzenet mindig látható lenne, látogass el a <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">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": "Could not get paste data: %s",
+    "Could not get paste data: %s":
-    "QR code": "QR code",
+        "Could not get paste data: %s"
-    "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/it.json

@@ -1,138 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Perché l'ignoranza è una benedizione (Because ignorance is bliss)",
+        "%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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "%s richiede php %s o superiore per funzionare. Ci spiace.",
+        "Questo messaggio non esiste, è scaduto o è stato cancellato.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s richiede la presenza della sezione [%s] nei file di configurazione.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Attendi per favore %d secondi prima di ciascun invio.",
+        "%s richiede php %s o superiore per funzionare. Ci spiace.",
-    "Paste is limited to %s of encrypted data.": "La dimensione del messaggio è limitata a %s di dati cifrati.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Dati non validi.",
+        "%s richiede la presenza della sezione [%s] nei file di configurazione.",
-    "You are unlucky. Try again.": "Ritenta, sarai più fortunato.",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Errore durante il salvataggio del commento.",
+        "Attendi per favore %d secondi prima di ciascun invio.",
-    "Error saving paste. Sorry.": "Errore durante il salvataggio del messaggio.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "ID-Messaggio non valido.",
+        "La dimensione del messaggio è limitata a %s di dati cifrati.",
-    "Paste is not of burn-after-reading type.": "Il messaggio non è di tipo Distruggi-dopo-lettura.",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Codice cancellazione errato. Il messaggio NON è stato cancellato.",
+        "Dati non validi.",
-    "Paste was properly deleted.": "Il messaggio è stato correttamente cancellato.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "%s funziona solo con JavaScript attivo. Ci dispiace per l'inconveniente.",
+        "Ritenta, sarai più fortunato.",
-    "%s requires a modern browser to work.": "%s richiede un browser moderno e aggiornato per funzionare.",
+    "Error saving comment. Sorry.":
-    "New": "Nuovo",
+        "Errore durante il salvataggio del commento.",
-    "Send": "Invia",
+    "Error saving paste. Sorry.":
-    "Clone": "Clona",
+        "Errore durante il salvataggio del messaggio.",
-    "Raw text": "Testo Raw",
+    "Invalid paste ID.":
-    "Expires": "Scade",
+        "ID-Messaggio non valido.",
-    "Burn after reading": "Distruggi dopo lettura",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Apri discussione",
+        "Il messaggio non è di tipo Distruggi-dopo-lettura.",
-    "Password (recommended)": "Password (raccomandato)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Discussione",
+        "Codice cancellazione errato. Il messaggio NON è stato cancellato.",
-    "Toggle navigation": "Scambia Navigazione",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "Il messaggio è stato correttamente cancellato.",
-        "%d secondo",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d secondi",
+        "%s funziona solo con JavaScript attivo. Ci dispiace per l'inconveniente.",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s richiede un browser moderno e aggiornato per funzionare.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Usi ancora Internet Explorer? Ti consigliamo di passare ad un browser più sicuro:",
-        "%d minuto",
+    "New":
-        "%d minuti",
+        "Nuovo",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Invia",
-    ],
+    "Clone":
-    "%d hours": [
+        "Clona",
-        "%d ora",
+    "Raw text":
-        "%d ore",
+        "Testo Raw",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Scade",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Distruggi dopo lettura",
-        "%d giorno",
+    "Open discussion":
-        "%d giorni",
+        "Apri discussione",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Password (raccomandato)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Discussione",
-        "%d settimana",
+    "Toggle navigation":
-        "%d settimane",
+        "Scambia Navigazione",
-        "%d weeks (2nd plural)",
+    "%d seconds": ["%d secondo", "%d secondi"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d minuto", "%d minuti"],
-    ],
+    "%d hours": ["%d ora", "%d ore"],
-    "%d months": [
+    "%d days": ["%d giorno", "%d giorni"],
-        "%d mese",
+    "%d weeks": ["%d settimana", "%d settimane"],
-        "%d mesi",
+    "%d months": ["%d mese", "%d mesi"],
-        "%d months (2nd plural)",
+    "%d years": ["%d anno", "%d anni"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Mai",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d anno",
+        "Nota: questo è un servizio di prova, i messaggi salvati possono essere cancellati in qualsiasi momento. Moriranno dei gattini se abuserai di questo servizio.",
-        "%d anni",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["Questo documento scadrà tra un secondo.", "Questo documento scadrà in %d secondi."],
-        "%d years (3rd plural)"
+    "This document will expire in %d minutes.":
-    ],
+        ["Questo documento scadrà tra un minuto.", "Questo documento scadrà in %d minuti."],
-    "Never": "Mai",
+    "This document will expire in %d hours.":
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Nota: questo è un servizio di prova, i messaggi salvati possono essere cancellati in qualsiasi momento. Moriranno dei gattini se abuserai di questo servizio.",
+        ["Questo documento scadrà tra un'ora.", "Questo documento scadrà in %d ore."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Questo documento scadrà tra un secondo.",
+        ["Questo documento scadrà tra un giorno.", "Questo documento scadrà in %d giorni."],
-        "Questo documento scadrà in %d secondi.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["Questo documento scadrà tra un mese.", "Questo documento scadrà in %d mesi."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Inserisci la password per questo messaggio:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Questo documento scadrà tra un minuto.",
+        "Non riesco a decifrari i dati (Chiave errata?)",
-        "Questo documento scadrà in %d minuti.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "Non riesco a cancellare il messaggio, non è stato salvato in modalità Distruggi-dopo-lettora.",
-        "This document will expire in %d minutes (3rd plural)"
+    "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.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Questo documento scadrà tra un'ora.",
+        "Non riesco a decifrare il commento (Chiave errata?)",
-        "Questo documento scadrà in %d ore.",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Rispondi",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anonimo",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Questo documento scadrà tra un giorno.",
+        "Avatar generato dall'indirizzo IP)",
-        "Questo documento scadrà in %d giorni.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Aggiungi un commento",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Nickname opzionale…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Questo documento scadrà tra un mese.",
+        "Invia commento",
-        "Questo documento scadrà in %d mesi.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Commento in fase di invio…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Commento inviato.",
-    "Please enter the password for this paste:": "Inserisci la password per questo messaggio:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Non riesco a decifrari i dati (Chiave errata?)",
+        "Non riesco ad aggiornare il display: %s",
-    "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.",
+    "unknown status":
-    "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.",
+        "stato sconosciuto",
-    "Could not decrypt comment; Wrong key?": "Non riesco a decifrare il commento (Chiave errata?)",
+    "server error or not responding":
-    "Reply": "Rispondi",
+        "errore o mancata risposta dal server",
-    "Anonymous": "Anonimo",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Avatar generato dall'indirizzo IP)",
+        "Impossibile inviare il commento: %s",
-    "Add comment": "Aggiungi un commento",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Nickname opzionale…",
+        "Muovi il mouse in modo casuale, per generare maggior entropia…",
-    "Post comment": "Invia commento",
+    "Sending paste…":
-    "Sending comment…": "Commento in fase di invio…",
+        "Messaggio in fase di invio…",
-    "Comment posted.": "Commento inviato.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Non riesco ad aggiornare il display: %s",
+        "Il tuo messaggio è qui: <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Premi [Ctrl]+[c] (Windows) o [Cmd]+[c] (Mac) per copiare il link)</span>",
-    "unknown status": "stato sconosciuto",
+    "Delete data":
-    "server error or not responding": "errore o mancata risposta dal server",
+        "Cancella i dati",
-    "Could not post comment: %s": "Impossibile inviare il commento: %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Messaggio in fase di invio…",
+        "Non riesco a creare il messaggio: %s",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Il tuo messaggio è qui: <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Premi [Ctrl]+[c] (Windows) o [Cmd]+[c] (Mac) per copiare il link)</span>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Cancella i dati",
+        "Non riesco a decifrare il messaggio: manca la chiave di decifrazione nell'URL (La chiave è parte integrante dell'URL. Per caso hai usato un Redirector o un altro servizio che ha rimosso una parte dell'URL?)",
-    "Could not create paste: %s": "Non riesco a creare il messaggio: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Non riesco a decifrare il messaggio: manca la chiave di decifrazione nell'URL (La chiave è parte integrante dell'URL. Per caso hai usato un Redirector o un altro servizio che ha rimosso una parte dell'URL?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "Format": "Formato",
     "Plain Text": "Solo Testo",
     "Source Code": "Codice Sorgente",
@@ -144,38 +135,25 @@
     "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.",
+    "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": "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.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Decifra",
+        "%s necessita che PATH termini con \"%s\". Aggiorna la variabile PATH nel tuo index.php.",
-    "Enter password": "Inserisci la password",
+    "Decrypt":
+        "Decifra",
+    "Enter password":
+        "Inserisci la password",
     "Loading…": "Carico…",
     "Decrypting paste…": "Decifro il messaggio…",
     "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).",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "Nel caso questo messaggio non scompaia, controlla questa <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">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": "Could not get paste data: %s",
+    "Could not get paste data: %s":
-    "QR code": "QR code",
+        "Could not get paste data: %s"
-    "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/nl.json

@@ -1,138 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Onwetendheid is een zegen",
+		"%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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "%s vereist PHP %s of hoger om te kunnen werken. Sorry",
+        "Geplakte tekst bestaat niet, is verlopen of verwijderd.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s vereist dat de configuratiesectie [%s] aanwezig is in het configuratiebestand",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Alstublieft %d seconden wachten tussen elk bericht",
+        "%s vereist PHP %s of hoger om te kunnen werken. Sorry",
-    "Paste is limited to %s of encrypted data.": "Geplakte tekst is beperkt tot %s aan versleutelde gegevens",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Ongeldige gegevens",
+        "%s vereist dat de configuratiesectie [%s] aanwezig is in het configuratiebestand",
-    "You are unlucky. Try again.": "Helaas. Probeer het nog eens",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Fout bij het opslaan van het commentaar. Sorry",
+	    "Alstublieft %d seconden wachten tussen elk bericht",
-    "Error saving paste. Sorry.": "Fout bij het opslaan van de geplakte tekst. Sorry.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "Ongeldige ID.",
+		"Geplakte tekst is beperkt tot %s aan versleutelde gegevens",
-    "Paste is not of burn-after-reading type.": "Geplakte tekst is geen 'vernietig na lezen' type",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Foutieve verwijdercode. Geplakte tekst is niet verwijderd.",
+        "Ongeldige gegevens",
-    "Paste was properly deleted.": "Geplakte tekst is correct verwijderd.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript vereist om %s te laten werken. Sorry voor het ongemak.",
+        "Helaas. Probeer het nog eens",
-    "%s requires a modern browser to work.": "%s vereist een moderne browser om te kunnen werken ",
+    "Error saving comment. Sorry.":
-    "New": "Nieuw",
+        "Fout bij het opslaan van het commentaar. Sorry",
-    "Send": "Verzenden",
+    "Error saving paste. Sorry.":
-    "Clone": "Clonen",
+        "Fout bij het opslaan van de geplakte tekst. Sorry.",
-    "Raw text": "Onbewerkte tekst",
+    "Invalid paste ID.":
-    "Expires": "Verloopt",
+        "Ongeldige ID.",
-    "Burn after reading": "Vernietig na lezen",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Open discussie",
+        "Geplakte tekst is geen 'vernietig na lezen' type",
-    "Password (recommended)": "Wachtwoord (aanbevolen)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Discussie",
+        "Foutieve verwijdercode. Geplakte tekst is niet verwijderd.",
-    "Toggle navigation": "Navigatie openen/sluiten",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "Geplakte tekst is correct verwijderd.",
-        "%d second",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d seconden",
+        "JavaScript vereist om %s te laten werken. Sorry voor het ongemak.",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s vereist een moderne browser om te kunnen werken ",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Gebruik je nog steeds Internet explorer? Doe jezelf een plezier en maak gebruik van een moderne browser:",
-        "%d minuut",
+    "New":
-        "%d minuten",
+        "Nieuw",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Verzenden",
-    ],
+    "Clone":
-    "%d hours": [
+        "Clonen",
-        "%d uur",
+    "Raw text":
-        "%d hours (1st plural)",
+        "Onbewerkte tekst",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Verloopt",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Vernietig na lezen",
-        "%d dag",
+    "Open discussion":
-        "%d dagen",
+		"Open discussie",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Wachtwoord (aanbevolen)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Discussie",
-        "%d week",
+    "Toggle navigation":
-        "%d weken",
+        "Navigatie openen/sluiten",
-        "%d weeks (2nd plural)",
+	"%d seconds": ["%d second", "%d seconden"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d minuut", "%d minuten"],
-    ],
+    "%d hours": ["%d uur"],
-    "%d months": [
+    "%d days": ["%d dag", "%d dagen"],
-        "%d maand",
+    "%d weeks": ["%d week", "%d weken"],
-        "%d maanden",
+    "%d months": ["%d maand", "%d maanden"],
-        "%d months (2nd plural)",
+    "%d years": ["%d jaar"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Nooit",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d jaar",
+        "Opmerking: Dit is een testservice: Gegevens kunnen op elk gegeven moment verwijderd worden.",
-        "%d years (1st plural)",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["Dit document verloopt over %d second.", "Dit document verloopt over %d seconden."],
-        "%d years (3rd plural)"
+    "This document will expire in %d minutes.":
-    ],
+        ["Dit document verloopt over %d minuut.", "Dit document verloopt over %d minuten"],
-    "Never": "Nooit",
+    "This document will expire in %d hours.":
-    "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.",
+        ["Dit document verloopt over %d uur."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Dit document verloopt over %d second.",
+        ["Dit document verloopt over %d dag.", "Dit document verloopt over %d dagen."],
-        "Dit document verloopt over %d seconden.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["Dit document verloopt over %d maand.", "Dit document verloopt over %d maanden."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Voer het wachtwoord in voor deze  geplakte tekst:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Dit document verloopt over %d minuut.",
+        "Kon de gegevens niet decoderen (verkeerde sleutel?)",
-        "Dit document verloopt over %d minuten",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+		"Verwijderen van de geplakte tekst niet mogelijk, deze werd niet opgeslagen in 'vernietig na lezen' modus.",
-        "This document will expire in %d minutes (3rd plural)"
+    "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.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Dit document verloopt over %d uur.",
+		"Kon het commentaar niet decoderen; Verkeerde sleutel?",
-        "This document will expire in %d hours (1st plural)",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Beantwoorden",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anoniem",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Dit document verloopt over %d dag.",
+        "Anonieme avatar (van het IP adres)",
-        "Dit document verloopt over %d dagen.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Commentaar toevoegen",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Optionele bijnaam…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Dit document verloopt over %d maand.",
+        "Plaats een commentaar",
-        "Dit document verloopt over %d maanden.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Commentaar verzenden…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Commentaar geplaatst.",
-    "Please enter the password for this paste:": "Voer het wachtwoord in voor deze  geplakte tekst:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Kon de gegevens niet decoderen (verkeerde sleutel?)",
+        "Kon de weergave niet vernieuwen: %s",
-    "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.",
+    "unknown status":
-    "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.",
+        "Onbekende status",
-    "Could not decrypt comment; Wrong key?": "Kon het commentaar niet decoderen; Verkeerde sleutel?",
+    "server error or not responding":
-    "Reply": "Beantwoorden",
+        "Serverfout of server reageert niet",
-    "Anonymous": "Anoniem",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Anonieme avatar (van het IP adres)",
+        "Kon het commentaar niet plaatsen: %s",
-    "Add comment": "Commentaar toevoegen",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Optionele bijnaam…",
+        "Aub uw muis bewegen voor meer entropie…",
-    "Post comment": "Plaats een commentaar",
+     "Sending paste…":
-    "Sending comment…": "Commentaar verzenden…",
+        "Geplakte tekst verzenden…",
-    "Comment posted.": "Commentaar geplaatst.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Kon de weergave niet vernieuwen: %s",
+        "Uw geplakte tekst is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Druk [Ctrl]+[c] om te kopiëren)</span>",
-    "unknown status": "Onbekende status",
+    "Delete data":
-    "server error or not responding": "Serverfout of server reageert niet",
+        "Gegevens wissen",
-    "Could not post comment: %s": "Kon het commentaar niet plaatsen: %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Geplakte tekst verzenden…",
+        "Kon de geplakte tekst niet aanmaken: %s",
-    "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>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Gegevens wissen",
+        "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?)",
-    "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?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "Format": "Formaat",
     "Plain Text": "Platte tekst",
     "Source Code": "Broncode",
@@ -142,40 +133,27 @@
     "The cloned file '%s' was attached to this paste.": "Het gekloonde bestand '%s' is bijgevoegd aan de geplakte tekst.",
     "Attach a file": "Een bestand toevoegen",
     "alternatively drag & drop a file or paste an image from the clipboard": "U kunt ook een bestand slepen en neerzetten of een afbeelding plakken van het klembord",
-    "File too large, to display a preview. Please download the attachment.": "Het bestand is te groot om voorbeeld weer te geven. Aub de bijlage downloaden",
+    "File too large, to display a preview. Please download the attachment.": "Het bestand is te groot om voorbeeld weer te geven. Aub de bijlage downloaden",   
-    "Remove attachment": "Bijlage verwijderen",
+	"Remove attachment": "Bijlage verwijderen",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Uw browser biedt geen ondersteuning voor het uploaden van gecodeerde bestanden. Gebruik alstublieft een nieuwere browser",
+    "Your browser does not support uploading encrypted files. Please use a newer browser.":
+		"Uw browser biedt geen ondersteuning voor het uploaden van gecodeerde bestanden. Gebruik alstublieft een nieuwere browser",
     "Invalid attachment.": "Ongeldige bijlage",
     "Options": "Opties",
     "Shorten URL": "URL verkorten",
     "Editor": "Editor",
     "Preview": "Preview",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s vereist dat het PATH eindigt in een '%s'. Aub het PATH updaten in uw index.php.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Decoderen",
+        "%s vereist dat het PATH eindigt in een '%s'. Aub het PATH updaten in uw index.php.",
-    "Enter password": "Voer het wachtwoord in",
+    "Decrypt":
+        "Decoderen",
+    "Enter password":
+        "Voer het wachtwoord in",
     "Loading…": "Laden…",
     "Decrypting paste…": "Geplakte tekst decoderen…",
     "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>.",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "In het geval dat dit bericht nooit verdwijnt, kijkt u dan eens naar <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\"> veelgestelde vragen voor informatie over het oplossen van problemen </a>.",
     "+++ no paste text +++": "+++ geen geplakte tekst +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
+    "Could not get paste data: %s":
-    "QR code": "QR code",
+        "Could not get paste data: %s"
-    "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/no.json

@@ -1,138 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Fordi uvitenhet er lykke",
+        "%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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "Beklager, %s krever php %s eller nyere for å kjøre.",
+        "Innlegget eksisterer ikke, er utløpt eller har blitt slettet.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s krever konfigurasjonsdel [%s] å være til stede i konfigurasjonsfilen .",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Vennligst vent %d sekunder mellom hvert innlegg.",
+        "Beklager, %s krever php %s eller nyere for å kjøre.",
-    "Paste is limited to %s of encrypted data.": "Innlegg er begrenset til %s av kryptert data.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Ugyldige data.",
+        "%s krever konfigurasjonsdel [%s] å være til stede i konfigurasjonsfilen .",
-    "You are unlucky. Try again.": "Du er uheldig. Prøv igjen.",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Beklager, det oppstod en feil ved lagring kommentar.",
+        "Vennligst vent %d sekunder mellom hvert innlegg.",
-    "Error saving paste. Sorry.": "Beklager, det oppstod en feil ved lagring innlegg.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "Feil innlegg ID.",
+        "Innlegg er begrenset til %s av kryptert data.",
-    "Paste is not of burn-after-reading type.": "Innlegg er ikke av typen slett etter lesing.",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Feil slettingsnøkkel. Innlegg ble ikke fjernet.",
+        "Ugyldige data.",
-    "Paste was properly deleted.": "Innlegget er slettet.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "Javascript kreves for at %s skal fungere. Beklager.",
+        "Du er uheldig. Prøv igjen.",
-    "%s requires a modern browser to work.": "%s krever en moderne nettleser for å fungere.",
+    "Error saving comment. Sorry.":
-    "New": "Ny",
+        "Beklager, det oppstod en feil ved lagring kommentar.",
-    "Send": "Send",
+    "Error saving paste. Sorry.":
-    "Clone": "Kopier",
+        "Beklager, det oppstod en feil ved lagring innlegg.",
-    "Raw text": "Ren tekst",
+    "Invalid paste ID.":
-    "Expires": "Utgår",
+        "Feil innlegg ID.",
-    "Burn after reading": "Slett etter lesing",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Åpen diskusjon",
+        "Innlegg er ikke av typen slett etter lesing.",
-    "Password (recommended)": "Passord (anbefalt)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Diskusjon",
+        "Feil slettingsnøkkel. Innlegg ble ikke fjernet.",
-    "Toggle navigation": "Veksle navigasjon",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "Innlegget er slettet.",
-        "%d sekund",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d sekunder",
+        "Javascript kreves for at %s skal fungere. Beklager.",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s krever en moderne nettleser for å fungere.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Fortsatt bruker av Internet Explorer? Gjør deg selv en tjeneste og bytt til en moderne nettleser:",
-        "%d minutt",
+    "New":
-        "%d minutter",
+        "Ny",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Send",
-    ],
+    "Clone":
-    "%d hours": [
+        "Kopier",
-        "%d time",
+    "Raw text":
-        "%d timer",
+        "Ren tekst",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Utgår",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Slett etter lesing",
-        "%d dag",
+    "Open discussion":
-        "%d dager",
+        "Åpen diskusjon",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Passord (anbefalt)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Diskusjon",
-        "%d uke",
+    "Toggle navigation":
-        "%d uker",
+        "Veksle navigasjon",
-        "%d weeks (2nd plural)",
+    "%d seconds": ["%d sekund", "%d sekunder"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d minutt", "%d minutter"],
-    ],
+    "%d hours": ["%d time", "%d timer"],
-    "%d months": [
+    "%d days": ["%d dag", "%d dager"],
-        "%d måned",
+    "%d weeks": ["%d uke", "%d uker"],
-        "%d måneder",
+    "%d months": ["%d måned", "%d måneder"],
-        "%d months (2nd plural)",
+    "%d years": ["%d år", "%d år"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Aldri",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d år",
+        "Merk: Dette er en test tjeneste: Data kan slettes når som helst. Kattunger vil dø hvis du misbruker denne tjenesten.",
-        "%d år",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["Dette dokumentet vil utløpe om %d sekund.", "Dette dokumentet vil utløpe om %d sekunder."],
-        "%d years (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."],
-    "Never": "Aldri",
+    "This document will expire in %d hours.":
-    "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.",
+        ["Dette dokumentet vil utløpe om %d time.", "Dette dokumentet vil utløpe om %d timer."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Dette dokumentet vil utløpe om %d sekund.",
+        ["Dette dokumentet vil utløpe om %d dag.", "Dette dokumentet vil utløpe om %d dager."],
-        "Dette dokumentet vil utløpe om %d sekunder.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["Dette dokumentet vil utløpe om %d måned.", "Dette dokumentet vil utløpe om %d måneder."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Vennligst skriv inn passordet for dette innlegget:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Dette dokumentet vil utløpe om %d minutt.",
+        "Kunne ikke dekryptere data (Feil nøkkel?)",
-        "Dette dokumentet vil utløpe om %d minutter.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "Kan ikke slette innlegget, det ble ikke lagret som 'slett etter les' type.",
-        "This document will expire in %d minutes (3rd plural)"
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "KUN FOR DINE ØYNE. Ikke lukk dette vinduet, denne meldingen kan ikke bli vist igjen.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Dette dokumentet vil utløpe om %d time.",
+        "Kan ikke dekryptere kommentar; Feil nøkkel?",
-        "Dette dokumentet vil utløpe om %d timer.",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Svar",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anonym",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Dette dokumentet vil utløpe om %d dag.",
+        "Anonym avatar generert med data fra IP adressen)",
-        "Dette dokumentet vil utløpe om %d dager.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Legg til kommentar",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Valgfritt kallenavn…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Dette dokumentet vil utløpe om %d måned.",
+        "Send kommentar",
-        "Dette dokumentet vil utløpe om %d måneder.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Sender Kommentar…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Kommentar sendt.",
-    "Please enter the password for this paste:": "Vennligst skriv inn passordet for dette innlegget:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Kunne ikke dekryptere data (Feil nøkkel?)",
+        "Kunne ikke oppdatere bildet: %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Kan ikke slette innlegget, det ble ikke lagret som 'slett etter les' type.",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "KUN FOR DINE ØYNE. Ikke lukk dette vinduet, denne meldingen kan ikke bli vist igjen.",
+        "ukjent status",
-    "Could not decrypt comment; Wrong key?": "Kan ikke dekryptere kommentar; Feil nøkkel?",
+    "server error or not responding":
-    "Reply": "Svar",
+        "tjener feilet eller svarer ikke",
-    "Anonymous": "Anonym",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Anonym avatar generert med data fra IP adressen)",
+        "Kunne ikke sende kommentar: %s",
-    "Add comment": "Legg til kommentar",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Valgfritt kallenavn…",
+        "Flytt musen for mer entropi…",
-    "Post comment": "Send kommentar",
+    "Sending paste…":
-    "Sending comment…": "Sender Kommentar…",
+        "Sender innlegg…",
-    "Comment posted.": "Kommentar sendt.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Kunne ikke oppdatere bildet: %s",
+        "Ditt innlegg er <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Trykk [Ctrl]+[c] for å kopiere)</span>",
-    "unknown status": "ukjent status",
+    "Delete data":
-    "server error or not responding": "tjener feilet eller svarer ikke",
+        "Slett data",
-    "Could not post comment: %s": "Kunne ikke sende kommentar: %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Sender innlegg…",
+        "Kunne ikke opprette innlegg: %s",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Ditt innlegg er <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Trykk [Ctrl]+[c] for å kopiere)</span>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Slett data",
+        "Kan ikke dekryptere innlegg: Dekrypteringsnøkkelen mangler i adressen (Har du bruket en redirector eller en URL forkorter som fjerner en del av addressen?)",
-    "Could not create paste: %s": "Kunne ikke opprette innlegg: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Kan ikke dekryptere innlegg: Dekrypteringsnøkkelen mangler i adressen (Har du bruket en redirector eller en URL forkorter som fjerner en del av addressen?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "Format": "Format",
     "Plain Text": "Ren Tekst",
     "Source Code": "Kildekode",
@@ -144,38 +135,25 @@
     "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.",
+    "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.",
     "Options": "Alternativer",
     "Shorten URL": "Adresse forkorter",
     "Editor": "Rediger",
     "Preview": "Forhåndsvis",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s krever at PATH ender på \"%s\". Vennligst oppdater PATH i index.php.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Dekrypter",
+        "%s krever at PATH ender på \"%s\". Vennligst oppdater PATH i index.php.",
-    "Enter password": "Skriv inn passord",
+    "Decrypt":
+        "Dekrypter",
+    "Enter password":
+        "Skriv inn passord",
     "Loading…": "Laster…",
     "Decrypting paste…": "Dekrypterer innlegg…",
     "Preparing new paste…": "Klargjør nytt innlegg…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Hvis denne meldingen ikke forsvinner kan du ta en titt på siden med <a href=\"%s\">ofte stilte spørsmål</a> for informasjon om feilsøking.",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "Hvis denne meldingen ikke forsvinner kan du ta en titt på siden med <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">ofte stilte spørsmål</a> for informasjon om feilsøking.",
     "+++ no paste text +++": "+++ ingen innleggstekst +++",
-    "Could not get paste data: %s": "Kunne ikke hente utklippsdata: %s",
+    "Could not get paste data: %s":
-    "QR code": "QR kode",
+        "Could not get paste data: %s"
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Denne websiden bruker usikker HTTP tilkobling! Bruk den kun for testing.",
+}
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For mer informasjon <a href=\"%s\">se ofte stilte spørsmål</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Din nettleser har behov for HTTPS tilkobling for å støtte WebCrypto biblioteket. Prøv å <a href=\"%s\">bytt til HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Nettleseren din støtter ikke WebAssembly som brukes for zlib komprimering. Du kan lage ukomprimerte dokumenter, men du kan ikke lese komprimerte.",
-    "waiting on user to provide a password": "venter på at bruker skal skrive passord",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Kunne ikke dekryptere data. Har du tastet riktig pssord? Prøv igjen med knappen på toppen.",
-    "Retry": "Prøv igjen",
-    "Showing raw text…": "Viser rå-tekst…",
-    "Notice:": "Notat:",
-    "This link will expire after %s.": "Denne lenken vil bli inaktiv etter %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Denne addressen kan kun bli besøkt en gang, ikke trykk på tilbake eller oppdater knappene i nettleseren.",
-    "Link:": "Lenke:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Mottaker kan bli kjent med din tidssone, ønsker du å konvertere til UTC?",
-    "Use Current Timezone": "Bruk gjeldende tidssone",
-    "Convert To UTC": "Konverter til UTC",
-    "Close": "Steng",
-    "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,129 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Perque lo bonaür es l’ignorància",
+        "%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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "O planhèm, %s necessita php %s o superior per foncionar.",
+        "Lo tèxte existís pas, a expirat, o es estat suprimit.",
-    "%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.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Mercés d'esperar %d segondas entre cada publicacion.",
+        "O planhèm, %s necessita php %s o superior per foncionar.",
-    "Paste is limited to %s of encrypted data.": "Lo tèxte es limitat a %s de donadas chifradas.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Donadas invalidas.",
+        "%s fa besonh de la seccion de configuracion [%s] dins lo fichièr de configuracion per foncionar.",
-    "You are unlucky. Try again.": "Pas cap de fortuna. Tornatz ensajar.",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Error al moment de salvagardar lo comentari. O planhèm.",
+        "Mercés d'esperar %d segondas entre cada publicacion.",
-    "Error saving paste. Sorry.": "Error al moment de salvagardar lo tèxte. O planhèm.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "ID del tèxte invalid.",
+        "Lo tèxte es limitat a %s de donadas chifradas.",
-    "Paste is not of burn-after-reading type.": "Lo tèxte es pas del tip \"Escafar aprèp lectura\".",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Geton de supression incorrècte. Lo tèxte es pas estat suprimit.",
+        "Donadas invalidas.",
-    "Paste was properly deleted.": "Lo tèxte es estat corrèctament  suprimit.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript es requesit per far foncionar %s. O planhèm per l’inconvenient.",
+        "Pas cap de fortuna. Tornatz ensajar.",
-    "%s requires a modern browser to work.": "%s necessita un navigator modèrn per foncionar.",
+    "Error saving comment. Sorry.":
-    "New": "Nòu",
+        "Error al moment de salvagardar lo comentari. O planhèm.",
-    "Send": "Mandar",
+    "Error saving paste. Sorry.":
-    "Clone": "Clonar",
+        "Error al moment de salvagardar lo tèxte. O planhèm.",
-    "Raw text": "Tèxte brut",
+    "Invalid paste ID.":
-    "Expires": "Expira",
+        "ID del tèxte invalid.",
-    "Burn after reading": "Escafar aprèp lectura",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Autorizar la discussion",
+        "Lo tèxte es pas del tip \"Escafar aprèp lectura\".",
-    "Password (recommended)": "Senhal (recomandat)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Discussion",
+        "Geton de supression incorrècte. Lo tèxte es pas estat suprimit.",
-    "Toggle navigation": "Virar la navigacion",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "Lo tèxte es estat correctament suprimit.",
-        "%d segonda",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d segondas",
+        "JavaScript es requesit per far foncionar %s. O planhèm per l’inconvenient.",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s necessita un navigator modèrn per foncionar.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Encora sus Internet Explorer ? Fasètz-vos una favor, passatz a un navigator modèrn :",
-        "%d minuta",
+    "New":
-        "%d minutas",
+        "Nòu",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Mandar",
-    ],
+    "Clone":
-    "%d hours": [
+        "Clonar",
-        "%d ora",
+    "Raw text":
-        "%d oras",
+        "Tèxte brut",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Expira",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Escafar aprèp lectura",
-        "%d jorn",
+    "Open discussion":
-        "%d jorns",
+        "Autorizar la discussion",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Senhal (recomandat)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Discussion",
-        "%d setmana",
+    "Toggle navigation":
-        "%d setmanas",
+        "Virar la navigacion",
-        "%d weeks (2nd plural)",
+    "%d seconds": ["%d segonda", "%d segondas"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d minuta", "%d minutas"],
-    ],
+    "%d hours": ["%d ora", "%d oras"],
-    "%d months": [
+    "%d days": ["%d jorn", "%d jorns"],
-        "%d mes",
+    "%d weeks": ["%d setmana", "%d setmanas"],
-        "%d meses",
+    "%d months": ["%d mes", "%d meses"],
-        "%d months (2nd plural)",
+    "%d years": ["%d an", "%d ans"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Jamai",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d an",
+        "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.",
-        "%d ans",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["Ce document expirera dans %d seconde.", "Aqueste document expirarà dins %d segondas."],
-        "%d years (3rd plural)"
+    "This document will expire in %d minutes.":
-    ],
+        ["Ce document expirera dans %d minute.", "Aqueste document expirarà dins %d minutas."],
-    "Never": "Jamai",
+    "This document will expire in %d hours.":
-    "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.",
+        ["Ce document expirera dans %d heure.", "Aqueste document expirarà dins %d oras."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Ce document expirera dans %d seconde.",
+        ["Ce document expirera dans %d jour.", "Aqueste document expirarà dins %d jorns."],
-        "Aqueste document expirarà dins %d segondas.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["Ce document expirera dans %d mois.", "Aqueste document expirarà dins %d meses."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Picatz lo senhal per aqueste tèxte :",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Ce document expirera dans %d minute.",
+        "Impossible de deschifrar las donadas (marrida clau ?)",
-        "Aqueste document expirarà dins %d minutas.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "Impossible de suprimir lo tèxte, perque es pas estat gardat en mòde \"Escafar aprèp lectura\".",
-        "This document will expire in %d minutes (3rd plural)"
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "PER VÒSTRES UÈLHS SOLAMENT. Tampetz pas aquesta fenèstra, aqueste tèxte poirà pas mai èsser afichat.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Ce document expirera dans %d heure.",
+        "Impossible de deschifrar lo comentari ; marrida clau ?",
-        "Aqueste document expirarà dins %d oras.",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Respondre",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anonime",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Ce document expirera dans %d jour.",
+        "Avatar anonime (Vizhash de l’adreça IP)",
-        "Aqueste document expirarà dins %d jorns.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Apondre un comentari",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Escais opcional…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Ce document expirera dans %d mois.",
+        "Mandar lo comentari",
-        "Aqueste document expirarà dins %d meses.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Mandadís del comentari…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Comentari mandat.",
-    "Please enter the password for this paste:": "Picatz lo senhal per aqueste tèxte :",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Impossible de deschifrar las donadas (marrida clau ?)",
+        "Impossible d’actualizar l’afichatge : %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Impossible de suprimir lo tèxte, perque es pas estat gardat en mòde \"Escafar aprèp lectura\".",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "PER VÒSTRES UÈLHS SOLAMENT. Tampetz pas aquesta fenèstra, aqueste tèxte poirà pas mai èsser afichat.",
+        "Estatut desconegut",
-    "Could not decrypt comment; Wrong key?": "Impossible de deschifrar lo comentari ; marrida clau ?",
+    "server error or not responding":
-    "Reply": "Respondre",
+        "Lo servidor respond pas o a rencontrat una error",
-    "Anonymous": "Anonime",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Avatar anonime (Vizhash de l’adreça IP)",
+        "Impossible de mandar lo comentari : %s",
-    "Add comment": "Apondre un comentari",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Escais opcional…",
+        "Mercés de bolegar vòstra mirga per mai entropia…",
-    "Post comment": "Mandar lo comentari",
+    "Sending paste…":
-    "Sending comment…": "Mandadís del comentari…",
+        "Mandadís del tèxte…",
-    "Comment posted.": "Comentari mandat.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Impossible d’actualizar l’afichatge : %s",
+        "Vòstre tèxte es disponible a l’adreça <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Picatz sus [Ctrl]+[c] per copiar)</span>",
-    "unknown status": "Estatut desconegut",
+    "Delete data":
-    "server error or not responding": "Lo servidor respond pas o a rescontrat una error",
+        "Supprimir las donadas del tèxte",
-    "Could not post comment: %s": "Impossible de mandar lo comentari : %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Mandadís del tèxte…",
+        "Impossible de crear lo tèxte : %s",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Vòstre tèxte es disponible a l’adreça <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Picatz sus [Ctrl]+[c] per copiar)</span>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Supprimir las donadas del tèxte",
+        "Impossible de deschifrar lo tèxte : clau de deschiframent absenta de l’URL (Avètz utilizat un redirector o un site de reduccion d’URL que suprimís una partida de l’URL ?)",
-    "Could not create paste: %s": "Impossible de crear lo tèxte : %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Impossible de deschifrar lo tèxte : clau de deschiframent absenta de l’URL (Avètz utilizat un redirector o un site de reduccion d’URL que suprimís una partida de l’URL ?)",
     "B": "o",
     "KiB": "Kio",
     "MiB": "Mio",
@@ -144,38 +144,25 @@
     "alternatively drag & drop a file or paste an image from the clipboard": "autrament lisatz lo fichièr o pegatz l’imatge del quichapapièrs",
     "File too large, to display a preview. Please download the attachment.": "Fichièr tròp pesuc per mostrar un apercebut. Telecargatz la pèca junta.",
     "Remove attachment": "Levar la pèça junta",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Vòstre navigator es pas compatible amb lo mandadís de fichièrs chifrats. Mercés d’emplegar un navigator mai recent.",
+    "Your browser does not support uploading encrypted files. Please use a newer browser.":
+        "Vòstre navigator es pas compatible amb lo mandadís de fichièrs chifrats. Mercés d’emplegar un navigator mai recent.",
     "Invalid attachment.": "Pèça junta invalida.",
     "Options": "Opcions",
     "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.":
-    "Decrypt": "Deschifrar",
+        "%s demanda que lo PATH termine en \"%s\". Mercés de metre a jorn lo PATH dins vòstre index.php.",
-    "Enter password": "Picatz lo senhal",
+    "Decrypt":
+        "Deschifrar",
+    "Enter password":
+        "Picatz lo senhal",
     "Loading…": "Cargament…",
     "Decrypting paste…": "Deschirament del tèxte…",
     "Preparing new paste…": "Preparacion…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Se per cas aqueste messatge quite pas de s’afichar mercés de gaitar <a href=\"%s\">aquesta FAQ per las solucions</a> (en anglés).",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "Se per cas aqueste messatge quita pas de s’afichar mercés de gaitar <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">aquesta FAQ per las solucions</a> (en anglés).",
     "+++ no paste text +++": "+++ cap de tèxte pegat +++",
-    "Could not get paste data: %s": "Recuperacion impossibla de las donadas copiadas : %s",
+    "Could not get paste data: %s":
-    "QR code": "Còdi QR",
+        "Could not get paste data: %s"
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Aqueste site utiliza una connexion HTTP pas segura ! Mercés de l’utilizar pas que per d’ensages.",
+}
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Per mai d’informacions <a href=\"%s\">vejatz aqueste article de FAQ</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Se pòt que vòstre navigator faga besonh d’una connexion HTTPS per èsser compatible amb l’API WebCrypto. Ensajatz de <a href=\"%s\">passar al HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Vòstre navigator es pas compatible amb WebAssembly, utilizat per la compression zlib. Podètz crear de documents pas compressat, mas ne podètz pas legir de compressats.",
-    "waiting on user to provide a password": "en espèra que l’utilizaire fornisca un senhal",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Deschiframent de las donadas impossible. Avètz picat un marrit senhal ? Tornatz ensajar amb lo boton ennaut.",
-    "Retry": "Tornar ensajar",
-    "Showing raw text…": "Afichatge del tèxte brut…",
-    "Notice:": "Avertiment :",
-    "This link will expire after %s.": "Aqueste ligam expirarà aprèp %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Òm pòt pas qu’accedir a aqueste ligam qu’un còp, utilizetz pas lo boton precedent o actualizar del navigator.",
-    "Link:": "Ligam :",
-    "Recipient may become aware of your timezone, convert time to UTC?": "Lo destinatari pòt s’avisar de vòstre fus orari, convertir en UTC ?",
-    "Use Current Timezone": "Utilizar l’actual",
-    "Convert To UTC": "Convertir en UTC",
-    "Close": "Tampar",
-    "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,181 +1,159 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Ponieważ ignorancja jest cnotą",
+        "%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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "%s wymaga PHP w wersji %s lub nowszej. Przykro mi.",
+        "Wklejka nie istnieje, wygasła albo została usunięta.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s wymaga obecności sekcji [%s] w pliku konfiguracyjnym.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Poczekaj %d sekund pomiędzy każdą wklejką.",
+        "%s wymaga PHP w wersji %s lub nowszej, sorry.",
-    "Paste is limited to %s of encrypted data.": "Wklejka jest limitowana do %s zaszyfrowanych danych.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Nieprawidłowe dane.",
+        "%s wymaga obecności sekcji [%s] w pliku konfiguracyjnym.",
-    "You are unlucky. Try again.": "Miałeś pecha. Spróbuj ponownie.",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Błąd przy zapisywaniu komentarza, sorry.",
+        "Poczekaj %d sekund pomiędzy każdą wklejką.",
-    "Error saving paste. Sorry.": "Błąd przy zapisywaniu wklejki, sorry.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "Nieprawidłowe ID wklejki.",
+        "Wklejka jest limitowana do %s zaszyfrowanych danych.",
-    "Paste is not of burn-after-reading type.": "Ta wklejka nie ulega autodestrukcji po przeczytaniu.",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Nieprawidłowy token usuwania. Wklejka nie została usunięta.",
+        "Nieprawidłowe dane.",
-    "Paste was properly deleted.": "Wklejka usunięta poprawnie.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "Do działania %sa jest wymagany JavaScript. Przepraszamy za tę niedogodność.",
+        "Miałeś pecha. Spróbuj ponownie.",
-    "%s requires a modern browser to work.": "%s wymaga do działania nowoczesnej przeglądarki.",
+    "Error saving comment. Sorry.":
-    "New": "Nowa",
+        "Błąd przy zapisywaniu komentarza, sorry.",
-    "Send": "Wyślij",
+    "Error saving paste. Sorry.":
-    "Clone": "Sklonuj",
+        "Błąd przy zapisywaniu wklejki, sorry.",
-    "Raw text": "Czysty tekst",
+    "Invalid paste ID.":
-    "Expires": "Wygasa za",
+        "Nieprawidłowe ID wklejki.",
-    "Burn after reading": "Zniszcz po przeczytaniu",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Otwarta dyskusja",
+        "Ta wklejka nie ulega autodestrukcji po przeczytaniu.",
-    "Password (recommended)": "Hasło (zalecane)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Dyskusja",
+        "Nieprawidłowy token usuwania. Wklejka nie została usunięta.",
-    "Toggle navigation": "Przełącz nawigację",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "Wklejka usunięta poprawnie.",
-        "%d second",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d second",
+        "Do działania %sa jest wymagany JavaScript. Przepraszamy za tę niedogodność.",
-        "%d second",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s wymaga do działania nowoczesnej przeglądarki.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Cały czas używasz Internet Explorera? Zrób sobie przysługę, przesiądź się na nowoczesną przeglądarkę:",
-        "%d minut",
+    "New":
-        "%d minut",
+        "Nowa",
-        "%d minut",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Wyślij",
-    ],
+    "Clone":
-    "%d hours": [
+        "Sklonuj",
-        "%d godzina",
+    "Raw text":
-        "%d godzina",
+        "Czysty tekst",
-        "%d godzinę",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Wygasa za",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Zniszcz po przeczytaniu",
-        "%d dzień",
+    "Open discussion":
-        "%d dzień",
+        "Otwarta dyskusja",
-        "%d dzień",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Hasło (zalecane)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Dyskusja",
-        "%d tydzień",
+    "Toggle navigation":
-        "%d tydzień",
+        "Przełącz nawigację",
-        "%d tydzień",
+    "%d seconds": ["%d second", "%d second", "%d second"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d minut", "%d minut", "%d minut"],
-    ],
+    "%d hours": ["%d godzina", "%d godzina", "%d godzinę"],
-    "%d months": [
+    "%d days": ["%d dzień", "%d dzień", "%d dzień"],
-        "%d miesiąc",
+    "%d weeks": ["%d tydzień", "%d tydzień", "%d tydzień"],
-        "%d miesiąc",
+    "%d months": ["%d miesiąc", "%d miesiąc", "%d miesiąc"],
-        "%d miesiąc",
+    "%d years": ["%d rok", "%d rok", "%d rok"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "nigdy",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d rok",
+        "Notka: To jest usługa testowa. Dane mogą zostać usunięte w dowolnym momencie. Kociątka umrą, jeśli nadużyjesz tej usługi.",
-        "%d rok",
+    "This document will expire in %d seconds.":
-        "%d rok",
+        ["Ten dokument wygaśnie za %d sekundę.", "Ten dokument wygaśnie za %d sekund."],
-        "%d years (3rd plural)"
+    "This document will expire in %d minutes.":
-    ],
+        ["Ten dokument wygaśnie za %d minutę.", "Ten dokument wygaśnie za %d minut."],
-    "Never": "nigdy",
+    "This document will expire in %d hours.":
-    "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.",
+        ["Ten dokument wygaśnie za godzinę.", "Ten dokument wygaśnie za %d godzin."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Ten dokument wygaśnie za %d sekundę.",
+        ["Ten dokument wygaśnie za %d dzień.", "Ten dokument wygaśnie za %d dni."],
-        "Ten dokument wygaśnie za %d sekund.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["Ten dokument wygaśnie za miesiąc.", "Ten dokument wygaśnie za %d miesięcy."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Wpisz hasło dla tej wklejki:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Ten dokument wygaśnie za %d minutę.",
+        "Nie udało się odszyfrować danych (zły klucz?)",
-        "Ten dokument wygaśnie za %d minut.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "Nie udało się usunąć wklejki, nie została zapisana w trybie zniszczenia po przeczytaniu.",
-        "This document will expire in %d minutes (3rd plural)"
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "TYLKO DO TWOJEGO WGLĄDU. Nie zamykaj tego okna, ta wiadomość nie będzie mogła być wyświetlona ponownie.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Ten dokument wygaśnie za godzinę.",
+        "Nie udało się odszyfrować komentarza; zły klucz?",
-        "Ten dokument wygaśnie za %d godzin.",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Odpowiedz",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anonim",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Ten dokument wygaśnie za %d dzień.",
+        "Anonimowy avatar (Vizhash z adresu IP)",
-        "Ten dokument wygaśnie za %d dni.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Dodaj komentarz",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Opcjonalny nick…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Ten dokument wygaśnie za miesiąc.",
+        "Wyślij komentarz",
-        "Ten dokument wygaśnie za %d miesięcy.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Wysyłanie komentarza…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Wysłano komentarz.",
-    "Please enter the password for this paste:": "Wpisz hasło dla tej wklejki:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Nie udało się odszyfrować danych (zły klucz?)",
+        "Nie można odświeżyć widoku: %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Nie udało się usunąć wklejki, nie została zapisana w trybie zniszczenia po przeczytaniu.",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "TYLKO DO TWOJEGO WGLĄDU. Nie zamykaj tego okna, ta wiadomość nie będzie mogła być wyświetlona ponownie.",
+        "nieznany status",
-    "Could not decrypt comment; Wrong key?": "Nie udało się odszyfrować komentarza; zły klucz?",
+    "server error or not responding":
-    "Reply": "Odpowiedz",
+        "bląd serwera lub brak odpowiedzi",
-    "Anonymous": "Anonim",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Anonimowy avatar (Vizhash z adresu IP)",
+        "Nie udało się wysłać komentarza: %s",
-    "Add comment": "Dodaj komentarz",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Opcjonalny nick…",
+        "Proszę poruszać myszą aby uzyskać większą entropię…",
-    "Post comment": "Wyślij komentarz",
+    "Sending paste…":
-    "Sending comment…": "Wysyłanie komentarza…",
+        "Wysyłanie wklejki…",
-    "Comment posted.": "Wysłano komentarz.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Nie można odświeżyć widoku: %s",
+        "Twoja wklejka to <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(wciśnij [Ctrl]+[c] aby skopiować)</span>",
-    "unknown status": "nieznany status",
+    "Delete data":
-    "server error or not responding": "błąd serwera lub brak odpowiedzi",
+        "Skasuj dane",
-    "Could not post comment: %s": "Nie udało się wysłać komentarza: %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Wysyłanie wklejki…",
+        "Nie udało się utworzyć wklejki: %s",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Twoja wklejka to <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(wciśnij [Ctrl]+[c] aby skopiować)</span>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Skasuj dane",
+        "Nie udało się odszyfrować wklejki - brak klucza deszyfrującego w adresie (użyłeś skracacza linków, który ucina część adresu?)",
-    "Could not create paste: %s": "Nie udało się utworzyć wklejki: %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 udało się odszyfrować wklejki - brak klucza deszyfrującego w adresie (użyłeś skracacza linków, który ucina część adresu?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "Format": "Format",
     "Plain Text": "Czysty tekst",
     "Source Code": "Kod źródłowy",
     "Markdown": "Markdown",
     "Download attachment": "Pobierz załącznik",
     "Cloned: '%s'": "Sklonowano: '%s'",
-    "The cloned file '%s' was attached to this paste.": "Sklonowany plik '%s' był dołączony do tej wklejki.",
+    "The cloned file '%s' was attached to this paste.": "The cloned file '%s' was attached to this paste.",
     "Attach a file": "Załącz plik",
-    "alternatively drag & drop a file or paste an image from the clipboard": "Alternatywnie przeciągnij i upuść plik albo wklej obraz ze schowka",
+    "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.": "Plik zbyt duży aby wyświetlić podgląd. Proszę pobrać załącznik.",
+    "File too large, to display a preview. Please download the attachment.": "File too large, to display a preview. Please download the attachment.",
     "Remove attachment": "Usuń załącznik",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Twoja przeglądarka nie wspiera wysyłania zaszyfrowanych plików. Użyj nowszej przeglądarki.",
+    "Your browser does not support uploading encrypted files. Please use a newer browser.":
+        "Twoja przeglądarka nie wspiera wysyłania zaszyfrowanych plików. Użyj nowszej przeglądarki.",
     "Invalid attachment.": "Nieprawidłowy załącznik.",
     "Options": "Opcje",
     "Shorten URL": "Skróć adres URL",
     "Editor": "Edytować",
-    "Preview": "Podgląd",
+    "Preview": "Zapowiedź",
-    "%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.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Odszyfruj",
+        "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Enter password": "Wpisz hasło",
+    "Decrypt":
-    "Loading…": "Wczytywanie…",
+        "Decrypt",
-    "Decrypting paste…": "Odszyfrowywanie wklejki…",
+    "Enter password":
-    "Preparing new paste…": "Przygotowywanie nowej wklejki…",
+        "Wpisz hasło",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "W przypadku gdy ten komunikat nigdy nie znika, proszę spójrz na <a href=\"%s\">to FAQ aby rozwiązać problem</a> (po angielsku).",
+    "Loading…": "Loading…",
-    "+++ no paste text +++": "+++ brak wklejonego tekstu +++",
+    "Decrypting paste…": "Decrypting paste…",
-    "Could not get paste data: %s": "Nie można było pobrać danych wklejki: %s",
+    "Preparing new paste…": "Preparing new paste…",
-    "QR code": "Kod QR",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
-    "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.",
+        "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a> (in English).",
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "For more information <a href=\"%s\">see this FAQ entry</a>.",
+    "+++ no paste text +++": "+++ no paste text +++",
-    "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>.",
+    "Could not get paste data: %s":
-    "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.",
+        "Could not get paste data: %s"
-    "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/pt.json

@@ -1,138 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Porque a ignorância é uma benção",
+        "%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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "%s requer php %s ou superior para funcionar. Desculpa.",
+        "A cópia não existe, expirou ou já foi excluída.",
-    "%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.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Por favor espere %d segundos entre cada publicação.",
+        "%s requer php %s ou superior para funcionar. Desculpa.",
-    "Paste is limited to %s of encrypted data.": "A cópia está limitada a %s de dados cifrados.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Dados inválidos.",
+        "%s requer que a seção de configuração [% s] esteja no arquivo de configuração.",
-    "You are unlucky. Try again.": "Você é azarado. Tente novamente",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Erro ao salvar comentário. Desculpa.",
+        "Por favor espere %d segundos entre cada publicação.",
-    "Error saving paste. Sorry.": "Erro ao salvar cópia. Desculpa.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "ID de cópia inválido.",
+        "A cópia está limitada a %s de dados cifrados.",
-    "Paste is not of burn-after-reading type.": "Cópia não é do tipo \"queime após ler\".",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Token de remoção inválido. A cópia não foi excluída.",
+        "Dados inválidos.",
-    "Paste was properly deleted.": "A cópia foi devidamente excluída.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "JavaScript é necessário para que %s funcione. Pedimos desculpas pela inconveniência.",
+        "Você é azarado. Tente novamente",
-    "%s requires a modern browser to work.": "%s requer um navegador moderno para funcionar.",
+    "Error saving comment. Sorry.":
-    "New": "Novo",
+        "Erro ao salvar comentário. Desculpa.",
-    "Send": "Enviar",
+    "Error saving paste. Sorry.":
-    "Clone": "Clonar",
+        "Erro ao salvar cópia. Desculpa.",
-    "Raw text": "Texto sem formato",
+    "Invalid paste ID.":
-    "Expires": "Expirar em",
+        "ID de cópia inválido.",
-    "Burn after reading": "Queime após ler",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Discussão aberta",
+        "Cópia não é do tipo \"queime após ler\".",
-    "Password (recommended)": "Senha (recomendada)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Discussão",
+        "Token de remoção inválido. A cópia não foi excluída.",
-    "Toggle navigation": "Mudar navegação",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "A cópia foi devidamente excluída.",
-        "%d segundo",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d segundos",
+        "JavaScript é necessário para que %s funcione. Pedimos desculpas pela inconveniência.",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s requer um navegador moderno para funcionar.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Ainda usando Internet Explorer? Faça-se um favor, mude para um navegador moderno:",
-        "%d minuto",
+    "New":
-        "%d minutos",
+        "Novo",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Enviar",
-    ],
+    "Clone":
-    "%d hours": [
+        "Clonar",
-        "%d hora",
+    "Raw text":
-        "%d horas",
+        "Texto sem formato",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Expirar em",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Queime após ler",
-        "%d dia",
+    "Open discussion":
-        "%d dias",
+        "Discussão aberta",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Senha (recomendada)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Discussão",
-        "%d semana",
+    "Toggle navigation":
-        "%d semanas",
+        "Mudar navegação",
-        "%d weeks (2nd plural)",
+    "%d seconds": ["%d segundo", "%d segundos"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d minuto", "%d minutos"],
-    ],
+    "%d hours": ["%d hora", "%d horas"],
-    "%d months": [
+    "%d days": ["%d dia", "%d dias"],
-        "%d mês",
+    "%d weeks": ["%d semana", "%d semanas"],
-        "%d meses",
+    "%d months": ["%d mês", "%d meses"],
-        "%d months (2nd plural)",
+    "%d years": ["%d ano", "%d anos"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Nunca",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d ano",
+        "Nota: Este é um serviço de teste. Dados podem ser perdidos a qualquer momento. Gatinhos morrerão se você abusar desse serviço.",
-        "%d anos",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["Este documento irá expirar em um segundo.", "Este documento irá expirar em %d segundos."],
-        "%d years (3rd plural)"
+    "This document will expire in %d minutes.":
-    ],
+        ["Este documento irá expirar em um minuto.", "Este documento irá expirar em %d minutos."],
-    "Never": "Nunca",
+    "This document will expire in %d hours.":
-    "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.",
+        ["Este documento irá expirar em uma hora.", "Este documento irá expirar em %d horas."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Este documento irá expirar em um segundo.",
+        ["Este documento irá expirar em um dia.", "Este documento irá expirar em %d dias."],
-        "Este documento irá expirar em %d segundos.",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["Este documento irá expirar em um mês.", "Este documento irá expirar em %d meses."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Por favor, digite a senha para essa cópia:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Este documento irá expirar em um minuto.",
+        "Não foi possível decifrar os dados (Chave errada?)",
-        "Este documento irá expirar em %d minutos.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "Não foi possível excluir a cópia, ela não foi salva no modo de \"queime após ler\".",
-        "This document will expire in %d minutes (3rd plural)"
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "APENAS PARA SEUS OLHOS. Não feche essa janela, essa mensagem não pode ser exibida novamente.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Este documento irá expirar em uma hora.",
+        "Não foi possível decifrar o comentário; Chave errada?",
-        "Este documento irá expirar em %d horas.",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "Responder",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Anônimo",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Este documento irá expirar em um dia.",
+        "Avatar gerado à partir do endereço IP",
-        "Este documento irá expirar em %d dias.",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "Adicionar comentário",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Apelido opcional…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Este documento irá expirar em um mês.",
+        "Publicar comentário",
-        "Este documento irá expirar em %d meses.",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "Enviando comentário…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Comentário publicado.",
-    "Please enter the password for this paste:": "Por favor, digite a senha para essa cópia:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Não foi possível decifrar os dados (Chave errada?)",
+        "Não foi possível atualizar a tela: %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Não foi possível excluir a cópia, ela não foi salva no modo de \"queime após ler\".",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "APENAS PARA SEUS OLHOS. Não feche essa janela, essa mensagem não pode ser exibida novamente.",
+        "Estado desconhecido",
-    "Could not decrypt comment; Wrong key?": "Não foi possível decifrar o comentário; Chave errada?",
+    "server error or not responding":
-    "Reply": "Responder",
+        "Servidor em erro ou não responsivo",
-    "Anonymous": "Anônimo",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Avatar gerado à partir do endereço IP",
+        "Não foi possível publicar o comentário: %s",
-    "Add comment": "Adicionar comentário",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Apelido opcional…",
+        "Por favor, mova o mouse para maior entropia…",
-    "Post comment": "Publicar comentário",
+    "Sending paste…":
-    "Sending comment…": "Enviando comentário…",
+        "Enviando cópia…",
-    "Comment posted.": "Comentário publicado.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Não foi possível atualizar a tela: %s",
+        "Sua cópia é <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Pressione [Ctrl]+[c] para copiar)</span>",
-    "unknown status": "Estado desconhecido",
+    "Delete data":
-    "server error or not responding": "Servidor em erro ou não responsivo",
+        "Excluir dados",
-    "Could not post comment: %s": "Não foi possível publicar o comentário: %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Enviando cópia…",
+        "Não foi possível criar cópia: %s",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Sua cópia é <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Pressione [Ctrl]+[c] para copiar)</span>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Excluir dados",
+        "Não foi possível decifrar a cópia: chave de decriptografia ausente na URL (Você utilizou um redirecionador ou encurtador de URL que removeu parte dela?)",
-    "Could not create paste: %s": "Não foi possível criar cópia: %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ão foi possível decifrar a cópia: chave de decriptografia ausente na URL (Você utilizou um redirecionador ou encurtador de URL que removeu parte dela?)",
-    "B": "B",
-    "KiB": "KiB",
-    "MiB": "MiB",
-    "GiB": "GiB",
-    "TiB": "TiB",
-    "PiB": "PiB",
-    "EiB": "EiB",
-    "ZiB": "ZiB",
-    "YiB": "YiB",
     "Format": "Formato",
     "Plain Text": "Texto sem formato",
     "Source Code": "Código fonte",
@@ -144,38 +135,25 @@
     "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.",
+    "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.",
     "Options": "Opções",
     "Shorten URL": "Encurtar URL",
     "Editor": "Editor",
     "Preview": "Visualizar",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "%s requer que o PATH termine em \"%s\". Por favor, atualize o PATH em seu index.php.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Decifrar",
+        "%s requer que o PATH termine em \"%s\". Por favor, atualize o PATH em seu index.php.",
-    "Enter password": "Digite a senha",
+    "Decrypt":
+        "Decifrar",
+    "Enter password":
+        "Digite a senha",
     "Loading…": "Carregando…",
     "Decrypting paste…": "Decifrando cópia…",
     "Preparing new paste…": "Preparando nova cópia…",
-    "In case this message never disappears please have a look at <a href=\"%s\">this FAQ for information to troubleshoot</a>.": "Caso essa mensagem nunca desapareça, por favor veja <a href=\"%s\">este FAQ para saber como resolver os problemas</a>.",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "Caso essa mensagem nunca desapareça, por favor veja <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">este FAQ para saber como resolver os problemas</a>.",
     "+++ no paste text +++": "+++ sem texto de cópia +++",
-    "Could not get paste data: %s": "Não foi possível obter dados de cópia: %s",
+    "Could not get paste data: %s":
-    "QR code": "Código QR",
+        "Could not get paste data: %s"
-    "This website is using an insecure HTTP connection! Please use it only for testing.": "Esse site usa uma conexão HTTP insegura! Use-o apenas para testes.",
+}
-    "For more information <a href=\"%s\">see this FAQ entry</a>.": "Para mais informações <a href=\"%s\">veja esse item do FAQ</a>.",
-    "Your browser may require an HTTPS connection to support the WebCrypto API. Try <a href=\"%s\">switching to HTTPS</a>.": "Seu navegador pode exigir uma conexão HTTPS para dar suporte à API WebCrypto. Tente <a href=\"%s\">mudar para HTTPS</a>.",
-    "Your browser doesn't support WebAssembly, used for zlib compression. You can create uncompressed documents, but can't read compressed ones.": "Seu navagador não suporta WebAssembly, usado para compressão zlib. Você pode criar documentos não compactados, mas não pode lê-los.",
-    "waiting on user to provide a password": "esperando que o usuário digite uma senha",
-    "Could not decrypt data. Did you enter a wrong password? Retry with the button at the top.": "Não foi possível decifrar os dados. Você digitou a senha corretamente? Tente novamente com o botão ao topo.",
-    "Retry": "Tentar Novamente",
-    "Showing raw text…": "Mostrando texto bruto…",
-    "Notice:": "Aviso:",
-    "This link will expire after %s.": "Esse link vai expirar após %s.",
-    "This link can only be accessed once, do not use back or refresh button in your browser.": "Esse link só pode ser acessado uma vez, não utilize o botão de voltar ou atualizar do seu navegador.",
-    "Link:": "Link:",
-    "Recipient may become aware of your timezone, convert time to UTC?": "O recipiente pode ter ciência de seu fuso horário, converter hora para UTC?",
-    "Use Current Timezone": "Usar Fuso Horário Atual",
-    "Convert To UTC": "Converter para UTC",
-    "Close": "Fechar",
-    "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,129 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Потому что неведение - благо",
+        "%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.": "Запись не существует, просрочена или была удалена.",
+    "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] в конфигурационном файле.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Please wait %d seconds between each post.",
+        "Для работы %s требуется php %s или выше. Извините.",
-    "Paste is limited to %s of encrypted data.": "Размер записи ограничен %s зашифрованных данных.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Неверные данные.",
+        "%s необходимо наличие секции [%s] в конфигурационном файле.",
-    "You are unlucky. Try again.": "Вам не повезло. Попробуйте еще раз.",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Ошибка при сохранении комментария. Извините.",
+        ["Пожалуйста ожидайте %d секунду между каждыми записями.", "Пожалуйста ожидайте %d секунды между каждыми записями.", "Пожалуйста ожидайте %d секунд между каждыми записями."],
-    "Error saving paste. Sorry.": "Ошибка при сохранении записи. Извините.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "Неверный ID записи.",
+        "Размер записи ограничен %s зашифрованных данных.",
-    "Paste is not of burn-after-reading type.": "Тип записи не \"Удалить после прочтения\".",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Неверный ключ удаления записи. Запись не удалена.",
+        "Неверные данные.",
-    "Paste was properly deleted.": "Запись была успешно удалена.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "Для работы %s требуется включенный JavaScript. Приносим извинения за неудобства.",
+        "Вам не повезло. Попробуйте еще раз.",
-    "%s requires a modern browser to work.": "Для работы %s требуется более современный браузер.",
+    "Error saving comment. Sorry.":
-    "New": "Новая запись",
+        "Ошибка при сохранении комментария. Извините.",
-    "Send": "Отправить",
+    "Error saving paste. Sorry.":
-    "Clone": "Дублировать",
+        "Ошибка при сохранении записи. Извините.",
-    "Raw text": "Исходный текст",
+    "Invalid paste ID.":
-    "Expires": "Удалить через",
+        "Неверный ID записи.",
-    "Burn after reading": "Удалить после прочтения",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Открыть обсуждение",
+        "Тип записи не \"Удалить после прочтения\".",
-    "Password (recommended)": "Пароль (рекомендуется)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Обсуждение",
+        "Неверный ключ удаления записи. Запись не удалена",
-    "Toggle navigation": "Переключить навигацию",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "Запись была успешно удалена.",
-        "%d секунду",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d секунды",
+        "Для работы %s требуется включенный JavaScript. Приносим извинения за неудобства.",
-        "%d секунд",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "Для работы %s требуется более современный браузер.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "До сих пор используете Internet Explorer? Пожалейте себя, перейдите на более современный браузер:",
-        "%d минуту",
+    "New":
-        "%d минуты",
+        "Новая запись",
-        "%d минут",
+    "Send":
-        "%d minutes (3rd plural)"
+        "Отправить",
-    ],
+    "Clone":
-    "%d hours": [
+        "Дублировать",
-        "%d час",
+    "Raw text":
-        "%d часа",
+        "Исходный текст",
-        "%d часов",
+    "Expires":
-        "%d hours (3rd plural)"
+        "Удалить через",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Удалить после прочтения",
-        "%d день",
+    "Open discussion":
-        "%d дня",
+        "Открыть обсуждение",
-        "%d дней",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "Пароль (рекомендуется)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Обсуждение",
-        "%d неделю",
+    "Toggle navigation":
-        "%d недели",
+        "Переключить навигацию",
-        "%d недель",
+    "%d seconds": ["%d секунду", "%d секунды", "%d секунд"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d минуту", "%d минуты", "%d минут"],
-    ],
+    "%d hours": ["%d час", "%d часа", "%d часов"],
-    "%d months": [
+    "%d days": ["%d день", "%d дня", "%d дней"],
-        "%d месяц",
+    "%d weeks": ["%d неделю", "%d недели", "%d недель"],
-        "%d месяца",
+    "%d months": ["%d месяц", "%d месяца", "%d месяцев"],
-        "%d месяцев",
+    "%d years": ["%d год", "%d года", "%d лет"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "Никогда",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d год",
+        "Примечание: Этот сервис тестовый: Данные могут быть удалены в любое время. Котята умрут, если вы будете злоупотреблять серсисом.",
-        "%d года",
+    "This document will expire in %d seconds.":
-        "%d лет",
+        ["Документ будет удален через %d секунду.", "Документ будет удален через %d секунды.", "Документ будет удален через %d секунд."],
-        "%d years (3rd plural)"
+    "This document will expire in %d minutes.":
-    ],
+        ["Документ будет удален через %d минуту.", "Документ будет удален через %d минуты.", "Документ будет удален через %d минут."],
-    "Never": "Никогда",
+    "This document will expire in %d hours.":
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Примечание: Этот сервис тестовый: Данные могут быть удалены в любое время. Котята умрут, если вы будете злоупотреблять серсисом.",
+        ["Документ будет удален через %d час.", "Документ будет удален через %d часа.", "Документ будет удален через %d часов."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Документ будет удален через %d секунду.",
+        ["Документ будет удален через %d день.", "Документ будет удален через %d дня.", "Документ будет удален через %d дней."],
-        "Документ будет удален через %d секунды.",
+    "This document will expire in %d months.":
-        "Документ будет удален через %d секунд.",
+        ["Документ будет удален через %d месяц.", "Документ будет удален через %d месяца.", "Документ будет удален через %d месяцев."],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "Пожалуйста введите пароль от записи:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Документ будет удален через %d минуту.",
+        "Невозможно расшифровать данные (Неверный ключ?)",
-        "Документ будет удален через %d минуты.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "Документ будет удален через %d минут.",
+        "Невозможно удалить запись, она не была сохранена в режиме удаления после прочтения",
-        "This document will expire in %d minutes (3rd plural)"
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "ТОЛЬКО ДЛЯ ВАШИХ ГЛАЗ. Не закрывайте это окно, это сообщение не может быть показано снова.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Документ будет удален через %d час.",
+        "Невозможно расшифровать комментарий; Неверный ключ?",
-        "Документ будет удален через %d часа.",
+    "Reply":
-        "Документ будет удален через %d часов.",
+        "Ответить",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "Аноним",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Документ будет удален через %d день.",
+        "Аватар, сгенерированный из IP-адреса",
-        "Документ будет удален через %d дня.",
+    "Add comment":
-        "Документ будет удален через %d дней.",
+        "Добавить комментарий",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "Опциональный никнейм…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Документ будет удален через %d месяц.",
+        "Отправить комментарий",
-        "Документ будет удален через %d месяца.",
+    "Sending comment…":
-        "Документ будет удален через %d месяцев.",
+        "Отправка комментария…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "Комментарий опубликован.",
-    "Please enter the password for this paste:": "Пожалуйста, введите пароль от записи:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Невозможно расшифровать данные (Неверный ключ?)",
+        "Не удалось обновить отображение: %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Невозможно удалить запись, она не была сохранена в режиме удаления после прочтения.",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "ТОЛЬКО ДЛЯ ВАШИХ ГЛАЗ. Не закрывайте это окно, это сообщение не может быть показано снова.",
+        "неизвестная причина",
-    "Could not decrypt comment; Wrong key?": "Невозможно расшифровать комментарий; Неверный ключ?",
+    "server error or not responding":
-    "Reply": "Ответить",
+        "ошибка сервера или нет ответа",
-    "Anonymous": "Аноним",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Аватар, сгенерированный из IP-адреса",
+        "Не удалось опубликовать комментарий: %s",
-    "Add comment": "Добавить комментарий",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Опциональный никнейм…",
+        "Пожалуйста двигайте мышкой для большей энтропии…",
-    "Post comment": "Отправить комментарий",
+    "Sending paste…":
-    "Sending comment…": "Отправка комментария…",
+        "Отправка записи…",
-    "Comment posted.": "Комментарий опубликован.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Не удалось обновить отображение: %s",
+        "Ссылка на запись <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Нажмите [Ctrl]+[c] чтобы скопировать ссылку)</span>",
-    "unknown status": "неизвестная причина",
+    "Delete data":
-    "server error or not responding": "ошибка сервера или нет ответа",
+        "Удалить запись",
-    "Could not post comment: %s": "Не удалось опубликовать комментарий: %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Отправка записи…",
+        "Не удалось опубликовать запись: %s",
-    "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>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "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": "Кбайт",
     "MiB": "Мбайт",
@@ -139,43 +139,31 @@
     "Markdown": "Язык разметки",
     "Download attachment": "Скачать прикрепленный файл",
     "Cloned: '%s'": "Дублировано: '%s'",
-    "The cloned file '%s' was attached to this paste.": "Дубликат файла '%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.": "Переменная PATH необходима %s в конце \"%s\". Пожалуйста, обновите переменную PATH в вашем index.php.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Расшифровать",
+        "Переменная PATH необходима %s в конце \"%s\". Пожалуйста обновите переменную PATH в вашем index.php.",
-    "Enter password": "Введите пароль",
+    "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>.",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "Если данное сообщение не исчезает длительное время, посмотрите <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">этот FAQ с информацией о возможном решении проблемы (на английском)</a>.",
     "+++ no paste text +++": "+++ в записи нет текста +++",
-    "Could not get paste data: %s": "Не удалось получить данные записи: %s",
+    "Could not get paste data: %s":
-    "QR code": "QR код",
+        "Не удалось получить данные записи: %s"
-    "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\">прочтите информацию в 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 PrivateBin": "Зашифрованная запиь на PrivateBin",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Посетите эту ссылку чтобы просмотреть запись. Передача ссылки кому либо позволит им получить доступ к записи тоже."
 }

i18n/sl.json

@@ -1,129 +1,129 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>.",
+    "%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": "Ker kar ne veš ne boli.",
+        "%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 < 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.",
+    "Paste does not exist, has expired or has been deleted.":
-    "%s requires php %s or above to work. Sorry.": "Oprosti, %s za delovanje potrebuje vsaj php %s.",
+        "Prilepek ne obstaja, mu je potekla življenjska doba, ali pa je izbrisan.",
-    "%s requires configuration section [%s] to be present in configuration file.": "%s potrebuje sekcijo konfiguracij [%s] v konfiguracijski datoteki.",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "Prosim počakaj vsaj %d sekund pred vsako naslednjo objavo.",
+        "Oprosti, %s za delovanje potrebuje vsaj php %s.",
-    "Paste is limited to %s of encrypted data.": "Velikost prilepka je omejena na %s zakodiranih podatkov.",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "Neveljavni podatki.",
+        "%s potrebuje sekcijo konfiguracij [%s] v konfiguracijski datoteki.",
-    "You are unlucky. Try again.": "Nimaš sreče, poskusi ponovno.",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "Nekaj je šlo narobe pri shranjevanju komentarja. Oprosti.",
+        "Prosim počakaj vsaj %d sekund pred vsako naslednjo objavo.",
-    "Error saving paste. Sorry.": "Nekaj je šlo narobe pri shranjevanju prilepka. Oprosti.",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "Napačen ID prilepka.",
+        "Velikost prilepka je omejena na %s zakodiranih podatkov.",
-    "Paste is not of burn-after-reading type.": "Prilepek ni tipa zažgi-po-branju.",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "Napačen token za izbris. Prilepek ni bil izbrisan..",
+        "Neveljavni podatki.",
-    "Paste was properly deleted.": "Prilepek je uspešno izbrisan.",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "Da %s deluje, moraš vklopiti JavaScript. Oprosti za povročene nevšečnosti.",
+        "Nimaš sreče, poskusi ponovno.",
-    "%s requires a modern browser to work.": "%s za svoje delovanje potrebuje moderen brskalnik.",
+    "Error saving comment. Sorry.":
-    "New": "Nov prilepek",
+        "Nekaj je šlo narobe pri shranjevanju komentarja. Oprosti.",
-    "Send": "Pošlji",
+    "Error saving paste. Sorry.":
-    "Clone": "Kloniraj",
+        "Nekaj je šlo narobe pri shranjevanju prilepka. Oprosti.",
-    "Raw text": "Surov tekst",
+    "Invalid paste ID.":
-    "Expires": "Poteče",
+        "Napačen ID prilepka.",
-    "Burn after reading": "Zažgi (pobriši) po branju",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "Dovoli razpravo",
+        "Prilepek ni tipa zažgi-po-branju.",
-    "Password (recommended)": "Geslo (priporočeno)",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "Razprava",
+        "Napačen token za izbris. Prilepek ni bil izbrisan..",
-    "Toggle navigation": "Preklopi navigacijo",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "Prilepek je uspešno izbrisan.",
-        "%d sekunda",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d sekundi",
+        "Da %s deluje, moraš vklopiti JavaScript. Oprosti za povročene nevšečnosti.",
-        "%d sekunde",
+    "%s requires a modern browser to work.":
-        "%d sekund"
+        "%s za svoje delovanje potrebuje moderen brskalnik.",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "Še vedno uporabljaš Internet Explorer? Naredi si uslugo, preklopi na moderen brskalnik:",
-        "%d minuta",
+    "New":
-        "%d minuti",
+        "Nov prilepek",
-        "%d minute",
+    "Send":
-        "%d minut"
+        "Pošlji",
-    ],
+    "Clone":
-    "%d hours": [
+        "Kloniraj",
-        "%d ura",
+    "Raw text":
-        "%d uri",
+        "Surov tekst",
-        "%d ure",
+    "Expires":
-        "%d ur"
+        "Poteče",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "Zažgi (pobriši) po branju",
-        "%d dan",
+    "Open discussion":
-        "%d dneva",
+        "Dovoli razpravo",
-        "%d dnevi",
+    "Password (recommended)":
-        "%d dni"
+        "Geslo (priporočeno)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "Razprava",
-        "%d teden",
+    "Toggle navigation":
-        "%d tedna",
+        "Preklopi navigacijo",
-        "%d tedni",
+    "%d seconds": ["%d sekunda", "%d sekundi", "%d sekunde", "%d sekund"],
-        "%d tednov"
+    "%d minutes": ["%d minuta", "%d minuti", "%d minute", "%d minut"],
-    ],
+    "%d hours": ["%d ura", "%d uri", "%d ure", "%d ur"],
-    "%d months": [
+    "%d days": ["%d dan", "%d dneva", "%d dnevi", "%d dni"],
-        "%d mesec",
+    "%d weeks": ["%d teden", "%d tedna", "%d tedni", "%d tednov"],
-        "%d meseca",
+    "%d months": ["%d mesec", "%d meseca", "%d meseci", "%d mesecev"],
-        "%d meseci",
+    "%d years": ["%d leto", "%d leti", "%d leta", "%d let"],
-        "%d mesecev"
+    "Never":
-    ],
+        "Nikoli",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d leto",
+        "Ne pozabi: To je testna storitev: Podatki so lahko kadarkoli pobrisani. Mucki bodo umrli, če boš zlorabljala to storitev.",
-        "%d leti",
+    "This document will expire in %d seconds.":
-        "%d leta",
+        ["Ta dokument bo potekel čez %d sekundo.", "Ta dokument bo potekel čez %d sekundi.", "Ta dokument bo potekel čez %d sekunde.", "Ta dokument bo potekel čez %d sekund."],
-        "%d let"
+    "This document will expire in %d minutes.":
-    ],
+        ["Ta dokument bo potekel čez %d minuto.", "Ta dokument bo potekel čez %d minuti.", "Ta dokument bo potekel čez %d minute.", "Ta dokument bo potekel čez %d minut."],
-    "Never": "Nikoli",
+    "This document will expire in %d hours.":
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "Ne pozabi: To je testna storitev: Podatki so lahko kadarkoli pobrisani. Mucki bodo umrli, če boš zlorabljala to storitev.",
+        ["Ta dokument bo potekel čez %d uro.", "Ta dokument bo potekel čez %d uri.", "Ta dokument bo potekel čez %d ure.", "Ta dokument bo potekel čez %d ur."],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "Ta dokument bo potekel čez %d sekundo.",
+        ["Ta dokument bo potekel čez %d dan.", "Ta dokument bo potekel čez %d dni.", "Ta dokument bo potekel čez %d dni.", "Ta dokument bo potekel čez %d dni."],
-        "Ta dokument bo potekel čez %d sekundi.",
+    "This document will expire in %d months.":
-        "Ta dokument bo potekel čez %d sekunde.",
+        ["Ta dokument bo potekel čez %d mesec.", "Ta dokument bo potekel čez %d meseca.", "Ta dokument bo potekel čez %d mesece.", "Ta dokument bo potekel čez %d mesecev."],
-        "Ta dokument bo potekel čez %d sekund."
+    "Please enter the password for this paste:":
-    ],
+        "Prosim vnesi geslo tega prilepka:",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "Ta dokument bo potekel čez %d minuto.",
+        "Nemogoče odkodirati podakte (Imaš napačen ključ?)",
-        "Ta dokument bo potekel čez %d minuti.",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "Ta dokument bo potekel čez %d minute.",
+        "Prilepek je nemogoče izbrisati, ni bil shranjen v načinu \"zažgi po branju\".",
-        "Ta dokument bo potekel čez %d minut."
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "SAMO ZA TVOJE OČI. Ne zapri tega okna (zavihka), to sporočilo ne bo prikazano nikoli več.",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "Ta dokument bo potekel čez %d uro.",
+        "Ne morem odkodirati komentarja: Imaš napačen ključ?",
-        "Ta dokument bo potekel čez %d uri.",
+    "Reply":
-        "Ta dokument bo potekel čez %d ure.",
+        "Odgovori",
-        "Ta dokument bo potekel čez %d ur."
+    "Anonymous":
-    ],
+        "Aninomno",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "Ta dokument bo potekel čez %d dan.",
+        "Anonimen avatar (Vizhash IP naslova)",
-        "Ta dokument bo potekel čez %d dni.",
+    "Add comment":
-        "Ta dokument bo potekel čez %d dni.",
+        "Dodaj komentar",
-        "Ta dokument bo potekel čez %d dni."
+    "Optional nickname…":
-    ],
+        "Uporabniško ime (lahko izpustiš)",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "Ta dokument bo potekel čez %d mesec.",
+        "Objavi komentar",
-        "Ta dokument bo potekel čez %d meseca.",
+    "Sending comment…":
-        "Ta dokument bo potekel čez %d mesece.",
+        "Pošiljam komentar …",
-        "Ta dokument bo potekel čez %d mesecev."
+    "Comment posted.":
-    ],
+        "Komentar poslan.",
-    "Please enter the password for this paste:": "Prosim vnesi geslo tega prilepka:",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "Nemogoče odkodirati podakte (Imaš napačen ključ?)",
+        "Ne morem osvežiti zaslona : %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "Prilepek je nemogoče izbrisati, ni bil shranjen v načinu \"zažgi po branju\".",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "SAMO ZA TVOJE OČI. Ne zapri tega okna (zavihka), to sporočilo ne bo prikazano nikoli več.",
+        "neznan status",
-    "Could not decrypt comment; Wrong key?": "Ne morem odkodirati komentarja: Imaš napačen ključ?",
+    "server error or not responding":
-    "Reply": "Odgovori",
+        "napaka na strežniku, ali pa se strežnik ne odziva",
-    "Anonymous": "Aninomno",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "Anonimen avatar (Vizhash IP naslova)",
+        "Komentarja ni bilo mogoče objaviti : %s",
-    "Add comment": "Dodaj komentar",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "Uporabniško ime (lahko izpustiš)",
+        "Prosim premakni svojo miško za več entropije…",
-    "Post comment": "Objavi komentar",
+    "Sending paste…":
-    "Sending comment…": "Pošiljam komentar …",
+        "Pošiljam prilepek…",
-    "Comment posted.": "Komentar poslan.",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "Ne morem osvežiti zaslona : %s",
+        "Tvoj prilepek je dostopen na naslovu: <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Pritisni [Ctrl]+[c] ali [Cmd] + [c] in skopiraj)</span>",
-    "unknown status": "neznan status",
+    "Delete data":
-    "server error or not responding": "napaka na strežniku, ali pa se strežnik ne odziva",
+        "Izbriši podatke",
-    "Could not post comment: %s": "Komentarja ni bilo mogoče objaviti : %s",
+    "Could not create paste: %s":
-    "Sending paste…": "Pošiljam prilepek…",
+        "Ne morem ustvariti prilepka: %s",
-    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>": "Tvoj prilepek je dostopen na naslovu: <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Pritisni [Ctrl]+[c] ali [Cmd] + [c] in skopiraj)</span>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "Izbriši podatke",
+        "Ne morem odkodirati prilepka: V URL-ju manjka ključ (A si uporabil krajšalnik URL-jev, ki odstrani del URL-ja?)",
-    "Could not create paste: %s": "Ne morem ustvariti prilepka: %s",
-    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)": "Ne morem odkodirati prilepka: V URL-ju manjka ključ (A si uporabil krajšalnik URL-jev, ki odstrani del URL-ja?)",
     "B": "o",
     "KiB": "KB",
     "MiB": "MB",
@@ -144,38 +144,25 @@
     "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": "Odstrani priponko",
-    "Your browser does not support uploading encrypted files. Please use a newer browser.": "Tvoj brskalnik ne omogoča nalaganje zakodiranih datotek. Prosim uporabi novejši brskalnik.",
+    "Your browser does not support uploading encrypted files. Please use a newer browser.":
+        "Tvoj brskalnik ne omogoča nalaganje zakodiranih datotek. Prosim uporabi novejši brskalnik.",
     "Invalid attachment.": "Neveljavna priponka.",
     "Options": "Možnosti",
     "Shorten URL": "Skrajšajte URL",
     "Editor": "Uredi",
     "Preview": "Predogled",
-    "%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.",
+    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
-    "Decrypt": "Decrypt",
+        "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
-    "Enter password": "Prosim vnesi geslo",
+    "Decrypt":
+        "Decrypt",
+    "Enter password":
+        "Prosim vnesi geslo",
     "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> (in English).",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a> (in English).",
     "+++ no paste text +++": "+++ no paste text +++",
-    "Could not get paste data: %s": "Could not get paste data: %s",
+    "Could not get paste data: %s":
-    "QR code": "QR code",
+        "Could not get paste data: %s"
-    "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/uk.json

@@ -1,181 +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 <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.": "Please wait %d seconds between each post.",
-    "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 допису.",
-    "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.": "Для роботи %s потрібен увімкнутий JavaScript. Вибачте.",
-    "%s requires a modern browser to work.": "Для роботи %s потрібен більш сучасний переглядач.",
-    "New": "Новий допис",
-    "Send": "Відправити",
-    "Clone": "Дублювати",
-    "Raw text": "Початковий текст",
-    "Expires": "Вилучити через",
-    "Burn after reading": "Знищити після прочитання",
-    "Open discussion": "Відкрити обговорення",
-    "Password (recommended)": "Пароль (рекомендується)",
-    "Discussion": "Обговорення",
-    "Toggle navigation": "Перемкнути навігацію",
-    "%d seconds": [
-        "%d секунду",
-        "%d секунди",
-        "%d секунд",
-        "%d seconds (3rd plural)"
-    ],
-    "%d minutes": [
-        "%d хвилину",
-        "%d хвилини",
-        "%d хвилин",
-        "%d minutes (3rd plural)"
-    ],
-    "%d hours": [
-        "%d годину",
-        "%d години",
-        "%d годин",
-        "%d hours (3rd plural)"
-    ],
-    "%d days": [
-        "%d день",
-        "%d дні",
-        "%d днів",
-        "%d days (3rd plural)"
-    ],
-    "%d weeks": [
-        "%d тиждень",
-        "%d тижні",
-        "%d тижнів",
-        "%d weeks (3rd plural)"
-    ],
-    "%d months": [
-        "%d місяць",
-        "%d місяці",
-        "%d місяців",
-        "%d months (3rd plural)"
-    ],
-    "%d years": [
-        "%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.": "Примітка: Це тестовий сервіс: Дані можуть бути вилучені в будь який момент. Кошенята помруть, якщо ви будете зловживати сервісом.",
-    "This document will expire in %d seconds.": [
-        "Документ буде вилучений через %d секунду.",
-        "Документ буде вилучений через %d секунди.",
-        "Документ буде вилучений через %d секунд.",
-        "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 (3rd plural)"
-    ],
-    "This document will expire in %d hours.": [
-        "Документ буде вилучений через %d годину.",
-        "Документ буде вилучений через %d години.",
-        "Документ буде вилучений через %d годин.",
-        "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 (3rd plural)"
-    ],
-    "This document will expire in %d months.": [
-        "Документ буде вилучений через %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?)": "Неможливо розшифрувати дані (Неправильний  ключ?)",
-    "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": "Кбайт",
-    "MiB": "Мбайт",
-    "GiB": "Гбайт",
-    "TiB": "Тбайт",
-    "PiB": "Пбайт",
-    "EiB": "Ебайт",
-    "ZiB": "Збайт",
-    "YiB": "Йбайт",
-    "Format": "Формат",
-    "Plain Text": "Звичайний текст",
-    "Source Code": "Джерельний код",
-    "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": "також можна перенести файл у вікно переглядача чи вставити зображення з буфера",
-    "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.": "Ваш переглядач не підтримує відправлення зашифрованих файлів. Використовуйте сучасніший переглядач.",
-    "Invalid attachment.": "Невідоме вкладення.",
-    "Options": "Опції",
-    "Shorten URL": "Коротке посилання",
-    "Editor": "Редактор",
-    "Preview": "Передогляд",
-    "%s requires the PATH to end in a \"%s\". Please update the PATH in your index.php.": "Змінна PATH необхідна %s в конці \"%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\">цей FAQ з інформацією про можливе вирішення проблеми</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\">дивіться інформацію в 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": "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,181 +1,159 @@
 {
     "PrivateBin": "PrivateBin",
-    "%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>。",
+    "%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": "因为无知是福",
+        "%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.": "粘贴内容不存在，已过期或已被删除。",
+    "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] 部分。",
+    "%s requires php %s or above to work. Sorry.":
-    "Please wait %d seconds between each post.": "每 %d 秒只能粘贴一次。",
+        "%s需要工作于PHP %s及以上版本，抱歉。",
-    "Paste is limited to %s of encrypted data.": "粘贴受限于 %s 加密数据。",
+    "%s requires configuration section [%s] to be present in configuration file.":
-    "Invalid data.": "无效的数据。",
+        "%s需要设置配置文件中 [%s] 的部分。",
-    "You are unlucky. Try again.": "请再试一次。",
+    "Please wait %d seconds between each post.":
-    "Error saving comment. Sorry.": "保存评论时出现错误，抱歉。",
+        "每 %d 秒只能粘贴一次。",
-    "Error saving paste. Sorry.": "保存粘贴内容时出现错误，抱歉。",
+    "Paste is limited to %s of encrypted data.":
-    "Invalid paste ID.": "无效的ID。",
+        "粘贴受限于 %s 加密数据。",
-    "Paste is not of burn-after-reading type.": "粘贴内容不是阅后即焚类型。",
+    "Invalid data.":
-    "Wrong deletion token. Paste was not deleted.": "错误的删除token，粘贴内容没有被删除。",
+        "无效的数据。",
-    "Paste was properly deleted.": "粘贴内容已被正确删除。",
+    "You are unlucky. Try again.":
-    "JavaScript is required for %s to work. Sorry for the inconvenience.": "%s需要JavaScript来进行加解密。 给你带来的不便敬请谅解。",
+        "请再试一次。",
-    "%s requires a modern browser to work.": "%s需要在现代浏览器上工作。",
+    "Error saving comment. Sorry.":
-    "New": "新建",
+        "存储评论时出现错误，抱歉。",
-    "Send": "送出",
+    "Error saving paste. Sorry.":
-    "Clone": "复制",
+        "存储粘贴时出现错误，抱歉。",
-    "Raw text": "纯文本",
+    "Invalid paste ID.":
-    "Expires": "有效期",
+        "无效的ID。",
-    "Burn after reading": "阅后即焚",
+    "Paste is not of burn-after-reading type.":
-    "Open discussion": "开放讨论",
+        "粘贴不是阅后即焚类型。",
-    "Password (recommended)": "密码（推荐）",
+    "Wrong deletion token. Paste was not deleted.":
-    "Discussion": "讨论",
+        "错误的删除token，粘贴没有被删除。",
-    "Toggle navigation": "切换导航栏",
+    "Paste was properly deleted.":
-    "%d seconds": [
+        "粘贴已被正确删除。",
-        "%d 秒",
+    "JavaScript is required for %s to work. Sorry for the inconvenience.":
-        "%d 秒",
+        "%s需要JavaScript来进行加解密。 给你带来的不便敬请谅解。",
-        "%d seconds (2nd plural)",
+    "%s requires a modern browser to work.":
-        "%d seconds (3rd plural)"
+        "%s需要工作于现代化的浏览器。",
-    ],
+    "Still using Internet Explorer? Do yourself a favor, switch to a modern browser:":
-    "%d minutes": [
+        "还在使用Internet Explorer？帮自己个忙，换上一个现代化的浏览器：",
-        "%d 分钟",
+    "New":
-        "%d 分钟",
+        "新建",
-        "%d minutes (2nd plural)",
+    "Send":
-        "%d minutes (3rd plural)"
+        "送出",
-    ],
+    "Clone":
-    "%d hours": [
+        "克隆",
-        "%d 小时",
+    "Raw text":
-        "%d 小时",
+        "纯文本",
-        "%d hours (2nd plural)",
+    "Expires":
-        "%d hours (3rd plural)"
+        "有效期",
-    ],
+    "Burn after reading":
-    "%d days": [
+        "阅后即焚",
-        "%d 天",
+    "Open discussion":
-        "%d 天",
+        "开放讨论",
-        "%d days (2nd plural)",
+    "Password (recommended)":
-        "%d days (3rd plural)"
+        "密码 (推荐)",
-    ],
+    "Discussion":
-    "%d weeks": [
+        "讨论",
-        "%d 周",
+    "Toggle navigation":
-        "%d 周",
+        "切换导航栏",
-        "%d weeks (2nd plural)",
+    "%d seconds": ["%d 秒", "%d 秒"],
-        "%d weeks (3rd plural)"
+    "%d minutes": ["%d 分钟", "%d 分钟"],
-    ],
+    "%d hours": ["%d 小时", "%d 小时"],
-    "%d months": [
+    "%d days": ["%d 天", "%d 天"],
-        "%d 个月",
+    "%d weeks": ["%d 周", "%d 周"],
-        "%d 个月",
+    "%d months": ["%d 个月", "%d 个月"],
-        "%d months (2nd plural)",
+    "%d years": ["%d 年", "%d 年"],
-        "%d months (3rd plural)"
+    "Never":
-    ],
+        "永不过期",
-    "%d years": [
+    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.":
-        "%d 年",
+        "注意：这是一个测试服务，数据随时可能被删除。如果你滥用这个服务的话，小猫咪会死的。",
-        "%d 年",
+    "This document will expire in %d seconds.":
-        "%d years (2nd plural)",
+        ["这份文档将在一秒后过期。", "这份文档将在 %d 秒后过期"],
-        "%d years (3rd plural)"
+    "This document will expire in %d minutes.":
-    ],
+        ["这份文档将在一分钟后过期。", "这份文档将在 %d 分钟后过期。"],
-    "Never": "永不过期",
+    "This document will expire in %d hours.":
-    "Note: This is a test service: Data may be deleted anytime. Kittens will die if you abuse this service.": "注意：这是一个测试服务，数据随时可能被删除。如果你滥用这个服务的话，小猫咪会死的。",
+        ["这份文档将在一小时后过期。", "这份文档将在 %d 小时后过期。"],
-    "This document will expire in %d seconds.": [
+    "This document will expire in %d days.":
-        "这份文档将在一秒后过期。",
+        ["这份文档将在一天后过期。", "这份文档将在 %d 天后过期。"],
-        "这份文档将在 %d 秒后过期",
+    "This document will expire in %d months.":
-        "This document will expire in %d seconds (2nd plural)",
+        ["这份文档将在一个月后过期。", "这份文档将在 %d 个月后过期。"],
-        "This document will expire in %d seconds (3rd plural)"
+    "Please enter the password for this paste:":
-    ],
+        "请输入这份粘贴的密码：",
-    "This document will expire in %d minutes.": [
+    "Could not decrypt data (Wrong key?)":
-        "这份文档将在一分钟后过期。",
+        "无法解密数据 (密钥错误？)",
-        "这份文档将在 %d 分钟后过期。",
+    "Could not delete the paste, it was not stored in burn after reading mode.":
-        "This document will expire in %d minutes (2nd plural)",
+        "无法删除此粘贴，它没有以阅后即焚模式存储。",
-        "This document will expire in %d minutes (3rd plural)"
+    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.":
-    ],
+        "看！仔！细！了！ 不要关闭窗口，否则你再也见不到这条消息了。",
-    "This document will expire in %d hours.": [
+    "Could not decrypt comment; Wrong key?":
-        "这份文档将在一小时后过期。",
+        "无法解密评论; 密钥错误？",
-        "这份文档将在 %d 小时后过期。",
+    "Reply":
-        "This document will expire in %d hours (2nd plural)",
+        "回复",
-        "This document will expire in %d hours (3rd plural)"
+    "Anonymous":
-    ],
+        "匿名",
-    "This document will expire in %d days.": [
+    "Avatar generated from IP address":
-        "这份文档将在一天后过期。",
+        "由IP生成的头像",
-        "这份文档将在 %d 天后过期。",
+    "Add comment":
-        "This document will expire in %d days (2nd plural)",
+        "添加评论",
-        "This document will expire in %d days (3rd plural)"
+    "Optional nickname…":
-    ],
+        "可选昵称…",
-    "This document will expire in %d months.": [
+    "Post comment":
-        "这份文档将在一个月后过期。",
+        "评论",
-        "这份文档将在 %d 个月后过期。",
+    "Sending comment…":
-        "This document will expire in %d months (2nd plural)",
+        "评论发送中…",
-        "This document will expire in %d months (3rd plural)"
+    "Comment posted.":
-    ],
+        "评论已发送。",
-    "Please enter the password for this paste:": "请输入这份粘贴内容的密码：",
+    "Could not refresh display: %s":
-    "Could not decrypt data (Wrong key?)": "无法解密数据（密钥错误？）",
+        "无法刷新显示： %s",
-    "Could not delete the paste, it was not stored in burn after reading mode.": "无法删除此粘贴内容，它没有以阅后即焚模式保存。",
+    "unknown status":
-    "FOR YOUR EYES ONLY. Don't close this window, this message can't be displayed again.": "看！仔！细！了！不要关闭窗口，否则你再也见不到这条消息了。",
+        "未知状态",
-    "Could not decrypt comment; Wrong key?": "无法解密评论; 密钥错误？",
+    "server error or not responding":
-    "Reply": "回复",
+        "服务器错误或无回应",
-    "Anonymous": "匿名",
+    "Could not post comment: %s":
-    "Avatar generated from IP address": "由IP生成的头像",
+        "无法发送评论： %s",
-    "Add comment": "添加评论",
+    "Please move your mouse for more entropy…":
-    "Optional nickname…": "可选昵称…",
+        "请移动鼠标增加随机性…",
-    "Post comment": "评论",
+    "Sending paste…":
-    "Sending comment…": "评论发送中…",
+        "粘贴提交中…",
-    "Comment posted.": "评论已发送。",
+    "Your paste is <a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(Hit [Ctrl]+[c] to copy)</span>":
-    "Could not refresh display: %s": "无法刷新显示：%s",
+        "您的粘贴的链接是<a id=\"pasteurl\" href=\"%s\">%s</a> <span id=\"copyhint\">(按下 [Ctrl]+[c] 以复制)</span>",
-    "unknown status": "未知状态",
+    "Delete data":
-    "server error or not responding": "服务器错误或无回应",
+        "删除数据",
-    "Could not post comment: %s": "无法发送评论： %s",
+    "Could not create paste: %s":
-    "Sending paste…": "粘贴内容提交中…",
+        "无法创建粘贴： %s",
-    "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>",
+    "Cannot decrypt paste: Decryption key missing in URL (Did you use a redirector or an URL shortener which strips part of the URL?)":
-    "Delete data": "删除数据",
+        "无法解密粘贴： URL中缺失解密密钥 (是否使用了重定向或者短链接导致密钥丢失？)",
-    "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中缺失解密密钥（是否使用了重定向或者短链接导致密钥丢失？）",
-    "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'",
+    "Cloned: '%s'": "克隆: '%s'",
-    "The cloned file '%s' was attached to this paste.": "副本 '%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": "拖放文件或从剪贴板粘贴图片",
+    "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.": "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.":
-    "Decrypt": "解密",
+        "%s 的 PATH 变量必须结束于 \"%s\"。 请修改你的 index.php 中的 PATH 变量。",
-    "Enter password": "输入密码",
+    "Decrypt":
+        "解密",
+    "Enter password":
+        "输入密码",
     "Loading…": "载入中…",
     "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>.": "如果这个消息一直存在，请参考 <a href=\"%s\">这里的 FAQ （英文版）</a>进行故障排除。",
+    "In case this message never disappears please have a look at <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">this FAQ for information to troubleshoot</a>.":
+        "如果这个消息一直不消失，请参考 <a href=\"https://github.com/PrivateBin/PrivateBin/wiki/FAQ#why-does-not-the-loading-message-go-away\">这里的 FAQ 进行故障排除</a> (英文版)。",
     "+++ no paste text +++": "+++ 没有粘贴内容 +++",
-    "Could not get paste data: %s": "无法获取粘贴数据：%s",
+    "Could not get paste data: %s":
-    "QR code": "二维码",
+        "Could not get paste data: %s"
-    "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.": "无法解密数据。 您输入了错误的密码吗？ 点顶部的按钮重试。",
-    "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 PrivateBin": "PrivateBin上的加密笔记",
-    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "访问这个链接来查看该笔记。 将这个URL发送给任何人即可允许其访问该笔记。"
 }

img/browserstack.svg

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 490.1 105.6" style="enable-background:new 0 0 490.1 105.6;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#F4B960;}
-	.st1{fill:#E66F32;}
-	.st2{fill:#E43C41;}
-	.st3{fill:#BDD041;}
-	.st4{fill:#6DB54C;}
-	.st5{fill:#AEDAE6;}
-	.st6{fill:#56B8DE;}
-	.st7{fill:#00B1D5;}
-	.st8{fill:url(#SVGID_1_);}
-	.st9{fill:#221F1F;}
-	.st10{fill:#FFFFFF;}
-	.st11{fill:#000111;}
-</style>
-<title>Browserstack-logo-white</title>
-<circle class="st0" cx="52.8" cy="52.8" r="52.8"/>
-<circle class="st1" cx="47.5" cy="47.5" r="47.5"/>
-<circle class="st2" cx="53.8" cy="41.1" r="41.1"/>
-<circle class="st3" cx="57.1" cy="44.4" r="37.8"/>
-<circle class="st4" cx="54.3" cy="47.2" r="35.1"/>
-<circle class="st5" cx="48.8" cy="41.7" r="29.5"/>
-<circle class="st6" cx="53.6" cy="36.8" r="24.7"/>
-<circle class="st7" cx="56.6" cy="39.9" r="21.7"/>
-<radialGradient id="SVGID_1_" cx="53.45" cy="63.02" r="18.57" gradientTransform="matrix(1 0 0 -1 0 106)" gradientUnits="userSpaceOnUse">
-	<stop  offset="0" style="stop-color:#797979"/>
-	<stop  offset="1" style="stop-color:#4C4C4C"/>
-</radialGradient>
-<circle class="st8" cx="53.5" cy="43" r="18.6"/>
-<circle class="st9" cx="53.5" cy="43" r="18.6"/>
-<ellipse transform="matrix(0.4094 -0.9123 0.9123 0.4094 2.8913 76.9251)" class="st10" cx="60.9" cy="36.2" rx="5.7" ry="3.7"/>
-<path class="st11" d="M122.5,32.6c0-0.3,0.3-0.6,0.6-0.6c0,0,0,0,0.1,0h16.6c9.5,0,13.9,4.4,13.9,11c0.2,3.7-1.8,7.2-5.2,8.8v0.1
-	c3.7,1.5,6.1,5.2,6,9.3c0,8.2-5.6,12.2-15.4,12.2h-16c-0.3,0-0.6-0.2-0.7-0.5c0,0,0,0,0-0.1L122.5,32.6L122.5,32.6z M139.6,49.1
-	c3.9,0,6.4-2.2,6.4-5.4s-2.4-5.5-6.4-5.5h-8.9c-0.2,0-0.4,0.1-0.4,0.3c0,0,0,0,0,0.1v10.2c0,0.2,0.1,0.3,0.3,0.4c0,0,0,0,0.1,0
-	H139.6L139.6,49.1z M130.6,66.9h9.3c4.3,0,6.8-2.3,6.8-5.8s-2.4-5.7-6.7-5.7h-9.3c-0.2,0-0.4,0.1-0.4,0.3c0,0,0,0,0,0.1v10.7
-	C130.3,66.8,130.4,66.9,130.6,66.9C130.6,66.9,130.6,66.9,130.6,66.9L130.6,66.9z"/>
-<path class="st11" d="M159.9,73.3c-0.3,0-0.6-0.2-0.7-0.5c0,0,0,0,0-0.1V44.6c0-0.3,0.3-0.6,0.6-0.6c0,0,0,0,0.1,0h6
-	c0.3,0,0.6,0.2,0.7,0.5c0,0,0,0,0,0.1v2.5h0.1c1.5-2.2,4.2-3.8,8.2-3.8c2.4,0,4.8,0.8,6.6,2.4c0.3,0.3,0.4,0.5,0.1,0.8l-3.5,4.1
-	c-0.2,0.3-0.6,0.4-0.9,0.2c0,0,0,0-0.1,0c-1.4-0.9-3-1.4-4.7-1.4c-4.1,0-6,2.7-6,7.4v15.9c0,0.3-0.3,0.6-0.6,0.6c0,0,0,0-0.1,0
-	H159.9L159.9,73.3z"/>
-<path class="st11" d="M182.9,65.8c-0.8-2.3-1.1-4.8-1.1-7.2c-0.1-2.5,0.3-4.9,1.1-7.2c1.8-5.1,6.6-8.1,13.1-8.1s11.2,3,13,8.1
-	c0.8,2.3,1.1,4.8,1.1,7.2c0.1,2.5-0.3,4.9-1.1,7.2c-1.8,5.1-6.6,8.1-13,8.1S184.7,71,182.9,65.8z M201.9,64c0.5-1.7,0.8-3.6,0.7-5.4
-	c0.1-1.8-0.1-3.7-0.7-5.4c-0.9-2.5-3.3-4-5.9-3.8c-2.6-0.2-5.1,1.4-6,3.8c-0.5,1.8-0.8,3.6-0.7,5.4c-0.1,1.8,0.1,3.7,0.7,5.4
-	c0.9,2.5,3.4,4,6,3.8C198.6,68,201,66.5,201.9,64L201.9,64z"/>
-<path class="st11" d="M241.9,73.3c-0.4,0-0.7-0.3-0.8-0.6L235,53.9h-0.1l-6.2,18.7c-0.1,0.4-0.4,0.6-0.8,0.6h-5.4
-	c-0.4,0-0.7-0.3-0.8-0.6l-10-28.1c-0.1-0.2,0-0.5,0.2-0.6c0.1,0,0.2-0.1,0.3,0h6.3c0.4,0,0.8,0.2,0.9,0.6l6.1,19.3h0.1l6-19.3
-	c0.1-0.4,0.5-0.6,0.9-0.6h4.7c0.4,0,0.7,0.2,0.9,0.6l6.4,19.3h0.1l5.8-19.3c0.1-0.4,0.5-0.7,0.9-0.6h6.3c0.2-0.1,0.5,0.1,0.5,0.3
-	c0,0.1,0,0.2,0,0.3l-10,28.1c-0.1,0.4-0.4,0.6-0.8,0.6L241.9,73.3L241.9,73.3z"/>
-<path class="st11" d="M259.3,69.3c-0.2-0.2-0.3-0.6-0.1-0.8c0,0,0,0,0.1-0.1l3.7-3.6c0.3-0.2,0.7-0.2,0.9,0c2.6,2.1,5.9,3.3,9.3,3.3
-	c3.9,0,5.9-1.5,5.9-3.5c0-1.8-1.1-2.9-5.2-3.2l-3.4-0.3c-6.4-0.6-9.7-3.6-9.7-8.6c0-5.7,4.4-9.2,12.3-9.2c4.2-0.1,8.4,1.2,11.9,3.6
-	c0.3,0.2,0.3,0.5,0.2,0.8c0,0,0,0,0,0.1l-3.2,3.6c-0.2,0.3-0.6,0.3-0.9,0.1c-2.5-1.5-5.4-2.4-8.3-2.4c-3.1,0-4.8,1.3-4.8,3
-	s1.1,2.7,5.2,3.1l3.4,0.3c6.6,0.6,9.8,3.8,9.8,8.6c0,5.8-4.6,9.9-13.3,9.9C268,74,263.2,72.4,259.3,69.3z"/>
-<path class="st11" d="M291.2,65.8c-0.8-2.3-1.2-4.7-1.1-7.2c-0.1-2.5,0.3-4.9,1-7.2c1.8-5.1,6.6-8.1,12.9-8.1c6.5,0,11.2,3.1,13,8.1
-	c0.7,2.1,1,4.1,1,8.8c0,0.3-0.3,0.6-0.6,0.6c0,0-0.1,0-0.1,0h-19.5c-0.2,0-0.4,0.1-0.4,0.3c0,0,0,0,0,0.1c0,0.8,0.2,1.5,0.5,2.2
-	c1,2.9,3.5,4.4,7.1,4.4c2.7,0.1,5.4-0.9,7.4-2.8c0.2-0.3,0.7-0.4,1-0.1c0,0,0,0,0,0l3.9,3.2c0.2,0.1,0.3,0.5,0.2,0.7
-	c0,0.1-0.1,0.1-0.1,0.1c-2.7,2.9-7.2,5-13,5C297.8,73.9,293,70.9,291.2,65.8z M310.4,52.8c-0.9-2.4-3.2-3.8-6.2-3.8
-	s-5.4,1.4-6.2,3.8c-0.3,0.8-0.4,1.6-0.4,2.5c0,0.2,0.1,0.3,0.3,0.4c0,0,0,0,0.1,0h12.4c0.2,0,0.4-0.1,0.4-0.3c0,0,0,0,0-0.1
-	C310.8,54.5,310.6,53.6,310.4,52.8L310.4,52.8z"/>
-<path class="st11" d="M323.6,73.3c-0.3,0-0.6-0.2-0.7-0.5c0,0,0,0,0-0.1V44.6c0-0.3,0.3-0.6,0.6-0.6c0,0,0,0,0.1,0h6
-	c0.3,0,0.6,0.2,0.7,0.5c0,0,0,0,0,0.1v2.5h0.1c1.5-2.2,4.2-3.8,8.2-3.8c2.4,0,4.8,0.8,6.6,2.4c0.3,0.3,0.4,0.5,0.1,0.8l-3.5,4.1
-	c-0.2,0.3-0.6,0.4-0.9,0.2c0,0,0,0-0.1,0c-1.4-0.9-3-1.4-4.7-1.4c-4.1,0-6,2.7-6,7.4v15.9c0,0.3-0.3,0.6-0.6,0.6c0,0,0,0-0.1,0
-	H323.6L323.6,73.3z"/>
-<path class="st11" d="M346.5,68.5c-0.3-0.2-0.4-0.6-0.2-0.9c0,0,0,0,0,0l4.1-4.4c0.2-0.3,0.6-0.3,0.9-0.1c0,0,0,0,0,0
-	c3.5,2.7,7.7,4.2,12.1,4.4c5.3,0,8.4-2.5,8.4-6c0-3-2-4.9-8.1-5.7l-2.4-0.3c-8.6-1.1-13.5-4.9-13.5-11.8c0-7.5,5.9-12.4,15.1-12.4
-	c5.1-0.1,10.1,1.4,14.5,4.2c0.3,0.1,0.4,0.4,0.2,0.7c0,0.1-0.1,0.1-0.1,0.2l-3.1,4.5c-0.2,0.3-0.6,0.4-0.9,0.2
-	c-3.2-2.1-6.9-3.2-10.7-3.2c-4.5,0-7,2.3-7,5.5c0,2.9,2.2,4.8,8.2,5.6l2.4,0.3c8.6,1.1,13.3,4.9,13.3,12c0,7.3-5.7,12.8-16.8,12.8
-	C356.3,73.9,350,71.5,346.5,68.5z"/>
-<path class="st11" d="M393.3,73.8c-6.4,0-8.8-2.9-8.8-8.6V49.8c0-0.2-0.1-0.3-0.3-0.4c0,0,0,0-0.1,0H382c-0.3,0-0.6-0.2-0.7-0.5
-	c0,0,0,0,0-0.1v-4.1c0-0.3,0.3-0.6,0.6-0.6c0,0,0,0,0.1,0h2.1c0.2,0,0.4-0.1,0.4-0.3c0,0,0,0,0-0.1v-8c0-0.3,0.3-0.6,0.6-0.6
-	c0,0,0,0,0.1,0h6c0.3,0,0.6,0.2,0.7,0.5c0,0,0,0,0,0.1v8c0,0.2,0.1,0.3,0.3,0.4c0,0,0,0,0.1,0h4.2c0.3,0,0.6,0.2,0.7,0.5
-	c0,0,0,0,0,0.1v4.1c0,0.3-0.3,0.6-0.6,0.6c0,0,0,0-0.1,0h-4.2c-0.2,0-0.4,0.1-0.4,0.3c0,0,0,0,0,0.1V65c0,2.1,0.9,2.7,3,2.7h1.6
-	c0.3,0,0.6,0.2,0.7,0.5c0,0,0,0,0,0.1v4.9c0,0.3-0.3,0.6-0.6,0.6c0,0,0,0-0.1,0L393.3,73.8L393.3,73.8z"/>
-<path class="st11" d="M421.2,73.3c-0.3,0-0.6-0.2-0.7-0.5c0,0,0,0,0-0.1v-2.1h0c-1.5,2-4.5,3.4-8.9,3.4c-5.8,0-10.6-2.8-10.6-8.9
-	c0-6.4,4.9-9.3,12.7-9.3h6.4c0.2,0,0.4-0.1,0.4-0.3c0,0,0,0,0-0.1v-1.4c0-3.3-1.7-4.9-7-4.9c-2.6-0.1-5.1,0.6-7.2,2
-	c-0.3,0.2-0.7,0.2-0.9-0.1c0,0,0,0,0-0.1l-2.4-4c-0.2-0.2-0.1-0.6,0.1-0.8c0,0,0,0,0,0c2.6-1.7,6-2.9,11.2-2.9
-	c9.6,0,13.2,3,13.2,10.2v19.1c0,0.3-0.3,0.6-0.6,0.6c0,0,0,0-0.1,0H421.2L421.2,73.3z M420.4,63.4v-2.2c0-0.2-0.1-0.3-0.3-0.4
-	c0,0,0,0-0.1,0h-5.2c-4.7,0-6.8,1.2-6.8,3.9c0,2.4,1.9,3.6,5.5,3.6C417.9,68.4,420.4,66.8,420.4,63.4L420.4,63.4z"/>
-<path class="st11" d="M433.1,65.8c-0.7-2.3-1.1-4.8-1-7.2c-0.1-2.4,0.3-4.9,1-7.2c1.8-5.2,6.7-8.1,13.1-8.1c4.2-0.2,8.2,1.5,11,4.6
-	c0.2,0.2,0.2,0.6,0,0.8c0,0,0,0-0.1,0.1l-4.1,3.3c-0.3,0.2-0.7,0.2-0.9-0.1c0,0,0,0,0-0.1c-1.5-1.7-3.6-2.6-5.9-2.5
-	c-2.8,0-5,1.3-5.9,3.8c-0.5,1.8-0.8,3.6-0.7,5.4c-0.1,1.8,0.1,3.7,0.7,5.5c0.9,2.5,3.1,3.8,5.9,3.8c2.2,0.1,4.4-0.9,5.9-2.6
-	c0.2-0.3,0.6-0.3,0.9-0.1c0,0,0,0,0,0l4.1,3.3c0.3,0.2,0.3,0.5,0.1,0.8c0,0,0,0-0.1,0.1c-2.9,3-6.9,4.6-11,4.5
-	C439.8,73.9,435,71.1,433.1,65.8z"/>
-<path class="st11" d="M482.8,73.3c-0.4,0-0.8-0.2-1-0.6l-8-12.3l-4.3,4.6v7.7c0,0.3-0.3,0.6-0.6,0.6c0,0,0,0-0.1,0h-6
-	c-0.3,0-0.6-0.2-0.7-0.5c0,0,0,0,0-0.1V32.6c0-0.3,0.3-0.6,0.6-0.6c0,0,0,0,0.1,0h6c0.3,0,0.6,0.2,0.7,0.5c0,0,0,0,0,0.1v23.8
-	l10.8-11.8c0.3-0.4,0.8-0.6,1.2-0.6h6.7c0.2,0,0.4,0.1,0.4,0.3c0,0.1,0,0.3-0.1,0.3l-10.1,10.7L490,72.7c0.1,0.2,0.1,0.4,0,0.5
-	c-0.1,0.1-0.2,0.1-0.3,0.1H482.8L482.8,73.3z"/>
-</svg>

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.3.4
+ * @version   1.2.3
  */
 
 // change this, if your php files and data is outside of your webservers document root

js/.nycrc.yml

@@ -1,9 +0,0 @@
----
-include:
-  - legacy.js
-  - privatebin.js
-reporter:
-  - text
-  - html
-report-dir: ../tst/log/js-coverage-report
-temp-dir: /tmp/nyc-output

js/base-x-3.0.7.js

@@ -1,120 +0,0 @@
-'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)
-  BASE_MAP.fill(255)
-  for (var i = 0; i < ALPHABET.length; i++) {
-    var x = ALPHABET.charAt(i)
-    var xc = x.charCodeAt(0)
-    if (BASE_MAP[xc] !== 255) { throw new TypeError(x + ' is ambiguous') }
-    BASE_MAP[xc] = i
-  }
-  var BASE = ALPHABET.length
-  var LEADER = ALPHABET.charAt(0)
-  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.length === 0) { return '' }
-        // Skip & count leading zeroes.
-    var zeroes = 0
-    var length = 0
-    var pbegin = 0
-    var pend = source.length
-    while (pbegin !== pend && source[pbegin] === 0) {
-      pbegin++
-      zeroes++
-    }
-        // Allocate enough space in big-endian base58 representation.
-    var size = ((pend - pbegin) * iFACTOR + 1) >>> 0
-    var b58 = new Uint8Array(size)
-        // Process the bytes.
-    while (pbegin !== pend) {
-      var carry = source[pbegin]
-            // Apply "b58 = b58 * 256 + ch".
-      var i = 0
-      for (var it1 = size - 1; (carry !== 0 || i < length) && (it1 !== -1); it1--, i++) {
-        carry += (256 * b58[it1]) >>> 0
-        b58[it1] = (carry % BASE) >>> 0
-        carry = (carry / BASE) >>> 0
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      length = i
-      pbegin++
-    }
-        // Skip leading zeroes in base58 result.
-    var it2 = size - length
-    while (it2 !== size && b58[it2] === 0) {
-      it2++
-    }
-        // Translate the result into a string.
-    var str = LEADER.repeat(zeroes)
-    for (; it2 < size; ++it2) { str += ALPHABET.charAt(b58[it2]) }
-    return str
-  }
-  function decodeUnsafe (source) {
-    if (typeof source !== 'string') { throw new TypeError('Expected String') }
-    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
-    while (source[psz] === LEADER) {
-      zeroes++
-      psz++
-    }
-        // Allocate enough space in big-endian base256 representation.
-    var size = (((source.length - psz) * FACTOR) + 1) >>> 0 // log(58) / log(256), rounded up.
-    var b256 = new Uint8Array(size)
-        // Process the characters.
-    while (source[psz]) {
-            // Decode character
-      var carry = BASE_MAP[source.charCodeAt(psz)]
-            // Invalid character
-      if (carry === 255) { return }
-      var i = 0
-      for (var it3 = size - 1; (carry !== 0 || i < length) && (it3 !== -1); it3--, i++) {
-        carry += (BASE * b256[it3]) >>> 0
-        b256[it3] = (carry % 256) >>> 0
-        carry = (carry / 256) >>> 0
-      }
-      if (carry !== 0) { throw new Error('Non-zero carry') }
-      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 = []
-    var j = zeroes
-    while (it4 !== size) {
-      vch[j++] = b256[it4++]
-    }
-    return vch
-  }
-  function decode (string) {
-    var buffer = decodeUnsafe(string)
-    if (buffer) { return buffer }
-    throw new Error('Non-base' + BASE + ' character')
-  }
-  return {
-    encode: encode,
-    decodeUnsafe: decodeUnsafe,
-    decode: decode
-  }
-}
-}).call(this);

js/base64-2.4.5.js

@@ -0,0 +1 @@
+(function(global,factory){typeof exports==="object"&&typeof module!=="undefined"?module.exports=factory(global):typeof define==="function"&&define.amd?define(factory):factory(global)})(typeof self!=="undefined"?self:typeof window!=="undefined"?window:typeof global!=="undefined"?global:this,function(global){"use strict";var _Base64=global.Base64;var version="2.4.5";var buffer;if(typeof module!=="undefined"&&module.exports){try{buffer=require("buffer").Buffer}catch(err){}}var b64chars="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";var b64tab=function(bin){var t={};for(var i=0,l=bin.length;i<l;i++)t[bin.charAt(i)]=i;return t}(b64chars);var fromCharCode=String.fromCharCode;var cb_utob=function(c){if(c.length<2){var cc=c.charCodeAt(0);return cc<128?c:cc<2048?fromCharCode(192|cc>>>6)+fromCharCode(128|cc&63):fromCharCode(224|cc>>>12&15)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}else{var cc=65536+(c.charCodeAt(0)-55296)*1024+(c.charCodeAt(1)-56320);return fromCharCode(240|cc>>>18&7)+fromCharCode(128|cc>>>12&63)+fromCharCode(128|cc>>>6&63)+fromCharCode(128|cc&63)}};var re_utob=/[\uD800-\uDBFF][\uDC00-\uDFFFF]|[^\x00-\x7F]/g;var utob=function(u){return u.replace(re_utob,cb_utob)};var cb_encode=function(ccc){var padlen=[0,2,1][ccc.length%3],ord=ccc.charCodeAt(0)<<16|(ccc.length>1?ccc.charCodeAt(1):0)<<8|(ccc.length>2?ccc.charCodeAt(2):0),chars=[b64chars.charAt(ord>>>18),b64chars.charAt(ord>>>12&63),padlen>=2?"=":b64chars.charAt(ord>>>6&63),padlen>=1?"=":b64chars.charAt(ord&63)];return chars.join("")};var btoa=global.btoa?function(b){return global.btoa(b)}:function(b){return b.replace(/[\s\S]{1,3}/g,cb_encode)};var _encode=buffer?buffer.from&&Uint8Array&&buffer.from!==Uint8Array.from?function(u){return(u.constructor===buffer.constructor?u:buffer.from(u)).toString("base64")}:function(u){return(u.constructor===buffer.constructor?u:new buffer(u)).toString("base64")}:function(u){return btoa(utob(u))};var encode=function(u,urisafe){return!urisafe?_encode(String(u)):_encode(String(u)).replace(/[+\/]/g,function(m0){return m0=="+"?"-":"_"}).replace(/=/g,"")};var encodeURI=function(u){return encode(u,true)};var re_btou=new RegExp(["[À-ß][€-¿]","[à-ï][€-¿]{2}","[ð-÷][€-¿]{3}"].join("|"),"g");var cb_btou=function(cccc){switch(cccc.length){case 4:var cp=(7&cccc.charCodeAt(0))<<18|(63&cccc.charCodeAt(1))<<12|(63&cccc.charCodeAt(2))<<6|63&cccc.charCodeAt(3),offset=cp-65536;return fromCharCode((offset>>>10)+55296)+fromCharCode((offset&1023)+56320);case 3:return fromCharCode((15&cccc.charCodeAt(0))<<12|(63&cccc.charCodeAt(1))<<6|63&cccc.charCodeAt(2));default:return fromCharCode((31&cccc.charCodeAt(0))<<6|63&cccc.charCodeAt(1))}};var btou=function(b){return b.replace(re_btou,cb_btou)};var cb_decode=function(cccc){var len=cccc.length,padlen=len%4,n=(len>0?b64tab[cccc.charAt(0)]<<18:0)|(len>1?b64tab[cccc.charAt(1)]<<12:0)|(len>2?b64tab[cccc.charAt(2)]<<6:0)|(len>3?b64tab[cccc.charAt(3)]:0),chars=[fromCharCode(n>>>16),fromCharCode(n>>>8&255),fromCharCode(n&255)];chars.length-=[0,0,2,1][padlen];return chars.join("")};var atob=global.atob?function(a){return global.atob(a)}:function(a){return a.replace(/[\s\S]{1,4}/g,cb_decode)};var _decode=buffer?buffer.from&&Uint8Array&&buffer.from!==Uint8Array.from?function(a){return(a.constructor===buffer.constructor?a:buffer.from(a,"base64")).toString()}:function(a){return(a.constructor===buffer.constructor?a:new buffer(a,"base64")).toString()}:function(a){return btou(atob(a))};var decode=function(a){return _decode(String(a).replace(/[-_]/g,function(m0){return m0=="-"?"+":"/"}).replace(/[^A-Za-z0-9\+\/]/g,""))};var noConflict=function(){var Base64=global.Base64;global.Base64=_Base64;return Base64};global.Base64={VERSION:version,atob:atob,btoa:btoa,fromBase64:decode,toBase64:encode,utob:utob,encode:encode,encodeURI:encodeURI,btou:btou,decode:decode,noConflict:noConflict};if(typeof Object.defineProperty==="function"){var noEnum=function(v){return{value:v,enumerable:false,writable:true,configurable:true}};global.Base64.extendString=function(){Object.defineProperty(String.prototype,"fromBase64",noEnum(function(){return decode(this)}));Object.defineProperty(String.prototype,"toBase64",noEnum(function(urisafe){return encode(this,urisafe)}));Object.defineProperty(String.prototype,"toBase64URI",noEnum(function(){return encode(this,true)}))}}if(global["Meteor"]){Base64=global.Base64}if(typeof module!=="undefined"&&module.exports){module.exports.Base64=global.Base64}else if(typeof define==="function"&&define.amd){define([],function(){return global.Base64})}return{Base64:global.Base64}});

js/comment.jsonld

@@ -1,35 +1,16 @@
 {
 	"@context": {
 		"so": "https://schema.org/",
-		"pb": "?jsonld=types#",
+		"status": "so:Integer",
-		"cm": "?jsonld=commentmeta#",
+		"id": "so:name",
-		"status": {
+		"parentid": "so:name",
-			"@type": "so:Integer"
+		"url: {
-		},
+			"@id": "so:url",
-		"id": {
+			"@type": "@id"
-			"@type": "so:name"
-		},
-		"pasteid": {
-			"@type": "so:name"
-		},
-		"parentid": {
-			"@type": "so:name"
-		},
-		"url": {
-			"@type": "so:url"
-		},
-		"v": {
-			"@type": "so:Integer",
-			"@value": 2
-		},
-		"ct": {
-			"@type": "pb:CipherText"
-		},
-		"adata": {
-			"@type": "pb:CipherParameters"
 		},
+		"data": "so:Text",
 		"meta": {
-			"@type": "cm:MetaData"
+			"@id": "?jsonld=commentmeta"
 		}
 	}
 }

js/commentmeta.jsonld

@@ -1,14 +1,8 @@
 {
 	"@context": {
 		"so": "https://schema.org/",
-		"pb": "?jsonld=types#"
+		"postdate": "so:Integer",
-	},
+		"nickname": "so:Text",
-	"MetaData": {
+		"vizhash": "so:Text"
-		"created": {
-			"@type": "CreationTime"
-		},
-		"icon": {
-			"@type": "so:url"
-		}
 	}
 }

js/common.js

@@ -5,34 +5,28 @@ global.assert = require('assert');
 global.jsc = require('jsverify');
 global.jsdom = require('jsdom-global');
 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.4.1');
-global.RawDeflate = require('./rawinflate-0.3').RawDeflate;
+global.sjcl = require('./sjcl-1.0.8');
-global.zlib = require('./zlib-1.2.11').zlib;
+global.Base64 = require('./base64-2.4.5').Base64;
+global.RawDeflate = require('./rawdeflate-0.5').RawDeflate;
+global.RawDeflate.inflate = require('./rawinflate-0.3').RawDeflate.inflate;
 require('./prettify');
 global.prettyPrint = window.PR.prettyPrint;
 global.prettyPrintOne = window.PR.prettyPrintOne;
 global.showdown = require('./showdown-1.9.1');
-global.DOMPurify = require('./purify-2.1.1');
+global.DOMPurify = require('./purify-2.0.8');
-global.baseX = require('./base-x-3.0.7').baseX;
-global.Legacy = require('./legacy').Legacy;
 require('./bootstrap-3.3.7');
 require('./privatebin');
 
 // internal variables
-var a2zString    = ['a','b','c','d','e','f','g','h','i','j','k','l','m',
+var a2zString = ['a','b','c','d','e','f','g','h','i','j','k','l','m',
-                    'n','o','p','q','r','s','t','u','v','w','x','y','z'],
+                     'n','o','p','q','r','s','t','u','v','w','x','y','z'],
-    digitString  = ['0','1','2','3','4','5','6','7','8','9'],
+    alnumString = a2zString.concat(['0','1','2','3','4','5','6','7','8','9']),
-    alnumString  = a2zString.concat(digitString),
+    queryString = alnumString.concat(['+','%','&','.','*','-','_']),
-    hexString    = digitString.concat(['a','b','c','d','e','f']),
+    hashString = queryString.concat(['!']),
-    queryString  = alnumString.concat(['+','%','&','.','*','-','_']),
-    hashString   = queryString.concat(['!']),
     base64String = alnumString.concat(['+','/','=']).concat(
         a2zString.map(function(c) {
             return c.toUpperCase();
@@ -42,9 +36,15 @@ var a2zString    = ['a','b','c','d','e','f','g','h','i','j','k','l','m',
     supportedLanguages = ['de', 'es', 'fr', 'it', 'no', 'pl', 'pt', 'oc', 'ru', 'sl', 'zh'],
     mimeTypes = ['image/png', 'application/octet-stream'],
     formats = ['plaintext', 'markdown', 'syntaxhighlighting'],
+    logFile = fs.createWriteStream('test.log'),
     mimeFile = fs.createReadStream('/etc/mime.types'),
     mimeLine = '';
 
+// redirect console messages to log file
+console.info = console.warn = console.error = function () {
+    logFile.write(Array.prototype.slice.call(arguments).join('') + '\n');
+};
+
 // populate mime types from environment
 mimeFile.on('data', function(data) {
     mimeLine += data;
@@ -81,8 +81,6 @@ function parseMime(line) {
 }
 
 // common testing helper functions
-exports.atob = atob;
-exports.btoa = btoa;
 
 // provides random lowercase characters from a to z
 exports.jscA2zString = function() {
@@ -94,11 +92,6 @@ exports.jscAlnumString = function() {
     return jsc.elements(alnumString);
 };
 
-//provides random characters allowed in hexadecimal notation
-exports.jscHexString = function() {
-    return jsc.elements(hexString);
-};
-
 // provides random characters allowed in GET queries
 exports.jscQueryString = function() {
     return jsc.elements(queryString);

js/legacy.js

@@ -1,311 +0,0 @@
-/**
- * PrivateBin
- *
- * a zero-knowledge paste bin
- *
- * @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.3.1
- * @name      Legacy
- * @namespace
- */
-
-/**
- * IMPORTANT NOTICE FOR DEVELOPERS:
- * The logic in this file is intended to run in legacy browsers. Avoid any use of:
- * - jQuery (doesn't work in older browsers)
- * - ES5 or newer in general
- * - const/let, use the traditional var declarations instead
- * - async/await or Promises, use traditional callbacks
- * - shorthand function notation "() => output", use the full "function() {return output;}" style
- * - IE doesn't support:
- *   - URL(), use the traditional window.location object
- *   - endsWith(), use indexof()
- * - yes, this logic needs to support IE 6, to at least display the error message
- */
-
-'use strict';
-(function() {
-    /**
-     * compatibility check
-     *
-     * @name   Check
-     * @class
-     */
-    var Check = (function () {
-        var me = {};
-
-        /**
-         * Status of the initial check, true means it passed
-         *
-         * @private
-         * @prop   {bool}
-         */
-        var status = false;
-
-        /**
-         * Initialization check did run
-         *
-         * @private
-         * @prop   {bool}
-         */
-        var init = false;
-
-        /**
-         * blacklist of UserAgents (parts) known to belong to a bot
-         *
-         * @private
-         * @enum   {Array}
-         * @readonly
-         */
-        var badBotUA = [
-            'Bot',
-            'bot'
-        ];
-
-        /**
-         * whitelist of top level domains to consider a secure context,
-         * regardless of protocol
-         *
-         * @private
-         * @enum   {Array}
-         * @readonly
-         */
-        var tld = [
-            '.onion',
-            '.i2p'
-        ];
-
-        /**
-         * whitelist of hostnames to consider a secure context,
-         * regardless of protocol
-         *
-         * @private
-         * @enum   {Array}
-         * @readonly
-         */
-        // whitelists of TLDs & local hostnames
-        var hostname = [
-            'localhost',
-            '127.0.0.1',
-            '[::1]'
-        ];
-
-        /**
-         * check if the context is secure
-         *
-         * @private
-         * @name   Check.isSecureContext
-         * @function
-         * @return {bool}
-         */
-        function isSecureContext()
-        {
-            // use .isSecureContext if available
-            if (window.isSecureContext === true || window.isSecureContext === false) {
-                return window.isSecureContext;
-            }
-
-            // HTTP is obviously insecure
-            if (window.location.protocol !== 'http:') {
-                return true;
-            }
-
-            // filter out actually secure connections over HTTP
-            for (var i = 0; i < tld.length; i++) {
-                if (
-                    window.location.hostname.indexOf(
-                        tld[i],
-                        window.location.hostname.length - tld[i].length
-                    ) !== -1
-                ) {
-                    return true;
-                }
-            }
-
-            // whitelist localhost for development
-            for (var j = 0; j < hostname.length; j++) {
-                if (window.location.hostname === hostname[j]) {
-                    return true;
-                }
-            }
-
-            // totally INSECURE http protocol!
-            return false;
-        }
-
-        /**
-         * checks whether this is a bot we dislike
-         *
-         * @private
-         * @name   Check.isBadBot
-         * @function
-         * @return {bool}
-         */
-        function isBadBot() {
-            // check whether a bot user agent part can be found in the current
-            // user agent
-            for (var i = 0; i < badBotUA.length; i++) {
-                if (navigator.userAgent.indexOf(badBotUA[i]) !== -1) {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * checks whether this is an unsupported browser, via feature detection
-         *
-         * @private
-         * @name   Check.isOldBrowser
-         * @function
-         * @return {bool}
-         */
-        function isOldBrowser() {
-            // webcrypto support
-            if (!(
-                'crypto' in window &&
-                'getRandomValues' in window.crypto &&
-                'subtle' in window.crypto &&
-                'encrypt' in window.crypto.subtle &&
-                'decrypt' in window.crypto.subtle &&
-                'Uint8Array' in window &&
-                'Uint32Array' in window
-            )) {
-                return true;
-            }
-
-            // async & ES6 support
-            try {
-                eval('async () => {}');
-            } catch (e) {
-                if (e instanceof SyntaxError) {
-                    return true;
-                } else {
-                    throw e; // throws CSP error
-                }
-            }
-
-            return false;
-        }
-
-        /**
-         * shows an error message
-         *
-         * @private
-         * @name   Check.showError
-         * @param  {string} message
-         * @function
-         */
-        function showError(message)
-        {
-            var element = document.getElementById('errormessage');
-            if (message.indexOf('<a') === -1) {
-                element.appendChild(
-                    document.createTextNode(message)
-                );
-            } else {
-                element.innerHTML = message;
-            }
-            removeHiddenFromId('errormessage');
-        }
-
-        /**
-         * removes "hidden" CSS class from element with given ID
-         *
-         * @private
-         * @name   Check.removeHiddenFromId
-         * @param  {string} id
-         * @function
-         */
-        function removeHiddenFromId(id)
-        {
-            var element = document.getElementById(id);
-            if (element) {
-                element.className = element.className.replace(/\bhidden\b/g, '');
-            }
-        }
-
-        /**
-         * returns if the check has concluded
-         *
-         * @name   Check.getInit
-         * @function
-         * @return {bool}
-         */
-        me.getInit = function()
-        {
-            return init;
-        };
-        
-        /**
-         * returns the current status of the check
-         *
-         * @name   Check.getStatus
-         * @function
-         * @return {bool}
-         */
-        me.getStatus = function()
-        {
-            return status;
-        };
-        
-        /**
-         * init on application start, returns an all-clear signal
-         *
-         * @name   Check.init
-         * @function
-         */
-        me.init = function()
-        {
-            // prevent bots from viewing a paste and potentially deleting data
-            // when burn-after-reading is set
-            if (isBadBot()) {
-                showError('I love you too, bot…');
-                init = true;
-                return;
-            }
-
-            if (isOldBrowser()) {
-                // some browsers (Chrome based ones) would have webcrypto support if using HTTPS
-                if (!isSecureContext()) {
-                    removeHiddenFromId('insecurecontextnotice');
-                }
-                removeHiddenFromId('oldnotice');
-                init = true;
-                return;
-            }
-
-            if (!isSecureContext()) {
-                removeHiddenFromId('httpnotice');
-            }
-            init = true;
-
-            // only if everything passed, we set the status to true
-            status = true;
-        };
-
-        return me;
-    })();
-
-    // main application start, called when DOM is fully loaded
-    if (document.readyState === 'complete' || (!document.attachEvent && document.readyState === 'interactive')) {
-        Check.init();
-    } else {
-        if (document.addEventListener) {
-            // first choice is DOMContentLoaded event
-            document.addEventListener('DOMContentLoaded', Check.init, false);
-            // backup is window load event
-            window.addEventListener('load', Check.init, false);
-        } else {
-            // must be IE
-            document.attachEvent('onreadystatechange', Check.init);
-            window.attachEvent('onload', Check.init);
-        }
-    }
-
-    this.Legacy = {
-        Check: Check
-    };
-}).call(this);

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "privatebin",
-  "version": "1.3.0",
+  "version": "1.2.1",
   "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,12 +8,11 @@
   },
   "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",
-    "jsverify": "^0.8.3"
+    "mime-types": "^2.1.20",
+    "node-webcrypto-ossl": "^1.0.37"
   },
   "scripts": {
     "test": "mocha"

js/paste.jsonld

@@ -1,42 +1,24 @@
 {
 	"@context": {
 		"so": "https://schema.org/",
-		"pb": "?jsonld=types#",
+		"status": {"@id": "so:Integer"},
-		"pm": "?jsonld=pastemeta#",
+		"id": {"@id": "so:name"},
-		"status": {
+		"deletetoken": {"@id": "so:Text"},
-			"@type": "so:Integer"
-		},
-		"id": {
-			"@type": "so:name"
-		},
-		"deletetoken": {
-			"@type": "so:Text"
-		},
 		"url": {
-			"@type": "so:url"
+			"@type": "@id",
-		},
+			"@id": "so:url"
-		"v": {
-			"@type": "so:Integer",
-			"@value": 2
-		},
-		"ct": {
-			"@type": "pb:CipherText"
-		},
-		"adata": {
-			"@type": "pm:AuthenticatedData"
 		},
+		"data": {"@id": "so:Text"},
+		"attachment": {"@id": "so:Text"},
+		"attachmentname": {"@id": "so:Text"},
 		"meta": {
-			"@type": "pm:MetaData"
+			"@id": "?jsonld=pastemeta"
 		},
 		"comments": {
-			"@type": "?jsonld=comment",
+			"@id": "?jsonld=comment",
 			"@container": "@list"
 		},
-		"comment_count": {
+		"comment_count": {"@id": "so:Integer"},
-			"@type": "so:Integer"
+		"comment_offset": {"@id": "so:Integer"}
-		},
-		"comment_offset": {
-			"@type": "so:Integer"
-		}
 	}
 }

js/pastemeta.jsonld

@@ -1,31 +1,11 @@
 {
 	"@context": {
 		"so": "https://schema.org/",
-		"pb": "?jsonld=types#"
+		"formatter": {"@id": "so:Text"},
-	},
+		"postdate": {"@id": "so:Integer"},
-	"AuthenticatedData": {
+		"opendiscussion": {"@id": "so:True"},
-		"@container": "@list",
+		"burnafterreading": {"@id": "so:True"},
-		"@value": [
+		"expire_date": {"@id": "so:Integer"},
-			{
+		"remaining_time": {"@id": "so:Integer"}
-				"@type": "pb:CipherParameters"
-			},
-			{
-				"@type": "pb:Formatter"
-			},
-			{
-				"@type": "pb:OpenDiscussion"
-			},
-			{
-				"@type": "pb:BurnAfterReading"
-			}
-		]
-	},
-	"MetaData": {
-		"expire": {
-			"@type": "pb:Expiration"
-		},
-		"time_to_live": {
-			"@type": "pb:RemainingSeconds"
-		}
 	}
 }

js/sjcl-1.0.8.js

@@ -0,0 +1,60 @@
+"use strict";var sjcl={cipher:{},hash:{},keyexchange:{},mode:{},misc:{},codec:{},exception:{corrupt:function(a){this.toString=function(){return"CORRUPT: "+this.message};this.message=a},invalid:function(a){this.toString=function(){return"INVALID: "+this.message};this.message=a},bug:function(a){this.toString=function(){return"BUG: "+this.message};this.message=a},notReady:function(a){this.toString=function(){return"NOT READY: "+this.message};this.message=a}}};
+sjcl.cipher.aes=function(a){this.s[0][0][0]||this.O();var b,c,d,e,f=this.s[0][4],g=this.s[1];b=a.length;var h=1;if(4!==b&&6!==b&&8!==b)throw new sjcl.exception.invalid("invalid aes key size");this.b=[d=a.slice(0),e=[]];for(a=b;a<4*b+28;a++){c=d[a-1];if(0===a%b||8===b&&4===a%b)c=f[c>>>24]<<24^f[c>>16&255]<<16^f[c>>8&255]<<8^f[c&255],0===a%b&&(c=c<<8^c>>>24^h<<24,h=h<<1^283*(h>>7));d[a]=d[a-b]^c}for(b=0;a;b++,a--)c=d[b&3?a:a-4],e[b]=4>=a||4>b?c:g[0][f[c>>>24]]^g[1][f[c>>16&255]]^g[2][f[c>>8&255]]^g[3][f[c&
+255]]};
+sjcl.cipher.aes.prototype={encrypt:function(a){return t(this,a,0)},decrypt:function(a){return t(this,a,1)},s:[[[],[],[],[],[]],[[],[],[],[],[]]],O:function(){var a=this.s[0],b=this.s[1],c=a[4],d=b[4],e,f,g,h=[],k=[],l,n,m,p;for(e=0;0x100>e;e++)k[(h[e]=e<<1^283*(e>>7))^e]=e;for(f=g=0;!c[f];f^=l||1,g=k[g]||1)for(m=g^g<<1^g<<2^g<<3^g<<4,m=m>>8^m&255^99,c[f]=m,d[m]=f,n=h[e=h[l=h[f]]],p=0x1010101*n^0x10001*e^0x101*l^0x1010100*f,n=0x101*h[m]^0x1010100*m,e=0;4>e;e++)a[e][f]=n=n<<24^n>>>8,b[e][m]=p=p<<24^p>>>8;for(e=
+0;5>e;e++)a[e]=a[e].slice(0),b[e]=b[e].slice(0)}};
+function t(a,b,c){if(4!==b.length)throw new sjcl.exception.invalid("invalid aes block size");var d=a.b[c],e=b[0]^d[0],f=b[c?3:1]^d[1],g=b[2]^d[2];b=b[c?1:3]^d[3];var h,k,l,n=d.length/4-2,m,p=4,r=[0,0,0,0];h=a.s[c];a=h[0];var q=h[1],v=h[2],w=h[3],x=h[4];for(m=0;m<n;m++)h=a[e>>>24]^q[f>>16&255]^v[g>>8&255]^w[b&255]^d[p],k=a[f>>>24]^q[g>>16&255]^v[b>>8&255]^w[e&255]^d[p+1],l=a[g>>>24]^q[b>>16&255]^v[e>>8&255]^w[f&255]^d[p+2],b=a[b>>>24]^q[e>>16&255]^v[f>>8&255]^w[g&255]^d[p+3],p+=4,e=h,f=k,g=l;for(m=
+0;4>m;m++)r[c?3&-m:m]=x[e>>>24]<<24^x[f>>16&255]<<16^x[g>>8&255]<<8^x[b&255]^d[p++],h=e,e=f,f=g,g=b,b=h;return r}
+sjcl.bitArray={bitSlice:function(a,b,c){a=sjcl.bitArray.$(a.slice(b/32),32-(b&31)).slice(1);return void 0===c?a:sjcl.bitArray.clamp(a,c-b)},extract:function(a,b,c){var d=Math.floor(-b-c&31);return((b+c-1^b)&-32?a[b/32|0]<<32-d^a[b/32+1|0]>>>d:a[b/32|0]>>>d)&(1<<c)-1},concat:function(a,b){if(0===a.length||0===b.length)return a.concat(b);var c=a[a.length-1],d=sjcl.bitArray.getPartial(c);return 32===d?a.concat(b):sjcl.bitArray.$(b,d,c|0,a.slice(0,a.length-1))},bitLength:function(a){var b=a.length;return 0===
+b?0:32*(b-1)+sjcl.bitArray.getPartial(a[b-1])},clamp:function(a,b){if(32*a.length<b)return a;a=a.slice(0,Math.ceil(b/32));var c=a.length;b=b&31;0<c&&b&&(a[c-1]=sjcl.bitArray.partial(b,a[c-1]&2147483648>>b-1,1));return a},partial:function(a,b,c){return 32===a?b:(c?b|0:b<<32-a)+0x10000000000*a},getPartial:function(a){return Math.round(a/0x10000000000)||32},equal:function(a,b){if(sjcl.bitArray.bitLength(a)!==sjcl.bitArray.bitLength(b))return!1;var c=0,d;for(d=0;d<a.length;d++)c|=a[d]^b[d];return 0===
+c},$:function(a,b,c,d){var e;e=0;for(void 0===d&&(d=[]);32<=b;b-=32)d.push(c),c=0;if(0===b)return d.concat(a);for(e=0;e<a.length;e++)d.push(c|a[e]>>>b),c=a[e]<<32-b;e=a.length?a[a.length-1]:0;a=sjcl.bitArray.getPartial(e);d.push(sjcl.bitArray.partial(b+a&31,32<b+a?c:d.pop(),1));return d},i:function(a,b){return[a[0]^b[0],a[1]^b[1],a[2]^b[2],a[3]^b[3]]},byteswapM:function(a){var b,c;for(b=0;b<a.length;++b)c=a[b],a[b]=c>>>24|c>>>8&0xff00|(c&0xff00)<<8|c<<24;return a}};
+sjcl.codec.utf8String={fromBits:function(a){var b="",c=sjcl.bitArray.bitLength(a),d,e;for(d=0;d<c/8;d++)0===(d&3)&&(e=a[d/4]),b+=String.fromCharCode(e>>>8>>>8>>>8),e<<=8;return decodeURIComponent(escape(b))},toBits:function(a){a=unescape(encodeURIComponent(a));var b=[],c,d=0;for(c=0;c<a.length;c++)d=d<<8|a.charCodeAt(c),3===(c&3)&&(b.push(d),d=0);c&3&&b.push(sjcl.bitArray.partial(8*(c&3),d));return b}};
+sjcl.codec.hex={fromBits:function(a){var b="",c;for(c=0;c<a.length;c++)b+=((a[c]|0)+0xf00000000000).toString(16).substr(4);return b.substr(0,sjcl.bitArray.bitLength(a)/4)},toBits:function(a){var b,c=[],d;a=a.replace(/\s|0x/g,"");d=a.length;a=a+"00000000";for(b=0;b<a.length;b+=8)c.push(parseInt(a.substr(b,8),16)^0);return sjcl.bitArray.clamp(c,4*d)}};
+sjcl.codec.base32={B:"ABCDEFGHIJKLMNOPQRSTUVWXYZ234567",X:"0123456789ABCDEFGHIJKLMNOPQRSTUV",BITS:32,BASE:5,REMAINING:27,fromBits:function(a,b,c){var d=sjcl.codec.base32.BASE,e=sjcl.codec.base32.REMAINING,f="",g=0,h=sjcl.codec.base32.B,k=0,l=sjcl.bitArray.bitLength(a);c&&(h=sjcl.codec.base32.X);for(c=0;f.length*d<l;)f+=h.charAt((k^a[c]>>>g)>>>e),g<d?(k=a[c]<<d-g,g+=e,c++):(k<<=d,g-=d);for(;f.length&7&&!b;)f+="=";return f},toBits:function(a,b){a=a.replace(/\s|=/g,"").toUpperCase();var c=sjcl.codec.base32.BITS,
+d=sjcl.codec.base32.BASE,e=sjcl.codec.base32.REMAINING,f=[],g,h=0,k=sjcl.codec.base32.B,l=0,n,m="base32";b&&(k=sjcl.codec.base32.X,m="base32hex");for(g=0;g<a.length;g++){n=k.indexOf(a.charAt(g));if(0>n){if(!b)try{return sjcl.codec.base32hex.toBits(a)}catch(p){}throw new sjcl.exception.invalid("this isn't "+m+"!");}h>e?(h-=e,f.push(l^n>>>h),l=n<<c-h):(h+=d,l^=n<<c-h)}h&56&&f.push(sjcl.bitArray.partial(h&56,l,1));return f}};
+sjcl.codec.base32hex={fromBits:function(a,b){return sjcl.codec.base32.fromBits(a,b,1)},toBits:function(a){return sjcl.codec.base32.toBits(a,1)}};
+sjcl.codec.base64={B:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",fromBits:function(a,b,c){var d="",e=0,f=sjcl.codec.base64.B,g=0,h=sjcl.bitArray.bitLength(a);c&&(f=f.substr(0,62)+"-_");for(c=0;6*d.length<h;)d+=f.charAt((g^a[c]>>>e)>>>26),6>e?(g=a[c]<<6-e,e+=26,c++):(g<<=6,e-=6);for(;d.length&3&&!b;)d+="=";return d},toBits:function(a,b){a=a.replace(/\s|=/g,"");var c=[],d,e=0,f=sjcl.codec.base64.B,g=0,h;b&&(f=f.substr(0,62)+"-_");for(d=0;d<a.length;d++){h=f.indexOf(a.charAt(d));
+if(0>h)throw new sjcl.exception.invalid("this isn't base64!");26<e?(e-=26,c.push(g^h>>>e),g=h<<32-e):(e+=6,g^=h<<32-e)}e&56&&c.push(sjcl.bitArray.partial(e&56,g,1));return c}};sjcl.codec.base64url={fromBits:function(a){return sjcl.codec.base64.fromBits(a,1,1)},toBits:function(a){return sjcl.codec.base64.toBits(a,1)}};sjcl.hash.sha256=function(a){this.b[0]||this.O();a?(this.F=a.F.slice(0),this.A=a.A.slice(0),this.l=a.l):this.reset()};sjcl.hash.sha256.hash=function(a){return(new sjcl.hash.sha256).update(a).finalize()};
+sjcl.hash.sha256.prototype={blockSize:512,reset:function(){this.F=this.Y.slice(0);this.A=[];this.l=0;return this},update:function(a){"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));var b,c=this.A=sjcl.bitArray.concat(this.A,a);b=this.l;a=this.l=b+sjcl.bitArray.bitLength(a);if(0x1fffffffffffff<a)throw new sjcl.exception.invalid("Cannot hash more than 2^53 - 1 bits");if("undefined"!==typeof Uint32Array){var d=new Uint32Array(c),e=0;for(b=512+b-(512+b&0x1ff);b<=a;b+=512)u(this,d.subarray(16*e,
+16*(e+1))),e+=1;c.splice(0,16*e)}else for(b=512+b-(512+b&0x1ff);b<=a;b+=512)u(this,c.splice(0,16));return this},finalize:function(){var a,b=this.A,c=this.F,b=sjcl.bitArray.concat(b,[sjcl.bitArray.partial(1,1)]);for(a=b.length+2;a&15;a++)b.push(0);b.push(Math.floor(this.l/0x100000000));for(b.push(this.l|0);b.length;)u(this,b.splice(0,16));this.reset();return c},Y:[],b:[],O:function(){function a(a){return 0x100000000*(a-Math.floor(a))|0}for(var b=0,c=2,d,e;64>b;c++){e=!0;for(d=2;d*d<=c;d++)if(0===c%d){e=
+!1;break}e&&(8>b&&(this.Y[b]=a(Math.pow(c,.5))),this.b[b]=a(Math.pow(c,1/3)),b++)}}};
+function u(a,b){var c,d,e,f=a.F,g=a.b,h=f[0],k=f[1],l=f[2],n=f[3],m=f[4],p=f[5],r=f[6],q=f[7];for(c=0;64>c;c++)16>c?d=b[c]:(d=b[c+1&15],e=b[c+14&15],d=b[c&15]=(d>>>7^d>>>18^d>>>3^d<<25^d<<14)+(e>>>17^e>>>19^e>>>10^e<<15^e<<13)+b[c&15]+b[c+9&15]|0),d=d+q+(m>>>6^m>>>11^m>>>25^m<<26^m<<21^m<<7)+(r^m&(p^r))+g[c],q=r,r=p,p=m,m=n+d|0,n=l,l=k,k=h,h=d+(k&l^n&(k^l))+(k>>>2^k>>>13^k>>>22^k<<30^k<<19^k<<10)|0;f[0]=f[0]+h|0;f[1]=f[1]+k|0;f[2]=f[2]+l|0;f[3]=f[3]+n|0;f[4]=f[4]+m|0;f[5]=f[5]+p|0;f[6]=f[6]+r|0;f[7]=
+f[7]+q|0}
+sjcl.mode.ccm={name:"ccm",G:[],listenProgress:function(a){sjcl.mode.ccm.G.push(a)},unListenProgress:function(a){a=sjcl.mode.ccm.G.indexOf(a);-1<a&&sjcl.mode.ccm.G.splice(a,1)},fa:function(a){var b=sjcl.mode.ccm.G.slice(),c;for(c=0;c<b.length;c+=1)b[c](a)},encrypt:function(a,b,c,d,e){var f,g=b.slice(0),h=sjcl.bitArray,k=h.bitLength(c)/8,l=h.bitLength(g)/8;e=e||64;d=d||[];if(7>k)throw new sjcl.exception.invalid("ccm: iv must be at least 7 bytes");for(f=2;4>f&&l>>>8*f;f++);f<15-k&&(f=15-k);c=h.clamp(c,
+8*(15-f));b=sjcl.mode.ccm.V(a,b,c,d,e,f);g=sjcl.mode.ccm.C(a,g,c,b,e,f);return h.concat(g.data,g.tag)},decrypt:function(a,b,c,d,e){e=e||64;d=d||[];var f=sjcl.bitArray,g=f.bitLength(c)/8,h=f.bitLength(b),k=f.clamp(b,h-e),l=f.bitSlice(b,h-e),h=(h-e)/8;if(7>g)throw new sjcl.exception.invalid("ccm: iv must be at least 7 bytes");for(b=2;4>b&&h>>>8*b;b++);b<15-g&&(b=15-g);c=f.clamp(c,8*(15-b));k=sjcl.mode.ccm.C(a,k,c,l,e,b);a=sjcl.mode.ccm.V(a,k.data,c,d,e,b);if(!f.equal(k.tag,a))throw new sjcl.exception.corrupt("ccm: tag doesn't match");
+return k.data},na:function(a,b,c,d,e,f){var g=[],h=sjcl.bitArray,k=h.i;d=[h.partial(8,(b.length?64:0)|d-2<<2|f-1)];d=h.concat(d,c);d[3]|=e;d=a.encrypt(d);if(b.length)for(c=h.bitLength(b)/8,65279>=c?g=[h.partial(16,c)]:0xffffffff>=c&&(g=h.concat([h.partial(16,65534)],[c])),g=h.concat(g,b),b=0;b<g.length;b+=4)d=a.encrypt(k(d,g.slice(b,b+4).concat([0,0,0])));return d},V:function(a,b,c,d,e,f){var g=sjcl.bitArray,h=g.i;e/=8;if(e%2||4>e||16<e)throw new sjcl.exception.invalid("ccm: invalid tag length");
+if(0xffffffff<d.length||0xffffffff<b.length)throw new sjcl.exception.bug("ccm: can't deal with 4GiB or more data");c=sjcl.mode.ccm.na(a,d,c,e,g.bitLength(b)/8,f);for(d=0;d<b.length;d+=4)c=a.encrypt(h(c,b.slice(d,d+4).concat([0,0,0])));return g.clamp(c,8*e)},C:function(a,b,c,d,e,f){var g,h=sjcl.bitArray;g=h.i;var k=b.length,l=h.bitLength(b),n=k/50,m=n;c=h.concat([h.partial(8,f-1)],c).concat([0,0,0]).slice(0,4);d=h.bitSlice(g(d,a.encrypt(c)),0,e);if(!k)return{tag:d,data:[]};for(g=0;g<k;g+=4)g>n&&(sjcl.mode.ccm.fa(g/
+k),n+=m),c[3]++,e=a.encrypt(c),b[g]^=e[0],b[g+1]^=e[1],b[g+2]^=e[2],b[g+3]^=e[3];return{tag:d,data:h.clamp(b,l)}}};
+sjcl.mode.ocb2={name:"ocb2",encrypt:function(a,b,c,d,e,f){if(128!==sjcl.bitArray.bitLength(c))throw new sjcl.exception.invalid("ocb iv must be 128 bits");var g,h=sjcl.mode.ocb2.S,k=sjcl.bitArray,l=k.i,n=[0,0,0,0];c=h(a.encrypt(c));var m,p=[];d=d||[];e=e||64;for(g=0;g+4<b.length;g+=4)m=b.slice(g,g+4),n=l(n,m),p=p.concat(l(c,a.encrypt(l(c,m)))),c=h(c);m=b.slice(g);b=k.bitLength(m);g=a.encrypt(l(c,[0,0,0,b]));m=k.clamp(l(m.concat([0,0,0]),g),b);n=l(n,l(m.concat([0,0,0]),g));n=a.encrypt(l(n,l(c,h(c))));
+d.length&&(n=l(n,f?d:sjcl.mode.ocb2.pmac(a,d)));return p.concat(k.concat(m,k.clamp(n,e)))},decrypt:function(a,b,c,d,e,f){if(128!==sjcl.bitArray.bitLength(c))throw new sjcl.exception.invalid("ocb iv must be 128 bits");e=e||64;var g=sjcl.mode.ocb2.S,h=sjcl.bitArray,k=h.i,l=[0,0,0,0],n=g(a.encrypt(c)),m,p,r=sjcl.bitArray.bitLength(b)-e,q=[];d=d||[];for(c=0;c+4<r/32;c+=4)m=k(n,a.decrypt(k(n,b.slice(c,c+4)))),l=k(l,m),q=q.concat(m),n=g(n);p=r-32*c;m=a.encrypt(k(n,[0,0,0,p]));m=k(m,h.clamp(b.slice(c),p).concat([0,
+0,0]));l=k(l,m);l=a.encrypt(k(l,k(n,g(n))));d.length&&(l=k(l,f?d:sjcl.mode.ocb2.pmac(a,d)));if(!h.equal(h.clamp(l,e),h.bitSlice(b,r)))throw new sjcl.exception.corrupt("ocb: tag doesn't match");return q.concat(h.clamp(m,p))},pmac:function(a,b){var c,d=sjcl.mode.ocb2.S,e=sjcl.bitArray,f=e.i,g=[0,0,0,0],h=a.encrypt([0,0,0,0]),h=f(h,d(d(h)));for(c=0;c+4<b.length;c+=4)h=d(h),g=f(g,a.encrypt(f(h,b.slice(c,c+4))));c=b.slice(c);128>e.bitLength(c)&&(h=f(h,d(h)),c=e.concat(c,[-2147483648,0,0,0]));g=f(g,c);
+return a.encrypt(f(d(f(h,d(h))),g))},S:function(a){return[a[0]<<1^a[1]>>>31,a[1]<<1^a[2]>>>31,a[2]<<1^a[3]>>>31,a[3]<<1^135*(a[0]>>>31)]}};
+sjcl.mode.gcm={name:"gcm",encrypt:function(a,b,c,d,e){var f=b.slice(0);b=sjcl.bitArray;d=d||[];a=sjcl.mode.gcm.C(!0,a,f,d,c,e||128);return b.concat(a.data,a.tag)},decrypt:function(a,b,c,d,e){var f=b.slice(0),g=sjcl.bitArray,h=g.bitLength(f);e=e||128;d=d||[];e<=h?(b=g.bitSlice(f,h-e),f=g.bitSlice(f,0,h-e)):(b=f,f=[]);a=sjcl.mode.gcm.C(!1,a,f,d,c,e);if(!g.equal(a.tag,b))throw new sjcl.exception.corrupt("gcm: tag doesn't match");return a.data},ka:function(a,b){var c,d,e,f,g,h=sjcl.bitArray.i;e=[0,0,
+0,0];f=b.slice(0);for(c=0;128>c;c++){(d=0!==(a[Math.floor(c/32)]&1<<31-c%32))&&(e=h(e,f));g=0!==(f[3]&1);for(d=3;0<d;d--)f[d]=f[d]>>>1|(f[d-1]&1)<<31;f[0]>>>=1;g&&(f[0]^=-0x1f000000)}return e},j:function(a,b,c){var d,e=c.length;b=b.slice(0);for(d=0;d<e;d+=4)b[0]^=0xffffffff&c[d],b[1]^=0xffffffff&c[d+1],b[2]^=0xffffffff&c[d+2],b[3]^=0xffffffff&c[d+3],b=sjcl.mode.gcm.ka(b,a);return b},C:function(a,b,c,d,e,f){var g,h,k,l,n,m,p,r,q=sjcl.bitArray;m=c.length;p=q.bitLength(c);r=q.bitLength(d);h=q.bitLength(e);
+g=b.encrypt([0,0,0,0]);96===h?(e=e.slice(0),e=q.concat(e,[1])):(e=sjcl.mode.gcm.j(g,[0,0,0,0],e),e=sjcl.mode.gcm.j(g,e,[0,0,Math.floor(h/0x100000000),h&0xffffffff]));h=sjcl.mode.gcm.j(g,[0,0,0,0],d);n=e.slice(0);d=h.slice(0);a||(d=sjcl.mode.gcm.j(g,h,c));for(l=0;l<m;l+=4)n[3]++,k=b.encrypt(n),c[l]^=k[0],c[l+1]^=k[1],c[l+2]^=k[2],c[l+3]^=k[3];c=q.clamp(c,p);a&&(d=sjcl.mode.gcm.j(g,h,c));a=[Math.floor(r/0x100000000),r&0xffffffff,Math.floor(p/0x100000000),p&0xffffffff];d=sjcl.mode.gcm.j(g,d,a);k=b.encrypt(e);
+d[0]^=k[0];d[1]^=k[1];d[2]^=k[2];d[3]^=k[3];return{tag:q.bitSlice(d,0,f),data:c}}};sjcl.misc.hmac=function(a,b){this.W=b=b||sjcl.hash.sha256;var c=[[],[]],d,e=b.prototype.blockSize/32;this.w=[new b,new b];a.length>e&&(a=b.hash(a));for(d=0;d<e;d++)c[0][d]=a[d]^909522486,c[1][d]=a[d]^1549556828;this.w[0].update(c[0]);this.w[1].update(c[1]);this.R=new b(this.w[0])};
+sjcl.misc.hmac.prototype.encrypt=sjcl.misc.hmac.prototype.mac=function(a){if(this.aa)throw new sjcl.exception.invalid("encrypt on already updated hmac called!");this.update(a);return this.digest(a)};sjcl.misc.hmac.prototype.reset=function(){this.R=new this.W(this.w[0]);this.aa=!1};sjcl.misc.hmac.prototype.update=function(a){this.aa=!0;this.R.update(a)};sjcl.misc.hmac.prototype.digest=function(){var a=this.R.finalize(),a=(new this.W(this.w[1])).update(a).finalize();this.reset();return a};
+sjcl.misc.pbkdf2=function(a,b,c,d,e){c=c||1E4;if(0>d||0>c)throw new sjcl.exception.invalid("invalid params to pbkdf2");"string"===typeof a&&(a=sjcl.codec.utf8String.toBits(a));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));e=e||sjcl.misc.hmac;a=new e(a);var f,g,h,k,l=[],n=sjcl.bitArray;for(k=1;32*l.length<(d||1);k++){e=f=a.encrypt(n.concat(b,[k]));for(g=1;g<c;g++)for(f=a.encrypt(f),h=0;h<f.length;h++)e[h]^=f[h];l=l.concat(e)}d&&(l=n.clamp(l,d));return l};
+sjcl.prng=function(a){this.c=[new sjcl.hash.sha256];this.m=[0];this.P=0;this.H={};this.N=0;this.U={};this.Z=this.f=this.o=this.ha=0;this.b=[0,0,0,0,0,0,0,0];this.h=[0,0,0,0];this.L=void 0;this.M=a;this.D=!1;this.K={progress:{},seeded:{}};this.u=this.ga=0;this.I=1;this.J=2;this.ca=0x10000;this.T=[0,48,64,96,128,192,0x100,384,512,768,1024];this.da=3E4;this.ba=80};
+sjcl.prng.prototype={randomWords:function(a,b){var c=[],d;d=this.isReady(b);var e;if(d===this.u)throw new sjcl.exception.notReady("generator isn't seeded");if(d&this.J){d=!(d&this.I);e=[];var f=0,g;this.Z=e[0]=(new Date).valueOf()+this.da;for(g=0;16>g;g++)e.push(0x100000000*Math.random()|0);for(g=0;g<this.c.length&&(e=e.concat(this.c[g].finalize()),f+=this.m[g],this.m[g]=0,d||!(this.P&1<<g));g++);this.P>=1<<this.c.length&&(this.c.push(new sjcl.hash.sha256),this.m.push(0));this.f-=f;f>this.o&&(this.o=
+f);this.P++;this.b=sjcl.hash.sha256.hash(this.b.concat(e));this.L=new sjcl.cipher.aes(this.b);for(d=0;4>d&&(this.h[d]=this.h[d]+1|0,!this.h[d]);d++);}for(d=0;d<a;d+=4)0===(d+1)%this.ca&&y(this),e=z(this),c.push(e[0],e[1],e[2],e[3]);y(this);return c.slice(0,a)},setDefaultParanoia:function(a,b){if(0===a&&"Setting paranoia=0 will ruin your security; use it only for testing"!==b)throw new sjcl.exception.invalid("Setting paranoia=0 will ruin your security; use it only for testing");this.M=a},addEntropy:function(a,
+b,c){c=c||"user";var d,e,f=(new Date).valueOf(),g=this.H[c],h=this.isReady(),k=0;d=this.U[c];void 0===d&&(d=this.U[c]=this.ha++);void 0===g&&(g=this.H[c]=0);this.H[c]=(this.H[c]+1)%this.c.length;switch(typeof a){case "number":void 0===b&&(b=1);this.c[g].update([d,this.N++,1,b,f,1,a|0]);break;case "object":c=Object.prototype.toString.call(a);if("[object Uint32Array]"===c){e=[];for(c=0;c<a.length;c++)e.push(a[c]);a=e}else for("[object Array]"!==c&&(k=1),c=0;c<a.length&&!k;c++)"number"!==typeof a[c]&&
+(k=1);if(!k){if(void 0===b)for(c=b=0;c<a.length;c++)for(e=a[c];0<e;)b++,e=e>>>1;this.c[g].update([d,this.N++,2,b,f,a.length].concat(a))}break;case "string":void 0===b&&(b=a.length);this.c[g].update([d,this.N++,3,b,f,a.length]);this.c[g].update(a);break;default:k=1}if(k)throw new sjcl.exception.bug("random: addEntropy only supports number, array of numbers or string");this.m[g]+=b;this.f+=b;h===this.u&&(this.isReady()!==this.u&&A("seeded",Math.max(this.o,this.f)),A("progress",this.getProgress()))},
+isReady:function(a){a=this.T[void 0!==a?a:this.M];return this.o&&this.o>=a?this.m[0]>this.ba&&(new Date).valueOf()>this.Z?this.J|this.I:this.I:this.f>=a?this.J|this.u:this.u},getProgress:function(a){a=this.T[a?a:this.M];return this.o>=a?1:this.f>a?1:this.f/a},startCollectors:function(){if(!this.D){this.a={loadTimeCollector:B(this,this.ma),mouseCollector:B(this,this.oa),keyboardCollector:B(this,this.la),accelerometerCollector:B(this,this.ea),touchCollector:B(this,this.qa)};if(window.addEventListener)window.addEventListener("load",
+this.a.loadTimeCollector,!1),window.addEventListener("mousemove",this.a.mouseCollector,!1),window.addEventListener("keypress",this.a.keyboardCollector,!1),window.addEventListener("devicemotion",this.a.accelerometerCollector,!1),window.addEventListener("touchmove",this.a.touchCollector,!1);else if(document.attachEvent)document.attachEvent("onload",this.a.loadTimeCollector),document.attachEvent("onmousemove",this.a.mouseCollector),document.attachEvent("keypress",this.a.keyboardCollector);else throw new sjcl.exception.bug("can't attach event");
+this.D=!0}},stopCollectors:function(){this.D&&(window.removeEventListener?(window.removeEventListener("load",this.a.loadTimeCollector,!1),window.removeEventListener("mousemove",this.a.mouseCollector,!1),window.removeEventListener("keypress",this.a.keyboardCollector,!1),window.removeEventListener("devicemotion",this.a.accelerometerCollector,!1),window.removeEventListener("touchmove",this.a.touchCollector,!1)):document.detachEvent&&(document.detachEvent("onload",this.a.loadTimeCollector),document.detachEvent("onmousemove",
+this.a.mouseCollector),document.detachEvent("keypress",this.a.keyboardCollector)),this.D=!1)},addEventListener:function(a,b){this.K[a][this.ga++]=b},removeEventListener:function(a,b){var c,d,e=this.K[a],f=[];for(d in e)e.hasOwnProperty(d)&&e[d]===b&&f.push(d);for(c=0;c<f.length;c++)d=f[c],delete e[d]},la:function(){C(this,1)},oa:function(a){var b,c;try{b=a.x||a.clientX||a.offsetX||0,c=a.y||a.clientY||a.offsetY||0}catch(d){c=b=0}0!=b&&0!=c&&this.addEntropy([b,c],2,"mouse");C(this,0)},qa:function(a){a=
+a.touches[0]||a.changedTouches[0];this.addEntropy([a.pageX||a.clientX,a.pageY||a.clientY],1,"touch");C(this,0)},ma:function(){C(this,2)},ea:function(a){a=a.accelerationIncludingGravity.x||a.accelerationIncludingGravity.y||a.accelerationIncludingGravity.z;if(window.orientation){var b=window.orientation;"number"===typeof b&&this.addEntropy(b,1,"accelerometer")}a&&this.addEntropy(a,2,"accelerometer");C(this,0)}};
+function A(a,b){var c,d=sjcl.random.K[a],e=[];for(c in d)d.hasOwnProperty(c)&&e.push(d[c]);for(c=0;c<e.length;c++)e[c](b)}function C(a,b){"undefined"!==typeof window&&window.performance&&"function"===typeof window.performance.now?a.addEntropy(window.performance.now(),b,"loadtime"):a.addEntropy((new Date).valueOf(),b,"loadtime")}function y(a){a.b=z(a).concat(z(a));a.L=new sjcl.cipher.aes(a.b)}function z(a){for(var b=0;4>b&&(a.h[b]=a.h[b]+1|0,!a.h[b]);b++);return a.L.encrypt(a.h)}
+function B(a,b){return function(){b.apply(a,arguments)}}sjcl.random=new sjcl.prng(6);
+a:try{var D,E,F,G;if(G="undefined"!==typeof module&&module.exports){var H;try{H=require("crypto")}catch(a){H=null}G=E=H}if(G&&E.randomBytes)D=E.randomBytes(128),D=new Uint32Array((new Uint8Array(D)).buffer),sjcl.random.addEntropy(D,1024,"crypto['randomBytes']");else if("undefined"!==typeof window&&"undefined"!==typeof Uint32Array){F=new Uint32Array(32);if(window.crypto&&window.crypto.getRandomValues)window.crypto.getRandomValues(F);else if(window.msCrypto&&window.msCrypto.getRandomValues)window.msCrypto.getRandomValues(F);
+else break a;sjcl.random.addEntropy(F,1024,"crypto['getRandomValues']")}}catch(a){"undefined"!==typeof window&&window.console&&(console.log("There was an error collecting entropy from the browser:"),console.log(a))}
+sjcl.json={defaults:{v:1,iter:1E4,ks:128,ts:64,mode:"ccm",adata:"",cipher:"aes"},ja:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json,f=e.g({iv:sjcl.random.randomWords(4,0)},e.defaults),g;e.g(f,c);c=f.adata;"string"===typeof f.salt&&(f.salt=sjcl.codec.base64.toBits(f.salt));"string"===typeof f.iv&&(f.iv=sjcl.codec.base64.toBits(f.iv));if(!sjcl.mode[f.mode]||!sjcl.cipher[f.cipher]||"string"===typeof a&&100>=f.iter||64!==f.ts&&96!==f.ts&&128!==f.ts||128!==f.ks&&192!==f.ks&&0x100!==f.ks||2>f.iv.length||
+4<f.iv.length)throw new sjcl.exception.invalid("json encrypt: invalid parameters");"string"===typeof a?(g=sjcl.misc.cachedPbkdf2(a,f),a=g.key.slice(0,f.ks/32),f.salt=g.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.publicKey&&(g=a.kem(),f.kemtag=g.tag,a=g.key.slice(0,f.ks/32));"string"===typeof b&&(b=sjcl.codec.utf8String.toBits(b));"string"===typeof c&&(f.adata=c=sjcl.codec.utf8String.toBits(c));g=new sjcl.cipher[f.cipher](a);e.g(d,f);d.key=a;f.ct="ccm"===f.mode&&sjcl.arrayBuffer&&sjcl.arrayBuffer.ccm&&
+b instanceof ArrayBuffer?sjcl.arrayBuffer.ccm.encrypt(g,b,f.iv,c,f.ts):sjcl.mode[f.mode].encrypt(g,b,f.iv,c,f.ts);return f},encrypt:function(a,b,c,d){var e=sjcl.json,f=e.ja.apply(e,arguments);return e.encode(f)},ia:function(a,b,c,d){c=c||{};d=d||{};var e=sjcl.json;b=e.g(e.g(e.g({},e.defaults),b),c,!0);var f,g;f=b.adata;"string"===typeof b.salt&&(b.salt=sjcl.codec.base64.toBits(b.salt));"string"===typeof b.iv&&(b.iv=sjcl.codec.base64.toBits(b.iv));if(!sjcl.mode[b.mode]||!sjcl.cipher[b.cipher]||"string"===
+typeof a&&100>=b.iter||64!==b.ts&&96!==b.ts&&128!==b.ts||128!==b.ks&&192!==b.ks&&0x100!==b.ks||!b.iv||2>b.iv.length||4<b.iv.length)throw new sjcl.exception.invalid("json decrypt: invalid parameters");"string"===typeof a?(g=sjcl.misc.cachedPbkdf2(a,b),a=g.key.slice(0,b.ks/32),b.salt=g.salt):sjcl.ecc&&a instanceof sjcl.ecc.elGamal.secretKey&&(a=a.unkem(sjcl.codec.base64.toBits(b.kemtag)).slice(0,b.ks/32));"string"===typeof f&&(f=sjcl.codec.utf8String.toBits(f));g=new sjcl.cipher[b.cipher](a);f="ccm"===
+b.mode&&sjcl.arrayBuffer&&sjcl.arrayBuffer.ccm&&b.ct instanceof ArrayBuffer?sjcl.arrayBuffer.ccm.decrypt(g,b.ct,b.iv,b.tag,f,b.ts):sjcl.mode[b.mode].decrypt(g,b.ct,b.iv,f,b.ts);e.g(d,b);d.key=a;return 1===c.raw?f:sjcl.codec.utf8String.fromBits(f)},decrypt:function(a,b,c,d){var e=sjcl.json;return e.ia(a,e.decode(b),c,d)},encode:function(a){var b,c="{",d="";for(b in a)if(a.hasOwnProperty(b)){if(!b.match(/^[a-z0-9]+$/i))throw new sjcl.exception.invalid("json encode: invalid property name");c+=d+'"'+
+b+'":';d=",";switch(typeof a[b]){case "number":case "boolean":c+=a[b];break;case "string":c+='"'+escape(a[b])+'"';break;case "object":c+='"'+sjcl.codec.base64.fromBits(a[b],0)+'"';break;default:throw new sjcl.exception.bug("json encode: unsupported type");}}return c+"}"},decode:function(a){a=a.replace(/\s/g,"");if(!a.match(/^\{.*\}$/))throw new sjcl.exception.invalid("json decode: this isn't json!");a=a.replace(/^\{|\}$/g,"").split(/,/);var b={},c,d;for(c=0;c<a.length;c++){if(!(d=a[c].match(/^\s*(?:(["']?)([a-z][a-z0-9]*)\1)\s*:\s*(?:(-?\d+)|"([a-z0-9+\/%*_.@=\-]*)"|(true|false))$/i)))throw new sjcl.exception.invalid("json decode: this isn't json!");
+null!=d[3]?b[d[2]]=parseInt(d[3],10):null!=d[4]?b[d[2]]=d[2].match(/^(ct|adata|salt|iv)$/)?sjcl.codec.base64.toBits(d[4]):unescape(d[4]):null!=d[5]&&(b[d[2]]="true"===d[5])}return b},g:function(a,b,c){void 0===a&&(a={});if(void 0===b)return a;for(var d in b)if(b.hasOwnProperty(d)){if(c&&void 0!==a[d]&&a[d]!==b[d])throw new sjcl.exception.invalid("required parameter overridden");a[d]=b[d]}return a},sa:function(a,b){var c={},d;for(d in a)a.hasOwnProperty(d)&&a[d]!==b[d]&&(c[d]=a[d]);return c},ra:function(a,
+b){var c={},d;for(d=0;d<b.length;d++)void 0!==a[b[d]]&&(c[b[d]]=a[b[d]]);return c}};sjcl.encrypt=sjcl.json.encrypt;sjcl.decrypt=sjcl.json.decrypt;sjcl.misc.pa={};sjcl.misc.cachedPbkdf2=function(a,b){var c=sjcl.misc.pa,d;b=b||{};d=b.iter||1E3;c=c[a]=c[a]||{};d=c[d]=c[d]||{firstSalt:b.salt&&b.salt.length?b.salt.slice(0):sjcl.random.randomWords(2,0)};c=void 0===b.salt?d.firstSalt:b.salt;d[c]=d[c]||sjcl.misc.pbkdf2(a,c,b.iter);return{key:d[c].slice(0),salt:c.slice(0)}};
+"undefined"!==typeof module&&module.exports&&(module.exports=sjcl);"function"===typeof define&&define([],function(){return sjcl});

js/test/Alert.js

@@ -4,19 +4,19 @@ var common = require('../common');
 describe('Alert', function () {
     describe('showStatus', function () {
         jsc.property(
-            'shows a status message (basic)',
+            'shows a status message',
             jsc.array(common.jscAlnumString()),
             jsc.array(common.jscAlnumString()),
             function (icon, message) {
                 icon = icon.join('');
                 message = message.join('');
-                const expected = '<div id="status">' + message + '</div>';
+                var expected = '<div id="status">' + message + '</div>';
                 $('body').html(
-                    '<div id="status"></div>'
+                        '<div id="status"></div>'
-                );
+                    );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showStatus(message, icon);
-                const result = $('body').html();
+                var result = $('body').html();
                 return expected === result;
             }
         );
@@ -26,7 +26,7 @@ describe('Alert', function () {
             jsc.array(common.jscAlnumString()),
             function (message) {
                 message = message.join('');
-                const expected = '<div id="status" role="alert" ' +
+                var expected = '<div id="status" role="alert" ' +
                     'class="statusmessage alert alert-info"><span ' +
                     'class="glyphicon glyphicon-info-sign" ' +
                     'aria-hidden="true"></span> <span>' + message + '</span></div>';
@@ -37,7 +37,7 @@ describe('Alert', function () {
                 );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showStatus(message);
-                const result = $('body').html();
+                var result = $('body').html();
                 return expected === result;
             }
         );
@@ -49,7 +49,7 @@ describe('Alert', function () {
             function (icon, message) {
                 icon = icon.join('');
                 message = message.join('');
-                const expected = '<div id="status" role="alert" ' +
+                var expected = '<div id="status" role="alert" ' +
                     'class="statusmessage alert alert-info"><span ' +
                     'class="glyphicon glyphicon-' + icon +
                     '" aria-hidden="true"></span> <span>' + message + '</span></div>';
@@ -60,72 +60,7 @@ describe('Alert', function () {
                 );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showStatus(message, icon);
-                const result = $('body').html();
+                var result = $('body').html();
-                return expected === result;
-            }
-        );
-    });
-
-    describe('showWarning', function () {
-        jsc.property(
-            'shows a warning message (basic)',
-            jsc.array(common.jscAlnumString()),
-            jsc.array(common.jscAlnumString()),
-            function (icon, message) {
-                icon = icon.join('');
-                message = message.join('');
-                const expected = '<div id="errormessage">' + message + '</div>';
-                $('body').html(
-                    '<div id="errormessage"></div>'
-                );
-                $.PrivateBin.Alert.init();
-                $.PrivateBin.Alert.showWarning(message, icon);
-                const result = $('body').html();
-                return expected === result;
-            }
-        );
-
-        jsc.property(
-            'shows a warning message (bootstrap)',
-            jsc.array(common.jscAlnumString()),
-            jsc.array(common.jscAlnumString()),
-            function (message) {
-                message = message.join('');
-                const expected = '<div id="errormessage" role="alert" ' +
-                    'class="statusmessage alert alert-danger"><span ' +
-                    'class="glyphicon glyphicon-warning-sign" ' +
-                    'aria-hidden="true"></span> <span>' + message + '</span></div>';
-                $('body').html(
-                    '<div id="errormessage" role="alert" class="statusmessage ' +
-                    'alert alert-danger hidden"><span class="glyphicon ' +
-                    'glyphicon-alert" aria-hidden="true"></span> </div>'
-                );
-                $.PrivateBin.Alert.init();
-                $.PrivateBin.Alert.showWarning(message);
-                const result = $('body').html();
-                return expected === result;
-            }
-        );
-
-        jsc.property(
-            'shows a warning message (bootstrap, custom icon)',
-            jsc.array(common.jscAlnumString()),
-            jsc.array(common.jscAlnumString()),
-            function (icon, message) {
-                icon = icon.join('');
-                message = message.join('');
-                const expected = '<div id="errormessage" role="alert" ' +
-                    'class="statusmessage alert alert-danger"><span ' +
-                    'class="glyphicon glyphicon-' + icon +
-                    '" aria-hidden="true"></span> <span>' + message + '</span></div>';
-                $('body').html(
-                    '<div id="errormessage" role="alert" class="statusmessage ' +
-                    'alert alert-danger hidden"><span class="glyphicon ' +
-                    'glyphicon-alert" aria-hidden="true"></span> </div>'
-                );
-                $.PrivateBin.Alert.init();
-                $.PrivateBin.Alert.showWarning(message, icon);
-                const result = $('body').html();
                 return expected === result;
             }
         );
@@ -139,13 +74,13 @@ describe('Alert', function () {
             function (icon, message) {
                 icon = icon.join('');
                 message = message.join('');
-                const expected = '<div id="errormessage">' + message + '</div>';
+                var expected = '<div id="errormessage">' + message + '</div>';
                 $('body').html(
                     '<div id="errormessage"></div>'
                 );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showError(message, icon);
-                const result = $('body').html();
+                var result = $('body').html();
                 return expected === result;
             }
         );
@@ -156,7 +91,7 @@ describe('Alert', function () {
             jsc.array(common.jscAlnumString()),
             function (icon, message) {
                 message = message.join('');
-                const expected = '<div id="errormessage" role="alert" ' +
+                var expected = '<div id="errormessage" role="alert" ' +
                     'class="statusmessage alert alert-danger"><span ' +
                     'class="glyphicon glyphicon-alert" ' +
                     'aria-hidden="true"></span> <span>' + message + '</span></div>';
@@ -167,7 +102,7 @@ describe('Alert', function () {
                 );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showError(message);
-                const result = $('body').html();
+                var result = $('body').html();
                 return expected === result;
             }
         );
@@ -179,7 +114,7 @@ describe('Alert', function () {
             function (icon, message) {
                 icon = icon.join('');
                 message = message.join('');
-                const expected = '<div id="errormessage" role="alert" ' +
+                var expected = '<div id="errormessage" role="alert" ' +
                     'class="statusmessage alert alert-danger"><span ' +
                     'class="glyphicon glyphicon-' + icon +
                     '" aria-hidden="true"></span> <span>' + message + '</span></div>';
@@ -190,7 +125,7 @@ describe('Alert', function () {
                 );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showError(message, icon);
-                const result = $('body').html();
+                var result = $('body').html();
                 return expected === result;
             }
         );
@@ -205,13 +140,13 @@ describe('Alert', function () {
             function (message, string, number) {
                 message = message.join('');
                 string = string.join('');
-                const expected = '<div id="remainingtime" class="">' + string + message + number + '</div>';
+                var expected = '<div id="remainingtime" class="">' + string + message + number + '</div>';
                 $('body').html(
                     '<div id="remainingtime" class="hidden"></div>'
                 );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showRemaining(['%s' + message + '%d', string, number]);
-                const result = $('body').html();
+                var result = $('body').html();
                 return expected === result;
             }
         );
@@ -224,7 +159,7 @@ describe('Alert', function () {
             function (message, string, number) {
                 message = message.join('');
                 string = string.join('');
-                const expected = '<div id="remainingtime" role="alert" ' +
+                var expected = '<div id="remainingtime" role="alert" ' +
                     'class="alert alert-info"><span ' +
                     'class="glyphicon glyphicon-fire" aria-hidden="true">' +
                     '</span> <span>' + string + message + number + '</span></div>';
@@ -235,7 +170,7 @@ describe('Alert', function () {
                 );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showRemaining(['%s' + message + '%d', string, number]);
-                const result = $('body').html();
+                var result = $('body').html();
                 return expected === result;
             }
         );
@@ -249,17 +184,17 @@ describe('Alert', function () {
             function (message, icon) {
                 message = message.join('');
                 icon = icon.join('');
-                const defaultMessage = 'Loading…';
+                var defaultMessage = 'Loading…';
                 if (message.length === 0) {
                     message = defaultMessage;
                 }
-                const expected = '<div id="loadingindicator" class="">' + message + '</div>';
+                var expected = '<div id="loadingindicator" class="">' + message + '</div>';
                 $('body').html(
                     '<div id="loadingindicator" class="hidden">' + defaultMessage + '</div>'
                 );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showLoading(message, icon);
-                const result = $('body').html();
+                var result = $('body').html();
                 return expected === result;
             }
         );
@@ -271,11 +206,11 @@ describe('Alert', function () {
             function (message, icon) {
                 message = message.join('');
                 icon = icon.join('');
-                const defaultMessage = 'Loading…';
+                var defaultMessage = 'Loading…';
                 if (message.length === 0) {
                     message = defaultMessage;
                 }
-                const expected = '<ul class="nav navbar-nav"><li ' +
+                var expected = '<ul class="nav navbar-nav"><li ' +
                     'id="loadingindicator" class="navbar-text"><span ' +
                     'class="glyphicon glyphicon-' + icon +
                     '" aria-hidden="true"></span> <span>' + message + '</span></li></ul>';
@@ -287,7 +222,7 @@ describe('Alert', function () {
                 );
                 $.PrivateBin.Alert.init();
                 $.PrivateBin.Alert.showLoading(message, icon);
-                const result = $('body').html();
+                var result = $('body').html();
                 return expected === result;
             }
         );
@@ -343,7 +278,7 @@ describe('Alert', function () {
             jsc.array(common.jscAlnumString()),
             function (trigger, message) {
                 message = message.join('');
-                let handlerCalled = false,
+                var handlerCalled = false,
                     defaultMessage = 'Loading…',
                     functions = [
                         $.PrivateBin.Alert.showStatus,
@@ -375,7 +310,6 @@ describe('Alert', function () {
                     return jsc.random(0, 1) ? true : $element;
                 });
                 functions[trigger](message);
-                $.PrivateBin.Alert.setCustomHandler(null);
                 return handlerCalled;
             }
         );

js/test/AttachmentViewer.js

@@ -32,16 +32,6 @@ describe('AttachmentViewer', function () {
                     'Download attachment</a></div><div id="attachmentPrevie' +
                     'w" class="hidden"></div>'
                 );
-                // mock createObjectURL for jsDOM
-                if (typeof window.URL.createObjectURL === 'undefined') {
-                    Object.defineProperty(
-                        window.URL,
-                        'createObjectURL',
-                        {value: function(blob) {
-                            return 'blob:' + location.origin + '/1b9d6bcd-bbfd-4b2d-9b5d-ab8dfbbd4bed';
-                        }}
-                    )
-                }
                 $.PrivateBin.AttachmentViewer.init();
                 results.push(
                     !$.PrivateBin.AttachmentViewer.hasAttachment() &&
@@ -53,8 +43,6 @@ describe('AttachmentViewer', function () {
                 } else {
                     $.PrivateBin.AttachmentViewer.setAttachment(data);
                 }
-                // beyond this point we will get the blob URL instead of the data
-                data = window.URL.createObjectURL(data);
                 const attachment = $.PrivateBin.AttachmentViewer.getAttachment();
                 results.push(
                     $.PrivateBin.AttachmentViewer.hasAttachment() &&

js/test/Check.js

@@ -1,80 +0,0 @@
-'use strict';
-var common = require('../common');
-/* global Legacy, WebCrypto */
-
-describe('Check', function () {
-    describe('init', function () {
-        this.timeout(30000);
-
-        it('returns false and shows error, if a bot UA is detected', function () {
-            jsc.assert(jsc.forall(
-                'string',
-                jsc.elements(['Bot', 'bot']),
-                'string',
-                function (prefix, botBit, suffix) {
-                    const clean = jsdom(
-                        '<html><body><div id="errormessage" class="hidden"></div>' +
-                        '</body></html>', {
-                            'userAgent': prefix + botBit + suffix
-                        }
-                    );
-                    Legacy.Check.init();
-                    const result1 = Legacy.Check.getInit() && !Legacy.Check.getStatus(),
-                          result2 = (document.getElementById('errormessage').className !== 'hidden');
-                    clean();
-                    return result1 && result2;
-                }
-            ),
-            {tests: 10});
-        });
-
-        jsc.property(
-            'shows error, if no webcrypto is detected',
-            'bool',
-            jsc.elements(['localhost', '127.0.0.1', '[::1]', '']),
-            jsc.nearray(common.jscA2zString()),
-            jsc.elements(['.onion', '.i2p', '']),
-            function (secureProtocol, localhost, domain, tld) {
-                const isDomain = localhost === '',
-                      isSecureContext = secureProtocol || !isDomain || tld.length > 0,
-                      clean = jsdom(
-                          '<html><body><div id="errormessage" class="hidden"></div>' +
-                          '<div id="oldnotice" class="hidden"></div>' +
-                          '<div id="insecurecontextnotice" class="hidden"></div></body></html>',
-                          {
-                              'url': (secureProtocol ? 'https' : 'http' ) + '://' +
-                                     (isDomain ? domain.join('') + tld : localhost) + '/'
-                          }
-                      );
-                Legacy.Check.init();
-                const result1 = Legacy.Check.getInit() && !Legacy.Check.getStatus(),
-                      result2 = isSecureContext === (document.getElementById('insecurecontextnotice').className === 'hidden'),
-                      result3 = (document.getElementById('oldnotice').className !== 'hidden');
-                clean();
-                return result1 && result2 && result3;
-            }
-        );
-
-        jsc.property(
-            'shows error, if HTTP only site is detected',
-            'bool',
-            jsc.nearray(common.jscA2zString()),
-            function (secureProtocol, domain) {
-                const clean = jsdom(
-                          '<html><body><div id="httpnotice" class="hidden"></div>' +
-                          '</body></html>',
-                          {
-                              'url': (secureProtocol ? 'https' : 'http' ) + '://' + domain.join('') + '/'
-                          }
-                      );
-                window.crypto = new WebCrypto();
-                Legacy.Check.init();
-                const result1 = Legacy.Check.getInit() && Legacy.Check.getStatus(),
-                      result2 = secureProtocol === (document.getElementById('httpnotice').className === 'hidden');
-                clean();
-                return result1 && result2;
-            }
-        );
-    });
-});
-

js/test/CryptTool.js

@@ -3,53 +3,35 @@ require('../common');
 
 describe('CryptTool', function () {
     describe('cipher & decipher', function () {
-        afterEach(async function () {
-            // pause to let async functions conclude
-            await new Promise(resolve => setTimeout(resolve, 1900));
-        });
-
         this.timeout(30000);
         it('can en- and decrypt any message', function () {
-            jsc.assert(jsc.forall(
+            jsc.check(jsc.forall(
                 'string',
                 'string',
                 'string',
-                async function (key, password, message) {
+                function (key, password, message) {
-                    // pause to let async functions conclude
+                    return message === $.PrivateBin.CryptTool.decipher(
-                    await new Promise(resolve => setTimeout(resolve, 300));
+                        key,
-                    let clean = jsdom();
+                        password,
-                    // ensure zlib is getting loaded
+                        $.PrivateBin.CryptTool.cipher(key, password, message)
-                    $.PrivateBin.Controller.initZ();
+                    );
-                    window.crypto = new WebCrypto();
-                    message = message.trim();
-                    let cipherMessage = await $.PrivateBin.CryptTool.cipher(
-                            key, password, message, []
-                        ),
-                        plaintext = await $.PrivateBin.CryptTool.decipher(
-                            key, password, cipherMessage
-                        );
-                    clean();
-                    return message === plaintext;
                 }
             ),
-            {tests: 3});
+            // reducing amount of checks as running 100 takes about 5 minutes
+            {tests: 5, quiet: true});
         });
 
         // The below static unit tests are included to ensure deciphering of "classic"
         // SJCL based pastes still works
         it(
-            'supports PrivateBin v1 ciphertext (SJCL & browser atob)',
+            'supports PrivateBin v1 ciphertext (SJCL & Base64)',
             function () {
-                delete global.Base64;
-                let clean = jsdom();
-                window.crypto = new WebCrypto();
-
                 // Of course you can easily decipher the following texts, if you like.
                 // Bonus points for finding their sources and hidden meanings.
-                return $.PrivateBin.CryptTool.decipher(
+                var paste1 = $.PrivateBin.CryptTool.decipher(
                     '6t2qsmLyfXIokNCL+3/yl15rfTUBQvm5SOnFPvNE7Q8=',
                     // -- "That's amazing. I've got the same combination on my luggage."
-                    Array.apply(0, Array(6)).map((_,b) => b + 1).join(''),
+                    Array.apply(0, Array(6)).map(function(_,b) { return b + 1; }).join(''),
                     '{"iv":"4HNFIl7eYbCh6HuShctTIA==","v":1,"iter":10000,"ks"' +
                     ':256,"ts":128,"mode":"gcm","adata":"","cipher":"aes","sa' +
                     'lt":"u0lQvePq6L0=","ct":"fGPUVrDyaVr1ZDGb+kqQ3CPEW8x4YKG' +
@@ -77,56 +59,56 @@ describe('CryptTool', function () {
                     'QUxMXI5htsn2rf0HxCFu7Po8DNYLxTS+67hYjDIYWYaEIc8LXWMLyDm9' +
                     'C5fARPJ4F2BIWgzgzkNj+dVjusft2XnziamWdbS5u3kuRlVuz5LQj+R5' +
                     'imnqQAincdZTkTT1nYx+DatlOLllCYIHffpI="}'
-                ).then(function (paste1) {
+                ),
-                    $.PrivateBin.CryptTool.decipher(
+                paste2 = $.PrivateBin.CryptTool.decipher(
-                        's9pmKZKOBN7EVvHpTA8jjLFH3Xlz/0l8lB4+ONPACrM=',
+                    's9pmKZKOBN7EVvHpTA8jjLFH3Xlz/0l8lB4+ONPACrM=',
-                        '', // no password
+                    '', // no password
-                        '{"iv":"WA42mdxIVXUwBqZu7JYNiw==","v":1,"iter":10000,"ks"' +
+                    '{"iv":"WA42mdxIVXUwBqZu7JYNiw==","v":1,"iter":10000,"ks"' +
-                        ':256,"ts":128,"mode":"gcm","adata":"","cipher":"aes","sa' +
+                    ':256,"ts":128,"mode":"gcm","adata":"","cipher":"aes","sa' +
-                        'lt":"jN6CjbQMJCM=","ct":"kYYMo5DFG1+w0UHiYXT5pdV0IUuXxzO' +
+                    'lt":"jN6CjbQMJCM=","ct":"kYYMo5DFG1+w0UHiYXT5pdV0IUuXxzO' +
-                        'lslkW/c3DRCbGFROCVkAskHce7HoRczee1N9c5MhHjVMJUIZE02qIS8U' +
+                    'lslkW/c3DRCbGFROCVkAskHce7HoRczee1N9c5MhHjVMJUIZE02qIS8U' +
-                        'yHdJ/GqcPVidTUcj9rnDNWsTXkjVv8jCwHS/cwmAjDTWpwp5ThECN+ov' +
+                    'yHdJ/GqcPVidTUcj9rnDNWsTXkjVv8jCwHS/cwmAjDTWpwp5ThECN+ov' +
-                        '/wNp/NdtTj8Qj7f/T3rfZIOCWfwLH9s4Des35UNcUidfPTNQ1l0Gm0X+' +
+                    '/wNp/NdtTj8Qj7f/T3rfZIOCWfwLH9s4Des35UNcUidfPTNQ1l0Gm0X+' +
-                        'r98CCUSYZjQxkZc6hRZBLPQ8EaNVooUwd5eP4GiYlmSDNA0wOSA+5isP' +
+                    'r98CCUSYZjQxkZc6hRZBLPQ8EaNVooUwd5eP4GiYlmSDNA0wOSA+5isP' +
-                        'YxomVCt+kFf58VBlNhpfNi7BLYAUTPpXT4SfH5drR9+C7NTeZ+tTCYjb' +
+                    'YxomVCt+kFf58VBlNhpfNi7BLYAUTPpXT4SfH5drR9+C7NTeZ+tTCYjb' +
-                        'U94PzYItOpu8vgnB1/a6BAM5h3m9w+giUb0df4hgTWeZnZxLjo5BN8WV' +
+                    'U94PzYItOpu8vgnB1/a6BAM5h3m9w+giUb0df4hgTWeZnZxLjo5BN8WV' +
-                        '+kdTXMj3/Vv0gw0DQrDcCuX/cBAjpy3lQGwlAN1vXoOIyZJUjMpQRrOL' +
+                    '+kdTXMj3/Vv0gw0DQrDcCuX/cBAjpy3lQGwlAN1vXoOIyZJUjMpQRrOL' +
-                        'dKvLB+zcmVNtGDbgnfP2IYBzk9NtodpUa27ne0T0ZpwOPlVwevsIVZO2' +
+                    'dKvLB+zcmVNtGDbgnfP2IYBzk9NtodpUa27ne0T0ZpwOPlVwevsIVZO2' +
-                        '24WLa+iQmmHOWDFFpVDlS0t0fLfOk7Hcb2xFsTxiCIiyKMho/IME1Du3' +
+                    '24WLa+iQmmHOWDFFpVDlS0t0fLfOk7Hcb2xFsTxiCIiyKMho/IME1Du3' +
-                        'X4e6BVa3hobSSZv0rRtNgY1KcyYPrUPW2fxZ+oik3y9SgGvb7XpjVIta' +
+                    'X4e6BVa3hobSSZv0rRtNgY1KcyYPrUPW2fxZ+oik3y9SgGvb7XpjVIta' +
-                        '8DWlDWRfZ9kzoweWEYqz9IA8Xd373RefpyuWI25zlHoX3nwljzsZU6dC' +
+                    '8DWlDWRfZ9kzoweWEYqz9IA8Xd373RefpyuWI25zlHoX3nwljzsZU6dC' +
-                        '//h/Dt2DNr+IAvKO3+u23cWoB9kgcZJ2FJuqjLvVfCF+OWcig7zs2pTY' +
+                    '//h/Dt2DNr+IAvKO3+u23cWoB9kgcZJ2FJuqjLvVfCF+OWcig7zs2pTY' +
-                        'JW6Rg6lqbBCxiUUlae6xJrjfv0pzD2VYCLY7v1bVTagppwKzNI3WaluC' +
+                    'JW6Rg6lqbBCxiUUlae6xJrjfv0pzD2VYCLY7v1bVTagppwKzNI3WaluC' +
-                        'OrdDYUCxUSe56yd1oAoLPRVbYvomRboUO6cjQhEknERyvt45og2kORJO' +
+                    'OrdDYUCxUSe56yd1oAoLPRVbYvomRboUO6cjQhEknERyvt45og2kORJO' +
-                        'EJayHW+jZgR0Y0jM3Nk17ubpij2gHxNx9kiLDOiCGSV5mn9mV7qd3HHc' +
+                    'EJayHW+jZgR0Y0jM3Nk17ubpij2gHxNx9kiLDOiCGSV5mn9mV7qd3HHc' +
-                        'OMSykiBgbyzjobi96LT2dIGLeDXTIdPOog8wyobO4jWq0GGs0vBB8oSY' +
+                    'OMSykiBgbyzjobi96LT2dIGLeDXTIdPOog8wyobO4jWq0GGs0vBB8oSY' +
-                        'XhHvixZLcSjX2KQuHmEoWzmJcr3DavdoXZmAurGWLKjzEdJc5dSD/eNr' +
+                    'XhHvixZLcSjX2KQuHmEoWzmJcr3DavdoXZmAurGWLKjzEdJc5dSD/eNr' +
-                        '99gjHX7wphJ6umKMM+fn6PcbYJkhDh2GlJL5COXjXfm/5aj/vuyaRRWZ' +
+                    '99gjHX7wphJ6umKMM+fn6PcbYJkhDh2GlJL5COXjXfm/5aj/vuyaRRWZ' +
-                        'MZtmnYpGAtAPg7AUG"}'
+                    'MZtmnYpGAtAPg7AUG"}'
-                    ).then(function (paste2) {
+                );
-                        clean();
+
-                        assert.ok(
+                assert.ok(
-                            paste1.includes('securely packed in iron') &&
+                    paste1.includes('securely packed in iron') &&
-                            paste2.includes('Sol is right')
+                    paste2.includes('Sol is right')
-                        );
+                );
-                    });
-                });
             }
         );
 
         it(
             'supports ZeroBin ciphertext (SJCL & Base64 1.7)',
             function () {
+                var newBase64 = global.Base64;
                 global.Base64 = require('../base64-1.7').Base64;
-                var clean = jsdom();
+                jsdom();
-                window.crypto = new WebCrypto();
+                delete require.cache[require.resolve('../privatebin')];
+                require('../privatebin');
 
                 // Of course you can easily decipher the following texts, if you like.
                 // Bonus points for finding their sources and hidden meanings.
-                return $.PrivateBin.CryptTool.decipher(
+                var paste1 = $.PrivateBin.CryptTool.decipher(
                     '6t2qsmLyfXIokNCL+3/yl15rfTUBQvm5SOnFPvNE7Q8=',
                     // -- "That's amazing. I've got the same combination on my luggage."
-                    Array.apply(0, Array(6)).map((_,b) => b + 1).join(''),
+                    Array.apply(0, Array(6)).map(function(_,b) { return b + 1; }).join(''),
                     '{"iv":"aTnR2qBL1CAmLX8FdWe3VA==","v":1,"iter":10000,"ks"' +
                     ':256,"ts":128,"mode":"gcm","adata":"","cipher":"aes","sa' +
                     'lt":"u0lQvePq6L0=","ct":"A3nBTvICZtYy6xqbIJE0c8Veored5lM' +
@@ -146,121 +128,80 @@ describe('CryptTool', function () {
                     '7mNNo7xba/YT9KoPDaniqnYqb+q2pX1WNWE7dLS2wfroMAS3kh8P22DA' +
                     'V37AeiNoD2PcI6ZcHbRdPa+XRrRcJhSPPW7UQ0z4OvBfjdu/w390QxAx' +
                     'SxvZewoh49fKKB6hTsRnZb4tpHkjlww=="}'
-                ).then(function (paste1) {
+                ),
-                    $.PrivateBin.CryptTool.decipher(
+                paste2 = $.PrivateBin.CryptTool.decipher(
-                        's9pmKZKOBN7EVvHpTA8jjLFH3Xlz/0l8lB4+ONPACrM=',
+                    's9pmKZKOBN7EVvHpTA8jjLFH3Xlz/0l8lB4+ONPACrM=',
-                        '', // no password
+                    '', // no password
-                        '{"iv":"Z7lAZQbkrqGMvruxoSm6Pw==","v":1,"iter":10000,"ks"' +
+                    '{"iv":"Z7lAZQbkrqGMvruxoSm6Pw==","v":1,"iter":10000,"ks"' +
-                        ':256,"ts":128,"mode":"gcm","adata":"","cipher":"aes","sa' +
+                    ':256,"ts":128,"mode":"gcm","adata":"","cipher":"aes","sa' +
-                        'lt":"jN6CjbQMJCM=","ct":"PuOPWB3i2FPcreSrLYeQf84LdE8RHjs' +
+                    'lt":"jN6CjbQMJCM=","ct":"PuOPWB3i2FPcreSrLYeQf84LdE8RHjs' +
-                        'c+MGtiOr4b7doNyWKYtkNorbRadxaPnEee2/Utrp1MIIfY5juJSy8RGw' +
+                    'c+MGtiOr4b7doNyWKYtkNorbRadxaPnEee2/Utrp1MIIfY5juJSy8RGw' +
-                        'EPX5ciWcYe6EzsXWznsnvhmpKNj9B7eIIrfSbxfy8E2e/g7xav1nive+' +
+                    'EPX5ciWcYe6EzsXWznsnvhmpKNj9B7eIIrfSbxfy8E2e/g7xav1nive+' +
-                        'ljToka3WT1DZ8ILQd/NbnJeHWaoSEOfvz8+d8QJPb1tNZvs7zEY95Dum' +
+                    'ljToka3WT1DZ8ILQd/NbnJeHWaoSEOfvz8+d8QJPb1tNZvs7zEY95Dum' +
-                        'QwbyOsIMKAvcZHJ9OJNpujXzdMyt6DpcFcqlldWBZ/8q5rAUTw0HNx/r' +
+                    'QwbyOsIMKAvcZHJ9OJNpujXzdMyt6DpcFcqlldWBZ/8q5rAUTw0HNx/r' +
-                        'CgbhAxRYfNoTLIcMM4L0cXbPSgCjwf5FuO3EdE13mgEDhcClW79m0Qvc' +
+                    'CgbhAxRYfNoTLIcMM4L0cXbPSgCjwf5FuO3EdE13mgEDhcClW79m0Qvc' +
-                        'nIh8xgzYoxLbp0+AwvC/MbZM8savN/0ieWr2EKkZ04ggiOIEyvfCUuNp' +
+                    'nIh8xgzYoxLbp0+AwvC/MbZM8savN/0ieWr2EKkZ04ggiOIEyvfCUuNp' +
-                        'rQBYO+y8kKduNEN6by0Yf4LRCPfmwN+GezDLuzTnZIMhPbGqUAdgV6Ex' +
+                    'rQBYO+y8kKduNEN6by0Yf4LRCPfmwN+GezDLuzTnZIMhPbGqUAdgV6Ex' +
-                        'qK2ULEEIrQEMoOuQIxfoMhqLlzG79vXGt2O+BY+4IiYfvmuRLks4UXfy' +
+                    'qK2ULEEIrQEMoOuQIxfoMhqLlzG79vXGt2O+BY+4IiYfvmuRLks4UXfy' +
-                        'HqxPXTJg48IYbGs0j4TtJPUgp3523EyYLwEGyVTAuWhYAmVIwd/hoV7d' +
+                    'HqxPXTJg48IYbGs0j4TtJPUgp3523EyYLwEGyVTAuWhYAmVIwd/hoV7d' +
-                        '7tmfcF73w9dufDFI3LNca2KxzBnWNPYvIZKBwWbq8ncxkb191dP6mjEi' +
+                    '7tmfcF73w9dufDFI3LNca2KxzBnWNPYvIZKBwWbq8ncxkb191dP6mjEi' +
-                        '7NnhqVk5A6vIBbu4AC5PZf76l6yep4xsoy/QtdDxCMocCXeAML9MQ9uP' +
+                    '7NnhqVk5A6vIBbu4AC5PZf76l6yep4xsoy/QtdDxCMocCXeAML9MQ9uP' +
-                        'QbuspOKrBvMfN5igA1kBqasnxI472KBNXsdZnaDddSVUuvhTcETM="}'
+                    'QbuspOKrBvMfN5igA1kBqasnxI472KBNXsdZnaDddSVUuvhTcETM="}'
-                    ).then(function (paste2) {
+                );
-                        clean();
+
-                        delete global.Base64;
+                global.Base64 = newBase64;
-                        assert.ok(
+                jsdom();
-                            paste1.includes('securely packed in iron') &&
+                delete require.cache[require.resolve('../privatebin')];
-                            paste2.includes('Sol is right')
+                require('../privatebin');
-                        );
+                assert.ok(
-                    });
+                    paste1.includes('securely packed in iron') &&
-                });
+                    paste2.includes('Sol is right')
+                );
             }
         );
+    });
 
-        it('does not truncate messages', async function () {
+    describe('isEntropyReady & addEntropySeedListener', function () {
-            let message = fs.readFileSync('test/compression-sample.txt', 'utf8'),
+        it(
-                clean = jsdom();
+            'lets us know that enough entropy is collected or make us wait for it',
-            window.crypto = new WebCrypto();
+            function(done) {
-            // ensure zlib is getting loaded
+                if ($.PrivateBin.CryptTool.isEntropyReady()) {
-            $.PrivateBin.Controller.initZ();
+                    done();
-            let cipherMessage = await $.PrivateBin.CryptTool.cipher(
+                } else {
-                    'foo', 'bar', message, []
+                    $.PrivateBin.CryptTool.addEntropySeedListener(function() {
-                ),
+                        done();
-                plaintext = await $.PrivateBin.CryptTool.decipher(
+                    });
-                        'foo', 'bar', cipherMessage
-                );
-            clean();
-            assert.strictEqual(
-                message,
-                plaintext
-            );
-        });
-
-        it('can en- and decrypt a particular message (#260)', function () {
-            jsc.assert(jsc.forall(
-                'string',
-                'string',
-                async function (key, password) {
-                    // pause to let async functions conclude
-                    await new Promise(resolve => setTimeout(resolve, 300));
-                    const message = `
-1 subgoal
-
-inv : Assert
-expr : Expr
-sBody : Instr
-deduction : (|- [|inv /\ assertOfExpr expr|] sBody [|inv|])%assert
-IHdeduction : (|= [|inv /\ assertOfExpr expr |] sBody [|inv|])%assert
-mem : Mem
-preInMem : inv mem
-m : Mem
-n : nat
-interpRel : interp (nth_iterate sBody n) (MemElem mem) = CpoElem Mem m
-lastIter : interp (nth_iterate sBody n) (MemElem mem) |=e expr_neg expr
-notLastIter : forall p : nat,
-              p < n -> interp (nth_iterate sBody p) (MemElem mem) |=e expr
-isWhile : interp (while expr sBody) (MemElem mem) =
-          interp (nth_iterate sBody n) (MemElem mem)
-
-======================== ( 1 / 1 )
-conseq_or_bottom inv (interp (nth_iterate sBody n) (MemElem mem))
-`;
-                    let clean = jsdom();
-                    // ensure zlib is getting loaded
-                    $.PrivateBin.Controller.initZ();
-                    window.crypto = new WebCrypto();
-                    let cipherMessage = await $.PrivateBin.CryptTool.cipher(
-                            key, password, message, []
-                        ),
-                        plaintext = await $.PrivateBin.CryptTool.decipher(
-                                key, password, cipherMessage
-                        );
-                    clean();
-                    return message === plaintext;
                 }
-            ),
+            }
-            {tests: 3});
+        );
-        });
     });
 
     describe('getSymmetricKey', function () {
-        this.timeout(30000);
         var keys = [];
 
         // the parameter is used to ensure the test is run more then one time
         jsc.property(
             'returns random, non-empty keys',
-            'integer',
+            function() {
-            function(counter) {
-                var clean = jsdom();
-                window.crypto = new WebCrypto();
                 var key = $.PrivateBin.CryptTool.getSymmetricKey(),
                     result = (key !== '' && keys.indexOf(key) === -1);
                 keys.push(key);
-                clean();
                 return result;
             }
         );
     });
+
+    describe('Base64.js vs SJCL.js vs abab.js', function () {
+        jsc.property(
+            'these all return the same base64 string',
+            'string',
+            function(string) {
+                var base64 = Base64.toBase64(string),
+                    sjcl = global.sjcl.codec.base64.fromBits(global.sjcl.codec.utf8String.toBits(string)),
+                    abab = window.btoa(Base64.utob(string));
+                return base64 === sjcl && sjcl === abab;
+            }
+        );
+    });
 });
 

js/test/DiscussionViewer.js

@@ -60,7 +60,7 @@ describe('DiscussionViewer', function () {
                 comments.forEach(function (comment) {
                     comment.id = comment.idArray.join('');
                     comment.parentid = comment.parentidArray.join('');
-                    $.PrivateBin.DiscussionViewer.addComment($.PrivateBin.Helper.CommentFactory(comment), comment.data, comment.meta.nickname);
+                    $.PrivateBin.DiscussionViewer.addComment(comment, comment.data, comment.meta.nickname);
                 });
                 results.push(
                     $('#discussion').hasClass('hidden')

js/test/Helper.js

@@ -73,7 +73,6 @@ describe('Helper', function () {
     });
 
     describe('urls2links', function () {
-        this.timeout(30000);
         before(function () {
             cleanup = jsdom();
         });
@@ -82,15 +81,7 @@ describe('Helper', function () {
             'ignores non-URL content',
             'string',
             function (content) {
-                content = content.replace(/\r|\f/g, '\n').replace(/\u0000/g, '').replace(/\u000b/g, '');
+                return content === $.PrivateBin.Helper.urls2links(content);
-                let clean = jsdom();
-                $('body').html('<div id="foo"></div>');
-                let e = $('#foo');
-                e.text(content);
-                $.PrivateBin.Helper.urls2links(e);
-                let result = e.text();
-                clean();
-                return content === result;
             }
         );
         jsc.property(
@@ -104,12 +95,9 @@ describe('Helper', function () {
             function (prefix, schema, address, query, fragment, postfix) {
                 query    = query.join('');
                 fragment = fragment.join('');
-                prefix = prefix.replace(/\r|\f/g, '\n').replace(/\u0000/g, '').replace(/\u000b/g, '');
+                prefix   = $.PrivateBin.Helper.htmlEntities(prefix);
-                postfix  = ' ' + postfix.replace(/\r/g, '\n').replace(/\u0000/g, '');
+                postfix  = ' ' + $.PrivateBin.Helper.htmlEntities(postfix);
-                let url  = schema + '://' + address.join('') + '/?' + query + '#' + fragment,
+                let url  = schema + '://' + address.join('') + '/?' + query + '#' + fragment;
-                    clean = jsdom();
-                $('body').html('<div id="foo"></div>');
-                let e = $('#foo');
 
                 // special cases: When the query string and fragment imply the beginning of an HTML entity, eg. &#0 or &#x
                 if (
@@ -120,12 +108,8 @@ describe('Helper', function () {
                     url = schema + '://' + address.join('') + '/?' + query.substring(0, query.length - 1);
                     postfix = '';
                 }
-                e.text(prefix + url + postfix);
+
-                $.PrivateBin.Helper.urls2links(e);
+                return prefix + '<a href="' + url + '" rel="nofollow">' + url + '</a>' + postfix === $.PrivateBin.Helper.urls2links(prefix + url + postfix);
-                let result = e.html();
-                clean();
-                url = $('<div />').text(url).html();
-                return $('<div />').text(prefix).html() + '<a href="' + url + '" target="_blank" rel="nofollow noopener noreferrer">' + url + '</a>' + $('<div />').text(postfix).html() === result;
             }
         );
         jsc.property(
@@ -134,18 +118,10 @@ describe('Helper', function () {
             jsc.array(common.jscQueryString()),
             'string',
             function (prefix, query, postfix) {
-                prefix = prefix.replace(/\r|\f/g, '\n').replace(/\u0000/g, '').replace(/\u000b/g, '');
+                prefix   = $.PrivateBin.Helper.htmlEntities(prefix);
-                postfix = ' ' + postfix.replace(/\r/g, '\n').replace(/\u0000/g, '');
+                postfix  = $.PrivateBin.Helper.htmlEntities(postfix);
-                let url  = 'magnet:?' + query.join('').replace(/^&+|&+$/gm,''),
+                let url  = 'magnet:?' + query.join('').replace(/^&+|&+$/gm,'');
-                    clean = jsdom();
+                return prefix + '<a href="' + url + '" rel="nofollow">' + url + '</a> ' + postfix === $.PrivateBin.Helper.urls2links(prefix + url + ' ' + postfix);
-                $('body').html('<div id="foo"></div>');
-                let e = $('#foo');
-                e.text(prefix + url + postfix);
-                $.PrivateBin.Helper.urls2links(e);
-                let result = e.html();
-                clean();
-                url = $('<div />').text(url).html();
-                return $('<div />').text(prefix).html() + '<a href="' + url + '" target="_blank" rel="nofollow noopener noreferrer">' + url + '</a>' + $('<div />').text(postfix).html() === result;
             }
         );
     });

js/test/Memory.js

@@ -1,60 +0,0 @@
-'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/Model.js

@@ -74,7 +74,7 @@ describe('Model', function () {
 
     describe('getPasteId', function () {
         this.timeout(30000);
-        beforeEach(function () {
+        before(function () {
             $.PrivateBin.Model.reset();
         });
 
@@ -82,24 +82,18 @@ describe('Model', function () {
             'returns the query string without separator, if any',
             jsc.nearray(common.jscA2zString()),
             jsc.nearray(common.jscA2zString()),
-            jsc.tuple(new Array(16).fill(common.jscHexString)),
+            jsc.nearray(common.jscHashString()),
-            jsc.array(common.jscQueryString()),
-            jsc.array(common.jscQueryString()),
             'string',
-            function (schema, address, pasteId, queryStart, queryEnd, fragment) {
+            function (schema, address, query, fragment) {
-                var pasteIdString    = pasteId.join(''),
+                var queryString = query.join(''),
-                    queryStartString = queryStart.join('') + (queryStart.length > 0 ? '&' : ''),
+                    clean = jsdom('', {
-                    queryEndString   = (queryEnd.length > 0 ? '&' : '') + queryEnd.join(''),
-                    queryString      = queryStartString + pasteIdString + queryEndString,
-                    clean            = jsdom('', {
                         url: schema.join('') + '://' + address.join('') +
                              '/?' + queryString + '#' + fragment
-                    });
+                    }),
-                    global.URL = require('jsdom-url').URL;
+                    result = $.PrivateBin.Model.getPasteId();
-                    var result = $.PrivateBin.Model.getPasteId();
                 $.PrivateBin.Model.reset();
                 clean();
-                return pasteIdString === result;
+                return queryString === result;
             }
         );
         jsc.property(
@@ -113,7 +107,6 @@ describe('Model', function () {
                              '/#' + fragment
                     }),
                     result = false;
-                global.URL = require('jsdom-url').URL;
                 try {
                     $.PrivateBin.Model.getPasteId();
                 }
@@ -129,19 +122,15 @@ describe('Model', function () {
 
     describe('getPasteKey', function () {
         this.timeout(30000);
-        beforeEach(function () {
-            $.PrivateBin.Model.reset();
-        });
-
         jsc.property(
-            'returns the fragment of a v1 URL',
+            'returns the fragment of the URL',
             jsc.nearray(common.jscA2zString()),
             jsc.nearray(common.jscA2zString()),
             jsc.array(common.jscQueryString()),
-            'nestring',
+            jsc.nearray(common.jscBase64String()),
             function (schema, address, query, fragment) {
-                const fragmentString = common.btoa(fragment.padStart(32, '\u0000'));
+                var fragmentString = fragment.join(''),
-                let clean = jsdom('', {
+                    clean = jsdom('', {
                         url: schema.join('') + '://' + address.join('') +
                              '/?' + query.join('') + '#' + fragmentString
                     }),
@@ -152,15 +141,15 @@ describe('Model', function () {
             }
         );
         jsc.property(
-            'returns the v1 fragment stripped of trailing query parts',
+            'returns the fragment stripped of trailing query parts',
             jsc.nearray(common.jscA2zString()),
             jsc.nearray(common.jscA2zString()),
             jsc.array(common.jscQueryString()),
-            'nestring',
+            jsc.nearray(common.jscBase64String()),
             jsc.array(common.jscHashString()),
             function (schema, address, query, fragment, trail) {
-                const fragmentString = common.btoa(fragment.padStart(32, '\u0000'));
+                var fragmentString = fragment.join(''),
-                let clean = jsdom('', {
+                    clean = jsdom('', {
                         url: schema.join('') + '://' + address.join('') + '/?' +
                              query.join('') + '#' + fragmentString + '&' + trail.join('')
                     }),
@@ -170,47 +159,6 @@ describe('Model', function () {
                 return fragmentString === result;
             }
         );
-        jsc.property(
-            'returns the fragment of a v2 URL',
-            jsc.nearray(common.jscA2zString()),
-            jsc.nearray(common.jscA2zString()),
-            jsc.array(common.jscQueryString()),
-            'nestring',
-            function (schema, address, query, fragment) {
-                // base58 strips leading NULL bytes, so the string is padded with these if not found
-                fragment = fragment.padStart(32, '\u0000');
-                let fragmentString = $.PrivateBin.CryptTool.base58encode(fragment),
-                    clean = jsdom('', {
-                        url: schema.join('') + '://' + address.join('') +
-                             '/?' + query.join('') + '#' + fragmentString
-                    }),
-                    result = $.PrivateBin.Model.getPasteKey();
-                $.PrivateBin.Model.reset();
-                clean();
-                return fragment === result;
-            }
-        );
-        jsc.property(
-            'returns the v2 fragment stripped of trailing query parts',
-            jsc.nearray(common.jscA2zString()),
-            jsc.nearray(common.jscA2zString()),
-            jsc.array(common.jscQueryString()),
-            'nestring',
-            jsc.array(common.jscHashString()),
-            function (schema, address, query, fragment, trail) {
-                // base58 strips leading NULL bytes, so the string is padded with these if not found
-                fragment = fragment.padStart(32, '\u0000');
-                let fragmentString = $.PrivateBin.CryptTool.base58encode(fragment),
-                    clean = jsdom('', {
-                        url: schema.join('') + '://' + address.join('') + '/?' +
-                             query.join('') + '#' + fragmentString + '&' + trail.join('')
-                    }),
-                    result = $.PrivateBin.Model.getPasteKey();
-                $.PrivateBin.Model.reset();
-                clean();
-                return fragment === result;
-            }
-        );
         jsc.property(
             'throws exception on empty fragment of the URL',
             jsc.nearray(common.jscA2zString()),
@@ -236,7 +184,7 @@ describe('Model', function () {
     });
 
     describe('getTemplate', function () {
-        beforeEach(function () {
+        before(function () {
             $.PrivateBin.Model.reset();
         });
 

js/test/PasteStatus.js

@@ -38,7 +38,7 @@ describe('PasteStatus', function () {
         this.timeout(30000);
 
         jsc.property(
-            'shows burn after reading message or remaining time v1',
+            'shows burn after reading message or remaining time',
             'bool',
             'nat',
             jsc.nearray(common.jscA2zString()),
@@ -56,51 +56,11 @@ describe('PasteStatus', function () {
                     result;
                 $('body').html('<div id="remainingtime" class="hidden"></div>');
                 $.PrivateBin.PasteStatus.init();
-                $.PrivateBin.PasteStatus.showRemainingTime($.PrivateBin.Helper.PasteFactory({'meta': {
+                $.PrivateBin.PasteStatus.showRemainingTime({
                     'burnafterreading': burnafterreading,
-                    'remaining_time': remainingTime
+                    'remaining_time': remainingTime,
-                }}));
+                    'expire_date': remainingTime ? ((new Date()).getTime() / 1000) + remainingTime : 0
-                if (burnafterreading) {
+                });
-                    result = $('#remainingtime').hasClass('foryoureyesonly') &&
-                            !$('#remainingtime').hasClass('hidden');
-                } else if (remainingTime) {
-                    result =!$('#remainingtime').hasClass('foryoureyesonly') &&
-                            !$('#remainingtime').hasClass('hidden');
-                } else {
-                    result = $('#remainingtime').hasClass('hidden') &&
-                            !$('#remainingtime').hasClass('foryoureyesonly');
-                }
-                clean();
-                return result;
-            }
-        );
-
-        jsc.property(
-            'shows burn after reading message or remaining time v2',
-            'bool',
-            'nat',
-            jsc.nearray(common.jscA2zString()),
-            jsc.nearray(common.jscA2zString()),
-            jsc.nearray(common.jscQueryString()),
-            'string',
-            function (
-                burnafterreading, remainingTime,
-                schema, address, query, fragment
-            ) {
-                var clean = jsdom('', {
-                        url: schema.join('') + '://' + address.join('') +
-                             '/?' + query.join('') + '#' + fragment
-                    }),
-                    result;
-                $('body').html('<div id="remainingtime" class="hidden"></div>');
-                $.PrivateBin.PasteStatus.init();
-                $.PrivateBin.PasteStatus.showRemainingTime($.PrivateBin.Helper.PasteFactory({
-                    'adata': [null, null, null, burnafterreading],
-                    'v': 2,
-                    'meta': {
-                        'time_to_live': remainingTime
-                    }
-                }));
                 if (burnafterreading) {
                     result = $('#remainingtime').hasClass('foryoureyesonly') &&
                             !$('#remainingtime').hasClass('hidden');

js/test/Prompt.js

@@ -12,7 +12,7 @@ describe('Prompt', function () {
             'string',
             function (password) {
                 password = password.replace(/\r+/g, '');
-                var clean = jsdom('', {url: 'ftp://example.com/?0000000000000000'});
+                var clean = jsdom('', {url: 'ftp://example.com/?0'});
                 $('body').html(
                     '<div id="passwordmodal" class="modal fade" role="dialog">' +
                     '<div class="modal-dialog"><div class="modal-content">' +
@@ -27,10 +27,8 @@ describe('Prompt', function () {
                 $.PrivateBin.Prompt.init();
                 $.PrivateBin.Prompt.requestPassword();
                 $('#passworddecrypt').val(password);
-                // TODO triggers error messages in current jsDOM version, find better solution
+                $('#passwordform').submit();
-                //$('#passwordform').submit();
+                var result = $.PrivateBin.Prompt.getPassword();
-                //var result = $.PrivateBin.Prompt.getPassword();
-                var result = $('#passworddecrypt').val();
                 $.PrivateBin.Model.reset();
                 clean();
                 return result === password;

js/test/ServerInteraction.js

@@ -1,40 +0,0 @@
-'use strict';
-require('../common');
-
-describe('ServerInteraction', function () {
-    describe('prepare', function () {
-        afterEach(async function () {
-            // pause to let async functions conclude
-            await new Promise(resolve => setTimeout(resolve, 1900));
-        });
-        this.timeout(30000);
-        it('can prepare an encrypted paste', function () {
-            jsc.assert(jsc.forall(
-                'string',
-                'string',
-                'string',
-                async function (key, password, message) {
-                    // pause to let async functions conclude
-                    await new Promise(resolve => setTimeout(resolve, 300));
-                    let clean = jsdom();
-                    window.crypto = new WebCrypto();
-                    message = message.trim();
-
-                    $.PrivateBin.ServerInteraction.prepare();
-                    $.PrivateBin.ServerInteraction.setCryptParameters(password, key);
-                    $.PrivateBin.ServerInteraction.setUnencryptedData('adata', [
-                        // encryption parameters defined by CryptTool, format, discussion, burn after reading
-                        null, 'plaintext', 0, 0
-                    ]);
-                    $.PrivateBin.ServerInteraction.setUnencryptedData('meta', {'expire': '5min'});
-                    await $.PrivateBin.ServerInteraction.setCipherMessage({'paste': message});
-                    //console.log($.PrivateBin.ServerInteraction.getData());
-                    clean();
-                    // TODO currently not testing anything and just used to generate v2 pastes for starting development of server side v2 implementation
-                    return true;
-                }
-            ),
-            {tests: 3});
-        });
-    });
-});

js/test/TopNav.js

@@ -118,6 +118,62 @@ 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();
@@ -270,7 +326,7 @@ describe('TopNav', function () {
             'returns the currently selected expiration date',
             function () {
                 $.PrivateBin.TopNav.init();
-                assert.ok($.PrivateBin.TopNav.getExpiration() === null);
+                assert.ok($.PrivateBin.TopNav.getExpiration() === '1week');
             }
         );
     });

js/test/UiHelper.js

@@ -6,7 +6,7 @@ describe('UiHelper', function () {
     // for now we use a mock function to trigger the event
     describe('historyChange', function () {
         this.timeout(30000);
-        beforeEach(function () {
+        before(function () {
             $.PrivateBin.Helper.reset();
             cleanup();
         });

js/types.jsonld

@@ -1,124 +0,0 @@
-{
-	"@context": {
-		"so": "https://schema.org/",
-		"dp": "http://dbpedia.org/resource/",
-		"pb": "?jsonld=types#"
-	},
-	"Base64": {
-		"@type": "so:Text"
-	},
-	"CipherText": {
-		"@type": "pb:Base64"
-	},
-	"PasteCipherMessage": {
-		"paste": {
-			"@type": "so:Text"
-		},
-		"attachment": {
-			"@type": "so:MediaObject"
-		},
-		"attachment_name": {
-			"@type": "so:Text"
-		}
-	},
-	"CommentCipherMessage": {
-		"comment": {
-			"@type": "so:Text"
-		},
-		"nickname": {
-			"@type": "so:Text"
-		}
-	},
-	"InitializationVector": {
-		"@type": "pb:Base64"
-	},
-	"Salt": {
-		"@type": "pb:Base64"
-	},
-	"Iterations": {
-		"@type": "so:Integer",
-		"@minimum": 1
-	},
-	"KeySize": {
-		"@type": "so:Integer",
-		"@value": 256,
-		"@minimum": 128,
-		"@maximum": 256,
-		"@enum": [128, 196, 256]
-	},
-	"TagSize": {
-		"@type": "so:Integer",
-		"@value": 128,
-		"@minimum": 32,
-		"@maximum": 128,
-		"@enum": [32, 64, 96, 104, 112, 120, 128]
-	},
-	"Algorithm": {
-		"@type": "so:Text",
-		"@value": "aes"
-	},
-	"Mode": {
-		"@type": "so:Text",
-		"@value": "gcm",
-		"@enum": ["ctr", "cbc", "gcm"]
-	},
-	"Compression": {
-		"@type": "so:Text",
-		"@value": "zlib",
-		"@enum": ["zlib", "none"]
-	},
-	"Formatter": {
-		"@type": "so:Text",
-		"@value": "plaintext",
-		"@enum": ["plaintext", "syntaxhighlighting", "markdown"]
-	},
-	"Expiration": {
-		"@type": "so:Text",
-		"@value": "1week",
-		"@enum": ["5min", "10min", "1hour", "1day", "1week", "1month", "1year", "never"]
-	},
-	"OpenDiscussion": {
-		"@type": "so:Boolean",
-		"@enum": [false, true]
-	},
-	"BurnAfterReading": {
-		"@type": "so:Boolean",
-		"@enum": [false, true]
-	},
-	"CreationTime": {
-		"@type": "dp:Unix_time"
-	},
-	"RemainingSeconds": {
-		"@type": "dp:Second",
-		"@minimum": 1
-	},
-	"CipherParameters": {
-		"@container": "@list",
-		"@value": [
-			{
-				"@type": "pb:InitializationVector"
-			},
-			{
-				"@type": "pb:Salt"
-			},
-			{
-				"@type": "pb:Iterations"
-			},
-			{
-				"@type": "pb:KeySize"
-			},
-			{
-				"@type": "pb:TagSize"
-			},
-			{
-				"@type": "pb:Algorithm"
-			},
-			{
-				"@type": "pb:Mode"
-			},
-			{
-				"@type": "pb:Compression"
-			}
-		]
-	}
-}

js/zlib-1.2.11.js

@@ -1,146 +0,0 @@
-'use strict';
-
-(function() {
-    let ret;
-
-    async function initialize() {
-        if (ret) return ret;
-
-        const COMPRESSION_LEVEL = 7;
-        const NO_ZLIB_HEADER = -1;
-        const CHUNK_SIZE = 32 * 1024;
-        const map = {};
-        const memory = new WebAssembly.Memory({
-            initial: 1,
-            maximum: 1024, // 64MB
-        });
-        const env = {
-            memory,
-            writeToJs(ptr, size) {
-                const o = map[ptr];
-                o.onData(new Uint8Array(memory.buffer, dstPtr, size));
-            },
-            _abort: errno => { console.error(`Error: ${errno}`) },
-            _grow: () => { },
-        };
-
-        let buff;
-        if (typeof fetch === 'undefined') {
-            buff = fs.readFileSync('zlib-1.2.11.wasm');
-        } else {
-            const resp = await fetch('js/zlib-1.2.11.wasm');
-            buff = await resp.arrayBuffer();
-        }
-        const module = await WebAssembly.compile(buff);
-        const ins = await WebAssembly.instantiate(module, { env });
-
-        const srcPtr = ins.exports._malloc(CHUNK_SIZE);
-        const dstPtr = ins.exports._malloc(CHUNK_SIZE);
-
-        class RawDef {
-            constructor() {
-                this.zstreamPtr = ins.exports._createDeflateContext(COMPRESSION_LEVEL, NO_ZLIB_HEADER);
-                map[this.zstreamPtr] = this;
-                this.offset = 0;
-                this.buff = new Uint8Array(CHUNK_SIZE);
-            }
-
-            deflate(chunk, flush) {
-                const src = new Uint8Array(memory.buffer, srcPtr, chunk.length);
-                src.set(chunk);
-                ins.exports._deflate(this.zstreamPtr, srcPtr, dstPtr, chunk.length, CHUNK_SIZE, flush);
-            }
-
-            onData(chunk) {
-                if (this.buff.length < this.offset + chunk.length) {
-                    const buff = this.buff;
-                    this.buff = new Uint8Array(this.buff.length * 2);
-                    this.buff.set(buff);
-                }
-                this.buff.set(chunk, this.offset);
-                this.offset += chunk.length;
-            }
-
-            destroy() {
-                ins.exports._freeDeflateContext(this.zstreamPtr);
-                delete map[this.zstreamPtr];
-                this.buff = null;
-            }
-
-            getBuffer() {
-                const res = new Uint8Array(this.offset);
-                for (let i = 0; i < this.offset; ++i) {
-                    res[i] = this.buff[i];
-                }
-                return res;
-            }
-        }
-
-        class RawInf {
-            constructor() {
-                this.zstreamPtr = ins.exports._createInflateContext(NO_ZLIB_HEADER);
-                map[this.zstreamPtr] = this;
-                this.offset = 0;
-                this.buff = new Uint8Array(CHUNK_SIZE);
-            }
-
-            inflate(chunk) {
-                const src = new Uint8Array(memory.buffer, srcPtr, chunk.length);
-                src.set(chunk);
-                ins.exports._inflate(this.zstreamPtr, srcPtr, dstPtr, chunk.length, CHUNK_SIZE);
-            }
-
-            onData(chunk) {
-                if (this.buff.length < this.offset + chunk.length) {
-                    const buff = this.buff;
-                    this.buff = new Uint8Array(this.buff.length * 2);
-                    this.buff.set(buff);
-                }
-                this.buff.set(chunk, this.offset);
-                this.offset += chunk.length;
-            }
-
-            destroy() {
-                ins.exports._freeInflateContext(this.zstreamPtr);
-                delete map[this.zstreamPtr];
-                this.buff = null;
-            }
-
-            getBuffer() {
-                const res = new Uint8Array(this.offset);
-                for (let i = 0; i < this.offset; ++i) {
-                    res[i] = this.buff[i];
-                }
-                return res;
-            }
-        }
-
-        ret = {
-                inflate(rawDeflateBuffer) {
-                    const rawInf = new RawInf();
-                    for (let offset = 0; offset < rawDeflateBuffer.length; offset += CHUNK_SIZE) {
-                        const end = Math.min(offset + CHUNK_SIZE, rawDeflateBuffer.length);
-                        const chunk = rawDeflateBuffer.subarray(offset, end);
-                        rawInf.inflate(chunk);
-                    }
-                    const ret = rawInf.getBuffer();
-                    rawInf.destroy();
-                    return ret;
-                },
-                deflate(rawInflateBuffer) {
-                    const rawDef = new RawDef();
-                    for (let offset = 0; offset < rawInflateBuffer.length; offset += CHUNK_SIZE) {
-                        const end = Math.min(offset + CHUNK_SIZE, rawInflateBuffer.length);
-                        const chunk = rawInflateBuffer.subarray(offset, end);
-                        rawDef.deflate(chunk, rawInflateBuffer.length <= offset + CHUNK_SIZE);
-                    }
-                    const ret = rawDef.getBuffer();
-                    rawDef.destroy();
-                    return ret;
-                },
-        }
-
-        return ret;
-    }
-    this.zlib = initialize();
-}).call(this);

lib/Configuration.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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin;
@@ -38,7 +38,6 @@ class Configuration
     private static $_defaults = array(
         'main' => array(
             'name'                     => 'PrivateBin',
-            'basepath'                 => '',
             'discussion'               => true,
             'opendiscussion'           => false,
             'password'                 => true,
@@ -46,7 +45,7 @@ class Configuration
             'burnafterreadingselected' => false,
             'defaultformatter'         => 'plaintext',
             'syntaxhighlightingtheme'  => null,
-            'sizelimit'                => 10485760,
+            'sizelimit'                => 2097152,
             'template'                 => 'bootstrap',
             'notice'                   => '',
             'languageselection'        => false,
@@ -54,10 +53,8 @@ class Configuration
             'urlshortener'             => '',
             'qrcode'                   => true,
             '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',
+            'cspheader'                => 'default-src \'none\'; manifest-src \'self\'; connect-src *; script-src \'self\'; style-src \'self\'; font-src \'self\'; img-src \'self\' data:; media-src data:; object-src data:; Referrer-Policy: \'no-referrer\'; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals',
             'zerobincompatibility'     => false,
-            'httpwarning'              => true,
-            'compression'              => 'zlib',
         ),
         'expire' => array(
             'default' => '1week',
@@ -103,9 +100,8 @@ class Configuration
     public function __construct()
     {
         $config     = array();
-        $basePath   = (getenv('CONFIG_PATH') !== false ? getenv('CONFIG_PATH') : PATH . 'cfg') . DIRECTORY_SEPARATOR;
+        $configFile = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.php';
-        $configIni  = $basePath . 'conf.ini';
+        $configIni  = PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.ini';
-        $configFile = $basePath . 'conf.php';
 
         // rename INI files to avoid configuration leakage
         if (is_readable($configIni)) {
@@ -114,7 +110,7 @@ class Configuration
             // cleanup sample, too
             $configIniSample = $configIni . '.sample';
             if (is_readable($configIniSample)) {
-                DataStore::prependRename($configIniSample, $basePath . 'conf.sample.php', ';');
+                DataStore::prependRename($configIniSample, PATH . 'cfg' . DIRECTORY_SEPARATOR . 'conf.sample.php', ';');
             }
         }
 

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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin;
@@ -28,14 +28,14 @@ class Controller
      *
      * @const string
      */
-    const VERSION = '1.3.4';
+    const VERSION = '1.2.3';
 
     /**
      * minimal required PHP version
      *
      * @const string
      */
-    const MIN_PHP_VERSION = '5.6.0';
+    const MIN_PHP_VERSION = '5.4.0';
 
     /**
      * show the same error message if the paste expired or does not exist
@@ -154,7 +154,6 @@ class Controller
      * initialize PrivateBin
      *
      * @access private
-     * @throws Exception
      */
     private function _init()
     {
@@ -178,16 +177,16 @@ class Controller
      * Store new paste or comment
      *
      * POST contains one or both:
-     * data = json encoded FormatV2 encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
+     * data = json encoded SJCL encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
-     * attachment = json encoded FormatV2 encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
+     * attachment = json encoded SJCL encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
      *
      * All optional data will go to meta information:
      * expire (optional) = expiration delay (never,5min,10min,1hour,1day,1week,1month,1year,burn) (default:never)
      * formatter (optional) = format to display the paste as (plaintext,syntaxhighlighting,markdown) (default:syntaxhighlighting)
      * burnafterreading (optional) = if this paste may only viewed once ? (0/1) (default:0)
      * opendiscusssion (optional) = is the discussion allowed on this paste ? (0/1) (default:0)
-     * attachmentname = json encoded FormatV2 encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
+     * attachmentname = json encoded SJCL encrypted text (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
-     * nickname (optional) = in discussion, encoded FormatV2 encrypted text nickname of author of comment (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
+     * nickname (optional) = in discussion, encoded SJCL encrypted text nickname of author of comment (containing keys: iv,v,iter,ks,ts,mode,adata,cipher,salt,ct)
      * parentid (optional) = in discussion, which comment this comment replies to.
      * pasteid (optional) = in discussion, which paste this comment belongs to.
      *
@@ -196,60 +195,62 @@ class Controller
      */
     private function _create()
     {
-        try {
+        // Ensure last paste from visitors IP address was more than configured amount of seconds ago.
-            // Ensure last paste from visitors IP address was more than configured amount of seconds ago.
+        TrafficLimiter::setConfiguration($this->_conf);
-            TrafficLimiter::setConfiguration($this->_conf);
+        if (!TrafficLimiter::canPass()) {
-            if (!TrafficLimiter::canPass()) {
+            return $this->_return_message(
-                $this->_return_message(
+            1, I18n::_(
-                    1, I18n::_(
+                'Please wait %d seconds between each post.',
-                        'Please wait %d seconds between each post.',
+                $this->_conf->getKey('limit', 'traffic')
-                        $this->_conf->getKey('limit', 'traffic')
+            )
-                    )
+        );
-                );
-                return;
-            }
-        } catch (Exception $e) {
-            $this->_return_message(1, I18n::_($e->getMessage()));
-            return;
         }
 
-        $data      = $this->_request->getData();
+        $data           = $this->_request->getParam('data');
-        $isComment = array_key_exists('pasteid', $data) &&
+        $attachment     = $this->_request->getParam('attachment');
-            !empty($data['pasteid']) &&
+        $attachmentname = $this->_request->getParam('attachmentname');
-            array_key_exists('parentid', $data) &&
+
-            !empty($data['parentid']);
-        if (!FormatV2::isValid($data, $isComment)) {
-            $this->_return_message(1, I18n::_('Invalid data.'));
-            return;
-        }
-        $sizelimit = $this->_conf->getKey('sizelimit');
         // Ensure content is not too big.
-        if (strlen($data['ct']) > $sizelimit) {
+        $sizelimit = $this->_conf->getKey('sizelimit');
-            $this->_return_message(
+        if (
-                1,
+            strlen($data) + strlen($attachment) + strlen($attachmentname) > $sizelimit
-                I18n::_(
+        ) {
-                    'Paste is limited to %s of encrypted data.',
+            return $this->_return_message(
-                    Filter::formatHumanReadableSize($sizelimit)
+            1,
-                )
+            I18n::_(
-            );
+                'Paste is limited to %s of encrypted data.',
-            return;
+                Filter::formatHumanReadableSize($sizelimit)
+            )
+        );
+        }
+
+        // Ensure attachment did not get lost due to webserver limits or Suhosin
+        if (strlen($attachmentname) > 0 && strlen($attachment) == 0) {
+            return $this->_return_message(1, 'Attachment missing in data received by server. Please check your webserver or suhosin configuration for maximum POST parameter limitations.');
         }
 
         // The user posts a comment.
-        if ($isComment) {
+        $pasteid  = $this->_request->getParam('pasteid');
-            $paste = $this->_model->getPaste($data['pasteid']);
+        $parentid = $this->_request->getParam('parentid');
+        if (!empty($pasteid) && !empty($parentid)) {
+            $paste = $this->_model->getPaste($pasteid);
             if ($paste->exists()) {
                 try {
-                    $comment = $paste->getComment($data['parentid']);
+                    $comment = $paste->getComment($parentid);
+
+                    $nickname = $this->_request->getParam('nickname');
+                    if (!empty($nickname)) {
+                        $comment->setNickname($nickname);
+                    }
+
                     $comment->setData($data);
                     $comment->store();
                 } catch (Exception $e) {
-                    $this->_return_message(1, $e->getMessage());
+                    return $this->_return_message(1, $e->getMessage());
-                    return;
                 }
                 $this->_return_message(0, $comment->getId());
             } else {
-                $this->_return_message(1, I18n::_('Invalid data.'));
+                $this->_return_message(1, 'Invalid data.');
             }
         }
         // The user posts a standard paste.
@@ -258,6 +259,34 @@ class Controller
             $paste = $this->_model->getPaste();
             try {
                 $paste->setData($data);
+
+                if (!empty($attachment)) {
+                    $paste->setAttachment($attachment);
+                    if (!empty($attachmentname)) {
+                        $paste->setAttachmentName($attachmentname);
+                    }
+                }
+
+                $expire = $this->_request->getParam('expire');
+                if (!empty($expire)) {
+                    $paste->setExpiration($expire);
+                }
+
+                $burnafterreading = $this->_request->getParam('burnafterreading');
+                if (!empty($burnafterreading)) {
+                    $paste->setBurnafterreading($burnafterreading);
+                }
+
+                $opendiscussion = $this->_request->getParam('opendiscussion');
+                if (!empty($opendiscussion)) {
+                    $paste->setOpendiscussion($opendiscussion);
+                }
+
+                $formatter = $this->_request->getParam('formatter');
+                if (!empty($formatter)) {
+                    $paste->setFormatter($formatter);
+                }
+
                 $paste->store();
             } catch (Exception $e) {
                 return $this->_return_message(1, $e->getMessage());
@@ -278,15 +307,22 @@ class Controller
         try {
             $paste = $this->_model->getPaste($dataid);
             if ($paste->exists()) {
-                // accessing this method ensures that the paste would be
+                // accessing this property ensures that the paste would be
                 // deleted if it has already expired
-                $paste->get();
+                $burnafterreading = $paste->isBurnafterreading();
-                if (hash_equals($paste->getDeleteToken(), $deletetoken)) {
+                if (
-                    // Paste exists and deletion token is valid: Delete the paste.
+                    ($burnafterreading && $deletetoken == 'burnafterreading') || // either we burn-after it has been read //@TODO: not needed anymore now?
+                    Filter::slowEquals($deletetoken, $paste->getDeleteToken()) // or we manually delete it with this secret token
+                ) {
+                    // Paste exists and deletion token (if required) is valid: Delete the paste.
                     $paste->delete();
                     $this->_status = 'Paste was properly deleted.';
                 } else {
-                    $this->_error = 'Wrong deletion token. Paste was not deleted.';
+                    if (!$burnafterreading && $deletetoken == 'burnafterreading') {
+                        $this->_error = 'Paste is not of burn-after-reading type.';
+                    } else {
+                        $this->_error = 'Wrong deletion token. Paste was not deleted.';
+                    }
                 }
             } else {
                 $this->_error = self::GENERIC_ERROR;
@@ -319,8 +355,8 @@ class Controller
             $paste = $this->_model->getPaste($dataid);
             if ($paste->exists()) {
                 $data = $paste->get();
-                if (array_key_exists('salt', $data['meta'])) {
+                if (property_exists($data->meta, 'salt')) {
-                    unset($data['meta']['salt']);
+                    unset($data->meta->salt);
                 }
                 $this->_return_message(0, $dataid, (array) $data);
             } else {
@@ -346,7 +382,6 @@ class Controller
         header('Last-Modified: ' . $time);
         header('Vary: Accept');
         header('Content-Security-Policy: ' . $this->_conf->getKey('cspheader'));
-        header('Referrer-Policy: no-referrer');
         header('X-Xss-Protection: 1; mode=block');
         header('X-Frame-Options: DENY');
         header('X-Content-Type-Options: nosniff');
@@ -369,7 +404,6 @@ class Controller
 
         $page = new View;
         $page->assign('NAME', $this->_conf->getKey('name'));
-        $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);
@@ -391,9 +425,6 @@ class Controller
         $page->assign('EXPIREDEFAULT', $this->_conf->getKey('default', 'expire'));
         $page->assign('URLSHORTENER', $this->_conf->getKey('urlshortener'));
         $page->assign('QRCODE', $this->_conf->getKey('qrcode'));
-        $page->assign('HTTPWARNING', $this->_conf->getKey('httpwarning'));
-        $page->assign('HTTPSLINK', 'https://' . $this->_request->getHost() . $this->_request->getRequestUri());
-        $page->assign('COMPRESSION', $this->_conf->getKey('compression'));
         $page->draw($this->_conf->getKey('template'));
     }
 
@@ -445,6 +476,6 @@ class Controller
             $result['url'] = $this->_urlBase . '?' . $message;
         }
         $result += $other;
-        $this->_json = Json::encode($result);
+        $this->_json = json_encode($result);
     }
 }

lib/Data/AbstractData.php

@@ -7,11 +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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Data;
 
+use stdClass;
+
 /**
  * AbstractData
  *
@@ -58,7 +60,7 @@ abstract class AbstractData
      * @param  array $options
      * @return AbstractData
      */
-    public static function getInstance(array $options)
+    public static function getInstance($options)
     {
     }
 
@@ -70,14 +72,14 @@ abstract class AbstractData
      * @param  array  $paste
      * @return bool
      */
-    abstract public function create($pasteid, array $paste);
+    abstract public function create($pasteid, $paste);
 
     /**
      * Read a paste.
      *
      * @access public
      * @param  string $pasteid
-     * @return array|false
+     * @return stdClass|false
      */
     abstract public function read($pasteid);
 
@@ -108,7 +110,7 @@ abstract class AbstractData
      * @param  array  $comment
      * @return bool
      */
-    abstract public function createComment($pasteid, $parentid, $commentid, array $comment);
+    abstract public function createComment($pasteid, $parentid, $commentid, $comment);
 
     /**
      * Read all comments of paste.
@@ -161,12 +163,12 @@ abstract class AbstractData
     /**
      * Get next free slot for comment from postdate.
      *
-     * @access protected
+     * @access public
      * @param  array $comments
      * @param  int|string $postdate
      * @return int|string
      */
-    protected function getOpenSlot(array &$comments, $postdate)
+    protected function getOpenSlot(&$comments, $postdate)
     {
         if (array_key_exists($postdate, $comments)) {
             $parts = explode('.', $postdate, 2);
@@ -178,25 +180,4 @@ abstract class AbstractData
         }
         return $postdate;
     }
-
-    /**
-     * Upgrade pre-version 1 pastes with attachment to version 1 format.
-     *
-     * @access protected
-     * @static
-     * @param  array $paste
-     * @return array
-     */
-    protected static function upgradePreV1Format(array $paste)
-    {
-        if (array_key_exists('attachment', $paste['meta'])) {
-            $paste['attachment'] = $paste['meta']['attachment'];
-            unset($paste['meta']['attachment']);
-            if (array_key_exists('attachmentname', $paste['meta'])) {
-                $paste['attachmentname'] = $paste['meta']['attachmentname'];
-                unset($paste['meta']['attachmentname']);
-            }
-        }
-        return $paste;
-    }
 }

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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Data;
@@ -16,7 +16,7 @@ use Exception;
 use PDO;
 use PDOException;
 use PrivateBin\Controller;
-use PrivateBin\Json;
+use stdClass;
 
 /**
  * Database
@@ -68,78 +68,80 @@ class Database extends AbstractData
      * @throws Exception
      * @return Database
      */
-    public static function getInstance(array $options)
+    public static function getInstance($options = null)
     {
         // if needed initialize the singleton
         if (!(self::$_instance instanceof self)) {
             self::$_instance = new self;
         }
 
-        // set table prefix if given
+        if (is_array($options)) {
-        if (array_key_exists('tbl', $options)) {
+            // set table prefix if given
-            self::$_prefix = $options['tbl'];
+            if (array_key_exists('tbl', $options)) {
-        }
+                self::$_prefix = $options['tbl'];
-
-        // initialize the db connection with new options
-        if (
-            array_key_exists('dsn', $options) &&
-            array_key_exists('usr', $options) &&
-            array_key_exists('pwd', $options) &&
-            array_key_exists('opt', $options)
-        ) {
-            // set default options
-            $options['opt'][PDO::ATTR_ERRMODE]          = PDO::ERRMODE_EXCEPTION;
-            $options['opt'][PDO::ATTR_EMULATE_PREPARES] = false;
-            $options['opt'][PDO::ATTR_PERSISTENT]       = true;
-            $db_tables_exist                            = true;
-
-            // setup type and dabase connection
-            self::$_type = strtolower(
-                substr($options['dsn'], 0, strpos($options['dsn'], ':'))
-            );
-            $tableQuery = self::_getTableQuery(self::$_type);
-            self::$_db  = new PDO(
-                $options['dsn'],
-                $options['usr'],
-                $options['pwd'],
-                $options['opt']
-            );
-
-            // check if the database contains the required tables
-            $tables = self::$_db->query($tableQuery)->fetchAll(PDO::FETCH_COLUMN, 0);
-
-            // create paste table if necessary
-            if (!in_array(self::_sanitizeIdentifier('paste'), $tables)) {
-                self::_createPasteTable();
-                $db_tables_exist = false;
             }
 
-            // create comment table if necessary
+            // initialize the db connection with new options
-            if (!in_array(self::_sanitizeIdentifier('comment'), $tables)) {
+            if (
-                self::_createCommentTable();
+                array_key_exists('dsn', $options) &&
-                $db_tables_exist = false;
+                array_key_exists('usr', $options) &&
-            }
+                array_key_exists('pwd', $options) &&
+                array_key_exists('opt', $options)
+            ) {
+                // set default options
+                $options['opt'][PDO::ATTR_ERRMODE]          = PDO::ERRMODE_EXCEPTION;
+                $options['opt'][PDO::ATTR_EMULATE_PREPARES] = false;
+                $options['opt'][PDO::ATTR_PERSISTENT]       = true;
+                $db_tables_exist                            = true;
 
-            // create config table if necessary
+                // setup type and dabase connection
-            $db_version = Controller::VERSION;
+                self::$_type = strtolower(
-            if (!in_array(self::_sanitizeIdentifier('config'), $tables)) {
+                    substr($options['dsn'], 0, strpos($options['dsn'], ':'))
-                self::_createConfigTable();
+                );
-                // if we only needed to create the config table, the DB is older then 0.22
+                $tableQuery = self::_getTableQuery(self::$_type);
-                if ($db_tables_exist) {
+                self::$_db  = new PDO(
-                    $db_version = '0.21';
+                    $options['dsn'],
+                    $options['usr'],
+                    $options['pwd'],
+                    $options['opt']
+                );
+
+                // check if the database contains the required tables
+                $tables = self::$_db->query($tableQuery)->fetchAll(PDO::FETCH_COLUMN, 0);
+
+                // create paste table if necessary
+                if (!in_array(self::_sanitizeIdentifier('paste'), $tables)) {
+                    self::_createPasteTable();
+                    $db_tables_exist = false;
+                }
+
+                // create comment table if necessary
+                if (!in_array(self::_sanitizeIdentifier('comment'), $tables)) {
+                    self::_createCommentTable();
+                    $db_tables_exist = false;
+                }
+
+                // create config table if necessary
+                $db_version = Controller::VERSION;
+                if (!in_array(self::_sanitizeIdentifier('config'), $tables)) {
+                    self::_createConfigTable();
+                    // if we only needed to create the config table, the DB is older then 0.22
+                    if ($db_tables_exist) {
+                        $db_version = '0.21';
+                    }
+                } else {
+                    $db_version = self::_getConfig('VERSION');
+                }
+
+                // update database structure if necessary
+                if (version_compare($db_version, Controller::VERSION, '<')) {
+                    self::_upgradeDatabase($db_version);
                 }
             } else {
-                $db_version = self::_getConfig('VERSION');
+                throw new Exception(
+                    'Missing configuration for key dsn, usr, pwd or opt in the section model_options, please check your configuration file', 6
+                );
             }
-
-            // update database structure if necessary
-            if (version_compare($db_version, Controller::VERSION, '<')) {
-                self::_upgradeDatabase($db_version);
-            }
-        } else {
-            throw new Exception(
-                'Missing configuration for key dsn, usr, pwd or opt in the section model_options, please check your configuration file', 6
-            );
         }
 
         return self::$_instance;
@@ -153,7 +155,7 @@ class Database extends AbstractData
      * @param  array  $paste
      * @return bool
      */
-    public function create($pasteid, array $paste)
+    public function create($pasteid, $paste)
     {
         if (
             array_key_exists($pasteid, self::$_cache)
@@ -165,50 +167,42 @@ class Database extends AbstractData
             }
         }
 
-        $expire_date      = 0;
+        $opendiscussion = $burnafterreading = false;
-        $opendiscussion   = $burnafterreading = false;
+        $attachment     = $attachmentname     = '';
-        $attachment       = $attachmentname   = null;
+        $meta           = $paste['meta'];
-        $meta             = $paste['meta'];
+        unset($meta['postdate']);
-        $isVersion1       = array_key_exists('data', $paste);
+        $expire_date = 0;
-        list($createdKey) = self::_getVersionedKeys($isVersion1 ? 1 : 2);
+        if (array_key_exists('expire_date', $paste['meta'])) {
-        $created          = (int) $meta[$createdKey];
+            $expire_date = (int) $paste['meta']['expire_date'];
-        unset($meta[$createdKey], $paste['meta']);
-        if (array_key_exists('expire_date', $meta)) {
-            $expire_date = (int) $meta['expire_date'];
             unset($meta['expire_date']);
         }
-        if (array_key_exists('opendiscussion', $meta)) {
+        if (array_key_exists('opendiscussion', $paste['meta'])) {
-            $opendiscussion = $meta['opendiscussion'];
+            $opendiscussion = (bool) $paste['meta']['opendiscussion'];
             unset($meta['opendiscussion']);
         }
-        if (array_key_exists('burnafterreading', $meta)) {
+        if (array_key_exists('burnafterreading', $paste['meta'])) {
-            $burnafterreading = $meta['burnafterreading'];
+            $burnafterreading = (bool) $paste['meta']['burnafterreading'];
             unset($meta['burnafterreading']);
         }
-        if ($isVersion1) {
+        if (array_key_exists('attachment', $paste['meta'])) {
-            if (array_key_exists('attachment', $meta)) {
+            $attachment = $paste['meta']['attachment'];
-                $attachment = $meta['attachment'];
+            unset($meta['attachment']);
-                unset($meta['attachment']);
+        }
-            }
+        if (array_key_exists('attachmentname', $paste['meta'])) {
-            if (array_key_exists('attachmentname', $meta)) {
+            $attachmentname = $paste['meta']['attachmentname'];
-                $attachmentname = $meta['attachmentname'];
+            unset($meta['attachmentname']);
-                unset($meta['attachmentname']);
-            }
-        } else {
-            $opendiscussion   = $paste['adata'][2];
-            $burnafterreading = $paste['adata'][3];
         }
         return self::_exec(
             'INSERT INTO ' . self::_sanitizeIdentifier('paste') .
             ' VALUES(?,?,?,?,?,?,?,?,?)',
             array(
                 $pasteid,
-                $isVersion1 ? $paste['data'] : Json::encode($paste),
+                $paste['data'],
-                $created,
+                $paste['meta']['postdate'],
                 $expire_date,
                 (int) $opendiscussion,
                 (int) $burnafterreading,
-                Json::encode($meta),
+                json_encode($meta),
                 $attachment,
                 $attachmentname,
             )
@@ -220,63 +214,65 @@ class Database extends AbstractData
      *
      * @access public
      * @param  string $pasteid
-     * @return array|false
+     * @return stdClass|false
      */
     public function read($pasteid)
     {
-        if (array_key_exists($pasteid, self::$_cache)) {
+        if (
-            return self::$_cache[$pasteid];
+            !array_key_exists($pasteid, self::$_cache)
-        }
+        ) {
+            self::$_cache[$pasteid] = false;
+            $paste                  = self::_select(
+                'SELECT * FROM ' . self::_sanitizeIdentifier('paste') .
+                ' WHERE dataid = ?', array($pasteid), true
+            );
 
-        self::$_cache[$pasteid] = false;
+            if (false !== $paste) {
-        $paste                  = self::_select(
+                // create object
-            'SELECT * FROM ' . self::_sanitizeIdentifier('paste') .
+                self::$_cache[$pasteid]       = new stdClass;
-            ' WHERE dataid = ?', array($pasteid), true
+                self::$_cache[$pasteid]->data = $paste['data'];
-        );
 
-        if ($paste === false) {
+                $meta = json_decode($paste['meta']);
-            return false;
+                if (!is_object($meta)) {
-        }
+                    $meta = new stdClass;
-        // create array
+                }
-        $data       = Json::decode($paste['data']);
-        $isVersion2 = array_key_exists('v', $data) && $data['v'] >= 2;
-        if ($isVersion2) {
-            self::$_cache[$pasteid] = $data;
-            list($createdKey)       = self::_getVersionedKeys(2);
-        } else {
-            self::$_cache[$pasteid] = array('data' => $paste['data']);
-            list($createdKey)       = self::_getVersionedKeys(1);
-        }
 
-        try {
+                // support older attachments
-            $paste['meta'] = Json::decode($paste['meta']);
+                if (property_exists($meta, 'attachment')) {
-        } catch (Exception $e) {
+                    self::$_cache[$pasteid]->attachment = $meta->attachment;
-            $paste['meta'] = array();
+                    unset($meta->attachment);
-        }
+                    if (property_exists($meta, 'attachmentname')) {
-        $paste                                       = self::upgradePreV1Format($paste);
+                        self::$_cache[$pasteid]->attachmentname = $meta->attachmentname;
-        self::$_cache[$pasteid]['meta']              = $paste['meta'];
+                        unset($meta->attachmentname);
-        self::$_cache[$pasteid]['meta'][$createdKey] = (int) $paste['postdate'];
+                    }
-        $expire_date                                 = (int) $paste['expiredate'];
+                }
-        if ($expire_date > 0) {
+                // support current attachments
-            self::$_cache[$pasteid]['meta']['expire_date'] = $expire_date;
+                elseif (array_key_exists('attachment', $paste) && strlen($paste['attachment'])) {
-        }
+                    self::$_cache[$pasteid]->attachment = $paste['attachment'];
-        if ($isVersion2) {
+                    if (array_key_exists('attachmentname', $paste) && strlen($paste['attachmentname'])) {
-            return self::$_cache[$pasteid];
+                        self::$_cache[$pasteid]->attachmentname = $paste['attachmentname'];
-        }
+                    }
-
+                }
-        // support v1 attachments
+                self::$_cache[$pasteid]->meta           = $meta;
-        if (array_key_exists('attachment', $paste) && strlen($paste['attachment'])) {
+                self::$_cache[$pasteid]->meta->postdate = (int) $paste['postdate'];
-            self::$_cache[$pasteid]['attachment'] = $paste['attachment'];
+                $expire_date                            = (int) $paste['expiredate'];
-            if (array_key_exists('attachmentname', $paste) && strlen($paste['attachmentname'])) {
+                if (
-                self::$_cache[$pasteid]['attachmentname'] = $paste['attachmentname'];
+                    $expire_date > 0
+                ) {
+                    self::$_cache[$pasteid]->meta->expire_date = $expire_date;
+                }
+                if (
+                    $paste['opendiscussion']
+                ) {
+                    self::$_cache[$pasteid]->meta->opendiscussion = true;
+                }
+                if (
+                    $paste['burnafterreading']
+                ) {
+                    self::$_cache[$pasteid]->meta->burnafterreading = true;
+                }
             }
         }
-        if ($paste['opendiscussion']) {
-            self::$_cache[$pasteid]['meta']['opendiscussion'] = true;
-        }
-        if ($paste['burnafterreading']) {
-            self::$_cache[$pasteid]['meta']['burnafterreading'] = true;
-        }
 
         return self::$_cache[$pasteid];
     }
@@ -331,21 +327,11 @@ class Database extends AbstractData
      * @param  array  $comment
      * @return bool
      */
-    public function createComment($pasteid, $parentid, $commentid, array $comment)
+    public function createComment($pasteid, $parentid, $commentid, $comment)
     {
-        if (array_key_exists('data', $comment)) {
+        foreach (array('nickname', 'vizhash') as $key) {
-            $version = 1;
+            if (!array_key_exists($key, $comment['meta'])) {
-            $data    = $comment['data'];
+                $comment['meta'][$key] = null;
-        } else {
-            $version = 2;
-            $data    = Json::encode($comment);
-        }
-        list($createdKey, $iconKey) = self::_getVersionedKeys($version);
-        $meta                       = $comment['meta'];
-        unset($comment['meta']);
-        foreach (array('nickname', $iconKey) as $key) {
-            if (!array_key_exists($key, $meta)) {
-                $meta[$key] = null;
             }
         }
         return self::_exec(
@@ -355,10 +341,10 @@ class Database extends AbstractData
                 $commentid,
                 $pasteid,
                 $parentid,
-                $data,
+                $comment['data'],
-                $meta['nickname'],
+                $comment['meta']['nickname'],
-                $meta[$iconKey],
+                $comment['meta']['vizhash'],
-                $meta[$createdKey],
+                $comment['meta']['postdate'],
             )
         );
     }
@@ -381,22 +367,16 @@ class Database extends AbstractData
         $comments = array();
         if (count($rows)) {
             foreach ($rows as $row) {
-                $i    = $this->getOpenSlot($comments, (int) $row['postdate']);
+                $i                            = $this->getOpenSlot($comments, (int) $row['postdate']);
-                $data = Json::decode($row['data']);
+                $comments[$i]                 = new stdClass;
-                if (array_key_exists('v', $data) && $data['v'] >= 2) {
+                $comments[$i]->id             = $row['dataid'];
-                    $version      = 2;
+                $comments[$i]->parentid       = $row['parentid'];
-                    $comments[$i] = $data;
+                $comments[$i]->data           = $row['data'];
-                } else {
+                $comments[$i]->meta           = new stdClass;
-                    $version      = 1;
+                $comments[$i]->meta->postdate = (int) $row['postdate'];
-                    $comments[$i] = array('data' => $row['data']);
+                foreach (array('nickname', 'vizhash') as $key) {
-                }
+                    if (array_key_exists($key, $row) && !empty($row[$key])) {
-                list($createdKey, $iconKey) = self::_getVersionedKeys($version);
+                        $comments[$i]->meta->$key = $row[$key];
-                $comments[$i]['id']         = $row['dataid'];
-                $comments[$i]['parentid']   = $row['parentid'];
-                $comments[$i]['meta']       = array($createdKey => (int) $row['postdate']);
-                foreach (array('nickname' => 'nickname', 'vizhash' => $iconKey) as $rowKey => $commentKey) {
-                    if (array_key_exists($rowKey, $row) && !empty($row[$rowKey])) {
-                        $comments[$i]['meta'][$commentKey] = $row[$rowKey];
                     }
                 }
             }
@@ -435,8 +415,7 @@ class Database extends AbstractData
         $pastes = array();
         $rows   = self::_select(
             'SELECT dataid FROM ' . self::_sanitizeIdentifier('paste') .
-            ' WHERE expiredate < ? AND expiredate != ? LIMIT ?',
+            ' WHERE expiredate < ? AND expiredate != ? LIMIT ?', array(time(), 0, $batchsize)
-            array(time(), 0, $batchsize)
         );
         if (count($rows)) {
             foreach ($rows as $row) {
@@ -473,7 +452,7 @@ class Database extends AbstractData
      * @param  array $params
      * @param  bool $firstOnly if only the first row should be returned
      * @throws PDOException
-     * @return array|false
+     * @return array
      */
     private static function _select($sql, array $params, $firstOnly = false)
     {
@@ -486,22 +465,6 @@ class Database extends AbstractData
         return $result;
     }
 
-    /**
-     * get version dependent key names
-     *
-     * @access private
-     * @static
-     * @param  int $version
-     * @return array
-     */
-    private static function _getVersionedKeys($version)
-    {
-        if ($version === 1) {
-            return array('postdate', 'vizhash');
-        }
-        return array('created', 'icon');
-    }
-
     /**
      * get table list query, depending on the database type
      *
@@ -580,7 +543,7 @@ class Database extends AbstractData
      *
      * @access private
      * @static
-     * @param  string $key
+     * @param string $key
      * @return array
      */
     private static function _getPrimaryKeyClauses($key = 'dataid')
@@ -594,34 +557,6 @@ class Database extends AbstractData
         return array($main_key, $after_key);
     }
 
-    /**
-     * get the data type, depending on the database driver
-     *
-     * PostgreSQL uses a different API for BLOBs then SQL, hence we use TEXT
-     *
-     * @access private
-     * @static
-     * @return string
-     */
-    private static function _getDataType()
-    {
-        return self::$_type === 'pgsql' ? 'TEXT' : 'BLOB';
-    }
-
-    /**
-     * get the attachment type, depending on the database driver
-     *
-     * PostgreSQL uses a different API for BLOBs then SQL, hence we use TEXT
-     *
-     * @access private
-     * @static
-     * @return string
-     */
-    private static function _getAttachmentType()
-    {
-        return self::$_type === 'pgsql' ? 'TEXT' : 'MEDIUMBLOB';
-    }
-
     /**
      * create the paste table
      *
@@ -631,18 +566,17 @@ class Database extends AbstractData
     private static function _createPasteTable()
     {
         list($main_key, $after_key) = self::_getPrimaryKeyClauses();
-        $dataType                   = self::_getDataType();
+        $dataType                   = self::$_type === 'pgsql' ? 'TEXT' : 'BLOB';
-        $attachmentType             = self::_getAttachmentType();
         self::$_db->exec(
             'CREATE TABLE ' . self::_sanitizeIdentifier('paste') . ' ( ' .
             "dataid CHAR(16) NOT NULL$main_key, " .
-            "data $attachmentType, " .
+            "data $dataType, " .
             'postdate INT, ' .
             'expiredate INT, ' .
             'opendiscussion INT, ' .
             'burnafterreading INT, ' .
             'meta TEXT, ' .
-            "attachment $attachmentType, " .
+            'attachment ' . (self::$_type === 'pgsql' ? 'TEXT' : 'MEDIUMBLOB') . ', ' .
             "attachmentname $dataType$after_key );"
         );
     }
@@ -656,7 +590,7 @@ class Database extends AbstractData
     private static function _createCommentTable()
     {
         list($main_key, $after_key) = self::_getPrimaryKeyClauses();
-        $dataType                   = self::_getDataType();
+        $dataType                   = self::$_type === 'pgsql' ? 'text' : 'BLOB';
         self::$_db->exec(
             'CREATE TABLE ' . self::_sanitizeIdentifier('comment') . ' ( ' .
             "dataid CHAR(16) NOT NULL$main_key, " .
@@ -715,8 +649,7 @@ class Database extends AbstractData
      */
     private static function _upgradeDatabase($oldversion)
     {
-        $dataType       = self::_getDataType();
+        $dataType = self::$_type === 'pgsql' ? 'TEXT' : 'BLOB';
-        $attachmentType = self::_getAttachmentType();
         switch ($oldversion) {
             case '0.21':
                 // create the meta column if necessary (pre 0.21 change)
@@ -728,7 +661,8 @@ class Database extends AbstractData
                 // SQLite only allows one ALTER statement at a time...
                 self::$_db->exec(
                     'ALTER TABLE ' . self::_sanitizeIdentifier('paste') .
-                    " ADD COLUMN attachment $attachmentType;"
+                    ' ADD COLUMN attachment ' .
+                    (self::$_type === 'pgsql' ? 'TEXT' : 'MEDIUMBLOB') . ';'
                 );
                 self::$_db->exec(
                     'ALTER TABLE ' . self::_sanitizeIdentifier('paste') . " ADD COLUMN attachmentname $dataType;"
@@ -738,7 +672,7 @@ class Database extends AbstractData
                 if (self::$_type !== 'sqlite') {
                     self::$_db->exec(
                         'ALTER TABLE ' . self::_sanitizeIdentifier('paste') .
-                        " ADD PRIMARY KEY (dataid), MODIFY COLUMN data $dataType;"
+                        ' ADD PRIMARY KEY (dataid), MODIFY COLUMN data $dataType;'
                     );
                     self::$_db->exec(
                         'ALTER TABLE ' . self::_sanitizeIdentifier('comment') .
@@ -760,17 +694,6 @@ class Database extends AbstractData
                     self::_sanitizeIdentifier('comment') . '(pasteid);'
                 );
                 // no break, continue with updates for 0.22 and later
-            case '1.3':
-                // SQLite doesn't support MODIFY, but it allows TEXT of similar
-                // size as BLOB and PostgreSQL uses TEXT, so there is no need
-                // to change it there
-                if (self::$_type !== 'sqlite' && self::$_type !== 'pgsql') {
-                    self::$_db->exec(
-                        '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') .

lib/Data/Filesystem.php

@@ -7,11 +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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Data;
 
+use PrivateBin\Model\Paste;
 use PrivateBin\Persistence\DataStore;
 
 /**
@@ -29,7 +30,7 @@ class Filesystem extends AbstractData
      * @param  array $options
      * @return Filesystem
      */
-    public static function getInstance(array $options)
+    public static function getInstance($options = null)
     {
         // if needed initialize the singleton
         if (!(self::$_instance instanceof self)) {
@@ -53,7 +54,7 @@ class Filesystem extends AbstractData
      * @param  array  $paste
      * @return bool
      */
-    public function create($pasteid, array $paste)
+    public function create($pasteid, $paste)
     {
         $storagedir = self::_dataid2path($pasteid);
         $file       = $storagedir . $pasteid . '.php';
@@ -71,16 +72,23 @@ class Filesystem extends AbstractData
      *
      * @access public
      * @param  string $pasteid
-     * @return array|false
+     * @return stdClass|false
      */
     public function read($pasteid)
     {
         if (!$this->exists($pasteid)) {
             return false;
         }
-        return self::upgradePreV1Format(
+        $paste = DataStore::get(self::_dataid2path($pasteid) . $pasteid . '.php');
-            DataStore::get(self::_dataid2path($pasteid) . $pasteid . '.php')
+        if (property_exists($paste->meta, 'attachment')) {
-        );
+            $paste->attachment = $paste->meta->attachment;
+            unset($paste->meta->attachment);
+            if (property_exists($paste->meta, 'attachmentname')) {
+                $paste->attachmentname = $paste->meta->attachmentname;
+                unset($paste->meta->attachmentname);
+            }
+        }
+        return $paste;
     }
 
     /**
@@ -155,7 +163,7 @@ class Filesystem extends AbstractData
      * @param  array  $comment
      * @return bool
      */
-    public function createComment($pasteid, $parentid, $commentid, array $comment)
+    public function createComment($pasteid, $parentid, $commentid, $comment)
     {
         $storagedir = self::_dataid2discussionpath($pasteid);
         $file       = $storagedir . $pasteid . '.' . $commentid . '.' . $parentid . '.php';
@@ -190,11 +198,11 @@ class Filesystem extends AbstractData
                     $comment = DataStore::get($discdir . $filename);
                     $items   = explode('.', $filename);
                     // Add some meta information not contained in file.
-                    $comment['id']       = $items[1];
+                    $comment->id       = $items[1];
-                    $comment['parentid'] = $items[2];
+                    $comment->parentid = $items[2];
 
                     // Store in array
-                    $key            = $this->getOpenSlot($comments, (int) $comment['meta']['created']);
+                    $key            = $this->getOpenSlot($comments, (int) $comment->meta->postdate);
                     $comments[$key] = $comment;
                 }
             }
@@ -283,8 +291,8 @@ class Filesystem extends AbstractData
                 if ($this->exists($pasteid)) {
                     $data = $this->read($pasteid);
                     if (
-                        array_key_exists('expire_date', $data['meta']) &&
+                        property_exists($data->meta, 'expire_date') &&
-                        $data['meta']['expire_date'] < time()
+                        $data->meta->expire_date < time()
                     ) {
                         $pastes[] = $pasteid;
                         if (count($pastes) >= $batchsize) {

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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin;
@@ -68,4 +68,23 @@ class Filter
         }
         return number_format($size, ($i ? 2 : 0), '.', ' ') . ' ' . I18n::_($iec[$i]);
     }
+
+    /**
+     * fixed time string comparison operation to prevent timing attacks
+     * https://crackstation.net/hashing-security.htm?=rd#slowequals
+     *
+     * @access public
+     * @static
+     * @param  string $a
+     * @param  string $b
+     * @return bool
+     */
+    public static function slowEquals($a, $b)
+    {
+        $diff = strlen($a) ^ strlen($b);
+        for ($i = 0; $i < strlen($a) && $i < strlen($b); ++$i) {
+            $diff |= ord($a[$i]) ^ ord($b[$i]);
+        }
+        return $diff === 0;
+    }
 }

lib/FormatV2.php

@@ -1,127 +0,0 @@
-<?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;
-
-/**
- * FormatV2
- *
- * Provides validation function for version 2 format of pastes & comments.
- */
-class FormatV2
-{
-    /**
-     * version 2 format validator
-     *
-     * Checks if the given array is a proper version 2 formatted, encrypted message.
-     *
-     * @access public
-     * @static
-     * @param  array $message
-     * @param  bool  $isComment
-     * @return bool
-     */
-    public static function isValid($message, $isComment = false)
-    {
-        $required_keys = array('adata', 'v', 'ct');
-        if ($isComment) {
-            $required_keys[] = 'pasteid';
-            $required_keys[] = 'parentid';
-        } else {
-            $required_keys[] = 'meta';
-        }
-
-        // Make sure no additionnal keys were added.
-        if (count(array_keys($message)) != count($required_keys)) {
-            return false;
-        }
-
-        // Make sure required fields are present.
-        foreach ($required_keys as $k) {
-            if (!array_key_exists($k, $message)) {
-                return false;
-            }
-        }
-
-        $cipherParams = $isComment ? $message['adata'] : $message['adata'][0];
-
-        // Make sure some fields are base64 data:
-        // - initialization vector
-        if (!base64_decode($cipherParams[0], true)) {
-            return false;
-        }
-        // - salt
-        if (!base64_decode($cipherParams[1], true)) {
-            return false;
-        }
-        // - cipher text
-        if (!($ct = base64_decode($message['ct'], true))) {
-            return false;
-        }
-
-        // Make sure some fields have a reasonable size:
-        // - initialization vector
-        if (strlen($cipherParams[0]) > 24) {
-            return false;
-        }
-        // - salt
-        if (strlen($cipherParams[1]) > 14) {
-            return false;
-        }
-
-        // Make sure some fields contain no unsupported values:
-        // - version
-        if (!(is_int($message['v']) || is_float($message['v'])) || (float) $message['v'] < 2) {
-            return false;
-        }
-        // - iterations, refuse less then 10000 iterations (minimum NIST recommendation)
-        if (!is_int($cipherParams[2]) || $cipherParams[2] <= 10000) {
-            return false;
-        }
-        // - key size
-        if (!in_array($cipherParams[3], array(128, 192, 256), true)) {
-            return false;
-        }
-        // - tag size
-        if (!in_array($cipherParams[4], array(64, 96, 128), true)) {
-            return false;
-        }
-        // - algorithm, must be AES
-        if ($cipherParams[5] !== 'aes') {
-            return false;
-        }
-        // - mode
-        if (!in_array($cipherParams[6], array('ctr', 'cbc', 'gcm'), true)) {
-            return false;
-        }
-        // - compression
-        if (!in_array($cipherParams[7], array('zlib', 'none'), true)) {
-            return false;
-        }
-
-        // Reject data if entropy is too low
-        if (strlen($ct) > strlen(gzdeflate($ct))) {
-            return false;
-        }
-
-        // require only the key 'expire' in the metadata of pastes
-        if (!$isComment && (
-            count($message['meta']) === 0 ||
-            !array_key_exists('expire', $message['meta']) ||
-            count($message['meta']) > 1
-        )) {
-            return false;
-        }
-
-        return true;
-    }
-}

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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin;
@@ -178,8 +178,9 @@ class I18n
 
         // load translations
         self::$_language     = $match;
-        self::$_translations = ($match == 'en') ? array() : Json::decode(
+        self::$_translations = ($match == 'en') ? array() : json_decode(
-            file_get_contents(self::_getPath($match . '.json'))
+            file_get_contents(self::_getPath($match . '.json')),
+            true
         );
     }
 
@@ -199,6 +200,7 @@ class I18n
                     self::$_availableLanguages[] = $match[1];
                 }
             }
+            self::$_availableLanguages[] = 'en';
         }
         return self::$_availableLanguages;
     }
@@ -264,7 +266,7 @@ class I18n
     {
         $file = self::_getPath('languages.json');
         if (count(self::$_languageLabels) == 0 && is_readable($file)) {
-            self::$_languageLabels = Json::decode(file_get_contents($file));
+            self::$_languageLabels = json_decode(file_get_contents($file), true);
         }
         if (count($languages) == 0) {
             return self::$_languageLabels;
@@ -315,8 +317,6 @@ class I18n
     protected static function _getPluralForm($n)
     {
         switch (self::$_language) {
-            case 'cs':
-                return $n == 1 ? 0 : ($n >= 2 && $n <= 4 ? 1 : 2);
             case 'fr':
             case 'oc':
             case 'zh':
@@ -324,11 +324,10 @@ class I18n
             case 'pl':
                 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, de, en, es, hu, it, nl, no, pt
+            // de, en, es, hu, it, nl, no, pt
             default:
                 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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin;
@@ -33,39 +33,9 @@ class Json
     public static function encode($input)
     {
         $jsonString = json_encode($input);
-        self::_detectError();
+        $errorCode  = json_last_error();
-        return $jsonString;
-    }
-
-    /**
-     * Returns an array with the contents as described in the given JSON input
-     *
-     * @access public
-     * @static
-     * @param  string $input
-     * @throws Exception
-     * @return array
-     */
-    public static function decode($input)
-    {
-        $array = json_decode($input, true);
-        self::_detectError();
-        return $array;
-    }
-
-    /**
-     * Detects JSON errors and raises an exception if one is found
-     *
-     * @access private
-     * @static
-     * @throws Exception
-     * @return void
-     */
-    private static function _detectError()
-    {
-        $errorCode = json_last_error();
         if ($errorCode === JSON_ERROR_NONE) {
-            return;
+            return $jsonString;
         }
 
         $message = 'A JSON error occurred';

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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin;
@@ -32,7 +32,7 @@ class Model
     /**
      * Data storage.
      *
-     * @var Data\AbstractData
+     * @var AbstractData
      */
     private $_store = null;
 
@@ -75,7 +75,7 @@ class Model
     /**
      * Gets, and creates if neccessary, a store object
      *
-     * @return Data\AbstractData
+     * @return AbstractData
      */
     private function _getStore()
     {

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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Model;
@@ -15,6 +15,8 @@ namespace PrivateBin\Model;
 use Exception;
 use PrivateBin\Configuration;
 use PrivateBin\Data\AbstractData;
+use PrivateBin\Sjcl;
+use stdClass;
 
 /**
  * AbstractModel
@@ -35,9 +37,9 @@ abstract class AbstractModel
      * Instance data.
      *
      * @access protected
-     * @var array
+     * @var stdClass
      */
-    protected $_data = array('meta' => array());
+    protected $_data;
 
     /**
      * Configuration.
@@ -66,6 +68,8 @@ abstract class AbstractModel
     {
         $this->_conf       = $configuration;
         $this->_store      = $storage;
+        $this->_data       = new stdClass;
+        $this->_data->meta = new stdClass;
     }
 
     /**
@@ -98,29 +102,28 @@ abstract class AbstractModel
      * Set data and recalculate ID.
      *
      * @access public
-     * @param  array $data
+     * @param string $data
      * @throws Exception
      */
-    public function setData(array $data)
+    public function setData($data)
     {
-        $data = $this->_sanitize($data);
+        if (!Sjcl::isValid($data)) {
-        $this->_validate($data);
+            throw new Exception('Invalid data.', 61);
-        $this->_data = $data;
+        }
+        $this->_data->data = $data;
 
-        // calculate a 64 bit checksum to avoid collisions
+        // We just want a small hash to avoid collisions:
-        $this->setId(hash(version_compare(PHP_VERSION, '5.6', '<') ? 'fnv164' : 'fnv1a64', $data['ct']));
+        // Half-MD5 (64 bits) will do the trick
+        $this->setId(substr(hash('md5', $data), 0, 16));
     }
 
     /**
      * Get instance data.
      *
      * @access public
-     * @return array
+     * @return stdClass
      */
-    public function get()
+    abstract public function get();
-    {
-        return $this->_data;
-    }
 
     /**
      * Store the instance's data.
@@ -158,24 +161,4 @@ abstract class AbstractModel
     {
         return (bool) preg_match('#\A[a-f\d]{16}\z#', (string) $id);
     }
-
-    /**
-     * Sanitizes data to conform with current configuration.
-     *
-     * @access protected
-     * @param  array $data
-     * @return array
-     */
-    abstract protected function _sanitize(array $data);
-
-    /**
-     * Validate data.
-     *
-     * @access protected
-     * @param  array $data
-     * @throws Exception
-     */
-    protected function _validate(array $data)
-    {
-    }
 }

lib/Model/Comment.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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Model;
@@ -15,6 +15,7 @@ namespace PrivateBin\Model;
 use Exception;
 use Identicon\Identicon;
 use PrivateBin\Persistence\TrafficLimiter;
+use PrivateBin\Sjcl;
 use PrivateBin\Vizhash16x16;
 
 /**
@@ -32,6 +33,29 @@ class Comment extends AbstractModel
      */
     private $_paste;
 
+    /**
+     * Get comment data.
+     *
+     * @access public
+     * @throws Exception
+     * @return stdClass
+     */
+    public function get()
+    {
+        // @todo add support to read specific comment
+        $comments = $this->_store->readComments($this->getPaste()->getId());
+        foreach ($comments as $comment) {
+            if (
+                $comment->parentid == $this->getParentId() &&
+                $comment->id == $this->getId()
+            ) {
+                $this->_data = $comment;
+                break;
+            }
+        }
+        return $this->_data;
+    }
+
     /**
      * Store the comment's data.
      *
@@ -56,7 +80,7 @@ class Comment extends AbstractModel
             throw new Exception('You are unlucky. Try again.', 69);
         }
 
-        $this->_data['meta']['created'] = time();
+        $this->_data->meta->postdate = time();
 
         // store comment
         if (
@@ -64,7 +88,7 @@ class Comment extends AbstractModel
                 $pasteid,
                 $this->getParentId(),
                 $this->getId(),
-                $this->_data
+                json_decode(json_encode($this->_data), true)
             ) === false
         ) {
             throw new Exception('Error saving comment. Sorry.', 70);
@@ -106,8 +130,8 @@ class Comment extends AbstractModel
      */
     public function setPaste(Paste $paste)
     {
-        $this->_paste           = $paste;
+        $this->_paste               = $paste;
-        $this->_data['pasteid'] = $paste->getId();
+        $this->_data->meta->pasteid = $paste->getId();
     }
 
     /**
@@ -133,7 +157,7 @@ class Comment extends AbstractModel
         if (!self::isValidId($id)) {
             throw new Exception('Invalid paste ID.', 65);
         }
-        $this->_data['parentid'] = $id;
+        $this->_data->meta->parentid = $id;
     }
 
     /**
@@ -144,22 +168,29 @@ class Comment extends AbstractModel
      */
     public function getParentId()
     {
-        if (!array_key_exists('parentid', $this->_data)) {
+        if (!property_exists($this->_data->meta, 'parentid')) {
-            $this->_data['parentid'] = $this->getPaste()->getId();
+            $this->_data->meta->parentid = '';
         }
-        return $this->_data['parentid'];
+        return $this->_data->meta->parentid;
     }
 
     /**
-     * Sanitizes data to conform with current configuration.
+     * Set nickname.
      *
-     * @access protected
+     * @access public
-     * @param  array $data
+     * @param string $nickname
-     * @return array
+     * @throws Exception
      */
-    protected function _sanitize(array $data)
+    public function setNickname($nickname)
     {
-        // we generate an icon based on a SHA512 HMAC of the users IP, if configured
+        if (!Sjcl::isValid($nickname)) {
+            throw new Exception('Invalid data.', 66);
+        }
+        $this->_data->meta->nickname = $nickname;
+
+        // If a nickname is provided, we generate an icon based on a SHA512 HMAC
+        // of the users IP. (We assume that if the user did not enter a nickname,
+        // the user wants to be anonymous and we will not generate an icon.)
         $icon = $this->_conf->getKey('icon');
         if ($icon != 'none') {
             $pngdata = '';
@@ -174,12 +205,9 @@ class Comment extends AbstractModel
                 );
             }
             if ($pngdata != '') {
-                if (!array_key_exists('meta', $data)) {
+                $this->_data->meta->vizhash = $pngdata;
-                    $data['meta'] = array();
-                }
-                $data['meta']['icon'] = $pngdata;
             }
         }
-        return $data;
+        // Once the icon is generated, we do not keep the IP address hash.
     }
 }

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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Model;
@@ -15,6 +15,7 @@ namespace PrivateBin\Model;
 use Exception;
 use PrivateBin\Controller;
 use PrivateBin\Persistence\ServerSalt;
+use PrivateBin\Sjcl;
 
 /**
  * Paste
@@ -28,7 +29,7 @@ class Paste extends AbstractModel
      *
      * @access public
      * @throws Exception
-     * @return array
+     * @return stdClass
      */
     public function get()
     {
@@ -38,43 +39,44 @@ class Paste extends AbstractModel
         }
 
         // check if paste has expired and delete it if neccessary.
-        if (array_key_exists('expire_date', $data['meta'])) {
+        if (property_exists($data->meta, 'expire_date')) {
-            if ($data['meta']['expire_date'] < time()) {
+            if ($data->meta->expire_date < time()) {
                 $this->delete();
                 throw new Exception(Controller::GENERIC_ERROR, 63);
             }
             // We kindly provide the remaining time before expiration (in seconds)
-            $data['meta']['time_to_live'] = $data['meta']['expire_date'] - time();
+            $data->meta->remaining_time = $data->meta->expire_date - time();
-            unset($data['meta']['expire_date']);
         }
 
         // check if non-expired burn after reading paste needs to be deleted
-        if (
+        if (property_exists($data->meta, 'burnafterreading') && $data->meta->burnafterreading) {
-            (array_key_exists('adata', $data) && $data['adata'][3] === 1) ||
-            (array_key_exists('burnafterreading', $data['meta']) && $data['meta']['burnafterreading'])
-        ) {
             $this->delete();
         }
 
-        // set formatter for the view in version 1 pastes.
+        // set formatter for for the view.
-        if (array_key_exists('data', $data) && !array_key_exists('formatter', $data['meta'])) {
+        if (!property_exists($data->meta, 'formatter')) {
             // support < 0.21 syntax highlighting
-            if (array_key_exists('syntaxcoloring', $data['meta']) && $data['meta']['syntaxcoloring'] === true) {
+            if (property_exists($data->meta, 'syntaxcoloring') && $data->meta->syntaxcoloring === true) {
-                $data['meta']['formatter'] = 'syntaxhighlighting';
+                $data->meta->formatter = 'syntaxhighlighting';
             } else {
-                $data['meta']['formatter'] = $this->_conf->getKey('defaultformatter');
+                $data->meta->formatter = $this->_conf->getKey('defaultformatter');
             }
         }
 
         // support old paste format with server wide salt
-        if (!array_key_exists('salt', $data['meta'])) {
+        if (!property_exists($data->meta, 'salt')) {
-            $data['meta']['salt'] = ServerSalt::get();
+            $data->meta->salt = ServerSalt::get();
+        }
+        $data->comments       = array_values($this->getComments());
+        $data->comment_count  = count($data->comments);
+        $data->comment_offset = 0;
+        $data->{'@context'}   = 'js/paste.jsonld';
+        $this->_data          = $data;
+
+        // If the paste was meant to be read only once, delete it.
+        if ($this->isBurnafterreading()) {
+            $this->delete();
         }
-        $data['comments']       = array_values($this->getComments());
-        $data['comment_count']  = count($data['comments']);
-        $data['comment_offset'] = 0;
-        $data['@context']       = '?jsonld=paste';
-        $this->_data            = $data;
 
         return $this->_data;
     }
@@ -92,14 +94,14 @@ class Paste extends AbstractModel
             throw new Exception('You are unlucky. Try again.', 75);
         }
 
-        $this->_data['meta']['created'] = time();
+        $this->_data->meta->postdate = time();
-        $this->_data['meta']['salt']    = serversalt::generate();
+        $this->_data->meta->salt     = serversalt::generate();
 
         // store paste
         if (
             $this->_store->create(
                 $this->getId(),
-                $this->_data
+                json_decode(json_encode($this->_data), true)
             ) === false
         ) {
             throw new Exception('Error saving paste. Sorry.', 76);
@@ -137,7 +139,7 @@ class Paste extends AbstractModel
      * @throws Exception
      * @return Comment
      */
-    public function getComment($parentId, $commentId = '')
+    public function getComment($parentId, $commentId = null)
     {
         if (!$this->exists()) {
             throw new Exception('Invalid data.', 62);
@@ -145,7 +147,7 @@ class Paste extends AbstractModel
         $comment = new Comment($this->_conf, $this->_store);
         $comment->setPaste($this);
         $comment->setParentId($parentId);
-        if ($commentId !== '') {
+        if ($commentId !== null) {
             $comment->setId($commentId);
         }
         return $comment;
@@ -174,16 +176,140 @@ class Paste extends AbstractModel
      */
     public function getDeleteToken()
     {
-        if (!array_key_exists('salt', $this->_data['meta'])) {
+        if (!property_exists($this->_data->meta, 'salt')) {
             $this->get();
         }
         return hash_hmac(
             $this->_conf->getKey('zerobincompatibility') ? 'sha1' : 'sha256',
             $this->getId(),
-            $this->_data['meta']['salt']
+            $this->_data->meta->salt
         );
     }
 
+    /**
+     * Set paste's attachment.
+     *
+     * @access public
+     * @param string $attachment
+     * @throws Exception
+     */
+    public function setAttachment($attachment)
+    {
+        if (!$this->_conf->getKey('fileupload') || !Sjcl::isValid($attachment)) {
+            throw new Exception('Invalid attachment.', 71);
+        }
+        $this->_data->meta->attachment = $attachment;
+    }
+
+    /**
+     * Set paste's attachment name.
+     *
+     * @access public
+     * @param string $attachmentname
+     * @throws Exception
+     */
+    public function setAttachmentName($attachmentname)
+    {
+        if (!$this->_conf->getKey('fileupload') || !Sjcl::isValid($attachmentname)) {
+            throw new Exception('Invalid attachment.', 72);
+        }
+        $this->_data->meta->attachmentname = $attachmentname;
+    }
+
+    /**
+     * Set paste expiration.
+     *
+     * @access public
+     * @param string $expiration
+     */
+    public function setExpiration($expiration)
+    {
+        $expire_options = $this->_conf->getSection('expire_options');
+        if (array_key_exists($expiration, $expire_options)) {
+            $expire = $expire_options[$expiration];
+        } else {
+            // using getKey() to ensure a default value is present
+            $expire = $this->_conf->getKey($this->_conf->getKey('default', 'expire'), 'expire_options');
+        }
+        if ($expire > 0) {
+            $this->_data->meta->expire_date = time() + $expire;
+        }
+    }
+
+    /**
+     * Set paste's burn-after-reading type.
+     *
+     * @access public
+     * @param string $burnafterreading
+     * @throws Exception
+     */
+    public function setBurnafterreading($burnafterreading = '1')
+    {
+        if ($burnafterreading === '0') {
+            $this->_data->meta->burnafterreading = false;
+        } else {
+            if ($burnafterreading !== '1') {
+                throw new Exception('Invalid data.', 73);
+            }
+            $this->_data->meta->burnafterreading = true;
+            $this->_data->meta->opendiscussion   = false;
+        }
+    }
+
+    /**
+     * Set paste's discussion state.
+     *
+     * @access public
+     * @param string $opendiscussion
+     * @throws Exception
+     */
+    public function setOpendiscussion($opendiscussion = '1')
+    {
+        if (
+            !$this->_conf->getKey('discussion') ||
+            $this->isBurnafterreading() ||
+            $opendiscussion === '0'
+        ) {
+            $this->_data->meta->opendiscussion = false;
+        } else {
+            if ($opendiscussion !== '1') {
+                throw new Exception('Invalid data.', 74);
+            }
+            $this->_data->meta->opendiscussion = true;
+        }
+    }
+
+    /**
+     * Set paste's format.
+     *
+     * @access public
+     * @param string $format
+     * @throws Exception
+     */
+    public function setFormatter($format)
+    {
+        if (!array_key_exists($format, $this->_conf->getSection('formatter_options'))) {
+            $format = $this->_conf->getKey('defaultformatter');
+        }
+        $this->_data->meta->formatter = $format;
+    }
+
+    /**
+     * Check if paste is of burn-after-reading type.
+     *
+     * @access public
+     * @throws Exception
+     * @return bool
+     */
+    public function isBurnafterreading()
+    {
+        if (!property_exists($this->_data, 'data')) {
+            $this->get();
+        }
+        return property_exists($this->_data->meta, 'burnafterreading') &&
+               $this->_data->meta->burnafterreading === true;
+    }
+
     /**
      * Check if paste has discussions enabled.
      *
@@ -193,66 +319,10 @@ class Paste extends AbstractModel
      */
     public function isOpendiscussion()
     {
-        if (!array_key_exists('adata', $this->_data) && !array_key_exists('data', $this->_data)) {
+        if (!property_exists($this->_data, 'data')) {
             $this->get();
         }
-        return
+        return property_exists($this->_data->meta, 'opendiscussion') &&
-            (array_key_exists('adata', $this->_data) && $this->_data['adata'][2] === 1) ||
+               $this->_data->meta->opendiscussion === true;
-            (array_key_exists('opendiscussion', $this->_data['meta']) && $this->_data['meta']['opendiscussion']);
-    }
-
-    /**
-     * Sanitizes data to conform with current configuration.
-     *
-     * @access protected
-     * @param  array $data
-     * @return array
-     */
-    protected function _sanitize(array $data)
-    {
-        $expiration = $data['meta']['expire'];
-        unset($data['meta']['expire']);
-        $expire_options = $this->_conf->getSection('expire_options');
-        if (array_key_exists($expiration, $expire_options)) {
-            $expire = $expire_options[$expiration];
-        } else {
-            // using getKey() to ensure a default value is present
-            $expire = $this->_conf->getKey($this->_conf->getKey('default', 'expire'), 'expire_options');
-        }
-        if ($expire > 0) {
-            $data['meta']['expire_date'] = time() + $expire;
-        }
-        return $data;
-    }
-
-    /**
-     * Validate data.
-     *
-     * @access protected
-     * @param  array $data
-     * @throws Exception
-     */
-    protected function _validate(array $data)
-    {
-        // reject invalid or disabled formatters
-        if (!array_key_exists($data['adata'][1], $this->_conf->getSection('formatter_options'))) {
-            throw new Exception('Invalid data.', 75);
-        }
-
-        // discussion requested, but disabled in config or burn after reading requested as well, or invalid integer
-        if (
-            ($data['adata'][2] === 1 && ( // open discussion flag
-                !$this->_conf->getKey('discussion') ||
-                $data['adata'][3] === 1  // burn after reading flag
-            )) ||
-            ($data['adata'][2] !== 0 && $data['adata'][2] !== 1)
-        ) {
-            throw new Exception('Invalid data.', 74);
-        }
-
-        // reject invalid burn after reading
-        if ($data['adata'][3] !== 0 && $data['adata'][3] !== 1) {
-            throw new Exception('Invalid data.', 73);
-        }
     }
 }

lib/Persistence/AbstractPersistence.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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Persistence;

lib/Persistence/DataStore.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.3.4
+ * @version   1.1
  */
 
 namespace PrivateBin\Persistence;
@@ -45,10 +45,7 @@ class DataStore extends AbstractPersistence
             $filename = substr($filename, strlen($path));
         }
         try {
-            self::_store(
+            self::_store($filename, self::PROTECTION_LINE . PHP_EOL . Json::encode($data));
-                $filename,
-                self::PROTECTION_LINE . PHP_EOL . Json::encode($data)
-            );
             return true;
         } catch (Exception $e) {
             return false;
@@ -61,16 +58,11 @@ class DataStore extends AbstractPersistence
      * @access public
      * @static
      * @param  string $filename
-     * @return array|false $data
+     * @return stdClass|false  $data
      */
     public static function get($filename)
     {
-        return Json::decode(
+        return json_decode(substr(file_get_contents($filename), strlen(self::PROTECTION_LINE . PHP_EOL)));
-            substr(
-                file_get_contents($filename),
-                strlen(self::PROTECTION_LINE . PHP_EOL)
-            )
-        );
     }
 
     /**

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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Persistence;
@@ -60,7 +60,7 @@ class PurgeLimiter extends AbstractPersistence
      *
      * @access public
      * @static
-     * @throws \Exception
+     * @throws Exception
      * @return bool
      */
     public static function canPurge()

lib/Persistence/ServerSalt.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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Persistence;

lib/Persistence/TrafficLimiter.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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin\Persistence;
@@ -90,7 +90,7 @@ class TrafficLimiter extends AbstractPersistence
      *
      * @access public
      * @static
-     * @throws \Exception
+     * @throws Exception
      * @return bool
      */
     public static function canPass()

lib/Request.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.3.4
+ * @version   1.2.3
  */
 
 namespace PrivateBin;
@@ -72,27 +72,6 @@ class Request
      */
     private $_isJsonApi = false;
 
-    /**
-     * Return the paste ID of the current paste.
-     *
-     * @access private
-     * @return string
-     */
-    private function getPasteId()
-    {
-        // RegEx to check for valid paste ID (16 base64 chars)
-        $pasteIdRegEx = '/^[a-f0-9]{16}$/';
-
-        foreach ($_GET as $key => $value) {
-            // only return if value is empty and key matches RegEx
-            if (($value === '') and preg_match($pasteIdRegEx, $key, $match)) {
-                return $match[0];
-            }
-        }
-
-        return 'invalid id';
-    }
-
     /**
      * Constructor
      *
@@ -107,10 +86,10 @@ class Request
         switch (array_key_exists('REQUEST_METHOD', $_SERVER) ? $_SERVER['REQUEST_METHOD'] : 'GET') {
             case 'DELETE':
             case 'PUT':
+                parse_str(file_get_contents(self::$_inputStream), $this->_params);
+                break;
             case 'POST':
-                $this->_params = Json::decode(
+                $this->_params = $_POST;
-                    file_get_contents(self::$_inputStream)
-                );
                 break;
             default:
                 $this->_params = $_GET;
@@ -121,13 +100,13 @@ class Request
             array_key_exists('QUERY_STRING', $_SERVER) &&
             !empty($_SERVER['QUERY_STRING'])
         ) {
-            $this->_params['pasteid'] = $this->getPasteId();
+            $this->_params['pasteid'] = $_SERVER['QUERY_STRING'];
         }
 
         // prepare operation, depending on current parameters
         if (
-            array_key_exists('ct', $this->_params) &&
+            (array_key_exists('data', $this->_params) && !empty($this->_params['data'])) ||
-            !empty($this->_params['ct'])
+            (array_key_exists('attachment', $this->_params) && !empty($this->_params['attachment']))
         ) {
             $this->_operation = 'create';
         } elseif (array_key_exists('pasteid', $this->_params) && !empty($this->_params['pasteid'])) {
@@ -152,33 +131,6 @@ class Request
         return $this->_operation;
     }
 
-    /**
-     * Get data of paste or comment
-     *
-     * @access public
-     * @return array
-     */
-    public function getData()
-    {
-        $data = array(
-            'adata' => $this->getParam('adata'),
-        );
-        $required_keys = array('v', 'ct');
-        $meta          = $this->getParam('meta');
-        if (empty($meta)) {
-            $required_keys[] = 'pasteid';
-            $required_keys[] = 'parentid';
-        } else {
-            $data['meta'] = $meta;
-        }
-        foreach ($required_keys as $key) {
-            $data[$key] = $this->getParam($key);
-        }
-        // forcing a cast to int or float
-        $data['v'] = $data['v'] + 0;
-        return $data;
-    }
-
     /**
      * Get a request parameter
      *
@@ -193,19 +145,6 @@ class Request
             $this->_params[$param] : $default;
     }
 
-    /**
-     * Get host as requested by the client
-     *
-     * @access public
-     * @return string
-     */
-    public function getHost()
-    {
-        return array_key_exists('HTTP_HOST', $_SERVER) ?
-            htmlspecialchars($_SERVER['HTTP_HOST']) :
-            'localhost';
-    }
-
     /**
      * Get request URI
      *
@@ -215,9 +154,7 @@ class Request
     public function getRequestUri()
     {
         return array_key_exists('REQUEST_URI', $_SERVER) ?
-        htmlspecialchars(
+            htmlspecialchars($_SERVER['REQUEST_URI']) : '/';
-            parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH)
-            ) : '/';
     }
 
     /**