From 4053ab2dfa6f1d0e1d57d2082a3475a1b5c3b4bb Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Tue, 20 Nov 2012 21:35:06 +0100 Subject: [PATCH 1/3] Clarify English strings and rephrase some stupid-sounding messages. --- src/locales/en.ini | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/locales/en.ini b/src/locales/en.ini index 6077c1f5a..a110583ea 100644 --- a/src/locales/en.ini +++ b/src/locales/en.ini @@ -6,7 +6,7 @@ pad.toolbar.italic.title = Italic (Ctrl-I) pad.toolbar.underline.title = Underline (Ctrl-U) pad.toolbar.strikethrough.title = Strikethrough pad.toolbar.ol.title = Ordered list -pad.toolbar.ul.title = UnOrdered List +pad.toolbar.ul.title = Unordered List pad.toolbar.indent.title = Indent pad.toolbar.unindent.title = Outdent pad.toolbar.undo.title = Undo (Ctrl-Z) @@ -34,27 +34,27 @@ pad.settings.language = Language: pad.importExport.import_export = Import/Export pad.importExport.import = Upload any text file or document pad.importExport.successful = Successful! -pad.importExport.export = Export current pad as +pad.importExport.export = Export current pad as: pad.importExport.exporthtml = HTML pad.importExport.exportplain = Plain text pad.importExport.exportword = Microsoft Word -pad.importExport.exportpdf = PDf +pad.importExport.exportpdf = PDF pad.importExport.exportopen = ODF (Open Document Format) pad.importExport.exportdokuwiki = DokuWiki pad.modals.connected = Connected. pad.modals.reconnecting = Reconnecting to your pad.. pad.modals.forcereconnect = Force reconnect -pad.modals.uderdup = Open in another window +pad.modals.uderdup = Opened in another window pad.modals.userdup.explanation = This pad seems to be opened in more than one browser window on this computer. -pad.modals.userdup.advice = Reconnect to use this windows instead. +pad.modals.userdup.advice = Reconnect to use this window instead. pad.modals.unauth = Not authorized -pad.modals.unauth.explanation = Your permissions have changes while viewing this page. Try to reconnect. +pad.modals.unauth.explanation = Your permissions have changed while viewing this page. Try to reconnect. pad.modals.looping = Disconnected. -pad.modals.looping.explanation = We're having problem communicating to the synchronization server. -pad.modals.looping.cause = Perhaps their connection runs through an incompatible firewall or incompatible proxy. +pad.modals.looping.explanation = There are communication problems with the synchronization server. +pad.modals.looping.cause = Perhaps you connected through an incompatible firewall or proxy. pad.modals.initsocketfail = Server is unreachable. pad.modals.initsocketfail.explanation = Couldn't connect to the synchronization server. -pad.modals.initsocketfail.cause = This could be because of your browser or Internet connection. #sounds stupid! +pad.modals.initsocketfail.cause = This is probably due to a problem with your browser or your internet connection. pad.modals.slowcommit = Disconnected. pad.modals.slowcommit.explanation = The server is not responding. pad.modals.slowcommit.cause = This could be due to problems with network connectivity. From 4e18df45c6f485b197ae53119055d7293a825d42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Laxstr=C3=B6m?= Date: Tue, 20 Nov 2012 20:47:34 +0000 Subject: [PATCH 2/3] Localisation updates from http://translatewiki.net. --- src/locales/bn.ini | 32 +++++++++++++++++++ src/locales/de.ini | 15 +++------ src/locales/es.ini | 3 +- src/locales/fi.ini | 49 ++++++++++++++++++++++++++++ src/locales/fr.ini | 18 +++-------- src/locales/nl.ini | 79 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 171 insertions(+), 25 deletions(-) create mode 100644 src/locales/bn.ini create mode 100644 src/locales/fi.ini create mode 100644 src/locales/nl.ini diff --git a/src/locales/bn.ini b/src/locales/bn.ini new file mode 100644 index 000000000..7eca9e383 --- /dev/null +++ b/src/locales/bn.ini @@ -0,0 +1,32 @@ +; Exported from translatewiki.net +; Author: Nasir8891 +[bn] +index.newPad = নতুন প্যাড +index.createOpenPad = অথবা নাম লিখে প্যাড খুলুন/তৈরী করুন: +pad.toolbar.bold.title = গাড় করা (Ctrl-B) +pad.toolbar.italic.title = বাঁকা করা (Ctrl-I) +pad.toolbar.settings.title = সেটিং +pad.colorpicker.save = সংরক্ষণ +pad.colorpicker.cancel = বাতিল +pad.loading = লোডিং... +pad.settings.language = ভাষা: +pad.importExport.successful = সফল! +; Fuzzy +pad.importExport.export = এই প্যাডটি এক্সপোর্ট করুন +pad.importExport.exporthtml = এইচটিএমএল +pad.importExport.exportplain = সাধারণ লেখা +pad.importExport.exportword = মাইক্রোসফট ওয়ার্ড +pad.importExport.exportpdf = পিডিএফ +pad.importExport.exportopen = ওডিএফ (ওপেন ডকুমেন্ট ফরম্যাট) +pad.modals.deleted = অপসারিত। +pad.modals.deleted.explanation = এই প্যাডটি অপসারণ করা হয়েছে। +pad.modals.disconnected.explanation = সার্ভারের সাথে যোগাযোগ করা যাচ্ছে না +pad.share = শেয়ার করুন +pad.share.link = লিংক +pad.share.emebdcode = ইউআরএল সংযোজন +pad.chat = চ্যাট +pad.chat.title = এই প্যাডের জন্য চ্যাট চালু করুন। +timeslider.toolbar.returnbutton = প্যাডে ফিরে যাও +timeslider.toolbar.authors = লেখকগণ: +timeslider.toolbar.authorsList = কোনো লেখক নেই +timeslider.exportCurrent = বর্তমান সংস্করণটি এক্সপোর্ট করুন: diff --git a/src/locales/de.ini b/src/locales/de.ini index 35fa61ee8..177746a56 100644 --- a/src/locales/de.ini +++ b/src/locales/de.ini @@ -1,7 +1,7 @@ +; Exported from translatewiki.net [de] index.newPad = Neues Pad index.createOpenPad = Pad mit folgendem Namen öffnen - pad.toolbar.bold.title = Fett (Strg-B) pad.toolbar.italic.title = Kursiv (Strg-I) pad.toolbar.underline.title = Unterstrichen (Strg-U) @@ -19,10 +19,8 @@ pad.toolbar.savedRevision.title = Diese Revision markieren pad.toolbar.settings.title = Einstellungen pad.toolbar.embed.title = Dieses Pad teilen oder einbetten pad.toolbar.showusers.title = Verbundene Benutzer anzeigen - pad.colorpicker.save = Speichern pad.colorpicker.cancel = Abbrechen - pad.loading = Laden... pad.settings.padSettings = Pad Einstellungen pad.settings.myView = Eigene Ansicht @@ -32,13 +30,12 @@ pad.settings.linenocheck = Zeilennummern pad.settings.fontType = Schriftart: pad.settings.fontType.normal = Normal pad.settings.fontType.monospaced = Monospace -pad.settings.language = Sprache: pad.settings.globalView = Gemeinsame Ansicht - +pad.settings.language = Sprache: pad.importExport.import_export = Import/Export pad.importExport.import = Datei oder Dokument hochladen pad.importExport.successful = Erfolgreich! - +; Fuzzy pad.importExport.export = Dieses Pad exportieren pad.importExport.exporthtml = HTML pad.importExport.exportplain = Reiner Text @@ -46,7 +43,6 @@ pad.importExport.exportword = Microsoft Word pad.importExport.exportpdf = PDf pad.importExport.exportopen = ODF (Open Document Format) pad.importExport.exportdokuwiki = DokuWiki - pad.modals.connected = Verbunden. pad.modals.reconnecting = Wiederherstellen der Verbindung... pad.modals.forcereconnect = Erneut Verbinden @@ -69,17 +65,14 @@ pad.modals.deleted.explanation = Dieses Pad wurde entfernt. pad.modals.disconnected = Verbindung unterbrochen. pad.modals.disconnected.explanation = Die Verbindung zum Synchronisationsserver wurde unterbrochen. pad.modals.disconnected.cause = Möglicherweise ist der Server nicht erreichbar. Bitte benachrichtigen Sie uns, falls dies weiterhin passiert. - pad.share = Dieses Pad teilen pad.share.readonly = Eingeschränkter zugriff (Nur lesen) pad.share.link = Link pad.share.emebdcode = In Webseite einbetten - pad.chat = Chat pad.chat.title = Den Chat für dieses Pad öffnen - timeslider.pageTitle = {{appTitle}} Pad-Geschichte timeslider.toolbar.returnbutton = Zurück zum Pad timeslider.toolbar.authors = Autoren: timeslider.toolbar.authorsList = keine Autoren -timeslider.exportCurrent = Exportiere diese Version als: \ No newline at end of file +timeslider.exportCurrent = Exportiere diese Version als: diff --git a/src/locales/es.ini b/src/locales/es.ini index a119af1c0..acb6a5cf1 100644 --- a/src/locales/es.ini +++ b/src/locales/es.ini @@ -1,3 +1,4 @@ +; Exported from translatewiki.net [es] index.newPad = Nuevo Pad index.createOpenPad = o puedes crear/abrir un Pad con el nombre: @@ -34,6 +35,7 @@ pad.settings.language = Idioma: pad.importExport.import_export = Importar/Exportar pad.importExport.import = Subir cualquier texto o documento pad.importExport.successful = ¡Operación exitosa! +; Fuzzy pad.importExport.export = Exporta el pad actual como pad.importExport.exporthtml = HTML pad.importExport.exportplain = Texto plano @@ -69,7 +71,6 @@ pad.share.link = Enlace pad.share.emebdcode = Incrustar URL pad.chat = Chat pad.chat.title = Abrir el chat para este pad. - timeslider.pageTitle = {{appTitle}} Línea de tiempo timeslider.toolbar.returnbutton = Volver al pad timeslider.toolbar.authors = Autores: diff --git a/src/locales/fi.ini b/src/locales/fi.ini new file mode 100644 index 000000000..cbaea8856 --- /dev/null +++ b/src/locales/fi.ini @@ -0,0 +1,49 @@ +; Exported from translatewiki.net +; Author: Nike +[fi] +index.newPad = Uusi muistio +index.createOpenPad = tai avaa muistio nimellä: +pad.toolbar.bold.title = Lihavointi (Ctrl-B) +pad.toolbar.italic.title = Kursivointi (Ctrl-I) +pad.toolbar.underline.title = Alleviivaus (Ctrl-U) +pad.toolbar.strikethrough.title = Yliviivaus +pad.toolbar.ol.title = Numeroitu lista +pad.toolbar.ul.title = Numeroimaton lista +pad.toolbar.indent.title = Sisennä +pad.toolbar.unindent.title = Ulonna +pad.toolbar.undo.title = Kumoa (Ctrl-Z) +pad.toolbar.redo.title = Tee uudelleen (Ctrl-Y) +pad.toolbar.clearAuthorship.title = Poista kirjoittavärit +pad.toolbar.import_export.title = Tuo tai vie eri muotoihin +pad.toolbar.savedRevision.title = Tallennetut versiot +pad.toolbar.settings.title = Asetukset +pad.toolbar.embed.title = Upota muistio +pad.toolbar.showusers.title = Näytä muistion käyttäjät +pad.colorpicker.save = Tallenna +pad.colorpicker.cancel = Peru +pad.loading = Ladataan… +pad.settings.padSettings = Muistion asetukset +pad.settings.myView = Oma näkymä +pad.settings.stickychat = Keskustelu aina näkyvissä +pad.settings.colorcheck = Kirjoittavärit +pad.settings.linenocheck = Rivinumerot +pad.settings.fontType = Kirjasintyyppi: +pad.settings.fontType.normal = normaali +pad.settings.fontType.monospaced = tasalevyinen +pad.settings.language = Kieli: +pad.importExport.import_export = Tuonti/vienti +pad.importExport.exporthtml = HTML +pad.importExport.exportplain = Muotoilematon teksti +pad.importExport.exportword = Microsoft Word +pad.importExport.exportpdf = PDF +pad.importExport.exportopen = ODF (Open Document Format) +pad.importExport.exportdokuwiki = DokuWiki +pad.modals.connected = Yhdistetty. +pad.modals.reconnecting = Herätellään yhteyttä muistioon... +pad.modals.forcereconnect = Pakota uudelleenyhdistäminen +pad.share = Jaa muistio +pad.share.readonly = Vain luku +pad.share.link = Linkki +pad.share.emebdcode = Upotusosoite +pad.chat = Keskustelu +timeslider.toolbar.returnbutton = Palaa muistioon diff --git a/src/locales/fr.ini b/src/locales/fr.ini index cf9391c8c..a80ff205b 100644 --- a/src/locales/fr.ini +++ b/src/locales/fr.ini @@ -1,7 +1,7 @@ +; Exported from translatewiki.net [fr] index.newPad = Nouveau Pad index.createOpenPad = ou créer/ouvrir un Pad intitulé - pad.toolbar.bold.title = Gras (Ctrl-B) pad.toolbar.italic.title = Italique (Ctrl-I) pad.toolbar.underline.title = Souligner (Ctrl-U) @@ -19,10 +19,8 @@ pad.toolbar.savedRevision.title = Versions enregistrées pad.toolbar.settings.title = Paramètres pad.toolbar.embed.title = Intégrer ce Pad pad.toolbar.showusers.title = Afficher les utilisateurs du Pad - pad.colorpicker.save = Sauver pad.colorpicker.cancel = Annuler - pad.loading = Chargement... pad.settings.padSettings = Paramètres du Pad pad.settings.myView = Ma vue @@ -31,14 +29,13 @@ pad.settings.colorcheck = Couleurs d'identification pad.settings.linenocheck = Numéros des lignes pad.settings.fontType = Type de police: pad.settings.fontType.normal = Normal -pad.settings.fontType.monospaced = Monospace +pad.settings.fontType.monospaced = Monospace pad.settings.globalView = Vue d'ensemble pad.settings.language = Langue: - pad.importExport.import_export = Importer/Exporter pad.importExport.import = Charger un texte ou un document pad.importExport.successful = Traitement effectué! - +; Fuzzy pad.importExport.export = Exporter ce Pad vers pad.importExport.exporthtml = HTML pad.importExport.exportplain = Texte brut @@ -46,7 +43,6 @@ pad.importExport.exportword = Microsoft Word pad.importExport.exportpdf = PDf pad.importExport.exportopen = ODF (Open Document Format) pad.importExport.exportdokuwiki = DokuWiki - pad.modals.connected = Connecté. pad.modals.reconnecting = Reconnexion vers votre Pad... pad.modals.forcereconnect = Forcer la reconnexion. @@ -60,7 +56,7 @@ pad.modals.looping.explanation = Nous éprouvons un problème de communication a pad.modals.looping.cause = Il est possible que leur connection soit protégée par un pare-feu incompatible ou un serveur proxy incompatible. pad.modals.initsocketfail = Le serveur est introuvable. pad.modals.initsocketfail.explanation = Impossible de se connecter au serveur de synchronisation. -pad.modals.initsocketfail.cause = La cause de ce problème peut être liée à votre fureteur web. +pad.modals.initsocketfail.cause = La cause de ce problème peut être liée à votre fureteur web. pad.modals.slowcommit = Disconnected. Déconnecté pad.modals.slowcommit.explanation = Le serveur ne répond pas. pad.modals.slowcommit.cause = La cause de ce problème peut être liée à une erreur de connectivité du réseau. @@ -69,18 +65,14 @@ pad.modals.deleted.explanation = Ce Pad a été supprimé. pad.modals.disconnected = Vous avez été déconnecté. pad.modals.disconnected.explanation = La connexion au serveur a échoué. pad.modals.disconnected.cause = Ce serveur est possiblement hors-ligne. Veuillez nous joindre si le problème persiste. - pad.share = Partager ce Pad pad.share.readonly = Lecture seule -pad.share.link = Lien +pad.share.link = Lien pad.share.emebdcode = Lien à intégrer - pad.chat = Messagerie pad.chat.title = Ouvrir la messagerie liée au Pad. - timeslider.pageTitle = {{appTitle}} Curseur temporel timeslider.toolbar.returnbutton = Retour à ce Pad. timeslider.toolbar.authors = Auteurs: timeslider.toolbar.authorsList = Aucun auteurs timeslider.exportCurrent = Exporter version actuelle vers: - diff --git a/src/locales/nl.ini b/src/locales/nl.ini new file mode 100644 index 000000000..87eaeb13e --- /dev/null +++ b/src/locales/nl.ini @@ -0,0 +1,79 @@ +; Exported from translatewiki.net +; Author: Siebrand +[nl] +index.newPad = Nieuw pad +index.createOpenPad = Maak of open pad met de naam: +pad.toolbar.bold.title = Vet (Ctrl-B) +pad.toolbar.italic.title = Cursief (Ctrl-I) +pad.toolbar.underline.title = Onderstrepen (Ctrl-U) +pad.toolbar.strikethrough.title = Doorhalen +pad.toolbar.ol.title = Geordende lijst +pad.toolbar.ul.title = Ongeordende lijst +pad.toolbar.indent.title = Inspringen +pad.toolbar.unindent.title = Inspringing verkleinen +pad.toolbar.undo.title = Ongedaan maken (Ctrl-Z) +pad.toolbar.redo.title = Opnieuw uitvoeren (Ctrl-Y) +pad.toolbar.clearAuthorship.title = Kleuren auteurs wissen +pad.toolbar.import_export.title = Naar/van andere opmaak exporteren/importeren +pad.toolbar.timeslider.title = Tijdlijn +pad.toolbar.savedRevision.title = Opgeslagen versies +pad.toolbar.settings.title = Instellingen +pad.toolbar.embed.title = Pad insluiten +pad.toolbar.showusers.title = Gebruikers van dit pad weergeven +pad.colorpicker.save = Opslaan +pad.colorpicker.cancel = Annuleren +pad.loading = Bezig met laden… +pad.settings.padSettings = Padinstellingen +pad.settings.myView = Mijn overzicht +pad.settings.stickychat = Chat altijd zichtbaar +pad.settings.colorcheck = Kleuren auteurs +pad.settings.linenocheck = Regelnummers +pad.settings.fontType = Lettertype: +pad.settings.fontType.normal = Normaal +pad.settings.fontType.monospaced = Monospace +pad.settings.globalView = Globaal overzicht +pad.settings.language = Taal: +pad.importExport.import_export = Importeren/exporteren +pad.importExport.import = Upload een tekstbestand of document +pad.importExport.successful = Afgerond +; Fuzzy +pad.importExport.export = Huidige pad exporteren als +pad.importExport.exporthtml = HTML +pad.importExport.exportplain = Tekst zonder opmaak +pad.importExport.exportword = Microsoft Word +pad.importExport.exportpdf = PDF +pad.importExport.exportopen = ODF (Open Document Format) +pad.importExport.exportdokuwiki = DokuWiki +pad.modals.connected = Verbonden. +pad.modals.reconnecting = Opnieuw verbinding maken met uw pad... +pad.modals.forcereconnect = Opnieuw verbinden +pad.modals.uderdup = Openen in ander venster +pad.modals.userdup.explanation = Dit pad is meer dan één keer geopend in een browservenster op deze computer. +pad.modals.userdup.advice = Opnieuw verbinden en dit venster gebruiken. +pad.modals.unauth = Niet toegestaan +pad.modals.unauth.explanation = Uw rechten zijn gewijzigd terwijl u de pagina aan het bekijken was. Probeer opnieuw te verbinden. +pad.modals.looping = Verbinding verbroken. +pad.modals.looping.explanation = Er is een probleem opgetreden tijdens de communicatie met de synchronisatieserver. +pad.modals.looping.cause = Mogelijk gebruikt de server een niet compatibele firewall of proxy server. +pad.modals.initsocketfail = Server is niet bereikbaar. +pad.modals.initsocketfail.explanation = Het was niet mogelijk te verbinden met de synchronisatieserver. +pad.modals.initsocketfail.cause = Mogelijk komt dit door uw browser of internetverbinding. +pad.modals.slowcommit = Verbinding verbroken. +pad.modals.slowcommit.explanation = De server reageert niet. +pad.modals.slowcommit.cause = Dit komt mogelijk door netwerkproblemen. +pad.modals.deleted = Verwijderd. +pad.modals.deleted.explanation = Dit pad is verwijderd. +pad.modals.disconnected = Uw verbinding is verbroken. +pad.modals.disconnected.explanation = De verbinding met de server is verbroken +pad.modals.disconnected.cause = De server is mogelijk niet beschikbaar. Stel alstublieft de beheerder op de hoogte. +pad.share = Pad delen +pad.share.readonly = Alleen-lezen +pad.share.link = Verwijzing +pad.share.emebdcode = URL insluiten +pad.chat = Chatten +pad.chat.title = Chat voor dit pad opnenen +timeslider.pageTitle = Tijdlijn voor {{appTitle}} +timeslider.toolbar.returnbutton = Terug naar pad +timeslider.toolbar.authors = Auteurs: +timeslider.toolbar.authorsList = Geen auteurs +timeslider.exportCurrent = Huidige versie exporteren als: From 8a23c2ff50bfec384883d8d90aae655d77b29690 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Tue, 20 Nov 2012 22:08:42 +0100 Subject: [PATCH 3/3] Use ; as comments indicator in i18n files --- src/static/js/l10n.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/l10n.js b/src/static/js/l10n.js index e2584cc4c..1d232908e 100644 --- a/src/static/js/l10n.js +++ b/src/static/js/l10n.js @@ -131,7 +131,7 @@ document.webL10n = (function(window, document, undefined) { // token expressions var reBlank = /^\s*|\s*$/; - var reComment = /^\s*#|^\s*$/; + var reComment = /^\s*;|^\s*$/;// Use ; for comments! var reSection = /^\s*\[(.*)\]\s*$/; var reImport = /^\s*@import\s+url\((.*)\)\s*$/i; var reSplit = /^([^=\s]*)\s*=\s*(.+)$/; // TODO: escape EOLs with '\'