From a39052f3535551fc038a6e19f11bc127f7f00c57 Mon Sep 17 00:00:00 2001 From: Sara Tavares <29093946+stavares843@users.noreply.github.com> Date: Thu, 18 Jun 2020 21:52:52 +0100 Subject: [PATCH 1/9] fix typo --- Umbrella/Resources/i18n/ar.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbrella/Resources/i18n/ar.lproj/Localizable.strings b/Umbrella/Resources/i18n/ar.lproj/Localizable.strings index 67ceb89..310c5ce 100644 --- a/Umbrella/Resources/i18n/ar.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/ar.lproj/Localizable.strings @@ -64,7 +64,7 @@ "CHANGE LOCATION" = "تغيير الموقع"; "Set your Feed" = "تعيين الخلاصة"; "SET NOW" = "أعد الآن"; -"There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again." = "لا توجد أحداث لعرضها لموقعك. سنقوم بعرضها عند حدوثها. سحب لتحديث للتحقق مرة أخرى."; +"There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again." = "لا توجد أحداث لعرضها لموقعك. سنقوم بعرضها عند حدوثها. سحب لتحديث للتحقق مرة أخرى."; "Security feed set to:" = "تم تعيين خلاصة الأمان على:"; "Interval" = "فترة"; "SET" = "عيّن"; From 9a58b55de99c3d9ffc32f7a06b2af209d837aa9e Mon Sep 17 00:00:00 2001 From: Sara Tavares <29093946+stavares843@users.noreply.github.com> Date: Thu, 18 Jun 2020 21:54:04 +0100 Subject: [PATCH 2/9] fix typo --- Umbrella/Resources/i18n/en.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbrella/Resources/i18n/en.lproj/Localizable.strings b/Umbrella/Resources/i18n/en.lproj/Localizable.strings index 66edfc0..3d1014f 100644 --- a/Umbrella/Resources/i18n/en.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/en.lproj/Localizable.strings @@ -64,7 +64,7 @@ "CHANGE FEED SETTINGS" = "CHANGE FEED SETTINGS"; "Set your Feed" = "Set your Feed"; "SET NOW" = "SET NOW"; -"There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again." = "There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again."; +"There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again." = "There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again."; "Security feed set to:" = "Security feed set to:"; "Interval" = "Interval"; "SET" = "SET"; From 542f6775cf49ba32e793aaa4eee2c63321639102 Mon Sep 17 00:00:00 2001 From: Sara Tavares <29093946+stavares843@users.noreply.github.com> Date: Thu, 18 Jun 2020 21:54:37 +0100 Subject: [PATCH 3/9] fix typo --- Umbrella/Resources/i18n/es.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbrella/Resources/i18n/es.lproj/Localizable.strings b/Umbrella/Resources/i18n/es.lproj/Localizable.strings index b3cafdd..58fd037 100644 --- a/Umbrella/Resources/i18n/es.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/es.lproj/Localizable.strings @@ -64,7 +64,7 @@ "CHANGE FEED SETTINGS" = "CAMBIAR LOS AJUSTES DE FEED"; "Set your Feed" = "Establezca su Feed"; "SET NOW" = "ESTABLECER AHORA"; -"There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again." = "No hay eventos para mostrar para su ubicación. Los mostraremos cuando ocurran. Tire para actualizar para comprobar de nuevo."; +"There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again." = "No hay eventos para mostrar para su ubicación. Los mostraremos cuando ocurran. Tire para actualizar para comprobar de nuevo."; "Security feed set to:" = "Feed de seguridad establecido en:"; "Interval" = "Intervalo"; "SET" = "ESTABLECER"; From afb100681f043152c65b88e3a4ad65f03f1a7244 Mon Sep 17 00:00:00 2001 From: Sara Tavares <29093946+stavares843@users.noreply.github.com> Date: Thu, 18 Jun 2020 21:55:06 +0100 Subject: [PATCH 4/9] fix typo --- Umbrella/Resources/i18n/fa.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbrella/Resources/i18n/fa.lproj/Localizable.strings b/Umbrella/Resources/i18n/fa.lproj/Localizable.strings index be21207..89189c8 100644 --- a/Umbrella/Resources/i18n/fa.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/fa.lproj/Localizable.strings @@ -64,7 +64,7 @@ "CHANGE LOCATION" = "تغییر موقعیت"; "Set your Feed" = "خوراک خود را تنظیم کنید"; "SET NOW" = "حالا تنظیم کن"; -"There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again." = "هیچ رویدادی برای نمایش مکان شما وجود ندارد. ما آنها را هنگامی که رخ دهند،نمایش خواهیم داد. برای بازنشانی دوباره بکشید تا دوباره بررسی شود."; +"There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again." = "هیچ رویدادی برای نمایش مکان شما وجود ندارد. ما آنها را هنگامی که رخ دهند،نمایش خواهیم داد. برای بازنشانی دوباره بکشید تا دوباره بررسی شود."; "Security feed set to:" = "خوراک امنیتی تنظیم شده است:"; "Interval" = "فاصله"; "SET" = "تنظیم"; From a96b7aaf39c4e75cc98c1e4d6b063d78bd124d62 Mon Sep 17 00:00:00 2001 From: Sara Tavares <29093946+stavares843@users.noreply.github.com> Date: Thu, 18 Jun 2020 21:55:38 +0100 Subject: [PATCH 5/9] fix typo --- Umbrella/Resources/i18n/fr.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbrella/Resources/i18n/fr.lproj/Localizable.strings b/Umbrella/Resources/i18n/fr.lproj/Localizable.strings index 4ae3c8e..2d65f02 100644 --- a/Umbrella/Resources/i18n/fr.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/fr.lproj/Localizable.strings @@ -64,7 +64,7 @@ "CHANGE LOCATION" = "CHANGER DE LOCALISATION"; "Set your Feed" = "Définissez votre Flux"; "SET NOW" = "DÉFINIR MAINTENANT"; -"There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again." = "Il n’y a aucun événement à afficher pour votre position géographique. Nous les afficherons quand il y en aura. Tirez vers le bas pour actualiser."; +"There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again." = "Il n’y a aucun événement à afficher pour votre position géographique. Nous les afficherons quand il y en aura. Tirez vers le bas pour actualiser."; "Security feed set to:" = "Le flux de sécurité est défini sur :"; "Interval" = "Intervalle"; "SET" = "DÉFINIR"; From 21e7747f7569dc11f60a104cdf5cb301650fc3b5 Mon Sep 17 00:00:00 2001 From: Sara Tavares <29093946+stavares843@users.noreply.github.com> Date: Thu, 18 Jun 2020 21:56:13 +0100 Subject: [PATCH 6/9] fix typo --- Umbrella/Resources/i18n/ru.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbrella/Resources/i18n/ru.lproj/Localizable.strings b/Umbrella/Resources/i18n/ru.lproj/Localizable.strings index d91394b..8599855 100644 --- a/Umbrella/Resources/i18n/ru.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/ru.lproj/Localizable.strings @@ -64,7 +64,7 @@ "CHANGE LOCATION" = "ИЗМЕНИТЬ МЕСТОПОЛОЖЕНИЕ"; "Set your Feed" = "Настройте свой канал"; "SET NOW" = "УСТАНОВИТЬ СЕЙЧАС"; -"There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again." = "Для вашего местоположения нет событий. Мы покажем их, когда они появятся. Потяните вниз, чтобы обновить данные."; +"There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again." = "Для вашего местоположения нет событий. Мы покажем их, когда они появятся. Потяните вниз, чтобы обновить данные."; "Security feed set to:" = "Новости безопасности заданы для:"; "Interval" = "Интервал"; "SET" = "ЗАДАТЬ"; From 220857514a6f463151b2fde80bbd6a1fd845eea2 Mon Sep 17 00:00:00 2001 From: Sara Tavares <29093946+stavares843@users.noreply.github.com> Date: Thu, 18 Jun 2020 21:56:45 +0100 Subject: [PATCH 7/9] fix typo --- Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings b/Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings index 08e012b..41a6376 100644 --- a/Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings @@ -64,7 +64,7 @@ "CHANGE FEED SETTINGS" = "更改饲料设置"; "Set your Feed" = "設置Feed"; "SET NOW" = "現在設定"; -"There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again." = "您的位置無法顯示任何事件。 我們會在它們出現時顯示它們。 拉動刷新以再次檢查。"; +"There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again." = "您的位置無法顯示任何事件。 我們會在它們出現時顯示它們。 拉動刷新以再次檢查。"; "Security feed set to:" = "安全Feed設置為："; "Interval" = "間隔"; "SET" = "組"; From 19315edc53b54dc9b990daf1dd5cdd6a2a042685 Mon Sep 17 00:00:00 2001 From: Sara Tavares <29093946+stavares843@users.noreply.github.com> Date: Thu, 18 Jun 2020 21:57:14 +0100 Subject: [PATCH 8/9] fix typo --- Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings b/Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings index 1f7ac61..3b64cf9 100644 --- a/Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings @@ -64,7 +64,7 @@ "CHANGE FEED SETTINGS" = "更改飼料設置"; "Set your Feed" = "設置訊息來源"; "SET NOW" = "現在設定"; -"There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again." = "沒有可顯示您所在位置的活動。我們會在它們出現時顯示它們。向上或向下拉動以刷新畫面並再次檢測。"; +"There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again." = "沒有可顯示您所在位置的活動。我們會在它們出現時顯示它們。向上或向下拉動以刷新畫面並再次檢測。"; "Security feed set to:" = "關於安全訊息的訂閲設置為："; "Interval" = "間隔"; "SET" = "設置"; From 900891841300765e5427066046e0efe927387f91 Mon Sep 17 00:00:00 2001 From: stavares Date: Thu, 18 Jun 2020 22:04:35 +0100 Subject: [PATCH 9/9] fix typo --- Umbrella/Resources/i18n/ar.lproj/Localizable.strings | 2 +- Umbrella/Resources/i18n/en.lproj/Localizable.strings | 2 +- Umbrella/Resources/i18n/es.lproj/Localizable.strings | 2 +- Umbrella/Resources/i18n/fa.lproj/Localizable.strings | 2 +- Umbrella/Resources/i18n/fr.lproj/Localizable.strings | 2 +- Umbrella/Resources/i18n/ru.lproj/Localizable.strings | 2 +- Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings | 2 +- Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings | 2 +- Umbrella/ViewControllers/Feed-RSS/Feed/FeedViewController.swift | 2 +- Umbrella/Views/Account/SettingCell.swift | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Umbrella/Resources/i18n/ar.lproj/Localizable.strings b/Umbrella/Resources/i18n/ar.lproj/Localizable.strings index 310c5ce..4df268e 100644 --- a/Umbrella/Resources/i18n/ar.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/ar.lproj/Localizable.strings @@ -143,7 +143,7 @@ "Manually" = "يدويا"; "Dashboard" = "لوحة القيادة"; "new customFeeds." = "customFeeds جديدة."; -"You can enable access in Settings> Umbrela> Notifications" = "يمكنك تمكين الوصول في الإعدادات> Umbrela> الإشعارات"; +"You can enable access in Settings> Umbrella> Notifications" = "يمكنك تمكين الوصول في الإعدادات> Umbrella> الإشعارات"; "Loading data from new repository will reset all the progress you made. Back up before you do it!" = "سيؤدي تحميل البيانات من مستودع جديد إلى إعادة تعيين كل التقدم الذي أحرزته. احتياطيًا قبل القيام بذلك! "; "Secondary" = "ثانوي"; diff --git a/Umbrella/Resources/i18n/en.lproj/Localizable.strings b/Umbrella/Resources/i18n/en.lproj/Localizable.strings index 3d1014f..13e2b1f 100644 --- a/Umbrella/Resources/i18n/en.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/en.lproj/Localizable.strings @@ -143,7 +143,7 @@ "Manually" = "Manually"; "Dashboard" = "Dashboard"; "new customFeeds." = "new customFeeds."; -"You can enable access in Settings> Umbrela> Notifications" = "You can enable access in Settings> Umbrela> Notifications"; +"You can enable access in Settings> Umbrella> Notifications" = "You can enable access in Settings> Umbrella> Notifications"; "Loading data from new repository will reset all the progress you made. Back up before you do it!" = "Loading data from new repository will reset all the progress you made. Back up before you do it!"; "Secondary" = "Secondary"; "Change" = "Change"; diff --git a/Umbrella/Resources/i18n/es.lproj/Localizable.strings b/Umbrella/Resources/i18n/es.lproj/Localizable.strings index 58fd037..e21a361 100644 --- a/Umbrella/Resources/i18n/es.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/es.lproj/Localizable.strings @@ -143,7 +143,7 @@ "Manually" = "Manualmente"; "Dashboard" = "Tablero"; "new customFeeds." = "nuevas customFeeds."; -"You can enable access in Settings> Umbrela> Notifications" = "Puede habilitar el acceso en Configuración> Umbrella> Notificaciones"; +"You can enable access in Settings> Umbrella> Notifications" = "Puede habilitar el acceso en Configuración> Umbrella> Notificaciones"; "Loading data from new repository will reset all the progress you made. Back up before you do it!" = "La carga de datos desde el nuevo repositorio restablecerá todo el progreso realizado. Copia de seguridad antes de hacerlo!"; "Secondary" = "Secundario"; "Change" = "Cambio"; diff --git a/Umbrella/Resources/i18n/fa.lproj/Localizable.strings b/Umbrella/Resources/i18n/fa.lproj/Localizable.strings index 89189c8..54a6e15 100644 --- a/Umbrella/Resources/i18n/fa.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/fa.lproj/Localizable.strings @@ -143,7 +143,7 @@ "Manually" = "به صورت دستی"; "Dashboard" = "پنل"; "new customFeeds." = "خوراک سفارشی جدید"; -"You can enable access in Settings> Umbrela> Notifications" = "شما می توانید دسترسی را در تنظیمات> چتر> اعلان ها فعال کنید"; +"You can enable access in Settings> Umbrella> Notifications" = "شما می توانید دسترسی را در تنظیمات> چتر> اعلان ها فعال کنید"; "Loading data from new repository will reset all the progress you made. Back up before you do it!" = "بارگیری داده ها از مخزن جدید تمام پیشرفت هایی را که ایجاد کرده اید تنظیم مجدد می کند. قبل از انجام این کار از قبل پشتیبان بگیرید"; "Secondary" = "ثانوی"; "Change" = "تغییر دادن"; diff --git a/Umbrella/Resources/i18n/fr.lproj/Localizable.strings b/Umbrella/Resources/i18n/fr.lproj/Localizable.strings index 2d65f02..f2265b9 100644 --- a/Umbrella/Resources/i18n/fr.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/fr.lproj/Localizable.strings @@ -143,7 +143,7 @@ "Manually" = "Manuellement"; "Dashboard" = "Tableau de bord"; "new customFeeds." = "Nouveaux Flux personnalisés."; -"You can enable access in Settings> Umbrela> Notifications" = "Vous pouvez activer l’accès aux Paramètres > Umbrella > Notifications"; +"You can enable access in Settings> Umbrella> Notifications" = "Vous pouvez activer l’accès aux Paramètres > Umbrella > Notifications"; "Loading data from new repository will reset all the progress you made. Back up before you do it!" = "Le chargement de données à partir d'un nouveau référentiel réinitialisera tous les progrès accomplis. Sauvegardez avant de le faire!"; "Secondary" = "Secondaire"; "Change" = "Changer"; diff --git a/Umbrella/Resources/i18n/ru.lproj/Localizable.strings b/Umbrella/Resources/i18n/ru.lproj/Localizable.strings index 8599855..bdbfc8c 100644 --- a/Umbrella/Resources/i18n/ru.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/ru.lproj/Localizable.strings @@ -143,7 +143,7 @@ "Manually" = "Вручную"; "Dashboard" = "Панель управления"; "new customFeeds." = "новые пользовательские каналы."; -"You can enable access in Settings> Umbrela> Notifications" = "Вы можете включить доступ через Настройки> Umbrela> Уведомления"; +"You can enable access in Settings> Umbrella> Notifications" = "Вы можете включить доступ через Настройки> Umbrella> Уведомления"; "Loading data from new repository will reset all the progress you made. Back up before you do it!" = "Загрузка данных из нового репозитория сбросит весь достигнутый вами прогресс. Сделайте резервную копию, прежде чем сделать это!"; "Secondary" = "второстепенный"; "Change" = "+ Изменить"; diff --git a/Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings b/Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings index 41a6376..234d305 100644 --- a/Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/zh-Hans.lproj/Localizable.strings @@ -143,7 +143,7 @@ "Manually" = "手動"; "Dashboard" = "儀表板"; "new customFeeds." = "新的customFeeds。"; -"You can enable access in Settings> Umbrela> Notifications" = "您可以在“設置> Umbrela> 通知中啟用訪問權限"; +"You can enable access in Settings> Umbrella> Notifications" = "您可以在“設置> Umbrella> 通知中啟用訪問權限"; "Loading data from new repository will reset all the progress you made. Back up before you do it!" = "从新存储库加载数据将重置您所做的所有进度。 在你做之前备份！"; "Secondary" = "次要"; "Change" = "更改"; diff --git a/Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings b/Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings index 3b64cf9..6fd0f7f 100644 --- a/Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings +++ b/Umbrella/Resources/i18n/zh-Hant.lproj/Localizable.strings @@ -143,7 +143,7 @@ "Manually" = "手動"; "Dashboard" = "儀表板"; "new customFeeds." = "新的自定義訂閲。"; -"You can enable access in Settings> Umbrela> Notifications" = "您可以在“設置”>“Umbrela”>“通知”中啟用訪問權限"; +"You can enable access in Settings> Umbrella> Notifications" = "您可以在“設置”>“Umbrella”>“通知”中啟用訪問權限"; "Loading data from new repository will reset all the progress you made. Back up before you do it!" = "從新存儲庫加載數據將重置您所做的所有進度。 在你做之前備份！"; "Secondary" = "次要"; "Change" = "更改"; diff --git a/Umbrella/ViewControllers/Feed-RSS/Feed/FeedViewController.swift b/Umbrella/ViewControllers/Feed-RSS/Feed/FeedViewController.swift index 2402df8..d89bb38 100644 --- a/Umbrella/ViewControllers/Feed-RSS/Feed/FeedViewController.swift +++ b/Umbrella/ViewControllers/Feed-RSS/Feed/FeedViewController.swift @@ -280,7 +280,7 @@ class FeedViewController: UIViewController { self.setNowLabel.text = "SET NOW".localized() self.securityFeedToLabel.text = "Security feed set to:".localized() - self.emptyDisplayLebLabel.text = "There are no events to display for your location. We’ll display them when they will occour. Pull to refresh to check again.".localized() + self.emptyDisplayLebLabel.text = "There are no events to display for your location. We’ll display them when they will occur. Pull to refresh to check again.".localized() self.emptyChangeLocationLabel.setTitle("CHANGE FEED SETTINGS".localized(), for: .normal) self.intervalLabel.text = "Interval".localized() diff --git a/Umbrella/Views/Account/SettingCell.swift b/Umbrella/Views/Account/SettingCell.swift index 9b7893e..e7a9747 100644 --- a/Umbrella/Views/Account/SettingCell.swift +++ b/Umbrella/Views/Account/SettingCell.swift @@ -153,7 +153,7 @@ class SettingCell: UITableViewCell { DispatchQueue.main.async { if permissionGranted == false { sender.isOn = false - UIAlertController.alert(title: "Alert".localized(), message: "You can enable access in Settings> Umbrela> Notifications", cancelButtonTitle: "OK".localized()) + UIAlertController.alert(title: "Alert".localized(), message: "You can enable access in Settings> Umbrella> Notifications", cancelButtonTitle: "OK".localized()) } else { UserDefaults.standard.set(sender.isOn, forKey: "showUpdateAsNotification")