From aeb46e0ca6707e2bb6ae784497047fafa00ce9d1 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Mon, 23 Oct 2017 10:41:44 -0400
Subject: [PATCH] fix: reverts "gitignore: ignore generated data"
- Reverts commit ffe39be930835185917329cfc833675589e91af2
- Adds missing generated strings from commit d8b60072...
Change-Id: I16c502b349f34c605c15b98a449fff9556520b29
Reviewed-by: Kateryna Kostiuk <kateryna.kostiuk@savoirfairelinux.com>
---
.gitignore | 3 ---
Ring/Ring/Constants/Generated/Strings.swift | 8 ++++++++
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/.gitignore b/.gitignore
index 849746a38..c6fe5d3f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,9 +11,6 @@ Ring/Ring.xcodeproj/project.xcworkspace/xcshareddata/
Ring/Ring.xcodeproj/project.xcworkspace/xcuserdata/
Ring/Ring.xcodeproj/xcuserdata/
-# Generated
-Ring/Ring/Constants/Generated/
-
# Obj-C/Swift specific
*.hmap
*.ipa
diff --git a/Ring/Ring/Constants/Generated/Strings.swift b/Ring/Ring/Constants/Generated/Strings.swift
index 3c6b54247..4c5bb7036 100644
--- a/Ring/Ring/Constants/Generated/Strings.swift
+++ b/Ring/Ring/Constants/Generated/Strings.swift
@@ -22,6 +22,12 @@ enum L10n {
static let accountNoNetworkTitle = L10n.tr("Localizable", "alerts.accountNoNetworkTitle")
/// Account couldn't be found on the Ring network. Make sure it was exported on Ring from an existing device, and that provided credentials are correct.
static let acountCannotBeFoundMessage = L10n.tr("Localizable", "alerts.acountCannotBeFoundMessage")
+ /// Cancel
+ static let profileCancelPhoto = L10n.tr("Localizable", "alerts.profileCancelPhoto")
+ /// Take photo
+ static let profileTakePhoto = L10n.tr("Localizable", "alerts.profileTakePhoto")
+ /// Upload photo
+ static let profileUploadPhoto = L10n.tr("Localizable", "alerts.profileUploadPhoto")
}
enum Createaccount {
@@ -54,6 +60,8 @@ enum L10n {
enum Createprofile {
/// Skip to Create Account
static let createAccount = L10n.tr("Localizable", "createProfile.createAccount")
+ /// Next
+ static let createAccountWithProfile = L10n.tr("Localizable", "createProfile.createAccountWithProfile")
/// Skip to Link Device
static let linkDevice = L10n.tr("Localizable", "createProfile.linkDevice")
}
--
GitLab