summaryrefslogtreecommitdiff
path: root/src/Resources.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-03 13:15:00 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-04-03 13:15:00 +0200
commitbc53b714952ceb0afd02b591403cb2bc0cb1aab9 (patch)
tree8ff57ed1a1265b2c87f37e3c8fa19876faf80990 /src/Resources.vala
parentd4c476947425c12b1984fedea16f8a8c42a07ba3 (diff)
parentc43dfb815a4951b8248f4f0e98babe4f80204f03 (diff)
Merge tag 'upstream/0.22.0'
Upstream version 0.22.0
Diffstat (limited to 'src/Resources.vala')
-rw-r--r--src/Resources.vala162
1 files changed, 62 insertions, 100 deletions
diff --git a/src/Resources.vala b/src/Resources.vala
index c8f02c4..54118f8 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -1,4 +1,4 @@
-/* Copyright 2009-2014 Yorba Foundation
+/* Copyright 2009-2015 Yorba Foundation
*
* This software is licensed under the GNU LGPL (version 2.1 or later).
* See the COPYING file in this distribution.
@@ -24,7 +24,7 @@ namespace Resources {
public const string? GIT_VERSION = null;
#endif
- public const string COPYRIGHT = _("Copyright 2009-2014 Yorba Foundation");
+ public const string COPYRIGHT = _("Copyright 2009-2015 Yorba Foundation");
public const string APP_GETTEXT_PACKAGE = GETTEXT_PACKAGE;
public const string HOME_URL = "https://wiki.gnome.org/Apps/Shotwell";
@@ -73,7 +73,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string CROP = "shotwell-crop";
public const string STRAIGHTEN = "shotwell-straighten";
public const string REDEYE = "shotwell-redeye";
- public const string ADJUST = "shotwell-adjust";
+ public const string ADJUST = "image-adjust";
public const string PIN_TOOLBAR = "shotwell-pin-toolbar";
public const string MAKE_PRIMARY = "shotwell-make-primary";
public const string IMPORT = "shotwell-import";
@@ -82,6 +82,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string CROP_PIVOT_RETICLE = "shotwell-crop-pivot-reticle";
public const string PUBLISH = "applications-internet";
public const string MERGE = "shotwell-merge-events";
+
+ public const string GO_NEXT = "go-next";
+ public const string GO_PREVIOUS = "go-previous";
public const string ICON_APP = "shotwell.svg";
public const string ICON_APP16 = "shotwell-16.svg";
@@ -117,8 +120,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string ICON_NO_EVENT = "no-event";
public const string ICON_ONE_TAG = "one-tag";
public const string ICON_TAGS = "multiple-tags";
- public const string ICON_FOLDER_CLOSED = "folder";
- public const string ICON_FOLDER_OPEN = "folder-open";
+ public const string ICON_FOLDER = "folder";
public const string ICON_FOLDER_DOCUMENTS = "folder-documents";
public const string ICON_IMPORTING = "go-down";
public const string ICON_LAST_IMPORT = "document-open-recent";
@@ -155,6 +157,37 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string VFLIP_MENU = _("Flip Verti_cally");
public const string VFLIP_LABEL = _("Flip Vertically");
+ public const string ABOUT_LABEL = _("_About");
+ public const string APPLY_LABEL = _("_Apply");
+ public const string CANCEL_LABEL = _("_Cancel");
+ public const string DELETE_LABEL = _("_Delete");
+ public const string EDIT_LABEL = _("_Edit");
+ public const string FORWARD_LABEL = _("_Forward");
+ public const string FULLSCREEN_LABEL = _("Fulls_creen");
+ public const string HELP_LABEL = _("_Help");
+ public const string LEAVE_FULLSCREEN_LABEL = _("Leave _Fullscreen");
+ public const string NEW_LABEL = _("_New");
+ public const string NEXT_LABEL = _("_Next");
+ public const string OK_LABEL = _("_OK");
+ public const string PLAY_LABEL = _("_Play");
+ public const string PREFERENCES_LABEL = _("_Preferences");
+ public const string PREVIOUS_LABEL = _("_Previous");
+ public const string PRINT_LABEL = _("_Print");
+ public const string QUIT_LABEL = _("_Quit");
+ public const string REFRESH_LABEL = _("_Refresh");
+ public const string REMOVE_LABEL = _("_Remove");
+ public const string REVERT_TO_SAVED_LABEL = _("_Revert");
+ public const string SAVE_LABEL = _("_Save");
+ public const string SAVE_AS_LABEL = _("Save _As");
+ public const string SORT_ASCENDING_LABEL = _("Sort _Ascending");
+ public const string SORT_DESCENDING_LABEL = _("Sort _Descending");
+ public const string STOP_LABEL = _("_Stop");
+ public const string UNDELETE_LABEL = _("_Undelete");
+ public const string ZOOM_100_LABEL = _("_Normal Size");
+ public const string ZOOM_FIT_LABEL = _("Best _Fit");
+ public const string ZOOM_IN_LABEL = _("Zoom _In");
+ public const string ZOOM_OUT_LABEL = _("Zoom _Out");
+
public const string ENHANCE_MENU = _("_Enhance");
public const string ENHANCE_LABEL = _("Enhance");
public const string ENHANCE_TOOLTIP = _("Automatically improve the photo's appearance");
@@ -246,7 +279,9 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string DISPLAY_REJECTED_OR_HIGHER_TOOLTIP = _("Show all photos, including rejected");
public const string DISPLAY_UNRATED_OR_HIGHER_MENU = _("_All Photos");
+ // Button label
public const string DISPLAY_UNRATED_OR_HIGHER_LABEL = _("Show all photos");
+ // Button tooltip
public const string DISPLAY_UNRATED_OR_HIGHER_TOOLTIP = _("Show all photos");
public const string VIEW_RATINGS_MENU = _("_Ratings");
@@ -269,9 +304,11 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string PUBLISH_TOOLTIP = _("Publish to various websites");
public const string EDIT_TITLE_MENU = _("Edit _Title...");
+ // Button label
public const string EDIT_TITLE_LABEL = _("Edit Title");
public const string EDIT_COMMENT_MENU = _("Edit _Comment...");
+ // Button label
public const string EDIT_COMMENT_LABEL = _("Edit Comment");
public const string EDIT_EVENT_COMMENT_MENU = _("Edit Event _Comment...");
@@ -282,6 +319,7 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
public const string ADD_TAGS_MENU = _("Add _Tags...");
public const string ADD_TAGS_CONTEXT_MENU = _("_Add Tags...");
+ // Dialog title
public const string ADD_TAGS_TITLE = _("Add Tags");
public const string PREFERENCES_MENU = _("_Preferences");
@@ -306,14 +344,17 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
}
public string add_tags_label(string[] names) {
- if (names.length == 1)
+ if (names.length == 1) {
return _("Add Tag \"%s\"").printf(HierarchicalTagUtilities.get_basename(names[0]));
- else if (names.length == 2)
+ } else if (names.length == 2) {
+ // Used when adding two tags to photo(s)
return _("Add Tags \"%s\" and \"%s\"").printf(
- HierarchicalTagUtilities.get_basename(names[0]),
- HierarchicalTagUtilities.get_basename(names[1]));
- else
+ HierarchicalTagUtilities.get_basename(names[0]),
+ HierarchicalTagUtilities.get_basename(names[1]));
+ } else {
+ // Undo/Redo command name (in Edit menu)
return _("Add Tags");
+ }
}
public string delete_tag_menu(string name) {
@@ -677,13 +718,11 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
File icons_dir = AppDirs.get_resources_dir().get_child("icons");
add_stock_icon(icons_dir.get_child("crop.svg"), CROP);
add_stock_icon(icons_dir.get_child("redeye.png"), REDEYE);
- add_stock_icon(icons_dir.get_child("image-adjust.svg"), ADJUST);
- add_stock_icon(icons_dir.get_child("pin-toolbar.svg"), PIN_TOOLBAR);
add_stock_icon(icons_dir.get_child("make-primary.svg"), MAKE_PRIMARY);
add_stock_icon(icons_dir.get_child("import.svg"), IMPORT);
add_stock_icon(icons_dir.get_child("straighten.svg"), STRAIGHTEN);
add_stock_icon(icons_dir.get_child("import-all.png"), IMPORT_ALL);
- add_stock_icon(icons_dir.get_child("enhance.png"), ENHANCE);
+ add_stock_icon(icons_dir.get_child("shotwell-auto-enhance.png"), ENHANCE);
add_stock_icon(icons_dir.get_child("crop-pivot-reticle.png"), CROP_PIVOT_RETICLE);
add_stock_icon(icons_dir.get_child("merge.svg"), MERGE);
add_stock_icon_from_themed_icon(new GLib.ThemedIcon(ICON_FLAGGED_PAGE), ICON_FLAGGED_PAGE);
@@ -1046,97 +1085,20 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
providers.set(widget, styler);
}
-
- public const string INSET_FRAME_STYLESHEET =
- """ .frame {
- border-style: inset;
- border-width: 1px;
- }""";
-
- public const string SCROLL_FRAME_STYLESHEET =
- """ GtkScrolledWindow {
- border-width: 0;
- border-style: none;
- border-radius: 0;
- padding: 0;
- }
-
- .frame {
- border-width: 1px;
- border-style: inset;
- }""";
- public const string PAGE_STYLESHEET =
- """ .frame {
- border-width: 1px;
- border-style: inset;
- border-radius: 0;
-
- padding: 0;
- }""";
-
- public const string VIEWPORT_STYLESHEET =
- """ GtkViewport {
- border-width: 1px;
- border-style: inset;
- border-radius: 0;
- padding: 0;
- }""";
-
- public const string TOOLBAR_STYLESHEET_TEMPLATE =
- """
- @define-color primary-bg %s;
-
- .toolbar {
- background-color: @primary-bg;
- border-width: 1px;
- border-color: shade (@primary-bg, 0.75);
- border-style: solid;
- }""";
-
- public const string SEARCH_BUTTON_STYLESHEET_TEMPLATE =
- """
- @define-color primary-bg %s;
-
- .button {
- background-image: none;
- background-color: @primary-bg;
- border-image: none;
- border-color: shade (@primary-bg, 0.75) @primary-bg shade (@primary-bg, 0.75) @primary-bg;
- border-style: solid;
- margin: 5px;
-
- -unico-border-gradient: none;
- -unico-outer-stroke-width: 0;
- -unico-outer-stroke-gradient: none;
- -unico-glow-radius: 0;
- -unico-inner-stroke-width: 0;
- -unico-inner-stroke-color: shade (@primary-bg, 1.1);
+ public const string CUSTOM_CSS =
+ """LibraryWindow {
+ -GtkPaned-handle-size: 1;
}
-
- .button:prelight {
- border-style: solid;
- border-width: 1px;
- border-color: shade (@primary-bg, 1.1);
-
- -unico-inner-stroke-color: shade (@primary-bg, 1.1);
- -unico-inner-stroke-width: 0;
-
- -unico-outer-stroke-width: 1px;
- -unico-outer-stroke-color: shade (@primary-bg, 0.8);
+ LibraryWindow .pane-separator {
+ background-color: @borders;
}
-
- .button:active {
- background-image: none;
- background-color: shade (@primary-bg, 0.75);
- border-style: solid;
- border-width: 1px;
- border-color: shade (@primary-bg, 0.6);
-
- -unico-outer-stroke-width: 1px;
- -unico-outer-stroke-color: shade (@primary-bg, 1.1);
+ SearchFilterToolbar {
+ border-width: 0 0 1px 0;
+ border-style: solid;
+ border-color: @borders;
}""";
-
+
public const string ONIMAGE_FONT_COLOR = "#000000";
public const string ONIMAGE_FONT_BACKGROUND = "rgba(255,255,255,0.5)";
}