Skip to content

Commit 59ccb50

Browse files
kopporkoppor
committed
Merge pull request #13 from IngvarJackal/master
Language locale fix for BugFix #959
2 parents 582fbec + f42065e commit 59ccb50

17 files changed

+1681
-1590
lines changed

‎src/main/java/net/sf/jabref/PreviewPrefsTab.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public void actionPerformed(ActionEvent e) {
170170
JOptionPane.PLAIN_MESSAGE);
171171
} catch (StringIndexOutOfBoundsException ex) {
172172
ex.printStackTrace();
173-
JOptionPane.showMessageDialog(null, "Parsing error: illegal backslash expression.\n" + ex.getMessage() + "\nLook at stderr for details.", "Parsing error", JOptionPane.WARNING_MESSAGE);
173+
JOptionPane.showMessageDialog(null, Globals.lang("Parsing error") + ": " + Globals.lang("illegal backslash expression") + ".\n" + ex.getMessage() + "\n" + Globals.lang("Look at stderr for details") + ".", Globals.lang("Parsing error"), JOptionPane.ERROR_MESSAGE);
174174
}
175175
}
176176
});
@@ -185,7 +185,7 @@ public void actionPerformed(ActionEvent e) {
185185
Globals.lang("Preview"), JOptionPane.PLAIN_MESSAGE);
186186
} catch (StringIndexOutOfBoundsException ex) {
187187
ex.printStackTrace();
188-
JOptionPane.showMessageDialog(null, "Parsing error: illegal backslash expression.\n" + ex.getMessage() + "\nLook at stderr for details.", "Parsing error", JOptionPane.WARNING_MESSAGE);
188+
JOptionPane.showMessageDialog(null, "Parsing error: illegal backslash expression.\n" + ex.getMessage() + "\nLook at stderr for details.", "Parsing error", JOptionPane.ERROR_MESSAGE);
189189
}
190190
}
191191
});

‎src/main/java/net/sf/jabref/export/layout/LayoutHelper.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222

2323
import javax.swing.JOptionPane;
2424

25+
import net.sf.jabref.Globals;
26+
27+
import com.sun.star.ui.GlobalAcceleratorConfiguration;
28+
2529

2630
/**
2731
* Helper class to get a Layout object.
@@ -376,7 +380,7 @@ private void parseField() throws IOException, StringIndexOutOfBoundsException
376380
for (StringInt entry : parsedEntries.subList(Math.max(0, parsedEntries.size()-6), parsedEntries.size()-1)) {
377381
lastFive.append(entry.s);
378382
}
379-
throw new StringIndexOutOfBoundsException("Backslash parsing error near " + "\'" + lastFive.toString().replace("\n", " ") + "\'");
383+
throw new StringIndexOutOfBoundsException(Globals.lang("Backslash parsing error near") + " \'" + lastFive.toString().replace("\n", " ") + "\'");
380384
}
381385

382386
//System.out.println("NAME:" + name);

‎src/main/resources/resource/JabRef_da.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1664,3 +1664,9 @@ Save_sort_order=
16641664
Show_Extra_columns=
16651665
Save_entries_as_configured_globally=
16661666
Open_=
1667+
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
1668+
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
1669+
Save_fields_as_user_defined_order=
1670+
Parsing_error=
1671+
illegal_backslash_expression=
1672+
Backslash_parsing_error_near=

‎src/main/resources/resource/JabRef_de.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2421,3 +2421,9 @@ Save_sort_order=
24212421
Show_Extra_columns=
24222422
Save_entries_as_configured_globally=
24232423
Open_=
2424+
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
2425+
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
2426+
Save_fields_as_user_defined_order=
2427+
Parsing_error=
2428+
illegal_backslash_expression=
2429+
Backslash_parsing_error_near=

‎src/main/resources/resource/JabRef_en.properties‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1513,10 +1513,6 @@ Sorted_all_subgroups_recursively.=Sorted_all_subgroups_recursively.
15131513

15141514
Sorted_immediate_subgroups.=Sorted_immediate_subgroups.
15151515

1516-
Sort_fields_in_alphabeta_order_(as_ver_2.10)=Sort_fields_in_alphabeta_order_(as_ver_2.10)
1517-
Sort_fields_in_old_fasion_(as_ver_2.9.2)=Sort_fields_in_old_fasion_(as_ver_2.9.2)
1518-
Save_fields_as_user_defined_order=Save_fields_as_user_defined_order
1519-
15201516
source_edit=source_edit
15211517
Special_Name_Formatters=Special_Name_Formatters
15221518

@@ -2402,13 +2398,20 @@ Opened_%0_folder(s).=Opened_%0_folder(s).
24022398

24032399

24042400
Searches_for_unlinked_PDF_files_on_the_file_system=Searches_for_unlinked_PDF_files_on_the_file_system
2405-
2406-
Save_entries_ordered_as_specified=Save_entries_ordered_as_specified
2407-
Save_sort_order=Save_sort_order
24082401
Export_entries_ordered_as_specified=Export_entries_ordered_as_specified
24092402
Export_sort_order=Export_sort_order
24102403
File_Sorting=File_Sorting
24112404
Newline_separator=Newline_separator
2405+
2406+
Save_entries_ordered_as_specified=Save_entries_ordered_as_specified
2407+
Save_sort_order=Save_sort_order
24122408
Show_Extra_columns=Show_Extra_columns
24132409
Save_entries_as_configured_globally=Save_entries_as_configured_globally
24142410
Open_=Open_
2411+
2412+
Sort_fields_in_alphabeta_order_(as_ver_2.10)=Sort_fields_in_alphabeta_order_(as_ver_2.10)
2413+
Sort_fields_in_old_fasion_(as_ver_2.9.2)=Sort_fields_in_old_fasion_(as_ver_2.9.2)
2414+
Save_fields_as_user_defined_order=Save_fields_as_user_defined_order
2415+
Parsing_error=Parsing_error
2416+
illegal_backslash_expression=illegal_backslash_expression
2417+
Backslash_parsing_error_near=Backslash_parsing_error_near

‎src/main/resources/resource/JabRef_es.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,3 +1556,9 @@ Save_sort_order=
15561556
Show_Extra_columns=
15571557
Save_entries_as_configured_globally=
15581558
Open_=
1559+
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
1560+
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
1561+
Save_fields_as_user_defined_order=
1562+
Parsing_error=
1563+
illegal_backslash_expression=
1564+
Backslash_parsing_error_near=

‎src/main/resources/resource/JabRef_fr.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1602,3 +1602,9 @@ Save_sort_order=Enregistrer_l'ordre_de_tri
16021602
Show_Extra_columns=Montrer_les_colonnes_suppl\u00e9mentaires
16031603
Save_entries_as_configured_globally=Enregistrer_les_entr\u00e9es_comme_dans_la_configuration_g\u00e9n\u00e9rale
16041604
Open_=Ouvrir_
1605+
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
1606+
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
1607+
Save_fields_as_user_defined_order=
1608+
Parsing_error=
1609+
illegal_backslash_expression=
1610+
Backslash_parsing_error_near=

‎src/main/resources/resource/JabRef_in.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,3 +1575,9 @@ Save_sort_order=
15751575
Show_Extra_columns=
15761576
Save_entries_as_configured_globally=
15771577
Open_=
1578+
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
1579+
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
1580+
Save_fields_as_user_defined_order=
1581+
Parsing_error=
1582+
illegal_backslash_expression=
1583+
Backslash_parsing_error_near=

‎src/main/resources/resource/JabRef_it.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,3 +1686,9 @@ Save_sort_order=
16861686
Show_Extra_columns=
16871687
Save_entries_as_configured_globally=
16881688
Open_=
1689+
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
1690+
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
1691+
Save_fields_as_user_defined_order=
1692+
Parsing_error=
1693+
illegal_backslash_expression=
1694+
Backslash_parsing_error_near=

‎src/main/resources/resource/JabRef_ja.properties‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2406,3 +2406,9 @@ Save_sort_order=
24062406
Show_Extra_columns=
24072407
Save_entries_as_configured_globally=
24082408
Open_=
2409+
Sort_fields_in_alphabeta_order_(as_ver_2.10)=
2410+
Sort_fields_in_old_fasion_(as_ver_2.9.2)=
2411+
Save_fields_as_user_defined_order=
2412+
Parsing_error=
2413+
illegal_backslash_expression=
2414+
Backslash_parsing_error_near=

0 commit comments

Comments
 (0)