Skip to content

Commit ef9cf97

Browse files
committed
Merge branch 'develop' of github.com:ether/etherpad-lite into drag-and-drop-between-frames-sandbox
2 parents f80407c + 638757f commit ef9cf97

File tree

14 files changed

+294
-59
lines changed

14 files changed

+294
-59
lines changed

src/locales/bn.json

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@
1010
},
1111
"index.newPad": "নতুন প্যাড",
1212
"index.createOpenPad": "অথবা নাম লিখে প্যাড খুলুন/তৈরী করুন:",
13-
"pad.toolbar.bold.title": "গাড় করা (Ctrl-B)",
14-
"pad.toolbar.italic.title": "বাঁকা করা (Ctrl-I)",
15-
"pad.toolbar.underline.title": "আন্ডারলাইন (Ctrl-U)",
16-
"pad.toolbar.strikethrough.title": "স্ট্রাইক্থ্রু",
17-
"pad.toolbar.ol.title": "সারিবদ্ধ তালিকা",
13+
"pad.toolbar.bold.title": "গাঢ় (Ctrl-B)",
14+
"pad.toolbar.italic.title": "বাঁকা (Ctrl+I)",
15+
"pad.toolbar.underline.title": "নিম্নরেখা (Ctrl+U)",
16+
"pad.toolbar.strikethrough.title": "অবচ্ছেদন (Ctrl+5)",
17+
"pad.toolbar.ol.title": "সারিবদ্ধ তালিকা (Ctrl+Shift+N)",
18+
"pad.toolbar.ul.title": "অসারিবদ্ধ তালিকা (Ctrl+Shift+L)",
1819
"pad.toolbar.indent.title": "প্রান্তিককরণ (TAB)",
1920
"pad.toolbar.unindent.title": "আউটডেন্ট (Shift+TAB)",
2021
"pad.toolbar.undo.title": "বাতিল করুন (Ctrl-Z)",
@@ -27,24 +28,28 @@
2728
"pad.toolbar.showusers.title": "এই প্যাডের ব্যবহারকারীদের দেখান",
2829
"pad.colorpicker.save": "সংরক্ষণ",
2930
"pad.colorpicker.cancel": "বাতিল",
30-
"pad.loading": "লোডিং...",
31+
"pad.loading": "লোড হচ্ছে...",
32+
"pad.noCookie": "কুকি পাওয়া যায়নি। দয়া করে আপনার ব্রাউজারে কুকি অনুমতি দিন!",
3133
"pad.passwordRequired": "এই প্যাড-টি দেখার জন্য আপনাকে পাসওয়ার্ড ব্যবহার করতে হবে",
3234
"pad.permissionDenied": "দুঃখিত, এ প্যাড-টি দেখার অধিকার আপনার নেই",
3335
"pad.wrongPassword": "আপনার পাসওয়ার্ড সঠিক নয়",
3436
"pad.settings.padSettings": "প্যাডের স্থাপন",
3537
"pad.settings.myView": "আমার দৃশ্য",
3638
"pad.settings.stickychat": "চ্যাট সক্রীনে প্রদর্শন করা হবে",
39+
"pad.settings.chatandusers": "চ্যাট এবং ব্যবহারকারী দেখান",
3740
"pad.settings.colorcheck": "লেখকদের নিজস্ব নির্বাচিত রং",
3841
"pad.settings.linenocheck": "লাইন নম্বর",
39-
"pad.settings.fontType": "ফন্ট-এর প্রকার:",
42+
"pad.settings.rtlcheck": "ডান থেকে বামে বিষয়বস্তু পড়বেন?",
43+
"pad.settings.fontType": "ফন্টের প্রকার:",
4044
"pad.settings.fontType.normal": "সাধারণ",
4145
"pad.settings.fontType.monospaced": "Monospace",
4246
"pad.settings.globalView": "সর্বব্যাপী দৃশ্য",
4347
"pad.settings.language": "ভাষা:",
4448
"pad.importExport.import_export": "আমদানি/রপ্তানি",
45-
"pad.importExport.import": "কোন টেক্সট ফাইল বা ডকুমেন্ট আপলোড করুন",
49+
"pad.importExport.import": "কোন টেক্সট ফাইল বা নথি আপলোড করুন",
4650
"pad.importExport.importSuccessful": "সফল!",
4751
"pad.importExport.export": "এই প্যাডটি রপ্তানি করুন:",
52+
"pad.importExport.exportetherpad": "ইথারপ্যাড",
4853
"pad.importExport.exporthtml": "এইচটিএমএল",
4954
"pad.importExport.exportplain": "সাধারণ লেখা",
5055
"pad.importExport.exportword": "মাইক্রোসফট ওয়ার্ড",
@@ -55,9 +60,11 @@
5560
"pad.modals.forcereconnect": "পুনরায় সংযোগস্থাপনের চেষ্টা",
5661
"pad.modals.userdup": "অন্য উইন্ডো-তে খোলা হয়েছে",
5762
"pad.modals.unauth": "আপনার অধিকার নেই",
58-
"pad.modals.initsocketfail": "সার্ভার-এর সাথে যোগাযোগ করতে অসক্ষম।",
63+
"pad.modals.initsocketfail": "সার্ভারে পৌঁছানো যাচ্ছে না।",
64+
"pad.modals.slowcommit.explanation": "সার্ভার সাড়া দিচ্ছে না।",
5965
"pad.modals.deleted": "অপসারিত।",
6066
"pad.modals.deleted.explanation": "এই প্যাডটি অপসারণ করা হয়েছে।",
67+
"pad.modals.disconnected": "আপনি সংযোগ বিচ্ছিন্ন হয়েছে গেছে।",
6168
"pad.modals.disconnected.explanation": "সার্ভারের সাথে যোগাযোগ করা যাচ্ছে না",
6269
"pad.share": "শেয়ার করুন",
6370
"pad.share.readonly": "শুধু পড়া",
@@ -86,11 +93,13 @@
8693
"timeslider.month.october": "অক্টোবর",
8794
"timeslider.month.november": "নভেম্বর",
8895
"timeslider.month.december": "ডিসেম্বর",
89-
"pad.userlist.entername": "আপনার নাম",
96+
"timeslider.unnamedauthors": "নামবিহীন {{num}} জন {[plural(num) one: লেখক, other: লেখক ]}",
97+
"pad.userlist.entername": "আপনার নাম লিখুন",
9098
"pad.userlist.unnamed": "কোন নাম নির্বাচন করা হয়নি",
9199
"pad.userlist.guest": "অতিথি",
92100
"pad.userlist.approve": "অনুমোদিত",
93101
"pad.impexp.importbutton": "এখন আমদানি করুন",
94102
"pad.impexp.importing": "আমদানি হচ্ছে...",
95-
"pad.impexp.importfailed": "আমদানি ব্যর্থ"
103+
"pad.impexp.importfailed": "আমদানি ব্যর্থ",
104+
"pad.impexp.copypaste": "দয়া করে অনুলিপি প্রতিলেপন করুন"
96105
}

src/locales/ca.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"Toniher",
88
"Macofe",
99
"Joan manel",
10-
"Eduardo Martinez"
10+
"Eduardo Martinez",
11+
"Jaumeortola"
1112
]
1213
},
1314
"index.newPad": "Nou pad",
@@ -75,7 +76,7 @@
7576
"pad.modals.slowcommit.explanation": "El servidor no respon.",
7677
"pad.modals.slowcommit.cause": "Això podria ser a causa de problemes amb la connectivitat de la xarxa.",
7778
"pad.modals.badChangeset.explanation": "El servidor de sincronització ha classificat com a il·legat una edició que heu fet.",
78-
"pad.modals.badChangeset.cause": "Això pot ser degut a una configuració errònia del servidor o a algun altre comportament inesperat. Si us plau, si considereu que això és un error, contacteu amb l'administrador del servei. Intenteu reconnectar-vos per tal de continuar editant.",
79+
"pad.modals.badChangeset.cause": "Això pot ser degut a una configuració errònia del servidor o a algun altre comportament inesperat. Si considereu que és un error, contacteu amb l'administrador del servei. Intenteu reconnectar-vos per a continuar editant.",
7980
"pad.modals.corruptPad.explanation": "El pad al qual esteu intentant accedir està corrupte.",
8081
"pad.modals.corruptPad.cause": "Això pot ser degut a una configuració errònia del servidor o a algun altre comportament inesperat. Si us plau, contacteu amb l'administrador del servei.",
8182
"pad.modals.deleted": "Suprimit.",
@@ -99,7 +100,7 @@
99100
"timeslider.version": "Versió {{version}}",
100101
"timeslider.saved": "Desat {{month}} {{day}}, {{year}}",
101102
"timeslider.playPause": "Reproducció / Pausa els continguts del pad",
102-
"timeslider.backRevision": "Tornar una revisió enrera en aquest Pad",
103+
"timeslider.backRevision": "Tornar una revisió enrere en aquest Pad",
103104
"timeslider.forwardRevision": "Anar una revisió endavant en aquest Pad",
104105
"timeslider.dateformat": "{{month}}/{{day}}/{{year}} {{hours}}:{{minutes}}:{{seconds}}",
105106
"timeslider.month.january": "Gener",

src/locales/eu.json

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,14 @@
2929
"pad.colorpicker.save": "Gorde",
3030
"pad.colorpicker.cancel": "Utzi",
3131
"pad.loading": "Kargatzen...",
32+
"pad.noCookie": "Cookiea ez da aurkitu. Mesedez, gaitu cookieak zure nabigatzailean!",
3233
"pad.passwordRequired": "Pasahitza behar duzu pad honetara sartzeko",
3334
"pad.permissionDenied": "Ez duzu bamienik pad honetara sartzeko",
3435
"pad.wrongPassword": "Zure pasahitza oker zegoen",
3536
"pad.settings.padSettings": "Pad hobespenak",
3637
"pad.settings.myView": "Nire ikusmoldea",
3738
"pad.settings.stickychat": "Txata beti pantailan",
39+
"pad.settings.chatandusers": "Erakutsi txata eta erabiltzaileak",
3840
"pad.settings.colorcheck": "Egiletzaren koloreak",
3941
"pad.settings.linenocheck": "Lerro zenbakiak",
4042
"pad.settings.rtlcheck": "Edukia eskubitik ezkerrera irakurri?",
@@ -69,11 +71,12 @@
6971
"pad.modals.initsocketfail.cause": "Ziurrenik hau zure nabigatzailea edo internet konexioaren arazo bat dela eta izango da.",
7072
"pad.modals.slowcommit.explanation": "Zerbitzariak ez du erantzuten.",
7173
"pad.modals.slowcommit.cause": "Baliteke hau sarearen konexio arazoak direla eta izatea.",
74+
"pad.modals.badChangeset.explanation": "Sinkronizazio zerbitzariak, zuk egindako aldaketa bat legez kanpokotzat jo du.",
7275
"pad.modals.deleted": "Ezabatua.",
7376
"pad.modals.deleted.explanation": "Pad hau ezabatua izan da.",
7477
"pad.modals.disconnected": "Deskonektatua izan zara.",
7578
"pad.modals.disconnected.explanation": "Zerbitzariaren konexioa galdu da",
76-
"pad.modals.disconnected.cause": "Baliteke zerbitzaria irisgarria ez izatea. Mesedez, esaiguzu hau gertatzen jarraitzen badu.",
79+
"pad.modals.disconnected.cause": "Baliteke zerbitzaria eskuragarri ez egotea. Mesedez, jakinarazi zerbitzuko administrariari honek gertatzen jarraitzen badu.",
7780
"pad.share": "Pad hau partekatu",
7881
"pad.share.readonly": "Irakurtzeko bakarrik",
7982
"pad.share.link": "Lotura",
@@ -102,7 +105,7 @@
102105
"timeslider.month.october": "Urria",
103106
"timeslider.month.november": "Azaroa",
104107
"timeslider.month.december": "Abendua",
105-
"timeslider.unnamedauthors": "{{num}} izenik gabeko egileak",
108+
"timeslider.unnamedauthors": "{{num}} izenik gabeko {[plural(num) one: egilea, other: egileak]}",
106109
"pad.savedrevs.marked": "Berrikuspen hau markatua dago gordetako berrikuspen gisa",
107110
"pad.userlist.entername": "Sartu zure erabiltzaile izena",
108111
"pad.userlist.unnamed": "izenik gabe",

src/locales/gu.json

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"@metadata": {
3+
"authors": [
4+
"Bhatakati aatma",
5+
"Harsh4101991",
6+
"KartikMistry"
7+
]
8+
},
9+
"index.newPad": "નવું પેડ",
10+
"pad.toolbar.bold.title": "બોલ્ડ",
11+
"pad.toolbar.settings.title": "ગોઠવણીઓ",
12+
"pad.colorpicker.save": "સાચવો",
13+
"pad.colorpicker.cancel": "રદ્દ કરો",
14+
"pad.loading": "લાવે છે...",
15+
"pad.noCookie": "કુકી મળી નહી. આપના બ્રાઉઝર સેટિંગમાં જઇ કુકી સક્રિય કરો!",
16+
"pad.passwordRequired": "તમારે આ પેડના ઉપયોગ માટે ગુપ્તસંજ્ઞાની જરુર પડશે",
17+
"pad.permissionDenied": "આ પેડના ઉપયોગની આપને પરવાનગી નથી",
18+
"pad.wrongPassword": "આપની ગુપ્તસંજ્ઞા ખોટી છે",
19+
"pad.settings.padSettings": "પેડ ગોઠવણીઓ",
20+
"pad.settings.myView": "મારા મતે",
21+
"pad.settings.fontType.normal": "સામાન્ય",
22+
"pad.settings.fontType.monospaced": "મોનોસ્પેસ",
23+
"pad.settings.language": "ભાષા:",
24+
"pad.importExport.import_export": "આયાત/નિકાસ",
25+
"pad.importExport.importSuccessful": "સફળ!",
26+
"pad.importExport.exporthtml": "HTML",
27+
"pad.importExport.exportplain": "સાદું લખાણ",
28+
"pad.importExport.exportword": "માઇક્રોસોફ્ટ વર્ડ",
29+
"pad.importExport.exportpdf": "PDF",
30+
"pad.importExport.exportopen": "ODF (ઓપન ડોક્યુમેન્ટ ફોરમેટ)",
31+
"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>.",
32+
"pad.modals.connected": "જોડાયેલું",
33+
"pad.chat": "વાતચીત",
34+
"pad.chat.title": "આ પેડ માટે વાતચીત ખોલો.",
35+
"pad.chat.loadmessages": "વધુ સંદેશાઓ લાવો",
36+
"timeslider.toolbar.authors": "લેખકો:",
37+
"timeslider.month.january": "જાન્યુઆરી",
38+
"timeslider.month.february": "ફેબ્રુઆરી",
39+
"timeslider.month.march": "માર્ચ",
40+
"timeslider.month.april": "એપ્રિલ",
41+
"timeslider.month.may": "મે",
42+
"timeslider.month.june": "જૂન",
43+
"timeslider.month.july": "જુલાઇ",
44+
"timeslider.month.august": "ઓગસ્ટ",
45+
"timeslider.month.september": "સપ્ટેમ્બર",
46+
"timeslider.month.october": "ઓક્ટોબર",
47+
"timeslider.month.november": "નવેમ્બર",
48+
"timeslider.month.december": "ડિસેમ્બર",
49+
"pad.userlist.entername": "તમારું નામ દાખલ કરો",
50+
"pad.userlist.unnamed": "અનામી",
51+
"pad.userlist.guest": "મહેમાન",
52+
"pad.userlist.deny": "નકારો",
53+
"pad.userlist.approve": "મંજૂર",
54+
"pad.impexp.importbutton": "આયાત કરો",
55+
"pad.impexp.importing": "આયાત કરે છે..."
56+
}

src/locales/ku-latn.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
"Bikarhêner",
55
"Dilyaramude",
66
"George Animal",
7-
"Gomada"
7+
"Gomada",
8+
"Mehk63"
89
]
910
},
1011
"index.newPad": "Bloknota nû",
@@ -67,7 +68,7 @@
6768
"timeslider.month.august": "gelawêj",
6869
"timeslider.month.september": "rezber",
6970
"timeslider.month.october": "kewçêr",
70-
"timeslider.month.november": "sermawez",
71+
"timeslider.month.november": "Mijdar",
7172
"timeslider.month.december": "berfanbar",
7273
"pad.userlist.entername": "Navê xwe têkeve",
7374
"pad.userlist.unnamed": "nenavkirî",

0 commit comments

Comments
 (0)