diff -Nru shotwell-0.9.1/debian/changelog shotwell-0.9.2/debian/changelog --- shotwell-0.9.1/debian/changelog 2011-04-05 14:52:31.000000000 +1000 +++ shotwell-0.9.2/debian/changelog 2011-04-13 16:45:34.000000000 +1000 @@ -1,3 +1,9 @@ +shotwell (0.9.2-0ubuntu1) natty; urgency=low + + * New upstream release (LP: #759487) + + -- Robert Ancell Wed, 13 Apr 2011 16:24:19 +1000 + shotwell (0.9.1-0ubuntu2) natty; urgency=low * debian/patches/01_lpi.patch: diff -Nru shotwell-0.9.1/Makefile shotwell-0.9.2/Makefile --- shotwell-0.9.1/Makefile 2011-04-05 10:35:38.000000000 +1000 +++ shotwell-0.9.2/Makefile 2011-04-13 08:04:01.000000000 +1000 @@ -1,6 +1,6 @@ PROGRAM = shotwell -VERSION = 0.9.1 +VERSION = 0.9.2 GETTEXT_PACKAGE = $(PROGRAM) BUILD_ROOT = 1 @@ -18,16 +18,16 @@ -include configure.mk +SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru pa hu en_GB uk ja fi zh_TW cs nb id th sl hr ar ast ro sr lt gl tr ca ko kk pt_BR eu he mk te ta +LOCAL_LANG_DIR=locale-langpack +SYSTEM_LANG_DIR := $(DESTDIR)$(PREFIX)/share/locale + VALAFLAGS := -g --enable-checking --thread --fatal-warnings $(USER_VALAFLAGS) DEFINES := _PREFIX='"$(PREFIX)"' _VERSION='"$(VERSION)"' GETTEXT_PACKAGE='"$(GETTEXT_PACKAGE)"' \ _LANG_SUPPORT_DIR='"$(SYSTEM_LANG_DIR)"' _LIBDIR='"${LIB}"' EXPORT_FLAGS = -export-dynamic -SUPPORTED_LANGUAGES=fr de it es pl et sv sk lv pt bg bn nl da zh_CN el ru pa hu en_GB uk ja fi zh_TW cs nb id th sl hr ar ast ro sr lt gl tr ca ko kk pt_BR eu he mk te ta -LOCAL_LANG_DIR=locale-langpack -SYSTEM_LANG_DIR=$(DESTDIR)$(PREFIX)/share/locale - include units.mk include plugins/plugins.mk @@ -568,15 +568,15 @@ endif $(PC_FILE): $(PC_INPUT) $(MAKE_FILES) - m4 '--define=_VERSION_=$(VERSION)' '--define=_PREFIX_=$(PREFIX)' '--define=_REQUIREMENTS_=$(PLUGIN_PKG_REQS)' \ - '--define=_LIB_=$(LIB)' $< > $@ + m4 '-D_VERSION_=$(VERSION)' '-D_PREFIX_=$(PREFIX)' '-D_REQUIREMENTS_=$(PLUGIN_PKG_REQS)' \ + '-D_LIB_=$(LIB)' $< > $@ $(UNITIZE_STAMP): $(MAKE_FILES) src/unit/rc/UnitInternals.m4 src/unit/rc/unitize_entry.m4 @mkdir -p $(UNITIZE_DIR) @$(foreach group,$(APP_GROUPS),\ `m4 '--define=_APP_GROUP_=$(group)' '--define=_UNIT_ENTRY_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).init_entry,)' '--define=_UNIT_TERMINATE_POINTS_=$(foreach nm,$($(group)_UNITS),$(nm).terminate_entry,)' src/unit/rc/unitize_entry.m4 > $(UNITIZE_DIR)/_$(group)_unitize_entry.vala`) @$(foreach nm,$(UNIT_NAMESPACES),\ - `m4 '--define=_UNIT_NAME_=$(nm)' '--define=_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '--define=_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`) + `m4 '-D_UNIT_NAME_=$(nm)' '-D_UNIT_USES_INITS_=$($(nm)_USES_INITS)' '-D_UNIT_USES_TERMINATORS_=$($(nm)_USES_TERMINATORS)' src/unit/rc/UnitInternals.m4 > $(UNITIZE_DIR)/_$(nm)Internals.vala`) @touch $@ $(UNITIZE_INITS) $(UNITIZE_ENTRIES): $(UNITIZE_STAMP) diff -Nru shotwell-0.9.1/NEWS shotwell-0.9.2/NEWS --- shotwell-0.9.1/NEWS 2011-04-05 04:21:09.000000000 +1000 +++ shotwell-0.9.2/NEWS 2011-04-13 06:15:57.000000000 +1000 @@ -1,3 +1,19 @@ +Shotwell 0.9.2 - 11 April 2011 - "He's a Mystery Wrapped in a Twinkie" +--------------------------------------------------------------------- + + * Resolves translation issue where shotwell.mo is installed in wrong location + * Fixes issue where cancelling Flickr upload can crash Shotwell + * Fixes issue where creating a Picasa Web album with an ampersand in the name + crashes Shotwell + * Resolves bug where selecting "Publish" in single photo mode publishes the + entire library instead of the selected photo + * Async I/O in publishing operations is now stopped when the user cancels the + operation + * Issue fixed on Fedora where the text was cut off in publishing dialog + * Fixes issue with ratings filter where it didn't function when the search bar + was hidden + + Shotwell 0.9.1 - 4 April 2011 - "All I Did was Hand Someone a Bag" --------------------------------------------------------------------- diff -Nru shotwell-0.9.1/plugins/common/RESTSupport.vala shotwell-0.9.2/plugins/common/RESTSupport.vala --- shotwell-0.9.1/plugins/common/RESTSupport.vala 2011-04-05 03:54:27.000000000 +1000 +++ shotwell-0.9.2/plugins/common/RESTSupport.vala 2011-04-12 06:26:25.000000000 +1000 @@ -506,9 +506,14 @@ while (true) { int current_char_value = (int) (current_char.get_char_validated()); + // null character signals end of string if (current_char_value < 1) break; - else if (current_char_value < 128) + + // no need to escape ASCII characters except the ampersand, greater-than sign and less-than + // signs, which are special in the world of XML + if ((current_char_value < 128) && (current_char_value != '&') && (current_char_value != '<') && + (current_char_value != '>')) encoded_str_builder.append_unichar(current_char.get_char_validated()); else encoded_str_builder.append("&#%d;".printf(current_char_value)); @@ -538,7 +543,12 @@ bool stop = false; foreach (Spit.Publishing.Publishable publishable in publishables) { GLib.File? file = publishable.get_serialized_file(); - assert (file != null); + + // if the current publishable hasn't been serialized, then skip it + if (file == null) { + current_file++; + continue; + } double fraction_complete = ((double) current_file) / publishables.length; if (status_updated != null) diff -Nru shotwell-0.9.1/plugins/shotwell-publishing/PicasaPublishing.vala shotwell-0.9.2/plugins/shotwell-publishing/PicasaPublishing.vala --- shotwell-0.9.1/plugins/shotwell-publishing/PicasaPublishing.vala 2011-04-05 03:54:27.000000000 +1000 +++ shotwell-0.9.2/plugins/shotwell-publishing/PicasaPublishing.vala 2011-04-12 06:26:25.000000000 +1000 @@ -816,6 +816,7 @@ private const string ADDITIONAL_SECURITY_MESSAGE = _("The email address and password you entered correspond to a Google account that has been tagged as requiring additional security. You can clear this tag by using your browser to log into Picasa Web Albums. To try again, re-enter your email address and password below."); private const int UNIFORM_ACTION_BUTTON_WIDTH = 102; + private const int VERTICAL_SPACE_HEIGHT = 32; public const int STANDARD_CONTENT_LABEL_WIDTH = 500; private weak Spit.Publishing.PluginHost host = null; @@ -838,7 +839,7 @@ Gtk.SeparatorToolItem bottom_space = new Gtk.SeparatorToolItem(); bottom_space.set_draw(false); add(top_space); - top_space.set_size_request(-1, 40); + top_space.set_size_request(-1, VERTICAL_SPACE_HEIGHT); Gtk.Label intro_message_label = new Gtk.Label(""); intro_message_label.set_line_wrap(true); @@ -861,7 +862,7 @@ Gtk.SeparatorToolItem long_message_space = new Gtk.SeparatorToolItem(); long_message_space.set_draw(false); add(long_message_space); - long_message_space.set_size_request(-1, 40); + long_message_space.set_size_request(-1, VERTICAL_SPACE_HEIGHT); break; case CredentialsPane.Mode.ADDITIONAL_SECURITY: @@ -870,7 +871,7 @@ Gtk.SeparatorToolItem long_message_space = new Gtk.SeparatorToolItem(); long_message_space.set_draw(false); add(long_message_space); - long_message_space.set_size_request(-1, 40); + long_message_space.set_size_request(-1, VERTICAL_SPACE_HEIGHT); break; } @@ -911,10 +912,10 @@ login_button.set_size_request(UNIFORM_ACTION_BUTTON_WIDTH, -1); entry_widgets_table.attach(go_back_button_aligner, 0, 1, 2, 3, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, - Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, 40); + Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, VERTICAL_SPACE_HEIGHT); entry_widgets_table.attach(login_button_aligner, 1, 2, 2, 3, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, - Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, 40); + Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, VERTICAL_SPACE_HEIGHT); entry_widgets_table_aligner.add(entry_widgets_table); add(entry_widgets_table_aligner); @@ -922,7 +923,7 @@ password_entry_label.set_mnemonic_widget(password_entry); add(bottom_space); - bottom_space.set_size_request(-1, 40); + bottom_space.set_size_request(-1, VERTICAL_SPACE_HEIGHT); } private void on_login_button_clicked() { diff -Nru shotwell-0.9.1/po/ar.po shotwell-0.9.2/po/ar.po --- shotwell-0.9.1/po/ar.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/ar.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/ast.po shotwell-0.9.2/po/ast.po --- shotwell-0.9.1/po/ast.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/ast.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/bg.po shotwell-0.9.2/po/bg.po --- shotwell-0.9.1/po/bg.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/bg.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/bn.po shotwell-0.9.2/po/bn.po --- shotwell-0.9.1/po/bn.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/bn.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/ca.po shotwell-0.9.2/po/ca.po --- shotwell-0.9.1/po/ca.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/ca.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/cs.po shotwell-0.9.2/po/cs.po --- shotwell-0.9.1/po/cs.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/cs.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/da.po shotwell-0.9.2/po/da.po --- shotwell-0.9.1/po/da.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/da.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/de.po shotwell-0.9.2/po/de.po --- shotwell-0.9.1/po/de.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/de.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/el.po shotwell-0.9.2/po/el.po --- shotwell-0.9.1/po/el.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/el.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/en_GB.po shotwell-0.9.2/po/en_GB.po --- shotwell-0.9.1/po/en_GB.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/en_GB.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/es.po shotwell-0.9.2/po/es.po --- shotwell-0.9.1/po/es.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/es.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/et.po shotwell-0.9.2/po/et.po --- shotwell-0.9.1/po/et.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/et.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-23 10:57+0000\n" diff -Nru shotwell-0.9.1/po/eu.po shotwell-0.9.2/po/eu.po --- shotwell-0.9.1/po/eu.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/eu.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/fi.po shotwell-0.9.2/po/fi.po --- shotwell-0.9.1/po/fi.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/fi.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/fr.po shotwell-0.9.2/po/fr.po --- shotwell-0.9.1/po/fr.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/fr.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-24 17:13+0000\n" diff -Nru shotwell-0.9.1/po/gl.po shotwell-0.9.2/po/gl.po --- shotwell-0.9.1/po/gl.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/gl.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/he.po shotwell-0.9.2/po/he.po --- shotwell-0.9.1/po/he.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/he.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/hr.po shotwell-0.9.2/po/hr.po --- shotwell-0.9.1/po/hr.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/hr.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/hu.po shotwell-0.9.2/po/hu.po --- shotwell-0.9.1/po/hu.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/hu.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/id.po shotwell-0.9.2/po/id.po --- shotwell-0.9.1/po/id.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/id.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/it.po shotwell-0.9.2/po/it.po --- shotwell-0.9.1/po/it.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/it.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/ja.po shotwell-0.9.2/po/ja.po --- shotwell-0.9.1/po/ja.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/ja.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-25 18:17+0000\n" diff -Nru shotwell-0.9.1/po/kk.po shotwell-0.9.2/po/kk.po --- shotwell-0.9.1/po/kk.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/kk.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/ko.po shotwell-0.9.2/po/ko.po --- shotwell-0.9.1/po/ko.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/ko.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/lt.po shotwell-0.9.2/po/lt.po --- shotwell-0.9.1/po/lt.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/lt.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/lv.po shotwell-0.9.2/po/lv.po --- shotwell-0.9.1/po/lv.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/lv.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/mk.po shotwell-0.9.2/po/mk.po --- shotwell-0.9.1/po/mk.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/mk.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/nb.po shotwell-0.9.2/po/nb.po --- shotwell-0.9.1/po/nb.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/nb.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/nl.po shotwell-0.9.2/po/nl.po --- shotwell-0.9.1/po/nl.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/nl.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/pa.po shotwell-0.9.2/po/pa.po --- shotwell-0.9.1/po/pa.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/pa.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/pl.po shotwell-0.9.2/po/pl.po --- shotwell-0.9.1/po/pl.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/pl.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/pt_BR.po shotwell-0.9.2/po/pt_BR.po --- shotwell-0.9.1/po/pt_BR.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/pt_BR.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/pt.po shotwell-0.9.2/po/pt.po --- shotwell-0.9.1/po/pt.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/pt.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" -"PO-Revision-Date: 2011-03-22 15:09+0000\n" +"PO-Revision-Date: 2011-04-05 09:34+0000\n" "Last-Translator: smarquespt \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -126,7 +126,7 @@ "\n" "%s" msgstr "" -"Ocorreu um erro fatal ocorreu ao aceder à galeria do Shotwell. O Shotwell não pode continuar.\n" +"Ocorreu um erro fatal ao aceder à galeria do Shotwell. O Shotwell não pode continuar.\n" "\n" "%s" diff -Nru shotwell-0.9.1/po/ro.po shotwell-0.9.2/po/ro.po --- shotwell-0.9.1/po/ro.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/ro.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/ru.po shotwell-0.9.2/po/ru.po --- shotwell-0.9.1/po/ru.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/ru.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-29 06:25+0000\n" diff -Nru shotwell-0.9.1/po/sk.po shotwell-0.9.2/po/sk.po --- shotwell-0.9.1/po/sk.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/sk.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/sl.po shotwell-0.9.2/po/sl.po --- shotwell-0.9.1/po/sl.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/sl.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/sr.po shotwell-0.9.2/po/sr.po --- shotwell-0.9.1/po/sr.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/sr.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/sv.po shotwell-0.9.2/po/sv.po --- shotwell-0.9.1/po/sv.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/sv.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/ta.po shotwell-0.9.2/po/ta.po --- shotwell-0.9.1/po/ta.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/ta.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-31 19:55+0000\n" diff -Nru shotwell-0.9.1/po/te.po shotwell-0.9.2/po/te.po --- shotwell-0.9.1/po/te.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/te.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" -"PO-Revision-Date: 2011-04-01 02:02+0000\n" +"PO-Revision-Date: 2011-04-07 01:00+0000\n" "Last-Translator: Praveen_Illa \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -24,29 +24,29 @@ #: plugins/shotwell-publishing/YouTubePublishing.vala:23 #: plugins/shotwell-publishing/FlickrPublishing.vala:23 msgid "translator-credits" -msgstr "అనువాదకుడి-పరపతులు" +msgstr "Praveen Illa , 2011." # GNOME Application Name msgid "Shotwell Photo Manager" -msgstr "" +msgstr "షాట్‌వెల్ ఫొటో నిర్వాహకి" # GNOME Application Class ("Generic Name") #: src/Resources.vala:14 msgid "Photo Manager" -msgstr "" +msgstr "ఫొటో నిర్వాహకి" # GNOME Application Comment msgid "Organize your photos" -msgstr "" +msgstr "మీ ఫొటోలను నిర్వహించండి" # GNOME Application Name for Direct Edit Mode msgid "Shotwell Photo Viewer" -msgstr "" +msgstr "షాట్‌వెల్ ఫొటో వీక్షకం" # GNOME Application Class for Direct Edit Mode #: src/Resources.vala:15 msgid "Photo Viewer" -msgstr "" +msgstr "ఫొటో వీక్షకం" #: src/LastImportPage.vala:17 msgid "Last Import" @@ -54,7 +54,7 @@ #: src/AppWindow.vala:57 msgid "Pin Toolbar" -msgstr "" +msgstr "సాధనపట్టీని తగిలించు" #: src/AppWindow.vala:58 msgid "Pin the toolbar open" @@ -62,11 +62,11 @@ #: src/AppWindow.vala:61 src/AppWindow.vala:139 msgid "Leave fullscreen" -msgstr "" +msgstr "పూర్తి తెరను వదిలిపెట్టు" #: src/AppWindow.vala:138 msgid "Leave _Fullscreen" -msgstr "" +msgstr "పూర్తి తెరను వదిలిపెట్టు(_F)" #: src/AppWindow.vala:490 msgid "_Quit" @@ -74,7 +74,7 @@ #: src/AppWindow.vala:491 msgid "Quit Shotwell" -msgstr "" +msgstr "షాట్‌వెల్ నిష్క్రమించాలా" #: src/AppWindow.vala:496 msgid "_About" @@ -90,15 +90,15 @@ #: src/AppWindow.vala:503 msgid "Use Shotwell at fullscreen" -msgstr "" +msgstr "షాట్‌వెల్‌ను పూర్తితెర వద్దవాడు" #: src/AppWindow.vala:508 msgid "_Contents" -msgstr "" +msgstr "విషయసూచిక(_C)" #: src/AppWindow.vala:509 msgid "More information on Shotwell" -msgstr "" +msgstr "షాట్‌వెల్ గురించిన మరింత సమాచారం" #: src/AppWindow.vala:514 msgid "_Frequently Asked Questions" @@ -121,6 +121,9 @@ "\n" "%s" msgstr "" +"షాట్‌వెల్ లైబ్రరీని వాడటానికి ప్రయత్నిస్తున్నపుడు ఒక ఫేటల్ దోషం సంభవించింది. షాట్‌వెల్ ఇక కొనసాగించలేదు.\n" +"\n" +"%s" #: src/AppWindow.vala:666 #: plugins/shotwell-transitions/shotwell-transitions.vala:81 @@ -129,12 +132,12 @@ #: plugins/shotwell-publishing/YouTubePublishing.vala:25 #: plugins/shotwell-publishing/FlickrPublishing.vala:25 msgid "Visit the Yorba web site" -msgstr "" +msgstr "యోర్బ వెబ్‌సైటును సందర్శించండి" #: src/AppWindow.vala:678 #, c-format msgid "Unable to display help: %s" -msgstr "" +msgstr "సహాయాన్ని చూపలేకపోతుంది: %s" #: src/AppWindow.vala:686 #, c-format @@ -2159,27 +2162,27 @@ #: src/CollectionPage.vala:529 src/CollectionPage.vala:544 msgid "Rotating" -msgstr "" +msgstr "తిప్పబడుతోంది" #: src/CollectionPage.vala:529 src/CollectionPage.vala:544 msgid "Undoing Rotate" -msgstr "" +msgstr "తిప్పినదానిని రద్దుచేస్తోంది" #: src/CollectionPage.vala:553 msgid "Flipping Horizontally" -msgstr "" +msgstr "అడ్డముగా తిప్పబడుతోంది" #: src/CollectionPage.vala:554 msgid "Undoing Flip Horizontally" -msgstr "" +msgstr "అడ్డంగా తిప్పినదానిని రద్దుచేయి" #: src/CollectionPage.vala:563 msgid "Flipping Vertically" -msgstr "" +msgstr "నిలువుగా తిప్పబడుతోంది" #: src/CollectionPage.vala:564 msgid "Undoing Flip Vertically" -msgstr "" +msgstr "నిలువుగా తిప్పినదానిని రద్దుచేయి" #: src/CollectionPage.vala:716 msgid "Library" diff -Nru shotwell-0.9.1/po/th.po shotwell-0.9.2/po/th.po --- shotwell-0.9.1/po/th.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/th.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-30 04:17+0000\n" diff -Nru shotwell-0.9.1/po/tr.po shotwell-0.9.2/po/tr.po --- shotwell-0.9.1/po/tr.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/tr.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" -"PO-Revision-Date: 2011-03-25 00:46+0000\n" -"Last-Translator: kara \n" +"PO-Revision-Date: 2011-04-06 15:32+0000\n" +"Last-Translator: MysD \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -26,7 +26,8 @@ msgid "translator-credits" msgstr "" "Yiğit Ateş \n" -"Hüseyin Demirtaş " +"Hüseyin Demirtaş \n" +"Muhammet Yüksel " # GNOME Application Name msgid "Shotwell Photo Manager" @@ -431,27 +432,27 @@ #: src/Resources.vala:125 msgid "Flip Hori_zontally" -msgstr "" +msgstr "Ya_tay Çevir" #: src/Resources.vala:126 msgid "Flip Horizontally" -msgstr "" +msgstr "Yatay Çevir" #: src/Resources.vala:127 msgid "Flip the photos horizontally" -msgstr "" +msgstr "Fotoğrafı yatay çevir" #: src/Resources.vala:129 msgid "Flip Verti_cally" -msgstr "" +msgstr "Di_key Çevir" #: src/Resources.vala:130 msgid "Flip Vertically" -msgstr "" +msgstr "Dikey Çevir" #: src/Resources.vala:131 msgid "Flip the photos vertically" -msgstr "" +msgstr "Fotoğrafı dikey çevir" #: src/Resources.vala:133 msgid "_Enhance" @@ -523,7 +524,7 @@ #: src/Resources.vala:156 msgid "Set as _Desktop Background" -msgstr "" +msgstr "_Masaüstü Arkapılan olarak ayarla" #: src/Resources.vala:157 msgid "Set selected image to be the new desktop background" @@ -531,7 +532,7 @@ #: src/Resources.vala:158 msgid "Set as _Desktop Slideshow..." -msgstr "" +msgstr "_Masaüstü Slayt gösterisi olarak ayarla..." #: src/Resources.vala:160 msgid "_Undo" @@ -615,119 +616,119 @@ #: src/Resources.vala:187 msgid "_Set Rating" -msgstr "" +msgstr "_Derecelendirmeyi Ayarla" #: src/Resources.vala:188 msgid "Set Rating" -msgstr "" +msgstr "Derecelendirmeyi Ayarla" #: src/Resources.vala:189 msgid "Change the rating of your photo" -msgstr "" +msgstr "Fotoğrafınızın derecelendirmesini değiştirin" #: src/Resources.vala:191 msgid "_Increase" -msgstr "" +msgstr "_Derecelendirmeyi arttır" #: src/Resources.vala:192 msgid "Increase Rating" -msgstr "" +msgstr "Derecelendirmeyi Arttır" #: src/Resources.vala:193 msgid "Increase the rating of your photo" -msgstr "" +msgstr "Fotoğrafınızın derecelendirmesini arttır" #: src/Resources.vala:195 msgid "_Decrease" -msgstr "" +msgstr "_Derecelendirmeyi Azalt" #: src/Resources.vala:196 msgid "Decrease Rating" -msgstr "" +msgstr "Derecelendirmeyi Azalt" #: src/Resources.vala:197 msgid "Decrease the rating of your photo" -msgstr "" +msgstr "Fotoğrafınızın derecelendirmesini azalt" #: src/Resources.vala:199 msgid "_Unrated" -msgstr "" +msgstr "_Derecesiz" #: src/Resources.vala:200 msgid "Rate Unrated" -msgstr "" +msgstr "Derecesiz Oran" #: src/Resources.vala:201 msgid "Setting as unrated" -msgstr "" +msgstr "Derecelendirilmemiş olarak ayarla" #: src/Resources.vala:202 msgid "Remove any ratings" -msgstr "" +msgstr "Derecelendirilmeyi kaldır" #: src/Resources.vala:204 msgid "_Rejected" -msgstr "" +msgstr "_Reddedilmiş" #: src/Resources.vala:205 msgid "Rate Rejected" -msgstr "" +msgstr "Reddedilmiş Oran" #: src/Resources.vala:206 msgid "Setting as rejected" -msgstr "" +msgstr "Reddedilen olarak ayarla" #: src/Resources.vala:207 msgid "Set rating to rejected" -msgstr "" +msgstr "Reddedilmiş derecelendirmeyi ayarla" #: src/Resources.vala:209 msgid "Rejected _Only" -msgstr "" +msgstr "_Sadece Reddedilmiş" #: src/Resources.vala:210 msgid "Rejected Only" -msgstr "" +msgstr "Sadece Reddedilmiş" #: src/Resources.vala:211 msgid "Show only rejected photos" -msgstr "" +msgstr "Sadece reddedilen fotoğraf" #: src/Resources.vala:213 msgid "All + _Rejected" -msgstr "" +msgstr "Tüm + _Reddedilen" #: src/Resources.vala:214 src/Resources.vala:215 msgid "Show all photos, including rejected" -msgstr "" +msgstr "Reddedilen dahil olmak üzere, tüm fotoğrafları göster" #: src/Resources.vala:217 msgid "_All Photos" -msgstr "" +msgstr "_Tüm Fotoğraflar" #: src/Resources.vala:218 src/Resources.vala:219 msgid "Show all photos" -msgstr "" +msgstr "Tüm fotoğrafları göster" #: src/Resources.vala:221 msgid "_Ratings" -msgstr "" +msgstr "_Değerlendirme" #: src/Resources.vala:222 msgid "Display each photo's rating" -msgstr "" +msgstr "Ekran ve fotoğrafı derecelendir" #: src/Resources.vala:224 msgid "_Filter Photos" -msgstr "" +msgstr "_Filtreli Fotoğraflar" #: src/Resources.vala:225 msgid "Filter Photos" -msgstr "" +msgstr "Filtreli Fotoğraflar" #: src/Resources.vala:226 msgid "Limit the number of photos displayed based on a filter" -msgstr "" +msgstr "Fotoğrafları sınırlı sayıda filtreye dayalı görüntüle" #: src/Resources.vala:228 msgid "_Duplicate" @@ -751,7 +752,7 @@ #: src/Resources.vala:235 msgid "_Print..." -msgstr "" +msgstr "_Baskı..." #: src/Resources.vala:236 src/direct/DirectPhotoPage.vala:72 msgid "Print the photo to a printer connected to your computer" @@ -759,19 +760,19 @@ #: src/Resources.vala:238 msgid "Pu_blish..." -msgstr "Ya_yımla..." +msgstr "Ya_yınla..." #: src/Resources.vala:239 msgid "Publish" -msgstr "Yayımla" +msgstr "Yayınla" #: src/Resources.vala:240 msgid "Publish to various websites" -msgstr "Çeşitli web sitelerinde yayımla" +msgstr "Çeşitli web sitelerinde yayınla" #: src/Resources.vala:242 msgid "E_dit Title..." -msgstr "" +msgstr "Başlık Dü_zenle..." #: src/Resources.vala:243 src/Dialogs.vala:883 msgid "Edit Title" @@ -779,7 +780,7 @@ #: src/Resources.vala:244 msgid "Edit title of the selected photo" -msgstr "" +msgstr "Seçilen fotoğraf başlığını düzenle" #: src/Resources.vala:246 msgid "_Adjust Date and Time..." @@ -831,11 +832,11 @@ #: src/Resources.vala:263 msgid "Send _To..." -msgstr "" +msgstr "Gön _der..." #: src/Resources.vala:264 msgid "Send photos by mail or instant message" -msgstr "" +msgstr "Posta veya anlık ileti ile fotoğraf gönder" #: src/Resources.vala:266 msgid "_Find..." @@ -851,7 +852,7 @@ #: src/Resources.vala:270 msgid "_Flag" -msgstr "" +msgstr "_Bayrak" #: src/Resources.vala:271 msgid "Flag the photos to work with them together" @@ -1428,7 +1429,7 @@ #, c-format msgid "%d Event" msgid_plural "%d Events" -msgstr[0] "" +msgstr[0] "%d Olaylar" #: src/Properties.vala:296 src/EventsDirectoryPage.vala:73 #, c-format @@ -1440,7 +1441,7 @@ #, c-format msgid "%d Video" msgid_plural "%d Videos" -msgstr[0] "" +msgstr[0] "%d videolar" #: src/Properties.vala:320 msgid "Date:" @@ -1464,12 +1465,12 @@ #: src/Properties.vala:347 msgid "Duration:" -msgstr "" +msgstr "Süre:" #: src/Properties.vala:347 #, c-format msgid "%.1f seconds" -msgstr "" +msgstr "%.1f saniye" #: src/Properties.vala:371 src/Properties.vala:375 src/Properties.vala:382 #: src/EditingTools.vala:2077 @@ -1813,7 +1814,7 @@ #: src/DesktopIntegration.vala:126 msgid "Send To" -msgstr "" +msgstr "Gönder" #: src/DesktopIntegration.vala:169 #, c-format @@ -1915,7 +1916,7 @@ #: src/PiwigoConnector.vala:801 msgid "Who can see those pictures ?" -msgstr "" +msgstr "Kim o resimleri görebilirsiniz?" #: src/PiwigoConnector.vala:828 #: plugins/shotwell-publishing/FacebookPublishing.vala:1657 @@ -1941,19 +1942,19 @@ #: src/PiwigoConnector.vala:904 msgid "Admins, Friends, Family, Contacts" -msgstr "" +msgstr "Yöneticiler, Arkadaşlar, Aile, Rehber" #: src/PiwigoConnector.vala:905 msgid "Admins, Family, Friends" -msgstr "" +msgstr "Yöneticiler, Aile, Arkadaşlar" #: src/PiwigoConnector.vala:906 msgid "Admins, Family" -msgstr "" +msgstr "Yöneticiler, Aile" #: src/PiwigoConnector.vala:907 msgid "Admins" -msgstr "" +msgstr "Yöneticiler" #: src/main.vala:81 #, c-format @@ -2191,7 +2192,7 @@ #: src/Dialogs.vala:15 msgid "Export Video" -msgstr "" +msgstr "Video Ihracatı" #: src/Dialogs.vala:41 msgid "Export Photos" @@ -2228,11 +2229,11 @@ #: src/Dialogs.vala:101 msgid "Unmodified" -msgstr "" +msgstr "Değiştirilmemiş" #: src/Dialogs.vala:102 msgid "Current" -msgstr "" +msgstr "Mevcut" #: src/Dialogs.vala:166 msgid "_Format:" @@ -2390,7 +2391,7 @@ #: src/Dialogs.vala:617 msgid "No photos or videos imported.\n" -msgstr "" +msgstr "Alınan resim ve videolar yok.\n" #: src/Dialogs.vala:632 msgid "Import Complete" @@ -2456,7 +2457,7 @@ #: src/Dialogs.vala:968 msgid "_Remove" -msgstr "" +msgstr "_Kaldır" #: src/Dialogs.vala:969 msgid "Remove Photo From Library" @@ -2538,22 +2539,22 @@ #: src/Dialogs.vala:1377 msgid "day" msgid_plural "days" -msgstr[0] "" +msgstr[0] "gün" #: src/Dialogs.vala:1378 msgid "hour" msgid_plural "hours" -msgstr[0] "" +msgstr[0] "saat" #: src/Dialogs.vala:1379 msgid "minute" msgid_plural "minutes" -msgstr[0] "" +msgstr[0] "dakika" #: src/Dialogs.vala:1380 msgid "second" msgid_plural "seconds" -msgstr[0] "" +msgstr[0] "saniye" #: src/Dialogs.vala:1424 #, c-format diff -Nru shotwell-0.9.1/po/uk.po shotwell-0.9.2/po/uk.po --- shotwell-0.9.1/po/uk.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/uk.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/po/zh_CN.po shotwell-0.9.2/po/zh_CN.po --- shotwell-0.9.1/po/zh_CN.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/zh_CN.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" -"PO-Revision-Date: 2011-03-22 15:09+0000\n" -"Last-Translator: lovenemesis \n" +"PO-Revision-Date: 2011-04-05 12:29+0000\n" +"Last-Translator: xhacker \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -24,7 +24,10 @@ #: plugins/shotwell-publishing/YouTubePublishing.vala:23 #: plugins/shotwell-publishing/FlickrPublishing.vala:23 msgid "translator-credits" -msgstr "翻译致谢" +msgstr "" +"Tommy He < tommy.he@linux.com>\n" +"zheng7fu2 < zheng7fu2@gmail.com>\n" +"Xhacker Liu " # GNOME Application Name msgid "Shotwell Photo Manager" @@ -62,11 +65,11 @@ #: src/AppWindow.vala:61 src/AppWindow.vala:139 msgid "Leave fullscreen" -msgstr "离开 全屏" +msgstr "离开全屏" #: src/AppWindow.vala:138 msgid "Leave _Fullscreen" -msgstr "离开 全屏(_F)" +msgstr "离开全屏(_F)" #: src/AppWindow.vala:490 msgid "_Quit" @@ -90,7 +93,7 @@ #: src/AppWindow.vala:503 msgid "Use Shotwell at fullscreen" -msgstr "在全屏时使用 Shotwell" +msgstr "全屏使用 Shotwell" #: src/AppWindow.vala:508 msgid "_Contents" @@ -98,7 +101,7 @@ #: src/AppWindow.vala:509 msgid "More information on Shotwell" -msgstr "更多关于 Shotwell 内容" +msgstr "更多关于 Shotwell 的内容" #: src/AppWindow.vala:514 msgid "_Frequently Asked Questions" @@ -1144,11 +1147,11 @@ #: src/Printing.vala:933 src/EditingTools.vala:656 msgid "Wallet (2 x 3 in.)" -msgstr "用于皮夹(2 x 3 )英寸" +msgstr "用于皮夹 (2 x 3) 英寸" #: src/Printing.vala:936 src/EditingTools.vala:657 msgid "Notecard (3 x 5 in.)" -msgstr "留言卡(3 x 5 英寸)" +msgstr "留言卡 (3 x 5 英寸)" #: src/Printing.vala:939 src/EditingTools.vala:658 msgid "4 x 6 in." @@ -1355,7 +1358,7 @@ #: src/direct/DirectPhotoPage.vala:247 src/direct/DirectPhotoPage.vala:445 #, c-format msgid "Unable to load %s: %s" -msgstr "无法装载 %s ： %s" +msgstr "无法装载 %s：%s" #: src/direct/DirectPhotoPage.vala:387 msgid "_Save a Copy" @@ -1399,7 +1402,7 @@ # a list of format specifiers and their meanings. #: src/Properties.vala:38 msgid "%I:%M %p" -msgstr "%I:%M %p" +msgstr "%p%I:%M" #: src/Properties.vala:50 msgid "Today" @@ -1503,7 +1506,7 @@ #: src/Properties.vala:489 msgid "GPS latitude:" -msgstr "GPS 纬度" +msgstr "GPS 纬度：" #: src/Properties.vala:492 msgid "GPS longitude:" @@ -1542,11 +1545,11 @@ #: src/util/misc.vala:231 src/util/misc.vala:236 msgid "%a %b %d" -msgstr "%a %b %d" +msgstr "%a %b%d" #: src/util/misc.vala:232 msgid "%d, %Y" -msgstr "%d, %Y" +msgstr "%Y年%d" #: src/util/misc.vala:237 src/util/misc.vala:242 src/util/misc.vala:243 #: src/util/misc.vala:251 @@ -1646,7 +1649,7 @@ #: src/EditingTools.vala:653 msgid "SD Video (4 : 3)" -msgstr "标清视频(4 : 3)" +msgstr "标清视频 (4 : 3)" #: src/EditingTools.vala:654 msgid "HD Video (16 : 9)" @@ -1740,7 +1743,7 @@ #: src/SearchFilter.vala:679 #, c-format msgid "Error loading UI file %s: %s" -msgstr "载入 UI 文件 %s 时出错： %s" +msgstr "载入 UI 文件 %s 时出错：%s" #: src/SearchFilter.vala:686 msgid "Type" @@ -2163,23 +2166,23 @@ #: src/CollectionPage.vala:529 src/CollectionPage.vala:544 msgid "Undoing Rotate" -msgstr "取消旋转" +msgstr "正在取消旋转" #: src/CollectionPage.vala:553 msgid "Flipping Horizontally" -msgstr "水平翻转" +msgstr "正在水平翻转" #: src/CollectionPage.vala:554 msgid "Undoing Flip Horizontally" -msgstr "取消水平翻转" +msgstr "正在取消水平翻转" #: src/CollectionPage.vala:563 msgid "Flipping Vertically" -msgstr "垂直翻转" +msgstr "正在垂直翻转" #: src/CollectionPage.vala:564 msgid "Undoing Flip Vertically" -msgstr "取消垂直翻转" +msgstr "正在取消垂直翻转" #: src/CollectionPage.vala:716 msgid "Library" @@ -2346,7 +2349,7 @@ #, c-format msgid "1 non-image file skipped.\n" msgid_plural "%d non-image files skipped.\n" -msgstr[0] "%d 个非照片文件被跳过。\n" +msgstr[0] "跳过 %d 个非照片文件。\n" #: src/Dialogs.vala:575 #, c-format @@ -2421,7 +2424,7 @@ #: src/Dialogs.vala:895 msgid "_Trash File" msgid_plural "_Trash Files" -msgstr[0] "垃圾文件(_T)" +msgstr[0] "_Trash Files" #: src/Dialogs.vala:899 msgid "Only _Remove" @@ -2466,11 +2469,11 @@ #: src/Dialogs.vala:1177 msgid "AM" -msgstr "AM" +msgstr "上午" #: src/Dialogs.vala:1178 msgid "PM" -msgstr "PM" +msgstr "下午" #: src/Dialogs.vala:1179 msgid "24 Hr" @@ -2511,7 +2514,7 @@ # a list of format specifiers and their meanings. #: src/Dialogs.vala:1289 msgid "%m/%d/%Y, %I:%M:%S %p" -msgstr "%m/%d/%Y, %I:%M:%S %p" +msgstr "%m/%d/%Y %p%I:%M:%S" #: src/Dialogs.vala:1374 #, c-format @@ -2519,8 +2522,8 @@ "Exposure time will be shifted forward by\n" "%d %s, %d %s, %d %s, and %d %s." msgstr "" -"曝光时间将会被向较早时改变 \n" -"%d %s, %d %s, %d %s, 和 %d %s." +"曝光时间将会向较早时改变 \n" +"%d %s、%d %s、%d % 和 %d %s。" #: src/Dialogs.vala:1375 #, c-format @@ -2528,8 +2531,8 @@ "Exposure time will be shifted backward by\n" "%d %s, %d %s, %d %s, and %d %s." msgstr "" -"曝光时间将会被向较晚时改变 \n" -"%d %s, %d %s, %d %s, 和 %d %s." +"曝光时间将会向较晚时改变 \n" +"%d %s、%d %s、%d %s 和 %d %s。" #: src/Dialogs.vala:1377 msgid "day" @@ -3017,7 +3020,7 @@ #: src/Commands.vala:1076 msgid "Original photo could not be adjusted." -msgstr "原始照片无法被修改。" +msgstr "无法修改原始照片。" #: src/Commands.vala:1096 msgid "Adjusting Date and Time" @@ -3030,7 +3033,7 @@ #: src/Commands.vala:1123 msgid "One original photo could not be adjusted." msgid_plural "The following original photos could not be adjusted." -msgstr[0] "下列原始照片无法被修改。" +msgstr[0] "无法修改下列原始照片。" #: src/Commands.vala:1125 src/Commands.vala:1137 msgid "Time Adjustment Error" @@ -3044,15 +3047,15 @@ #: src/Commands.vala:1393 msgid "Move Photos to Trash" -msgstr "移动照片至垃圾箱" +msgstr "移动照片至回收站" #: src/Commands.vala:1393 msgid "Restore Photos from Trash" -msgstr "从垃圾箱还原照片" +msgstr "从回收站还原照片" #: src/Commands.vala:1394 msgid "Move the photos to the Shotwell trash" -msgstr "将照片移至 Shotwell 垃圾箱" +msgstr "将照片移至 Shotwell 回收站" #: src/Commands.vala:1394 msgid "Restore the photos back to the Shotwell library" @@ -3060,11 +3063,11 @@ #: src/Commands.vala:1413 msgid "Moving Photos to Trash" -msgstr "正在移动照片到垃圾箱" +msgstr "正在移动照片到回收站" #: src/Commands.vala:1413 msgid "Restoring Photos From Trash" -msgstr "正在从垃圾箱还原照片" +msgstr "正在从回收站还原照片" #: src/Commands.vala:1502 msgid "Flag" @@ -3231,7 +3234,7 @@ #: plugins/shotwell-transitions/shotwell-transitions.vala:77 msgid "Copyright 2010 Maxim Kartashev, Copyright 2011 Yorba Foundation" -msgstr "版权所有 2010 Maxim Kartashev, 版权所有 2009-2010 Yorba Foundation" +msgstr "版权所有 2010 Maxim Kartashev，版权所有 2009-2010 Yorba Foundation" #: plugins/shotwell-transitions/SlideEffect.vala:16 msgid "Slide" @@ -3460,7 +3463,7 @@ #: plugins/shotwell-publishing/YouTubePublishing.vala:943 #, c-format msgid "Videos will appear in '%s'" -msgstr "视频将出现在 '%s'" +msgstr "视频将出现在“%s”" #: plugins/shotwell-publishing/YouTubePublishing.vala:966 msgid "Video privacy _setting:" @@ -3664,7 +3667,7 @@ #: ui/yandex_publish_model.glade:24 msgid "_Albums (or write new):" -msgstr "相册（或创建新的）(_A)：" +msgstr "相册 (或创建新的) (_A)：" #: ui/yandex_publish_model.glade:38 msgid "Access _type:" diff -Nru shotwell-0.9.1/po/zh_TW.po shotwell-0.9.2/po/zh_TW.po --- shotwell-0.9.1/po/zh_TW.po 2011-04-05 04:42:26.000000000 +1000 +++ shotwell-0.9.2/po/zh_TW.po 2011-04-12 06:54:40.000000000 +1000 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: shotwell-0.9.1\n" +"Project-Id-Version: shotwell-0.9.2\n" "Report-Msgid-Bugs-To: vera@yorba.org\n" "POT-Creation-Date: 2011-03-03 11:49-0800\n" "PO-Revision-Date: 2011-03-22 15:09+0000\n" diff -Nru shotwell-0.9.1/src/LibraryWindow.vala shotwell-0.9.2/src/LibraryWindow.vala --- shotwell-0.9.1/src/LibraryWindow.vala 2011-04-05 03:54:29.000000000 +1000 +++ shotwell-0.9.2/src/LibraryWindow.vala 2011-04-13 08:04:00.000000000 +1000 @@ -815,17 +815,19 @@ } private void on_display_searchbar(Gtk.Action action) { + show_search_bar(((Gtk.ToggleAction) action).get_active()); + } + + public void show_search_bar(bool display) { if (!(get_current_page() is CheckerboardPage)) return; - - bool display = ((Gtk.ToggleAction) action).get_active(); - + is_search_toolbar_visible = display; toggle_search_bar(should_show_search_bar(), get_current_page() as CheckerboardPage); if (!display) search_actions.reset(); - // Ticket #3222 - remember search bar status between sessions. + // Remember search bar status between sessions. Config.get_instance().set_search_bar_hidden(is_search_toolbar_visible); } diff -Nru shotwell-0.9.1/src/MetadataWriter.vala shotwell-0.9.2/src/MetadataWriter.vala --- shotwell-0.9.1/src/MetadataWriter.vala 2011-04-05 03:54:29.000000000 +1000 +++ shotwell-0.9.2/src/MetadataWriter.vala 2011-04-13 08:04:00.000000000 +1000 @@ -526,8 +526,6 @@ if (wait) workers.wait_for_empty_queue(); - pending.clear(); - count_cancelled_work(int.MAX, true); } diff -Nru shotwell-0.9.1/src/PhotoPage.vala shotwell-0.9.2/src/PhotoPage.vala --- shotwell-0.9.1/src/PhotoPage.vala 2011-04-05 03:54:29.000000000 +1000 +++ shotwell-0.9.2/src/PhotoPage.vala 2011-04-12 06:26:27.000000000 +1000 @@ -3011,7 +3011,7 @@ private void on_publish() { if (get_view().get_count() > 0) - PublishingDialog.go((Gee.Collection) get_view().get_sources()); + PublishingDialog.go((Gee.Collection) get_view().get_selected_sources()); } private void on_view_menu() { diff -Nru shotwell-0.9.1/src/publishing/APIGlue.vala shotwell-0.9.2/src/publishing/APIGlue.vala --- shotwell-0.9.1/src/publishing/APIGlue.vala 2011-04-05 03:54:27.000000000 +1000 +++ shotwell-0.9.2/src/publishing/APIGlue.vala 2011-04-12 06:26:26.000000000 +1000 @@ -293,8 +293,6 @@ } public GLib.File? get_serialized_file() { - assert(serialized_file != null); - return serialized_file; } diff -Nru shotwell-0.9.1/src/publishing/PublishingPluginHost.vala shotwell-0.9.2/src/publishing/PublishingPluginHost.vala --- shotwell-0.9.1/src/publishing/PublishingPluginHost.vala 2011-04-05 03:54:27.000000000 +1000 +++ shotwell-0.9.2/src/publishing/PublishingPluginHost.vala 2011-04-12 06:26:26.000000000 +1000 @@ -18,6 +18,7 @@ private Spit.Publishing.Publisher active_publisher = null; private Publishable[] publishables = null; private LoginCallback current_login_callback = null; + private bool publishing_halted = false; public ConcretePublishingHost(Service service, PublishingDialog dialog, Publishable[] publishables) { @@ -122,6 +123,7 @@ clean_up(); + publishing_halted = true; dialog = null; } @@ -254,6 +256,9 @@ spin_event_loop(); + if (publishing_halted) + break; + i++; } diff -Nru shotwell-0.9.1/src/SearchFilter.vala shotwell-0.9.2/src/SearchFilter.vala --- shotwell-0.9.1/src/SearchFilter.vala 2011-04-05 03:54:29.000000000 +1000 +++ shotwell-0.9.2/src/SearchFilter.vala 2011-04-13 08:04:00.000000000 +1000 @@ -1104,8 +1104,12 @@ // Forces an update of the search filter. public void update() { - if (null == search_filter) - return; + if (null == search_filter) { + // Search bar isn't being shown, need to toggle it. + LibraryWindow.get_app().show_search_bar(true); + } + + assert(null != search_filter); search_filter.set_search_filter(actions.text.value); search_filter.flagged = actions.flagged.active; diff -Nru shotwell-0.9.1/src/WebConnectors.vala shotwell-0.9.2/src/WebConnectors.vala --- shotwell-0.9.1/src/WebConnectors.vala 2011-04-05 03:54:29.000000000 +1000 +++ shotwell-0.9.2/src/WebConnectors.vala 2011-04-12 06:26:27.000000000 +1000 @@ -562,29 +562,27 @@ public signal void login_requested(); public LoginWelcomePane(string service_welcome_message) { - Gtk.SeparatorToolItem top_space = new Gtk.SeparatorToolItem(); - top_space.set_draw(false); - Gtk.SeparatorToolItem bottom_space = new Gtk.SeparatorToolItem(); - bottom_space.set_draw(false); - add(top_space); - top_space.set_size_request(-1, 140); - Gtk.Table content_layouter = new Gtk.Table(2, 1, false); + Gtk.Alignment label_wrapper = new Gtk.Alignment(0.5f, 1.0f, 0.0f, 0.0f); + Gtk.Label not_logged_in_label = new Gtk.Label(""); not_logged_in_label.set_use_markup(true); not_logged_in_label.set_markup(service_welcome_message); not_logged_in_label.set_line_wrap(true); not_logged_in_label.set_size_request(PublishingDialog.STANDARD_CONTENT_LABEL_WIDTH, -1); - content_layouter.attach(not_logged_in_label, 0, 1, 0, 1, + + label_wrapper.add(not_logged_in_label); + + content_layouter.attach(label_wrapper, 0, 1, 0, 1, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, 0); - not_logged_in_label.set_size_request(PublishingDialog.STANDARD_CONTENT_LABEL_WIDTH, 112); + not_logged_in_label.set_size_request(PublishingDialog.STANDARD_CONTENT_LABEL_WIDTH, 150); not_logged_in_label.set_alignment(0.5f, 0.0f); login_button = new Gtk.Button.with_mnemonic(_("_Login")); Gtk.Alignment login_button_aligner = - new Gtk.Alignment(0.5f, 0.5f, 0.0f, 0.0f); + new Gtk.Alignment(0.5f, 0.25f, 0.0f, 0.0f); login_button_aligner.add(login_button); login_button.set_size_request(PublishingDialog.STANDARD_ACTION_BUTTON_WIDTH, -1); login_button.clicked.connect(on_login_clicked); @@ -593,8 +591,6 @@ Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, Gtk.AttachOptions.EXPAND | Gtk.AttachOptions.FILL, 6, 0); add(content_layouter); - add(bottom_space); - bottom_space.set_size_request(-1, 112); } private void on_login_clicked() { diff -Nru shotwell-0.9.1/THANKS shotwell-0.9.2/THANKS --- shotwell-0.9.1/THANKS 2011-04-05 03:54:30.000000000 +1000 +++ shotwell-0.9.2/THANKS 2011-04-12 06:26:29.000000000 +1000 @@ -79,6 +79,7 @@ Krešo Kunjas Shushi Kurose monkey.libre +Xhacker Liu Ingo Lütkebohle Sven Mahlstedt <1ne_mail_an-sven.m@web.de> Sérgio Marques @@ -120,6 +121,7 @@ Rob van den Berg Kaj-Ivar van der Wijst Johannes Wilm +Muhammet Yüksel Lukáš Zapletal Zheng7fu2 Andrej Žnidaršič