@@ -79,12 +79,12 @@
on
-
Reply
+
Reply
- Delete
+ Delete
- Hide
+ Hide
diff --git a/addons/marketing/i18n/ja.po b/addons/marketing/i18n/ja.po
new file mode 100644
index 00000000000..d07123329b6
--- /dev/null
+++ b/addons/marketing/i18n/ja.po
@@ -0,0 +1,28 @@
+# Japanese translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR
, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-24 21:01+0000\n"
+"Last-Translator: Tomomi Mengelberg \n"
+"Language-Team: Japanese \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-25 04:46+0000\n"
+"X-Generator: Launchpad (build 15139)\n"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_manager
+msgid "Manager"
+msgstr "マネージャー"
+
+#. module: marketing
+#: model:res.groups,name:marketing.group_marketing_user
+msgid "User"
+msgstr "ユーザー"
diff --git a/addons/marketing_campaign/i18n/fi.po b/addons/marketing_campaign/i18n/fi.po
new file mode 100644
index 00000000000..522e59eba57
--- /dev/null
+++ b/addons/marketing_campaign/i18n/fi.po
@@ -0,0 +1,1073 @@
+# Finnish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2012-02-08 00:36+0000\n"
+"PO-Revision-Date: 2012-04-24 14:22+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: Finnish \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-04-25 04:46+0000\n"
+"X-Generator: Launchpad (build 15139)\n"
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Manual Mode"
+msgstr "Manuaalinen tila"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_from_id:0
+msgid "Previous Activity"
+msgstr "Edellinen toiminto"
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:818
+#, python-format
+msgid "The current step for this item has no email or report to preview."
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.transition:0
+msgid "The To/From Activity of transition must be of the same Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Time"
+msgstr "Aika"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "Custom Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Group By..."
+msgstr "Ryhmittely..."
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,revenue:0
+msgid ""
+"Set an expected revenue if you consider that every campaign item that has "
+"reached this point has generated a certain revenue. You can get revenue "
+"statistics in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,trigger:0
+msgid "Trigger"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,count:0
+msgid "# of Actions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Campaign Editor"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: view:marketing.campaign.workitem:0
+msgid "Today"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: selection:marketing.campaign.segment,state:0
+msgid "Running"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "March"
+msgstr "maaliskuu"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,object_id:0
+msgid "Object"
+msgstr "Kohde"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_2
+msgid ""
+"Hello, We are happy to announce that you now become our Silver Partner."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Set to Draft"
+msgstr "Aseta luonnokseksi"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,to_ids:0
+msgid "Next Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronization"
+msgstr "Synkronointi"
+
+#. module: marketing_campaign
+#: sql_constraint:marketing.campaign.transition:0
+msgid "The interval must be positive or zero"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:818
+#, python-format
+msgid "No preview"
+msgstr "Ei esikatselua"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,date_run:0
+msgid "Launch Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,day:0
+msgid "Day"
+msgstr "Päivä"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Outgoing Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Reset"
+msgstr "Palauta"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,object_id:0
+msgid "Choose the resource on which you want this campaign to be run"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_last_date:0
+msgid "Last Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "You can not duplicate a campaign, it's not supported yet."
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Year(s)"
+msgstr "Vuosi(a)"
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_last_date:0
+msgid ""
+"Date on which this segment was synchronized last time (automatically or "
+"manually)"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Cancelled"
+msgstr "Peruutettu"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,trigger:0
+msgid "Automatic"
+msgstr "Automaattinen"
+
+#. module: marketing_campaign
+#: help:marketing.campaign,mode:0
+msgid ""
+"Test - It creates and process all the activities directly (without waiting "
+"for the delay on transitions) but does not send emails or produce reports.\n"
+"Test in Realtime - It creates and processes all the activities directly but "
+"does not send emails or produce reports.\n"
+"With Manual Confirmation - the campaigns runs normally, but the user has to "
+"validate all workitem manually.\n"
+"Normal - the campaign runs normally and automatically sends all emails and "
+"reports (be very careful with this mode, you're live!)"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_run:0
+msgid "Initial start date of this segment."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,campaign_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign.activity,campaign_id:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,campaign_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,campaign_id:0
+msgid "Campaign"
+msgstr "Kampanja"
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_3
+msgid "Congratulation! You become our Gold Partner."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,segment_id:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,segment_id:0
+msgid "Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Cost / Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,type:0
+msgid ""
+"The type of action to execute when an item enters this activity, such as:\n"
+" - Email: send an email using a predefined email template\n"
+" - Report: print an existing Report defined on the resource item and save "
+"it into a specific directory\n"
+" - Custom Action: execute a predefined action, e.g. to modify the fields "
+"of the resource record\n"
+" "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_next_sync:0
+msgid "Next time the synchronization job is scheduled to run automatically"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Month(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,partner_id:0
+#: model:ir.model,name:marketing_campaign.model_res_partner
+#: field:marketing.campaign.workitem,partner_id:0
+msgid "Partner"
+msgstr "Kumppani"
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.filters,name:marketing_campaign.filter0
+msgid "Partners"
+msgstr "Kumppanit"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid "Don't delete workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,state:0
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,state:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,state:0
+msgid "State"
+msgstr "Tila"
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Marketing Reports"
+msgstr "Markkinointiraportit"
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+msgid "New"
+msgstr "Uusi"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,type:0
+msgid "Type"
+msgstr "Tyyppi"
+
+#. module: marketing_campaign
+#: field:marketing.campaign,name:0
+#: field:marketing.campaign.activity,name:0
+#: field:marketing.campaign.segment,name:0
+#: field:marketing.campaign.transition,name:0
+msgid "Name"
+msgstr "Nimi"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.workitem,res_name:0
+msgid "Resource Name"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,sync_mode:0
+msgid "Synchronization mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Run"
+msgstr "Suorita"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,from_ids:0
+msgid "Previous Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,date_done:0
+msgid "Date this segment was last closed or cancelled."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Marketing Campaign Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,error_msg:0
+msgid "Error Message"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_form
+#: view:marketing.campaign:0
+msgid "Campaigns"
+msgstr "Kampanjat"
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_type:0
+msgid "Interval Unit"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:792
+#, python-format
+msgid "Email Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_id:0
+#: selection:marketing.campaign.activity,type:0
+msgid "Report"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "July"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_configuration
+msgid "Configuration"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,variable_cost:0
+msgid ""
+"Set a variable cost if you consider that every campaign item that has "
+"reached this point has entailed a certain cost. You can get cost statistics "
+"in the Reporting section"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Hour(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_segment
+msgid "Campaign Segment"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+#: view:marketing.campaign.workitem:0
+msgid "Cancel"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,keep_if_condition_not_met:0
+msgid ""
+"By activating this option, workitems that aren't executed because the "
+"condition is not met are marked as cancelled instead of being deleted."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+msgid "Exceptions"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:res.partner,workitem_ids:0
+msgid "Workitems"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,fixed_cost:0
+msgid "Fixed Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_2
+msgid "Congratulation! You become now our Silver Partner."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Modified"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,interval_nbr:0
+msgid "Interval Value"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,revenue:0
+#: field:marketing.campaign.activity,revenue:0
+msgid "Revenue"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "September"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "December"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,partner_field_id:0
+msgid ""
+"The generated workitems will be linked to the partner related to the record. "
+"If the record is the partner itself leave this field empty. This is useful "
+"for reporting purposes, via the Campaign Analysis or Campaign Follow-up "
+"views."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,month:0
+msgid "Month"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.transition,activity_to_id:0
+msgid "Next Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_followup
+msgid "Campaign Follow-up"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,email_template_id:0
+msgid "The e-mail to send when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+msgid "Test Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records modified after last sync (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_ir_actions_report_xml
+msgid "ir.actions.report.xml"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_stat
+msgid "Campaign Statistics"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,server_action_id:0
+msgid "The action to perform when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,partner_field_id:0
+msgid "Partner Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: model:ir.actions.act_window,name:marketing_campaign.action_campaign_analysis_all
+#: model:ir.model,name:marketing_campaign.model_campaign_analysis
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_campaign_analysis_all
+msgid "Campaign Analysis"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,sync_mode:0
+msgid ""
+"Determines an additional criterion to add to the filter when selecting new "
+"records to inject in the campaign. \"No duplicates\" prevents selecting "
+"records which have already entered the campaign previously.If the campaign "
+"has a \"unique field\" set, \"no duplicates\" will also prevent selecting "
+"records which have the same value for the unique field as other records that "
+"already entered the campaign."
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test in Realtime"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Test Directly"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,report_directory_id:0
+msgid "Directory"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: view:marketing.campaign.segment:0
+msgid "Draft"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Preview"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Related Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "August"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "Normal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,start:0
+msgid "This activity is launched when the campaign starts."
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,signal:0
+msgid ""
+"An activity with a signal can be called programmatically. Be careful, the "
+"workitem is always created when a signal is sent"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "June"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_email_template
+msgid "Email Templates"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: all records"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "All records (no duplicates)"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Newly Created"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,date:0
+#: view:marketing.campaign.workitem:0
+msgid "Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "November"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,condition:0
+msgid "Condition"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_id:0
+msgid "The report to generate when this activity is activated"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#, python-format
+msgid ""
+"The campaign cannot be started: it doesn't have any starting activity. "
+"Modify campaign's activities to mark one as the starting point."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,unique_field_id:0
+msgid "Unique Field"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Exception"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "October"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,email_template_id:0
+msgid "Email Template"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "January"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,date:0
+msgid "Execution Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_workitem
+msgid "Campaign Workitem"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_activity
+msgid "Campaign Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,report_directory_id:0
+msgid "This folder is used to store the generated reports"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#: code:addons/marketing_campaign/marketing_campaign.py:148
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "Error"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+#: field:marketing.campaign.activity,server_action_id:0
+msgid "Action"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:528
+#, python-format
+msgid "Automatic transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,start:0
+msgid "Start"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: view:res.partner:0
+msgid "History"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Process"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:530
+#: selection:marketing.campaign.transition,trigger:0
+#, python-format
+msgid "Cosmetic"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.transition,trigger:0
+msgid "How is the destination workitem triggered"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,help:marketing_campaign.action_marketing_campaign_form
+msgid ""
+"A marketing campaign is an event or activity that will help you manage and "
+"reach your partners with specific messages. A campaign can have many "
+"activities that will be triggered from a specific situation. One action "
+"could be sending an email template that has previously been created in the "
+"system."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign:0
+#: selection:marketing.campaign,state:0
+#: selection:marketing.campaign.segment,state:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "Done"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:214
+#, python-format
+msgid "Operation not supported"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_3
+msgid "Hello, We are happy to announce that you become our Gold Partner."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Close"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:marketing.campaign.segment:0
+msgid "Model of filter must be same as resource model of Campaign "
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.activity,condition:0
+msgid ""
+"Python expression to decide whether the activity can be executed, otherwise "
+"it will be deleted or cancelled.The expression may use the following "
+"[browsable] variables:\n"
+" - activity: the campaign activity\n"
+" - workitem: the campaign workitem\n"
+" - resource: the resource object this campaign item represents\n"
+" - transitions: list of campaign transitions outgoing from this activity\n"
+"...- re: Python regular expression module"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Synchronize Manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,res_id:0
+msgid "Resource ID"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:136
+#, python-format
+msgid "The campaign cannot be started: there are no activities in it."
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign_transition
+msgid "Campaign Transition"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: selection:campaign.analysis,state:0
+#: view:marketing.campaign.workitem:0
+#: selection:marketing.campaign.workitem,state:0
+msgid "To Do"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.workitem:0
+msgid "Campaign Step"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_segment_form
+#: model:ir.ui.menu,name:marketing_campaign.menu_marketing_campaign_segment_form
+#: view:marketing.campaign.segment:0
+msgid "Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.act_marketing_campaing_segment_opened
+msgid "All Segments"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.activity:0
+msgid "Incoming Transitions"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.activity,type:0
+msgid "E-mail"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.transition,interval_type:0
+msgid "Day(s)"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign,activity_ids:0
+#: view:marketing.campaign.activity:0
+msgid "Activities"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "May"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,unique_field_id:0
+msgid ""
+"If set, this field will help segments that work in \"no duplicates\" mode to "
+"avoid selecting similar records twice. Similar records are records that have "
+"the same value for this unique field. For example by choosing the "
+"\"email_from\" field for CRM Leads you would prevent sending the same "
+"campaign to the same email address again. If not set, the \"no duplicates\" "
+"segments will only avoid selecting the same record again if it entered the "
+"campaign previously. Only easily comparable fields like textfields, "
+"integers, selections or single relationships may be used."
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:529
+#, python-format
+msgid "After %(interval_nbr)d %(interval_type)s"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,subject:marketing_campaign.email_template_1
+msgid "Welcome in OpenERP Partner Channel!"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.model,name:marketing_campaign.model_marketing_campaign
+msgid "Marketing Campaign"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_done:0
+msgid "End Date"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "February"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,res_id:0
+#: view:marketing.campaign:0
+#: field:marketing.campaign,object_id:0
+#: field:marketing.campaign.segment,object_id:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,object_id:0
+msgid "Resource"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign,fixed_cost:0
+msgid ""
+"Fixed cost for running this campaign. You may also specify variable cost and "
+"revenue on each campaign activity. Cost and Revenue statistics are included "
+"in Campaign Reporting."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "Sync mode: only records updated after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:campaign.analysis,country_id:0
+msgid "Country"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,signal:0
+msgid "Signal"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.workitem,date:0
+msgid "If date is not set, this workitem has to be run manually"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:campaign.analysis,month:0
+msgid "April"
+msgstr ""
+
+#. module: marketing_campaign
+#: code:addons/marketing_campaign/marketing_campaign.py:158
+#, python-format
+msgid "The campaign cannot be marked as done before all segments are closed."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign:0
+#: field:marketing.campaign,mode:0
+msgid "Mode"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,activity_id:0
+#: view:marketing.campaign.activity:0
+#: view:marketing.campaign.workitem:0
+#: field:marketing.campaign.workitem,activity_id:0
+msgid "Activity"
+msgstr ""
+
+#. module: marketing_campaign
+#: help:marketing.campaign.segment,ir_filter_id:0
+msgid ""
+"Filter to select the matching resource records that belong to this segment. "
+"New filters can be created and saved using the advanced search on the list "
+"view of the Resource. If no filter is set, all records are selected without "
+"filtering. The synchronization mode may also add a criterion to the filter."
+msgstr ""
+
+#. module: marketing_campaign
+#: model:ir.actions.act_window,name:marketing_campaign.action_marketing_campaign_workitem
+#: model:ir.ui.menu,name:marketing_campaign.menu_action_marketing_campaign_workitem
+msgid "Campaign Followup"
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.segment,date_next_sync:0
+msgid "Next Synchronization"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+#: field:marketing.campaign.segment,ir_filter_id:0
+msgid "Filter"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:marketing.campaign.segment:0
+msgid "All"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign.segment,sync_mode:0
+msgid "Only records created after last sync"
+msgstr ""
+
+#. module: marketing_campaign
+#: constraint:res.partner:0
+msgid "Error ! You cannot create recursive associated members."
+msgstr ""
+
+#. module: marketing_campaign
+#: field:marketing.campaign.activity,variable_cost:0
+msgid "Variable Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: selection:marketing.campaign,mode:0
+msgid "With Manual Confirmation"
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,total_cost:0
+#: view:marketing.campaign:0
+msgid "Cost"
+msgstr ""
+
+#. module: marketing_campaign
+#: model:email.template,body_text:marketing_campaign.email_template_1
+msgid "Hello, We are very happy to send Welcome message."
+msgstr ""
+
+#. module: marketing_campaign
+#: view:campaign.analysis:0
+#: field:campaign.analysis,year:0
+msgid "Year"
+msgstr ""
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index c7540935005..d04cde0e428 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -246,7 +246,7 @@
-
+
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index bdb04525d43..b65386ca9c9 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -20,7 +20,7 @@
-
+
@@ -128,7 +128,7 @@
+ parent="base.menu_association" sequence="30"/>
-
+
@@ -250,7 +250,7 @@
-
+
@@ -291,7 +291,7 @@
-
+
@@ -321,7 +321,7 @@
-
+
@@ -330,7 +330,7 @@
-
+
@@ -348,7 +348,7 @@
-
+
@@ -357,10 +357,10 @@
-
+
-
+
@@ -374,7 +374,7 @@
-
+
@@ -386,15 +386,15 @@
-
-
+
+
-
+
@@ -406,10 +406,10 @@
-
+
-
+
@@ -431,7 +431,7 @@
-
+
@@ -458,10 +458,10 @@
-
+
-
-
+
+
@@ -480,10 +480,10 @@
-
+
-
-
+
+
@@ -516,7 +516,6 @@
@@ -573,15 +572,16 @@
mrp.production
tree
-
+
+
-
-
+
+
@@ -748,7 +748,7 @@
-
+
-
+
-
+
@@ -1024,8 +1024,7 @@
+ parent="base.menu_mrp_root" sequence="2"/>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index b588ab53b8f..ec2ef72d40d 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -148,7 +148,7 @@
-
+
@@ -261,18 +261,16 @@
+ sequence="2"/>
+ icon="STOCK_INDENT"/>
+ icon="STOCK_INDENT"/>-->
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index dd29de20f9b..6af1dc702fa 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -70,7 +70,7 @@
-
+
@@ -141,7 +141,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml
index 063ee9b8544..766733034b7 100644
--- a/addons/multi_company/multi_company_demo.xml
+++ b/addons/multi_company/multi_company_demo.xml
@@ -65,7 +65,7 @@
editor_demo
-
+
sales_demo_us
@@ -73,7 +73,7 @@
sales_demo_us
-
+
sales_demo_be
@@ -81,7 +81,7 @@
sales_demo_be
-
+
sales_demo_in
@@ -89,7 +89,7 @@
sales_demo_in
-
+
odoo_demo
@@ -97,7 +97,7 @@
odoo_demo
-
+
diff --git a/addons/multi_company/res_company_view.xml b/addons/multi_company/res_company_view.xml
index b246a1914d7..db0be0d09f4 100644
--- a/addons/multi_company/res_company_view.xml
+++ b/addons/multi_company/res_company_view.xml
@@ -68,7 +68,6 @@
-
+
-
+
@@ -146,7 +146,7 @@
-
+
diff --git a/addons/point_of_sale/wizard/pos_payment.xml b/addons/point_of_sale/wizard/pos_payment.xml
index 212c0d8c412..b790d2bac0f 100644
--- a/addons/point_of_sale/wizard/pos_payment.xml
+++ b/addons/point_of_sale/wizard/pos_payment.xml
@@ -12,7 +12,7 @@
-
+
diff --git a/addons/portal/portal.py b/addons/portal/portal.py
index 6ca833fecd1..8f4ff66aef2 100644
--- a/addons/portal/portal.py
+++ b/addons/portal/portal.py
@@ -39,6 +39,9 @@ class portal(osv.osv):
help='The group corresponding to this portal'),
'url': fields.char('URL', size=64,
help="The url where portal users can connect to the server"),
+ 'home_action_id': fields.many2one('ir.actions.actions',
+ string='Home Action',
+ help="if set, replaces the standard home action (first screen after loggin) for the portal's users"),
'menu_action_id': fields.many2one('ir.actions.act_window', readonly=True,
# ISSUE: 'ondelete' constraints do not seem effective on this field...
string='Menu Action',
diff --git a/addons/portal/portal_view.xml b/addons/portal/portal_view.xml
index a6a780fdf16..e427bbd5b1f 100644
--- a/addons/portal/portal_view.xml
+++ b/addons/portal/portal_view.xml
@@ -64,6 +64,7 @@ the portal's users.
+
diff --git a/addons/portal/wizard/portal_wizard.py b/addons/portal/wizard/portal_wizard.py
index 0eceec3f46b..1ec4cbb0e4b 100644
--- a/addons/portal/wizard/portal_wizard.py
+++ b/addons/portal/wizard/portal_wizard.py
@@ -146,6 +146,7 @@ class wizard(osv.osv_memory):
'user_email': u.user_email,
'context_lang': u.lang,
'share': True,
+ 'action_id': wiz.portal_id.home_action_id and wiz.portal_id.home_action_id.id or False,
'partner_id': u.partner_id and u.partner_id.id,
} for u in wiz.user_ids if u.user_email not in existing_logins ]
portal_obj.write(cr, ROOT_UID, [wiz.portal_id.id],
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index de92b9c6c60..dd495757ec1 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -5,8 +5,7 @@
+ parent="base.menu_custom"/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index 6ce26ecb98c..b3e90ab4e6e 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -57,7 +57,7 @@
-
+
@@ -67,8 +67,8 @@
-
-
+
+
@@ -82,9 +82,9 @@
-
+
-
+
@@ -115,7 +115,7 @@
-
+
@@ -220,12 +220,12 @@
-
+
-
+
@@ -288,10 +288,10 @@
-
+
-
+
diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po
index 2a98a34c825..4de0aed76f8 100644
--- a/addons/product/i18n/sl.po
+++ b/addons/product/i18n/sl.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 00:37+0000\n"
-"PO-Revision-Date: 2011-01-25 11:06+0000\n"
-"Last-Translator: Simon Vidmar \n"
+"PO-Revision-Date: 2012-04-24 10:28+0000\n"
+"Last-Translator: Dusan Laznik \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-09 06:30+0000\n"
-"X-Generator: Launchpad (build 14763)\n"
+"X-Launchpad-Export-Date: 2012-04-25 04:46+0000\n"
+"X-Generator: Launchpad (build 15139)\n"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -57,6 +57,7 @@ msgid ""
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
msgstr ""
+"Predvidena količina(izračunana kot:razpoložliva količina+prihodi-odhodi)"
#. module: product
#: model:product.category,name:product.cat1
@@ -82,7 +83,7 @@ msgstr "Dan"
#. module: product
#: view:product.product:0
msgid "UoM"
-msgstr "ME"
+msgstr "EM"
#. module: product
#: model:product.template,name:product.product_product_pc2_product_template
@@ -149,7 +150,7 @@ msgstr "Sklic"
msgid ""
"The minimal quantity to trigger this rule, expressed in the supplier UoM if "
"any or in the default UoM of the product otherrwise."
-msgstr ""
+msgstr "Mininalna količina za aktiviranje tega pravila ni vpisana"
#. module: product
#: model:product.template,name:product.product_product_24_product_template
@@ -168,11 +169,13 @@ msgid ""
"Conversion from Product UoM %s to Default UoM %s is not possible as they "
"both belong to different Category!."
msgstr ""
+"Pretvorba iz EM %s izdelka v privzeto EM %s ni mogoča, saj obe pripadata "
+"različnim kategorijam!."
#. module: product
#: model:product.uom,name:product.product_uom_dozen
msgid "Dozen"
-msgstr ""
+msgstr "Ducat"
#. module: product
#: selection:product.template,cost_method:0
@@ -182,7 +185,7 @@ msgstr "Povprečna cena"
#. module: product
#: help:product.pricelist.item,name:0
msgid "Explicit rule name for this pricelist line."
-msgstr ""
+msgstr "Izrecno pravilo za to linijo cenika."
#. module: product
#: model:product.template,name:product.product_product_cpu1_product_template
@@ -202,7 +205,7 @@ msgstr "Cenik"
#. module: product
#: view:product.template:0
msgid "UOM"
-msgstr "ME"
+msgstr "EM"
#. module: product
#: model:product.uom,name:product.product_uom_unit
@@ -225,6 +228,7 @@ msgid ""
"Determines if the product can be visible in the list of product within a "
"selection from a sale order line."
msgstr ""
+"Določa, če je izdelek lahko viden na seznamu izdelkov v izboru za prodajo."
#. module: product
#: model:product.pricelist.version,name:product.ver0
@@ -254,6 +258,8 @@ msgid ""
"Create a product form for everything you buy or sell. Specify a supplier if "
"the product can be purchased."
msgstr ""
+"Kreirajte obrazec izdelkov prodaje in nabave. Določite dobavitelja, če "
+"izdelek mogoče kupiti,specificiraj dobavitelja."
#. module: product
#: view:product.uom:0
@@ -278,6 +284,9 @@ msgid ""
"supplying. 'Make to Order': When needed, purchase or produce for the "
"procurement request."
msgstr ""
+"\"S skladišča\":Če je potrebno,vzamemo iz zaloge ali počakamo novo dobavo. "
+"\"Naročilo\":Po potrebi se naroči ali proizvede nov proizvod po zahtevku "
+"nabave."
#. module: product
#: model:process.node,note:product.process_node_supplier0
@@ -319,22 +328,22 @@ msgstr "Kategorija"
#: help:product.pricelist.item,min_quantity:0
msgid ""
"The rule only applies if the partner buys/sells more than this quantity."
-msgstr ""
+msgstr "Pravilo velja ,če partner kupuje/prodaja več od te količine."
#. module: product
#: model:product.template,name:product.product_product_woodmm0_product_template
msgid "Wood 2mm"
-msgstr ""
+msgstr "Les 2mm"
#. module: product
#: field:product.price_list,qty1:0
msgid "Quantity-1"
-msgstr ""
+msgstr "Količina-1"
#. module: product
#: help:product.packaging,ul_qty:0
msgid "The number of packages by layer"
-msgstr ""
+msgstr "Število paketov"
#. module: product
#: field:product.packaging,qty:0
@@ -351,7 +360,7 @@ msgstr "Stanje"
#. module: product
#: help:product.template,categ_id:0
msgid "Select category for the current product"
-msgstr ""
+msgstr "Izbira kategorije za trenutni proizvod"
#. module: product
#: field:product.product,outgoing_qty:0
@@ -361,7 +370,7 @@ msgstr "Odhajajoča količina"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Reference UoM for this category"
-msgstr ""
+msgstr "Refrenčna EM za to kategorijo"
#. module: product
#: model:product.price.type,name:product.list_price
@@ -372,7 +381,7 @@ msgstr "Priporočna cena"
#. module: product
#: field:product.price_list,qty5:0
msgid "Quantity-5"
-msgstr ""
+msgstr "Količina-5"
#. module: product
#: model:product.category,name:product.product_category_10
@@ -387,7 +396,7 @@ msgstr "Vodja izdelka"
#. module: product
#: field:product.supplierinfo,product_name:0
msgid "Supplier Product Name"
-msgstr ""
+msgstr "Dobaviteljev naziv proizvoda"
#. module: product
#: model:product.template,name:product.product_product_pc3_product_template
@@ -402,6 +411,9 @@ msgid ""
"information about your products related to procurement logistics, sales "
"price, product category, suppliers and so on."
msgstr ""
+"Proizvode lahko nabavimo/prodamo. To so lahko materijali, skladiščni "
+"artikli, potrošni material ali storitve. Forma artikla vsebuje detaljne "
+"informacije o nabavi, prodajnim cenah, kategorijah, dobaviteljih itd."
#. module: product
#: help:product.product,qty_available:0
@@ -415,12 +427,12 @@ msgid ""
"Location of the Warehouse of this Shop, or any of its children.\n"
"Otherwise, this includes goods stored in any Stock Location typed as "
"'internal'."
-msgstr ""
+msgstr "Trenutna količina izdelka."
#. module: product
#: view:product.pricelist:0
msgid "Products Price Search"
-msgstr ""
+msgstr "Iskanje po cenah proizvodov"
#. module: product
#: view:product.product:0
@@ -464,12 +476,12 @@ msgstr "Višina"
#. module: product
#: help:product.pricelist.version,date_end:0
msgid "Ending date for this pricelist version to be valid."
-msgstr ""
+msgstr "Datum do katerega velja cenik"
#. module: product
#: model:product.category,name:product.cat0
msgid "All products"
-msgstr ""
+msgstr "Vsi proizvodi"
#. module: product
#: model:ir.model,name:product.model_pricelist_partnerinfo
@@ -479,22 +491,22 @@ msgstr "pricelist.partnerinfo"
#. module: product
#: field:product.price_list,qty2:0
msgid "Quantity-2"
-msgstr ""
+msgstr "Količina-2"
#. module: product
#: field:product.price_list,qty3:0
msgid "Quantity-3"
-msgstr ""
+msgstr "Količina-3"
#. module: product
#: view:product.product:0
msgid "Codes"
-msgstr ""
+msgstr "Šifre"
#. module: product
#: field:product.price_list,qty4:0
msgid "Quantity-4"
-msgstr ""
+msgstr "Količina-4"
#. module: product
#: view:res.partner:0
@@ -504,7 +516,7 @@ msgstr "Prodaja in nabava"
#. module: product
#: model:product.uom.categ,name:product.uom_categ_wtime
msgid "Working Time"
-msgstr ""
+msgstr "Delovni čas"
#. module: product
#: model:ir.actions.act_window,help:product.product_pricelist_action2
@@ -516,17 +528,22 @@ msgid ""
"each version has several rules. Example: the customer price of a product "
"category will be based on the supplier price multiplied by 1.80."
msgstr ""
+"Cenik vsebuje pravila po katerih se izračunavajo nabavne in prodajne ciene "
+"za vse partnerje ki so dodeljeni ceniku. Ceniki imajo več verzij (2010, "
+"2011, akcija Februar 2011, itd.)in vsaka verzija ima več pravil. Primer: "
+"prodajna cena določene kategorije proizvoda mora biti enaka nabavni ceni "
+"pomnoženi z 1.80."
#. module: product
#: model:product.template,name:product.product_product_metalcleats0_product_template
msgid "Metal Cleats"
-msgstr ""
+msgstr "Kovinske objemke"
#. module: product
#: code:addons/product/product.py:175
#, python-format
msgid "Cannot change the category of existing UoM '%s'."
-msgstr ""
+msgstr "Ni dovoljeno spremeniti kategorijo obstoječe Em'% s'."
#. module: product
#: model:ir.model,name:product.model_product_uom_categ
@@ -546,7 +563,7 @@ msgstr "Izračun cene"
#. module: product
#: model:res.groups,name:product.group_uos
msgid "Product UoS View"
-msgstr ""
+msgstr "Pregled proizvoda ES(enota prodaje)"
#. module: product
#: field:product.template,purchase_ok:0
@@ -564,6 +581,8 @@ msgid ""
"1 or several supplier(s) can be linked to a product. All information stands "
"in the product form."
msgstr ""
+"Eden ali več dobaviteljev lahko povežemo s proizvodom. Vse informacije se "
+"nahajajo v formi proizvoda."
#. module: product
#: help:product.uom,category_id:0
@@ -571,36 +590,38 @@ msgid ""
"Quantity conversions may happen automatically between Units of Measure in "
"the same category, according to their respective ratios."
msgstr ""
+"Preračun količine se lahko naredi avtomatsko med EM ,ki se nahajajo v isti "
+"kategoriji glede na njihove koeficiente."
#. module: product
#: help:product.packaging,width:0
msgid "The width of the package"
-msgstr ""
+msgstr "Širina paketa"
#. module: product
#: selection:product.category,type:0
msgid "View"
-msgstr ""
+msgstr "Pogled:"
#. module: product
#: model:ir.actions.act_window,name:product.product_template_action_tree
msgid "Product Templates"
-msgstr ""
+msgstr "Podloge proizvoda"
#. module: product
#: field:product.category,parent_left:0
msgid "Left Parent"
-msgstr ""
+msgstr "Levi panel"
#. module: product
#: model:product.template,name:product.product_product_restaurantexpenses0_product_template
msgid "Restaurant Expenses"
-msgstr ""
+msgstr "Stroški restavracije"
#. module: product
#: help:product.packaging,qty:0
msgid "The total number of products you can put by pallet or box."
-msgstr ""
+msgstr "Skupno število izdelkov, po paleti/škatlji."
#. module: product
#: constraint:product.packaging:0
@@ -616,7 +637,7 @@ msgstr "Min. količina"
#. module: product
#: model:ir.model,name:product.model_product_price_type
msgid "Price Type"
-msgstr ""
+msgstr "Vrsta cene"
#. module: product
#: code:addons/product/product.py:363
@@ -659,21 +680,24 @@ msgid ""
"not overlaps with original version. You should change the dates and "
"reactivate the pricelist"
msgstr ""
+"Ko se verzija podvaja je nastavljense status postavi na n\"eaktivni\", tako "
+"da so datumi ne prekrivajo z izvirno različico. Lahko spremenite datume in "
+"reaktivirate cenik."
#. module: product
#: model:product.template,name:product.product_product_kitshelfofcm0_product_template
msgid "KIT Shelf of 100cm"
-msgstr ""
+msgstr "KIT polica 100cm"
#. module: product
#: field:product.supplierinfo,name:0
msgid "Supplier"
-msgstr ""
+msgstr "Dobavitelj"
#. module: product
#: field:product.product,qty_available:0
msgid "Quantity On Hand"
-msgstr ""
+msgstr "Razpoložljiva količina"
#. module: product
#: model:product.template,name:product.product_product_26_product_template
@@ -688,7 +712,7 @@ msgstr "Naziv cene"
#. module: product
#: model:product.template,name:product.product_product_arm_product_template
msgid "Cabinet"
-msgstr ""
+msgstr "Kabinet"
#. module: product
#: help:product.product,incoming_qty:0
@@ -702,12 +726,12 @@ msgid ""
"Location of the Warehouse of this Shop, or any of its children.\n"
"Otherwise, this includes goods arriving to any Stock Location typed as "
"'internal'."
-msgstr ""
+msgstr "Količina proizvodov, ki je bila planirana za dospetje."
#. module: product
#: model:product.template,name:product.product_product_woodentable0_product_template
msgid "Wooden Table"
-msgstr ""
+msgstr "Lesena miza"
#. module: product
#: model:product.template,name:product.product_product_cpu3_product_template
@@ -727,12 +751,12 @@ msgstr "Cenik"
#: view:product.product:0
#: view:product.template:0
msgid "Suppliers"
-msgstr ""
+msgstr "Dobavitelji"
#. module: product
#: view:product.product:0
msgid "To Purchase"
-msgstr ""
+msgstr "Za nabavo"
#. module: product
#: help:product.supplierinfo,min_qty:0
@@ -741,6 +765,8 @@ msgid ""
"Product UoM if not empty, in the default unit of measure of the product "
"otherwise."
msgstr ""
+"Minimalna nabavna količina tega dobavitelja izražena u EM dobavitelja ili u "
+"predefinirani EM proizvoda,če nabavna EM ni vpisana."
#. module: product
#: view:product.pricelist.item:0
@@ -753,6 +779,8 @@ msgid ""
"This price will be considered as a price for the supplier UoM if any or the "
"default Unit of Measure of the product otherwise"
msgstr ""
+"To bo nabavna cena u nabavni EM proizvoda ali v predefinirani EM artikla,če "
+"nabavna EM ni vpisana"
#. module: product
#: model:product.category,name:product.product_category_accessories
@@ -776,6 +804,9 @@ msgid ""
"management. For example, in food industries, you will manage a stock of ham "
"but invoice in Kg. Keep empty to use the default UOM."
msgstr ""
+"Uporabljajo podjetja, ki upravljajo dve merske enoti: izdajanje računov in "
+"vodenje zalog. Na primer, v živilski industriji, boste upravljali zalogo "
+"šunke, računa pa v kg. Pustite prazno, da uporabite privzeto EM."
#. module: product
#: view:product.pricelist.item:0
@@ -819,7 +850,7 @@ msgstr "Sklic kupca"
#. module: product
#: view:product.product:0
msgid "Miscellaneous"
-msgstr ""
+msgstr "Razno"
#. module: product
#: field:product.pricelist.type,key:0
@@ -837,6 +868,8 @@ msgid ""
"Set a product if this rule only apply to one product. Keep empty for all "
"products"
msgstr ""
+"Izberite produkt,če to pravilo velja samo za en produkt. Pustite prazno za "
+"vse ostale."
#. module: product
#: view:product.product:0
@@ -847,12 +880,12 @@ msgstr "Nabava in lokacije"
#. module: product
#: model:product.template,name:product.product_product_kitchendesignproject0_product_template
msgid "Kitchen Design Project"
-msgstr ""
+msgstr "Projekt dizajna kuhinje"
#. module: product
#: model:product.uom,name:product.uom_hour
msgid "Hour"
-msgstr ""
+msgstr "Ura"
#. module: product
#: selection:product.template,state:0
@@ -863,33 +896,33 @@ msgstr "V razvoju"
#: code:addons/product/product.py:363
#, python-format
msgid "UoM categories Mismatch!"
-msgstr ""
+msgstr "EM se ne ujemajo!"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm1_product_template
msgid "Shelf of 200cm"
-msgstr ""
+msgstr "Polica 200cm"
#. module: product
#: view:product.uom:0
msgid "Ratio & Precision"
-msgstr ""
+msgstr "Razmerje & Preciznost"
#. module: product
#: model:product.uom,name:product.product_uom_gram
msgid "g"
-msgstr ""
+msgstr "g"
#. module: product
#: model:product.category,name:product.product_category_11
msgid "IT components kits"
-msgstr ""
+msgstr "IT sestavni sklopi"
#. module: product
#: selection:product.category,type:0
#: selection:product.template,state:0
msgid "Normal"
-msgstr ""
+msgstr "Običajno"
#. module: product
#: model:process.node,name:product.process_node_supplier0
@@ -919,7 +952,7 @@ msgstr "Kategorije izdelkov"
#. module: product
#: view:product.uom:0
msgid " e.g: 1 * (reference unit) = ratio * (this unit)"
-msgstr ""
+msgstr " npr: 1 * (referenčna enota) = razmerje * (trenutna enota)"
#. module: product
#: model:ir.actions.act_window,help:product.product_uom_form_action
@@ -928,6 +961,9 @@ msgid ""
"You can define a conversion rate between several Units of Measure within the "
"same category."
msgstr ""
+"Kreiranje in upravljanje merske enote, ki jih želite uporabljati v vašem "
+"sistemu. Določite lahko menjalno razmerje med več merskimi enotami v isti "
+"kategoriji."
#. module: product
#: field:product.packaging,weight:0
@@ -937,7 +973,7 @@ msgstr "Skupna masa paketa"
#. module: product
#: field:product.template,seller_info_id:0
msgid "unknown"
-msgstr ""
+msgstr "neznano"
#. module: product
#: help:product.packaging,code:0
@@ -950,6 +986,8 @@ msgid ""
"Product's cost for accounting stock valuation. It is the base price for the "
"supplier price."
msgstr ""
+"Sstroški izdelka za obračun vrednotenja zalog . To je osnovna cena za "
+"dobaviteljevo ceno."
#. module: product
#: view:product.price.type:0
@@ -981,7 +1019,7 @@ msgstr "Opis za nabavo"
#. module: product
#: constraint:product.pricelist.version:0
msgid "You cannot have 2 pricelist versions that overlap!"
-msgstr ""
+msgstr "Ne morete imeti 2 različic cenika , ki se prekrivata"
#. module: product
#: help:product.supplierinfo,delay:0
@@ -998,6 +1036,8 @@ msgid ""
"manage new versions of a price list. Some examples of versions: 2010, 2011, "
"Summer Promotion, etc."
msgstr ""
+"Tukaj je lahko več verzij cenika. Tukaj lahko Kreirate in upravljate novo "
+"verzijo cenika. Npr.:2011,2012,Poletna razprodaja..."
#. module: product
#: selection:product.template,type:0
@@ -1017,7 +1057,7 @@ msgstr "Zap."
#. module: product
#: view:product.price_list:0
msgid "Calculate Product Price per unit base on pricelist version."
-msgstr ""
+msgstr "Izračunaj ceno izdelka na osnovi cenika"
#. module: product
#: model:ir.model,name:product.model_product_ul
@@ -1064,21 +1104,24 @@ msgid ""
"be converted to each other. For example, in the unit of measure category "
"\"Time\", you will have the following UoM: Hours, Days."
msgstr ""
+"Kreiraj enoto mere,ki jo želiš uporabiti. Če je v kategoriji več enot,jih "
+"lahko medsebojno pretvarjaš. Npr. v kategoriji \"čas\" imamo lahko "
+"\"minuta,ura,dan..)"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Bigger than the reference UoM"
-msgstr ""
+msgstr "Večja od referenčne Em."
#. module: product
#: field:product.category,parent_right:0
msgid "Right Parent"
-msgstr ""
+msgstr "Desno pravilo"
#. module: product
#: view:product.product:0
msgid "To Sell"
-msgstr ""
+msgstr "Prodati"
#. module: product
#: help:product.product,outgoing_qty:0
@@ -1092,12 +1135,12 @@ msgid ""
"Location of the Warehouse of this Shop, or any of its children.\n"
"Otherwise, this includes goods leaving from any Stock Location typed as "
"'internal'."
-msgstr ""
+msgstr "Količina proizvodov, načrtovana za opustitev."
#. module: product
#: model:product.category,name:product.product_category_services0
msgid "Marketable Services"
-msgstr ""
+msgstr "Storitve trženja"
#. module: product
#: field:product.pricelist.item,price_surcharge:0
@@ -1112,7 +1155,7 @@ msgstr "Matična plošča ASUStek A7N8X"
#. module: product
#: field:product.product,packaging:0
msgid "Logistical Units"
-msgstr ""
+msgstr "Logistične enote"
#. module: product
#: field:product.category,complete_name:0
@@ -1131,7 +1174,7 @@ msgstr "Naziv"
#. module: product
#: model:product.template,name:product.product_product_woodlintelm0_product_template
msgid "Wood Lintel 4m"
-msgstr ""
+msgstr "Lesena preklada 4m"
#. module: product
#: model:ir.actions.act_window,help:product.product_normal_action
@@ -1142,16 +1185,20 @@ msgid ""
"contains detailed information about your products related to procurement "
"logistics, sales price, product category, suppliers and so on."
msgstr ""
+"Potrebno je definirati izdelek.. Izdelki so lahko surovine,, potrošni "
+"material in storitve.Oblika proizvoda vsebuje podrobne informacije o vaših "
+"izdelkih, povezanih z logistiko naročil, prodajne cene, kategorijo izdelkov, "
+"dobaviteljev in tako naprej."
#. module: product
#: model:product.uom,name:product.product_uom_kgm
msgid "kg"
-msgstr ""
+msgstr "kg"
#. module: product
#: model:product.uom,name:product.product_uom_meter
msgid "m"
-msgstr ""
+msgstr "m"
#. module: product
#: selection:product.template,state:0
@@ -1161,7 +1208,7 @@ msgstr "Zastarelo"
#. module: product
#: model:product.uom,name:product.product_uom_km
msgid "km"
-msgstr ""
+msgstr "km"
#. module: product
#: help:product.template,cost_method:0
@@ -1170,6 +1217,9 @@ msgid ""
"at the end of the year), Average Price: the cost price is recomputed at each "
"reception of products."
msgstr ""
+"Standardna (planska) cena: cena je fiksnodoločena ,izračunava se periodično "
+"(običajno na koncu leta), Povprečna cena: cena se izračunava pri vsaki "
+"nabavi proizvoda."
#. module: product
#: help:product.category,sequence:0
@@ -1181,7 +1231,7 @@ msgstr ""
#: field:product.uom,factor:0
#: field:product.uom,factor_inv:0
msgid "Ratio"
-msgstr ""
+msgstr "Razmerje"
#. module: product
#: help:product.template,purchase_ok:0
@@ -1205,22 +1255,22 @@ msgstr "Širina"
#. module: product
#: help:product.price.type,field:0
msgid "Associated field in the product form."
-msgstr ""
+msgstr "Povezano polje s forme proizvoda"
#. module: product
#: view:product.product:0
msgid "Unit of Measure"
-msgstr ""
+msgstr "Enota mere"
#. module: product
#: field:product.template,procure_method:0
msgid "Procurement Method"
-msgstr ""
+msgstr "Metoda Naročnja"
#. module: product
#: report:product.pricelist:0
msgid "Printing Date"
-msgstr ""
+msgstr "Datum izpisa"
#. module: product
#: field:product.template,uos_id:0
@@ -1243,6 +1293,7 @@ msgstr ""
#: help:product.template,seller_id:0
msgid "Main Supplier who has highest priority in Supplier List."
msgstr ""
+"Glavni dobavitelj, ki ima največjo prednost iz seznama dobaviteljev."
#. module: product
#: model:product.category,name:product.product_category_services
@@ -1253,7 +1304,7 @@ msgstr "Storitve"
#. module: product
#: model:ir.actions.act_window,name:product.product_form_config_action
msgid "Create or Import Products"
-msgstr ""
+msgstr "Kreiraj ali uvozi proizvod."
#. module: product
#: field:product.pricelist.item,base_pricelist_id:0
@@ -1274,24 +1325,24 @@ msgstr "Proizvodi"
#. module: product
#: help:product.packaging,rows:0
msgid "The number of layers on a pallet or box"
-msgstr ""
+msgstr "Število slojev na paleti ali škatlji"
#. module: product
#: help:product.pricelist.item,base:0
msgid "The mode for computing the price for this rule."
-msgstr ""
+msgstr "Način izračuna cene za to pravilo."
#. module: product
#: view:product.packaging:0
#: view:product.product:0
msgid "Pallet Dimension"
-msgstr ""
+msgstr "Dimenzija palete"
#. module: product
#: code:addons/product/product.py:668
#, python-format
msgid " (copy)"
-msgstr ""
+msgstr " (kopija)"
#. module: product
#: field:product.template,seller_ids:0
@@ -1305,6 +1356,8 @@ msgid ""
"order and the delivery of the finished products. It's the time you promise "
"to your customers."
msgstr ""
+"To je povprečna zamuda v dneh od potrditve naročila stranke in dobavo "
+"končnih proizvodov."
#. module: product
#: view:product.product:0
@@ -1316,7 +1369,7 @@ msgstr "Druga EM"
#: code:addons/product/product.py:143
#, python-format
msgid "Error !"
-msgstr ""
+msgstr "Napaka !"
#. module: product
#: model:ir.actions.act_window,name:product.product_uom_form_action
@@ -1324,17 +1377,17 @@ msgstr ""
#: model:ir.ui.menu,name:product.next_id_16
#: view:product.uom:0
msgid "Units of Measure"
-msgstr ""
+msgstr "Merske enote"
#. module: product
#: field:product.supplierinfo,min_qty:0
msgid "Minimal Quantity"
-msgstr ""
+msgstr "Minimalna količina"
#. module: product
#: model:product.category,name:product.product_category_pc
msgid "PC"
-msgstr ""
+msgstr "PC"
#. module: product
#: help:product.supplierinfo,product_code:0
@@ -1342,6 +1395,8 @@ msgid ""
"This supplier's product code will be used when printing a request for "
"quotation. Keep empty to use the internal one."
msgstr ""
+"Dobaviteljeva šifra artikla bo uporabljena na izpisu povpraševanja. Pustite "
+" prazno,če želite izpisati internu šifro."
#. module: product
#: selection:product.template,procure_method:0
@@ -1356,7 +1411,7 @@ msgstr "Različica cenika"
#. module: product
#: field:product.product,virtual_available:0
msgid "Quantity Available"
-msgstr ""
+msgstr "količina,ki je na voljo"
#. module: product
#: help:product.pricelist.item,sequence:0
@@ -1384,7 +1439,7 @@ msgstr "Bruto masa v kg."
#. module: product
#: model:product.template,name:product.product_product_sidepanel0_product_template
msgid "Side Panel"
-msgstr ""
+msgstr "Bočni panel"
#. module: product
#: view:product.product:0
@@ -1401,7 +1456,7 @@ msgstr "Teže"
#. module: product
#: field:product.uom,category_id:0
msgid "UoM Category"
-msgstr ""
+msgstr "Kategorija enote mere"
#. module: product
#: field:product.template,loc_rack:0
@@ -1411,7 +1466,7 @@ msgstr "Stojalo"
#. module: product
#: field:product.template,uom_po_id:0
msgid "Purchase Unit of Measure"
-msgstr ""
+msgstr "Nabavna enota mere"
#. module: product
#: field:product.template,supply_method:0
@@ -1425,11 +1480,14 @@ msgid ""
"category to get the list of all products linked to this category or to a "
"child of this category."
msgstr ""
+"Lista vseh proizvodov klasificirana po kategorijah. Lahko izberete "
+"kategorijo,če želite listo vseh proizvodov v izbrani kategoriji ali "
+"podkategoriji."
#. module: product
#: view:product.product:0
msgid "Group by..."
-msgstr ""
+msgstr "Grupiraj po..."
#. module: product
#: model:product.template,name:product.product_product_cpu_gen_product_template
@@ -1455,7 +1513,7 @@ msgid ""
"production order and, if it is a multi-level bill of material, it's only for "
"the level of this product. Different lead times will be summed for all "
"levels and purchase orders."
-msgstr ""
+msgstr "Povprečna zamuda v dnevih za proizvodnjo tega izdelka."
#. module: product
#: model:product.template,name:product.product_product_pc1_product_template
@@ -1468,11 +1526,12 @@ msgid ""
"If the active field is set to False, it will allow you to hide the pricelist "
"without removing it."
msgstr ""
+"Nastavitev cenika na neaktivno,omogoča skrivanje cenika brez brisanja."
#. module: product
#: model:product.uom,name:product.product_uom_cm
msgid "cm"
-msgstr ""
+msgstr "cm"
#. module: product
#: model:ir.model,name:product.model_product_uom
@@ -1493,12 +1552,12 @@ msgstr "Natančnost zaokroževanja"
#. module: product
#: view:product.uom:0
msgid "Unit of Measure Properties"
-msgstr ""
+msgstr "Lastnosti merske enote"
#. module: product
#: model:product.template,name:product.product_product_shelf1_product_template
msgid "Rack 200cm"
-msgstr ""
+msgstr "Polica 200cm"
#. module: product
#: selection:product.template,supply_method:0
@@ -1508,7 +1567,7 @@ msgstr "Nakup"
#. module: product
#: view:product.uom.categ:0
msgid "Units of Measure categories"
-msgstr ""
+msgstr "Kategorije enot mere"
#. module: product
#: help:product.packaging,weight_ul:0
@@ -1518,12 +1577,12 @@ msgstr "Masa prazne LE"
#. module: product
#: model:product.template,name:product.product_product_woodmm10_product_template
msgid "Wood 10mm"
-msgstr ""
+msgstr "Les 10mm"
#. module: product
#: selection:product.uom,uom_type:0
msgid "Smaller than the reference UoM"
-msgstr ""
+msgstr "Manjše,kot referenčna EM"
#. module: product
#: field:product.price.type,active:0
@@ -1542,22 +1601,22 @@ msgstr "Spremenljiva marža"
#. module: product
#: sql_constraint:product.uom:0
msgid "The conversion ratio for a unit of measure cannot be 0!"
-msgstr ""
+msgstr "Koeficient pretvorbe ne sme biti 0!"
#. module: product
#: help:product.packaging,ean:0
msgid "The EAN code of the package unit."
-msgstr ""
+msgstr "EAN koda pakiranja"
#. module: product
#: help:product.supplierinfo,product_uom:0
msgid "This comes from the product form."
-msgstr ""
+msgstr "To pride iz forme proizvoda"
#. module: product
#: field:product.packaging,weight_ul:0
msgid "Empty Package Weight"
-msgstr ""
+msgstr "Težina praznega pakiranja"
#. module: product
#: field:product.price.type,field:0
@@ -1575,22 +1634,24 @@ msgid ""
"How many times this UoM is smaller than the reference UoM in this category:\n"
"1 * (reference unit) = ratio * (this unit)"
msgstr ""
+"Kolikokrat jeta EM manjši od referenčne EM v tej kategoriji:\n"
+"1 * (referenčna enota) = razmerje * (ta enota)"
#. module: product
#: model:ir.actions.act_window,name:product.product_price_type_action
#: model:ir.ui.menu,name:product.menu_product_price_type
msgid "Price Types"
-msgstr ""
+msgstr "Tip cene"
#. module: product
#: help:product.template,uom_id:0
msgid "Default Unit of Measure used for all stock operation."
-msgstr ""
+msgstr "Privzeta EM za vse operacije zalog."
#. module: product
#: model:product.category,name:product.product_category_misc0
msgid "Misc"
-msgstr ""
+msgstr "Razno"
#. module: product
#: model:product.template,name:product.product_product_pc4_product_template
@@ -1616,17 +1677,17 @@ msgstr "Objavljen cenik"
#. module: product
#: model:product.category,name:product.product_category_marketableproduct0
msgid "Marketable Products"
-msgstr ""
+msgstr "Tržni proizvodi"
#. module: product
#: field:product.supplierinfo,product_code:0
msgid "Supplier Product Code"
-msgstr ""
+msgstr "Šifra artikla dobavitelja"
#. module: product
#: view:product.product:0
msgid "Default UOM"
-msgstr ""
+msgstr "Definirana(običajna) EM"
#. module: product
#: selection:product.ul,type:0
@@ -1636,7 +1697,7 @@ msgstr "Paleta"
#. module: product
#: field:product.packaging,ul_qty:0
msgid "Package by layer"
-msgstr ""
+msgstr "Pakiranje po slojih"
#. module: product
#: field:product.template,warranty:0
@@ -1649,6 +1710,8 @@ msgid ""
"Set a category of product if this rule only apply to products of a category "
"and his children. Keep empty for all products"
msgstr ""
+"Nastavi kategorijo izdelka samo,če se to pravilo uporablja za izdelek v "
+"kategoriji in njegovih podkategorijah."
#. module: product
#: model:ir.model,name:product.model_product_product
@@ -1678,6 +1741,8 @@ msgid ""
"Produce will generate production order or tasks, according to the product "
"type. Buy will trigger purchase orders when requested."
msgstr ""
+"Generiran bo proizvodni nalog, glede na vrsto izdelka. Nakup bo sprožil "
+"naročilo."
#. module: product
#: field:product.product,variants:0
@@ -1698,12 +1763,12 @@ msgstr "Faktor preračuna"
#. module: product
#: help:product.supplierinfo,sequence:0
msgid "Assigns the priority to the list of product supplier."
-msgstr ""
+msgstr "Dodeli prednost na seznam dobavitelja izdelkov."
#. module: product
#: field:product.template,uom_id:0
msgid "Default Unit Of Measure"
-msgstr ""
+msgstr "Privzeta EM"
#. module: product
#: model:product.template,name:product.product_product_tow1_product_template
@@ -1718,7 +1783,7 @@ msgstr "Metoda zaokroževanja"
#. module: product
#: model:product.category,name:product.product_category_assembly
msgid "Assembly Service"
-msgstr ""
+msgstr "Storitev montaže"
#. module: product
#: model:ir.actions.report.xml,name:product.report_product_label
@@ -1738,7 +1803,7 @@ msgstr "Storitev"
#. module: product
#: help:product.packaging,height:0
msgid "The height of the package"
-msgstr ""
+msgstr "Višina pakiranja"
#. module: product
#: view:product.pricelist:0
@@ -1760,28 +1825,28 @@ msgstr "Družba"
msgid ""
"Base price for computing the customer price. Sometimes called the catalog "
"price."
-msgstr ""
+msgstr "Osnova za izračun cene kupca.(Kataloška cena)"
#. module: product
#: code:addons/product/pricelist.py:376
#, python-format
msgid "Partner section of the product form"
-msgstr ""
+msgstr "Podatki o partnerju v formi izdelka"
#. module: product
#: help:product.price.type,name:0
msgid "Name of this kind of price."
-msgstr ""
+msgstr "Ime te vrste cene"
#. module: product
#: field:product.supplierinfo,product_uom:0
msgid "Supplier UoM"
-msgstr ""
+msgstr "EM dobavitelja"
#. module: product
#: help:product.pricelist.version,date_start:0
msgid "Starting date for this pricelist version to be valid."
-msgstr ""
+msgstr "Datum od katerega velja ta verzija cenika."
#. module: product
#: help:product.template,uom_po_id:0
@@ -1789,6 +1854,7 @@ msgid ""
"Default Unit of Measure used for purchase orders. It must be in the same "
"category than the default unit of measure."
msgstr ""
+"Privzeta EM za naročilo. Biti mora v isti kategoriji kot privzeta EM."
#. module: product
#: model:product.template,description:product.product_product_cpu1_product_template
@@ -1803,7 +1869,7 @@ msgstr "Dolžina"
#. module: product
#: model:product.uom.categ,name:product.uom_categ_length
msgid "Length / Distance"
-msgstr ""
+msgstr "Dolžina/Razdalja"
#. module: product
#: model:product.template,name:product.product_product_0_product_template
@@ -1819,22 +1885,22 @@ msgstr "Vrsta cenika"
#. module: product
#: model:product.category,name:product.product_category_otherproducts0
msgid "Other Products"
-msgstr ""
+msgstr "Drugi proizvodi"
#. module: product
#: field:product.product,color:0
msgid "Color Index"
-msgstr ""
+msgstr "Barvvni index"
#. module: product
#: view:product.product:0
msgid "Characteristics"
-msgstr ""
+msgstr "Karakteristike"
#. module: product
#: field:product.template,sale_ok:0
msgid "Can be Sold"
-msgstr ""
+msgstr "LAhko se proda"
#. module: product
#: field:product.template,produce_delay:0
@@ -1850,7 +1916,7 @@ msgstr "Cenik dobavitelja"
#: code:addons/product/product.py:175
#, python-format
msgid "Warning"
-msgstr ""
+msgstr "Opozorilo"
#. module: product
#: field:product.pricelist.item,base:0
@@ -1860,12 +1926,12 @@ msgstr "Zaosnovano na"
#. module: product
#: model:product.uom,name:product.product_uom_ton
msgid "t"
-msgstr ""
+msgstr "t"
#. module: product
#: model:product.category,name:product.product_category_rawmaterial0
msgid "Raw Materials"
-msgstr ""
+msgstr "Surovine"
#. module: product
#: help:product.template,product_manager:0
@@ -1875,7 +1941,7 @@ msgstr ""
#. module: product
#: field:product.pricelist,name:0
msgid "Pricelist Name"
-msgstr ""
+msgstr "Naziv cenika"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_version
@@ -1892,7 +1958,7 @@ msgstr "* ( 1 + "
#. module: product
#: help:product.packaging,weight:0
msgid "The weight of a full package, pallet or box."
-msgstr ""
+msgstr "Skupna teža pakiranja palete ali škatlje"
#. module: product
#: model:product.template,name:product.product_product_hdd2_product_template
@@ -1902,12 +1968,12 @@ msgstr "Trdi disk Seagate 7200.8 120GB"
#. module: product
#: model:product.template,name:product.product_product_employee0_product_template
msgid "Employee"
-msgstr ""
+msgstr "Zaposleni"
#. module: product
#: model:product.template,name:product.product_product_shelfofcm0_product_template
msgid "Shelf of 100cm"
-msgstr ""
+msgstr "Polica 100cm"
#. module: product
#: model:ir.model,name:product.model_product_category
@@ -1918,12 +1984,12 @@ msgstr "Kategorija izdelkov"
#. module: product
#: report:product.pricelist:0
msgid "Price List Name"
-msgstr ""
+msgstr "Naziv cenika"
#. module: product
#: field:product.supplierinfo,delay:0
msgid "Delivery Lead Time"
-msgstr ""
+msgstr "Čas dostave"
#. module: product
#: help:product.uom,active:0
@@ -1931,12 +1997,13 @@ msgid ""
"By unchecking the active field you can disable a unit of measure without "
"deleting it."
msgstr ""
+"Z odznačavanjem polja \"aktiven\" lahko deaktivirate EM,ne da bi je brisali."
#. module: product
#: model:ir.actions.act_window,name:product.product_uom_categ_form_action
#: model:ir.ui.menu,name:product.menu_product_uom_categ_form_action
msgid "UoM Categories"
-msgstr ""
+msgstr "EM kategorij"
#. module: product
#: field:product.template,seller_delay:0
@@ -1953,12 +2020,12 @@ msgstr "Škatla"
msgid ""
"Create and manage your packaging dimensions and types you want to be "
"maintained in your system."
-msgstr ""
+msgstr "Ustvarite in urejajte dimenzije in vrste embalaže."
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm1_product_template
msgid "Rear Panel SHE200"
-msgstr ""
+msgstr "Zadnaj stranica SHE200"
#. module: product
#: help:product.pricelist.type,key:0
@@ -1970,7 +2037,7 @@ msgstr ""
#. module: product
#: view:product.product:0
msgid "Context..."
-msgstr ""
+msgstr "Kontekst..."
#. module: product
#: model:product.template,name:product.product_product_hdd1_product_template
@@ -1980,12 +2047,12 @@ msgstr "Trdi disk Seagate 7200.8 80GB"
#. module: product
#: help:product.supplierinfo,qty:0
msgid "This is a quantity which is converted into Default Uom."
-msgstr ""
+msgstr "To je količina ,ki je pretvorjena v privzeto EM."
#. module: product
#: field:product.packaging,ul:0
msgid "Type of Package"
-msgstr ""
+msgstr "Tip pakiranja"
#. module: product
#: selection:product.ul,type:0
@@ -2010,17 +2077,17 @@ msgstr "Procesor po želji"
#. module: product
#: model:process.transition,name:product.process_transition_supplierofproduct0
msgid "Supplier of the product"
-msgstr ""
+msgstr "Dobavitelj proizvoda"
#. module: product
#: field:product.product,product_image:0
msgid "Image"
-msgstr ""
+msgstr "Slika"
#. module: product
#: field:product.uom,uom_type:0
msgid "UoM Type"
-msgstr ""
+msgstr "Tip EM"
#. module: product
#: help:product.product,active:0
@@ -2028,13 +2095,15 @@ msgid ""
"If the active field is set to False, it will allow you to hide the product "
"without removing it."
msgstr ""
+"Če je polje nastavljeno neaktivno,je dovoljeno skriti izdelek,ne da bi ga "
+"odstranili"
#. module: product
#: help:product.uom,rounding:0
msgid ""
"The computed quantity will be a multiple of this value. Use 1.0 for a UoM "
"that cannot be further split, such as a piece."
-msgstr ""
+msgstr "Izračunana količina bo večkratnik te vrednosti."
#. module: product
#: view:product.product:0
@@ -2050,7 +2119,7 @@ msgstr "Vrsta"
#. module: product
#: model:product.template,name:product.product_product_rearpanelarm0_product_template
msgid "Rear Panel SHE100"
-msgstr ""
+msgstr "Zadnja stranica SHE100"
#. module: product
#: model:product.template,name:product.product_product_23_product_template
@@ -2060,7 +2129,7 @@ msgstr "Kompleten PC s perifernimi enotami"
#. module: product
#: model:product.template,name:product.product_product_hotelexpenses0_product_template
msgid "Hotel Expenses"
-msgstr ""
+msgstr "Stroški hotela"
#. module: product
#: help:product.uom,factor_inv:0
@@ -2068,11 +2137,13 @@ msgid ""
"How many times this UoM is bigger than the reference UoM in this category:\n"
"1 * (this unit) = ratio * (reference unit)"
msgstr ""
+"Kolikokrat je ta EM večja od privzete Em v tej kategoriji.\n"
+"1*(ta enota)=razmerje*(privzeta enota)"
#. module: product
#: model:product.template,name:product.product_product_shelf0_product_template
msgid "Rack 100cm"
-msgstr ""
+msgstr "Polica 100cm"
#. module: product
#: help:product.packaging,sequence:0
@@ -2091,11 +2162,13 @@ msgid ""
"At least one pricelist has no active version !\n"
"Please create or activate one."
msgstr ""
+"Najmanj en cenik nima aktivne verzije.\n"
+"Aktiviraj ali kreiraj."
#. module: product
#: field:product.pricelist.item,price_max_margin:0
msgid "Max. Price Margin"
-msgstr ""
+msgstr "Max, prodajna marža"
#. module: product
#: help:product.supplierinfo,product_name:0
@@ -2103,6 +2176,8 @@ msgid ""
"This supplier's product name will be used when printing a request for "
"quotation. Keep empty to use the internal one."
msgstr ""
+"Dobaviteljev naziv proizvoda bo izpisan na ponudbi. Pusti prazno,če želiš "
+"interni naziv."
#. module: product
#: selection:product.template,mes_type:0
@@ -2112,7 +2187,7 @@ msgstr "Spremenljivo"
#. module: product
#: field:product.template,rental:0
msgid "Can be Rent"
-msgstr ""
+msgstr "Lahko se najame"
#. module: product
#: model:product.price.type,name:product.standard_price
@@ -2123,7 +2198,7 @@ msgstr "Lastna cena"
#. module: product
#: field:product.pricelist.item,price_min_margin:0
msgid "Min. Price Margin"
-msgstr ""
+msgstr "Min. marža prodajne cijene"
#. module: product
#: field:product.template,weight:0
@@ -2133,7 +2208,7 @@ msgstr "Bruto masa"
#. module: product
#: model:product.template,name:product.product_product_assemblysection0_product_template
msgid "Assembly Section"
-msgstr ""
+msgstr "Montažni(sestavni)del"
#. module: product
#: model:product.category,name:product.product_category_3
@@ -2156,12 +2231,12 @@ msgstr "Zaporedje"
#. module: product
#: model:product.template,name:product.product_assembly_product_template
msgid "Assembly Service Cost"
-msgstr ""
+msgstr "Strošek montaže"
#. module: product
#: view:product.price_list:0
msgid "Close"
-msgstr ""
+msgstr "Zapri"
#. module: product
#: model:ir.model,name:product.model_product_pricelist_item
@@ -2176,7 +2251,7 @@ msgstr "RAM po želji"
#. module: product
#: view:res.partner:0
msgid "Sales Properties"
-msgstr ""
+msgstr "Lastnosti prodaje"
#. module: product
#: view:product.product:0
@@ -2187,12 +2262,12 @@ msgstr "Čakalne dobe"
#. module: product
#: view:product.product:0
msgid "Both stockable and consumable products"
-msgstr ""
+msgstr "Skladiščeni in potrošni proizvodi"
#. module: product
#: model:process.node,note:product.process_node_product0
msgid "Creation of the product"
-msgstr ""
+msgstr "Kreiranje proizvoda"
#. module: product
#: field:pricelist.partnerinfo,name:0
@@ -2238,13 +2313,13 @@ msgstr "Variante izdelka"
#. module: product
#: model:product.category,name:product.product_category_shelves0
msgid "Shelves"
-msgstr ""
+msgstr "Police"
#. module: product
#: code:addons/product/pricelist.py:375
#, python-format
msgid "Other Pricelist"
-msgstr ""
+msgstr "drugi cenik"
#. module: product
#: model:ir.model,name:product.model_product_template
@@ -2263,7 +2338,7 @@ msgstr "Metoda stroškov"
#: view:product.packaging:0
#: view:product.product:0
msgid "Palletization"
-msgstr ""
+msgstr "Nalaganje na palete"
#. module: product
#: help:product.template,volume:0
@@ -2292,7 +2367,7 @@ msgstr "Različice cenikov"
#. module: product
#: model:product.template,name:product.product_product_span100_product_template
msgid "Shelf Panel"
-msgstr ""
+msgstr "Panel-polica"
#. module: product
#: help:product.pricelist.item,price_round:0
@@ -2301,6 +2376,10 @@ msgid ""
"Rounding is applied after the discount and before the surcharge.\n"
"To have prices that end in 9.99, set rounding 10, surcharge -0.01"
msgstr ""
+"Postavvi ceno,ki je včkratnik te vrednosti.\n"
+"Zaokroževanje se izvede po izračunu popusta in pred dodatkom na ceno.\n"
+"Da dobite cene,ki se končajo na 9.99,postavite zaokroževanje na 10,dodatek "
+"pa na 0.01"
#. module: product
#: field:product.template,list_price:0
@@ -2310,12 +2389,12 @@ msgstr "Prodajna cena"
#. module: product
#: constraint:product.category:0
msgid "Error ! You cannot create recursive categories."
-msgstr ""
+msgstr "Napaka! Ne morete ustvariti rekurzivne kategorije."
#. module: product
#: field:product.category,type:0
msgid "Category Type"
-msgstr ""
+msgstr "Vrsta kategorije"
#. module: product
#: model:product.category,name:product.cat2
@@ -2328,11 +2407,13 @@ msgid ""
"Coefficient to convert UOM to UOS\n"
" uos = uom * coeff"
msgstr ""
+"Koeficent za pretvorbo EM(enota mere) v ES(enota prodaje)\n"
+"ES=EM*koef"
#. module: product
#: constraint:res.partner:0
msgid "Error ! You cannot create recursive associated members."
-msgstr ""
+msgstr "Napaka! Ne morete ustvariti rekurzivne povezane člane."
#. module: product
#: field:product.pricelist.item,price_discount:0
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 0388b2a4aa3..bd763daefcb 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -3,7 +3,7 @@
+ parent="base.menu_base_config" sequence="0"/>
@@ -231,8 +231,7 @@
-->
+ parent="product.menu_product_pricelist_main" sequence="2"/>-->
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2a12fc9ad08..1642d28e35f 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -1,7 +1,7 @@
-
+
product.search.form
@@ -17,16 +17,16 @@
-
+
-
+
-
-
+
+
@@ -56,8 +56,8 @@
-
-
+
+
@@ -78,7 +78,7 @@
-
+
@@ -94,28 +94,27 @@
-
+
-
-
+
+
-
+
-
+
@@ -150,7 +149,7 @@
-
+
@@ -350,7 +349,6 @@
@@ -546,8 +544,8 @@
@@ -646,26 +644,25 @@
-
+
-
-
+
+
-
+
-
+
@@ -675,7 +672,7 @@
-
+
@@ -686,7 +683,7 @@
-
+
diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml
index 8fef3c1470e..8126018d3a5 100644
--- a/addons/project/board_project_view.xml
+++ b/addons/project/board_project_view.xml
@@ -20,7 +20,7 @@
-
+
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index c48b075721a..956b159a0bb 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -21,7 +21,7 @@