diff --git a/i18n/ar.json b/i18n/ar.json index b0e57350..74e47eae 100644 --- a/i18n/ar.json +++ b/i18n/ar.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "السمة", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/bg.json b/i18n/bg.json index 14f0dd38..67c7a534 100644 --- a/i18n/bg.json +++ b/i18n/bg.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/ca.json b/i18n/ca.json index 09887d34..6525f02f 100644 --- a/i18n/ca.json +++ b/i18n/ca.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/co.json b/i18n/co.json index fbae32da..f27547de 100644 --- a/i18n/co.json +++ b/i18n/co.json @@ -232,5 +232,7 @@ "Show password": "Affissà a parolla d’intesa", "Hide password": "Piattà a parolla d’intesa", "Theme": "Tema", - "Copy": "Cupià" + "Copy": "Cupià", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/cs.json b/i18n/cs.json index f92bfdd1..5541b690 100644 --- a/i18n/cs.json +++ b/i18n/cs.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Vzhled", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/de.json b/i18n/de.json index 051204ec..0b5335f2 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -232,5 +232,7 @@ "Show password": "Passwort anzeigen", "Hide password": "Passwort verbergen", "Theme": "Design", - "Copy": "Kopieren" + "Copy": "Kopieren", + "Cmd": "Cmd", + "Ctrl": "Strg" } diff --git a/i18n/el.json b/i18n/el.json index fa4c2fc0..62677119 100644 --- a/i18n/el.json +++ b/i18n/el.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/en.json b/i18n/en.json index 0227afa9..7787edfc 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/es.json b/i18n/es.json index 0c263b66..21dc83b8 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -232,5 +232,7 @@ "Show password": "Mostrar contraseña", "Hide password": "Ocultar contraseña", "Theme": "Tema", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/et.json b/i18n/et.json index 48921bec..42996ca0 100644 --- a/i18n/et.json +++ b/i18n/et.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Teema", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/fa.json b/i18n/fa.json index 6a63d9c1..677e7b30 100644 --- a/i18n/fa.json +++ b/i18n/fa.json @@ -232,5 +232,7 @@ "Show password": "نمایش رمز عبور", "Hide password": "مخفی‌کردن رمز عبور", "Theme": "تم", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/fi.json b/i18n/fi.json index 08360df0..c1ddf64d 100644 --- a/i18n/fi.json +++ b/i18n/fi.json @@ -232,5 +232,7 @@ "Show password": "Näytä salasana", "Hide password": "Piilota salasana", "Theme": "Teema", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/fr.json b/i18n/fr.json index 51cd1a73..0d195296 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -232,5 +232,7 @@ "Show password": "Afficher le mot de passe", "Hide password": "Cacher le mot de passe", "Theme": "Thème", - "Copy": "Copier" + "Copy": "Copier", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/he.json b/i18n/he.json index dae7e396..d39ed0c4 100644 --- a/i18n/he.json +++ b/i18n/he.json @@ -232,5 +232,7 @@ "Show password": "הצג סיסמה", "Hide password": "הסתר סיסמה", "Theme": "נושא", - "Copy": "העתק" + "Copy": "העתק", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/hi.json b/i18n/hi.json index 0227afa9..7787edfc 100644 --- a/i18n/hi.json +++ b/i18n/hi.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/hu.json b/i18n/hu.json index 5c5b1d67..bacfe004 100644 --- a/i18n/hu.json +++ b/i18n/hu.json @@ -232,5 +232,7 @@ "Show password": "Jelszó megjelenítése", "Hide password": "Jelszó elrejtése", "Theme": "Téma", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/id.json b/i18n/id.json index 13bc4940..2c5c4f35 100644 --- a/i18n/id.json +++ b/i18n/id.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/it.json b/i18n/it.json index ab4b7b7a..91ede752 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -232,5 +232,7 @@ "Show password": "Mostra password", "Hide password": "Nascondi password", "Theme": "Tema", - "Copy": "Copiare" + "Copy": "Copiare", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/ja.json b/i18n/ja.json index e7c10573..ac9bcd22 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/jbo.json b/i18n/jbo.json index a990cf8a..919ec301 100644 --- a/i18n/jbo.json +++ b/i18n/jbo.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "jvinu", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/ko.json b/i18n/ko.json index 0227afa9..7787edfc 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/ku.json b/i18n/ku.json index 192a11f0..4e96a544 100644 --- a/i18n/ku.json +++ b/i18n/ku.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/la.json b/i18n/la.json index 68378b48..71a4ed32 100644 --- a/i18n/la.json +++ b/i18n/la.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/lt.json b/i18n/lt.json index 3f9b0ee3..37d89b93 100644 --- a/i18n/lt.json +++ b/i18n/lt.json @@ -232,5 +232,7 @@ "Show password": "Rodyti slaptažodį", "Hide password": "Slėpti slaptažodį", "Theme": "Apipavidalinimas", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/nl.json b/i18n/nl.json index 65799494..381c86a5 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -232,5 +232,7 @@ "Show password": "Toon wachtwoord", "Hide password": "Verberg wachtwoord", "Theme": "Thema", - "Copy": "Kopieëren" + "Copy": "Kopieëren", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/no.json b/i18n/no.json index 466f8174..6b913e99 100644 --- a/i18n/no.json +++ b/i18n/no.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/oc.json b/i18n/oc.json index 25564e00..f16ffd62 100644 --- a/i18n/oc.json +++ b/i18n/oc.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/pl.json b/i18n/pl.json index 5288af28..fd8b5184 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -232,5 +232,7 @@ "Show password": "Pokaż hasło", "Hide password": "Ukryj hasło", "Theme": "Motyw", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/pt.json b/i18n/pt.json index 7dcb8a9d..32d57ac6 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/ro.json b/i18n/ro.json index 8c7e2505..a84e70bc 100644 --- a/i18n/ro.json +++ b/i18n/ro.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/ru.json b/i18n/ru.json index 80690653..65058d37 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -232,5 +232,7 @@ "Show password": "Показать пароль", "Hide password": "Скрыть пароль", "Theme": "Тема", - "Copy": "Скопировать" + "Copy": "Скопировать", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/sk.json b/i18n/sk.json index 9dbdb176..2fd43017 100644 --- a/i18n/sk.json +++ b/i18n/sk.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/sl.json b/i18n/sl.json index 2fae5599..0b48292c 100644 --- a/i18n/sl.json +++ b/i18n/sl.json @@ -232,5 +232,7 @@ "Show password": "Pokaži geslo", "Hide password": "Skrij geslo", "Theme": "Tema", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/sv.json b/i18n/sv.json index 7ca9cb21..9c1d0600 100644 --- a/i18n/sv.json +++ b/i18n/sv.json @@ -232,5 +232,7 @@ "Show password": "Visa lösenord", "Hide password": "Dölj lösenord", "Theme": "Tema", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/th.json b/i18n/th.json index a85a3126..db145327 100644 --- a/i18n/th.json +++ b/i18n/th.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "ธีม", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/tr.json b/i18n/tr.json index 64ffff19..c1fe39f7 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -232,5 +232,7 @@ "Show password": "Show password", "Hide password": "Hide password", "Theme": "Theme", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/uk.json b/i18n/uk.json index 38b318c3..405a6e42 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -232,5 +232,7 @@ "Show password": "Показати пароль", "Hide password": "Сховати пароль", "Theme": "Тема", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/i18n/zh.json b/i18n/zh.json index 5d60f7d1..f74e08a3 100644 --- a/i18n/zh.json +++ b/i18n/zh.json @@ -232,5 +232,7 @@ "Show password": "显示密码", "Hide password": "隐藏密码", "Theme": "主题", - "Copy": "Copy" + "Copy": "Copy", + "Cmd": "Cmd", + "Ctrl": "Ctrl" } diff --git a/js/privatebin.js b/js/privatebin.js index b983ba1d..01ad82a4 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -2109,7 +2109,7 @@ jQuery.PrivateBin = (function($) { { const ua = navigator.userAgent; const isMac = /Mac/.test(ua); - const hotkey = isMac ? 'Cmd' : 'Ctrl'; + const hotkey = isMac ? I18n._('Cmd') : I18n._('Ctrl'); I18n._( $('#pastelink'), 'Your document is %s (Hit %s+c to copy)', diff --git a/lib/Configuration.php b/lib/Configuration.php index b5588f16..27e82307 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -122,7 +122,7 @@ class Configuration 'js/kjua-0.10.0.js' => 'sha512-BYj4xggowR7QD150VLSTRlzH62YPfhpIM+b/1EUEr7RQpdWAGKulxWnOvjFx1FUlba4m6ihpNYuQab51H6XlYg==', 'js/legacy.js' => 'sha512-RQEo1hxpNc37i+jz/D9/JiAZhG8GFx3+SNxjYnI7jUgirDIqrCSj6QPAAZeaidditcWzsJ3jxfEj5lVm7ZwTRQ==', 'js/prettify.js' => 'sha512-puO0Ogy++IoA2Pb9IjSxV1n4+kQkKXYAEUtVzfZpQepyDPyXk8hokiYDS7ybMogYlyyEIwMLpZqVhCkARQWLMg==', - 'js/privatebin.js' => 'sha512-fj5mOIO3TVE3CeyTOheT0cZyfVkyy0xfjWZJiIbABzx2hDzLcbR+7LK4VWZjaexp1fUDfXFAaqupvnhbq0Lo8g==', + 'js/privatebin.js' => 'sha512-f/If9/COB1WxyWbWQ6lbEW3tH2ix1eWFAnodAwihQBEbgWnl9rVH26kf4HGmWWWQ6w5qsnzeOOkPr0s0TCpZVw==', 'js/purify-3.4.1.js' => 'sha512-280a/Vb6fVFsYaeRrkuDp4EDmdYlt2XS+dlDEO/U9qljPrAraA2bIzHTNmP+9dpwPDDwTML+RS+h5iaagPwTzA==', 'js/showdown-2.1.0.js' => 'sha512-WYXZgkTR0u/Y9SVIA4nTTOih0kXMEd8RRV6MLFdL6YU8ymhR528NLlYQt1nlJQbYz4EW+ZsS0fx1awhiQJme1Q==', 'js/zlib-1.3.2.js' => 'sha512-RAhJgxg9siMIA8ky4c10Rc2zUgnK80olHB8Tt1IOYWY4Eh1WmrviQkDn+sgBlb38ZHq3tzufGC41kP360gmosQ==', diff --git a/lib/I18n.php b/lib/I18n.php index 14c109bf..641efc6e 100644 --- a/lib/I18n.php +++ b/lib/I18n.php @@ -307,7 +307,7 @@ class I18n public static function getCopyHotkey() { return isset($_SERVER['HTTP_USER_AGENT']) && - strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false ? 'Cmd' : 'Ctrl'; + strpos($_SERVER['HTTP_USER_AGENT'], 'Mac') !== false ? self::_('Cmd') : self::_('Ctrl'); } /**