From f458fc105f981486b42fb119fb978391663e56c1 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 26 Nov 2024 14:11:56 +0100
Subject: [PATCH 001/114] Added functionality to move Kanban boards with arrow
 buttons

---
 www/kanban/inner.js | 65 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 947092c59..737e19798 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -559,6 +559,71 @@ define([
                 e.stopPropagation();
             }).appendTo($(el).find('.kanban-board-header'));
         });
+        $container.find('.kanban-board').each(function (i, el) {
+            $('<button>', {
+                'class': 'kanban-edit-item fa fa-arrow-left',
+                'alt': '', 
+            }).click(function (e) {
+                var boardList = $container[0].childNodes[0].childNodes[0].childNodes
+                var newKanban = boardList[boardList.length-1]
+                var boardsArray = Array.from(boardList)
+                boardsArray.slice(boardsArray.length-1, 1)
+                var moveBoards = function (arr, oldIndex, newIndex) {
+                    if (newIndex >= arr.length) {
+                        var k = newIndex - arr.length + 1;
+                        while (k--) {
+                            arr.push(undefined);
+                        }
+                    }
+                    arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
+                    return arr;
+                };
+                if (i === 0) {
+                    moveBoards(boardsArray, i, boardsArray.length-1)
+                } else {
+                    moveBoards(boardsArray, i, i-1)
+                }
+                var index = boardsArray.indexOf(el)
+                i = index
+                var boardContainer = $container[0].childNodes[0].childNodes[0]
+                boardContainer.innerHTML = ''; 
+                boardsArray.forEach(board => {
+                    boardContainer.appendChild(board);
+                });
+                boardContainer.appendChild(newKanban);                
+            }).appendTo($(el).find('.kanban-board-header'));
+        });
+         $container.find('.kanban-board').each(function (i, el) {
+            $('<button>', {
+                'class': 'kanban-edit-item fa fa-arrow-right',
+                'alt': '', 
+            }).click(function (e) {
+                var boardList = $container[0].childNodes[0].childNodes[0].childNodes
+                var newKanban = boardList[boardList.length-1]
+                var boardsArray = Array.from(boardList)
+                boardsArray.slice(boardsArray.length-1, 1)
+                var moveBoards = function (arr, oldIndex, newIndex) {
+                    var element = arr[oldIndex];
+                    arr.splice(oldIndex, 1);
+                    arr.splice(newIndex, 0, element);
+                };
+                if (i === boardsArray.length-2) {
+                    moveBoards(boardsArray, i, 0)
+                } else {
+                    moveBoards(boardsArray, i, i+1)
+                }
+                var boardContainer = $container[0].childNodes[0].childNodes[0]
+                boardContainer.innerHTML = ''; 
+                boardsArray.forEach(board => {
+                    boardContainer.appendChild(board);
+                });
+                var index = boardsArray.indexOf(el)
+                i = index
+                boardContainer.appendChild(newKanban);
+                
+
+            }).appendTo($(el).find('.kanban-board-header'));
+        });
     };
 
     // Kanban code

From c268bdfb771409d7079abaf0abd6ce54f0bce0f1 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 29 Nov 2024 17:36:14 +0100
Subject: [PATCH 002/114] Can move items up/down board - WIP

---
 www/kanban/inner.js | 240 ++++++++++++++++++++++++++++++++------------
 1 file changed, 176 insertions(+), 64 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 737e19798..5b3c64618 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -148,6 +148,7 @@ define([
     };
 
     var addEditItemButton = function () {};
+    var addMoveItemButton = function () {}
 
     var now = function () { return +new Date(); };
     var _lastUpdate = 0;
@@ -156,6 +157,7 @@ define([
         kanban.setBoards(Util.clone(boards));
         kanban.inEditMode = false;
         addEditItemButton(framework, kanban);
+        addMoveItemButton(framework, kanban)
     };
     var _updateBoardsThrottle = Util.throttle(_updateBoards, 1000);
     var updateBoards = function (framework, kanban, boards) {
@@ -534,6 +536,175 @@ define([
         UI.openCustomModal(editModal.modal);
     };
 
+    addMoveItemButton = function (framework, kanban) {
+        if (!kanban) { return; }
+        if (framework.isReadOnly() || framework.isLocked()) { return; }
+        var $container = $(kanban.element);
+
+        var moveBoards = function (arr, oldIndex, newIndex) {
+            arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
+            return arr;
+        };
+
+        $container.find('.kanban-board').each(function (i, el) {
+            $('<button>', {
+                'class': 'kanban-edit-item fa fa-arrow-left',
+                'alt': '', 
+            }).click(function (e) { 
+                var boardList = $container[0].childNodes[0].childNodes[0].childNodes
+                var newKanban = boardList[boardList.length-1]
+                var boardsArray = Array.from(boardList)
+                boardsArray.slice(boardsArray.length-1, 1)
+                var index = boardsArray.indexOf(el)
+                if (index > 0) {
+                    moveBoards(boardsArray, index, index-1)
+                    var index = boardsArray.indexOf(el)
+                    i = index
+                    var boardContainer = $container[0].childNodes[0].childNodes[0]
+                    boardContainer.innerHTML = ''; 
+                    boardsArray.forEach(board => {
+                        boardContainer.appendChild(board);
+                    });
+                    boardContainer.appendChild(newKanban); 
+                }
+            }).appendTo($(el).find('.kanban-board-header'));
+        });
+        $container.find('.kanban-board').each(function (i, el) {
+            $('<button>', {
+                'class': 'kanban-edit-item fa fa-arrow-right',
+                'alt': '', 
+            }).click(function (e) {
+                var boardList = $container[0].childNodes[0].childNodes[0].childNodes
+                var newKanban = boardList[boardList.length-1]
+                var boardsArray = Array.from(boardList)
+                boardsArray.slice(boardsArray.length-1, 1)
+                var index = boardsArray.indexOf(el)
+                if (index < boardsArray.length-1) {
+                    moveBoards(boardsArray, index, index+1)
+                    var index = boardsArray.indexOf(el)
+                    i = index
+                    var boardContainer = $container[0].childNodes[0].childNodes[0]
+                    boardContainer.innerHTML = ''; 
+                    boardsArray.forEach(board => {
+                        boardContainer.appendChild(board);
+                    });
+                    boardContainer.appendChild(newKanban); 
+                }
+
+            }).appendTo($(el).find('.kanban-board-header'));
+        });
+        $container.find('.kanban-item').each(function (i, el) {
+            $('<button>', {
+                'class': 'kanban-edit-item fa fa-arrow-down',
+                'alt': Messages.kanban_editCard,
+            }).click(function (e) {
+                var itemList = el.parentNode.childNodes                
+                var itemArray = Array.from(itemList)
+                var index = itemArray.indexOf(el)
+                if (index < itemArray.length-1) {
+                    moveBoards(itemArray, index, index+1)
+                    var index = itemArray.indexOf(el)
+                    i = index
+                    var itemContainer = el.parentNode
+                    itemContainer.innerHTML = ''; 
+                    itemArray.forEach(item => {
+                        itemContainer.appendChild(item);
+                    });
+                }
+            }).insertAfter($(el).find('.kanban-item-text'));
+        });
+        $container.find('.kanban-item').each(function (i, el) {
+            $('<button>', {
+                'class': 'kanban-edit-item fa fa-arrow-up',
+                'alt': Messages.kanban_editCard,
+            }).click(function (e) {
+                var itemList = el.parentNode.childNodes                
+                var itemArray = Array.from(itemList)
+                var index = itemArray.indexOf(el)
+                if (index > 0) {
+                    moveBoards(itemArray, index, index-1)
+                    var index = itemArray.indexOf(el)
+                    i = index
+                    var itemContainer = el.parentNode
+                    itemContainer.innerHTML = ''; 
+                    itemArray.forEach(item => {
+                        itemContainer.appendChild(item);
+                    });
+                }
+            }).insertAfter($(el).find('.kanban-item-text'));
+        });
+        // $container.find('.kanban-item').each(function (i, el) {
+        //     $('<button>', {
+        //         'class': 'kanban-edit-item fa fa-arrow-left',
+        //         'alt': Messages.kanban_editCard,
+        //     }).click(function (e) {
+        //         // var itemList = el.parentNode.childNodes     
+        //         var boardList = $container[0].childNodes[0].childNodes[0].childNodes
+
+        //         var board = el.parentNode.parentNode.parentNode     
+        //         // var itemArray = Array.from(itemList)
+        //         var boardsArray = Array.from(boardList)
+        //         boardsArray.slice(boardsArray.length-1, 1)
+        //         console.log(board)
+        //         console.log(boardsArray)
+        //         var index = boardsArray.indexOf(board)
+        //         console.log(index)
+        //         // var index = itemArray.indexOf(el)
+        //         if (index > 0) {
+        //             var moveBoards = function (arr, oldIndex, newIndex) {
+        //                 if (newIndex >= arr.length) {
+        //                     var k = newIndex - arr.length + 1;
+        //                     while (k--) {
+        //                         arr.push(undefined);
+        //                     }
+        //                 }
+        //                 arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
+        //                 return arr;
+        //             };
+        //             moveBoards(itemArray, index, index-1)
+        //             var index = itemArray.indexOf(el)
+        //             i = index
+        //             var itemContainer = el.parentNode
+        //             itemContainer.innerHTML = ''; 
+        //             itemArray.forEach(item => {
+        //                 itemContainer.appendChild(item);
+        //             });
+        //         }
+        //     }).insertAfter($(el).find('.kanban-item-text'));
+        // });
+        // $container.find('.kanban-item').each(function (i, el) {
+        //     $('<button>', {
+        //         'class': 'kanban-edit-item fa fa-arrow-right',
+        //         'alt': Messages.kanban_editCard,
+        //     }).click(function (e) {
+        //         var itemList = el.parentNode.childNodes                
+        //         // var itemArray = Array.from(itemList)
+        //         var index = itemArray.indexOf(el)
+        //         // if (index > 0) {
+        //         //     var moveBoards = function (arr, oldIndex, newIndex) {
+        //         //         if (newIndex >= arr.length) {
+        //         //             var k = newIndex - arr.length + 1;
+        //         //             while (k--) {
+        //         //                 arr.push(undefined);
+        //         //             }
+        //         //         }
+        //         //         arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
+        //         //         return arr;
+        //         //     };
+        //         //     moveBoards(itemArray, index, index-1)
+        //         //     var index = itemArray.indexOf(el)
+        //         //     i = index
+        //         //     var itemContainer = el.parentNode
+        //         //     itemContainer.innerHTML = ''; 
+        //         //     itemArray.forEach(item => {
+        //         //         itemContainer.appendChild(item);
+        //         //     });
+        //         // }
+        //     }).insertAfter($(el).find('.kanban-item-text'));
+        // });
+    
+    }
+
     addEditItemButton = function (framework, kanban) {
         if (!kanban) { return; }
         if (framework.isReadOnly() || framework.isLocked()) { return; }
@@ -559,71 +730,8 @@ define([
                 e.stopPropagation();
             }).appendTo($(el).find('.kanban-board-header'));
         });
-        $container.find('.kanban-board').each(function (i, el) {
-            $('<button>', {
-                'class': 'kanban-edit-item fa fa-arrow-left',
-                'alt': '', 
-            }).click(function (e) {
-                var boardList = $container[0].childNodes[0].childNodes[0].childNodes
-                var newKanban = boardList[boardList.length-1]
-                var boardsArray = Array.from(boardList)
-                boardsArray.slice(boardsArray.length-1, 1)
-                var moveBoards = function (arr, oldIndex, newIndex) {
-                    if (newIndex >= arr.length) {
-                        var k = newIndex - arr.length + 1;
-                        while (k--) {
-                            arr.push(undefined);
-                        }
-                    }
-                    arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
-                    return arr;
-                };
-                if (i === 0) {
-                    moveBoards(boardsArray, i, boardsArray.length-1)
-                } else {
-                    moveBoards(boardsArray, i, i-1)
-                }
-                var index = boardsArray.indexOf(el)
-                i = index
-                var boardContainer = $container[0].childNodes[0].childNodes[0]
-                boardContainer.innerHTML = ''; 
-                boardsArray.forEach(board => {
-                    boardContainer.appendChild(board);
-                });
-                boardContainer.appendChild(newKanban);                
-            }).appendTo($(el).find('.kanban-board-header'));
-        });
-         $container.find('.kanban-board').each(function (i, el) {
-            $('<button>', {
-                'class': 'kanban-edit-item fa fa-arrow-right',
-                'alt': '', 
-            }).click(function (e) {
-                var boardList = $container[0].childNodes[0].childNodes[0].childNodes
-                var newKanban = boardList[boardList.length-1]
-                var boardsArray = Array.from(boardList)
-                boardsArray.slice(boardsArray.length-1, 1)
-                var moveBoards = function (arr, oldIndex, newIndex) {
-                    var element = arr[oldIndex];
-                    arr.splice(oldIndex, 1);
-                    arr.splice(newIndex, 0, element);
-                };
-                if (i === boardsArray.length-2) {
-                    moveBoards(boardsArray, i, 0)
-                } else {
-                    moveBoards(boardsArray, i, i+1)
-                }
-                var boardContainer = $container[0].childNodes[0].childNodes[0]
-                boardContainer.innerHTML = ''; 
-                boardsArray.forEach(board => {
-                    boardContainer.appendChild(board);
-                });
-                var index = boardsArray.indexOf(el)
-                i = index
-                boardContainer.appendChild(newKanban);
-                
+        
 
-            }).appendTo($(el).find('.kanban-board-header'));
-        });
     };
 
     // Kanban code
@@ -732,6 +840,7 @@ define([
                 framework.localChange();
                 if (kanban) {
                     addEditItemButton(framework, kanban);
+                    addMoveItemButton(framework, kanban)
                 }
             },
             click: function (el) {
@@ -1037,6 +1146,7 @@ define([
                 kanban.options.tags = t;
                 kanban.setBoards(kanban.options.boards);
                 addEditItemButton(framework, kanban);
+                addMoveItemButton(framework, kanban)
             };
 
             var redrawList = function (allTags) {
@@ -1248,6 +1358,7 @@ define([
             if (!kanban) { return; }
             if (unlocked) {
                 addEditItemButton(framework, kanban);
+                addMoveItemButton(framework, kanban)
                 kanban.options.readOnly = false;
                 return void $container.removeClass('cp-app-readonly');
             }
@@ -1352,6 +1463,7 @@ define([
             if (!kanban) {
                 kanban = initKanban(framework, (newContent || {}).content);
                 addEditItemButton(framework, kanban);
+                addMoveItemButton(framework, kanban)
                 return;
             }
 

From 39a7ad8f41af7c843e2edfdc8069b582061ef396 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 3 Dec 2024 19:49:24 +0100
Subject: [PATCH 003/114] Can move boards sideways, items up/down and between
 boards

---
 www/kanban/inner.js | 258 ++++++++++++++++++--------------------------
 1 file changed, 105 insertions(+), 153 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 5b3c64618..85036d03c 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -537,172 +537,124 @@ define([
     };
 
     addMoveItemButton = function (framework, kanban) {
-        if (!kanban) { return; }
-        if (framework.isReadOnly() || framework.isLocked()) { return; }
-        var $container = $(kanban.element);
+        if ('ontouchstart' in window) {
+            if (!kanban) { return; }
+            if (framework.isReadOnly() || framework.isLocked()) { return; }
+            var $container = $(kanban.element);
 
-        var moveBoards = function (arr, oldIndex, newIndex) {
-            arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
-            return arr;
-        };
+            var move = function (arr, oldIndex, newIndex) {
+                arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
+                return arr;
+            };
 
-        $container.find('.kanban-board').each(function (i, el) {
+            $container.find('.kanban-board').each(function (i, el) {
+                $('<button>', {
+                    'class': 'kanban-edit-item fa fa-arrow-left',
+                    'alt': '', 
+                }).click(function (e) { 
+                    var elId = $(el).attr("data-id")
+                    var index = kanban.options.boards.list.indexOf(parseInt(elId))
+                    if (index > 0) {
+                        move(kanban.options.boards.list, index, index-1)
+                        updateBoards(framework, kanban, kanban.options.boards)
+                        el.scrollIntoView()
+                    }
+                }).appendTo($(el).find('.kanban-board-header'));
+            });
+            $container.find('.kanban-board').each(function (i, el) {
+                $('<button>', {
+                    'class': 'kanban-edit-item fa fa-arrow-right',
+                    'alt': '', 
+                }).click(function (e) {
+                    var elId = $(el).attr("data-id")
+                    var index = kanban.options.boards.list.indexOf(parseInt(elId))
+                    if (index < kanban.options.boards.list.length-1) {
+                        move(kanban.options.boards.list, index, index+1)
+                        updateBoards(framework, kanban, kanban.options.boards)
+                        setTimeout(() => {
+                            el.scrollIntoView()
+                        }, 3000);
+                    }
+                }).appendTo($(el).find('.kanban-board-header'));
+            });
+            $container.find('.kanban-item').each(function (i, el) {
+                $('<button>', {
+                    'class': 'kanban-edit-item fa fa-arrow-down',
+                    'alt': Messages.kanban_editCard,
+                }).click(function (e) {
+                    var board = el.parentNode.parentNode.parentNode     
+                    var elId = parseInt($(el).attr("data-eid"))
+                    var boardId = $(board).attr("data-id")
+                    var boardItems = kanban.options.boards.data[boardId].item
+                    var index = boardItems.indexOf(elId)
+                    if (index < boardItems.length-1) {
+                        move(boardItems, index, index+1)
+                        updateBoards(framework, kanban, kanban.options.boards)
+                    }
+                }).insertAfter($(el).find('.kanban-item-text'));
+            });
+            $container.find('.kanban-item').each(function (i, el) {
+                $('<button>', {
+                    'class': 'kanban-edit-item fa fa-arrow-up',
+                    'alt': Messages.kanban_editCard,
+                }).click(function (e) {
+                    var board = el.parentNode.parentNode.parentNode     
+                    var elId = parseInt($(el).attr("data-eid"))
+                    var boardId = $(board).attr("data-id")
+                    var boardItems = kanban.options.boards.data[boardId].item
+                    var index = boardItems.indexOf(elId)
+                    if (index > 0) {
+                        move(boardItems, index, index-1)
+                        updateBoards(framework, kanban, kanban.options.boards)
+                    }
+                }).insertAfter($(el).find('.kanban-item-text'));
+            });
+        $container.find('.kanban-item').each(function (i, el) {
             $('<button>', {
                 'class': 'kanban-edit-item fa fa-arrow-left',
-                'alt': '', 
-            }).click(function (e) { 
-                var boardList = $container[0].childNodes[0].childNodes[0].childNodes
-                var newKanban = boardList[boardList.length-1]
-                var boardsArray = Array.from(boardList)
-                boardsArray.slice(boardsArray.length-1, 1)
-                var index = boardsArray.indexOf(el)
-                if (index > 0) {
-                    moveBoards(boardsArray, index, index-1)
-                    var index = boardsArray.indexOf(el)
-                    i = index
-                    var boardContainer = $container[0].childNodes[0].childNodes[0]
-                    boardContainer.innerHTML = ''; 
-                    boardsArray.forEach(board => {
-                        boardContainer.appendChild(board);
-                    });
-                    boardContainer.appendChild(newKanban); 
+                'alt': Messages.kanban_editCard,
+            }).click(function (e) {
+                var board = el.parentNode.parentNode.parentNode  
+                var boards = kanban.options.boards
+                var boardId = $(board).attr("data-id")
+                var boardIndex = boards.list.indexOf(parseInt(boardId))
+                var elId = parseInt($(el).attr("data-eid"))
+                var boardItems = boards.data[boardId].item
+                let itemIndex = boardItems.indexOf(elId)
+            
+                if (boardIndex > 0) {
+                    var nextBoardItems = boards.data[boardId-1].item
+                    nextBoardItems.unshift(elId)
+                    boardItems.splice(itemIndex, 1)
+                    boards.data[boardId].item = boardItems
+                    updateBoards(framework, kanban, boards)
                 }
-            }).appendTo($(el).find('.kanban-board-header'));
+            }).insertAfter($(el).find('.kanban-item-text'));
         });
-        $container.find('.kanban-board').each(function (i, el) {
+         $container.find('.kanban-item').each(function (i, el) {
             $('<button>', {
                 'class': 'kanban-edit-item fa fa-arrow-right',
-                'alt': '', 
-            }).click(function (e) {
-                var boardList = $container[0].childNodes[0].childNodes[0].childNodes
-                var newKanban = boardList[boardList.length-1]
-                var boardsArray = Array.from(boardList)
-                boardsArray.slice(boardsArray.length-1, 1)
-                var index = boardsArray.indexOf(el)
-                if (index < boardsArray.length-1) {
-                    moveBoards(boardsArray, index, index+1)
-                    var index = boardsArray.indexOf(el)
-                    i = index
-                    var boardContainer = $container[0].childNodes[0].childNodes[0]
-                    boardContainer.innerHTML = ''; 
-                    boardsArray.forEach(board => {
-                        boardContainer.appendChild(board);
-                    });
-                    boardContainer.appendChild(newKanban); 
-                }
-
-            }).appendTo($(el).find('.kanban-board-header'));
-        });
-        $container.find('.kanban-item').each(function (i, el) {
-            $('<button>', {
-                'class': 'kanban-edit-item fa fa-arrow-down',
                 'alt': Messages.kanban_editCard,
             }).click(function (e) {
-                var itemList = el.parentNode.childNodes                
-                var itemArray = Array.from(itemList)
-                var index = itemArray.indexOf(el)
-                if (index < itemArray.length-1) {
-                    moveBoards(itemArray, index, index+1)
-                    var index = itemArray.indexOf(el)
-                    i = index
-                    var itemContainer = el.parentNode
-                    itemContainer.innerHTML = ''; 
-                    itemArray.forEach(item => {
-                        itemContainer.appendChild(item);
-                    });
+                var board = el.parentNode.parentNode.parentNode  
+                var boards = kanban.options.boards
+                var boardId = parseInt($(board).attr("data-id"))
+                var boardIndex = boards.list.indexOf(parseInt(boardId))
+                var elId = parseInt($(el).attr("data-eid"))
+                var boardItems = boards.data[boardId].item
+                let itemIndex = boardItems.indexOf(elId)
+            
+                if (boardIndex < kanban.options.boards.list.length-1) {
+                    var nextBoardItems = boards.data[boardId+1].item
+                    nextBoardItems.unshift(elId)
+                    boardItems.splice(itemIndex, 1)
+                    boards.data[boardId].item = boardItems
+                    updateBoards(framework, kanban, boards)
                 }
             }).insertAfter($(el).find('.kanban-item-text'));
         });
-        $container.find('.kanban-item').each(function (i, el) {
-            $('<button>', {
-                'class': 'kanban-edit-item fa fa-arrow-up',
-                'alt': Messages.kanban_editCard,
-            }).click(function (e) {
-                var itemList = el.parentNode.childNodes                
-                var itemArray = Array.from(itemList)
-                var index = itemArray.indexOf(el)
-                if (index > 0) {
-                    moveBoards(itemArray, index, index-1)
-                    var index = itemArray.indexOf(el)
-                    i = index
-                    var itemContainer = el.parentNode
-                    itemContainer.innerHTML = ''; 
-                    itemArray.forEach(item => {
-                        itemContainer.appendChild(item);
-                    });
-                }
-            }).insertAfter($(el).find('.kanban-item-text'));
-        });
-        // $container.find('.kanban-item').each(function (i, el) {
-        //     $('<button>', {
-        //         'class': 'kanban-edit-item fa fa-arrow-left',
-        //         'alt': Messages.kanban_editCard,
-        //     }).click(function (e) {
-        //         // var itemList = el.parentNode.childNodes     
-        //         var boardList = $container[0].childNodes[0].childNodes[0].childNodes
-
-        //         var board = el.parentNode.parentNode.parentNode     
-        //         // var itemArray = Array.from(itemList)
-        //         var boardsArray = Array.from(boardList)
-        //         boardsArray.slice(boardsArray.length-1, 1)
-        //         console.log(board)
-        //         console.log(boardsArray)
-        //         var index = boardsArray.indexOf(board)
-        //         console.log(index)
-        //         // var index = itemArray.indexOf(el)
-        //         if (index > 0) {
-        //             var moveBoards = function (arr, oldIndex, newIndex) {
-        //                 if (newIndex >= arr.length) {
-        //                     var k = newIndex - arr.length + 1;
-        //                     while (k--) {
-        //                         arr.push(undefined);
-        //                     }
-        //                 }
-        //                 arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
-        //                 return arr;
-        //             };
-        //             moveBoards(itemArray, index, index-1)
-        //             var index = itemArray.indexOf(el)
-        //             i = index
-        //             var itemContainer = el.parentNode
-        //             itemContainer.innerHTML = ''; 
-        //             itemArray.forEach(item => {
-        //                 itemContainer.appendChild(item);
-        //             });
-        //         }
-        //     }).insertAfter($(el).find('.kanban-item-text'));
-        // });
-        // $container.find('.kanban-item').each(function (i, el) {
-        //     $('<button>', {
-        //         'class': 'kanban-edit-item fa fa-arrow-right',
-        //         'alt': Messages.kanban_editCard,
-        //     }).click(function (e) {
-        //         var itemList = el.parentNode.childNodes                
-        //         // var itemArray = Array.from(itemList)
-        //         var index = itemArray.indexOf(el)
-        //         // if (index > 0) {
-        //         //     var moveBoards = function (arr, oldIndex, newIndex) {
-        //         //         if (newIndex >= arr.length) {
-        //         //             var k = newIndex - arr.length + 1;
-        //         //             while (k--) {
-        //         //                 arr.push(undefined);
-        //         //             }
-        //         //         }
-        //         //         arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
-        //         //         return arr;
-        //         //     };
-        //         //     moveBoards(itemArray, index, index-1)
-        //         //     var index = itemArray.indexOf(el)
-        //         //     i = index
-        //         //     var itemContainer = el.parentNode
-        //         //     itemContainer.innerHTML = ''; 
-        //         //     itemArray.forEach(item => {
-        //         //         itemContainer.appendChild(item);
-        //         //     });
-        //         // }
-        //     }).insertAfter($(el).find('.kanban-item-text'));
-        // });
-    
+        }
+        
     }
 
     addEditItemButton = function (framework, kanban) {

From 8bdbfdd1f7d691a4cd760dc7af7ab1162c8a7b3d Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 3 Jan 2025 17:03:05 +0100
Subject: [PATCH 004/114] Refactoring

---
 www/kanban/inner.js      | 169 ++++++++++++++++++---------------------
 www/kanban/jkanban_cp.js |   2 +-
 2 files changed, 78 insertions(+), 93 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 85036d03c..9d6f69264 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -148,7 +148,7 @@ define([
     };
 
     var addEditItemButton = function () {};
-    var addMoveItemButton = function () {}
+    var addMoveElementButton = function () {};
 
     var now = function () { return +new Date(); };
     var _lastUpdate = 0;
@@ -157,7 +157,7 @@ define([
         kanban.setBoards(Util.clone(boards));
         kanban.inEditMode = false;
         addEditItemButton(framework, kanban);
-        addMoveItemButton(framework, kanban)
+        addMoveElementButton(framework, kanban);
     };
     var _updateBoardsThrottle = Util.throttle(_updateBoards, 1000);
     var updateBoards = function (framework, kanban, boards) {
@@ -536,7 +536,7 @@ define([
         UI.openCustomModal(editModal.modal);
     };
 
-    addMoveItemButton = function (framework, kanban) {
+    addMoveElementButton = function (framework, kanban) {
         if ('ontouchstart' in window) {
             if (!kanban) { return; }
             if (framework.isReadOnly() || framework.isLocked()) { return; }
@@ -544,118 +544,103 @@ define([
 
             var move = function (arr, oldIndex, newIndex) {
                 arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
-                return arr;
+                updateBoards(framework, kanban, kanban.options.boards);
+            };
+
+            var moveBetweenBoards = function (nextBoardItems, elId, boardItems, itemIndex, boards, boardId) {
+                nextBoardItems.unshift(elId);
+                boardItems.splice(itemIndex, 1);
+                boards.data[boardId].item = boardItems;
+                updateBoards(framework, kanban, boards);
+            };
+
+            var shiftItem = function (direction, el) {
+                var board = el.parentNode.parentNode.parentNode;
+                var boards = kanban.options.boards;
+                var elId = parseInt($(el).attr("data-eid"));
+                var boardId = parseInt($(board).attr("data-id"));
+                var boardItems = direction === ('up' || 'down') ? kanban.options.boards.data[boardId].item : boards.data[boardId].item;
+                var index = boardItems.indexOf(elId);
+                var boardIndex = boards.list.indexOf(parseInt(boardId));
+                var itemIndex = boardItems.indexOf(elId);
+                let nextBoardItems;
+
+                if (direction === 'up' && index > 0) {
+                    move(boardItems, index, index-1);
+                } else if (direction === 'down' && index < boardItems.length-1) {
+                    move(boardItems, index, index+1);
+                } else if (direction === 'left' && boardIndex > 0) {
+                    nextBoardItems = boards.data[boards.list[boardIndex-1]].item;
+                    moveBetweenBoards(nextBoardItems, elId, boardItems, itemIndex, boards, boardId);
+                } else if (direction === 'right' && boardIndex < kanban.options.boards.list.length-1){
+                    nextBoardItems = boards.data[boards.list[boardIndex+1]].item;
+                    moveBetweenBoards(nextBoardItems, elId, boardItems, itemIndex, boards, boardId);
+                }
+            };
+
+            var shiftBoards = function (direction, el) {
+                var elId = $(el).attr("data-id");
+                var index = kanban.options.boards.list.indexOf(parseInt(elId));
+                if (direction === 'left' && index > 0) {
+                    move(kanban.options.boards.list, index, index-1);
+                } else if (direction === 'right' && index < kanban.options.boards.list.length-1) {
+                    move(kanban.options.boards.list, index, index+1);
+                }
+                setTimeout(function () {
+                    el.scrollIntoView();
+                }, 100);
             };
 
             $container.find('.kanban-board').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-left',
                     'alt': '', 
-                }).click(function (e) { 
-                    var elId = $(el).attr("data-id")
-                    var index = kanban.options.boards.list.indexOf(parseInt(elId))
-                    if (index > 0) {
-                        move(kanban.options.boards.list, index, index-1)
-                        updateBoards(framework, kanban, kanban.options.boards)
-                        el.scrollIntoView()
-                    }
+                }).click(function () { 
+                    shiftBoards('left', el);
                 }).appendTo($(el).find('.kanban-board-header'));
             });
             $container.find('.kanban-board').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-right',
                     'alt': '', 
-                }).click(function (e) {
-                    var elId = $(el).attr("data-id")
-                    var index = kanban.options.boards.list.indexOf(parseInt(elId))
-                    if (index < kanban.options.boards.list.length-1) {
-                        move(kanban.options.boards.list, index, index+1)
-                        updateBoards(framework, kanban, kanban.options.boards)
-                        setTimeout(() => {
-                            el.scrollIntoView()
-                        }, 3000);
-                    }
+                }).click(function () {
+                    shiftBoards('right', el);
                 }).appendTo($(el).find('.kanban-board-header'));
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-down',
                     'alt': Messages.kanban_editCard,
-                }).click(function (e) {
-                    var board = el.parentNode.parentNode.parentNode     
-                    var elId = parseInt($(el).attr("data-eid"))
-                    var boardId = $(board).attr("data-id")
-                    var boardItems = kanban.options.boards.data[boardId].item
-                    var index = boardItems.indexOf(elId)
-                    if (index < boardItems.length-1) {
-                        move(boardItems, index, index+1)
-                        updateBoards(framework, kanban, kanban.options.boards)
-                    }
+                }).click(function () {
+                    shiftItem('down', el);
                 }).insertAfter($(el).find('.kanban-item-text'));
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-up',
                     'alt': Messages.kanban_editCard,
-                }).click(function (e) {
-                    var board = el.parentNode.parentNode.parentNode     
-                    var elId = parseInt($(el).attr("data-eid"))
-                    var boardId = $(board).attr("data-id")
-                    var boardItems = kanban.options.boards.data[boardId].item
-                    var index = boardItems.indexOf(elId)
-                    if (index > 0) {
-                        move(boardItems, index, index-1)
-                        updateBoards(framework, kanban, kanban.options.boards)
-                    }
+                }).click(function () {
+                    shiftItem('up', el);
+                }).insertAfter($(el).find('.kanban-item-text'));
+            });
+            $container.find('.kanban-item').each(function (i, el) {
+                $('<button>', {
+                    'class': 'kanban-edit-item fa fa-arrow-left',
+                    'alt': Messages.kanban_editCard,
+                }).click(function () {
+                    shiftItem('left', el);
+                }).insertAfter($(el).find('.kanban-item-text'));
+            });
+            $container.find('.kanban-item').each(function (i, el) {
+                $('<button>', {
+                    'class': 'kanban-edit-item fa fa-arrow-right',
+                    'alt': Messages.kanban_editCard,
+                }).click(function () {
+                    shiftItem('right', el);
                 }).insertAfter($(el).find('.kanban-item-text'));
             });
-        $container.find('.kanban-item').each(function (i, el) {
-            $('<button>', {
-                'class': 'kanban-edit-item fa fa-arrow-left',
-                'alt': Messages.kanban_editCard,
-            }).click(function (e) {
-                var board = el.parentNode.parentNode.parentNode  
-                var boards = kanban.options.boards
-                var boardId = $(board).attr("data-id")
-                var boardIndex = boards.list.indexOf(parseInt(boardId))
-                var elId = parseInt($(el).attr("data-eid"))
-                var boardItems = boards.data[boardId].item
-                let itemIndex = boardItems.indexOf(elId)
-            
-                if (boardIndex > 0) {
-                    var nextBoardItems = boards.data[boardId-1].item
-                    nextBoardItems.unshift(elId)
-                    boardItems.splice(itemIndex, 1)
-                    boards.data[boardId].item = boardItems
-                    updateBoards(framework, kanban, boards)
-                }
-            }).insertAfter($(el).find('.kanban-item-text'));
-        });
-         $container.find('.kanban-item').each(function (i, el) {
-            $('<button>', {
-                'class': 'kanban-edit-item fa fa-arrow-right',
-                'alt': Messages.kanban_editCard,
-            }).click(function (e) {
-                var board = el.parentNode.parentNode.parentNode  
-                var boards = kanban.options.boards
-                var boardId = parseInt($(board).attr("data-id"))
-                var boardIndex = boards.list.indexOf(parseInt(boardId))
-                var elId = parseInt($(el).attr("data-eid"))
-                var boardItems = boards.data[boardId].item
-                let itemIndex = boardItems.indexOf(elId)
-            
-                if (boardIndex < kanban.options.boards.list.length-1) {
-                    var nextBoardItems = boards.data[boardId+1].item
-                    nextBoardItems.unshift(elId)
-                    boardItems.splice(itemIndex, 1)
-                    boards.data[boardId].item = boardItems
-                    updateBoards(framework, kanban, boards)
-                }
-            }).insertAfter($(el).find('.kanban-item-text'));
-        });
         }
-        
-    }
+    };
 
     addEditItemButton = function (framework, kanban) {
         if (!kanban) { return; }
@@ -792,7 +777,7 @@ define([
                 framework.localChange();
                 if (kanban) {
                     addEditItemButton(framework, kanban);
-                    addMoveItemButton(framework, kanban)
+                    addMoveElementButton(framework, kanban);
                 }
             },
             click: function (el) {
@@ -1098,7 +1083,7 @@ define([
                 kanban.options.tags = t;
                 kanban.setBoards(kanban.options.boards);
                 addEditItemButton(framework, kanban);
-                addMoveItemButton(framework, kanban)
+                addMoveElementButton(framework, kanban);
             };
 
             var redrawList = function (allTags) {
@@ -1310,7 +1295,7 @@ define([
             if (!kanban) { return; }
             if (unlocked) {
                 addEditItemButton(framework, kanban);
-                addMoveItemButton(framework, kanban)
+                addMoveElementButton(framework, kanban);
                 kanban.options.readOnly = false;
                 return void $container.removeClass('cp-app-readonly');
             }
@@ -1415,7 +1400,7 @@ define([
             if (!kanban) {
                 kanban = initKanban(framework, (newContent || {}).content);
                 addEditItemButton(framework, kanban);
-                addMoveItemButton(framework, kanban)
+                addMoveElementButton(framework, kanban);
                 return;
             }
 
diff --git a/www/kanban/jkanban_cp.js b/www/kanban/jkanban_cp.js
index 1b3a9967b..a2f31b708 100644
--- a/www/kanban/jkanban_cp.js
+++ b/www/kanban/jkanban_cp.js
@@ -44,7 +44,7 @@ define([
             getTextColor: function () { return '#000'; },
             cursors: {},
             tags: [],
-            dragBoards: true,
+            dragBoards: 'ontouchstart' in window ? false : true,
             addItemButton: false,
             readOnly: false,
             dragEl: function (/*el, source*/) {},

From e11efec91d4e7d6d30f2709d66338dbf46ded5d9 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 3 Jan 2025 17:55:43 +0100
Subject: [PATCH 005/114] Added alt text

---
 customize.dist/messages.js |  7 +++++++
 www/kanban/inner.js        | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index a5784b495..01cc3a84e 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -136,6 +136,13 @@ define(req, function(AppConfig, Default, Language) {
         }
     };
 
+    Messages.kanban_moveItemUp = 'Move item up'
+    Messages.kanban_moveitemDown = 'Move item down'
+    Messages.kanban_moveitemLeft = 'Move item left'
+    Messages.kanban_moveitemRight = 'Move item right'
+    Messages.kanban_moveBoardLeft = 'Move board left'
+    Messages.kanban_moveBoardRight = 'Move board right'
+
     return Messages;
 
 });
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 9d6f69264..32c25947a 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -594,7 +594,7 @@ define([
             $container.find('.kanban-board').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-left',
-                    'alt': '', 
+                    'alt': Messages.kanban_moveBoardLeft,
                 }).click(function () { 
                     shiftBoards('left', el);
                 }).appendTo($(el).find('.kanban-board-header'));
@@ -602,7 +602,7 @@ define([
             $container.find('.kanban-board').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-right',
-                    'alt': '', 
+                    'alt': Messages.kanban_moveBoardUp,
                 }).click(function () {
                     shiftBoards('right', el);
                 }).appendTo($(el).find('.kanban-board-header'));
@@ -610,7 +610,7 @@ define([
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-down',
-                    'alt': Messages.kanban_editCard,
+                    'alt': Messages.kanban_moveItemDown,
                 }).click(function () {
                     shiftItem('down', el);
                 }).insertAfter($(el).find('.kanban-item-text'));
@@ -618,7 +618,7 @@ define([
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-up',
-                    'alt': Messages.kanban_editCard,
+                    'alt': Messages.kanban_moveItemUp,
                 }).click(function () {
                     shiftItem('up', el);
                 }).insertAfter($(el).find('.kanban-item-text'));
@@ -626,7 +626,7 @@ define([
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-left',
-                    'alt': Messages.kanban_editCard,
+                    'alt': Messages.kanban_moveItemLeft,
                 }).click(function () {
                     shiftItem('left', el);
                 }).insertAfter($(el).find('.kanban-item-text'));
@@ -634,7 +634,7 @@ define([
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-right',
-                    'alt': Messages.kanban_editCard,
+                    'alt': Messages.kanban_moveItemRight,
                 }).click(function () {
                     shiftItem('right', el);
                 }).insertAfter($(el).find('.kanban-item-text'));

From c9f6dd21d5f4a972403f1f4e2ef1cd4629ad5ed4 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 3 Jan 2025 17:57:03 +0100
Subject: [PATCH 006/114] Added translation key markers

---
 customize.dist/messages.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 01cc3a84e..c1c32d0a3 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -136,12 +136,12 @@ define(req, function(AppConfig, Default, Language) {
         }
     };
 
-    Messages.kanban_moveItemUp = 'Move item up'
-    Messages.kanban_moveitemDown = 'Move item down'
-    Messages.kanban_moveitemLeft = 'Move item left'
-    Messages.kanban_moveitemRight = 'Move item right'
-    Messages.kanban_moveBoardLeft = 'Move board left'
-    Messages.kanban_moveBoardRight = 'Move board right'
+    Messages.kanban_moveItemUp = 'Move item up' // XXX
+    Messages.kanban_moveitemDown = 'Move item down' // XXX
+    Messages.kanban_moveitemLeft = 'Move item left' // XXX
+    Messages.kanban_moveitemRight = 'Move item right' // XXX
+    Messages.kanban_moveBoardLeft = 'Move board left' // XXX
+    Messages.kanban_moveBoardRight = 'Move board right' // XXX
 
     return Messages;
 

From 99e20edc1bc4220de31a20135005dd7070a7b012 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 6 Jan 2025 16:02:56 +0100
Subject: [PATCH 007/114] Added arrow buttons for moving question blocks and
 disabled drag on mobile

---
 www/form/app-form.less | 10 ++++++++++
 www/form/inner.js      | 28 +++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 2042999ce..64ab479b2 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -971,6 +971,16 @@
             i { margin-right: 5px; }
             background: fade(@cryptpad_text_col, 10%);
         }
+        .cp-form-block-arrows {
+
+            float: left;
+            padding: 5px;
+            margin-top: -35px;
+            margin-left: -10px;
+            border-radius: 0px @variables_radius 0px 0px;
+            .direction-arrow { margin: 5px; }
+            background: fade(@cryptpad_text_col, 10%);
+        }
     }
 
     .cp-form-type-radio, .cp-form-type-checkbox {
diff --git a/www/form/inner.js b/www/form/inner.js
index 661b0ee98..af60b65be 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4260,12 +4260,38 @@ define([
                     }
                 }
             }
+            let shiftButtons;
+            if ('ontouchstart' in window) {
+                var upButton = h('div.kanban-edit-item.fa.fa-arrow-up.direction-arrow');
+                var downButton = h('div.kanban-edit-item.fa.fa-arrow-down.direction-arrow');
+                var shiftBlock = function(direction) {
+                    var blockIndex = content.order.indexOf(uid);
+                    if (direction === 'up' && blockIndex > 0) {
+                        content.order.splice(blockIndex-1, 0, content.order.splice(blockIndex, 1)[0]);
+                    } else if (direction === 'down' && blockIndex < content.order.length-1) {
+                        content.order.splice(blockIndex+1, 0, content.order.splice(blockIndex, 1)[0]);
+                    }
+                    framework.localChange();
+                    updateForm(framework, content, true);
+                };
+                $(upButton).click(function () {
+                    shiftBlock('up');
+                });
+                $(downButton).click(function () {
+                    shiftBlock('down');
+                });
+                shiftButtons = h('div.cp-form-block-arrows', [
+                    upButton,
+                    downButton
+                ]);
+            }
             var editableCls = editable ? ".editable" : "";
             elements.push(h('div.cp-form-block'+editableCls, {
                 'data-id':uid,
                 'data-type':type
             }, [
                 APP.isEditor ? dragHandle : undefined,
+                shiftButtons,
                 changeType,
                 isStatic ? undefined : q,
                 h('div.cp-form-block-content', [
@@ -4505,7 +4531,7 @@ define([
             return true;
         });
 
-        if (editable) {
+        if (editable && !('ontouchstart' in window)) {
             if (APP.mainSortable) { APP.mainSortable.destroy(); }
             var grabHandle;
             if (window.matchMedia("(pointer: coarse)").matches) {

From 5d0929674e76aca7ab2ef9bbc37367bb019740f3 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 6 Jan 2025 16:20:25 +0100
Subject: [PATCH 008/114] Corrections

---
 www/kanban/inner.js | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 32c25947a..6eee82829 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -547,9 +547,9 @@ define([
                 updateBoards(framework, kanban, kanban.options.boards);
             };
 
-            var moveBetweenBoards = function (nextBoardItems, elId, boardItems, itemIndex, boards, boardId) {
+            var moveBetweenBoards = function (nextBoardItems, elId, boardItems, index, boards, boardId) {
                 nextBoardItems.unshift(elId);
-                boardItems.splice(itemIndex, 1);
+                boardItems.splice(index, 1);
                 boards.data[boardId].item = boardItems;
                 updateBoards(framework, kanban, boards);
             };
@@ -562,7 +562,6 @@ define([
                 var boardItems = direction === ('up' || 'down') ? kanban.options.boards.data[boardId].item : boards.data[boardId].item;
                 var index = boardItems.indexOf(elId);
                 var boardIndex = boards.list.indexOf(parseInt(boardId));
-                var itemIndex = boardItems.indexOf(elId);
                 let nextBoardItems;
 
                 if (direction === 'up' && index > 0) {
@@ -571,10 +570,10 @@ define([
                     move(boardItems, index, index+1);
                 } else if (direction === 'left' && boardIndex > 0) {
                     nextBoardItems = boards.data[boards.list[boardIndex-1]].item;
-                    moveBetweenBoards(nextBoardItems, elId, boardItems, itemIndex, boards, boardId);
+                    moveBetweenBoards(nextBoardItems, elId, boardItems, index, boards, boardId);
                 } else if (direction === 'right' && boardIndex < kanban.options.boards.list.length-1){
                     nextBoardItems = boards.data[boards.list[boardIndex+1]].item;
-                    moveBetweenBoards(nextBoardItems, elId, boardItems, itemIndex, boards, boardId);
+                    moveBetweenBoards(nextBoardItems, elId, boardItems, index, boards, boardId);
                 }
             };
 
@@ -602,7 +601,7 @@ define([
             $container.find('.kanban-board').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-right',
-                    'alt': Messages.kanban_moveBoardUp,
+                    'alt': Messages.kanban_moveBoardRight,
                 }).click(function () {
                     shiftBoards('right', el);
                 }).appendTo($(el).find('.kanban-board-header'));
@@ -667,8 +666,6 @@ define([
                 e.stopPropagation();
             }).appendTo($(el).find('.kanban-board-header'));
         });
-        
-
     };
 
     // Kanban code

From 9c17e1cc309ce2431af42b2ea63f86e71c635f4e Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 6 Jan 2025 16:53:05 +0100
Subject: [PATCH 009/114] Changed updateBoards function

---
 www/kanban/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 6eee82829..c03aa20cf 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -544,14 +544,14 @@ define([
 
             var move = function (arr, oldIndex, newIndex) {
                 arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
-                updateBoards(framework, kanban, kanban.options.boards);
+                _updateBoards(framework, kanban, kanban.options.boards);
             };
 
             var moveBetweenBoards = function (nextBoardItems, elId, boardItems, index, boards, boardId) {
                 nextBoardItems.unshift(elId);
                 boardItems.splice(index, 1);
                 boards.data[boardId].item = boardItems;
-                updateBoards(framework, kanban, boards);
+                _updateBoards(framework, kanban, boards);
             };
 
             var shiftItem = function (direction, el) {

From 0d5e6f0baedc15fc24cb5533e8fc94d390fb7099 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 7 Jan 2025 13:20:07 +0100
Subject: [PATCH 010/114] Arrow layout

---
 www/form/app-form.less |  9 +++++----
 www/form/inner.js      | 10 ++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 64ab479b2..588731a3c 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -972,13 +972,14 @@
             background: fade(@cryptpad_text_col, 10%);
         }
         .cp-form-block-arrows {
-
-            float: left;
+            max-width: fit-content;
+            margin-inline: auto;
             padding: 5px;
             margin-top: -35px;
-            margin-left: -10px;
             border-radius: 0px @variables_radius 0px 0px;
-            .direction-arrow { margin: 5px; }
+            .direction-arrow-down {
+                margin-left: 20px; 
+            }
             background: fade(@cryptpad_text_col, 10%);
         }
     }
diff --git a/www/form/inner.js b/www/form/inner.js
index af60b65be..00129c85c 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4020,10 +4020,8 @@ define([
             var changeType;
             if (editable) {
                 // Drag handle
-                dragHandle = h('span.cp-form-block-drag-handle', [
-                    h('i.fa.fa-ellipsis-h'),
-                    h('i.fa.fa-ellipsis-h'),
-                ]);
+                var dragEllipses = 'ontouchstart' in window ? undefined : [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')]
+                dragHandle = h('span.cp-form-block-drag-handle', dragEllipses);
 
                 // Question
                 var inputQ = h('input', {
@@ -4262,8 +4260,8 @@ define([
             }
             let shiftButtons;
             if ('ontouchstart' in window) {
-                var upButton = h('div.kanban-edit-item.fa.fa-arrow-up.direction-arrow');
-                var downButton = h('div.kanban-edit-item.fa.fa-arrow-down.direction-arrow');
+                var upButton = h('div.kanban-edit-item.fa.fa-arrow-up');
+                var downButton = h('div.kanban-edit-item.fa.fa-arrow-down.direction-arrow-down');
                 var shiftBlock = function(direction) {
                     var blockIndex = content.order.indexOf(uid);
                     if (direction === 'up' && blockIndex > 0) {

From 0b54842e552ca58a2b54b074a92407bc32f85c7a Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Wed, 8 Jan 2025 12:00:24 +0100
Subject: [PATCH 011/114] Fix scrollIntoView referents and remove margins

---
 www/kanban/app-kanban.less | 6 ------
 www/kanban/inner.js        | 5 ++---
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 86e1052b5..0b2e76b41 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -180,9 +180,6 @@
         &:focus-visible {
             outline: @variables_focus_style;
         }
-        @media (hover: none) {
-            margin-right: 20px;
-        }
         @media(max-width:500px) or (max-height:700px)
         {
             margin-right:0px;
@@ -347,9 +344,6 @@
             overflow-y: auto;
             justify-content: space-around;
             min-height: 38px; // Size of one card
-            @media (hover: none) {
-                padding-right: 30px;
-            }
             @media(max-width:500px) or (max-height:700px)
             {
                 padding-right:5px;
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index c03aa20cf..c710746ea 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -552,6 +552,7 @@ define([
                 boardItems.splice(index, 1);
                 boards.data[boardId].item = boardItems;
                 _updateBoards(framework, kanban, boards);
+                $(`.kanban-item[data-eid="${elId}"]`)[0].scrollIntoView()
             };
 
             var shiftItem = function (direction, el) {
@@ -585,9 +586,7 @@ define([
                 } else if (direction === 'right' && index < kanban.options.boards.list.length-1) {
                     move(kanban.options.boards.list, index, index+1);
                 }
-                setTimeout(function () {
-                    el.scrollIntoView();
-                }, 100);
+                $(`.kanban-board[data-id="${elId}"]`)[0].scrollIntoView()
             };
 
             $container.find('.kanban-board').each(function (i, el) {

From 2faf02c36b8566bd27c6f040624225c77f147c88 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 17 Jan 2025 10:35:00 +0100
Subject: [PATCH 012/114] Added drag/arrow toggle

---
 www/kanban/app-kanban.less | 48 ++++++++++++++++++-
 www/kanban/inner.js        | 97 ++++++++++++++++++++++++++++----------
 www/kanban/jkanban_cp.js   |  1 +
 3 files changed, 118 insertions(+), 28 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 0b2e76b41..96adcfbdf 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -171,8 +171,8 @@
     }
 
     .kanban-edit-item {
-        padding: 5px;
         border: 0;
+        float:right;
         background: transparent;
         align-self: flex-start;
         outline-style: none;
@@ -186,6 +186,42 @@
         }
     }
 
+    .item-arrow-container {
+        width: 17%;
+        margin-top: 2%
+    }
+
+    .fa-arrow-right {
+        &.item-arrow {
+            margin-right: -250%
+        }
+        &.board-arrow {
+        
+        }
+    }
+
+    .fa-arrow-left {
+        &.item-arrow {
+            float: left;
+            margin-left: -250%;
+        }
+        &.board-arrow {
+
+        float: left;
+            margin-left: -2%;
+        }
+    }
+
+    .fa-arrow-down {
+        position: absolute;
+        left: 42%;
+    }
+    
+    .fa-arrow-up {
+        position: absolute;
+        left: 54%;
+    }
+
     .cp-kanban-cursors {
         &:empty { display: none; }
         order: 2;
@@ -209,8 +245,10 @@
             }
         }
     }
+    
     .kanban-item {
         display: flex;
+        flex-direction: column;
         align-items: center;
         justify-content: space-between;
         padding: 5px;
@@ -299,6 +337,7 @@
             }
         }
         .kanban-item-text {
+            width: 100%;
             .tools_unselectable();
             cursor: text;
             overflow-wrap: anywhere;
@@ -350,7 +389,6 @@
             }
         }
         header {
-            display: flex;
             flex-wrap: wrap;
             align-items: center;
             padding: 5px 10px;
@@ -521,14 +559,20 @@
             }
         }
     }
+    .toggle-active {
+        background-color: @cp_kanban-fg !important;
+                        color: @cp_app-bg !important;
+    }
     #cp-app-kanban-container {
         &:not(.cp-kanban-quick) {
             #cp-kanban-controls {
                 .cp-kanban-changeView {
+                 &:not(.drag) {
                     span.cp-kanban-view {
                         background-color: @cp_kanban-fg !important;
                         color: @cp_app-bg;
                     }
+                 }
                     // span.cp-kanban-view-small {
                     // }
                 }
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index c710746ea..5256eca26 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -152,12 +152,16 @@ define([
 
     var now = function () { return +new Date(); };
     var _lastUpdate = 0;
-    var _updateBoards = function (framework, kanban, boards) {
+    var _updateBoards = function (framework, kanban, boards, drag) {
         _lastUpdate = now();
         kanban.setBoards(Util.clone(boards));
         kanban.inEditMode = false;
+        if (drag  === undefined) {
+            var toggle = $('#toggle-drag').attr('class').indexOf('toggle-active')
+            drag = toggle != -1 ? false : true
+        }
         addEditItemButton(framework, kanban);
-        addMoveElementButton(framework, kanban);
+        addMoveElementButton(framework, kanban, drag);
     };
     var _updateBoardsThrottle = Util.throttle(_updateBoards, 1000);
     var updateBoards = function (framework, kanban, boards) {
@@ -536,22 +540,22 @@ define([
         UI.openCustomModal(editModal.modal);
     };
 
-    addMoveElementButton = function (framework, kanban) {
-        if ('ontouchstart' in window) {
+    addMoveElementButton = function (framework, kanban, drag) {
+        var $container = $(kanban.element);
+        if ('ontouchstart' in window || drag === false) {
             if (!kanban) { return; }
             if (framework.isReadOnly() || framework.isLocked()) { return; }
-            var $container = $(kanban.element);
 
             var move = function (arr, oldIndex, newIndex) {
                 arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
-                _updateBoards(framework, kanban, kanban.options.boards);
+                _updateBoards(framework, kanban, kanban.options.boards, false);
             };
 
             var moveBetweenBoards = function (nextBoardItems, elId, boardItems, index, boards, boardId) {
                 nextBoardItems.unshift(elId);
                 boardItems.splice(index, 1);
                 boards.data[boardId].item = boardItems;
-                _updateBoards(framework, kanban, boards);
+                _updateBoards(framework, kanban, boards, false);
                 $(`.kanban-item[data-eid="${elId}"]`)[0].scrollIntoView()
             };
 
@@ -588,22 +592,36 @@ define([
                 }
                 $(`.kanban-board[data-id="${elId}"]`)[0].scrollIntoView()
             };
-
             $container.find('.kanban-board').each(function (i, el) {
+                $(el).find('.item-icon-container').remove();
+                var arrowContainer = h('div.item-icon-container')
+                $(arrowContainer).appendTo($(el).find('.kanban-board-header'));
                 $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-left',
+                    'class': 'kanban-edit-item fa fa-arrow-left board-arrow',
                     'alt': Messages.kanban_moveBoardLeft,
                 }).click(function () { 
                     shiftBoards('left', el);
-                }).appendTo($(el).find('.kanban-board-header'));
+                }).appendTo($(el).find('.item-icon-container'));
             });
             $container.find('.kanban-board').each(function (i, el) {
                 $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-right',
+                    'class': 'kanban-edit-item fa fa-arrow-right board-arrow',
                     'alt': Messages.kanban_moveBoardRight,
                 }).click(function () {
                     shiftBoards('right', el);
-                }).appendTo($(el).find('.kanban-board-header'));
+                }).appendTo($(el).find('.item-icon-container'));
+            });
+            $container.find('.kanban-item').each(function (i, el) {
+                $(el).find('.item-arrow-container').remove();
+                var arrowContainerItem = h('div.item-arrow-container')
+                $(arrowContainerItem).appendTo((el));
+                $(el).addClass('kanban-item-mobile')
+                $('<button>', {
+                    'class': 'kanban-edit-item fa fa-arrow-left item-arrow',
+                    'alt': Messages.kanban_moveItemLeft,
+                }).click(function () {
+                    shiftItem('left', el);
+                }).appendTo($(el).find('.item-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
@@ -611,7 +629,7 @@ define([
                     'alt': Messages.kanban_moveItemDown,
                 }).click(function () {
                     shiftItem('down', el);
-                }).insertAfter($(el).find('.kanban-item-text'));
+                }).appendTo($(el).find('.item-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
@@ -619,23 +637,22 @@ define([
                     'alt': Messages.kanban_moveItemUp,
                 }).click(function () {
                     shiftItem('up', el);
-                }).insertAfter($(el).find('.kanban-item-text'));
+                }).appendTo($(el).find('.item-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-left',
-                    'alt': Messages.kanban_moveItemLeft,
-                }).click(function () {
-                    shiftItem('left', el);
-                }).insertAfter($(el).find('.kanban-item-text'));
-            });
-            $container.find('.kanban-item').each(function (i, el) {
-                $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-right',
+                    'class': 'kanban-edit-item fa fa-arrow-right item-arrow',
                     'alt': Messages.kanban_moveItemRight,
                 }).click(function () {
                     shiftItem('right', el);
-                }).insertAfter($(el).find('.kanban-item-text'));
+                }).appendTo($(el).find('.item-arrow-container'));
+            });
+        } else {
+            $container.find('.kanban-board').each(function (i, el) {
+                $(el).find('.item-icon-container').remove();
+            });
+            $container.find('.kanban-item').each(function (i, el) {
+                $(el).find('.item-arrow-container').remove();
             });
         }
     };
@@ -653,7 +670,7 @@ define([
             }).click(function (e) {
                 getItemEditModal(framework, kanban, itemId);
                 e.stopPropagation();
-            }).insertAfter($(el).find('.kanban-item-text'));
+            }).appendTo($(el).find('.kanban-item-text'));
         });
         $container.find('.kanban-board').each(function (i, el) {
             var itemId = $(el).attr('data-id');
@@ -765,6 +782,7 @@ define([
             buttonContent: '❌',
             readOnly: framework.isReadOnly() || framework.isLocked(),
             tagsAnd: _tagsAnd,
+            dragItems: true,
             refresh: function () {
                 onRedraw.fire();
             },
@@ -772,8 +790,10 @@ define([
                 verbose("Board object has changed");
                 framework.localChange();
                 if (kanban) {
+                    var toggle = $('#toggle-drag').attr('class').indexOf('toggle-active')
+                    var drag = toggle != -1 ? false : true
                     addEditItemButton(framework, kanban);
-                    addMoveElementButton(framework, kanban);
+                    addMoveElementButton(framework, kanban, drag);
                 }
             },
             click: function (el) {
@@ -941,6 +961,9 @@ define([
                         item.tags = kanban.options.tags;
                     }
                     kanban.addElement(boardId, item, isTop);
+                    var toggle = $('#toggle-drag').attr('class').indexOf('toggle-active')
+                    var drag = toggle != -1 ? false : true
+                    addMoveElementButton(framework, kanban, drag)
                 };
                 $input.blur(save);
                 $input.keydown(function (e) {
@@ -1164,8 +1187,30 @@ define([
     
             }
 
+            var toggleDrag = h('span#toggle-drag.cp-kanban-view.fa.fa-arrows');
+            let drag = true
+            $(toggleDrag).click(function() {
+                if (drag === false) {
+                    drag = true
+                    kanban.options.dragBoards = true
+                    kanban.options.dragItems = true
+                    $(toggleDrag).removeClass('fa-hand-o-up').addClass('fa-arrows')
+                    addMoveElementButton(framework, kanban, drag);
+                } else {
+                    drag = false
+                    kanban.options.dragBoards = false
+                    kanban.options.dragItems = false
+                    $(toggleDrag).removeClass('fa-arrows').addClass('fa-hand-o-up')
+                    addMoveElementButton(framework, kanban, drag);
+                }
+                $(toggleDrag).toggleClass('toggle-active')
+            })
+
             var container = h('div#cp-kanban-controls', [
                 tags,
+                h('div.cp-kanban-changeView.drag', [
+                    toggleDrag
+                ]),
                 h('div.cp-kanban-changeView', [
                     small,
                     big
diff --git a/www/kanban/jkanban_cp.js b/www/kanban/jkanban_cp.js
index a2f31b708..3b7e594af 100644
--- a/www/kanban/jkanban_cp.js
+++ b/www/kanban/jkanban_cp.js
@@ -336,6 +336,7 @@ define([
                     moves: function (el) {
                         if (self.options.readOnly) { return false; }
                         if (el.classList.contains('new-item')) { return false; }
+                        if ('ontouchstart' in window || self.options.dragItems === false) {return false;}
                         return el.classList.contains('kanban-item');
                     },
                     accepts: function () {

From ea3698976fc8795db66f77597b3eab56893c5f1c Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 17 Jan 2025 14:18:01 +0100
Subject: [PATCH 013/114] Refactoring

---
 customize.dist/messages.js | 12 ++++-----
 www/kanban/app-kanban.less | 52 ++++++++++++++++++++------------------
 www/kanban/inner.js        | 50 +++++++++++++-----------------------
 3 files changed, 51 insertions(+), 63 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index c1c32d0a3..e9c61439d 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -136,12 +136,12 @@ define(req, function(AppConfig, Default, Language) {
         }
     };
 
-    Messages.kanban_moveItemUp = 'Move item up' // XXX
-    Messages.kanban_moveitemDown = 'Move item down' // XXX
-    Messages.kanban_moveitemLeft = 'Move item left' // XXX
-    Messages.kanban_moveitemRight = 'Move item right' // XXX
-    Messages.kanban_moveBoardLeft = 'Move board left' // XXX
-    Messages.kanban_moveBoardRight = 'Move board right' // XXX
+    Messages.kanban_moveItemUp = 'Move item up'; // XXX
+    Messages.kanban_moveitemDown = 'Move item down'; // XXX
+    Messages.kanban_moveitemLeft = 'Move item left'; // XXX
+    Messages.kanban_moveitemRight = 'Move item right'; // XXX
+    Messages.kanban_moveBoardLeft = 'Move board left'; // XXX
+    Messages.kanban_moveBoardRight = 'Move board right'; // XXX
 
     return Messages;
 
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 96adcfbdf..b1ef7ca6a 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -188,40 +188,33 @@
 
     .item-arrow-container {
         width: 17%;
-        margin-top: 2%
+        margin-top: 2%;
+        .fa-arrow-down {
+            position: absolute;
+            left: 42%;
+        }
+        .fa-arrow-up {
+            position: absolute;
+            left: 54%;
+        }
     }
 
     .fa-arrow-right {
         &.item-arrow {
             margin-right: -250%
         }
-        &.board-arrow {
-        
-        }
     }
 
     .fa-arrow-left {
+        float: left;
         &.item-arrow {
-            float: left;
             margin-left: -250%;
         }
         &.board-arrow {
-
-        float: left;
             margin-left: -2%;
         }
     }
 
-    .fa-arrow-down {
-        position: absolute;
-        left: 42%;
-    }
-    
-    .fa-arrow-up {
-        position: absolute;
-        left: 54%;
-    }
-
     .cp-kanban-cursors {
         &:empty { display: none; }
         order: 2;
@@ -245,7 +238,6 @@
             }
         }
     }
-    
     .kanban-item {
         display: flex;
         flex-direction: column;
@@ -351,6 +343,18 @@
                 height: auto;
             }
         }
+        .item-arrow-container {
+            width: 17%;
+            margin-top: 2%;
+            .fa-arrow-down {
+                position: absolute;
+                left: 42%;
+            }
+            .fa-arrow-up {
+                position: absolute;
+                left: 54%;
+            }
+        }
         &.kanban-item-hidden {
             display: none;
         }
@@ -567,14 +571,12 @@
         &:not(.cp-kanban-quick) {
             #cp-kanban-controls {
                 .cp-kanban-changeView {
-                 &:not(.drag) {
-                    span.cp-kanban-view {
-                        background-color: @cp_kanban-fg !important;
-                        color: @cp_app-bg;
+                    &:not(.drag) {
+                        span.cp-kanban-view, .toggle-active {
+                            background-color: @cp_kanban-fg !important;
+                            color: @cp_app-bg;
+                        }
                     }
-                 }
-                    // span.cp-kanban-view-small {
-                    // }
                 }
             }
         }
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 5256eca26..865274cf1 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -152,16 +152,12 @@ define([
 
     var now = function () { return +new Date(); };
     var _lastUpdate = 0;
-    var _updateBoards = function (framework, kanban, boards, drag) {
+    var _updateBoards = function (framework, kanban, boards) {
         _lastUpdate = now();
         kanban.setBoards(Util.clone(boards));
         kanban.inEditMode = false;
-        if (drag  === undefined) {
-            var toggle = $('#toggle-drag').attr('class').indexOf('toggle-active')
-            drag = toggle != -1 ? false : true
-        }
         addEditItemButton(framework, kanban);
-        addMoveElementButton(framework, kanban, drag);
+        addMoveElementButton(framework, kanban);
     };
     var _updateBoardsThrottle = Util.throttle(_updateBoards, 1000);
     var updateBoards = function (framework, kanban, boards) {
@@ -540,8 +536,11 @@ define([
         UI.openCustomModal(editModal.modal);
     };
 
-    addMoveElementButton = function (framework, kanban, drag) {
+    addMoveElementButton = function (framework, kanban) {
         var $container = $(kanban.element);
+        var drag = $('#toggle-drag').attr('class').indexOf('toggle-active') !== -1 ? false : true;
+        kanban.options.dragBoards = drag;
+        kanban.options.dragItems = drag;
         if ('ontouchstart' in window || drag === false) {
             if (!kanban) { return; }
             if (framework.isReadOnly() || framework.isLocked()) { return; }
@@ -556,7 +555,7 @@ define([
                 boardItems.splice(index, 1);
                 boards.data[boardId].item = boardItems;
                 _updateBoards(framework, kanban, boards, false);
-                $(`.kanban-item[data-eid="${elId}"]`)[0].scrollIntoView()
+                $(`.kanban-item[data-eid="${elId}"]`)[0].scrollIntoView();
             };
 
             var shiftItem = function (direction, el) {
@@ -590,11 +589,11 @@ define([
                 } else if (direction === 'right' && index < kanban.options.boards.list.length-1) {
                     move(kanban.options.boards.list, index, index+1);
                 }
-                $(`.kanban-board[data-id="${elId}"]`)[0].scrollIntoView()
+                $(`.kanban-board[data-id="${elId}"]`)[0].scrollIntoView();
             };
             $container.find('.kanban-board').each(function (i, el) {
                 $(el).find('.item-icon-container').remove();
-                var arrowContainer = h('div.item-icon-container')
+                var arrowContainer = h('div.item-icon-container');
                 $(arrowContainer).appendTo($(el).find('.kanban-board-header'));
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-left board-arrow',
@@ -613,9 +612,8 @@ define([
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $(el).find('.item-arrow-container').remove();
-                var arrowContainerItem = h('div.item-arrow-container')
+                var arrowContainerItem = h('div.item-arrow-container');
                 $(arrowContainerItem).appendTo((el));
-                $(el).addClass('kanban-item-mobile')
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-left item-arrow',
                     'alt': Messages.kanban_moveItemLeft,
@@ -790,10 +788,8 @@ define([
                 verbose("Board object has changed");
                 framework.localChange();
                 if (kanban) {
-                    var toggle = $('#toggle-drag').attr('class').indexOf('toggle-active')
-                    var drag = toggle != -1 ? false : true
                     addEditItemButton(framework, kanban);
-                    addMoveElementButton(framework, kanban, drag);
+                    addMoveElementButton(framework, kanban);
                 }
             },
             click: function (el) {
@@ -961,9 +957,7 @@ define([
                         item.tags = kanban.options.tags;
                     }
                     kanban.addElement(boardId, item, isTop);
-                    var toggle = $('#toggle-drag').attr('class').indexOf('toggle-active')
-                    var drag = toggle != -1 ? false : true
-                    addMoveElementButton(framework, kanban, drag)
+                    addMoveElementButton(framework, kanban);
                 };
                 $input.blur(save);
                 $input.keydown(function (e) {
@@ -1188,23 +1182,15 @@ define([
             }
 
             var toggleDrag = h('span#toggle-drag.cp-kanban-view.fa.fa-arrows');
-            let drag = true
             $(toggleDrag).click(function() {
-                if (drag === false) {
-                    drag = true
-                    kanban.options.dragBoards = true
-                    kanban.options.dragItems = true
-                    $(toggleDrag).removeClass('fa-hand-o-up').addClass('fa-arrows')
-                    addMoveElementButton(framework, kanban, drag);
+                if ($('#toggle-drag').attr('class').indexOf('toggle-active') !== -1) {
+                    $(toggleDrag).removeClass('fa-hand-o-up').addClass('fa-arrows');
                 } else {
-                    drag = false
-                    kanban.options.dragBoards = false
-                    kanban.options.dragItems = false
-                    $(toggleDrag).removeClass('fa-arrows').addClass('fa-hand-o-up')
-                    addMoveElementButton(framework, kanban, drag);
+                    $(toggleDrag).removeClass('fa-arrows').addClass('fa-hand-o-up');
                 }
-                $(toggleDrag).toggleClass('toggle-active')
-            })
+                $(toggleDrag).toggleClass('toggle-active');
+                addMoveElementButton(framework, kanban);
+            });
 
             var container = h('div#cp-kanban-controls', [
                 tags,

From 56f8cbc1f6fae81d58f3b5a214250ca157444cd8 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 17 Jan 2025 14:57:28 +0100
Subject: [PATCH 014/114] Cleaning

---
 www/kanban/app-kanban.less | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index b1ef7ca6a..0e5cf3dd3 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -563,10 +563,6 @@
             }
         }
     }
-    .toggle-active {
-        background-color: @cp_kanban-fg !important;
-                        color: @cp_app-bg !important;
-    }
     #cp-app-kanban-container {
         &:not(.cp-kanban-quick) {
             #cp-kanban-controls {

From b3b65e31b705bd0b02684c30663ac1c8734ca895 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 21 Jan 2025 14:24:36 +0100
Subject: [PATCH 015/114] Ensured Store in Drive button hidden if file in drive

---
 www/common/common-ui-elements.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 378ccdb98..7d1b122bf 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -871,7 +871,7 @@ define([
                     h('i.fa.fa-hdd-o'),
                     h('span.cp-toolbar-name.cp-toolbar-drawer-element', Messages.toolbar_storeInDrive)
                 ])).click(common.prepareFeedback(type)).click(function () {
-                    $(button).hide();
+                    $('.cp-toolbar-storeindrive').hide();
                     common.getSframeChannel().query("Q_AUTOSTORE_STORE", {
                         forceOwnDrive: true,
                     }, function (err, obj) {
@@ -3349,6 +3349,9 @@ define([
         if (data && data.stored) {
             if (!data.inMyDrive) {
                 $('.cp-toolbar-storeindrive').show();
+            } else {
+                $('.cp-toolbar-storeindrive').hide();
+
             }
             return;
         }

From 03acd8d6d19b8d1ef2c9756ffb50c8aaa5dfee63 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 21 Jan 2025 16:12:27 +0100
Subject: [PATCH 016/114] UI improvements

---
 customize.dist/translations/messages.js |  4 ++++
 www/form/app-form.less                  |  5 ++---
 www/form/inner.js                       | 15 ++++++++++-----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index df4096367..a7866bdfd 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -13,6 +13,10 @@ define(['/common/translations/messages.js'], function (Messages) {
     // Replace the existing keys in your copied file here:
     // Messages.button_newpad = "New Rich Text Document";
 
+    //NOTE: these keys are also added to the Kanban mobile UI PR #1753
+    Messages.moveItemUp = 'Move item up'; // XXX
+    Messages.moveitemDown = 'Move item down'; // XXX
+
     return Messages;
 });
 
diff --git a/www/form/app-form.less b/www/form/app-form.less
index 588731a3c..f90ed7334 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -974,13 +974,12 @@
         .cp-form-block-arrows {
             max-width: fit-content;
             margin-inline: auto;
-            padding: 5px;
+            padding: 6px;
             margin-top: -35px;
             border-radius: 0px @variables_radius 0px 0px;
-            .direction-arrow-down {
+            .fa-arrow-down {
                 margin-left: 20px; 
             }
-            background: fade(@cryptpad_text_col, 10%);
         }
     }
 
diff --git a/www/form/inner.js b/www/form/inner.js
index 00129c85c..aa1f028cd 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4022,7 +4022,6 @@ define([
                 // Drag handle
                 var dragEllipses = 'ontouchstart' in window ? undefined : [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')]
                 dragHandle = h('span.cp-form-block-drag-handle', dragEllipses);
-
                 // Question
                 var inputQ = h('input', {
                     value: block.q || Messages.form_default
@@ -4260,8 +4259,12 @@ define([
             }
             let shiftButtons;
             if ('ontouchstart' in window) {
-                var upButton = h('div.kanban-edit-item.fa.fa-arrow-up');
-                var downButton = h('div.kanban-edit-item.fa.fa-arrow-down.direction-arrow-down');
+                var upButton = h('div.fa.fa-arrow-up',  {
+                    'title': Messages.moveItemUp
+                });
+                var downButton = h('div.fa.fa-arrow-down', {
+                    'title': Messages.moveitemDown
+                });
                 var shiftBlock = function(direction) {
                     var blockIndex = content.order.indexOf(uid);
                     if (direction === 'up' && blockIndex > 0) {
@@ -4284,7 +4287,8 @@ define([
                 ]);
             }
             var editableCls = editable ? ".editable" : "";
-            elements.push(h('div.cp-form-block'+editableCls, {
+            var draggable = 'ontouchstart' in window ? '.nodrag' : '';
+            elements.push(h('div.cp-form-block'+editableCls+draggable, {
                 'data-id':uid,
                 'data-type':type
             }, [
@@ -4529,13 +4533,14 @@ define([
             return true;
         });
 
-        if (editable && !('ontouchstart' in window)) {
+        if (editable) {
             if (APP.mainSortable) { APP.mainSortable.destroy(); }
             var grabHandle;
             if (window.matchMedia("(pointer: coarse)").matches) {
                 grabHandle = '.cp-form-block-drag-handle';
             } else {
                 grabHandle = null;
+                
             }
             APP.mainSortable = Sortable.create($container[0], {
                 handle: grabHandle,

From 14d7d187142f4292d2f2c1c8a0d484e7ca90c455 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 21 Jan 2025 16:13:49 +0100
Subject: [PATCH 017/114] Linting

---
 www/form/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index aa1f028cd..5839c7b76 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4020,7 +4020,7 @@ define([
             var changeType;
             if (editable) {
                 // Drag handle
-                var dragEllipses = 'ontouchstart' in window ? undefined : [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')]
+                var dragEllipses = 'ontouchstart' in window ? undefined : [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')];
                 dragHandle = h('span.cp-form-block-drag-handle', dragEllipses);
                 // Question
                 var inputQ = h('input', {

From b878d8f9c5a38bc9fcb3a334c37846e7d53e44f4 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 21 Jan 2025 16:15:09 +0100
Subject: [PATCH 018/114] Remove newlines

---
 www/form/inner.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 5839c7b76..c28419f3c 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4540,7 +4540,6 @@ define([
                 grabHandle = '.cp-form-block-drag-handle';
             } else {
                 grabHandle = null;
-                
             }
             APP.mainSortable = Sortable.create($container[0], {
                 handle: grabHandle,

From 7b6a17bf7dab0207a146024bfe4032e5a5fc3e5a Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 21 Jan 2025 16:31:11 +0100
Subject: [PATCH 019/114] Changed translation keys, alt>title

---
 customize.dist/messages.js              |  7 -------
 customize.dist/translations/messages.js |  9 +++++++++
 www/kanban/app-kanban.less              |  6 ++++--
 www/kanban/inner.js                     | 14 +++++++-------
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index e9c61439d..a5784b495 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -136,13 +136,6 @@ define(req, function(AppConfig, Default, Language) {
         }
     };
 
-    Messages.kanban_moveItemUp = 'Move item up'; // XXX
-    Messages.kanban_moveitemDown = 'Move item down'; // XXX
-    Messages.kanban_moveitemLeft = 'Move item left'; // XXX
-    Messages.kanban_moveitemRight = 'Move item right'; // XXX
-    Messages.kanban_moveBoardLeft = 'Move board left'; // XXX
-    Messages.kanban_moveBoardRight = 'Move board right'; // XXX
-
     return Messages;
 
 });
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index df4096367..359536e80 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -13,6 +13,15 @@ define(['/common/translations/messages.js'], function (Messages) {
     // Replace the existing keys in your copied file here:
     // Messages.button_newpad = "New Rich Text Document";
 
+    Messages.kanban_moveitemLeft = 'Move item left'; // XXX
+    Messages.kanban_moveitemRight = 'Move item right'; // XXX
+    Messages.kanban_moveBoardLeft = 'Move board left'; // XXX
+    Messages.kanban_moveBoardRight = 'Move board right'; // XXX
+
+    //NOTE: these keys are also added to the Form mobile UI PR #1753
+    Messages.moveItemUp = 'Move item up'; // XXX
+    Messages.moveitemDown = 'Move item down'; // XXX
+
     return Messages;
 });
 
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 0e5cf3dd3..ff3d05db8 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -34,7 +34,7 @@
         background-color: @palette0;
         color: @cryptpad_color_grey_800;
         border-radius: @variables_radius @variables_radius 0px 0px;
-        button.kanban-edit-item {
+        button.kanban-edit-item, .cp-kanban.arrow {
             color: @cryptpad_color_grey_800;
         }
     }
@@ -170,7 +170,7 @@
         overflow: hidden;
     }
 
-    .kanban-edit-item {
+    .kanban-edit-item, .cp-kanban-arrow {
         border: 0;
         float:right;
         background: transparent;
@@ -186,6 +186,8 @@
         }
     }
 
+    
+
     .item-arrow-container {
         width: 17%;
         margin-top: 2%;
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 865274cf1..9547da6d7 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -596,8 +596,8 @@ define([
                 var arrowContainer = h('div.item-icon-container');
                 $(arrowContainer).appendTo($(el).find('.kanban-board-header'));
                 $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-left board-arrow',
-                    'alt': Messages.kanban_moveBoardLeft,
+                    'class': 'cp-kanban-arrow fa fa-arrow-left board-arrow',
+                    'title': Messages.kanban_moveBoardLeft,
                 }).click(function () { 
                     shiftBoards('left', el);
                 }).appendTo($(el).find('.item-icon-container'));
@@ -605,7 +605,7 @@ define([
             $container.find('.kanban-board').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-right board-arrow',
-                    'alt': Messages.kanban_moveBoardRight,
+                    'title': Messages.kanban_moveBoardRight,
                 }).click(function () {
                     shiftBoards('right', el);
                 }).appendTo($(el).find('.item-icon-container'));
@@ -616,7 +616,7 @@ define([
                 $(arrowContainerItem).appendTo((el));
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-left item-arrow',
-                    'alt': Messages.kanban_moveItemLeft,
+                    'title': Messages.kanban_moveItemLeft,
                 }).click(function () {
                     shiftItem('left', el);
                 }).appendTo($(el).find('.item-arrow-container'));
@@ -624,7 +624,7 @@ define([
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-down',
-                    'alt': Messages.kanban_moveItemDown,
+                    'title': Messages.kanban_moveItemDown,
                 }).click(function () {
                     shiftItem('down', el);
                 }).appendTo($(el).find('.item-arrow-container'));
@@ -632,7 +632,7 @@ define([
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-up',
-                    'alt': Messages.kanban_moveItemUp,
+                    'title': Messages.moveItemUp,
                 }).click(function () {
                     shiftItem('up', el);
                 }).appendTo($(el).find('.item-arrow-container'));
@@ -640,7 +640,7 @@ define([
             $container.find('.kanban-item').each(function (i, el) {
                 $('<button>', {
                     'class': 'kanban-edit-item fa fa-arrow-right item-arrow',
-                    'alt': Messages.kanban_moveItemRight,
+                    'title': Messages.moveItemRight,
                 }).click(function () {
                     shiftItem('right', el);
                 }).appendTo($(el).find('.item-arrow-container'));

From 82d8f617a246bc0b33aadde034bc029995ce3158 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 21 Jan 2025 16:32:11 +0100
Subject: [PATCH 020/114] Corrected translation keys note

---
 customize.dist/translations/messages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index a7866bdfd..a4aa81611 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -13,7 +13,7 @@ define(['/common/translations/messages.js'], function (Messages) {
     // Replace the existing keys in your copied file here:
     // Messages.button_newpad = "New Rich Text Document";
 
-    //NOTE: these keys are also added to the Kanban mobile UI PR #1753
+    //NOTE: these keys are also added to the Kanban mobile UI PR #1727
     Messages.moveItemUp = 'Move item up'; // XXX
     Messages.moveitemDown = 'Move item down'; // XXX
 

From 71adcd956b983897850fcfef2c072592ad521b90 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 21 Jan 2025 16:40:13 +0100
Subject: [PATCH 021/114] Remove redundant code

---
 www/common/common-ui-elements.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 7d1b122bf..1693d8ab2 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -865,9 +865,7 @@ define([
                 if (callback) { button.click(callback); }
                 break;
             case 'storeindrive':
-                button = $(h('button.cp-toolbar-storeindrive', {
-                    style: 'display:none;'
-                }, [
+                button = $(h('button.cp-toolbar-storeindrive', [
                     h('i.fa.fa-hdd-o'),
                     h('span.cp-toolbar-name.cp-toolbar-drawer-element', Messages.toolbar_storeInDrive)
                 ])).click(common.prepareFeedback(type)).click(function () {
@@ -3351,7 +3349,6 @@ define([
                 $('.cp-toolbar-storeindrive').show();
             } else {
                 $('.cp-toolbar-storeindrive').hide();
-
             }
             return;
         }

From b7a0eb3c3a7056ae1ca937ca93c70e9b5c8e2690 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 21 Jan 2025 17:31:50 +0100
Subject: [PATCH 022/114] Added aria-hidden

---
 www/form/inner.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index c28419f3c..3d92f90d4 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4259,11 +4259,13 @@ define([
             }
             let shiftButtons;
             if ('ontouchstart' in window) {
-                var upButton = h('div.fa.fa-arrow-up',  {
-                    'title': Messages.moveItemUp
+                var upButton = h('i.fa.fa-arrow-up',  {
+                    'title': Messages.moveItemUp,
+                    'aria-hidden': true
                 });
-                var downButton = h('div.fa.fa-arrow-down', {
-                    'title': Messages.moveitemDown
+                var downButton = h('i.fa.fa-arrow-down', {
+                    'title': Messages.moveitemDown,
+                    'aria-hidden': true
                 });
                 var shiftBlock = function(direction) {
                     var blockIndex = content.order.indexOf(uid);

From b9481ec40d7209dbca7b95ea212c75fc99d7eba9 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 21 Jan 2025 17:56:00 +0100
Subject: [PATCH 023/114] Set aria-hidden to true

---
 www/kanban/app-kanban.less |  3 ++-
 www/kanban/inner.js        | 28 +++++++++++++++++-----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index ff3d05db8..f643cbe22 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -34,7 +34,7 @@
         background-color: @palette0;
         color: @cryptpad_color_grey_800;
         border-radius: @variables_radius @variables_radius 0px 0px;
-        button.kanban-edit-item, .cp-kanban.arrow {
+        button.kanban-edit-item, .cp-kanban-arrow {
             color: @cryptpad_color_grey_800;
         }
     }
@@ -398,6 +398,7 @@
             flex-wrap: wrap;
             align-items: center;
             padding: 5px 10px;
+            // cursor: pointer;
             cursor: move;
             cursor: grab;
             .kanban-title-board {
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 9547da6d7..53b7ff9be 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -595,17 +595,19 @@ define([
                 $(el).find('.item-icon-container').remove();
                 var arrowContainer = h('div.item-icon-container');
                 $(arrowContainer).appendTo($(el).find('.kanban-board-header'));
-                $('<button>', {
+                $('<i>', {
                     'class': 'cp-kanban-arrow fa fa-arrow-left board-arrow',
                     'title': Messages.kanban_moveBoardLeft,
+                    'aria-hidden': true
                 }).click(function () { 
                     shiftBoards('left', el);
                 }).appendTo($(el).find('.item-icon-container'));
             });
             $container.find('.kanban-board').each(function (i, el) {
-                $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-right board-arrow',
+                $('<i>', {
+                    'class': 'cp-kanban-arrow fa fa-arrow-right board-arrow',
                     'title': Messages.kanban_moveBoardRight,
+                    'aria-hidden': true
                 }).click(function () {
                     shiftBoards('right', el);
                 }).appendTo($(el).find('.item-icon-container'));
@@ -614,33 +616,37 @@ define([
                 $(el).find('.item-arrow-container').remove();
                 var arrowContainerItem = h('div.item-arrow-container');
                 $(arrowContainerItem).appendTo((el));
-                $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-left item-arrow',
+                $('<i>', {
+                    'class': 'cp-kanban-arrow fa fa-arrow-left item-arrow',
                     'title': Messages.kanban_moveItemLeft,
+                    'aria-hidden': true
                 }).click(function () {
                     shiftItem('left', el);
                 }).appendTo($(el).find('.item-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
-                $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-down',
+                $('<i>', {
+                    'class': 'cp-kanban-arrow fa fa-arrow-down',
                     'title': Messages.kanban_moveItemDown,
+                    'aria-hidden': true
                 }).click(function () {
                     shiftItem('down', el);
                 }).appendTo($(el).find('.item-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
-                $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-up',
+                $('<i>', {
+                    'class': 'cp-kanban-arrow fa fa-arrow-up',
                     'title': Messages.moveItemUp,
+                    'aria-hidden': true
                 }).click(function () {
                     shiftItem('up', el);
                 }).appendTo($(el).find('.item-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
-                $('<button>', {
-                    'class': 'kanban-edit-item fa fa-arrow-right item-arrow',
+                $('<i>', {
+                    'class': 'cp-kanban-arrow fa fa-arrow-right item-arrow',
                     'title': Messages.moveItemRight,
+                    'aria-hidden': true
                 }).click(function () {
                     shiftItem('right', el);
                 }).appendTo($(el).find('.item-arrow-container'));

From b56d5990ca19a14ec138e6b336980094ca8a9000 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Wed, 22 Jan 2025 14:03:38 +0200
Subject: [PATCH 024/114] Enable toggling between editor and preview on mobile
 #1367

---
 www/code/app-code.less |  8 ++--
 www/code/inner.js      | 94 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 82 insertions(+), 20 deletions(-)

diff --git a/www/code/app-code.less b/www/code/app-code.less
index 740468821..09aeb8260 100644
--- a/www/code/app-code.less
+++ b/www/code/app-code.less
@@ -137,7 +137,7 @@
     @media (max-width: @browser_media-medium-screen) {
         #cp-app-code-editor {
             &.cp-app-code-present {
-                #cp-app-code-container { display: none !important; }
+                //#cp-app-code-container { display: none !important; }
                 #cp-app-code-preview {
                     flex: 1;
                     max-width: 100%;
@@ -156,9 +156,9 @@
                         padding-bottom: 100px;
                     }
                 }
-                #cp-app-code-preview {
-                    display: none !important;
-                }
+                // #cp-app-code-preview {
+                //     display: none !important;
+                // }
             }
         }
     }
diff --git a/www/code/inner.js b/www/code/inner.js
index 4be60351a..7bf8d4146 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -177,6 +177,15 @@ define([
         });
     };
 
+    function showEditor() {
+        $previewContainer.hide();
+        $codeMirrorContainer.show();
+        $previewButton.removeClass('cp-toolbar-button-active');
+        framework._.sfCommon.setPadAttribute('previewMode', false, function (e) {
+            if (e) { console.error(e); }
+        });
+    }
+
     var mkPreviewPane = function (editor, CodeMirror, framework, isPresentMode) {
         var $previewContainer = $('#cp-app-code-preview');
         var $preview = $('#cp-app-code-preview-content');
@@ -216,23 +225,44 @@ define([
             previewTo = setTimeout(function () {
                 $codeMirror.removeClass('transition');
             }, 500);
-            if (!previews[CodeMirror.highlightMode]) {
-                $previewContainer.show();
-            }
-            $previewContainer.toggle();
-            if ($previewContainer.is(':visible')) {
-                forceDrawPreview();
-                $codeMirrorContainer.removeClass('cp-app-code-fullpage');
-                $previewButton.addClass('cp-toolbar-button-active');
-                framework._.sfCommon.setPadAttribute('previewMode', true, function (e) {
-                    if (e) { return console.log(e); }
-                });
+            var isSmallScreen = window.innerWidth <= 600;
+
+            if (isSmallScreen) {
+                if ($previewContainer.is(':visible')) {
+                    $previewContainer.hide();
+                    $codeMirrorContainer.show(); // Show the editor container
+                    $previewButton.removeClass('cp-toolbar-button-active');
+                    framework._.sfCommon.setPadAttribute('previewMode', false, function (e) {
+                        if (e) { return console.log(e); }
+                    });
+                } else {
+                    $previewContainer.show();
+                    $codeMirrorContainer.hide(); // Hide the editor container
+                    $previewButton.addClass('cp-toolbar-button-active');
+                    forceDrawPreview();
+                    framework._.sfCommon.setPadAttribute('previewMode', true, function (e) {
+                        if (e) { return console.log(e); }
+                    });
+                }
             } else {
-                $codeMirrorContainer.addClass('cp-app-code-fullpage');
-                $previewButton.removeClass('cp-toolbar-button-active');
-                framework._.sfCommon.setPadAttribute('previewMode', false, function (e) {
-                    if (e) { return console.log(e); }
-                });
+                if (!previews[CodeMirror.highlightMode]) {
+                    $previewContainer.show();
+                }
+                $previewContainer.toggle();
+                if ($previewContainer.is(':visible')) {
+                    forceDrawPreview();
+                    $codeMirrorContainer.removeClass('cp-app-code-fullpage');
+                    $previewButton.addClass('cp-toolbar-button-active');
+                    framework._.sfCommon.setPadAttribute('previewMode', true, function (e) {
+                        if (e) { return console.log(e); }
+                    });
+                } else {
+                    $codeMirrorContainer.addClass('cp-app-code-fullpage');
+                    $previewButton.removeClass('cp-toolbar-button-active');
+                    framework._.sfCommon.setPadAttribute('previewMode', false, function (e) {
+                        if (e) { return console.log(e); }
+                    });
+                }
             }
         });
 
@@ -286,6 +316,38 @@ define([
         };
 
         framework.onReady(function () {
+
+            //handle refresh
+            var isSmallScreen = window.innerWidth <= 700;
+
+            framework._.sfCommon.getPadAttribute('previewMode', function (e, previewMode) {
+                if (e) { return console.error(e); }
+                if (isSmallScreen) {
+                    if (previewMode) {
+
+                        $previewContainer.show();
+                        $codeMirrorContainer.hide();
+                        $previewButton.addClass('cp-toolbar-button-active');
+                        forceDrawPreview();
+                    } else {
+                        $previewContainer.hide();
+                        $codeMirrorContainer.show();
+                        $previewButton.removeClass('cp-toolbar-button-active');
+                    }
+                } else {
+                    if (previewMode) {
+                        $previewContainer.show();
+                        $codeMirrorContainer.removeClass('cp-app-code-fullpage');
+                        $previewButton.addClass('cp-toolbar-button-active');
+                        forceDrawPreview();
+                    } else {
+                        $previewContainer.hide();
+                        $codeMirrorContainer.addClass('cp-app-code-fullpage');
+                        $previewButton.removeClass('cp-toolbar-button-active');
+                    }
+                }
+            });
+
             // add the splitter
             var splitter = $('<div>', {
                 'class': 'cp-splitter'

From 499e65cdb1ec39440c7a3f36457b562eea854bbf Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Wed, 18 Dec 2024 16:26:05 +0200
Subject: [PATCH 025/114] Fix overflow of long questions + required weird
 sizing #1722

---
 www/form/app-form.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 2042999ce..0c9a5d510 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -605,12 +605,15 @@
                         }
                         .cp-form-block-question-text {
                             flex: 1;
+                            word-wrap: break-word;
+                            overflow: hidden;
                         }
                         .cp-form-required-tag {
                             padding: 5px;
                             margin-top: -10px;
                             margin-right: -10px;
                             &.cp-is-empty {
+                                max-height: fit-content;
                                 padding: 3px;
                                 border: 2px solid @cryptpad_color_red;
                                 color: @cp_form-invalid;

From 5520abb87c4d2e7cb86c74f31180083ee99dda98 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Wed, 22 Jan 2025 12:29:45 +0200
Subject: [PATCH 026/114] Change to rem unit #1722

---
 www/form/app-form.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 0c9a5d510..0ffb26c93 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -613,7 +613,7 @@
                             margin-top: -10px;
                             margin-right: -10px;
                             &.cp-is-empty {
-                                max-height: fit-content;
+                                max-height: 2rem;
                                 padding: 3px;
                                 border: 2px solid @cryptpad_color_red;
                                 color: @cp_form-invalid;

From 97b23ffc2bc0f1d3ca4784b361473f96471165f2 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Thu, 23 Jan 2025 15:49:39 +0100
Subject: [PATCH 027/114] UI adjustments - item arrow/edit button layout, two
 toggles

---
 www/kanban/app-kanban.less | 67 +++++++++++++++++++-------------------
 www/kanban/inner.js        | 40 ++++++++++++++---------
 www/kanban/jkanban_cp.js   | 10 ++++--
 3 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index f643cbe22..fc629f270 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -177,6 +177,7 @@
         align-self: flex-start;
         outline-style: none;
         border-radius: @variables_radius;
+        cursor: pointer;
         &:focus-visible {
             outline: @variables_focus_style;
         }
@@ -189,31 +190,22 @@
     
 
     .item-arrow-container {
-        width: 17%;
+        width: 100%;
         margin-top: 2%;
+        display: flex;
+        justify-content: space-between;
         .fa-arrow-down {
-            position: absolute;
-            left: 42%;
+            margin-left: 5px
         }
         .fa-arrow-up {
-            position: absolute;
-            left: 54%;
-        }
-    }
-
-    .fa-arrow-right {
-        &.item-arrow {
-            margin-right: -250%
+            margin-right: 5px
         }
     }
 
     .fa-arrow-left {
-        float: left;
-        &.item-arrow {
-            margin-left: -250%;
-        }
         &.board-arrow {
             margin-left: -2%;
+            float: left;
         }
     }
 
@@ -252,8 +244,11 @@
         box-shadow: @cryptpad_ui_shadow;
         .tools_unselectable();
         touch-action: none;
-        cursor: move;
-        cursor: grab;
+        &:not(.no-drag) {
+            cursor: move;
+            cursor: grab;
+        }
+        
 
         margin-bottom: 5px;
         &:last-child {
@@ -330,11 +325,12 @@
                 font-size: 12px;
             }
         }
-        .kanban-item-text {
+        .kanban-item-text-container {
             width: 100%;
             .tools_unselectable();
             cursor: text;
             overflow-wrap: anywhere;
+            display: flex;
             flex: 1;
             &:empty::before {
               content: "\200b";
@@ -344,19 +340,11 @@
                 padding: 0;
                 height: auto;
             }
-        }
-        .item-arrow-container {
-            width: 17%;
-            margin-top: 2%;
-            .fa-arrow-down {
-                position: absolute;
-                left: 42%;
-            }
-            .fa-arrow-up {
-                position: absolute;
-                left: 54%;
+            .kanban-item-text {
+                width: 100%;
             }
         }
+
         &.kanban-item-hidden {
             display: none;
         }
@@ -398,9 +386,10 @@
             flex-wrap: wrap;
             align-items: center;
             padding: 5px 10px;
-            // cursor: pointer;
-            cursor: move;
-            cursor: grab;
+            &:not(.no-drag) {
+                cursor: move;
+                cursor: grab;
+            }
             .kanban-title-board {
                 flex: 1;
                 min-width: 0;
@@ -546,6 +535,10 @@
             right: 10px;
             height: 30px;
             width: 60px;
+            &.drag {
+                margin-right: 10px;
+            }
+            
             span {
                 height: 30px;
                 width: 30px;
@@ -563,6 +556,7 @@
                 &:last-child {
                     border-radius: 0px @variables_radius @variables_radius 0px;
                 }
+
             }
         }
     }
@@ -570,15 +564,20 @@
         &:not(.cp-kanban-quick) {
             #cp-kanban-controls {
                 .cp-kanban-changeView {
-                    &:not(.drag) {
-                        span.cp-kanban-view, .toggle-active {
+                    span.cp-kanban-view {
+                        &:not(.toggle-inactive) {
                             background-color: @cp_kanban-fg !important;
                             color: @cp_app-bg;
                         }
+                        
                     }
                 }
             }
         }
+        .toggle-active {
+            background-color: @cp_kanban-fg !important;
+            color: @cp_app-bg;
+        }
         &.cp-kanban-quick {
             #cp-kanban-controls {
                 .cp-kanban-changeView {
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 53b7ff9be..46bb7b34d 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -538,10 +538,10 @@ define([
 
     addMoveElementButton = function (framework, kanban) {
         var $container = $(kanban.element);
-        var drag = $('#toggle-drag').attr('class').indexOf('toggle-active') !== -1 ? false : true;
+        var drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
         kanban.options.dragBoards = drag;
         kanban.options.dragItems = drag;
-        if ('ontouchstart' in window || drag === false) {
+        if (drag === false) {
             if (!kanban) { return; }
             if (framework.isReadOnly() || framework.isLocked()) { return; }
 
@@ -592,6 +592,7 @@ define([
                 $(`.kanban-board[data-id="${elId}"]`)[0].scrollIntoView();
             };
             $container.find('.kanban-board').each(function (i, el) {
+                $(el).find('.kanban-board-header').addClass('no-drag');
                 $(el).find('.item-icon-container').remove();
                 var arrowContainer = h('div.item-icon-container');
                 $(arrowContainer).appendTo($(el).find('.kanban-board-header'));
@@ -613,6 +614,7 @@ define([
                 }).appendTo($(el).find('.item-icon-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
+                $(el).addClass('no-drag');
                 $(el).find('.item-arrow-container').remove();
                 var arrowContainerItem = h('div.item-arrow-container');
                 $(arrowContainerItem).appendTo((el));
@@ -625,13 +627,15 @@ define([
                 }).appendTo($(el).find('.item-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
+                var centralArrowContainerItem = h('div.item-central-arrow-container');
+                $(centralArrowContainerItem).appendTo($(el).find('.item-arrow-container'));
                 $('<i>', {
                     'class': 'cp-kanban-arrow fa fa-arrow-down',
                     'title': Messages.kanban_moveItemDown,
                     'aria-hidden': true
                 }).click(function () {
                     shiftItem('down', el);
-                }).appendTo($(el).find('.item-arrow-container'));
+                }).appendTo($(el).find('.item-central-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $('<i>', {
@@ -640,7 +644,7 @@ define([
                     'aria-hidden': true
                 }).click(function () {
                     shiftItem('up', el);
-                }).appendTo($(el).find('.item-arrow-container'));
+                }).appendTo($(el).find('.item-central-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $('<i>', {
@@ -654,9 +658,11 @@ define([
         } else {
             $container.find('.kanban-board').each(function (i, el) {
                 $(el).find('.item-icon-container').remove();
+                $(el).find('.kanban-board-header').removeClass('no-drag');
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $(el).find('.item-arrow-container').remove();
+                $(el).removeClass('no-drag');
             });
         }
     };
@@ -674,7 +680,7 @@ define([
             }).click(function (e) {
                 getItemEditModal(framework, kanban, itemId);
                 e.stopPropagation();
-            }).appendTo($(el).find('.kanban-item-text'));
+            }).appendTo($(el).find('.kanban-item-text-container'));
         });
         $container.find('.kanban-board').each(function (i, el) {
             var itemId = $(el).attr('data-id');
@@ -1186,22 +1192,26 @@ define([
                 });
     
             }
-
-            var toggleDrag = h('span#toggle-drag.cp-kanban-view.fa.fa-arrows');
-            $(toggleDrag).click(function() {
-                if ($('#toggle-drag').attr('class').indexOf('toggle-active') !== -1) {
-                    $(toggleDrag).removeClass('fa-hand-o-up').addClass('fa-arrows');
-                } else {
-                    $(toggleDrag).removeClass('fa-arrows').addClass('fa-hand-o-up');
-                }
-                $(toggleDrag).toggleClass('toggle-active');
+            var toggleOffclass = 'ontouchstart' in window ? 'toggle-active' : 'toggle-inactive'; 
+            var toggleOnclass = 'ontouchstart' in window ? 'toggle-inactive' : 'toggle-active'; 
+            var toggleDragOff = h(`span#toggle-drag-off.cp-kanban-view.${toggleOffclass}.fa.fa-arrows`);
+            $(toggleDragOff).click(function() {
+                $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');
+                $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
+                addMoveElementButton(framework, kanban);
+            });
+            var toggleDragOn = h(`span#toggle-drag-on.cp-kanban-view.${toggleOnclass}.fa.fa-hand-o-up`);
+            $(toggleDragOn).click(function() {
+                $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
+                $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 addMoveElementButton(framework, kanban);
             });
 
             var container = h('div#cp-kanban-controls', [
                 tags,
                 h('div.cp-kanban-changeView.drag', [
-                    toggleDrag
+                    toggleDragOff,
+                    toggleDragOn
                 ]),
                 h('div.cp-kanban-changeView', [
                     small,
diff --git a/www/kanban/jkanban_cp.js b/www/kanban/jkanban_cp.js
index 3b7e594af..22c465d15 100644
--- a/www/kanban/jkanban_cp.js
+++ b/www/kanban/jkanban_cp.js
@@ -336,7 +336,7 @@ define([
                     moves: function (el) {
                         if (self.options.readOnly) { return false; }
                         if (el.classList.contains('new-item')) { return false; }
-                        if ('ontouchstart' in window || self.options.dragItems === false) {return false;}
+                        if (self.options.dragItems === false) {return false;}
                         return el.classList.contains('kanban-item');
                     },
                     accepts: function () {
@@ -530,11 +530,15 @@ define([
                 var el = self.options.getAvatar(c);
                 nodeCursors.appendChild(el);
             });
-            var nodeItemText = document.createElement('div');
+            var nodeItemTextContainer = document.createElement('div');
+            nodeItemTextContainer.classList.add('kanban-item-text-container');
+            nodeItem.appendChild(nodeItemTextContainer);
+            var nodeItemText  = document.createElement('div');
             nodeItemText.classList.add('kanban-item-text');
             nodeItemText.dataset.eid = element.id;
             nodeItemText.innerText = element.title;
-            nodeItem.appendChild(nodeItemText);
+            nodeItemTextContainer.appendChild(nodeItemText);
+            
             // Check if this card is filtered out
             if (Array.isArray(self.options.tags) && self.options.tags.length) {
                 var hide;

From 548f5eaba91e8e7e837b41d0f5d29fc9256b39fe Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Wed, 5 Feb 2025 14:01:07 +0100
Subject: [PATCH 028/114] Accessibility pt1

---
 www/kanban/app-kanban.less | 16 ++++++++++------
 www/kanban/inner.js        | 16 ++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index fc629f270..701a06e3f 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -539,7 +539,8 @@
                 margin-right: 10px;
             }
             
-            span {
+            span, button {
+                border: 0;
                 height: 30px;
                 width: 30px;
                 line-height: 30px;
@@ -557,6 +558,7 @@
                     border-radius: 0px @variables_radius @variables_radius 0px;
                 }
 
+
             }
         }
     }
@@ -565,11 +567,13 @@
             #cp-kanban-controls {
                 .cp-kanban-changeView {
                     span.cp-kanban-view {
-                        &:not(.toggle-inactive) {
-                            background-color: @cp_kanban-fg !important;
-                            color: @cp_app-bg;
+                        background-color: @cp_kanban-fg !important;
+                        color: @cp_app-bg;
+                    }
+                    button.cp-kanban-view {
+                        &:not(.toggle-active) {
+                            color: @cp_kanban-fg !important;
                         }
-                        
                     }
                 }
             }
@@ -583,7 +587,7 @@
                 .cp-kanban-changeView {
                     // span.cp-kanban-view {
                     // }
-                    span.cp-kanban-view-small {
+                    button.cp-kanban-view-small {
                         background-color: @cp_kanban-fg !important;
                         color: @cp_app-bg;
                     }
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 46bb7b34d..e4ef51493 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -596,7 +596,7 @@ define([
                 $(el).find('.item-icon-container').remove();
                 var arrowContainer = h('div.item-icon-container');
                 $(arrowContainer).appendTo($(el).find('.kanban-board-header'));
-                $('<i>', {
+                $('<button>', {
                     'class': 'cp-kanban-arrow fa fa-arrow-left board-arrow',
                     'title': Messages.kanban_moveBoardLeft,
                     'aria-hidden': true
@@ -605,7 +605,7 @@ define([
                 }).appendTo($(el).find('.item-icon-container'));
             });
             $container.find('.kanban-board').each(function (i, el) {
-                $('<i>', {
+                $('<button>', {
                     'class': 'cp-kanban-arrow fa fa-arrow-right board-arrow',
                     'title': Messages.kanban_moveBoardRight,
                     'aria-hidden': true
@@ -618,7 +618,7 @@ define([
                 $(el).find('.item-arrow-container').remove();
                 var arrowContainerItem = h('div.item-arrow-container');
                 $(arrowContainerItem).appendTo((el));
-                $('<i>', {
+                $('<button>', {
                     'class': 'cp-kanban-arrow fa fa-arrow-left item-arrow',
                     'title': Messages.kanban_moveItemLeft,
                     'aria-hidden': true
@@ -629,7 +629,7 @@ define([
             $container.find('.kanban-item').each(function (i, el) {
                 var centralArrowContainerItem = h('div.item-central-arrow-container');
                 $(centralArrowContainerItem).appendTo($(el).find('.item-arrow-container'));
-                $('<i>', {
+                $('<button>', {
                     'class': 'cp-kanban-arrow fa fa-arrow-down',
                     'title': Messages.kanban_moveItemDown,
                     'aria-hidden': true
@@ -638,7 +638,7 @@ define([
                 }).appendTo($(el).find('.item-central-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
-                $('<i>', {
+                $('<button>', {
                     'class': 'cp-kanban-arrow fa fa-arrow-up',
                     'title': Messages.moveItemUp,
                     'aria-hidden': true
@@ -647,7 +647,7 @@ define([
                 }).appendTo($(el).find('.item-central-arrow-container'));
             });
             $container.find('.kanban-item').each(function (i, el) {
-                $('<i>', {
+                $('<button>', {
                     'class': 'cp-kanban-arrow fa fa-arrow-right item-arrow',
                     'title': Messages.moveItemRight,
                     'aria-hidden': true
@@ -1194,13 +1194,13 @@ define([
             }
             var toggleOffclass = 'ontouchstart' in window ? 'toggle-active' : 'toggle-inactive'; 
             var toggleOnclass = 'ontouchstart' in window ? 'toggle-inactive' : 'toggle-active'; 
-            var toggleDragOff = h(`span#toggle-drag-off.cp-kanban-view.${toggleOffclass}.fa.fa-arrows`);
+            var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view.${toggleOffclass}.fa.fa-arrows`);
             $(toggleDragOff).click(function() {
                 $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 addMoveElementButton(framework, kanban);
             });
-            var toggleDragOn = h(`span#toggle-drag-on.cp-kanban-view.${toggleOnclass}.fa.fa-hand-o-up`);
+            var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view.${toggleOnclass}.fa.fa-hand-o-up`);
             $(toggleDragOn).click(function() {
                 $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');

From 6ea3449752e2432b9542df99fd48d47c3e021b95 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Wed, 5 Feb 2025 15:35:54 +0100
Subject: [PATCH 029/114] Accessibility fixes pt2

---
 www/kanban/app-kanban.less | 32 +++++++++++++++++---------------
 www/kanban/inner.js        |  8 ++++----
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 701a06e3f..5270089a7 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -191,7 +191,7 @@
 
     .item-arrow-container {
         width: 100%;
-        margin-top: 2%;
+        margin-top: 5%;
         display: flex;
         justify-content: space-between;
         .fa-arrow-down {
@@ -539,7 +539,7 @@
                 margin-right: 10px;
             }
             
-            span, button {
+            button {
                 border: 0;
                 height: 30px;
                 width: 30px;
@@ -547,6 +547,7 @@
                 text-align: center;
                 display: inline-block;
                 background-color: @board-bg;
+                color: @cp_kanban-fg !important;
                 cursor: pointer;
                 &:hover {
                     background-color: darken(@board-bg, 10%);
@@ -566,30 +567,22 @@
         &:not(.cp-kanban-quick) {
             #cp-kanban-controls {
                 .cp-kanban-changeView {
-                    span.cp-kanban-view {
-                        background-color: @cp_kanban-fg !important;
-                        color: @cp_app-bg;
-                    }
                     button.cp-kanban-view {
-                        &:not(.toggle-active) {
-                            color: @cp_kanban-fg !important;
-                        }
+                        background-color: @cp_kanban-fg;
+                        color: @cp_app-bg !important;
                     }
+
                 }
             }
         }
-        .toggle-active {
-            background-color: @cp_kanban-fg !important;
-            color: @cp_app-bg;
-        }
         &.cp-kanban-quick {
             #cp-kanban-controls {
                 .cp-kanban-changeView {
                     // span.cp-kanban-view {
                     // }
                     button.cp-kanban-view-small {
-                        background-color: @cp_kanban-fg !important;
-                        color: @cp_app-bg;
+                        background-color: @cp_kanban-fg;
+                        color: @cp_app-bg !important;
                     }
                 }
             }
@@ -599,6 +592,15 @@
                 }
             }
         }
+        button.cp-kanban-view-drag {
+            &.toggle-active {
+                background-color: @cp_kanban-fg;
+                color: @cp_app-bg !important;
+            }
+            &.toggle-inactive {
+                color: @cp_kanban-fg;
+            }
+        }
     }
 
     #cp-app-kanban-content {
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index e4ef51493..96bc0c729 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1053,8 +1053,8 @@ define([
         var $cContainer = $('#cp-app-kanban-container');
         var addControls = function () {
             // Quick or normal mode
-            var small = h('span.cp-kanban-view-small.fa.fa-minus');
-            var big = h('span.cp-kanban-view.fa.fa-bars');
+            var small = h('button.cp-kanban-view-small.fa.fa-minus');
+            var big = h('button.cp-kanban-view.fa.fa-bars');
             $(small).click(function () {
                 if ($cContainer.hasClass('cp-kanban-quick')) { return; }
                 $cContainer.addClass('cp-kanban-quick');
@@ -1194,13 +1194,13 @@ define([
             }
             var toggleOffclass = 'ontouchstart' in window ? 'toggle-active' : 'toggle-inactive'; 
             var toggleOnclass = 'ontouchstart' in window ? 'toggle-inactive' : 'toggle-active'; 
-            var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view.${toggleOffclass}.fa.fa-arrows`);
+            var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`);
             $(toggleDragOff).click(function() {
                 $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 addMoveElementButton(framework, kanban);
             });
-            var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view.${toggleOnclass}.fa.fa-hand-o-up`);
+            var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`);
             $(toggleDragOn).click(function() {
                 $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');

From 22b70c65be8b0ab2a3e818f7a234e377fb4819be Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Wed, 5 Feb 2025 18:29:50 +0100
Subject: [PATCH 030/114] Accessibility pt3

---
 customize.dist/translations/messages.js | 2 ++
 www/kanban/app-kanban.less              | 9 ---------
 www/kanban/inner.js                     | 4 ++--
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 359536e80..0314a2255 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -21,6 +21,8 @@ define(['/common/translations/messages.js'], function (Messages) {
     //NOTE: these keys are also added to the Form mobile UI PR #1753
     Messages.moveItemUp = 'Move item up'; // XXX
     Messages.moveitemDown = 'Move item down'; // XXX
+    Messages.toggleArrows = 'Switch to arrow view'; // XXX
+    Messages.toggleDrag = 'Switch to drag view'; // XXX
 
     return Messages;
 });
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 5270089a7..01dc86933 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -187,8 +187,6 @@
         }
     }
 
-    
-
     .item-arrow-container {
         width: 100%;
         margin-top: 5%;
@@ -248,7 +246,6 @@
             cursor: move;
             cursor: grab;
         }
-        
 
         margin-bottom: 5px;
         &:last-child {
@@ -344,7 +341,6 @@
                 width: 100%;
             }
         }
-
         &.kanban-item-hidden {
             display: none;
         }
@@ -558,8 +554,6 @@
                 &:last-child {
                     border-radius: 0px @variables_radius @variables_radius 0px;
                 }
-
-
             }
         }
     }
@@ -571,15 +565,12 @@
                         background-color: @cp_kanban-fg;
                         color: @cp_app-bg !important;
                     }
-
                 }
             }
         }
         &.cp-kanban-quick {
             #cp-kanban-controls {
                 .cp-kanban-changeView {
-                    // span.cp-kanban-view {
-                    // }
                     button.cp-kanban-view-small {
                         background-color: @cp_kanban-fg;
                         color: @cp_app-bg !important;
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 96bc0c729..a630ab86f 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1194,13 +1194,13 @@ define([
             }
             var toggleOffclass = 'ontouchstart' in window ? 'toggle-active' : 'toggle-inactive'; 
             var toggleOnclass = 'ontouchstart' in window ? 'toggle-inactive' : 'toggle-active'; 
-            var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`);
+            var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
             $(toggleDragOff).click(function() {
                 $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 addMoveElementButton(framework, kanban);
             });
-            var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`);
+            var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
             $(toggleDragOn).click(function() {
                 $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
                 $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');

From efdf1c3032cb1b10459f67005d9a2299e417a138 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Thu, 6 Feb 2025 18:33:34 +0100
Subject: [PATCH 031/114] Added toggle

---
 customize.dist/translations/messages.js |  4 ++-
 www/form/app-form.less                  | 43 +++++++++++++++++++------
 www/form/inner.js                       | 42 ++++++++++++++++++------
 3 files changed, 69 insertions(+), 20 deletions(-)

diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index a4aa81611..4a6cf36c2 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -15,7 +15,9 @@ define(['/common/translations/messages.js'], function (Messages) {
 
     //NOTE: these keys are also added to the Kanban mobile UI PR #1727
     Messages.moveItemUp = 'Move item up'; // XXX
-    Messages.moveitemDown = 'Move item down'; // XXX
+    Messages.moveItemDown = 'Move item down'; // XXX
+    Messages.toggleArrows = 'Switch to arrow view'; // XXX
+    Messages.toggleDrag = 'Switch to drag view'; // XXX
 
     return Messages;
 });
diff --git a/www/form/app-form.less b/www/form/app-form.less
index f90ed7334..b04222231 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -203,10 +203,27 @@
             //flex-wrap: wrap;
             overflow: auto;
 
+            .cp-form-view-drag {
+                width: 30px;
+                height: 30px;
+                border: none;
+                border-radius: 5px 0px 0px 5px;
+                background-color: @cp_form-bg1;
+                color: @cryptpad_text_col; 
+                &.toggle-active {
+                    color: @cp_form-bg1 !important;
+                    background-color: @cryptpad_text_col;
+                }
+            }
+            #toggle-drag-on {
+                border-radius: 0px 5px 5px 0px !important;
+            }
+
             @media screen and (max-width: 1000px) {
                 flex-wrap: wrap;
                 justify-content: flex-start;
                 .cp-form-creator-control {
+
                     width: 100% !important;
                     .cp-form-creator-settings {
                         display: flex;
@@ -223,6 +240,7 @@
                             flex: 1;
                             padding-right: 20px;
                         }
+
                     }
                 }
             }
@@ -587,6 +605,21 @@
                             }
                         }
                     }
+                    .cp-form-block-arrows {
+                        .cp-form-arrow {
+                            background-color: transparent;
+                            border: none;
+                            color:@cryptpad_text_col;
+                        }
+                        max-width: fit-content;
+                        margin-inline: auto;
+                        padding: 6px;
+                        margin-top: -35px;
+                        border-radius: 0px @variables_radius 0px 0px;
+                        .fa-arrow-down {
+                            margin-left: 20px; 
+                        }
+                    }
 
                     &.sortable-ghost { visibility: hidden; }
                     &.sortable-drag { opacity: 0.9 !important; }
@@ -971,16 +1004,6 @@
             i { margin-right: 5px; }
             background: fade(@cryptpad_text_col, 10%);
         }
-        .cp-form-block-arrows {
-            max-width: fit-content;
-            margin-inline: auto;
-            padding: 6px;
-            margin-top: -35px;
-            border-radius: 0px @variables_radius 0px 0px;
-            .fa-arrow-down {
-                margin-left: 20px; 
-            }
-        }
     }
 
     .cp-form-type-radio, .cp-form-type-checkbox {
diff --git a/www/form/inner.js b/www/form/inner.js
index 3d92f90d4..db327b26d 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4020,7 +4020,8 @@ define([
             var changeType;
             if (editable) {
                 // Drag handle
-                var dragEllipses = 'ontouchstart' in window ? undefined : [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')];
+                let drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
+                var dragEllipses = drag ? [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')] : undefined
                 dragHandle = h('span.cp-form-block-drag-handle', dragEllipses);
                 // Question
                 var inputQ = h('input', {
@@ -4258,15 +4259,16 @@ define([
                 }
             }
             let shiftButtons;
-            if ('ontouchstart' in window) {
-                var upButton = h('i.fa.fa-arrow-up',  {
+            let drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
+            if (!drag) {
+                var upButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-up',  {
                     'title': Messages.moveItemUp,
                     'aria-hidden': true
-                });
-                var downButton = h('i.fa.fa-arrow-down', {
-                    'title': Messages.moveitemDown,
+                }))
+                var downButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-down', {
+                    'title': Messages.moveItemDown,
                     'aria-hidden': true
-                });
+                }))
                 var shiftBlock = function(direction) {
                     var blockIndex = content.order.indexOf(uid);
                     if (direction === 'up' && blockIndex > 0) {
@@ -4274,7 +4276,6 @@ define([
                     } else if (direction === 'down' && blockIndex < content.order.length-1) {
                         content.order.splice(blockIndex+1, 0, content.order.splice(blockIndex, 1)[0]);
                     }
-                    framework.localChange();
                     updateForm(framework, content, true);
                 };
                 $(upButton).click(function () {
@@ -4289,7 +4290,9 @@ define([
                 ]);
             }
             var editableCls = editable ? ".editable" : "";
-            var draggable = 'ontouchstart' in window ? '.nodrag' : '';
+            var draggable = drag ? '' : '.nodrag';
+                        console.log("draggable", draggable)
+
             elements.push(h('div.cp-form-block'+editableCls+draggable, {
                 'data-id':uid,
                 'data-type':type
@@ -4563,6 +4566,8 @@ define([
                     }
                 }
             });
+            let drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
+            APP.mainSortable.options.disabled = drag ? false : true;
             return;
         }
 
@@ -5129,9 +5134,28 @@ define([
                 editableStr
             ]);
 
+            var toggleOffclass = 'ontouchstart' in window ? 'toggle-active' : 'toggle-inactive'; 
+            var toggleOnclass = 'ontouchstart' in window ? 'toggle-inactive' : 'toggle-active'; 
+            var toggleDragOff = h(`button#toggle-drag-off.cp-form-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
+            $(toggleDragOff).click(function() {
+                $(toggleDragOff).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOff).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined
+                updateForm(framework, content, true)
+            });
+            var toggleDragOn = h(`button#toggle-drag-on.cp-form-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
+            $(toggleDragOn).click(function() {
+                $(toggleDragOn).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOn).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined
+                updateForm(framework, content, true)
+            });
+
+            var drag = h('div', [
+                toggleDragOff,
+                toggleDragOn
+            ])
+
             return [
                 preview,
                 previewSettings,
+                drag,
                 colorTheme
             ];
         };

From 14d495cd1774add5fde1681ad6e093880c673af2 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 7 Feb 2025 12:18:23 +0100
Subject: [PATCH 032/114] Linting

---
 www/form/app-form.less |  2 --
 www/form/inner.js      | 36 ++++++++++++++++++++----------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index b04222231..fc0b26f4b 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -223,7 +223,6 @@
                 flex-wrap: wrap;
                 justify-content: flex-start;
                 .cp-form-creator-control {
-
                     width: 100% !important;
                     .cp-form-creator-settings {
                         display: flex;
@@ -240,7 +239,6 @@
                             flex: 1;
                             padding-right: 20px;
                         }
-
                     }
                 }
             }
diff --git a/www/form/inner.js b/www/form/inner.js
index db327b26d..32238a8a6 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3903,7 +3903,7 @@ define([
         var updateAddInline = APP.updateAddInline = function () {
             $container.find('.cp-form-creator-add-inline').remove();
             // Add before existing question
-            $container.find('.cp-form-block:not(.nodrag)').each(function (i, el) {
+            $container.find('.cp-form-block').each(function (i, el) {
                 var $el = $(el);
                 var uid = $el.attr('data-id');
                 $el.before(getFormCreator(uid));
@@ -4021,7 +4021,7 @@ define([
             if (editable) {
                 // Drag handle
                 let drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
-                var dragEllipses = drag ? [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')] : undefined
+                var dragEllipses = drag ? [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')] : undefined;
                 dragHandle = h('span.cp-form-block-drag-handle', dragEllipses);
                 // Question
                 var inputQ = h('input', {
@@ -4259,16 +4259,18 @@ define([
                 }
             }
             let shiftButtons;
-            let drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
+            let drag;
+            if (editable) {
+                drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
             if (!drag) {
                 var upButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-up',  {
                     'title': Messages.moveItemUp,
                     'aria-hidden': true
-                }))
+                }));
                 var downButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-down', {
                     'title': Messages.moveItemDown,
                     'aria-hidden': true
-                }))
+                }));
                 var shiftBlock = function(direction) {
                     var blockIndex = content.order.indexOf(uid);
                     if (direction === 'up' && blockIndex > 0) {
@@ -4289,10 +4291,10 @@ define([
                     downButton
                 ]);
             }
+            }
+
             var editableCls = editable ? ".editable" : "";
             var draggable = drag ? '' : '.nodrag';
-                        console.log("draggable", draggable)
-
             elements.push(h('div.cp-form-block'+editableCls+draggable, {
                 'data-id':uid,
                 'data-type':type
@@ -4566,8 +4568,8 @@ define([
                     }
                 }
             });
-            let drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
-            APP.mainSortable.options.disabled = drag ? false : true;
+            APP.mainSortable.options.disabled = 'ontouchstart' in window ? true : false;
+
             return;
         }
 
@@ -5137,20 +5139,22 @@ define([
             var toggleOffclass = 'ontouchstart' in window ? 'toggle-active' : 'toggle-inactive'; 
             var toggleOnclass = 'ontouchstart' in window ? 'toggle-inactive' : 'toggle-active'; 
             var toggleDragOff = h(`button#toggle-drag-off.cp-form-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
-            $(toggleDragOff).click(function() {
-                $(toggleDragOff).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOff).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined
-                updateForm(framework, content, true)
-            });
             var toggleDragOn = h(`button#toggle-drag-on.cp-form-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
+            $(toggleDragOff).click(function() {
+                $(toggleDragOff).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOff).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined;
+                updateForm(framework, content, true);
+                APP.mainSortable.options.disabled =  true;
+            });
             $(toggleDragOn).click(function() {
-                $(toggleDragOn).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOn).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined
-                updateForm(framework, content, true)
+                $(toggleDragOn).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOn).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined;
+                updateForm(framework, content, true);
+                APP.mainSortable.options.disabled =  false; 
             });
 
             var drag = h('div', [
                 toggleDragOff,
                 toggleDragOn
-            ])
+            ]);
 
             return [
                 preview,

From 5b84f619cb1f0cd554de929cd4c865fbbb9fab88 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 7 Feb 2025 12:24:26 +0100
Subject: [PATCH 033/114] Toggle fix

---
 www/kanban/inner.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index a630ab86f..ea7a2c793 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1196,14 +1196,12 @@ define([
             var toggleOnclass = 'ontouchstart' in window ? 'toggle-inactive' : 'toggle-active'; 
             var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
             $(toggleDragOff).click(function() {
-                $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');
-                $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
+                $(toggleDragOff).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOff).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined;
                 addMoveElementButton(framework, kanban);
             });
             var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
             $(toggleDragOn).click(function() {
-                $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive');
-                $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive');
+                $(toggleDragOn).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOn).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined;
                 addMoveElementButton(framework, kanban);
             });
 

From 641c177ff40e4244336adaae6bf55020a79cde83 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 11 Feb 2025 11:09:46 +0100
Subject: [PATCH 034/114] Corrections

---
 www/kanban/inner.js | 85 +++++++++++++++++++--------------------------
 1 file changed, 36 insertions(+), 49 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index ea7a2c793..7ae2f3b07 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -537,14 +537,21 @@ define([
     };
 
     addMoveElementButton = function (framework, kanban) {
+        if (!kanban) { return; }
+        if (framework.isReadOnly() || framework.isLocked()) { return; }
         var $container = $(kanban.element);
         var drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
         kanban.options.dragBoards = drag;
         kanban.options.dragItems = drag;
+        $container.find('.kanban-board').each(function (i, el) {
+            $(el).find('.item-icon-container').remove();
+            $(el).find('.kanban-board-header').removeClass('no-drag');
+        });
+        $container.find('.kanban-item').each(function (i, el) {
+            $(el).find('.item-arrow-container').remove();
+            $(el).removeClass('no-drag');
+        });
         if (drag === false) {
-            if (!kanban) { return; }
-            if (framework.isReadOnly() || framework.isLocked()) { return; }
-
             var move = function (arr, oldIndex, newIndex) {
                 arr.splice(newIndex, 0, arr.splice(oldIndex, 1)[0]);
                 _updateBoards(framework, kanban, kanban.options.boards, false);
@@ -553,17 +560,16 @@ define([
             var moveBetweenBoards = function (nextBoardItems, elId, boardItems, index, boards, boardId) {
                 nextBoardItems.unshift(elId);
                 boardItems.splice(index, 1);
-                boards.data[boardId].item = boardItems;
                 _updateBoards(framework, kanban, boards, false);
                 $(`.kanban-item[data-eid="${elId}"]`)[0].scrollIntoView();
             };
 
             var shiftItem = function (direction, el) {
-                var board = el.parentNode.parentNode.parentNode;
+                var board = $(el).closest('.kanban-board')
                 var boards = kanban.options.boards;
                 var elId = parseInt($(el).attr("data-eid"));
                 var boardId = parseInt($(board).attr("data-id"));
-                var boardItems = direction === ('up' || 'down') ? kanban.options.boards.data[boardId].item : boards.data[boardId].item;
+                var boardItems = boards.data[boardId].item;
                 var index = boardItems.indexOf(elId);
                 var boardIndex = boards.list.indexOf(parseInt(boardId));
                 let nextBoardItems;
@@ -593,78 +599,59 @@ define([
             };
             $container.find('.kanban-board').each(function (i, el) {
                 $(el).find('.kanban-board-header').addClass('no-drag');
-                $(el).find('.item-icon-container').remove();
                 var arrowContainer = h('div.item-icon-container');
                 $(arrowContainer).appendTo($(el).find('.kanban-board-header'));
-                $('<button>', {
+                $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-left board-arrow',
                     'title': Messages.kanban_moveBoardLeft,
                     'aria-hidden': true
-                }).click(function () { 
+                })).click(function () { 
                     shiftBoards('left', el);
-                }).appendTo($(el).find('.item-icon-container'));
-            });
-            $container.find('.kanban-board').each(function (i, el) {
-                $('<button>', {
+                }).appendTo(arrowContainer);
+                $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-right board-arrow',
                     'title': Messages.kanban_moveBoardRight,
                     'aria-hidden': true
-                }).click(function () {
+                })).click(function () {
                     shiftBoards('right', el);
-                }).appendTo($(el).find('.item-icon-container'));
+                }).appendTo(arrowContainer);
             });
             $container.find('.kanban-item').each(function (i, el) {
                 $(el).addClass('no-drag');
-                $(el).find('.item-arrow-container').remove();
                 var arrowContainerItem = h('div.item-arrow-container');
                 $(arrowContainerItem).appendTo((el));
-                $('<button>', {
+                $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-left item-arrow',
                     'title': Messages.kanban_moveItemLeft,
                     'aria-hidden': true
-                }).click(function () {
+                })).click(function () {
                     shiftItem('left', el);
-                }).appendTo($(el).find('.item-arrow-container'));
-            });
-            $container.find('.kanban-item').each(function (i, el) {
+                }).appendTo(arrowContainerItem);
                 var centralArrowContainerItem = h('div.item-central-arrow-container');
-                $(centralArrowContainerItem).appendTo($(el).find('.item-arrow-container'));
-                $('<button>', {
+                $(centralArrowContainerItem).appendTo(arrowContainerItem);
+                $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-down',
                     'title': Messages.kanban_moveItemDown,
                     'aria-hidden': true
-                }).click(function () {
+                })).click(function () {
                     shiftItem('down', el);
-                }).appendTo($(el).find('.item-central-arrow-container'));
-            });
-            $container.find('.kanban-item').each(function (i, el) {
-                $('<button>', {
+                }).appendTo(centralArrowContainerItem);
+                $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-up',
                     'title': Messages.moveItemUp,
                     'aria-hidden': true
-                }).click(function () {
+                })).click(function () {
                     shiftItem('up', el);
-                }).appendTo($(el).find('.item-central-arrow-container'));
-            });
-            $container.find('.kanban-item').each(function (i, el) {
-                $('<button>', {
+                }).appendTo(centralArrowContainerItem);
+                $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-right item-arrow',
                     'title': Messages.moveItemRight,
                     'aria-hidden': true
-                }).click(function () {
+                })).click(function () {
                     shiftItem('right', el);
-                }).appendTo($(el).find('.item-arrow-container'));
+                }).appendTo(arrowContainerItem);
             });
-        } else {
-            $container.find('.kanban-board').each(function (i, el) {
-                $(el).find('.item-icon-container').remove();
-                $(el).find('.kanban-board-header').removeClass('no-drag');
-            });
-            $container.find('.kanban-item').each(function (i, el) {
-                $(el).find('.item-arrow-container').remove();
-                $(el).removeClass('no-drag');
-            });
-        }
+        } 
     };
 
     addEditItemButton = function (framework, kanban) {
@@ -674,20 +661,20 @@ define([
         $container.find('.kanban-edit-item').remove();
         $container.find('.kanban-item').each(function (i, el) {
             var itemId = $(el).attr('data-eid');
-            $('<button>', {
+            $(h('.button', {
                 'class': 'kanban-edit-item fa fa-pencil',
                 'alt': Messages.kanban_editCard,
             }).click(function (e) {
                 getItemEditModal(framework, kanban, itemId);
                 e.stopPropagation();
-            }).appendTo($(el).find('.kanban-item-text-container'));
+            })).appendTo($(el).find('.kanban-item-text-container'));
         });
         $container.find('.kanban-board').each(function (i, el) {
             var itemId = $(el).attr('data-id');
-            $('<button>', {
+            $(h('.button', {
                 'class': 'kanban-edit-item fa fa-pencil',
                 'alt': Messages.kanban_editBoard,
-            }).click(function (e) {
+            })).click(function (e) {
                 getBoardEditModal(framework, kanban, itemId);
                 e.stopPropagation();
             }).appendTo($(el).find('.kanban-board-header'));

From 2f2e97c51ceda31f797afedb7b5c13f1bfc2cf8b Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 11 Feb 2025 16:23:07 +0100
Subject: [PATCH 035/114] Corrections

---
 customize.dist/messages.js              |   7 ++
 customize.dist/translations/messages.js |   6 --
 www/form/app-form.less                  |  30 +++---
 www/form/inner.js                       | 122 ++++++++++++++----------
 4 files changed, 97 insertions(+), 68 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index be65e98a9..ba160c5ee 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -135,6 +135,13 @@ define(req, function(AppConfig, Default, Language) {
             return text;
         }
     };
+
+    //NOTE: these keys are also added to the Kanban mobile UI PR #1727
+    Messages.moveItemUp = 'Move item up'; // XXX
+    Messages.moveItemDown = 'Move item down'; // XXX
+    Messages.toggleArrows = 'Switch to arrow view'; // XXX
+    Messages.toggleDrag = 'Switch to drag view'; // XXX
+    
     return Messages;
 
 });
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 4a6cf36c2..df4096367 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -13,12 +13,6 @@ define(['/common/translations/messages.js'], function (Messages) {
     // Replace the existing keys in your copied file here:
     // Messages.button_newpad = "New Rich Text Document";
 
-    //NOTE: these keys are also added to the Kanban mobile UI PR #1727
-    Messages.moveItemUp = 'Move item up'; // XXX
-    Messages.moveItemDown = 'Move item down'; // XXX
-    Messages.toggleArrows = 'Switch to arrow view'; // XXX
-    Messages.toggleDrag = 'Switch to drag view'; // XXX
-
     return Messages;
 });
 
diff --git a/www/form/app-form.less b/www/form/app-form.less
index fc0b26f4b..03cb1ae4f 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -207,16 +207,22 @@
                 width: 30px;
                 height: 30px;
                 border: none;
-                border-radius: 5px 0px 0px 5px;
+                border-radius: @variables_radius 0px 0px @variables_radius;
                 background-color: @cp_form-bg1;
                 color: @cryptpad_text_col; 
-                &.toggle-active {
-                    color: @cp_form-bg1 !important;
+                @media (max-width:723px) and (min-width:693px), (max-width:553px) and (min-width:524px) {
+                    border-radius: @variables_radius @variables_radius 0px 0px;
+                }
+                &.cp-toggle-active {
+                    color: @cp_form-bg1;
                     background-color: @cryptpad_text_col;
                 }
             }
-            #toggle-drag-on {
-                border-radius: 0px 5px 5px 0px !important;
+            #cp-toggle-drag-on {
+                border-radius: 0px @variables_radius @variables_radius 0px !important;
+                @media (max-width:723px) and (min-width:693px), (max-width:553px) and (min-width:524px) {
+                    border-radius: 0px 0px @variables_radius @variables_radius !important;
+                }
             }
 
             @media screen and (max-width: 1000px) {
@@ -604,18 +610,18 @@
                         }
                     }
                     .cp-form-block-arrows {
-                        .cp-form-arrow {
-                            background-color: transparent;
-                            border: none;
-                            color:@cryptpad_text_col;
-                        }
+                        justify-content: space-between;
                         max-width: fit-content;
                         margin-inline: auto;
                         padding: 6px;
                         margin-top: -35px;
                         border-radius: 0px @variables_radius 0px 0px;
-                        .fa-arrow-down {
-                            margin-left: 20px; 
+                        display: flex;
+                        column-gap: 20px;
+                        .cp-form-arrow {
+                            background-color: transparent;
+                            border: none;
+                            color: @cryptpad_text_col;
                         }
                     }
 
diff --git a/www/form/inner.js b/www/form/inner.js
index 32238a8a6..17b5d57cc 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4018,11 +4018,46 @@ define([
 
 
             var changeType;
+            let shiftButtons;
             if (editable) {
+                // Arrows 
+                var upButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-up',  {
+                    'title': Messages.moveItemUp,
+                    'aria-hidden': true
+                }));
+                var downButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-down', {
+                    'title': Messages.moveItemDown,
+                    'aria-hidden': true
+                }));
+                var shiftBlock = function(direction) {
+                    var blockIndex = content.order.indexOf(uid);
+                    if (direction === 'up' && blockIndex > 0) {
+                        content.order.splice(blockIndex-1, 0, content.order.splice(blockIndex, 1)[0]);
+                    } else if (direction === 'down' && blockIndex < content.order.length-1) {
+                        content.order.splice(blockIndex+1, 0, content.order.splice(blockIndex, 1)[0]);
+                    }
+                    updateForm(framework, content, true);
+                };
+                $(upButton).click(function () {
+                    shiftBlock('up');
+                });
+                $(downButton).click(function () {
+                    shiftBlock('down');
+                });
+                shiftButtons = h('div.cp-form-block-arrows', 
+                    {style: 'display: none'}, [
+                    upButton,
+                    downButton
+                ]);
+
                 // Drag handle
-                let drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
-                var dragEllipses = drag ? [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')] : undefined;
+                var drag = APP.drag
+                var dragEllipses = [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')] 
                 dragHandle = h('span.cp-form-block-drag-handle', dragEllipses);
+                if (!drag) {
+                   $(shiftButtons).css({display: 'flex'}) 
+                   $(dragEllipses).css({display: 'none'}) 
+                }
                 // Question
                 var inputQ = h('input', {
                     value: block.q || Messages.form_default
@@ -4258,40 +4293,9 @@ define([
                     }
                 }
             }
-            let shiftButtons;
-            let drag;
-            if (editable) {
-                drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
-            if (!drag) {
-                var upButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-up',  {
-                    'title': Messages.moveItemUp,
-                    'aria-hidden': true
-                }));
-                var downButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-down', {
-                    'title': Messages.moveItemDown,
-                    'aria-hidden': true
-                }));
-                var shiftBlock = function(direction) {
-                    var blockIndex = content.order.indexOf(uid);
-                    if (direction === 'up' && blockIndex > 0) {
-                        content.order.splice(blockIndex-1, 0, content.order.splice(blockIndex, 1)[0]);
-                    } else if (direction === 'down' && blockIndex < content.order.length-1) {
-                        content.order.splice(blockIndex+1, 0, content.order.splice(blockIndex, 1)[0]);
-                    }
-                    updateForm(framework, content, true);
-                };
-                $(upButton).click(function () {
-                    shiftBlock('up');
-                });
-                $(downButton).click(function () {
-                    shiftBlock('down');
-                });
-                shiftButtons = h('div.cp-form-block-arrows', [
-                    upButton,
-                    downButton
-                ]);
-            }
-            }
+
+            
+
 
             var editableCls = editable ? ".editable" : "";
             var draggable = drag ? '' : '.nodrag';
@@ -5136,20 +5140,38 @@ define([
                 editableStr
             ]);
 
-            var toggleOffclass = 'ontouchstart' in window ? 'toggle-active' : 'toggle-inactive'; 
-            var toggleOnclass = 'ontouchstart' in window ? 'toggle-inactive' : 'toggle-active'; 
-            var toggleDragOff = h(`button#toggle-drag-off.cp-form-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
-            var toggleDragOn = h(`button#toggle-drag-on.cp-form-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
-            $(toggleDragOff).click(function() {
-                $(toggleDragOff).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOff).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined;
-                updateForm(framework, content, true);
-                APP.mainSortable.options.disabled =  true;
-            });
-            $(toggleDragOn).click(function() {
-                $(toggleDragOn).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOn).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined;
-                updateForm(framework, content, true);
-                APP.mainSortable.options.disabled =  false; 
-            });
+            var toggleOffclass;
+            var toggleOnclass;
+            if ('ontouchstart' in window) {
+                toggleOffclass = 'cp-toggle-active'
+                APP.drag = false
+            } else {
+                toggleOnclass = 'cp-toggle-active'
+                APP.drag = true
+            }
+
+            var toggleDragOff = h(`button#cp-toggle-drag-off.cp-form-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
+            var toggleDragOn = h(`button#cp-toggle-drag-on.cp-form-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
+            // var container = $('.cp-form-creator-content')
+            // $(container).addClass('cp-drag')    
+            const updateDrag = state => {
+                return function () {
+                    $(toggleDragOn).toggleClass('cp-toggle-active', state);
+                    $(toggleDragOff).toggleClass('cp-toggle-active', !state);
+                    APP.mainSortable.options.disabled = !state;
+                    APP.drag = state
+                    if (state) {
+                        $('.cp-form-block-arrows').css({display: 'none'})
+                        $('.fa-ellipsis-h').css({display: 'block'})
+
+                    } else {
+                        $('.cp-form-block-arrows').css({display: 'flex'})
+                        $('.fa-ellipsis-h').css({display: 'none'})
+                    }
+                };
+            };
+            $(toggleDragOn).click(updateDrag(true));
+            $(toggleDragOff).click(updateDrag(false));
 
             var drag = h('div', [
                 toggleDragOff,

From 35b3f7b993ed1dca49021ef84336240d132ca031 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 11 Feb 2025 17:22:10 +0100
Subject: [PATCH 036/114] More corrections/refactoring

---
 customize.dist/messages.js              | 11 +++++++++
 customize.dist/translations/messages.js | 11 ---------
 www/kanban/app-kanban.less              |  4 ++--
 www/kanban/inner.js                     | 31 ++++++++++++++-----------
 4 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index a5784b495..4d23f592d 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -136,6 +136,17 @@ define(req, function(AppConfig, Default, Language) {
         }
     };
 
+    Messages.kanban_moveitemLeft = 'Move item left'; // XXX
+    Messages.kanban_moveitemRight = 'Move item right'; // XXX
+    Messages.kanban_moveBoardLeft = 'Move board left'; // XXX
+    Messages.kanban_moveBoardRight = 'Move board right'; // XXX
+
+    //NOTE: these keys are also added to the Form mobile UI PR #1753
+    Messages.moveItemUp = 'Move item up'; // XXX
+    Messages.moveitemDown = 'Move item down'; // XXX
+    Messages.toggleArrows = 'Switch to arrow view'; // XXX
+    Messages.toggleDrag = 'Switch to drag view'; // XXX
+
     return Messages;
 
 });
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index 0314a2255..df4096367 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -13,17 +13,6 @@ define(['/common/translations/messages.js'], function (Messages) {
     // Replace the existing keys in your copied file here:
     // Messages.button_newpad = "New Rich Text Document";
 
-    Messages.kanban_moveitemLeft = 'Move item left'; // XXX
-    Messages.kanban_moveitemRight = 'Move item right'; // XXX
-    Messages.kanban_moveBoardLeft = 'Move board left'; // XXX
-    Messages.kanban_moveBoardRight = 'Move board right'; // XXX
-
-    //NOTE: these keys are also added to the Form mobile UI PR #1753
-    Messages.moveItemUp = 'Move item up'; // XXX
-    Messages.moveitemDown = 'Move item down'; // XXX
-    Messages.toggleArrows = 'Switch to arrow view'; // XXX
-    Messages.toggleDrag = 'Switch to drag view'; // XXX
-
     return Messages;
 });
 
diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 01dc86933..65566f7b4 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -584,11 +584,11 @@
             }
         }
         button.cp-kanban-view-drag {
-            &.toggle-active {
+            &.cp-toggle-active {
                 background-color: @cp_kanban-fg;
                 color: @cp_app-bg !important;
             }
-            &.toggle-inactive {
+            &.cp-toggle-inactive {
                 color: @cp_kanban-fg;
             }
         }
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 7ae2f3b07..e795144fc 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -540,7 +540,7 @@ define([
         if (!kanban) { return; }
         if (framework.isReadOnly() || framework.isLocked()) { return; }
         var $container = $(kanban.element);
-        var drag = $('#toggle-drag-off').attr('class').indexOf('toggle-active') !== -1 ? false : true;
+        var drag = kanban.drag;
         kanban.options.dragBoards = drag;
         kanban.options.dragItems = drag;
         $container.find('.kanban-board').each(function (i, el) {
@@ -557,7 +557,7 @@ define([
                 _updateBoards(framework, kanban, kanban.options.boards, false);
             };
 
-            var moveBetweenBoards = function (nextBoardItems, elId, boardItems, index, boards, boardId) {
+            var moveBetweenBoards = function (nextBoardItems, elId, boardItems, index, boards) {
                 nextBoardItems.unshift(elId);
                 boardItems.splice(index, 1);
                 _updateBoards(framework, kanban, boards, false);
@@ -565,7 +565,7 @@ define([
             };
 
             var shiftItem = function (direction, el) {
-                var board = $(el).closest('.kanban-board')
+                var board = $(el).closest('.kanban-board');
                 var boards = kanban.options.boards;
                 var elId = parseInt($(el).attr("data-eid"));
                 var boardId = parseInt($(board).attr("data-id"));
@@ -1179,18 +1179,23 @@ define([
                 });
     
             }
-            var toggleOffclass = 'ontouchstart' in window ? 'toggle-active' : 'toggle-inactive'; 
-            var toggleOnclass = 'ontouchstart' in window ? 'toggle-inactive' : 'toggle-active'; 
+
+
+            var toggleOffclass = 'ontouchstart' in window ? 'cp-toggle-active' : 'cp-toggle-inactive'; 
+            var toggleOnclass = 'ontouchstart' in window ? 'cp-toggle-inactive' : 'cp-toggle-active'; 
             var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
-            $(toggleDragOff).click(function() {
-                $(toggleDragOff).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOff).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOn).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined;
-                addMoveElementButton(framework, kanban);
-            });
             var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
-            $(toggleDragOn).click(function() {
-                $(toggleDragOn).attr('class').indexOf('toggle-inactive') !== -1 ? $(toggleDragOn).toggleClass('toggle-inactive').toggleClass('toggle-active') && $(toggleDragOff).toggleClass('toggle-active').toggleClass('toggle-inactive') : undefined;
-                addMoveElementButton(framework, kanban);
-            });
+
+            const updateDrag = state => {
+                return function () {
+                    $(toggleDragOn).toggleClass('cp-toggle-active', state).toggleClass('cp-toggle-inactive', !state);
+                    $(toggleDragOff).toggleClass('cp-toggle-active', !state).toggleClass('cp-toggle-inactive', state);
+                    kanban.drag = state;
+                    addMoveElementButton(framework, kanban);
+                };
+            };
+            $(toggleDragOn).click(updateDrag(true));
+            $(toggleDragOff).click(updateDrag(false));
 
             var container = h('div#cp-kanban-controls', [
                 tags,

From 3f8edc1c486277205e792c0c20fe5a9ecfe91be9 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 14 Feb 2025 14:41:47 +0100
Subject: [PATCH 037/114] More corrections

---
 www/form/app-form.less | 34 ++++++++++++++++----------
 www/form/inner.js      | 54 +++++++++++++++---------------------------
 2 files changed, 40 insertions(+), 48 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 03cb1ae4f..a579db161 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -391,6 +391,26 @@
                 display: flex;
                 flex-flow: column;
                 flex: 1 1 1000px;
+                &.cp-no-drag {
+                    .cp-form-block-arrows {
+                        justify-content: space-between;
+                        max-width: fit-content;
+                        margin-inline: auto;
+                        padding: 6px;
+                        margin-top: -35px;
+                        border-radius: 0px @variables_radius 0px 0px;
+                        display: flex !important;
+                        column-gap: 20px;
+                        .cp-form-arrow {
+                            background-color: transparent;
+                            border: none;
+                            color: @cryptpad_text_col;
+                        }
+                    }
+                    .fa-ellipsis-h {
+                        display: none !important;
+                    }
+                }
 
                 .cp-form-creator-add-inline {
                     display: flex;
@@ -610,19 +630,7 @@
                         }
                     }
                     .cp-form-block-arrows {
-                        justify-content: space-between;
-                        max-width: fit-content;
-                        margin-inline: auto;
-                        padding: 6px;
-                        margin-top: -35px;
-                        border-radius: 0px @variables_radius 0px 0px;
-                        display: flex;
-                        column-gap: 20px;
-                        .cp-form-arrow {
-                            background-color: transparent;
-                            border: none;
-                            color: @cryptpad_text_col;
-                        }
+                        display: none;
                     }
 
                     &.sortable-ghost { visibility: hidden; }
diff --git a/www/form/inner.js b/www/form/inner.js
index 17b5d57cc..4954bf914 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3775,7 +3775,7 @@ define([
         });
         $body.addClass('cp-form-palette-'+color);
 
-        $container.attr('class', 'cp-form-creator-content'+(APP.isEditor? ' cp-form-iseditor': ''));
+        $container.attr('class', 'cp-form-creator-content'+(APP.isEditor? ' cp-form-iseditor': '')+ ('ontouchstart' in window ? ' cp-no-drag' : ''));
 
         if (APP.isClosed && content.answers.privateKey && !APP.isEditor && !APP.hasAnswered) {
             var sframeChan = framework._.sfCommon.getSframeChannel();
@@ -3903,7 +3903,7 @@ define([
         var updateAddInline = APP.updateAddInline = function () {
             $container.find('.cp-form-creator-add-inline').remove();
             // Add before existing question
-            $container.find('.cp-form-block').each(function (i, el) {
+            $container.find('.cp-form-block:not(.cp-form-submit-message)').each(function (i, el) {
                 var $el = $(el);
                 var uid = $el.attr('data-id');
                 $el.before(getFormCreator(uid));
@@ -4033,10 +4033,13 @@ define([
                     var blockIndex = content.order.indexOf(uid);
                     if (direction === 'up' && blockIndex > 0) {
                         content.order.splice(blockIndex-1, 0, content.order.splice(blockIndex, 1)[0]);
+                        updateForm(framework, content, true);
+                        framework.localChange();
                     } else if (direction === 'down' && blockIndex < content.order.length-1) {
                         content.order.splice(blockIndex+1, 0, content.order.splice(blockIndex, 1)[0]);
+                        updateForm(framework, content, true);
+                        framework.localChange();
                     }
-                    updateForm(framework, content, true);
                 };
                 $(upButton).click(function () {
                     shiftBlock('up');
@@ -4044,20 +4047,15 @@ define([
                 $(downButton).click(function () {
                     shiftBlock('down');
                 });
-                shiftButtons = h('div.cp-form-block-arrows', 
-                    {style: 'display: none'}, [
+                shiftButtons = h('div.cp-form-block-arrows', [ 
                     upButton,
                     downButton
                 ]);
 
                 // Drag handle
-                var drag = APP.drag
-                var dragEllipses = [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')] 
+                var dragEllipses = [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')]; 
                 dragHandle = h('span.cp-form-block-drag-handle', dragEllipses);
-                if (!drag) {
-                   $(shiftButtons).css({display: 'flex'}) 
-                   $(dragEllipses).css({display: 'none'}) 
-                }
+
                 // Question
                 var inputQ = h('input', {
                     value: block.q || Messages.form_default
@@ -4294,11 +4292,8 @@ define([
                 }
             }
 
-            
-
-
             var editableCls = editable ? ".editable" : "";
-            var draggable = drag ? '' : '.nodrag';
+            var draggable = APP.drag ? '' : '.nodrag';
             elements.push(h('div.cp-form-block'+editableCls+draggable, {
                 'data-id':uid,
                 'data-type':type
@@ -5140,36 +5135,25 @@ define([
                 editableStr
             ]);
 
-            var toggleOffclass;
-            var toggleOnclass;
-            if ('ontouchstart' in window) {
-                toggleOffclass = 'cp-toggle-active'
-                APP.drag = false
-            } else {
-                toggleOnclass = 'cp-toggle-active'
-                APP.drag = true
-            }
-
+            var toggleOffclass = 'ontouchstart' in window ? 'cp-toggle-active' : undefined;
+            var toggleOnclass = 'ontouchstart' in window ? undefined : 'cp-toggle-active';
             var toggleDragOff = h(`button#cp-toggle-drag-off.cp-form-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
             var toggleDragOn = h(`button#cp-toggle-drag-on.cp-form-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
-            // var container = $('.cp-form-creator-content')
-            // $(container).addClass('cp-drag')    
             const updateDrag = state => {
                 return function () {
+                    var $container = $('.cp-form-creator-content');
                     $(toggleDragOn).toggleClass('cp-toggle-active', state);
                     $(toggleDragOff).toggleClass('cp-toggle-active', !state);
                     APP.mainSortable.options.disabled = !state;
-                    APP.drag = state
+                    APP.drag = state;
                     if (state) {
-                        $('.cp-form-block-arrows').css({display: 'none'})
-                        $('.fa-ellipsis-h').css({display: 'block'})
-
+                        $container.removeClass('cp-no-drag');
                     } else {
-                        $('.cp-form-block-arrows').css({display: 'flex'})
-                        $('.fa-ellipsis-h').css({display: 'none'})
+                        $container.addClass('cp-no-drag');  
                     }
                 };
             };
+
             $(toggleDragOn).click(updateDrag(true));
             $(toggleDragOff).click(updateDrag(false));
 
@@ -5297,7 +5281,7 @@ define([
                 fillerContainer = h('div.cp-form-filler-container');
             }
 
-            var contentContainer = h('div.cp-form-creator-content' + (APP.isEditor ? '.cp-form-iseditor' : ''));
+            var contentContainer = h('div.cp-form-creator-content' + (APP.isEditor ? '.cp-form-iseditor' : '') + ('ontouchstart' in window ? '.cp-no-drag' : ''));
             var resultsContainer = h('div.cp-form-creator-results');
             var answeredContainer = h('div.cp-form-creator-answered', {
                 style: 'display: none;'
@@ -5567,7 +5551,7 @@ define([
             var editButtons = h('div.cp-form-edit-buttons-container', [ preview, edit, del ]);
 
             var editDiv, previewDiv;
-            var div = h('div.cp-form-block.editable.nodrag', [
+            var div = h('div.cp-form-block.editable.nodrag.cp-form-submit-message', [
                 h('div.cp-form-block-content', [
                     p,
                     editDiv = h('div.cp-form-response-modal', t),

From 894d97e2450c6c5689c129373a4b678c7a44cba7 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 14 Feb 2025 14:52:07 +0100
Subject: [PATCH 038/114] Corrections

---
 www/kanban/app-kanban.less | 2 +-
 www/kanban/inner.js        | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 65566f7b4..f47d95fae 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -172,7 +172,7 @@
 
     .kanban-edit-item, .cp-kanban-arrow {
         border: 0;
-        float:right;
+        float: right;
         background: transparent;
         align-self: flex-start;
         outline-style: none;
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index e795144fc..466f12623 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1180,7 +1180,6 @@ define([
     
             }
 
-
             var toggleOffclass = 'ontouchstart' in window ? 'cp-toggle-active' : 'cp-toggle-inactive'; 
             var toggleOnclass = 'ontouchstart' in window ? 'cp-toggle-inactive' : 'cp-toggle-active'; 
             var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});

From 91a172e666251db4eff82695299c2bd14fcb0755 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Sun, 16 Feb 2025 16:47:24 +0200
Subject: [PATCH 039/114] Fix issues

---
 www/code/inner.js | 107 +++++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 58 deletions(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index 7bf8d4146..756527a47 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -177,15 +177,8 @@ define([
         });
     };
 
-    function showEditor() {
-        $previewContainer.hide();
-        $codeMirrorContainer.show();
-        $previewButton.removeClass('cp-toolbar-button-active');
-        framework._.sfCommon.setPadAttribute('previewMode', false, function (e) {
-            if (e) { console.error(e); }
-        });
-    }
 
+    var isSmallScreen = () => window.innerWidth <= 600;
     var mkPreviewPane = function (editor, CodeMirror, framework, isPresentMode) {
         var $previewContainer = $('#cp-app-code-preview');
         var $preview = $('#cp-app-code-preview-content');
@@ -219,37 +212,64 @@ define([
         }, 400);
 
         var previewTo;
+
+        var togglePreview = function (show) {
+            if (show) {
+                $previewContainer.show();
+                $codeMirrorContainer.hide();
+                $previewButton.addClass('cp-toolbar-button-active');
+                forceDrawPreview();
+            } else {
+                $previewContainer.hide();
+                $codeMirrorContainer.show();
+                $previewButton.removeClass('cp-toolbar-button-active');
+            }
+            framework._.sfCommon.setPadAttribute('previewMode', show);
+        };
+
+        var handleResize = function () {
+            framework._.sfCommon.getPadAttribute('previewMode', function (e, previewMode) {
+                if (e) { return console.error(e); }
+                if (isPresentMode) {
+                    $previewContainer.show();
+                    $codeMirrorContainer.hide();
+                    $previewButton.hide();
+                    forceDrawPreview();
+                } else {
+                    if (isSmallScreen()) {
+                        togglePreview(previewMode);
+                    } else {
+                        if (previewMode) {
+                            $previewContainer.show();
+                            $codeMirrorContainer.removeClass('cp-app-code-fullpage');
+                            $previewButton.addClass('cp-toolbar-button-active');
+                            forceDrawPreview();
+                        } else {
+                            $previewContainer.hide();
+                            $codeMirrorContainer.addClass('cp-app-code-fullpage');
+                            $previewButton.removeClass('cp-toolbar-button-active');
+                        }
+                    }
+                }
+            });
+        };
+
         $previewButton.click(function () {
             clearTimeout(previewTo);
             $codeMirror.addClass('transition');
             previewTo = setTimeout(function () {
                 $codeMirror.removeClass('transition');
             }, 500);
-            var isSmallScreen = window.innerWidth <= 600;
 
-            if (isSmallScreen) {
-                if ($previewContainer.is(':visible')) {
-                    $previewContainer.hide();
-                    $codeMirrorContainer.show(); // Show the editor container
-                    $previewButton.removeClass('cp-toolbar-button-active');
-                    framework._.sfCommon.setPadAttribute('previewMode', false, function (e) {
-                        if (e) { return console.log(e); }
-                    });
-                } else {
-                    $previewContainer.show();
-                    $codeMirrorContainer.hide(); // Hide the editor container
-                    $previewButton.addClass('cp-toolbar-button-active');
-                    forceDrawPreview();
-                    framework._.sfCommon.setPadAttribute('previewMode', true, function (e) {
-                        if (e) { return console.log(e); }
-                    });
-                }
+            var show = !isVisible();
+            if (isSmallScreen()) {
+                togglePreview(show);
             } else {
                 if (!previews[CodeMirror.highlightMode]) {
                     $previewContainer.show();
                 }
                 $previewContainer.toggle();
-                if ($previewContainer.is(':visible')) {
+                if (isVisible()) {
                     forceDrawPreview();
                     $codeMirrorContainer.removeClass('cp-app-code-fullpage');
                     $previewButton.addClass('cp-toolbar-button-active');
@@ -316,37 +336,8 @@ define([
         };
 
         framework.onReady(function () {
-
-            //handle refresh
-            var isSmallScreen = window.innerWidth <= 700;
-
-            framework._.sfCommon.getPadAttribute('previewMode', function (e, previewMode) {
-                if (e) { return console.error(e); }
-                if (isSmallScreen) {
-                    if (previewMode) {
-
-                        $previewContainer.show();
-                        $codeMirrorContainer.hide();
-                        $previewButton.addClass('cp-toolbar-button-active');
-                        forceDrawPreview();
-                    } else {
-                        $previewContainer.hide();
-                        $codeMirrorContainer.show();
-                        $previewButton.removeClass('cp-toolbar-button-active');
-                    }
-                } else {
-                    if (previewMode) {
-                        $previewContainer.show();
-                        $codeMirrorContainer.removeClass('cp-app-code-fullpage');
-                        $previewButton.addClass('cp-toolbar-button-active');
-                        forceDrawPreview();
-                    } else {
-                        $previewContainer.hide();
-                        $codeMirrorContainer.addClass('cp-app-code-fullpage');
-                        $previewButton.removeClass('cp-toolbar-button-active');
-                    }
-                }
-            });
+            handleResize();
+            window.addEventListener('resize', handleResize);
 
             // add the splitter
             var splitter = $('<div>', {

From 7e79c43ee2f5c15fba6822bb4dd1c0d17f4a1229 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Mon, 17 Feb 2025 12:26:22 +0200
Subject: [PATCH 040/114] Fix manual resize issues

---
 www/code/inner.js | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index 756527a47..17eb946a1 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -228,30 +228,30 @@ define([
         };
 
         var handleResize = function () {
-            framework._.sfCommon.getPadAttribute('previewMode', function (e, previewMode) {
-                if (e) { return console.error(e); }
-                if (isPresentMode) {
-                    $previewContainer.show();
-                    $codeMirrorContainer.hide();
-                    $previewButton.hide();
-                    forceDrawPreview();
+            var wasPreviewVisible = isVisible(); // Capture preview state before resize
+
+            if (isPresentMode) {
+                $previewContainer.show();
+                $codeMirrorContainer.hide();
+                $previewButton.hide();
+                forceDrawPreview();
+            } else {
+                if (isSmallScreen()) {
+                    togglePreview(wasPreviewVisible); // Restore previous preview state
                 } else {
-                    if (isSmallScreen()) {
-                        togglePreview(previewMode);
+                    if (wasPreviewVisible) {
+                        $previewContainer.show();
+                        $codeMirrorContainer.show();
+                        $codeMirrorContainer.removeClass('cp-app-code-fullpage');
+                        $previewButton.addClass('cp-toolbar-button-active');
+                        forceDrawPreview();
                     } else {
-                        if (previewMode) {
-                            $previewContainer.show();
-                            $codeMirrorContainer.removeClass('cp-app-code-fullpage');
-                            $previewButton.addClass('cp-toolbar-button-active');
-                            forceDrawPreview();
-                        } else {
-                            $previewContainer.hide();
-                            $codeMirrorContainer.addClass('cp-app-code-fullpage');
-                            $previewButton.removeClass('cp-toolbar-button-active');
-                        }
+                        $previewContainer.hide();
+                        $codeMirrorContainer.addClass('cp-app-code-fullpage');
+                        $previewButton.removeClass('cp-toolbar-button-active');
                     }
                 }
-            });
+            }
         };
 
         $previewButton.click(function () {

From 557839f0bb0706b6cc2816d2721cc008802028ea Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 17 Feb 2025 18:11:14 +0100
Subject: [PATCH 041/114] Disabled drag on load w/ touchscreen

---
 www/kanban/inner.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 466f12623..31f908e4c 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1184,7 +1184,7 @@ define([
             var toggleOnclass = 'ontouchstart' in window ? 'cp-toggle-inactive' : 'cp-toggle-active'; 
             var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
             var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
-
+            kanban.drag = 'ontouchstart' in window ? false : true
             const updateDrag = state => {
                 return function () {
                     $(toggleDragOn).toggleClass('cp-toggle-active', state).toggleClass('cp-toggle-inactive', !state);

From c4d1d46505636c86e132d3b248924de4efaaa256 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 18 Feb 2025 15:07:49 +0100
Subject: [PATCH 042/114] Edit button fix

---
 www/kanban/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 31f908e4c..c942fdf8d 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -664,10 +664,10 @@ define([
             $(h('.button', {
                 'class': 'kanban-edit-item fa fa-pencil',
                 'alt': Messages.kanban_editCard,
-            }).click(function (e) {
+            })).click(function (e) {
                 getItemEditModal(framework, kanban, itemId);
                 e.stopPropagation();
-            })).appendTo($(el).find('.kanban-item-text-container'));
+            }).insertAfter($(el).find('.kanban-item-text'));
         });
         $container.find('.kanban-board').each(function (i, el) {
             var itemId = $(el).attr('data-id');

From 6a342751c012ff9a41caa66e9f63986995d50ecd Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Tue, 18 Feb 2025 17:10:27 +0100
Subject: [PATCH 043/114] Fixed button focusability

---
 www/kanban/inner.js | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index c942fdf8d..33bdeef9d 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -604,14 +604,16 @@ define([
                 $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-left board-arrow',
                     'title': Messages.kanban_moveBoardLeft,
-                    'aria-hidden': true
+                    'aria-hidden': true,
+                    'tabindex': 0
                 })).click(function () { 
                     shiftBoards('left', el);
                 }).appendTo(arrowContainer);
                 $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-right board-arrow',
                     'title': Messages.kanban_moveBoardRight,
-                    'aria-hidden': true
+                    'aria-hidden': true,
+                    'tabindex': 0
                 })).click(function () {
                     shiftBoards('right', el);
                 }).appendTo(arrowContainer);
@@ -623,7 +625,8 @@ define([
                 $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-left item-arrow',
                     'title': Messages.kanban_moveItemLeft,
-                    'aria-hidden': true
+                    'aria-hidden': true,
+                    'tabindex': 0
                 })).click(function () {
                     shiftItem('left', el);
                 }).appendTo(arrowContainerItem);
@@ -632,21 +635,24 @@ define([
                 $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-down',
                     'title': Messages.kanban_moveItemDown,
-                    'aria-hidden': true
+                    'aria-hidden': true,
+                    'tabindex': 0
                 })).click(function () {
                     shiftItem('down', el);
                 }).appendTo(centralArrowContainerItem);
                 $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-up',
                     'title': Messages.moveItemUp,
-                    'aria-hidden': true
+                    'aria-hidden': true,
+                    'tabindex': 0
                 })).click(function () {
                     shiftItem('up', el);
                 }).appendTo(centralArrowContainerItem);
                 $(h('.button', {
                     'class': 'cp-kanban-arrow fa fa-arrow-right item-arrow',
                     'title': Messages.moveItemRight,
-                    'aria-hidden': true
+                    'aria-hidden': true,
+                    'tabindex': 0
                 })).click(function () {
                     shiftItem('right', el);
                 }).appendTo(arrowContainerItem);
@@ -664,6 +670,8 @@ define([
             $(h('.button', {
                 'class': 'kanban-edit-item fa fa-pencil',
                 'alt': Messages.kanban_editCard,
+                'aria-hidden': true,
+                'tabindex': 0
             })).click(function (e) {
                 getItemEditModal(framework, kanban, itemId);
                 e.stopPropagation();
@@ -674,6 +682,8 @@ define([
             $(h('.button', {
                 'class': 'kanban-edit-item fa fa-pencil',
                 'alt': Messages.kanban_editBoard,
+                'aria-hidden': true,
+                'tabindex': 0
             })).click(function (e) {
                 getBoardEditModal(framework, kanban, itemId);
                 e.stopPropagation();
@@ -1182,8 +1192,8 @@ define([
 
             var toggleOffclass = 'ontouchstart' in window ? 'cp-toggle-active' : 'cp-toggle-inactive'; 
             var toggleOnclass = 'ontouchstart' in window ? 'cp-toggle-inactive' : 'cp-toggle-active'; 
-            var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
-            var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
+            var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows, 'tabindex': 0});
+            var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag, 'tabindex': 0});
             kanban.drag = 'ontouchstart' in window ? false : true
             const updateDrag = state => {
                 return function () {

From 9fd649fb8ceeceddf3637af2b49a8350f9067e68 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Thu, 20 Feb 2025 11:44:59 +0100
Subject: [PATCH 044/114] Fixed container class and button accessibility

---
 www/form/inner.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 4954bf914..67a0d1efd 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3774,8 +3774,8 @@ define([
             }
         });
         $body.addClass('cp-form-palette-'+color);
-
-        $container.attr('class', 'cp-form-creator-content'+(APP.isEditor? ' cp-form-iseditor': '')+ ('ontouchstart' in window ? ' cp-no-drag' : ''));
+        var containerDragClass = ('ontouchstart' in window || APP.drag === false) ? ' cp-no-drag' : ''
+        $container.attr('class', 'cp-form-creator-content'+(APP.isEditor? ' cp-form-iseditor': '')+ containerDragClass);
 
         if (APP.isClosed && content.answers.privateKey && !APP.isEditor && !APP.hasAnswered) {
             var sframeChan = framework._.sfCommon.getSframeChannel();
@@ -4023,11 +4023,13 @@ define([
                 // Arrows 
                 var upButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-up',  {
                     'title': Messages.moveItemUp,
-                    'aria-hidden': true
+                    'aria-hidden': true,
+                    'tabindex': 0
                 }));
                 var downButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-down', {
                     'title': Messages.moveItemDown,
-                    'aria-hidden': true
+                    'aria-hidden': true,
+                    'tabindex': 0
                 }));
                 var shiftBlock = function(direction) {
                     var blockIndex = content.order.indexOf(uid);
@@ -5137,8 +5139,8 @@ define([
 
             var toggleOffclass = 'ontouchstart' in window ? 'cp-toggle-active' : undefined;
             var toggleOnclass = 'ontouchstart' in window ? undefined : 'cp-toggle-active';
-            var toggleDragOff = h(`button#cp-toggle-drag-off.cp-form-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows});
-            var toggleDragOn = h(`button#cp-toggle-drag-on.cp-form-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag});
+            var toggleDragOff = h(`button#cp-toggle-drag-off.cp-form-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows, 'tabindex': 0});
+            var toggleDragOn = h(`button#cp-toggle-drag-on.cp-form-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag, 'tabindex': 0});
             const updateDrag = state => {
                 return function () {
                     var $container = $('.cp-form-creator-content');

From 396a9cf5de52c95a4fb3defb2548d1fe947ef737 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 21 Feb 2025 15:51:40 +0100
Subject: [PATCH 045/114] Prevent duplicates from team drive & restore if
 trashed - WIP

---
 www/common/common-ui-elements.js | 13 ++++++++-----
 www/common/cryptpad-common.js    |  2 +-
 www/common/drive-ui.js           |  5 +++--
 www/common/outer/async-store.js  | 21 ++++++++++++++++++---
 4 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 1693d8ab2..17ecfc4f1 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -594,16 +594,19 @@ define([
         let $icon = $button.find('> i');
 
         let attributes = {};
+        let style = {};
         let btnClass = $button.attr('class');
         let btnId = $button.attr('id');
         let btnTitle = $button.attr('title');
+        let btnVisibility = $button.attr('style');
         if (btnClass) { attributes['class'] = btnClass; }
         if (btnId) { attributes['id'] = btnId; }
         if (btnTitle && !attributes.title) { attributes['title'] = btnTitle; }
-
+        if (btnVisibility) { attributes['style'] = btnVisibility; }
         return UIElements.createDropdownEntry({
             tag: 'a',
             attributes: attributes,
+            style: style,
             content: [
                 h('i',{ 'class': $icon.attr('class') }),
                 h('span', $button.text())
@@ -865,7 +868,9 @@ define([
                 if (callback) { button.click(callback); }
                 break;
             case 'storeindrive':
-                button = $(h('button.cp-toolbar-storeindrive', [
+                button = $(h('button.cp-toolbar-storeindrive', {
+                    style: 'display:none;'
+                }, [
                     h('i.fa.fa-hdd-o'),
                     h('span.cp-toolbar-name.cp-toolbar-drawer-element', Messages.toolbar_storeInDrive)
                 ])).click(common.prepareFeedback(type)).click(function () {
@@ -3347,9 +3352,7 @@ define([
         if (data && data.stored) {
             if (!data.inMyDrive) {
                 $('.cp-toolbar-storeindrive').show();
-            } else {
-                $('.cp-toolbar-storeindrive').hide();
-            }
+            } 
             return;
         }
         var priv = common.getMetadataMgr().getPrivateData();
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index d4bc03a93..73368a297 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1184,7 +1184,7 @@ define([
                 path: data.path,
                 owners: data.owners,
                 expire: data.expire,
-                forceSave: 1
+                forceSave: typeof(data.forceSave) === "undefined" ? 1 : data.forceSave
             }, function (obj) {
                 if (obj && obj.error) { return void cb(obj.error); }
                 cb();
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index d7577c78b..a1dd41abe 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -5094,9 +5094,10 @@ define([
                 sframeChan.query('Q_STORE_IN_TEAM', {
                     href: data.href || data.rohref,
                     password: data.password,
-                    path: paths[0].path[0] === 'template' ? ['template'] : undefined,
+                    path: paths[0].path[0],
                     title: data.title || '',
-                    teamId: -1
+                    teamId: -1,
+                    forceSave: 0
                 }, function (err) {
                     if (err) { return void console.error(err); }
                 });
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index e9eb8226a..0b957eb66 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1198,7 +1198,8 @@ define([
             // If it is stored, update its data, otherwise ask the user if they want to store it
             var allData = [];
             var sendTo = [];
-            var inTargetDrive, inMyDrive;
+            var inTargetDrive, inMyDrive, inTrash;
+            var path = [];
             getAllStores().forEach(function (s) {
                 // If this is an edit link but we don't have edit rights, this entry is not useful
                 if (h.mode === "edit" && s.id && !s.secondaryKey) {
@@ -1220,7 +1221,20 @@ define([
                 if (!s.id) { inMyDrive = res.length; }
 
                 Array.prototype.push.apply(allData, res);
+
+                if (res) {
+                    var elementPath = store.manager.user.userObject.findFile(res[0].id)[0];
+                    if (elementPath) {
+                        path.push(elementPath);
+                    }
+                }    
+
             });
+
+            if (path[0]) {
+                inTrash = (path[0][0] === 'trash' && path[0].length === 4) ? true : false;
+            }
+
             var contains = allData.length !== 0;
             if (store.offline && !contains) {
                 return void cb({ error: 'OFFLINE' });
@@ -1253,9 +1267,8 @@ define([
                 }
                 obj.userObject.setHref(channel, null, href);
             });
-
             // Add the pad if it does not exist in our drive
-            if (!contains || (data.forceSave && !inTargetDrive)) {
+            if (!contains || (data.forceSave && !inTargetDrive) || (data.teamId === -1 && !inMyDrive)) {
                 var autoStore = Util.find(store.proxy, ['settings', 'general', 'autostore']);
                 if (autoStore !== 1 && !data.forceSave && !data.path) {
                     // send event to inner to display the corner popup
@@ -1287,6 +1300,8 @@ define([
                     });
                     return;
                 }
+            } else if (inTrash) {
+                store.manager.user.userObject.restore(path[0]);
             }
 
             sendTo.forEach(function (teamId) {

From 7c98f971722b66fdff5c1e4417a208407b2af6c3 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Fri, 21 Feb 2025 17:55:29 +0100
Subject: [PATCH 046/114] WIP

---
 www/common/cryptpad-common.js   | 2 +-
 www/common/drive-ui.js          | 2 +-
 www/common/outer/async-store.js | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 73368a297..d4bc03a93 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1184,7 +1184,7 @@ define([
                 path: data.path,
                 owners: data.owners,
                 expire: data.expire,
-                forceSave: typeof(data.forceSave) === "undefined" ? 1 : data.forceSave
+                forceSave: 1
             }, function (obj) {
                 if (obj && obj.error) { return void cb(obj.error); }
                 cb();
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index a1dd41abe..cc5e13914 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -5097,7 +5097,7 @@ define([
                     path: paths[0].path[0],
                     title: data.title || '',
                     teamId: -1,
-                    forceSave: 0
+                    path: paths[0].path[0] === 'template' ? ['template'] : undefined
                 }, function (err) {
                     if (err) { return void console.error(err); }
                 });
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 0b957eb66..2dbfbda31 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1212,7 +1212,7 @@ define([
                 }
 
                 // Check if the pad is already stored in the specified drive (data.teamId)
-                if ((!s.id && !data.teamId) || Number(s.id) === data.teamId) {
+                if ((!s.id && (!data.teamId || data.teamId === -1)) || Number(s.id) === data.teamId) {
                     if (!inTargetDrive) {
                         inTargetDrive = res.length;
                     }
@@ -1268,7 +1268,7 @@ define([
                 obj.userObject.setHref(channel, null, href);
             });
             // Add the pad if it does not exist in our drive
-            if (!contains || (data.forceSave && !inTargetDrive) || (data.teamId === -1 && !inMyDrive)) {
+            if (!contains || (data.forceSave && !inTargetDrive)) {
                 var autoStore = Util.find(store.proxy, ['settings', 'general', 'autostore']);
                 if (autoStore !== 1 && !data.forceSave && !data.path) {
                     // send event to inner to display the corner popup

From 8a28c9258b0e3d5a0b9e77cb97b4da5f55c3c1ee Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Sat, 22 Feb 2025 23:48:01 +0200
Subject: [PATCH 047/114] Implement review changes #1722

---
 www/form/app-form.less | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 0ffb26c93..93f28ec57 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -613,10 +613,12 @@
                             margin-top: -10px;
                             margin-right: -10px;
                             &.cp-is-empty {
-                                max-height: 2rem;
+                                max-height: fit-content;
                                 padding: 3px;
-                                border: 2px solid @cryptpad_color_red;
-                                color: @cp_form-invalid;
+                                border: 2px solid @cp_alerts-danger-fg;
+                                border-radius: @variables_radius;
+                                background-color: @cp_alerts-danger-bg;
+                                color: @cp_alerts-danger-text;
                             }
                         }
                     }

From b849545efa1464d72678c082a1c605bd2e6fd599 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 23 Feb 2025 16:45:30 +0000
Subject: [PATCH 048/114] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1787 of 1787 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1787 of 1787 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1787 of 1787 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1787 of 1787 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1787 of 1787 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1787 of 1787 strings)

Co-authored-by: QiuXiaoYu <73543@qq.com>
Co-authored-by: Subtext6676 <subtext6676@users.noreply.weblate.cryptpad.org>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: WhiredPlanck <wplanck@aosc.io>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/zh_Hans/
Translation: CryptPad/App
---
 www/common/translations/messages.zh.json | 402 +++++++++++------------
 1 file changed, 201 insertions(+), 201 deletions(-)

diff --git a/www/common/translations/messages.zh.json b/www/common/translations/messages.zh.json
index f611b25c8..a1e50c144 100644
--- a/www/common/translations/messages.zh.json
+++ b/www/common/translations/messages.zh.json
@@ -1,220 +1,220 @@
 {
-    "main_title": "CryptPad: 零知識, 即時協作編寫",
+    "main_title": "CryptPad：零知识，协同实时编辑",
     "type": {
         "pad": "富文本",
-        "code": "編碼",
+        "code": "代码",
         "poll": "投票",
         "slide": "Markdown 幻灯片",
-        "drive": "磁碟",
+        "drive": "CryptDrive",
         "whiteboard": "白板",
-        "file": "檔案",
-        "media": "多媒體",
+        "file": "文件",
+        "media": "媒体",
         "kanban": "任务看板",
         "todo": "待办事项",
         "teams": "团队",
         "sheet": "工作表",
         "contacts": "联系人",
         "form": "表单",
-        "presentation": "演示文档",
+        "presentation": "演示文稿",
         "doc": "文档",
         "diagram": "图表"
     },
-    "common_connectionLost": "<b>伺服器連線中斷</b><br>現在是唯讀狀態，直到連線恢復正常。",
+    "common_connectionLost": "<b>服务器连接中断</b><br>您现在处于只读模式，直到连接恢复。",
     "typeError": "此文档与所选应用不兼容",
-    "onLogout": "您已退出登录，{0}点击此处{1}登录<br>或按 Esc 以只读模式访问您的文档。",
-    "loading": "載入中...",
-    "error": "錯誤",
-    "saved": "儲存",
+    "onLogout": "您已登出，{0}点击此处{1}登录<br>或按 Esc 键以只读模式访问您的文档。",
+    "loading": "正在加载…",
+    "error": "错误",
+    "saved": "已保存",
     "deleted": "已删除",
-    "disconnected": "已斷線",
-    "synchronizing": "同步中",
-    "reconnecting": "重新連結...",
-    "readonly": "唯讀",
+    "disconnected": "已断开连接",
+    "synchronizing": "正在同步",
+    "reconnecting": "正在重新连接",
+    "readonly": "只读",
     "anonymous": "访客",
-    "users": "用戶",
+    "users": "用户",
     "viewer": "檢視者",
     "viewers": "檢視群",
     "editor": "編輯者",
-    "language": "語言",
-    "upgrade": "昇級",
+    "language": "语言",
+    "upgrade": "升级",
     "MB": "MB",
     "GB": "GB",
     "KB": "kB",
     "formattedMB": "{0} MB",
     "formattedGB": "{0} GB",
     "formattedKB": "{0} kB",
-    "pinLimitReached": "你已達到儲存容量上限",
+    "pinLimitReached": "您已达到存储限制",
     "pinLimitReachedAlert": "您已达到存储空间上限。 新的文档不会存储在您的 CryptDrive 中。<br>您可以从 CryptDrive 中删除文档或<a>订阅高级优惠</a>以提高您的存储空间上限。",
     "pinLimitNotPinned": "已达到存储空间上限。<br>此文档未存储在您的 CryptDrive 中。",
     "pinLimitDrive": "您已达到存储空间上限。<br>您无法创建新文档。",
     "importButtonTitle": "从本地文档导入文档",
     "exportButtonTitle": "将此文档导出到本地文档",
     "exportPrompt": "你希望怎麼命名你的檔案?",
-    "user_rename": "改變顯示名稱",
-    "user_displayName": "顯示名稱",
-    "user_accountName": "帳號名稱",
-    "clickToEdit": "點擊以編輯",
+    "user_rename": "更改显示名称",
+    "user_displayName": "显示名称",
+    "user_accountName": "账号名称",
+    "clickToEdit": "点击编辑",
     "forgetPrompt": "点击确定会将此文档移至回收站。 确定吗？",
     "movedToTrash": "该文档已移至回收站。<br><a>访问我的云盘</a>",
     "shareButton": "分享",
-    "shareSuccess": "複製連結到剪貼版",
+    "shareSuccess": "已将链接复制到剪贴板",
     "newButton": "新",
     "newButtonTitle": "创建一个新文档",
-    "saveTemplateButton": "存成模版",
-    "saveTemplatePrompt": "為這個模版選一個標題",
-    "templateSaved": "模版已儲存!",
-    "selectTemplate": "選擇一個模版或是按 escape 跳出",
-    "previewButtonTitle": "顯示或隱藏 Markdown 預覽模式",
-    "presentButtonTitle": "輸入簡報模式",
-    "backgroundButtonTitle": "改變簡報的顏色背景",
-    "colorButtonTitle": "在簡報模式下改變文字顏色",
-    "printButton": "列印 (enter)",
-    "printOptions": "版型選項",
-    "printSlideNumber": "顯示投影片號碼",
-    "printDate": "顯示日期",
+    "saveTemplateButton": "另存为模板",
+    "saveTemplatePrompt": "为模板选择标题",
+    "templateSaved": "模板已保存！",
+    "selectTemplate": "选择模板或按 Esc 键",
+    "previewButtonTitle": "显示或隐藏 Markdown 预览模式",
+    "presentButtonTitle": "进入演示模式",
+    "backgroundButtonTitle": "更改演示文稿中的背景颜色",
+    "colorButtonTitle": "在演示模式下更改文本颜色",
+    "printButton": "打印（Enter）",
+    "printOptions": "布局选项",
+    "printSlideNumber": "显示幻灯片编号",
+    "printDate": "显示日期",
     "printTitle": "显示文档标题",
-    "printCSS": "自定風格規則 (CSS):",
-    "printTransition": "啟用轉場動畫",
-    "slideOptionsTitle": "自定你的投影片",
-    "editShare": "編輯連結",
-    "viewShare": "唯讀連結",
-    "notifyJoined": "{0} 已加入此協作期間",
-    "notifyRenamed": "{0} 現在改名為 {1}",
-    "notifyLeft": "{0} 已離開了這個協作期間",
-    "okButton": "OK (enter)",
+    "printCSS": "自定义样式规则（CSS）：",
+    "printTransition": "启用过渡动画",
+    "slideOptionsTitle": "自定义幻灯片",
+    "editShare": "编辑链接",
+    "viewShare": "只读链接",
+    "notifyJoined": "{0} 加入了协作会话",
+    "notifyRenamed": "{0} 现在已改名为 {1}",
+    "notifyLeft": "{0} 离开了协作会话",
+    "okButton": "确定（Enter）",
     "cancel": "取消",
-    "cancelButton": "取消 (esc)",
-    "historyButton": "顯示文件歷史",
+    "cancelButton": "取消（Esc）",
+    "historyButton": "显示文档历史记录",
     "history_next": "下个版本",
     "history_prev": "先前版本",
-    "history_closeTitle": "關閉歷史記錄",
-    "history_restoreTitle": "將此文件重建到所挑選的版本",
+    "history_closeTitle": "关闭历史记录",
+    "history_restoreTitle": "还原所选文档版本",
     "history_restorePrompt": "您确定要用显示的版本替换文档的当前版本吗?",
-    "history_restoreDone": "文件已重建",
-    "poll_publish_button": "發佈",
-    "poll_create_user": "新增使用者",
-    "poll_create_option": "新增選項",
-    "poll_commit": "投入",
-    "poll_optionPlaceholder": "選項",
-    "poll_userPlaceholder": "你的名稱",
-    "poll_removeOption": "確定要移除這個選項嗎?",
-    "poll_removeUser": "確定要移除這位使用者嗎?",
+    "history_restoreDone": "文档已还原",
+    "poll_publish_button": "发布",
+    "poll_create_user": "添加新用户",
+    "poll_create_option": "添加新选项",
+    "poll_commit": "提交",
+    "poll_optionPlaceholder": "选项",
+    "poll_userPlaceholder": "您的名字",
+    "poll_removeOption": "是否确定要移除此选项？",
+    "poll_removeUser": "是否确定要移除此用户？",
     "poll_descriptionHint": "請簡述這個調查目的，完成時使用「發佈鍵」。任何知道此調查連結者可以更改這裏的描述內容，但我們不鼓勵這麼做。.",
     "canvas_clear": "清除",
-    "canvas_delete": "刪除所選",
-    "canvas_width": "寛度",
-    "canvas_opacity": "透明度",
+    "canvas_delete": "删除所选内容",
+    "canvas_width": "宽度",
+    "canvas_opacity": "不透明度",
     "fm_rootName": "云盘",
-    "fm_trashName": "垃圾桶",
-    "fm_filesDataName": "所有檔案",
-    "fm_templateName": "模版",
-    "fm_searchName": "搜尋",
-    "fm_searchPlaceholder": "搜尋...",
+    "fm_trashName": "回收站",
+    "fm_filesDataName": "所有文件",
+    "fm_templateName": "模板",
+    "fm_searchName": "搜索",
+    "fm_searchPlaceholder": "搜索…",
     "fm_newButton": "新的",
     "fm_newButtonTitle": "创建一个新的文档或文件夹，在当前文件夹中导入一个文件。",
-    "fm_newFolder": "新資料夾",
+    "fm_newFolder": "新建文件夹",
     "fm_newFile": "新文档",
-    "fm_folder": "資料夾",
-    "fm_folderName": "資料夾名稱",
-    "fm_numberOfFolders": "# 個資料夾",
-    "fm_numberOfFiles": "# 檔案",
-    "fm_fileName": "檔案名",
-    "fm_type": "類型",
-    "fm_lastAccess": "上回使用",
-    "fm_creation": "創建",
-    "fm_forbidden": "禁止的行為",
-    "fm_originalPath": "原始路徑",
-    "fm_openParent": "顯示在目錄夾中",
-    "fm_noname": "無標題文件",
-    "fm_emptyTrashDialog": "確定要清理垃圾筒嗎?",
+    "fm_folder": "文件夹",
+    "fm_folderName": "文件夹名称",
+    "fm_numberOfFolders": "# 文件夹",
+    "fm_numberOfFiles": "# 文件",
+    "fm_fileName": "文件名",
+    "fm_type": "类型",
+    "fm_lastAccess": "上次访问",
+    "fm_creation": "创建",
+    "fm_forbidden": "禁止的操作",
+    "fm_originalPath": "原始路径",
+    "fm_openParent": "在文件夹中显示",
+    "fm_noname": "无标题文档",
+    "fm_emptyTrashDialog": "是否确定要清空回收站？",
     "fm_removeSeveralPermanentlyDialog": "您确定要从您的云盘中删除这些{0}项目吗? 它们将留在已存储它们的其他用户的云盘中。",
     "fm_removePermanentlyDialog": "您确定要从云盘中删除此项目吗？它将保留在已存储它的其他用户的云盘中。",
-    "fm_restoreDialog": "確定要重置 {0} 到它之前的位置嗎？",
-    "fm_unknownFolderError": "所選或上回訪問的目錄不再存在了，正開啟上層目錄中...",
-    "fm_contextMenuError": "無法在此元件下打開文本選單。如果這個問題一直發生，請試著重新載入此頁。",
-    "fm_selectError": "無法選取目標的要素。如果這個問題一直發生，請試著重新載入此頁。",
-    "fm_categoryError": "無法打開所選的類別，正在顯示根目錄。",
-    "fm_info_root": "在此建立任何巢狀目錄夾以便於整理分類你的檔案。",
+    "fm_restoreDialog": "是否确定要将 {0} 还原到之前的位置？",
+    "fm_unknownFolderError": "所选或上次访问的目录不再存在。正在打开上层文件夹…",
+    "fm_contextMenuError": "无法打开该元素的上下文菜单。如果问题仍然存在，请尝试重新加载页面。",
+    "fm_selectError": "无法选择目标元素。如果问题仍然存在，请尝试重新加载页面。",
+    "fm_categoryError": "无法打开所选类别，显示根目录。",
+    "fm_info_root": "在此处创建任意数量的嵌套文件夹以便对文件进行分类。",
     "fm_info_template": "这些文档存储为模板。 创建新文档时可以重复使用它们。",
-    "fm_info_trash": "清空垃圾筒好讓 CryptDrive 多出一些空間",
+    "fm_info_trash": "清空回收站以释放 CryptDrive 中的空间。",
     "fm_info_anonymous": "您尚未登录，因此您的文档将在 {0} 天后过期。清除浏览器历史记录可能会导致它们消失。<br><a href=\"/register/\">注册</a>（无需提供个人信息）或<a href=\"/login/\">登录</a>即可将文档无限期地存储在您的云盘中。<a href=\"#docs\">阅读有关注册账号的更多信息</a>。",
-    "fm_error_cantPin": "內部伺服器出錯，請重新載入本頁並再試一次。",
-    "fc_newfolder": "新資料夾",
-    "fc_rename": "重新命名",
-    "fc_open": "打開",
-    "fc_open_ro": "打開 (唯讀)",
-    "fc_delete": "刪除",
-    "fc_restore": "重置",
+    "fm_error_cantPin": "内部服务器错误，请重新加载页面并重试。",
+    "fc_newfolder": "新建文件夹",
+    "fc_rename": "重命名",
+    "fc_open": "打开",
+    "fc_open_ro": "打开（只读）",
+    "fc_delete": "移至回收站",
+    "fc_restore": "还原",
     "fc_remove": "删除",
-    "fc_empty": "清理垃圾筒",
+    "fc_empty": "清空回收站",
     "fc_prop": "Properties",
-    "fo_moveUnsortedError": "你不能移動資料夾到未整理的工作檔案清單",
-    "fo_existingNameError": "名稱已被使用，請選擇其它名稱",
-    "fo_moveFolderToChildError": "你不能移動資料夾到它的子資料夾底下",
-    "fo_unavailableName": "在新位置裏同名的檔案或資料夾名稱已存在，請重新命名後再試看看。",
-    "login_login": "登入",
-    "login_register": "註冊",
+    "fo_moveUnsortedError": "您无法将文件夹移动到模板列表",
+    "fo_existingNameError": "名称已在该目录中使用，请选择其他名称。",
+    "fo_moveFolderToChildError": "您无法将文件夹移至其子文件夹",
+    "fo_unavailableName": "新位置已存在同名文件或文件夹，重命名元素并重试。",
+    "login_login": "登录",
+    "login_register": "注册",
     "logoutButton": "登出",
-    "settingsButton": "設定",
-    "login_username": "用戶名",
-    "login_password": "密碼",
-    "login_confirm": "確認你的密碼",
-    "login_hashing": "散列你的密碼中，這要花上一點時間",
+    "settingsButton": "设置",
+    "login_username": "用户名",
+    "login_password": "密码",
+    "login_confirm": "确认您的密码",
+    "login_hashing": "正在散列您的密码，这可能需要一些时间。",
     "login_noSuchUser": "用户名或密码无效",
-    "login_invalUser": "要求用戶名",
-    "login_invalPass": "要求密碼",
-    "login_unhandledError": "發生了未預期的錯誤 :(",
-    "register_importRecent": "从您的访客会话中导入文档",
-    "register_acceptTerms": "我同意 <a>服務條款</a>",
-    "register_passwordsDontMatch": "密碼不相符！",
-    "register_mustAcceptTerms": "你必須同意我們的服務條款。",
+    "login_invalUser": "请填写用户名",
+    "login_invalPass": "请填写密码",
+    "login_unhandledError": "发生意外错误 :(",
+    "register_importRecent": "从访客会话导入文档",
+    "register_acceptTerms": "我接受<a>服务条款</a>",
+    "register_passwordsDontMatch": "密码不匹配！",
+    "register_mustAcceptTerms": "您必须接受服务条款。",
     "register_header": "注册",
-    "register_writtenPassword": "我已記下了我的用戶名和密碼，請繼續",
+    "register_writtenPassword": "我已记下我的用户名和密码，继续",
     "register_cancel": "取消",
     "register_warning": "警告",
-    "register_alreadyRegistered": "這名用戶己存在了,你要登入嗎?",
-    "settings_title": "設定",
-    "settings_save": "儲存",
-    "settings_backup": "備份",
-    "settings_restore": "重建",
-    "settings_reset": "從你的 CryptDrive 移除所有的檔案和資料夾",
+    "register_alreadyRegistered": "此用户已存在，是否要登录？",
+    "settings_title": "设置",
+    "settings_save": "保存",
+    "settings_backup": "备份",
+    "settings_restore": "还原",
+    "settings_reset": "从 CryptDrive 移除所有文件和文件夹",
     "settings_resetPrompt": "此操作将从您的云盘中删除所有文档。<br>确定要继续吗？<br>输入“<em>我喜欢 CryptPad</em>”进行确认。",
-    "settings_resetDone": "你的目錄現已清空！",
-    "settings_resetError": "不正確的認證文字，你的 CryptDrive 並未更改。",
-    "settings_resetTips": "使用 CryptDrive 的竅門",
-    "settings_resetTipsButton": "在 CryptDrive 下重置可用的訣竅",
-    "settings_resetTipsDone": "所有的訣竅現在都可再次看到了。",
+    "settings_resetDone": "您的云盘现在为空！",
+    "settings_resetError": "验证文本不正确，您的 CryptDrive 尚未更改。",
+    "settings_resetTips": "提示",
+    "settings_resetTipsButton": "重置 CryptDrive 中的可用提示",
+    "settings_resetTipsDone": "现在可以再次看到所有提示。",
     "settings_importTitle": "将此浏览器的最近文档导入您的 CryptDrive 中",
-    "settings_import": "滙入",
-    "settings_importConfirm": "您确定要将最近的文档从此浏览器导入到您用户帐户的 CryptDrive 吗？",
-    "settings_importDone": "滙入完成",
+    "settings_import": "导入",
+    "settings_importConfirm": "是否确定要将最近的文档从此浏览器导入到您用户账号的 CryptDrive？",
+    "settings_importDone": "导入已完成",
     "settings_userFeedbackHint1": "CryptPad 會提供一些基本的反饋到伺服器，以讓我們知道如何改善用戶體驗。",
     "settings_userFeedbackHint2": "您的文档内容永远不会与服务器共享。",
-    "settings_userFeedback": "啟用用戶反饋功能",
-    "settings_anonymous": "你尚未登入，在此瀏覽器上進行特別設定。",
-    "settings_publicSigningKey": "公開金鑰簽署",
+    "settings_userFeedback": "启用用户反馈",
+    "settings_anonymous": "您尚未登录，此处的设置仅适用于此浏览器。",
+    "settings_publicSigningKey": "公开签名密钥",
     "settings_logoutEverywhereTitle": "关闭远程会话",
-    "settings_logoutEverywhere": "自所有其它的網頁期間登出",
-    "settings_logoutEverywhereConfirm": "你確定嗎？你將需要登入到所有用到設置。",
-    "upload_serverError": "伺服器出錯：本次無法上傳你的檔案",
-    "upload_uploadPending": "你欲上傳檔案正在傳輸中，要取消並上傳新檔案嗎？",
-    "upload_success": "你的檔案 ({0}) 已成功地上傳並放入到你的網路磁碟中。",
-    "upload_notEnoughSpace": "你的 CryptDrive 無足夠空間來存放這個檔案。",
-    "upload_tooLarge": "该文档超过了您的帐户允许的最大上传大小。",
-    "upload_choose": "選擇一個檔案",
-    "upload_pending": "待處理",
-    "upload_cancelled": "已取消的",
+    "settings_logoutEverywhere": "强制登出所有其他网页会话",
+    "settings_logoutEverywhereConfirm": "是否确定？您需要登录所有的设备。",
+    "upload_serverError": "服务器错误：此时无法上传文件。",
+    "upload_uploadPending": "您已经有正在上传的文件，取消并上传新文件？",
+    "upload_success": "您的文件（{0}）已成功上传并添加到云盘。",
+    "upload_notEnoughSpace": "CryptDrive 中没有足够的空间容纳此文件。",
+    "upload_tooLarge": "此文件超过了您账号允许的最大上传大小。",
+    "upload_choose": "选择文件",
+    "upload_pending": "待处理",
+    "upload_cancelled": "已取消",
     "upload_size": "大小",
-    "about": "關於",
-    "privacy": "隐私",
-    "contact": "聯繫",
+    "about": "关于",
+    "privacy": "隐私政策",
+    "contact": "联系我们",
     "terms": "服务条款",
-    "header_logoTitle": "回到主頁",
-    "edit": "編輯",
-    "view": "檢視",
+    "header_logoTitle": "转到您的 CryptDrive",
+    "edit": "编辑",
+    "view": "查看",
     "feedback_about": "如果您正在阅读本文，您可能会好奇为什幺 CryptPad 在您执行某些操作时会请求网页。",
-    "feedback_privacy": "我們注重你的隱私，同時也要讓 CryptPad 容易使用。我們利用這個檔案來了解哪一種介面設計為用戶所重視，透過它來請求特別的功能參數。",
-    "feedback_optout": "如果欲退出客戶資料收集, 請到 <a>用戶設定頁</a>, 可以找到勾選項目來啟用或關閉用戶回饋功能。",
+    "feedback_privacy": "我们注重您的隐私，同时也希望 CryptPad 非常易于使用。我们使用此文件来了解哪些用户界面功能对我们的用户很重要，通过请求它以及指定已执行的操作的参数。",
+    "feedback_optout": "如果您想选择退出，请访问<a>您的用户设置页面</a>，找到可以启用或禁用用户反馈复选框。",
     "settings_cat_kanban": "看板",
     "themeButton": "主题",
     "languageButton": "语言",
@@ -226,7 +226,7 @@
     "forgetButton": "删除",
     "exportButton": "导出",
     "importButton": "导入",
-    "forgotten": "移到回收站",
+    "forgotten": "已移至回收站",
     "initializing": "初始化中…",
     "typing": "编辑中",
     "profile_editDescription": "编辑描述",
@@ -269,7 +269,7 @@
     "contacts_removeHistoryTitle": "清理聊天记录",
     "contacts_info4": "任何一个参与者都可以永久清除聊天记录",
     "contacts_info3": "双击他们的图标以查看他们的个人资料",
-    "contacts_info2": "单击联系人的图标与他们聊天",
+    "contacts_info2": "点击联系人的图标与他们聊天",
     "contacts_info1": "这些是您的联系人。 从这里，您可以：",
     "contacts_padTitle": "聊天",
     "contacts_warning": "您在此处键入的所有内容都是持久存在的，可供本文档的所有现有和未来用户使用。 小心敏感信息！",
@@ -296,7 +296,7 @@
     "canvas_opacityLabel": "不透明度：{0}",
     "oo_uploaded": "上传已完成。点击确定重新加载页面或点击取消以只读模式继续。",
     "oo_cantUpload": "其他用户在场时不允许上传。",
-    "oo_reconnect": "服务器已恢复连接。 单击确定以重新加载并继续编辑。",
+    "oo_reconnect": "服务器连接已恢复，点击“确定”重新加载并继续编辑。",
     "poll_comment_disabled": "使用 ✓ 按钮发布此投票以启用评论。",
     "poll_comment_placeholder": "您的评论",
     "poll_comment_remove": "删除此评论",
@@ -346,7 +346,7 @@
     "template_empty": "没有可用的模板",
     "template_import": "导入模板",
     "useTemplateCancel": "重新开始 (Esc)",
-    "useTemplateOK": "选择一个模板（Enter）",
+    "useTemplateOK": "选择模板（Enter）",
     "useTemplate": "从模板开始？",
     "uploadButtonTitle": "上传新文件到您的 CryptDrive",
     "uploadFolderButton": "上传文件夹",
@@ -356,15 +356,15 @@
     "form_preview": "表格预览",
     "form_changeTypeConfirm": "选择新的问题类型。",
     "form_corruptAnswers": "此表单已经有回复。 更改此问题类型可能会使以前的响应数据无效。",
-    "userAccountButton": "用户中心",
+    "userAccountButton": "用户菜单",
     "userListButton": "用户列表",
     "saveTitle": "保存标题（enter）",
-    "pinLimitReachedAlertNoAccounts": "您已达到存储空间上限",
+    "pinLimitReachedAlertNoAccounts": "您已达到存储限制",
     "storageStatus": "存储：<br><b>{0}</b>已用完<b>{1}</b>",
     "upgradeAccount": "升级账号",
     "userlist_offline": "您当前处于离线状态，用户列表不可用。",
     "errorState": "严重错误：{0}",
-    "realtime_unrecoverableError": "发生了不可恢复的错误。 单击确定以重新加载。",
+    "realtime_unrecoverableError": "发生了不可恢复的错误，点击“确定”重新加载。",
     "disabledApp": "此应用已被禁用。 请联系此 CryptPad 的管理员了解详细信息。",
     "mustLogin": "您必须登录才能访问此页面",
     "deletedFromServer": "文档已销毁",
@@ -374,7 +374,7 @@
     "invalidHashError": "您请求的文档的 URL 无效。",
     "chainpadError": "更新内容时出现严重错误。 此页面处于只读模式，以确保您不会丢失您的工作。<br>点击 Esc 以继续查看此文档，或重新加载后再次尝试编辑。",
     "inactiveError": "由于缺少活动，此文档已被删除。 按 Esc 创建一个新文档。",
-    "deletedError": "该文档已被删除，不再可用。",
+    "deletedError": "此文档已被删除，不再可用。",
     "expiredError": "此文档已达到销毁日期，不再可用。",
     "anonymousStoreDisabled": "此 CryptPad 实例的管理员已禁用访客存储服务。 请登录以访问您自己的 CryptDrive。",
     "padNotPinnedVariable": "此文档将在 {4} 天不活动后过期，请{0}登录{1}或{2}注册{3}以保留它。",
@@ -411,15 +411,15 @@
     "settings_changePasswordNew": "新密码",
     "settings_changePasswordCurrent": "当前密码",
     "settings_changePasswordButton": "更改密码",
-    "settings_changePasswordHint": "更改您的帐户密码。 输入您当前的密码，然后输入两次以确认新密码。<br><b>如果您忘记了密码，我们将无法重置您的密码，因此请务必小心！</b>",
+    "settings_changePasswordHint": "更改您的账号密码。输入您当前的密码，然后输入两次以确认新密码。<br><b>如果您忘记了密码，我们将无法重置您的密码，因此请务必小心！</b>",
     "settings_changePasswordTitle": "更改您的密码",
-    "settings_ownDrivePending": "您的帐户正在升级。 在该过程完成之前，请不要关闭或重新加载此页面。",
-    "settings_ownDriveConfirm": "升级您的帐户可能需要一些时间。您需要在所有设备上重新登录。确定吗？",
-    "settings_ownDriveButton": "升级您的帐户",
-    "settings_ownDriveHint": "由于技术原因，较旧的帐户无法访问最新功能。 免费更新将启用当前功能，并为之后的更新准备好您的 CryptDrive。",
+    "settings_ownDrivePending": "正在升级您的账号。在过程完成之前，请勿关闭或重新加载此页面。",
+    "settings_ownDriveConfirm": "升级您的账号可能需要一些时间。您需要在所有设备上重新登录。是否确定？",
+    "settings_ownDriveButton": "升级您的账号",
+    "settings_ownDriveHint": "由于技术原因，旧账号无法访问最新功能。免费更新将启用当前功能，并为 CryptDrive 的未来更新做准备。",
     "settings_ownDriveTitle": "更新账号",
     "settings_padOpenLinkLabel": "启用打开直接链接的功能",
-    "settings_padOpenLinkHint": "使用此选项，您可以在单击时打开嵌入式链接而无需弹出预览窗口",
+    "settings_padOpenLinkHint": "使用此选项无需预览弹窗就可以在点击时打开嵌入式链接",
     "settings_padOpenLinkTitle": "首次点击时打开链接",
     "settings_padSpellcheckLabel": "在富文本文档中启用拼写检查",
     "settings_padSpellcheckHint": "此选项允许您在富文本文档中启用拼写检查。 拼写错误将带有红色下划线，您必须在右键单击时按住 Ctrl 或 Meta 键才能看到正确的选项。",
@@ -434,11 +434,11 @@
     "settings_driveDuplicateHint": "当您将拥有的文档移动到共享文件夹时，您的 CryptDrive 中会保留一份副本，以确保您保留对它的控制权。您可以隐藏重复的文档。除非被删除，否则只有共享版本可见，在这种情况下，原始版本将显示在其先前的位置。",
     "settings_driveDuplicateTitle": "您拥有的重复文档",
     "settings_logoutEverywhereButton": "退出登录",
-    "settings_deleted": "您的用户帐号现已删除。 按 确定 进入主页。",
+    "settings_deleted": "现已删除您的用户账号，按“确定”转到主页。",
     "settings_deleteButton": "删除您的帐号",
     "settings_deleteModal": "与您的 CryptPad 管理员共享以下信息，以便从他们的服务器中删除您的数据。",
-    "settings_deleteHint": "删除账号是永久性的。 您的 CryptDrive 和您的文档列表将从服务器中删除。 如果没有其他人将它们存储在他们的 CryptDrive 中，您的其余文档将在 90 天内被删除。",
-    "settings_deleteTitle": "删除账号",
+    "settings_deleteHint": "账号删除是永久的。将从服务器删除您的 CryptDrive 和文档列表。如果没有其他人在其 CryptDrive 中存储您的文档，将在 90 天后删除其余文档。",
+    "settings_deleteTitle": "账号删除",
     "settings_userFeedbackTitle": "反馈",
     "settings_autostoreMaybe": "手动（总是询问）",
     "settings_autostoreNo": "手动（从不询问）",
@@ -490,7 +490,7 @@
     "fc_delete_owned": "销毁",
     "fc_collapseAll": "全部收起",
     "fc_expandAll": "展开全部",
-    "fc_color": "换颜色",
+    "fc_color": "更改颜色",
     "fc_newsharedfolder": "新建共享文件夹",
     "fm_passwordProtected": "密码保护",
     "fm_moveNestedSF": "您不能将一个共享文件夹放在另一个共享文件夹中。 文件夹 {0} 未移动。",
@@ -548,7 +548,7 @@
     "share_embedCategory": "内嵌",
     "main_catch_phrase": "协同套件<br>端到端加密并开源",
     "features_f_social": "社交功能",
-    "features_f_devices_note": "在任何地方使用您的帐号访问 CryptDrive",
+    "features_f_devices_note": "使用您的用户账号随时随地访问您的 CryptDrive",
     "features_f_devices": "所有设备上的文档",
     "features_f_cryptdrive1_note": "目录，共享目录，模板，标签",
     "features_f_cryptdrive1": "全部CryptDrive功能",
@@ -609,11 +609,11 @@
     "support_disabledTitle": "未启用支持",
     "admin_supportListHint": "这是用户发送到支持邮箱的工单列表。 所有管理员都可以看到消息及其答案。 已关闭的票无法重新打开。 您只能删除（隐藏）已关闭的工单，其他管理员仍然可以看到已删除的工单。",
     "admin_supportListTitle": "支持邮箱",
-    "admin_supportInitHint": "您可以配置一个邮箱以方便用户以安全的方式反馈使用信息给您。",
+    "admin_supportInitHint": "您可以配置支持邮箱，以便您的 CryptPad 实例用户在账号有问题时有安全联系您的方式。",
     "admin_supportInitTitle": "支持邮箱初始化",
     "admin_supportAddError": "无效的私钥",
     "admin_supportAddKey": "添加私钥",
-    "admin_supportInitPrivate": "您的 CryptPad 实例配置了邮箱，但您的帐户没有正确的私钥来访问它。 请在下面的输入框里面添将私钥添更新到您的帐户里。",
+    "admin_supportInitPrivate": "您的 CryptPad 实例配置为使用支持邮箱，但您的账号没有正确的私钥来访问它。请使用下表将私钥添加或更新到您的账号。",
     "admin_supportInitHelp": "您的服务器尚未配置支持邮箱。 如果您希望支持邮箱接收来自您的用户的消息，您应该让您的服务器管理员运行位于“./scripts/generate-admin-keys.js”中的脚本，然后将公钥存储在“config.js”中 \" 文档并将私钥发送给您。",
     "admin_cat_support": "支持",
     "supportPage": "支持",
@@ -646,14 +646,14 @@
     "settings_codeSpellcheckTitle": "拼写检查",
     "admin_diskUsageButton": "生成报告",
     "admin_diskUsageHint": "各种 CryptPad 资源占用的存储空间量",
-    "admin_diskUsageTitle": "磁盘使用情况",
+    "admin_diskUsageTitle": "云盘使用量",
     "timeoutError": "一个错误中断了您与服务器的连接。 <br>点击 Esc 重新加载页面。",
     "contact_email": "电子邮件",
     "contact_chat": "聊天",
     "contact_bug": "Bug报告",
     "contact_devHint": "用于功能请求、可用性改进或者说声谢谢。",
     "contact_dev": "联系开发人员",
-    "contact_adminHint": "关于账户、存储限制或者服务可用性相关的任务问题。\n",
+    "contact_adminHint": "有关您的账号、存储限制或服务可用性的任何问题。\n",
     "contact_admin": "联系管理员：{0}",
     "footer_donate": "捐献",
     "admin_flushCacheDone": "清除缓存成功",
@@ -674,7 +674,7 @@
     "settings_cat_security": "安全和隐私",
     "imprint": "法律声明",
     "oo_sheetMigration_anonymousEditor": "本文档需要升级。 在注册用户打开之前，访客无法进行编辑。",
-    "oo_sheetMigration_complete": "可用更新版本，按 OK 重新加载。",
+    "oo_sheetMigration_complete": "有可用的更新版本，按“确定”重新加载。",
     "oo_sheetMigration_loading": "将您的文档升级到最新版本。 请等待大约 1 分钟。",
     "oo_exportInProgress": "正在导出",
     "oo_importInProgress": "正在导入",
@@ -682,7 +682,7 @@
     "burnAfterReading_warningDeleted": "此文档已被永久删除，一旦您关闭此窗口，您将无法再次访问它。",
     "burnAfterReading_proceed": "查看和删除",
     "burnAfterReading_warningAccess": "该文档将自毁。 当您单击下面的按钮时，您将在永久删除之前看到一次内容。 当您关闭此窗口时，您将无法再次访问它。 如果您还没有准备好继续，您可以关闭此窗口并稍后再回来。",
-    "burnAfterReading_generateLink": "单击下面的按钮以生成链接。",
+    "burnAfterReading_generateLink": "点击下方按钮生成链接。",
     "team_inviteJoin": "加入团队",
     "team_inviteLinkCreate": "创建链接",
     "burnAfterReading_warningLink": "您已将此文档设置为自毁。 收件人访问此链接后，他们将能够看到该文档一次，然后将其永久删除。",
@@ -700,7 +700,7 @@
     "team_inviteFrom": "从：",
     "team_inviteLinkCopy": "创建链接",
     "team_inviteLinkErrorName": "请为您邀请的人添加姓名。 他们可以稍后更改。 ",
-    "team_inviteLinkWarning": "访问此链接的人员将能够加入此团队并查看其内容。请谨慎分享。",
+    "team_inviteLinkWarning": "访问此链接的人员将能够加入此团队并查看其内容，请谨慎分享。",
     "team_inviteLinkLoading": "生成您的链接",
     "team_inviteLinkNoteMsg": "此消息将在收件人决定是否加入此团队之前显示。",
     "share_contactPasswordAlert": "此项目受密码保护。 因为您与 CryptPad 联系人共享它，所以收件人不必输入密码。",
@@ -713,7 +713,7 @@
     "team_inviteLinkTempName": "临时名称（在待处理的邀请列表中可见）",
     "team_inviteLinkTitle": "为该团队创建个性化邀请",
     "contacts_muteInfo": "您不会收到来自禁言用户的任何通知或消息。<br>他们不会知道您已将他们禁言。 ",
-    "contacts_mutedUsers": "禁言帐户",
+    "contacts_mutedUsers": "已禁言账号",
     "contacts_manageMuted": "管理禁言",
     "contacts_unmute": "取消禁言",
     "contacts_mute": "禁言",
@@ -759,7 +759,7 @@
     "owner_team_add": "{0} 希望您成为团队 <b>{1}</b> 的所有者。要接受吗？",
     "team_listSlot": "可用的团队名额",
     "team_listTitle": "您的团队",
-    "team_maxTeams": "每个用户帐户只能是 {0} 个团队的成员。",
+    "team_maxTeams": "每个用户账号只能是 {0} 个团队的成员。",
     "team_infoContent": "每个团队都有自己的 CryptDrive、存储配额、聊天和成员列表。 团队所有者可以删除整个团队，管理员可以邀请或踢除成员，成员可以离开团队。",
     "team_avatarHint": "最大尺寸为 500 kB（png、jpg、jpeg、gif）",
     "team_avatarTitle": "团队头像",
@@ -778,10 +778,10 @@
     "team_createLabel": "创建一个新团队",
     "team_infoLabel": "关于团队",
     "team_cat_admin": "管理员",
-    "team_cat_drive": "磁盘",
+    "team_cat_drive": "云盘",
     "team_cat_chat": "聊天",
     "team_cat_members": "成员",
-    "team_cat_back": "回到团队",
+    "team_cat_back": "返回团队",
     "team_cat_create": "新建",
     "team_cat_list": "团队",
     "team_cat_general": "关于",
@@ -866,7 +866,7 @@
     "help_genericMore": "阅读我们的<a>文档</a>，详细了解 CryptPad 如何为您工作",
     "header_homeTitle": "转到 CryptPad 主页",
     "four04_pageNotFound": "我们找不到您要查找的页面。",
-    "features_f_subscribe_note": "订阅需要注册账号",
+    "features_f_subscribe_note": "需要注册账号才能订阅",
     "features_f_subscribe": "订阅",
     "features_f_supporter_note": "帮助 CryptPad 实现财务可持续发展，并表明由用户自愿资助的隐私增强软件应该成为常态",
     "features_f_supporter": "支持隐私",
@@ -927,7 +927,7 @@
     "support_cat_other": "其他",
     "support_cat_bug": "错误报告",
     "support_cat_data": "内容丢失",
-    "support_cat_account": "用户帐号",
+    "support_cat_account": "用户账号",
     "info_privacyFlavour": "此实例的<a>隐私政策</a>",
     "user_about": "关于 CryptPad",
     "info_imprintFlavour": "关于此实例的管理员的<a>法律信息</a>",
@@ -1005,8 +1005,8 @@
     "trimHistory_currentSize": "当前历史记录大小：<b>{0}</b>",
     "trimHistory_needMigration": "请<a>更新您的 CryptDrive</a> 以启用此功能。",
     "settings_safeLinksTitle": "安全链接",
-    "register_instance": "在 {0} 上创建一个新帐户",
-    "login_instance": "在 {0} 上连接到您的帐户",
+    "register_instance": "在 {0} 上创建新账号",
+    "login_instance": "在 {0} 上连接到您的账号",
     "home_morestorage": "如需更多存储空间：",
     "home_location": "加密数据托管在 {0}",
     "footer_website": "项目网站",
@@ -1120,7 +1120,7 @@
     "admin_updateAvailableTitle": "新版本",
     "admin_cat_network": "网络",
     "mdToolbar_embed": "嵌入的文件",
-    "restrictedLoginPrompt": "您无权访问此文档。 如果您认为您的帐户应该能够访问它，请<a>登录</a>。",
+    "restrictedLoginPrompt": "您无权访问此文档。如果您认为您的账号应该能够访问它，请<a>登录</a>。",
     "copyToClipboard": "复制到剪贴板",
     "settings_driveRedirect": "自动重定向我",
     "settings_driveRedirectHint": "默认情况下不再启用登录时从主页自动重定向到云盘。 可以在下面启用旧版行为。",
@@ -1247,7 +1247,7 @@
     "calendar_errorNoCalendar": "未选择可编辑的日历",
     "calendar_deleteOwned": "与它共享的其他用户仍然可以看到它。",
     "calendar_deleteTeamConfirm": "确定要从团队中删除此日历吗？",
-    "calendar_deleteConfirm": "您确定要从您的帐户中删除此日历吗？",
+    "calendar_deleteConfirm": "是否确定要从您的账号中删除此日历？",
     "calendar_today": "今天",
     "calendar_month": "月",
     "calendar_week": "星期",
@@ -1262,8 +1262,8 @@
     "oo_cantMigrate": "此工作表超过了最大上传大小，并且太大而无法迁移。",
     "footer_roadmap": "路线图",
     "settings_deleteSubscription": "管理我的订阅",
-    "settings_deleteContinue": "删除我的账户",
-    "settings_deleteWarning": "警告：您当前订阅了高级计划（由其他用户付费或提供）。 请在删除您的帐户之前取消您的计划，因为一旦您的帐户被删除，您将无法联系支持人员。",
+    "settings_deleteContinue": "删除我的账号",
+    "settings_deleteWarning": "警告：您当前订阅了高级计划（由其他用户付费或提供）。请在删除账号前取消您的计划，因为一旦删除账号，不联系支持人员就无法取消计划。",
     "broadcast_newCustom": "来自管理员的消息",
     "broadcast_preview": "预览通知",
     "broadcast_defaultLanguage": "回退到此语言",
@@ -1325,7 +1325,7 @@
     "creation_helperText": "在文档中打开",
     "creation_expiresIn": "销毁于",
     "register_warning_note": "由于 CryptPad 的加密特性，如果您忘记了用户名和/或密码，服务管理员将无法恢复数据。 请将它们保存在安全的地方。",
-    "register_notes": "<ul class=\"cp-notes-list\"><li>您的密码是加密所有文档的密钥。 <span class=\"red\">如果您丢失了，我们将无法恢复您的数据。</span></li><li>如果您使用的是共享计算机，<span class=\"red\">请记住 完成后退出</span>。 只有关闭浏览器窗口才会暴露您的帐户。 </li><li>要在不登录的情况下保留您创建和/或存储的文档，请勾选“从您的访客会话导入文档”。 </li></ul>",
+    "register_notes": "<ul class=\"cp-notes-list\"><li>您的密码是加密所有文档的密钥。<span class=\"red\">如果您丢失了，我们将无法恢复您的数据。</span></li><li>如果您使用的是共享计算机，<span class=\"red\">请记住在完成后登出</span>。仅关闭浏览器窗口会暴露您的账号。</li><li>要保留您在未登录时创建和/或存储的文档，请勾选“从访客会话导入文档”。</li></ul>",
     "register_notes_title": "重要笔记",
     "offlineError": "无法同步最新数据，此时无法显示此页面。 当您与服务的连接恢复时，加载将继续。",
     "share_noContactsOffline": "您目前处于离线状态。 联系人不可用。",
@@ -1394,7 +1394,7 @@
     "admin_defaultlimitTitle": "存储限制 (MB)",
     "admin_defaultlimitHint": "未应用自定义规则时 CryptDrives（用户和团队）的最大存储限制",
     "admin_registrationTitle": "关闭注册",
-    "admin_registrationHint": "实例的访问者无法创建账号。管理员可以创建邀请。",
+    "admin_registrationHint": "实例的访问者无法创建账号，管理员可以创建邀请。",
     "snapshots_cantMake": "无法创建快照。 您已断开连接。",
     "snapshots_notFound": "此快照不再存在，因为文档的历史记录已被删除。",
     "snapshot_error_exists": "已经有这个版本的快照",
@@ -1429,7 +1429,7 @@
     "support_warning_bug": "请指定出现问题的浏览器以及是否安装了任何扩展。 请提供尽可能多的有关问题的详细信息以及重现问题所需的步骤",
     "support_warning_document": "请说明导致问题的文档类型并提供<a>文档标识符</a>或链接",
     "support_warning_drives": "请注意，管理员无法按名称识别文件夹和文档。 对于共享文件夹，请提供<a>文档标识符</a>",
-    "support_warning_account": "请注意，管理员无法重置密码。 如果您丢失了帐户凭据但仍处于登录状态，您可以<a>将数据迁移到新帐户</a>",
+    "support_warning_account": "请注意，管理员无法重置密码。如果您丢失了账号凭据但仍在登录，可以<a>将数据迁移到新账号</a>",
     "support_warning_prompt": "请为您的问题选择最相关的类别。 这有助于管理员进行分类，并为提供哪些信息提供进一步的建议",
     "info_sourceFlavour": "CryptPad 的<a>源代码</a>",
     "info_termsFlavour": "此实例的<a>服务条款</a>",
@@ -1448,10 +1448,10 @@
     "ui_success": "成功",
     "ui_fetch": "获取",
     "ui_confirm": "确定",
-    "admin_archiveReason": "请说明存档原因并确认您要继续",
+    "admin_archiveReason": "请说明归档原因并确认您要继续",
     "admin_restoreReason": "请说明恢复原因并确认您要继续",
-    "admin_accountMetadataTitle": "帐户信息",
-    "admin_accountMetadataHint": "输入用户的公钥以获取有关其帐户的数据。",
+    "admin_accountMetadataTitle": "账号信息",
+    "admin_accountMetadataHint": "输入用户的公钥以获取有关其账号的数据。",
     "admin_documentMetadataTitle": "文档信息",
     "admin_documentMetadataHint": "通过其 id 或 URL 查询文档或文件",
     "admin_documentSize": "文档尺寸",
@@ -1460,7 +1460,7 @@
     "admin_documentModifiedTime": "上一次更改",
     "admin_currentlyOpen": "当前打开的",
     "admin_channelAvailable": "可用的",
-    "admin_channelArchived": "存档",
+    "admin_channelArchived": "已归档",
     "admin_blockAvailable": "块可用",
     "admin_blockArchived": "块已存档",
     "admin_archiveBlock": "归档块",
@@ -1485,7 +1485,7 @@
     "calendar_rec_edit": "这是一个重复的事件",
     "calendar_str_filter_day": "天数: {0}",
     "calendar_rec_weekdays": "平日每天",
-    "admin_archiveDocument": "存档文档",
+    "admin_archiveDocument": "归档文档",
     "ui_jsRequired": "必须启用 JavaScript 才能在浏览器中进行加密",
     "admin_reportContent": "举报内容",
     "admin_getRawMetadata": "元数据历史",
@@ -1605,11 +1605,11 @@
     "dph_reason": "原因：{0}",
     "dph_sf_destroyed": "所有者销毁了分享的文件夹 <b>{0}</b>",
     "dph_sf_destroyed_team": "所有者销毁了团队云盘 <b>{1}</b> 中分享的文件夹 <b>{0}</b>",
-    "admin_archiveAccount": "存档此账号",
+    "admin_archiveAccount": "归档此账号",
     "admin_archiveAccountInfo": "包括其拥有的文件",
     "admin_restoreAccount": "还原此账号",
-    "admin_accountSuspended": "管理员存档的账号",
-    "admin_accountReport": "账号存档报告",
+    "admin_accountSuspended": "管理员归档的账号",
+    "admin_accountReport": "账号归档报告",
     "admin_accountReportFull": "获取详情报告",
     "admin_channelPlaceholder": "已销毁的文档占位符",
     "dph_default": "此内容不再可用",
@@ -1710,7 +1710,7 @@
     "support_pasteUserData": "在此处粘贴用户数据",
     "support_legacyButton": "获取活动工单",
     "support_recordedTitle": "片段",
-    "support_recordedHint": "将常用文本存储为单击快捷方式以插入支持消息中。",
+    "support_recordedHint": "将常用文本存储为一键式快捷方式，以便在支持消息中插入。",
     "support_recordedContent": "内容",
     "support_recordedEmpty": "没有片段",
     "support_legacyTitle": "查看旧的支持数据",
@@ -1720,7 +1720,7 @@
     "support_legacyClear": "为此账号删除",
     "support_team": "支持团队",
     "support_answerAs": "作为 <b>{0}</b> 回答",
-    "support_movePending": "移动到存档",
+    "support_movePending": "移至归档",
     "support_moveActive": "移动到活动",
     "support_copyUserData": "复制用户数据",
     "support_insertRecorded": "插入片段",
@@ -1773,7 +1773,7 @@
     "admin_totpRecoveryHint": "用户可以在 2FA 恢复页面 /recovery/ 复制恢复数据，然后将其通过电子邮件发送给实例管理员。粘贴以下恢复数据即可为账号禁用 2FA",
     "label_logo": "CryptPad 徽标",
     "team_nameAlreadySet": "团队名称已设置为 {0}",
-    "admin_archiveAccountConfirm": "请指定存档的原因，这将显示给用户。",
+    "admin_archiveAccountConfirm": "请说明归档原因，这将显示给用户。",
     "calendar_rec_change_first": "将第一个重复事件移动到不同的日历。也将移动所有重复事件。",
     "ssoauth_form_hint_register": "添加 CryptPad 密码以增强安全性，或留空并继续。如果不添加密码，实例管理员将可以使用保护数据的密钥。",
     "admin_forcemfaHint": "将要求此实例上的全部用户设置双因素身份验证才能登录其账号。请注意，现有用户如果不设置 TOTP 应用程序将无法继续使用其账号。",

From 2a7b908c39a50d8de6f36ed1792d67e5d1c42546 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 23 Feb 2025 16:45:30 +0000
Subject: [PATCH 049/114] Translated using Weblate (Spanish)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 87.9% (1571 of 1787 strings)

Translated using Weblate (Spanish)

Currently translated at 87.9% (1571 of 1787 strings)

Co-authored-by: Pedro López Ruiz <pedrolopezruiz@posteo.net>
Co-authored-by: Ricardo Garicano Arenas <rgaricano@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/es/
Translation: CryptPad/App
---
 www/common/translations/messages.es.json | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/www/common/translations/messages.es.json b/www/common/translations/messages.es.json
index 0892a210c..4769479e2 100644
--- a/www/common/translations/messages.es.json
+++ b/www/common/translations/messages.es.json
@@ -16,7 +16,8 @@
         "teams": "Equipos",
         "form": "Formulario",
         "presentation": "Presentación",
-        "doc": "Documento"
+        "doc": "Documento",
+        "diagram": "Diagrama"
     },
     "disconnected": "Desconectado",
     "synchronizing": "Sincronizando",
@@ -1573,5 +1574,13 @@
     "team_linkUsesInfinite": "(sin límite de usos)",
     "form_settingsButton": "Configuración del formulario",
     "form_editable_on": "Una vez y editar",
-    "form_responseNotification": "Nuevas respuestas a la forma: <b>{0}</b>"
+    "form_responseNotification": "Nuevas respuestas a la forma: <b>{0}</b>",
+    "settings_mfaHint": "Proteja su cuenta con un código de verificación adicional proporcionado por una aplicación autenticadora de su elección.",
+    "form_anonymized": "Las respuestas son anónimas",
+    "form_condorcetSchulze": "Schulze",
+    "form_showCondorcetWinner": "ganador: ",
+    "form_showDetails": "Detalles",
+    "form_condorcetExtendedDisplay": "Número de partidos ganados por cada candidato: ",
+    "form_type_date": "Fecha",
+    "team_linkUses": "({0}/{1} restante)"
 }

From 2a42c6cd2cd64b0bfe946ff0dc4b9d286cf6873a Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 23 Feb 2025 16:45:30 +0000
Subject: [PATCH 050/114] Translated using Weblate (Russian)

Currently translated at 100.0% (1787 of 1787 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: serbul (ifreedomlab.net) <serbul@users.noreply.weblate.cryptpad.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/ru/
Translation: CryptPad/App
---
 www/common/translations/messages.ru.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.ru.json b/www/common/translations/messages.ru.json
index a1d23562b..96359d187 100644
--- a/www/common/translations/messages.ru.json
+++ b/www/common/translations/messages.ru.json
@@ -1783,5 +1783,9 @@
     "admin_onboardingDescPlaceholder": "Текст описания экземпляра",
     "admin_mfa_confirm_disable": "Вы уверены, что хотите выключить многофакторную аутентификацию (MFA)?",
     "admin_mfa_confirm_enable": "Вы уверены, что хотите включить многофакторную аутентификацию (MFA)?",
-    "team_autoTrim": "Оптимизация (усечение) истории хранилища Команды... Пожалуйста, подождите."
+    "team_autoTrim": "Оптимизация (усечение) истории хранилища Команды... Пожалуйста, подождите.",
+    "form_passwordWarning": "Обратите внимание, что пароль Формы можно установить только сейчас, во время создания, и его нельзя изменить позже.",
+    "calendar_hide": "Скрыть календари",
+    "fm_restoreMultipleDialog": "Вы уверены, что хотите восстановить {0} файлов и/или папок в прежнее расположение?",
+    "calendar_show": "Показать календари"
 }

From b84a42b277f3fc508b1660c969bc6bbefe4807dd Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 23 Feb 2025 16:45:30 +0000
Subject: [PATCH 051/114] Translated using Weblate (Romanian)

Currently translated at 100.0% (1787 of 1787 strings)

Co-authored-by: Gabriel <gabrielc@users.noreply.weblate.cryptpad.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/ro/
Translation: CryptPad/App
---
 www/common/translations/messages.ro.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.ro.json b/www/common/translations/messages.ro.json
index 7a531df8d..f07bc6485 100644
--- a/www/common/translations/messages.ro.json
+++ b/www/common/translations/messages.ro.json
@@ -1783,5 +1783,9 @@
     "install_header": "Instalare",
     "team_autoTrim": "Scurtăm istoricul drive-ului de echipa... Vă rugăm să așteptați.",
     "admin_mfa_confirm_enable": "Sunteți sigur că doriți să activați Autentificarea În Mai Mulți Pași?",
-    "admin_mfa_confirm_disable": "Sunteți sigur că doriți să dezactivați Autentificarea În Mai Mulți Pași?"
+    "admin_mfa_confirm_disable": "Sunteți sigur că doriți să dezactivați Autentificarea În Mai Mulți Pași?",
+    "form_passwordWarning": "Vă rugăm să țineți minte că parola la Form poate fi setată doar acum, în momentul creării și nu poate fi schimbată mai târziu.",
+    "fm_restoreMultipleDialog": "Sigur doriți să restaurați {0} fișiere și/sau dosare către locația lor anterioară?",
+    "calendar_show": "Arată calendare",
+    "calendar_hide": "Ascunde calendare"
 }

From 4d43aa2190009e0325d6c55763f0cbf28b1bae9c Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 23 Feb 2025 16:45:30 +0000
Subject: [PATCH 052/114] Translated using Weblate (Portuguese (Brazil))
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 93.1% (1664 of 1787 strings)

Co-authored-by: Danilo Corrêa Silva <profdanilocsilva@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/pt_BR/
Translation: CryptPad/App
---
 www/common/translations/messages.pt-br.json | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/www/common/translations/messages.pt-br.json b/www/common/translations/messages.pt-br.json
index 8026159d8..206fff4eb 100644
--- a/www/common/translations/messages.pt-br.json
+++ b/www/common/translations/messages.pt-br.json
@@ -352,7 +352,7 @@
     "settings_autostoreMaybe": "Manual (sempre perguntar)",
     "settings_autostoreYes": "Automático",
     "settings_autostoreHint": "<b>Automatico</b> Todos os documentos que você visitou estão armazenados em seu CryptDrive.<br><b>Manual (sempre pergunta)</b> Se você ainda não armazenou documentos, será questionado se deseja armazená-los em seu CryptDrive.<br><b>Manual (nunca pergunta)</b> Os documentos não são armazenados automaticamente em seu CryptDrive. A opção para armazená-los estará escondida.",
-    "settings_autostoreTitle": "Bloco armazenado no CryptDrive",
+    "settings_autostoreTitle": "Documento armazenado no CryptDrive",
     "settings_resetThumbnailsDone": "Todas as miniaturas foram apagadas.",
     "settings_resetThumbnailsDescription": "Limpar todas as miniaturas de documentos armazenadas em seu navegador.",
     "settings_resetThumbnailsAction": "Limpar",
@@ -464,8 +464,8 @@
     "admin_updateLimitButton": "Atualizar cotas",
     "admin_updateLimitHint": "Forçar uma atualização dos limites de armazenamento do usuário pode ser feito a qualquer momento, mas só é necessário em caso de erro",
     "admin_updateLimitTitle": "Atualizar cotas de usuários",
-    "admin_registeredHint": "Número de usuários registrados na sua instância",
-    "admin_registeredTitle": "Usuários registrados",
+    "admin_registeredHint": "Número de usuários ativos na sua instância",
+    "admin_registeredTitle": "Drives do usuário e equipe",
     "admin_activePadsHint": "Número de documentos exclusivos atualmente sendo visualizados ou editados",
     "admin_activePadsTitle": "documentos ativos",
     "admin_activeSessionsHint": "Número de conexões websocket ativas (e único endereço de IP conectado)",
@@ -816,7 +816,7 @@
     "footer_donate": "Doe",
     "admin_flushCacheDone": "Cache limpo com sucesso",
     "admin_flushCacheButton": "Limpar cache",
-    "admin_flushCacheHint": "Força os usuários a baixar os ativos do cliente mais recentes (apenas se o seu servidor estiver no modo novo)",
+    "admin_flushCacheHint": "Força os usuários a baixar os ativos do cliente mais recentes (apenas se o seu servidor estiver no modo novo) após uma customização ou alteração nas configurações. Evita reiniciar o servidor mas reinicia as conexões de todos os usuários, por favor use com cautela.",
     "admin_flushCacheTitle": "Limpar cache HTTP",
     "settings_padNotifTitle": "Notificações de comentários",
     "comments_comment": "Comentário",
@@ -1018,7 +1018,7 @@
     "history_cantRestore": "Restauração falhou. Você está desconectado.",
     "history_close": "Fechar",
     "history_restore": "Restaurar",
-    "admin_registrationHint": "Não permitir que nenhum novo usuário se registre",
+    "admin_registrationHint": "Visitantes da instância não podem criar contas. Convites podem ser criados pelos administradores.",
     "fm_sort": "Ordenar",
     "comments_error": "Não é possível acrescentar um comentário aqui",
     "settings_padNotifCheckbox": "Desabilitar notificações de comentários",
@@ -1666,5 +1666,6 @@
     "admin_diskUsageWarning": "Use com cuidado! Dependendo do tamanho dos dados armazenados na instância, a geração deste relatório pode consumir toda a memória disponível no servidor e causar travamento.",
     "goRight": "Direita",
     "dph_pad_pw": "Este documento está protegido por uma nova senha",
-    "goLeft": "Esquerda"
+    "goLeft": "Esquerda",
+    "calendar_rec_change_first": "Movendo o primeiro evento duplicado para uma agenda diferente. Todos os eventos duplicados serão movidos."
 }

From d2eccac1ef538438becaab59d7b4ca487cfea8bf Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 23 Feb 2025 16:45:30 +0000
Subject: [PATCH 053/114] Translated using Weblate (Bulgarian)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 37.5% (671 of 1787 strings)

Translated using Weblate (Bulgarian)

Currently translated at 36.1% (646 of 1787 strings)

Translated using Weblate (Bulgarian)

Currently translated at 34.7% (621 of 1787 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: Мария Рангелова <rangelova_1186@abv.bg>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/bg/
Translation: CryptPad/App
---
 www/common/translations/messages.bg.json | 74 +++++++++++++++++++++++-
 1 file changed, 73 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.bg.json b/www/common/translations/messages.bg.json
index 56ac012e0..0d833a25e 100644
--- a/www/common/translations/messages.bg.json
+++ b/www/common/translations/messages.bg.json
@@ -599,5 +599,77 @@
     "sharedFolders_create": "Създаване на споделена папка",
     "sharedFolders_create_name": "Име на папка",
     "sharedFolders_create_owned": "Собствена папка",
-    "convertFolderToSF_SFParent": "Тази папка не може да бъде преобразувана в споделена папка в текущото си местоположение. Преместете го извън споделената папка, за да продължите."
+    "convertFolderToSF_SFParent": "Тази папка не може да бъде преобразувана в споделена папка в текущото си местоположение. Преместете го извън споделената папка, за да продължите.",
+    "convertFolderToSF_confirm": "Тази папка трябва да бъде преобразувана в споделена папка, за да могат другите да я видят. Продължавате ли?",
+    "chrome68": "Изглежда, че използвате браузъра Chrome или Chromium версия 68. Той съдържа грешка, която води до това, че страницата става напълно бяла след няколко секунди или страницата не реагира на кликвания. За да коригирате този проблем, можете да превключите на друг раздел и да се върнете след това или да превъртите в страницата. Тази грешка трябва да бъде коригирана в следващата версия на вашия браузър.",
+    "autostore_file": "файл",
+    "autostore_sf": "папка",
+    "autostore_pad": "Оформяне на текст",
+    "autostore_notstored": "Този {0} не е във вашия CryptDrive. Искате ли да го съхраните сега?",
+    "autostore_settings": "Можете да активирате автоматичното съхранение на документите във вашата страница <a>Настройки</a>.",
+    "autostore_store": "Хранилище",
+    "autostore_hide": "Не съхранявайте",
+    "autostore_error": "Неочаквана грешка: не можахме да съхраним този документ, опитайте отново.",
+    "autostore_saved": "Документът беше успешно съхранен във вашия CryptDrive!",
+    "autostore_forceSave": "Съхранявайте файла във вашия CryptDrive",
+    "autostore_notAvailable": "Трябва да съхраните този документ във вашия CryptDrive, преди да можете да използвате тази функция.",
+    "crowdfunding_button": "Поддръжка на CryptPad",
+    "crowdfunding_button2": "Даряване",
+    "crowdfunding_popup_text": "<h3>Имаме нужда от вашата помощ!</h3>За да сме сигурни, че CryptPad се разработва активно, помислете за подкрепа на проекта чрез страницата OpenCollective, където можете да видите нашата <b>Пътна карта</b> и <b>Цели за финансиране</ b>.",
+    "crowdfunding_popup_no": "Не сега",
+    "survey": "Проучване на CryptPad",
+    "markdown_toc": "Съдържание",
+    "fm_expirablePad": "Изтича: {0}",
+    "admin_authError": "Само администраторите имат достъп до тази страница",
+    "admin_cat_general": "Главен",
+    "admin_cat_stats": "Статистика",
+    "adminPage": "Администрация",
+    "admin_activeSessionsTitle": "Активни връзки",
+    "admin_activePadsTitle": "Активни документи",
+    "admin_activePadsHint": "Брой уникални документи, които в момента се разглеждат или редактират",
+    "admin_registeredTitle": "Потребителски и екипни дискове",
+    "admin_registeredHint": "Брой активни дискове на вашето копие",
+    "admin_updateLimitButton": "Обновяване на квоти",
+    "admin_updateLimitDone": "Обновяването завърши успешно",
+    "admin_flushCacheTitle": "Изчистване на HTTP кеша",
+    "admin_flushCacheButton": "Изчистване на кеша",
+    "admin_flushCacheDone": "Кешът е изчистен успешно",
+    "footer_donate": "Даряване",
+    "contact_admin": "Свържете се с администраторите за: {0}",
+    "contact_dev": "Свързване с разработчиците",
+    "contact_devHint": "За заявяване на функции, подобрения на използваемостта или за да кажете благодаря.",
+    "contact_bug": "Докладване за грешка",
+    "contact_chat": "Чат",
+    "contact_email": "Имейл",
+    "admin_flushCacheHint": "Принуждава всички потребители да изтеглят най-новите активи след промяна в персонализирането или конфигурацията им. Избягва рестартирането на сървъра, но кара всеки активен потребител да нулира връзката си, моля, използвайте пестеливо.",
+    "contact_adminHint": "За всякакви проблеми, свързани с акаунта ви, ограничение за съхранение или наличност на услугата.\n",
+    "admin_activeSessionsHint": "Брой активни уебсокет връзки (и свързани уникални IP адреси)",
+    "admin_updateLimitTitle": "Обновяване на потребителските квоти",
+    "admin_updateLimitHint": "Принудителното обновяване на лимитите за потребителското хранилище може да се извърши по всяко време, но е необходимо само в случай на грешка",
+    "timeoutError": "Грешка прекъсна връзката ви със сървъра. <br>Натиснете Esc, за да презаредите страницата.",
+    "admin_diskUsageTitle": "Използване на диска",
+    "admin_diskUsageHint": "Размер на изразходеното пространство за съхранение, чрез различни ресурси на CryptPad",
+    "admin_diskUsageButton": "Генериране на отчет",
+    "settings_codeSpellcheckTitle": "Проверка на правописа",
+    "settings_codeSpellcheckLabel": "Активиране на проверката на правописа в редактора на кода",
+    "drive_active1Day": "Последните 24 часа",
+    "drive_active7Days": "Последните 7 дни",
+    "drive_active28Days": "Последните 4 седмици",
+    "drive_activeOld": "По-малко нови документи",
+    "friendRequest_later": "Решете по-късно",
+    "friendRequest_accept": "Приемам (Въвеждам)",
+    "friendRequest_decline": "Отказване",
+    "friendRequest_declined": "<b>{0}</b> отхвърляне на искането ви за контакт",
+    "friendRequest_accepted": "<b>{0}</b> приемане на вашата заявка за връзка",
+    "friendRequest_received": "<b>{0}</b> би искал да бъде ваш контакт",
+    "friendRequest_notification": "<b>{0}</b> ви изпрати заявка за контакт",
+    "notifications_empty": "Няма налични известия",
+    "profile_addDescription": "Добавяне на описание",
+    "profile_editDescription": "Редактиране на вашето описание",
+    "profile_addLink": "Добавяне на връзка към сайта си",
+    "profile_friendRequestSent": "Изчакваща заявка за контакт...",
+    "isContact": "{0} е един от вашите контакти",
+    "isNotContact": "{0} is <b>not</b> един от вашите контакти",
+    "profile_info": "Другите потребители могат да намерят профила ви чрез аватара ви в списъците с потребители на документи.",
+    "notification_padShared": "{0} сподели документ с вас: <b>{1}</b>"
 }

From 3592b5ce8e5c9f1138b5258357279be9a3a6568e Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Sun, 23 Feb 2025 16:45:30 +0000
Subject: [PATCH 054/114] Translated using Weblate (Basque)

Currently translated at 100.0% (1787 of 1787 strings)

Co-authored-by: Alexander Gabilondo <alexgabi@disroot.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/eu/
Translation: CryptPad/App
---
 www/common/translations/messages.eu.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.eu.json b/www/common/translations/messages.eu.json
index 50ffbce38..53aea674f 100644
--- a/www/common/translations/messages.eu.json
+++ b/www/common/translations/messages.eu.json
@@ -1783,5 +1783,9 @@
     "admin_onboardingOptionsHint": "Mesedez, hautatu aukera egokia zure instantziarako.<br>Ezarpen hauek geroago alda daitezke administrazio panelean.",
     "admin_mfa_confirm_disable": "Ziur faktore anitzeko autentifikazioa desgaitu nahi duzula?",
     "admin_mfa_confirm_enable": "Ziur faktore anitzeko autentifikazioa gaitu nahi duzula?",
-    "team_autoTrim": "Taldeko diskoen historia mozten... Itxaron mesedez."
+    "team_autoTrim": "Taldeko diskoen historia mozten... Itxaron mesedez.",
+    "fm_restoreMultipleDialog": "Ziur {0} fitxategi edo/eta karpeta lehengo kokapenetara leheneratu nahi dituzula?",
+    "calendar_show": "Erakutsi egutegiak",
+    "calendar_hide": "Ezkutatu egutegiak",
+    "form_passwordWarning": "Kontuan izan Inprimakiaren pasahitza orain bakarrik ezar daitekeela sortzean eta ezin dela geroago aldatu."
 }

From d539beee13c8010f2876b92368eccf4e9c0b113a Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 24 Feb 2025 11:01:19 +0100
Subject: [PATCH 055/114] Fixed bug with restoring & deleted redundant line

---
 www/common/drive-ui.js          | 1 -
 www/common/outer/async-store.js | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index cc5e13914..65fd07628 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -5094,7 +5094,6 @@ define([
                 sframeChan.query('Q_STORE_IN_TEAM', {
                     href: data.href || data.rohref,
                     password: data.password,
-                    path: paths[0].path[0],
                     title: data.title || '',
                     teamId: -1,
                     path: paths[0].path[0] === 'template' ? ['template'] : undefined
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 2dbfbda31..e4ca55a85 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1222,7 +1222,7 @@ define([
 
                 Array.prototype.push.apply(allData, res);
 
-                if (res) {
+                if (res && res[0]) {
                     var elementPath = store.manager.user.userObject.findFile(res[0].id)[0];
                     if (elementPath) {
                         path.push(elementPath);

From 178313387f241341a78d0f64aca7330b527d2d13 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Tue, 25 Feb 2025 13:52:49 +0200
Subject: [PATCH 056/114] Fix issues with language switching #1367

---
 www/code/inner.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index 17eb946a1..98aacead8 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -214,7 +214,7 @@ define([
         var previewTo;
 
         var togglePreview = function (show) {
-            if (show) {
+            if (show && previews[CodeMirror.highlightMode]) {
                 $previewContainer.show();
                 $codeMirrorContainer.hide();
                 $previewButton.addClass('cp-toolbar-button-active');
@@ -230,14 +230,14 @@ define([
         var handleResize = function () {
             var wasPreviewVisible = isVisible(); // Capture preview state before resize
 
-            if (isPresentMode) {
+            if (isPresentMode && previews[CodeMirror.highlightMode]) {
                 $previewContainer.show();
                 $codeMirrorContainer.hide();
                 $previewButton.hide();
                 forceDrawPreview();
             } else {
                 if (isSmallScreen()) {
-                    togglePreview(wasPreviewVisible); // Restore previous preview state
+                    togglePreview(wasPreviewVisible);
                 } else {
                     if (wasPreviewVisible) {
                         $previewContainer.show();
@@ -309,10 +309,14 @@ define([
 
         var modeChange = function (mode) {
             if (previews[mode]) {
+                console.log(previews[mode]);
                 $previewButton.show();
+                if(isSmallScreen()) {
+                    togglePreview(false);
+                }
                 framework._.sfCommon.getPadAttribute('previewMode', function (e, data) {
                     if (e) { return void console.error(e); }
-                    if (data !== false) {
+                    if (data !== false && data !== undefined) {
                         $previewContainer.show();
                         $previewButton.addClass('cp-toolbar-button-active');
                         $codeMirrorContainer.removeClass('cp-app-code-fullpage');
@@ -328,6 +332,7 @@ define([
             $previewButton.hide();
             $previewContainer.hide();
             $previewButton.removeClass('active');
+            $codeMirrorContainer.show();
             $codeMirrorContainer.addClass('cp-app-code-fullpage');
         };
 

From c120b12b1906b939caca6556da84f000b381216a Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:11:54 +0200
Subject: [PATCH 057/114] remove log

---
 www/code/inner.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index 98aacead8..e56357e0f 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -309,7 +309,6 @@ define([
 
         var modeChange = function (mode) {
             if (previews[mode]) {
-                console.log(previews[mode]);
                 $previewButton.show();
                 if(isSmallScreen()) {
                     togglePreview(false);

From 0687f942bcc452d0d13eb94e8604ccb9e3753719 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:26:43 +0200
Subject: [PATCH 058/114] Remove comments #1367

---
 www/code/app-code.less | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/www/code/app-code.less b/www/code/app-code.less
index 09aeb8260..c6da5960b 100644
--- a/www/code/app-code.less
+++ b/www/code/app-code.less
@@ -137,7 +137,6 @@
     @media (max-width: @browser_media-medium-screen) {
         #cp-app-code-editor {
             &.cp-app-code-present {
-                //#cp-app-code-container { display: none !important; }
                 #cp-app-code-preview {
                     flex: 1;
                     max-width: 100%;
@@ -156,9 +155,6 @@
                         padding-bottom: 100px;
                     }
                 }
-                // #cp-app-code-preview {
-                //     display: none !important;
-                // }
             }
         }
     }

From d5de3c43fe86c2a437dd0a03d9c929dcabae8431 Mon Sep 17 00:00:00 2001
From: DianaXWiki <139217939+DianaXWiki@users.noreply.github.com>
Date: Wed, 26 Feb 2025 12:49:56 +0200
Subject: [PATCH 059/114] Add example of accessiblity refactoring #1367

---
 www/form/inner.js | 64 +++++++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 25 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 661b0ee98..095d341d2 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -115,10 +115,13 @@ define([
     };
 
     var saveAndCancelOptions = function (cb) {
-        var cancelBlock = h('button.btn.btn-default.cp-form-preview-button',[
-                            h('i.fa.fa-eye'),
-                            Messages.form_preview_button
-                        ]);
+       var cancelBlock = h('button.btn.btn-default.cp-form-preview-button', {
+            attrs: { 'aria-labelledby': Messages.form_preview_button }
+        }, [
+            h('i.fa.fa-eye', { attrs: { 'aria-hidden': 'true' } }),
+            h('span', { attrs: { id: Messages.form_preview_button } }, Messages.form_preview_button)
+        ]);
+
         $(cancelBlock).click(function () { cb(undefined, true); });
 
         return cancelBlock;
@@ -220,13 +223,18 @@ define([
     var editOptions = function (v, isDefaultOpts, setCursorGetter, cb, tmp) {
         var evOnSave = Util.mkEvent();
 
-        var add = h('button.btn', [
-            h('i.fa.fa-plus'),
-            h('span', Messages.form_add_option)
+        var add = h('button.btn', {
+            attrs: { 'aria-labelledby':  Messages.form_add_option }
+        }, [
+            h('i.fa.fa-plus', { attrs: { 'aria-hidden': 'true' } }),
+            h('span', { attrs: { id: Messages.form_add_option } }, Messages.form_add_option)
         ]);
-        var addItem = h('button.btn.btn-secondary', [
-            h('i.fa.fa-plus'),
-            h('span', Messages.form_add_item)
+
+        var addItem = h('button.btn.btn-secondary', {
+            attrs: { 'aria-labelledby': Messages.form_add_item }
+        }, [
+            h('i.fa.fa-plus', { attrs: { 'aria-hidden': 'true' } }),
+            h('span', { attrs: { id: Messages.form_add_item } }, Messages.form_add_item)
         ]);
 
         var cursor;
@@ -5068,9 +5076,9 @@ define([
             });
             var $modal = modal.$modal;
             $modal.find('.cp-modal').append([
-                h('h2', [
-                    h('i.fa.fa-wrench'),
-                    h('span', Messages.form_settingsButton)
+                h('h2', { attrs: { 'aria-labelledby': Messages.form_settingsButton} }, [
+                    h('i.fa.fa-wrench', { attrs: { 'aria-hidden': 'true' } }),
+                    h('span', { attrs: { id: Messages.form_settingsButton } }, Messages.form_settingsButton)
                 ]),
                 endDateContainer,
                 anonContainer,
@@ -5079,9 +5087,9 @@ define([
                 privacyContainer,
                 editableContainer,
             ]);
-            var modalBtn = h('button.btn.btn-secondary', [
-                h('i.fa.fa-wrench'),
-                h('span', Messages.form_settingsButton)
+            var modalBtn = h('button.btn.btn-secondary', { attrs: { 'aria-labelledby': Messages.form_settingsButton } }, [
+                h('i.fa.fa-wrench', { attrs: { 'aria-hidden': 'true' } }),
+                h('span', { attrs: { id: Messages.form_settingsButton } }, Messages.form_settingsButton)
             ]);
             $(modalBtn).click(function () {
                 setTimeout(function () {
@@ -5472,17 +5480,23 @@ define([
             var t = h('textarea');
             var p = h('p.cp-form-response-msg-hint', Messages.form_responseMsg);
 
-            var preview = h('button.btn.btn-default.cp-form-preview-button',[
-                h('i.fa.fa-eye'),
-                h('span', Messages.form_preview_button)
+            var preview = h('button.btn.btn-default.cp-form-preview-button', {
+                attrs: { 'aria-labelledby':  Messages.form_preview_button }
+            }, [
+                h('i.fa.fa-eye', { attrs: { 'aria-hidden': 'true' } }),
+                h('span', { attrs: { id: Messages.form_preview_button } }, Messages.form_preview_button)
             ]);
-            var edit = h('button.btn.btn-default.cp-form-edit-button', [
-                h('i.fa.fa-pencil'),
-                h('span', Messages.form_editBlock)
+            var edit = h('button.btn.btn-default.cp-form-edit-button', {
+                attrs: { 'aria-labelledby': Messages.form_editBlock }
+            }, [
+                h('i.fa.fa-pencil', { attrs: { 'aria-hidden': 'true' } }),
+                h('span', { attrs: { id: Messages.form_editBlock } }, Messages.form_editBlock)
             ]);
-            var del = h('button.btn.btn-danger-alt', [
-                h('i.fa.fa-trash-o'),
-                h('span', Messages.form_delete)
+            var del = h('button.btn.btn-danger-alt', {
+                attrs: { 'aria-labelledby': Messages.form_delete }
+            }, [
+                h('i.fa.fa-trash-o', { attrs: { 'aria-hidden': 'true' } }),
+                h('span', { attrs: { id: Messages.form_delete } }, Messages.form_delete)
             ]);
             var editButtons = h('div.cp-form-edit-buttons-container', [ preview, edit, del ]);
 

From 10a53b6c422cc978de14c494eb416ba2516265e1 Mon Sep 17 00:00:00 2001
From: Diana Voineag <diana.voineag@xwiki.com>
Date: Wed, 26 Feb 2025 12:59:42 +0200
Subject: [PATCH 060/114] Revert "Add example of accessiblity refactoring
 #1367"

This reverts commit d5de3c43fe86c2a437dd0a03d9c929dcabae8431.
---
 www/common/common-ui-elements.js |  6 ++-
 www/form/inner.js                | 64 +++++++++++++-------------------
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 378ccdb98..f67d24186 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -904,9 +904,11 @@ define([
             case 'toggle':
                 button = $(h('button.cp-toolbar-tools', {
                     //title: data.title || '', // TODO display if the label text is collapsed
+                    'aria-labelledby': data.text ? 'toolbar-button-label' : undefined,
+                    'aria-label': data.text || Messages.toolbar_tools // Fallback
                 }, [
-                    h('i.fa.' + (data.icon || 'fa-wrench')),
-                    h('span.cp-toolbar-name', data.text || Messages.toolbar_tools)
+                    h('i.fa.' + (data.icon || 'fa-wrench'), { 'aria-hidden': 'true' }),
+                    h('span.cp-toolbar-name', { id: 'toolbar-button-label' }, data.text || Messages.toolbar_tools)
                 ])).click(common.prepareFeedback(type));
                 /*
                 window.setTimeout(function () {
diff --git a/www/form/inner.js b/www/form/inner.js
index 095d341d2..661b0ee98 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -115,13 +115,10 @@ define([
     };
 
     var saveAndCancelOptions = function (cb) {
-       var cancelBlock = h('button.btn.btn-default.cp-form-preview-button', {
-            attrs: { 'aria-labelledby': Messages.form_preview_button }
-        }, [
-            h('i.fa.fa-eye', { attrs: { 'aria-hidden': 'true' } }),
-            h('span', { attrs: { id: Messages.form_preview_button } }, Messages.form_preview_button)
-        ]);
-
+        var cancelBlock = h('button.btn.btn-default.cp-form-preview-button',[
+                            h('i.fa.fa-eye'),
+                            Messages.form_preview_button
+                        ]);
         $(cancelBlock).click(function () { cb(undefined, true); });
 
         return cancelBlock;
@@ -223,18 +220,13 @@ define([
     var editOptions = function (v, isDefaultOpts, setCursorGetter, cb, tmp) {
         var evOnSave = Util.mkEvent();
 
-        var add = h('button.btn', {
-            attrs: { 'aria-labelledby':  Messages.form_add_option }
-        }, [
-            h('i.fa.fa-plus', { attrs: { 'aria-hidden': 'true' } }),
-            h('span', { attrs: { id: Messages.form_add_option } }, Messages.form_add_option)
+        var add = h('button.btn', [
+            h('i.fa.fa-plus'),
+            h('span', Messages.form_add_option)
         ]);
-
-        var addItem = h('button.btn.btn-secondary', {
-            attrs: { 'aria-labelledby': Messages.form_add_item }
-        }, [
-            h('i.fa.fa-plus', { attrs: { 'aria-hidden': 'true' } }),
-            h('span', { attrs: { id: Messages.form_add_item } }, Messages.form_add_item)
+        var addItem = h('button.btn.btn-secondary', [
+            h('i.fa.fa-plus'),
+            h('span', Messages.form_add_item)
         ]);
 
         var cursor;
@@ -5076,9 +5068,9 @@ define([
             });
             var $modal = modal.$modal;
             $modal.find('.cp-modal').append([
-                h('h2', { attrs: { 'aria-labelledby': Messages.form_settingsButton} }, [
-                    h('i.fa.fa-wrench', { attrs: { 'aria-hidden': 'true' } }),
-                    h('span', { attrs: { id: Messages.form_settingsButton } }, Messages.form_settingsButton)
+                h('h2', [
+                    h('i.fa.fa-wrench'),
+                    h('span', Messages.form_settingsButton)
                 ]),
                 endDateContainer,
                 anonContainer,
@@ -5087,9 +5079,9 @@ define([
                 privacyContainer,
                 editableContainer,
             ]);
-            var modalBtn = h('button.btn.btn-secondary', { attrs: { 'aria-labelledby': Messages.form_settingsButton } }, [
-                h('i.fa.fa-wrench', { attrs: { 'aria-hidden': 'true' } }),
-                h('span', { attrs: { id: Messages.form_settingsButton } }, Messages.form_settingsButton)
+            var modalBtn = h('button.btn.btn-secondary', [
+                h('i.fa.fa-wrench'),
+                h('span', Messages.form_settingsButton)
             ]);
             $(modalBtn).click(function () {
                 setTimeout(function () {
@@ -5480,23 +5472,17 @@ define([
             var t = h('textarea');
             var p = h('p.cp-form-response-msg-hint', Messages.form_responseMsg);
 
-            var preview = h('button.btn.btn-default.cp-form-preview-button', {
-                attrs: { 'aria-labelledby':  Messages.form_preview_button }
-            }, [
-                h('i.fa.fa-eye', { attrs: { 'aria-hidden': 'true' } }),
-                h('span', { attrs: { id: Messages.form_preview_button } }, Messages.form_preview_button)
+            var preview = h('button.btn.btn-default.cp-form-preview-button',[
+                h('i.fa.fa-eye'),
+                h('span', Messages.form_preview_button)
             ]);
-            var edit = h('button.btn.btn-default.cp-form-edit-button', {
-                attrs: { 'aria-labelledby': Messages.form_editBlock }
-            }, [
-                h('i.fa.fa-pencil', { attrs: { 'aria-hidden': 'true' } }),
-                h('span', { attrs: { id: Messages.form_editBlock } }, Messages.form_editBlock)
+            var edit = h('button.btn.btn-default.cp-form-edit-button', [
+                h('i.fa.fa-pencil'),
+                h('span', Messages.form_editBlock)
             ]);
-            var del = h('button.btn.btn-danger-alt', {
-                attrs: { 'aria-labelledby': Messages.form_delete }
-            }, [
-                h('i.fa.fa-trash-o', { attrs: { 'aria-hidden': 'true' } }),
-                h('span', { attrs: { id: Messages.form_delete } }, Messages.form_delete)
+            var del = h('button.btn.btn-danger-alt', [
+                h('i.fa.fa-trash-o'),
+                h('span', Messages.form_delete)
             ]);
             var editButtons = h('div.cp-form-edit-buttons-container', [ preview, edit, del ]);
 

From 30d01536555b8ebd5a5a847e81c9bbcdc20fef10 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Wed, 26 Feb 2025 14:03:37 +0200
Subject: [PATCH 061/114] Add review changes #1722

---
 www/form/app-form.less | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 93f28ec57..0405ee1cf 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -613,10 +613,9 @@
                             margin-top: -10px;
                             margin-right: -10px;
                             &.cp-is-empty {
-                                max-height: fit-content;
+                                height: fit-content;
                                 padding: 3px;
-                                border: 2px solid @cp_alerts-danger-fg;
-                                border-radius: @variables_radius;
+                                border-radius: 0 @variables_radius 0 0;
                                 background-color: @cp_alerts-danger-bg;
                                 color: @cp_alerts-danger-text;
                             }

From ae60a57b34e2d9d861dbd7550cd2f461f0c02a34 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Wed, 26 Feb 2025 15:24:12 +0200
Subject: [PATCH 062/114] Fix linter issues #1367

---
 www/code/inner.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index e56357e0f..efa1b2006 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -227,6 +227,10 @@ define([
             framework._.sfCommon.setPadAttribute('previewMode', show);
         };
 
+        var isVisible = function () {
+            return $previewContainer.is(':visible');
+        };
+
         var handleResize = function () {
             var wasPreviewVisible = isVisible(); // Capture preview state before resize
 
@@ -335,9 +339,6 @@ define([
             $codeMirrorContainer.addClass('cp-app-code-fullpage');
         };
 
-        var isVisible = function () {
-            return $previewContainer.is(':visible');
-        };
 
         framework.onReady(function () {
             handleResize();

From 96167fd66d85b54c7e7bba4e6314f3736ac4b626 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Wed, 26 Feb 2025 16:30:27 +0200
Subject: [PATCH 063/114] Refactor + last revview changes #1367

---
 www/code/inner.js | 84 +++++++++++++++++++++++++----------------------
 1 file changed, 45 insertions(+), 39 deletions(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index efa1b2006..dd7a5ce78 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -218,7 +218,7 @@ define([
                 $previewContainer.show();
                 $codeMirrorContainer.hide();
                 $previewButton.addClass('cp-toolbar-button-active');
-                forceDrawPreview();
+                drawPreview();
             } else {
                 $previewContainer.hide();
                 $codeMirrorContainer.show();
@@ -234,30 +234,32 @@ define([
         var handleResize = function () {
             var wasPreviewVisible = isVisible(); // Capture preview state before resize
 
+            // Present mode: always draw preview
             if (isPresentMode && previews[CodeMirror.highlightMode]) {
                 $previewContainer.show();
                 $codeMirrorContainer.hide();
                 $previewButton.hide();
-                forceDrawPreview();
-            } else {
-                if (isSmallScreen()) {
-                    togglePreview(wasPreviewVisible);
-                } else {
-                    if (wasPreviewVisible) {
-                        $previewContainer.show();
-                        $codeMirrorContainer.show();
-                        $codeMirrorContainer.removeClass('cp-app-code-fullpage');
-                        $previewButton.addClass('cp-toolbar-button-active');
-                        forceDrawPreview();
-                    } else {
-                        $previewContainer.hide();
-                        $codeMirrorContainer.addClass('cp-app-code-fullpage');
-                        $previewButton.removeClass('cp-toolbar-button-active');
-                    }
-                }
+                return forceDrawPreview();
             }
+            // Small screen: toggle between editor and preview
+            if (isSmallScreen()) {
+                return togglePreview(wasPreviewVisible);
+            }
+            // Normal screen: split view to editor only
+            if (wasPreviewVisible) {
+                $previewContainer.show();
+                $codeMirrorContainer.show();
+                $codeMirrorContainer.removeClass('cp-app-code-fullpage');
+                $previewButton.addClass('cp-toolbar-button-active');
+                return forceDrawPreview();
+            }
+            // Normal screen: editor only to split view
+            $previewContainer.hide();
+            $codeMirrorContainer.addClass('cp-app-code-fullpage');
+            $previewButton.removeClass('cp-toolbar-button-active');
         };
 
+
         $previewButton.click(function () {
             clearTimeout(previewTo);
             $codeMirror.addClass('transition');
@@ -266,28 +268,32 @@ define([
             }, 500);
 
             var show = !isVisible();
+
+            // Small screen: toggle between editor and preview
             if (isSmallScreen()) {
-                togglePreview(show);
-            } else {
-                if (!previews[CodeMirror.highlightMode]) {
-                    $previewContainer.show();
-                }
-                $previewContainer.toggle();
-                if (isVisible()) {
-                    forceDrawPreview();
-                    $codeMirrorContainer.removeClass('cp-app-code-fullpage');
-                    $previewButton.addClass('cp-toolbar-button-active');
-                    framework._.sfCommon.setPadAttribute('previewMode', true, function (e) {
-                        if (e) { return console.log(e); }
-                    });
-                } else {
-                    $codeMirrorContainer.addClass('cp-app-code-fullpage');
-                    $previewButton.removeClass('cp-toolbar-button-active');
-                    framework._.sfCommon.setPadAttribute('previewMode', false, function (e) {
-                        if (e) { return console.log(e); }
-                    });
-                }
+                return togglePreview(show);
+            } 
+            
+            if (!previews[CodeMirror.highlightMode]) {
+                $previewContainer.show();
             }
+            $previewContainer.toggle();
+            //Normal screen: split view to editor only
+            if (isVisible()) {
+                $codeMirrorContainer.removeClass('cp-app-code-fullpage');
+                $previewButton.addClass('cp-toolbar-button-active');
+                framework._.sfCommon.setPadAttribute('previewMode', true, function (e) {
+                    if (e) { return console.log(e); }
+                });
+                return forceDrawPreview();
+            }
+
+            // Normal screen: editor only to split view
+            $codeMirrorContainer.addClass('cp-app-code-fullpage');
+            $previewButton.removeClass('cp-toolbar-button-active');
+            framework._.sfCommon.setPadAttribute('previewMode', false, function (e) {
+                if (e) { return console.log(e); }
+            });
         });
 
         framework._.toolbar.$bottomM.append($previewButton);
@@ -315,7 +321,7 @@ define([
             if (previews[mode]) {
                 $previewButton.show();
                 if(isSmallScreen()) {
-                    togglePreview(false);
+                    return togglePreview(false);
                 }
                 framework._.sfCommon.getPadAttribute('previewMode', function (e, data) {
                     if (e) { return void console.error(e); }

From 62714e502c61187ce26df615eb12b8461b3ca27d Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Wed, 26 Feb 2025 16:33:56 +0200
Subject: [PATCH 064/114] Remove accessibility stuff #1367

---
 www/common/common-ui-elements.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index f67d24186..2632bc34c 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -907,8 +907,8 @@ define([
                     'aria-labelledby': data.text ? 'toolbar-button-label' : undefined,
                     'aria-label': data.text || Messages.toolbar_tools // Fallback
                 }, [
-                    h('i.fa.' + (data.icon || 'fa-wrench'), { 'aria-hidden': 'true' }),
-                    h('span.cp-toolbar-name', { id: 'toolbar-button-label' }, data.text || Messages.toolbar_tools)
+                    h('i.fa.' + (data.icon || 'fa-wrench')),
+                    h('span.cp-toolbar-name', data.text || Messages.toolbar_tools)
                 ])).click(common.prepareFeedback(type));
                 /*
                 window.setTimeout(function () {

From 9d201fc2eeb2148f29da844e0cacf549b64f6dd4 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Wed, 26 Feb 2025 16:41:32 +0200
Subject: [PATCH 065/114] Change forceDrawPreview to DrawPreview #1367

---
 www/code/inner.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/code/inner.js b/www/code/inner.js
index dd7a5ce78..ecf742ca0 100644
--- a/www/code/inner.js
+++ b/www/code/inner.js
@@ -239,7 +239,7 @@ define([
                 $previewContainer.show();
                 $codeMirrorContainer.hide();
                 $previewButton.hide();
-                return forceDrawPreview();
+                return drawPreview();
             }
             // Small screen: toggle between editor and preview
             if (isSmallScreen()) {
@@ -251,7 +251,7 @@ define([
                 $codeMirrorContainer.show();
                 $codeMirrorContainer.removeClass('cp-app-code-fullpage');
                 $previewButton.addClass('cp-toolbar-button-active');
-                return forceDrawPreview();
+                return drawPreview();
             }
             // Normal screen: editor only to split view
             $previewContainer.hide();

From 16fd290de9a1fc948601fae11e822749e71b4ebf Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 26 Feb 2025 15:58:00 +0100
Subject: [PATCH 066/114] Fix invalid labelledby attribute

---
 www/common/common-ui-elements.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 2632bc34c..0674dcaec 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -904,7 +904,6 @@ define([
             case 'toggle':
                 button = $(h('button.cp-toolbar-tools', {
                     //title: data.title || '', // TODO display if the label text is collapsed
-                    'aria-labelledby': data.text ? 'toolbar-button-label' : undefined,
                     'aria-label': data.text || Messages.toolbar_tools // Fallback
                 }, [
                     h('i.fa.' + (data.icon || 'fa-wrench')),

From b3fb8b748a027993ddc908fe89ef946bce7e6c65 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Thu, 27 Feb 2025 14:12:14 +0100
Subject: [PATCH 067/114] Screen width formatting

---
 www/form/app-form.less | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index a579db161..3e000c997 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -210,7 +210,7 @@
                 border-radius: @variables_radius 0px 0px @variables_radius;
                 background-color: @cp_form-bg1;
                 color: @cryptpad_text_col; 
-                @media (max-width:723px) and (min-width:693px), (max-width:553px) and (min-width:524px) {
+                @media (max-width:723px) and (min-width:693px), (max-width:553px) and (min-width:524px), (max-width:379px) and (min-width:350px) {
                     border-radius: @variables_radius @variables_radius 0px 0px;
                 }
                 &.cp-toggle-active {
@@ -220,7 +220,7 @@
             }
             #cp-toggle-drag-on {
                 border-radius: 0px @variables_radius @variables_radius 0px !important;
-                @media (max-width:723px) and (min-width:693px), (max-width:553px) and (min-width:524px) {
+                @media (max-width:723px) and (min-width:693px), (max-width:553px) and (min-width:524px), (max-width:379px) and (min-width:350px) {
                     border-radius: 0px 0px @variables_radius @variables_radius !important;
                 }
             }

From 3908e55699248953bf646952d98fc83c53aa070e Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Thu, 27 Feb 2025 14:18:38 +0100
Subject: [PATCH 068/114] Auditor fix

---
 www/form/command-handler.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/form/command-handler.js b/www/form/command-handler.js
index dc49a9e18..2592d11ab 100644
--- a/www/form/command-handler.js
+++ b/www/form/command-handler.js
@@ -215,8 +215,8 @@ define([
                     formData = Utils.Hash.getFormData(Utils.secret);
                     keys = Utils.secret && Utils.secret.keys;
                 }
-                privateKey = formData.form_private;
-                publicKey = formData.form_public;
+                privateKey = formData?.form_private;
+                publicKey = formData?.form_public;
                 var curvePrivate = privateKey || data.privateKey;
                 if (!curvePrivate) { return void cb({error: 'EFORBIDDEN'}); }
                 var crypto = Utils.Crypto.Mailbox.createEncryptor({

From 242383853cdec3822d1d47a741072d8a0e241d09 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Thu, 27 Feb 2025 15:03:59 +0100
Subject: [PATCH 069/114] Toggle styled horizontally

---
 www/form/app-form.less | 35 +++++++++++++++++------------------
 www/form/inner.js      |  2 +-
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 3e000c997..e7a3b3427 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -203,25 +203,24 @@
             //flex-wrap: wrap;
             overflow: auto;
 
-            .cp-form-view-drag {
-                width: 30px;
-                height: 30px;
-                border: none;
-                border-radius: @variables_radius 0px 0px @variables_radius;
-                background-color: @cp_form-bg1;
-                color: @cryptpad_text_col; 
-                @media (max-width:723px) and (min-width:693px), (max-width:553px) and (min-width:524px), (max-width:379px) and (min-width:350px) {
-                    border-radius: @variables_radius @variables_radius 0px 0px;
+            .cp-drag-container {
+                display: flex;
+                flex-direction: row;
+
+                .cp-form-view-drag {
+                    width: 30px;
+                    height: 30px;
+                    border: none;
+                    border-radius: @variables_radius 0px 0px @variables_radius;
+                    background-color: @cp_form-bg1;
+                    color: @cryptpad_text_col; 
+                    &.cp-toggle-active {
+                        color: @cp_form-bg1;
+                        background-color: @cryptpad_text_col;
+                    }
                 }
-                &.cp-toggle-active {
-                    color: @cp_form-bg1;
-                    background-color: @cryptpad_text_col;
-                }
-            }
-            #cp-toggle-drag-on {
-                border-radius: 0px @variables_radius @variables_radius 0px !important;
-                @media (max-width:723px) and (min-width:693px), (max-width:553px) and (min-width:524px), (max-width:379px) and (min-width:350px) {
-                    border-radius: 0px 0px @variables_radius @variables_radius !important;
+                #cp-toggle-drag-on {
+                    border-radius: 0px @variables_radius @variables_radius 0px !important;
                 }
             }
 
diff --git a/www/form/inner.js b/www/form/inner.js
index 67a0d1efd..b36f21d7e 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -5159,7 +5159,7 @@ define([
             $(toggleDragOn).click(updateDrag(true));
             $(toggleDragOff).click(updateDrag(false));
 
-            var drag = h('div', [
+            var drag = h('div.cp-drag-container', [
                 toggleDragOff,
                 toggleDragOn
             ]);

From 48a8496cd13d7c689da5e028d5e76bd6d7dd8700 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 4 Mar 2025 13:50:04 +0000
Subject: [PATCH 070/114] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1787 of 1787 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1787 of 1787 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1787 of 1787 strings)

Translated using Weblate (Chinese (Simplified Han script))

Currently translated at 100.0% (1787 of 1787 strings)

Co-authored-by: Subtext6676 <subtext6676@users.noreply.weblate.cryptpad.org>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: WhiredPlanck <wplanck@aosc.io>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/zh_Hans/
Translation: CryptPad/App
---
 www/common/translations/messages.zh.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/www/common/translations/messages.zh.json b/www/common/translations/messages.zh.json
index a1e50c144..4bca5c2ce 100644
--- a/www/common/translations/messages.zh.json
+++ b/www/common/translations/messages.zh.json
@@ -9,7 +9,7 @@
         "whiteboard": "白板",
         "file": "文件",
         "media": "媒体",
-        "kanban": "任务看板",
+        "kanban": "看板",
         "todo": "待办事项",
         "teams": "团队",
         "sheet": "工作表",
@@ -49,7 +49,7 @@
     "pinLimitDrive": "您已达到存储空间上限。<br>您无法创建新文档。",
     "importButtonTitle": "从本地文档导入文档",
     "exportButtonTitle": "将此文档导出到本地文档",
-    "exportPrompt": "你希望怎麼命名你的檔案?",
+    "exportPrompt": "是否命名您的文件？",
     "user_rename": "更改显示名称",
     "user_displayName": "显示名称",
     "user_accountName": "账号名称",
@@ -306,11 +306,11 @@
     "poll_bookmark_col": "将此列添加为书签，以便它始终解锁并在开始时为您显示",
     "poll_unlocked": "解锁",
     "poll_locked": "锁定",
-    "kanban_addBoard": "添加新看板",
+    "kanban_addBoard": "添加面板",
     "kanban_working": "进行中",
     "kanban_todo": "待办事项",
     "kanban_item": "项目 {0}",
-    "kanban_newBoard": "新看板",
+    "kanban_newBoard": "新面板",
     "pad_mediatagOptions": "图像属性",
     "pad_mediatagImport": "保存到您的 CryptDrive 中",
     "pad_mediatagBorder": "边框宽度（像素）",
@@ -973,8 +973,8 @@
     "admin_openFilesTitle": "打开文档",
     "profile_copyKey": "复制公钥",
     "oo_isLocked": "正在同步更改，请稍候",
-    "kanban_editBoard": "编辑此板",
-    "kanban_editCard": "编辑这张卡片",
+    "kanban_editBoard": "编辑此面板",
+    "kanban_editCard": "编辑此卡片",
     "kanban_clearFilter": "清除过滤器",
     "kanban_conflicts": "目前正在编辑：",
     "kanban_noTags": "没有标签",
@@ -1493,14 +1493,14 @@
     "og_teamDrive": "团队云盘",
     "og_default": "CryptPad：端到端加密协作套件",
     "og_login": "登录 {0}",
-    "og_register": "在 {0} 上注册一个帐户",
+    "og_register": "在 {0} 上注册账号",
     "og_contact": "{0} 联系人",
     "og_pricing": "{0} 价格",
     "og_features": "{0} 特色",
     "og_encryptedAppType": "已加密 {0}",
     "admin_documentMetadataPlaceholder": "文档网址或id",
     "admin_blockMetadataTitle": "登录阻止信息",
-    "admin_blockMetadataHint": "登录块允许帐户使用用户名 + 密码的组合登录 CryptPad",
+    "admin_blockMetadataHint": "登录块允许账号使用用户名 + 密码的组合登录 CryptPad",
     "admin_blockMetadataPlaceholder": "绝对或相对块网址",
     "admin_accountMetadataPlaceholder": "用户 ID（公共签名密钥）",
     "admin_firstPinTime": "第一给个pin的活动时间",
@@ -1606,7 +1606,7 @@
     "dph_sf_destroyed": "所有者销毁了分享的文件夹 <b>{0}</b>",
     "dph_sf_destroyed_team": "所有者销毁了团队云盘 <b>{1}</b> 中分享的文件夹 <b>{0}</b>",
     "admin_archiveAccount": "归档此账号",
-    "admin_archiveAccountInfo": "包括其拥有的文件",
+    "admin_archiveAccountInfo": "包括其拥有的文档",
     "admin_restoreAccount": "还原此账号",
     "admin_accountSuspended": "管理员归档的账号",
     "admin_accountReport": "账号归档报告",
@@ -1666,7 +1666,7 @@
     "ssoauth_form_hint_login": "请输入您的 CryptPad 密码",
     "kanban_hideTags": "查看更少的标签",
     "kanban_showTags": "查看全部标签",
-    "loading_mfa_required": "此实例需要双因素身份验证。请使用身份验证应用和下方表单更新您的账号。",
+    "loading_mfa_required": "此实例需要双因素身份验证，请使用身份验证应用和下表更新您的账号。",
     "team_autoTrim": "正在精简团队云盘历史…请稍候。",
     "admin_mfa_confirm_enable": "是否确定要启用多因素身份验证？",
     "admin_mfa_confirm_disable": "是否确定要禁用多因素身份验证？",

From 97628029ff6c84702e7d146aacb0bf4db89f608f Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 4 Mar 2025 13:50:04 +0000
Subject: [PATCH 071/114] Translated using Weblate (Czech)

Currently translated at 79.0% (1413 of 1787 strings)

Co-authored-by: slichvar <slichvar@protonmail.com>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/cs/
Translation: CryptPad/App
---
 www/common/translations/messages.cs.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/common/translations/messages.cs.json b/www/common/translations/messages.cs.json
index 8769febb3..d4a80e2d4 100644
--- a/www/common/translations/messages.cs.json
+++ b/www/common/translations/messages.cs.json
@@ -70,10 +70,10 @@
     "pad_mediatagOpen": "Otevřit soubor",
     "pad_mediatagShare": "Sdílet soubor",
     "importButton": "Importovat",
-    "formattedKB": "{0} KB",
+    "formattedKB": "{0} kB",
     "formattedGB": "{0} GB",
     "formattedMB": "{0} MB",
-    "KB": "KB",
+    "KB": "kB",
     "GB": "GB",
     "MB": "MB",
     "language": "Jazyk",

From cb6f9b4264b7ec2b49f0d288d109bc9314945495 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 4 Mar 2025 13:50:04 +0000
Subject: [PATCH 072/114] Translated using Weblate (Danish)

Currently translated at 10.0% (180 of 1787 strings)

Co-authored-by: Jens Andersen <cryptpad-translation.trivial213@passinbox.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/da/
Translation: CryptPad/App
---
 www/common/translations/messages.da.json | 161 ++++++++++++++++++++++-
 1 file changed, 160 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.da.json b/www/common/translations/messages.da.json
index a062fed39..bb5445efa 100644
--- a/www/common/translations/messages.da.json
+++ b/www/common/translations/messages.da.json
@@ -21,5 +21,164 @@
     "typeError": "Dette dokument er ikke kompatibelt med det valgte program",
     "main_title": "CryptPad: Zero Knowledge, Collaborative Real Time Editing",
     "common_connectionLost": "<b>Serverforbindelse afbrudt</b><br>Du er nu i skrivebeskyttet tilstand, indtil forbindelsen er tilbage.",
-    "onLogout": "Du er logget ud, {0}klik her{1} for at logge ind<br>eller tryk på Esc for at få adgang til dit dokument i skrivebeskyttet tilstand."
+    "onLogout": "Du er logget ud, {0}klik her{1} for at logge ind<br>eller tryk på Esc for at få adgang til dit dokument i skrivebeskyttet tilstand.",
+    "historyText": "Redigeringshistorik",
+    "uploadButton": "Upload filer",
+    "padNotPinned": "Dette dokument vil udløbe efter 3 måneder af inaktivitet, {0}login{1} eller {2}lav en konto{3} for at bevare det.",
+    "padNotPinnedVariable": "Dette dokument wil udløbe efter {4} dage af inaktivitet, {0}login{1} eller {2}lav en konto{3} for at bevare det.",
+    "anonymousStoreDisabled": "Administratoren af denne Cryptpad-instans har deaktiveret opbevaring for gæster. Log ind for at tilgå dit eget CryptDrive.",
+    "history_prev": "Tidligere version",
+    "chainpadError": "En kritisk fejl har fundet sted i forbindelse med at updatere dit indhold. Denne side er i skrive-beskyttet tilstand for at garantere at du ikke mister dit arbejde. <br> Tryk Esc for at fortsætte med se dette dokument, eller genindlæs siden for at prøve at redigere igen.",
+    "errorCopy": " Du kan stadig bruge den nuværende version i skrive-beskyttet tilstand ved at trykke Esc.",
+    "storageStatus": "Plads:<br><b>{0}</b> brugt ud af <b>{1}</b>",
+    "newVersionError": "En ny version af CryptPad er tilgængelig .<br><a href='#'>Genindlæs</a> for at bruge den nye version eller tryk Esc for at tilgå dit indhold i <b>offline tilstand</b>.",
+    "pinLimitReachedAlertNoAccounts": "Du har nået din opbevaringsplads grænse",
+    "initializing": "Opstarter...",
+    "forgetPrompt": "Når du klikker OK, bliver dette dokument rykket til papirkurven. Er du sikker?",
+    "selectTemplate": "Vælg en skabelon eller tryk Esc",
+    "useTemplateCancel": "Start frisk (Esc)",
+    "forgotten": "Flyttet til papirkurven",
+    "readonly": "Skrivebeskyttet",
+    "pinLimitDrive": "Du har nået din opbevaringsplads grænse. <br>Du kan ikke lave nye dokumenter.",
+    "clickToEdit": "Klik for at redigere",
+    "uploadButtonTitle": "Upload en ny fil til dit CryptDrive",
+    "pinLimitReachedAlert": "Du har nået din opbevaringsplads grænse. Nye dokumenter vil ikke blive opbevaret i dit CryptDruve.<br>Du kan enten slette dokumenter fra CryptDrive eller <a>abonnere på et premium tilbud</a> for at forøge din grænse.",
+    "exportPrompt": "Hvad vil du navngive din fil?",
+    "user_rename": "Ændre dit kaldenavn",
+    "newButtonTitle": "Lav et nyt dokument",
+    "backgroundButtonTitle": "Ændre baggrundens farve i præsentationen",
+    "printBackgroundRemove": "Fjern dette baggrundsbilled",
+    "colorButtonTitle": "Ændre tekst farven i præsentations tilstanden",
+    "printCSS": "Brugerdefineret stil-regler (CSS):",
+    "printBackgroundNoValue": "<em>Intet baggrunds billed valgt</em>",
+    "themeButtonTitle": "Vælg farveskemaet for kode og slide-editors",
+    "tags_add": "Opdater tags for de valgte dokumenter",
+    "tags_duplicate": "Duplikere tag: {0}",
+    "languageButtonTitle": "Vælg sproget til at bruge for sytaks highlighting",
+    "viewEmbedTag": "For at indlejre dette dokument, skal du inkludere denne iframe i din web-side hvor end du vil. Du kan stilisere det med CSS eller HTML attributer.",
+    "forgetButton": "Slet",
+    "shareButton": "Del",
+    "tags_noentry": "Du kan ikke tag et slettet dokument",
+    "notifyJoined": "{0} har joinet samarbejds-sessionen",
+    "kanban_done": "Færdig",
+    "poll_userPlaceholder": "Dit navn",
+    "poll_removeOption": "Er du sikker på at du vil fjerne denne valg-mulighed?",
+    "fileEmbedScript": "For at indlejre denne fil, inkluder dette script et sted i din web-side for at load Media-Tag'et:",
+    "fileEmbedTag": "Da placere dette Media Tag, hvor end på din web-side hvor du har lyst til at indlejre det:",
+    "history_restorePrompt": "Er du sikker på at du vil erstatte den nuværende version af dokumentet med den fremviste version?",
+    "history_loadMore": "Vis mere af historikken",
+    "poll_publish_button": "Offentliggør",
+    "poll_create_user": "Tilføj en ny bruger",
+    "expiredError": "Dette dokument har nået dets destruktions dato og er ikke længere tilgængeligt.",
+    "invalidHashError": "Dokumentet som du har anmodet har en invalid URL.",
+    "errorRedirectToHome": "Tryk Esc for at blive omdirigeret til dit CryptDrive.",
+    "loading": "Indlæser...",
+    "saved": "Gemt",
+    "deletedFromServer": "Dokument destrueret",
+    "disconnected": "Frakoblet",
+    "synchronizing": "Synkronisere",
+    "reconnecting": "Genforbinder",
+    "typing": "Det bliver redigeret",
+    "errorState": "Kritisk fejl: {0}",
+    "users": "Bruger",
+    "editor": "Redaktør",
+    "userlist_offline": "Du er iøjeblikket offline, bruger-listen er ikke tilgængelig.",
+    "language": "Sprog",
+    "upgrade": "Upgrade",
+    "MB": "MB",
+    "GB": "GB",
+    "formattedMB": "{0} MB",
+    "formattedGB": "{0} GB",
+    "pinLimitReached": "Du har nået din opbevaringsplads grænse",
+    "importButtonTitle": "Importer et dokument fra en lokal fil",
+    "exportButton": "Exporter",
+    "exportButtonTitle": "Exporter dette dokument til en lokal fil",
+    "user_displayName": "Kaldenavn",
+    "user_accountName": "Kontonavn",
+    "saveTitle": "Gem titlen (enter)",
+    "movedToTrash": "Det dokument er blevet rykket til papirkurven.<br><a>Tilgå mit drive</a>",
+    "userListButton": "Bruger liste",
+    "chatButton": "Chat",
+    "userAccountButton": "Bruger menu",
+    "newButton": "Ny",
+    "uploadFolderButton": "Upload mappe",
+    "saveTemplateButton": "Gem som en skabelon",
+    "saveTemplatePrompt": "Vælg en titel for skabelonen",
+    "templateSaved": "Skabelon gemt!",
+    "useTemplate": "Start med en skabelon?",
+    "useTemplateOK": "Vælg en skabelon (Enter)",
+    "template_import": "Importer en skabelon",
+    "template_empty": "Ingen skabelon tilgængelig",
+    "previewButtonTitle": "Vis eller gem Markdown viseren",
+    "presentButtonTitle": "Aktiver præsentations tilstand",
+    "propertiesButton": "Egenskaber",
+    "propertiesButtonTitle": "Se dokumentets egenskaber",
+    "printButton": "Print (Enter)",
+    "printButtonTitle2": "Print dit dokument eller eksporter det som en pdf fil",
+    "printOptions": "Layout indstillinger",
+    "printSlideNumber": "Vis slide nummeret",
+    "printDate": "Vis datoen",
+    "printTitle": "Vis dokument titlen",
+    "printTransition": "Aktiver overgangs animationer",
+    "printBackground": "Brug et baggrundsbilled",
+    "printBackgroundButton": "Vælg et billed",
+    "printBackgroundValue": "<b>Nuværende baggrund:</b><em>{0}</em>",
+    "filePickerButton": "Indlejre et dokument opbevaret i CryptDrive",
+    "filePicker_close": "Luk",
+    "filePicker_description": "Vælg en fil fra dit CryptDrive som du vil indlejre eller upload en ny fil",
+    "filePicker_filter": "Filterere filer efter navn",
+    "tags_title": "Tags (kun for dig)",
+    "tags_notShared": "Dine tags er ikke delt med andre brugere",
+    "slideOptionsText": "Indstillinger",
+    "slideOptionsTitle": "Tilpas dine slides",
+    "slide_invalidLess": "Brugerdefineret stil er ugyldig",
+    "languageButton": "Sprog",
+    "themeButton": "Tema",
+    "viewShare": "Skrive-beskyttet link",
+    "notifyRenamed": "{0} er nu kendt som {1}",
+    "notifyLeft": "{0} har forladt samarbejds-sessionen",
+    "ok": "OK",
+    "okButton": "OK (Enter)",
+    "cancel": "Afbryd",
+    "cancelButton": "Afbryd (Esc)",
+    "show_help_button": "Vis hjælp",
+    "help_button": "Hjælp",
+    "historyButton": "Vis dokumentets redigeringshistorik",
+    "history_next": "Næste version",
+    "history_closeTitle": "Luk historikken",
+    "history_restoreTitle": "Genopret den valgte version af dokumentet",
+    "history_restoreDone": "Dokument genoprettet",
+    "openLinkInNewTab": "Åben link i en ny fane",
+    "pad_mediatagTitle": "Media-Tag indstillinger",
+    "pad_mediatagWidth": "Bredte (px)",
+    "pad_mediatagHeight": "Højde (px)",
+    "pad_mediatagRatio": "Bevar ratio",
+    "pad_mediatagBorder": "Rammens bredde (px)",
+    "pad_mediatagPreview": "Forevisning",
+    "pad_mediatagImport": "Gem i dit CryptDrive",
+    "pad_mediatagOptions": "Billed egenskaber",
+    "kanban_newBoard": "Nyt board",
+    "kanban_item": "Forekomst",
+    "kanban_todo": "Mangler at gøres",
+    "kanban_working": "Igangværende",
+    "kanban_addBoard": "Tilføj et board",
+    "poll_create_option": "Tilføj en ny mulighed",
+    "poll_commit": "Indsend",
+    "poll_optionPlaceholder": "Mulighed",
+    "poll_removeUser": "Er du sikker på at du vil fjerne denne bruger?",
+    "printText": "Print",
+    "deletedError": "Dette dokument er blevet slettet og er ikke længere tilgængeligt.",
+    "inactiveError": "Dette dokument er blevet slettet grundet inaktivitet. Tryk Esc for at lave et nyt dokument.",
+    "deleted": "Slettet",
+    "mustLogin": "Du må være logget ind, for at kunne tilgå denne side",
+    "disabledApp": "Denne applikation er blevet deaktiveret. Kontakt administratoren af denne Cryptpad for mere information.",
+    "realtime_unrecoverableError": "En ikke reperarbar fejl har fundet sted. Klik OK for at genindlæse.",
+    "anonymous": "Gæst",
+    "upgradeAccount": "Opgrader konto",
+    "pinLimitNotPinned": "Du har nået din opbevaringsplads grænse. <br>Dette dokument er ikke opbevaret i dit CryptDrive.",
+    "importButton": "Importer",
+    "editShare": "Rediger link",
+    "error": "Fejl",
+    "KB": "kB",
+    "formattedKB": "{0} kB"
 }

From 7f349302432a2ae9c23df56dd4b0e0f577755695 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 4 Mar 2025 13:50:04 +0000
Subject: [PATCH 073/114] Translated using Weblate (Dutch)

Currently translated at 35.8% (641 of 1787 strings)

Co-authored-by: slichvar <slichvar@protonmail.com>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/nl/
Translation: CryptPad/App
---
 www/common/translations/messages.nl.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/translations/messages.nl.json b/www/common/translations/messages.nl.json
index 400941007..671725eee 100644
--- a/www/common/translations/messages.nl.json
+++ b/www/common/translations/messages.nl.json
@@ -121,7 +121,7 @@
     "pinLimitReachedAlertNoAccounts": "U heeft uw opslaglimiet bereikt",
     "pinLimitReachedAlert": "U heeft uw opslaglimiet bereikt. Nieuwe documenten worden niet opgeslagen in uw CryptDrive.<br>U kunt documenten verwijderen van uw CryptDrive of <a>opwaarderen naar een premium-account</a> om uw opslaglimiet te verhogen.",
     "pinLimitReached": "U heeft uw opslaglimiet bereikt",
-    "formattedKB": "{0} KB",
+    "formattedKB": "{0} kB",
     "formattedGB": "{0} GB",
     "formattedMB": "{0} MB",
     "KB": "KB",

From b91f078e11cdd152574c0153d6e8844e339356ca Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Tue, 4 Mar 2025 13:50:05 +0000
Subject: [PATCH 074/114] Translated using Weblate (Slovak)

Currently translated at 9.7% (175 of 1787 strings)

Translated using Weblate (Slovak)

Currently translated at 9.7% (174 of 1787 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: slichvar <slichvar@protonmail.com>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/sk/
Translation: CryptPad/App
---
 www/common/translations/messages.sk.json | 169 ++++++++++++++++++++---
 1 file changed, 147 insertions(+), 22 deletions(-)

diff --git a/www/common/translations/messages.sk.json b/www/common/translations/messages.sk.json
index fd5637e4e..bf49b8a8e 100644
--- a/www/common/translations/messages.sk.json
+++ b/www/common/translations/messages.sk.json
@@ -13,23 +13,28 @@
     "login_confirm": "Opakujte heslo",
     "login_password": "Heslo",
     "login_username": "Uživatelské jméno",
-    "padNotPinned": "Tento dokument expiruje za 3 měsíce neaktivity, {0}přihlašte se{1} nebo {2}se registrujte{3} pro jeho uchování.",
-    "onLogout": "Jste odhlášení, {0}klikněte zde{1} pro přihlášení<br>nebo zmáčkněte Esc pro čtení dokumentu.",
-    "typeError": "Tento dokument není kompatibilní s vybranou aplikací",
-    "common_connectionLost": "<b>Spojení se serverem ztraceno</b><br>Nyní jste v režimu čtení, dokud nebude spojení obnoveno.",
+    "padNotPinned": "Tento dokument expiruje po 3 mesiacoch neakivity, {0}prihláste sa{1} alebo {2}registrujte{3}, aby ste si ho ponechali.",
+    "onLogout": "Ste odhlásený, {0}kliknite sem{1} pre prihlásenie<br>alebo stlačte Esc pre čítanie dokumentu.",
+    "typeError": "Tento dokument nie je kompatibilný s vybranou aplikáciou",
+    "common_connectionLost": "<b>Strata spojenia so serverom</b><br>Ste v režime na čítanie, pokým nebude spojenie obnovené.",
     "type": {
-        "teams": "Týmy",
-        "sheet": "Tabulka",
+        "teams": "Tímy",
+        "sheet": "Tabuľka",
         "contacts": "Kontakty",
-        "todo": "Úkol",
-        "media": "Média",
-        "file": "Soubor",
-        "whiteboard": "Tabule",
+        "todo": "Dokončiť",
+        "media": "Médiá",
+        "file": "Súbor",
+        "whiteboard": "Whiteboard",
         "drive": "CryptDrive",
-        "slide": "Prezentace",
-        "poll": "Hlasování",
+        "slide": "Prezentácia",
+        "poll": "Hlasovanie",
         "code": "Kód",
-        "pad": "Formátovaný text"
+        "pad": "Dokument",
+        "form": "Formulár",
+        "doc": "Dokument",
+        "presentation": "Prezentácia",
+        "diagram": "Diagram",
+        "kanban": "Kanban"
     },
     "logoutEverywhere": "Odhlásit se všude",
     "login_login": "Přihlásit se",
@@ -42,14 +47,134 @@
     "register_cancel": "Zrušit",
     "register_writtenPassword": "Své uživatelské jméno a heslo jsem si zapsal, pokračovat",
     "register_header": "Registrovat",
-    "deletedFromServer": "Dokument zničen",
-    "deleted": "Smazáno",
-    "saved": "Uloženo",
+    "deletedFromServer": "Dokument bol zničený",
+    "deleted": "Zmazané",
+    "saved": "Uložené",
     "error": "Chyba",
-    "loading": "Načítání...",
-    "invalidHashError": "Požadovaný dokument má neplatné URL.",
-    "inactiveError": "Tento dokument byl smazán kvůli neaktivitě. Zmáčkněte Escape pro vytvoření nového dokumentu.",
-    "deletedError": "Tento dokument byl smazán a není již dostupný.",
-    "expiredError": "Tento dokument expiroval a není již dostupný.",
-    "padNotPinnedVariable": "Tento dokument expiruje za {4} dny neaktivity, {0}přihlašte se{1} nebo {2}se registrujte{3} pro jeho uchování."
+    "loading": "Načítavanie...",
+    "invalidHashError": "Požadovaný dokument má neplatnú adresu URL.",
+    "inactiveError": "Tento dokument bol vymazaný kvôli neaktivite. Stlačte Esc na vytvorenie nového dokumentu.",
+    "deletedError": "Tento dokument bol vymazaný a už nie je dostupný.",
+    "expiredError": "Tento dokument expiroval a už nie je dostupný.",
+    "padNotPinnedVariable": "Tento dokument expiruje po {4}dňoch neaktivity, {0}prihláste sa{1} alebo {2}registrujte{3}, aby ste si ho ponechali.",
+    "editor": "redaktor",
+    "viewer": "čitateľ",
+    "viewers": "čitatelia",
+    "errorCopy": " Stále môžete použiť súcasnú verziu v režime iba na čítanie stlačením Esc.",
+    "errorRedirectToHome": "Stlačte Esc na presmerovanie do vášho CryptDrive.",
+    "newVersionError": "K dispozíci je novšia verzia CryptPad.<br><a href='#'>Obnovte stránku</a> pre zobrazenie novšej verzie alebo stlačte escape pre pokračovanie <b>v offline režime</b>.",
+    "mustLogin": "Musíte byť prihlásený pre prístup k tejto stránke",
+    "realtime_unrecoverableError": "Vyskytla sa neopraviteľná chyba. Kliknite OK pre obnovenie stránky.",
+    "disconnected": "Odpojené",
+    "synchronizing": "Synchronizácia",
+    "reconnecting": "Prebieha opätovné pripojenie",
+    "typing": "Úprava",
+    "initializing": "Inicializovanie...",
+    "forgotten": "Presunuté do koša",
+    "errorState": "Kritická chyba: {0}",
+    "anonymousStoreDisabled": "Administrátor tejto CryptPad inštancie zakázal úložisko pre hostí. Prihlásením získate prístup k vašemu CryptDrive.",
+    "chainpadError": "Pri aktualizovaní obsahu došlo ku kritickej chybe. Táto stránka je v režime len na čítanie, aby ste nestratili svoju prácu.<br>Stlačte Esc na zobrazenie dokumentu alebo znovu načítajte pre pokračovanie v úpravách.",
+    "users": "Používatelia",
+    "language": "Jazyk",
+    "upgrade": "Upgrade",
+    "upgradeAccount": "Upgrade účtu",
+    "MB": "MB",
+    "GB": "GB",
+    "formattedMB": "{0} MB",
+    "formattedGB": "{0} GB",
+    "pinLimitReached": "Dosiahli ste limit úložiska",
+    "pinLimitReachedAlertNoAccounts": "Dosiahli ste limit úložiska",
+    "pinLimitNotPinned": "Dosiahli ste limit úložiska.<br>Tento dokument nie je uložený vo vašom CryptDrive.",
+    "pinLimitDrive": "Dosiahli ste limit úložiska.<br>Nemôžete vytvoriť nové dokumenty.",
+    "importButton": "Importovať",
+    "importButtonTitle": "Importovať dokument z lokálneho súboru",
+    "exportButton": "Exportovať",
+    "exportButtonTitle": "Exportovať dokument do lokálneho súboru",
+    "exportPrompt": "Ako chcete pomenovať váš súbor?",
+    "user_rename": "Zmeniť používateľské meno",
+    "user_displayName": "Používaťeľské meno",
+    "user_accountName": "Názov účtu",
+    "clickToEdit": "Kliknutím upravíte",
+    "saveTitle": "Uloženie názvu (enter)",
+    "forgetButton": "Zmazať",
+    "movedToTrash": "Tento dokument bol presunutý do koša. <br><a>Otvoriť môj Drive</a>",
+    "shareButton": "Zdieľať",
+    "shareSuccess": "Link bol skopírovaný do schránky",
+    "userListButton": "Zoznam používateľov",
+    "chatButton": "Chat",
+    "userAccountButton": "Používateľské menu",
+    "newButton": "Nový",
+    "uploadButton": "Nahrať súbory",
+    "uploadFolderButton": "Nahrať priečinok",
+    "uploadButtonTitle": "Nahrať nový súbor na CryptDrive",
+    "saveTemplatePrompt": "Zvoľte názov šablóny",
+    "saveTemplateButton": "Uložiť ako šablónu",
+    "templateSaved": "Šablóna uložená!",
+    "useTemplate": "Začať so šablónou?",
+    "useTemplateOK": "Vyberte šablónu (Enter)",
+    "useTemplateCancel": "Začať odznova (Esc)",
+    "template_empty": "Nie je k dispozícii žiadna šablóna",
+    "previewButtonTitle": "Zobrazenie alebo skrytie náhľadu Markdown režimu",
+    "presentButtonTitle": "Vstup do režimu prezentácie",
+    "colorButtonTitle": "Zmenia farby textu v režime prezentácie",
+    "propertiesButton": "Vlastnosti",
+    "propertiesButtonTitle": "Zistiť vlastnosti dokumentu",
+    "printButton": "Tlačiť (enter)",
+    "printOptions": "Možnosti rozloženia",
+    "printSlideNumber": "Zobraziť číslo snímky",
+    "printDate": "Zobraziť dátum",
+    "printTitle": "Zobraziť názov dokumentu",
+    "printCSS": "Vlastné pravidlá štýlu (CSS):",
+    "printTransition": "Zapnúť prechodové animácie",
+    "printBackground": "Použiť obrázok na pozadí",
+    "printBackgroundButton": "Vyberte obrázok",
+    "printBackgroundRemove": "Odstrániť tento obrázok na pozadí",
+    "filePickerButton": "Vložiť súbor uložený v CryptDrive",
+    "filePicker_close": "Zavrieť",
+    "filePicker_filter": "Filtrovať súbory podľa názvu",
+    "tags_title": "Štítky (len pre vás)",
+    "tags_add": "Aktualizovať značky pre vybrané dokumenty",
+    "tags_notShared": "Vaše štítky nie sú zdieľané s ostatnými používaťeľmi",
+    "tags_duplicate": "Duplicitný štítok : {0}",
+    "tags_noentry": "Nemôžete pridať štítok vymazanému dokumentu",
+    "slideOptionsText": "Možnosti",
+    "slide_invalidLess": "Neplatný vlastný štýl",
+    "languageButton": "Jazyk",
+    "themeButton": "Motív",
+    "themeButtonTitle": "Výber farebného motívu pre editory kódu a snímok",
+    "viewShare": "Odkaz len na čítanie",
+    "fileEmbedScript": "Pre vloženie súboru vložte tento skript raz do svojej stránky, aby sa načítal Media Tag:",
+    "fileEmbedTag": "Potom umiestnite Media Tag kamkoľvek na stránku, ktorú chcete vložiť:",
+    "notifyJoined": "{0} sa pripojil ku spolupráci",
+    "notifyRenamed": "{0} je teraz {1}",
+    "notifyLeft": "{0} odišiel/a",
+    "ok": "OK",
+    "okButton": "OK (enter)",
+    "editShare": "Odkaz pre úpravy",
+    "cancelButton": "Zrušiť (esc)",
+    "show_help_button": "Zobraziť nápovedu",
+    "help_button": "Nápoveda",
+    "historyText": "História",
+    "main_title": "CryptPad: Zero Knowledge, Collaborative Real Time Editing",
+    "userlist_offline": "Aktuálne ste offline, zoznam používateľov nie je dostupný.",
+    "pinLimitReachedAlert": "Dosiahli ste limit úložiska. Nové dokumenty sa nebudú ukladať vo vašom CryptDrive.<br>Buď vymažte dokumenty zo svojho CryptDrive alebo <a>si zakúpte prémiovú ponuku</a> na zvýšenie limitu.",
+    "newButtonTitle": "Vytvoriť nový dokument",
+    "selectTemplate": "Vyberte šablónu alebo stlačte escape",
+    "readonly": "Iba na čítanie",
+    "disabledApp": "Táto aplikácia bola zakázaná. Kontaktujte administrátora tejto CryptPad inštancie pre viac informácii.",
+    "formattedKB": "{0} kB",
+    "template_import": "Importovať šablónu",
+    "forgetPrompt": "Kliknutím na OK presuniete dokument do koša. Ste si istý?",
+    "backgroundButtonTitle": "Zmena farby pozadia v prezentácii",
+    "printButtonTitle2": "Vytlačiť dokument alebo exportovať ako PDF súbor",
+    "printText": "Tlačiť",
+    "printBackgroundValue": "<b>Súčasné pozadie:</b> <em>{0}</em>",
+    "slideOptionsTitle": "Prispôsobte svoje snímky",
+    "filePicker_description": "Vyberte súbor z CryptDrive a vložte ho alebo nahrajte nový súbor",
+    "cancel": "Zrušiť",
+    "viewEmbedTag": "Tento iframe môžete vložit na svoju stránku a upraviť ho pomocou CSS alebo HTML.",
+    "historyButton": "Zobratiť históriu dokumentu",
+    "anonymous": "Hosť",
+    "KB": "kB",
+    "storageStatus": "Úložisko:<br><b>{0}</b> využité z <b>{1}</b>"
 }

From f8815adb23cad18934471fe9a5aea95fcd767e6d Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Wed, 5 Mar 2025 14:07:07 +0000
Subject: [PATCH 075/114] Fix toggle appearance on iOS

#1808
---
 www/kanban/app-kanban.less | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index f47d95fae..c21767d39 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -539,6 +539,8 @@
                 border: 0;
                 height: 30px;
                 width: 30px;
+                margin: 0;
+                padding: 1px 4px;
                 line-height: 30px;
                 text-align: center;
                 display: inline-block;

From 04fa1d1e7bda615e6fdab0d4610f45274f41f4bd Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Wed, 5 Mar 2025 14:21:38 +0000
Subject: [PATCH 076/114] Fix toggle appearance on iOS 1808

---
 www/form/app-form.less | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index e7a3b3427..e977c73d8 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -207,7 +207,9 @@
                 display: flex;
                 flex-direction: row;
 
-                .cp-form-view-drag {
+                button.cp-form-view-drag {
+                    margin: 0;
+                    padding: 1px 4px;
                     width: 30px;
                     height: 30px;
                     border: none;

From 1ca252bd12944a9831aba8fd98e72e0861ebc2f8 Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Thu, 6 Mar 2025 15:45:13 +0000
Subject: [PATCH 077/114] Fix translation keys

---
 customize.dist/messages.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index 4d23f592d..396f8fb11 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -136,14 +136,14 @@ define(req, function(AppConfig, Default, Language) {
         }
     };
 
-    Messages.kanban_moveitemLeft = 'Move item left'; // XXX
-    Messages.kanban_moveitemRight = 'Move item right'; // XXX
+    Messages.moveItemLeft = 'Move item left'; // XXX
+    Messages.moveItemRight = 'Move item right'; // XXX
     Messages.kanban_moveBoardLeft = 'Move board left'; // XXX
     Messages.kanban_moveBoardRight = 'Move board right'; // XXX
 
     //NOTE: these keys are also added to the Form mobile UI PR #1753
     Messages.moveItemUp = 'Move item up'; // XXX
-    Messages.moveitemDown = 'Move item down'; // XXX
+    Messages.moveItemDown = 'Move item down'; // XXX
     Messages.toggleArrows = 'Switch to arrow view'; // XXX
     Messages.toggleDrag = 'Switch to drag view'; // XXX
 

From 4d9427c41780e89e68aed7448f222317b44f6e7d Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Thu, 6 Mar 2025 15:46:04 +0000
Subject: [PATCH 078/114] Fix arrow buttons markup

---
 www/kanban/app-kanban.less | 25 +++++-----
 www/kanban/inner.js        | 94 +++++++++++++++++++-------------------
 2 files changed, 58 insertions(+), 61 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index c21767d39..87581aa9c 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -177,7 +177,6 @@
         align-self: flex-start;
         outline-style: none;
         border-radius: @variables_radius;
-        cursor: pointer;
         &:focus-visible {
             outline: @variables_focus_style;
         }
@@ -187,25 +186,23 @@
         }
     }
 
-    .item-arrow-container {
-        width: 100%;
-        margin-top: 5%;
+    .item-icon-container{ // Board arrows
         display: flex;
+        width: 100%;
         justify-content: space-between;
-        .fa-arrow-down {
-            margin-left: 5px
-        }
-        .fa-arrow-up {
-            margin-right: 5px
+        .board-arrow {
+            padding: 0px;
         }
     }
 
-    .fa-arrow-left {
-        &.board-arrow {
-            margin-left: -2%;
-            float: left;
-        }
+    .item-arrow-container { // Card arrows
+        width: 100%;
+        margin-top: 0.25rem;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
     }
+   
 
     .cp-kanban-cursors {
         &:empty { display: none; }
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 33bdeef9d..a50b3686c 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -601,20 +601,20 @@ define([
                 $(el).find('.kanban-board-header').addClass('no-drag');
                 var arrowContainer = h('div.item-icon-container');
                 $(arrowContainer).appendTo($(el).find('.kanban-board-header'));
-                $(h('.button', {
-                    'class': 'cp-kanban-arrow fa fa-arrow-left board-arrow',
-                    'title': Messages.kanban_moveBoardLeft,
-                    'aria-hidden': true,
-                    'tabindex': 0
-                })).click(function () { 
+                $(h('button', {
+                    'class': 'cp-kanban-arrow board-arrow',
+                    'title': Messages.kanban_moveBoardLeft
+                }, [
+                    h('i.fa.fa-arrow-left', {'aria-hidden': true})
+                ])).click(function () { 
                     shiftBoards('left', el);
                 }).appendTo(arrowContainer);
-                $(h('.button', {
-                    'class': 'cp-kanban-arrow fa fa-arrow-right board-arrow',
+                $(h('button', {
+                    'class': 'cp-kanban-arrow board-arrow',
                     'title': Messages.kanban_moveBoardRight,
-                    'aria-hidden': true,
-                    'tabindex': 0
-                })).click(function () {
+                }, [
+                    h('i.fa.fa-arrow-right', {'aria-hidden': true})
+                ])).click(function () {
                     shiftBoards('right', el);
                 }).appendTo(arrowContainer);
             });
@@ -622,38 +622,38 @@ define([
                 $(el).addClass('no-drag');
                 var arrowContainerItem = h('div.item-arrow-container');
                 $(arrowContainerItem).appendTo((el));
-                $(h('.button', {
-                    'class': 'cp-kanban-arrow fa fa-arrow-left item-arrow',
-                    'title': Messages.kanban_moveItemLeft,
-                    'aria-hidden': true,
-                    'tabindex': 0
-                })).click(function () {
+                $(h('button', {
+                    'class': 'cp-kanban-arrow item-arrow',
+                    'title': Messages.moveItemLeft,
+                }, [
+                    h('i.fa.fa-arrow-left', {'aria-hidden': true})
+                ])).click(function () {
                     shiftItem('left', el);
                 }).appendTo(arrowContainerItem);
                 var centralArrowContainerItem = h('div.item-central-arrow-container');
                 $(centralArrowContainerItem).appendTo(arrowContainerItem);
-                $(h('.button', {
-                    'class': 'cp-kanban-arrow fa fa-arrow-down',
-                    'title': Messages.kanban_moveItemDown,
-                    'aria-hidden': true,
-                    'tabindex': 0
-                })).click(function () {
+                $(h('button', {
+                    'class': 'cp-kanban-arrow item-arrow',
+                    'title': Messages.moveItemDown,
+                }, [
+                    h('i.fa.fa-arrow-down', {'aria-hidden': true})
+                ])).click(function () {
                     shiftItem('down', el);
                 }).appendTo(centralArrowContainerItem);
-                $(h('.button', {
-                    'class': 'cp-kanban-arrow fa fa-arrow-up',
-                    'title': Messages.moveItemUp,
-                    'aria-hidden': true,
-                    'tabindex': 0
-                })).click(function () {
+                $(h('button', {
+                    'class': 'cp-kanban-arrow item-arrow',
+                    'title': Messages.moveItemUp
+                }, [
+                    h('i.fa.fa-arrow-up', {'aria-hidden': true})
+                ])).click(function () {
                     shiftItem('up', el);
                 }).appendTo(centralArrowContainerItem);
-                $(h('.button', {
-                    'class': 'cp-kanban-arrow fa fa-arrow-right item-arrow',
-                    'title': Messages.moveItemRight,
-                    'aria-hidden': true,
-                    'tabindex': 0
-                })).click(function () {
+                $(h('button', {
+                    'class': 'cp-kanban-arrow item-arrow',
+                    'title': Messages.moveItemRight
+                }, [
+                    h('i.fa.fa-arrow-right', {'aria-hidden': true})
+                ])).click(function () {
                     shiftItem('right', el);
                 }).appendTo(arrowContainerItem);
             });
@@ -667,24 +667,24 @@ define([
         $container.find('.kanban-edit-item').remove();
         $container.find('.kanban-item').each(function (i, el) {
             var itemId = $(el).attr('data-eid');
-            $(h('.button', {
-                'class': 'kanban-edit-item fa fa-pencil',
-                'alt': Messages.kanban_editCard,
-                'aria-hidden': true,
-                'tabindex': 0
-            })).click(function (e) {
+            $(h('button', {
+                'class': 'kanban-edit-item',
+                'title': Messages.kanban_editCard
+            }, [
+                h('i.fa.fa-pencil', {'aria-hidden': true})
+            ])).click(function (e) {
                 getItemEditModal(framework, kanban, itemId);
                 e.stopPropagation();
             }).insertAfter($(el).find('.kanban-item-text'));
         });
         $container.find('.kanban-board').each(function (i, el) {
             var itemId = $(el).attr('data-id');
-            $(h('.button', {
-                'class': 'kanban-edit-item fa fa-pencil',
-                'alt': Messages.kanban_editBoard,
-                'aria-hidden': true,
-                'tabindex': 0
-            })).click(function (e) {
+            $(h('button', {
+                'class': 'kanban-edit-item',
+                'title': Messages.kanban_editBoard
+            }, [
+                h('i.fa.fa-pencil', {'aria-hidden': true})
+            ])).click(function (e) {
                 getBoardEditModal(framework, kanban, itemId);
                 e.stopPropagation();
             }).appendTo($(el).find('.kanban-board-header'));

From bfcaaabfc2374cd7849a1079a1b7906c2a0c48ea Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Thu, 6 Mar 2025 15:57:46 +0000
Subject: [PATCH 079/114] add labels to arrow buttons

---
 www/kanban/inner.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index a50b3686c..4ed0789a1 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -603,7 +603,8 @@ define([
                 $(arrowContainer).appendTo($(el).find('.kanban-board-header'));
                 $(h('button', {
                     'class': 'cp-kanban-arrow board-arrow',
-                    'title': Messages.kanban_moveBoardLeft
+                    'title': Messages.kanban_moveBoardLeft,
+                    'aria-label': Messages.kanban_moveBoardLeft
                 }, [
                     h('i.fa.fa-arrow-left', {'aria-hidden': true})
                 ])).click(function () { 
@@ -612,6 +613,7 @@ define([
                 $(h('button', {
                     'class': 'cp-kanban-arrow board-arrow',
                     'title': Messages.kanban_moveBoardRight,
+                    'aria-label': Messages.kanban_moveBoardRight
                 }, [
                     h('i.fa.fa-arrow-right', {'aria-hidden': true})
                 ])).click(function () {
@@ -625,6 +627,7 @@ define([
                 $(h('button', {
                     'class': 'cp-kanban-arrow item-arrow',
                     'title': Messages.moveItemLeft,
+                    'aria-label': Messages.moveItemLeft
                 }, [
                     h('i.fa.fa-arrow-left', {'aria-hidden': true})
                 ])).click(function () {
@@ -635,6 +638,7 @@ define([
                 $(h('button', {
                     'class': 'cp-kanban-arrow item-arrow',
                     'title': Messages.moveItemDown,
+                    'aria-label': Messages.moveItemDown
                 }, [
                     h('i.fa.fa-arrow-down', {'aria-hidden': true})
                 ])).click(function () {
@@ -642,7 +646,8 @@ define([
                 }).appendTo(centralArrowContainerItem);
                 $(h('button', {
                     'class': 'cp-kanban-arrow item-arrow',
-                    'title': Messages.moveItemUp
+                    'title': Messages.moveItemUp,
+                    'aria-label': Messages.moveItemUp
                 }, [
                     h('i.fa.fa-arrow-up', {'aria-hidden': true})
                 ])).click(function () {
@@ -650,7 +655,8 @@ define([
                 }).appendTo(centralArrowContainerItem);
                 $(h('button', {
                     'class': 'cp-kanban-arrow item-arrow',
-                    'title': Messages.moveItemRight
+                    'title': Messages.moveItemRight,
+                    'aria-label': Messages.moveItemRight
                 }, [
                     h('i.fa.fa-arrow-right', {'aria-hidden': true})
                 ])).click(function () {
@@ -669,7 +675,8 @@ define([
             var itemId = $(el).attr('data-eid');
             $(h('button', {
                 'class': 'kanban-edit-item',
-                'title': Messages.kanban_editCard
+                'title': Messages.kanban_editCard,
+                'aria-label': Messages.kanban_editCard
             }, [
                 h('i.fa.fa-pencil', {'aria-hidden': true})
             ])).click(function (e) {
@@ -681,7 +688,8 @@ define([
             var itemId = $(el).attr('data-id');
             $(h('button', {
                 'class': 'kanban-edit-item',
-                'title': Messages.kanban_editBoard
+                'title': Messages.kanban_editBoard,
+                'aria-label': Messages.kanban_editBoard
             }, [
                 h('i.fa.fa-pencil', {'aria-hidden': true})
             ])).click(function (e) {

From d774de4b28f6afa8e5a723c09467bd81476887b3 Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Thu, 6 Mar 2025 17:23:01 +0000
Subject: [PATCH 080/114] Accessibilty fixes to form arrows

---
 www/form/inner.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index b36f21d7e..93bf582fc 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4021,16 +4021,14 @@ define([
             let shiftButtons;
             if (editable) {
                 // Arrows 
-                var upButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-up',  {
+                var upButton = h('button.cp-form-arrow', {
                     'title': Messages.moveItemUp,
-                    'aria-hidden': true,
-                    'tabindex': 0
-                }));
-                var downButton = h('button.cp-form-arrow', h('i.fa.fa-arrow-down', {
+                    'aria-label': Messages.moveItemUp
+                }, [h('i.fa.fa-arrow-up',  {'aria-hidden': true})]);
+                var downButton = h('button.cp-form-arrow', {
                     'title': Messages.moveItemDown,
-                    'aria-hidden': true,
-                    'tabindex': 0
-                }));
+                    'aria-label': Messages.moveItemDown
+                }, [h('i.fa.fa-arrow-down', {'aria-hidden': true})]);
                 var shiftBlock = function(direction) {
                     var blockIndex = content.order.indexOf(uid);
                     if (direction === 'up' && blockIndex > 0) {

From 883fe80fcb56d950174dfc0728e40aad4edbbc13 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 7 Mar 2025 00:20:26 +0000
Subject: [PATCH 081/114] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1787 of 1787 strings)

Co-authored-by: Subtext6676 <subtext6676@users.noreply.weblate.cryptpad.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/zh_Hans/
Translation: CryptPad/App
---
 www/common/translations/messages.zh.json | 104 +++++++++++------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/www/common/translations/messages.zh.json b/www/common/translations/messages.zh.json
index 4bca5c2ce..b3775d2ae 100644
--- a/www/common/translations/messages.zh.json
+++ b/www/common/translations/messages.zh.json
@@ -44,22 +44,22 @@
     "formattedGB": "{0} GB",
     "formattedKB": "{0} kB",
     "pinLimitReached": "您已达到存储限制",
-    "pinLimitReachedAlert": "您已达到存储空间上限。 新的文档不会存储在您的 CryptDrive 中。<br>您可以从 CryptDrive 中删除文档或<a>订阅高级优惠</a>以提高您的存储空间上限。",
-    "pinLimitNotPinned": "已达到存储空间上限。<br>此文档未存储在您的 CryptDrive 中。",
-    "pinLimitDrive": "您已达到存储空间上限。<br>您无法创建新文档。",
-    "importButtonTitle": "从本地文档导入文档",
-    "exportButtonTitle": "将此文档导出到本地文档",
+    "pinLimitReachedAlert": "您已达到存储限制。新文档不会存储在您的 CryptDrive 中。<br>您可以从 CryptDrive 中移除文档或<a>订阅高级优惠</a>以增加限额。",
+    "pinLimitNotPinned": "您已达到存储限制。<br>此文档未存储在您的 CryptDrive 中。",
+    "pinLimitDrive": "您已达到存储限制。<br>您无法创建新文档。",
+    "importButtonTitle": "从本地文件导入文档",
+    "exportButtonTitle": "将此文档导出到本地文件",
     "exportPrompt": "是否命名您的文件？",
     "user_rename": "更改显示名称",
     "user_displayName": "显示名称",
     "user_accountName": "账号名称",
     "clickToEdit": "点击编辑",
-    "forgetPrompt": "点击确定会将此文档移至回收站。 确定吗？",
+    "forgetPrompt": "点击确定会将此文档移至回收站。是否确定？",
     "movedToTrash": "该文档已移至回收站。<br><a>访问我的云盘</a>",
     "shareButton": "分享",
     "shareSuccess": "已将链接复制到剪贴板",
     "newButton": "新",
-    "newButtonTitle": "创建一个新文档",
+    "newButtonTitle": "创建新文档",
     "saveTemplateButton": "另存为模板",
     "saveTemplatePrompt": "为模板选择标题",
     "templateSaved": "模板已保存！",
@@ -111,7 +111,7 @@
     "fm_searchName": "搜索",
     "fm_searchPlaceholder": "搜索…",
     "fm_newButton": "新的",
-    "fm_newButtonTitle": "创建一个新的文档或文件夹，在当前文件夹中导入一个文件。",
+    "fm_newButtonTitle": "创建新文档或文件夹，在当前文件夹中导入文件。",
     "fm_newFolder": "新建文件夹",
     "fm_newFile": "新文档",
     "fm_folder": "文件夹",
@@ -227,8 +227,8 @@
     "exportButton": "导出",
     "importButton": "导入",
     "forgotten": "已移至回收站",
-    "initializing": "初始化中…",
-    "typing": "编辑中",
+    "initializing": "正在初始化…",
+    "typing": "正在编辑",
     "profile_editDescription": "编辑描述",
     "profile_addDescription": "添加描述",
     "poll_comment_submit": "发送",
@@ -270,7 +270,7 @@
     "contacts_info4": "任何一个参与者都可以永久清除聊天记录",
     "contacts_info3": "双击他们的图标以查看他们的个人资料",
     "contacts_info2": "点击联系人的图标与他们聊天",
-    "contacts_info1": "这些是您的联系人。 从这里，您可以：",
+    "contacts_info1": "这些是您的联系人。从这里，您可以：",
     "contacts_padTitle": "聊天",
     "contacts_warning": "您在此处键入的所有内容都是持久存在的，可供本文档的所有现有和未来用户使用。 小心敏感信息！",
     "contacts_typeHere": "在此处输入消息...",
@@ -324,33 +324,33 @@
     "ok": "确定",
     "fileEmbedTag": "然后将此媒体标签放置在您要嵌入的页面中的任何位置：",
     "fileEmbedScript": "要嵌入此文件，请在您的页面中包含此脚本一次以加载媒体标签：",
-    "viewEmbedTag": "要嵌入此文档，请将此 iframe 包含在您的页面中任何想要的位置。您可以使用 CSS 或 HTML 属性对其进行样式设置。",
+    "viewEmbedTag": "要嵌入此文档，请将此 iframe 包含在您想要的页面中的任何位置。您可以使用 CSS 或 HTML 属性对其进行样式设置。",
     "themeButtonTitle": "选择用于代码和幻灯片编辑器的颜色主题",
     "languageButtonTitle": "选择用于语法突出显示的语言",
     "slide_invalidLess": "自定义样式无效",
-    "tags_noentry": "您不能标记已删除的文档",
+    "tags_noentry": "您无法标记已删除的文档",
     "tags_duplicate": "重复标签：{0}",
-    "tags_notShared": "您的标签未与其他用户共享",
+    "tags_notShared": "您的标签不会与其他用户共享",
     "tags_add": "更新所选文档的标签",
-    "tags_title": "标签（仅供自己使用）",
-    "filePicker_filter": "按名称筛选文档",
-    "filePicker_description": "从您的 CryptDrive 中选择一个文件以嵌入它或上传一个新文件",
-    "filePickerButton": "嵌入存储在 CryptDrive 中的文档",
+    "tags_title": "标签（仅供您使用）",
+    "filePicker_filter": "按名称筛选文件",
+    "filePicker_description": "从 CryptDrive 中选择文件以嵌入或上传新文件",
+    "filePickerButton": "嵌入存储在 CryptDrive 中的文件",
     "printBackgroundRemove": "移除此背景图片",
-    "printBackgroundNoValue": "<em> 不显示背景图片 </em>",
-    "printBackgroundValue": "<b> 当前背景： </b> <em> {0} </em>",
-    "printBackgroundButton": "选择一张图片",
+    "printBackgroundNoValue": "<em>不显示背景图片</em>",
+    "printBackgroundValue": "<b>当前背景：</b><em>{0}</em>",
+    "printBackgroundButton": "选择图片",
     "printBackground": "使用背景图片",
-    "printButtonTitle2": "打印您的文档或将其导出为 PDF 文档",
+    "printButtonTitle2": "打印文档或将其导出为 PDF 文件",
     "propertiesButtonTitle": "获取文档属性",
     "template_empty": "没有可用的模板",
     "template_import": "导入模板",
-    "useTemplateCancel": "重新开始 (Esc)",
+    "useTemplateCancel": "重新开始（Esc）",
     "useTemplateOK": "选择模板（Enter）",
     "useTemplate": "从模板开始？",
-    "uploadButtonTitle": "上传新文件到您的 CryptDrive",
+    "uploadButtonTitle": "将新文件上传到您的 CryptDrive",
     "uploadFolderButton": "上传文件夹",
-    "uploadButton": "上传文档",
+    "uploadButton": "上传文件",
     "form_required_on": "必要的",
     "form_required_off": "选项",
     "form_preview": "表格预览",
@@ -358,25 +358,25 @@
     "form_corruptAnswers": "此表单已经有回复。 更改此问题类型可能会使以前的响应数据无效。",
     "userAccountButton": "用户菜单",
     "userListButton": "用户列表",
-    "saveTitle": "保存标题（enter）",
+    "saveTitle": "保存标题（Enter）",
     "pinLimitReachedAlertNoAccounts": "您已达到存储限制",
-    "storageStatus": "存储：<br><b>{0}</b>已用完<b>{1}</b>",
+    "storageStatus": "存储：<br>已使用 <b>{0}</b>（共 <b>{1}</b>）",
     "upgradeAccount": "升级账号",
     "userlist_offline": "您当前处于离线状态，用户列表不可用。",
     "errorState": "严重错误：{0}",
-    "realtime_unrecoverableError": "发生了不可恢复的错误，点击“确定”重新加载。",
-    "disabledApp": "此应用已被禁用。 请联系此 CryptPad 的管理员了解详细信息。",
+    "realtime_unrecoverableError": "发生了不可恢复的错误，点击确定重新加载。",
+    "disabledApp": "已禁用此应用程序。如需了解详情，请联系此 CryptPad 的管理员。",
     "mustLogin": "您必须登录才能访问此页面",
     "deletedFromServer": "文档已销毁",
-    "newVersionError": "有新版本的 CryptPad 可用。<br><a href='#'>重新加载</a>以使用新版本，或按 Esc 键以<b>离线模式</b>访问您的内容。",
-    "errorRedirectToHome": "按 Esc 重定向到您的 CryptDrive。",
-    "errorCopy": " 您仍然可以按只读模式使用当前版本 Esc 。",
+    "newVersionError": "CryptPad 的新版本可用。<br><a href='#'>重新加载</a>以使用新版本，或按 Esc 键在<b>离线模式</b>下访问您的内容。",
+    "errorRedirectToHome": "按 Esc 键重定向到您的 CryptDrive。",
+    "errorCopy": " 您仍然可以通过按 Esc 键在只读模式下使用当前版本。",
     "invalidHashError": "您请求的文档的 URL 无效。",
-    "chainpadError": "更新内容时出现严重错误。 此页面处于只读模式，以确保您不会丢失您的工作。<br>点击 Esc 以继续查看此文档，或重新加载后再次尝试编辑。",
-    "inactiveError": "由于缺少活动，此文档已被删除。 按 Esc 创建一个新文档。",
+    "chainpadError": "更新内容时出现严重错误。此页面处于只读模式，以确保不会丢失工作。<br>按 Esc 键继续查看此文档，或重新加载以尝试再次编辑。",
+    "inactiveError": "由于不活动，此文档已被删除。按 Esc 键创建新文档。",
     "deletedError": "此文档已被删除，不再可用。",
     "expiredError": "此文档已达到销毁日期，不再可用。",
-    "anonymousStoreDisabled": "此 CryptPad 实例的管理员已禁用访客存储服务。 请登录以访问您自己的 CryptDrive。",
+    "anonymousStoreDisabled": "此 CryptPad 实例的管理员已禁用访客存储服务。请登录以访问您自己的 CryptDrive。",
     "padNotPinnedVariable": "此文档将在 {4} 天不活动后过期，请{0}登录{1}或{2}注册{3}以保留它。",
     "padNotPinned": "此文档将在 3 个月不活动后过期，请{0}登录{1}或{2}注册{3}以保留它。",
     "download_step2": "解密中",
@@ -887,16 +887,16 @@
     "snapshots_delete": "删除",
     "oo_deletedVersion": "这个版本在历史上已经不存在了。",
     "snapshots_close": "关闭",
-    "snapshots_restore": "恢复",
+    "snapshots_restore": "还原",
     "snapshots_open": "打开",
     "snapshots_placeholder": "快照标题",
     "snapshots_new": "新快照",
     "snapshots_button": "快照",
     "snaphot_title": "快照",
     "infobar_versionHash": "您当前正在查看此文档 ({0}) 的旧版本。",
-    "history_restoreDriveDone": "CryptDrive 已恢复",
+    "history_restoreDriveDone": "CryptDrive 已还原",
     "history_restoreDrivePrompt": "您确定要用显示的版本替换 CryptDrive 的当前版本吗？",
-    "history_restoreDriveTitle": "恢复所选版本的 CryptDrive",
+    "history_restoreDriveTitle": "还原所选版本的 CryptDrive",
     "history_userNext": "下一个作者",
     "history_fastNext": "下一个编辑会话",
     "history_userPrev": "以前的作者",
@@ -904,8 +904,8 @@
     "history_shareTitle": "分享此版本的链接",
     "share_versionHash": "您即将以只读模式共享文档的选定历史版本。 这也将<b>授予文档所有版本的查看权限</b>。",
     "history_close": "关闭",
-    "history_cantRestore": "恢复失败。 您已断开连接。",
-    "history_restore": "恢复",
+    "history_cantRestore": "还原失败，您已断开连接。",
+    "history_restore": "还原",
     "share_bar": "创建链接",
     "settings_kanbanTagsOr": "或",
     "settings_kanbanTagsAnd": "并",
@@ -1324,7 +1324,7 @@
     "docs_link": "文档",
     "creation_helperText": "在文档中打开",
     "creation_expiresIn": "销毁于",
-    "register_warning_note": "由于 CryptPad 的加密特性，如果您忘记了用户名和/或密码，服务管理员将无法恢复数据。 请将它们保存在安全的地方。",
+    "register_warning_note": "由于 CryptPad 的加密特性，如果您忘记了用户名和/或密码，服务管理员将无法恢复数据。请将它们保存在安全的地方。",
     "register_notes": "<ul class=\"cp-notes-list\"><li>您的密码是加密所有文档的密钥。<span class=\"red\">如果您丢失了，我们将无法恢复您的数据。</span></li><li>如果您使用的是共享计算机，<span class=\"red\">请记住在完成后登出</span>。仅关闭浏览器窗口会暴露您的账号。</li><li>要保留您在未登录时创建和/或存储的文档，请勾选“从访客会话导入文档”。</li></ul>",
     "register_notes_title": "重要笔记",
     "offlineError": "无法同步最新数据，此时无法显示此页面。 当您与服务的连接恢复时，加载将继续。",
@@ -1352,11 +1352,11 @@
     "fileTableHeader": "下载和上传",
     "allowNotifications": "允许通知",
     "archivedFromServer": "文档已归档",
-    "restoredFromServer": "文档已恢复",
+    "restoredFromServer": "文档已还原",
     "admin_archiveInput2": "文档密码",
     "admin_archiveInput": "文档网址",
-    "admin_unarchiveButton": "恢复",
-    "admin_unarchiveHint": "恢复以前存档的文档",
+    "admin_unarchiveButton": "还原",
+    "admin_unarchiveHint": "还原之前归档的文档",
     "admin_archiveButton": "归档",
     "admin_archiveHint": "在不永久删除文档的情况下使文档不可用。 它将被放置在“存档”目录中，并在几天后删除（可在服务器配置文档中配置）。",
     "errorPopupBlocked": "CryptPad 需要能够打开新标签才能操作。 请允许在浏览器的地址栏中弹出窗口。 这些窗口永远不会用于向您展示广告。",
@@ -1433,7 +1433,7 @@
     "support_warning_prompt": "请为您的问题选择最相关的类别。 这有助于管理员进行分类，并为提供哪些信息提供进一步的建议",
     "info_sourceFlavour": "CryptPad 的<a>源代码</a>",
     "info_termsFlavour": "此实例的<a>服务条款</a>",
-    "ui_restore": "恢复",
+    "ui_restore": "还原",
     "ui_archive": "归档",
     "ui_undefined": "未知",
     "admin_documentType": "類型",
@@ -1448,8 +1448,8 @@
     "ui_success": "成功",
     "ui_fetch": "获取",
     "ui_confirm": "确定",
-    "admin_archiveReason": "请说明归档原因并确认您要继续",
-    "admin_restoreReason": "请说明恢复原因并确认您要继续",
+    "admin_archiveReason": "请说明归档的原因，并确认您要继续",
+    "admin_restoreReason": "请说明还原的原因，并确认您要继续",
     "admin_accountMetadataTitle": "账号信息",
     "admin_accountMetadataHint": "输入用户的公钥以获取有关其账号的数据。",
     "admin_documentMetadataTitle": "文档信息",
@@ -1464,10 +1464,10 @@
     "admin_blockAvailable": "块可用",
     "admin_blockArchived": "块已存档",
     "admin_archiveBlock": "归档块",
-    "admin_documentConflict": "归档/恢复",
-    "admin_restoreBlock": "恢复归档块",
+    "admin_documentConflict": "归档/还原",
+    "admin_restoreBlock": "还原已归档的块",
     "admin_getPinList": "当前的pin列表",
-    "admin_restoreDocument": "恢复文档",
+    "admin_restoreDocument": "还原文档",
     "admin_planlimit": "存储限制",
     "fm_filterBy": "筛选",
     "fm_rmFilter": "删除过滤器",
@@ -1514,7 +1514,7 @@
     "admin_pinLogAvailable": "Pin 日志可用",
     "admin_pinLogArchived": "Pin 日志已存档",
     "admin_blockKey": "阻止公钥",
-    "admin_conflictExplanation": "本文件有两个版本。 恢复存档版本将覆盖实时版本。 存档实时版本将覆盖存档版本。 这两项一旦操作都无法撤消。",
+    "admin_conflictExplanation": "此文档存在两个版本。还原已归档的版本将覆盖实时版本。归档实时版本将覆盖已归档的版本。这两种操作都无法撤销。",
     "settings_mfaHint": "使用您选择的身份验证应用提供的额外验证码保护您的账号",
     "done": "完成",
     "mfa_setup_button": "开始 2FA 设置",
@@ -1773,7 +1773,7 @@
     "admin_totpRecoveryHint": "用户可以在 2FA 恢复页面 /recovery/ 复制恢复数据，然后将其通过电子邮件发送给实例管理员。粘贴以下恢复数据即可为账号禁用 2FA",
     "label_logo": "CryptPad 徽标",
     "team_nameAlreadySet": "团队名称已设置为 {0}",
-    "admin_archiveAccountConfirm": "请说明归档原因，这将显示给用户。",
+    "admin_archiveAccountConfirm": "请说明归档的原因，这将显示给用户。",
     "calendar_rec_change_first": "将第一个重复事件移动到不同的日历。也将移动所有重复事件。",
     "ssoauth_form_hint_register": "添加 CryptPad 密码以增强安全性，或留空并继续。如果不添加密码，实例管理员将可以使用保护数据的密钥。",
     "admin_forcemfaHint": "将要求此实例上的全部用户设置双因素身份验证才能登录其账号。请注意，现有用户如果不设置 TOTP 应用程序将无法继续使用其账号。",

From ec13199a492d882e62eb7b1f55b5c4e30b7a22ae Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 7 Mar 2025 00:20:27 +0000
Subject: [PATCH 082/114] Translated using Weblate (Czech)

Currently translated at 79.0% (1413 of 1787 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: slichvar <slichvar@protonmail.com>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/cs/
Translation: CryptPad/App
---
 www/common/translations/messages.cs.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/translations/messages.cs.json b/www/common/translations/messages.cs.json
index d4a80e2d4..884509cf6 100644
--- a/www/common/translations/messages.cs.json
+++ b/www/common/translations/messages.cs.json
@@ -320,7 +320,7 @@
     "chatButton": "Chat",
     "userListButton": "Seznam uživatelů",
     "shareButton": "Sdílet",
-    "movedToTrash": "Dokument byl přesunut do koše.<br>Otevřít CryptDrive<a></a>",
+    "movedToTrash": "Dokument byl přesunut do koše.<br><a>Otevřít CryptDrive</a>",
     "forgetPrompt": "Kliknutí na OK přesune dokument do koše. Jste si jistí?",
     "forgetButton": "Smazat",
     "saveTitle": "Uložit název (enter)",

From eed3cb8875900655de3baf7a8bc45d758006f9c8 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 7 Mar 2025 00:20:27 +0000
Subject: [PATCH 083/114] Translated using Weblate (Slovak)

Currently translated at 17.0% (304 of 1787 strings)

Translated using Weblate (Slovak)

Currently translated at 16.3% (292 of 1787 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: slichvar <slichvar@protonmail.com>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/sk/
Translation: CryptPad/App
---
 www/common/translations/messages.sk.json | 187 +++++++++++++++++++----
 1 file changed, 158 insertions(+), 29 deletions(-)

diff --git a/www/common/translations/messages.sk.json b/www/common/translations/messages.sk.json
index bf49b8a8e..aae5ceed2 100644
--- a/www/common/translations/messages.sk.json
+++ b/www/common/translations/messages.sk.json
@@ -87,19 +87,19 @@
     "pinLimitNotPinned": "Dosiahli ste limit úložiska.<br>Tento dokument nie je uložený vo vašom CryptDrive.",
     "pinLimitDrive": "Dosiahli ste limit úložiska.<br>Nemôžete vytvoriť nové dokumenty.",
     "importButton": "Importovať",
-    "importButtonTitle": "Importovať dokument z lokálneho súboru",
+    "importButtonTitle": "Importovať dokument zo súboru",
     "exportButton": "Exportovať",
-    "exportButtonTitle": "Exportovať dokument do lokálneho súboru",
+    "exportButtonTitle": "Exportovať dokument do súboru",
     "exportPrompt": "Ako chcete pomenovať váš súbor?",
-    "user_rename": "Zmeniť používateľské meno",
-    "user_displayName": "Používaťeľské meno",
-    "user_accountName": "Názov účtu",
-    "clickToEdit": "Kliknutím upravíte",
-    "saveTitle": "Uloženie názvu (enter)",
+    "user_rename": "Zmeniť meno",
+    "user_displayName": "Meno",
+    "user_accountName": "Užívateľské meno",
+    "clickToEdit": "Kliknite pre úpravu",
+    "saveTitle": "Uložiť názov (enter)",
     "forgetButton": "Zmazať",
-    "movedToTrash": "Tento dokument bol presunutý do koša. <br><a>Otvoriť môj Drive</a>",
+    "movedToTrash": "Dokument bol presunutý do koša.<br><a>Otvoriť CryptDrive</a>",
     "shareButton": "Zdieľať",
-    "shareSuccess": "Link bol skopírovaný do schránky",
+    "shareSuccess": "Odkaz bol skopírovaný do schránky",
     "userListButton": "Zoznam používateľov",
     "chatButton": "Chat",
     "userAccountButton": "Používateľské menu",
@@ -107,16 +107,16 @@
     "uploadButton": "Nahrať súbory",
     "uploadFolderButton": "Nahrať priečinok",
     "uploadButtonTitle": "Nahrať nový súbor na CryptDrive",
-    "saveTemplatePrompt": "Zvoľte názov šablóny",
+    "saveTemplatePrompt": "Zvoľte názov pre šablónu",
     "saveTemplateButton": "Uložiť ako šablónu",
     "templateSaved": "Šablóna uložená!",
     "useTemplate": "Začať so šablónou?",
-    "useTemplateOK": "Vyberte šablónu (Enter)",
-    "useTemplateCancel": "Začať odznova (Esc)",
+    "useTemplateOK": "Vybrať šablónu (Enter)",
+    "useTemplateCancel": "Začať bez šablóny (Esc)",
     "template_empty": "Nie je k dispozícii žiadna šablóna",
-    "previewButtonTitle": "Zobrazenie alebo skrytie náhľadu Markdown režimu",
-    "presentButtonTitle": "Vstup do režimu prezentácie",
-    "colorButtonTitle": "Zmenia farby textu v režime prezentácie",
+    "previewButtonTitle": "Zobraziť alebo skyť Markdown náhľad",
+    "presentButtonTitle": "Spustiť režim prezentácie",
+    "colorButtonTitle": "Zmeniť farbu textu v režime prezentácie",
     "propertiesButton": "Vlastnosti",
     "propertiesButtonTitle": "Zistiť vlastnosti dokumentu",
     "printButton": "Tlačiť (enter)",
@@ -125,23 +125,23 @@
     "printDate": "Zobraziť dátum",
     "printTitle": "Zobraziť názov dokumentu",
     "printCSS": "Vlastné pravidlá štýlu (CSS):",
-    "printTransition": "Zapnúť prechodové animácie",
+    "printTransition": "Povoliť animáciu prechodov",
     "printBackground": "Použiť obrázok na pozadí",
-    "printBackgroundButton": "Vyberte obrázok",
-    "printBackgroundRemove": "Odstrániť tento obrázok na pozadí",
+    "printBackgroundButton": "Vybrať obrázok",
+    "printBackgroundRemove": "Odstrániť obrázok na pozadí",
     "filePickerButton": "Vložiť súbor uložený v CryptDrive",
     "filePicker_close": "Zavrieť",
     "filePicker_filter": "Filtrovať súbory podľa názvu",
     "tags_title": "Štítky (len pre vás)",
-    "tags_add": "Aktualizovať značky pre vybrané dokumenty",
-    "tags_notShared": "Vaše štítky nie sú zdieľané s ostatnými používaťeľmi",
+    "tags_add": "Upraviť štítky pre vybrané dokumenty",
+    "tags_notShared": "Vaše štítky nie sú zdieľané s ostatnými používateľmi",
     "tags_duplicate": "Duplicitný štítok : {0}",
-    "tags_noentry": "Nemôžete pridať štítok vymazanému dokumentu",
+    "tags_noentry": "Nemôžete pridať štítok ku vymazanému dokumentu",
     "slideOptionsText": "Možnosti",
     "slide_invalidLess": "Neplatný vlastný štýl",
     "languageButton": "Jazyk",
     "themeButton": "Motív",
-    "themeButtonTitle": "Výber farebného motívu pre editory kódu a snímok",
+    "themeButtonTitle": "Vybrať farebný motív pre editory kódu a snímkov",
     "viewShare": "Odkaz len na čítanie",
     "fileEmbedScript": "Pre vloženie súboru vložte tento skript raz do svojej stránky, aby sa načítal Media Tag:",
     "fileEmbedTag": "Potom umiestnite Media Tag kamkoľvek na stránku, ktorú chcete vložiť:",
@@ -157,7 +157,7 @@
     "historyText": "História",
     "main_title": "CryptPad: Zero Knowledge, Collaborative Real Time Editing",
     "userlist_offline": "Aktuálne ste offline, zoznam používateľov nie je dostupný.",
-    "pinLimitReachedAlert": "Dosiahli ste limit úložiska. Nové dokumenty sa nebudú ukladať vo vašom CryptDrive.<br>Buď vymažte dokumenty zo svojho CryptDrive alebo <a>si zakúpte prémiovú ponuku</a> na zvýšenie limitu.",
+    "pinLimitReachedAlert": "Dosiahli ste limit úložiska. Nové dokumenty sa nebudú ukladať vo vašom CryptDrive.<br>Buď vymažte dokumenty zo svojho CryptDrive alebo <a>si zakúpte prémiovú ponuku</a> pre zvýšenie limitu.",
     "newButtonTitle": "Vytvoriť nový dokument",
     "selectTemplate": "Vyberte šablónu alebo stlačte escape",
     "readonly": "Iba na čítanie",
@@ -168,13 +168,142 @@
     "backgroundButtonTitle": "Zmena farby pozadia v prezentácii",
     "printButtonTitle2": "Vytlačiť dokument alebo exportovať ako PDF súbor",
     "printText": "Tlačiť",
-    "printBackgroundValue": "<b>Súčasné pozadie:</b> <em>{0}</em>",
-    "slideOptionsTitle": "Prispôsobte svoje snímky",
-    "filePicker_description": "Vyberte súbor z CryptDrive a vložte ho alebo nahrajte nový súbor",
+    "printBackgroundValue": "<b>Aktuálne pozadie:</b> <em>{0}</em>",
+    "slideOptionsTitle": "Prispôsobiť snímky",
+    "filePicker_description": "Vyberte súbor z CryptDrive alebo nahrajte nový súbor pre vloženie",
     "cancel": "Zrušiť",
-    "viewEmbedTag": "Tento iframe môžete vložit na svoju stránku a upraviť ho pomocou CSS alebo HTML.",
-    "historyButton": "Zobratiť históriu dokumentu",
+    "viewEmbedTag": "Tento iframe môžete vložiť na svoju stránku a upraviť ho pomocou CSS alebo HTML.",
+    "historyButton": "Zobraziť históriu dokumentu",
     "anonymous": "Hosť",
     "KB": "kB",
-    "storageStatus": "Úložisko:<br><b>{0}</b> využité z <b>{1}</b>"
+    "storageStatus": "Úložisko:<br><b>{0}</b> využité z <b>{1}</b>",
+    "printBackgroundNoValue": "<em>Nezobrazuje sa žiadny obrázok na pozadí</em>",
+    "languageButtonTitle": "Vybrať jazyk pre zvýraznenie syntaxe",
+    "history_next": "Ďalšia verzia",
+    "history_prev": "Predchádzajúca verzia",
+    "history_loadMore": "Načítať ďalšiu históriu",
+    "history_closeTitle": "Zavrieť históriu",
+    "history_restoreTitle": "Obnoviť vybranú verziu dokumentu",
+    "history_restorePrompt": "Ste si istý, že chcete nahradiť súčasnú verziu dokumentu vybranou verziou?",
+    "history_restoreDone": "Dokument obnovený",
+    "openLinkInNewTab": "Otvoriť odkaz v novej karte",
+    "pad_mediatagTitle": "Nastavenia Media-Tag",
+    "pad_mediatagWidth": "Šírka (px)",
+    "pad_mediatagHeight": "Výška (px)",
+    "pad_mediatagRatio": "Zachovať pomer",
+    "pad_mediatagBorder": "Širka okraja (px)",
+    "pad_mediatagPreview": "Náhľad",
+    "pad_mediatagImport": "Uložiť do CryptDrive",
+    "pad_mediatagOptions": "Vlastnosti obrázku",
+    "kanban_item": "Položka {0}",
+    "kanban_todo": "Dokončiť",
+    "kanban_done": "Hotovo",
+    "kanban_working": "Prebieha",
+    "kanban_addBoard": "Pridať stĺpec",
+    "poll_publish_button": "Zverejniť",
+    "poll_create_user": "Pridať nového používateľa",
+    "poll_create_option": "Pridať novú možnosť",
+    "poll_commit": "Odoslať",
+    "poll_userPlaceholder": "Vaše meno",
+    "poll_removeOption": "Ste si istý, že chcete odstrániť túto možnosť?",
+    "poll_remove": "Odstrániť",
+    "poll_edit": "Upraviť",
+    "poll_locked": "Uzamknuté",
+    "poll_unlocked": "Odomknuté",
+    "poll_bookmark_col": "Tento stĺpec si môžeťe pridať do záložiek, aby sa vám vždy odomkol a zobrazil na začiatku",
+    "poll_bookmarked_col": "Toto je pripnutý stĺpec. Bude vždy odomknutý a zobrazí sa na začiatku.",
+    "poll_total": "SUMA",
+    "poll_comment_list": "Komentáre",
+    "poll_comment_add": "Pridať komentár",
+    "poll_comment_submit": "Odoslať",
+    "poll_comment_remove": "Odstrániť komentár",
+    "poll_comment_placeholder": "Váš komentár",
+    "oo_cantUpload": "Nahrávanie nie je povolené pokiaľ sú pripojený ostatný používatelia.",
+    "oo_uploaded": "Nahrávanie dokončené. Kliknite OK pre obnovenie stránky alebo zrušiť pre pokračovanie v režime iba na čítanie.",
+    "canvas_clear": "Vymazať",
+    "canvas_delete": "Vymazať výber",
+    "canvas_width": "Šírka",
+    "canvas_opacity": "Priehľadnosť",
+    "canvas_opacityLabel": "Priehľadnosť: {0}",
+    "canvas_widthLabel": "Šírka: {0}",
+    "canvas_currentBrush": "Aktuálny štetec",
+    "canvas_imageEmbed": "Vložiť obrázok z počítača",
+    "profileButton": "Profil",
+    "profile_upload": " Nahrať nového avatara",
+    "profile_uploadSizeError": "Chyba: váš avatar musí byť menší ako {0}",
+    "profile_error": "Nastala chyba počas vytvárania vášho profilu: {0}",
+    "profile_register": "Pre vytvorenie profilu sa musíte zaregistrovať!",
+    "profile_viewMyProfile": "Zobraziť môj profil",
+    "userlist_addAsFriendTitle": "Odoslať \"{0}\" žiadosť o kontakt",
+    "contacts_title": "Kontakty",
+    "contacts_rejected": "Žiadosť o kontakt zamietnutá",
+    "contacts_request": "<em>{0}</em>si vás chce pridať do kontaktov.<b>Prijať</b>?",
+    "contacts_send": "Odoslať",
+    "contacts_remove": "Odstrániť kontakt",
+    "contacts_typeHere": "Tu napíšte správu...",
+    "contacts_padTitle": "Chat",
+    "contacts_info1": "Toto sú vaše kontakty. Odtiaľto možete:",
+    "contacts_info2": "Kliknite na ikonu kontaktu pre začatie chatu",
+    "contacts_info3": "Dvakrát kliknite na ikonu pre zobrazenie profilu",
+    "contacts_info4": "Každý z účastníkovv môže trvale zmazať históriu chatu",
+    "contacts_removeHistoryTitle": "Vymazať históriu chatu",
+    "contacts_confirmRemoveHistory": "Ste si istý že chcete natrvalo odstrániť históriu chatu? Dáta nemôžu byť obnovené",
+    "contacts_removeHistoryServerError": "Pri odstraňovaní histórie nastala chyba. Skúste to neskôr",
+    "contacts_fetchHistory": "Načítať staršiu históriu",
+    "contacts_rooms": "Miestnosti",
+    "contacts_leaveRoom": "Opustiť miestnosť",
+    "fm_rootName": "Drive",
+    "fm_trashName": "Kôš",
+    "fm_filesDataName": "Všetky súbory",
+    "fm_templateName": "Šablóny",
+    "fm_ownedPadsName": "Vlastné",
+    "fm_tagsName": "Štítky",
+    "fm_sharedFolderName": "Zdieľaný priečinok",
+    "fm_searchPlaceholder": "Vyhľadávanie...",
+    "fm_newButton": "Nový",
+    "fm_newFolder": "Nový priečinok",
+    "fm_newFile": "Nový dokument",
+    "ui_more": "Viac",
+    "fm_folder": "Zložka",
+    "fm_sharedFolder": "Zdielaná zložka",
+    "fm_folderName": "Názov zložky",
+    "fm_numberOfFolders": "# zložiek",
+    "fm_numberOfFiles": "# súborov",
+    "fm_fileName": "Názov súboru",
+    "fm_type": "Typ",
+    "fm_lastAccess": "Posledný prístup",
+    "fm_creation": "Vytvorené",
+    "fm_forbidden": "Zakázaná akcia",
+    "fm_originalPath": "Pôvodná cesta",
+    "fm_openParent": "Zobraziť v priečinku",
+    "fm_noname": "Dokument bez názvu",
+    "kanban_newBoard": "Nový stĺpec",
+    "canvas_saveToDrive": "Uložiť obrázok ako súbor v CryptDrive",
+    "contacts_added": "Žiadosť o kontakt prijatá.",
+    "contacts_confirmRemove": "Ste si istý, že chcete odstrániť <em>{0}</em>z kontaktov?",
+    "poll_removeUser": "Ste si istý, že chcete odstrániť tohto používateľa?",
+    "fm_emptyTrashDialog": "Naozaj chcete vyprázdniť kôš?",
+    "poll_optionPlaceholder": "Možnosť",
+    "oo_reconnect": "Pripojenie k serveru je obnovené. Kliknite OK pre obnovenie stránky a pokračovanie v úpravách.",
+    "profile_uploadTypeError": "Chyba: formát vašeho avatara nie je povolený. Povolené formáty sú: {0}",
+    "poll_descriptionHint": "Popíšte svoju anketu a použite tlačidlo ✓ (publikovať).\nPopis sa dá napísať iba pomocou syntaxe markdown, môžete tiež vložiť médiá zo svojho CryptDrive.\nKtokoľvek s odkazom môže popis zmeniť, ale to neodporúčame.",
+    "poll_comment_disabled": "Zverejnite anketu pomocou tlačidla ✓ aby boli povolené komentáre.",
+    "fm_searchName": "Hľadať",
+    "fm_removeSeveralPermanentlyDialog": "Ste si istý, že chcete odstrániť tieto súbory z vášho disku? Ostanú v diskoch ostatných používateľov, ktorý si ich uložili.",
+    "contacts_warning": "Všetko čo sem napíšete, je trvalé a dostupné všetkým súčasným aj budúcim používateľom tohto dokumentu. Buďte opatrní pri nakladaní s citlivými informáciami!",
+    "contacts_online": "Ďalší používateľ z tejto miestnosti je online",
+    "fm_recentPadsName": "Nedávne",
+    "fm_newButtonTitle": "Vytvorte nový dokument alebo priečinok, importujte súbor do aktuálneho priečinku.",
+    "fm_removePermanentlyDialog": "Ste si istý, že chcete odstrániť túto položku zo svojho disku? Položka ostane na diskoch používateľov ktorý si ho uložili.",
+    "fm_deleteOwnedPad": "Určite chcete natrvalo odstrániť tento dokument?",
+    "fm_deleteOwnedPads": "Určite chcete natrvalo odstrániť tieto dokumenty?",
+    "fm_restoreDialog": "Chcete obnoviť {0} na pôvodné miesto?",
+    "fm_unknownFolderError": "Vybraný alebo naposledy navštívený priečinok už neexistuje. Otváram nadradený priečinok...",
+    "fm_contextMenuError": "Nepodarilo sa otvoriť kontextové menu pre tento prvok. Ak problém pretrváva, skúste obnoviť stránku.",
+    "fm_selectError": "Nepodarilo sa vybrať zvolený prvok. Ak problém pretrváva, skúste stránku znova načítať.",
+    "fm_categoryError": "Nepodarilo sa otvoriť zvolenú kategóriu, zobrazuje sa koreňový adresár.",
+    "fm_info_root": "Môžete vytvoriť ľubovolné množstvo podpriečinkov pre triedenie súborov.",
+    "fm_info_template": "Tieto dokumenty sú uložené ako šablóny. Môžu sa znova použiť pri vytváraní nových dokumentov.",
+    "fm_info_recent": "Tieto dokumenty boli nedávno upravené alebo otvorené vami alebo ľuďmi, s ktorými spolupracujete.",
+    "fm_info_trash": "Vyprázdnite kôš pre uvoľnenie miesta na CryptDrive."
 }

From a9453a45f8a568241d451d123fb5bfe404d31ef9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 7 Mar 2025 17:17:12 +0100
Subject: [PATCH 084/114] Fix kanban header

---
 www/kanban/app-kanban.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 87581aa9c..c6e4062c0 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -376,6 +376,7 @@
             }
         }
         header {
+            display: flex;
             flex-wrap: wrap;
             align-items: center;
             padding: 5px 10px;

From 94f0765058613ec975c1f3f96d24fbd1b4f859d1 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 10 Mar 2025 10:50:06 +0100
Subject: [PATCH 085/114] Removed un-trash functionality

---
 www/common/common-ui-elements.js |  4 +---
 www/common/drive-ui.js           |  4 ++--
 www/common/outer/async-store.js  | 18 +-----------------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 17ecfc4f1..bc9ca1b3d 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -594,7 +594,6 @@ define([
         let $icon = $button.find('> i');
 
         let attributes = {};
-        let style = {};
         let btnClass = $button.attr('class');
         let btnId = $button.attr('id');
         let btnTitle = $button.attr('title');
@@ -606,7 +605,6 @@ define([
         return UIElements.createDropdownEntry({
             tag: 'a',
             attributes: attributes,
-            style: style,
             content: [
                 h('i',{ 'class': $icon.attr('class') }),
                 h('span', $button.text())
@@ -3352,7 +3350,7 @@ define([
         if (data && data.stored) {
             if (!data.inMyDrive) {
                 $('.cp-toolbar-storeindrive').show();
-            } 
+            }
             return;
         }
         var priv = common.getMetadataMgr().getPrivateData();
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 65fd07628..d7577c78b 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -5094,9 +5094,9 @@ define([
                 sframeChan.query('Q_STORE_IN_TEAM', {
                     href: data.href || data.rohref,
                     password: data.password,
+                    path: paths[0].path[0] === 'template' ? ['template'] : undefined,
                     title: data.title || '',
-                    teamId: -1,
-                    path: paths[0].path[0] === 'template' ? ['template'] : undefined
+                    teamId: -1
                 }, function (err) {
                     if (err) { return void console.error(err); }
                 });
diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index e4ca55a85..9a865c030 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1198,8 +1198,7 @@ define([
             // If it is stored, update its data, otherwise ask the user if they want to store it
             var allData = [];
             var sendTo = [];
-            var inTargetDrive, inMyDrive, inTrash;
-            var path = [];
+            var inTargetDrive, inMyDrive;
             getAllStores().forEach(function (s) {
                 // If this is an edit link but we don't have edit rights, this entry is not useful
                 if (h.mode === "edit" && s.id && !s.secondaryKey) {
@@ -1221,20 +1220,7 @@ define([
                 if (!s.id) { inMyDrive = res.length; }
 
                 Array.prototype.push.apply(allData, res);
-
-                if (res && res[0]) {
-                    var elementPath = store.manager.user.userObject.findFile(res[0].id)[0];
-                    if (elementPath) {
-                        path.push(elementPath);
-                    }
-                }    
-
             });
-
-            if (path[0]) {
-                inTrash = (path[0][0] === 'trash' && path[0].length === 4) ? true : false;
-            }
-
             var contains = allData.length !== 0;
             if (store.offline && !contains) {
                 return void cb({ error: 'OFFLINE' });
@@ -1300,8 +1286,6 @@ define([
                     });
                     return;
                 }
-            } else if (inTrash) {
-                store.manager.user.userObject.restore(path[0]);
             }
 
             sendTo.forEach(function (teamId) {

From f34267eee7e5bf8cf93c7d4d4ccebefff380d8d5 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 10 Mar 2025 11:01:46 +0100
Subject: [PATCH 086/114] Newline

---
 www/common/outer/async-store.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 9a865c030..5b7bb5503 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1253,6 +1253,7 @@ define([
                 }
                 obj.userObject.setHref(channel, null, href);
             });
+            
             // Add the pad if it does not exist in our drive
             if (!contains || (data.forceSave && !inTargetDrive)) {
                 var autoStore = Util.find(store.proxy, ['settings', 'general', 'autostore']);

From 9cc11d5eb7f5baeffb0103046fdb90e77d4e7b71 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 10 Mar 2025 10:59:38 +0100
Subject: [PATCH 087/114] Fix arrow order in DOM

---
 www/kanban/app-kanban.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index c6e4062c0..760b079fb 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -172,7 +172,6 @@
 
     .kanban-edit-item, .cp-kanban-arrow {
         border: 0;
-        float: right;
         background: transparent;
         align-self: flex-start;
         outline-style: none;

From 2d721d40bb1edcb25c4c6e08e352c787a2ce93ea Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 10 Mar 2025 13:52:43 +0100
Subject: [PATCH 088/114] Fixed new item input box spacing

---
 www/kanban/app-kanban.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 760b079fb..937d46608 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -318,7 +318,7 @@
                 font-size: 12px;
             }
         }
-        .kanban-item-text-container {
+        .kanban-item-text-container, .kanban-item-text {
             width: 100%;
             .tools_unselectable();
             cursor: text;

From 7f6956e267a0d3a979748987e74871af6c404825 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 10 Mar 2025 14:14:57 +0100
Subject: [PATCH 089/114] Fixed focus outline color

---
 www/form/app-form.less | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index e977c73d8..35801c18c 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -215,7 +215,10 @@
                     border: none;
                     border-radius: @variables_radius 0px 0px @variables_radius;
                     background-color: @cp_form-bg1;
-                    color: @cryptpad_text_col; 
+                    color: @cryptpad_text_col;
+                    &:focus-visible {
+                        outline: @variables_focus_style;
+                    }
                     &.cp-toggle-active {
                         color: @cp_form-bg1;
                         background-color: @cryptpad_text_col;
@@ -406,6 +409,9 @@
                             background-color: transparent;
                             border: none;
                             color: @cryptpad_text_col;
+                            &:focus-visible {
+                                outline: @variables_focus_style;
+                            }
                         }
                     }
                     .fa-ellipsis-h {

From 813029353f1a87e6b4cbd6eceba055b66ca67d7e Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Mar 2025 18:39:39 +0100
Subject: [PATCH 090/114] Disable tippy on move up/down buttons

---
 www/form/inner.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/form/inner.js b/www/form/inner.js
index 93bf582fc..1511342d1 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4022,10 +4022,12 @@ define([
             if (editable) {
                 // Arrows 
                 var upButton = h('button.cp-form-arrow', {
+                    'data-notippy':1,
                     'title': Messages.moveItemUp,
                     'aria-label': Messages.moveItemUp
                 }, [h('i.fa.fa-arrow-up',  {'aria-hidden': true})]);
                 var downButton = h('button.cp-form-arrow', {
+                    'data-notippy':1,
                     'title': Messages.moveItemDown,
                     'aria-label': Messages.moveItemDown
                 }, [h('i.fa.fa-arrow-down', {'aria-hidden': true})]);

From f843e96914152aa5ab6c2a9f9b132267b191a978 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 10 Mar 2025 18:42:29 +0100
Subject: [PATCH 091/114] Disable tippy on move up/down buttons

---
 www/kanban/inner.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index 4ed0789a1..fccf5bc6d 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -625,6 +625,7 @@ define([
                 var arrowContainerItem = h('div.item-arrow-container');
                 $(arrowContainerItem).appendTo((el));
                 $(h('button', {
+                    'data-notippy':1,
                     'class': 'cp-kanban-arrow item-arrow',
                     'title': Messages.moveItemLeft,
                     'aria-label': Messages.moveItemLeft
@@ -636,6 +637,7 @@ define([
                 var centralArrowContainerItem = h('div.item-central-arrow-container');
                 $(centralArrowContainerItem).appendTo(arrowContainerItem);
                 $(h('button', {
+                    'data-notippy':1,
                     'class': 'cp-kanban-arrow item-arrow',
                     'title': Messages.moveItemDown,
                     'aria-label': Messages.moveItemDown
@@ -645,6 +647,7 @@ define([
                     shiftItem('down', el);
                 }).appendTo(centralArrowContainerItem);
                 $(h('button', {
+                    'data-notippy':1,
                     'class': 'cp-kanban-arrow item-arrow',
                     'title': Messages.moveItemUp,
                     'aria-label': Messages.moveItemUp
@@ -654,6 +657,7 @@ define([
                     shiftItem('up', el);
                 }).appendTo(centralArrowContainerItem);
                 $(h('button', {
+                    'data-notippy':1,
                     'class': 'cp-kanban-arrow item-arrow',
                     'title': Messages.moveItemRight,
                     'aria-label': Messages.moveItemRight

From dae34203b6166c3b67514e10dc034c17f51e8756 Mon Sep 17 00:00:00 2001
From: mathilde-cryptpad <156299270+mathilde-cryptpad@users.noreply.github.com>
Date: Tue, 11 Mar 2025 08:47:23 +0100
Subject: [PATCH 092/114] remove OCSP Stapling support as it's now deprecated
 by Let's Encrypt for security reasons

---
 docs/example-advanced.nginx.conf | 10 ----------
 docs/example.nginx.conf          | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/docs/example-advanced.nginx.conf b/docs/example-advanced.nginx.conf
index 64e226bcc..e9458dbab 100644
--- a/docs/example-advanced.nginx.conf
+++ b/docs/example-advanced.nginx.conf
@@ -89,16 +89,6 @@ server {
     # HSTS (ngx_http_headers_module is required) (63072000 seconds)
     add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
 
-    # OCSP stapling
-    ssl_stapling on;
-    ssl_stapling_verify on;
-
-    # verify chain of trust of OCSP response using Root CA and Intermediate certs
-    ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;
-
-    # replace with the IP address of your resolver
-    resolver 8.8.8.8 8.8.4.4 1.1.1.1 1.0.0.1 9.9.9.9 149.112.112.112 208.67.222.222 208.67.220.220;
-
     # OnlyOffice fonts may be loaded from both domains
     if ($uri ~ ^/common/onlyoffice/.*/fonts/) { set $allowed_origins "*"; }
 
diff --git a/docs/example.nginx.conf b/docs/example.nginx.conf
index eae30310a..23ccf2182 100644
--- a/docs/example.nginx.conf
+++ b/docs/example.nginx.conf
@@ -65,16 +65,6 @@ server {
     # HSTS (ngx_http_headers_module is required) (63072000 seconds)
     add_header Strict-Transport-Security "max-age=63072000; includeSubDomains" always;
 
-    # OCSP stapling
-    ssl_stapling on;
-    ssl_stapling_verify on;
-
-    # verify chain of trust of OCSP response using Root CA and Intermediate certs
-    ssl_trusted_certificate /etc/ssl/certs/ca-certificates.crt;
-
-    # replace with the IP address of your resolver
-    resolver 8.8.8.8 8.8.4.4 1.1.1.1 1.0.0.1 9.9.9.9 149.112.112.112 208.67.222.222 208.67.220.220;
-
     location / {
         proxy_pass            http://localhost:3000;
         proxy_set_header      X-Real-IP $remote_addr;

From b70225328e500522f7d78071e37596f28220524c Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 11 Mar 2025 11:38:09 +0200
Subject: [PATCH 093/114] add outline to buttons

---
 www/kanban/app-kanban.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index 937d46608..a3e64e46b 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -553,6 +553,9 @@
                 &:last-child {
                     border-radius: 0px @variables_radius @variables_radius 0px;
                 }
+                &:focus-visible {
+                    outline: @variables_focus_style;
+                }
             }
         }
     }

From 3498ae555478dbeb96ac576b92d30d3938fac09d Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 11 Mar 2025 12:01:56 +0200
Subject: [PATCH 094/114] remove `aria-hidden`

---
 www/kanban/inner.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index fccf5bc6d..075ba04ae 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1204,9 +1204,9 @@ define([
 
             var toggleOffclass = 'ontouchstart' in window ? 'cp-toggle-active' : 'cp-toggle-inactive'; 
             var toggleOnclass = 'ontouchstart' in window ? 'cp-toggle-inactive' : 'cp-toggle-active'; 
-            var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows, 'tabindex': 0});
-            var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag, 'tabindex': 0});
-            kanban.drag = 'ontouchstart' in window ? false : true
+            var toggleDragOff = h(`button#toggle-drag-off.cp-kanban-view-drag.${toggleOffclass}.fa.fa-arrows`, {'title': Messages.toggleArrows, 'tabindex': 0});
+            var toggleDragOn = h(`button#toggle-drag-on.cp-kanban-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'title': Messages.toggleDrag, 'tabindex': 0});
+            kanban.drag = 'ontouchstart' in window ? false : true;
             const updateDrag = state => {
                 return function () {
                     $(toggleDragOn).toggleClass('cp-toggle-active', state).toggleClass('cp-toggle-inactive', !state);

From 44e86da914cca154504384c764348f8d0d14740f Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 11 Mar 2025 12:09:51 +0200
Subject: [PATCH 095/114] remove `aria-hidden` + add missing semi-colon

---
 www/form/inner.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/form/inner.js b/www/form/inner.js
index 1511342d1..18add5e38 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3774,7 +3774,7 @@ define([
             }
         });
         $body.addClass('cp-form-palette-'+color);
-        var containerDragClass = ('ontouchstart' in window || APP.drag === false) ? ' cp-no-drag' : ''
+        var containerDragClass = ('ontouchstart' in window || APP.drag === false) ? ' cp-no-drag' : '';
         $container.attr('class', 'cp-form-creator-content'+(APP.isEditor? ' cp-form-iseditor': '')+ containerDragClass);
 
         if (APP.isClosed && content.answers.privateKey && !APP.isEditor && !APP.hasAnswered) {
@@ -5139,8 +5139,8 @@ define([
 
             var toggleOffclass = 'ontouchstart' in window ? 'cp-toggle-active' : undefined;
             var toggleOnclass = 'ontouchstart' in window ? undefined : 'cp-toggle-active';
-            var toggleDragOff = h(`button#cp-toggle-drag-off.cp-form-view-drag.${toggleOffclass}.fa.fa-arrows`, {'aria-hidden': true, 'title': Messages.toggleArrows, 'tabindex': 0});
-            var toggleDragOn = h(`button#cp-toggle-drag-on.cp-form-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'aria-hidden': true, 'title': Messages.toggleDrag, 'tabindex': 0});
+            var toggleDragOff = h(`button#cp-toggle-drag-off.cp-form-view-drag.${toggleOffclass}.fa.fa-arrows`, {'title': Messages.toggleArrows, 'tabindex': 0});
+            var toggleDragOn = h(`button#cp-toggle-drag-on.cp-form-view-drag.${toggleOnclass}.fa.fa-hand-o-up`, {'title': Messages.toggleDrag, 'tabindex': 0});
             const updateDrag = state => {
                 return function () {
                     var $container = $('.cp-form-creator-content');

From cee79bbf766809edd0f88fc61dbdda6b2efc7ac9 Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Tue, 11 Mar 2025 12:26:21 +0200
Subject: [PATCH 096/114] remove unnecessary focus from the board

---
 www/kanban/jkanban_cp.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/kanban/jkanban_cp.js b/www/kanban/jkanban_cp.js
index 7bb791d78..e835ea208 100644
--- a/www/kanban/jkanban_cp.js
+++ b/www/kanban/jkanban_cp.js
@@ -703,6 +703,7 @@ define([
             //content board
             var contentBoard = document.createElement('main');
             contentBoard.classList.add('kanban-drag');
+            contentBoard.setAttribute('tabindex', '-1');
             //add drag to array for dragula
             self.boardContainer.push(contentBoard);
             (board.item || []).forEach(function (itemkey) {

From b660b639c5a94f23c288704f3e6301d288251072 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 12 Mar 2025 12:02:12 +0100
Subject: [PATCH 097/114] Translated using Weblate (Chinese (Simplified Han
 script))

Currently translated at 100.0% (1787 of 1787 strings)

Co-authored-by: Subtext6676 <subtext6676@users.noreply.weblate.cryptpad.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/zh_Hans/
Translation: CryptPad/App
---
 www/common/translations/messages.zh.json | 70 ++++++++++++------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/www/common/translations/messages.zh.json b/www/common/translations/messages.zh.json
index b3775d2ae..6ce783f91 100644
--- a/www/common/translations/messages.zh.json
+++ b/www/common/translations/messages.zh.json
@@ -89,7 +89,7 @@
     "history_prev": "先前版本",
     "history_closeTitle": "关闭历史记录",
     "history_restoreTitle": "还原所选文档版本",
-    "history_restorePrompt": "您确定要用显示的版本替换文档的当前版本吗?",
+    "history_restorePrompt": "是否确定要用显示的版本替换文档的当前版本？",
     "history_restoreDone": "文档已还原",
     "poll_publish_button": "发布",
     "poll_create_user": "添加新用户",
@@ -99,7 +99,7 @@
     "poll_userPlaceholder": "您的名字",
     "poll_removeOption": "是否确定要移除此选项？",
     "poll_removeUser": "是否确定要移除此用户？",
-    "poll_descriptionHint": "請簡述這個調查目的，完成時使用「發佈鍵」。任何知道此調查連結者可以更改這裏的描述內容，但我們不鼓勵這麼做。.",
+    "poll_descriptionHint": "描述您的投票，并在完成后使用 ✓（发布）按钮。\n描述可以使用 Markdown 语法编写，您可以从 CryptDrive 嵌入媒体元素。\n任何拥有链接的人都可以更改描述，但不鼓励这样做。",
     "canvas_clear": "清除",
     "canvas_delete": "删除所选内容",
     "canvas_width": "宽度",
@@ -234,7 +234,7 @@
     "poll_comment_submit": "发送",
     "poll_comment_list": "评论",
     "poll_edit": "编辑",
-    "poll_remove": "删除",
+    "poll_remove": "移除",
     "kanban_done": "完成",
     "pad_mediatagPreview": "预览",
     "historyText": "历史",
@@ -255,29 +255,29 @@
     "fm_deleteOwnedPads": "您确定要永久销毁这些文档吗？",
     "fm_deleteOwnedPad": "您确定要永久销毁此文档吗？",
     "fm_sharedFolder": "共享文件夹",
-    "ui_more": "更多的",
+    "ui_more": "更多",
     "fm_sharedFolderName": "共享文件夹",
     "fm_tagsName": "标签",
     "fm_ownedPadsName": "拥有的",
     "fm_recentPadsName": "最近",
     "contacts_online": "此房间的另一位用户在线",
-    "contacts_leaveRoom": "离开这个房间",
+    "contacts_leaveRoom": "离开此房间",
     "contacts_rooms": "房间",
     "contacts_fetchHistory": "检索更早的历史记录",
-    "contacts_removeHistoryServerError": "删除您的聊天记录时出错。 稍后再试",
-    "contacts_confirmRemoveHistory": "您确定要永久删除您的聊天记录吗？ 数据无法恢复",
+    "contacts_removeHistoryServerError": "移除聊天记录时出错，请稍后重试",
+    "contacts_confirmRemoveHistory": "是否确定要永久移除您的聊天记录？数据无法恢复",
     "contacts_removeHistoryTitle": "清理聊天记录",
-    "contacts_info4": "任何一个参与者都可以永久清除聊天记录",
-    "contacts_info3": "双击他们的图标以查看他们的个人资料",
-    "contacts_info2": "点击联系人的图标与他们聊天",
+    "contacts_info4": "任一参与者均可永久清除聊天记录",
+    "contacts_info3": "双击联系人图标查看其个人资料",
+    "contacts_info2": "点击联系人图标与其聊天",
     "contacts_info1": "这些是您的联系人。从这里，您可以：",
     "contacts_padTitle": "聊天",
-    "contacts_warning": "您在此处键入的所有内容都是持久存在的，可供本文档的所有现有和未来用户使用。 小心敏感信息！",
-    "contacts_typeHere": "在此处输入消息...",
-    "contacts_confirmRemove": "确定要从联系人中删除 <em>{0}</em> 吗？",
-    "contacts_remove": "删除此联系人",
+    "contacts_warning": "您在此输入的所有内容都将持续存在，本文档的所有现有用户及未来用户都可访问。请注意敏感信息！",
+    "contacts_typeHere": "在此处输入消息…",
+    "contacts_confirmRemove": "是否确定要从您的联系人移除 <em>{0}</em>？",
+    "contacts_remove": "移除此联系人",
     "contacts_send": "发送",
-    "contacts_request": "<em>{0}</em> 想将您添加为联系人。 <b>要接受吗</b>？",
+    "contacts_request": "<em>{0}</em> 想将您添加为联系人。<b>接受吗</b>？",
     "contacts_rejected": "联系人邀请被拒绝",
     "contacts_added": "联系人已接受邀请。",
     "contacts_title": "联系人",
@@ -285,34 +285,34 @@
     "profile_viewMyProfile": "查看我的个人资料",
     "profile_register": "您必须注册才能创建个人资料！",
     "profile_error": "创建您的个人资料时出错：{0}",
-    "profile_uploadTypeError": "错误：您的头像类型不被允许。 允许的类型是：{0}",
+    "profile_uploadTypeError": "错误：不允许您的头像类型。允许的类型为：{0}",
     "profile_uploadSizeError": "错误：您的头像必须小于 {0}",
     "profile_upload": " 上传新头像",
     "profileButton": "个人资料",
     "canvas_currentBrush": "当前画笔",
-    "canvas_imageEmbed": "从您的计算机中嵌入图像",
-    "canvas_saveToDrive": "将此图像另存为 CryptDrive 中的文档",
+    "canvas_imageEmbed": "从您的计算机嵌入图片",
+    "canvas_saveToDrive": "将此图片保存为 CryptDrive 中的文件",
     "canvas_widthLabel": "宽度：{0}",
     "canvas_opacityLabel": "不透明度：{0}",
     "oo_uploaded": "上传已完成。点击确定重新加载页面或点击取消以只读模式继续。",
     "oo_cantUpload": "其他用户在场时不允许上传。",
-    "oo_reconnect": "服务器连接已恢复，点击“确定”重新加载并继续编辑。",
+    "oo_reconnect": "服务器连接已恢复，点击确定重新加载并继续编辑。",
     "poll_comment_disabled": "使用 ✓ 按钮发布此投票以启用评论。",
     "poll_comment_placeholder": "您的评论",
     "poll_comment_remove": "删除此评论",
     "poll_comment_add": "添加评论",
-    "poll_total": "全部的",
+    "poll_total": "总计",
     "poll_bookmarked_col": "这是您的书签专栏。它将始终为您解锁并在开始时显示。",
     "poll_bookmark_col": "将此列添加为书签，以便它始终解锁并在开始时为您显示",
-    "poll_unlocked": "解锁",
-    "poll_locked": "锁定",
+    "poll_unlocked": "已解锁",
+    "poll_locked": "已锁定",
     "kanban_addBoard": "添加面板",
     "kanban_working": "进行中",
     "kanban_todo": "待办事项",
     "kanban_item": "项目 {0}",
     "kanban_newBoard": "新面板",
-    "pad_mediatagOptions": "图像属性",
-    "pad_mediatagImport": "保存到您的 CryptDrive 中",
+    "pad_mediatagOptions": "图片属性",
+    "pad_mediatagImport": "保存在您的 CryptDrive 中",
     "pad_mediatagBorder": "边框宽度（像素）",
     "pad_mediatagRatio": "保持比例",
     "pad_mediatagHeight": "高度（像素）",
@@ -460,9 +460,9 @@
     "settings_exportErrorDescription": "我们无法将以下文档添加到导出文档中：",
     "settings_exportError": "查看错误",
     "settings_export_done": "您的下载已准备就绪！",
-    "settings_export_compressing": "压缩数据...",
-    "settings_export_download": "正在下载和解密您的文档...",
-    "settings_export_reading": "正在读取您的 CryptDrive...",
+    "settings_export_compressing": "正在压缩数据…",
+    "settings_export_download": "正在下载和解密您的文档…",
+    "settings_export_reading": "正在读取您的 CryptDrive…",
     "settings_exportCancel": "您确定要取消导出吗？ 下次您将不得不从头开始。",
     "settings_exportWarning": "注意：此工具仍处于公测版本，可能存在可扩展性问题。为了获得更好的性能，建议让此选项卡保持焦点。",
     "settings_exportFailed": "如果文档需要 1 分钟以上的时间才能下载，则它不会包含在导出文档中。 将显示一个指向尚未导出的文档链接。",
@@ -530,7 +530,7 @@
     "autostore_notstored": "{0}不在您的 CryptDrive 里。您要继续保存吗？",
     "autostore_pad": "pad",
     "autostore_sf": "文件夹",
-    "autostore_file": "文档",
+    "autostore_file": "文件",
     "chrome68": "您似乎在使用 Chrome 或者 Chromium 68 版本。这个版本的错误会导致页面变白或者失去响应。碰到这个问题的时候，您可以切换到其他标签页然后再切回来，或者滚动页面。这个问题会在浏览器未来的版本中修复。",
     "convertFolderToSF_confirm": "这个目录必须要转成共享目录才能被其他用户访问，继续？",
     "convertFolderToSF_SFChildren": "已经在共享目录里面的目录不能再次被共享。可以将目录移到其他地方继续。",
@@ -627,7 +627,7 @@
     "notification_padShared": "{0} 与您共享了一个文档：<b>{1}</b>",
     "isNotContact": "{0}<b>不是</b>您的联系人",
     "isContact": "{0} 是您的联系人之一",
-    "profile_friendRequestSent": "联系请求待处理...",
+    "profile_friendRequestSent": "联系请求待处理…",
     "profile_info": "其他用户可以通过您在文档用户列表中的头像找到您的个人资料。",
     "profile_addLink": "添加指向您网站的链接",
     "notifications_empty": "没有可用的通知",
@@ -843,7 +843,7 @@
     "properties_changePassword": "改变密码",
     "properties_addPassword": "添加一个密码",
     "password_submit": "递交",
-    "password_placeholder": "在此处输入密码...",
+    "password_placeholder": "在此处输入密码…",
     "password_error": "找不到文档<br>此错误可能由两个因素引起：密码无效或文档已被破坏。",
     "password_info": "您尝试打开的文档不再存在或受新密码保护。 输入正确的密码以访问内容。",
     "creation_newPadModalDescription": "单击一个应用进程以创建一个新文档。 您也可以按 <b>Tab</b> 选择应用进程，然后按 <b>Enter</b> 确认。",
@@ -851,7 +851,7 @@
     "creation_expiration": "销毁日期",
     "creation_noOwner": "没有拥有者",
     "creation_owners": "拥有者",
-    "creation_create": "新建",
+    "creation_create": "创建",
     "creation_newTemplate": "新模板",
     "creation_noTemplate": "空白文档",
     "creation_password": "密码\n",
@@ -935,9 +935,9 @@
     "support_languagesPreamble": "支持团队使用以下语言：",
     "slide_textCol": "文本颜色",
     "slide_backCol": "背景颜色",
-    "toolbar_file": "文档",
+    "toolbar_file": "文件",
     "code_editorTheme": "编辑器主题",
-    "drive_treeButton": "文档",
+    "drive_treeButton": "文件",
     "toolbar_tools": "工具",
     "toolbar_savetodrive": "另存为图像",
     "toolbar_insert": "插入",
@@ -1028,7 +1028,7 @@
     "premiumAccess": "作为 {0} 的订阅者，您可以在此抢先体验应用进程中创建新文档。 请注意，它是实验性的，不应信任重要数据。",
     "earlyAccessBlocked": "此应用进程在此实例上尚不可用",
     "premiumOnly": "在此应用进程中创建新文档目前仅限于 {0} 上的订阅者。 这是一个用于测试目的的早期访问实验应用进程。 它很快就会在 {0} 上提供给所有人。",
-    "download_step3": "转换...",
+    "download_step3": "正在转换…",
     "fc_openIn": "在{0}打开",
     "creation_new": "新{0}",
     "form_conditional_hint": "要使此部分有条件，请在其上方添加选择或复选框问题",
@@ -1365,7 +1365,7 @@
     "error_unhelpfulScriptError": "脚本错误：有关详细信息，请参阅浏览器控制台",
     "tag_edit": "编辑",
     "tag_add": "添加",
-    "loading_state_5": "重建文档",
+    "loading_state_5": "重构文档",
     "loading_state_4": "加载团队",
     "loading_state_3": "加载共享文件夹",
     "loading_state_2": "更新内容",

From 00a4fbdbd970eaa23524a547027ae2ab9847ca3f Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Wed, 12 Mar 2025 12:02:12 +0100
Subject: [PATCH 098/114] Translated using Weblate (Italian)

Currently translated at 99.3% (1776 of 1787 strings)

Co-authored-by: Viki Halwick <vikihalwick@users.noreply.weblate.cryptpad.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/it/
Translation: CryptPad/App
---
 www/common/translations/messages.it.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/common/translations/messages.it.json b/www/common/translations/messages.it.json
index 9aab3c535..5eb8cda4f 100644
--- a/www/common/translations/messages.it.json
+++ b/www/common/translations/messages.it.json
@@ -1771,5 +1771,10 @@
     "admin_onboardingOptionsHint": "Scegli l’opzione appropriata per la tua istanza.<br> Queste configurazioni possono essere cambiate successivamente nel pannello di amministrazione.",
     "team_autoTrim": "Eliminazione della cronologia del drive del gruppo... Si prega di attendere.",
     "admin_mfa_confirm_enable": "Sei sicuro/a di voler attivare l'autenticazione a più fattori?",
-    "admin_mfa_confirm_disable": "Sei sicuro/a di voler disattivare l'autenticazione a più fattori?"
+    "admin_mfa_confirm_disable": "Sei sicuro/a di voler disattivare l'autenticazione a più fattori?",
+    "fm_restoreMultipleDialog": "Sei sicuro/a di voler ripristinare {0} file e/o cartelle nelle loro posizioni precedenti?",
+    "calendar_hide": "Nascondi i calendari",
+    "calendar_show": "Mostra i calendari",
+    "form_passwordWarning": "La password del modulo può essere impostata solo al momento della creazione e non può essere modificata in seguito.",
+    "admin_blockKey": "Chiave pubblica di blocco"
 }

From 0a9afb600368888b9bd753ef0f12907941a74c36 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Wed, 12 Mar 2025 16:59:14 +0100
Subject: [PATCH 099/114] Remove trailing whitespace

---
 www/common/outer/async-store.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js
index 5b7bb5503..2d1ac1a80 100644
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -1253,7 +1253,7 @@ define([
                 }
                 obj.userObject.setHref(channel, null, href);
             });
-            
+
             // Add the pad if it does not exist in our drive
             if (!contains || (data.forceSave && !inTargetDrive)) {
                 var autoStore = Util.find(store.proxy, ['settings', 'general', 'autostore']);

From ce4f77d6d4b4222e231f68bcfbce86bf16996371 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Mon, 10 Mar 2025 14:06:24 +0100
Subject: [PATCH 100/114] Fixed issue with toggle outline

---
 www/kanban/app-kanban.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index a3e64e46b..dd0d8ebc6 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -586,6 +586,9 @@
             }
         }
         button.cp-kanban-view-drag {
+            &:focus-visible {
+                outline: @variables_focus_style;
+            }
             &.cp-toggle-active {
                 background-color: @cp_kanban-fg;
                 color: @cp_app-bg !important;

From 6e003f2de49198058ddc84195fe6b3fe24842ce4 Mon Sep 17 00:00:00 2001
From: zuzanna-maria <zuzanna.ludzik@gmail.com>
Date: Wed, 12 Mar 2025 16:57:31 +0100
Subject: [PATCH 101/114] Removed redundant arrow padding

---
 www/kanban/app-kanban.less | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/www/kanban/app-kanban.less b/www/kanban/app-kanban.less
index dd0d8ebc6..c8fc5198f 100644
--- a/www/kanban/app-kanban.less
+++ b/www/kanban/app-kanban.less
@@ -189,9 +189,6 @@
         display: flex;
         width: 100%;
         justify-content: space-between;
-        .board-arrow {
-            padding: 0px;
-        }
     }
 
     .item-arrow-container { // Card arrows

From f5a02278e9a06cdd0f6ed87ef8a0ab2b498af588 Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Wed, 12 Mar 2025 17:09:26 +0000
Subject: [PATCH 102/114] Fix small gap above question type label

---
 www/form/app-form.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 35801c18c..46509e96c 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -400,7 +400,7 @@
                         justify-content: space-between;
                         max-width: fit-content;
                         margin-inline: auto;
-                        padding: 6px;
+                        padding: 5px;
                         margin-top: -35px;
                         border-radius: 0px @variables_radius 0px 0px;
                         display: flex !important;

From 2ab210eb193c9a87fd7417d4c3da2041b25b1f3b Mon Sep 17 00:00:00 2001
From: daria <dariae9@yahoo.com>
Date: Thu, 13 Mar 2025 16:01:00 +0200
Subject: [PATCH 103/114] add border radius to arrow buttons

---
 www/form/app-form.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index 46509e96c..c4fe74265 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -410,6 +410,7 @@
                             border: none;
                             color: @cryptpad_text_col;
                             &:focus-visible {
+                                border-radius: @variables_radius;
                                 outline: @variables_focus_style;
                             }
                         }

From 945d249eed1df1b2d8be00ee9ce0a1b26b94497f Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Fri, 14 Mar 2025 17:02:12 +0100
Subject: [PATCH 104/114] Translated using Weblate (Catalan)

Currently translated at 71.7% (1283 of 1787 strings)

Co-authored-by: Jaume Batlle Brugal <jaume.batlle@disroot.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/ca/
Translation: CryptPad/App
---
 www/common/translations/messages.ca.json | 55 +++++++++++++++++-------
 1 file changed, 40 insertions(+), 15 deletions(-)

diff --git a/www/common/translations/messages.ca.json b/www/common/translations/messages.ca.json
index ef795961f..46afc871e 100644
--- a/www/common/translations/messages.ca.json
+++ b/www/common/translations/messages.ca.json
@@ -658,7 +658,7 @@
     "form_cantFindAnswers": "No s'han pogut recuperar les respostes existents per a aquest formulari.",
     "calendar_errorNoCalendar": "No s'ha seleccionat cap calendari editable",
     "form_editor": "Editor",
-    "admin_setlimitTitle": "Aplica un límit personalitzat",
+    "admin_setlimitTitle": "Estableix un límit personalitzat",
     "broadcast_preview": "Previsualitza la notificació",
     "settings_deleteSubscription": "Gestiona la meva subscripció",
     "footer_roadmap": "Full de ruta",
@@ -690,7 +690,7 @@
     "settings_trimHistoryTitle": "Suprimeix l'historial",
     "form_notAnswered": "<b>{0}</b> respostes buides",
     "snapshots_delete": "Suprimeix",
-    "oo_version_latest": "Més tard",
+    "oo_version_latest": "Últim",
     "oo_version": "Versió: ",
     "mediatag_loadButton": "Carrega l'adjunt",
     "notification_fileShared": "{0} us ha compartit un fitxer: <b>{1}</b>",
@@ -814,7 +814,7 @@
     "crowdfunding_button": "Doneu suport al CryptPad",
     "settings_codeSpellcheckLabel": "Activa la verificació ortogràfica a l'editor de codi",
     "admin_activeSessionsTitle": "Connexions actives",
-    "admin_registeredTitle": "Usuaris registrats",
+    "admin_registeredTitle": "Unitats d'usuari i d'equip",
     "admin_updateLimitDone": "L'actualització s'ha completat correctament",
     "isNotContact": "{0} <b>no</b> és un dels vostres contactes",
     "teams_table_role": "Rol",
@@ -890,7 +890,7 @@
     "fm_restricted": "No teniu accés",
     "settings_kanbanTagsTitle": "Filtre d'etiquetes",
     "settings_kanbanTagsAnd": "AND",
-    "history_cantRestore": "Ha fallat la restauració. Està desconnectat.",
+    "history_cantRestore": "Ha fallat la restauració. Esteu desconnectat.",
     "history_fastPrev": "Sessió d'edició anterior",
     "history_userNext": "Autor següent",
     "snaphot_title": "Instantània",
@@ -976,7 +976,7 @@
     "calendar_nth_last": "últim",
     "admin_cat_support": "Assistència",
     "friendRequest_later": "Decideix més tard",
-    "history_restoreDrivePrompt": "Esteu segur que voleu substituir la versió actual de CryptDrive per la versió mostrada?",
+    "history_restoreDrivePrompt": "Segur que voleu substituir la versió actual de CryptDrive per la versió mostrada?",
     "owner_add": "{0} vol que sigueu propietari del document <b>{1}</b>. Ho accepteu?",
     "owner_team_add": "{0} vol que sigueu propietari/a de l'equip <b>{1}</b>. Accepteu?",
     "sent": "Missatge enviat",
@@ -992,7 +992,7 @@
     "friendRequest_declined": "<b>{0}</b> ha rebutjat la sol·licitud de contacte",
     "form_alreadyAnsweredMult": "Heu respost a aquest formulari el:",
     "form_responseNotification": "Respostes noves al formulari: <b>{0}</b>",
-    "snapshots_cantMake": "No s'ha pogut crear la instantània. Està desconnectat.",
+    "snapshots_cantMake": "No s'ha pogut crear la instantània. Esteu sense connexió.",
     "calendar_rec_no": "Una vegada",
     "admin_defaultlimitTitle": "Límit d'emmagatzematge (MB)",
     "calendar_rec_monthly_pick": "En dies",
@@ -1009,7 +1009,7 @@
     "admin_limitSetNote": "Nota",
     "admin_invalKey": "Clau pública no vàlida",
     "admin_invalLimit": "El valor límit no és vàlid",
-    "admin_cat_quota": "Emmagatzematge d'usuaris",
+    "admin_cat_quota": "Emmagatzematge d'usuari",
     "team_exportTitle": "Descarrega la unitat de l'equip",
     "form_condition_q": "Trieu una pregunta",
     "home_location": "Les dades xifrades estan allotjades a {0}",
@@ -1125,7 +1125,7 @@
     "adminPage": "Administració",
     "admin_activeSessionsHint": "Nombre de connexions websocket actives (i adreces IP úniques connectades)",
     "admin_activePadsHint": "Nombre de documents únics que s'estan visualitzant o editant actualment",
-    "admin_registeredHint": "Nombre d'usuaris registrats a la vostra instància",
+    "admin_registeredHint": "Nombre d'unitats actives a la vostra instància",
     "admin_updateLimitTitle": "Actualitzar les quotes d'usuari",
     "admin_updateLimitButton": "Actualitzar les quotes",
     "admin_flushCacheTitle": "Neteja la memòria cau HTTP",
@@ -1332,12 +1332,12 @@
     "settings_cat_kanban": "Kanban",
     "history_restore": "Restaura",
     "history_close": "Tanca",
-    "history_shareTitle": "Comparteix un enllaç a aquesta versió",
-    "share_versionHash": "Esteu a punt de compartir la versió seleccionada de l'historial del document en mode només de lectura. Això també farà que <b>doni accés a la vista</b> per a totes les versions del document.",
+    "history_shareTitle": "Compartiu un enllaç a aquesta versió",
+    "share_versionHash": "Esteu a punt de compartir la versió seleccionada de l'historial del document en mode només de lectura. Això també farà que <b>doneu accés de lectura</b> per a totes les versions del document.",
     "history_userPrev": "Autor anterior",
-    "history_fastNext": "Següent sessió d'edició",
+    "history_fastNext": "Sessió d'edició següent",
     "history_restoreDriveTitle": "Restaura la versió seleccionada del CryptDrive",
-    "snapshots_ooPickVersion": "Heu de seleccionar una versió abans de crear una instantània",
+    "snapshots_ooPickVersion": "Cal seleccionar una versió abans de crear una instantània",
     "snapshot_error_exists": "Ja hi ha una instantània d'aquesta versió",
     "snapshots_notFound": "Aquesta instantània ja no existeix perquè s'ha suprimit l'historial del document.",
     "admin_registrationHint": "Els visitants de la instància no poden crear comptes. Els administradors poden crear invitacions.",
@@ -1350,13 +1350,13 @@
     "team_exportButton": "Baixa",
     "admin_limitUser": "Clau pública de l'usuari",
     "fm_deletedFolder": "S'ha suprimit la carpeta",
-    "access_destroyPad": "Destrueix permanentment aquest document o carpeta",
+    "access_destroyPad": "Esborra permanentment aquest document o carpeta",
     "fm_shareFolderPassword": "Protegeix aquesta carpeta amb una contrasenya (opcional)",
     "loading_state_0": "Interfície de construcció",
     "loading_state_1": "Carrega la unitat",
     "loading_state_2": "Actualitza el contingut",
     "loading_state_3": "Carrega les carpetes compartides",
-    "loading_state_4": "Carrega els equips",
+    "loading_state_4": "Carrega equips",
     "loading_state_5": "Reconstrueix el document",
     "tag_add": "Afegeix",
     "tag_edit": "Edita",
@@ -1762,5 +1762,30 @@
     "support_userNotification": "Tiquet d'assistència o resposta nou: {0}",
     "install_instance": "Creeu el primer compte d'administrador, després personalitzeu la instància",
     "install_header": "Instal·lació",
-    "install_launch": "Configuració de la instància"
+    "install_launch": "Configuració de la instància",
+    "fm_restoreMultipleDialog": "Segur que voleu restablir {0} arxius o carpetes a les seves ubicacions anteriors?",
+    "calendar_show": "Mostra els calendaris",
+    "install_notes": "<ul class=\"cp-notes-list\">Creeu el primer compte d'administrador en aquesta pàgina. Els administradors editen la configuració de la instància, incloent-hi les quotes d'emmagatzematge, i tenen accés a les eines de moderació.</li><li>La vostra constrasenya és la clau secreta que encripta tots els vostres documents i privilegis d'administrador d'aquesta instància. <span class=\"red\">Si la perdeu, no hi ha manera de recuperar les vostres dades.</span></li><li>Si esteu utilitzant un ordinador compartit, <span class=\"red\">recordeu de tancar la sessió</span> quan hagueu acabat. El fet de simplement tancar la finestra del navegador deixa el vostre compte exposat.</li></ul>",
+    "admin_mfa_confirm_enable": "Esteu segur que voleu activar l'autentificació multi-factor?",
+    "form_passwordWarning": "Tingueu en compte que la constrasenya de formulari només es pot establir ara, el moment de creació, i que després no es pot canviar.",
+    "calendar_hide": "Amaga els calendaris",
+    "team_autoTrim": "S'està esborrant l'historial de la unitat d'equip.",
+    "admin_mfa_confirm_disable": "Esteu segur que voleu desactivar l'autentificació multi-factor?",
+    "support_recordedEmpty": "No hi ha cap fragment",
+    "support_recordedId": "Identificador únic de fragment",
+    "support_recordedTitle": "Fragments",
+    "support_insertRecorded": "Inseriu un fragment",
+    "install_token": "Token d'instal·lació",
+    "admin_appSelection": "Configuració de l'aplicació",
+    "admin_appsTitle": "Aplicacions de la instància",
+    "onboarding_save_error": "Algunes opcions no s'han pogut desar correctament. Visiteu el panell d'administrador per comprovar-ne els valors.",
+    "admin_appsHint": "Trieu quines aplicacions voleu habilitar per aquesta instància.",
+    "admin_cat_apps": "Aplicacions",
+    "onboarding_upload": "Trieu un logotip",
+    "admin_onboardingNameTitle": "Us donem la benvinguda a la vostra instància de CryptPad",
+    "admin_onboardingNameHint": "Trieu un títol, una descripció, un color de ressaltat i un logotip (tots son opcionals)",
+    "admin_onboardingOptionsTitle": "Paràmetres de la instància",
+    "admin_onboardingNamePlaceholder": "Títol de la instància",
+    "admin_onboardingDescPlaceholder": "Descripció de la instància",
+    "admin_onboardingOptionsHint": "Trieu la opció apropiada per la vostra instància.<br>Aquests paràmetres es poden canviar després des del panell d'administració."
 }

From 41997439a6b84c13abb59bb86f5bedf56ed11506 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 18 Mar 2025 15:46:32 +0100
Subject: [PATCH 105/114] Fix form arrows UI with long question type

---
 www/form/app-form.less | 74 +++++++++++++++++++++++++++---------------
 www/form/inner.js      | 15 +++++----
 2 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/www/form/app-form.less b/www/form/app-form.less
index c4fe74265..42f2c1bd7 100644
--- a/www/form/app-form.less
+++ b/www/form/app-form.less
@@ -133,6 +133,19 @@
         }
     }
 
+    .cp-form-iseditor {
+        .cp-form-block header {
+            display: flex !important;
+        }
+    }
+    .cp-form-creator-results {
+        .cp-form-block-type {
+            float: right;
+            margin-top: -10px;
+            margin-right: -10px;
+        }
+    }
+
     &.cp-form-readonly {
         .cp-form-creator-inline-add {
             display: none;
@@ -321,7 +334,6 @@
             div.cp-form-creator-content {
                 position: relative;
                 .cp-form-block-type {
-                    margin-top: -35px;
                     &.editable {
                         cursor: pointer;
                     }
@@ -396,27 +408,26 @@
                 flex-flow: column;
                 flex: 1 1 1000px;
                 &.cp-no-drag {
-                    .cp-form-block-arrows {
-                        justify-content: space-between;
-                        max-width: fit-content;
-                        margin-inline: auto;
-                        padding: 5px;
-                        margin-top: -35px;
-                        border-radius: 0px @variables_radius 0px 0px;
-                        display: flex !important;
-                        column-gap: 20px;
-                        .cp-form-arrow {
-                            background-color: transparent;
-                            border: none;
-                            color: @cryptpad_text_col;
-                            &:focus-visible {
-                                border-radius: @variables_radius;
-                                outline: @variables_focus_style;
+                    .cp-form-block {
+                        .cp-form-block-arrows {
+                            padding-left: 5px;
+                            border-radius: 0px @variables_radius 0px 0px;
+                            display: flex;
+                            column-gap: 10px;
+                            .cp-form-arrow {
+                                display: block;
+                                background-color: transparent;
+                                border: none;
+                                color: @cryptpad_text_col;
+                                &:focus-visible {
+                                    border-radius: @variables_radius;
+                                    outline: @variables_focus_style;
+                                }
                             }
                         }
-                    }
-                    .fa-ellipsis-h {
-                        display: none !important;
+                        .cp-form-block-drag-handle {
+                            display: none !important;
+                        }
                     }
                 }
 
@@ -610,6 +621,14 @@
                         margin-bottom: 20px;
                     }
 
+                    header {
+                        display: none;
+                        justify-content: space-between;
+                        margin-top: -10px;
+                        margin-left: -10px;
+                        margin-right: -10px;
+                    }
+
                     .cp-form-disabled {
                         .cp-form-poll-choice, .cp-form-type-sort {
                             cursor: not-allowed !important;
@@ -625,15 +644,16 @@
                     .cp-form-block-drag-handle {
                         display: flex;
                         flex-flow: column;
-                        height: 25px;
-                        align-items: center;
+                        width: 50px;
+                        justify-content: center;
+                        padding-left: 10px;
+                        font-size: 20px;
                         color: @cp_sidebar-hint;
                         i {
                             cursor: grab;
                             &:first-child {
                                 height: 3px;
-                                margin-top: -10px;
-                                margin-bottom: 1px;
+                                margin-bottom: 2px;
                             }
                         }
                     }
@@ -1016,10 +1036,10 @@
             }
         }
         .cp-form-block-type {
-            float: right;
+            //float: right;
             padding: 5px;
-            margin-top: -10px;
-            margin-right: -10px;
+            //margin-top: -10px;
+            //margin-right: -10px;
             border-radius: 0px @variables_radius 0px 0px;
             i { margin-right: 5px; }
             background: fade(@cryptpad_text_col, 10%);
diff --git a/www/form/inner.js b/www/form/inner.js
index 18add5e38..0f87f4f2c 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -4020,7 +4020,7 @@ define([
             var changeType;
             let shiftButtons;
             if (editable) {
-                // Arrows 
+                // Arrows
                 var upButton = h('button.cp-form-arrow', {
                     'data-notippy':1,
                     'title': Messages.moveItemUp,
@@ -4049,13 +4049,14 @@ define([
                 $(downButton).click(function () {
                     shiftBlock('down');
                 });
-                shiftButtons = h('div.cp-form-block-arrows', [ 
+                shiftButtons = h('div.cp-form-block-arrows', [
                     upButton,
                     downButton
                 ]);
 
+
                 // Drag handle
-                var dragEllipses = [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')]; 
+                var dragEllipses = [h('i.fa.fa-ellipsis-h'), h('i.fa.fa-ellipsis-h')];
                 dragHandle = h('span.cp-form-block-drag-handle', dragEllipses);
 
                 // Question
@@ -4300,9 +4301,11 @@ define([
                 'data-id':uid,
                 'data-type':type
             }, [
-                APP.isEditor ? dragHandle : undefined,
-                shiftButtons,
-                changeType,
+                h('header', [
+                    APP.isEditor ? dragHandle : undefined,
+                    shiftButtons,
+                    changeType
+                ]),
                 isStatic ? undefined : q,
                 h('div.cp-form-block-content', [
                     APP.isEditor && !isStatic ? requiredDiv : undefined,

From 2739636ad2c518350d4fe85e3e4ee0e815c6efd4 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 18 Mar 2025 16:08:50 +0100
Subject: [PATCH 106/114] Fix kanban buttons inconsistencies

---
 .../src/less2/include/colortheme-dark.less    |  7 ++++---
 .../src/less2/include/colortheme.less         |  7 ++++---
 customize.dist/src/less2/include/forms.less   | 21 +++++++++----------
 www/kanban/inner.js                           |  6 +++---
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/customize.dist/src/less2/include/colortheme-dark.less b/customize.dist/src/less2/include/colortheme-dark.less
index 1f5aee211..ed31b18b6 100644
--- a/customize.dist/src/less2/include/colortheme-dark.less
+++ b/customize.dist/src/less2/include/colortheme-dark.less
@@ -162,10 +162,11 @@
 // Buttons
 @cp_buttons-fg: @cryptpad_color_brand_300;
 @cp_buttons-hover: @cryptpad_color_brand_fadest;
-@cp_buttons-default: @cryptpad_color_grey_700;
 @cp_buttons-default-color: @cryptpad_text_col;
-@cp_buttons-default-alt-color: @cryptpad_color_grey_700;
-@cp_buttons-default-border: @cryptpad_text_col;
+@cp_buttons-default-bg: @cryptpad_text_col;
+@cp_buttons-default-fg: @cryptpad_color_grey_900;
+@cp_buttons-default-alt-bg: @cryptpad_color_grey_900;
+@cp_buttons-default-alt-fg: @cryptpad_text_col;
 @cp_buttons-red: #E55236;
 @cp_buttons-red-text: @cryptpad_color_light_red;
 @cp_buttons-red-color: #FFF;
diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less
index ece9f6fe0..316f1d06c 100644
--- a/customize.dist/src/less2/include/colortheme.less
+++ b/customize.dist/src/less2/include/colortheme.less
@@ -161,10 +161,11 @@
 // Buttons
 @cp_buttons-fg: @cryptpad_color_brand;
 @cp_buttons-hover: @cryptpad_color_brand_fadest;
-@cp_buttons-default: #CCC;
 @cp_buttons-default-color: @cryptpad_text_col;
-@cp_buttons-default-border: @cryptpad_text_col;
-@cp_buttons-default-alt-color: @cryptpad_color_grey_50;
+@cp_buttons-default-bg: @cryptpad_color_grey_200;
+@cp_buttons-default-fg: @cryptpad_text_col;
+@cp_buttons-default-alt-bg: @cryptpad_color_white;
+@cp_buttons-default-alt-fg: @cryptpad_text_col;
 @cp_buttons-red: #E55236;
 @cp_buttons-red-text: @cp_buttons-red;
 @cp_buttons-red-color: #FFF;
diff --git a/customize.dist/src/less2/include/forms.less b/customize.dist/src/less2/include/forms.less
index 745d24ab0..e2e96f4a3 100644
--- a/customize.dist/src/less2/include/forms.less
+++ b/customize.dist/src/less2/include/forms.less
@@ -191,22 +191,21 @@
         }
 
         &.btn-default {
-            border-color: @cp_buttons-default-border;
-            color: @cp_buttons-default-color;
+            background-color: @cp_buttons-default-bg;
+            color: @cp_buttons-default-fg;
+            border-color: @cp_buttons-default-bg;
             &:hover, &:not(:disabled):active, &:focus {
-                border-color: @cp_buttons-default-border;
-                color: @cp_buttons-default-color;
-                background-color: @cp_buttons-default;
+                background-color: fade(@cryptpad_text_col, 20%);
+                border-color: @cryptpad_text_col;
+                color: @cryptpad_text_col;
             }
         }
         &.btn-default-alt {
-            border-color: @cp_buttons-default-alt-color;
-            color: @cp_buttons-default-alt-color;
-            background-color: @cp_buttons-default-color;
+            border-color: @cp_buttons-default-alt-fg;
+            color: @cp_buttons-default-alt-fg;
+            background-color: @cp_buttons-default-alt-bg;
             &:hover, &:not(:disabled):active, &:focus {
-                border-color: @cp_buttons-default-color;
-                color: @cp_buttons-default-color;
-                background-color: @cp_toolbar-fade3;
+                background-color: fade(@cryptpad_text_col, 20%);
             }
         }
 
diff --git a/www/kanban/inner.js b/www/kanban/inner.js
index eeb953ae7..7f9fbdad4 100644
--- a/www/kanban/inner.js
+++ b/www/kanban/inner.js
@@ -1186,7 +1186,7 @@ define([
                 commitTags();
             });
 
-            let toggleTagsButton = h('button.btn.btn-default.cp-kanban-toggle-tags', [
+            let toggleTagsButton = h('button.btn.btn-default-alt.cp-kanban-toggle-tags', [
                 h('i.fa.fa-tags'),
                 h('span', Messages.fm_tagsName)
             ]);
@@ -1199,8 +1199,8 @@ define([
                 $tags.toggle();
                 let visible = $tags.is(':visible');
                 $(toggleContainer).toggleClass('cp-kanban-container-flex', !visible);
-                $toggleBtn.toggleClass('btn-default', visible);
-                $toggleBtn.toggleClass('btn-default-alt', !visible);
+                $toggleBtn.toggleClass('btn-default-alt', visible);
+                $toggleBtn.toggleClass('btn-default', !visible);
             };
             $toggleBtn.click(function() {
                 toggleClicked = true;

From 8f96735cc363a4ecd378047847decfefac1cee8f Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 18 Mar 2025 16:19:06 +0100
Subject: [PATCH 107/114] lint compliance

---
 www/diagram/util.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/www/diagram/util.js b/www/diagram/util.js
index b6cdf0067..d2c836c97 100644
--- a/www/diagram/util.js
+++ b/www/diagram/util.js
@@ -10,7 +10,6 @@ define([
     '/components/pako/dist/pako.min.js',
     '/common/common-hash.js',
     '/api/config',
-    'jquery',
 ], function (
     Util,
     FileCrypto,
@@ -19,7 +18,6 @@ define([
     pako,
     Hash,
     ApiConfig,
-    $,
 ) {
     const Nacl = window.nacl;
     const x2js = new X2JS();
@@ -82,11 +80,6 @@ define([
         }
     };
 
-    const xmlAsJsonContent = (xml) => {
-        var decompressedXml = decompressDrawioXml(xml);
-        return numbersToNumbers(x2js.xml2js(decompressedXml));
-    };
-
     // As described here: https://drawio-app.com/extracting-the-xml-from-mxfiles/
     const decompressDrawioXml = function(xmlDocStr) {
         var TEXT_NODE = 3;
@@ -122,6 +115,12 @@ define([
         return result;
     };
 
+    const xmlAsJsonContent = (xml) => {
+        var decompressedXml = decompressDrawioXml(xml);
+        return numbersToNumbers(x2js.xml2js(decompressedXml));
+    };
+
+
     const parseDrawioStyle = (styleAttrValue) => {
         if (!styleAttrValue) {
             return {};

From a74d96651a57bbe7cb76f1a927e3b2cd5c2550ad Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 19 Mar 2025 16:34:50 +0100
Subject: [PATCH 108/114] Fix Access-Control-Allow-Origin cache issue

---
 lib/http-worker.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/http-worker.js b/lib/http-worker.js
index dbbdb67e3..1b748a2e8 100644
--- a/lib/http-worker.js
+++ b/lib/http-worker.js
@@ -145,7 +145,7 @@ var cacheHeaders = function (Env, key, headers) {
 
 var getHeaders = function (Env, type) {
     var key = type + 'HeadersCache';
-    if (Env[key]) { return Env[key]; }
+    if (Env[key]) { return Util.clone(Env[key]); }
 
     var headers = Default.httpHeaders(Env);
 
@@ -165,7 +165,7 @@ var getHeaders = function (Env, type) {
     // when duplicated by NGINX in production environments
     if (type === 'api') { delete headers['Content-Security-Policy']; }
 
-    return headers;
+    return Util.clone(headers);
 };
 
 var setHeaders = function (req, res) {

From dfee32768ded36a350387fe08f03cbcec51a8b24 Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Thu, 20 Mar 2025 15:57:20 +0000
Subject: [PATCH 109/114] Adjust translation keys

---
 customize.dist/messages.js | 44 ++++++++++++++++----------------------
 www/admin/inner.js         |  6 +++---
 www/form/inner.js          |  2 +-
 www/settings/inner.js      |  2 +-
 4 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index d76c32eb8..d5a4d3cdf 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -136,41 +136,33 @@ define(req, function(AppConfig, Default, Language) {
 
     Messages.addItemBottom = 'Add item to bottom of the board'; // XXX or 'Add card..'
     Messages.addItemTop = 'Add item to top of the board'; // XXX or 'Add card..'
-
     Messages.admin_logoSize_error = "The logo size is too large"; // XXX
-    Messages.limit_error = "Please enter a valid number"; // XXX
-    Messages.positiveNumber_error = "Please enter a positive number"; // XXX
-    Messages.answerType_error = "Please select how to answer the form"; // XXX
-
+    Messages.error_limit = "Please enter a valid number"; // XXX
+    Messages.error_positiveNumber = "Please enter a positive number"; // XXX
+    Messages.form_answerType_error = "Please select how to answer the form"; // XXX
     Messages.moveItemLeft = 'Move item left'; // XXX
     Messages.moveItemRight = 'Move item right'; // XXX
     Messages.kanban_moveBoardLeft = 'Move board left'; // XXX
     Messages.kanban_moveBoardRight = 'Move board right'; // XXX
-
     Messages.moveItemUp = 'Move item up'; // XXX
     Messages.moveItemDown = 'Move item down'; // XXX
     Messages.toggleArrows = 'Switch to arrow view'; // XXX
     Messages.toggleDrag = 'Switch to drag view'; // XXX
-
-        // XXX
-        Messages.admin_cat_admins = "Administrators";
-        Messages.admin_admin = "Admin";
-        Messages.admin_listAdminsTitle = "Current administrators";
-        Messages.admin_listAdminsHint = "View and remove administrators";
-        Messages.admin_addAdminsTitle = "Add administrators";
-        Messages.admin_addAdminsHint = "Add administrators from their public key or from your contacts list";
-        Messages.admin_addAdminsAdd = "Promote a contact to admin";
-        Messages.admin_addKeyLabel = "Add an admin using their public key";
-        Messages.admin_errorAddKeyLabel = "Add a valid public key";
-        Messages.admin_errorAddAdmins = "Pick a contact to promote to admin";
-
-        Messages.admin_listName = "Admin name";
-        Messages.admin_listKey = "Admin key";
-        Messages.admin_listAction = "Remove admin rights";
-
-        Messages.admin_listHardcoded = "Admin added into config.js. Can only be removed by editing the config file.";
-        Messages.admin_listConfirm = "Are you sure you want to remove the admin rights of this user?";
-
+    Messages.admin_cat_admins = "Administrators";
+    Messages.admin_admin = "Admin";
+    Messages.admin_listAdminsTitle = "Current administrators";
+    Messages.admin_listAdminsHint = "View and remove administrators";
+    Messages.admin_addAdminsTitle = "Add administrators";
+    Messages.admin_addAdminsHint = "Add administrators from their public key or from your contacts list";
+    Messages.admin_addAdminsAdd = "Promote a contact to admin";
+    Messages.admin_addKeyLabel = "Add an admin using their public key";
+    Messages.admin_errorAddKeyLabel = "Add a valid public key";
+    Messages.admin_errorAddAdmins = "Pick a contact to promote to admin";
+    Messages.admin_listName = "Admin name";
+    Messages.admin_listKey = "Admin key";
+    Messages.admin_listAction = "Remove admin rights";
+    Messages.admin_listHardcoded = "Admin added into config.js. Can only be removed by editing the config file.";
+    Messages.admin_listConfirm = "Are you sure you want to remove the admin rights of this user?";
     Messages.fm_link_invalid = "Please provide a valid URL"; // XXX
     Messages.skipLink = "Skip to main content"; // XXX
 
diff --git a/www/admin/inner.js b/www/admin/inner.js
index 2da209bd5..60f9b6d65 100644
--- a/www/admin/inner.js
+++ b/www/admin/inner.js
@@ -1839,7 +1839,7 @@ define([
                 validate: function () {
                     var l = parseInt($(newLimit).val());
                     if (isNaN(l)) {
-                        return UI.warn(Messages.limit_error);
+                        return UI.warn(Messages.error_limit);
                     }
                     return true;
                 }
@@ -3916,14 +3916,14 @@ define([
                 validate: function () {
                     var l = parseInt($(newDuration).val());
                     if (isNaN(l)) {
-                        return void UI.warn(Messages.limit_error);
+                        return void UI.warn(Messages.error_limit);
                     }
                     return true;
                 }
             }, function () {
                 var d = parseInt($(newDuration).val());
                 if (!isPositiveInteger(d)) {
-                    return void UI.warn(Messages.positiveNumber_error);
+                    return void UI.warn(Messages.error_positiveNumber);
                 }
 
                 var data = [d];
diff --git a/www/form/inner.js b/www/form/inner.js
index 7c972d964..5543433ac 100644
--- a/www/form/inner.js
+++ b/www/form/inner.js
@@ -3565,7 +3565,7 @@ define([
         });
         var $send = $(send).click(function () {
             if (!$radio.find('input[type="radio"]:checked').length) {
-                return UI.warn(Messages.answerType_error);
+                return UI.warn(Messages.form_answerType_error);
             }
 
             var results = getFormResults();
diff --git a/www/settings/inner.js b/www/settings/inner.js
index b1419531e..f65d7a555 100644
--- a/www/settings/inner.js
+++ b/www/settings/inner.js
@@ -902,7 +902,7 @@ define([
 
         var todo = function () {
             var val = parseInt($input.val());
-            if (typeof(val) !== 'number' || isNaN(val)) { return UI.warn(Messages.limit_error); }
+            if (typeof(val) !== 'number' || isNaN(val)) { return UI.warn(Messages.error_limit); }
             if (val === oldVal) { return; }
             spinner.spin();
             common.setAttribute(['general', 'mediatag-size'], val, function (err) {

From eef0ca353d6c0f9454e1736a8ded1068b5edb5e4 Mon Sep 17 00:00:00 2001
From: Weblate <noreply@weblate.org>
Date: Thu, 20 Mar 2025 17:28:10 +0100
Subject: [PATCH 110/114] Translated using Weblate (English)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently translated at 100.0% (1817 of 1817 strings)

Co-authored-by: David Benqué <david.benque@xwiki.com>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/en/
Translation: CryptPad/App
---
 www/common/translations/messages.json | 36 ++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json
index fa940fb1f..1a97ce4c8 100644
--- a/www/common/translations/messages.json
+++ b/www/common/translations/messages.json
@@ -1154,7 +1154,7 @@
     "calendar_deleteConfirm": "Are you sure you want to delete this calendar from your account?",
     "calendar_deleteTeamConfirm": "Are you sure you want to delete this calendar from the team?",
     "calendar_deleteOwned": "It will remain visible to other users it has been shared with.",
-    "calendar_errorNoCalendar": "No editable calendar selected",
+    "calendar_errorNoCalendar": "No calendar available",
     "calendar_import": "Add to my calendars",
     "calendar_newEvent": "New event",
     "calendar_dateRange": "{0} - {1}",
@@ -1328,7 +1328,7 @@
     "form_anonName": "Your name",
     "form_answerAs": "Answer as",
     "fm_link_warning": "Warning: the URL exceeds 200 characters",
-    "fm_link_invalid": "Invalid URL",
+    "fm_link_invalid": "Please provide a valid URL",
     "ui_collapse": "Collapse",
     "ui_expand": "Expand",
     "form_totalResponses": "Total responses: {0}",
@@ -1787,5 +1787,35 @@
     "form_passwordWarning": "Please note that a Form password can only be set now at creation time and cannot be changed later.",
     "fm_restoreMultipleDialog": "Are you sure you want to restore {0} files and/or folders to their previous locations?",
     "calendar_show": "Show calendars",
-    "calendar_hide": "Hide calendars"
+    "calendar_hide": "Hide calendars",
+    "admin_logoSize_error": "The logo size is too large",
+    "admin_listAdminsHint": "View and remove administrators",
+    "error_limit": "Please enter a valid number",
+    "form_answerType_error": "Please select how to answer the form",
+    "admin_addKeyLabel": "Add an admin using their public key",
+    "error_positiveNumber": "Please enter a positive number",
+    "admin_cat_admins": "Administrators",
+    "admin_admin": "Admin",
+    "admin_listAdminsTitle": "Current administrators",
+    "admin_addAdminsAdd": "Promote a contact to admin",
+    "admin_addAdminsTitle": "Add administrators",
+    "admin_errorAddAdmins": "Pick a contact to promote to admin",
+    "admin_addAdminsHint": "Add administrators from their public key or from your contacts list",
+    "moveItemLeft": "Move item left",
+    "admin_errorAddKeyLabel": "Add a valid public key",
+    "skipLink": "Skip to main content",
+    "admin_listName": "Admin name",
+    "admin_listKey": "Admin key",
+    "moveItemRight": "Move item right",
+    "admin_listAction": "Remove admin rights",
+    "kanban_moveBoardRight": "Move board right",
+    "admin_listHardcoded": "Admin added into config.js. Can only be removed by editing the config file.",
+    "addItemBottom": "Add card to the bottom of the board",
+    "admin_listConfirm": "Are you sure you want to remove the admin rights of this user?",
+    "addItemTop": "Add card to the top of the board",
+    "kanban_moveBoardLeft": "Move board left",
+    "toggleDrag": "Drag to move items",
+    "moveItemUp": "Move item up",
+    "moveItemDown": "Move item down",
+    "toggleArrows": "Arrow buttons to move items"
 }

From 57ce0f9997d69998ca8a852cbdc846322b020361 Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Thu, 20 Mar 2025 16:45:01 +0000
Subject: [PATCH 111/114] REUSE compliance

---
 .reuse/dep5 | 163 -------------------------------------
 REUSE.toml  | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 226 insertions(+), 163 deletions(-)
 delete mode 100644 .reuse/dep5
 create mode 100644 REUSE.toml

diff --git a/.reuse/dep5 b/.reuse/dep5
deleted file mode 100644
index 227d0b182..000000000
--- a/.reuse/dep5
+++ /dev/null
@@ -1,163 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: CryptPad
-Upstream-Contact: XWiki <contact@cryptpad.org>
-Source: https://cryptpad.org
-
-# Sample paragraph, commented out:
-#
-# Files: src/*
-# Copyright: $YEAR $NAME <$CONTACT>
-# License: ...
-
-Files: *.png
-Copyright: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
-License: AGPL-3.0-or-later
-
-Files: *.json
-Copyright: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
-License: AGPL-3.0-or-later
-
-Files: .jshintignore
-Copyright: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
-License: AGPL-3.0-or-later
-
-Files: .jshintrc
-Copyright: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
-License: AGPL-3.0-or-later
-
-Files: .stylelintrc.js
-Copyright: 2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors
-License: AGPL-3.0-or-later
-
-Files: scripts/tests/test-data/*
-Copyright: 2024 XWiki CryptPad Team <contact@cryptpad.org> and contributors
-License: AGPL-3.0-or-later
-
-## Dependencies
-
-Files: www/common/theme/*
-Copyright: 2017 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
-License: MIT
-
-Files: www/lib/mermaid/*
-Copyright: (c) 2014 - 2021 Knut Sveidqvist
-License: MIT
-
-Files: www/lib/calendar/moment.min.js
-Copyright: (c) JS Foundation and other contributors
-License: MIT
-
-Files: www/lib/pdfjs/*
-Copyright: 2017 Mozilla Foundation
-License: Apache-2.0
-
-Files: www/lib/codemirror-extra-modes/asciidoc/*
-Copyright: (c) 2015, the Asciidoctor Project
-License: BSD-3-Clause
-
-Files: www/lib/datepicker/*
-Copyright: 2017 Gregory Petrosyan
-License: MIT
-
-Files: www/lib/diff-dom/*
-Copyright: Johannes Wilm, Fidus Writer
-License: LGPL-3.0-only
-
-Files: www/lib/fabric-history.min.js
-Copyright: 2008-2015 Printio (Juriy Zaytsev, Maxim Chernyak)
-License: MIT
-
-Files: www/lib/fabric.min.js
-Copyright: 2008-2015 Printio (Juriy Zaytsev, Maxim Chernyak)
-License: MIT
-
-Files: www/lib/pdfjs/*
-Copyright: 2012 Mozilla Foundation
-License: Apache-2.0
-
-Files: www/lib/qrcode.min.js
-Copyright: Sangmin Shim
-License: MIT
-
-Files: www/lib/rangy/rangy-core.min.js
-Copyright: 2015, Tim Down
-License: MIT
-
-Files: www/lib/textFit.min.js
-Copyright: 11/2014 by STRML (strml.github.com)
-License: MIT
-
-Files: www/lib/tippy/*
-Copyright: 2017 atomiks
-License: MIT
-
-Files: www/lib/turndown.browser.umd.js
-Copyright: 2017 Dom Christie
-License: MIT
-
-Files: www/lib/markmap/*
-Copyright: 2015 Jakub Dundalek
-License: MIT
-
-Files: www/pad/mathjax/*
-Copyright: 2009-2018 The MathJax Consortium
-License: Apache-2.0
-
-Files: www/pad/wordcount/*
-Copyright: Ingo Herbote
-License: MIT
-
-### same as CKEditor
-Files: www/pad/wysiwygarea-plugin.js
-Copyright: 2003-2017, CKSource - Frederico Knabben. All rights reserved
-License:  GPL-2.0-or-later
-
-Files: www/pad/icons/*
-Copyright: unknown
-License:  GPL-2.0-or-later
-
-## OnlyOffice
-
-Files: www/common/onlyoffice/AllFonts.js
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/fonts_thumbnail.png
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/fonts_thumbnail@2x.png
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/plugins.json
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/v1/*
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/v2b/*
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/v4/*
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/v5/*
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/v6/*
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/v7/*
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
-
-Files: www/common/onlyoffice/x2t/*
-Copyright: Ascensio System Limited 2010-2022
-License: AGPL-3.0-or-later
diff --git a/REUSE.toml b/REUSE.toml
new file mode 100644
index 000000000..721bafd70
--- /dev/null
+++ b/REUSE.toml
@@ -0,0 +1,226 @@
+version = 1
+SPDX-PackageName = "CryptPad"
+SPDX-PackageSupplier = "XWiki <contact@cryptpad.org>"
+SPDX-PackageDownloadLocation = "https://cryptpad.org"
+
+[[annotations]]
+path = "**.png"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "**.json"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = ".jshintignore"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = ".jshintrc"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = ".stylelintrc.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2023 XWiki CryptPad Team <contact@cryptpad.org> and contributors"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "scripts/tests/test-data/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2024 XWiki CryptPad Team <contact@cryptpad.org> and contributors"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/theme/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2017 by Marijn Haverbeke <marijn@haverbeke.berlin> and others"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/mermaid/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "(c) 2014 - 2021 Knut Sveidqvist"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/calendar/moment.min.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "(c) JS Foundation and other contributors"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/pdfjs/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2017 Mozilla Foundation"
+SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = "www/lib/codemirror-extra-modes/asciidoc/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "(c) 2015, the Asciidoctor Project"
+SPDX-License-Identifier = "BSD-3-Clause"
+
+[[annotations]]
+path = "www/lib/datepicker/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2017 Gregory Petrosyan"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/diff-dom/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Johannes Wilm, Fidus Writer"
+SPDX-License-Identifier = "LGPL-3.0-only"
+
+[[annotations]]
+path = "www/lib/fabric-history.min.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2008-2015 Printio (Juriy Zaytsev, Maxim Chernyak)"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/fabric.min.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2008-2015 Printio (Juriy Zaytsev, Maxim Chernyak)"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/pdfjs/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2012 Mozilla Foundation"
+SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = "www/lib/qrcode.min.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Sangmin Shim"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/rangy/rangy-core.min.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2015, Tim Down"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/textFit.min.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "11/2014 by STRML (strml.github.com)"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/tippy/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2017 atomiks"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/turndown.browser.umd.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2017 Dom Christie"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/lib/markmap/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2015 Jakub Dundalek"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/pad/mathjax/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2009-2018 The MathJax Consortium"
+SPDX-License-Identifier = "Apache-2.0"
+
+[[annotations]]
+path = "www/pad/wordcount/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ingo Herbote"
+SPDX-License-Identifier = "MIT"
+
+[[annotations]]
+path = "www/pad/wysiwygarea-plugin.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2003-2017, CKSource - Frederico Knabben. All rights reserved"
+SPDX-License-Identifier = "GPL-2.0-or-later"
+
+[[annotations]]
+path = "www/pad/icons/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "unknown"
+SPDX-License-Identifier = "GPL-2.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/AllFonts.js"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/fonts_thumbnail.png"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/fonts_thumbnail@2x.png"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/plugins.json"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/v1/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/v2b/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/v4/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/v5/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/v6/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/v7/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"
+
+[[annotations]]
+path = "www/common/onlyoffice/x2t/**"
+precedence = "aggregate"
+SPDX-FileCopyrightText = "Ascensio System Limited 2010-2022"
+SPDX-License-Identifier = "AGPL-3.0-or-later"

From 7c24d2789f575607335f8b846bf835ff0825209e Mon Sep 17 00:00:00 2001
From: David Benque <david@cryptpad.org>
Date: Thu, 20 Mar 2025 16:46:18 +0000
Subject: [PATCH 112/114] Remove hard-coded translations

---
 customize.dist/messages.js | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/customize.dist/messages.js b/customize.dist/messages.js
index d5a4d3cdf..a28190005 100755
--- a/customize.dist/messages.js
+++ b/customize.dist/messages.js
@@ -134,37 +134,7 @@ define(req, function(AppConfig, Default, Language) {
         }
     };
 
-    Messages.addItemBottom = 'Add item to bottom of the board'; // XXX or 'Add card..'
-    Messages.addItemTop = 'Add item to top of the board'; // XXX or 'Add card..'
-    Messages.admin_logoSize_error = "The logo size is too large"; // XXX
-    Messages.error_limit = "Please enter a valid number"; // XXX
-    Messages.error_positiveNumber = "Please enter a positive number"; // XXX
-    Messages.form_answerType_error = "Please select how to answer the form"; // XXX
-    Messages.moveItemLeft = 'Move item left'; // XXX
-    Messages.moveItemRight = 'Move item right'; // XXX
-    Messages.kanban_moveBoardLeft = 'Move board left'; // XXX
-    Messages.kanban_moveBoardRight = 'Move board right'; // XXX
-    Messages.moveItemUp = 'Move item up'; // XXX
-    Messages.moveItemDown = 'Move item down'; // XXX
-    Messages.toggleArrows = 'Switch to arrow view'; // XXX
-    Messages.toggleDrag = 'Switch to drag view'; // XXX
-    Messages.admin_cat_admins = "Administrators";
-    Messages.admin_admin = "Admin";
-    Messages.admin_listAdminsTitle = "Current administrators";
-    Messages.admin_listAdminsHint = "View and remove administrators";
-    Messages.admin_addAdminsTitle = "Add administrators";
-    Messages.admin_addAdminsHint = "Add administrators from their public key or from your contacts list";
-    Messages.admin_addAdminsAdd = "Promote a contact to admin";
-    Messages.admin_addKeyLabel = "Add an admin using their public key";
-    Messages.admin_errorAddKeyLabel = "Add a valid public key";
-    Messages.admin_errorAddAdmins = "Pick a contact to promote to admin";
-    Messages.admin_listName = "Admin name";
-    Messages.admin_listKey = "Admin key";
-    Messages.admin_listAction = "Remove admin rights";
-    Messages.admin_listHardcoded = "Admin added into config.js. Can only be removed by editing the config file.";
-    Messages.admin_listConfirm = "Are you sure you want to remove the admin rights of this user?";
-    Messages.fm_link_invalid = "Please provide a valid URL"; // XXX
-    Messages.skipLink = "Skip to main content"; // XXX
+    
 
     return Messages;
 

From 2130e3339a771ca6dc32152daaf377577157908b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 21 Mar 2025 15:07:19 +0100
Subject: [PATCH 113/114] Improve findFile efficiency with multiple files

---
 www/common/drive-ui.js      | 23 ++++++---
 www/common/proxy-manager.js | 38 +++++++++++++++
 www/common/userObject.js    | 94 +++++++++++++++++++++++--------------
 3 files changed, 113 insertions(+), 42 deletions(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index f83f445c0..e9b75f66d 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -4025,9 +4025,10 @@ define([
             var header7, header28, headerOld;
             var i = 0;
             var channels = [];
+            var toShow = [];
 
             if (typeFilter) {
-                var ids = filesList.map(function (arr) { return arr[0]; });
+                let ids = filesList.map(function (arr) { return arr[0]; });
                 var idsFilter = filterPads(ids, typeFilter, false, true);
                 filesList = filesList.filter(function (arr) {
                     return (idsFilter.indexOf(arr[0]) !== -1);
@@ -4046,15 +4047,18 @@ define([
                     return true;
                 }
 
-                var paths = manager.findFile(id);
-                if (!paths.length) { return; }
-                var path = paths[0];
-                if (manager.isPathIn(path, [TRASH])) { return; }
-
                 if (!file.channel) { file.channel = id; }
                 if (channels.indexOf(file.channel) !== -1) { return; }
                 channels.push(file.channel);
+                toShow.push({id, file});
+                i++;
+            });
 
+            let ids = toShow.map(obj => { return obj.id });
+            var allPaths = manager.findFiles(ids);
+            toShow.forEach(obj => {
+                let file = obj.file;
+                let id = obj.id;
                 if (!header7 && file.atime < last1) {
                     $list.append(h('li.cp-app-drive-element-separator', h('span', Messages.drive_active7Days)));
                     header7 = true;
@@ -4078,6 +4082,12 @@ define([
                 var $element = $('<li>', {
                     'class': 'cp-app-drive-element cp-app-drive-element-notrash cp-app-drive-element-file cp-app-drive-element-row' + roClass,
                 });*/
+                var paths = allPaths[id];
+                if (paths.every(path => {
+                    return manager.isPathIn(path, [TRASH])
+                })) { return; }
+                var path = paths[0];
+
                 var parentPath = path.slice();
                 var key = parentPath.pop();
                 var root = manager.find(parentPath);
@@ -4085,7 +4095,6 @@ define([
                 $element.off('contextmenu').contextmenu(openContextMenu('default'));
                 $element.data('context', 'default');
                 $list.append($element);
-                i++;
             });
         };
 
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 509e91a3a..a15741fc4 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -249,6 +249,43 @@ define([
         });
         return ret;
     };
+    var findFiles = function (Env, ids) {
+        var ret = {};
+        var userObjects = _getUserObjects(Env);
+        let mainRes = {};
+        userObjects.forEach(function (uo) {
+            //var fPath = _getUserObjectPath(Env, uo);
+            var fId = Number(uo.id);
+            if (!uo.id) {
+                let fIds = userObjects.map(uo => {
+                    return +uo.id;
+                }).filter(Boolean);
+                Array.prototype.push.apply(ids, fIds);
+            }
+            var results = uo.findFiles(ids);
+            if (!uo.id) {
+                mainRes = results;
+            }
+            //console.error(results);
+            if (fId) {
+                // This is a shared folder, we have to fix the paths in the results
+                let fPath = (mainRes[fId] || [])[0];
+                if (!fPath) { return; } // Can't search into this sf
+                Object.keys(results).forEach(file => {
+                    results[file].forEach(p => {
+                        Array.prototype.unshift.apply(p, fPath);
+                    });
+                });
+            }
+            // Push the results from this proxy
+            Object.keys(results).forEach(file => {
+                ret[file] ||= [];
+                Array.prototype.push.apply(ret[file], results[file]);
+            });
+        });
+        return ret;
+    };
+
 
     // Returns file IDs corresponding to the provided channels
     var _findChannels = function (Env, channels, onlyMain) {
@@ -1753,6 +1790,7 @@ define([
             getOwnedPads: callWithEnv(getOwnedPads),
             getTagsList: callWithEnv(getTagsList),
             findFile: callWithEnv(findFile),
+            findFiles: callWithEnv(findFiles),
             findChannels: callWithEnv(findChannels),
             getSharedFolderData: callWithEnv(getSharedFolderData),
             getFolderData: callWithEnv(getFolderData),
diff --git a/www/common/userObject.js b/www/common/userObject.js
index 14a60a5d4..a97ec336d 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -573,56 +573,65 @@ define([
         };
 
         // SEARCH
-        var _findFileInRoot = function (path, file) {
+        var _findFileInRoot = function (path, files) {
             if (!isPathIn(path, [ROOT, TRASH])) { return []; }
-            var paths = [];
+            files = Array.isArray(files) ? files : [files];
+            var paths = {};
             var root = find(path);
             var addPaths = function (p) {
-                if (paths.indexOf(p) === -1) {
-                    paths.push(p);
-                }
+                Object.keys(p).forEach(file => {
+                    paths[file] ||= [];
+                    Array.prototype.push.apply(paths[file], p[file]);
+                });
             };
 
             if (isFile(root) || isSharedFolder(root)) {
-                if (compareFiles(file, root)) {
-                    if (paths.indexOf(path) === -1) {
-                        paths.push(path);
+                files.some(file => {
+                    if (compareFiles(file, root)) {
+                        paths[file] ||= [];
+                        paths[file].push(path);
                     }
-                }
+                });
                 return paths;
             }
             if (isFolder(root)) {
                 for (var e in root) {
-                    var nPath = path.slice();
+                    let nPath = path.slice();
                     nPath.push(e);
-                    _findFileInRoot(nPath, file).forEach(addPaths);
+                    addPaths(_findFileInRoot(nPath, files));
                 }
             }
 
             return paths;
         };
-        exp.findFileInRoot = function (file) {
-            return _findFileInRoot([ROOT], file);
+        /*
+        exp.findFileInRoot = function (files) {
+            return _findFileInRoot([ROOT], files);
         };
-        var _findFileInHrefArray = function (rootName, file) {
-            if (sharedFolder) { return []; }
-            if (!files[rootName]) { return []; }
+        */
+        var _findFileInHrefArray = function (rootName, files) {
+            if (sharedFolder) { return {}; }
+            if (!files[rootName]) { return {}; }
             var unsorted = files[rootName].slice();
-            var ret = [];
+            var ret = {};
             var i = -1;
-            while ((i = unsorted.indexOf(file, i+1)) !== -1){
-                ret.push([rootName, i]);
-            }
+            files.forEach(file => {
+                while ((i = unsorted.indexOf(file, i+1)) !== -1){
+                    ret[file] ||= [];
+                    ret[file].push([rootName, i]);
+                }
+            });
             return ret;
         };
-        var _findFileInTrash = function (path, file) {
+        var _findFileInTrash = function (path, files) {
             if (sharedFolder) { return []; }
             var root = find(path);
-            var paths = [];
+            var paths = {};
             var addPaths = function (p) {
-                if (paths.indexOf(p) === -1) {
-                    paths.push(p);
-                }
+                Object.keys(p).forEach(file => {
+                    paths[file] ||= [];
+                    Array.prototype.push.apply(paths[file], p[file]);
+                });
             };
             if (path.length === 1 && typeof(root) === 'object') {
                 Object.keys(root).forEach(function (key) {
@@ -630,7 +639,7 @@ define([
                     if (!Array.isArray(arr)) { return; }
                     var nPath = path.slice();
                     nPath.push(key);
-                    _findFileInTrash(nPath, file).forEach(addPaths);
+                    addPaths(_findFileInTrash(nPath, files));
                 });
             }
             if (path.length === 2) {
@@ -640,24 +649,39 @@ define([
                     nPath.push(i);
                     nPath.push('element');
                     if (isFile(el.element)) {
-                        if (compareFiles(file, el.element)) {
-                            addPaths(nPath);
-                        }
+                        files.some(file => {
+                            if (compareFiles(file, root)) {
+                                paths[file] ||= [];
+                                paths[file].push(nPath);
+                            }
+                        });
                         return;
                     }
-                    _findFileInTrash(nPath, file).forEach(addPaths);
+                    addPaths(_findFileInTrash(nPath, files));
                 });
             }
             if (path.length >= 4) {
-                _findFileInRoot(path, file).forEach(addPaths);
+                addPaths(_findFileInRoot(path, files));
             }
             return paths;
         };
+        var findFiles = exp.findFiles = function (files) {
+            var rootpaths = _findFileInRoot([ROOT], files);
+            var templatepaths = _findFileInHrefArray(TEMPLATE, files);
+            var trashpaths = _findFileInTrash([TRASH], files);
+            let res = {};
+            files.forEach(file => { res[file] = []; });
+            [rootpaths, templatepaths, trashpaths].forEach(r => {
+                Object.keys(r).forEach(file => {
+                    res[file] ||= [];
+                    Array.prototype.push.apply(res[file], r[file]);
+                });
+            });
+            return res;
+        };
         var findFile = exp.findFile = function (file) {
-            var rootpaths = _findFileInRoot([ROOT], file);
-            var templatepaths = _findFileInHrefArray(TEMPLATE, file);
-            var trashpaths = _findFileInTrash([TRASH], file);
-            return rootpaths.concat(templatepaths, trashpaths);
+            let res = findFiles([file]);
+            return res[file] || [];
         };
 
         // Get drive ids of files from their channel ids

From bb5f8f734f0d20f80bc56ab2f27442d4167fb965 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 21 Mar 2025 16:58:41 +0100
Subject: [PATCH 114/114] Fix issues with findFile

---
 www/common/proxy-manager.js | 24 ++++++++++++++++++------
 www/common/userObject.js    |  6 +++---
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index a15741fc4..d2704c16b 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -235,11 +235,25 @@ define([
     var findFile = function (Env, id) {
         var ret = [];
         var userObjects = _getUserObjects(Env);
+        let mainRes = {};
         userObjects.forEach(function (uo) {
-            var fPath = _getUserObjectPath(Env, uo);
-            var results = uo.findFile(id);
-            if (fPath) {
+            var fId = Number(uo.id);
+            let results;
+            if (!fId) {
+                // Main drive: get the paths of all the SF
+                // in addition to the paths of the requested file
+                let ids = [id];
+                let fIds = userObjects.map(uo => {
+                    return +uo.id;
+                }).filter(Boolean);
+                Array.prototype.push.apply(ids, fIds);
+                mainRes = uo.findFiles(ids); // Store paths of each SF
+                results = mainRes[id]; // Paths of requested file
+            } else {
+                results = uo.findFile(id);
                 // This is a shared folder, we have to fix the paths in the results
+                let fPath = (mainRes[fId] || [])[0];
+                if (!fPath) { return; } // Can't search into this sf
                 results.forEach(function (p) {
                     Array.prototype.unshift.apply(p, fPath);
                 });
@@ -263,9 +277,7 @@ define([
                 Array.prototype.push.apply(ids, fIds);
             }
             var results = uo.findFiles(ids);
-            if (!uo.id) {
-                mainRes = results;
-            }
+            if (!uo.id) { mainRes = results; }
             //console.error(results);
             if (fId) {
                 // This is a shared folder, we have to fix the paths in the results
diff --git a/www/common/userObject.js b/www/common/userObject.js
index a97ec336d..62f80c9cc 100644
--- a/www/common/userObject.js
+++ b/www/common/userObject.js
@@ -609,13 +609,13 @@ define([
             return _findFileInRoot([ROOT], files);
         };
         */
-        var _findFileInHrefArray = function (rootName, files) {
+        var _findFileInHrefArray = function (rootName, toFind) {
             if (sharedFolder) { return {}; }
             if (!files[rootName]) { return {}; }
             var unsorted = files[rootName].slice();
             var ret = {};
             var i = -1;
-            files.forEach(file => {
+            toFind.forEach(file => {
                 while ((i = unsorted.indexOf(file, i+1)) !== -1){
                     ret[file] ||= [];
                     ret[file].push([rootName, i]);
@@ -650,7 +650,7 @@ define([
                     nPath.push('element');
                     if (isFile(el.element)) {
                         files.some(file => {
-                            if (compareFiles(file, root)) {
+                            if (compareFiles(file, el.element)) {
                                 paths[file] ||= [];
                                 paths[file].push(nPath);
                             }