merge base project into cannery
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				continuous-integration/drone/push Build is passing
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	continuous-integration/drone/push Build is passing
				
			This commit is contained in:
		| @@ -56,7 +56,7 @@ msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/user_registration/new.html.heex:47 | ||||
| #: lib/cannery_web/templates/user_reset_password/new.html.heex:3 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:44 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:42 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Forgot your password?" | ||||
| msgstr "" | ||||
| @@ -66,13 +66,13 @@ msgstr "" | ||||
| msgid "Invite someone new!" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/components/topbar.ex:135 | ||||
| #: lib/cannery_web/components/topbar.ex:138 | ||||
| #: lib/cannery_web/templates/user_confirmation/new.html.heex:31 | ||||
| #: lib/cannery_web/templates/user_registration/new.html.heex:44 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:47 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:45 | ||||
| #: lib/cannery_web/templates/user_reset_password/new.html.heex:31 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:3 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:30 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:28 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Log in" | ||||
| msgstr "" | ||||
| @@ -97,13 +97,13 @@ msgstr "" | ||||
| msgid "New Tag" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/components/topbar.ex:127 | ||||
| #: lib/cannery_web/components/topbar.ex:130 | ||||
| #: lib/cannery_web/templates/user_confirmation/new.html.heex:28 | ||||
| #: lib/cannery_web/templates/user_registration/new.html.heex:3 | ||||
| #: lib/cannery_web/templates/user_registration/new.html.heex:37 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:44 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:42 | ||||
| #: lib/cannery_web/templates/user_reset_password/new.html.heex:28 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:41 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:39 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Register" | ||||
| msgstr "" | ||||
| @@ -115,7 +115,7 @@ msgid "Resend confirmation instructions" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:3 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:31 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:29 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Reset password" | ||||
| msgstr "" | ||||
|   | ||||
| @@ -191,7 +191,7 @@ msgstr "" | ||||
| msgid "Invites" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:25 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:23 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Keep me logged in for 60 days" | ||||
| msgstr "" | ||||
| @@ -568,7 +568,7 @@ msgstr "" | ||||
| msgid "UPC" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:22 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:20 | ||||
| #: lib/cannery_web/templates/user_settings/edit.html.heex:76 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Confirm new password" | ||||
| @@ -580,7 +580,7 @@ msgstr "" | ||||
| msgid "Current password" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:18 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:16 | ||||
| #: lib/cannery_web/templates/user_settings/edit.html.heex:69 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "New password" | ||||
| @@ -1186,14 +1186,14 @@ msgstr "" | ||||
| #: lib/cannery_web/templates/user_confirmation/new.html.heex:12 | ||||
| #: lib/cannery_web/templates/user_registration/new.html.heex:20 | ||||
| #: lib/cannery_web/templates/user_reset_password/new.html.heex:12 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:19 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:17 | ||||
| #: lib/cannery_web/templates/user_settings/edit.html.heex:27 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Email" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/user_registration/new.html.heex:24 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:22 | ||||
| #: lib/cannery_web/templates/user_session/new.html.heex:20 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Password" | ||||
| msgstr "" | ||||
|   | ||||
| @@ -10,16 +10,11 @@ msgid "" | ||||
| msgstr "" | ||||
| "Language: en\n" | ||||
|  | ||||
| #: lib/cannery/accounts/email.ex:30 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Confirm your %{name} account" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/confirm_email.html.eex:3 | ||||
| #: lib/cannery_web/templates/email/confirm_email.html.heex:3 | ||||
| #: lib/cannery_web/templates/email/confirm_email.txt.eex:2 | ||||
| #: lib/cannery_web/templates/email/reset_password.html.eex:3 | ||||
| #: lib/cannery_web/templates/email/reset_password.html.heex:3 | ||||
| #: lib/cannery_web/templates/email/reset_password.txt.eex:2 | ||||
| #: lib/cannery_web/templates/email/update_email.html.eex:3 | ||||
| #: lib/cannery_web/templates/email/update_email.html.heex:3 | ||||
| #: lib/cannery_web/templates/email/update_email.txt.eex:2 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Hi %{email}," | ||||
| @@ -36,61 +31,62 @@ msgstr "" | ||||
| msgid "If you didn't request this change from %{url}, please ignore this." | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery/accounts/email.ex:37 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Reset your %{name} password" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery/accounts/email.ex:44 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Update your %{name} email" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/confirm_email.html.eex:9 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Welcome to %{name}!" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/confirm_email.txt.eex:4 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "Welcome to %{name}%!" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/update_email.html.eex:8 | ||||
| #: lib/cannery_web/templates/email/update_email.html.heex:8 | ||||
| #: lib/cannery_web/templates/email/update_email.txt.eex:4 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "You can change your email by visiting the URL below:" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/confirm_email.html.eex:14 | ||||
| #: lib/cannery_web/templates/email/confirm_email.html.heex:14 | ||||
| #: lib/cannery_web/templates/email/confirm_email.txt.eex:6 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "You can confirm your account by visiting the URL below:" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/reset_password.html.eex:8 | ||||
| #: lib/cannery_web/templates/email/reset_password.html.heex:8 | ||||
| #: lib/cannery_web/templates/email/reset_password.txt.eex:4 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "You can reset your password by visiting the URL below:" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/confirm_email.html.eex:22 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "If you didn't create an account at %{name}, please ignore this." | ||||
| #: lib/cannery/accounts/email.ex:30 | ||||
| #, elixir-autogen, elixir-format, fuzzy | ||||
| msgid "Confirm your Cannery account" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/reset_password.html.eex:16 | ||||
| #: lib/cannery_web/templates/email/update_email.html.eex:16 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "If you didn't request this change from %{name}, please ignore this." | ||||
| #: lib/cannery_web/templates/email/confirm_email.html.heex:22 | ||||
| #, elixir-autogen, elixir-format, fuzzy | ||||
| msgid "If you didn't create an account at Cannery, please ignore this." | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/reset_password.html.heex:16 | ||||
| #: lib/cannery_web/templates/email/update_email.html.heex:16 | ||||
| #, elixir-autogen, elixir-format, fuzzy | ||||
| msgid "If you didn't request this change from Cannery, please ignore this." | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery/accounts/email.ex:37 | ||||
| #, elixir-autogen, elixir-format, fuzzy | ||||
| msgid "Reset your Cannery password" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/layout/email.txt.eex:9 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "This email was sent from %{name} at %{url}, the self-hosted firearm tracker website." | ||||
| #, elixir-autogen, elixir-format, fuzzy | ||||
| msgid "This email was sent from Cannery at %{url}, the self-hosted firearm tracker website." | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/layout/email.html.heex:13 | ||||
| #, elixir-autogen, elixir-format | ||||
| msgid "This email was sent from %{name}, the self-hosted firearm tracker website." | ||||
| #, elixir-autogen, elixir-format, fuzzy | ||||
| msgid "This email was sent from Cannery, the self-hosted firearm tracker website." | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery/accounts/email.ex:44 | ||||
| #, elixir-autogen, elixir-format, fuzzy | ||||
| msgid "Update your Cannery email" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/email/confirm_email.html.heex:9 | ||||
| #: lib/cannery_web/templates/email/confirm_email.txt.eex:4 | ||||
| #, elixir-autogen, elixir-format, fuzzy | ||||
| msgid "Welcome to Cannery" | ||||
| msgstr "" | ||||
|   | ||||
| @@ -57,7 +57,7 @@ msgid "Not found" | ||||
| msgstr "" | ||||
|  | ||||
| #: lib/cannery_web/templates/user_registration/new.html.heex:13 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:14 | ||||
| #: lib/cannery_web/templates/user_reset_password/edit.html.heex:13 | ||||
| #: lib/cannery_web/templates/user_settings/edit.html.heex:22 | ||||
| #: lib/cannery_web/templates/user_settings/edit.html.heex:64 | ||||
| #: lib/cannery_web/templates/user_settings/edit.html.heex:118 | ||||
|   | ||||
		Reference in New Issue
	
	Block a user