Skip to content

Commit 4259a8c

Browse files
committed
Merge branch 'develop' of https://github.com/ether/etherpad-lite into develop
2 parents 8ded04a + 3e5475f commit 4259a8c

File tree

9 files changed

+37
-8
lines changed

9 files changed

+37
-8
lines changed

.github/workflows/release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
permissions:
2+
contents: read
13
name: Release etherpad
24
on:
35
workflow_dispatch:

admin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "admin",
33
"private": true,
4-
"version": "2.4.2",
4+
"version": "2.5.0",
55
"type": "module",
66
"scripts": {
77
"dev": "vite",

bin/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bin",
3-
"version": "2.4.2",
3+
"version": "2.5.0",
44
"description": "",
55
"main": "checkAllPads.js",
66
"directories": {

bin/plugins.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const possibleActions = [
2424

2525
const install = ()=> {
2626
const argsAsString: string = args.join(" ");
27-
const regexRegistryPlugins = /(?<=i\s)(.*?)(?=--github|--path|$)/;
27+
const regexRegistryPlugins = /(?<=(?:i|install)\s)(.*?)(?=--github|--path|$)/;
2828
const regexLocalPlugins = /(?<=--path\s)(.*?)(?=--github|$)/;
2929
const regexGithubPlugins = /(?<=--github\s)(.*?)(?=--path|$)/;
3030
const registryPlugins = argsAsString.match(regexRegistryPlugins)?.[0]?.split(" ")?.filter(s => s) || [];

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
"type": "git",
5151
"url": "https://github.com/ether/etherpad-lite.git"
5252
},
53-
"version": "2.4.2",
53+
"version": "2.5.0",
5454
"license": "Apache-2.0"
5555
}

src/locales/it.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"admin_plugins.page-title": "Gestore dei plugin - Etherpad",
3131
"admin_plugins.version": "Versione",
3232
"admin_plugins_info": "Informazioni sulla risoluzione dei problemi",
33+
"admin_plugins_info.hooks": "Hook installati",
3334
"admin_plugins_info.hooks_client": "Hook lato client",
3435
"admin_plugins_info.hooks_server": "Hook lato server",
3536
"admin_plugins_info.parts": "Parti installate",

src/locales/kab.json

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
{
22
"@metadata": {
33
"authors": [
4-
"Belkacem77"
4+
"Belkacem77",
5+
"ButterflyOfFire"
56
]
67
},
8+
"admin_plugins.name": "Isem",
9+
"admin_plugins.version": "Lqem",
10+
"admin_settings": "Iɣewwaren",
11+
"admin_settings.current": "Tawila tamirant",
12+
"admin_settings.current_save.value": "Sekles iɣewwaren",
13+
"admin_settings.page-title": "Iɣewwaren - Etherpad",
714
"index.newPad": "Apad amaynut",
815
"index.createOpenPad": "neɣ rnu/ldi apad s yisem:",
916
"pad.toolbar.bold.title": "Zur (Ctrl+B)",
@@ -24,7 +31,7 @@
2431
"pad.toolbar.embed.title": "Bḍu sakin seddu apad-agi",
2532
"pad.toolbar.showusers.title": "Sken iseqdacen ɣef upad-agi",
2633
"pad.colorpicker.save": "Sekles",
27-
"pad.colorpicker.cancel": "Sefsex",
34+
"pad.colorpicker.cancel": "Semmet",
2835
"pad.loading": "Asali...",
2936
"pad.noCookie": "Anagi n tuqqna ulac-it. Sireg inagan n tuqqna deg iminig-ik!",
3037
"pad.permissionDenied": "Ur ɣur-k ara tasiregt akken ad tkecmeḍ ar upad-agi",
@@ -37,6 +44,7 @@
3744
"pad.settings.rtlcheck": "Ɣeṛ agbur seg uyeffus s azelmaḍ?",
3845
"pad.settings.fontType": "Anaw n tsefsit:",
3946
"pad.settings.language": "Tutlayt:",
47+
"pad.settings.about": "Ɣef",
4048
"pad.importExport.import_export": "Kter/Sifeḍ",
4149
"pad.importExport.import": "Sali aḍris neɣ isemli",
4250
"pad.importExport.importSuccessful": "Yedda!",
@@ -52,7 +60,7 @@
5260
"pad.modals.reconnecting": "Tulsa n tuqqna ar upad-ik.",
5361
"pad.modals.forcereconnect": "Ḥettem tulsa n tuqqna",
5462
"pad.modals.reconnecttimer": "Ɛreḍ tikelt-nniḍen tuqqna",
55-
"pad.modals.cancel": "Sefsex",
63+
"pad.modals.cancel": "Semmet",
5664
"pad.modals.userdup": "Yeldi deg usfaylu-nniḍen",
5765
"pad.modals.userdup.explanation": "Apad-agi yettban yeldi deg isfuyla-nniḍen deg uselkim-agi.",
5866
"pad.modals.userdup.advice": "Ales tuqqna akken ad tesqedceḍ asfaylu-agi.",

src/locales/ps.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,26 @@
55
"شاه زمان پټان"
66
]
77
},
8+
"admin_plugins.last-update": "وروستۍ هم‌مهالېدنه",
9+
"admin_plugins.name": "نوم",
10+
"admin_plugins.version": "بل‌بڼه",
11+
"admin_plugins_info": "ستونزو اواري مالومات",
12+
"admin_plugins_info.hooks": "ځای‌پرځای‌شوي چنگکونه",
13+
"admin_plugins_info.version_latest": "وروستۍ د لاسرسي وړ بل‌بڼه",
14+
"admin_plugins_info.version_number": "بل‌بڼې شمېره",
15+
"admin_settings": "اوڼنې",
16+
"admin_settings.current": "اوسنی ترتيب",
17+
"admin_settings.current_example-devel": "د پراختيااوڼنې کينډۍ بېلگه",
18+
"admin_settings.current_example-prod": "د توليد اوڼنې کينډۍ بېلگه",
19+
"admin_settings.current_save.value": "اوڼنې خوندي‌کول",
820
"index.newPad": "نوې ليکچه",
921
"index.createOpenPad": "ليکچه د نوم له مخې پرانېستل",
22+
"index.recentPads": "وروستۍ ليکچې",
23+
"index.recentPadsEmpty": "هېڅ وروستۍ ليکچې ونه موندل شوې.",
24+
"index.generateNewPad": "ناڅاپي ليکچې نوم پنځول",
25+
"index.labelPad": "ليکچې نوم (اختياري)",
26+
"index.placeholderPadEnter": "مهرباني وکړئ ليکچې نوم وليکئ...",
27+
"index.createAndShareDocuments": "په رښتينې وخت کې لاسوندونه جوړ او شريک کړئ",
1028
"pad.toolbar.bold.title": "زغرد (Ctrl-B)",
1129
"pad.toolbar.italic.title": "رېوند (Ctrl-I)",
1230
"pad.toolbar.underline.title": "لرکرښن (Ctrl+U)",

src/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,6 @@
147147
"debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts",
148148
"test:vitest": "vitest"
149149
},
150-
"version": "2.4.2",
150+
"version": "2.5.0",
151151
"license": "Apache-2.0"
152152
}

0 commit comments

Comments
 (0)