Merge branch 'master' into swift3

Author: tomlokhorst

Diff for: Library/Core/StringResource.swift

@@ -16,8 +16,14 @@ public protocol StringResourceType {
   /// File in containing the string
   var tableName: String { get }
 
+  /// Bundle this string is in
+  var bundle: NSBundle { get }
+
   /// Locales of the a localizable string
   var locales: [String] { get }
+  
+  /// Comment directly before and/or after the string, if any
+  var comment: String? { get }
 }
 
 public struct StringResource: StringResourceType {
@@ -28,12 +34,20 @@ public struct StringResource: StringResourceType {
   /// File in containing the string
   public let tableName: String
 
+  /// Bundle this string is in
+  public let bundle: NSBundle
+
   /// Locales of the a localizable string
   public let locales: [String]
+  
+  /// Comment directly before and/or after the string, if any
+  public let comment: String?
 
-  public init(key: String, tableName: String, locales: [String]) {
+  public init(key: String, tableName: String, bundle: NSBundle, locales: [String], comment: String?) {
     self.key = key
     self.tableName = tableName
+    self.bundle = bundle
     self.locales = locales
+    self.comment = comment
   }
 }