From a4f2ebe57ee304ca5d8d415e4f4f1bab443f9fb8 Mon Sep 17 00:00:00 2001 From: jdittrich Date: Wed, 26 Mar 2014 18:22:41 +0100 Subject: [PATCH 01/12] Update package.json updated the underscore version number to 1.5.1 (from 1.3.1). Not lifted to most current version because frontend tests broke from 1.5.2 upwards. --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index f47ec4741..d8aa26e99 100644 --- a/src/package.json +++ b/src/package.json @@ -34,7 +34,7 @@ "semver" : "1.0.13", "security" : "1.0.0", "tinycon" : "0.0.1", - "underscore" : "1.3.1", + "underscore" : "1.5.1", "unorm" : "1.0.0", "languages4translatewiki" : "0.1.3", "swagger-node-express" : "1.2.3", From 086bf83e6ccd4e576b579b3fb718ed10e5f6daee Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 20 Oct 2014 18:57:22 +0200 Subject: [PATCH 02/12] Localisation updates from https://translatewiki.net. --- src/locales/bcc.json | 122 +++++++++++++++++++++++++++++++++++++++++++ src/locales/lki.json | 75 ++++++++++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 src/locales/bcc.json create mode 100644 src/locales/lki.json diff --git a/src/locales/bcc.json b/src/locales/bcc.json new file mode 100644 index 000000000..10349ae5c --- /dev/null +++ b/src/locales/bcc.json @@ -0,0 +1,122 @@ +{ + "@metadata": { + "authors": [ + "Baloch Afghanistan" + ] + }, + "index.newPad": "دفترچه یادداشت تازه", + "index.createOpenPad": "یا ایجاد/بازکردن یک دفترچه یادداشت با نام:", + "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.indent.title": "تورفتگی (TAB)", + "pad.toolbar.unindent.title": "بیرون رفتگی (Shift+TAB)", + "pad.toolbar.undo.title": "باطل‌کردن (Ctrl-Z)", + "pad.toolbar.redo.title": "از نو (Ctrl-Y)", + "pad.toolbar.clearAuthorship.title": "پاک‌کردن رنگ‌های نویسندگی", + "pad.toolbar.import_export.title": "درون‌ریزی/برون‌ریزی از/به قالب‌های مختلف", + "pad.toolbar.timeslider.title": "لغزندهٔ زمان", + "pad.toolbar.savedRevision.title": "ذخیره‌سازی نسخه", + "pad.toolbar.settings.title": "تنظیمات", + "pad.toolbar.embed.title": "اشتراک و جاسازی این دفترچه یادداشت", + "pad.toolbar.showusers.title": "نمایش کاربران در این دفترچه یادداشت", + "pad.colorpicker.save": "زاپاس کورتین", + "pad.colorpicker.cancel": "کنسیل", + "pad.loading": "...بار بیت", + "pad.passwordRequired": "برای دسترسی به این دفترچه یادداشت نیاز به یک گذرواژه دارید", + "pad.permissionDenied": "شرمنده، شما را اجازت په دسترسی ای صفحه نیست.", + "pad.wrongPassword": "گذرواژه‌ی شما درست نیست", + "pad.settings.padSettings": "تنظیمات دفترچه یادداشت", + "pad.settings.myView": "نمای من", + "pad.settings.stickychat": "گفتگو همیشه روی صفحه نمایش باشد", + "pad.settings.colorcheck": "رنگ‌های نویسندگی", + "pad.settings.linenocheck": "شماره‌ی خطوط", + "pad.settings.rtlcheck": "خواندن محتوا از راست به چپ؟", + "pad.settings.fontType": "نوع قلم:", + "pad.settings.fontType.normal": "نرمال", + "pad.settings.fontType.monospaced": "Monospace", + "pad.settings.globalView": "نمای سراسری", + "pad.settings.language": "زبان:", + "pad.importExport.import_export": "درون‌ریزی/برون‌ریزی", + "pad.importExport.import": "بارگذاری پرونده‌ی متنی یا سند", + "pad.importExport.importSuccessful": "موفقیت آمیز بود!", + "pad.importExport.export": "برون‌ریزی این دفترچه یادداشت با قالب:", + "pad.importExport.exporthtml": "HTML", + "pad.importExport.exportplain": "سادگین متن", + "pad.importExport.exportword": "Microsoft Word", + "pad.importExport.exportpdf": "PDF", + "pad.importExport.exportopen": "ODF (قالب سند باز)", + "pad.importExport.exportdokuwiki": "DokuWiki", + "pad.importExport.abiword.innerHTML": "شما تنها می‌توانید از قالب متن ساده یا اچ‌تی‌ام‌ال درون‌ریزی کنید. برای بیشتر شدن ویژگی‌های درون‌ریزی پیشرفته AbiWord را نصب کنید.", + "pad.modals.connected": "متصل شد.", + "pad.modals.reconnecting": "در حال اتصال دوباره به دفترچه یادداشت شما..", + "pad.modals.forcereconnect": "واداشتن به اتصال دوباره", + "pad.modals.userdup": "در پنجره‌ای دیگر باز شد", + "pad.modals.userdup.explanation": "گمان می‌رود این دفترچه یادداشت در بیش از یک پنجره‌ی مرورگر باز شده‌است.", + "pad.modals.userdup.advice": "برای استفاده از این پنجره دوباره وصل شوید.", + "pad.modals.unauth": "مجاز نیست", + "pad.modals.unauth.explanation": "دسترسی شما در حین مشاهده‌ی این برگه تغییر یافته‌است. دوباره متصل شوید.", + "pad.modals.looping.explanation": "مشکلاتی ارتباطی با سرور همگام‌سازی وجود دارد.", + "pad.modals.looping.cause": "شاید شما از طریق یک فایروال یا پروکسی ناسازگار متصل شده‌اید.", + "pad.modals.initsocketfail": "سرور در دسترس نیست.", + "pad.modals.initsocketfail.explanation": "نمی‌توان به سرور همگام سازی وصل شد.", + "pad.modals.initsocketfail.cause": "شاید این به خاطر مشکلی در مرورگر یا اتصال اینترنتی شما باشد.", + "pad.modals.slowcommit.explanation": "سرور پاسخ نمی‌دهد.", + "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.explanation": "این دفترچه یادداشت پاک شده‌است.", + "pad.modals.disconnected": "اتصال شما قطع شده‌است.", + "pad.modals.disconnected.explanation": "اتصال به سرور قطع شده‌است.", + "pad.modals.disconnected.cause": "ممکن است سرور در دسترس نباشد. اگر این مشکل باز هم رخ داد مدیر حدمت را آگاه کنید.", + "pad.share": "به اشتراک‌گذاری این دفترچه یادداشت", + "pad.share.readonly": "فقط خواندنی", + "pad.share.link": "پیوند", + "pad.share.emebdcode": "جاسازی نشانی", + "pad.chat": "گفتگو", + "pad.chat.title": "بازکردن گفتگو برای این دفترچه یادداشت", + "pad.chat.loadmessages": "بارگیری پیام‌های بیشتر", + "timeslider.pageTitle": "لغزندهٔ زمان {{appTitle}}", + "timeslider.toolbar.returnbutton": "بازگشت به دفترچه یادداشت", + "timeslider.toolbar.authors": "نویسوک:", + "timeslider.toolbar.authorsList": "بدون نویسنده", + "timeslider.toolbar.exportlink.title": "درگیزگ", + "timeslider.exportCurrent": "برون‌ریزی نگارش کنونی به عنوان:", + "timeslider.version": "نگارش {{version}}", + "timeslider.saved": "{{month}} {{day}}، {{year}} ذخیره شد", + "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": "دسمبر", + "timeslider.unnamedauthors": "{{num}} نویسندهٔ بی‌نام", + "pad.savedrevs.marked": "این بازنویسی هم اکنون به عنوان ذخیره شده علامت‌گذاری شد", + "pad.userlist.entername": "وتی یوزرنامء بلک ات", + "pad.userlist.unnamed": "بدون نام", + "pad.userlist.guest": "مهمان", + "pad.userlist.deny": "رد کردن", + "pad.userlist.approve": "تایید", + "pad.editbar.clearcolors": "رنگ نویسندگی از همه‌ی سند پاک شود؟", + "pad.impexp.importbutton": "هم اکنون درون‌ریزی کن", + "pad.impexp.importing": "در حال درون‌ریزی...", + "pad.impexp.confirmimport": "با درون‌ریزی یک پرونده نوشتهٔ کنونی دفترچه پاک می‌شود. آیا می‌خواهید ادامه دهید؟", + "pad.impexp.convertFailed": "ما نمی‌توانیم این پرونده را درون‌ریزی کنیم. خواهشمندیم قالب دیگری برای سندتان انتخاب کرده یا بصورت دستی آنرا کپی کنید", + "pad.impexp.uploadFailed": "آپلود انجام نشد، دوباره تلاش کنید", + "pad.impexp.importfailed": "درون‌ریزی انجام نشد", + "pad.impexp.copypaste": "کپی پیست کنید", + "pad.impexp.exportdisabled": "برون‌ریزی با قالب {{type}} از کار افتاده است. برای جزئیات بیشتر با مدیر سیستمتان تماس بگیرید." +} diff --git a/src/locales/lki.json b/src/locales/lki.json new file mode 100644 index 000000000..b74362980 --- /dev/null +++ b/src/locales/lki.json @@ -0,0 +1,75 @@ +{ + "@metadata": { + "authors": [ + "Hosseinblue" + ] + }, + "index.newPad": "تازۀpad", + "index.createOpenPad": ":ئۀ وسیلۀ نؤمpadسازین/وآز کردن یه گلۀ", + "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.indent.title": "تورفتگی-ئه نؤم چئن (TAB)", + "pad.toolbar.unindent.title": "(Shift+TAB)بیرون آمدگی-درچئن", + "pad.toolbar.undo.title": "گِلّا دائن-ئآهۀتن(Ctrl-Z)", + "pad.toolbar.redo.title": "ئۀ نوواهۀتن (Ctrl-Y)", + "pad.toolbar.clearAuthorship.title": "پاکاکردن رنگۀل تالیفی", + "pad.toolbar.import_export.title": "دربردن/ئه نؤم ئآووردن ئۀ/ئِِژ فرمتۀل گوناگون", + "pad.toolbar.timeslider.title": "اسلایدر وختی-زمانی", + "pad.toolbar.savedRevision.title": "ذخیرل دسکاریۀل", + "pad.toolbar.settings.title": "تنظیمۀل", + "pad.toolbar.embed.title": "بۀشاکردن ؤ نیائن(اشتراک ونشاندن)ئۀ نؤم سایت", + "pad.toolbar.showusers.title": "نیشان دائن کاربر ئۀ نؤم ئئ\npad", + "pad.colorpicker.save": "ذخیرۀ", + "pad.colorpicker.cancel": "ئآهووسانن-لغو", + "pad.loading": "...(loading)بارنیائن", + "pad.passwordRequired": "هؤمۀ رمزتؤنه گرۀکۀ-لازمۀ ئۀرا اتصال ئئ \npad", + "pad.wrongPassword": "رمزۀ تؤن دؤرس نیۀ", + "pad.settings.padSettings": "pad تنظیمۀل", + "pad.settings.myView": "نمایش-سئرکردن مه", + "pad.settings.stickychat": "چت همؤیشۀ ئۀ ولگۀ نمایش بوو", + "pad.settings.colorcheck": "رنگۀل تالیفی", + "pad.settings.linenocheck": "شؤمارۀل خطی", + "pad.settings.fontType": ":شئؤۀ فؤنت", + "pad.settings.fontType.normal": "عادی", + "pad.settings.fontType.monospaced": "پئنی-پهنا", + "pad.settings.globalView": "نمایش جئ هانی", + "pad.settings.language": ":زوون", + "pad.importExport.import_export": "در بردن/ئه نؤم ئآووردن", + "pad.importExport.import": "بارنیائن هر جور نوشته یا سندئ", + "pad.importExport.importSuccessful": "! موفق بی-پیرووز بی", + "pad.importExport.exporthtml": "html", + "pad.importExport.exportplain": "متن پئن-درئژ", + "pad.importExport.exportword": "مایکروسافت وورد", + "pad.importExport.exportpdf": "پی دی اف", + "pad.modals.connected": "وصل بیۀ", + "pad.modals.deleted": "پاک بیا-حذف بی", + "pad.share.readonly": "تنیا بخؤۀن", + "pad.share.link": "لینک", + "pad.chat": "گپ", + "pad.chat.loadmessages": "پئامۀلئ تر باره سۀر", + "timeslider.toolbar.exportlink.title": "در بِردن", + "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.userlist.entername": "نؤم تؤن وارد کۀن", + "pad.userlist.unnamed": "بئ نؤم", + "pad.userlist.guest": "مئمان", + "pad.userlist.deny": "رد کردن", + "pad.userlist.approve": "راووا داشتن-تصویب کردن", + "pad.impexp.importbutton": "ایسۀ وارد کۀ", + "pad.impexp.importing": "...وارد مۀهه", + "pad.impexp.importfailed": "وارد نؤنئ-خطای واردکردن" +} From 3fce9f83092b693e9b3ed5e4e7bb0b243f7e2b0c Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Thu, 23 Oct 2014 21:32:44 +0200 Subject: [PATCH 03/12] Localisation updates from https://translatewiki.net. --- src/locales/es.json | 6 +++--- src/locales/ja.json | 16 ++++++++-------- src/locales/pt.json | 10 ++++++---- src/locales/tr.json | 11 ++++++----- src/locales/zh-hans.json | 6 +++--- 5 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/locales/es.json b/src/locales/es.json index 85abebf72..62e255ea4 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -18,9 +18,9 @@ "pad.toolbar.bold.title": "Negrita (Ctrl-B)", "pad.toolbar.italic.title": "Cursiva (Ctrl-I)", "pad.toolbar.underline.title": "Subrayado (Ctrl-U)", - "pad.toolbar.strikethrough.title": "Tachado", - "pad.toolbar.ol.title": "Lista ordenada", - "pad.toolbar.ul.title": "Lista desordenada", + "pad.toolbar.strikethrough.title": "Tachado (Ctrl+5)", + "pad.toolbar.ol.title": "Lista ordenada (Ctrl+Mayús+N)", + "pad.toolbar.ul.title": "Lista desordenada (Ctrl+Mayús+L)", "pad.toolbar.indent.title": "Sangría (TAB)", "pad.toolbar.unindent.title": "Eliminar sangría (Shift+TAB)", "pad.toolbar.undo.title": "Deshacer (Ctrl-Z)", diff --git a/src/locales/ja.json b/src/locales/ja.json index f9d63cd26..011c935a9 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -6,16 +6,16 @@ }, "index.newPad": "新規作成", "index.createOpenPad": "または作成/編集するパッド名を入力:", - "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.bold.title": "太字 (Ctrl+B)", + "pad.toolbar.italic.title": "斜体 (Ctrl+I)", + "pad.toolbar.underline.title": "下線 (Ctrl+U)", + "pad.toolbar.strikethrough.title": "取り消し線 (Ctrl+5)", + "pad.toolbar.ol.title": "番号付きリスト (Ctrl+Shift+N)", + "pad.toolbar.ul.title": "番号なしリスト (Ctrl+Shift+L)", "pad.toolbar.indent.title": "インデント (Tab)", "pad.toolbar.unindent.title": "インデント解除 (Shift+Tab)", - "pad.toolbar.undo.title": "元に戻す (Ctrl-Z)", - "pad.toolbar.redo.title": "やり直し (Ctrl-Y)", + "pad.toolbar.undo.title": "元に戻す (Ctrl+Z)", + "pad.toolbar.redo.title": "やり直し (Ctrl+Y)", "pad.toolbar.clearAuthorship.title": "作者の色分けを消去", "pad.toolbar.import_export.title": "他の形式のファイルのインポート/エクスポート", "pad.toolbar.timeslider.title": "タイムスライダー", diff --git a/src/locales/pt.json b/src/locales/pt.json index 949bb7bc7..69a4dca16 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -5,7 +5,8 @@ "Luckas", "Tuliouel", "Waldir", - "Imperadeiro98" + "Imperadeiro98", + "Macofe" ] }, "index.newPad": "Nova Nota", @@ -13,9 +14,9 @@ "pad.toolbar.bold.title": "Negrito (Ctrl-B)", "pad.toolbar.italic.title": "Itálico (Ctrl-I)", "pad.toolbar.underline.title": "Sublinhado (Ctrl-U)", - "pad.toolbar.strikethrough.title": "Riscar", - "pad.toolbar.ol.title": "Lista ordenada", - "pad.toolbar.ul.title": "Lista desordenada", + "pad.toolbar.strikethrough.title": "Riscar (Ctrl+5)", + "pad.toolbar.ol.title": "Lista ordenada (Ctrl+Shift+N)", + "pad.toolbar.ul.title": "Lista desordenada (Ctrl+Shift+L)", "pad.toolbar.indent.title": "Avançar (TAB)", "pad.toolbar.unindent.title": "Recuar (Shift+TAB)", "pad.toolbar.undo.title": "Desfazer (Ctrl-Z)", @@ -71,6 +72,7 @@ "pad.modals.disconnected.cause": "O servidor pode estar indisponível. Por favor, notifique o administrador de serviço se isto continuar a acontecer.", "pad.share": "Compartilhar este pad", "pad.share.readonly": "Somente para leitura", + "pad.share.link": "Ligação", "pad.chat": "Bate-papo", "pad.chat.title": "Abrir o bate-papo para este pad.", "pad.chat.loadmessages": "Carregar mais mensagens", diff --git a/src/locales/tr.json b/src/locales/tr.json index 89c1f0df3..a83c73132 100644 --- a/src/locales/tr.json +++ b/src/locales/tr.json @@ -4,7 +4,8 @@ "Emperyan", "Erdemaslancan", "Joseph", - "Meelo" + "Meelo", + "Trockya" ] }, "index.newPad": "Yeni Bloknot", @@ -12,13 +13,13 @@ "pad.toolbar.bold.title": "Kalın (Ctrl-B)", "pad.toolbar.italic.title": "Eğik (Ctrl-I)", "pad.toolbar.underline.title": "Altı Çizili (Ctrl-U)", - "pad.toolbar.strikethrough.title": "Üstü Çizili", - "pad.toolbar.ol.title": "Sıralı liste", - "pad.toolbar.ul.title": "Sırasız Liste", + "pad.toolbar.strikethrough.title": "Üstü Çizili (Ctrl+5)", + "pad.toolbar.ol.title": "Sıralı liste (Ctrl+Shift+N)", + "pad.toolbar.ul.title": "Sırasız Liste (Ctrl+Shift+L)", "pad.toolbar.indent.title": "Girintiyi arttır (TAB)", "pad.toolbar.unindent.title": "Girintiyi azalt (Shift+TAB)", "pad.toolbar.undo.title": "Geri Al (Ctrl-Z)", - "pad.toolbar.redo.title": "Yenile (Ctrl-Y)", + "pad.toolbar.redo.title": "Yinele (Ctrl+Y)", "pad.toolbar.clearAuthorship.title": "Yazarlık Renklerini Temizle", "pad.toolbar.import_export.title": "Farklı dosya biçimlerini içeri/dışarı aktar", "pad.toolbar.timeslider.title": "Zaman Çizelgesi", diff --git a/src/locales/zh-hans.json b/src/locales/zh-hans.json index 556ab8a12..61aa99fc9 100644 --- a/src/locales/zh-hans.json +++ b/src/locales/zh-hans.json @@ -18,9 +18,9 @@ "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.strikethrough.title": "删除线（Ctrl+5）", + "pad.toolbar.ol.title": "有序列表（Ctrl+Shift+N）", + "pad.toolbar.ul.title": "无序列表（Ctrl+Shift+L）", "pad.toolbar.indent.title": "增加缩进（TAB）", "pad.toolbar.unindent.title": "减少缩进（Shift+TAB）", "pad.toolbar.undo.title": "撤消 (Ctrl-Z)", From 45611561e63bd47dbb58beef12318b76b5494f57 Mon Sep 17 00:00:00 2001 From: Siebrand Mazeland Date: Mon, 27 Oct 2014 18:53:33 +0100 Subject: [PATCH 04/12] Localisation updates from https://translatewiki.net. --- src/locales/fr.json | 45 +++++++++++++++++++++++---------------------- src/locales/he.json | 6 +++--- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/src/locales/fr.json b/src/locales/fr.json index 757cd15ad..b6b1a7200 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -16,7 +16,8 @@ "Rastus Vernon", "Stephane Cottin", "Tux-tn", - "Maxim21" + "Maxim21", + "Boniface" ] }, "index.newPad": "Nouveau pad", @@ -24,9 +25,9 @@ "pad.toolbar.bold.title": "Gras (Ctrl-B)", "pad.toolbar.italic.title": "Italique (Ctrl-I)", "pad.toolbar.underline.title": "Souligné (Ctrl-U)", - "pad.toolbar.strikethrough.title": "Barré", - "pad.toolbar.ol.title": "Liste ordonnée", - "pad.toolbar.ul.title": "Liste non ordonnée", + "pad.toolbar.strikethrough.title": "Barré (Ctrl+5)", + "pad.toolbar.ol.title": "Liste ordonnée (Ctrl+Shift+N)", + "pad.toolbar.ul.title": "Liste non ordonnée (Ctrl+Shift+L)", "pad.toolbar.indent.title": "Indenter (TAB)", "pad.toolbar.unindent.title": "Désindenter (Maj+TAB)", "pad.toolbar.undo.title": "Annuler (Ctrl-Z)", @@ -49,7 +50,7 @@ "pad.settings.stickychat": "Toujours afficher le chat", "pad.settings.colorcheck": "Couleurs d’identification", "pad.settings.linenocheck": "Numéros de lignes", - "pad.settings.rtlcheck": "Lecture de droite à gauche", + "pad.settings.rtlcheck": "Le contenu doit-il être lu de droite à gauche ?", "pad.settings.fontType": "Police :", "pad.settings.fontType.normal": "Normal", "pad.settings.fontType.monospaced": "Monospace", @@ -57,7 +58,7 @@ "pad.settings.language": "Langue :", "pad.importExport.import_export": "Importer/Exporter", "pad.importExport.import": "Charger un texte ou un document", - "pad.importExport.importSuccessful": "Réussi!", + "pad.importExport.importSuccessful": "Réussi !", "pad.importExport.export": "Exporter le pad actuel comme :", "pad.importExport.exporthtml": "HTML", "pad.importExport.exportplain": "Texte brut", @@ -83,7 +84,7 @@ "pad.modals.slowcommit.cause": "Ce problème peut venir d'une mauvaise connectivité au réseau.", "pad.modals.badChangeset.explanation": "Une modification que vous avez effectuée a été classée comme illégale par le serveur de synchronisation.", "pad.modals.badChangeset.cause": "Cela peut être dû à une mauvaise configuration du serveur ou à un autre comportement inattendu. Veuillez contacter l’administrateur du service, si vous pensez que c’est une erreur. Essayez de vous reconnecter pour continuer à modifier.", - "pad.modals.corruptPad.explanation": "Le bloc auquel vous essayez d’accéder est corrompu.", + "pad.modals.corruptPad.explanation": "Le pad auquel vous essayez d’accéder est corrompu.", "pad.modals.corruptPad.cause": "Cela peut être dû à une mauvaise configuration du serveur ou à un autre comportement inattendu. Veuillez contacter l’administrateur du service.", "pad.modals.deleted": "Supprimé.", "pad.modals.deleted.explanation": "Ce pad a été supprimé.", @@ -102,22 +103,22 @@ "timeslider.toolbar.authors": "Auteurs :", "timeslider.toolbar.authorsList": "Aucun auteur", "timeslider.toolbar.exportlink.title": "Exporter", - "timeslider.exportCurrent": "Exporter la version actuelle en :", + "timeslider.exportCurrent": "Exporter la version actuelle sous :", "timeslider.version": "Version {{version}}", "timeslider.saved": "Enregistré le {{day}} {{month}} {{year}}", "timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}", - "timeslider.month.january": "Janvier", - "timeslider.month.february": "Février", - "timeslider.month.march": "Mars", - "timeslider.month.april": "Avril", - "timeslider.month.may": "Mai", - "timeslider.month.june": "Juin", - "timeslider.month.july": "Juillet", - "timeslider.month.august": "Août", - "timeslider.month.september": "Septembre", - "timeslider.month.october": "Octobre", - "timeslider.month.november": "Novembre", - "timeslider.month.december": "Décembre", + "timeslider.month.january": "janvier", + "timeslider.month.february": "février", + "timeslider.month.march": "mars", + "timeslider.month.april": "avril", + "timeslider.month.may": "mai", + "timeslider.month.june": "juin", + "timeslider.month.july": "juillet", + "timeslider.month.august": "août", + "timeslider.month.september": "septembre", + "timeslider.month.october": "octobre", + "timeslider.month.november": "novembre", + "timeslider.month.december": "décembre", "timeslider.unnamedauthors": "{{num}} {[plural(num) one: auteur anonyme, other: auteurs anonymes ]}", "pad.savedrevs.marked": "Cette révision est maintenant marquée comme révision enregistrée", "pad.userlist.entername": "Entrez votre nom", @@ -128,10 +129,10 @@ "pad.editbar.clearcolors": "Effacer les couleurs de paternité dans tout le document ?", "pad.impexp.importbutton": "Importer maintenant", "pad.impexp.importing": "Import en cours...", - "pad.impexp.confirmimport": "Importer un fichier écrasera le texte actuel du pad. Êtes-vous sûr de vouloir le faire?", + "pad.impexp.confirmimport": "Importer un fichier écrasera le texte actuel du pad. Êtes-vous sûr de vouloir le faire ?", "pad.impexp.convertFailed": "Nous ne pouvons pas importer ce fichier. Veuillez utiliser un autre format de document ou faire un copier/coller manuel", "pad.impexp.uploadFailed": "Le téléchargement a échoué, veuillez réessayer", "pad.impexp.importfailed": "Échec de l'importation", "pad.impexp.copypaste": "Veuillez copier/coller", - "pad.impexp.exportdisabled": "Exporter au format {{type}} est désactivé. Veuillez contacter votre administrateur système pour plus de détails." + "pad.impexp.exportdisabled": "L'option d'export au format {{type}} est désactivée. Veuillez contacter votre administrateur système pour plus de détails." } diff --git a/src/locales/he.json b/src/locales/he.json index 555cb5f5f..7d7f2b78b 100644 --- a/src/locales/he.json +++ b/src/locales/he.json @@ -12,9 +12,9 @@ "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.strikethrough.title": "קו מוחק (Ctrl+5)", + "pad.toolbar.ol.title": "רשימה ממוספרת (Ctrl+Shift+N)", + "pad.toolbar.ul.title": "רשימת תבליטים (Ctrl+Shift+L)", "pad.toolbar.indent.title": "הזחה (טאב)", "pad.toolbar.unindent.title": "צמצום הזחה (שיפט–טאב)", "pad.toolbar.undo.title": "ביטול (Ctrl-Z)", From f1046442975f1a9d826b5dfcdd4640ea91f01c88 Mon Sep 17 00:00:00 2001 From: John McLear Date: Wed, 29 Oct 2014 12:15:53 +0000 Subject: [PATCH 05/12] Fix for MySQL issues See https://github.com/Pita/ueberDB/issues/63 --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 18556aad4..7fd1204f7 100644 --- a/src/package.json +++ b/src/package.json @@ -16,7 +16,7 @@ "require-kernel" : "1.0.5", "resolve" : "0.2.x", "socket.io" : "0.9.x", - "ueberDB" : ">=0.2.2", + "ueberDB" : ">=0.2.4", "express" : "3.1.0", "async" : "0.1.x", "connect" : "2.7.x", From cd8ea040ad686f3498ae8235986edab1fda018ab Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 30 Oct 2014 14:41:21 +0000 Subject: [PATCH 06/12] bump ueber to require working mysql --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 7fd1204f7..848bd53d3 100644 --- a/src/package.json +++ b/src/package.json @@ -16,7 +16,7 @@ "require-kernel" : "1.0.5", "resolve" : "0.2.x", "socket.io" : "0.9.x", - "ueberDB" : ">=0.2.4", + "ueberDB" : ">=0.2.5", "express" : "3.1.0", "async" : "0.1.x", "connect" : "2.7.x", From 51b9af9df09173140e900c935ab85ac86f3e9fe4 Mon Sep 17 00:00:00 2001 From: John McLear Date: Thu, 30 Oct 2014 16:12:17 +0000 Subject: [PATCH 07/12] bump ueberdb again --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 848bd53d3..11faa9e6a 100644 --- a/src/package.json +++ b/src/package.json @@ -16,7 +16,7 @@ "require-kernel" : "1.0.5", "resolve" : "0.2.x", "socket.io" : "0.9.x", - "ueberDB" : ">=0.2.5", + "ueberDB" : ">=0.2.6", "express" : "3.1.0", "async" : "0.1.x", "connect" : "2.7.x", From 41b7f99204e2bc1abbf644109d594d460947c8cc Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 1 Nov 2014 16:25:14 +0000 Subject: [PATCH 08/12] Bump resolve Update dep fixes https://github.com/ether/etherpad-lite/issues/2050 --- src/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/package.json b/src/package.json index 11faa9e6a..ec618db45 100644 --- a/src/package.json +++ b/src/package.json @@ -14,7 +14,7 @@ "yajsml" : "1.1.6", "request" : "2.9.100", "require-kernel" : "1.0.5", - "resolve" : "0.2.x", + "resolve" : ">=1.0.0", "socket.io" : "0.9.x", "ueberDB" : ">=0.2.6", "express" : "3.1.0", From bf380eea504662ea41aa431e30d7e30ad6a36cd3 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 1 Nov 2014 18:07:34 +0000 Subject: [PATCH 09/12] take line breaks and treat them appropriatly instead of creating a space for them.. --- src/static/js/contentcollector.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/contentcollector.js b/src/static/js/contentcollector.js index ee0a1c27a..5e393670f 100644 --- a/src/static/js/contentcollector.js +++ b/src/static/js/contentcollector.js @@ -89,7 +89,7 @@ function makeContentCollector(collectStyles, browser, apool, domInterface, class function textify(str) { return sanitizeUnicode( - str.replace(/[\n\r ]/g, ' ').replace(/\xa0/g, ' ').replace(/\t/g, ' ')); + str.replace(/\n/g, '').replace(/[\n\r ]/g, ' ').replace(/\xa0/g, ' ').replace(/\t/g, ' ')); } function getAssoc(node, name) From d54bb52b759bd68a1ec78735008f88eb9cb22d1f Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 1 Nov 2014 18:18:25 +0000 Subject: [PATCH 10/12] Fixes #1414 https://github.com/ether/etherpad-lite/issues/1414 --- src/static/js/pad_utils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/pad_utils.js b/src/static/js/pad_utils.js index c2ff6fd0e..343e5fce6 100644 --- a/src/static/js/pad_utils.js +++ b/src/static/js/pad_utils.js @@ -482,7 +482,7 @@ var padutils = { }, bindCheckboxChange: function(node, func) { - $(node).bind("click change", func); + $(node).change(func); }, encodeUserId: function(userId) { From ff549db261d0945c08b97a99789624aec96b6fcb Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 1 Nov 2014 20:58:56 +0000 Subject: [PATCH 11/12] use latest jsdom --- src/node/utils/ImportHtml.js | 4 +--- src/package.json | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js index abba2ac19..e2629791d 100644 --- a/src/node/utils/ImportHtml.js +++ b/src/node/utils/ImportHtml.js @@ -14,10 +14,8 @@ * limitations under the License. */ -var jsdom = require('jsdom-nocontextifiy').jsdom; +var jsdom = require('jsdom').jsdom; var log4js = require('log4js'); - - var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var contentcollector = require("ep_etherpad-lite/static/js/contentcollector"); diff --git a/src/package.json b/src/package.json index 652aebaf8..b035da88b 100644 --- a/src/package.json +++ b/src/package.json @@ -25,7 +25,7 @@ "formidable" : "1.0.9", "log4js" : "0.6.6", "nodemailer" : "0.3.x", - "jsdom-nocontextifiy" : "0.2.10", + "jsdom" : ">=1.1.0", "async-stacktrace" : "0.0.2", "npm" : "1.4.x", "ejs" : "0.6.1", From 124ae311379b6e55fe4e550bc06229c37e660879 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 1 Nov 2014 21:15:31 +0000 Subject: [PATCH 12/12] blah push back for imports --- src/node/utils/ImportHtml.js | 2 +- src/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/node/utils/ImportHtml.js b/src/node/utils/ImportHtml.js index e2629791d..48188dfd0 100644 --- a/src/node/utils/ImportHtml.js +++ b/src/node/utils/ImportHtml.js @@ -14,7 +14,7 @@ * limitations under the License. */ -var jsdom = require('jsdom').jsdom; +var jsdom = require('jsdom-nocontextifiy').jsdom; var log4js = require('log4js'); var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var contentcollector = require("ep_etherpad-lite/static/js/contentcollector"); diff --git a/src/package.json b/src/package.json index b035da88b..652aebaf8 100644 --- a/src/package.json +++ b/src/package.json @@ -25,7 +25,7 @@ "formidable" : "1.0.9", "log4js" : "0.6.6", "nodemailer" : "0.3.x", - "jsdom" : ">=1.1.0", + "jsdom-nocontextifiy" : "0.2.10", "async-stacktrace" : "0.0.2", "npm" : "1.4.x", "ejs" : "0.6.1",