Skip to content

Commit

Permalink
merge 1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
rnixx committed Nov 11, 2024
2 parents 2513cd3 + 6025bd4 commit a2af78b
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 99 deletions.
10 changes: 8 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
Changes
=======

1.1a3 (unreleased)
------------------
1.1rc2 (unreleased)
-------------------

- Nothing changed yet.


1.1rc1 (2024-05-23)
-------------------

- Run tests on bootstrap5 factory theme.
[lenadax]
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def read_file(name):
return f.read()


version = '1.1a3.dev0'
version = '1.1rc2.dev0'
shortdesc = 'Web application stub'
longdesc = '\n\n'.join([read_file(name) for name in [
'README.rst',
Expand Down
63 changes: 31 additions & 32 deletions src/cone/app/locale/cone.app.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE 1.0\n"
"POT-Creation-Date: 2024-05-25 17:44+0200\n"
"POT-Creation-Date: 2024-11-11 09:06+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -23,8 +23,8 @@ msgstr ""

#. Default: Settings
#: ./src/cone/app/model.py:255 ./src/cone/app/browser/settings.py:43
#: ./src/cone/app/browser/templates/settings_sidebar.pt:13
#: ./src/cone/app/browser/templates/settings.pt:12
#: ./src/cone/app/browser/templates/settings_sidebar.pt:19
#: ./src/cone/app/browser/templates/settings.pt:18
msgid "settings"
msgstr ""

Expand Down Expand Up @@ -213,102 +213,102 @@ msgid "browse"
msgstr ""

#. Default: One level up
#: ./src/cone/app/browser/actions.py:272
#: ./src/cone/app/browser/actions.py:273
msgid "action_one_level_up"
msgstr ""

#. Default: View
#: ./src/cone/app/browser/actions.py:306
#: ./src/cone/app/browser/actions.py:307
msgid "action_view"
msgstr ""

#. Default: Listing
#: ./src/cone/app/browser/actions.py:350
#: ./src/cone/app/browser/actions.py:351
msgid "action_listing"
msgstr ""

#. Default: Sharing
#: ./src/cone/app/browser/actions.py:371
#: ./src/cone/app/browser/actions.py:372
msgid "action_sharing"
msgstr ""

#. Default: Edit
#: ./src/cone/app/browser/actions.py:414
#: ./src/cone/app/browser/actions.py:415
msgid "action_edit"
msgstr ""

#. Default: Do you really want to delete this Item?
#: ./src/cone/app/browser/actions.py:434
#: ./src/cone/app/browser/actions.py:435
msgid "delete_item_confirm"
msgstr ""

#. Default: Delete
#: ./src/cone/app/browser/actions.py:436
#: ./src/cone/app/browser/actions.py:437
msgid "action_delete"
msgstr ""

#. Default: Do you really want to delete selected Items?
#: ./src/cone/app/browser/actions.py:454
#: ./src/cone/app/browser/actions.py:455
msgid "delete_items_confirm"
msgstr ""

#. Default: Delete selected children
#: ./src/cone/app/browser/actions.py:456
#: ./src/cone/app/browser/actions.py:457
msgid "action_delete_selected_children"
msgstr ""

#. Default: Cut
#: ./src/cone/app/browser/actions.py:473
#: ./src/cone/app/browser/actions.py:474
msgid "action_cut"
msgstr ""

#. Default: Copy
#: ./src/cone/app/browser/actions.py:488
#: ./src/cone/app/browser/actions.py:489
msgid "action_copy"
msgstr ""

#. Default: Paste
#: ./src/cone/app/browser/actions.py:503
#: ./src/cone/app/browser/actions.py:504
msgid "action_paste"
msgstr ""

#. Default: Move up
#: ./src/cone/app/browser/actions.py:546
#: ./src/cone/app/browser/actions.py:547
msgid "move_up"
msgstr ""

#. Default: Move down
#: ./src/cone/app/browser/actions.py:560
#: ./src/cone/app/browser/actions.py:561
msgid "move_down"
msgstr ""

#. Default: Logout
#: ./src/cone/app/browser/layout.py:139
#: ./src/cone/app/browser/layout.py:135
msgid "logout"
msgstr ""

#. Default: Navigation
#: ./src/cone/app/browser/layout.py:335
#: ./src/cone/app/browser/layout.py:330
msgid "navigation"
msgstr ""

#. Default: English
#: ./src/cone/app/browser/layout.py:496
#: ./src/cone/app/browser/layout.py:492
msgid "lang_en"
msgstr ""

#. Default: German
#: ./src/cone/app/browser/layout.py:497
#: ./src/cone/app/browser/layout.py:493
msgid "lang_de"
msgstr ""

#. Default: French
#: ./src/cone/app/browser/layout.py:498
#: ./src/cone/app/browser/layout.py:494
msgid "lang_fr"
msgstr ""

#. Default: Italian
#: ./src/cone/app/browser/layout.py:499
#: ./src/cone/app/browser/layout.py:495
msgid "lang_it"
msgstr ""

Expand Down Expand Up @@ -403,43 +403,43 @@ msgid "last"
msgstr ""

#. Default: Created by
#: ./src/cone/app/browser/templates/byline.pt:7
#: ./src/cone/app/browser/templates/byline.pt:9
msgid "created_by"
msgstr ""

#. Default: on
#: ./src/cone/app/browser/templates/byline.pt:9
#: ./src/cone/app/browser/templates/byline.pt:13
msgid "created_on"
msgstr ""

#. Default: Last modified
#: ./src/cone/app/browser/templates/byline.pt:13
#: ./src/cone/app/browser/templates/byline.pt:20
msgid "last_modified"
msgstr ""

#. Default: Showing
#: ./src/cone/app/browser/templates/batched_items_footer.pt:11
#: ./src/cone/app/browser/templates/table.pt:185
#: ./src/cone/app/browser/templates/table.pt:187
msgid "showing"
msgstr ""

#. Default: to
#: ./src/cone/app/browser/templates/batched_items_footer.pt:14
#: ./src/cone/app/browser/templates/table.pt:188
#: ./src/cone/app/browser/templates/table.pt:190
msgid "to"
msgstr ""

#. Default: of
#: ./src/cone/app/browser/templates/batched_items_footer.pt:17
#: ./src/cone/app/browser/templates/table.pt:191
#: ./src/cone/app/browser/templates/table.pt:193
msgid "of"
msgstr ""

#. Default: entries
#: ./src/cone/app/browser/templates/batched_items_footer.pt:20
#: ./src/cone/app/browser/templates/batched_items_header.pt:44
#: ./src/cone/app/browser/templates/table.pt:50
#: ./src/cone/app/browser/templates/table.pt:194
#: ./src/cone/app/browser/templates/table.pt:196
msgid "entries"
msgstr ""

Expand Down Expand Up @@ -485,7 +485,6 @@ msgstr ""
msgid "insufficient_privileges_help"
msgstr ""

#. Default: Language
#: ./src/cone/app/browser/templates/language.pt:16
#: ./src/cone/app/browser/templates/language.pt:19
msgid "language"
msgstr ""
Loading

0 comments on commit a2af78b

Please sign in to comment.