[shotwell/wip/dedeprecate: 31/38] WIP
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [shotwell/wip/dedeprecate: 31/38] WIP
- Date: Wed, 2 Nov 2016 19:59:10 +0000 (UTC)
commit a87d3f86c0ca0584507a6b237b7d9692b60dfdbc
Author: Jens Georg <mail jensge org>
Date: Sun Oct 30 09:07:24 2016 +0100
WIP
ui/collection.ui | 26 +++++++-------
ui/events_directory.ui | 10 +++--
ui/import.ui | 58 +++++++++++++++++++----------
ui/import_queue.ui | 6 ++--
ui/media.ui | 95 ++++++++++++++++++++++++++++++------------------
ui/offline.ui | 61 ++++++++++++++++++++-----------
ui/photo.ui | 22 +++++++----
ui/photo_context.ui | 3 +-
ui/trash.ui | 52 +++++++++++++++++---------
9 files changed, 210 insertions(+), 123 deletions(-)
---
diff --git a/ui/collection.ui b/ui/collection.ui
index ede3cbb..9a4b681 100644
--- a/ui/collection.ui
+++ b/ui/collection.ui
@@ -2,57 +2,57 @@
<interface domain="shotwell">
<menu id="CollectionContextMenu">
<submenu>
- <attribute name="label" translatable="yes">Rate</attribute>
+ <attribute name="label" translatable="yes">_Set Rating</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">RateFive</attribute>
+ <attribute name="label" translatable="no">★★★★★</attribute>
<attribute name="action">RateFive</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">RateFour</attribute>
+ <attribute name="label" translatable="no">★★★★</attribute>
<attribute name="action">RateFour</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">RateThree</attribute>
+ <attribute name="label" translatable="no">★★★</attribute>
<attribute name="action">RateThree</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">RateTwo</attribute>
+ <attribute name="label" translatable="no">★★</attribute>
<attribute name="action">RateTwo</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">RateOne</attribute>
+ <attribute name="label" translatable="no">★</attribute>
<attribute name="action">RateOne</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">RateUnrated</attribute>
+ <attribute name="label" translatable="yes">_Unrated</attribute>
<attribute name="action">RateUnrated</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">RateRejected</attribute>
+ <attribute name="label" translatable="yes">_Rejected</attribute>
<attribute name="action">RateRejected</attribute>
</item>
</section>
<section>
<item>
- <attribute name="label" translatable="yes">IncreaseRating</attribute>
+ <attribute name="label" translatable="yes">_Increase</attribute>
<attribute name="action">IncreaseRating</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">DecreaseRating</attribute>
+ <attribute name="label" translatable="yes">_Decrease</attribute>
<attribute name="action">DecreaseRating</attribute>
</item>
</section>
</submenu>
<submenu>
- <attribute name="label" translatable="yes">RawDeveloper</attribute>
+ <attribute name="label" translatable="yes">_Developer</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">RawDeveloperShotwell</attribute>
+ <attribute name="label" translatable="yes">Shotwell</attribute>
<attribute name="action">RawDeveloperShotwell</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">RawDeveloperCamera</attribute>
+ <attribute name="label" translatable="yes">Camera</attribute>
<attribute name="action">RawDeveloperCamera</attribute>
</item>
</section>
diff --git a/ui/events_directory.ui b/ui/events_directory.ui
index dd56911..bf0abca 100644
--- a/ui/events_directory.ui
+++ b/ui/events_directory.ui
@@ -86,11 +86,13 @@
<attribute name="action">CommonDisplaySearchbar</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplaySidebar</attribute>
+ <attribute name="label" translatable="yes">S_idebar</attribute>
+ <attribute name="accel">F9</attribute>
<attribute name="action">CommonDisplaySidebar</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayToolbar</attribute>
+ <attribute name="label" translatable="yes">T_oolbar</attribute>
+ <attribute name="accel"><Primary>F9</attribute>
<attribute name="action">CommonDisplayToolbar</attribute>
</item>
</section>
@@ -106,11 +108,11 @@
<attribute name="label" translatable="yes">Sort _Events</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
<attribute name="action">CommonSortEventsAscending</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsDescending</attribute>
+ <attribute name="label" translatable="yes">D_escending</attribute>
<attribute name="action">CommonSortEventsDescending</attribute>
</item>
</section>
diff --git a/ui/import.ui b/ui/import.ui
index 52ec86f..5f92d19 100644
--- a/ui/import.ui
+++ b/ui/import.ui
@@ -89,11 +89,13 @@
<attribute name="action">CommonDisplaySearchbar</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplaySidebar</attribute>
+ <attribute name="label" translatable="yes">S_idebar</attribute>
+ <attribute name="accel">F9</attribute>
<attribute name="action">CommonDisplaySidebar</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayToolbar</attribute>
+ <attribute name="label" translatable="yes">T_oolbar</attribute>
+ <attribute name="accel"><Primary>F9</attribute>
<attribute name="action">CommonDisplayToolbar</attribute>
</item>
</section>
@@ -109,36 +111,52 @@
<attribute name="label" translatable="yes">_Filter Photos</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonDisplayFiveOrHigher</attribute>
- <attribute name="action">CommonDisplayFiveOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel"><Primary>5</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayFourOrHigher</attribute>
- <attribute name="action">CommonDisplayFourOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel"><Primary>4</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayThreeOrHigher</attribute>
- <attribute name="action">CommonDisplayThreeOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel"><Primary>3</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayTwoOrHigher</attribute>
- <attribute name="action">CommonDisplayTwoOrHigher</attribute>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel"><Primary>2</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayOneOrHigher</attribute>
- <attribute name="action">CommonDisplayOneOrHigher</attribute>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel"><Primary>1</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayUnratedOrHigher</attribute>
- <attribute name="action">CommonDisplayUnratedOrHigher</attribute>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel"><Primary>0</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayRejectedOrHigher</attribute>
- <attribute name="action">CommonDisplayRejectedOrHigher</attribute>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel"><Primary>9</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayRejectedOnly</attribute>
- <attribute name="action">CommonDisplayRejectedOnly</attribute>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel"><Primary>8</attribute>
</item>
</section>
</submenu>
@@ -148,11 +166,11 @@
<attribute name="label" translatable="yes">Sort _Events</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
<attribute name="action">CommonSortEventsAscending</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsDescending</attribute>
+ <attribute name="label" translatable="yes">_Descending</attribute>
<attribute name="action">CommonSortEventsDescending</attribute>
</item>
</section>
diff --git a/ui/import_queue.ui b/ui/import_queue.ui
index e12f262..e8685bc 100644
--- a/ui/import_queue.ui
+++ b/ui/import_queue.ui
@@ -5,7 +5,7 @@
<attribute name="label" translatable="yes">_File</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">Stop</attribute>
+ <attribute name="label" translatable="yes">_Stop Import</attribute>
<attribute name="action">Stop</attribute>
</item>
</section>
@@ -48,11 +48,11 @@
<attribute name="label" translatable="yes">Sort _Events</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
<attribute name="action">CommonSortEventsAscending</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsDescending</attribute>
+ <attribute name="label" translatable="yes">D_escending</attribute>
<attribute name="action">CommonSortEventsDescending</attribute>
</item>
</section>
diff --git a/ui/media.ui b/ui/media.ui
index bc8766d..2a437ed 100644
--- a/ui/media.ui
+++ b/ui/media.ui
@@ -14,7 +14,8 @@
<attribute name="action">ExternalLibraryImport</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">Export</attribute>
+ <attribute name="label" translatable="yes">Save _As…</attribute>
+ <attribute name="accel"><Primary><Shift>e</attribute>
<attribute name="action">Export</attribute>
</item>
</section>
@@ -23,7 +24,8 @@
</section>
<section>
<item>
- <attribute name="label" translatable="yes">CommonJumpToFile</attribute>
+ <attribute name="label" translatable="yes">Show in File Mana_ger</attribute>
+ <attribute name="accel"><Primary><Shift>m</attribute>
<attribute name="action">CommonJumpToFile</attribute>
</item>
</section>
@@ -69,11 +71,13 @@
<section>
<attribute name="id">EditExtrasPlaceholder</attribute>
<item>
- <attribute name="label" translatable="yes">RemoveFromLibrary</attribute>
+ <attribute name="label" translatable="yes">R_emove from Library</attribute>
+ <attribute name="accel"><Shift>Delete</attribute>
<attribute name="action">RemoveFromLibrary</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">MoveToTrash</attribute>
+ <attribute name="label" translatable="yes">_Move to Trash</attribute>
+ <attribute name="accel">Delete</attribute>
<attribute name="action">MoveToTrash</attribute>
</item>
</section>
@@ -110,11 +114,13 @@
<attribute name="action">CommonDisplaySearchbar</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplaySidebar</attribute>
+ <attribute name="label" translatable="yes">S_idebar</attribute>
+ <attribute name="accel">F9</attribute>
<attribute name="action">CommonDisplaySidebar</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayToolbar</attribute>
+ <attribute name="label" translatable="yes">T_oolbar</attribute>
+ <attribute name="accel"><Primary>F9</attribute>
<attribute name="action">CommonDisplayToolbar</attribute>
</item>
</section>
@@ -130,11 +136,13 @@
<attribute name="action">ViewComment</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">ViewTags</attribute>
+ <attribute name="label" translatable="yes">Ta_gs</attribute>
+ <attribute name="accel"><Primary><Shift>g</attribute>
<attribute name="action">ViewTags</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">ViewRatings</attribute>
+ <attribute name="label" translatable="yes">_Ratings</attribute>
+ <attribute name="accel"><Primary><Shift>n</attribute>
<attribute name="action">ViewRatings</attribute>
</item>
</section>
@@ -143,68 +151,84 @@
<attribute name="label" translatable="yes">_Filter Photos</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonDisplayFiveOrHigher</attribute>
- <attribute name="action">CommonDisplayFiveOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel"><Primary>5</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayFourOrHigher</attribute>
- <attribute name="action">CommonDisplayFourOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel"><Primary>4</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayThreeOrHigher</attribute>
- <attribute name="action">CommonDisplayThreeOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel"><Primary>3</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayTwoOrHigher</attribute>
- <attribute name="action">CommonDisplayTwoOrHigher</attribute>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel"><Primary>2</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayOneOrHigher</attribute>
- <attribute name="action">CommonDisplayOneOrHigher</attribute>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel"><Primary>1</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayUnratedOrHigher</attribute>
- <attribute name="action">CommonDisplayUnratedOrHigher</attribute>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel"><Primary>0</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayRejectedOrHigher</attribute>
- <attribute name="action">CommonDisplayRejectedOrHigher</attribute>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel"><Primary>9</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayRejectedOnly</attribute>
- <attribute name="action">CommonDisplayRejectedOnly</attribute>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel"><Primary>8</attribute>
</item>
</section>
</submenu>
</section>
<section>
<submenu>
- <attribute name="label" translatable="yes">SortPhotos</attribute>
+ <attribute name="label" translatable="yes">Sort _Photos</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">SortByTitle</attribute>
+ <attribute name="label" translatable="yes">By _Title</attribute>
<attribute name="action">SortByTitle</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">SortByFilename</attribute>
+ <attribute name="label" translatable="yes">By _Filename</attribute>
<attribute name="action">SortByFilename</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">SortByExposureDate</attribute>
+ <attribute name="label" translatable="yes">By Exposure _Date</attribute>
<attribute name="action">SortByExposureDate</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">SortByRating</attribute>
+ <attribute name="label" translatable="yes">By _Rating</attribute>
<attribute name="action">SortByRating</attribute>
</item>
</section>
<section>
<item>
- <attribute name="label" translatable="yes">SortAscending</attribute>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
<attribute name="action">SortAscending</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">SortDescending</attribute>
+ <attribute name="label" translatable="yes">D_escending</attribute>
<attribute name="action">SortDescending</attribute>
</item>
</section>
@@ -213,11 +237,11 @@
<attribute name="label" translatable="yes">Sort _Events</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
<attribute name="action">CommonSortEventsAscending</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsDescending</attribute>
+ <attribute name="label" translatable="yes">_Descending</attribute>
<attribute name="action">CommonSortEventsDescending</attribute>
</item>
</section>
@@ -246,11 +270,12 @@
</section>
<section>
<item>
- <attribute name="label" translatable="yes">Flag</attribute>
+ <attribute name="label" translatable="yes">_Flag</attribute>
+ <attribute name="accel"><Primary>g</attribute>
<attribute name="action">Flag</attribute>
</item>
<submenu>
- <attribute name="label" translatable="yes">Rate</attribute>
+ <attribute name="label" translatable="yes">_Set Rating</attribute>
<section>
<item>
<attribute name="label" translatable="yes">RateFive</attribute>
diff --git a/ui/offline.ui b/ui/offline.ui
index 4968344..54ed0c1 100644
--- a/ui/offline.ui
+++ b/ui/offline.ui
@@ -55,7 +55,8 @@
</section>
<section>
<item>
- <attribute name="label" translatable="yes">RemoveFromLibrary</attribute>
+ <attribute name="label" translatable="yes">R_emove from Library</attribute>
+ <attribute name="accel"><Shift>Delete</attribute>
<attribute name="action">RemoveFromLibrary</attribute>
</item>
</section>
@@ -92,11 +93,13 @@
<attribute name="action">CommonDisplaySearchbar</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplaySidebar</attribute>
+ <attribute name="label" translatable="yes">S_idebar</attribute>
+ <attribute name="accel">F9</attribute>
<attribute name="action">CommonDisplaySidebar</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayToolbar</attribute>
+ <attribute name="label" translatable="yes">T_oolbar</attribute>
+ <attribute name="accel"><Primary>F9</attribute>
<attribute name="action">CommonDisplayToolbar</attribute>
</item>
</section>
@@ -105,36 +108,52 @@
<attribute name="label" translatable="yes">_Filter Photos</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonDisplayFiveOrHigher</attribute>
- <attribute name="action">CommonDisplayFiveOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel"><Primary>5</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayFourOrHigher</attribute>
- <attribute name="action">CommonDisplayFourOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel"><Primary>4</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayThreeOrHigher</attribute>
- <attribute name="action">CommonDisplayThreeOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel"><Primary>3</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayTwoOrHigher</attribute>
- <attribute name="action">CommonDisplayTwoOrHigher</attribute>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel"><Primary>2</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayOneOrHigher</attribute>
- <attribute name="action">CommonDisplayOneOrHigher</attribute>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel"><Primary>1</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayUnratedOrHigher</attribute>
- <attribute name="action">CommonDisplayUnratedOrHigher</attribute>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel"><Primary>0</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayRejectedOrHigher</attribute>
- <attribute name="action">CommonDisplayRejectedOrHigher</attribute>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel"><Primary>9</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayRejectedOnly</attribute>
- <attribute name="action">CommonDisplayRejectedOnly</attribute>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel"><Primary>8</attribute>
</item>
</section>
</submenu>
@@ -144,11 +163,11 @@
<attribute name="label" translatable="yes">Sort _Events</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
<attribute name="action">CommonSortEventsAscending</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsDescending</attribute>
+ <attribute name="label" translatable="yes">D_escending</attribute>
<attribute name="action">CommonSortEventsDescending</attribute>
</item>
</section>
diff --git a/ui/photo.ui b/ui/photo.ui
index 598df1c..0ff45cc 100644
--- a/ui/photo.ui
+++ b/ui/photo.ui
@@ -14,7 +14,8 @@
<attribute name="action">ExternalLibraryImport</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">Export</attribute>
+ <attribute name="label" translatable="yes">Save _As…</attribute>
+ <attribute name="accel"><Primary><Shift>e</attribute>
<attribute name="action">Export</attribute>
</item>
</section>
@@ -73,11 +74,13 @@
</section>
<section>
<item>
- <attribute name="label" translatable="yes">RemoveFromLibrary</attribute>
+ <attribute name="label" translatable="yes">R_emove from Library</attribute>
+ <attribute name="accel"><Shift>Delete</attribute>
<attribute name="action">RemoveFromLibrary</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">MoveToTrash</attribute>
+ <attribute name="label" translatable="yes">_Move to Trash</attribute>
+ <attribute name="accel">Delete</attribute>
<attribute name="action">MoveToTrash</attribute>
</item>
</section>
@@ -102,17 +105,20 @@
<attribute name="action">CommonDisplayExtendedProperties</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplaySidebar</attribute>
+ <attribute name="label" translatable="yes">S_idebar</attribute>
+ <attribute name="accel">F9</attribute>
<attribute name="action">CommonDisplaySidebar</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayToolbar</attribute>
+ <attribute name="label" translatable="yes">T_oolbar</attribute>
+ <attribute name="accel"><Primary>F9</attribute>
<attribute name="action">CommonDisplayToolbar</attribute>
</item>
</section>
<section>
<item>
- <attribute name="label" translatable="yes">ViewRatings</attribute>
+ <attribute name="label" translatable="yes">_Ratings</attribute>
+ <attribute name="accel"><Primary><Shift>n</attribute>
<attribute name="action">ViewRatings</attribute>
</item>
</section>
@@ -121,11 +127,11 @@
<attribute name="label" translatable="yes">Sort _Events</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
<attribute name="action">CommonSortEventsAscending</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsDescending</attribute>
+ <attribute name="label" translatable="yes">_Descending</attribute>
<attribute name="action">CommonSortEventsDescending</attribute>
</item>
</section>
diff --git a/ui/photo_context.ui b/ui/photo_context.ui
index b859aca..1af8513 100644
--- a/ui/photo_context.ui
+++ b/ui/photo_context.ui
@@ -115,7 +115,8 @@
</section>
<section>
<item>
- <attribute name="label" translatable="yes">MoveToTrash</attribute>
+ <attribute name="label" translatable="yes">_Move to Trash</attribute>
+ <attribute name="accel">Delete</attribute>
<attribute name="action">MoveToTrash</attribute>
</item>
</section>
diff --git a/ui/trash.ui b/ui/trash.ui
index 6fc84ad..d47ace3 100644
--- a/ui/trash.ui
+++ b/ui/trash.ui
@@ -115,36 +115,52 @@
<attribute name="label" translatable="yes">_Filter Photos</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonDisplayFiveOrHigher</attribute>
- <attribute name="action">CommonDisplayFiveOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">7</attribute>
+ <attribute name="accel"><Primary>5</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayFourOrHigher</attribute>
- <attribute name="action">CommonDisplayFourOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">6</attribute>
+ <attribute name="accel"><Primary>4</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayThreeOrHigher</attribute>
- <attribute name="action">CommonDisplayThreeOrHigher</attribute>
+ <attribute name="label" translatable="no">★★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">5</attribute>
+ <attribute name="accel"><Primary>3</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayTwoOrHigher</attribute>
- <attribute name="action">CommonDisplayTwoOrHigher</attribute>
+ <attribute name="label" translatable="no">★★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">4</attribute>
+ <attribute name="accel"><Primary>2</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayOneOrHigher</attribute>
- <attribute name="action">CommonDisplayOneOrHigher</attribute>
+ <attribute name="label" translatable="no">★</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">3</attribute>
+ <attribute name="accel"><Primary>1</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayUnratedOrHigher</attribute>
- <attribute name="action">CommonDisplayUnratedOrHigher</attribute>
+ <attribute name="label" translatable="yes">_All Photos</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">2</attribute>
+ <attribute name="accel"><Primary>0</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayRejectedOrHigher</attribute>
- <attribute name="action">CommonDisplayRejectedOrHigher</attribute>
+ <attribute name="label" translatable="yes">All + _Rejected</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">1</attribute>
+ <attribute name="accel"><Primary>9</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonDisplayRejectedOnly</attribute>
- <attribute name="action">CommonDisplayRejectedOnly</attribute>
+ <attribute name="label" translatable="yes">Rejected _Only</attribute>
+ <attribute name="action">filterbar.display.rating</attribute>
+ <attribute name="target">8</attribute>
+ <attribute name="accel"><Primary>8</attribute>
</item>
</section>
</submenu>
@@ -154,11 +170,11 @@
<attribute name="label" translatable="yes">Sort _Events</attribute>
<section>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsAscending</attribute>
+ <attribute name="label" translatable="yes">_Ascending</attribute>
<attribute name="action">CommonSortEventsAscending</attribute>
</item>
<item>
- <attribute name="label" translatable="yes">CommonSortEventsDescending</attribute>
+ <attribute name="label" translatable="yes">D_escending</attribute>
<attribute name="action">CommonSortEventsDescending</attribute>
</item>
</section>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
