Skip to content
Snippets Groups Projects
Commit 99c3137a authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Merge branch 'release-2.3' of https://github.com/vufind-org/vufind into release-2.3

parents 22e65e22 3260b391
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 25 additions and 27 deletions
import/marc_auth_fast_chronological.properties
+ 3
− 3
View file @ 99c3137a
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
id = 001 id = 001
source = "FAST" source = "FAST"
record_type = "Chronological" record_type = "Chronological"
heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151a:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151avxyz:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz
use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451a:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451avxyz:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz
see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551a:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551avxyz:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz
import/marc_auth_fast_corporate.properties
+ 3
− 3
View file @ 99c3137a
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
id = 001 id = 001
source = "FAST" source = "FAST"
record_type = "Corporate Names" record_type = "Corporate Names"
heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151a:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151avxyz:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz
use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451a:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451avxyz:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz
see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551a:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551avxyz:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz
import/marc_auth_fast_event.properties
+ 3
− 3
View file @ 99c3137a
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
id = 001 id = 001
source = "FAST" source = "FAST"
record_type = "Event" record_type = "Event"
heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151a:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151avxyz:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz
use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451a:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451avxyz:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz
see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551a:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551avxyz:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz
import/marc_auth_fast_formgenre.properties
+ 3
− 3
View file @ 99c3137a
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
id = 001 id = 001
source = "FAST" source = "FAST"
record_type = "Form/Genre" record_type = "Form/Genre"
heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151a:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151avxyz:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz
use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451a:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451avxyz:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz
see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551a:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551avxyz:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz
import/marc_auth_fast_geographic.properties
+ 3
− 3
View file @ 99c3137a
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
id = 001 id = 001
source = "FAST" source = "FAST"
record_type = "Geographic" record_type = "Geographic"
heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151a:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151avxyz:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz
use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451a:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451avxyz:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz
see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551a:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551avxyz:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz
import/marc_auth_fast_personal.properties
+ 3
− 3
View file @ 99c3137a
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
id = 001 id = 001
source = "FAST" source = "FAST"
record_type = "Personal Names" record_type = "Personal Names"
heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151a:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151avxyz:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz
use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451a:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451avxyz:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz
see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551a:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551avxyz:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz
import/marc_auth_fast_title.properties
+ 3
− 3
View file @ 99c3137a
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
id = 001 id = 001
source = "FAST" source = "FAST"
record_type = "Uniform Titles" record_type = "Uniform Titles"
heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151a:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151avxyz:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz
use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451a:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451avxyz:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz
see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551a:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551avxyz:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz
import/marc_auth_fast_topical.properties
+ 3
− 3
View file @ 99c3137a
...@@ -6,6 +6,6 @@ ...@@ -6,6 +6,6 @@
id = 001 id = 001
source = "FAST" source = "FAST"
record_type = "Topical" record_type = "Topical"
heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151a:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz heading = 100abcdegjqt:110abcdegjqt:111abcdegjqt:130abcdegjqt:150abvxyz:151avxyz:155avxyz:180vxyz:181vxyz:182vxyz:185vxyz
use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451a:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz use_for = 400abcdegjqt:410abcdegjqt:411abcdegjqt:430abcdegjqt:450abvxyz:451avxyz:455avxyz:480vxyz:481vxyz:482vxyz:485vxyz
see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551a:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz see_also = 500abcdegjqt:510abcdegjqt:511abcdegjqt:530abcdegjqt:550abvxyz:551avxyz:555avxyz:580vxyz:581vxyz:582vxyz:585vxyz
languages/en.ini
+ 0
− 2
View file @ 99c3137a
...@@ -700,7 +700,6 @@ recaptcha_refresh_btn = "Get a new challenge" ...@@ -700,7 +700,6 @@ recaptcha_refresh_btn = "Get a new challenge"
recaptcha_visual_challenge = "Get a visual challenge" recaptcha_visual_challenge = "Get a visual challenge"
Record Citations = "Record Citations" Record Citations = "Record Citations"
Record Count = "Record Count" Record Count = "Record Count"
Recover Account = "Recover Account"
recovery_by_email = "Recover by email" recovery_by_email = "Recover by email"
recovery_by_username = "Recover by username" recovery_by_username = "Recover by username"
recovery_disabled = "Password recovery not enabled" recovery_disabled = "Password recovery not enabled"
...@@ -796,7 +795,6 @@ Similar Items = "Similar Items" ...@@ -796,7 +795,6 @@ Similar Items = "Similar Items"
skip_confirm = "Are you sure you want to skip this step?" skip_confirm = "Are you sure you want to skip this step?"
skip_fix_metadata = "Do not fix the metadata at this time." skip_fix_metadata = "Do not fix the metadata at this time."
skip_step = "Skip this step" skip_step = "Skip this step"
Skip to content = "Skip to content"
Slide = Slide Slide = Slide
sms_failure = "Error! Could not send message." sms_failure = "Error! Could not send message."
sms_phone_number = "10-Digit Phone Number" sms_phone_number = "10-Digit Phone Number"
......
themes/jquerymobile/templates/Auth/Database/recovery.phtml
+ 1
− 1
View file @ 99c3137a
...@@ -8,4 +8,4 @@ ...@@ -8,4 +8,4 @@
<input type="email" id="email" name="email" style="margin-top:.5em;height:28px"/> <input type="email" id="email" name="email" style="margin-top:.5em;height:28px"/>
</div> </div>
<?=$this->recaptcha()->html($this->useRecaptcha) ?> <?=$this->recaptcha()->html($this->useRecaptcha) ?>
<input type="submit" name="submit" value="<?=$this->transEsc('Recover Account') ?>"/> <input type="submit" name="submit" value="<?=$this->transEsc('Submit') ?>"/>
\ No newline at end of file \ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment