Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consistent file name casing (and other localization improvements) #1629

Merged
merged 9 commits into from
Jul 26, 2016
Merged

Consistent file name casing (and other localization improvements) #1629

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ea7292
AUX files
oscargus Jul 26, 2016
067e854
ZIP files
oscargus Jul 26, 2016
9445648
BIB files
oscargus Jul 26, 2016
c14ef15
JAR files
oscargus Jul 26, 2016
f4cab36
didn't
oscargus Jul 26, 2016
1dacfbf
Couldn't what's
oscargus Jul 26, 2016
0e44319
Consistent casing
oscargus Jul 26, 2016
a5ed109
AUX apparently is commonly used in French words...
oscargus Jul 26, 2016
230dd63
Fixed the flawed quick-and-dirty find-and-replace failures
oscargus Jul 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/net/sf/jabref/cli/JabRefCLI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ private Options getOptions() {

options.addOption(Option.builder("a").
longOpt("aux").
desc(String.format("%s: %s[.aux],%s[.bib]", Localization.lang("Subdatabase from aux"),
desc(String.format("%s: %s[.aux],%s[.bib]", Localization.lang("Subdatabase from AUX"),
Localization.lang("file"),
Localization.lang("new"))).
hasArg().
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/sf/jabref/gui/actions/NewSubDatabaseAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import net.sf.jabref.preferences.JabRefPreferences;

/**
* The action concerned with generate a new (sub-)database from latex aux file.
* The action concerned with generate a new (sub-)database from latex AUX file.
*/
public class NewSubDatabaseAction extends MnemonicAwareAction {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/sf/jabref/gui/auximport/FromAuxDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

*/

// A wizard dialog for generating a new sub database from existing TeX aux file
// A wizard dialog for generating a new sub database from existing TeX AUX file
//
// created by : r.nagel 23.08.2004
//
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/net/sf/jabref/logic/auxparser/AuxParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/**
* LaTeX Aux to BibTeX Parser
* <p>
* Extracts a subset of BibTeX entries from a BibDatabase that are included in an aux file.
* Extracts a subset of BibTeX entries from a BibDatabase that are included in an AUX file.
*/
public class AuxParser {
private static final Log LOGGER = LogFactory.getLog(AuxParser.class);
Expand All @@ -35,9 +35,9 @@ public class AuxParser {
private final BibDatabase masterDatabase;

/**
* Generates a database based on the given aux file and BibTeX database
* Generates a database based on the given AUX file and BibTeX database
*
* @param auxFile Path to the LaTeX aux file
* @param auxFile Path to the LaTeX AUX file
* @param database BibTeX database
*/
public AuxParser(String auxFile, BibDatabase database) {
Expand All @@ -55,21 +55,21 @@ public AuxParserResult parse() {
}

/*
* Parses the aux file and extracts all bib keys.
* Also supports nested aux files (latex \\include).
* Parses the AUX file and extracts all bib keys.
* Also supports nested AUX files (latex \\include).
*
* There exists no specification of the aux file.
* Every package, class or document can write to the aux file.
* The aux file consists of LaTeX macros and is read at the \begin{document} and again at the \end{document}.
* There exists no specification of the AUX file.
* Every package, class or document can write to the AUX file.
* The AUX file consists of LaTeX macros and is read at the \begin{document} and again at the \end{document}.
*
* BibTeX citation: \citation{x,y,z}
* Biblatex citation: \abx@aux@cite{x,y,z}
* Nested aux files: \@input{x}
* Nested AUX files: \@input{x}
*/
private AuxParserResult parseAuxFile() {
AuxParserResult result = new AuxParserResult(masterDatabase);

// nested aux files
// nested AUX files
List<String> fileList = new ArrayList<>(1);
fileList.add(auxFile);

Expand Down Expand Up @@ -124,7 +124,7 @@ private AuxParserResult parseAuxFile() {
}

/*
* Try to find an equivalent BibTeX entry inside the reference database for all keys inside the aux file.
* Try to find an equivalent BibTeX entry inside the reference database for all keys inside the AUX file.
*/
private void resolveTags(AuxParserResult result) {
for (String key : result.getUniqueKeys()) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/sf/jabref/logic/auxparser/AuxParserResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public String getInformation(boolean includeMissingEntries) {
StringBuilder result = new StringBuilder();

result.append(Localization.lang("keys_in_database")).append(' ').append(masterDatabase.getEntryCount()).append('\n')
.append(Localization.lang("found_in_aux_file")).append(' ').append(getFoundKeysInAux()).append('\n')
.append(Localization.lang("found_in_AUX_file")).append(' ').append(getFoundKeysInAux()).append('\n')
.append(Localization.lang("resolved")).append(' ').append(getResolvedKeysCount()).append('\n')
.append(Localization.lang("not_found")).append(' ').append(getUnresolvedKeysCount()).append('\n')
.append(Localization.lang("crossreferenced entries included")).append(' ')
Expand All @@ -81,7 +81,7 @@ public String getInformation(boolean includeMissingEntries) {
}
}
if (nestedAuxCount > 0) {
result.append(Localization.lang("nested_aux_files")).append(' ').append(nestedAuxCount);
result.append(Localization.lang("nested_AUX_files")).append(' ').append(nestedAuxCount);
}
return result.toString();
}
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/l10n/JabRef_da.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ Format_of_author_and_editor_names=Formattering_af_forfatter-_og_redaktørnavn
Format_String=Formatstreng
Format_used=Format_brugt
Formatter_Name=Navn_på_formatering
found_in_aux_file=fundet_i_aux-fil
found_in_AUX_file=fundet_i_AUX-fil
Full_name=Fuldt_navn
General=Generelt
General_fields=Generelle_felter
Expand Down Expand Up @@ -483,7 +483,7 @@ Name=Navn
Name_formatter=Navneformatering
Natbib_style=Natbib-stil

nested_aux_files='nestede'_aux-filer
nested_AUX_files='nestede'_AUX-filer
New=Ny
new=ny
New_BibTeX_entry=Ny_BibTeX-post
Expand Down Expand Up @@ -724,7 +724,7 @@ Store_journal_abbreviations=Gem_tidsskriftsforkortelser
Stored_entry=Post_gemt
Strings=Strenge
Strings_for_database=Strenge_for_database
Subdatabase_from_aux=Deldatabase_fra_aux-fil
Subdatabase_from_AUX=Deldatabase_fra_AUX-fil
Switches_between_full_and_abbreviated_journal_name_if_the_journal_name_is_known.=Skifter_mellem_fuldt_og_forkortet_tidsskriftsnavn_hvis_navnet_er_kendt.
Synchronize_file_links=Synkroniser_eksterne_links
Synchronizing_file_links...=Synkroniserer_eksterne_links...
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/l10n/JabRef_de.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ Format_String=Formatier-Ausdruck
Format_used=benutztes_Format
Formatter_Name=Name_des_Formatierers

found_in_aux_file=gefundene_Schlüssel_in_AUX_Datei
found_in_AUX_file=gefundene_Schlüssel_in_AUX_Datei

Full_name=Kompletter_Name

Expand Down Expand Up @@ -883,7 +883,7 @@ Name_formatter=Namens-Formatierer

Natbib_style=Natbib-Stil

nested_aux_files=referenzierte_AUX_Dateien
nested_AUX_files=referenzierte_AUX_Dateien

New=Neu

Expand Down Expand Up @@ -1347,7 +1347,7 @@ Strings=Ersetzen

Strings_for_database=Strings_für_die_Datei

Subdatabase_from_aux=Teildatenbank_aus_aux-Datei
Subdatabase_from_AUX=Teildatenbank_aus_AUX-Datei


##\## These lines were changed\:
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -600,7 +600,7 @@ Format_String=Format_String
Format_used=Format_used
Formatter_Name=Formatter_Name

found_in_aux_file=found_in_aux_file
found_in_AUX_file=found_in_AUX_file

Full_name=Full_name

Expand Down Expand Up @@ -755,7 +755,7 @@ Key_pattern=Key_pattern

keys_in_database=keys_in_database

#nottranslated.Toviewit,usemenu"Tools|NewBibTeXfilefromAUxfile",andlaunchtheactiononanon-existantauxfile.
#nottranslated.Toviewit,usemenu"Tools|NewBibTeXfilefromAUxfile",andlaunchtheactiononanon-existantAUXfile.
Keyword=Keyword

Label=Label
Expand Down Expand Up @@ -841,7 +841,7 @@ Name_formatter=Name_formatter

Natbib_style=Natbib_style

nested_aux_files=nested_aux_files
nested_AUX_files=nested_AUX_files

New=New

Expand Down Expand Up @@ -1265,7 +1265,7 @@ Strings=Strings

Strings_for_database=Strings_for_database

Subdatabase_from_aux=Subdatabase_from_aux
Subdatabase_from_AUX=Subdatabase_from_AUX

Switches_between_full_and_abbreviated_journal_name_if_the_journal_name_is_known.=Switches_between_full_and_abbreviated_journal_name_if_the_journal_name_is_known.

Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/l10n/JabRef_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ Format_of_author_and_editor_names=Formato_de_los_nombres_de_autor_y_editor
Format_String=Formatear_cadena
Format_used=Formato_usado
Formatter_Name=Nombre_del_formateador
found_in_aux_file=encontrado_en_archivo_aux
found_in_AUX_file=encontrado_en_archivo_AUX
Full_name=Nombre_completo
General=General
General_fields=Generar_campos
Expand Down Expand Up @@ -450,7 +450,7 @@ Moved_group_"%0".=Se_ha_movido_el_grupo_"%0".
Name=Nombre
Name_formatter=Formateador_de_nombre
Natbib_style=Estilo_Natbib
nested_aux_files=Archivos_aux_anidados
nested_AUX_files=Archivos_AUX_anidados
New=Nuevo
new=new
New_BibTeX_entry=Nueva_entrada_BibTeX
Expand Down Expand Up @@ -676,7 +676,7 @@ Store_journal_abbreviations=Almacenar_abreviaturas_de_revista
Stored_entry=Entrada_almacenada
Strings=Cadenas
Strings_for_database=Cadenas_para_base_de_datos
Subdatabase_from_aux=Base_de_datos_secundaria_desde_aux
Subdatabase_from_AUX=Base_de_datos_secundaria_desde_AUX
Switches_between_full_and_abbreviated_journal_name_if_the_journal_name_is_known.=Cambia_entre_nombre_completo_y_abreviatura_de_la_revista_si_se_conoce_en_nombe_de_la_revista.
Synchronize_file_links=Sincronizar_enlaces_de_archivo
Synchronizing_file_links...=Sincronizando_archivo_enlaces...
Expand Down
8 changes: 4 additions & 4 deletions src/main/resources/l10n/JabRef_fa.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,7 +611,7 @@ Format_String=
Format_used=
Formatter_Name=

found_in_aux_file=
found_in_AUX_file=

Full_name=

Expand Down Expand Up @@ -764,7 +764,7 @@ Key_pattern=

keys_in_database=

#nottranslated.Toviewit,usemenu"Tools|NewBibTeXfilefromAUxfile",andlaunchtheactiononanon-existantauxfile.
#nottranslated.Toviewit,usemenu"Tools|NewBibTeXfilefromAUxfile",andlaunchtheactiononanon-existantAUXfile.
Keyword=

Label=
Expand Down Expand Up @@ -850,7 +850,7 @@ Name_formatter=

Natbib_style=

nested_aux_files=
nested_AUX_files=

New=

Expand Down Expand Up @@ -1308,7 +1308,7 @@ Strings=

Strings_for_database=

Subdatabase_from_aux=
Subdatabase_from_AUX=


Synchronize_file_links=
Expand Down
Loading