libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-02-01 03:12:42 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ether/etherpad-lite into develop

Browse source
This commit is contained in:
John McLear 2014-10-19 00:03:18 +01:00
commit 3115da7880
26 changed files with 486 additions and 165 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
README.md
View file

@ -50,9 +50,9 @@ Update to the latest version with `git pull origin`, then run `bin\installOnWind
## GNU/Linux and other UNIX-like systems ## GNU/Linux and other UNIX-like systems
You'll need gzip, git, curl, libssl develop libraries, python and gcc. You'll need gzip, git, curl, libssl develop libraries, python and gcc.
*For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential` - *For Debian/Ubuntu*: `apt-get install gzip git-core curl python libssl-dev pkg-config build-essential`
*For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"` - *For Fedora/CentOS*: `yum install gzip git-core curl python openssl-devel && yum groupinstall "Development Tools"`
*For FreeBSD*: `portinstall node, npm, git (optional)` - *For FreeBSD*: `portinstall node, npm, git (optional)`
Additionally, you'll need [node.js](http://nodejs.org) installed, Ideally the latest stable version, be careful of installing nodejs from apt. Additionally, you'll need [node.js](http://nodejs.org) installed, Ideally the latest stable version, be careful of installing nodejs from apt.

5
bin/installDeps.sh
View file

@ -36,8 +36,9 @@ hash npm > /dev/null 2>&1 || {
#check npm version #check npm version
NPM_VERSION=$(npm --version) NPM_VERSION=$(npm --version)
if [ ! $(echo $NPM_VERSION | cut -d "." -f 1) = "1" ]; then NPM_MAIN_VERSION=$(echo $NPM_VERSION | cut -d "." -f 1)
echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x" >&2 if [ $(echo $NPM_MAIN_VERSION) = "0" ]; then
echo "You're running a wrong version of npm, you're using $NPM_VERSION, we need 1.x or higher" >&2
exit 1 exit 1
fi fi

27
src/locales/ar.json
View file

@ -2,7 +2,8 @@
"@metadata": { "@metadata": {
"authors": [ "authors": [
"Ali1", "Ali1",
"Tux-tn" "Tux-tn",
"Alami"
] ]
}, },
"index.newPad": "باد جديد", "index.newPad": "باد جديد",
@ -17,6 +18,7 @@
"pad.toolbar.unindent.title": "حذف الإزاحة", "pad.toolbar.unindent.title": "حذف الإزاحة",
"pad.toolbar.undo.title": "فك (Ctrl-Z)", "pad.toolbar.undo.title": "فك (Ctrl-Z)",
"pad.toolbar.redo.title": "تكرار (Ctrl-Y)", "pad.toolbar.redo.title": "تكرار (Ctrl-Y)",
"pad.toolbar.clearAuthorship.title": "مسح ألوان التأليف",
"pad.toolbar.import_export.title": "استيراد/تصدير من/إلى تنسيقات ملفات مختلفة", "pad.toolbar.import_export.title": "استيراد/تصدير من/إلى تنسيقات ملفات مختلفة",
"pad.toolbar.timeslider.title": "متصفح التاريخ", "pad.toolbar.timeslider.title": "متصفح التاريخ",
"pad.toolbar.savedRevision.title": "حفظ المراجعة", "pad.toolbar.savedRevision.title": "حفظ المراجعة",
@ -50,6 +52,7 @@
"pad.importExport.exportpdf": "صيغة المستندات المحمولة", "pad.importExport.exportpdf": "صيغة المستندات المحمولة",
"pad.importExport.exportopen": "ODF (نسق المستند المفتوح)", "pad.importExport.exportopen": "ODF (نسق المستند المفتوح)",
"pad.importExport.exportdokuwiki": "دوکوويكي", "pad.importExport.exportdokuwiki": "دوکوويكي",
"pad.importExport.abiword.innerHTML": "لايمكنك الاستيراد إلا من نص عادي أو من تنسيقات إتش تي إم إل. للحصول على المزيد من ميزات الاستيراد المتقدمة، يرجى تثبيت أبيورد <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\"></a>.",
"pad.modals.connected": "متصل.", "pad.modals.connected": "متصل.",
"pad.modals.reconnecting": "إعادة الاتصال ببادك", "pad.modals.reconnecting": "إعادة الاتصال ببادك",
"pad.modals.forcereconnect": "فرض إعادة الاتصال", "pad.modals.forcereconnect": "فرض إعادة الاتصال",
@ -57,21 +60,31 @@
"pad.modals.userdup.explanation": "يبدو أن هذا الباد تم فتحه في أكثر من نافذة متصفح في هذا الحاسوب.", "pad.modals.userdup.explanation": "يبدو أن هذا الباد تم فتحه في أكثر من نافذة متصفح في هذا الحاسوب.",
"pad.modals.userdup.advice": "إعادة الاتصال لإستعمال هذه النافذة بدلاً من الاخرى.", "pad.modals.userdup.advice": "إعادة الاتصال لإستعمال هذه النافذة بدلاً من الاخرى.",
"pad.modals.unauth": "غير مخول", "pad.modals.unauth": "غير مخول",
"pad.modals.unauth.explanation": "لقد تغيرت الأذونات الخاصة بك أثناء عرض هذه الصفحة. حاول إعادة الاتصال.",
"pad.modals.looping.explanation": "هناك مشاكل في الاتصال مع ملقم التزامن.",
"pad.modals.looping.cause": "ربما كنت متصلاً من خلال وكيل أو جدار حماية غير متوافق.",
"pad.modals.initsocketfail": "لا يمكن الوصول إلى الخادم", "pad.modals.initsocketfail": "لا يمكن الوصول إلى الخادم",
"pad.modals.initsocketfail.explanation": "تعذر الاتصال بخادم المزامنة.", "pad.modals.initsocketfail.explanation": "تعذر الاتصال بخادم المزامنة.",
"pad.modals.initsocketfail.cause": "وهذا على الأرجح بسبب مشكلة في المستعرض الخاص بك أو الاتصال بإنترنت.",
"pad.modals.slowcommit.explanation": "الخادم لا يستجيب.", "pad.modals.slowcommit.explanation": "الخادم لا يستجيب.",
"pad.modals.slowcommit.cause": "يمكن أن يكون هذا بسبب مشاكل في الاتصال بالشبكة.", "pad.modals.slowcommit.cause": "يمكن أن يكون هذا بسبب مشاكل في الاتصال بالشبكة.",
"pad.modals.badChangeset.explanation": "لقد صنفت إحدى عمليات التحرير التي قمت بها كعملية غير مسموح بها من قبل ملقم التزامن.",
"pad.modals.badChangeset.cause": "يمكن أن يكون هذا بسبب تكوين ملقم خاطئ أو بسبب سلوك آخر غير متوقع. يرجى الاتصال بمسؤول الخدمة إذا كنت تعتقد بأن هناك خطأ ما. حاول إعادة الاتصال لمتابعة التحرير.",
"pad.modals.corruptPad.explanation": "الباد الذي تحاول الوصول إليه تالف.",
"pad.modals.corruptPad.cause": "قد يكون هذا بسبب تكوين ملقم خاطئ أو بسبب سلوك آخر غير متوقع. يرجى الاتصال بمسؤول الخدمة.",
"pad.modals.deleted": "محذوف.", "pad.modals.deleted": "محذوف.",
"pad.modals.deleted.explanation": "تمت إزالة هذا الباد", "pad.modals.deleted.explanation": "تمت إزالة هذا الباد",
"pad.modals.disconnected": "لم تعد متّصل.", "pad.modals.disconnected": "لم تعد متّصل.",
"pad.modals.disconnected.explanation": "تم فقدان الإتصال بالخادم", "pad.modals.disconnected.explanation": "تم فقدان الإتصال بالخادم",
"pad.modals.disconnected.cause": "قد يكون الخادم غير متوفر. الرجاء إعلامنا إذا تكرر هذا.", "pad.modals.disconnected.cause": "قد يكون الخادم غير متوفر. يرجى إعلام مسؤول الخدمة إذا كان هذا لا يزال يحدث.",
"pad.share": "شارك هذه الباد",
"pad.share.readonly": "للقراءة فقط", "pad.share.readonly": "للقراءة فقط",
"pad.share.link": "رابط", "pad.share.link": "رابط",
"pad.share.emebdcode": "URL للتضمين", "pad.share.emebdcode": "URL للتضمين",
"pad.chat": "دردشة", "pad.chat": "دردشة",
"pad.chat.title": "فتح الدردشة لهذا الباد", "pad.chat.title": "فتح الدردشة لهذا الباد",
"pad.chat.loadmessages": "تحميل المزيد من الرسائل", "pad.chat.loadmessages": "تحميل المزيد من الرسائل",
"timeslider.pageTitle": "{{appTitle}} متصفح التاريخ",
"timeslider.toolbar.returnbutton": "العودة إلى الباد", "timeslider.toolbar.returnbutton": "العودة إلى الباد",
"timeslider.toolbar.authors": "المؤلفون:", "timeslider.toolbar.authors": "المؤلفون:",
"timeslider.toolbar.authorsList": "بدون مؤلفين", "timeslider.toolbar.authorsList": "بدون مؤلفين",
@ -92,14 +105,20 @@
"timeslider.month.october": "أكتوبر", "timeslider.month.october": "أكتوبر",
"timeslider.month.november": "نوفمبر", "timeslider.month.november": "نوفمبر",
"timeslider.month.december": "ديسمبر", "timeslider.month.december": "ديسمبر",
"pad.userlist.entername": "إدخل اسمك", "timeslider.unnamedauthors": "بدون اسم {{num}} {[plural(num) واحد: كاتب، آخر: مؤلف]}",
"pad.savedrevs.marked": "هذا التنقيح محدد الآن كمراجعة محفوظة",
"pad.userlist.entername": "أدخل اسمك",
"pad.userlist.unnamed": "غير مسمى", "pad.userlist.unnamed": "غير مسمى",
"pad.userlist.guest": "ضيف", "pad.userlist.guest": "ضيف",
"pad.userlist.deny": "رفض", "pad.userlist.deny": "رفض",
"pad.userlist.approve": "موافقة", "pad.userlist.approve": "موافقة",
"pad.editbar.clearcolors": "مسح ألوان التأليف أو المستند بأكمله؟",
"pad.impexp.importbutton": "الاستيراد الآن", "pad.impexp.importbutton": "الاستيراد الآن",
"pad.impexp.importing": "الاستيراد...", "pad.impexp.importing": "الاستيراد...",
"pad.impexp.confirmimport": "استيراد ملف سيؤدي للكتابة فوق النص الحالي بالباد. هل أنت متأكد من أنك تريد المتابعة؟",
"pad.impexp.convertFailed": "لم نتمكن من استيراد هذا الملف. يرجى استخدام تنسيق مستند مختلف، أو النسخ واللصق يدوياً",
"pad.impexp.uploadFailed": "فشل التحميل، الرجاء المحاولة مرة أخرى", "pad.impexp.uploadFailed": "فشل التحميل، الرجاء المحاولة مرة أخرى",
"pad.impexp.importfailed": "فشل الاستيراد", "pad.impexp.importfailed": "فشل الاستيراد",
"pad.impexp.copypaste": "الرجاء نسخ/لصق" "pad.impexp.copypaste": "الرجاء نسخ/لصق",
"pad.impexp.exportdisabled": "تصدير التنسيق {{type}} معطل. يرجى الاتصال بمسؤول النظام الخاص بك للحصول على التفاصيل."
} }

18
src/locales/en.json
View file

@ -2,16 +2,16 @@
"index.newPad": "New Pad", "index.newPad": "New Pad",
"index.createOpenPad": "or create/open a Pad with the name:", "index.createOpenPad": "or create/open a Pad with the name:",
"pad.toolbar.bold.title": "Bold (Ctrl-B)", "pad.toolbar.bold.title": "Bold (Ctrl+B)",
"pad.toolbar.italic.title": "Italic (Ctrl-I)", "pad.toolbar.italic.title": "Italic (Ctrl+I)",
"pad.toolbar.underline.title": "Underline (Ctrl-U)", "pad.toolbar.underline.title": "Underline (Ctrl+U)",
"pad.toolbar.strikethrough.title": "Strikethrough", "pad.toolbar.strikethrough.title": "Strikethrough (Ctrl+5)",
"pad.toolbar.ol.title": "Ordered list", "pad.toolbar.ol.title": "Ordered list (Ctrl+Shift+N)",
"pad.toolbar.ul.title": "Unordered List", "pad.toolbar.ul.title": "Unordered List (Ctrl+Shift+L)",
"pad.toolbar.indent.title": "Indent (TAB)", "pad.toolbar.indent.title": "Indent (TAB)",
"pad.toolbar.unindent.title": "Outdent (Shift+TAB)", "pad.toolbar.unindent.title": "Outdent (Shift+TAB)",
"pad.toolbar.undo.title": "Undo (Ctrl-Z)", "pad.toolbar.undo.title": "Undo (Ctrl+Z)",
"pad.toolbar.redo.title": "Redo (Ctrl-Y)", "pad.toolbar.redo.title": "Redo (Ctrl+Y)",
"pad.toolbar.clearAuthorship.title": "Clear Authorship Colors", "pad.toolbar.clearAuthorship.title": "Clear Authorship Colors",
"pad.toolbar.import_export.title": "Import/Export from/to different file formats", "pad.toolbar.import_export.title": "Import/Export from/to different file formats",
"pad.toolbar.timeslider.title": "Timeslider", "pad.toolbar.timeslider.title": "Timeslider",
@ -85,7 +85,7 @@
"pad.modals.disconnected": "You have been disconnected.", "pad.modals.disconnected": "You have been disconnected.",
"pad.modals.disconnected.explanation": "The connection to the server was lost", "pad.modals.disconnected.explanation": "The connection to the server was lost",
"pad.modals.disconnected.cause": "The server may be unavailable. Please notify the service administrator if this continues to happen.", "pad.modals.disconnected.cause": "The server may be unavailable. Please notify the service administrator if this continues to happen.",
"pad.share": "Share this pad", "pad.share": "Share this pad",
"pad.share.readonly": "Read only", "pad.share.readonly": "Read only",
"pad.share.link": "Link", "pad.share.link": "Link",

59
src/locales/es.json
View file

@ -9,11 +9,12 @@
"Rubenwap", "Rubenwap",
"VegaDark", "VegaDark",
"Vivaelcelta", "Vivaelcelta",
"Xuacu" "Xuacu",
"Macofe"
] ]
}, },
"index.newPad": "Nuevo Pad", "index.newPad": "Nuevo pad",
"index.createOpenPad": "o crea/abre un Pad con el nombre:", "index.createOpenPad": "o crea/abre un pad con el nombre:",
"pad.toolbar.bold.title": "Negrita (Ctrl-B)", "pad.toolbar.bold.title": "Negrita (Ctrl-B)",
"pad.toolbar.italic.title": "Cursiva (Ctrl-I)", "pad.toolbar.italic.title": "Cursiva (Ctrl-I)",
"pad.toolbar.underline.title": "Subrayado (Ctrl-U)", "pad.toolbar.underline.title": "Subrayado (Ctrl-U)",
@ -24,7 +25,7 @@
"pad.toolbar.unindent.title": "Eliminar sangría (Shift+TAB)", "pad.toolbar.unindent.title": "Eliminar sangría (Shift+TAB)",
"pad.toolbar.undo.title": "Deshacer (Ctrl-Z)", "pad.toolbar.undo.title": "Deshacer (Ctrl-Z)",
"pad.toolbar.redo.title": "Rehacer (Ctrl-Y)", "pad.toolbar.redo.title": "Rehacer (Ctrl-Y)",
"pad.toolbar.clearAuthorship.title": "Eliminar los colores de los autores", "pad.toolbar.clearAuthorship.title": "Eliminar los colores de autoría",
"pad.toolbar.import_export.title": "Importar/Exportar a diferentes formatos de archivos", "pad.toolbar.import_export.title": "Importar/Exportar a diferentes formatos de archivos",
"pad.toolbar.timeslider.title": "Línea de tiempo", "pad.toolbar.timeslider.title": "Línea de tiempo",
"pad.toolbar.savedRevision.title": "Guardar revisión", "pad.toolbar.savedRevision.title": "Guardar revisión",
@ -34,13 +35,13 @@
"pad.colorpicker.save": "Guardar", "pad.colorpicker.save": "Guardar",
"pad.colorpicker.cancel": "Cancelar", "pad.colorpicker.cancel": "Cancelar",
"pad.loading": "Cargando...", "pad.loading": "Cargando...",
"pad.passwordRequired": "Necesitas una contraseña para acceder a este documento", "pad.passwordRequired": "Necesitas una contraseña para acceder a este pad",
"pad.permissionDenied": "No tienes permiso para acceder a esta página", "pad.permissionDenied": "No tienes permiso para acceder a este pad",
"pad.wrongPassword": "La contraseña era incorrecta", "pad.wrongPassword": "La contraseña era incorrecta",
"pad.settings.padSettings": "Configuración del Pad", "pad.settings.padSettings": "Configuración del pad",
"pad.settings.myView": "Preferencias personales", "pad.settings.myView": "Preferencias personales",
"pad.settings.stickychat": "Chat siempre encima", "pad.settings.stickychat": "Chat siempre en pantalla",
"pad.settings.colorcheck": "Color de autoría", "pad.settings.colorcheck": "Colores de autoría",
"pad.settings.linenocheck": "Números de línea", "pad.settings.linenocheck": "Números de línea",
"pad.settings.rtlcheck": "¿Leer contenido de derecha a izquierda?", "pad.settings.rtlcheck": "¿Leer contenido de derecha a izquierda?",
"pad.settings.fontType": "Tipografía:", "pad.settings.fontType": "Tipografía:",
@ -50,7 +51,7 @@
"pad.settings.language": "Idioma:", "pad.settings.language": "Idioma:",
"pad.importExport.import_export": "Importar/Exportar", "pad.importExport.import_export": "Importar/Exportar",
"pad.importExport.import": "Subir cualquier texto o documento", "pad.importExport.import": "Subir cualquier texto o documento",
"pad.importExport.importSuccessful": "¡Operación realizada con éxito!", "pad.importExport.importSuccessful": "¡Éxito!",
"pad.importExport.export": "Exporta el pad actual como:", "pad.importExport.export": "Exporta el pad actual como:",
"pad.importExport.exporthtml": "HTML", "pad.importExport.exporthtml": "HTML",
"pad.importExport.exportplain": "Texto plano", "pad.importExport.exportplain": "Texto plano",
@ -58,32 +59,32 @@
"pad.importExport.exportpdf": "PDF", "pad.importExport.exportpdf": "PDF",
"pad.importExport.exportopen": "ODF (Open Document Format)", "pad.importExport.exportopen": "ODF (Open Document Format)",
"pad.importExport.exportdokuwiki": "DokuWiki", "pad.importExport.exportdokuwiki": "DokuWiki",
"pad.importExport.abiword.innerHTML": "Sólo puede importar formatos de texto plano o html. Para funciones más avanzadas instale <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">abiword</a>.", "pad.importExport.abiword.innerHTML": "Sólo puedes importar formatos de texto plano o html. Para funciones más avanzadas instala <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">abiword</a>.",
"pad.modals.connected": "Conectado.", "pad.modals.connected": "Conectado.",
"pad.modals.reconnecting": "Reconectando a tu pad..", "pad.modals.reconnecting": "Reconectando a tu pad..",
"pad.modals.forcereconnect": "Reconexión forzosa", "pad.modals.forcereconnect": "Forzar reconexión",
"pad.modals.userdup": "Abierto en otra ventana", "pad.modals.userdup": "Abierto en otra ventana",
"pad.modals.userdup.explanation": "Este pad parece estar abierto en más de una ventana de tu navegador.", "pad.modals.userdup.explanation": "Este pad parece estar abierto en más de una ventana de tu navegador.",
"pad.modals.userdup.advice": "Reconectar para usar esta ventana.", "pad.modals.userdup.advice": "Reconectar para usar esta ventana.",
"pad.modals.unauth": "No autorizado.", "pad.modals.unauth": "No autorizado.",
"pad.modals.unauth.explanation": "Los permisos han cambiado mientras estabas viendo esta página. Intenta reconectar de nuevo.", "pad.modals.unauth.explanation": "Tus permisos han cambiado mientras estabas viendo esta página. Intenta reconectarte.",
"pad.modals.looping.explanation": "Estamos teniendo problemas con la sincronización en el servidor.", "pad.modals.looping.explanation": "Hay problemas con el servidor de sincronización.",
"pad.modals.looping.cause": "Puede deberse a que te conectes a través de un proxy o un cortafuegos incompatible.", "pad.modals.looping.cause": "Puede deberse a que te conectes a través de un proxy o un cortafuegos incompatible.",
"pad.modals.initsocketfail": "Servidor incalcanzable.", "pad.modals.initsocketfail": "Servidor incalcanzable.",
"pad.modals.initsocketfail.explanation": "No se pudo conectar al servidor de sincronización.", "pad.modals.initsocketfail.explanation": "No se pudo conectar al servidor de sincronización.",
"pad.modals.initsocketfail.cause": "Puede ser a causa de tu navegador o de una caída en tu conexión de Internet.", "pad.modals.initsocketfail.cause": "Probablemente debido a un problema en tu navegador o en tu conexión a internet.",
"pad.modals.slowcommit.explanation": "El servidor no responde.", "pad.modals.slowcommit.explanation": "El servidor no responde.",
"pad.modals.slowcommit.cause": "Puede deberse a problemas con tu conexión de red.", "pad.modals.slowcommit.cause": "Puede deberse a problemas con tu conexión de red.",
"pad.modals.badChangeset.explanation": "Ha hecho una edición clasificada como ilegal por el servidor de sincronización.", "pad.modals.badChangeset.explanation": "Has hecho una edición clasificada como ilegal por el servidor de sincronización.",
"pad.modals.badChangeset.cause": "Esto podría ser debido a una mala configuración del servidor o algún otro comportamiento inesperado. Póngase en contacto con el administrador del servicio, si siente que esto es un error. Intente volver a conectar con el fin de seguir editando.", "pad.modals.badChangeset.cause": "Esto podría deberse a una mala configuración del servidor o algún otro comportamiento inesperado. Contacta al administrador del servicio, si piensas que esto es un error. Intenta reconectarte con el fin de seguir editando.",
"pad.modals.corruptPad.explanation": "El pad que está intentando acceder está dañado.", "pad.modals.corruptPad.explanation": "El pad que intentas acceder está dañado.",
"pad.modals.corruptPad.cause": "Esto puede deberse a una mala configuración de servidor o algún otro comportamiento inesperado. Póngase en contacto con el administrador del servicio.", "pad.modals.corruptPad.cause": "Esto puede deberse a una mala configuración del servidor o algún otro comportamiento inesperado. Contacta al administrador del servicio.",
"pad.modals.deleted": "Borrado.", "pad.modals.deleted": "Borrado.",
"pad.modals.deleted.explanation": "Este pad ha sido borrado.", "pad.modals.deleted.explanation": "Este pad ha sido borrado.",
"pad.modals.disconnected": "Has sido desconectado.", "pad.modals.disconnected": "Te has desconectado.",
"pad.modals.disconnected.explanation": "Se perdió la conexión con el servidor", "pad.modals.disconnected.explanation": "Se perdió la conexión con el servidor",
"pad.modals.disconnected.cause": "El servidor podría no estar disponible. Contacte con nosotros si esto continúa sucediendo.", "pad.modals.disconnected.cause": "El servidor podría no estar disponible. Contacta al administrador del servicio si esto continúa sucediendo.",
"pad.share": "Compatir el pad", "pad.share": "Compatir este pad",
"pad.share.readonly": "Sólo lectura", "pad.share.readonly": "Sólo lectura",
"pad.share.link": "Enlace", "pad.share.link": "Enlace",
"pad.share.emebdcode": "Incrustar URL", "pad.share.emebdcode": "Incrustar URL",
@ -118,13 +119,13 @@
"pad.userlist.guest": "Invitado", "pad.userlist.guest": "Invitado",
"pad.userlist.deny": "Denegar", "pad.userlist.deny": "Denegar",
"pad.userlist.approve": "Aprobar", "pad.userlist.approve": "Aprobar",
"pad.editbar.clearcolors": "¿Desea borrar el color de los autores en todo el documento?", "pad.editbar.clearcolors": "¿Quieres borrar los colores de autoría en todo el documento?",
"pad.impexp.importbutton": "Importar", "pad.impexp.importbutton": "Importar ahora",
"pad.impexp.importing": "Importando...", "pad.impexp.importing": "Importando...",
"pad.impexp.confirmimport": "Al importar un fichero se borrará el contenido actual del documento. ¿Quiere continuar?", "pad.impexp.confirmimport": "Al importar un archivo se borrará el contenido actual del pad. ¿Estás seguro de que quieres continuar?",
"pad.impexp.convertFailed": "No pudimos importar este fichero. Intentalo con otro formato diferente o copia y pega manualmente.", "pad.impexp.convertFailed": "No pudimos importar este archivo. Inténtalo con un formato diferente o copia y pega manualmente.",
"pad.impexp.uploadFailed": "El envío del fichero falló. Intentelo de nuevo.", "pad.impexp.uploadFailed": "El envío falló. Intentalo de nuevo.",
"pad.impexp.importfailed": "Fallo al importar", "pad.impexp.importfailed": "Fallo al importar",
"pad.impexp.copypaste": "Intente copiar y pegar", "pad.impexp.copypaste": "Intenta copiar y pegar",
"pad.impexp.exportdisabled": "La exportación al formato {{type}} format está desactivada. Contacte con su administrador de sistemas." "pad.impexp.exportdisabled": "La exportación al formato {{type}} está desactivada. Contacta a tu administrador de sistemas."
} }

3
src/locales/ko.json
View file

@ -2,7 +2,8 @@
"@metadata": { "@metadata": {
"authors": [ "authors": [
"Hym411", "Hym411",
"아라" "아라",
"Revi"
] ]
}, },
"index.newPad": "새 패드", "index.newPad": "새 패드",

76
src/locales/mn.json Normal file
View file

@ -0,0 +1,76 @@
{
"@metadata": {
"authors": [
"MongolWiki",
"Wisdom"
]
},
"pad.toolbar.bold.title": "Болд тескт (Ctrl-B)",
"pad.toolbar.italic.title": "Налуу тескт (Ctrl-I)",
"pad.toolbar.underline.title": "Доогуур зураас (Ctrl-U)",
"pad.toolbar.strikethrough.title": "Дундуураа зураастай",
"pad.toolbar.ol.title": "Эрэмбэлэгдсэн жагсаалт",
"pad.toolbar.ul.title": "Эрэмбэлээгүй жагсаалт",
"pad.toolbar.undo.title": "Буцаах (Ctrl-Z)",
"pad.toolbar.redo.title": "Undo -ын эсрэг (Ctrl-Y)",
"pad.toolbar.settings.title": "Тохиргоо",
"pad.colorpicker.save": "Хадгалах",
"pad.colorpicker.cancel": "Цуцлах",
"pad.loading": "Уншиж байна...",
"pad.settings.padSettings": "Падын тохиргоо",
"pad.settings.linenocheck": "Мөрийн дугаар",
"pad.settings.fontType": "Фонтын төрөл:",
"pad.settings.fontType.normal": "Ердийн",
"pad.settings.fontType.monospaced": "Зай ихтэй фонт",
"pad.settings.language": "Хэл:",
"pad.importExport.import_export": "Импорт/Экспорт",
"pad.importExport.import": "Бичвэр, текст файл оруулах",
"pad.importExport.importSuccessful": "Амжилттай!",
"pad.importExport.exportplain": "Цулгаа бичвэр",
"pad.importExport.exportpdf": "PDF файл",
"pad.importExport.exportopen": "ODF файл",
"pad.modals.connected": "Холбогдсон.",
"pad.modals.unauth": "Үл зөвшөөрөгдсөн",
"pad.modals.initsocketfail": "Сервер холбогдох боломжгүй.",
"pad.modals.slowcommit.explanation": "Сервер хариу өгөхгүй байна.",
"pad.modals.deleted": "Устгагдсан",
"pad.modals.deleted.explanation": "Энэ паб устсан байна.",
"pad.modals.disconnected": "Таны холболт салсан байна.",
"pad.modals.disconnected.explanation": "Серверын холболт салсан байна",
"pad.share": "Энэ падыг тараах",
"pad.share.readonly": "Зөвхөн унших",
"pad.share.link": "Холбоос",
"pad.share.emebdcode": "URL хавсаргах",
"pad.chat": "Чат",
"pad.chat.loadmessages": "Нэмэж мессеж оруулах",
"timeslider.toolbar.returnbutton": "Падруу буцах",
"timeslider.toolbar.authors": "Зохиогч:",
"timeslider.toolbar.authorsList": "Зохиогчгүй",
"timeslider.toolbar.exportlink.title": "Экспорт",
"timeslider.exportCurrent": "Энэ хувилбарыг экспортлохдоо:",
"timeslider.version": "Хувилбар {{version}}",
"timeslider.saved": "{{year}}-ы {{month}}-н {{day}}-нд да;галсан.",
"timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
"timeslider.month.january": "Нэгдүгээр сар",
"timeslider.month.february": "Хоёрдугаар сар",
"timeslider.month.march": "Гуравдугаар сар",
"timeslider.month.april": "Дөрөвдүгээр сар",
"timeslider.month.may": "Тавдугаар сар",
"timeslider.month.june": "Зургаадугаар сар",
"timeslider.month.july": "Долоодугаар сар",
"timeslider.month.august": "Наймдугаар сар",
"timeslider.month.september": "Есдүгээр сар",
"timeslider.month.october": "Аравдугаар сар",
"timeslider.month.november": "Арваннэгдүгээр сар",
"timeslider.month.december": "Арванхоёрдугаар сар",
"pad.savedrevs.marked": "Энэ хувилбар хадгалагдаагүй байна",
"pad.userlist.entername": "Нэрээ бичнэ үү",
"pad.userlist.unnamed": "нэргүй",
"pad.userlist.guest": "Зочин",
"pad.userlist.deny": "Үл зөвшөөр",
"pad.userlist.approve": "Зөвшөөр",
"pad.impexp.importbutton": "Одоо импорт хий",
"pad.impexp.importing": "Импортлож байна...",
"pad.impexp.importfailed": "Импортлоход алдаа",
"pad.impexp.copypaste": "Хуулаад тавина уу"
}

71
src/locales/nap.json Normal file
View file

@ -0,0 +1,71 @@
{
"@metadata": {
"authors": [
"Chelin"
]
},
"index.newPad": "Novo Pad",
"index.createOpenPad": "o crià o apre nu Pad cu 'o nomme:",
"pad.toolbar.bold.title": "Grassetto (Ctrl-B)",
"pad.toolbar.italic.title": "Cursivo (Ctrl-I)",
"pad.toolbar.underline.title": "Sottolineato (Ctrl-U)",
"pad.toolbar.strikethrough.title": "Barrato",
"pad.toolbar.ol.title": "Ennece nummerato",
"pad.toolbar.ul.title": "Ennece puntato",
"pad.toolbar.indent.title": "Rientro (TAB)",
"pad.toolbar.unindent.title": "Riduce rientro (Shift+TAB)",
"pad.toolbar.undo.title": "Annulla (Ctrl-Z)",
"pad.toolbar.redo.title": "Ripete (Ctrl-Y)",
"pad.toolbar.clearAuthorship.title": "Elimina 'e culure ca 'ndicanno 'e auture",
"pad.toolbar.import_export.title": "'Mporta/esporta 'e/a diverse furmate 'e file",
"pad.toolbar.timeslider.title": "Presentazzione cronologgia",
"pad.toolbar.savedRevision.title": "Sarva revisione",
"pad.toolbar.settings.title": "Mpustaziune",
"pad.colorpicker.save": "Sarva",
"pad.colorpicker.cancel": "Canciella",
"pad.loading": "Carecamiento 'n curso…",
"pad.passwordRequired": "Pe' accede a chisto Pad è necessaria 'na password",
"pad.permissionDenied": "Nun se dispunne d\"e permisse necessare pe' accede a chisto Pad",
"pad.wrongPassword": "'A password è sbagliata",
"pad.settings.padSettings": "Mpostazzione d\"o pad",
"pad.settings.fontType.normal": "Nurmale",
"pad.importExport.exporthtml": "HTML",
"pad.importExport.exportpdf": "PDF",
"pad.importExport.exportopen": "ODF (Open Document Format)",
"pad.importExport.exportdokuwiki": "DokuWiki",
"pad.modals.connected": "Cunnesso.",
"pad.modals.reconnecting": "Ricunnessione ô pad 'n curso...",
"pad.modals.forcereconnect": "Forza 'a ricunnessione",
"pad.modals.userdup": "Aprito 'n n'ata fenesta",
"pad.modals.unauth": "Nun autorizzato",
"pad.modals.deleted": "Canciellato.",
"timeslider.pageTitle": "Cronologgia {{appTitle}}",
"timeslider.toolbar.returnbutton": "Ritorna ô Pad",
"timeslider.toolbar.authors": "Auture:",
"timeslider.toolbar.authorsList": "Nisciun autore",
"timeslider.toolbar.exportlink.title": "Espurta",
"timeslider.exportCurrent": "Espurta 'a verzione corrente comme:",
"timeslider.version": "Verzione {{version}}",
"timeslider.saved": "Sarvato {{day}} {{month}} {{year}}",
"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
"timeslider.month.january": "Jennaro",
"timeslider.month.february": "Frevaro",
"timeslider.month.march": "Màrzo",
"timeslider.month.april": "Abbrile",
"timeslider.month.may": "Màjo",
"timeslider.month.june": "Giùgno",
"timeslider.month.july": "Luglio",
"timeslider.month.august": "Aùsto",
"timeslider.month.september": "Settembre",
"timeslider.month.october": "Ottovre",
"timeslider.month.november": "Nuvembre",
"timeslider.month.december": "Dicembre",
"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autore, other: auture ]} senza nomme",
"pad.userlist.entername": "'Nserisce 'o tujo nomme",
"pad.userlist.unnamed": "senza nomme",
"pad.userlist.guest": "Ospite",
"pad.userlist.deny": "Nega",
"pad.userlist.approve": "Appruva",
"pad.impexp.importbutton": "'Mpurta mmo",
"pad.impexp.importing": "'Mpurtazzione 'n curso..."
}

29
src/locales/pa.json
View file

@ -1,7 +1,8 @@
{ {
"@metadata": { "@metadata": {
"authors": [ "authors": [
"Aalam" "Aalam",
"Babanwalia"
] ]
}, },
"index.newPad": "ਨਵਾਂ ਪੈਡ", "index.newPad": "ਨਵਾਂ ਪੈਡ",
@ -12,7 +13,8 @@
"pad.toolbar.strikethrough.title": "ਵਿੰਨ੍ਹੋ ਵਿਨੋ", "pad.toolbar.strikethrough.title": "ਵਿੰਨ੍ਹੋ ਵਿਨੋ",
"pad.toolbar.ol.title": "ਲੜੀਵਾਰ ਲਿਸਟ", "pad.toolbar.ol.title": "ਲੜੀਵਾਰ ਲਿਸਟ",
"pad.toolbar.ul.title": "ਬਿਨ-ਲੜੀਬੱਧ ਸੂਚੀ", "pad.toolbar.ul.title": "ਬਿਨ-ਲੜੀਬੱਧ ਸੂਚੀ",
"pad.toolbar.indent.title": "ਹਾਸ਼ੀਏ ਤੋਂ ਦੂਰ", "pad.toolbar.indent.title": "ਹਾਸ਼ੀਏ ਤੋਂ ਪਰ੍ਹੇ (ਟੈਬ)",
"pad.toolbar.unindent.title": "ਹਾਸ਼ੀਏ ਵੱਲ (ਸ਼ਿਫ਼ਟ+ਟੈਬ)",
"pad.toolbar.undo.title": "ਵਾਪਸ (Ctrl-Z)", "pad.toolbar.undo.title": "ਵਾਪਸ (Ctrl-Z)",
"pad.toolbar.redo.title": "ਪਰਤਾਓ (Ctrl-Y)", "pad.toolbar.redo.title": "ਪਰਤਾਓ (Ctrl-Y)",
"pad.toolbar.clearAuthorship.title": "ਪਰਮਾਣਕਿਤਾ ਰੰਗ ਸਾਫ਼ ਕਰੋ", "pad.toolbar.clearAuthorship.title": "ਪਰਮਾਣਕਿਤਾ ਰੰਗ ਸਾਫ਼ ਕਰੋ",
@ -22,7 +24,7 @@
"pad.toolbar.settings.title": "ਸੈਟਿੰਗ", "pad.toolbar.settings.title": "ਸੈਟਿੰਗ",
"pad.toolbar.embed.title": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਤੇ ਇੰਬੈੱਡ ਕਰੋ", "pad.toolbar.embed.title": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਤੇ ਇੰਬੈੱਡ ਕਰੋ",
"pad.toolbar.showusers.title": "ਇਹ ਪੈਡ ਉੱਤੇ ਯੂਜ਼ਰ ਵੇਖਾਓ", "pad.toolbar.showusers.title": "ਇਹ ਪੈਡ ਉੱਤੇ ਯੂਜ਼ਰ ਵੇਖਾਓ",
"pad.colorpicker.save": "ਸੰਭਾਲੋ", "pad.colorpicker.save": "ਸਾਂਭੋ",
"pad.colorpicker.cancel": "ਰੱਦ ਕਰੋ", "pad.colorpicker.cancel": "ਰੱਦ ਕਰੋ",
"pad.loading": "…ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ", "pad.loading": "…ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
"pad.passwordRequired": "ਇਹ ਪੈਡ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ", "pad.passwordRequired": "ਇਹ ਪੈਡ ਦੀ ਵਰਤੋਂ ਕਰਨ ਲਈ ਤੁਹਾਨੂੰ ਪਾਸਵਰਡ ਚਾਹੀਦਾ ਹੈ",
@ -31,6 +33,7 @@
"pad.settings.padSettings": "ਪੈਡ ਸੈਟਿੰਗ", "pad.settings.padSettings": "ਪੈਡ ਸੈਟਿੰਗ",
"pad.settings.myView": "ਮੇਰੀ ਝਲਕ", "pad.settings.myView": "ਮੇਰੀ ਝਲਕ",
"pad.settings.stickychat": "ਹਮੇਸ਼ਾ ਸਕਰੀਨ ਉੱਤੇ ਗੱਲ ਕਰੋ", "pad.settings.stickychat": "ਹਮੇਸ਼ਾ ਸਕਰੀਨ ਉੱਤੇ ਗੱਲ ਕਰੋ",
"pad.settings.colorcheck": "ਲੇਖਕੀ ਰੰਗ",
"pad.settings.linenocheck": "ਲਾਈਨ ਨੰਬਰ", "pad.settings.linenocheck": "ਲਾਈਨ ਨੰਬਰ",
"pad.settings.rtlcheck": "ਸਮੱਗਰੀ ਸੱਜੇ ਤੋਂ ਖੱਬੇ ਪੜ੍ਹਨੀ ਹੈ?", "pad.settings.rtlcheck": "ਸਮੱਗਰੀ ਸੱਜੇ ਤੋਂ ਖੱਬੇ ਪੜ੍ਹਨੀ ਹੈ?",
"pad.settings.fontType": "ਫੋਂਟ ਕਿਸਮ:", "pad.settings.fontType": "ਫੋਂਟ ਕਿਸਮ:",
@ -48,18 +51,31 @@
"pad.importExport.exportpdf": "ਪੀਡੀਐਫ", "pad.importExport.exportpdf": "ਪੀਡੀਐਫ",
"pad.importExport.exportopen": "ODF (ਓਪਨ ਡੌਕੂਮੈਂਟ ਫਾਰਮੈਟ)", "pad.importExport.exportopen": "ODF (ਓਪਨ ਡੌਕੂਮੈਂਟ ਫਾਰਮੈਟ)",
"pad.importExport.exportdokuwiki": "DokuWiki", "pad.importExport.exportdokuwiki": "DokuWiki",
"pad.importExport.abiword.innerHTML": "ਤੁਸੀਂ ਸਿਰਫ਼ ਸਾਦੀਆਂ ਲਿਖਤੀ ਜਾਂ ਐੱਚ.ਟੀ.ਐੱਮ.ਐੱਲ. ਰੂਪ-ਰੇਖਾਵਾਂ ਤੋਂ ਦਰਾਮਦ ਕਰ ਸਕਦੇ ਹੋ। ਹੋਰ ਉੱਨਤ ਦਰਾਮਦੀ ਗੁਣਾਂ ਵਾਸਤੇ ਮਿਹਰਬਾਨੀ ਕਰਕੇ <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">ਐਬੀਵਰਡ ਥਾਪੋ</a>।",
"pad.modals.connected": "ਕੁਨੈਕਟ ਹੈ।", "pad.modals.connected": "ਕੁਨੈਕਟ ਹੈ।",
"pad.modals.reconnecting": "..ਤੁਹਾਡੇ ਪੈਡ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ", "pad.modals.reconnecting": "..ਤੁਹਾਡੇ ਪੈਡ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
"pad.modals.forcereconnect": "ਧੱਕੇ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕਰੋ", "pad.modals.forcereconnect": "ਧੱਕੇ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕਰੋ",
"pad.modals.userdup": "ਹੋਰ ਵਿੰਡੋ ਵਿੱਚ ਖੁੱਲ੍ਹਿਆ ਹੈ", "pad.modals.userdup": "ਹੋਰ ਵਿੰਡੋ ਵਿੱਚ ਖੁੱਲ੍ਹਿਆ ਹੈ",
"pad.modals.userdup.explanation": "ਇਹ ਪੈਡ ਇਸ ਕੰਪਿਊਟਰ 'ਤੇ ਇੱਕ ਤੋਂ ਵੱਧ ਫਰੋਲੂ ਬਾਰੀ ਵਿੱਚ ਖੁੱਲ੍ਹਿਆ ਜਾਪਦਾ ਹੈ।",
"pad.modals.userdup.advice": "ਸਗੋਂ ਇਹ ਬਾਰੀ ਵਰਤਣ ਵਾਸਤੇ ਮੁੜ ਜੁੜੋ।",
"pad.modals.unauth": "ਪਰਮਾਣਿਤ ਨਹੀਂ ਹੈ", "pad.modals.unauth": "ਪਰਮਾਣਿਤ ਨਹੀਂ ਹੈ",
"pad.modals.unauth.explanation": "ਇਹ ਸਫ਼ਾ ਵੇਖਦੇ-ਵੇਖਦੇ ਤੁਹਾਨੂੰ ਮਿਲ਼ੀਆਂ ਇਜਾਜ਼ਤਾਂ ਬਦਲ ਗਈਆਂ ਹਨ। ਮੁੜ ਜੁੜਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰੋ।",
"pad.modals.looping.explanation": "ਇੱਕਰੂਪੀ ਸਰਵਰ ਨਾਲ਼ ਸੰਚਾਰੀ ਔਕੜਾਂ ਆ ਰਹੀਆਂ ਹਨ।",
"pad.modals.looping.cause": "ਸ਼ਾਇਦ ਤੁਸੀਂ ਕਿਸੇ ਅਢੁਕਵੀਂ ਸੁਰੱਖਿਆ ਪ੍ਰਨਾਲ਼ੀ ਜਾਂ ਪ੍ਰਾਕਸੀ ਰਾਹੀਂ ਜੁੜੇ ਹੋ।",
"pad.modals.initsocketfail": "ਸਰਵਰ ਪਹੁੰਚ ਵਿੱਚ ਨਹੀਂ ਹੈ।", "pad.modals.initsocketfail": "ਸਰਵਰ ਪਹੁੰਚ ਵਿੱਚ ਨਹੀਂ ਹੈ।",
"pad.modals.initsocketfail.explanation": "ਇੱਕਰੂਪੀ ਸਰਵਰ ਨਾਲ਼ ਰਾਬਤਾ ਨਹੀਂ ਬਣ ਸਕਿਆ।",
"pad.modals.initsocketfail.cause": "ਇਹ ਸ਼ਾਇਦ ਤੁਹਾਡੇ ਫਰੋਲੂ ਜਾਂ ਇੰਟਰਨੈੱਟ ਜੋੜ ਦੀਆਂ ਗੁੰਝਲਾਂ ਕਰਕੇ ਹੋ ਰਿਹਾ ਹੈ।",
"pad.modals.slowcommit.explanation": "ਸਰਵਰ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਿਹਾ ਹੈ।", "pad.modals.slowcommit.explanation": "ਸਰਵਰ ਜਵਾਬ ਨਹੀਂ ਦੇ ਰਿਹਾ ਹੈ।",
"pad.modals.slowcommit.cause": "ਇਹ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਾਲ ਸਮੱਸਿਆ ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ।", "pad.modals.slowcommit.cause": "ਇਹ ਨੈੱਟਵਰਕ ਕੁਨੈਕਸ਼ਨ ਨਾਲ ਸਮੱਸਿਆ ਕਰਕੇ ਹੋ ਸਕਦਾ ਹੈ।",
"pad.modals.badChangeset.explanation": "ਤੁਹਾਡੇ ਵੱਲੋਂ ਕੀਤੀ ਇੱਕ ਸੋਧ ਨੂੰ ਇੱਕਰੂਪੀ ਸਰਵਰ ਨੇ ਗ਼ੈਰ-ਕਨੂੰਨੀ ਕਰਾਰ ਦਿੱਤਾ ਹੈ।",
"pad.modals.badChangeset.cause": "ਇਹ ਸਿਸਟਮ ਦੀ ਕਿਸੇ ਗ਼ਲਤ ਨੁਹਾਰ ਜਾਂ ਕੋਈ ਹੋਰ ਅਣਸੋਚੇ ਵਤੀਰਾ ਕਰਕੇ ਵਾਪਰ ਸਕਦਾ ਹੈ। ਜੇਕਰ ਤੁਹਾਨੂੰ ਇਹ ਇੱਕ ਦੋਸ਼ ਲੱਗਦਾ ਹੈ ਤਾਂ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਪ੍ਰਬੰਧਕ ਨਾਲ਼ ਰਾਬਤਾ ਬਣਾਉ। ਸੋਧ ਜਾਰੀ ਰੱਖਣ ਵਾਸਤੇ ਮੁੜ ਜੁੜੋ।",
"pad.modals.corruptPad.explanation": "ਜਿਸ ਪੈਡ ਤੱਕ ਤੁਸੀਂ ਪਹੁੰਚਣਾ ਚਾਹੁੰਦੇ ਹੋ, ਉਹ ਖੋਟਾ ਹੈ।",
"pad.modals.corruptPad.cause": "ਇਹ ਸਿਸਟਮ ਦੀ ਕਿਸੇ ਗ਼ਲਤ ਨੁਹਾਰ ਜਾਂ ਕੋਈ ਹੋਰ ਅਣਸੋਚੇ ਵਤੀਰਾ ਕਰਕੇ ਵਾਪਰ ਸਕਦਾ ਹੈ। ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਪ੍ਰਬੰਧਕ ਨਾਲ਼ ਰਾਬਤਾ ਬਣਾਉ।",
"pad.modals.deleted": "ਹਟਾਇਆ।", "pad.modals.deleted": "ਹਟਾਇਆ।",
"pad.modals.deleted.explanation": "ਇਹ ਪੈਡ ਹਟਾਇਆ ਜਾ ਚੁੱਕਾ ਹੈ।", "pad.modals.deleted.explanation": "ਇਹ ਪੈਡ ਹਟਾਇਆ ਜਾ ਚੁੱਕਾ ਹੈ।",
"pad.modals.disconnected": "ਤੁਸੀਂ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਚੁੱਕੇ ਹੋ।", "pad.modals.disconnected": "ਤੁਸੀਂ ਡਿਸ-ਕੁਨੈਕਟ ਹੋ ਚੁੱਕੇ ਹੋ।",
"pad.modals.disconnected.explanation": "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ ਹੈ", "pad.modals.disconnected.explanation": "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ ਹੋਇਆ ਹੈ",
"pad.modals.disconnected.cause": "ਸਰਵਰ ਨਾਮੌਜੂਦ ਹੋ ਸਕਦਾ ਹੈ। ਜੇਕਰ ਇਹ ਹੁੰਦਾ ਰਹੇ ਤਾਂ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਸੇਵਾ ਪ੍ਰਬੰਧਕ ਨੂੰ ਖ਼ਬਰ ਕਰੋ।",
"pad.share": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਕਰੋ", "pad.share": "ਇਹ ਪੈਡ ਸਾਂਝਾ ਕਰੋ",
"pad.share.readonly": "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ", "pad.share.readonly": "ਕੇਵਲ ਪੜ੍ਹਨ ਲਈ",
"pad.share.link": "ਲਿੰਕ", "pad.share.link": "ਲਿੰਕ",
@ -88,7 +104,7 @@
"timeslider.month.october": "ਅਕਤੂਬਰ", "timeslider.month.october": "ਅਕਤੂਬਰ",
"timeslider.month.november": "ਨਵੰਬਰ", "timeslider.month.november": "ਨਵੰਬਰ",
"timeslider.month.december": "ਦਸੰਬਰ", "timeslider.month.december": "ਦਸੰਬਰ",
"timeslider.unnamedauthors": "{{num}} ਬੇਨਾਮ ਲੇਖਕ", "timeslider.unnamedauthors": "{{num}} ਬੇਨਾਮ {[plural(num) one: ਲੇਖਕ, other: ਲੇਖਕ ]}",
"pad.savedrevs.marked": "ਇਹ ਰੀਵਿਜ਼ਨ ਨੂੰ ਹੁਣ ਸੰਭਾਲੇ ਹੋਏ ਰੀਵਿਜ਼ਨ ਵਜੋਂ ਮੰਨਿਆ ਗਿਆ ਹੈ", "pad.savedrevs.marked": "ਇਹ ਰੀਵਿਜ਼ਨ ਨੂੰ ਹੁਣ ਸੰਭਾਲੇ ਹੋਏ ਰੀਵਿਜ਼ਨ ਵਜੋਂ ਮੰਨਿਆ ਗਿਆ ਹੈ",
"pad.userlist.entername": "ਆਪਣਾ ਨਾਂ ਦਿਉ", "pad.userlist.entername": "ਆਪਣਾ ਨਾਂ ਦਿਉ",
"pad.userlist.unnamed": "ਬੇਨਾਮ", "pad.userlist.unnamed": "ਬੇਨਾਮ",
@ -98,7 +114,10 @@
"pad.editbar.clearcolors": "ਪੂਰੇ ਦਸਾਤਵੇਜ਼ ਉੱਤੇ ਪਰਮਾਣਕਿਤਾ ਰੰਗ ਸਾਫ਼ ਕਰਨੇ ਹਨ?", "pad.editbar.clearcolors": "ਪੂਰੇ ਦਸਾਤਵੇਜ਼ ਉੱਤੇ ਪਰਮਾਣਕਿਤਾ ਰੰਗ ਸਾਫ਼ ਕਰਨੇ ਹਨ?",
"pad.impexp.importbutton": "ਹੁਣੇ ਇੰਪੋਰਟ ਕਰੋ", "pad.impexp.importbutton": "ਹੁਣੇ ਇੰਪੋਰਟ ਕਰੋ",
"pad.impexp.importing": "...ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ", "pad.impexp.importing": "...ਇੰਪੋਰਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
"pad.impexp.confirmimport": "ਕੋਈ ਫ਼ਾਈਲ ਦਰਾਮਦ ਕਾਰਨ ਨਾਲ਼ ਪੈਡ ਦੀ ਮੌਜੂਦਾ ਲਿਖਤ ਉੱਤੇ ਲਿਖਿਆ ਜਾਵੇਗਾ। ਕੀ ਤੁਸੀਂ ਸੱਚੀਂ ਇਹ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ?",
"pad.impexp.convertFailed": "ਅਸੀਂ ਇਸ ਫ਼ਾਈਲ ਦੀ ਦਰਾਮਦ ਨਹੀਂ ਕਰ ਸਕੇ। ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਕੋਈ ਵੱਖਰੀ ਦਸਤਾਵੇਜ਼ੀ ਰੂਪ-ਰੇਖਾ ਵਰਤੋ ਜਾਂ ਹੱਥੀਂ ਨਕਲ-ਚੇਪੀ ਕਰੋ।",
"pad.impexp.uploadFailed": "ਅੱਪਲੋਡ ਲਈ ਫੇਲ੍ਹ ਹੈ, ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।", "pad.impexp.uploadFailed": "ਅੱਪਲੋਡ ਲਈ ਫੇਲ੍ਹ ਹੈ, ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।",
"pad.impexp.importfailed": "ਇੰਪੋਰਟ ਫੇਲ੍ਹ ਹੈ", "pad.impexp.importfailed": "ਇੰਪੋਰਟ ਫੇਲ੍ਹ ਹੈ",
"pad.impexp.copypaste": "ਕਾਪੀ ਕਰੋ ਚੇਪੋ ਜੀ" "pad.impexp.copypaste": "ਕਾਪੀ ਕਰੋ ਚੇਪੋ ਜੀ",
"pad.impexp.exportdisabled": "{{type}} ਰੂਪ-ਰੇਖਾ ਵਜੋਂ ਬਰਾਮਦ ਕਰਨਾ ਬੰਦ ਹੈ। ਵੇਰਵੇ ਵਾਸਤੇ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਆਪਣੇ ਸਿਸਟਮ ਦੇ ਪ੍ਰਬੰਧਕ ਨਾਲ਼ ਰਾਬਤਾ ਬਣਾਉ।"
} }

5
src/locales/pt-br.json
View file

@ -7,7 +7,8 @@
"TheGabrielZaum", "TheGabrielZaum",
"Titoncio", "Titoncio",
"Tuliouel", "Tuliouel",
"Rafaelff" "Rafaelff",
"Dianakc"
] ]
}, },
"index.newPad": "Nova Nota", "index.newPad": "Nova Nota",
@ -83,7 +84,7 @@
"pad.modals.disconnected.cause": "O servidor pode estar indisponível. Por favor, notifique o administrador caso isso continue.", "pad.modals.disconnected.cause": "O servidor pode estar indisponível. Por favor, notifique o administrador caso isso continue.",
"pad.share": "Compartilhar esta nota", "pad.share": "Compartilhar esta nota",
"pad.share.readonly": "Somente leitura", "pad.share.readonly": "Somente leitura",
"pad.share.link": "Ligação", "pad.share.link": "Link",
"pad.share.emebdcode": "Incorporar o URL", "pad.share.emebdcode": "Incorporar o URL",
"pad.chat": "Bate-papo", "pad.chat": "Bate-papo",
"pad.chat.title": "Abrir o bate-papo desta nota.", "pad.chat.title": "Abrir o bate-papo desta nota.",

2
src/node/handler/ExportHandler.js
View file

@ -52,7 +52,7 @@ exports.doExport = function(req, res, padId, type)
hooks.aCallFirst("exportFileName", padId, hooks.aCallFirst("exportFileName", padId,
function(err, hookFileName){ function(err, hookFileName){
// if fileName is set then set it to the padId, note that fileName is returned as an array. // if fileName is set then set it to the padId, note that fileName is returned as an array.
if(hookFileName) fileName = hookFileName; if(hookFileName.length) fileName = hookFileName;
//tell the browser that this is a downloadable file //tell the browser that this is a downloadable file

8
src/node/utils/toolbar.js
View file

@ -99,8 +99,8 @@ _.extend(Button.prototype, {
"data-key": this.attributes.command, "data-key": this.attributes.command,
}; };
return tag("li", liAttributes, return tag("li", liAttributes,
tag("a", { "class": this.grouping }, tag("a", { "class": this.grouping, "data-l10n-id": this.attributes.localizationId },
tag("span", { "class": " "+ this.attributes.class, "data-l10n-id": this.attributes.localizationId }) tag("span", { "class": " "+ this.attributes.class })
) )
); );
} }
@ -203,13 +203,13 @@ module.exports = {
settings: defaultButtonAttributes("settings"), settings: defaultButtonAttributes("settings"),
embed: defaultButtonAttributes("embed"), embed: defaultButtonAttributes("embed"),
showusers: defaultButtonAttributes("showusers"), showusers: defaultButtonAttributes("showusers"),
timeslider_export: { timeslider_export: {
command: "import_export", command: "import_export",
localizationId: "timeslider.toolbar.exportlink.title", localizationId: "timeslider.toolbar.exportlink.title",
class: "buttonicon buttonicon-import_export" class: "buttonicon buttonicon-import_export"
}, },
timeslider_returnToPad: { timeslider_returnToPad: {
command: "timeslider_returnToPad", command: "timeslider_returnToPad",
localizationId: "timeslider.toolbar.returnbutton", localizationId: "timeslider.toolbar.returnbutton",

76
src/static/css/fontawesome-etherpad.css Normal file
View file

@ -0,0 +1,76 @@
@font-face {
font-family: 'fontawesome-etherpad';
src: url('../font/fontawesome-etherpad.eot?81419457');
src: url('../font/fontawesome-etherpad.eot?81419457#iefix') format('embedded-opentype'),
url('../font/fontawesome-etherpad.woff?81419457') format('woff'),
url('../font/fontawesome-etherpad.ttf?81419457') format('truetype'),
url('../font/fontawesome-etherpad.svg?81419457#fontawesome-etherpad') format('svg');
font-weight: normal;
font-style: normal;
}
/* Chrome hack: SVG is rendered more smooth in Windozze. 100% magic, uncomment if you need it. */
/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
/*
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontawesome-etherpad';
src: url('../font/fontawesome-etherpad.svg?81419457#fontawesome-etherpad') format('svg');
}
}
*/
[class^="icon-"]:before, [class*=" icon-"]:before {
font-family: "fontawesome-etherpad";
font-style: normal;
font-weight: normal;
speak: none;
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: .2em;
text-align: center;
/* opacity: .8; */
/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;
/* fix buttons height, for twitter bootstrap */
line-height: 1em;
/* Animation center compensation - margins should be symmetric */
/* remove if not needed */
margin-left: .2em;
/* you can be more comfortable with increased icons size */
/* font-size: 120%; */
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
.icon-users:before { content: '\e800'; } /* '' */
.icon-star:before { content: '\e801'; } /* '' */
.icon-cog:before { content: '\e802'; } /* '' */
.icon-bold:before { content: '\e803'; } /* '' */
.icon-italic:before { content: '\e804'; } /* '' */
.icon-indent-left:before { content: '\e805'; } /* '' */
.icon-indent-right:before { content: '\e806'; } /* '' */
.icon-list-bullet:before { content: '\e807'; } /* '' */
.icon-list-numbered:before { content: '\e808'; } /* '' */
.icon-strike:before { content: '\e809'; } /* '' */
.icon-underline:before { content: '\e80a'; } /* '' */
.icon-cw:before { content: '\e80b'; } /* '' */
.icon-ccw:before { content: '\e80c'; } /* '' */
.icon-clock:before { content: '\e80d'; } /* '' */
.icon-eye-off:before { content: '\e80e'; } /* '' */
.icon-eye:before { content: '\e80f'; } /* '' */
.icon-play:before { content: '\e810'; } /* '' */
.icon-fast-bw:before { content: '\e811'; } /* '' */
.icon-fast-fw:before { content: '\e812'; } /* '' */
.icon-pause:before { content: '\e813'; } /* '' */
.icon-glass:before { content: '\e814'; } /* '' */
.icon-code:before { content: '\e815'; } /* '' */
.icon-exchange:before { content: '\e816'; } /* '' */
.icon-chat:before { content: '\e817'; } /* '' */

119
src/static/css/pad.css
View file

@ -73,6 +73,10 @@ a img {
.toolbar ul li { .toolbar ul li {
float: left; float: left;
margin-left: 2px; margin-left: 2px;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
} }
.toolbar ul li.separator { .toolbar ul li.separator {
border: inherit; border: inherit;
@ -160,15 +164,16 @@ a img {
border: 1px solid #ccc; border: 1px solid #ccc;
outline: none; outline: none;
} }
#usericon a { li[data-key=showusers] > a {
min-width: 30px; min-width: 30px;
text-align: left; text-align: left;
} }
#usericon a #online_count { li[data-key=showusers] > a #online_count {
color: #777; color: #777;
font-size: 10px; font-size: 11px;
position: relative; position: relative;
top: 2px; top: 2px;
padding-left: 2px;
} }
#editorcontainer { #editorcontainer {
position: absolute; position: absolute;
@ -664,64 +669,68 @@ table#otheruserstable {
.buttonicon { .buttonicon {
width: 16px; width: 16px;
height: 16px; height: 16px;
background-image: url('../../static/img/etherpad_lite_icons.png');
background-repeat: no-repeat;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
font-family: "fontawesome-etherpad";
font-size: 15px;
font-style: normal;
font-weight: normal;
color: #666;
} }
.buttonicon-bold { .buttonicon-bold:before {
background-position: 0px -116px content: "\e803";
} }
.buttonicon-italic { .buttonicon-italic:before {
background-position: 0px 0px content: "\e804";
} }
.buttonicon-underline { .buttonicon-underline:before {
background-position: 0px -236px content: "\e80a";
} }
.buttonicon-strikethrough { .buttonicon-strikethrough:before {
background-position: 0px -200px content: "\e809";
} }
.buttonicon-insertorderedlist { .buttonicon-insertorderedlist:before {
background-position: 0px -477px content: "\e808";
} }
.buttonicon-insertunorderedlist { .buttonicon-insertunorderedlist:before {
background-position: 0px -34px content: "\e807";
} }
.buttonicon-indent { .buttonicon-indent:before {
background-position: 0px -52px content: "\e806";
} }
.buttonicon-outdent { .buttonicon-outdent:before {
background-position: 0px -134px content: "\e805";
} }
.buttonicon-undo { .buttonicon-undo:before {
background-position: 0px -255px content: "\e80c";
} }
.buttonicon-redo { .buttonicon-redo:before {
background-position: 0px -166px content: "\e80b";
} }
.buttonicon-clearauthorship { .buttonicon-clearauthorship:before {
background-position: 0px -86px content: "\e80e";
} }
.buttonicon-settings { .buttonicon-settings:before {
background-position: 0px -436px content: "\e802";
} }
.buttonicon-import_export { .buttonicon-import_export:before {
background-position: 0px -68px content: "\e816";
} }
.buttonicon-embed { .buttonicon-embed:before {
background-position: 0px -18px content: "\e815";
} }
.buttonicon-history { .buttonicon-history:before {
background-position: 0px -218px content: "\e80d";
} }
.buttonicon-chat { .buttonicon-chat:before {
background-position: 0px -102px; content: "\e817";
} }
.buttonicon-showusers { .buttonicon-showusers:before {
background-position: 0px -183px; content: "\e800";
} }
.buttonicon-savedRevision { .buttonicon-savedRevision:before {
background-position: 0px -493px content: "\e801";
} }
#focusprotector { #focusprotector {
z-index: 100; z-index: 100;
@ -736,9 +745,6 @@ table#otheruserstable {
opacity: 0.01; opacity: 0.01;
display: none; display: none;
} }
#online_count {
color: #888;
}
.rtl { .rtl {
direction: RTL direction: RTL
} }
@ -814,7 +820,7 @@ input[type=checkbox] {
float: left; float: left;
} }
#settings, #settings,
#importexport, #import_export,
#embed, #embed,
#connectivity, #connectivity,
#users { #users {
@ -836,7 +842,7 @@ input[type=checkbox] {
border-left: 1px solid #ccc !important; border-left: 1px solid #ccc !important;
width: 185px !important; width: 185px !important;
} }
@media screen and (max-width: 600px) { @media screen and (max-width: 600px) {
.toolbar ul li.separator { .toolbar ul li.separator {
display: none; display: none;
} }
@ -854,7 +860,7 @@ input[type=checkbox] {
left:0px; left:0px;
right:0px; right:0px;
color:#000; color:#000;
} }
.gritter-close { .gritter-close {
display:block !important; display:block !important;
left: auto !important; left: auto !important;
@ -882,13 +888,13 @@ input[type=checkbox] {
.gritter-item-wrapper > div{ .gritter-item-wrapper > div{
background: none; background: none;
} }
#editorcontainer { #editorcontainer {
top: 68px; top: 68px;
} }
#editbar { #editbar {
height: 62px; height: 62px;
} }
.toolbar ul.menu_right { .toolbar ul.menu_right {
float: left; float: left;
margin-top:2px; margin-top:2px;
} }
@ -1070,15 +1076,4 @@ input[type=checkbox] {
text-shadow: none; text-shadow: none;
} }
/* End of gritter stuff */ /* End of gritter stuff */
.activeButton{
background: #eee;
background: -webkit-linear-gradient(#ddd, #fff);
background: -moz-linear-gradient(#ddd, #fff);
background: -o-linear-gradient(#ddd, #fff);
background: -ms-linear-gradient(#ddd, #fff);
background: linear-gradient(#ddd, #fff);
-webkit-box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
-moz-box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
box-shadow: 0 0 8px rgba(0,0,0,.1) inset;
}

13
src/static/css/timeslider.css
View file

@ -158,17 +158,20 @@
float: right float: right
} }
#settings, #settings,
#importexport, #import_export,
#embed, #embed,
#connectivity, #connectivity,
#users { #users {
top: 62px; top: 62px;
} }
#importexport .popup { #import_export .popup {
width: 185px width: 183px;
border-top: none;
border-right: none;
border-radius: 0 0 0 6px;
} }
#importexport { #import_export {
top: 118px; top: 115px;
width: 185px; width: 185px;
} }
.timeslider-bar { .timeslider-bar {

BIN
src/static/font/fontawesome-etherpad.eot Normal file
View file

Binary file not shown.

35
src/static/font/fontawesome-etherpad.svg Normal file
View file

@ -0,0 +1,35 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg">
<metadata>Copyright (C) 2014 by original authors @ fontello.com</metadata>
<defs>
<font id="fontawesome-etherpad" horiz-adv-x="1000" >
<font-face font-family="fontawesome-etherpad" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
<missing-glyph horiz-adv-x="1000" />
<glyph glyph-name="users" unicode="&#xe800;" d="m0 367q0 197 69 197 4 0 25-11t54-24 66-12q38 0 75 13-3-21-3-37 0-78 45-143-90-3-148-72h-75q-45 0-77 23t-31 66z m71 340q0 59 42 101t101 42 101-42 42-101-42-101-101-42-101 42-42 101z m72-713q0 30 2 58t8 61 14 61 24 54 35 45 48 30 62 11q6 0 24-12t41-26 59-27 76-12 75 12 60 27 41 26 23 12q35 0 63-11t47-30 35-45 24-54 15-61 8-61 2-58q0-66-41-105t-108-39h-488q-68 0-108 39t-41 105z m178 499q0 89 63 151t152 63 151-63 63-151-63-152-151-63-152 63-63 152z m393 214q0 59 42 101t101 42 101-42 42-101-42-101-101-42-101 42-42 101z m27-357q45 65 45 143 0 16-3 37 37-13 74-13 33 0 67 12t54 24 24 11q69 0 69-197 0-43-31-66t-77-22h-75q-57 68-147 71z" horiz-adv-x="1071.4" />
<glyph glyph-name="star" unicode="&#xe801;" d="m0 489q0 21 31 26l280 40 126 254q11 23 27 23t28-23l125-254 280-40q32-5 32-26 0-12-15-27l-203-197 48-279q1-4 1-12 0-11-6-19t-17-9q-10 0-22 7l-251 132-250-132q-13-7-23-7-11 0-17 9t-6 19q0 4 1 12l48 279-203 197q-14 15-14 27z" horiz-adv-x="928.6" />
<glyph glyph-name="cog" unicode="&#xe802;" d="m0 289v124q0 7 5 13t10 7l104 16q8 25 22 51-23 32-60 77-6 7-6 14 0 5 5 12 15 20 55 60t53 40q7 0 15-5l77-60q24 13 50 21 9 76 17 104 3 15 20 15h124q7 0 13-4t7-12l15-103q28-9 50-21l80 60q5 5 13 5 7 0 14-5 72-67 92-95 4-5 4-13 0-6-4-12-9-12-29-38t-30-39q14-28 23-55l102-15q7-1 12-7t4-13v-124q0-7-4-13t-11-7l-104-16q-10-30-21-51 19-28 59-77 6-6 6-14t-5-12q-15-21-55-61t-53-39q-7 0-14 5l-77 60q-25-13-51-21-9-76-16-104-4-16-20-16h-124q-8 0-14 5t-6 12l-16 103q-27 9-50 20l-79-59q-6-5-14-5-8 0-14 6-70 63-92 94-4 5-4 12 0 7 5 13 8 12 28 37t30 40q-15 28-23 55l-102 15q-7 1-11 7t-5 13z m286 61q0-59 42-101t101-42 101 42 41 101-41 101-101 42-101-42-42-101z" horiz-adv-x="857.1" />
<glyph glyph-name="bold" unicode="&#xe803;" d="m0-79l1 53q9 2 48 9t59 15q4 7 7 15t4 19 4 18 1 21 0 19v36q0 548-12 572-2 5-12 8t-25 6-28 4-27 3-17 2l-2 46q55 1 190 6t208 5q13 0 38 0t38 0q39 0 76-7t72-24 60-39 41-59 16-76q0-29-9-54t-22-40-36-32-41-25-47-22q86-20 144-75t57-139q0-55-20-100t-52-73-77-47-91-27-98-8q-25 0-74 2t-74 1q-59 0-171-6t-129-7z m297 793q0-28 3-84t2-85q0-15 0-45t-1-44q0-26 1-38 23-4 61-4 46 0 80 7t61 25 41 50 15 79q0 39-16 68t-45 46-60 24-69 8q-28 0-73-7z m4-629q0-21 2-47t7-37q41-18 78-18 210 0 210 187 0 64-23 101-15 24-35 41t-37 26-45 14-47 6-53 1q-40 0-56-6 0-29 0-88t-1-89q0-4 0-37t0-54z" horiz-adv-x="785.7" />
<glyph glyph-name="italic" unicode="&#xe804;" d="m0-78l10 48q3 1 45 12t62 21q16 19 23 56 1 4 35 162t63 303 29 165v14q-13 7-30 11t-39 4-32 3l10 58q19-2 67-4t84-4 67-1q27 0 55 1t67 4 55 4q-2-22-10-50-17-6-57-16t-60-19q-5-10-8-23t-5-23-4-25-4-24q-15-82-49-234t-43-198q-1-5-7-32t-11-51-9-46-4-32l1-10q9-3 103-18-2-24-9-55-6 0-18-1t-18-1q-16 0-49 6t-48 6q-77 1-115 1-28 0-79-5t-68-6z" horiz-adv-x="571.4" />
<glyph glyph-name="indent-left" unicode="&#xe805;" d="m0 11v107q0 7 5 12t13 6h964q7 0 13-6t5-12v-107q0-8-5-13t-13-5h-964q-7 0-13 5t-5 13z m0 643v107q0 7 5 12t13 6h964q7 0 13-6t5-12v-107q0-8-5-13t-13-5h-964q-7 0-13 5t-5 13z m18-268q0 8 5 13l161 160q5 5 12 5 8 0 13-5t5-13v-321q0-7-5-13t-13-5q-7 0-12 5l-161 161q-5 5-5 13z m339-161v107q0 7 5 13t13 5h607q7 0 13-5t5-13v-107q0-7-5-13t-13-5h-607q-7 0-13 5t-5 13z m0 214v107q0 8 5 13t13 5h607q7 0 13-5t5-13v-107q0-7-5-12t-13-6h-607q-7 0-13 6t-5 12z" horiz-adv-x="1000" />
<glyph glyph-name="indent-right" unicode="&#xe806;" d="m0 11v107q0 7 5 12t13 6h964q7 0 13-6t5-12v-107q0-8-5-13t-13-5h-964q-7 0-13 5t-5 13z m0 214v321q0 8 5 13t13 5q8 0 13-5l160-160q5-5 5-13t-5-13l-160-161q-5-5-13-5-7 0-13 5t-5 13z m0 429v107q0 7 5 12t13 6h964q7 0 13-6t5-12v-107q0-8-5-13t-13-5h-964q-7 0-13 5t-5 13z m357-429v107q0 7 5 13t13 5h607q7 0 13-5t5-13v-107q0-7-5-13t-13-5h-607q-7 0-13 5t-5 13z m0 214v107q0 8 5 13t13 5h607q7 0 13-5t5-13v-107q0-7-5-12t-13-6h-607q-7 0-13 6t-5 12z" horiz-adv-x="1000" />
<glyph glyph-name="list-bullet" unicode="&#xe807;" d="m0 64q0 45 31 76t76 31 76-31 31-76-31-76-76-31-76 31-31 76z m0 286q0 45 31 76t76 31 76-31 31-76-31-76-76-31-76 31-31 76z m0 286q0 44 31 76t76 31 76-31 31-76-31-76-76-31-76 31-31 76z m286-625v107q0 7 5 12t13 6h678q7 0 13-6t5-12v-107q0-7-5-13t-13-5h-678q-8 0-13 5t-5 13z m0 285v108q0 7 5 12t13 5h678q7 0 13-5t5-12v-108q0-7-5-12t-13-5h-678q-8 0-13 5t-5 12z m0 286v107q0 8 5 13t13 5h678q7 0 13-5t5-13v-107q0-7-5-12t-13-6h-678q-8 0-13 6t-5 12z" horiz-adv-x="1000" />
<glyph glyph-name="list-numbered" unicode="&#xe808;" d="m8 237q0 29 14 52t31 38 37 27 31 24 14 25q0 14-9 22t-22 7q-25 0-45-32l-47 33q13 28 40 44t59 16q40 0 68-23t28-63q0-28-19-51t-42-36-42-28-20-30h71v34h59v-89h-202q-4 20-4 30z m3-350l31 49q28-25 60-25 16 0 28 8t12 24q0 35-59 31l-14 31q4 6 18 24t24 31 20 21v1q-9 0-27-1t-27 0v-30h-59v85h186v-49l-53-65q28-6 45-27t17-49q0-45-31-70t-75-26q-60 0-96 37z m8 887l76 71h59v-225h60v-56h-187v56h60q0 22 0 68t1 67v7h-1q-5-10-28-30z m267-763v107q0 8 5 13t13 5h678q7 0 13-6t5-12v-107q0-8-5-13t-13-5h-678q-8 0-13 5t-5 13z m0 285v108q0 7 5 12t13 5h678q7 0 13-5t5-12v-108q0-7-5-12t-13-5h-678q-8 0-13 5t-5 12z m0 286v107q0 8 5 13t13 5h678q7 0 13-5t5-13v-107q0-7-5-12t-13-6h-678q-8 0-13 6t-5 12z" horiz-adv-x="1000" />
<glyph glyph-name="strike" unicode="&#xe809;" d="m0 296v36q0 8 5 13t13 5h964q8 0 13-5t5-13v-36q0-7-5-12t-13-5h-964q-8 0-13 5t-5 12z m214 239q0 101 75 173 74 71 219 71 28 0 94-11 36-7 98-27 6-21 12-66 8-68 8-102 0-10-3-25l-7-2-46 4-8 1q-28 83-58 114-49 51-117 51-64 0-102-33-37-32-37-81 0-41 37-79t156-72q38-11 96-36 33-16 53-29h-414q-16 19-29 44-27 54-27 105z m17-456q0 17 0 38l1 20v25l57 1q8-19 17-40t12-31 7-15q20-32 45-52 24-20 59-32 33-12 73-12 36 0 78 15 43 14 68 48 26 34 26 72 0 47-45 87-19 16-77 40h230q4-22 4-51 0-62-23-119-13-30-40-58-20-19-61-45-44-27-85-37-45-12-113-12-64 0-109 13l-78 23q-32 9-40 15-5 5-5 13v7q0 60-1 87z" horiz-adv-x="1000" />
<glyph glyph-name="underline" unicode="&#xe80a;" d="m0-25v-36q0-8 5-13t13-5h821q8 0 13 5t5 13v36q0 8-5 13t-13 5h-821q-8 0-13-5t-5-13z m0 802q7 0 22 0 34 0 63-2 74-4 92-4 48 0 94 2 65 2 82 3 31 0 48 1l-1-8 1-36v-5q-33-5-69-5-33 0-44-14-7-7-7-73 0-8 0-18t0-15l1-128 8-156q3-69 28-112 20-33 54-52 49-26 98-26 58 0 107 16 31 10 55 28 27 20 37 36 20 31 29 63 12 41 12 128 0 44-2 72t-6 68-8 89l-2 33q-3 37-13 49-19 20-43 19l-56-1-8 2 1 48h47l114-6q43-2 110 6l10-2q3-21 3-28 0-4-2-17-25-7-47-8-41-6-44-9-8-9-8-23 0-4 0-15t1-17q5-11 13-221 3-109-9-170-8-42-23-68-21-36-62-69-42-32-102-49-61-19-142-19-93 0-159 26-66 26-99 68-34 42-47 109-9 44-9 132v186q0 105-9 119-14 20-82 21-21 2-25 3z" horiz-adv-x="857.1" />
<glyph glyph-name="cw" unicode="&#xe80b;" d="m0 350q0 87 34 166t92 137 136 92 167 34q82 0 158-31t137-88l72 72q16 18 39 8 22-9 22-33v-250q0-14-10-25t-26-11h-250q-23 0-32 23-10 22 7 38l77 77q-82 77-194 77-58 0-111-23t-91-61-62-91-22-111 22-111 62-91 91-61 111-23q66 0 125 29t100 82q4 6 13 7 8 0 14-5l76-77q5-4 6-11t-5-13q-60-74-147-114t-182-41q-87 0-167 34t-136 92-92 137-34 166z" horiz-adv-x="857.1" />
<glyph glyph-name="ccw" unicode="&#xe80c;" d="m0 457v250q0 24 22 33 22 10 39-8l72-72q60 57 137 88t159 31q87 0 166-34t137-92 91-137 34-166-34-166-91-137-137-92-166-34q-96 0-183 41t-147 114q-4 6-4 12t5 12l76 77q6 5 14 5 9-1 13-7 41-53 100-82t126-29q58 0 110 23t92 61 61 91 22 111-22 111-61 91-92 61-110 23q-55 0-105-20t-90-57l77-77q17-16 8-38-10-23-33-23h-250q-15 0-25 11t-11 25z" horiz-adv-x="857.1" />
<glyph glyph-name="clock" unicode="&#xe80d;" d="m0 350q0 117 58 215t155 156 216 58 215-58 156-156 57-215-57-215-156-156-215-58-216 58-155 156-58 215z m125 0q0-83 41-152t110-111 153-41 152 41 110 111 41 152-41 152-110 111-152 41-153-41-110-111-41-152z m161-54v36q0 8 5 13t13 5h125v196q0 8 5 13t12 5h36q8 0 13-5t5-13v-250q0-7-5-12t-13-5h-178q-8 0-13 5t-5 12z" horiz-adv-x="857.1" />
<glyph glyph-name="eye-off" unicode="&#xe80e;" d="m0 314q0 22 11 39 86 131 212 207t277 76q50 0 100-10l31 54q5 9 15 9 3 0 10-3t18-9 18-10 18-10 10-7q9-5 9-15 0-4 0-5-59-105-176-316t-176-316l-28-50q-5-9-15-9-7 0-75 39-9 6-9 16 0 7 25 48-80 37-147 97t-117 137q-11 17-11 38z m71 0q94-144 239-209l43 79q-48 35-76 88t-27 114q0 67 34 125-128-65-213-197z m259 72q0-11 8-19t19-8 19 8 8 19q0 48 34 82t82 34q11 0 19 8t8 19-8 19-19 7q-70 0-120-50t-50-119z m170-393l41 74q119 10 219 76t169 171q-65 100-158 164l35 63q53-36 102-86t81-102q11-19 11-39t-11-38q-22-36-61-81-84-96-194-149t-234-53z m89 159l157 281q4-26 4-47 0-78-44-142t-117-92z" horiz-adv-x="1000" />
<glyph glyph-name="eye" unicode="&#xe80f;" d="m0 314q0 19 11 39 78 128 210 205t279 78 279-78 210-205q11-20 11-39t-11-38q-78-129-210-206t-279-77-279 77-210 206q-11 19-11 38z m71 0q75-114 187-182t242-68 242 68 187 182q-85 132-213 197 34-58 34-125 0-104-73-177t-177-73-177 73-73 177q0 67 34 125-128-65-213-197z m259 72q0-11 8-19t19-8 19 8 8 19q0 48 34 82t82 34q11 0 19 8t8 19-8 19-19 7q-70 0-120-50t-50-119z" horiz-adv-x="1000" />
<glyph glyph-name="play" unicode="&#xe810;" d="m0-61v822q0 14 9 20t22-2l741-412q13-7 13-17t-13-17l-741-412q-13-7-22-2t-9 20z" horiz-adv-x="785.7" />
<glyph glyph-name="fast-bw" unicode="&#xe811;" d="m68 350q0 15 11 25l396 396q11 11 18 8t7-18v-396q3 6 7 10l396 396q11 11 18 8t8-18v-822q0-14-8-18t-18 8l-396 396q-4 5-7 11v-397q0-14-7-18t-18 8l-396 396q-11 11-11 25z" horiz-adv-x="928.6" />
<glyph glyph-name="fast-fw" unicode="&#xe812;" d="m0-61v822q0 14 7 18t18-8l396-396q5-4 8-11v397q0 14 7 18t18-8l396-396q10-11 10-25t-10-25l-396-396q-11-11-18-8t-7 18v396q-3-5-8-10l-396-396q-10-11-18-8t-7 18z" horiz-adv-x="928.6" />
<glyph glyph-name="pause" unicode="&#xe813;" d="m0-43v786q0 14 11 25t25 11h285q15 0 26-11t10-25v-786q0-14-10-25t-26-11h-285q-15 0-25 11t-11 25z m500 0v786q0 14 11 25t25 11h285q15 0 26-11t10-25v-786q0-14-10-25t-26-11h-285q-15 0-25 11t-11 25z" horiz-adv-x="857.1" />
<glyph glyph-name="glass" unicode="&#xe814;" d="m52 746q0 13 10 21t21 9 24 3h786q13 0 24-3t21-9 10-21q0-19-24-43l-353-353v-429h179q15 0 25-10t11-25-11-25-25-11h-500q-14 0-25 11t-11 25 11 25 25 10h179v429l-353 353q-24 24-24 43z" horiz-adv-x="1000" />
<glyph glyph-name="code" unicode="&#xe815;" d="m25 314q0 8 6 13l260 260q5 6 13 6t12-6l28-28q6-5 6-13t-6-12l-219-220 219-219q6-6 6-13t-6-13l-28-28q-5-5-12-5t-13 5l-260 260q-6 6-6 13z m372-350l208 720q3 8 9 11t13 2l35-10q7-2 11-9t1-13l-208-721q-2-7-9-11t-13-1l-34 9q-8 3-11 9t-2 14z m325 118q0 7 5 13l219 219-219 220q-5 5-5 12t5 13l28 28q6 6 13 6t13-6l260-260q5-5 5-13t-5-13l-260-260q-6-5-13-5t-13 5l-28 28q-5 6-5 13z" horiz-adv-x="1071.4" />
<glyph glyph-name="exchange" unicode="&#xe816;" d="m0 136q0 8 5 13l179 178q5 5 12 5 8 0 13-5t5-13v-107h768q7 0 13-5t5-13v-107q0-7-5-12t-13-6h-768v-107q0-7-5-12t-13-6q-6 0-13 6l-178 178q-5 5-5 13z m0 303v107q0 8 5 13t13 5h768v107q0 8 5 13t13 5q6 0 13-5l178-178q5-5 5-13t-5-13l-179-179q-5-5-12-5-8 0-13 6t-5 12v107h-768q-7 0-13 6t-5 12z" horiz-adv-x="1000" />
<glyph glyph-name="chat" unicode="&#xe817;" d="m0 421q0 78 53 144t143 104 197 38 197-38 143-104 53-144-53-143-143-104-197-38q-48 0-98 9-70-50-155-72-21-5-48-9h-2q-6 0-12 5t-6 11q-1 2-1 4t1 4 1 3l1 3t2 3 2 3 3 2 2 3q3 3 13 14t15 16 12 17 14 21 11 25q-69 40-108 98t-40 125z m344-354q32-3 49-3 90 0 172 25t148 72q69 52 107 119t37 141q0 43-13 85 72-39 114-99t42-128q0-67-40-126t-108-98q5-14 11-25t14-21 13-16 14-17 13-14q0 0 2-2t3-3 2-3 2-3l1-3t1-3 1-4-1-3q-2-8-7-13t-13-4q-27 4-48 9-85 23-155 72-50-9-98-9-151 0-263 74z" horiz-adv-x="1000" />
</font>
</defs>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
src/static/font/fontawesome-etherpad.ttf Normal file
View file

Binary file not shown.

BIN
src/static/font/fontawesome-etherpad.woff Normal file
View file

Binary file not shown.

28
src/static/js/ace2_inner.js
View file

@ -2333,7 +2333,7 @@ function Ace2Inner(){
if(rep.selStart[1] == rep.selEnd[1] && rep.selStart[1] == rep.lines.atIndex(n).text.length){ if(rep.selStart[1] == rep.selEnd[1] && rep.selStart[1] == rep.lines.atIndex(n).text.length){
return false; // If we're at the end of a line we treat it as having no formatting return false; // If we're at the end of a line we treat it as having no formatting
} }
if(rep.selStart[1] == 0 && rep.selEnd[1] == 0){ if(rep.selStart[1] == 0 && rep.selEnd[1] == 0){
rep.selEnd[1] == 1; rep.selEnd[1] == 1;
} }
if(rep.selEnd[1] == -1){ if(rep.selEnd[1] == -1){
@ -3741,6 +3741,30 @@ function Ace2Inner(){
toggleAttributeOnSelection('underline'); toggleAttributeOnSelection('underline');
specialHandled = true; specialHandled = true;
} }
if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "5" && (evt.metaKey || evt.ctrlKey))
{
// cmd-5 (strikethrough)
fastIncorp(13);
evt.preventDefault();
toggleAttributeOnSelection('strikethrough');
specialHandled = true;
}
if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "l" && (evt.metaKey || evt.ctrlKey) && evt.shiftKey)
{
// cmd-shift-L (unorderedlist)
fastIncorp(9);
evt.preventDefault();
doInsertUnorderedList()
specialHandled = true;
}
if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "n" && (evt.metaKey || evt.ctrlKey) && evt.shiftKey)
{
// cmd-shift-N (orderedlist)
fastIncorp(9);
evt.preventDefault();
doInsertOrderedList()
specialHandled = true;
}
if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "h" && (evt.ctrlKey)) if ((!specialHandled) && isTypeForCmdKey && String.fromCharCode(which).toLowerCase() == "h" && (evt.ctrlKey))
{ {
// cmd-H (backspace) // cmd-H (backspace)
@ -3818,7 +3842,7 @@ function Ace2Inner(){
// top.console.log(caretOffsetTop, viewport.top, caretOffsetTopBottom, viewport.bottom); // top.console.log(caretOffsetTop, viewport.top, caretOffsetTopBottom, viewport.bottom);
var caretIsNotVisible = (caretOffsetTop < viewport.top || caretOffsetTopBottom >= viewport.bottom); // Is the Caret Visible to the user? var caretIsNotVisible = (caretOffsetTop < viewport.top || caretOffsetTopBottom >= viewport.bottom); // Is the Caret Visible to the user?
// Expect some weird behavior caretOffsetTopBottom is greater than viewport.bottom on a keypress down // Expect some weird behavior caretOffsetTopBottom is greater than viewport.bottom on a keypress down
var offsetTopSamePlace = caretOffsetTop == viewport.top; // sometimes moving key left & up leaves the caret at the same point as the viewport.top, technically the caret is visible but it's not fully visible so we should move to it var offsetTopSamePlace = caretOffsetTop == viewport.top; // sometimes moving key left & up leaves the caret at the same point as the viewport.top, technically the caret is visible but it's not fully visible so we should move to it
if(offsetTopSamePlace && (evt.which == 37 || evt.which == 38)){ if(offsetTopSamePlace && (evt.which == 37 || evt.which == 38)){
var newY = caretOffsetTop; var newY = caretOffsetTop;
setScrollY(newY); setScrollY(newY);

8
src/static/js/pad_editbar.js
View file

@ -206,7 +206,7 @@ var padeditbar = (function()
if(module.css('display') != "none") if(module.css('display') != "none")
{ {
$("#" + self.dropdowns[i] + "link").removeClass("selected"); $("li[data-key=" + self.dropdowns[i] + "] > a").removeClass("selected");
module.slideUp("fast", cb); module.slideUp("fast", cb);
returned = true; returned = true;
} }
@ -223,12 +223,12 @@ var padeditbar = (function()
if(module.css('display') != "none") if(module.css('display') != "none")
{ {
$("#" + self.dropdowns[i] + "link").removeClass("selected"); $("li[data-key=" + self.dropdowns[i] + "] > a").removeClass("selected");
module.slideUp("fast"); module.slideUp("fast");
} }
else if(self.dropdowns[i]==moduleName) else if(self.dropdowns[i]==moduleName)
{ {
$("#" + self.dropdowns[i] + "link").addClass("selected"); $("li[data-key=" + self.dropdowns[i] + "] > a").addClass("selected");
module.slideDown("fast", cb); module.slideDown("fast", cb);
} }
} }
@ -271,7 +271,7 @@ var padeditbar = (function()
toolbar.registerDropdownCommand("showusers", "users"); toolbar.registerDropdownCommand("showusers", "users");
toolbar.registerDropdownCommand("settings"); toolbar.registerDropdownCommand("settings");
toolbar.registerDropdownCommand("connectivity"); toolbar.registerDropdownCommand("connectivity");
toolbar.registerDropdownCommand("import_export", "importexport"); toolbar.registerDropdownCommand("import_export");
toolbar.registerDropdownCommand("embed"); toolbar.registerDropdownCommand("embed");
toolbar.registerCommand("embed", function () { toolbar.registerCommand("embed", function () {

11
src/static/js/pad_userlist.js
View file

@ -468,6 +468,8 @@ var paduserlist = (function()
self.setMyUserInfo(myInitialUserInfo); self.setMyUserInfo(myInitialUserInfo);
$('#editbar [data-key=showusers] > a').append('<span id="online_count">1</span>');
$("#otheruserstable tr").remove(); $("#otheruserstable tr").remove();
if (pad.getUserIsGuest()) if (pad.getUserIsGuest())
@ -602,13 +604,8 @@ var paduserlist = (function()
online++; online++;
} }
} }
var $btn = $("#editbar [data-key=showusers] > a")
, $counter = $('#online_count', $btn) $('#online_count').text(online);
if(!$counter.length) {
$counter = $('<span id="online_count">')
$btn.append($counter)
}
$counter.text(online);
return online; return online;
}, },

3
src/static/js/pad_utils.js
View file

@ -515,12 +515,13 @@ function setupGlobalExceptionHandler() {
globalExceptionHandler = function test (msg, url, linenumber) globalExceptionHandler = function test (msg, url, linenumber)
{ {
var errorId = randomString(20); var errorId = randomString(20);
var userAgent = padutils.escapeHtml(navigator.userAgent);
if ($("#editorloadingbox").attr("display") != "none"){ if ($("#editorloadingbox").attr("display") != "none"){
//show javascript errors to the user //show javascript errors to the user
$("#editorloadingbox").css("padding", "10px"); $("#editorloadingbox").css("padding", "10px");
$("#editorloadingbox").css("padding-top", "45px"); $("#editorloadingbox").css("padding-top", "45px");
$("#editorloadingbox").html("<div style='text-align:left;color:red;font-size:16px;'><b>An error occured</b><br>The error was reported with the following id: '" + errorId + "'<br><br><span style='color:black;font-weight:bold;font-size:16px'>Please press and hold Ctrl and press F5 to reload this page, if the problem persists please send this error message to your webmaster: </span><div style='color:black;font-size:14px'>'" $("#editorloadingbox").html("<div style='text-align:left;color:red;font-size:16px;'><b>An error occured</b><br>The error was reported with the following id: '" + errorId + "'<br><br><span style='color:black;font-weight:bold;font-size:16px'>Please press and hold Ctrl and press F5 to reload this page, if the problem persists please send this error message to your webmaster: </span><div style='color:black;font-size:14px'>'"
+ "ErrorId: " + errorId + "<br>URL: " + window.location.href + "<br>UserAgent: " + navigator.userAgent + "<br>" + msg + " in " + url + " at line " + linenumber + "'</div></div>"); + "ErrorId: " + errorId + "<br>URL: " + window.location.href + "<br>UserAgent: " + userAgent + "<br>" + msg + " in " + url + " at line " + linenumber + "'</div></div>");
} }
//send javascript errors to the server //send javascript errors to the server

3
src/templates/pad.html
View file

@ -40,6 +40,7 @@
<link rel="shortcut icon" href="<%=settings.faviconPad%>"> <link rel="shortcut icon" href="<%=settings.faviconPad%>">
<% e.begin_block("styles"); %> <% e.begin_block("styles"); %>
<link href="../static/css/fontawesome-etherpad.css" rel="stylesheet">
<link href="../static/css/pad.css" rel="stylesheet"> <link href="../static/css/pad.css" rel="stylesheet">
<link href="../static/custom/pad.css" rel="stylesheet"> <link href="../static/custom/pad.css" rel="stylesheet">
<style title="dynamicsyntax"></style> <style title="dynamicsyntax"></style>
@ -174,7 +175,7 @@
</div> </div>
</div> </div>
<div id="importexport" class="popup"> <div id="import_export" class="popup">
<h1 data-l10n-id="pad.importExport.import_export"></h1> <h1 data-l10n-id="pad.importExport.import_export"></h1>
<div class="column acl-write"> <div class="column acl-write">
<% e.begin_block("importColumn"); %> <% e.begin_block("importColumn"); %>

2
src/templates/timeslider.html
View file

@ -177,7 +177,7 @@
</div> </div>
<!-- export code --> <!-- export code -->
<div id="importexport"> <div id="import_export">
<div id="export" class="popup"> <div id="export" class="popup">
<p data-l10n-id="timeslider.exportCurrent"></p> <p data-l10n-id="timeslider.exportCurrent"></p>

44
tests/frontend/specs/language.js
View file

@ -11,31 +11,31 @@ describe("Language select and change", function(){
helper.newPad(cb); helper.newPad(cb);
this.timeout(60000); this.timeout(60000);
}); });
// Destroy language cookies // Destroy language cookies
it("makes text german", function(done) { it("makes text german", function(done) {
var inner$ = helper.padInner$; var inner$ = helper.padInner$;
var chrome$ = helper.padChrome$; var chrome$ = helper.padChrome$;
//click on the settings button to make settings visible //click on the settings button to make settings visible
var $settingsButton = chrome$(".buttonicon-settings"); var $settingsButton = chrome$(".buttonicon-settings");
$settingsButton.click(); $settingsButton.click();
//click the language button //click the language button
var $language = chrome$("#languagemenu"); var $language = chrome$("#languagemenu");
var $languageoption = $language.find("[value=de]"); var $languageoption = $language.find("[value=de]");
//select german //select german
$languageoption.attr('selected','selected'); $languageoption.attr('selected','selected');
$language.change(); $language.change();
helper.waitFor(function() { helper.waitFor(function() {
return chrome$(".buttonicon-bold").parent()[0]["title"] == "Fett (Strg-B)"; return chrome$(".buttonicon-bold").parent()[0]["title"] == "Fett (Strg-B)";
}) })
.done(function(){ .done(function(){
//get the value of the bold button //get the value of the bold button
var $boldButton = chrome$(".buttonicon-bold").parent(); var $boldButton = chrome$(".buttonicon-bold").parent();
//get the title of the bold button //get the title of the bold button
var boldButtonTitle = $boldButton[0]["title"]; var boldButtonTitle = $boldButton[0]["title"];
@ -44,58 +44,58 @@ describe("Language select and change", function(){
done(); done();
}); });
}); });
it("makes text English", function(done) { it("makes text English", function(done) {
var inner$ = helper.padInner$; var inner$ = helper.padInner$;
var chrome$ = helper.padChrome$; var chrome$ = helper.padChrome$;
//click on the settings button to make settings visible //click on the settings button to make settings visible
var $settingsButton = chrome$(".buttonicon-settings"); var $settingsButton = chrome$(".buttonicon-settings");
$settingsButton.click(); $settingsButton.click();
//click the language button //click the language button
var $language = chrome$("#languagemenu"); var $language = chrome$("#languagemenu");
//select english //select english
$language.val("en"); $language.val("en");
$language.change(); $language.change();
//get the value of the bold button //get the value of the bold button
var $boldButton = chrome$(".buttonicon-bold").parent(); var $boldButton = chrome$(".buttonicon-bold").parent();
helper.waitFor(function() { return $boldButton[0]["title"] != "Fett (Strg-B)";}) helper.waitFor(function() { return $boldButton[0]["title"] != "Fett (Strg+B)";})
.done(function(){ .done(function(){
//get the value of the bold button //get the value of the bold button
var $boldButton = chrome$(".buttonicon-bold").parent(); var $boldButton = chrome$(".buttonicon-bold").parent();
//get the title of the bold button //get the title of the bold button
var boldButtonTitle = $boldButton[0]["title"]; var boldButtonTitle = $boldButton[0]["title"];
//check if the language is now English //check if the language is now English
expect(boldButtonTitle).to.be("Bold (Ctrl-B)"); expect(boldButtonTitle).to.be("Bold (Ctrl+B)");
done(); done();
}); });
}); });
it("changes direction when picking an rtl lang", function(done) { it("changes direction when picking an rtl lang", function(done) {
var inner$ = helper.padInner$; var inner$ = helper.padInner$;
var chrome$ = helper.padChrome$; var chrome$ = helper.padChrome$;
//click on the settings button to make settings visible //click on the settings button to make settings visible
var $settingsButton = chrome$(".buttonicon-settings"); var $settingsButton = chrome$(".buttonicon-settings");
$settingsButton.click(); $settingsButton.click();
//click the language button //click the language button
var $language = chrome$("#languagemenu"); var $language = chrome$("#languagemenu");
var $languageoption = $language.find("[value=ar]"); var $languageoption = $language.find("[value=ar]");
//select arabic //select arabic
// $languageoption.attr('selected','selected'); // Breaks the test.. // $languageoption.attr('selected','selected'); // Breaks the test..
$language.val("ar"); $language.val("ar");
$languageoption.change(); $languageoption.change();
helper.waitFor(function() { helper.waitFor(function() {
return chrome$("html")[0]["dir"] != 'ltr'; return chrome$("html")[0]["dir"] != 'ltr';
}) })
.done(function(){ .done(function(){