diff --git a/.gitignore b/.gitignore index 71584e76bb5..28fabc00b96 100644 --- a/.gitignore +++ b/.gitignore @@ -18,7 +18,6 @@ out/ .nyc_output .idea /package-lock.json -/src/bin/abiword.exe /src/bin/convertSettings.json /src/bin/etherpad-1.deb /src/bin/node.exe diff --git a/Dockerfile b/Dockerfile index 2ad2936fb0d..6ee07c2c644 100644 --- a/Dockerfile +++ b/Dockerfile @@ -62,15 +62,7 @@ ARG ETHERPAD_LOCAL_PLUGINS= # ETHERPAD_GITHUB_PLUGINS="ether/ep_plugin" ARG ETHERPAD_GITHUB_PLUGINS= -# Control whether abiword will be installed, enabling exports to DOC/PDF/ODT formats. -# By default, it is not installed. -# If given any value, abiword will be installed. -# -# EXAMPLE: -# INSTALL_ABIWORD=true -ARG INSTALL_ABIWORD= - -# Control whether libreoffice will be installed, enabling exports to DOC/PDF/ODT formats. +# Control whether libreoffice will be installed, enabling exports to DOC/DOCX/PDF/ODT formats. # By default, it is not installed. # If given any value, libreoffice will be installed. # @@ -110,7 +102,6 @@ RUN \ ca-certificates \ curl \ git \ - ${INSTALL_ABIWORD:+abiword abiword-plugin-command} \ ${INSTALL_SOFFICE:+libreoffice openjdk8-jre libreoffice-common} && \ rm -rf /var/cache/apk/* diff --git a/doc/docker.adoc b/doc/docker.adoc index 7114db3b6c9..e113adf8a5b 100644 --- a/doc/docker.adoc +++ b/doc/docker.adoc @@ -62,24 +62,11 @@ The variable value has to be a space separated, double quoted list of plugin nam Some plugins will need personalized settings. Just refer to the previous section, and include them in your custom `settings.json.docker`. -==== Rebuilding including export functionality for DOC/PDF/ODT +==== Rebuilding including export functionality for DOC/DOCX/PDF/ODT -If you want to be able to export your pads to DOC/PDF/ODT files, you can install -either Abiword or Libreoffice via setting a build variable. - -===== Via Abiword - -For installing Abiword, set the `INSTALL_ABIWORD` build variable to any value. - -Also, you will need to configure the path to the abiword executable -via setting the `abiword` property in `/settings.json.docker` to -`/usr/bin/abiword` or via setting the environment variable `ABIWORD` to -`/usr/bin/abiword`. - -===== Via Libreoffice - -For installing Libreoffice instead, set the `INSTALL_SOFFICE` build variable -to any value. +If you want to be able to export your pads to DOC/DOCX/PDF/ODT files, you can +install Libreoffice via setting the `INSTALL_SOFFICE` build variable to any +value. Also, you will need to configure the path to the libreoffice executable via setting the `soffice` property in `/settings.json.docker` to @@ -464,12 +451,8 @@ For the editor container, you can also make it full width by adding `full-width- | How long may clients use served javascript code (in seconds)? Not setting this may cause problems during deployment. Set to 0 to disable caching. | `21600` (6 hours) -| `ABIWORD` -| Absolute path to the Abiword executable. Abiword is needed to get advanced import/export features of pads. Setting it to null disables Abiword and will only allow plain text and HTML import/exports. -| `null` - | `SOFFICE` -| This is the absolute path to the soffice executable. LibreOffice can be used in lieu of Abiword to export pads. Setting it to null disables LibreOffice exporting. +| Absolute path to the soffice (LibreOffice) executable. Needed for advanced import/export of pads (docx, pdf, odt). Setting it to null disables LibreOffice and will only allow plain text and HTML import/exports. | `null` | `ALLOW_UNKNOWN_FILE_ENDS` diff --git a/doc/docker.md b/doc/docker.md index 73bd26fbbe4..71af392360f 100644 --- a/doc/docker.md +++ b/doc/docker.md @@ -29,24 +29,11 @@ The variable value has to be a space separated, double quoted list of plugin nam Some plugins will need personalized settings. Just refer to the previous section, and include them in your custom `settings.json.docker`. -### Rebuilding including export functionality for DOC/PDF/ODT +### Rebuilding including export functionality for DOC/DOCX/PDF/ODT -If you want to be able to export your pads to DOC/PDF/ODT files, you can install -either Abiword or Libreoffice via setting a build variable. - -#### Via Abiword - -For installing Abiword, set the `INSTALL_ABIWORD` build variable to any value. - -Also, you will need to configure the path to the abiword executable -via setting the `abiword` property in `/settings.json.docker` to -`/usr/bin/abiword` or via setting the environment variable `ABIWORD` to -`/usr/bin/abiword`. - -#### Via Libreoffice - -For installing Libreoffice instead, set the `INSTALL_SOFFICE` build variable -to any value. +If you want to be able to export your pads to DOC/DOCX/PDF/ODT files, you can +install Libreoffice via setting the `INSTALL_SOFFICE` build variable to any +value. Also, you will need to configure the path to the libreoffice executable via setting the `soffice` property in `/settings.json.docker` to @@ -202,8 +189,7 @@ For the editor container, you can also make it full width by adding `full-width- | `EDIT_ONLY` | Users may edit pads but not create new ones. Pad creation is only via the API. This applies both to group pads and regular pads. | `false` | | `MINIFY` | If true, all css & js will be minified before sending to the client. This will improve the loading performance massively, but makes it difficult to debug the javascript/css | `true` | | `MAX_AGE` | How long may clients use served javascript code (in seconds)? Not setting this may cause problems during deployment. Set to 0 to disable caching. | `21600` (6 hours) | -| `ABIWORD` | Absolute path to the Abiword executable. Abiword is needed to get advanced import/export features of pads. Setting it to null disables Abiword and will only allow plain text and HTML import/exports. | `null` | -| `SOFFICE` | This is the absolute path to the soffice executable. LibreOffice can be used in lieu of Abiword to export pads. Setting it to null disables LibreOffice exporting. | `null` | +| `SOFFICE` | Absolute path to the soffice (LibreOffice) executable. Needed for advanced import/export of pads (docx, pdf, odt). Setting it to null disables LibreOffice and will only allow plain text and HTML import/exports. | `null` | | `ALLOW_UNKNOWN_FILE_ENDS` | Allow import of file types other than the supported ones: txt, doc, docx, rtf, odt, html & htm | `true` | | `REQUIRE_AUTHENTICATION` | This setting is used if you require authentication of all users. Note: "/admin" always requires authentication. | `false` | | `REQUIRE_AUTHORIZATION` | Require authorization by a module, or a user with is_admin set, see below. | `false` | diff --git a/settings.json.docker b/settings.json.docker index a265a9235cf..890f225d30a 100644 --- a/settings.json.docker +++ b/settings.json.docker @@ -91,7 +91,7 @@ * "password": "${PASSW:}" // if PASSW is not defined would result in password === '' * * If you want to use an empty value (null) as default value for a variable, - * simply do not set it, without putting any colons: "${ABIWORD}". + * simply do not set it, without putting any colons: "${SOFFICE}". * * 3) if you want to use newlines in the default value of a string parameter, * use "\n" as usual. @@ -349,24 +349,22 @@ "maxAge": "${MAX_AGE:21600}", // 60 * 60 * 6 = 6 hours /* - * Absolute path to the Abiword executable. + * This is the absolute path to the soffice executable. * - * Abiword is needed to get advanced import/export features of pads. Setting - * it to null disables Abiword and will only allow plain text and HTML - * import/exports. + * LibreOffice is used for advanced import/export of pads (docx, pdf, odt). + * Setting it to null disables LibreOffice and will only allow plain text + * and HTML import/exports. */ - "abiword": "${ABIWORD:null}", + "soffice": "${SOFFICE:null}", /* - * This is the absolute path to the soffice executable. - * - * LibreOffice can be used in lieu of Abiword to export pads. - * Setting it to null disables LibreOffice exporting. + * When true (the default), the "Microsoft Word" export button downloads a .docx file via + * LibreOffice (requires "soffice" to be set). Set to false to revert to legacy .doc output + * (which also requires "soffice"). */ - "soffice": "${SOFFICE:null}", + "docxExport": "${DOCX_EXPORT:true}", /* - * Allow import of file types other than the supported ones: * txt, doc, docx, rtf, odt, html & htm */ "allowUnknownFileEnds": "${ALLOW_UNKNOWN_FILE_ENDS:true}", diff --git a/settings.json.template b/settings.json.template index 9f0bc55a00e..4ee63fe9bb1 100644 --- a/settings.json.template +++ b/settings.json.template @@ -82,7 +82,7 @@ * "password": "${PASSW:}" // if PASSW is not defined would result in password === '' * * If you want to use an empty value (null) as default value for a variable, - * simply do not set it, without putting any colons: "${ABIWORD}". + * simply do not set it, without putting any colons: "${SOFFICE}". * * 3) if you want to use newlines in the default value of a string parameter, * use "\n" as usual. @@ -336,24 +336,22 @@ "maxAge": 21600, // 60 * 60 * 6 = 6 hours /* - * Absolute path to the Abiword executable. + * This is the absolute path to the soffice executable. * - * Abiword is needed to get advanced import/export features of pads. Setting - * it to null disables Abiword and will only allow plain text and HTML - * import/exports. + * LibreOffice is used for advanced import/export of pads (docx, pdf, odt). + * Setting it to null disables LibreOffice and will only allow plain text + * and HTML import/exports. */ - "abiword": null, + "soffice": null, /* - * This is the absolute path to the soffice executable. - * - * LibreOffice can be used in lieu of Abiword to export pads. - * Setting it to null disables LibreOffice exporting. + * When true (the default), the "Microsoft Word" export button downloads a .docx file via + * LibreOffice (requires "soffice" to be set). Set to false to revert to legacy .doc output + * (which also requires "soffice"). */ - "soffice": null, + "docxExport": true, /* - * Allow import of file types other than the supported ones: * txt, doc, docx, rtf, odt, html & htm */ "allowUnknownFileEnds": true, diff --git a/src/locales/ar.json b/src/locales/ar.json index 1ffd7f015ab..0b24afd6fe7 100644 --- a/src/locales/ar.json +++ b/src/locales/ar.json @@ -117,7 +117,6 @@ "pad.importExport.exportword": "مايكروسوفت وورد", "pad.importExport.exportpdf": "صيغة المستندات المحمولة", "pad.importExport.exportopen": "ODF (نسق المستند المفتوح)", - "pad.importExport.abiword.innerHTML": "لا يمكنك الاستيراد إلا من نص عادي أو من تنسيقات HTML. للحصول على المزيد من ميزات الاستيراد المتقدمة، يرجى تثبيت AbiWord أو LibreOffice.", "pad.modals.connected": "متصل.", "pad.modals.reconnecting": "إعادة الاتصال ببادك..", "pad.modals.forcereconnect": "فرض إعادة الاتصال", diff --git a/src/locales/ast.json b/src/locales/ast.json index b46964bf436..ce38e618f5f 100644 --- a/src/locales/ast.json +++ b/src/locales/ast.json @@ -52,7 +52,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Sólo se pue importar dende los formatos de testu planu o HTML. Pa carauterístiques d'importación más avanzaes instala Abiword o LibreOffice.", "pad.modals.connected": "Coneutáu.", "pad.modals.reconnecting": "Reconeutando col to bloc...", "pad.modals.forcereconnect": "Forzar la reconexón", diff --git a/src/locales/az.json b/src/locales/az.json index fbcd38635b0..1c082e39044 100644 --- a/src/locales/az.json +++ b/src/locales/az.json @@ -66,7 +66,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (açıq sənəd formatı)", - "pad.importExport.abiword.innerHTML": "Siz yalnız adi mətndən və ya HTML-dən idxal edə bilərsiniz. İdxalın daha mürəkkəb funksiyaları üçün, zəhmət olmasa, AbiWord və ya LibreOffice quraşdırın.", "pad.modals.connected": "Bağlandı.", "pad.modals.reconnecting": "Sizin lövhə yenidən qoşulur…", "pad.modals.forcereconnect": "Məcbur təkrarən bağlan", diff --git a/src/locales/bcc.json b/src/locales/bcc.json index d56dbea354b..363210437ce 100644 --- a/src/locales/bcc.json +++ b/src/locales/bcc.json @@ -62,7 +62,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (قالب سند باز)", - "pad.importExport.abiword.innerHTML": "شما تنها می‌توانید از قالب متن ساده یا اچ‌تی‌ام‌ال درون‌ریزی کنید. برای بیشتر شدن ویژگی‌های درون‌ریزی پیشرفته AbiWord را نصب کنید.", "pad.modals.connected": "متصل شد.", "pad.modals.reconnecting": "در حال اتصال دوباره به دفترچه یادداشت شما..", "pad.modals.forcereconnect": "واداشتن به اتصال دوباره", diff --git a/src/locales/be-tarask.json b/src/locales/be-tarask.json index a7bb279ceaf..bb9d73a3397 100644 --- a/src/locales/be-tarask.json +++ b/src/locales/be-tarask.json @@ -97,7 +97,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Вы можаце імпартаваць толькі з звычайнага тэксту або HTML. Дзеля больш пашыраных магчымасьцяў імпарту, калі ласка, усталюйце AbiWord альбо LibreOffice.", "pad.modals.connected": "Падлучыліся.", "pad.modals.reconnecting": "Перападлучэньне да вашага дакумэнта…", "pad.modals.forcereconnect": "Прымусовае перападлучэньне", diff --git a/src/locales/bgn.json b/src/locales/bgn.json index 0bb468cf1cf..76047904fa2 100644 --- a/src/locales/bgn.json +++ b/src/locales/bgn.json @@ -38,7 +38,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (پاچین سندئ قالب)", - "pad.importExport.abiword.innerHTML": "شما تا توانیت که شه ساده گین متنی ئین قالب یا اچ‌تی‌ام‌ال بی تئ کنیت . په گیشتیرین کارا ئییان پیشرفته ئین بی تئ کورتینا AbiWord نصب کنیت.", "pad.modals.connected": "وصل بوت.", "pad.modals.userdup": "نوکین دروازه گئ پاچ کورتین", "pad.modals.unauth": "مجاز نه اینت", diff --git a/src/locales/br.json b/src/locales/br.json index d3c33202d53..08d09f1d917 100644 --- a/src/locales/br.json +++ b/src/locales/br.json @@ -52,7 +52,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Ne c'hallit enporzhiañ nemet furmadoù testennoù plaen pe HTML. Evit arc'hwelioù enporzhiañ emdroetoc'h, staliit Abiword pe LibreOffice.", "pad.modals.connected": "Kevreet.", "pad.modals.reconnecting": "Adkevreañ war-zu ho pad...", "pad.modals.forcereconnect": "Adkevreañ dre heg", diff --git a/src/locales/ca.json b/src/locales/ca.json index cbb65168940..86624bb3d75 100644 --- a/src/locales/ca.json +++ b/src/locales/ca.json @@ -93,7 +93,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Només podeu importar de text sense format o HTML. Per a opcions d'importació més avançades instal·leu l'Abiword.", "pad.modals.connected": "Connectat.", "pad.modals.reconnecting": "S'està tornant a connectar al vostre pad…", "pad.modals.forcereconnect": "Força tornar a connectar", diff --git a/src/locales/cs.json b/src/locales/cs.json index aec3a5a1c72..e5f73c78461 100644 --- a/src/locales/cs.json +++ b/src/locales/cs.json @@ -117,7 +117,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Importovat lze pouze z formátů prostého textu nebo HTML. Pokročilejší funkce pro import naleznete v instalaci AbiWord nebo LibreOffice.", "pad.modals.connected": "Připojeno.", "pad.modals.reconnecting": "Opětovné připojení k Padu...", "pad.modals.forcereconnect": "Vynutit znovupřipojení", diff --git a/src/locales/da.json b/src/locales/da.json index 10151304f4b..ea6da5a3236 100644 --- a/src/locales/da.json +++ b/src/locales/da.json @@ -74,7 +74,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Du kan kun importere fra almindelig tekst eller HTML-formater. For mere avancerede importfunktioner skal du installere AbiWord eller LibreOffice .", "pad.modals.connected": "Forbundet.", "pad.modals.reconnecting": "Genopretter forbindelsen til din pad...", "pad.modals.forcereconnect": "Gennemtving genoprettelse af forbindelsen", diff --git a/src/locales/de.json b/src/locales/de.json index 5fde3af2e1d..499ccccb4dd 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -122,7 +122,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Du kannst nur aus reinen Text- oder HTML-Formaten importieren. Für umfangreichere Importfunktionen muss AbiWord oder LibreOffice auf dem Server installiert werden.", "pad.modals.connected": "Verbunden.", "pad.modals.reconnecting": "Dein Pad wird neu verbunden...", "pad.modals.forcereconnect": "Erneutes Verbinden erzwingen", diff --git a/src/locales/diq.json b/src/locales/diq.json index 96ef1cbfe49..75ada910072 100644 --- a/src/locales/diq.json +++ b/src/locales/diq.json @@ -93,7 +93,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Şıma şenê tenya metınanê zelalan ya zi formatanê HTML-i biyarê. Seba vêşi xısusiyetanê arezekerdışi ra gırey AbiWordi ya zi LibreOfficeyi bar kerên.", "pad.modals.connected": "Gıre diya.", "pad.modals.reconnecting": "Pada şıma rê fına irtibat kewê no", "pad.modals.forcereconnect": "Mecbur anciya gırê de", diff --git a/src/locales/dsb.json b/src/locales/dsb.json index 805d3f19d55..127011ae763 100644 --- a/src/locales/dsb.json +++ b/src/locales/dsb.json @@ -106,7 +106,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Móžoš jano z fprmatow lutnego teksta abo z HTML-formata importěrowaś. Za wěcej rozšyrjone importěrowańske funkcije instalěruj pšosym Abiword abo LibreOffice.", "pad.modals.connected": "Zwězany.", "pad.modals.reconnecting": "Zwězujo se znowego z twójim zapisnikom...", "pad.modals.forcereconnect": "Znowego zwězaś", diff --git a/src/locales/dty.json b/src/locales/dty.json index b0dd535685e..eed93c60e47 100644 --- a/src/locales/dty.json +++ b/src/locales/dty.json @@ -50,7 +50,6 @@ "pad.importExport.exportword": "माइक्रोसफ्ट वर्ड", "pad.importExport.exportpdf": "पिडिएफ", "pad.importExport.exportopen": "ओडिएफ (खुल्ला कागजात ढाँचा)", - "pad.importExport.abiword.innerHTML": "तम सादा पाठ या HTML ढाँचा बठेइ मात्तरी आयात अरीसकन्छऽ। विस्तारित आयात विशेषता खिलाई कृपया abiword स्थापना अरऽ।", "pad.modals.connected": "जोडीयाको।", "pad.modals.reconnecting": "तमरा प्याडमि दोबरा जडान अद्‍दाछ़..", "pad.modals.forcereconnect": "बलात् पुन:जडान", diff --git a/src/locales/el.json b/src/locales/el.json index cbe811a9f1a..471135ce06f 100644 --- a/src/locales/el.json +++ b/src/locales/el.json @@ -103,7 +103,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Μπορείτε να εισάγετε απλό κείμενο ή HTML. Για προηγμένες δυνατότητες εισαγωγής παρακαλούμε εγκαταστήστε το AbiWord ή το LibreOffice.", "pad.modals.connected": "Συνδεμένοι.", "pad.modals.reconnecting": "Επανασύνδεση στο pad σας…", "pad.modals.forcereconnect": "Επιβολή επανασύνδεσης", diff --git a/src/locales/en-gb.json b/src/locales/en-gb.json index 7a648bd44e3..342aabc0166 100644 --- a/src/locales/en-gb.json +++ b/src/locales/en-gb.json @@ -53,7 +53,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "You only can import from plain text or HTML formats. For more advanced import features please install AbiWord or LibreOffice.", "pad.modals.connected": "Connected.", "pad.modals.reconnecting": "Reconnecting to your pad…", "pad.modals.forcereconnect": "Force reconnect", diff --git a/src/locales/en.json b/src/locales/en.json index 51e07f3021a..9494797797d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -108,7 +108,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "You only can import from plain text or HTML formats. For more advanced import features please install AbiWord or LibreOffice.", "pad.modals.connected": "Connected.", "pad.modals.reconnecting": "Reconnecting to your pad…", diff --git a/src/locales/eo.json b/src/locales/eo.json index 7e1d558afab..d71e9d14f49 100644 --- a/src/locales/eo.json +++ b/src/locales/eo.json @@ -52,7 +52,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Formato “OpenDocument”)", - "pad.importExport.abiword.innerHTML": "Nur kapablas enporti de plata teksto aŭ HTML. Por pli speciala importkapablo, bonvolu instalu la programon, Abiword.", "pad.modals.connected": "Konektita.", "pad.modals.reconnecting": "Rekonektanta al via redaktilo..", "pad.modals.forcereconnect": "Perforte rekonekti", diff --git a/src/locales/es.json b/src/locales/es.json index 85153d0cb1b..04976d51ccb 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -104,7 +104,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Solo se puede importar desde texto plano o formatos HTML. Para obtener funciones de importación más avanzadas, instale AbiWord o LibreOffice.", "pad.modals.connected": "Conectado.", "pad.modals.reconnecting": "Reconectando a tu pad...", "pad.modals.forcereconnect": "Forzar reconexión", diff --git a/src/locales/et.json b/src/locales/et.json index 8ec7900a3c8..162f1bf815d 100644 --- a/src/locales/et.json +++ b/src/locales/et.json @@ -46,7 +46,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Paraku on ainult lihttekstis voi HTML-vormingus dokumentide importimine võimaldatud. Rohkem võimaluste jaoks peab paigaldama abiword.", "pad.modals.connected": "Ühendatud.", "pad.modals.reconnecting": "Proovitakse luua ühendus klade juurde...", "pad.modals.forcereconnect": "Sunni ühenduse taasloomist", diff --git a/src/locales/eu.json b/src/locales/eu.json index 05bbf314949..025636ba190 100644 --- a/src/locales/eu.json +++ b/src/locales/eu.json @@ -109,7 +109,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Testu laua edo HTML formatudun testuak bakarrik inporta ditzakezu. Aurreratuagoak diren inportazio aukerak izateko AbiWord edo LibreOffice instala ezazu.", "pad.modals.connected": "Konektatuta.", "pad.modals.reconnecting": "Zure pad-era birkonektatzen...", "pad.modals.forcereconnect": "Behartu berkonexioa", diff --git a/src/locales/fa.json b/src/locales/fa.json index 4f03adc3b9e..871acbf5b8e 100644 --- a/src/locales/fa.json +++ b/src/locales/fa.json @@ -98,7 +98,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (قالب سند باز)", - "pad.importExport.abiword.innerHTML": "شما تنها می‌توانید از قالب متن ساده یا اچ‌تی‌ام‌ال درون‌ریزی کنید. برای بیشتر شدن ویژگی‌های درون‌ریزی پیشرفته AbiWord یا LibreOffice را نصب کنید.", "pad.modals.connected": "متصل شد.", "pad.modals.reconnecting": "در حال اتصال دوباره به پد شما...", "pad.modals.forcereconnect": "واداشتن به اتصال دوباره", diff --git a/src/locales/ff.json b/src/locales/ff.json index dbb6c3b02d5..a1164036d37 100644 --- a/src/locales/ff.json +++ b/src/locales/ff.json @@ -83,7 +83,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Mbaaw-ɗaa jiggaade tan ko baykaaji binndi ɓolɓolti maa HTML. Ngam heɓde fannuuji jiggagol ɓurɗi seeɓde, tiiɗno yillo install AbiWord or LibreOffice.", "pad.modals.connected": "Seŋiima.", "pad.modals.reconnecting": "Nana seŋoo e faɗo maa…", "pad.modals.forcereconnect": "Forsu ceŋagol kadi", diff --git a/src/locales/fi.json b/src/locales/fi.json index 80a48ada5ca..1d91ed6701c 100644 --- a/src/locales/fi.json +++ b/src/locales/fi.json @@ -104,7 +104,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Tuonti on tuettu vain HTML- ja raakatekstitiedostoista. Monipuoliset tuontiominaisuudet ovat käytettävissä asentamalla AbiWordin tai LibreOfficen.", "pad.modals.connected": "Yhdistetty.", "pad.modals.reconnecting": "Muodostetaan yhteyttä muistioon uudelleen…", "pad.modals.forcereconnect": "Pakota yhdistämään uudelleen", diff --git a/src/locales/fo.json b/src/locales/fo.json index c98ade6c447..2a7c89ce59e 100644 --- a/src/locales/fo.json +++ b/src/locales/fo.json @@ -39,7 +39,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Opið Dokument Format)", - "pad.importExport.abiword.innerHTML": "Tú kanst bert innflyta frá einføldum teksti ella html formatum. Fyri funksjónir til innflytan fyri víðarikomin vinarliga installera abiword.", "pad.modals.connected": "Tú hevur samband.", "pad.modals.reconnecting": "Roynir aftur at fáa samband við tín pad..", "pad.modals.forcereconnect": "Tvinga endurstovnan av sambandi.", diff --git a/src/locales/fr.json b/src/locales/fr.json index 1915edaeef8..514d7d27f0e 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -135,7 +135,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Vous ne pouvez importer que des formats texte brut ou HTML. Pour des fonctionnalités d’importation plus évoluées, veuillez installer AbiWord ou LibreOffice.", "pad.modals.connected": "Connecté.", "pad.modals.reconnecting": "Reconnexion à votre bloc-notes en cours...", "pad.modals.forcereconnect": "Forcer la reconnexion", diff --git a/src/locales/ga.json b/src/locales/ga.json index 08939b50126..9258797a37e 100644 --- a/src/locales/ga.json +++ b/src/locales/ga.json @@ -105,7 +105,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Formáid Doiciméad Oscailte)", - "pad.importExport.abiword.innerHTML": "Ní féidir leat iompórtáil ach ó théacs simplí nó ó fhormáidí HTML. Chun gnéithe iompórtála níos forbartha a fháil, suiteáil AbiWord nó LibreOffice le do thoil.", "pad.modals.connected": "Ceangailte.", "pad.modals.reconnecting": "Ag athcheangal le do phainéal…", "pad.modals.forcereconnect": "Athcheangal fórsaithe", diff --git a/src/locales/gl.json b/src/locales/gl.json index 465496a0383..45ca25ccf08 100644 --- a/src/locales/gl.json +++ b/src/locales/gl.json @@ -108,7 +108,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Só podes importar texto simple ou formatos HTML. Para obter máis información sobre as características de importación avanzadas instala AbiWord.", "pad.modals.connected": "Conectado.", "pad.modals.reconnecting": "Reconectando co teu documento...", "pad.modals.forcereconnect": "Forzar a reconexión", diff --git a/src/locales/gu.json b/src/locales/gu.json index d2f7c4fa1cc..436cc422fd5 100644 --- a/src/locales/gu.json +++ b/src/locales/gu.json @@ -26,7 +26,6 @@ "pad.importExport.exportword": "માઇક્રોસોફ્ટ વર્ડ", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (ઓપન ડોક્યુમેન્ટ ફોરમેટ)", - "pad.importExport.abiword.innerHTML": "આપ માત્ર સાદુ લખાણ અથવા HTML આયાત કરી શકો છો. વધુ અધ્યતન આયાત સુવિધા માટે abiword ઇન્સ્ટોલ કરો.", "pad.modals.connected": "જોડાયેલું", "pad.chat": "વાતચીત", "pad.chat.title": "આ પેડ માટે વાતચીત ખોલો.", diff --git a/src/locales/he.json b/src/locales/he.json index 0515308f0c0..785e68701e9 100644 --- a/src/locales/he.json +++ b/src/locales/he.json @@ -110,7 +110,6 @@ "pad.importExport.exportword": "מיקרוסופט וורד", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "באפשרותך לייבא מטקסט פשוט או מ־HTML. לאפשרויות יבוא מתקדמות יותר יש להתקין AbiWord או LibreOffice.", "pad.modals.connected": "מחובר.", "pad.modals.reconnecting": "מתבצע חיבור מחדש למחברת שלך…", "pad.modals.forcereconnect": "לכפות חיבור מחדש", diff --git a/src/locales/hr.json b/src/locales/hr.json index 77b10674a7c..3111f7e3a5e 100644 --- a/src/locales/hr.json +++ b/src/locales/hr.json @@ -53,7 +53,6 @@ "pad.importExport.exportword": "Datoteku programa Microsoft Word", "pad.importExport.exportpdf": "Datoteku Acrobatova PDF formata", "pad.importExport.exportopen": "Datoteku formata Open Document (ODF)", - "pad.importExport.abiword.innerHTML": "Možete uvoziti samo datoteke formata za obični tekst (bez oblikovanja) te datoteke u formatima HTML-a. Za naprednije mogućnosti uvoza, molimo Vas, instalirajte program AbiWord ili LibreOffice.", "pad.modals.connected": "Povezano.", "pad.modals.reconnecting": "Ponovo Vas povezujemo s Vašim blokićem...", "pad.modals.forcereconnect": "Prisilno se ponovo poveži", diff --git a/src/locales/hrx.json b/src/locales/hrx.json index 397e41c9e3c..a80023b68fc 100644 --- a/src/locales/hrx.json +++ b/src/locales/hrx.json @@ -45,7 +45,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Sie können nur aus Klartext oder HTML-Formaten importieren. Für mehr erweiterte Importfunktionen installieren Sie bitte abiword.", "pad.modals.connected": "Verbünd (konnektiert).", "pad.modals.reconnecting": "Wiederherstelle von der Verbinnung …", "pad.modals.forcereconnect": "Erneit Verbinne", diff --git a/src/locales/hsb.json b/src/locales/hsb.json index 7a75c950878..9b40de1f980 100644 --- a/src/locales/hsb.json +++ b/src/locales/hsb.json @@ -106,7 +106,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Móžeš jenož z formatow luteho teksta abo z HTML-formata importować. Za bóle rozšěrjene importowe funkcije instaluj prošu Abiword abo LibreOffice.", "pad.modals.connected": "Zwjazany.", "pad.modals.reconnecting": "Zwjazuje so znowa z twojim zapisnikom...", "pad.modals.forcereconnect": "Znowa zwjazać", diff --git a/src/locales/hu.json b/src/locales/hu.json index 377672b1716..89de739c95d 100644 --- a/src/locales/hu.json +++ b/src/locales/hu.json @@ -94,7 +94,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document formátum)", - "pad.importExport.abiword.innerHTML": "Csak szöveges, vagy HTML formátumokból importálhat. A haladó importálási szolgáltatásért kérjük telepítse a AbiWord vagy a LibreOffice alkalmazást.", "pad.modals.connected": "Kapcsolódva.", "pad.modals.reconnecting": "Újrakapcsolódás a jegyzetfüzethez…", "pad.modals.forcereconnect": "Újrakapcsolódás kényszerítése", diff --git a/src/locales/ia.json b/src/locales/ia.json index 7fde194558f..096c402aeaf 100644 --- a/src/locales/ia.json +++ b/src/locales/ia.json @@ -106,7 +106,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Es possibile importar solmente le files in formato de texto simple o HTML. Pro functionalitate de importation plus extense, installa AbiWord o LibreOffice.", "pad.modals.connected": "Connectite.", "pad.modals.reconnecting": "Reconnexion a tu nota…", "pad.modals.forcereconnect": "Fortiar reconnexion", diff --git a/src/locales/id.json b/src/locales/id.json index 0011a9557fc..ec0ce5c0424 100644 --- a/src/locales/id.json +++ b/src/locales/id.json @@ -91,7 +91,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Anda hanya dapat mengimpor dari format teks polos atau HTML. Untuk fitur impor yang lebih canggih, pasanglah AbiWord atau LibreOffice.", "pad.modals.connected": "Tersambung.", "pad.modals.reconnecting": "Menyambungkan kembali ke pad Anda…", "pad.modals.forcereconnect": "Sambung kembali secara paksa", diff --git a/src/locales/is.json b/src/locales/is.json index 0ff9ec5d695..a47a2e66e65 100644 --- a/src/locales/is.json +++ b/src/locales/is.json @@ -82,7 +82,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Þú getur aðeins flutt inn úr hreinum texta eða HTML sniðum. Til að geta nýtt \nfleiri þróaðri innflutningssnið settu þá upp AbiWord forritið eða LibreOffice.", "pad.modals.connected": "Tengt.", "pad.modals.reconnecting": "Endurtengist skrifblokkinni þinni…", "pad.modals.forcereconnect": "Þvinga endurtengingu", diff --git a/src/locales/it.json b/src/locales/it.json index aa49a59c095..8a28bd23487 100644 --- a/src/locales/it.json +++ b/src/locales/it.json @@ -116,7 +116,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "È possibile importare solo i formati di testo semplice o HTML. Per metodi più avanzati di importazione installare AbiWord o LibreOffice.", "pad.modals.connected": "Connesso.", "pad.modals.reconnecting": "Riconnessione al pad in corso…", "pad.modals.forcereconnect": "Forza la riconnessione", diff --git a/src/locales/ja.json b/src/locales/ja.json index fb1cc6a4605..54bec17047a 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -76,7 +76,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "プレーンテキストまたは HTML ファイルからのみインポートできます。より高度なインポート機能を使用するには、AbiWord またはLibreOfficeをインストールしてください。", "pad.modals.connected": "接続されました。", "pad.modals.reconnecting": "パッドに再接続中...", "pad.modals.forcereconnect": "強制的に再接続", diff --git a/src/locales/kab.json b/src/locales/kab.json index 38f7ba99e1e..aa9edd7de4c 100644 --- a/src/locales/kab.json +++ b/src/locales/kab.json @@ -55,7 +55,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Tzemreḍ kan ad ketreḍ aḍris aččuran neɣ imasalen HTML. Ugar n tmahilin n ukter leqqayen, rzu ar Sebded AbiWord.", "pad.modals.connected": "Iqqen.", "pad.modals.reconnecting": "Tulsa n tuqqna ar upad-ik.", "pad.modals.forcereconnect": "Ḥettem tulsa n tuqqna", diff --git a/src/locales/ko.json b/src/locales/ko.json index 174fa2eb0de..dd4d9b18126 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -98,7 +98,6 @@ "pad.importExport.exportword": "Microsoft 워드", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format, 개방형 문서 형식)", - "pad.importExport.abiword.innerHTML": "일반 텍스트나 HTML 형식으로만 가져올 수 있습니다. 고급 가져오기 기능에 대해서는 AbiWord를 설치하세요.", "pad.modals.connected": "연결함.", "pad.modals.reconnecting": "내 패드에 다시 연결하는 중...", "pad.modals.forcereconnect": "강제로 다시 연결", diff --git a/src/locales/krc.json b/src/locales/krc.json index fdf400a8073..fe5b0e3229a 100644 --- a/src/locales/krc.json +++ b/src/locales/krc.json @@ -85,7 +85,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (OpenOffice'ни документи)", - "pad.importExport.abiword.innerHTML": "Сиз къуру тюз текстни неда HTML импорт этерге боллукъсуз. Импортну андан кенг функциялары ючюн AbiWord не LibreOffice къуругъуз.", "pad.modals.connected": "Байланды.", "pad.modals.reconnecting": "Блокнотугъузгъа джангыдан байлана турады...", "pad.modals.forcereconnect": "Джангыдан зор бла байланыу", diff --git a/src/locales/ksh.json b/src/locales/ksh.json index 8015e4f112c..4555c18cd05 100644 --- a/src/locales/ksh.json +++ b/src/locales/ksh.json @@ -48,7 +48,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF (Poteerbaa Dokemänte Fommaat)", "pad.importExport.exportopen": "ODF (Offe Dokemänte-Fommaat)", - "pad.importExport.abiword.innerHTML": "Mer künne bloß eijfaache Täxte udder HTML_Fommaate empoteere. Opwändejere Müjjeleschkeite fö der Empoot jon och, doför bruch mer en Enschtallazjuhn met Abiword.", "pad.modals.connected": "Verbonge.", "pad.modals.reconnecting": "Ben wider aam Verbenge …", "pad.modals.forcereconnect": "Wider verbenge", diff --git a/src/locales/lki.json b/src/locales/lki.json index 556368a201a..87625da7ead 100644 --- a/src/locales/lki.json +++ b/src/locales/lki.json @@ -50,7 +50,6 @@ "pad.importExport.exportword": "مایکروسافت وورد", "pad.importExport.exportpdf": "پی دی اف", "pad.importExport.exportopen": " (قالب سند باز)ODF", - "pad.importExport.abiword.innerHTML": "شما تنها می‌توانید از قالب متن ساده یا اچ‌تی‌ام‌ال درون‌ریزی کنید. برای بیشتر شدن ویژگی‌های درون‌ریزی پیشرفته AbiWord را نصب کنید.", "pad.modals.connected": "وصل بیۀ", "pad.modals.reconnecting": "..در حال اتصال دوباره به دفترچه یادداشت شما", "pad.modals.forcereconnect": "واداشتن به اتصال دوباره", diff --git a/src/locales/lt.json b/src/locales/lt.json index 885a90408c4..4fd1ba89828 100644 --- a/src/locales/lt.json +++ b/src/locales/lt.json @@ -89,7 +89,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Atvirasis dokumento formatas)", - "pad.importExport.abiword.innerHTML": "Galite importuoti tik iš paprasto teksto ar HTML formatų. Dėl išplėstinių importavimo funkcijų prašome įdiegti AbiWord ar LibreOffice.", "pad.modals.connected": "Prisijungta.", "pad.modals.reconnecting": "Iš naujo prisijungiama prie jūsų bloknoto…", "pad.modals.forcereconnect": "Priversti prisijungti iš naujo", diff --git a/src/locales/map-bms.json b/src/locales/map-bms.json index d920cc5cbe4..ac93f46001d 100644 --- a/src/locales/map-bms.json +++ b/src/locales/map-bms.json @@ -46,7 +46,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Rika mung teyeng impor sekang format plain text utawa HTML. Kanggo fitur impor sing lewih maju monggo masang abiword.", "pad.modals.connected": "Nyambung.", "pad.modals.reconnecting": "Mbaleli nyambung ming pad Rika...", "pad.modals.forcereconnect": "Maksa nyambung maning", diff --git a/src/locales/mk.json b/src/locales/mk.json index af56f699902..a7517b6ee0f 100644 --- a/src/locales/mk.json +++ b/src/locales/mk.json @@ -108,7 +108,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Можете да увезувате само од прост текст и HTML-формат. Понапредни можности за увоз ќе добиете ако воспоставите AbiWord или LibreOffice.", "pad.modals.connected": "Поврзано.", "pad.modals.reconnecting": "Ве преповрзувам со тетратката...", "pad.modals.forcereconnect": "Наметни преповрзување", diff --git a/src/locales/ml.json b/src/locales/ml.json index f65080ec887..308a350f9b7 100644 --- a/src/locales/ml.json +++ b/src/locales/ml.json @@ -56,7 +56,6 @@ "pad.importExport.exportword": "മൈക്രോസോഫ്റ്റ് വേഡ്", "pad.importExport.exportpdf": "പി.ഡി.എഫ്.", "pad.importExport.exportopen": "ഒ.ഡി.എഫ്. (ഓപ്പൺ ഡോക്യുമെന്റ് ഫോർമാറ്റ്)", - "pad.importExport.abiword.innerHTML": "പ്ലെയിൻ ടെക്സ്റ്റോ എച്ച്.റ്റി.എം.എൽ. തരമോ മാത്രമേ താങ്കൾക്ക് ഇറക്കുമതി ചെയ്യാനാവൂ. കൂടുതൽ വിപുലീകൃത ഇറക്കുമതി സൗകര്യങ്ങൾക്കായി ദയവായി അബിവേഡ് അല്ലെങ്കിൽ ലിബർഓഫീസ് ഇൻസ്റ്റോൾ ചെയ്യുക.", "pad.modals.connected": "ബന്ധിപ്പിച്ചിരിക്കുന്നു.", "pad.modals.reconnecting": "താങ്കളുടെ പാഡിലേയ്ക്ക് വീണ്ടും ബന്ധിപ്പിക്കുന്നു...", "pad.modals.forcereconnect": "എന്തായാലും ബന്ധിപ്പിക്കുക", diff --git a/src/locales/ms.json b/src/locales/ms.json index 767d283e341..c8ca6542279 100644 --- a/src/locales/ms.json +++ b/src/locales/ms.json @@ -52,7 +52,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Anda hanya boleh mengimport dari format teks biasa atau html. Untuk ciri-ciri import yang lebih maju, sila memasang abiword.", "pad.modals.connected": "Bersambung.", "pad.modals.reconnecting": "Bersambung semula dengan pad anda...", "pad.modals.forcereconnect": "Sambung semula secara paksa", diff --git a/src/locales/my.json b/src/locales/my.json index d427bbcb5c5..522ded52a46 100644 --- a/src/locales/my.json +++ b/src/locales/my.json @@ -85,7 +85,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "ပီဒီအက်ဖ်", "pad.importExport.exportopen": "ODF (စာရွက်စာတမ်းဖွင့်ပုံစံ)", - "pad.importExport.abiword.innerHTML": "သင်ရိုးရိုးစာသားများ (သို့) HTML ပုံစံများဖြင့်သာတင်သွင်းနိုင်သည်။ ပိုမိုအဆင့်မြင့်သောသွင်းကုန်အင်္ဂါရပ်များအတွက် ကျေးဇူးပြု၍ ကျေးဇူးပြု၍ AbiWord သို့မဟုတ် LibreOffice ကို install လုပ်ပါ။", "pad.modals.connected": "ချိတ်ဆက်ထားသည်။", "pad.modals.reconnecting": "သင်၏ pad သို့ပြန်လည်ချိတ်ဆက်နေသည်…", "pad.modals.forcereconnect": "ပြန်လည်ချိတ်ဆက်ခိုင်းပါ", diff --git a/src/locales/nap.json b/src/locales/nap.json index 70f615b3801..c704b159181 100644 --- a/src/locales/nap.json +++ b/src/locales/nap.json @@ -51,7 +51,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Putite surtanto mpurtà testo chiano o furmatte HTML. Pe n'avé sisteme cchiù annanze 'e mpurtazione pe' piacere installate Abiword.", "pad.modals.connected": "Cunnesso.", "pad.modals.reconnecting": "Ricunnessione ô pad 'n curso...", "pad.modals.forcereconnect": "Forza 'a ricunnessione", diff --git a/src/locales/nb.json b/src/locales/nb.json index 111a8f2c45f..6f41f83d7ef 100644 --- a/src/locales/nb.json +++ b/src/locales/nb.json @@ -73,7 +73,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Du kan bare importere fra ren tekst eller HTML-formater. For mer avanserte importfunksjoner, installer AbiWord eller LibreOffice.", "pad.modals.connected": "Tilkoblet.", "pad.modals.reconnecting": "Kobler til pad-en på nytt …", "pad.modals.forcereconnect": "Tving gjenoppkobling", diff --git a/src/locales/nds.json b/src/locales/nds.json index 75cdaabec1c..1475602a050 100644 --- a/src/locales/nds.json +++ b/src/locales/nds.json @@ -46,7 +46,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Se köönt blots wat vun Kloortext oder HTML-Stücken röverhalen. Mit köönt Se ok anner Saken röverhalen. Dorför mööt Se bidde abiword inrichten.", "pad.modals.connected": "Verbindung steiht.", "pad.modals.reconnecting": "En Verbindung wedder opboen ...", "pad.modals.forcereconnect": "Noch mal verbinnen", diff --git a/src/locales/nl.json b/src/locales/nl.json index 31ab822b589..7b19f40dab2 100644 --- a/src/locales/nl.json +++ b/src/locales/nl.json @@ -120,7 +120,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "U kunt alleen importeren vanuit tekst zonder opmaak of met HTML-opmaak. Installeer AbiWord of LibreOffice om meer geavanceerde importmogelijkheden te krijgen.", "pad.modals.connected": "Verbonden.", "pad.modals.reconnecting": "De verbinding met uw notitie wordt hersteld…", "pad.modals.forcereconnect": "Opnieuw verbinden", diff --git a/src/locales/nn.json b/src/locales/nn.json index ee772027998..0168ed2f1ca 100644 --- a/src/locales/nn.json +++ b/src/locales/nn.json @@ -44,7 +44,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Du kan berre importera frå rein tekst- eller HTML-format. Ver venleg og installer Abiword om du treng meir avanserte importfunksjonar.", "pad.modals.connected": "Tilkopla.", "pad.modals.reconnecting": "Gjenopprettar tilkoplinga til blokka di …", "pad.modals.forcereconnect": "Tving gjentilkopling", diff --git a/src/locales/oc.json b/src/locales/oc.json index 84a015ae461..2ce7a85ef7a 100644 --- a/src/locales/oc.json +++ b/src/locales/oc.json @@ -78,7 +78,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Podètz pas importar que de formats tèxte brut o html. Per de foncionalitats d'importacion mai evoluadas, installatz abiword.", "pad.modals.connected": "Connectat.", "pad.modals.reconnecting": "Reconnexion cap a vòstre Pad...", "pad.modals.forcereconnect": "Forçar la reconnexion.", diff --git a/src/locales/os.json b/src/locales/os.json index 2f023b27a95..f9b03ffc5fd 100644 --- a/src/locales/os.json +++ b/src/locales/os.json @@ -45,7 +45,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Дӕ бон у импорт кӕнын ӕрмӕст хуымӕтӕг текст кӕнӕ html форматӕй. Лӕмбынӕг импорты миниуджытӕн, дӕ хорзӕхӕй, сӕвӕр abiword.", "pad.modals.connected": "Иугонд.", "pad.modals.reconnecting": "Дӕ документмӕ ногӕй иугонд цӕуы..", "pad.modals.forcereconnect": "Тыххӕй баиу кӕнын", diff --git a/src/locales/pa.json b/src/locales/pa.json index 513b8a27f67..c50a3e6ba54 100644 --- a/src/locales/pa.json +++ b/src/locales/pa.json @@ -68,7 +68,6 @@ "pad.importExport.exportword": "ਮਾਈਕਰੋਸਾਫਟ ਵਰਡ", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (ਓਪਨ ਡੌਕੂਮੈਂਟ ਫਾਰਮੈਟ)", - "pad.importExport.abiword.innerHTML": "ਤੁਸੀਂ ਸਿਰਫ਼ ਸਾਦੀਆਂ ਲਿਖਤੀ ਜਾਂ ਐੱਚ.ਟੀ.ਐੱਮ.ਐੱਲ. ਰੂਪ-ਰੇਖਾਵਾਂ ਤੋਂ ਦਰਾਮਦ ਕਰ ਸਕਦੇ ਹੋ। ਹੋਰ ਉੱਨਤ ਦਰਾਮਦੀ ਗੁਣਾਂ ਵਾਸਤੇ ਮਿਹਰਬਾਨੀ ਕਰਕੇ ਐਬੀਵਰਡ ਥਾਪੋ।", "pad.modals.connected": "ਜੁੜਿਆ ਹੋਇਆ।", "pad.modals.reconnecting": "..ਤੁਹਾਡੇ ਪੈਡ ਨਾਲ ਮੁੜ-ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ", "pad.modals.forcereconnect": "ਧੱਕੇ ਨਾਲ ਮੁੜ-ਜੁੜੋ", diff --git a/src/locales/pl.json b/src/locales/pl.json index ec82f9014c7..02f24959cc1 100644 --- a/src/locales/pl.json +++ b/src/locales/pl.json @@ -104,7 +104,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Możesz importować pliki tylko w formacie zwykłego tekstu lub HTML. Aby umożliwić bardziej zaawansowane funkcje importu, zainstaluj AbiWord lub LibreOffice.", "pad.modals.connected": "Połączony.", "pad.modals.reconnecting": "Ponowne łączenie z dokumentem...", "pad.modals.forcereconnect": "Wymuś ponowne połączenie", diff --git a/src/locales/pms.json b/src/locales/pms.json index c41c023c17f..165d9d02b40 100644 --- a/src/locales/pms.json +++ b/src/locales/pms.json @@ -105,7 +105,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "A peul mach amporté dij formà ëd test sempi o HTML. Për dle fonsionalità d'amportassion pi avansà, ch'a anstala AbiWord o LibreOffice.", "pad.modals.connected": "Colegà.", "pad.modals.reconnecting": "Neuva conession a sò feuj…", "pad.modals.forcereconnect": "Forsé la neuva conession", diff --git a/src/locales/pt-br.json b/src/locales/pt-br.json index 4ffe81cbd6d..383c10b7c39 100644 --- a/src/locales/pt-br.json +++ b/src/locales/pt-br.json @@ -104,7 +104,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Só é possível importar texto sem formatação ou HTML. Para obter funcionalidades de importação mais avançadas, por favor instale o AbiWordor ou LibreOffice.", "pad.modals.connected": "Conectado.", "pad.modals.reconnecting": "Reconectando à sua nota…", "pad.modals.forcereconnect": "Forçar reconexão", diff --git a/src/locales/pt.json b/src/locales/pt.json index efb11c80b23..2ca3fe6f5d9 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -98,7 +98,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Só pode fazer importações de texto não formatado ou com formato HTML. Para funcionalidades de importação de texto mais avançadas, instale AbiWord ou LibreOffice, por favor.", "pad.modals.connected": "Ligado.", "pad.modals.reconnecting": "A restabelecer ligação à nota…", "pad.modals.forcereconnect": "Forçar restabelecimento de ligação", diff --git a/src/locales/qqq.json b/src/locales/qqq.json index 80b88ddbb06..1b4a98b227d 100644 --- a/src/locales/qqq.json +++ b/src/locales/qqq.json @@ -61,7 +61,6 @@ "pad.importExport.exportword": "Used as link text, preceded by {{msg-etherpadlite|Pad.importExport.export}}.\n{{Related|Pad.importExport.export}}", "pad.importExport.exportpdf": "Used as link text, preceded by {{msg-etherpadlite|Pad.importExport.export}}.\n{{Related|Pad.importExport.export}}", "pad.importExport.exportopen": "Used as link text, preceded by {{msg-etherpadlite|Pad.importExport.export}}.\n{{Related|Pad.importExport.export}}", - "pad.importExport.abiword.innerHTML": "Used as intro text for the \"Import file\" form.\n\nPreceded by the heading {{msg-etherpadlite|pad.importExport.import}}.", "pad.modals.connected": "Used as HTML

heading to indicate the status.\n\nSee also:\n* {{msg-etherpadlite|Pad.modals.reconnecting}}\n{{Identical|Connected}}", "pad.modals.reconnecting": "Used as HTML

heading to indicate the status.\n\nSee also:\n* {{msg-etherpadlite|Pad.modals.connected}}", "pad.modals.forcereconnect": "Label of a button that will make the browser reconnect to the synchronization server.", diff --git a/src/locales/ro.json b/src/locales/ro.json index 562aac3bce0..128187e5dab 100644 --- a/src/locales/ro.json +++ b/src/locales/ro.json @@ -67,7 +67,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Puteți importa doar din format simplu sau HTML. Pentru funcții de import mai avansate, vă rugăm instalați AbiWord sau LibreOffice.", "pad.modals.connected": "Conectat.", "pad.modals.reconnecting": "Se reconectează la pad…", "pad.modals.forcereconnect": "Forțează reconectarea", diff --git a/src/locales/ru.json b/src/locales/ru.json index 7e11d382e01..6f200e55d36 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -122,7 +122,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (документ OpenOffice)", - "pad.importExport.abiword.innerHTML": "Вы можете импортировать только из обычного текста или HTML. Для более продвинутых функций импорта установите AbiWord или LibreOffice.", "pad.modals.connected": "Подключен.", "pad.modals.reconnecting": "Повторное подключение к вашему документу…", "pad.modals.forcereconnect": "Принудительное переподключение", diff --git a/src/locales/sc.json b/src/locales/sc.json index 0ae544a7bd3..2b622cd317a 100644 --- a/src/locales/sc.json +++ b/src/locales/sc.json @@ -84,7 +84,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Documentu Formadu)", - "pad.importExport.abiword.innerHTML": "Isceti is formados de testu sèmplitze o HTML podent èssere importados. Pro mètodos avantzados de importatzione, installa AbiWord o LibreOffice.", "pad.modals.connected": "Connètidu.", "pad.modals.reconnecting": "Connetende a su pad tuo...", "pad.modals.forcereconnect": "Fortza sa connesione", diff --git a/src/locales/sco.json b/src/locales/sco.json index b67e587b486..d043cdafeee 100644 --- a/src/locales/sco.json +++ b/src/locales/sco.json @@ -51,7 +51,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Ye can anely import fae plain tex or HTML formats. Fur mair advanced import features please install abiword.", "pad.modals.connected": "Connected.", "pad.modals.reconnecting": "Reconnectin til yer pad..", "pad.modals.forcereconnect": "Force reconnect", diff --git a/src/locales/sh-latn.json b/src/locales/sh-latn.json index e09c64dd476..eb26375efac 100644 --- a/src/locales/sh-latn.json +++ b/src/locales/sh-latn.json @@ -57,7 +57,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Možete uvoziti samo iz običnog teksta te datoteke u formatima HTML-a. Naprednije mogućnosti uvoza dobit ćete ako instalirajte AbiWord ili LibreOffice.", "pad.modals.connected": "Povezano.", "pad.modals.reconnecting": "Prepovezujemo Vas s blokićem...", "pad.modals.forcereconnect": "Nametni prepovezivanje", diff --git a/src/locales/shn.json b/src/locales/shn.json index f36df000fbb..50f32f13fb1 100644 --- a/src/locales/shn.json +++ b/src/locales/shn.json @@ -49,7 +49,6 @@ "pad.importExport.exportword": "မၢႆႇၶရူဝ်ႇသွပ်ႉဝၢတ်ႉ", "pad.importExport.exportpdf": "ၽီႇတီႇဢႅပ်ႉၾ်", "pad.importExport.exportopen": "ဢူဝ်တီႇဢႅပ်ႉၾ် (Open Document Format)", - "pad.importExport.abiword.innerHTML": "ၸဝ်ႈၵဝ်ႇတေ ၸၢင်ႈလုၵ်ႉတီႈ တူဝ်လိၵ်ႈလွၼ်ႉလွၼ်ႉ ဢမ်ႇၼၼ် HTML သေ သူင်ႇၶဝ်ႈၵႂႃႇၵူၺ်း။ တွၼ်ႈတႃႇ လၢႆးၵၢၼ်သူင်ႇၶဝ်ႈၶိုၵ်ႉတွၼ်းတၢင်ႇၸိူဝ်းၼၼ်ႉ ၶႅၼ်းတေႃႈ ဢူၼ်းသႂ်ႇ AbiWord.", "pad.modals.connected": "ၵွင်ႉသၢၼ်ယဝ်ႉ", "pad.modals.reconnecting": "ၶိုၼ်းၵွင်ႉသၢၼ်ၸူး ၽႅတ်ႉၸဝ်ႈၵဝ်ႇယူႇ", "pad.modals.forcereconnect": "တဵၵ်းၸႂ်ႉ ၶိုၼ်းၵွင်ႉသၢၼ်", diff --git a/src/locales/sk.json b/src/locales/sk.json index ea1e47d607d..6f608cc562f 100644 --- a/src/locales/sk.json +++ b/src/locales/sk.json @@ -90,7 +90,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Importovať môžete len čistý text alebo HTML. Pre pokročilejšie funkcie importu prosím nainštalujte „AbiWord“.", "pad.modals.connected": "Pripojené.", "pad.modals.reconnecting": "Opätovné pripájanie k vášmu poznámkovému bloku...", "pad.modals.forcereconnect": "Vynútiť znovupripojenie", diff --git a/src/locales/sl.json b/src/locales/sl.json index a599a1688a8..4319253c91b 100644 --- a/src/locales/sl.json +++ b/src/locales/sl.json @@ -91,7 +91,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF", - "pad.importExport.abiword.innerHTML": "Uvoziti je mogoče le golo besedilo in formate HTML. Za naprednejše možnosti uvoza namestite program AbiWord.", "pad.modals.connected": "Povezano.", "pad.modals.reconnecting": "Poteka povezovanje z blokcem ...", "pad.modals.forcereconnect": "Vsili ponovno povezavo", diff --git a/src/locales/sq.json b/src/locales/sq.json index 4f8c18fe42e..988c88b3446 100644 --- a/src/locales/sq.json +++ b/src/locales/sq.json @@ -88,7 +88,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Mund të importoni vetëm prej formati tekst i thjeshtë ose HTML. Për veçori më të thelluara importimi, ju lutemi, instaloni AbiWord-in ose LibreOffice.", "pad.modals.connected": "I lidhur.", "pad.modals.reconnecting": "Po rilidheni te blloku juaj…", "pad.modals.forcereconnect": "Detyro rilidhje", diff --git a/src/locales/sr-ec.json b/src/locales/sr-ec.json index 2ae09c5ed19..f45d0b0032f 100644 --- a/src/locales/sr-ec.json +++ b/src/locales/sr-ec.json @@ -59,7 +59,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Једино можете увести са једноставног текстуалног формата или HTML формата. За компликованије функције о увозу, молимо да инсталирате AbiWord или LibreOffice.", "pad.modals.connected": "Повезано.", "pad.modals.reconnecting": "Поново се повезујем на ваш пад...", "pad.modals.forcereconnect": "Присилно се поново повежи", diff --git a/src/locales/sr-el.json b/src/locales/sr-el.json index 35b86dd6225..f52ca296c5f 100644 --- a/src/locales/sr-el.json +++ b/src/locales/sr-el.json @@ -46,7 +46,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Jedino možete uvesti sa jednostavnog tekstualnog formata ili HTML formata. Za komplikovanije funkcije o uvozu, molimo da instalirate AbiWord.", "pad.modals.connected": "Povezano.", "pad.modals.reconnecting": "Ponovo se povezujem na vaš pad..", "pad.modals.forcereconnect": "Prisilno se ponovo poveži", diff --git a/src/locales/sro.json b/src/locales/sro.json index 03578c299bb..94fc431bcd3 100644 --- a/src/locales/sro.json +++ b/src/locales/sro.json @@ -80,7 +80,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Isceti is formados de testu sèmplitze o HTML podent èssere importados. Pro mètodos avantzados de importatzione, installa AbiWord o LibreOffice.", "pad.modals.connected": "Connètidu.", "pad.modals.reconnecting": "Connetende a su pad tuo...", "pad.modals.forcereconnect": "Fortza sa connesione", diff --git a/src/locales/sv.json b/src/locales/sv.json index 939eeac3dc0..0dcc960f1b7 100644 --- a/src/locales/sv.json +++ b/src/locales/sv.json @@ -110,7 +110,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "Du kan endast importera från oformaterad text eller HTML-format. För mer avancerade importfunktioner, var god installera AbiWord eller LibreOffice.", "pad.modals.connected": "Ansluten.", "pad.modals.reconnecting": "Återansluter till ditt block…", "pad.modals.forcereconnect": "Tvinga återanslutning", diff --git a/src/locales/sw.json b/src/locales/sw.json index c45ed08e9a5..425c28cd1f7 100644 --- a/src/locales/sw.json +++ b/src/locales/sw.json @@ -87,7 +87,6 @@ "pad.importExport.exportword": "Neno la Microsoft", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Fungua Fomati ya Hati)", - "pad.importExport.abiword.innerHTML": "Unaweza kuagiza tu kutoka kwa maandishi wazi au fomati za HTML. Kwa vipengee vya hali ya juu zaidi tafadhali weka AbiWord au LibreOffice .", "pad.modals.connected": "Imeunganishwa", "pad.modals.reconnecting": "Inaunganisha tena pedi yako…", "pad.modals.forcereconnect": "Lazimisha kuunganisha tena", diff --git a/src/locales/th.json b/src/locales/th.json index 8b44b2f20f0..d3c0ecbf673 100644 --- a/src/locales/th.json +++ b/src/locales/th.json @@ -87,7 +87,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Open Document Format)", - "pad.importExport.abiword.innerHTML": "คุณสามารถนำเข้าได้จากรูปแบบ HTML หรือข้อความธรรมดาเท่านั้น สำหรับคุณสมบัติการนำเข้าขั้นสูงเพิ่มเติม โปรดติดตั้ง AbiWord หรือ LibraOffice", "pad.modals.connected": "เชื่อมต่อแล้ว", "pad.modals.reconnecting": "กำลังเชื่อมต่อกับแผ่นจดบันทึกของคุณใหม่..", "pad.modals.forcereconnect": "บังคับเชื่อมต่อใหม่", diff --git a/src/locales/tr.json b/src/locales/tr.json index 48638509989..9fcfa4e4806 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -97,7 +97,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (Açık Doküman Biçimi)", - "pad.importExport.abiword.innerHTML": "Yalnızca düz metin veya HTML biçimlerinden içe aktarabilirsiniz. Daha gelişmiş içe aktarma özellikleri için lütfen AbiWord veya LibreOffice yükleyin .", "pad.modals.connected": "Bağlandı.", "pad.modals.reconnecting": "Bloknotuza tekrar bağlanılıyor…", "pad.modals.forcereconnect": "Yeniden bağlanmaya zorla", diff --git a/src/locales/uk.json b/src/locales/uk.json index 4879f62cc72..d188cf8db8b 100644 --- a/src/locales/uk.json +++ b/src/locales/uk.json @@ -98,7 +98,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF (документ OpenOffice)", - "pad.importExport.abiword.innerHTML": "Ви можете імпортувати лише у форматі простого тексту або HTML. Для більш просунутих способів імпорту встановіть AbiWord або LibreOffice.", "pad.modals.connected": "З'єднано.", "pad.modals.reconnecting": "Перепідключення до Вашого документа…", "pad.modals.forcereconnect": "Примусове перепідключення", diff --git a/src/locales/vi.json b/src/locales/vi.json index d618725e7b2..95f52079c5d 100644 --- a/src/locales/vi.json +++ b/src/locales/vi.json @@ -49,7 +49,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF", - "pad.importExport.abiword.innerHTML": "Bạn chỉ có thể nhập vào từ văn bản thuần túy hay định dạng HTML. Nếu muốn có nhiều chức năng nhập hơn xin hãy cài đặt abiword.", "pad.modals.connected": "Đã kết nối lại.", "pad.modals.reconnecting": "Kết nối lại tới pad của bạn", "pad.modals.forcereconnect": "Ép kết nối lại", diff --git a/src/locales/zh-hans.json b/src/locales/zh-hans.json index ac4549262a1..a3befc99dd1 100644 --- a/src/locales/zh-hans.json +++ b/src/locales/zh-hans.json @@ -127,7 +127,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF（开放文档格式）", - "pad.importExport.abiword.innerHTML": "您只可以导入纯文本或HTML格式。要获取更高级的导入功能，请安装 AbiWord 或是 LibreOffice。", "pad.modals.connected": "已连接。", "pad.modals.reconnecting": "重新连接到您的记事本…", "pad.modals.forcereconnect": "强制重新连接", diff --git a/src/locales/zh-hant.json b/src/locales/zh-hant.json index febf764c8e1..27c2a8521ce 100644 --- a/src/locales/zh-hant.json +++ b/src/locales/zh-hant.json @@ -116,7 +116,6 @@ "pad.importExport.exportword": "Microsoft Word", "pad.importExport.exportpdf": "PDF", "pad.importExport.exportopen": "ODF（開放文件格式）", - "pad.importExport.abiword.innerHTML": "您只可以匯入純文字或HTML格式。若要取得更進階的導入功能，請安裝AbiWord 或是LibreOffice。", "pad.modals.connected": "已連線。", "pad.modals.reconnecting": "重新連線到您的記事本…", "pad.modals.forcereconnect": "強制重新連線", diff --git a/src/node/handler/ExportHandler.ts b/src/node/handler/ExportHandler.ts index e1294171ab9..8a03bd898c5 100644 --- a/src/node/handler/ExportHandler.ts +++ b/src/node/handler/ExportHandler.ts @@ -95,7 +95,7 @@ exports.doExport = async (req: any, res: any, padId: string, readOnlyId: string, // ensure html can be collected by the garbage collector html = null; - // send the convert job to the converter (abiword, libreoffice, ..) + // send the convert job to the converter (libreoffice) const destFile = `${tempDirectory}/etherpad_export_${randNum}.${type}`; // Allow plugins to overwrite the convert in export process @@ -103,10 +103,7 @@ exports.doExport = async (req: any, res: any, padId: string, readOnlyId: string, if (result.length > 0) { // console.log("export handled by plugin", destFile); } else { - const converter = - settings.soffice != null ? require('../utils/LibreOffice') - : settings.abiword != null ? require('../utils/Abiword') - : null; + const converter = require('../utils/LibreOffice'); await converter.convertFile(srcFile, destFile, type); } diff --git a/src/node/handler/ImportHandler.ts b/src/node/handler/ImportHandler.ts index e569c12fa15..393c76f2377 100644 --- a/src/node/handler/ImportHandler.ts +++ b/src/node/handler/ImportHandler.ts @@ -59,11 +59,6 @@ const rm = async (path: string) => { let converter:any = null; let exportExtension = 'htm'; -// load abiword only if it is enabled and if soffice is disabled -if (settings.abiword != null && settings.soffice == null) { - converter = require('../utils/Abiword'); -} - // load soffice only if it is enabled if (settings.soffice != null) { converter = require('../utils/LibreOffice'); @@ -81,7 +76,7 @@ const tmpDirectory = os.tmpdir(); */ const doImport = async (req:any, res:any, padId:string, authorId:string) => { // pipe to a file - // convert file to html via abiword or soffice + // convert file to html via soffice // set html in the pad const randNum = Math.floor(Math.random() * 0xFFFFFFFF); diff --git a/src/node/handler/PadMessageHandler.ts b/src/node/handler/PadMessageHandler.ts index eb8faa74bb9..27df3ffa4d2 100644 --- a/src/node/handler/PadMessageHandler.ts +++ b/src/node/handler/PadMessageHandler.ts @@ -32,7 +32,6 @@ import padutils from '../../static/js/pad_utils'; import readOnlyManager from '../db/ReadOnlyManager'; import settings, { exportAvailable, - abiwordAvailable, sofficeAvailable } from '../utils/Settings'; const securityManager = require('../db/SecurityManager'); @@ -1043,9 +1042,9 @@ const handleClientReady = async (socket:any, message: ClientReadyMessage) => { serverTimestamp: Date.now(), sessionRefreshInterval: settings.cookie.sessionRefreshInterval, userId: sessionInfo.author, - abiwordAvailable: abiwordAvailable(), sofficeAvailable: sofficeAvailable(), exportAvailable: exportAvailable(), + docxExport: settings.docxExport, plugins: { plugins: plugins.plugins, parts: plugins.parts, diff --git a/src/node/hooks/express/importexport.ts b/src/node/hooks/express/importexport.ts index d3d40664afd..c2ded2a80d8 100644 --- a/src/node/hooks/express/importexport.ts +++ b/src/node/hooks/express/importexport.ts @@ -28,22 +28,22 @@ exports.expressCreateServer = (hookName:string, args:ArgsExpressType, cb:Functio args.app.use('/p/:pad{/:rev}/export/:type', limiter); args.app.get('/p/:pad{/:rev}/export/:type', (req:any, res:any, next:Function) => { (async () => { - const types = ['pdf', 'doc', 'txt', 'html', 'odt', 'etherpad']; + const types = ['pdf', 'doc', 'docx', 'txt', 'html', 'odt', 'etherpad']; // send a 404 if we don't support this filetype if (types.indexOf(req.params.type) === -1) { return next(); } - // if abiword is disabled, and this is a format we only support with abiword, output a message + // if soffice is disabled, and this is a format we only support with soffice, output a message if (exportAvailable() === 'no' && - ['odt', 'pdf', 'doc'].indexOf(req.params.type) !== -1) { + ['odt', 'pdf', 'doc', 'docx'].indexOf(req.params.type) !== -1) { console.error(`Impossible to export pad "${req.params.pad}" in ${req.params.type} format.` + ' There is no converter configured'); // ACHTUNG: do not include req.params.type in res.send() because there is // no HTML escaping and it would lead to an XSS - res.send('This export is not enabled at this Etherpad instance. Set the path to Abiword' + - ' or soffice (LibreOffice) in settings.json to enable this feature'); + res.send('This export is not enabled at this Etherpad instance. Set the path to soffice ' + + '(LibreOffice) in settings.json to enable this feature'); return; } diff --git a/src/node/utils/Abiword.ts b/src/node/utils/Abiword.ts deleted file mode 100644 index fd17497ed12..00000000000 --- a/src/node/utils/Abiword.ts +++ /dev/null @@ -1,93 +0,0 @@ -'use strict'; -/** - * Controls the communication with the Abiword application - */ - -/* - * 2011 Peter 'Pita' Martischka (Primary Technology Ltd) - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS-IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import {ChildProcess} from "node:child_process"; -import {AsyncQueueTask} from "../types/AsyncQueueTask"; - -const spawn = require('child_process').spawn; -const async = require('async'); -import settings from './Settings'; -const os = require('os'); - -// on windows we have to spawn a process for each convertion, -// cause the plugin abicommand doesn't exist on this platform -if (os.type().indexOf('Windows') > -1) { - exports.convertFile = async (srcFile: string, destFile: string, type: string) => { - const abiword = spawn(settings.abiword, [`--to=${destFile}`, srcFile]); - let stdoutBuffer = ''; - abiword.stdout.on('data', (data: string) => { stdoutBuffer += data.toString(); }); - abiword.stderr.on('data', (data: string) => { stdoutBuffer += data.toString(); }); - await new Promise((resolve, reject) => { - abiword.on('exit', (code: number) => { - if (code !== 0) return reject(new Error(`Abiword died with exit code ${code}`)); - if (stdoutBuffer !== '') { - console.log(stdoutBuffer); - } - resolve(); - }); - }); - }; - // on unix operating systems, we can start abiword with abicommand and - // communicate with it via stdin/stdout - // thats much faster, about factor 10 -} else { - let abiword: ChildProcess; - let stdoutCallback: Function|null = null; - const spawnAbiword = () => { - abiword = spawn(settings.abiword, ['--plugin', 'AbiCommand']); - let stdoutBuffer = ''; - let firstPrompt = true; - abiword.stderr!.on('data', (data) => { stdoutBuffer += data.toString(); }); - abiword.on('exit', (code) => { - spawnAbiword(); - if (stdoutCallback != null) { - stdoutCallback(new Error(`Abiword died with exit code ${code}`)); - stdoutCallback = null; - } - }); - abiword.stdout!.on('data', (data) => { - stdoutBuffer += data.toString(); - // we're searching for the prompt, cause this means everything we need is in the buffer - if (stdoutBuffer.search('AbiWord:>') !== -1) { - const err = stdoutBuffer.search('OK') !== -1 ? null : new Error(stdoutBuffer); - stdoutBuffer = ''; - if (stdoutCallback != null && !firstPrompt) { - stdoutCallback(err); - stdoutCallback = null; - } - firstPrompt = false; - } - }); - }; - spawnAbiword(); - - const queue = async.queue((task: AsyncQueueTask, callback:Function) => { - abiword.stdin!.write(`convert ${task.srcFile} ${task.destFile} ${task.type}\n`); - stdoutCallback = (err: string) => { - if (err != null) console.error('Abiword File failed to convert', err); - callback(err); - }; - }, 1); - - exports.convertFile = async (srcFile: string, destFile: string, type: string) => { - await queue.pushAsync({srcFile, destFile, type}); - }; -} diff --git a/src/node/utils/ExportHtml.ts b/src/node/utils/ExportHtml.ts index 2d8e6a3a695..700b4403fdc 100644 --- a/src/node/utils/ExportHtml.ts +++ b/src/node/utils/ExportHtml.ts @@ -254,8 +254,7 @@ const getHTMLFromAtext = async (pad:PadType, atext: AText, authorColors?: string let s = taker.take(chars); - // removes the characters with the code 12. Don't know where they come - // from but they break the abiword parser and are completly useless + // form feed (0x0C) is a legacy control char with no meaning in HTML s = s.replace(String.fromCharCode(12), ''); assem.append(_encodeWhitespace(Security.escapeHTML(s))); diff --git a/src/node/utils/ExportTxt.ts b/src/node/utils/ExportTxt.ts index ba4d9e19f00..58746822817 100644 --- a/src/node/utils/ExportTxt.ts +++ b/src/node/utils/ExportTxt.ts @@ -159,8 +159,7 @@ const getTXTFromAtext = (pad: PadType, atext: AText, authorColors?:string) => { const s = taker.take(chars); - // removes the characters with the code 12. Don't know where they come - // from but they break the abiword parser and are completly useless + // form feed (0x0C) stripping — left commented historically // s = s.replace(String.fromCharCode(12), ""); // remove * from s, it's just not needed on a blank line.. This stops diff --git a/src/node/utils/Settings.ts b/src/node/utils/Settings.ts index d25c3d4e1a3..56fec21f6f9 100644 --- a/src/node/utils/Settings.ts +++ b/src/node/utils/Settings.ts @@ -237,8 +237,8 @@ export type SettingsType = { editOnly: boolean, maxAge: number, minify: boolean, - abiword: string | null, soffice: string | null, + docxExport: boolean, allowUnknownFileEnds: boolean, loglevel: string, logLayoutType: string, @@ -475,14 +475,15 @@ const settings: SettingsType = { * A flag that shows if minification is enabled or not */ minify: true, - /** - * The path of the abiword executable - */ - abiword: null, /** * The path of the libreoffice executable */ soffice: null, + /** + * When true, the "Microsoft Word" export button downloads a .docx file (requires soffice). + * Set to false to revert to legacy .doc output. + */ + docxExport: true, /** * Should we support none natively supported file types on import? */ @@ -684,15 +685,6 @@ if (typeof module !== 'undefined' && module.exports) { settings.dbSettings = {filename: path.join(settings.root, 'var/rusty.db')}; // END OF SETTINGS -// checks if abiword is avaiable -export const abiwordAvailable = () => { - if (settings.abiword != null) { - return os.type().indexOf('Windows') !== -1 ? 'withoutPDF' : 'yes'; - } else { - return 'no'; - } -}; - export const sofficeAvailable = () => { if (settings.soffice != null) { return os.type().indexOf('Windows') !== -1 ? 'withoutPDF' : 'yes'; @@ -701,19 +693,7 @@ export const sofficeAvailable = () => { } }; -export const exportAvailable = () => { - const abiword = abiwordAvailable(); - const soffice = sofficeAvailable(); - - if (abiword === 'no' && soffice === 'no') { - return 'no'; - } else if ((abiword === 'withoutPDF' && soffice === 'no') || - (abiword === 'no' && soffice === 'withoutPDF')) { - return 'withoutPDF'; - } else { - return 'yes'; - } -}; +export const exportAvailable = () => sofficeAvailable(); // Return etherpad version from package.json @@ -767,7 +747,7 @@ const storeSettings = (settingsObj: any) => { * no coercition for "null" values. * * If the user wants a variable to be null by default, he'll have to use the - * short syntax "${ABIWORD}", and not "${ABIWORD:null}": the latter would result + * short syntax "${SOFFICE}", and not "${SOFFICE:null}": the latter would result * in the literal string "null", instead. */ const coerceValue = (stringValue: string) => { @@ -962,6 +942,15 @@ export const reloadSettings = () => { storeSettings(settingsParsed); storeSettings(credentials); + // Emit a clear migration warning when the deprecated abiword setting is detected. + if (settingsParsed && (settingsParsed as any).abiword != null) { + logger.warn( + 'The "abiword" setting is no longer supported and has been ignored. ' + + 'Abiword import/export support has been removed. ' + + 'Please install LibreOffice and set "soffice" to its executable path instead.' + ); + } + // Init logging config settings.logconfig = defaultLogConfig( settings.loglevel ? settings.loglevel : defaultLogLevel, @@ -1015,20 +1004,6 @@ export const reloadSettings = () => { logger.info(`Using skin "${settings.skinName}" in dir: ${skinPath}`); } - if (settings.abiword) { - // Check abiword actually exists - fs.exists(settings.abiword, (exists: boolean) => { - if (!exists) { - const abiwordError = 'Abiword does not exist at this path, check your settings file.'; - if (!settings.suppressErrorsInPadText) { - settings.defaultPadText += `\nError: ${abiwordError}${suppressDisableMsg}`; - } - logger.error(`${abiwordError} File location: ${settings.abiword}`); - settings.abiword = null; - } - }); - } - if (settings.soffice) { fs.exists(settings.soffice, (exists: boolean) => { if (!exists) { diff --git a/src/static/css/pad/popup_import_export.css b/src/static/css/pad/popup_import_export.css index 3bfe0722e75..25f2cab7df7 100644 --- a/src/static/css/pad/popup_import_export.css +++ b/src/static/css/pad/popup_import_export.css @@ -11,16 +11,10 @@ /* hidden element */ #importstatusball, -#importmessagesuccess, -#importmessageabiword { +#importmessagesuccess { display: none; } -#importmessageabiword { - color: #900; - font-size: small; -} - #importsubmitinput { margin-top: 10px; } \ No newline at end of file diff --git a/src/static/js/pad_impexp.ts b/src/static/js/pad_impexp.ts index 8b8575c819d..f7cb4ae0bf9 100644 --- a/src/static/js/pad_impexp.ts +++ b/src/static/js/pad_impexp.ts @@ -144,23 +144,22 @@ const padimpexp = (() => { $('#exportetherpada').attr('href', `${padRootPath}/export/etherpad`); $('#exportplaina').attr('href', `${padRootPath}/export/txt`); - // hide stuff thats not avaible if abiword/soffice is disabled + // hide stuff thats not avaible if soffice is disabled + const wordFormat = clientVars.docxExport ? 'docx' : 'doc'; if (clientVars.exportAvailable === 'no') { $('#exportworda').remove(); $('#exportpdfa').remove(); $('#exportopena').remove(); - - $('#importmessageabiword').show(); } else if (clientVars.exportAvailable === 'withoutPDF') { $('#exportpdfa').remove(); - $('#exportworda').attr('href', `${padRootPath}/export/doc`); + $('#exportworda').attr('href', `${padRootPath}/export/${wordFormat}`); $('#exportopena').attr('href', `${padRootPath}/export/odt`); $('#importexport').css({height: '142px'}); $('#importexportline').css({height: '142px'}); } else { - $('#exportworda').attr('href', `${padRootPath}/export/doc`); + $('#exportworda').attr('href', `${padRootPath}/export/${wordFormat}`); $('#exportpdfa').attr('href', `${padRootPath}/export/pdf`); $('#exportopena').attr('href', `${padRootPath}/export/odt`); } diff --git a/src/static/js/types/SocketIOMessage.ts b/src/static/js/types/SocketIOMessage.ts index f2b8cfc14fa..690c293cba8 100644 --- a/src/static/js/types/SocketIOMessage.ts +++ b/src/static/js/types/SocketIOMessage.ts @@ -80,13 +80,13 @@ export type ClientVarPayload = { skinName: string skinVariants: string, exportAvailable: string + docxExport: boolean savedRevisions: PadRevision[], initialRevisionList: number[], padShortcutEnabled: MapArrayType, initialTitle: string, opts: {} numConnectedUsers: number - abiwordAvailable: string sofficeAvailable: string plugins: { plugins: MapArrayType diff --git a/src/static/skins/colibris/src/components/import-export.css b/src/static/skins/colibris/src/components/import-export.css index d8425d89529..0465e20b55c 100644 --- a/src/static/skins/colibris/src/components/import-export.css +++ b/src/static/skins/colibris/src/components/import-export.css @@ -1,15 +1,3 @@ -#importmessageabiword { - font-style: italic; - color: #64d29b; - color: var(--primary-color); -} -#importmessageabiword > a { - font-weight: bold; - text-decoration: underline; - color: #64d29b; - color: var(--primary-color); -} - #importmessagefail { margin-top: 10px; } diff --git a/src/templates/pad.html b/src/templates/pad.html index 1c6071f28ba..ccb091e76f3 100644 --- a/src/templates/pad.html +++ b/src/templates/pad.html @@ -192,7 +192,6 @@

<% e.begin_block("importColumn"); %>

-

diff --git a/src/tests/backend/specs/api/importexportGetPost.ts b/src/tests/backend/specs/api/importexportGetPost.ts index 1e3fb5b026e..ec8c6536be6 100644 --- a/src/tests/backend/specs/api/importexportGetPost.ts +++ b/src/tests/backend/specs/api/importexportGetPost.ts @@ -199,17 +199,16 @@ describe(__filename, function () { } }); - describe('Import/Export tests requiring AbiWord/LibreOffice', function () { + describe('Import/Export tests requiring LibreOffice', function () { before(async function () { - if ((!settings.abiword || settings.abiword.indexOf('/') === -1) && - (!settings.soffice || settings.soffice.indexOf('/') === -1)) { + if (!settings.soffice || settings.soffice.indexOf('/') === -1) { this.skip(); } }); // For some reason word import does not work in testing.. // TODO: fix support for .doc files.. - it('Tries to import .doc that uses soffice or abiword', async function () { + it('Tries to import .doc that uses soffice', async function () { await agent.post(`/p/${testPadId}/import`) .set("authorization", await common.generateJWTToken()) .attach('file', wordDoc, {filename: '/test.doc', contentType: 'application/msword'}) @@ -230,7 +229,15 @@ describe(__filename, function () { .expect((res:any) => assert(res.body.length >= 9000)); }); - it('Tries to import .docx that uses soffice or abiword', async function () { + it('exports DOCX', async function () { + await agent.get(`/p/${testPadId}/export/docx`) + .set("authorization", await common.generateJWTToken()) + .buffer(true).parse(superagent.parse['application/octet-stream']) + .expect(200) + .expect((res:any) => assert(res.body.length >= 4000)); + }); + + it('Tries to import .docx that uses soffice', async function () { await agent.post(`/p/${testPadId}/import`) .set("authorization", await common.generateJWTToken()) .attach('file', wordXDoc, { @@ -255,7 +262,15 @@ describe(__filename, function () { .expect((res:any) => assert(res.body.length >= 9100)); }); - it('Tries to import .pdf that uses soffice or abiword', async function () { + it('exports DOCX from imported DOCX', async function () { + await agent.get(`/p/${testPadId}/export/docx`) + .set("authorization", await common.generateJWTToken()) + .buffer(true).parse(superagent.parse['application/octet-stream']) + .expect(200) + .expect((res:any) => assert(res.body.length >= 4000)); + }); + + it('Tries to import .pdf that uses soffice', async function () { await agent.post(`/p/${testPadId}/import`) .set("authorization", await common.generateJWTToken()) .attach('file', pdfDoc, {filename: '/test.pdf', contentType: 'application/pdf'}) @@ -276,7 +291,7 @@ describe(__filename, function () { .expect((res:any) => assert(res.body.length >= 1000)); }); - it('Tries to import .odt that uses soffice or abiword', async function () { + it('Tries to import .odt that uses soffice', async function () { await agent.post(`/p/${testPadId}/import`) .set("authorization", await common.generateJWTToken()) .attach('file', odtDoc, {filename: '/test.odt', contentType: 'application/odt'}) @@ -296,7 +311,7 @@ describe(__filename, function () { .expect(200) .expect((res:any) => assert(res.body.length >= 7000)); }); - }); // End of AbiWord/LibreOffice tests. + }); // End of LibreOffice tests. it('Tries to import .etherpad', async function () { this.timeout(3000); diff --git a/src/tests/settings.json b/src/tests/settings.json index 9fef0fa1998..ca2c5f64d2c 100644 --- a/src/tests/settings.json +++ b/src/tests/settings.json @@ -1 +1 @@ -{"title":"Etherpad","favicon":null,"skinName":"colibris","skinVariants":"super-light-toolbar super-light-editor light-background","ip":"0.0.0.0","port":9001,"showSettingsInAdminPage":true,"dbType":"dirty","dbSettings":{"filename":"var/dirty.db"},"defaultPadText":"Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at https://etherpad.org\n","padOptions":{"noColors":false,"showControls":true,"showChat":true,"showLineNumbers":true,"useMonospaceFont":false,"userName":null,"userColor":null,"rtl":false,"alwaysShowChat":false,"chatAndUsers":false,"lang":null},"padShortcutEnabled":{"altF9":true,"altC":true,"cmdShift2":true,"delete":true,"return":true,"esc":true,"cmdS":true,"tab":true,"cmdZ":true,"cmdY":true,"cmdI":true,"cmdB":true,"cmdU":true,"cmd5":true,"cmdShiftL":true,"cmdShiftN":true,"cmdShift1":true,"cmdShiftC":true,"cmdH":true,"ctrlHome":true,"pageUp":true,"pageDown":true},"suppressErrorsInPadText":false,"requireSession":false,"editOnly":false,"minify":true,"maxAge":21600,"abiword":null,"soffice":null,"allowUnknownFileEnds":true,"requireAuthentication":false,"requireAuthorization":false,"trustProxy":false,"cookie":{"keyRotationInterval":86400000,"sameSite":"Lax","sessionLifetime":864000000,"sessionRefreshInterval":86400000},"disableIPlogging":false,"automaticReconnectionTimeout":0,"scrollWhenFocusLineIsOutOfViewport":{"percentage":{"editionAboveViewport":0,"editionBelowViewport":0},"duration":0,"scrollWhenCaretIsInTheLastLineOfViewport":false,"percentageToScrollWhenUserPressesArrowUp":0},"users":{"admin":{"password":"changeme1","is_admin":true},"user":{"password":"changeme1","is_admin":false}},"socketTransportProtocols":["websocket","polling"],"socketIo":{"maxHttpBufferSize":1000000},"loadTest":false,"dumpOnUncleanExit":false,"importExportRateLimiting":{"windowMs":90000,"max":10},"importMaxFileSize":52428800,"commitRateLimiting":{"duration":1,"points":10},"exposeVersion":false,"loglevel":"INFO","customLocaleStrings":{},"enableAdminUITests":true,"lowerCasePadIds":false,"sso":{"issuer":"${SSO_ISSUER:http://localhost:9001}","clients":[{"client_id":"${ADMIN_CLIENT:admin_client}","client_secret":"${ADMIN_SECRET:admin}","grant_types":["authorization_code"],"response_types":["code"],"redirect_uris":["${ADMIN_REDIRECT:http://localhost:9001/admin/}","https://oauth.pstmn.io/v1/callback"]},{"client_id":"${USER_CLIENT:user_client}","client_secret":"${USER_SECRET:user}","grant_types":["authorization_code"],"response_types":["code"],"redirect_uris":["${USER_REDIRECT:http://localhost:9001/}"]}]}} \ No newline at end of file +{"title":"Etherpad","favicon":null,"skinName":"colibris","skinVariants":"super-light-toolbar super-light-editor light-background","ip":"0.0.0.0","port":9001,"showSettingsInAdminPage":true,"dbType":"dirty","dbSettings":{"filename":"var/dirty.db"},"defaultPadText":"Welcome to Etherpad!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at https://etherpad.org\n","padOptions":{"noColors":false,"showControls":true,"showChat":true,"showLineNumbers":true,"useMonospaceFont":false,"userName":null,"userColor":null,"rtl":false,"alwaysShowChat":false,"chatAndUsers":false,"lang":null},"padShortcutEnabled":{"altF9":true,"altC":true,"cmdShift2":true,"delete":true,"return":true,"esc":true,"cmdS":true,"tab":true,"cmdZ":true,"cmdY":true,"cmdI":true,"cmdB":true,"cmdU":true,"cmd5":true,"cmdShiftL":true,"cmdShiftN":true,"cmdShift1":true,"cmdShiftC":true,"cmdH":true,"ctrlHome":true,"pageUp":true,"pageDown":true},"suppressErrorsInPadText":false,"requireSession":false,"editOnly":false,"minify":true,"maxAge":21600,"soffice":null,"allowUnknownFileEnds":true,"requireAuthentication":false,"requireAuthorization":false,"trustProxy":false,"cookie":{"keyRotationInterval":86400000,"sameSite":"Lax","sessionLifetime":864000000,"sessionRefreshInterval":86400000},"disableIPlogging":false,"automaticReconnectionTimeout":0,"scrollWhenFocusLineIsOutOfViewport":{"percentage":{"editionAboveViewport":0,"editionBelowViewport":0},"duration":0,"scrollWhenCaretIsInTheLastLineOfViewport":false,"percentageToScrollWhenUserPressesArrowUp":0},"users":{"admin":{"password":"changeme1","is_admin":true},"user":{"password":"changeme1","is_admin":false}},"socketTransportProtocols":["websocket","polling"],"socketIo":{"maxHttpBufferSize":1000000},"loadTest":false,"dumpOnUncleanExit":false,"importExportRateLimiting":{"windowMs":90000,"max":10},"importMaxFileSize":52428800,"commitRateLimiting":{"duration":1,"points":10},"exposeVersion":false,"loglevel":"INFO","customLocaleStrings":{},"enableAdminUITests":true,"lowerCasePadIds":false,"sso":{"issuer":"${SSO_ISSUER:http://localhost:9001}","clients":[{"client_id":"${ADMIN_CLIENT:admin_client}","client_secret":"${ADMIN_SECRET:admin}","grant_types":["authorization_code"],"response_types":["code"],"redirect_uris":["${ADMIN_REDIRECT:http://localhost:9001/admin/}","https://oauth.pstmn.io/v1/callback"]},{"client_id":"${USER_CLIENT:user_client}","client_secret":"${USER_SECRET:user}","grant_types":["authorization_code"],"response_types":["code"],"redirect_uris":["${USER_REDIRECT:http://localhost:9001/}"]}]}} \ No newline at end of file diff --git a/ui/pad.html b/ui/pad.html index e1154194372..6ce5cb56039 100644 --- a/ui/pad.html +++ b/ui/pad.html @@ -402,7 +402,6 @@

-