`, and ``.
+@font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace;
+@font-family-base: @font-family-sans-serif;
+
+@font-size-base: 14px;
+@font-size-large: ceil((@font-size-base * 1.25)); // ~18px
+@font-size-small: ceil((@font-size-base * 0.85)); // ~12px
+
+@font-size-h1: floor((@font-size-base * 2.6)); // ~36px
+@font-size-h2: floor((@font-size-base * 2.15)); // ~30px
+@font-size-h3: ceil((@font-size-base * 1.7)); // ~24px
+@font-size-h4: ceil((@font-size-base * 1.25)); // ~18px
+@font-size-h5: @font-size-base;
+@font-size-h6: ceil((@font-size-base * 0.85)); // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+@line-height-base: 1.428571429; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+@line-height-computed: floor((@font-size-base * @line-height-base)); // ~20px
+
+//** By default, this inherits from the ``.
+@headings-font-family: inherit;
+@headings-font-weight: 500;
+@headings-line-height: 1.1;
+@headings-color: inherit;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
+
+//** Load fonts from this directory.
+@icon-font-path: "../fonts/";
+//** File name for all font files.
+@icon-font-name: "glyphicons-halflings-regular";
+//** Element ID within SVG icon file.
+@icon-font-svg-id: "glyphicons_halflingsregular";
+
+
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
+
+@padding-base-vertical: 6px;
+@padding-base-horizontal: 12px;
+
+@padding-large-vertical: 10px;
+@padding-large-horizontal: 16px;
+
+@padding-small-vertical: 5px;
+@padding-small-horizontal: 10px;
+
+@padding-xs-vertical: 1px;
+@padding-xs-horizontal: 5px;
+
+@line-height-large: 1.33;
+@line-height-small: 1.5;
+
+@border-radius-base: 4px;
+@border-radius-large: 6px;
+@border-radius-small: 3px;
+
+//** Global color for active items (e.g., navs or dropdowns).
+@component-active-color: #fff;
+//** Global background color for active items (e.g., navs or dropdowns).
+@component-active-bg: @brand-primary;
+
+//** Width of the `border` for generating carets that indicator dropdowns.
+@caret-width-base: 4px;
+//** Carets increase slightly in size for larger components.
+@caret-width-large: 5px;
+
+
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
+
+//** Padding for ``s and ` | `s.
+@table-cell-padding: 8px;
+//** Padding for cells in `.table-condensed`.
+@table-condensed-cell-padding: 5px;
+
+//** Default background color used for all tables.
+@table-bg: transparent;
+//** Background color used for `.table-striped`.
+@table-bg-accent: #f9f9f9;
+//** Background color used for `.table-hover`.
+@table-bg-hover: #f5f5f5;
+@table-bg-active: @table-bg-hover;
+
+//** Border color for table and cell borders.
+@table-border-color: #ddd;
+
+
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
+
+@btn-font-weight: normal;
+
+@btn-default-color: #333;
+@btn-default-bg: #fff;
+@btn-default-border: #ccc;
+
+@btn-primary-color: #fff;
+@btn-primary-bg: @brand-primary;
+@btn-primary-border: darken(@btn-primary-bg, 5%);
+
+@btn-success-color: #fff;
+@btn-success-bg: @brand-success;
+@btn-success-border: darken(@btn-success-bg, 5%);
+
+@btn-info-color: #fff;
+@btn-info-bg: @brand-info;
+@btn-info-border: darken(@btn-info-bg, 5%);
+
+@btn-warning-color: #fff;
+@btn-warning-bg: @brand-warning;
+@btn-warning-border: darken(@btn-warning-bg, 5%);
+
+@btn-danger-color: #fff;
+@btn-danger-bg: @brand-danger;
+@btn-danger-border: darken(@btn-danger-bg, 5%);
+
+@btn-link-disabled-color: @gray-light;
+
+
+//== Forms
+//
+//##
+
+//** `` background color
+@input-bg: #fff;
+//** `` background color
+@input-bg-disabled: @gray-lighter;
+
+//** Text color for ``s
+@input-color: @gray;
+//** `` border color
+@input-border: #ccc;
+//** `` border radius
+@input-border-radius: @border-radius-base;
+//** Border color for inputs on focus
+@input-border-focus: #66afe9;
+
+//** Placeholder text color
+@input-color-placeholder: @gray-light;
+
+//** Default `.form-control` height
+@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
+//** Large `.form-control` height
+@input-height-large: (ceil(@font-size-large * @line-height-large) + (@padding-large-vertical * 2) + 2);
+//** Small `.form-control` height
+@input-height-small: (floor(@font-size-small * @line-height-small) + (@padding-small-vertical * 2) + 2);
+
+@legend-color: @gray-dark;
+@legend-border-color: #e5e5e5;
+
+//** Background color for textual input addons
+@input-group-addon-bg: @gray-lighter;
+//** Border color for textual input addons
+@input-group-addon-border-color: @input-border;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
+
+//** Background for the dropdown menu.
+@dropdown-bg: #fff;
+//** Dropdown menu `border-color`.
+@dropdown-border: rgba(0,0,0,.15);
+//** Dropdown menu `border-color` **for IE8**.
+@dropdown-fallback-border: #ccc;
+//** Divider color for between dropdown items.
+@dropdown-divider-bg: #e5e5e5;
+
+//** Dropdown link text color.
+@dropdown-link-color: @gray-dark;
+//** Hover color for dropdown links.
+@dropdown-link-hover-color: darken(@gray-dark, 5%);
+//** Hover background for dropdown links.
+@dropdown-link-hover-bg: #f5f5f5;
+
+//** Active dropdown menu item text color.
+@dropdown-link-active-color: @component-active-color;
+//** Active dropdown menu item background color.
+@dropdown-link-active-bg: @component-active-bg;
+
+//** Disabled dropdown menu item background color.
+@dropdown-link-disabled-color: @gray-light;
+
+//** Text color for headers within dropdown menus.
+@dropdown-header-color: @gray-light;
+
+//** Deprecated `@dropdown-caret-color` as of v3.1.0
+@dropdown-caret-color: #000;
+
+
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
+
+@zindex-navbar: 1000;
+@zindex-dropdown: 1000;
+@zindex-popover: 1060;
+@zindex-tooltip: 1070;
+@zindex-navbar-fixed: 1030;
+@zindex-modal-background: 1040;
+@zindex-modal: 1050;
+
+
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `@screen-xs` as of v3.0.1
+@screen-xs: 480px;
+//** Deprecated `@screen-xs-min` as of v3.2.0
+@screen-xs-min: @screen-xs;
+//** Deprecated `@screen-phone` as of v3.0.1
+@screen-phone: @screen-xs-min;
+
+// Small screen / tablet
+//** Deprecated `@screen-sm` as of v3.0.1
+@screen-sm: 768px;
+@screen-sm-min: @screen-sm;
+//** Deprecated `@screen-tablet` as of v3.0.1
+@screen-tablet: @screen-sm-min;
+
+// Medium screen / desktop
+//** Deprecated `@screen-md` as of v3.0.1
+@screen-md: 992px;
+@screen-md-min: @screen-md;
+//** Deprecated `@screen-desktop` as of v3.0.1
+@screen-desktop: @screen-md-min;
+
+// Large screen / wide desktop
+//** Deprecated `@screen-lg` as of v3.0.1
+@screen-lg: 1200px;
+@screen-lg-min: @screen-lg;
+//** Deprecated `@screen-lg-desktop` as of v3.0.1
+@screen-lg-desktop: @screen-lg-min;
+
+// So media queries don't overlap when required, provide a maximum
+@screen-xs-max: (@screen-sm-min - 1);
+@screen-sm-max: (@screen-md-min - 1);
+@screen-md-max: (@screen-lg-min - 1);
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+@grid-columns: 12;
+//** Padding between columns. Gets divided in half for the left and right.
+@grid-gutter-width: 30px;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+@grid-float-breakpoint: @screen-sm-min;
+//** Point at which the navbar begins collapsing.
+@grid-float-breakpoint-max: (@grid-float-breakpoint - 1);
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
+
+// Small screen / tablet
+@container-tablet: ((720px + @grid-gutter-width));
+//** For `@screen-sm-min` and up.
+@container-sm: @container-tablet;
+
+// Medium screen / desktop
+@container-desktop: ((940px + @grid-gutter-width));
+//** For `@screen-md-min` and up.
+@container-md: @container-desktop;
+
+// Large screen / wide desktop
+@container-large-desktop: ((1140px + @grid-gutter-width));
+//** For `@screen-lg-min` and up.
+@container-lg: @container-large-desktop;
+
+
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+@navbar-height: 50px;
+@navbar-margin-bottom: @line-height-computed;
+@navbar-border-radius: @border-radius-base;
+@navbar-padding-horizontal: floor((@grid-gutter-width / 2));
+@navbar-padding-vertical: ((@navbar-height - @line-height-computed) / 2);
+@navbar-collapse-max-height: 340px;
+
+@navbar-default-color: #777;
+@navbar-default-bg: #f8f8f8;
+@navbar-default-border: darken(@navbar-default-bg, 6.5%);
+
+// Navbar links
+@navbar-default-link-color: #777;
+@navbar-default-link-hover-color: #333;
+@navbar-default-link-hover-bg: transparent;
+@navbar-default-link-active-color: #555;
+@navbar-default-link-active-bg: darken(@navbar-default-bg, 6.5%);
+@navbar-default-link-disabled-color: #ccc;
+@navbar-default-link-disabled-bg: transparent;
+
+// Navbar brand label
+@navbar-default-brand-color: @navbar-default-link-color;
+@navbar-default-brand-hover-color: darken(@navbar-default-brand-color, 10%);
+@navbar-default-brand-hover-bg: transparent;
+
+// Navbar toggle
+@navbar-default-toggle-hover-bg: #ddd;
+@navbar-default-toggle-icon-bar-bg: #888;
+@navbar-default-toggle-border-color: #ddd;
+
+
+// Inverted navbar
+// Reset inverted navbar basics
+@navbar-inverse-color: @gray-light;
+@navbar-inverse-bg: #222;
+@navbar-inverse-border: darken(@navbar-inverse-bg, 10%);
+
+// Inverted navbar links
+@navbar-inverse-link-color: @gray-light;
+@navbar-inverse-link-hover-color: #fff;
+@navbar-inverse-link-hover-bg: transparent;
+@navbar-inverse-link-active-color: @navbar-inverse-link-hover-color;
+@navbar-inverse-link-active-bg: darken(@navbar-inverse-bg, 10%);
+@navbar-inverse-link-disabled-color: #444;
+@navbar-inverse-link-disabled-bg: transparent;
+
+// Inverted navbar brand label
+@navbar-inverse-brand-color: @navbar-inverse-link-color;
+@navbar-inverse-brand-hover-color: #fff;
+@navbar-inverse-brand-hover-bg: transparent;
+
+// Inverted navbar toggle
+@navbar-inverse-toggle-hover-bg: #333;
+@navbar-inverse-toggle-icon-bar-bg: #fff;
+@navbar-inverse-toggle-border-color: #333;
+
+
+//== Navs
+//
+//##
+
+//=== Shared nav styles
+@nav-link-padding: 10px 15px;
+@nav-link-hover-bg: @gray-lighter;
+
+@nav-disabled-link-color: @gray-light;
+@nav-disabled-link-hover-color: @gray-light;
+
+@nav-open-link-hover-color: #fff;
+
+//== Tabs
+@nav-tabs-border-color: #ddd;
+
+@nav-tabs-link-hover-border-color: @gray-lighter;
+
+@nav-tabs-active-link-hover-bg: @body-bg;
+@nav-tabs-active-link-hover-color: @gray;
+@nav-tabs-active-link-hover-border-color: #ddd;
+
+@nav-tabs-justified-link-border-color: #ddd;
+@nav-tabs-justified-active-link-border-color: @body-bg;
+
+//== Pills
+@nav-pills-border-radius: @border-radius-base;
+@nav-pills-active-link-hover-bg: @component-active-bg;
+@nav-pills-active-link-hover-color: @component-active-color;
+
+
+//== Pagination
+//
+//##
+
+@pagination-color: @link-color;
+@pagination-bg: #fff;
+@pagination-border: #ddd;
+
+@pagination-hover-color: @link-hover-color;
+@pagination-hover-bg: @gray-lighter;
+@pagination-hover-border: #ddd;
+
+@pagination-active-color: #fff;
+@pagination-active-bg: @brand-primary;
+@pagination-active-border: @brand-primary;
+
+@pagination-disabled-color: @gray-light;
+@pagination-disabled-bg: #fff;
+@pagination-disabled-border: #ddd;
+
+
+//== Pager
+//
+//##
+
+@pager-bg: @pagination-bg;
+@pager-border: @pagination-border;
+@pager-border-radius: 15px;
+
+@pager-hover-bg: @pagination-hover-bg;
+
+@pager-active-bg: @pagination-active-bg;
+@pager-active-color: @pagination-active-color;
+
+@pager-disabled-color: @pagination-disabled-color;
+
+
+//== Jumbotron
+//
+//##
+
+@jumbotron-padding: 30px;
+@jumbotron-color: inherit;
+@jumbotron-bg: @gray-lighter;
+@jumbotron-heading-color: inherit;
+@jumbotron-font-size: ceil((@font-size-base * 1.5));
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+@state-success-text: #3c763d;
+@state-success-bg: #dff0d8;
+@state-success-border: darken(spin(@state-success-bg, -10), 5%);
+
+@state-info-text: #31708f;
+@state-info-bg: #d9edf7;
+@state-info-border: darken(spin(@state-info-bg, -10), 7%);
+
+@state-warning-text: #8a6d3b;
+@state-warning-bg: #fcf8e3;
+@state-warning-border: darken(spin(@state-warning-bg, -10), 5%);
+
+@state-danger-text: #a94442;
+@state-danger-bg: #f2dede;
+@state-danger-border: darken(spin(@state-danger-bg, -10), 5%);
+
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+@tooltip-max-width: 200px;
+//** Tooltip text color
+@tooltip-color: #fff;
+//** Tooltip background color
+@tooltip-bg: #000;
+@tooltip-opacity: .9;
+
+//** Tooltip arrow width
+@tooltip-arrow-width: 5px;
+//** Tooltip arrow color
+@tooltip-arrow-color: @tooltip-bg;
+
+
+//== Popovers
+//
+//##
+
+//** Popover body background color
+@popover-bg: #fff;
+//** Popover maximum width
+@popover-max-width: 276px;
+//** Popover border color
+@popover-border-color: rgba(0,0,0,.2);
+//** Popover fallback border color
+@popover-fallback-border-color: #ccc;
+
+//** Popover title background color
+@popover-title-bg: darken(@popover-bg, 3%);
+
+//** Popover arrow width
+@popover-arrow-width: 10px;
+//** Popover arrow color
+@popover-arrow-color: #fff;
+
+//** Popover outer arrow width
+@popover-arrow-outer-width: (@popover-arrow-width + 1);
+//** Popover outer arrow color
+@popover-arrow-outer-color: fadein(@popover-border-color, 5%);
+//** Popover outer arrow fallback color
+@popover-arrow-outer-fallback-color: darken(@popover-fallback-border-color, 20%);
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+@label-default-bg: @gray-light;
+//** Primary label background color
+@label-primary-bg: @brand-primary;
+//** Success label background color
+@label-success-bg: @brand-success;
+//** Info label background color
+@label-info-bg: @brand-info;
+//** Warning label background color
+@label-warning-bg: @brand-warning;
+//** Danger label background color
+@label-danger-bg: @brand-danger;
+
+//** Default label text color
+@label-color: #fff;
+//** Default text color of a linked label
+@label-link-hover-color: #fff;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+@modal-inner-padding: 15px;
+
+//** Padding applied to the modal title
+@modal-title-padding: 15px;
+//** Modal title line-height
+@modal-title-line-height: @line-height-base;
+
+//** Background color of modal content area
+@modal-content-bg: #fff;
+//** Modal content border color
+@modal-content-border-color: rgba(0,0,0,.2);
+//** Modal content border color **for IE8**
+@modal-content-fallback-border-color: #999;
+
+//** Modal backdrop background color
+@modal-backdrop-bg: #000;
+//** Modal backdrop opacity
+@modal-backdrop-opacity: .5;
+//** Modal header border color
+@modal-header-border-color: #e5e5e5;
+//** Modal footer border color
+@modal-footer-border-color: @modal-header-border-color;
+
+@modal-lg: 900px;
+@modal-md: 600px;
+@modal-sm: 300px;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+@alert-padding: 15px;
+@alert-border-radius: @border-radius-base;
+@alert-link-font-weight: bold;
+
+@alert-success-bg: @state-success-bg;
+@alert-success-text: @state-success-text;
+@alert-success-border: @state-success-border;
+
+@alert-info-bg: @state-info-bg;
+@alert-info-text: @state-info-text;
+@alert-info-border: @state-info-border;
+
+@alert-warning-bg: @state-warning-bg;
+@alert-warning-text: @state-warning-text;
+@alert-warning-border: @state-warning-border;
+
+@alert-danger-bg: @state-danger-bg;
+@alert-danger-text: @state-danger-text;
+@alert-danger-border: @state-danger-border;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+@progress-bg: #f5f5f5;
+//** Progress bar text color
+@progress-bar-color: #fff;
+
+//** Default progress bar color
+@progress-bar-bg: @brand-primary;
+//** Success progress bar color
+@progress-bar-success-bg: @brand-success;
+//** Warning progress bar color
+@progress-bar-warning-bg: @brand-warning;
+//** Danger progress bar color
+@progress-bar-danger-bg: @brand-danger;
+//** Info progress bar color
+@progress-bar-info-bg: @brand-info;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+@list-group-bg: #fff;
+//** `.list-group-item` border color
+@list-group-border: #ddd;
+//** List group border radius
+@list-group-border-radius: @border-radius-base;
+
+//** Background color of single list items on hover
+@list-group-hover-bg: #f5f5f5;
+//** Text color of active list items
+@list-group-active-color: @component-active-color;
+//** Background color of active list items
+@list-group-active-bg: @component-active-bg;
+//** Border color of active list elements
+@list-group-active-border: @list-group-active-bg;
+//** Text color for content within active list items
+@list-group-active-text-color: lighten(@list-group-active-bg, 40%);
+
+//** Text color of disabled list items
+@list-group-disabled-color: @gray-light;
+//** Background color of disabled list items
+@list-group-disabled-bg: @gray-lighter;
+//** Text color for content within disabled list items
+@list-group-disabled-text-color: @list-group-disabled-color;
+
+@list-group-link-color: #555;
+@list-group-link-hover-color: @list-group-link-color;
+@list-group-link-heading-color: #333;
+
+
+//== Panels
+//
+//##
+
+@panel-bg: #fff;
+@panel-body-padding: 15px;
+@panel-heading-padding: 10px 15px;
+@panel-footer-padding: @panel-heading-padding;
+@panel-border-radius: @border-radius-base;
+
+//** Border color for elements within panels
+@panel-inner-border: #ddd;
+@panel-footer-bg: #f5f5f5;
+
+@panel-default-text: @gray-dark;
+@panel-default-border: #ddd;
+@panel-default-heading-bg: #f5f5f5;
+
+@panel-primary-text: #fff;
+@panel-primary-border: @brand-primary;
+@panel-primary-heading-bg: @brand-primary;
+
+@panel-success-text: @state-success-text;
+@panel-success-border: @state-success-border;
+@panel-success-heading-bg: @state-success-bg;
+
+@panel-info-text: @state-info-text;
+@panel-info-border: @state-info-border;
+@panel-info-heading-bg: @state-info-bg;
+
+@panel-warning-text: @state-warning-text;
+@panel-warning-border: @state-warning-border;
+@panel-warning-heading-bg: @state-warning-bg;
+
+@panel-danger-text: @state-danger-text;
+@panel-danger-border: @state-danger-border;
+@panel-danger-heading-bg: @state-danger-bg;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+@thumbnail-padding: 4px;
+//** Thumbnail background color
+@thumbnail-bg: @body-bg;
+//** Thumbnail border color
+@thumbnail-border: #ddd;
+//** Thumbnail border radius
+@thumbnail-border-radius: @border-radius-base;
+
+//** Custom text color for thumbnail captions
+@thumbnail-caption-color: @text-color;
+//** Padding around the thumbnail caption
+@thumbnail-caption-padding: 9px;
+
+
+//== Wells
+//
+//##
+
+@well-bg: #f5f5f5;
+@well-border: darken(@well-bg, 7%);
+
+
+//== Badges
+//
+//##
+
+@badge-color: #fff;
+//** Linked badge text color on hover
+@badge-link-hover-color: #fff;
+@badge-bg: @gray-light;
+
+//** Badge text color in active nav link
+@badge-active-color: @link-color;
+//** Badge background color in active nav link
+@badge-active-bg: #fff;
+
+@badge-font-weight: bold;
+@badge-line-height: 1;
+@badge-border-radius: 10px;
+
+
+//== Breadcrumbs
+//
+//##
+
+@breadcrumb-padding-vertical: 8px;
+@breadcrumb-padding-horizontal: 15px;
+//** Breadcrumb background color
+@breadcrumb-bg: #f5f5f5;
+//** Breadcrumb text color
+@breadcrumb-color: #ccc;
+//** Text color of current page in the breadcrumb
+@breadcrumb-active-color: @gray-light;
+//** Textual separator for between breadcrumb elements
+@breadcrumb-separator: "/";
+
+
+//== Carousel
+//
+//##
+
+@carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6);
+
+@carousel-control-color: #fff;
+@carousel-control-width: 15%;
+@carousel-control-opacity: .5;
+@carousel-control-font-size: 20px;
+
+@carousel-indicator-active-bg: #fff;
+@carousel-indicator-border-color: #fff;
+
+@carousel-caption-color: #fff;
+
+
+//== Close
+//
+//##
+
+@close-font-weight: bold;
+@close-color: #000;
+@close-text-shadow: 0 1px 0 #fff;
+
+
+//== Code
+//
+//##
+
+@code-color: #c7254e;
+@code-bg: #f9f2f4;
+
+@kbd-color: #fff;
+@kbd-bg: #333;
+
+@pre-bg: #f5f5f5;
+@pre-color: @gray-dark;
+@pre-border-color: #ccc;
+@pre-scrollable-max-height: 340px;
+
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+@component-offset-horizontal: 180px;
+//** Text muted color
+@text-muted: @gray-light;
+//** Abbreviations and acronyms border color
+@abbr-border-color: @gray-light;
+//** Headings small color
+@headings-small-color: @gray-light;
+//** Blockquote small color
+@blockquote-small-color: @gray-light;
+//** Blockquote font size
+@blockquote-font-size: (@font-size-base * 1.25);
+//** Blockquote border color
+@blockquote-border-color: @gray-lighter;
+//** Page header border color
+@page-header-border-color: @gray-lighter;
+//** Width of horizontal description list titles
+@dl-horizontal-offset: @component-offset-horizontal;
+//** Horizontal line color.
+@hr-border: @gray-lighter;
+
+
diff --git a/searx/static/oscar/less/bootstrap/wells.less b/searx/static/oscar/less/bootstrap/wells.less
new file mode 100644
index 000000000..15d072b0c
--- /dev/null
+++ b/searx/static/oscar/less/bootstrap/wells.less
@@ -0,0 +1,29 @@
+//
+// Wells
+// --------------------------------------------------
+
+
+// Base class
+.well {
+ min-height: 20px;
+ padding: 19px;
+ margin-bottom: 20px;
+ background-color: @well-bg;
+ border: 1px solid @well-border;
+ border-radius: @border-radius-base;
+ .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
+ blockquote {
+ border-color: #ddd;
+ border-color: rgba(0,0,0,.15);
+ }
+}
+
+// Sizes
+.well-lg {
+ padding: 24px;
+ border-radius: @border-radius-large;
+}
+.well-sm {
+ padding: 9px;
+ border-radius: @border-radius-small;
+}
diff --git a/searx/static/oscar/less/oscar/checkbox.less b/searx/static/oscar/less/oscar/checkbox.less
new file mode 100644
index 000000000..712e53d49
--- /dev/null
+++ b/searx/static/oscar/less/oscar/checkbox.less
@@ -0,0 +1,9 @@
+// Hide element if checkbox is checked
+input[type=checkbox]:checked ~ .label_hide_if_checked {
+ display:none;
+}
+
+// Hide element if checkbox is not checked
+input[type=checkbox]:not(:checked) ~ .label_hide_if_not_checked {
+ display:none;
+}
diff --git a/searx/static/oscar/less/oscar/cursor.less b/searx/static/oscar/less/oscar/cursor.less
new file mode 100644
index 000000000..c7e3191d8
--- /dev/null
+++ b/searx/static/oscar/less/oscar/cursor.less
@@ -0,0 +1,4 @@
+// display cursor
+.cursor-text {
+ cursor: text !important;
+}
diff --git a/searx/static/oscar/less/oscar/footer.less b/searx/static/oscar/less/oscar/footer.less
new file mode 100644
index 000000000..0b25e735f
--- /dev/null
+++ b/searx/static/oscar/less/oscar/footer.less
@@ -0,0 +1,19 @@
+// Sticky footer styles
+
+html {
+ position: relative;
+ min-height: 100%;
+}
+
+body {
+ /* Margin bottom by footer height */
+ margin-bottom: 80px;
+}
+
+.footer {
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ /* Set the fixed height of the footer here */
+ height: 60px;
+}
diff --git a/searx/static/oscar/less/oscar/infobox.less b/searx/static/oscar/less/oscar/infobox.less
new file mode 100644
index 000000000..c6a6d4248
--- /dev/null
+++ b/searx/static/oscar/less/oscar/infobox.less
@@ -0,0 +1,9 @@
+.infobox {
+ .infobox_part {
+ margin-bottom: 20px;
+ }
+
+ .infobox_part:last-child {
+ margin-bottom: 0;
+ }
+}
diff --git a/searx/static/oscar/less/oscar/oscar.less b/searx/static/oscar/less/oscar/oscar.less
new file mode 100644
index 000000000..22f7558ad
--- /dev/null
+++ b/searx/static/oscar/less/oscar/oscar.less
@@ -0,0 +1,11 @@
+@import "footer.less";
+
+@import "checkbox.less";
+
+@import "results.less";
+
+@import "infobox.less";
+
+@import "search.less";
+
+@import "cursor.less";
diff --git a/searx/static/oscar/less/oscar/results.less b/searx/static/oscar/less/oscar/results.less
new file mode 100644
index 000000000..06c8a1740
--- /dev/null
+++ b/searx/static/oscar/less/oscar/results.less
@@ -0,0 +1,41 @@
+// default formating of results
+.result-default {
+ clear: both;
+}
+
+// image formating of results
+.result-images {
+ float: left !important;
+}
+
+.img-thumbnail {
+ margin: 5px;
+ max-height: 128px;
+ min-height: 128px;
+}
+
+// video formating of results
+.result-videos {
+ clear: both;
+}
+
+// torrent formating of results
+.result-torrents {
+ clear: both;
+}
+
+// suggestion
+.suggestion_item {
+ margin: 2px 5px;
+}
+
+// download result
+.result_download {
+ margin-right: 5px;
+}
+
+// page forward, backward
+#pagination {
+ margin-top: 30px;
+ padding-bottom: 50px;
+}
diff --git a/searx/static/oscar/less/oscar/search.less b/searx/static/oscar/less/oscar/search.less
new file mode 100644
index 000000000..f95ab50d4
--- /dev/null
+++ b/searx/static/oscar/less/oscar/search.less
@@ -0,0 +1,4 @@
+.search_categories {
+ margin:10px 0;
+ text-transform: capitalize;
+}
diff --git a/searx/templates/oscar/about.html b/searx/templates/oscar/about.html
new file mode 100644
index 000000000..6f9572546
--- /dev/null
+++ b/searx/templates/oscar/about.html
@@ -0,0 +1,67 @@
+{% extends "oscar/base.html" %}
+{% block site_alert_warning_nojs %} {% endblock %}
+{% block title %}{{ _('about') }} - {% endblock %}
+{% block content %}
+
+
+
+ Searx is a metasearch engine, aggregating the results of other search engines while not storing information about its users.
+
+ Why use Searx?
+
+ - Searx may not offer you as personalised results as Google, but it doesn't generate a profile about you
+ - Searx doesn't care about what you search for, never shares anything with a third party, and it can't be used to compromise you
+ - Searx is free software, the code is 100% open and you can help to make it better. See more on github
+
+ If you do care about privacy, want to be a conscious user, or otherwise believe
+ in digital freedom, make Searx your default search engine or run it on your own server
+
+ Technical details - How does it work?
+
+ Searx is a metasearch engine,
+inspired by the seeks project.
+It provides basic privacy by mixing your queries with searches on other platforms without storing search data. Queries are made using a POST request on every browser (except chrome*). Therefore they show up in neither our logs, nor your url history. In case of Chrome* users there is an exception, Searx uses the search bar to perform GET requests.
+Searx can be added to your browser's search bar; moreover, it can be set as the default search engine.
+
+
+ How can I make it my own?
+
+ Searx appreciates your concern regarding logs, so take the code and run it yourself! Add your Searx to this list to help other people reclaim their privacy and make the Internet freer!
+ The more decentralized the Internet, is the more freedom we have!
+
+
+ More about searx
+
+
+
+
+
+
+ FAQ
+
+ How to add to firefox?
+ Install searx as a search engine on any version of Firefox! (javascript required)
+
+ Developer FAQ
+
+ New engines?
+
+ Don't forget to restart searx after config edit!
+
+ Installation/WSGI support?
+ See the installation and setup wiki page
+
+ How to debug engines?
+ Stats page contains some useful data about the engines used.
+
+
+{% endblock %}
diff --git a/searx/templates/oscar/base.html b/searx/templates/oscar/base.html
new file mode 100644
index 000000000..a023db415
--- /dev/null
+++ b/searx/templates/oscar/base.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
+
+
+ {% block title %}{% endblock %}searx
+
+
+
+
+
+
+
+
+
+ {% block styles %}
+ {% endblock %}
+ {% block head %}
+ {% endblock %}
+
+
+
+
+
+
+
+
+ {% include 'oscar/navbar.html' %}
+
+ {% block site_alert_error %}
+ {% endblock %}
+ {% block site_alert_warning %}
+ {% endblock %}
+ {% block site_alert_warning_nojs %}
+
+ {% endblock %}
+ {% block site_alert_info %}
+ {% endblock %}
+ {% block site_alert_success %}
+ {% endblock %}
+
+ {% block content %}
+ {% endblock %}
+
+
+
+
+
+ {% if autocomplete %}{% endif %}
+
+
+
diff --git a/searx/templates/oscar/categories.html b/searx/templates/oscar/categories.html
new file mode 100644
index 000000000..82ddcf686
--- /dev/null
+++ b/searx/templates/oscar/categories.html
@@ -0,0 +1,6 @@
+
+{% for category in categories %}
+
+{% endfor %}
+
diff --git a/searx/templates/oscar/index.html b/searx/templates/oscar/index.html
new file mode 100644
index 000000000..e58aa073a
--- /dev/null
+++ b/searx/templates/oscar/index.html
@@ -0,0 +1,15 @@
+{% extends "oscar/base.html" %}
+{% block content %}
+
+
+
+ searx
+
+
+
+
+ {% include 'oscar/search_full.html' %}
+
+
+
+{% endblock %}
diff --git a/searx/templates/oscar/infobox.html b/searx/templates/oscar/infobox.html
new file mode 100644
index 000000000..541da8ba7
--- /dev/null
+++ b/searx/templates/oscar/infobox.html
@@ -0,0 +1,28 @@
+
+
+ {{ infobox.infobox }}
+
+
+ {% if infobox.img_src %}  {% endif %}
+ {% if infobox.content %} {{ infobox.content }} {% endif %}
+
+ {% if infobox.attributes %}
+
+ {% for attribute in infobox.attributes %}
+
+ {{ attribute.label }} |
+ {{ attribute.value }} |
+
+ {% endfor %}
+
+ {% endif %}
+
+ {% if infobox.urls %}
+
+ {% endif %}
+
+
diff --git a/searx/templates/oscar/macros.html b/searx/templates/oscar/macros.html
new file mode 100644
index 000000000..f61de2015
--- /dev/null
+++ b/searx/templates/oscar/macros.html
@@ -0,0 +1,3 @@
+{% macro icon(action) -%}
+
+{%- endmacro %}
diff --git a/searx/templates/oscar/messages/first_time.html b/searx/templates/oscar/messages/first_time.html
new file mode 100644
index 000000000..38db62bdf
--- /dev/null
+++ b/searx/templates/oscar/messages/first_time.html
@@ -0,0 +1,8 @@
+
+
+ {{ icon('info-sign') }} {{ _('Heads up!') }}
+ {{ _('It look like you are using searx first time.') }}
+
diff --git a/searx/templates/oscar/messages/js_disabled.html b/searx/templates/oscar/messages/js_disabled.html
new file mode 100644
index 000000000..8baaf1e4c
--- /dev/null
+++ b/searx/templates/oscar/messages/js_disabled.html
@@ -0,0 +1,4 @@
+
+ {{ _('Warning!') }}
+ {{ _('Please enable JavaScript to use full functionality of this site.') }}
+
diff --git a/searx/templates/oscar/messages/no_data_available.html b/searx/templates/oscar/messages/no_data_available.html
new file mode 100644
index 000000000..aee791766
--- /dev/null
+++ b/searx/templates/oscar/messages/no_data_available.html
@@ -0,0 +1,5 @@
+{% from 'oscar/macros.html' import icon %}
+
+ {{ icon('info-sign') }} {{ _('Heads up!') }}
+ {{ _('There is currently no data available. ') }}
+
diff --git a/searx/templates/oscar/messages/no_results.html b/searx/templates/oscar/messages/no_results.html
new file mode 100644
index 000000000..ac3705eb8
--- /dev/null
+++ b/searx/templates/oscar/messages/no_results.html
@@ -0,0 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
+
+
+ {{ icon('info-sign') }} {{ _('Sorry!') }}
+ {{ _('we didn\'t find any results. Please use another query or search in more categories.') }}
+
diff --git a/searx/templates/oscar/messages/save_settings_successfull.html b/searx/templates/oscar/messages/save_settings_successfull.html
new file mode 100644
index 000000000..63e578c70
--- /dev/null
+++ b/searx/templates/oscar/messages/save_settings_successfull.html
@@ -0,0 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
+
+
+ {{ icon('ok-sign') }} {{ _('Well done!') }}
+ {{ _('Settings saved successfully.') }}
+
diff --git a/searx/templates/oscar/messages/unknow_error.html b/searx/templates/oscar/messages/unknow_error.html
new file mode 100644
index 000000000..3c4c9c15d
--- /dev/null
+++ b/searx/templates/oscar/messages/unknow_error.html
@@ -0,0 +1,9 @@
+{% from 'oscar/macros.html' import icon %}
+
+
+ {{ icon('exclamation-sign') }} {{ _('Oh snap!') }}
+ {{ _('Something went wrong.') }}
+
diff --git a/searx/templates/oscar/navbar.html b/searx/templates/oscar/navbar.html
new file mode 100644
index 000000000..db0d7818f
--- /dev/null
+++ b/searx/templates/oscar/navbar.html
@@ -0,0 +1,21 @@
+
+
diff --git a/searx/templates/oscar/opensearch.xml b/searx/templates/oscar/opensearch.xml
new file mode 100644
index 000000000..f39283f99
--- /dev/null
+++ b/searx/templates/oscar/opensearch.xml
@@ -0,0 +1,27 @@
+
+
+ searx
+ Search searx
+ UTF-8
+ searx metasearch
+ {% if opensearch_method == 'get' %}
+
+ {% if autocomplete %}
+
+
+
+
+ {% endif %}
+ {% else %}
+
+
+
+ {% if autocomplete %}
+
+
+
+
+
+ {% endif %}
+ {% endif %}
+
diff --git a/searx/templates/oscar/opensearch_response_rss.xml b/searx/templates/oscar/opensearch_response_rss.xml
new file mode 100644
index 000000000..5673eb2e1
--- /dev/null
+++ b/searx/templates/oscar/opensearch_response_rss.xml
@@ -0,0 +1,23 @@
+
+
+
+ Searx search: {{ q }}
+ {{ base_url }}?q={{ q }}
+ Search results for "{{ q }}" - searx
+ {{ number_of_results }}
+ 1
+ {{ number_of_results }}
+
+
+ {% for r in results %}
+ -
+ {{ r.title }}
+ {{ r.url }}
+ {{ r.content }}
+ {% if r.pubdate %}{{ r.pubdate }}{% endif %}
+
+ {% endfor %}
+
+
diff --git a/searx/templates/oscar/preferences.html b/searx/templates/oscar/preferences.html
new file mode 100644
index 000000000..2868adecc
--- /dev/null
+++ b/searx/templates/oscar/preferences.html
@@ -0,0 +1,141 @@
+{% extends "oscar/base.html" %}
+{% block title %}{{ _('preferences') }} - {% endblock %}
+{% block content %}
+
+
+ {{ _('Preferences') }}
+
+
+{% endblock %}
diff --git a/searx/templates/oscar/result_templates/default.html b/searx/templates/oscar/result_templates/default.html
new file mode 100644
index 000000000..3b0963816
--- /dev/null
+++ b/searx/templates/oscar/result_templates/default.html
@@ -0,0 +1,8 @@
+
+
+{% if result.publishedDate %}{% endif %}
+
+{% if result.content %}{{ result.content|safe }} {% endif %}
+
+{{ result.engine }}
+{{ result.pretty_url }}
diff --git a/searx/templates/oscar/result_templates/images.html b/searx/templates/oscar/result_templates/images.html
new file mode 100644
index 000000000..3ad48352a
--- /dev/null
+++ b/searx/templates/oscar/result_templates/images.html
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+ 
+ {% if result.content %} {{ result.content|safe }} {% endif %}
+
+
+
+
+
diff --git a/searx/templates/oscar/result_templates/torrent.html b/searx/templates/oscar/result_templates/torrent.html
new file mode 100644
index 000000000..903d304eb
--- /dev/null
+++ b/searx/templates/oscar/result_templates/torrent.html
@@ -0,0 +1,14 @@
+{% from 'oscar/macros.html' import icon %}
+
+
+
+{% if result.publishedDate %}{% endif %}
+
+{{ icon('transfer') }} {{ _('Seeder') }} {{ result.seed }}, {{ _('Leecher') }} {{ result.leech }}
+
+{{ icon('magnet') }} magnet link
+
+{% if result.content %}{{ result.content|safe }} {% endif %}
+
+{{ result.engine }}
+{{ result.pretty_url }}
diff --git a/searx/templates/oscar/result_templates/videos.html b/searx/templates/oscar/result_templates/videos.html
new file mode 100644
index 000000000..1a9b60717
--- /dev/null
+++ b/searx/templates/oscar/result_templates/videos.html
@@ -0,0 +1,13 @@
+
+
+{% if result.publishedDate %}{% endif %}
+
+
+
+ 
+ {% if result.content %} {{ result.content|safe }} {% endif %}
+
+
+
+{{ result.engine }}
+{{ result.pretty_url }}
diff --git a/searx/templates/oscar/results.html b/searx/templates/oscar/results.html
new file mode 100644
index 000000000..deda276fa
--- /dev/null
+++ b/searx/templates/oscar/results.html
@@ -0,0 +1,106 @@
+{% extends "oscar/base.html" %}
+{% block title %}{{ q }} - {% endblock %}
+{% block content %}
+
+
+ {{ _('Search results') }}
+ {% include 'oscar/search.html' %}
+
+ {% if answers %}
+ {% for answer in answers %}
+
+ {{ answer }}
+
+ {% endfor %}
+ {% endif %}
+
+ {% for result in results %}
+
+ {% set index = loop.index %}
+ {% if result.template %}{% include 'oscar/result_templates/'+result['template'] %}{% else %}{% include 'oscar/result_templates/default.html' %}{% endif %}
+
+ {% endfor %}
+
+ {% if not results %}
+ {% include 'oscar/messages/no_results.html' %}
+ {% endif %}
+
+
+
+ {% if paging %}
+
+
+ {% endif %}
+
+
+
+
+{% endblock %}
diff --git a/searx/templates/oscar/search.html b/searx/templates/oscar/search.html
new file mode 100644
index 000000000..4b1f8b6a1
--- /dev/null
+++ b/searx/templates/oscar/search.html
@@ -0,0 +1,12 @@
+{% from 'oscar/macros.html' import icon %}
+
diff --git a/searx/templates/oscar/search_full.html b/searx/templates/oscar/search_full.html
new file mode 100644
index 000000000..f44d48adf
--- /dev/null
+++ b/searx/templates/oscar/search_full.html
@@ -0,0 +1,17 @@
+{% from 'oscar/macros.html' import icon %}
+
+
diff --git a/searx/templates/oscar/stats.html b/searx/templates/oscar/stats.html
new file mode 100644
index 000000000..0fb104210
--- /dev/null
+++ b/searx/templates/oscar/stats.html
@@ -0,0 +1,33 @@
+{% extends "oscar/base.html" %}
+{% block title %}{{ _('stats') }} - {% endblock %}
+{% block content %}
+
+ {{ _('Engine stats') }}
+
+ {% for stat_name,stat_category in stats %}
+
+ {{ stat_name }}
+
+ {% for engine in stat_category %}
+
+ {{ engine.name }}
+
+
+
+ {{ '%.02f'|format(engine.avg) }}
+
+
+
+
+ {% endfor %}
+ {% if not stat_category %}
+
+ {% include 'oscar/messages/no_data_available.html' %}
+
+ {% endif %}
+
+
+ {% endfor %}
+
+
+{% endblock %}
diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo
index 553d3d9d0..eea1b1d0c 100644
Binary files a/searx/translations/de/LC_MESSAGES/messages.mo and b/searx/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po
index c28759470..658e6dcd6 100644
--- a/searx/translations/de/LC_MESSAGES/messages.po
+++ b/searx/translations/de/LC_MESSAGES/messages.po
@@ -1,99 +1,110 @@
-# English translations for PROJECT.
+# English translations for .
# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-#
+# This file is distributed under the same license as the project.
+#
# Translators:
# pointhi, 2014
# stf , 2014
# rike, 2014
msgid ""
msgstr ""
-"Project-Id-Version: searx\n"
+"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-07 21:47+0200\n"
-"PO-Revision-Date: 2014-09-08 07:00+0000\n"
+"POT-Creation-Date: 2014-11-01 21:11+0100\n"
+"PO-Revision-Date: 2014-03-15 18:40+0000\n"
"Last-Translator: pointhi\n"
-"Language-Team: German (http://www.transifex.com/projects/p/searx/language/de/)\n"
+"Language-Team: German "
+"(http://www.transifex.com/projects/p/searx/language/de/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: searx/webapp.py:250
+#: searx/webapp.py:305
msgid "{minutes} minute(s) ago"
msgstr "vor {minutes} Minute(n)"
-#: searx/webapp.py:252
+#: searx/webapp.py:307
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "vor {hours} Stunde(n), {minutes} Minute(n)"
-#: searx/engines/__init__.py:164
+#: searx/engines/__init__.py:177
msgid "Page loads (sec)"
msgstr "Ladezeit (sek)"
-#: searx/engines/__init__.py:168
+#: searx/engines/__init__.py:181
msgid "Number of results"
msgstr "Trefferanzahl"
-#: searx/engines/__init__.py:172
+#: searx/engines/__init__.py:185
msgid "Scores"
msgstr "Punkte"
-#: searx/engines/__init__.py:176
+#: searx/engines/__init__.py:189
msgid "Scores per result"
msgstr "Punkte pro Treffer"
-#: searx/engines/__init__.py:180
+#: searx/engines/__init__.py:193
msgid "Errors"
msgstr "Fehler"
#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8
+#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16
msgid "about"
msgstr "Über uns"
#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:9
+#: searx/templates/oscar/navbar.html:17
+#: searx/templates/oscar/preferences.html:2
msgid "preferences"
msgstr "Einstellungen"
#: searx/templates/courgette/preferences.html:5
#: searx/templates/default/preferences.html:5
+#: searx/templates/oscar/preferences.html:6
msgid "Preferences"
msgstr "Einstellungen"
#: searx/templates/courgette/preferences.html:9
#: searx/templates/default/preferences.html:9
+#: searx/templates/oscar/preferences.html:21
msgid "Default categories"
msgstr "Standardkategorien"
#: searx/templates/courgette/preferences.html:15
#: searx/templates/default/preferences.html:15
+#: searx/templates/oscar/preferences.html:27
msgid "Search language"
msgstr "Suchsprache"
#: searx/templates/courgette/preferences.html:18
#: searx/templates/default/preferences.html:18
+#: searx/templates/oscar/preferences.html:30
msgid "Automatic"
msgstr "Automatisch"
#: searx/templates/courgette/preferences.html:26
#: searx/templates/default/preferences.html:26
+#: searx/templates/oscar/preferences.html:39
msgid "Interface language"
msgstr "Oberflächensprache"
#: searx/templates/courgette/preferences.html:36
#: searx/templates/default/preferences.html:36
+#: searx/templates/oscar/preferences.html:50
msgid "Autocomplete"
msgstr "Autovervollständigung"
#: searx/templates/courgette/preferences.html:47
#: searx/templates/default/preferences.html:47
+#: searx/templates/oscar/preferences.html:63
msgid "Method"
msgstr "Methode"
#: searx/templates/courgette/preferences.html:56
#: searx/templates/default/preferences.html:56
+#: searx/templates/oscar/preferences.html:73
msgid "Themes"
msgstr "Designs"
@@ -116,6 +127,7 @@ msgstr "Kategorie"
#: searx/templates/courgette/preferences.html:83
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:83
+#: searx/templates/oscar/preferences.html:110
msgid "Allow"
msgstr "Erlauben"
@@ -123,67 +135,228 @@ msgstr "Erlauben"
#: searx/templates/courgette/preferences.html:84
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:84
+#: searx/templates/oscar/preferences.html:109
msgid "Block"
msgstr "Blockieren"
#: searx/templates/courgette/preferences.html:92
#: searx/templates/default/preferences.html:92
+#: searx/templates/oscar/preferences.html:124
msgid ""
-"These settings are stored in your cookies, this allows us not to store this "
-"data about you."
-msgstr "Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, damit wir keine Ihrer persönlichen Daten speichern müssen."
+"These settings are stored in your cookies, this allows us not to store "
+"this data about you."
+msgstr ""
+"Diese Informationen werden in Cookies auf Ihrem Rechner gespeichert, "
+"damit wir keine Ihrer persönlichen Daten speichern müssen."
#: searx/templates/courgette/preferences.html:94
#: searx/templates/default/preferences.html:94
+#: searx/templates/oscar/preferences.html:126
msgid ""
"These cookies serve your sole convenience, we don't use these cookies to "
"track you."
-msgstr "Diese Cookies dienen einzig Ihrem Komfort, wir verwenden sie nicht, um Sie zu überwachen."
+msgstr ""
+"Diese Cookies dienen einzig Ihrem Komfort, wir verwenden sie nicht, um "
+"Sie zu überwachen."
#: searx/templates/courgette/preferences.html:97
#: searx/templates/default/preferences.html:97
+#: searx/templates/oscar/preferences.html:129
msgid "save"
msgstr "Speichern"
#: searx/templates/courgette/preferences.html:98
#: searx/templates/default/preferences.html:98
+#: searx/templates/oscar/preferences.html:130
msgid "back"
msgstr "Zurück"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
+#: searx/templates/oscar/results.html:78
msgid "Search URL"
msgstr "Such-URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
+#: searx/templates/oscar/results.html:83
msgid "Download results"
msgstr "Ergebnisse herunterladen"
#: searx/templates/courgette/results.html:34
-#: searx/templates/default/results.html:34
+#: searx/templates/default/results.html:42
+#: searx/templates/oscar/results.html:58
msgid "Suggestions"
msgstr "Vorschläge"
#: searx/templates/courgette/results.html:62
-#: searx/templates/default/results.html:62
+#: searx/templates/default/results.html:78
+#: searx/templates/oscar/results.html:37
msgid "previous page"
msgstr "vorherige Seite"
#: searx/templates/courgette/results.html:73
-#: searx/templates/default/results.html:73
+#: searx/templates/default/results.html:89
+#: searx/templates/oscar/results.html:45
msgid "next page"
msgstr "nächste Seite"
#: searx/templates/courgette/search.html:3
-#: searx/templates/default/search.html:3
+#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/oscar/search_full.html:5
msgid "Search for..."
msgstr "Suche nach..."
#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
+#: searx/templates/oscar/stats.html:5
msgid "Engine stats"
msgstr "Suchmaschinenstatistik"
+#: searx/templates/default/results.html:34
+msgid "Answers"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "Powered by"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "a privacy-respecting, hackable metasearch engine"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:6
+msgid "Toggle navigation"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:15
+msgid "home"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:11
+msgid "General"
+msgstr "Allgemein"
+
+#: searx/templates/oscar/preferences.html:12
+msgid "Engines"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:36
+msgid "What language do you prefer for search?"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:47
+msgid "Change the language of the layout"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:60
+msgid "Find stuff as you type"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:70
+msgid ""
+"Change how forms are submited, learn more about request methods"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:81
+msgid "Change searx layout"
+msgstr ""
+
+#: searx/templates/oscar/results.html:6
+msgid "Search results"
+msgstr ""
+
+#: searx/templates/oscar/results.html:73
+msgid "Links"
+msgstr ""
+
+#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
+msgid "Start search"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Show search filters"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Hide search filters"
+msgstr ""
+
+#: searx/templates/oscar/stats.html:2
+msgid "stats"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:4
+#: searx/templates/oscar/messages/no_results.html:5
+#: searx/templates/oscar/messages/save_settings_successfull.html:5
+#: searx/templates/oscar/messages/unknow_error.html:5
+msgid "Close"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:6
+#: searx/templates/oscar/messages/no_data_available.html:3
+msgid "Heads up!"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:7
+msgid "It look like you are using searx first time."
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:2
+msgid "Warning!"
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:3
+msgid "Please enable JavaScript to use full functionality of this site."
+msgstr ""
+
+#: searx/templates/oscar/messages/no_data_available.html:4
+msgid "There is currently no data available. "
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:8
+msgid ""
+"we didn't find any results. Please use another query or search in more "
+"categories."
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:7
+msgid "Well done!"
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:8
+msgid "Settings saved successfully."
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:7
+msgid "Oh snap!"
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:8
+msgid "Something went wrong."
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:20
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:21
+msgid "View source"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Seeder"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Leecher"
+msgstr ""
+
# categories - manually added
# TODO - automatically add
msgid "files"
@@ -212,3 +385,4 @@ msgstr "Neuigkeiten"
msgid "map"
msgstr "Karte"
+
diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo
index 13936f4fb..c150e852d 100644
Binary files a/searx/translations/en/LC_MESSAGES/messages.mo and b/searx/translations/en/LC_MESSAGES/messages.mo differ
diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po
index 7f2ef09e9..e48f36927 100644
--- a/searx/translations/en/LC_MESSAGES/messages.po
+++ b/searx/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-01 19:24+0200\n"
+"POT-Creation-Date: 2014-11-01 21:11+0100\n"
"PO-Revision-Date: 2014-01-30 15:22+0100\n"
"Last-Translator: FULL NAME \n"
"Language-Team: en \n"
@@ -17,79 +17,90 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
-#: searx/webapp.py:251
+#: searx/webapp.py:305
msgid "{minutes} minute(s) ago"
msgstr ""
-#: searx/webapp.py:253
+#: searx/webapp.py:307
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr ""
-#: searx/engines/__init__.py:176
+#: searx/engines/__init__.py:177
msgid "Page loads (sec)"
msgstr ""
-#: searx/engines/__init__.py:180
+#: searx/engines/__init__.py:181
msgid "Number of results"
msgstr ""
-#: searx/engines/__init__.py:184
+#: searx/engines/__init__.py:185
msgid "Scores"
msgstr ""
-#: searx/engines/__init__.py:188
+#: searx/engines/__init__.py:189
msgid "Scores per result"
msgstr ""
-#: searx/engines/__init__.py:192
+#: searx/engines/__init__.py:193
msgid "Errors"
msgstr ""
#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8
+#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16
msgid "about"
msgstr ""
#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:9
+#: searx/templates/oscar/navbar.html:17
+#: searx/templates/oscar/preferences.html:2
msgid "preferences"
msgstr ""
#: searx/templates/courgette/preferences.html:5
#: searx/templates/default/preferences.html:5
+#: searx/templates/oscar/preferences.html:6
msgid "Preferences"
msgstr ""
#: searx/templates/courgette/preferences.html:9
#: searx/templates/default/preferences.html:9
+#: searx/templates/oscar/preferences.html:21
msgid "Default categories"
msgstr ""
#: searx/templates/courgette/preferences.html:15
#: searx/templates/default/preferences.html:15
+#: searx/templates/oscar/preferences.html:27
msgid "Search language"
msgstr ""
#: searx/templates/courgette/preferences.html:18
#: searx/templates/default/preferences.html:18
+#: searx/templates/oscar/preferences.html:30
msgid "Automatic"
msgstr ""
#: searx/templates/courgette/preferences.html:26
#: searx/templates/default/preferences.html:26
+#: searx/templates/oscar/preferences.html:39
msgid "Interface language"
msgstr ""
#: searx/templates/courgette/preferences.html:36
#: searx/templates/default/preferences.html:36
+#: searx/templates/oscar/preferences.html:50
msgid "Autocomplete"
msgstr ""
#: searx/templates/courgette/preferences.html:47
#: searx/templates/default/preferences.html:47
+#: searx/templates/oscar/preferences.html:63
msgid "Method"
msgstr ""
#: searx/templates/courgette/preferences.html:56
#: searx/templates/default/preferences.html:56
+#: searx/templates/oscar/preferences.html:73
msgid "Themes"
msgstr ""
@@ -110,86 +121,232 @@ msgstr ""
#: searx/templates/courgette/preferences.html:72
#: searx/templates/courgette/preferences.html:83
-#: searx/templates/default/preferences.html:73
-#: searx/templates/default/preferences.html:85
+#: searx/templates/default/preferences.html:72
+#: searx/templates/default/preferences.html:83
+#: searx/templates/oscar/preferences.html:110
msgid "Allow"
msgstr ""
#: searx/templates/courgette/preferences.html:72
#: searx/templates/courgette/preferences.html:84
-#: searx/templates/default/preferences.html:73
-#: searx/templates/default/preferences.html:86
+#: searx/templates/default/preferences.html:72
+#: searx/templates/default/preferences.html:84
+#: searx/templates/oscar/preferences.html:109
msgid "Block"
msgstr ""
#: searx/templates/courgette/preferences.html:92
-#: searx/templates/default/preferences.html:94
+#: searx/templates/default/preferences.html:92
+#: searx/templates/oscar/preferences.html:124
msgid ""
"These settings are stored in your cookies, this allows us not to store "
"this data about you."
msgstr ""
#: searx/templates/courgette/preferences.html:94
-#: searx/templates/default/preferences.html:96
+#: searx/templates/default/preferences.html:94
+#: searx/templates/oscar/preferences.html:126
msgid ""
"These cookies serve your sole convenience, we don't use these cookies to "
"track you."
msgstr ""
#: searx/templates/courgette/preferences.html:97
-#: searx/templates/default/preferences.html:99
+#: searx/templates/default/preferences.html:97
+#: searx/templates/oscar/preferences.html:129
msgid "save"
msgstr ""
#: searx/templates/courgette/preferences.html:98
-#: searx/templates/default/preferences.html:100
+#: searx/templates/default/preferences.html:98
+#: searx/templates/oscar/preferences.html:130
msgid "back"
msgstr ""
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
+#: searx/templates/oscar/results.html:78
msgid "Search URL"
msgstr ""
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
+#: searx/templates/oscar/results.html:83
msgid "Download results"
msgstr ""
#: searx/templates/courgette/results.html:34
-#: searx/templates/default/results.html:34
+#: searx/templates/default/results.html:42
+#: searx/templates/oscar/results.html:58
msgid "Suggestions"
msgstr ""
#: searx/templates/courgette/results.html:62
-#: searx/templates/default/results.html:62
+#: searx/templates/default/results.html:78
+#: searx/templates/oscar/results.html:37
msgid "previous page"
msgstr ""
#: searx/templates/courgette/results.html:73
-#: searx/templates/default/results.html:73
+#: searx/templates/default/results.html:89
+#: searx/templates/oscar/results.html:45
msgid "next page"
msgstr ""
#: searx/templates/courgette/search.html:3
-#: searx/templates/default/search.html:3
+#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/oscar/search_full.html:5
msgid "Search for..."
msgstr ""
#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
+#: searx/templates/oscar/stats.html:5
msgid "Engine stats"
msgstr ""
-#: searx/templates/default/preferences.html:72
-msgid "Localization"
+#: searx/templates/default/results.html:34
+msgid "Answers"
msgstr ""
-#: searx/templates/default/preferences.html:82
-msgid "Yes"
+#: searx/templates/oscar/base.html:61
+msgid "Powered by"
msgstr ""
-#: searx/templates/default/preferences.html:82
-msgid "No"
+#: searx/templates/oscar/base.html:61
+msgid "a privacy-respecting, hackable metasearch engine"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:6
+msgid "Toggle navigation"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:15
+msgid "home"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:11
+msgid "General"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:12
+msgid "Engines"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:36
+msgid "What language do you prefer for search?"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:47
+msgid "Change the language of the layout"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:60
+msgid "Find stuff as you type"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:70
+msgid ""
+"Change how forms are submited, learn more about request methods"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:81
+msgid "Change searx layout"
+msgstr ""
+
+#: searx/templates/oscar/results.html:6
+msgid "Search results"
+msgstr ""
+
+#: searx/templates/oscar/results.html:73
+msgid "Links"
+msgstr ""
+
+#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
+msgid "Start search"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Show search filters"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Hide search filters"
+msgstr ""
+
+#: searx/templates/oscar/stats.html:2
+msgid "stats"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:4
+#: searx/templates/oscar/messages/no_results.html:5
+#: searx/templates/oscar/messages/save_settings_successfull.html:5
+#: searx/templates/oscar/messages/unknow_error.html:5
+msgid "Close"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:6
+#: searx/templates/oscar/messages/no_data_available.html:3
+msgid "Heads up!"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:7
+msgid "It look like you are using searx first time."
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:2
+msgid "Warning!"
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:3
+msgid "Please enable JavaScript to use full functionality of this site."
+msgstr ""
+
+#: searx/templates/oscar/messages/no_data_available.html:4
+msgid "There is currently no data available. "
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:8
+msgid ""
+"we didn't find any results. Please use another query or search in more "
+"categories."
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:7
+msgid "Well done!"
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:8
+msgid "Settings saved successfully."
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:7
+msgid "Oh snap!"
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:8
+msgid "Something went wrong."
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:20
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:21
+msgid "View source"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Seeder"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Leecher"
msgstr ""
# categories - manually added
diff --git a/searx/translations/es/LC_MESSAGES/messages.mo b/searx/translations/es/LC_MESSAGES/messages.mo
index 2d0b16527..6490fa148 100644
Binary files a/searx/translations/es/LC_MESSAGES/messages.mo and b/searx/translations/es/LC_MESSAGES/messages.mo differ
diff --git a/searx/translations/es/LC_MESSAGES/messages.po b/searx/translations/es/LC_MESSAGES/messages.po
index f2a900953..89293d7a6 100644
--- a/searx/translations/es/LC_MESSAGES/messages.po
+++ b/searx/translations/es/LC_MESSAGES/messages.po
@@ -1,99 +1,110 @@
-# English translations for PROJECT.
+# English translations for .
# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-#
+# This file is distributed under the same license as the project.
+#
# Translators:
# Alejandro León Aznar, 2014
msgid ""
msgstr ""
-"Project-Id-Version: searx\n"
+"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-07 21:47+0200\n"
+"POT-Creation-Date: 2014-11-01 21:11+0100\n"
"PO-Revision-Date: 2014-09-08 11:01+0000\n"
"Last-Translator: Alejandro León Aznar\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/searx/language/es/)\n"
+"Language-Team: Spanish "
+"(http://www.transifex.com/projects/p/searx/language/es/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: searx/webapp.py:250
+#: searx/webapp.py:305
msgid "{minutes} minute(s) ago"
msgstr "hace {minutes} minuto(s)"
-#: searx/webapp.py:252
+#: searx/webapp.py:307
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "hace {hours} hora(s) y {minutes} minuto(s)"
-#: searx/engines/__init__.py:164
+#: searx/engines/__init__.py:177
msgid "Page loads (sec)"
msgstr "Tiempo de carga (segundos)"
-#: searx/engines/__init__.py:168
+#: searx/engines/__init__.py:181
msgid "Number of results"
msgstr "Número de resultados"
-#: searx/engines/__init__.py:172
+#: searx/engines/__init__.py:185
msgid "Scores"
msgstr "Puntuaciones"
-#: searx/engines/__init__.py:176
+#: searx/engines/__init__.py:189
msgid "Scores per result"
msgstr "Puntuaciones por resultado"
-#: searx/engines/__init__.py:180
+#: searx/engines/__init__.py:193
msgid "Errors"
msgstr "Errores"
#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8
+#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16
msgid "about"
msgstr "acerca de"
#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:9
+#: searx/templates/oscar/navbar.html:17
+#: searx/templates/oscar/preferences.html:2
msgid "preferences"
msgstr "preferencias"
#: searx/templates/courgette/preferences.html:5
#: searx/templates/default/preferences.html:5
+#: searx/templates/oscar/preferences.html:6
msgid "Preferences"
msgstr "Preferencias"
#: searx/templates/courgette/preferences.html:9
#: searx/templates/default/preferences.html:9
+#: searx/templates/oscar/preferences.html:21
msgid "Default categories"
msgstr "Categorías predeterminadas"
#: searx/templates/courgette/preferences.html:15
#: searx/templates/default/preferences.html:15
+#: searx/templates/oscar/preferences.html:27
msgid "Search language"
msgstr "Buscar idioma"
#: searx/templates/courgette/preferences.html:18
#: searx/templates/default/preferences.html:18
+#: searx/templates/oscar/preferences.html:30
msgid "Automatic"
msgstr "Automático"
#: searx/templates/courgette/preferences.html:26
#: searx/templates/default/preferences.html:26
+#: searx/templates/oscar/preferences.html:39
msgid "Interface language"
msgstr "Idioma de la interfaz"
#: searx/templates/courgette/preferences.html:36
#: searx/templates/default/preferences.html:36
+#: searx/templates/oscar/preferences.html:50
msgid "Autocomplete"
-msgstr "Autocompletar"
+msgstr ""
#: searx/templates/courgette/preferences.html:47
#: searx/templates/default/preferences.html:47
+#: searx/templates/oscar/preferences.html:63
msgid "Method"
-msgstr "Método"
+msgstr ""
#: searx/templates/courgette/preferences.html:56
#: searx/templates/default/preferences.html:56
+#: searx/templates/oscar/preferences.html:73
msgid "Themes"
-msgstr "Temas"
+msgstr ""
#: searx/templates/courgette/preferences.html:66
#: searx/templates/default/preferences.html:66
@@ -114,6 +125,7 @@ msgstr "Categoría"
#: searx/templates/courgette/preferences.html:83
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:83
+#: searx/templates/oscar/preferences.html:110
msgid "Allow"
msgstr "Permitir"
@@ -121,67 +133,228 @@ msgstr "Permitir"
#: searx/templates/courgette/preferences.html:84
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:84
+#: searx/templates/oscar/preferences.html:109
msgid "Block"
msgstr "Bloquear"
#: searx/templates/courgette/preferences.html:92
#: searx/templates/default/preferences.html:92
+#: searx/templates/oscar/preferences.html:124
msgid ""
-"These settings are stored in your cookies, this allows us not to store this "
-"data about you."
-msgstr "Esta configuración se guarda en sus cookies, lo que nos permite no almacenar dicha información sobre usted."
+"These settings are stored in your cookies, this allows us not to store "
+"this data about you."
+msgstr ""
+"Esta configuración se guarda en sus cookies, lo que nos permite no "
+"almacenar dicha información sobre usted."
#: searx/templates/courgette/preferences.html:94
#: searx/templates/default/preferences.html:94
+#: searx/templates/oscar/preferences.html:126
msgid ""
"These cookies serve your sole convenience, we don't use these cookies to "
"track you."
-msgstr "Estas cookies son para su propia comodidad, no las utilizamos para rastrearle."
+msgstr ""
+"Estas cookies son para su propia comodidad, no las utilizamos para "
+"rastrearle."
#: searx/templates/courgette/preferences.html:97
#: searx/templates/default/preferences.html:97
+#: searx/templates/oscar/preferences.html:129
msgid "save"
msgstr "Guardar"
#: searx/templates/courgette/preferences.html:98
#: searx/templates/default/preferences.html:98
+#: searx/templates/oscar/preferences.html:130
msgid "back"
msgstr "Atrás"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
+#: searx/templates/oscar/results.html:78
msgid "Search URL"
msgstr "Buscar URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
+#: searx/templates/oscar/results.html:83
msgid "Download results"
msgstr "Descargar resultados"
#: searx/templates/courgette/results.html:34
-#: searx/templates/default/results.html:34
+#: searx/templates/default/results.html:42
+#: searx/templates/oscar/results.html:58
msgid "Suggestions"
msgstr "Sugerencias"
#: searx/templates/courgette/results.html:62
-#: searx/templates/default/results.html:62
+#: searx/templates/default/results.html:78
+#: searx/templates/oscar/results.html:37
msgid "previous page"
msgstr "Página anterior"
#: searx/templates/courgette/results.html:73
-#: searx/templates/default/results.html:73
+#: searx/templates/default/results.html:89
+#: searx/templates/oscar/results.html:45
msgid "next page"
msgstr "Página siguiente"
#: searx/templates/courgette/search.html:3
-#: searx/templates/default/search.html:3
+#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/oscar/search_full.html:5
msgid "Search for..."
msgstr "Buscar..."
#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
+#: searx/templates/oscar/stats.html:5
msgid "Engine stats"
msgstr "Estadísticas del motor de búsqueda"
+#: searx/templates/default/results.html:34
+msgid "Answers"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "Powered by"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "a privacy-respecting, hackable metasearch engine"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:6
+msgid "Toggle navigation"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:15
+msgid "home"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:11
+msgid "General"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:12
+msgid "Engines"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:36
+msgid "What language do you prefer for search?"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:47
+msgid "Change the language of the layout"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:60
+msgid "Find stuff as you type"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:70
+msgid ""
+"Change how forms are submited, learn more about request methods"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:81
+msgid "Change searx layout"
+msgstr ""
+
+#: searx/templates/oscar/results.html:6
+msgid "Search results"
+msgstr ""
+
+#: searx/templates/oscar/results.html:73
+msgid "Links"
+msgstr ""
+
+#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
+msgid "Start search"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Show search filters"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Hide search filters"
+msgstr ""
+
+#: searx/templates/oscar/stats.html:2
+msgid "stats"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:4
+#: searx/templates/oscar/messages/no_results.html:5
+#: searx/templates/oscar/messages/save_settings_successfull.html:5
+#: searx/templates/oscar/messages/unknow_error.html:5
+msgid "Close"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:6
+#: searx/templates/oscar/messages/no_data_available.html:3
+msgid "Heads up!"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:7
+msgid "It look like you are using searx first time."
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:2
+msgid "Warning!"
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:3
+msgid "Please enable JavaScript to use full functionality of this site."
+msgstr ""
+
+#: searx/templates/oscar/messages/no_data_available.html:4
+msgid "There is currently no data available. "
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:8
+msgid ""
+"we didn't find any results. Please use another query or search in more "
+"categories."
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:7
+msgid "Well done!"
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:8
+msgid "Settings saved successfully."
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:7
+msgid "Oh snap!"
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:8
+msgid "Something went wrong."
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:20
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:21
+msgid "View source"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Seeder"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Leecher"
+msgstr ""
+
# categories - manually added
# TODO - automatically add
msgid "files"
@@ -210,3 +383,4 @@ msgstr "noticias"
msgid "map"
msgstr "mapa"
+
diff --git a/searx/translations/fr/LC_MESSAGES/messages.mo b/searx/translations/fr/LC_MESSAGES/messages.mo
index 7171b9af0..947eb2b31 100644
Binary files a/searx/translations/fr/LC_MESSAGES/messages.mo and b/searx/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/searx/translations/fr/LC_MESSAGES/messages.po b/searx/translations/fr/LC_MESSAGES/messages.po
index a52f4c11a..f4f8bb1f8 100644
--- a/searx/translations/fr/LC_MESSAGES/messages.po
+++ b/searx/translations/fr/LC_MESSAGES/messages.po
@@ -1,99 +1,110 @@
-# English translations for PROJECT.
+# English translations for .
# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-#
+# This file is distributed under the same license as the project.
+#
# Translators:
# Benjamin Sonntag , 2014
# FIRST AUTHOR , 2014
# rike, 2014
msgid ""
msgstr ""
-"Project-Id-Version: searx\n"
+"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-07 21:47+0200\n"
+"POT-Creation-Date: 2014-11-01 21:11+0100\n"
"PO-Revision-Date: 2014-09-07 21:24+0000\n"
"Last-Translator: Adam Tauber \n"
-"Language-Team: French (http://www.transifex.com/projects/p/searx/language/fr/)\n"
+"Language-Team: French "
+"(http://www.transifex.com/projects/p/searx/language/fr/)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: searx/webapp.py:250
+#: searx/webapp.py:305
msgid "{minutes} minute(s) ago"
msgstr "il y a {minutes} minute(s)"
-#: searx/webapp.py:252
+#: searx/webapp.py:307
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "il y a {hours} heure(s), {minutes} minute(s)"
-#: searx/engines/__init__.py:164
+#: searx/engines/__init__.py:177
msgid "Page loads (sec)"
msgstr "Chargement de la page (sec)"
-#: searx/engines/__init__.py:168
+#: searx/engines/__init__.py:181
msgid "Number of results"
msgstr "Nombre de résultats"
-#: searx/engines/__init__.py:172
+#: searx/engines/__init__.py:185
msgid "Scores"
msgstr "Score"
-#: searx/engines/__init__.py:176
+#: searx/engines/__init__.py:189
msgid "Scores per result"
msgstr "Score par résultat"
-#: searx/engines/__init__.py:180
+#: searx/engines/__init__.py:193
msgid "Errors"
msgstr "Erreurs"
#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8
+#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16
msgid "about"
msgstr "À propos"
#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:9
+#: searx/templates/oscar/navbar.html:17
+#: searx/templates/oscar/preferences.html:2
msgid "preferences"
msgstr "préférences"
#: searx/templates/courgette/preferences.html:5
#: searx/templates/default/preferences.html:5
+#: searx/templates/oscar/preferences.html:6
msgid "Preferences"
msgstr "Préférences"
#: searx/templates/courgette/preferences.html:9
#: searx/templates/default/preferences.html:9
+#: searx/templates/oscar/preferences.html:21
msgid "Default categories"
msgstr "Catégories par défaut"
#: searx/templates/courgette/preferences.html:15
#: searx/templates/default/preferences.html:15
+#: searx/templates/oscar/preferences.html:27
msgid "Search language"
msgstr "Langue de recherche"
#: searx/templates/courgette/preferences.html:18
#: searx/templates/default/preferences.html:18
+#: searx/templates/oscar/preferences.html:30
msgid "Automatic"
msgstr "Automatique"
#: searx/templates/courgette/preferences.html:26
#: searx/templates/default/preferences.html:26
+#: searx/templates/oscar/preferences.html:39
msgid "Interface language"
msgstr "Langue de l'interface"
#: searx/templates/courgette/preferences.html:36
#: searx/templates/default/preferences.html:36
+#: searx/templates/oscar/preferences.html:50
msgid "Autocomplete"
msgstr ""
#: searx/templates/courgette/preferences.html:47
#: searx/templates/default/preferences.html:47
+#: searx/templates/oscar/preferences.html:63
msgid "Method"
msgstr ""
#: searx/templates/courgette/preferences.html:56
#: searx/templates/default/preferences.html:56
+#: searx/templates/oscar/preferences.html:73
msgid "Themes"
msgstr ""
@@ -116,6 +127,7 @@ msgstr "Catégorie"
#: searx/templates/courgette/preferences.html:83
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:83
+#: searx/templates/oscar/preferences.html:110
msgid "Allow"
msgstr "Autoriser"
@@ -123,67 +135,228 @@ msgstr "Autoriser"
#: searx/templates/courgette/preferences.html:84
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:84
+#: searx/templates/oscar/preferences.html:109
msgid "Block"
msgstr "Bloquer"
#: searx/templates/courgette/preferences.html:92
#: searx/templates/default/preferences.html:92
+#: searx/templates/oscar/preferences.html:124
msgid ""
-"These settings are stored in your cookies, this allows us not to store this "
-"data about you."
-msgstr "Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas collecter vos données."
+"These settings are stored in your cookies, this allows us not to store "
+"this data about you."
+msgstr ""
+"Ces paramètres sont stockés dans vos cookies ; ceci nous permet de ne pas"
+" collecter vos données."
#: searx/templates/courgette/preferences.html:94
#: searx/templates/default/preferences.html:94
+#: searx/templates/oscar/preferences.html:126
msgid ""
"These cookies serve your sole convenience, we don't use these cookies to "
"track you."
-msgstr "Ces cookies existent pour votre confort d'utilisation, nous ne les utilisons pas pour vous espionner."
+msgstr ""
+"Ces cookies existent pour votre confort d'utilisation, nous ne les "
+"utilisons pas pour vous espionner."
#: searx/templates/courgette/preferences.html:97
#: searx/templates/default/preferences.html:97
+#: searx/templates/oscar/preferences.html:129
msgid "save"
msgstr "enregistrer"
#: searx/templates/courgette/preferences.html:98
#: searx/templates/default/preferences.html:98
+#: searx/templates/oscar/preferences.html:130
msgid "back"
msgstr "retour"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
+#: searx/templates/oscar/results.html:78
msgid "Search URL"
msgstr "URL de recherche"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
+#: searx/templates/oscar/results.html:83
msgid "Download results"
msgstr "Télécharger les résultats"
#: searx/templates/courgette/results.html:34
-#: searx/templates/default/results.html:34
+#: searx/templates/default/results.html:42
+#: searx/templates/oscar/results.html:58
msgid "Suggestions"
msgstr "Suggestions"
#: searx/templates/courgette/results.html:62
-#: searx/templates/default/results.html:62
+#: searx/templates/default/results.html:78
+#: searx/templates/oscar/results.html:37
msgid "previous page"
msgstr "page précédente"
#: searx/templates/courgette/results.html:73
-#: searx/templates/default/results.html:73
+#: searx/templates/default/results.html:89
+#: searx/templates/oscar/results.html:45
msgid "next page"
msgstr "page suivante"
#: searx/templates/courgette/search.html:3
-#: searx/templates/default/search.html:3
+#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/oscar/search_full.html:5
msgid "Search for..."
msgstr "Rechercher..."
#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
+#: searx/templates/oscar/stats.html:5
msgid "Engine stats"
msgstr "Statistiques du moteur"
+#: searx/templates/default/results.html:34
+msgid "Answers"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "Powered by"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "a privacy-respecting, hackable metasearch engine"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:6
+msgid "Toggle navigation"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:15
+msgid "home"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:11
+msgid "General"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:12
+msgid "Engines"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:36
+msgid "What language do you prefer for search?"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:47
+msgid "Change the language of the layout"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:60
+msgid "Find stuff as you type"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:70
+msgid ""
+"Change how forms are submited, learn more about request methods"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:81
+msgid "Change searx layout"
+msgstr ""
+
+#: searx/templates/oscar/results.html:6
+msgid "Search results"
+msgstr ""
+
+#: searx/templates/oscar/results.html:73
+msgid "Links"
+msgstr ""
+
+#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
+msgid "Start search"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Show search filters"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Hide search filters"
+msgstr ""
+
+#: searx/templates/oscar/stats.html:2
+msgid "stats"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:4
+#: searx/templates/oscar/messages/no_results.html:5
+#: searx/templates/oscar/messages/save_settings_successfull.html:5
+#: searx/templates/oscar/messages/unknow_error.html:5
+msgid "Close"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:6
+#: searx/templates/oscar/messages/no_data_available.html:3
+msgid "Heads up!"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:7
+msgid "It look like you are using searx first time."
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:2
+msgid "Warning!"
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:3
+msgid "Please enable JavaScript to use full functionality of this site."
+msgstr ""
+
+#: searx/templates/oscar/messages/no_data_available.html:4
+msgid "There is currently no data available. "
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:8
+msgid ""
+"we didn't find any results. Please use another query or search in more "
+"categories."
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:7
+msgid "Well done!"
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:8
+msgid "Settings saved successfully."
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:7
+msgid "Oh snap!"
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:8
+msgid "Something went wrong."
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:20
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:21
+msgid "View source"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Seeder"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Leecher"
+msgstr ""
+
# categories - manually added
# TODO - automatically add
msgid "files"
@@ -212,3 +385,4 @@ msgstr "actus"
msgid "map"
msgstr ""
+
diff --git a/searx/translations/hu/LC_MESSAGES/messages.mo b/searx/translations/hu/LC_MESSAGES/messages.mo
index a60b3ee22..dc3e457f7 100644
Binary files a/searx/translations/hu/LC_MESSAGES/messages.mo and b/searx/translations/hu/LC_MESSAGES/messages.mo differ
diff --git a/searx/translations/hu/LC_MESSAGES/messages.po b/searx/translations/hu/LC_MESSAGES/messages.po
index c34e56db9..b3977a477 100644
--- a/searx/translations/hu/LC_MESSAGES/messages.po
+++ b/searx/translations/hu/LC_MESSAGES/messages.po
@@ -1,100 +1,111 @@
-# English translations for PROJECT.
+# English translations for .
# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-#
+# This file is distributed under the same license as the project.
+#
# Translators:
# Adam Tauber , 2014
# FIRST AUTHOR , 2014
msgid ""
msgstr ""
-"Project-Id-Version: searx\n"
+"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-07 21:47+0200\n"
+"POT-Creation-Date: 2014-11-01 21:11+0100\n"
"PO-Revision-Date: 2014-09-07 21:30+0000\n"
"Last-Translator: Adam Tauber \n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/searx/language/hu/)\n"
+"Language-Team: Hungarian "
+"(http://www.transifex.com/projects/p/searx/language/hu/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: searx/webapp.py:250
+#: searx/webapp.py:305
msgid "{minutes} minute(s) ago"
msgstr "{minutes} perce"
-#: searx/webapp.py:252
+#: searx/webapp.py:307
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "{hours} óra, {minutes} perce"
-#: searx/engines/__init__.py:164
+#: searx/engines/__init__.py:177
msgid "Page loads (sec)"
msgstr "Válaszidők (sec)"
-#: searx/engines/__init__.py:168
+#: searx/engines/__init__.py:181
msgid "Number of results"
msgstr "Találatok száma"
-#: searx/engines/__init__.py:172
+#: searx/engines/__init__.py:185
msgid "Scores"
msgstr "Pontszámok"
-#: searx/engines/__init__.py:176
+#: searx/engines/__init__.py:189
msgid "Scores per result"
msgstr "Pontszámok találatonként"
-#: searx/engines/__init__.py:180
+#: searx/engines/__init__.py:193
msgid "Errors"
msgstr "Hibák"
#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8
+#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16
msgid "about"
msgstr "rólunk"
#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:9
+#: searx/templates/oscar/navbar.html:17
+#: searx/templates/oscar/preferences.html:2
msgid "preferences"
msgstr "beállítások"
#: searx/templates/courgette/preferences.html:5
#: searx/templates/default/preferences.html:5
+#: searx/templates/oscar/preferences.html:6
msgid "Preferences"
msgstr "Beállítások"
#: searx/templates/courgette/preferences.html:9
#: searx/templates/default/preferences.html:9
+#: searx/templates/oscar/preferences.html:21
msgid "Default categories"
msgstr "Alapértelmezett kategóriák"
#: searx/templates/courgette/preferences.html:15
#: searx/templates/default/preferences.html:15
+#: searx/templates/oscar/preferences.html:27
msgid "Search language"
msgstr "Keresés nyelve"
#: searx/templates/courgette/preferences.html:18
#: searx/templates/default/preferences.html:18
+#: searx/templates/oscar/preferences.html:30
msgid "Automatic"
msgstr "Automatikus"
#: searx/templates/courgette/preferences.html:26
#: searx/templates/default/preferences.html:26
+#: searx/templates/oscar/preferences.html:39
msgid "Interface language"
msgstr "Felület nyelve"
#: searx/templates/courgette/preferences.html:36
#: searx/templates/default/preferences.html:36
+#: searx/templates/oscar/preferences.html:50
msgid "Autocomplete"
-msgstr "Automatikus kiegészítés"
+msgstr ""
#: searx/templates/courgette/preferences.html:47
#: searx/templates/default/preferences.html:47
+#: searx/templates/oscar/preferences.html:63
msgid "Method"
-msgstr "Method"
+msgstr ""
#: searx/templates/courgette/preferences.html:56
#: searx/templates/default/preferences.html:56
+#: searx/templates/oscar/preferences.html:73
msgid "Themes"
-msgstr "Megjelenés"
+msgstr ""
#: searx/templates/courgette/preferences.html:66
#: searx/templates/default/preferences.html:66
@@ -115,6 +126,7 @@ msgstr "Kategória"
#: searx/templates/courgette/preferences.html:83
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:83
+#: searx/templates/oscar/preferences.html:110
msgid "Allow"
msgstr "Engedélyezés"
@@ -122,67 +134,226 @@ msgstr "Engedélyezés"
#: searx/templates/courgette/preferences.html:84
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:84
+#: searx/templates/oscar/preferences.html:109
msgid "Block"
msgstr "Tiltás"
#: searx/templates/courgette/preferences.html:92
#: searx/templates/default/preferences.html:92
+#: searx/templates/oscar/preferences.html:124
msgid ""
-"These settings are stored in your cookies, this allows us not to store this "
-"data about you."
+"These settings are stored in your cookies, this allows us not to store "
+"this data about you."
msgstr "Ezek a beállítások csak a böngésző cookie-jaiban tárolódnak."
#: searx/templates/courgette/preferences.html:94
#: searx/templates/default/preferences.html:94
+#: searx/templates/oscar/preferences.html:126
msgid ""
"These cookies serve your sole convenience, we don't use these cookies to "
"track you."
-msgstr "Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a felhasználók követésére."
+msgstr ""
+"Ezek a cookie-k csak kényelmi funkciókat látnak el, nem használjuk a "
+"felhasználók követésére."
#: searx/templates/courgette/preferences.html:97
#: searx/templates/default/preferences.html:97
+#: searx/templates/oscar/preferences.html:129
msgid "save"
msgstr "mentés"
#: searx/templates/courgette/preferences.html:98
#: searx/templates/default/preferences.html:98
+#: searx/templates/oscar/preferences.html:130
msgid "back"
msgstr "vissza"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
+#: searx/templates/oscar/results.html:78
msgid "Search URL"
msgstr "Keresési URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
+#: searx/templates/oscar/results.html:83
msgid "Download results"
msgstr "Találatok letöltése"
#: searx/templates/courgette/results.html:34
-#: searx/templates/default/results.html:34
+#: searx/templates/default/results.html:42
+#: searx/templates/oscar/results.html:58
msgid "Suggestions"
msgstr "Javaslatok"
#: searx/templates/courgette/results.html:62
-#: searx/templates/default/results.html:62
+#: searx/templates/default/results.html:78
+#: searx/templates/oscar/results.html:37
msgid "previous page"
msgstr "előző oldal"
#: searx/templates/courgette/results.html:73
-#: searx/templates/default/results.html:73
+#: searx/templates/default/results.html:89
+#: searx/templates/oscar/results.html:45
msgid "next page"
msgstr "következő oldal"
#: searx/templates/courgette/search.html:3
-#: searx/templates/default/search.html:3
+#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/oscar/search_full.html:5
msgid "Search for..."
msgstr "Keresés..."
#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
+#: searx/templates/oscar/stats.html:5
msgid "Engine stats"
msgstr "Kereső statisztikák"
+#: searx/templates/default/results.html:34
+msgid "Answers"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "Powered by"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "a privacy-respecting, hackable metasearch engine"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:6
+msgid "Toggle navigation"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:15
+msgid "home"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:11
+msgid "General"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:12
+msgid "Engines"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:36
+msgid "What language do you prefer for search?"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:47
+msgid "Change the language of the layout"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:60
+msgid "Find stuff as you type"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:70
+msgid ""
+"Change how forms are submited, learn more about request methods"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:81
+msgid "Change searx layout"
+msgstr ""
+
+#: searx/templates/oscar/results.html:6
+msgid "Search results"
+msgstr ""
+
+#: searx/templates/oscar/results.html:73
+msgid "Links"
+msgstr ""
+
+#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
+msgid "Start search"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Show search filters"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Hide search filters"
+msgstr ""
+
+#: searx/templates/oscar/stats.html:2
+msgid "stats"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:4
+#: searx/templates/oscar/messages/no_results.html:5
+#: searx/templates/oscar/messages/save_settings_successfull.html:5
+#: searx/templates/oscar/messages/unknow_error.html:5
+msgid "Close"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:6
+#: searx/templates/oscar/messages/no_data_available.html:3
+msgid "Heads up!"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:7
+msgid "It look like you are using searx first time."
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:2
+msgid "Warning!"
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:3
+msgid "Please enable JavaScript to use full functionality of this site."
+msgstr ""
+
+#: searx/templates/oscar/messages/no_data_available.html:4
+msgid "There is currently no data available. "
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:8
+msgid ""
+"we didn't find any results. Please use another query or search in more "
+"categories."
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:7
+msgid "Well done!"
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:8
+msgid "Settings saved successfully."
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:7
+msgid "Oh snap!"
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:8
+msgid "Something went wrong."
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:20
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:21
+msgid "View source"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Seeder"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Leecher"
+msgstr ""
+
# categories - manually added
# TODO - automatically add
msgid "files"
@@ -211,3 +382,4 @@ msgstr "hírek"
msgid "map"
msgstr "térkép"
+
diff --git a/searx/translations/it/LC_MESSAGES/messages.mo b/searx/translations/it/LC_MESSAGES/messages.mo
index 77b5503d0..2adfd31ce 100644
Binary files a/searx/translations/it/LC_MESSAGES/messages.mo and b/searx/translations/it/LC_MESSAGES/messages.mo differ
diff --git a/searx/translations/it/LC_MESSAGES/messages.po b/searx/translations/it/LC_MESSAGES/messages.po
index 4eeb15fa4..3b84301a4 100644
--- a/searx/translations/it/LC_MESSAGES/messages.po
+++ b/searx/translations/it/LC_MESSAGES/messages.po
@@ -1,99 +1,110 @@
-# English translations for PROJECT.
+# English translations for .
# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-#
+# This file is distributed under the same license as the project.
+#
# Translators:
# dp , 2014
msgid ""
msgstr ""
-"Project-Id-Version: searx\n"
+"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-07 21:47+0200\n"
+"POT-Creation-Date: 2014-11-01 21:11+0100\n"
"PO-Revision-Date: 2014-09-08 08:19+0000\n"
"Last-Translator: dp \n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/searx/language/it/)\n"
+"Language-Team: Italian "
+"(http://www.transifex.com/projects/p/searx/language/it/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: searx/webapp.py:250
+#: searx/webapp.py:305
msgid "{minutes} minute(s) ago"
msgstr "di {minutes} minuti fa"
-#: searx/webapp.py:252
+#: searx/webapp.py:307
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "di {ore} h e {minutes} minuti fa"
-#: searx/engines/__init__.py:164
+#: searx/engines/__init__.py:177
msgid "Page loads (sec)"
msgstr " Caricamento della pagina (secondi)"
-#: searx/engines/__init__.py:168
+#: searx/engines/__init__.py:181
msgid "Number of results"
msgstr "Risultati ottenuti"
-#: searx/engines/__init__.py:172
+#: searx/engines/__init__.py:185
msgid "Scores"
msgstr "Punteggio"
-#: searx/engines/__init__.py:176
+#: searx/engines/__init__.py:189
msgid "Scores per result"
msgstr "Punteggio per risultato"
-#: searx/engines/__init__.py:180
+#: searx/engines/__init__.py:193
msgid "Errors"
msgstr "Errori"
#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8
+#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16
msgid "about"
msgstr "informazioni"
#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:9
+#: searx/templates/oscar/navbar.html:17
+#: searx/templates/oscar/preferences.html:2
msgid "preferences"
msgstr "preferenze"
#: searx/templates/courgette/preferences.html:5
#: searx/templates/default/preferences.html:5
+#: searx/templates/oscar/preferences.html:6
msgid "Preferences"
msgstr "Preferenze"
#: searx/templates/courgette/preferences.html:9
#: searx/templates/default/preferences.html:9
+#: searx/templates/oscar/preferences.html:21
msgid "Default categories"
msgstr "Categorie predefinite"
#: searx/templates/courgette/preferences.html:15
#: searx/templates/default/preferences.html:15
+#: searx/templates/oscar/preferences.html:27
msgid "Search language"
msgstr "Lingua di ricerca"
#: searx/templates/courgette/preferences.html:18
#: searx/templates/default/preferences.html:18
+#: searx/templates/oscar/preferences.html:30
msgid "Automatic"
msgstr "Automatico"
#: searx/templates/courgette/preferences.html:26
#: searx/templates/default/preferences.html:26
+#: searx/templates/oscar/preferences.html:39
msgid "Interface language"
msgstr "Linguaggio dell'interfaccia"
#: searx/templates/courgette/preferences.html:36
#: searx/templates/default/preferences.html:36
+#: searx/templates/oscar/preferences.html:50
msgid "Autocomplete"
-msgstr "Completamento automatico"
+msgstr ""
#: searx/templates/courgette/preferences.html:47
#: searx/templates/default/preferences.html:47
+#: searx/templates/oscar/preferences.html:63
msgid "Method"
-msgstr "Metodo"
+msgstr ""
#: searx/templates/courgette/preferences.html:56
#: searx/templates/default/preferences.html:56
+#: searx/templates/oscar/preferences.html:73
msgid "Themes"
-msgstr "Grafica"
+msgstr ""
#: searx/templates/courgette/preferences.html:66
#: searx/templates/default/preferences.html:66
@@ -114,6 +125,7 @@ msgstr "Categoria"
#: searx/templates/courgette/preferences.html:83
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:83
+#: searx/templates/oscar/preferences.html:110
msgid "Allow"
msgstr "Autorizza"
@@ -121,67 +133,228 @@ msgstr "Autorizza"
#: searx/templates/courgette/preferences.html:84
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:84
+#: searx/templates/oscar/preferences.html:109
msgid "Block"
msgstr "Blocca"
#: searx/templates/courgette/preferences.html:92
#: searx/templates/default/preferences.html:92
+#: searx/templates/oscar/preferences.html:124
msgid ""
-"These settings are stored in your cookies, this allows us not to store this "
-"data about you."
-msgstr "Queste impostazioni sono salvate nei tuoi cookie, consentendoci di non conservare dati su di te."
+"These settings are stored in your cookies, this allows us not to store "
+"this data about you."
+msgstr ""
+"Queste impostazioni sono salvate nei tuoi cookie, consentendoci di non "
+"conservare dati su di te."
#: searx/templates/courgette/preferences.html:94
#: searx/templates/default/preferences.html:94
+#: searx/templates/oscar/preferences.html:126
msgid ""
"These cookies serve your sole convenience, we don't use these cookies to "
"track you."
-msgstr "I cookie sono funzionali ad un servizio migliore. Non usiamo i cookie per sorvegliarti."
+msgstr ""
+"I cookie sono funzionali ad un servizio migliore. Non usiamo i cookie per"
+" sorvegliarti."
#: searx/templates/courgette/preferences.html:97
#: searx/templates/default/preferences.html:97
+#: searx/templates/oscar/preferences.html:129
msgid "save"
msgstr "salva"
#: searx/templates/courgette/preferences.html:98
#: searx/templates/default/preferences.html:98
+#: searx/templates/oscar/preferences.html:130
msgid "back"
msgstr "indietro"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
+#: searx/templates/oscar/results.html:78
msgid "Search URL"
msgstr "URL della ricerca"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
+#: searx/templates/oscar/results.html:83
msgid "Download results"
msgstr "Scarica i risultati"
#: searx/templates/courgette/results.html:34
-#: searx/templates/default/results.html:34
+#: searx/templates/default/results.html:42
+#: searx/templates/oscar/results.html:58
msgid "Suggestions"
msgstr "Suggerimenti"
#: searx/templates/courgette/results.html:62
-#: searx/templates/default/results.html:62
+#: searx/templates/default/results.html:78
+#: searx/templates/oscar/results.html:37
msgid "previous page"
msgstr "pagina precedente"
#: searx/templates/courgette/results.html:73
-#: searx/templates/default/results.html:73
+#: searx/templates/default/results.html:89
+#: searx/templates/oscar/results.html:45
msgid "next page"
msgstr "pagina successiva"
#: searx/templates/courgette/search.html:3
-#: searx/templates/default/search.html:3
+#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/oscar/search_full.html:5
msgid "Search for..."
msgstr "Cerca…"
#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
+#: searx/templates/oscar/stats.html:5
msgid "Engine stats"
msgstr "Statistiche dei motori"
+#: searx/templates/default/results.html:34
+msgid "Answers"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "Powered by"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "a privacy-respecting, hackable metasearch engine"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:6
+msgid "Toggle navigation"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:15
+msgid "home"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:11
+msgid "General"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:12
+msgid "Engines"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:36
+msgid "What language do you prefer for search?"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:47
+msgid "Change the language of the layout"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:60
+msgid "Find stuff as you type"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:70
+msgid ""
+"Change how forms are submited, learn more about request methods"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:81
+msgid "Change searx layout"
+msgstr ""
+
+#: searx/templates/oscar/results.html:6
+msgid "Search results"
+msgstr ""
+
+#: searx/templates/oscar/results.html:73
+msgid "Links"
+msgstr ""
+
+#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
+msgid "Start search"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Show search filters"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Hide search filters"
+msgstr ""
+
+#: searx/templates/oscar/stats.html:2
+msgid "stats"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:4
+#: searx/templates/oscar/messages/no_results.html:5
+#: searx/templates/oscar/messages/save_settings_successfull.html:5
+#: searx/templates/oscar/messages/unknow_error.html:5
+msgid "Close"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:6
+#: searx/templates/oscar/messages/no_data_available.html:3
+msgid "Heads up!"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:7
+msgid "It look like you are using searx first time."
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:2
+msgid "Warning!"
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:3
+msgid "Please enable JavaScript to use full functionality of this site."
+msgstr ""
+
+#: searx/templates/oscar/messages/no_data_available.html:4
+msgid "There is currently no data available. "
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:8
+msgid ""
+"we didn't find any results. Please use another query or search in more "
+"categories."
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:7
+msgid "Well done!"
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:8
+msgid "Settings saved successfully."
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:7
+msgid "Oh snap!"
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:8
+msgid "Something went wrong."
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:20
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:21
+msgid "View source"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Seeder"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Leecher"
+msgstr ""
+
# categories - manually added
# TODO - automatically add
msgid "files"
@@ -210,3 +383,4 @@ msgstr "notizie"
msgid "map"
msgstr "mappe"
+
diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo
index d91b5b1da..348a3a902 100644
Binary files a/searx/translations/ja/LC_MESSAGES/messages.mo and b/searx/translations/ja/LC_MESSAGES/messages.mo differ
diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po
index 510a77eae..3039eb14a 100644
--- a/searx/translations/ja/LC_MESSAGES/messages.po
+++ b/searx/translations/ja/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-05 16:45+0200\n"
+"POT-Creation-Date: 2014-11-01 21:11+0100\n"
"PO-Revision-Date: 2014-10-05 16:38+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: ja \n"
@@ -17,79 +17,90 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
-#: searx/webapp.py:251
+#: searx/webapp.py:305
msgid "{minutes} minute(s) ago"
msgstr ""
-#: searx/webapp.py:253
+#: searx/webapp.py:307
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr ""
-#: searx/engines/__init__.py:176
+#: searx/engines/__init__.py:177
msgid "Page loads (sec)"
msgstr ""
-#: searx/engines/__init__.py:180
+#: searx/engines/__init__.py:181
msgid "Number of results"
msgstr ""
-#: searx/engines/__init__.py:184
+#: searx/engines/__init__.py:185
msgid "Scores"
msgstr ""
-#: searx/engines/__init__.py:188
+#: searx/engines/__init__.py:189
msgid "Scores per result"
msgstr ""
-#: searx/engines/__init__.py:192
+#: searx/engines/__init__.py:193
msgid "Errors"
msgstr ""
#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8
+#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16
msgid "about"
msgstr "に関する"
#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:9
+#: searx/templates/oscar/navbar.html:17
+#: searx/templates/oscar/preferences.html:2
msgid "preferences"
msgstr "設定"
#: searx/templates/courgette/preferences.html:5
#: searx/templates/default/preferences.html:5
+#: searx/templates/oscar/preferences.html:6
msgid "Preferences"
msgstr "設定"
#: searx/templates/courgette/preferences.html:9
#: searx/templates/default/preferences.html:9
+#: searx/templates/oscar/preferences.html:21
msgid "Default categories"
msgstr ""
#: searx/templates/courgette/preferences.html:15
#: searx/templates/default/preferences.html:15
+#: searx/templates/oscar/preferences.html:27
msgid "Search language"
msgstr ""
#: searx/templates/courgette/preferences.html:18
#: searx/templates/default/preferences.html:18
+#: searx/templates/oscar/preferences.html:30
msgid "Automatic"
msgstr ""
#: searx/templates/courgette/preferences.html:26
#: searx/templates/default/preferences.html:26
+#: searx/templates/oscar/preferences.html:39
msgid "Interface language"
msgstr ""
#: searx/templates/courgette/preferences.html:36
#: searx/templates/default/preferences.html:36
+#: searx/templates/oscar/preferences.html:50
msgid "Autocomplete"
msgstr ""
#: searx/templates/courgette/preferences.html:47
#: searx/templates/default/preferences.html:47
+#: searx/templates/oscar/preferences.html:63
msgid "Method"
msgstr ""
#: searx/templates/courgette/preferences.html:56
#: searx/templates/default/preferences.html:56
+#: searx/templates/oscar/preferences.html:73
msgid "Themes"
msgstr ""
@@ -112,6 +123,7 @@ msgstr ""
#: searx/templates/courgette/preferences.html:83
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:83
+#: searx/templates/oscar/preferences.html:110
msgid "Allow"
msgstr ""
@@ -119,11 +131,13 @@ msgstr ""
#: searx/templates/courgette/preferences.html:84
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:84
+#: searx/templates/oscar/preferences.html:109
msgid "Block"
msgstr ""
#: searx/templates/courgette/preferences.html:92
#: searx/templates/default/preferences.html:92
+#: searx/templates/oscar/preferences.html:124
msgid ""
"These settings are stored in your cookies, this allows us not to store "
"this data about you."
@@ -131,6 +145,7 @@ msgstr ""
#: searx/templates/courgette/preferences.html:94
#: searx/templates/default/preferences.html:94
+#: searx/templates/oscar/preferences.html:126
msgid ""
"These cookies serve your sole convenience, we don't use these cookies to "
"track you."
@@ -138,45 +153,54 @@ msgstr ""
#: searx/templates/courgette/preferences.html:97
#: searx/templates/default/preferences.html:97
+#: searx/templates/oscar/preferences.html:129
msgid "save"
msgstr ""
#: searx/templates/courgette/preferences.html:98
#: searx/templates/default/preferences.html:98
+#: searx/templates/oscar/preferences.html:130
msgid "back"
msgstr ""
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
+#: searx/templates/oscar/results.html:78
msgid "Search URL"
msgstr ""
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
+#: searx/templates/oscar/results.html:83
msgid "Download results"
msgstr ""
#: searx/templates/courgette/results.html:34
#: searx/templates/default/results.html:42
+#: searx/templates/oscar/results.html:58
msgid "Suggestions"
msgstr "提案"
#: searx/templates/courgette/results.html:62
#: searx/templates/default/results.html:78
+#: searx/templates/oscar/results.html:37
msgid "previous page"
msgstr "前のページ"
#: searx/templates/courgette/results.html:73
#: searx/templates/default/results.html:89
+#: searx/templates/oscar/results.html:45
msgid "next page"
msgstr "次のページ"
#: searx/templates/courgette/search.html:3
-#: searx/templates/default/search.html:3
+#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/oscar/search_full.html:5
msgid "Search for..."
msgstr "検索する..."
#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
+#: searx/templates/oscar/stats.html:5
msgid "Engine stats"
msgstr ""
@@ -184,6 +208,147 @@ msgstr ""
msgid "Answers"
msgstr ""
+#: searx/templates/oscar/base.html:61
+msgid "Powered by"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "a privacy-respecting, hackable metasearch engine"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:6
+msgid "Toggle navigation"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:15
+msgid "home"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:11
+msgid "General"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:12
+msgid "Engines"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:36
+msgid "What language do you prefer for search?"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:47
+msgid "Change the language of the layout"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:60
+msgid "Find stuff as you type"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:70
+msgid ""
+"Change how forms are submited, learn more about request methods"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:81
+msgid "Change searx layout"
+msgstr ""
+
+#: searx/templates/oscar/results.html:6
+msgid "Search results"
+msgstr ""
+
+#: searx/templates/oscar/results.html:73
+msgid "Links"
+msgstr ""
+
+#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
+msgid "Start search"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Show search filters"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Hide search filters"
+msgstr ""
+
+#: searx/templates/oscar/stats.html:2
+msgid "stats"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:4
+#: searx/templates/oscar/messages/no_results.html:5
+#: searx/templates/oscar/messages/save_settings_successfull.html:5
+#: searx/templates/oscar/messages/unknow_error.html:5
+msgid "Close"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:6
+#: searx/templates/oscar/messages/no_data_available.html:3
+msgid "Heads up!"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:7
+msgid "It look like you are using searx first time."
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:2
+msgid "Warning!"
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:3
+msgid "Please enable JavaScript to use full functionality of this site."
+msgstr ""
+
+#: searx/templates/oscar/messages/no_data_available.html:4
+msgid "There is currently no data available. "
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:8
+msgid ""
+"we didn't find any results. Please use another query or search in more "
+"categories."
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:7
+msgid "Well done!"
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:8
+msgid "Settings saved successfully."
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:7
+msgid "Oh snap!"
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:8
+msgid "Something went wrong."
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:20
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:21
+msgid "View source"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Seeder"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Leecher"
+msgstr ""
+
# categories - manually added
# TODO - automatically add
msgid "files"
diff --git a/searx/translations/nl/LC_MESSAGES/messages.mo b/searx/translations/nl/LC_MESSAGES/messages.mo
index 2d55fb352..8b1706b50 100644
Binary files a/searx/translations/nl/LC_MESSAGES/messages.mo and b/searx/translations/nl/LC_MESSAGES/messages.mo differ
diff --git a/searx/translations/nl/LC_MESSAGES/messages.po b/searx/translations/nl/LC_MESSAGES/messages.po
index 46c975c77..1598dfc52 100644
--- a/searx/translations/nl/LC_MESSAGES/messages.po
+++ b/searx/translations/nl/LC_MESSAGES/messages.po
@@ -1,99 +1,110 @@
-# English translations for PROJECT.
+# English translations for .
# Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the PROJECT project.
-#
+# This file is distributed under the same license as the project.
+#
# Translators:
# André Koot , 2014
msgid ""
msgstr ""
-"Project-Id-Version: searx\n"
+"Project-Id-Version: searx\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-09-07 21:47+0200\n"
+"POT-Creation-Date: 2014-11-01 21:11+0100\n"
"PO-Revision-Date: 2014-09-09 15:33+0000\n"
"Last-Translator: André Koot \n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/searx/language/nl/)\n"
+"Language-Team: Dutch "
+"(http://www.transifex.com/projects/p/searx/language/nl/)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 1.3\n"
-"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: searx/webapp.py:250
+#: searx/webapp.py:305
msgid "{minutes} minute(s) ago"
msgstr "{minutes} min geleden"
-#: searx/webapp.py:252
+#: searx/webapp.py:307
msgid "{hours} hour(s), {minutes} minute(s) ago"
msgstr "{hours} uur, {minutes} min geleden"
-#: searx/engines/__init__.py:164
+#: searx/engines/__init__.py:177
msgid "Page loads (sec)"
msgstr "Pagina laadt (sec)"
-#: searx/engines/__init__.py:168
+#: searx/engines/__init__.py:181
msgid "Number of results"
msgstr "Aantal zoekresultaten"
-#: searx/engines/__init__.py:172
+#: searx/engines/__init__.py:185
msgid "Scores"
msgstr "Scores"
-#: searx/engines/__init__.py:176
+#: searx/engines/__init__.py:189
msgid "Scores per result"
msgstr "Scores per zoekresultaat"
-#: searx/engines/__init__.py:180
+#: searx/engines/__init__.py:193
msgid "Errors"
msgstr "Fouten"
#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:8
+#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16
msgid "about"
msgstr "over"
#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:9
+#: searx/templates/oscar/navbar.html:17
+#: searx/templates/oscar/preferences.html:2
msgid "preferences"
msgstr "voorkeuren"
#: searx/templates/courgette/preferences.html:5
#: searx/templates/default/preferences.html:5
+#: searx/templates/oscar/preferences.html:6
msgid "Preferences"
msgstr "Voorkeuren"
#: searx/templates/courgette/preferences.html:9
#: searx/templates/default/preferences.html:9
+#: searx/templates/oscar/preferences.html:21
msgid "Default categories"
msgstr "Standaardcategorieën"
#: searx/templates/courgette/preferences.html:15
#: searx/templates/default/preferences.html:15
+#: searx/templates/oscar/preferences.html:27
msgid "Search language"
msgstr "Zoektaal"
#: searx/templates/courgette/preferences.html:18
#: searx/templates/default/preferences.html:18
+#: searx/templates/oscar/preferences.html:30
msgid "Automatic"
msgstr "Automatisch"
#: searx/templates/courgette/preferences.html:26
#: searx/templates/default/preferences.html:26
+#: searx/templates/oscar/preferences.html:39
msgid "Interface language"
msgstr "Interfacetaal"
#: searx/templates/courgette/preferences.html:36
#: searx/templates/default/preferences.html:36
+#: searx/templates/oscar/preferences.html:50
msgid "Autocomplete"
-msgstr "Auto-aanvullen"
+msgstr ""
#: searx/templates/courgette/preferences.html:47
#: searx/templates/default/preferences.html:47
+#: searx/templates/oscar/preferences.html:63
msgid "Method"
-msgstr "Methode"
+msgstr ""
#: searx/templates/courgette/preferences.html:56
#: searx/templates/default/preferences.html:56
+#: searx/templates/oscar/preferences.html:73
msgid "Themes"
-msgstr "Thema's"
+msgstr ""
#: searx/templates/courgette/preferences.html:66
#: searx/templates/default/preferences.html:66
@@ -114,6 +125,7 @@ msgstr "Categorie"
#: searx/templates/courgette/preferences.html:83
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:83
+#: searx/templates/oscar/preferences.html:110
msgid "Allow"
msgstr "Toestaan"
@@ -121,67 +133,228 @@ msgstr "Toestaan"
#: searx/templates/courgette/preferences.html:84
#: searx/templates/default/preferences.html:72
#: searx/templates/default/preferences.html:84
+#: searx/templates/oscar/preferences.html:109
msgid "Block"
msgstr "Blokkeren"
#: searx/templates/courgette/preferences.html:92
#: searx/templates/default/preferences.html:92
+#: searx/templates/oscar/preferences.html:124
msgid ""
-"These settings are stored in your cookies, this allows us not to store this "
-"data about you."
-msgstr "Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets over jou te bewaren."
+"These settings are stored in your cookies, this allows us not to store "
+"this data about you."
+msgstr ""
+"Deze instellingen worden bewaard in je cookies. Hierdoor hoeven wij niets"
+" over jou te bewaren."
#: searx/templates/courgette/preferences.html:94
#: searx/templates/default/preferences.html:94
+#: searx/templates/oscar/preferences.html:126
msgid ""
"These cookies serve your sole convenience, we don't use these cookies to "
"track you."
-msgstr "Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies niet om je te volgen."
+msgstr ""
+"Deze cookies zijn alleen voor je eigen gemak, we gebruiken deze cookies "
+"niet om je te volgen."
#: searx/templates/courgette/preferences.html:97
#: searx/templates/default/preferences.html:97
+#: searx/templates/oscar/preferences.html:129
msgid "save"
msgstr "bewaren"
#: searx/templates/courgette/preferences.html:98
#: searx/templates/default/preferences.html:98
+#: searx/templates/oscar/preferences.html:130
msgid "back"
msgstr "terug"
#: searx/templates/courgette/results.html:12
#: searx/templates/default/results.html:12
+#: searx/templates/oscar/results.html:78
msgid "Search URL"
msgstr "Zoek URL"
#: searx/templates/courgette/results.html:16
#: searx/templates/default/results.html:16
+#: searx/templates/oscar/results.html:83
msgid "Download results"
msgstr "Downloaden zoekresultaten"
#: searx/templates/courgette/results.html:34
-#: searx/templates/default/results.html:34
+#: searx/templates/default/results.html:42
+#: searx/templates/oscar/results.html:58
msgid "Suggestions"
msgstr "Suggesties"
#: searx/templates/courgette/results.html:62
-#: searx/templates/default/results.html:62
+#: searx/templates/default/results.html:78
+#: searx/templates/oscar/results.html:37
msgid "previous page"
msgstr "vorige pagina"
#: searx/templates/courgette/results.html:73
-#: searx/templates/default/results.html:73
+#: searx/templates/default/results.html:89
+#: searx/templates/oscar/results.html:45
msgid "next page"
msgstr "volgende pagina"
#: searx/templates/courgette/search.html:3
-#: searx/templates/default/search.html:3
+#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/oscar/search_full.html:5
msgid "Search for..."
msgstr "Zoeken naar..."
#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
+#: searx/templates/oscar/stats.html:5
msgid "Engine stats"
msgstr "Zoekmachinestatistieken"
+#: searx/templates/default/results.html:34
+msgid "Answers"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "Powered by"
+msgstr ""
+
+#: searx/templates/oscar/base.html:61
+msgid "a privacy-respecting, hackable metasearch engine"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:6
+msgid "Toggle navigation"
+msgstr ""
+
+#: searx/templates/oscar/navbar.html:15
+msgid "home"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:11
+msgid "General"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:12
+msgid "Engines"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:36
+msgid "What language do you prefer for search?"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:47
+msgid "Change the language of the layout"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:60
+msgid "Find stuff as you type"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:70
+msgid ""
+"Change how forms are submited, learn more about request methods"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:81
+msgid "Change searx layout"
+msgstr ""
+
+#: searx/templates/oscar/results.html:6
+msgid "Search results"
+msgstr ""
+
+#: searx/templates/oscar/results.html:73
+msgid "Links"
+msgstr ""
+
+#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
+msgid "Start search"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Show search filters"
+msgstr ""
+
+#: searx/templates/oscar/search_full.html:11
+msgid "Hide search filters"
+msgstr ""
+
+#: searx/templates/oscar/stats.html:2
+msgid "stats"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:4
+#: searx/templates/oscar/messages/no_results.html:5
+#: searx/templates/oscar/messages/save_settings_successfull.html:5
+#: searx/templates/oscar/messages/unknow_error.html:5
+msgid "Close"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:6
+#: searx/templates/oscar/messages/no_data_available.html:3
+msgid "Heads up!"
+msgstr ""
+
+#: searx/templates/oscar/messages/first_time.html:7
+msgid "It look like you are using searx first time."
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:2
+msgid "Warning!"
+msgstr ""
+
+#: searx/templates/oscar/messages/js_disabled.html:3
+msgid "Please enable JavaScript to use full functionality of this site."
+msgstr ""
+
+#: searx/templates/oscar/messages/no_data_available.html:4
+msgid "There is currently no data available. "
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:7
+msgid "Sorry!"
+msgstr ""
+
+#: searx/templates/oscar/messages/no_results.html:8
+msgid ""
+"we didn't find any results. Please use another query or search in more "
+"categories."
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:7
+msgid "Well done!"
+msgstr ""
+
+#: searx/templates/oscar/messages/save_settings_successfull.html:8
+msgid "Settings saved successfully."
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:7
+msgid "Oh snap!"
+msgstr ""
+
+#: searx/templates/oscar/messages/unknow_error.html:8
+msgid "Something went wrong."
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:20
+msgid "Get image"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/images.html:21
+msgid "View source"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Seeder"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Leecher"
+msgstr ""
+
# categories - manually added
# TODO - automatically add
msgid "files"
@@ -210,3 +383,4 @@ msgstr "nieuws"
msgid "map"
msgstr "kaart"
+
diff --git a/searx/webapp.py b/searx/webapp.py
index 0555d6ca9..e25a4067a 100644
--- a/searx/webapp.py
+++ b/searx/webapp.py
@@ -71,9 +71,9 @@ app.secret_key = settings['server']['secret_key']
babel = Babel(app)
-# TODO configurable via settings.yml
-favicons = ['wikipedia', 'youtube', 'vimeo', 'soundcloud',
- 'twitter', 'stackoverflow', 'github']
+#TODO configurable via settings.yml
+favicons = ['wikipedia', 'youtube', 'vimeo', 'dailymotion', 'soundcloud',
+ 'twitter', 'stackoverflow', 'github', 'deviantart']
cookie_max_age = 60 * 60 * 24 * 365 * 23 # 23 years
@@ -177,6 +177,8 @@ def render(template_name, override_theme=None, **kwargs):
kwargs['url_for'] = url_for_theme
kwargs['theme'] = get_current_theme_name(override=override_theme)
+
+ kwargs['template_name'] = template_name
return render_template(
'{}/{}'.format(kwargs['theme'], template_name), **kwargs)
|