merge: epoch-1.10.0 d'upstream

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,10 @@
-- [ ] I have disclosed use of any AI generated code in my commit messages.
+Replace this text with a description of your changes, and why these changes are important. Read and acknowledge the list below. PRs without a completed checkbox will be closed.
-  - If you are using an LLM, and do not fully understand the changes it is making to the code base, do not create a PR.
-  - In our experience, AI generated code often results in overly complex code that lacks enough context for a proper fix or feature inclusion. This results in considerably longer code reviews. Due to this, AI authored or partially authored PRs may be closed without comment.
-- [ ] I understand these changes in full and will be able to respond to review comments.
-- [ ] My change is accurately described in the commit message.
-- [ ] My contribution is tested and working as described.
-- [ ] I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions.
 
+---
+
+- I have not included any LLM (also known as AI) generated content in this PR, including code, comments, and descriptions.
+- I understand these changes in full and will be able to respond to review comments.
+- My change is accurately described in the commit message.
+- My contribution is tested and working as described.
+- I have read the [Developer Certificate of Origin](https://developercertificate.org/) and certify my contribution under its conditions.
+- [ ] I have read and followed all of the above requirements. For more information, see our [contributor guide](https://github.com/pop-os/pop/blob/master/CONTRIBUTING.md).

.github/workflows/require-checklist.yml

@@ -0,0 +1,14 @@
+# From https://github.com/mheap/require-checklist-action, license MIT
+name: Require Checklist
+
+on:
+  pull_request:
+    types: [opened, edited, synchronize]
+
+jobs:
+  job1:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: mheap/require-checklist-action@v2
+        with:
+          requireChecklist: true

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cosmic-term"
-version = "1.9.0"
+version = "1.10.0"
 authors = ["Jeremy Soller <jeremy@system76.com>"]
 edition = "2024"
 license = "GPL-3.0-only"

cargo.just

@@ -0,0 +1,70 @@
+cargo-target-dir := env('CARGO_TARGET_DIR', 'target')
+
+# Compile with debug profile
+[no-cd]
+build-debug *args:
+    cargo build {{args}}
+
+# Compile with release profile
+[no-cd]
+build-release *args: (build-debug '--release' args)
+
+# Compile with a vendored tarball
+[no-cd]
+build-vendored *args: vendor-extract (build-release '--frozen --offline' args)
+
+# Check for errors and linter warnings
+[no-cd]
+check *args:
+    cargo clippy --all-features {{args}} -- -W clippy::pedantic
+
+# Runs a check with JSON message format for IDE integration
+[no-cd]
+check-json: (check '--message-format=json')
+
+# Remove Cargo build artifacts
+[no-cd]
+clean:
+    cargo clean
+
+# Also remove .cargo and vendored dependencies
+[no-cd]
+clean-dist: clean
+    rm -rf .cargo vendor vendor.tar target
+
+# Run the application for testing purposes
+[no-cd]
+run *args:
+    cargo run {{args}}
+
+# Run `cargo test`
+[no-cd]
+test *args:
+    cargo test {{args}}
+
+# Vendor Cargo dependencies locally
+[no-cd]
+vendor:
+    #!/usr/bin/env bash
+    mkdir -p .cargo
+    cargo vendor --locked | head -n -1 > .cargo/config.toml
+    echo 'directory = "vendor"' >> .cargo/config.toml
+    echo >> .cargo/config.toml
+    echo '[env]' >> .cargo/config.toml
+    if [ -n "${SOURCE_DATE_EPOCH}" ]
+    then
+        source_date="$(date -d "@${SOURCE_DATE_EPOCH}" "+%Y-%m-%d")"
+        echo "VERGEN_GIT_COMMIT_DATE = \"${source_date}\"" >> .cargo/config.toml
+    fi
+    if [ -n "${SOURCE_GIT_HASH}" ]
+    then
+        echo "VERGEN_GIT_SHA = \"${SOURCE_GIT_HASH}\"" >> .cargo/config.toml
+    fi
+    tar pcf vendor.tar .cargo vendor
+    rm -rf .cargo vendor
+
+# Extracts vendored dependencies
+[no-cd]
+vendor-extract:
+    rm -rf vendor
+    tar pxf vendor.tar

debian/changelog

@@ -1,3 +1,9 @@
+cosmic-term (1.10.0) noble; urgency=medium
+
+  * Epoch 1.10.0 version update
+
+ -- Michael Murphy <michael@mmurphy.dev>  Mon, 05 Oct 2026 21:28:17 +0200
+
 cosmic-term (1.9.0) noble; urgency=medium
 
   * Epoch 1.9.0 version update

i18n/cs/cosmic_term.ftl

@@ -45,8 +45,8 @@ use-bright-bold = Světlejší tučný text
 splits = Rozdělení
 focus-follow-mouse = Zaměření psaní sleduje myš
 advanced = Pokročilé
-show-headerbar = Zobrazit hlavičku
+show-headerbar = Zobrazit záhlaví
-show-header-description = Hlavičku lze odkrýt z nabídky zobrazené po kliknutí pravým tlačítkem myši
+show-header-description = Záhlaví lze odkrýt v nabídce zobrazené po kliknutí pravým tlačítkem myši
 find-placeholder = Najít...
 find-previous = Najít předchozí
 find-next = Najít další
@@ -69,7 +69,7 @@ next-tab = Další karta
 previous-tab = Předchozí karta
 split-horizontal = Rozdělit horizontálně
 split-vertical = Rozdělit vertikálně
-pane-toggle-maximize = Přepnout maximalizaci
+pane-toggle-maximize = Maximalizovat nebo obnovit podokno
 menu-color-schemes = Barevná schémata...
 menu-settings = Nastavení...
 menu-about = O aplikaci Terminál COSMIC...
@@ -99,14 +99,17 @@ shortcut-group-zoom = Přiblížení
 toggle-fullscreen = Přepnout režim celé obrazovky
 type-to-search = Pište pro vyhledávání...
 copy-or-sigint = Kopírovat nebo SIGINT
-focus-pane-down = Zaměřit panel dole
+focus-pane-down = Zaměřit podokno dole
-focus-pane-left = Zaměřit panel vlevo
+focus-pane-left = Zaměřit podokno vlevo
-focus-pane-right = Zaměřit panel vpravo
+focus-pane-right = Zaměřit podokno vpravo
-focus-pane-up = Zaměřit panel nahoře
+focus-pane-up = Zaměřit podokno nahoře
 shortcut-replace-body = { $binding } je již přiřazena k „{ $existing }“. Nahradit za „{ $new_action }“?
 shortcut-capture-hint = Stiskněte kombinaci kláves
 paste-primary = Vložit primární
 copy-link = Kopírovat odkaz
 tab-new-inherit-working-directory = Nové karty a okna používají aktuální adresář
 tab-new-inherit-working-directory-description = Otevírat nové karty a okna v pracovním adresáři aktivní karty
-show-pane-borders = Zobrazit ohraničení panelu
+show-pane-borders = Zobrazit ohraničení podoken
+window-header = Záhlaví okna
+move-tab-left = Přesunout kartu doleva
+move-tab-right = Přesunout kartu doprava

i18n/de/cosmic_term.ftl

@@ -105,7 +105,7 @@ next-tab = Nächster Tab
 previous-tab = Vorheriger Tab
 split-horizontal = Horizontal teilen
 split-vertical = Vertikal teilen
-pane-toggle-maximize = Maximierung umschalten
+pane-toggle-maximize = Bereich maximieren oder wiederherstellen
 menu-color-schemes = Farbschemen ...
 menu-settings = Einstellungen ...
 menu-about = Über COSMIC Terminal ...
@@ -150,3 +150,6 @@ keywords = Befehl;Shell;Terminal;CLI;
 tab-new-inherit-working-directory = Neue Tabs und Fenster verwenden das aktuelle Verzeichnis
 tab-new-inherit-working-directory-description = Neue Tabs und Fenster im Arbeitsverzeichnis des aktiven Tabs öffnen
 show-pane-borders = Bereichsrahmen anzeigen
+window-header = Fenstertitel
+move-tab-left = Tab nach links verschieben
+move-tab-right = Tab nach rechts verschieben

i18n/el/cosmic_term.ftl

@@ -107,7 +107,7 @@ next-tab = Επόμενη καρτέλα
 previous-tab = Προηγούμενη καρτέλα
 split-horizontal = Οριζόντιος διαχωρισμός
 split-vertical = Κάθετος διαχωρισμός
-pane-toggle-maximize = Εναλλαγή μεγιστοποίησης
+pane-toggle-maximize = Μεγιστοποίηση ή επαναφορά προβολής
 menu-color-schemes = Χρωματικοί συνδυασμοί...
 menu-settings = Ρυθμίσεις...
 menu-about = Σχετικά με το Τερματικό COSMIC...
@@ -153,3 +153,6 @@ shortcut-replace-body = Ο συνδυασμός { $binding } έχει ήδη α
 tab-new-inherit-working-directory = Οι νέες καρτέλες και παράθυρα χρησιμοποιούν τον τρέχοντα κατάλογο
 tab-new-inherit-working-directory-description = Άνοιγμα νέων καρτελών και παραθύρων στον τρέχοντα κατάλογο της ενεργής καρτέλας
 show-pane-borders = Εμφάνιση περιγραμμάτων πλαισίων
+window-header = Κεφαλίδα παραθύρου
+move-tab-left = Μετακίνηση καρτέλας στα αριστερά
+move-tab-right = Μετακίνηση καρτέλας στα δεξιά

i18n/en-GB/cosmic_term.ftl

@@ -105,7 +105,7 @@ next-tab = Next tab
 previous-tab = Previous tab
 split-horizontal = Split horizontal
 split-vertical = Split vertical
-pane-toggle-maximize = Toggle maximized
+pane-toggle-maximize = Maximise or restore pane
 menu-color-schemes = Colour schemes...
 menu-settings = Settings...
 menu-about = About COSMIC Terminal...
@@ -115,3 +115,4 @@ cancel = Cancel
 keyboard-shortcuts = Keyboard shortcuts
 replace = Replace
 menu-keyboard-shortcuts = Keyboard shortcuts...
+window-header = Window header

i18n/en/cosmic_term.ftl

@@ -158,6 +158,8 @@ zoom-reset = Default text size
 zoom-out = Smaller text
 next-tab = Next tab
 previous-tab = Previous tab
+move-tab-left = Move tab left
+move-tab-right = Move tab right
 split-horizontal = Split horizontal
 split-vertical = Split vertical
 pane-toggle-maximize = Maximize or restore pane

i18n/fi/cosmic_term.ftl

@@ -107,7 +107,7 @@ next-tab = Seuraava välilehti
 previous-tab = Edellinen välilehti
 split-horizontal = Halkaise näkymä vaakasuunnassa
 split-vertical = Halkaise näkymä pystysuunnassa
-pane-toggle-maximize = Suurennus päällä tai pois
+pane-toggle-maximize = Suurenna tai palauta paneeli
 menu-color-schemes = Väriteemat…
 menu-settings = Asetukset…
 menu-about = Tietoa COSMICin päätteestä…
@@ -152,3 +152,6 @@ shortcut-group-other = Muut
 tab-new-inherit-working-directory = Uudet välilehdet käyttävät nykyistä hakemistoa
 tab-new-inherit-working-directory-description = Avaa uudet välilehdet aktiivisen välilehden työskentelyhakemistossa
 show-pane-borders = Näytä paneelin rajat
+window-header = Ikkunan otsake
+move-tab-left = Siirrä välilehti vasemmalle
+move-tab-right = Siirrä välilehti oikealle

i18n/fr/cosmic_term.ftl

@@ -96,7 +96,7 @@ quit = Quitter
 
 ## Edit
 
-edit = Modifier
+edit = Édition
 copy = Copier
 paste = Coller
 select-all = Sélectionner tout
@@ -123,7 +123,7 @@ next-tab = Onglet suivant
 previous-tab = Onglet précédent
 split-horizontal = Scinder en horizontal
 split-vertical = Scinder en vertical
-pane-toggle-maximize = Vue unique
+pane-toggle-maximize = Agrandir ou restaurer le panneau
 menu-color-schemes = Palettes de couleurs...
 menu-settings = Paramètres...
 menu-about = À propos de terminal COSMIC...
@@ -176,3 +176,6 @@ copy-on-select-clipboard = Copier la sélection dans le presse-papiers
 copy-on-select-clipboard-description = En plus de la sélection primaire (clic du milieu), comme copy-on-select = clipboard dans Ghostty
 show-pane-borders = Afficher les bordures des panneaux
 unfocused-pane-dim = Atténuation des panneaux inactifs
+window-header = Barre de titre de la fenêtre
+move-tab-left = Déplacer l'onglet à gauche
+move-tab-right = Déplacer l'onglet à droite

i18n/ga/cosmic_term.ftl

@@ -105,7 +105,7 @@ next-tab = An cluaisín ar aghaidh
 previous-tab = An cluaisín roimhe seo
 split-horizontal = Scoilt cothrománach
 split-vertical = Scoilt ingearach
-pane-toggle-maximize = Scoránaigh uasmhéadú
+pane-toggle-maximize = Uasmhéadaigh nó athchóirigh an phána
 menu-color-schemes = Scéimeanna dathanna...
 menu-settings = Socruithe...
 menu-about = Maidir le COSMIC Teirminéal...
@@ -149,3 +149,5 @@ keywords = Ordú;Blaosc;Teirminéal;CLI;
 copy-link = Cóipeáil Nasc
 tab-new-inherit-working-directory = Úsáideann cluaisíní agus fuinneoga nua an t-eolaire reatha
 tab-new-inherit-working-directory-description = Oscail cluaisíní agus fuinneoga nua in eolaire oibre an chluaisín ghníomhaigh
+show-pane-borders = Taispeáin teorainneacha na pána
+window-header = Ceanntásc na fuinneoige

i18n/gl/cosmic_term.ftl

@@ -7,7 +7,7 @@ support = Soporte
 settings = Axustes
 appearance = Apariencia
 theme = Tema
-match-desktop = Axustar ao escritorio
+match-desktop = Emparexar co escritorio
 dark = Escuro
 light = Claro
 default-zoom-step = Pasos do zoom
@@ -110,3 +110,6 @@ passwords-title = Contrasinais
 add-password = Engadir contrasinal
 password-input = Contrasinal
 password-input-description = Descripción
+window-header = Cabeceira da xanela
+move-tab-left = Mover a pestaña á esquerda
+move-tab-right = Mover a pestaña á dereita

i18n/hu/cosmic_term.ftl

@@ -52,14 +52,14 @@ opacity = Háttér átlátszósága
 
 ### Font
 
-font = Betűtípus
+font = Betűkészlet
-advanced-font-settings = Speciális betűtípus-beállítások
+advanced-font-settings = Speciális betűkészlet-beállítások
-default-font = Betűtípus
+default-font = Betűkészlet
 default-font-size = Betűméret
 default-font-stretch = Betűszélesség
-default-font-weight = Normál betűsúly
+default-font-weight = Normál betűvastagság
-default-dim-font-weight = Vékony betűsúly
+default-dim-font-weight = Vékony betűvastagság
-default-bold-font-weight = Félkövér betűsúly
+default-bold-font-weight = Félkövér betűvastagság
 use-bright-bold = Félkövér szöveg világosítása
 
 ### Splits
@@ -109,7 +109,7 @@ next-tab = Következő lap
 previous-tab = Előző lap
 split-horizontal = Vízszintes felosztás
 split-vertical = Függőleges felosztás
-pane-toggle-maximize = Panel maximalizálása
+pane-toggle-maximize = Panel maximalizálása vagy visszaállítása
 menu-color-schemes = Színsémák…
 menu-settings = Beállítások…
 menu-about = A COSMIC Terminál névjegye…
@@ -150,3 +150,6 @@ copy-link = Hivatkozás másolása
 tab-new-inherit-working-directory = Az új lapok és ablakok az aktuális könyvtárat használják
 tab-new-inherit-working-directory-description = Az új lapok és ablakok az aktív lap munkakönyvtárában nyílnak meg
 show-pane-borders = Ablaktábla-szegélyek megjelenítése
+window-header = Ablakfejléc
+move-tab-left = Lap mozgatása balra
+move-tab-right = Lap mozgatása jobbra

i18n/id/cosmic_term.ftl

@@ -23,7 +23,7 @@ remain-open = Tetap buka setelah proses anak berakhir.
 settings = Pengaturan
 appearance = Tampilan
 theme = Tema
-match-desktop = Cocok desktop
+match-desktop = Sesuaikan desktop
 dark = Gelap
 light = Terang
 syntax-dark = Skema warna gelap
@@ -68,7 +68,7 @@ next-tab = Tab selanjutnya
 previous-tab = Tab sebelumnya
 split-horizontal = Pemisahan horisontal
 split-vertical = Pemisahan vertikal
-pane-toggle-maximize = Ubah ke maksimal
+pane-toggle-maximize = Maksimalkan atau pulihkan panel
 menu-color-schemes = Skema warna...
 menu-settings = Pengaturan...
 menu-about = Tentang Terminal COSMIC...
@@ -110,3 +110,6 @@ copy-link = Salin Tautan
 tab-new-inherit-working-directory = Tab dan jendela baru menggunakan direktori saat ini
 tab-new-inherit-working-directory-description = Buka tab dan jendela baru di direktori pekerjaan tab aktif
 show-pane-borders = Tampilkan batas panel
+window-header = Header jendela
+move-tab-left = Pindahkan tab ke kiri
+move-tab-right = Pindahkan tab ke kanan

i18n/kk/cosmic_term.ftl

@@ -5,8 +5,8 @@ support = Қолдау
 settings = Баптаулар
 appearance = Сыртқы көрініс
 theme = Тема
-match-desktop = Жұмыс үстеліне сәйкес болу
+match-desktop = Жұмыс үстеліне сәйкес
-dark = Қою
+dark = Қараңғы
 light = Ашық
 file = Файл
 new-tab = Жаңа бет
@@ -29,7 +29,7 @@ find = Табу
 cosmic-terminal = COSMIC терминалы
 new-terminal = Жаңа терминал
 color-schemes = Түстер схемалары
-rename = Атын өзгерту
+rename = Атауын өзгерту
 import-errors = Импорттау қателері
 profiles = Профильдер
 command-line = Командалық жол
@@ -69,7 +69,7 @@ next-tab = Келесі бет
 previous-tab = Алдыңғы бет
 split-horizontal = Горизонталды бөлу
 split-vertical = Вертикалды бөлу
-pane-toggle-maximize = Толық экран режимін ауыстыру
+pane-toggle-maximize = Панельді үлкейту немесе қалпына келтіру
 menu-color-schemes = Түс схемалары...
 menu-about = COSMIC терминалы туралы...
 menu-password-manager = Парольдер...
@@ -110,3 +110,6 @@ copy-link = Сілтемені көшіру
 tab-new-inherit-working-directory = Жаңа беттерде және терезелерде ағымдағы буманы қолдану
 tab-new-inherit-working-directory-description = Жаңа беттерді және терезелерді белсенді беттің жұмыс бумасында ашу
 show-pane-borders = Панель жақтауларын көрсету
+window-header = Терезе тақырыптамасы
+move-tab-left = Бетті солға жылжыту
+move-tab-right = Бетті оңға жылжыту

i18n/kmr/cosmic_term.ftl

@@ -33,7 +33,7 @@ command-line = Rêza fermanê
 view = Dîtin
 dark = Tarî
 hold = Ragire
-match-desktop = Bi sermaseyê re li hev bîne
+match-desktop = Bi sermaseyê re guncav bike
 find-previous = Yê paş bibîne
 cosmic-terminal = Termînalê COSMIC
 find-placeholder = Bibîne...
@@ -110,3 +110,6 @@ toggle-fullscreen = Dîmendera tijî biguhêrîne
 type-to-search = Ji bo lêgerînê binivîse...
 copy-link = Girêdanê jê bigire
 show-pane-borders = Sînorên kilîtdankê nîşan bide
+window-header = Sernavê çarçoveyê
+move-tab-left = Rûgerê bilivîne çepê
+move-tab-right = Rûgerê bilivîne rastê

i18n/pl/cosmic_term.ftl

@@ -109,7 +109,7 @@ next-tab = Następna karta
 previous-tab = Poprzednia karta
 split-horizontal = Podziel w poziomie
 split-vertical = Podziel w pionie
-pane-toggle-maximize = Przełącznik maksymalizacji
+pane-toggle-maximize = Maksymalizuj lub przywróć panel
 menu-color-schemes = Schemat kolorów...
 menu-settings = Ustawienia…
 menu-about = O Terminalu COSMIC...
@@ -150,3 +150,4 @@ copy-link = Skopiuj Odnośnik
 tab-new-inherit-working-directory = Nowe karty i okna użyją obecnego katalogu
 tab-new-inherit-working-directory-description = Otwieraj nowe karty i okna w katalogu roboczym aktywnej karty
 show-pane-borders = Pokaż obramowania paneli
+window-header = Nagłówek okna

i18n/pt-BR/cosmic_term.ftl

@@ -70,7 +70,7 @@ focus-follow-mouse = Foco de digitação segue o mouse
 ### Advanced
 
 advanced = Avançado
-show-headerbar = Mostrar a barra de título
+show-headerbar = Mostrar cabeçalho
 show-header-description = Mostrar o cabeçalho ao clicar no menu com o botão direito do mouse
 # Find
 find-placeholder = Localizar...
@@ -109,7 +109,7 @@ next-tab = Próxima aba
 previous-tab = Aba anterior
 split-horizontal = Dividir horizontalmente
 split-vertical = Dividir verticalmente
-pane-toggle-maximize = Alternar maximização
+pane-toggle-maximize = Maximizar ou restaurar o quadro
 menu-color-schemes = Esquemas de cores...
 menu-settings = Configurações...
 menu-about = Sobre o Terminal...
@@ -150,3 +150,6 @@ copy-link = Copiar link
 tab-new-inherit-working-directory = Novas abas e janelas usam o diretório atual
 tab-new-inherit-working-directory-description = Abrir novas abas e janelas no diretório de trabalho da aba ativa
 show-pane-borders = Mostrar bordas do quadro
+window-header = Cabeçalho da janela
+move-tab-left = Mover a aba para a esquerda
+move-tab-right = Mover a aba para a direita

i18n/ru/cosmic_term.ftl

@@ -106,7 +106,7 @@ next-tab = Следующая вкладка
 previous-tab = Предыдущая вкладка
 split-horizontal = Разделение по горизонтали
 split-vertical = Разделение по вертикали
-pane-toggle-maximize = Переключить на весь экран
+pane-toggle-maximize = Развернуть/восстановить область
 menu-color-schemes = Цветовые схемы...
 menu-settings = Параметры...
 menu-about = О Терминале COSMIC...
@@ -143,4 +143,7 @@ type-to-search = Введите для поиска...
 copy-link = Копировать ссылку
 tab-new-inherit-working-directory = Текущий каталог в новых вкладках и окнах
 tab-new-inherit-working-directory-description = Открывать новые вкладки и окна в рабочем каталоге активной вкладки
-show-pane-borders = Показывать границы панелей
+show-pane-borders = Показывать границы областей
+window-header = Заголовок окна
+move-tab-left = Перемещение вкладки налево
+move-tab-right = Перемещение вкладки направо

i18n/sv-SE/cosmic_term.ftl

@@ -110,7 +110,7 @@ next-tab = Nästa flik
 previous-tab = Föregående flik
 split-horizontal = Dela horisontellt
 split-vertical = Dela vertikalt
-pane-toggle-maximize = Växla maximerad
+pane-toggle-maximize = Maximera eller återställ fält
 clear-scrollback = Töm tillbakarullning
 menu-color-schemes = Färgscheman…
 menu-settings = Inställningar...
@@ -154,3 +154,6 @@ copy-link = Kopiera länk
 tab-new-inherit-working-directory-description = Öppna nya flikar och fönster i den aktiva flikens arbetskatalog
 tab-new-inherit-working-directory = Nya flikar och fönster använder aktuell katalog
 show-pane-borders = Visa ram runt fält
+window-header = Fönstertitel
+move-tab-left = Flytta flik vänster
+move-tab-right = Flytta flik höger

i18n/uk/cosmic_term.ftl

@@ -38,7 +38,7 @@ settings = Налаштування
 
 appearance = Вигляд
 theme = Тема
-match-desktop = Системна
+match-desktop = Підігнати під стільницю
 dark = Темна
 light = Світла
 syntax-dark = Темна колірна схема
@@ -150,3 +150,6 @@ copy-link = Копіювати ланку
 tab-new-inherit-working-directory = Нові вкладки та вікна відкривати в поточному каталозі
 tab-new-inherit-working-directory-description = Відкривати нові вкладки та вікна в робочому каталозі активної вкладки
 show-pane-borders = Показувати межі панелей
+window-header = Заголовок вікна
+move-tab-left = Перемістити ліворуч
+move-tab-right = Перемістити праворуч

i18n/zh-CN/cosmic_term.ftl

@@ -105,7 +105,7 @@ next-tab = 下一个标签
 previous-tab = 上一个标签
 split-horizontal = 水平分割
 split-vertical = 垂直分割
-pane-toggle-maximize = 切换最大化
+pane-toggle-maximize = 将窗格最大化或还原
 menu-color-schemes = 配色方案…
 menu-settings = 设置…
 menu-about = 关于 COSMIC 终端…
@@ -150,3 +150,6 @@ copy-link = 复制链接
 tab-new-inherit-working-directory = 新标签和窗口使用当前目录
 tab-new-inherit-working-directory-description = 在活动标签的工作目录中打开新标签和窗口
 show-pane-borders = 显示窗格边框
+window-header = 窗口标题栏
+move-tab-left = 将标签向左移动
+move-tab-right = 将标签向右移动

i18n/zh-TW/cosmic_term.ftl

@@ -104,7 +104,7 @@ next-tab = 下個分頁
 previous-tab = 上個分頁
 split-horizontal = 水平分割
 split-vertical = 垂直分割
-pane-toggle-maximize = 切換最大化
+pane-toggle-maximize = 將窗格最大化或還原
 menu-color-schemes = 配色方案...
 menu-settings = 設定...
 menu-about = 關於 COSMIC 終端機…
@@ -150,3 +150,6 @@ comment = COSMIC 桌面終端機模擬器
 tab-new-inherit-working-directory = 新分頁和視窗使用目前目錄
 tab-new-inherit-working-directory-description = 在作用中分頁的工作目錄開啟新分頁和視窗
 show-pane-borders = 顯示窗格邊框
+window-header = 視窗標題列
+move-tab-left = 將分頁向左移動
+move-tab-right = 將分頁向右移動

src/main.rs

@@ -8,7 +8,7 @@ use cosmic::iced::keyboard::key::Physical;
 use cosmic::widget::menu::action::MenuAction;
 use cosmic::widget::menu::key_bind::KeyBind;
 use cosmic::widget::pane_grid::Pane;
-use cosmic::widget::segmented_button::ReorderEvent;
+use cosmic::widget::segmented_button::{InsertPosition, ReorderEvent};
 use cosmic::{
     Application, ApplicationExt, Element, action,
     app::{Core, Settings, Task, context_drawer},
@@ -425,6 +425,8 @@ pub enum Action {
     TabNext,
     TabPrev,
     TabRename,
+    TabMoveLeft,
+    TabMoveRight,
     ToggleFullscreen,
     WindowClose,
     WindowNew,
@@ -485,6 +487,8 @@ impl Action {
             Self::TabNext => Message::TabNext,
             Self::TabPrev => Message::TabPrev,
             Self::TabRename => Message::TabRenameOpen(entity_opt),
+            Self::TabMoveLeft => Message::TabMoveLeft,
+            Self::TabMoveRight => Message::TabMoveRight,
             Self::ToggleFullscreen => Message::ToggleFullscreen,
             Self::WindowClose => Message::WindowClose,
             Self::WindowNew => Message::WindowNew,
@@ -617,6 +621,8 @@ pub enum Message {
     TabRenameCommit,
     TabRenameCancel,
     TabRenameResetToDefault,
+    TabMoveLeft,
+    TabMoveRight,
     TermEvent(pane_grid::Pane, segmented_button::Entity, TermEvent),
     TermEventTx(mpsc::UnboundedSender<(pane_grid::Pane, segmented_button::Entity, PtyEvent)>),
     TermOsc(pane_grid::Pane, segmented_button::Entity, OscEvent),
@@ -2248,7 +2254,7 @@ impl Application for App {
             .comments(fl!("comment"))
             .license("GPL-3.0-only")
             .license_url("https://spdx.org/licenses/GPL-3.0-only")
-            .developers([("Jeremy Soller", "jeremy@system76.com")])
+            .developers([("System76", "info@system76.com")])
             .links([
                 (fl!("repository"), "https://github.com/pop-os/cosmic-term"),
                 (
@@ -3737,6 +3743,33 @@ impl Application for App {
                 }
                 self.pane_model.update_terminal_focus();
             }
+            Message::TabMoveLeft => {
+                if let Some(tab_model) = self.pane_model.active_mut() {
+                    let pos: usize = tab_model
+                        .position(tab_model.active())
+                        .expect("at least one tab is always open")
+                        .into();
+                    if pos > 0 {
+                        let dragged = tab_model.iter().nth(pos).expect("tab unavailable");
+                        let target = tab_model.iter().nth(pos - 1).expect("previous tab missing");
+                        tab_model.reorder(dragged, target, InsertPosition::Before);
+                    }
+                }
+            }
+            Message::TabMoveRight => {
+                if let Some(tab_model) = self.pane_model.active_mut() {
+                    let len = tab_model.iter().count();
+                    let pos: usize = tab_model
+                        .position(tab_model.active())
+                        .expect("at least one tab is always open")
+                        .into();
+                    if pos < len - 1 && len > 1 {
+                        let dragged = tab_model.iter().nth(pos).expect("tab unavailable");
+                        let target = tab_model.iter().nth(pos + 1).expect("next tab missing");
+                        tab_model.reorder(dragged, target, InsertPosition::After);
+                    }
+                }
+            }
             Message::TermEvent(pane, entity, event) => {
                 match event {
                     TermEvent::Bell => {

src/menu.rs

@@ -237,6 +237,9 @@ pub fn menu_bar<'a>(
                         MenuItem::Button(fl!("next-tab"), None, Action::TabNext),
                         MenuItem::Button(fl!("previous-tab"), None, Action::TabPrev),
                         MenuItem::Divider,
+                        MenuItem::Button(fl!("move-tab-left"), None, Action::TabMoveLeft),
+                        MenuItem::Button(fl!("move-tab-right"), None, Action::TabMoveRight),
+                        MenuItem::Divider,
                         MenuItem::Button(
                             fl!("split-horizontal"),
                             None,

src/shortcuts.rs

@@ -89,6 +89,8 @@ pub enum KeyBindAction {
     TabNext,
     TabPrev,
     TabRename,
+    TabMoveLeft,
+    TabMoveRight,
     ToggleFullscreen,
     ToggleReadOnly,
     WindowClose,
@@ -132,6 +134,8 @@ impl KeyBindAction {
             Self::TabNext => Some(Action::TabNext),
             Self::TabPrev => Some(Action::TabPrev),
             Self::TabRename => Some(Action::TabRename),
+            Self::TabMoveLeft => Some(Action::TabMoveLeft),
+            Self::TabMoveRight => Some(Action::TabMoveRight),
             Self::ToggleFullscreen => Some(Action::ToggleFullscreen),
             Self::ToggleReadOnly => Some(Action::ToggleReadOnly),
             Self::WindowClose => Some(Action::WindowClose),
@@ -296,6 +300,8 @@ pub fn action_label(action: KeyBindAction) -> String {
         KeyBindAction::TabNext => fl!("next-tab"),
         KeyBindAction::TabPrev => fl!("previous-tab"),
         KeyBindAction::TabRename => fl!("rename-tab"),
+        KeyBindAction::TabMoveLeft => fl!("move-tab-left"),
+        KeyBindAction::TabMoveRight => fl!("move-tab-right"),
         KeyBindAction::ToggleFullscreen => fl!("toggle-fullscreen"),
         KeyBindAction::ToggleReadOnly => fl!("read-only"),
         KeyBindAction::WindowClose => fl!("close-window"),
@@ -332,6 +338,8 @@ pub fn shortcut_groups() -> Vec<ShortcutGroup> {
             KeyBindAction::TabRename,
             KeyBindAction::TabNext,
             KeyBindAction::TabPrev,
+            KeyBindAction::TabMoveLeft,
+            KeyBindAction::TabMoveRight,
             KeyBindAction::TabActivate0,
             KeyBindAction::TabActivate1,
             KeyBindAction::TabActivate2,
@@ -486,6 +494,10 @@ fn fallback_shortcuts() -> Shortcuts {
     bind!([Ctrl], "Tab", TabNext);
     bind!([Ctrl, Shift], "Tab", TabPrev);
 
+    // Ctrl+Shift+PageUp/Down move tabs left and right
+    bind!([Ctrl, Shift], "PageUp", TabMoveLeft);
+    bind!([Ctrl, Shift], "PageDown", TabMoveRight);
+
     // Ctrl+Shift+# activates tabs by index
     bind!([Ctrl, Shift], "1", TabActivate0);
     bind!([Ctrl, Shift], "2", TabActivate1);