Merge branch 'feature/upstream' into develop

1 files changed, 2 insertions, 1 deletions

diff --git a/src/Photo.vala b/src/Photo.vala
index 34cfedf..f636a32 100644
--- a/src/Photo.vala
+++ b/src/Photo.vala
@@ -3808,6 +3808,7 @@ public abstract class Photo : PhotoSource, Dateable, Positionable {
         if (ext == null || !file_format.get_properties().is_recognized_extension(ext))
             ext = file_format.get_properties().get_default_extension();
         
+        // TRANSLATORS: "modified" here is part of a file name that was changed with another image tool outside of Shotwell. Note that there are potential issues with UTF-8 characters
         string editable_basename = "%s_%s.%s".printf(name, _("modified"), ext);
         
         bool collision;
@@ -4837,7 +4838,7 @@ public class LibraryPhotoSourceCollection : MediaSourceCollection {
         assert(source_id.has_prefix(Photo.TYPENAME));
         string numeric_only = source_id.substring(Photo.TYPENAME.length, -1);
         
-        return fetch_by_numeric_id(parse_int64(numeric_only, 16));
+        return fetch_by_numeric_id(int64.parse(numeric_only, 16));
     }
 
     public override Gee.Collection<string> get_event_source_ids(EventID event_id){