Unverified Commit 89ad3cb8 authored by Stefan's avatar Stefan Committed by GitHub

Merge new release into master branch!

parents 32027134 1e25e7fc
# 1.6.3
* SECURITY: Update ejs
* SECURITY: xss vulnerability when reading window.location.href
* SECURITY: sanitize jsonp
* NEW: Catch SIGTERM for graceful shutdown
* NEW: Show actual applied text formatting for caret position
* NEW: Add settings to improve scrolling of viewport on line changes
# 1.6.2
* NEW: Added pad shortcut disabling feature
* NEW: Create option to automatically reconnect after a few seconds
......
......@@ -7,7 +7,7 @@
"node": ">=0.6.10"
},
"dependencies": {
"marked": "~0.1.9"
"marked": ">=0.3.6"
},
"devDependencies": {},
"optionalDependencies": {},
......
......@@ -150,6 +150,34 @@
/* Time (in seconds) to automatically reconnect pad when a "Force reconnect"
message is shown to user. Set to 0 to disable automatic reconnection */
"automaticReconnectionTimeout" : 0,
/*
* By default, when caret is moved out of viewport, it scrolls the minimum height needed to make this
* line visible.
*/
"scrollWhenFocusLineIsOutOfViewport": {
/*
* Percentage of viewport height to be additionally scrolled.
* E.g use "percentage.editionAboveViewport": 0.5, to place caret line in the
* middle of viewport, when user edits a line above of the viewport
* Set to 0 to disable extra scrolling
*/
"percentage": {
"editionAboveViewport": 0,
"editionBelowViewport": 0
},
/* Time (in milliseconds) used to animate the scroll transition. Set to 0 to disable animation */
"duration": 0,
/*
* Flag to control if it should scroll when user places the caret in the last line of the viewport
*/
"scrollWhenCaretIsInTheLastLineOfViewport": false,
/*
* Percentage of viewport height to be additionally scrolled when user presses arrow up
* in the line of the top of the viewport.
* Set to 0 to let the scroll to be handled as default by the Etherpad
*/
"percentageToScrollWhenUserPressesArrowUp": 0
},
/* Users for basic authentication. is_admin = true gives access to /admin.
If you do not uncomment this, /admin will not be available! */
......
......@@ -6,7 +6,8 @@
"Mushviq Abdulla",
"Wertuose",
"Mastizada",
"Archaeodontosaurus"
"Archaeodontosaurus",
"Neriman2003"
]
},
"index.newPad": "Yeni lövhə",
......@@ -61,6 +62,8 @@
"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",
"pad.modals.reconnecttimer": "Yenidən qoşulur",
"pad.modals.cancel": "Ləğv et",
"pad.modals.userdup": "Başqa pəncərədə artıq açıqdır",
"pad.modals.userdup.explanation": "Bu lövhə, ola bilsin ki, bu kompüterdəki brauzerin bir neçə pəncərəsində açılmışdır.",
"pad.modals.userdup.advice": "Bu pəncərəni istifadə etmək üçün yenidən qoşul.",
......
......@@ -57,10 +57,11 @@
"pad.importExport.exportword": "Microsoft Word",
"pad.importExport.exportpdf": "PDF",
"pad.importExport.exportopen": "ODF (Open Document Format)",
"pad.importExport.abiword.innerHTML": "Teyna duz metini yana html formati şıma şenê azete dê. Dehana vêşi xısusiyetanê azere kerdışi rê grey <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">AbiWord'i bar kerên</a>.",
"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 <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">AbiWord-i bar kerên</a>.",
"pad.modals.connected": "Gırediya.",
"pad.modals.reconnecting": "Bloknot da şıma rê fına irtibat kewê no",
"pad.modals.forcereconnect": "Mecbur anciya gırê de",
"pad.modals.reconnecttimer": "Anciya gırê beno",
"pad.modals.cancel": "Bıtexelne",
"pad.modals.userdup": "Zewbina pençere de bi a",
"pad.modals.userdup.explanation": "Ena bloknot ena komputer de yew ra zeder penceran dı akerde asena",
......
......@@ -38,7 +38,7 @@
"pad.colorpicker.save": "Guardar",
"pad.colorpicker.cancel": "Cancelar",
"pad.loading": "Cargando...",
"pad.noCookie": "La cookie no se pudo encontrar. ¡Habilita las cookies en tu navegador!",
"pad.noCookie": "No se pudo encontrar la «cookie». Permite la utilización de «cookies» en el navegador.",
"pad.passwordRequired": "Necesitas una contraseña para acceder a este pad",
"pad.permissionDenied": "No tienes permiso para acceder a este pad",
"pad.wrongPassword": "La contraseña era incorrecta",
......
......@@ -13,7 +13,8 @@
"Macofe",
"MrTapsa",
"Silvonen",
"Espeox"
"Espeox",
"Pyscowicz"
]
},
"index.newPad": "Uusi muistio",
......@@ -68,6 +69,8 @@
"pad.modals.connected": "Yhdistetty.",
"pad.modals.reconnecting": "Muodostetaan yhteyttä muistioon uudelleen...",
"pad.modals.forcereconnect": "Pakota yhdistämään uudelleen",
"pad.modals.reconnecttimer": "Yritetään yhdistää uudelleen",
"pad.modals.cancel": "Peruuta",
"pad.modals.userdup": "Avattu toisessa ikkunassa",
"pad.modals.userdup.explanation": "Tämä muistio vaikuttaa olevan avoinna useammassa eri selainikkunassa tällä koneella.",
"pad.modals.userdup.advice": "Yhdistä uudelleen, jos haluat käyttää tätä ikkunaa.",
......
{
"@metadata": {
"authors": [
"Robin van der Vliet"
]
},
"pad.toolbar.bold.title": "Fet (Ctrl+B)",
"pad.toolbar.italic.title": "Kursyf (Ctrl+I)",
"pad.toolbar.underline.title": "Understreekje (Ctrl+U)",
"pad.toolbar.settings.title": "Ynstellingen",
"pad.colorpicker.save": "Bewarje",
"pad.colorpicker.cancel": "Annulearje",
"pad.settings.fontType.normal": "Normaal",
"pad.settings.fontType.monospaced": "Monospace",
"pad.settings.language": "Taal:",
"pad.importExport.exporthtml": "HTML",
"pad.importExport.exportword": "Microsoft Word",
"pad.importExport.exportpdf": "PDF",
"pad.modals.connected": "Ferbûn.",
"pad.modals.deleted": "Fuortsmiten.",
"pad.share.link": "Keppeling",
"timeslider.toolbar.authors": "Auteurs:",
"timeslider.toolbar.authorsList": "Gjin auteurs",
"timeslider.toolbar.exportlink.title": "Eksportearje",
"timeslider.version": "Ferzje {{version}}",
"timeslider.dateformat": "{{day}}-{{month}}-{{year}} {{hours}}:{{minutes}}:{{seconds}}",
"timeslider.month.january": "jannewaris",
"timeslider.month.february": "febrewaris",
"timeslider.month.march": "maart",
"timeslider.month.april": "april",
"timeslider.month.may": "maaie",
"timeslider.month.june": "juny",
"timeslider.month.july": "july",
"timeslider.month.august": "augustus",
"timeslider.month.september": "septimber",
"timeslider.month.october": "oktober",
"timeslider.month.november": "novimber",
"timeslider.month.december": "desimber",
"pad.userlist.unnamed": "sûnder namme",
"pad.userlist.guest": "Gast",
"pad.userlist.deny": "Wegerje",
"pad.userlist.approve": "Goedkarre"
}
{
"@metadata": {
"authors": [
"Sfic"
]
},
"pad.toolbar.bold.title": "गहरा (Ctrl+B)",
"pad.toolbar.italic.title": "तिरछा (Ctrl+I)",
"pad.toolbar.strikethrough.title": "काटें (Ctrl+5)",
"pad.colorpicker.save": "सहेजें",
"pad.colorpicker.cancel": "रद्द करें",
"pad.loading": "लोड हो रहा है...",
"pad.settings.language": "भाषा:",
"pad.importExport.import_export": "आयात/निर्यात",
"pad.importExport.exportpdf": "पीडीएफ़",
"pad.modals.cancel": "रद्द करें",
"timeslider.toolbar.authors": "लेखक:",
"timeslider.toolbar.exportlink.title": "निर्यात",
"timeslider.version": "संस्करण {{version}}",
"timeslider.saved": "{{day}} {{month}} {{year}} सहेजा गया",
"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
"timeslider.month.january": "जनवरी",
"timeslider.month.february": "फ़रवरी",
"timeslider.month.march": "मार्च",
"timeslider.month.april": "अप्रैल",
"timeslider.month.may": "मई",
"timeslider.month.june": "जून",
"timeslider.month.july": "जुलाई",
"timeslider.month.august": "अगस्त",
"timeslider.month.september": "सितम्बर",
"timeslider.month.october": "अक्टूबर",
"timeslider.month.november": "नवम्बर",
"timeslider.month.december": "दिसम्बर",
"pad.userlist.guest": "अतिथि",
"pad.impexp.importbutton": "अभी आयात करें",
"pad.impexp.importing": "आयात कर रहा...",
"pad.impexp.importfailed": "आयात विफल हुआ",
"pad.impexp.copypaste": "कृपया कॉपी पेस्ट करें"
}
......@@ -3,7 +3,8 @@
"authors": [
"Shirayuki",
"Torinky",
"Omotecho"
"Omotecho",
"Aefgh39622"
]
},
"index.newPad": "新規作成",
......@@ -54,7 +55,7 @@
"pad.importExport.exportword": "Microsoft Word",
"pad.importExport.exportpdf": "PDF",
"pad.importExport.exportopen": "ODF (Open Document Format)",
"pad.importExport.abiword.innerHTML": "プレーンテキストまたは HTML ファイルからのみインポートできます。より高度なインポート機能を使用するには、<a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">abiword をインストール</a>してください。",
"pad.importExport.abiword.innerHTML": "プレーンテキストまたは HTML ファイルからのみインポートできます。より高度なインポート機能を使用するには、<a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">AbiWord をインストール</a>してください。",
"pad.modals.connected": "接続されました。",
"pad.modals.reconnecting": "パッドに再接続中...",
"pad.modals.forcereconnect": "強制的に再接続",
......
{
"@metadata": {
"authors": [
"Ernác"
]
},
"pad.toolbar.settings.title": "Джарашдырыула",
"pad.colorpicker.save": "Сакъла",
"pad.loading": "Джюклениу...",
"pad.settings.fontType.normal": "Нормал",
"pad.settings.fontType.monospaced": "Монокенгликли",
"pad.settings.globalView": "Глобал кёрюнюу",
"pad.settings.language": "Тил:",
"pad.importExport.import_export": "Импорт/экспорт",
"pad.importExport.importSuccessful": "Тыйыншлы!",
"pad.importExport.exporthtml": "HTML",
"pad.importExport.exportplain": "Тюз текст",
"pad.importExport.exportword": "Microsoft Word",
"pad.importExport.exportpdf": "PDF",
"pad.importExport.exportopen": "ODF (OpenOffice'ни документи)",
"pad.chat": "Чат",
"timeslider.toolbar.returnbutton": "Документге",
"timeslider.toolbar.authors": "Авторла:",
"timeslider.toolbar.exportlink.title": "Эспорт эт",
"timeslider.version": "{{version}} версия",
"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}.{{minutes}}.{{seconds}}",
"timeslider.month.january": "январь",
"timeslider.month.february": "февраль",
"timeslider.month.march": "март",
"timeslider.month.april": "апрель",
"timeslider.month.may": "май",
"timeslider.month.june": "июнь",
"timeslider.month.july": "июль",
"timeslider.month.august": "август",
"timeslider.month.september": "сентябрь",
"timeslider.month.october": "октябрь",
"timeslider.month.november": "ноябрь",
"timeslider.month.december": "декабрь",
"pad.userlist.guest": "Къонакъ",
"pad.impexp.importing": "Импорт этиу…"
}
{
"@metadata": {
"authors": [
"StefanusRA"
"StefanusRA",
"Empu"
]
},
"index.newPad": "Pad Anyar",
......@@ -30,7 +31,7 @@
"pad.permissionDenied": "Rika ora duwe idin kanggo ngakses pad kiye",
"pad.wrongPassword": "Tembung sandhine Rika salah",
"pad.settings.padSettings": "Pangaturan Pad",
"pad.settings.myView": "Delengane Inyong",
"pad.settings.myView": "Delengané Inyong",
"pad.settings.stickychat": "Dopokan mesti nang layar",
"pad.settings.colorcheck": "Authorship colors",
"pad.settings.linenocheck": "Nomer baris",
......
{
"@metadata": {
"authors": [
"Akapochtli",
"Taresi"
]
},
"index.newPad": "Yancuic Pad",
"index.createOpenPad": "auh xicchīhua/xictlapo cē Pad in ītōcā:",
"pad.toolbar.bold.title": "Tilāhuac (Ctrl+B)",
"pad.toolbar.italic.title": "Coltic (Ctrl+I)",
"pad.toolbar.underline.title": "Tlahuahuantli (Ctrl+U)",
"pad.toolbar.strikethrough.title": "Tlīlhuahuantli (Ctrl+5)",
"pad.toolbar.undo.title": "Xicmācuepa (Ctrl+Z)",
"pad.toolbar.redo.title": "Occeppa (Ctrl+Y)",
"pad.toolbar.settings.title": "Tlatlālīliztli",
"pad.colorpicker.save": "Xicpiya",
"pad.colorpicker.cancel": "Xiccāhua",
"pad.settings.padSettings": "Pad Ītlatlālīliz",
"pad.settings.myView": "Notlachiyaliz",
"pad.settings.language": "Tlahtōlli:",
"pad.importExport.exportetherpad": "Etherpad",
"pad.importExport.exporthtml": "HTML",
"pad.importExport.exportword": "Microsoft Word",
"pad.importExport.exportpdf": "PDF",
"pad.importExport.exportopen": "ODF (Open Document Format)",
"pad.modals.deleted": "Omopohpoloh.",
"pad.modals.deleted.explanation": "Ōmopoloh inīn Pad.",
"timeslider.version": "Inīc {{version}} Cuepaliztli",
"timeslider.month.january": "Īccēmētztli",
"timeslider.month.february": "Īcōmemētztli",
"timeslider.month.march": "Īcyēyimētztli",
"timeslider.month.april": "Īcnāhuimētztli",
"timeslider.month.may": "Īcmācuīllimētztli",
"timeslider.month.june": "Īcchicuacemmētztli",
"timeslider.month.july": "Īcchicōmemētztli",
"timeslider.month.august": "Īcchicuēyimētztli",
"timeslider.month.september": "Īcchiucnāhuimētztli",
"timeslider.month.october": "Īcmahtlactlimētztli",
"timeslider.month.november": "Īcmahtlactlioncēmētztli",
"timeslider.month.december": "Īcmahtlactliomōmemētztli"
}
......@@ -56,7 +56,7 @@
"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, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">installer abiword</a>.",
"pad.importExport.abiword.innerHTML": "Du kan bare importere fra ren tekst eller HTML-formater. For mer avanserte importfunksjoner, <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">installer AbiWord</a>.",
"pad.modals.connected": "Tilkoblet.",
"pad.modals.reconnecting": "Kobler til din blokk på nytt...",
"pad.modals.forcereconnect": "Tving gjenoppkobling",
......
......@@ -8,7 +8,8 @@
"Imperadeiro98",
"Macofe",
"Ti4goc",
"Cainamarques"
"Cainamarques",
"Athena in Wonderland"
]
},
"index.newPad": "Nova Nota",
......@@ -33,12 +34,14 @@
"pad.colorpicker.save": "Gravar",
"pad.colorpicker.cancel": "Cancelar",
"pad.loading": "A carregar…",
"pad.noCookie": "O cookie não foi encontrado. Por favor, ative os cookies no seu navegador!",
"pad.passwordRequired": "Precisa de uma senha para aceder a este pad",
"pad.permissionDenied": "Não tem permissão para aceder a este pad.",
"pad.wrongPassword": "A palavra-chave está errada",
"pad.settings.padSettings": "Configurações da Nota",
"pad.settings.myView": "Minha vista",
"pad.settings.stickychat": "Bate-papo sempre no ecrã",
"pad.settings.chatandusers": "Mostrar a conversação e os utilizadores",
"pad.settings.colorcheck": "Cores de autoria",
"pad.settings.linenocheck": "Números de linha",
"pad.settings.rtlcheck": "Ler o conteúdo da direita para a esquerda?",
......@@ -51,21 +54,34 @@
"pad.importExport.import": "Carregar qualquer ficheiro de texto ou documento",
"pad.importExport.importSuccessful": "Bem sucedido!",
"pad.importExport.export": "Exportar a Nota atual como:",
"pad.importExport.exportetherpad": "Etherpad",
"pad.importExport.exporthtml": "HTML",
"pad.importExport.exportplain": "Texto simples",
"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 <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">instale o AbiWord</a>.",
"pad.modals.connected": "Ligado.",
"pad.modals.reconnecting": "Reconectando-se ao seu bloco…",
"pad.modals.forcereconnect": "Forçar reconexão",
"pad.modals.reconnecttimer": "A tentar religar",
"pad.modals.cancel": "Cancelar",
"pad.modals.userdup": "Aberto noutra janela",
"pad.modals.userdup.explanation": "Este pad parece estar aberto em mais do que uma janela do navegador neste computador.",
"pad.modals.userdup.advice": "Religar para utilizar esta janela.",
"pad.modals.unauth": "Não autorizado",
"pad.modals.unauth.explanation": "As suas permissões foram alteradas enquanto revia esta página. Tente religar.",
"pad.modals.looping.explanation": "Existem problemas de comunicação com o servidor de sincronização.",
"pad.modals.looping.cause": "Talvez tenha ligado por um firewall ou proxy incompatível.",
"pad.modals.initsocketfail": "O servidor está inacessível.",
"pad.modals.initsocketfail.explanation": "Não foi possível a conexão ao servidor de sincronização.",
"pad.modals.initsocketfail.cause": "Isto provavelmente ocorreu por um problema no seu navegador ou na sua ligação de Internet.",
"pad.modals.slowcommit.explanation": "O servidor não está a responder.",
"pad.modals.slowcommit.cause": "Isto pode ser por problemas com a ligação de rede.",
"pad.modals.badChangeset.explanation": "Uma edição que fez foi classificada como ilegal pelo servidor de sincronização.",
"pad.modals.badChangeset.cause": "Isto pode ocorrer devido a uma configuração errada do servidor ou algum outro comportamento inesperado. Por favor contacte o administrador, se acredita que é um erro. Tente religar para continuar a editar.",
"pad.modals.corruptPad.explanation": "A nota que está a tentar aceder está corrompida.",
"pad.modals.corruptPad.cause": "Isto pode ocorrer devido a uma configuração errada do servidor ou algum outro comportamento inesperado. Por favor contacte o administrador.",
"pad.modals.deleted": "Eliminado.",
"pad.modals.deleted.explanation": "Este pad foi removido.",
"pad.modals.disconnected": "Você foi desconectado.",
......@@ -74,9 +90,11 @@
"pad.share": "Compartilhar este pad",
"pad.share.readonly": "Somente para leitura",
"pad.share.link": "Ligação",
"pad.share.emebdcode": "Incorporar o URL",
"pad.chat": "Bate-papo",
"pad.chat.title": "Abrir o bate-papo para este pad.",
"pad.chat.loadmessages": "Carregar mais mensagens",
"timeslider.pageTitle": "Linha do tempo de {{appTitle}}",
"timeslider.toolbar.returnbutton": "Voltar ao pad",
"timeslider.toolbar.authors": "Autores:",
"timeslider.toolbar.authorsList": "Sem Autores",
......@@ -84,6 +102,9 @@
"timeslider.exportCurrent": "Exportar versão atual como:",
"timeslider.version": "Versão {{version}}",
"timeslider.saved": "Gravado a {{day}} de {{month}} de {{ano}}",
"timeslider.playPause": "Reproduzir / Pausar conteúdo do Pad",
"timeslider.backRevision": "Voltar a uma revisão anterior neste Pad",
"timeslider.forwardRevision": "Ir a uma revisão posterior neste Pad",
"timeslider.dateformat": "{{day}}/{{month}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
"timeslider.month.january": "Janeiro",
"timeslider.month.february": "Fevereiro",
......@@ -97,7 +118,9 @@
"timeslider.month.october": "Outubro",
"timeslider.month.november": "Novembro",
"timeslider.month.december": "Dezembro",
"timeslider.unnamedauthors": "{{num}} {[plural(num) one: autor anónimo, other: autores anónimos ]}",
"pad.savedrevs.marked": "Esta revisão está agora marcada como gravada",
"pad.savedrevs.timeslider": "Pode consultar as revisões gravadas visitando a linha do tempo",
"pad.userlist.entername": "Insira o seu nome",
"pad.userlist.unnamed": "sem nome",
"pad.userlist.guest": "Convidado",
......@@ -107,8 +130,10 @@
"pad.impexp.importbutton": "Importar agora",
"pad.impexp.importing": "Importando...",
"pad.impexp.confirmimport": "A importação de um ficheiro irá substituir o texto atual do pad. Tem certeza que deseja continuar?",
"pad.impexp.padHasData": "Não fomos capazes de importar este arquivo porque este Pad já tinha alterações, por favor importe para um novo pad",
"pad.impexp.convertFailed": "Não foi possível importar este ficheiro. Utilize outro formato ou copie e insira manualmente",
"pad.impexp.padHasData": "Não fomos capazes de importar este ficheiro porque este Pad já tinha alterações, por favor importe para um novo pad",
"pad.impexp.uploadFailed": "O upload falhou. Por favor, tente novamente",
"pad.impexp.importfailed": "A importação falhou",
"pad.impexp.copypaste": "Por favor, copie e cole"
"pad.impexp.copypaste": "Por favor, copie e cole",
"pad.impexp.exportdisabled": "A exportação no formato {{type}} está desativada. Por favor, contacte o administrador do sistema para mais informações."
}
......@@ -8,7 +8,7 @@
]
},
"index.newPad": "Nov dokument",
"index.createOpenPad": "ali pa odpri dokument z imenom:",
"index.createOpenPad": "ali pa ustvari/odpri dokument z imenom:",
"pad.toolbar.bold.title": "Krepko (Ctrl-B)",
"pad.toolbar.italic.title": "Ležeče (Ctrl-I)",
"pad.toolbar.underline.title": "Podčrtano (Ctrl-U)",
......@@ -20,7 +20,7 @@
"pad.toolbar.undo.title": "Razveljavi (Ctrl-Z)",
"pad.toolbar.redo.title": "Ponovno uveljavi (Ctrl-Y)",
"pad.toolbar.clearAuthorship.title": "Počisti barve avtorstva (Ctrl+Shift+C)",
"pad.toolbar.import_export.title": "Izvozi/Uvozi različne oblike zapisov",
"pad.toolbar.import_export.title": "Uvozi/Izvozi različne oblike zapisov",
"pad.toolbar.timeslider.title": "Časovni trak",
"pad.toolbar.savedRevision.title": "Shrani redakcijo",
"pad.toolbar.settings.title": "Nastavitve",
......
......@@ -5,21 +5,22 @@
"Milicevic01",
"Милан Јелисавчић",
"Srdjan m",
"Obsuser"
"Obsuser",
"Acamicamacaraca"
]
},
"index.newPad": "Нови Пад",
"index.createOpenPad": "или направите/отворите пад следећег назива:",
"pad.toolbar.bold.title": "Подебљано (Ctrl-B)",
"pad.toolbar.italic.title": "Искошено (Ctrl-I)",
"pad.toolbar.underline.title": "Подвучено (Ctrl-U)",
"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+Z)",
"pad.toolbar.redo.title": "Понови (Ctrl+Z)",
"pad.toolbar.clearAuthorship.title": "Очисти ауторске боје (Ctrl+Shift+C)",
"pad.toolbar.import_export.title": "Увези/извези из/на друге датотечне формате",
"pad.toolbar.timeslider.title": "Временска линија",
......@@ -29,9 +30,9 @@
"pad.toolbar.showusers.title": "Прикажи кориснике на овом паду",
"pad.colorpicker.save": "Сачувај",
"pad.colorpicker.cancel": "Откажи",
"pad.loading": "Учитавање...",
"pad.loading": "Учитавам…",
"pad.noCookie": "Колачић није пронађен. Молимо да укључите колачиће у вашем прегледавачу!",
"pad.passwordRequired": "Требате лозинку како бисте приступили овом паду",
"pad.passwordRequired": "Требате имати лозинку како бисте приступили овом паду",
"pad.permissionDenied": "Немате дозволу да приступите овом паду",
"pad.wrongPassword": "Ваша лозинка није исправна",
"pad.settings.padSettings": "Подешавања пада",
......@@ -48,15 +49,15 @@
"pad.settings.language": "Језик:",
"pad.importExport.import_export": "Увоз/извоз",
"pad.importExport.import": "Отпремите било коју текстуалну датотеку или документ",
"pad.importExport.importSuccessful": "Успело!",
"pad.importExport.importSuccessful": "Успешно!",
"pad.importExport.export": "Извези тренутни пад као:",
"pad.importExport.exportetherpad": "Etherpad",
"pad.importExport.exporthtml": "HTML",
"pad.importExport.exportplain": "чист текст",
"pad.importExport.exportplain": "Чист текст",
"pad.importExport.exportword": "Microsoft Word",
"pad.importExport.exportpdf": "PDF",
"pad.importExport.exportopen": "ODF (Open Document Format)",
"pad.importExport.abiword.innerHTML": "Једино можете увести са једноставног текстуалног формата или HTML формата. За компликованије функције о увозу, молимо да <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-in-Ubuntu-or-OpenSuse-or-SLES-with-AbiWord\">инсталирате AbiWord</a>.",
"pad.importExport.abiword.innerHTML": "Једино можете увести са једноставног текстуалног формата или HTML формата. За компликованије функције о увозу, молимо да <a href=\"https://github.com/ether/etherpad-lite/wiki/How-to-enable-importing-and-exporting-different-file-formats-with-AbiWord\">инсталирате AbiWord</a>.",
"pad.modals.connected": "Повезано.",
"pad.modals.reconnecting": "Поново се повезујем на ваш пад..",
"pad.modals.forcereconnect": "Присилно се поново повежи",
......@@ -83,24 +84,24 @@
"pad.modals.disconnected": "Веза је прекинута.",
"pad.modals.disconnected.explanation": "Изгубљена је веза са сервером",
"pad.modals.disconnected.cause": "Сервер није доступан. Обавестите сервисног администратора ако се ово настави дешавати.",
"pad.share": "Дели овај пад",
"pad.share": "Пофели овај пад",
"pad.share.readonly": "Само за читање",
"pad.share.link": "Веза",
"pad.share.emebdcode": "Угради везу",
"pad.chat": "Ћаскање",
"pad.chat.title": "Отворите ћаскање за овај пад.",
"pad.chat.loadmessages": "Учитајте више порука.",
"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.version": "Издање {{version}}",
"timeslider.saved": "Сачувано на {{day}}. {{month}}. {{year}}",
"timeslider.playPause": "Пусти/паузирај садржај пада",
"timeslider.backRevision": "Иди на претходну верзију овог пада",
"timeslider.forwardRevision": "Иди на следећу верзију овог пада",
"timeslider.forwardRevision": "Иди на следеће издање пада",
"timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
"timeslider.month.january": "јануар",
"timeslider.month.february": "фебруар",
......@@ -115,21 +116,21 @@
"timeslider.month.november": "новембар",
"timeslider.month.december": "децембар",
"timeslider.unnamedauthors": "{{num}} неименован(и) {[plural(num) one: аутор, other: аутори ]}",
"pad.savedrevs.marked": "Ова верзија је сада означена као сачувана",
"pad.savedrevs.marked": "Ова измена је сада означена као сачувана",
"pad.savedrevs.timeslider": "Можете видети сачуване измене користећи се временском линијом",
"pad.userlist.entername": "Упишите своје име",
"pad.userlist.unnamed": "нема имена",
"pad.userlist.unnamed": "неименован",
"pad.userlist.guest": "Гост",
"pad.userlist.deny": "Одбиј",
"pad.userlist.approve": "одобрено",
"pad.userlist.approve": "Одобри",
"pad.editbar.clearcolors": "Очисти ауторске боје за цели документ?",
"pad.impexp.importbutton": "Увези одмах",
"pad.impexp.importing": "Увожење...",
"pad.impexp.importing": "Увозим...",
"pad.impexp.confirmimport": "Увоз датотеке ће преписати тренутни текст пада. Да ли сте сигурни да желите наставити?",
"pad.impexp.convertFailed": "Не можемо увести ову датотеку. Молимо да користите други формат документа или да документ копирате ручно",
"pad.impexp.padHasData": "Не можемо да увеземо ову датотеку зато што је већ било промена на овом паду, молимо да увезете нови пад",
"pad.impexp.uploadFailed": "Отпремање није успело, молимо да покушате поново",
"pad.impexp.importfailed": "Увоз неуспешан",
"pad.impexp.copypaste": "Молимо да ручно копирате",
"pad.impexp.convertFailed": "Не могу да увезем ову датотеку. Молимо да користите други формат документа или да документ копирате ручно",
"pad.impexp.padHasData": "Не могу да увезем ову датотеку зато што је већ било промена на овом паду, молимо да увезете нови пад",
"pad.impexp.uploadFailed": "Нисам успео да отпремим, молимо покушате поново",
"pad.impexp.importfailed": "Нисам успео да увезем",
"pad.impexp.copypaste": "Копирајте и залепите",
"pad.impexp.exportdisabled": "Извоз у формату {{type}} није дозвољен. Контактирајте системског администратора за детаље."
}
{
"@metadata": {
"authors": [
"BHARATHESHA ALASANDEMAJALU",
"VASANTH S.N."
]
},
"index.newPad": "ಪೊಸ ಪ್ಯಾಡ್",
"index.createOpenPad": "ಅತಂಡ ಈ ಪುದರ್ತ ಪ್ಯಾಡನ್ನು ಉಂಡು ಮನ್ಪು/ತೋಜಾಲ:",
"pad.toolbar.bold.title": "ದಪ್ಪೊ(Ctrl+B)",
"pad.toolbar.italic.title": "ಓರೆ (Ctrl-I)",
"pad.toolbar.underline.title": "ಅಡಿಗೆರೆ(Ctrl-U)",
"pad.toolbar.indent.title": "Indent (TAB)",
"pad.toolbar.undo.title": "ಪಿರವುತ(Ctrl+Z)",
"pad.toolbar.redo.title": "ದುಂಬುತ್ತ(Ctrl+Y)",
"pad.toolbar.settings.title": "ಸಂಯೋಜನೆಲು",
"pad.toolbar.showusers.title": "ಈ ಪ್ಯಾಡ್ ಟ್ ಗಲಸುನಾಯಾನ್ ತೋಜಾಲೆ",
"pad.colorpicker.save": "ಒರಿಪಾಲೆ",
"pad.colorpicker.cancel": "ವಜಾ ಮಲ್ಪುಲೆ",
"pad.loading": "ದಿಂಜಾವೊಂದುಂಡು......",
"pad.wrongPassword": "ಇರೇನಾ ಪಾಸ್ ವರ್ಡ್ ತಪ್ಪತುಂಡ್",
"pad.settings.padSettings": "ಪ್ಯಾಡ್ ಸಂಯೋಜನೆ",
"pad.settings.language": "ಬಾಸೆ:",
"pad.importExport.exportetherpad": "Etherpad",