---
help/C/view-sidebar.page | 2 +-
plugins/Makefile.plugin.mk | 2 +-
plugins/shotwell-publishing/PicasaPublishing.vala | 2 +-
plugins/shotwell-publishing/PiwigoPublishing.vala | 2 +-
plugins/shotwell-publishing/YouTubePublishing.vala | 2 +-
po/shotwell-core/shotwell.pot | 2 +-
src/AppDirs.vala | 2 +-
src/Commands.vala | 2 +-
src/CustomComponents.vala | 2 +-
src/DirectoryMonitor.vala | 2 +-
src/Photo.vala | 2 +-
src/PhotoPage.vala | 2 +-
src/Tombstone.vala | 4 ++--
src/camera/ImportPage.vala | 2 +-
src/core/DataSource.vala | 4 ++--
src/core/DatabaseSourceCollection.vala | 2 +-
src/plugins/DataImportsInterfaces.vala | 4 ++--
src/plugins/PublishingInterfaces.vala | 2 +-
src/searches/SearchBoolean.vala | 2 +-
src/util/file.vala | 2 +-
src/util/misc.vala | 2 +-
thumbnailer/shotwell-video-thumbnailer.vala | 2 +-
22 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/help/C/view-sidebar.page b/help/C/view-sidebar.page
index de26c40..2da4674 100644
--- a/help/C/view-sidebar.page
+++ b/help/C/view-sidebar.page
@@ -26,7 +26,7 @@
<p>The <gui>Flagged</gui> lists all photos you had previous flagged.</p>
-<p>The <gui>Saved Search</gui> allows you to sort your libary by many
criterias.</p>
+<p>The <gui>Saved Search</gui> allows you to sort your library by many
criteria.</p>
<p>The <gui>Events</gui> folder lists all events in your library. An event is
a group of photos that were taken at approximately the same time.</p>
diff --git a/plugins/Makefile.plugin.mk b/plugins/Makefile.plugin.mk
index d76433b..2b83b5f 100644
--- a/plugins/Makefile.plugin.mk
+++ b/plugins/Makefile.plugin.mk
@@ -4,7 +4,7 @@
# Requires PLUGIN and SRC_FILES be set to the name of the plugin binary (minus
extension) and that
# the directory is registered in plugins.mk.
#
-# To use, include this file in each plug-in directory's Makefile after setting
apropriate variables.
+# To use, include this file in each plug-in directory's Makefile after setting
appropriate variables.
# Also be sure that each plug-in has a dummy_main() function to satisfy
valac's linkage.
#
# NOTE: This file is called from the cwd of each directory, hence the relative
paths should be
diff --git a/plugins/shotwell-publishing/PicasaPublishing.vala
b/plugins/shotwell-publishing/PicasaPublishing.vala
index 397503d..a9676bb 100644
--- a/plugins/shotwell-publishing/PicasaPublishing.vala
+++ b/plugins/shotwell-publishing/PicasaPublishing.vala
@@ -318,7 +318,7 @@ public class PicasaPublisher : Spit.Publishing.Publisher,
GLib.Object {
// user's album feed doesn't exist -- this occurs when the user
has a valid Google
// account but it hasn't yet been set up for use with Picasa. In
this case, we
// display an informational pane with an "account not set up"
message. In addition, we
- // deauthenticate the session. Deauth is neccessary because
must've previously auth'd
+ // deauthenticate the session. Deauth is necessary because we
must've previously auth'd
// the user's account to even be able to query the album feed.
session.deauthenticate();
do_show_not_set_up_pane();
diff --git a/plugins/shotwell-publishing/PiwigoPublishing.vala
b/plugins/shotwell-publishing/PiwigoPublishing.vala
index d75b922..47b648b 100644
--- a/plugins/shotwell-publishing/PiwigoPublishing.vala
+++ b/plugins/shotwell-publishing/PiwigoPublishing.vala
@@ -859,7 +859,7 @@ public class PiwigoPublisher : Spit.Publishing.Publisher,
GLib.Object {
}
debug("Unhandled error: type=%s; message='%s'".printf(error_type,
e.message));
- do_show_error_message(_("An error message occured when publishing to
Piwigo. Please try again."));
+ do_show_error_message(_("An error message occurred when publishing to
Piwigo. Please try again."));
}
/**
diff --git a/plugins/shotwell-publishing/YouTubePublishing.vala
b/plugins/shotwell-publishing/YouTubePublishing.vala
index 9319eb9..6ab6713 100644
--- a/plugins/shotwell-publishing/YouTubePublishing.vala
+++ b/plugins/shotwell-publishing/YouTubePublishing.vala
@@ -290,7 +290,7 @@ public class YouTubePublisher : Spit.Publishing.Publisher,
GLib.Object {
// account. This occurs when the user has a valid Google account
but it hasn't
// yet been set up for use with YouTube. In this case, we
re-display the credentials
// capture pane with an "account not set up" message. In addition,
we deauthenticate
- // the session. Deauth is neccessary because we did previously
auth the user's
+ // the session. Deauth is necessary because we did previously auth
the user's
// account.
session.deauthenticate();
do_show_credentials_pane(CredentialsPane.Mode.NOT_SET_UP);
diff --git a/po/shotwell-core/shotwell.pot b/po/shotwell-core/shotwell.pot
index df41958..a5dec74 100644
--- a/po/shotwell-core/shotwell.pot
+++ b/po/shotwell-core/shotwell.pot
@@ -3685,7 +3685,7 @@ msgid "Creating album %s..."
msgstr ""
#: plugins/shotwell-publishing/PiwigoPublishing.vala:862
-msgid "An error message occured when publishing to Piwigo. Please try again."
+msgid "An error message occurred when publishing to Piwigo. Please try again."
msgstr ""
#: plugins/shotwell-publishing/PiwigoPublishing.vala:943
diff --git a/src/AppDirs.vala b/src/AppDirs.vala
index 0a0c0f1..2b217f4 100644
--- a/src/AppDirs.vala
+++ b/src/AppDirs.vala
@@ -150,7 +150,7 @@ class AppDirs {
return get_home_dir().get_child(_("Pictures"));
}
- // Library folder + photo folder, based on user's prefered directory
pattern.
+ // Library folder + photo folder, based on user's preferred directory
pattern.
public static File get_baked_import_dir(time_t tm) {
string? pattern = Config.Facade.get_instance().get_directory_pattern();
if (is_string_empty(pattern))
diff --git a/src/Commands.vala b/src/Commands.vala
index b233599..02f0a4b 100644
--- a/src/Commands.vala
+++ b/src/Commands.vala
@@ -791,7 +791,7 @@ public class RedeyeCommand :
GenericPhotoTransformationCommand {
public abstract class MovePhotosCommand : Command {
// Piggyback on a private command so that processing to determine
new_event can occur before
- // contruction, if needed
+ // construction, if needed
protected class RealMovePhotosCommand : MultipleDataSourceCommand {
private SourceProxy new_event_proxy = null;
private Gee.HashMap<MediaSource, SourceProxy?> old_events = new
Gee.HashMap<
diff --git a/src/CustomComponents.vala b/src/CustomComponents.vala
index 13a0149..6f8e302 100644
--- a/src/CustomComponents.vala
+++ b/src/CustomComponents.vala
@@ -128,7 +128,7 @@ public class ThemeLoader {
/* If the image data loaded from disk didn't contain
NUM_SUPPORTED_INTENSITIES
colors, then we can't unambiguously map the colors in the loaded
image data
- to theme colors on the user's system, so propogate an error */
+ to theme colors on the user's system, so propagate an error */
if (colors.size != NUM_SUPPORTED_INTENSITIES)
error("ThemeLoader: load_icon: pixbuf does not contain the correct
number " +
"of unique colors");
diff --git a/src/DirectoryMonitor.vala b/src/DirectoryMonitor.vala
index 4647b2d..0ee2717 100644
--- a/src/DirectoryMonitor.vala
+++ b/src/DirectoryMonitor.vala
@@ -1100,7 +1100,7 @@ public class DirectoryMonitor : Object {
break;
default:
- // artifically complete it
+ // artificially complete it
query_info.completed = true;
process_query_queue(query_info);
break;
diff --git a/src/Photo.vala b/src/Photo.vala
index dd7b5ba..81ad24a 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -156,7 +156,7 @@ public enum Rating {
// Photo is an abstract class that allows for applying transformations
on-the-fly to a
// particular photo without modifying the backing image file. The interface
allows for
-// transformations to be stored persistently elsewhere or in memory until
they're commited en
+// transformations to be stored persistently elsewhere or in memory until
they're committed en
// masse to an image file.
public abstract class Photo : PhotoSource, Dateable {
// Need to use "thumb" rather than "photo" for historical reasons -- this
name is used
diff --git a/src/PhotoPage.vala b/src/PhotoPage.vala
index 8676364..9c55327 100644
--- a/src/PhotoPage.vala
+++ b/src/PhotoPage.vala
@@ -1459,7 +1459,7 @@ public abstract class EditingHostPage : SinglePhotoPage {
current_tool = tool;
current_tool.activate(photo_canvas);
- // if the tool has an auxilliary window, move it properly on the screen
+ // if the tool has an auxiliary window, move it properly on the screen
place_tool_window();
// repaint entire view, with the tool now hooked in
diff --git a/src/Tombstone.vala b/src/Tombstone.vala
index c71948b..4e2fed6 100644
--- a/src/Tombstone.vala
+++ b/src/Tombstone.vala
@@ -102,7 +102,7 @@ public class TombstoneSourceCollection :
DatabaseSourceCollection {
// This initiates a scan of the tombstoned files, resurrecting them if the
file is no longer
// present on disk. If a DirectoryMonitor is supplied, the scan will use
that object's FileInfo
// if available. If not available or not supplied, the scan will query
for the file's
- // existance.
+ // existence.
//
// Note that this call is non-blocking.
public void launch_scan(DirectoryMonitor? monitor, Cancellable?
cancellable) {
@@ -132,7 +132,7 @@ public class TombstoneSourceCollection :
DatabaseSourceCollection {
break;
if (!(err is IOError.NOT_FOUND)) {
- warning("Unable to check for existance of tombstoned
file %s: %s",
+ warning("Unable to check for existence of tombstoned
file %s: %s",
file.get_path(), err.message);
}
}
diff --git a/src/camera/ImportPage.vala b/src/camera/ImportPage.vala
index 5859b80..3d19e77 100644
--- a/src/camera/ImportPage.vala
+++ b/src/camera/ImportPage.vala
@@ -1626,7 +1626,7 @@ public class ImportPage : CheckerboardPage {
CameraImportJob import_job = new CameraImportJob(null_context,
import_file);
- // Maintain RAW+JPEG assocation.
+ // Maintain RAW+JPEG association.
if (import_file is PhotoImportSource &&
((PhotoImportSource) import_file).get_associated() != null) {
import_job.set_associated(new CameraImportJob(null_context,
diff --git a/src/core/DataSource.vala b/src/core/DataSource.vala
index f0c219e..11a5f90 100644
--- a/src/core/DataSource.vala
+++ b/src/core/DataSource.vala
@@ -361,7 +361,7 @@ public abstract class DataSource : DataObject {
// or has been unlinked from one. It should not be used otherwise. (In
particular, don't
// automate destroys by removing and then calling this method -- that will
happen automatically.)
// To destroy a DataSource already integrated into a SourceCollection, call
- // SourceCollection.destroy_marked(). Returns true if the operation
completed succesfully,
+ // SourceCollection.destroy_marked(). Returns true if the operation
completed successfully,
// otherwise it will return false.
public bool destroy_orphan(bool delete_backing) {
bool ret = true;
@@ -386,7 +386,7 @@ public abstract class DataSource : DataObject {
return ret;
}
- // DataViews subscribe to the DataSource to inform it of their existance.
Not only does this
+ // DataViews subscribe to the DataSource to inform it of their existence.
Not only does this
// allow for signal reflection (i.e. DataSource.altered ->
DataView.altered) it also makes
// them first-in-line for notification of destruction, so they can remove
themselves from
// their ViewCollections automatically.
diff --git a/src/core/DatabaseSourceCollection.vala
b/src/core/DatabaseSourceCollection.vala
index 44b080f..044a8bf 100644
--- a/src/core/DatabaseSourceCollection.vala
+++ b/src/core/DatabaseSourceCollection.vala
@@ -8,7 +8,7 @@ public delegate int64 GetSourceDatabaseKey(DataSource source);
// A DatabaseSourceCollection is a SourceCollection that understands database
keys (IDs) and the
// nature that a row in a database can only be instantiated once in the
system, and so it tracks
-// their existance in a map so they can be fetched by their key.
+// their existence in a map so they can be fetched by their key.
//
// TODO: This would be better implemented as an observer class, possibly with
an interface to
// force subclasses to provide a fetch_by_key() method.
diff --git a/src/plugins/DataImportsInterfaces.vala
b/src/plugins/DataImportsInterfaces.vala
index bd97b8a..5edfcfb 100644
--- a/src/plugins/DataImportsInterfaces.vala
+++ b/src/plugins/DataImportsInterfaces.vala
@@ -94,7 +94,7 @@ public interface DataImporter : GLib.Object {
}
/**
- * Represents a libary of importable media items.
+ * Represents a library of importable media items.
*
* Developers of data import plugins provide a class that implements this
interface.
*/
@@ -190,7 +190,7 @@ public interface DialogPane : GLib.Object {
/**
* If this bit is set, when the associated pane is installed, the
on-screen publishing
- * dialog box will grow to accomodate a full-width 1024 pixel web
page. If both
+ * dialog box will grow to accommodate a full-width 1024 pixel web
page. If both
* EXTENDED_SIZE and COLOSSAL_SIZE are set, EXTENDED_SIZE takes
precedence.
*/
COLOSSAL_SIZE = 1 << 2;
diff --git a/src/plugins/PublishingInterfaces.vala
b/src/plugins/PublishingInterfaces.vala
index 339cc9d..0c9eabe 100644
--- a/src/plugins/PublishingInterfaces.vala
+++ b/src/plugins/PublishingInterfaces.vala
@@ -178,7 +178,7 @@ public interface DialogPane : GLib.Object {
/**
* If this bit is set, when the associated pane is installed, the
on-screen publishing
- * dialog box will grow to accomodate a full-width 1024 pixel web
page. If both
+ * dialog box will grow to accommodate a full-width 1024 pixel web
page. If both
* EXTENDED_SIZE and COLOSSAL_SIZE are set, EXTENDED_SIZE takes
precedence.
*/
COLOSSAL_SIZE = 1 << 2;
diff --git a/src/searches/SearchBoolean.vala b/src/searches/SearchBoolean.vala
index 40a13c8..3ee72b2 100644
--- a/src/searches/SearchBoolean.vala
+++ b/src/searches/SearchBoolean.vala
@@ -735,7 +735,7 @@ public class SavedSearch : DataSource {
}
}
-// This table contains every saved search. It's the prefered way to add and
destroy a saved
+// This table contains every saved search. It's the preferred way to add and
destroy a saved
// search as well, since this table's create/destroy methods are tied to the
database.
public class SavedSearchTable {
private static SavedSearchTable? instance = null;
diff --git a/src/util/file.vala b/src/util/file.vala
index 15b9569..eaba254 100644
--- a/src/util/file.vala
+++ b/src/util/file.vala
@@ -6,7 +6,7 @@
// Returns true if the file is claimed, false if it exists, and throws an
Error otherwise. The file
// will be created when the function exits and should be overwritten. Note
that the file is not
-// held open; claiming a file is merely based on its existance.
+// held open; claiming a file is merely based on its existence.
//
// This function is thread-safe.
public bool claim_file(File file) throws Error {
diff --git a/src/util/misc.vala b/src/util/misc.vala
index c842840..54a7a93 100644
--- a/src/util/misc.vala
+++ b/src/util/misc.vala
@@ -355,7 +355,7 @@ public class OpTimer {
}
// Dummy function for suppressing 'could not stat file' errors
-// generated when saving into a previously non-existant file -
+// generated when saving into a previously non-existent file -
// please see https://bugzilla.gnome.org/show_bug.cgi?id=662814
// and to work around a spurious warning given by GDK when a
// key press event is passed from a child class' event handler
diff --git a/thumbnailer/shotwell-video-thumbnailer.vala
b/thumbnailer/shotwell-video-thumbnailer.vala
index a4d7dc2..79a2d7e 100644
--- a/thumbnailer/shotwell-video-thumbnailer.vala
+++ b/thumbnailer/shotwell-video-thumbnailer.vala
@@ -84,7 +84,7 @@ class ShotwellThumbnailer {
// Get the snapshot buffer format now. We set the caps on the
appsink so
// that it can only be an rgb buffer. The only thing we have
not specified
- // on the caps is the height, which is dependant on the
pixel-aspect-ratio
+ // on the caps is the height, which is dependent on the
pixel-aspect-ratio
// of the source material.
caps = buffer.get_caps();
if (caps == null) {
--
1.7.9.5
_______________________________________________
Shotwell mailing list
[email protected]
http://lists.yorba.org/cgi-bin/mailman/listinfo/shotwell
