Changeset 30808 for main/trunk/greenstone3/web/WEB-INF

Timestamp:

2016-09-15T10:40:22+12:00 (8 years ago)

Author:

kjdon

Message:

removed my debugging xs. Oops, a whole lot were left in :-(. changing the 'ddd occurs x times in y documents' text strings. can't have this in two parts to be joined together as other languages have different sentence structure. so we just need lots of versions of it

File:

• main/trunk/greenstone3/web/WEB-INF/classes/interface_default.properties (modified) (5 diffs)

main/trunk/greenstone3/web/WEB-INF/classes/interface_default.properties

@@ -71 +71 @@
 query.docsreturned={0-numdocs} {1-level-plural} returned.
 
-query.termoccurs.1.1={0-term} occurs {1-termfreq} time
-query.termoccurs.x.1={0-term} occurs {1-termfreq} times
-query.termoccurs.x.x={0-term} occurs {1-termfreq} times
-query.termSectionFreq=in {0-numdocs} {1-level-plural}
+query.termoccurs.0={0-term} occurs 0 times
+query.termoccurs.1={0-term} occurs 1 time
+query.termoccurs.x={0-term} occurs {1-termfreq} times
+
+query.termoccurs.1.1={0-term} occurs 1 time in 1 {1-level-single}
+query.termoccurs.x.1={0-term} occurs {1-termfreq} times in 1 {2-level-single}
+query.termoccurs.x.x={0-term} occurs {1-termfreq} times in {2-numdocs} {3-level-plural}
+
+#query.termoccurs.1.1={0-term} occurs {1-termfreq} time
+#query.termoccurs.x.1={0-term} occurs {1-termfreq} times
+#query.termoccurs.x.x={0-term} occurs {1-termfreq} times
+#query.termSectionFreq=in {0-numdocs} {1-level-plural}
 query.document=document
 query.document_plural=documents
@@ -102 +110 @@
 pref.all=all
 pref.set_prefs=Set preferences
-pref.set_prefs_help=Click "Set preferences" if you want to save your changes.
+pref.set_prefs_help=Click 'Set preferences' if you want to save your changes.
 pref.berrybasket=Berry basket:
 pref.documentbasket=Document basket:
@@ -108 +116 @@
 pref.off=off
 pref.book=Book viewer mode: 
-pref.formatedit=Format edit mod:e
-pref.theme=Visual theme
+pref.formatedit=Format edit mode:
+pref.theme=Visual theme:
+pref.switch_theme=Switch Theme
 
 ##################
@@ -115 +124 @@
 ##################
 doc.loading=loading
-doc.filter_pages=Filter pagesx
-doc.filter.pagenum=pagenumx
-doc.filter.title=titlex
-doc.highlightTooltip=Enable or disable search term highlightingx
-doc.realisticBooksTooltip=Enable or disable the realistic books viewx
-doc.zoomTooltip=Enable or disable zooming images in the standard viewx
-doc.slideshowTooltip=View a slideshow of the imagesx
-doc.floatingTooltip=Fix the table of contents to the right side of the screenx
-doc.expand_doc=Expand documentx
-doc.collapse_doc=Collapse documentx
+doc.filter_pages=Filter pages
+doc.filter.pagenum=pagenum
+doc.filter.title=title
+doc.highlightTooltip=Enable or disable search term highlighting
+doc.realisticBooksTooltip=Enable or disable the realistic books view
+doc.zoomTooltip=Enable or disable zooming images in the standard view
+doc.slideshowTooltip=View a slideshow of the images
+doc.floatingTooltip=Fix the table of contents to the right side of the screen
+doc.expand_doc=Expand document
+doc.collapse_doc=Collapse document
 doc.document=Document
 doc.back_to_top=back to top
-doc.default_view=Default viewx
-doc.image_view=Image viewx
-doc.text_view=Text viewx
+doc.default_view=Default view
+doc.image_view=Image view
+doc.text_view=Text view
 
 doc.map_nearby_docs=Show documents near here
@@ -142 +151 @@
 #####################
 
-de.rebuilding_collection=rebuilding collectionx
-de.no_changes=No changes detectedx
-de.save=Save changesx
-de.rebuild=Rebuildx
-de.saverebuild=Save and Rebuildx
-de.extract_pages=Extract these pages to a documentx
-de.visible_metadata=Visible metadatax:
-de.all_metadata=Allx
-de.add_new_metadata=Add new metadatax
-de.no_meta_name_given=No value given for new metadata namex
-de.edit_metadata=edit metadatax
-de.hide_metadata=hide metadatax
-de.edit_content=Edit contentx
-de.hide_editor=Hide Editorx
-de.save_changes=Save changesx
-de.saving=Savingx
-de.enter_meta_name=Enter a metadata name, then click 'Add New Metadata'x
-de.enter_meta_dropdown=Enter a metadata name, or use the down arrow to select one, then click 'Add New Metadata'x
+de.rebuilding_collection=rebuilding collection
+de.no_changes=No changes detected
+de.save=Save changes
+de.rebuild=Rebuild
+de.saverebuild=Save and Rebuild
+de.extract_pages=Extract these pages to a document
+de.visible_metadata=Visible metadata:
+de.all_metadata=All
+de.add_new_metadata=Add new metadata
+de.no_meta_name_given=No value given for new metadata name
+de.edit_metadata=edit metadata
+de.hide_metadata=hide metadata
+de.edit_content=Edit content
+de.hide_editor=Hide Editor
+de.save_changes=Save changes
+de.saving=Saving
+de.enter_meta_name=Enter a metadata name, then click 'Add New Metadata'
+de.enter_meta_dropdown=Enter a metadata name, or use the down arrow to select one, then click 'Add New Metadata'
 ##################
 # authentication page