Odoo Server (MOVED TO GITHUB)

Merge lp:~openerp-dev/openobject-server/7.0-mail_issues-adh into lp:openobject-server

  1. 7.0-mail_issues-adh
  2. Merge into trunk
Proposed by Anand Dharampuriya(OpenERP)
Status: Superseded
Proposed branch: lp:~openerp-dev/openobject-server/7.0-mail_issues-adh
Merge into: lp:openobject-server
Diff against target: 2251 lines (+854/-141) (has conflicts)
9 files modified
openerp/addons/base/i18n/bg.po (+14/-0)
openerp/addons/base/i18n/de.po (+55/-24)
openerp/addons/base/i18n/es.po (+26/-0)
openerp/addons/base/i18n/nb.po (+691/-116)
openerp/addons/base/i18n/vi.po (+39/-0)
openerp/addons/base/ir/ir_model.py (+7/-0)
openerp/addons/base/ir/ir_values.py (+8/-1)
openerp/osv/orm.py (+11/-0)
openerp/tools/mail.py (+3/-0)
Text conflict in openerp/addons/base/i18n/bg.po
Text conflict in openerp/addons/base/i18n/de.po
Text conflict in openerp/addons/base/i18n/es.po
Text conflict in openerp/addons/base/i18n/nb.po
Text conflict in openerp/addons/base/i18n/vi.po
Text conflict in openerp/addons/base/ir/ir_model.py
Text conflict in openerp/osv/orm.py
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/7.0-mail_issues-adh
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+220782@code.launchpad.net

Description of the change

Hello,
Here I had solved while you get project issue from configured incoming mail server if your mail's body contain ">" sign it display > instead of that.
You just have to add following lines in html2plaintext method defined in server>openerp>tools>mail.py

html = html.replace('&lt;', '<')
html = html.replace('&gt;', '>')
html = html.replace('&amp;', '&')

Thanx
Anand Dharampuriya(ADH)

To post a comment you must log in.
lp:~openerp-dev/openobject-server/7.0-mail_issues-adh updated
5308. By Anand Dharampuriya(OpenERP)

[FIX] Solve while you get project issue from configured incoming mail server it show &gt; for every greaterthen sign(>)of body's content https://bugs.launchpad.net/openobject-addons/+bug/1168376

Unmerged revisions

5308. By Anand Dharampuriya(OpenERP)

[FIX] Solve while you get project issue from configured incoming mail server it show &gt; for every greaterthen sign(>)of body's content https://bugs.launchpad.net/openobject-addons/+bug/1168376

5307. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

5306. By Thibault Delavallée (OpenERP)

[FIX] orm: unlink: when unlinking a record, trigger the computing of
function fields for other records in the same model. Previously all function fields in the
current model were not computed for some reason not provided by the history.

We therefore compute effective store_ids on which the various trigerred
function fields will be computed again. Those ids are the ids given
in the store_get storage variable minus the deleted ones.

5305. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

5304. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

5303. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

5302. By Martin Trigaux (OpenERP)

[FIX] ir_model_fields: when adding a new custom column to a custom model, set a valid _rec_name to this model (otherwise would require a server restart to reinstanciate the model)

5301. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

5300. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

5299. By Launchpad Translations on behalf of openerp

Launchpad automatic translations update.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/i18n/bg.po'
2--- openerp/addons/base/i18n/bg.po 2014-05-17 06:42:08 +0000
3+++ openerp/addons/base/i18n/bg.po 2014-05-23 11:18:54 +0000
4@@ -4,17 +4,31 @@
5 #
6 msgid ""
7 msgstr ""
8+<<<<<<< TREE
9 "Project-Id-Version: OpenERP Server 5.0.4\n"
10 "Report-Msgid-Bugs-To: support@openerp.com\n"
11 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
12 "PO-Revision-Date: 2012-08-20 15:49+0000\n"
13 "Last-Translator: Boris <boris.t.ivanov@gmail.com>\n"
14 "Language-Team: \n"
15+=======
16+"Project-Id-Version: openobject-server\n"
17+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
18+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
19+"PO-Revision-Date: 2014-05-09 13:12+0000\n"
20+"Last-Translator: Vihren Kanev <Unknown>\n"
21+"Language-Team: Bulgarian <bg@li.org>\n"
22+>>>>>>> MERGE-SOURCE
23 "MIME-Version: 1.0\n"
24 "Content-Type: text/plain; charset=UTF-8\n"
25 "Content-Transfer-Encoding: 8bit\n"
26+<<<<<<< TREE
27 "X-Launchpad-Export-Date: 2014-05-17 06:26+0000\n"
28 "X-Generator: Launchpad (build 17007)\n"
29+=======
30+"X-Launchpad-Export-Date: 2014-05-10 07:55+0000\n"
31+"X-Generator: Launchpad (build 16996)\n"
32+>>>>>>> MERGE-SOURCE
33
34 #. module: base
35 #: model:ir.module.module,description:base.module_account_check_writing
36
37=== modified file 'openerp/addons/base/i18n/de.po'
38--- openerp/addons/base/i18n/de.po 2014-05-17 06:42:08 +0000
39+++ openerp/addons/base/i18n/de.po 2014-05-23 11:18:54 +0000
40@@ -5,17 +5,31 @@
41 # Ferdinand Gassauer <f.gassauer@chricar.at>, 2010.
42 msgid ""
43 msgstr ""
44+<<<<<<< TREE
45 "Project-Id-Version: OpenERP Server 5.0.4\n"
46 "Report-Msgid-Bugs-To: support@openerp.com\n"
47 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
48 "PO-Revision-Date: 2012-12-22 01:32+0000\n"
49 "Last-Translator: Felix Schubert <Unknown>\n"
50 "Language-Team: German <kde-i18n-doc@kde.org>\n"
51+=======
52+"Project-Id-Version: openobject-server\n"
53+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
54+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
55+"PO-Revision-Date: 2014-05-17 09:03+0000\n"
56+"Last-Translator: Ralf Hilgenstock <rh@dialoge.info>\n"
57+"Language-Team: German <de@li.org>\n"
58+>>>>>>> MERGE-SOURCE
59 "MIME-Version: 1.0\n"
60 "Content-Type: text/plain; charset=UTF-8\n"
61 "Content-Transfer-Encoding: 8bit\n"
62+<<<<<<< TREE
63 "X-Launchpad-Export-Date: 2014-05-17 06:29+0000\n"
64 "X-Generator: Launchpad (build 17007)\n"
65+=======
66+"X-Launchpad-Export-Date: 2014-05-18 05:53+0000\n"
67+"X-Generator: Launchpad (build 17007)\n"
68+>>>>>>> MERGE-SOURCE
69
70 #. module: base
71 #: model:ir.module.module,description:base.module_account_check_writing
72@@ -453,7 +467,7 @@
73 #: code:addons/orm.py:2649
74 #, python-format
75 msgid "Invalid group_by"
76-msgstr "Fehler bei group_by Argument"
77+msgstr "Ungültiges group_by Argument"
78
79 #. module: base
80 #: field:ir.module.category,child_ids:0
81@@ -470,7 +484,7 @@
82 #: field:ir.model.data,date_update:0
83 #: field:ir.model.relation,date_update:0
84 msgid "Update Date"
85-msgstr "Update des Datums"
86+msgstr "Datum aktualisieren"
87
88 #. module: base
89 #: model:ir.module.module,shortdesc:base.module_base_action_rule
90@@ -770,6 +784,14 @@
91 msgstr "Verkauf & Einkauf"
92
93 #. module: base
94+<<<<<<< TREE
95+=======
96+#: view:res.partner:0
97+msgid "Put an internal note..."
98+msgstr "Eine interne Mitteilung verfassen"
99+
100+#. module: base
101+>>>>>>> MERGE-SOURCE
102 #: view:ir.translation:0
103 msgid "Untranslated"
104 msgstr "Nicht übersetzt"
105@@ -6711,7 +6733,7 @@
106 #. module: base
107 #: help:ir.actions.client,res_model:0
108 msgid "Optional model, mostly used for needactions."
109-msgstr "Dieses ist ein optionales Krokodil"
110+msgstr "Optionales Modell, meist für Bedarfsaktionen verwandt"
111
112 #. module: base
113 #: code:addons/base/module/module.py:306
114@@ -6732,7 +6754,7 @@
115 #. module: base
116 #: field:res.company,child_ids:0
117 msgid "Child Companies"
118-msgstr "untergeordnete Gesellschaften"
119+msgstr "Tochterunternehmen"
120
121 #. module: base
122 #: model:res.country,name:base.ni
123@@ -9368,6 +9390,15 @@
124
125 #. module: base
126 #: view:res.partner:0
127+<<<<<<< TREE
128+=======
129+#: view:res.users:0
130+msgid "Tags..."
131+msgstr "Schlagworte …"
132+
133+#. module: base
134+#: view:res.partner:0
135+>>>>>>> MERGE-SOURCE
136 msgid "at"
137 msgstr "bei"
138
139@@ -10322,7 +10353,7 @@
140 #. module: base
141 #: selection:ir.model.fields,select_level:0
142 msgid "Always Searchable"
143-msgstr "immer eine Suche anzeigen"
144+msgstr "Immer durchsuchbar"
145
146 #. module: base
147 #: help:res.country.state,code:0
148@@ -11765,7 +11796,7 @@
149 #: code:addons/base/ir/ir_model.py:347
150 #, python-format
151 msgid "Model %s does not exist!"
152-msgstr "Modul %s existiert nicht!"
153+msgstr "Modell %s existiert nicht!"
154
155 #. module: base
156 #: model:ir.module.module,shortdesc:base.module_mrp_jit
157@@ -11976,7 +12007,7 @@
158 #: model:ir.actions.act_window,name:base.ir_action_window
159 #: model:ir.ui.menu,name:base.menu_ir_action_window
160 msgid "Window Actions"
161-msgstr "Schließe/Öffne Fenster..."
162+msgstr "Fenster öffnen/schließen …"
163
164 #. module: base
165 #: model:ir.module.module,description:base.module_portal_project_issue
166@@ -11989,8 +12020,8 @@
167 " "
168 msgstr ""
169 "\n"
170-"Diese Anwendung fügt Ihrem Portal ein Menü und Funktionen für Probleme "
171-"hinzu, wenn project_issue und das Portal installiert sind.\n"
172+"Diese Anwendung fügt Ihrem Portal ein Menü und Funktionen hinzu, wenn "
173+"project_issue und das Portal installiert sind.\n"
174 "============================================================================="
175 "=====================\n"
176 " "
177@@ -13549,7 +13580,7 @@
178 #. module: base
179 #: model:ir.module.module,summary:base.module_crm
180 msgid "Leads, Opportunities, Phone Calls"
181-msgstr "Leads, Opportunities, Telefonate"
182+msgstr "Leads, Chancen, Telefonate"
183
184 #. module: base
185 #: model:ir.module.category,description:base.module_category_knowledge_management
186@@ -13680,7 +13711,7 @@
187 #. module: base
188 #: view:ir.module.module:0
189 msgid "Search modules"
190-msgstr "Suche Module"
191+msgstr "Suche nach Modulen"
192
193 #. module: base
194 #: model:res.country,name:base.by
195@@ -13808,12 +13839,12 @@
196 #. module: base
197 #: view:ir.actions.server:0
198 msgid "Trigger Configuration"
199-msgstr "Auslösung konfigurieren"
200+msgstr "Auslöser konfigurieren"
201
202 #. module: base
203 #: view:base.language.install:0
204 msgid "Load"
205-msgstr "Lade"
206+msgstr "Laden"
207
208 #. module: base
209 #: model:ir.module.module,description:base.module_warning
210@@ -13907,7 +13938,7 @@
211 #. module: base
212 #: model:ir.module.module,shortdesc:base.module_hr
213 msgid "Employee Directory"
214-msgstr "Angestelltenverzeichnis"
215+msgstr "Mitarbeiterverzeichnis"
216
217 #. module: base
218 #: field:ir.cron,args:0
219@@ -14510,7 +14541,7 @@
220 #. module: base
221 #: model:ir.ui.menu,name:base.menu_ir_cron
222 msgid "Scheduler"
223-msgstr "Scheduler"
224+msgstr "Terminplaner"
225
226 #. module: base
227 #: model:ir.module.module,description:base.module_event_moodle
228@@ -16142,7 +16173,7 @@
229 #: field:ir.model,modules:0
230 #: field:ir.model.fields,modules:0
231 msgid "In Modules"
232-msgstr "In Anwendungen"
233+msgstr "In Modulen"
234
235 #. module: base
236 #: model:ir.module.module,shortdesc:base.module_contacts
237@@ -16635,7 +16666,7 @@
238 #. module: base
239 #: view:ir.rule:0
240 msgid "Record rules"
241-msgstr "Aufzeichnung Regel"
242+msgstr "Regel aufzeichnen"
243
244 #. module: base
245 #: help:workflow.transition,act_to:0
246@@ -17790,7 +17821,7 @@
247 #: field:ir.model,access_ids:0
248 #: view:ir.model.access:0
249 msgid "Access"
250-msgstr "Datenzugriffsfehler"
251+msgstr "Zugriff"
252
253 #. module: base
254 #: code:addons/base/res/res_company.py:165
255@@ -18214,7 +18245,7 @@
256 #. module: base
257 #: model:res.partner.category,name:base.res_partner_category_15
258 msgid "Wholesaler"
259-msgstr "Wiederverkäufer"
260+msgstr "Großhändler"
261
262 #. module: base
263 #: model:ir.module.module,shortdesc:base.module_base_vat
264@@ -18628,7 +18659,7 @@
265 #. module: base
266 #: field:ir.actions.server,mobile:0
267 msgid "Mobile No"
268-msgstr "Handy-Nr."
269+msgstr "Mobil-Nummer"
270
271 #. module: base
272 #: model:ir.actions.act_window,name:base.action_partner_by_category
273@@ -18652,12 +18683,12 @@
274 #. module: base
275 #: field:ir.attachment,file_size:0
276 msgid "File Size"
277-msgstr "Datei Grösse"
278+msgstr "Dateigröße"
279
280 #. module: base
281 #: help:ir.sequence,prefix:0
282 msgid "Prefix value of the record for the sequence"
283-msgstr "Präfix einer Folgen"
284+msgstr "Präfixwert des Datensatzes für Sequenz"
285
286 #. module: base
287 #: model:res.country,name:base.sc
288@@ -18872,8 +18903,8 @@
289 msgstr ""
290 "Verwalten Sie Ihre Beziehungen zu Interessenten und Kunden. Nutzen Sie dabei "
291 "\r\n"
292-"Leads = Vorverhandlungen, \r\n"
293-"Opportunities = Gelegenheiten, \r\n"
294+"Leads = Interessenten, Vorverhandlungen, \r\n"
295+"Opportunities = Chancen, Gelegenheiten, \r\n"
296 "Requests = Anfragen oder \r\n"
297 "Issues = Problembearbeitungen."
298
299
300=== modified file 'openerp/addons/base/i18n/es.po'
301--- openerp/addons/base/i18n/es.po 2014-05-17 06:42:08 +0000
302+++ openerp/addons/base/i18n/es.po 2014-05-23 11:18:54 +0000
303@@ -4,17 +4,43 @@
304 #
305 msgid ""
306 msgstr ""
307+<<<<<<< TREE
308 "Project-Id-Version: OpenERP Server 5.0.4\n"
309 "Report-Msgid-Bugs-To: support@openerp.com\n"
310 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
311 "PO-Revision-Date: 2012-12-26 14:21+0000\n"
312+=======
313+"Project-Id-Version: openobject-server\n"
314+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
315+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
316+"PO-Revision-Date: 2014-05-13 01:13+0000\n"
317+>>>>>>> MERGE-SOURCE
318 "Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
319 "Language-Team: \n"
320 "MIME-Version: 1.0\n"
321 "Content-Type: text/plain; charset=UTF-8\n"
322 "Content-Transfer-Encoding: 8bit\n"
323+<<<<<<< TREE
324 "X-Launchpad-Export-Date: 2014-05-17 06:36+0000\n"
325 "X-Generator: Launchpad (build 17007)\n"
326+=======
327+"X-Launchpad-Export-Date: 2014-05-14 06:20+0000\n"
328+"X-Generator: Launchpad (build 17002)\n"
329+
330+#. module: base
331+#: help:ir.actions.act_window,res_id:0
332+msgid ""
333+"Database ID of record to open in form view, when ``view_mode`` is set to "
334+"'form' only"
335+msgstr ""
336+"Id. de la base de datos del registro para abrir en el formulario de vista, "
337+"cuando se establece el modo de vista únicamente a 'formulario'"
338+
339+#. module: base
340+#: view:ir.rule:0
341+msgid "Create Access Right"
342+msgstr "Otorgue derecho de acceso"
343+>>>>>>> MERGE-SOURCE
344
345 #. module: base
346 #: model:ir.module.module,description:base.module_account_check_writing
347
348=== modified file 'openerp/addons/base/i18n/nb.po'
349--- openerp/addons/base/i18n/nb.po 2014-05-17 06:42:08 +0000
350+++ openerp/addons/base/i18n/nb.po 2014-05-23 11:18:54 +0000
351@@ -7,15 +7,26 @@
352 msgstr ""
353 "Project-Id-Version: openobject-server\n"
354 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
355+<<<<<<< TREE
356 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
357 "PO-Revision-Date: 2012-08-20 15:45+0000\n"
358 "Last-Translator: Antony Lesuisse (OpenERP) <al@openerp.com>\n"
359+=======
360+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
361+"PO-Revision-Date: 2014-05-22 00:11+0000\n"
362+"Last-Translator: Kenneth Aalberg <kenneaal@gmail.com>\n"
363+>>>>>>> MERGE-SOURCE
364 "Language-Team: Norwegian Bokmal <nb@li.org>\n"
365 "MIME-Version: 1.0\n"
366 "Content-Type: text/plain; charset=UTF-8\n"
367 "Content-Transfer-Encoding: 8bit\n"
368+<<<<<<< TREE
369 "X-Launchpad-Export-Date: 2014-05-17 06:33+0000\n"
370 "X-Generator: Launchpad (build 17007)\n"
371+=======
372+"X-Launchpad-Export-Date: 2014-05-22 06:43+0000\n"
373+"X-Generator: Launchpad (build 17017)\n"
374+>>>>>>> MERGE-SOURCE
375
376 #. module: base
377 #: model:ir.module.module,description:base.module_account_check_writing
378@@ -25,10 +36,22 @@
379 "================================================\n"
380 " "
381 msgstr ""
382-"\n"
383-"Modul for sjekkskriving og sjekkprinting.\n"
384-"===================================\n"
385-" "
386+<<<<<<< TREE
387+"\n"
388+"Modul for sjekkskriving og sjekkprinting.\n"
389+"===================================\n"
390+" "
391+=======
392+"\n"
393+"Modul for sjekkskriving og sjekkprinting.\n"
394+"===================================\n"
395+" "
396+
397+#. module: base
398+#: view:res.partner.bank:0
399+msgid "e.g. GEBABEBB"
400+msgstr "d.v.s GEBABEBB"
401+>>>>>>> MERGE-SOURCE
402
403 #. module: base
404 #: model:res.country,name:base.sh
405@@ -282,7 +305,80 @@
406 #. module: base
407 #: selection:base.language.install,lang:0
408 msgid "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
409-msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
410+<<<<<<< TREE
411+msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
412+=======
413+msgstr "Inuktitut / ᐃᓄᒃᑎᑐᑦ"
414+
415+#. module: base
416+#: model:ir.module.module,description:base.module_l10n_ch
417+msgid ""
418+"\n"
419+" Swiss localization :\n"
420+" ====================\n"
421+" **Multilang swiss STERCHI account chart and taxes**\n"
422+" **Author:** Camptocamp SA\n"
423+"\n"
424+" **Financial contributors:** Prisme Solutions Informatique SA, Quod SA\n"
425+"\n"
426+" **Translation contributors:** brain-tec AG, Agile Business Group\n"
427+"\n"
428+" **This release will introduce major changes to l10n_ch.**\n"
429+"\n"
430+" Due to important refactoring needs and the Switzerland adoption of new "
431+"international payment standard during 2013-2014. We have reorganised the "
432+"swiss localization addons this way:\n"
433+"\n"
434+" - **l10n_ch**: Multilang swiss STERCHI account chart and taxes (official "
435+"addon)\n"
436+" - **l10n_ch_base_bank**: Technical module that introduces a new and "
437+"simplified version of bank type management\n"
438+" - **l10n_ch_bank**: List of swiss banks\n"
439+" - **l10n_ch_zip**: List of swiss postal zip\n"
440+" - **l10n_ch_dta**: Support of dta payment protocol (will be deprecated end "
441+"2014)\n"
442+" - **l10n_ch_payment_slip**: Support of ESR/BVR payment slip report and "
443+"reconciliation. Report refactored with easy element positioning.\n"
444+" - **l10n_ch_sepa**: Alpha implementation of PostFinance SEPA/PAIN support "
445+"will be completed during 2013/2014\n"
446+"\n"
447+" The modules will be soon available on OpenERP swiss localization on "
448+"launchpad:\n"
449+" https://launchpad.net/openerp-swiss-localization\n"
450+msgstr ""
451+"\n"
452+" Sveitsisk lokalisering:\n"
453+" ====================\n"
454+" ** Flerspråklig Sveitsisk STERCHI kontograf og skatter**\n"
455+" **Forfatter:** Camptocamp SA\n"
456+"\n"
457+" **Finansielle bidragsytere:** Prisme Solutions Informatique SA,, Quod SA\n"
458+"\n"
459+" ** Oversettelse bidragsytere:** brain-tec AG, Agile Business Group\n"
460+"\n"
461+" **Denne versjonen innfører store endringer i l10n_ch.**\n"
462+"\n"
463+" På grunn av viktige behov for refaktorering og Sveits sin innføring av en "
464+"ny internasjonal betalingsstandard i 2013-2014, har vi reorganisert de "
465+"sveitsiske lokaliseringsmodulene slik:\n"
466+"\n"
467+" -**l10n_ch**: Flerspråkelig Sveitsisk STERCHI kontograf og skatter "
468+"(offisiell modul)\n"
469+" -**l10n_ch_base_bank**: Teknisk modul som introduserer en ny og forenklet "
470+"versjon av banktypestyring\n"
471+" -**l10n_ch_bank**: Liste over Sveitsiske banker\n"
472+" -**l10n_ch_zip**: Liste over Sveitiske postnummer\n"
473+" -**l10n_ch_dta**: Støtte for DTA betalingsprotokollen (Vil bli utfaset ved "
474+"utgangen av 2014)\n"
475+" -**l10n_ch_payment_slip**: Støtte for ESR/BVR betalingskvitteringsrapport "
476+"og rekonsiliering. Rapport refaktorert med lettere elementreposisjonering.\n"
477+" -**l10n_ch_sepa**: Alpha implementasjon av PostFinance SEPA/PAIN, vil bli "
478+"fullført i løpet av 2013/2014\n"
479+"\n"
480+" Modulene vil bli tilgjengelige via Sveitsisk lokalisasjon av OpenERP via "
481+"launchpad:\n"
482+" https://launchpad..net/openerp-swiss-localization\n"
483+>>>>>>> MERGE-SOURCE
484
485 #. module: base
486 #: model:res.groups,name:base.group_multi_currency
487@@ -732,6 +828,14 @@
488 msgstr "Salg & Innkjøp"
489
490 #. module: base
491+<<<<<<< TREE
492+=======
493+#: view:res.partner:0
494+msgid "Put an internal note..."
495+msgstr "Lag et internt notat..."
496+
497+#. module: base
498+>>>>>>> MERGE-SOURCE
499 #: view:ir.translation:0
500 msgid "Untranslated"
501 msgstr "Ikke oversatt"
502@@ -993,7 +1097,17 @@
503 #: field:base.language.import,overwrite:0
504 #: field:base.language.install,overwrite:0
505 msgid "Overwrite Existing Terms"
506-msgstr "Overskriv eksisterende vilkår"
507+<<<<<<< TREE
508+msgstr "Overskriv eksisterende vilkår"
509+=======
510+msgstr "Overskriv eksisterende vilkår"
511+
512+#. module: base
513+#: code:addons/base/res/res_currency.py:52
514+#, python-format
515+msgid "No currency rate associated for currency %d for the given period"
516+msgstr "Ingen vekslingsrate for valutaen %d er angitt for den gitte perioden"
517+>>>>>>> MERGE-SOURCE
518
519 #. module: base
520 #: model:ir.module.module,description:base.module_hr_holidays
521@@ -1127,7 +1241,20 @@
522 #. module: base
523 #: model:ir.model,name:base.model_base_module_upgrade
524 msgid "Module Upgrade"
525-msgstr "Moduloppdatering"
526+<<<<<<< TREE
527+msgstr "Moduloppdatering"
528+=======
529+msgstr "Moduloppdatering"
530+
531+#. module: base
532+#: view:res.bank:0
533+#: view:res.company:0
534+#: view:res.partner:0
535+#: view:res.partner.bank:0
536+#: view:res.users:0
537+msgid "ZIP"
538+msgstr "ZIP"
539+>>>>>>> MERGE-SOURCE
540
541 #. module: base
542 #: selection:base.language.install,lang:0
543@@ -1927,8 +2054,42 @@
544 "If you check this box, your customized translations will be overwritten and "
545 "replaced by the official ones."
546 msgstr ""
547-"Hvis du merker av denne boksen, vil dine tilpassede oversettelser "
548-"overskrives med offisielle oversettelser."
549+<<<<<<< TREE
550+"Hvis du merker av denne boksen, vil dine tilpassede oversettelser "
551+"overskrives med offisielle oversettelser."
552+=======
553+"Hvis du merker av denne boksen, vil dine tilpassede oversettelser "
554+"overskrives med offisielle oversettelser."
555+
556+#. module: base
557+#: model:ir.actions.act_window,help:base.action_res_partner_bank_account_form
558+msgid ""
559+"<p class=\"oe_view_nocontent_create\">\n"
560+" Click to create a bank account.\n"
561+" </p><p>\n"
562+" Configure your company's bank accounts and select those that "
563+"must appear on the report footer.\n"
564+" You can reorder bank accounts from the list view.\n"
565+" </p>\n"
566+" <p>\n"
567+" If you use the accounting application of OpenERP, journals "
568+"and accounts will be created automatically based on these data.\n"
569+" </p> \n"
570+" "
571+msgstr ""
572+"<p class=\"oe_view_nocontent_create\">\n"
573+" Klikk for å lage en bankkonto.\n"
574+" </p><p>\n"
575+" Konfigurer ditt firmas bankkontoer, og velg de som må stå på "
576+"bunnen av rapporter.\n"
577+" Du kan endre rekkefølgen på kontoene fra listevisningen.\n"
578+" </p>\n"
579+" <p>\n"
580+" Hvis du bruker regnskapsmodulen i OpenERP, vil journaler og "
581+"kontoer bli automatisk skapt basert på disse dataene.\n"
582+" </p> \n"
583+" "
584+>>>>>>> MERGE-SOURCE
585
586 #. module: base
587 #: model:ir.actions.act_window,name:base.ir_action_report_xml
588@@ -1964,6 +2125,15 @@
589 "module.reference_id"
590
591 #. module: base
592+<<<<<<< TREE
593+=======
594+#: code:addons/base/ir/ir_model.py:85
595+#, python-format
596+msgid "Invalid Search Criteria"
597+msgstr "Ugyldige søkekriterier"
598+
599+#. module: base
600+>>>>>>> MERGE-SOURCE
601 #: field:res.users,login:0
602 msgid "Login"
603 msgstr "Logg inn"
604@@ -2046,7 +2216,16 @@
605 #. module: base
606 #: model:res.country,name:base.tp
607 msgid "East Timor"
608-msgstr "Øst-Timor"
609+<<<<<<< TREE
610+msgstr "Øst-Timor"
611+=======
612+msgstr "Øst-Timor"
613+
614+#. module: base
615+#: field:workflow.transition,act_to:0
616+msgid "Destination Activity"
617+msgstr "Målaktivitet"
618+>>>>>>> MERGE-SOURCE
619
620 #. module: base
621 #: code:addons/base/module/module.py:414
622@@ -2483,6 +2662,14 @@
623 msgstr "Koreansk (KP) / 한국어 (KP)"
624
625 #. module: base
626+<<<<<<< TREE
627+=======
628+#: model:ir.module.module,shortdesc:base.module_l10n_vn
629+msgid "Vietnam Chart of Accounts"
630+msgstr "Kontoplan for Vietnam"
631+
632+#. module: base
633+>>>>>>> MERGE-SOURCE
634 #: model:res.country,name:base.ax
635 msgid "Åland Islands"
636 msgstr "Åland øyene"
637@@ -3133,12 +3320,16 @@
638 #: field:ir.translation,res_id:0
639 #: field:ir.values,res_id:0
640 msgid "Record ID"
641+<<<<<<< TREE
642 msgstr "Post-ID"
643
644 #. module: base
645 #: view:ir.filters:0
646 msgid "My Filters"
647 msgstr ""
648+=======
649+msgstr "Post-ID"
650+>>>>>>> MERGE-SOURCE
651
652 #. module: base
653 #: field:ir.actions.server,email:0
654@@ -3599,19 +3790,40 @@
655 " above. Specify the interval information and partner to be invoice.\n"
656 " "
657 msgstr ""
658-"\n"
659-"Opprett gjentagende dokumenter.\n"
660-"============================\n"
661-"\n"
662-"Denne modulen lar deg opprette nye dokumenter og legge til abonnementer på "
663-"det dokumentet.\n"
664-"\n"
665-"For eksempel, for å lage en faktura som periodisk genereres:\n"
666-"---------------------------------------------------------------\n"
667-" * Definer en dokumenttype basert på faktura objektet\n"
668-" * Definer et abonnement som har et kildedokument definert som\n"
669-" over. Spesifiser intervallet og partneren som skal faktureres.\n"
670-" "
671+<<<<<<< TREE
672+"\n"
673+"Opprett gjentagende dokumenter.\n"
674+"============================\n"
675+"\n"
676+"Denne modulen lar deg opprette nye dokumenter og legge til abonnementer på "
677+"det dokumentet.\n"
678+"\n"
679+"For eksempel, for å lage en faktura som periodisk genereres:\n"
680+"---------------------------------------------------------------\n"
681+" * Definer en dokumenttype basert på faktura objektet\n"
682+" * Definer et abonnement som har et kildedokument definert som\n"
683+" over. Spesifiser intervallet og partneren som skal faktureres.\n"
684+" "
685+=======
686+"\n"
687+"Opprett gjentagende dokumenter.\n"
688+"============================\n"
689+"\n"
690+"Denne modulen lar deg opprette nye dokumenter og legge til abonnementer på "
691+"det dokumentet.\n"
692+"\n"
693+"For eksempel, for å lage en faktura som periodisk genereres:\n"
694+"---------------------------------------------------------------\n"
695+" * Definer en dokumenttype basert på faktura objektet\n"
696+" * Definer et abonnement som har et kildedokument definert som\n"
697+" over. Spesifiser intervallet og partneren som skal faktureres.\n"
698+" "
699+
700+#. module: base
701+#: view:res.company:0
702+msgid "e.g. Global Business Solutions"
703+msgstr "f.eks. Global Business Solutions"
704+>>>>>>> MERGE-SOURCE
705
706 #. module: base
707 #: field:res.company,rml_header1:0
708@@ -3655,6 +3867,15 @@
709 msgstr ""
710
711 #. module: base
712+<<<<<<< TREE
713+=======
714+#: code:addons/base/ir/ir_mail_server.py:222
715+#, python-format
716+msgid "Connection Test Succeeded!"
717+msgstr "Tilkoblingstest fullført!"
718+
719+#. module: base
720+>>>>>>> MERGE-SOURCE
721 #: field:ir.actions.client,params_store:0
722 msgid "Params storage"
723 msgstr "Parameterlagring"
724@@ -4026,7 +4247,17 @@
725 #. module: base
726 #: view:ir.actions.server:0
727 msgid "Fields Mapping"
728-msgstr "Kobling av felt"
729+<<<<<<< TREE
730+msgstr "Kobling av felt"
731+=======
732+msgstr "Kobling av felt"
733+
734+#. module: base
735+#: code:addons/base/module/wizard/base_module_upgrade.py:84
736+#, python-format
737+msgid "Unmet Dependency!"
738+msgstr "Uløst avhengighet!"
739+>>>>>>> MERGE-SOURCE
740
741 #. module: base
742 #: model:res.partner.title,name:base.res_partner_title_sir
743@@ -4050,12 +4281,16 @@
744 #. module: base
745 #: view:base.module.import:0
746 msgid "Select module package to import (.zip file):"
747+<<<<<<< TREE
748 msgstr "Velg modulpakke for import (.zip fil):"
749
750 #. module: base
751 #: view:ir.filters:0
752 msgid "Personal"
753 msgstr ""
754+=======
755+msgstr "Velg modulpakke for import (.zip fil):"
756+>>>>>>> MERGE-SOURCE
757
758 #. module: base
759 #: field:base.language.export,modules:0
760@@ -4207,6 +4442,7 @@
761 msgstr "Oppgaver i CRM"
762
763 #. module: base
764+<<<<<<< TREE
765 #: help:ir.model.fields,relation_field:0
766 msgid ""
767 "For one2many fields, the field on the target model that implement the "
768@@ -4214,6 +4450,12 @@
769 msgstr ""
770 "For en-til-mange felt, feltet på målmodellen som implementerer den motsatte "
771 "mange-til-en relasjonen"
772+=======
773+#: model:ir.module.category,name:base.module_category_generic_modules_accounting
774+#: view:res.company:0
775+msgid "Accounting"
776+msgstr "Regnskap"
777+>>>>>>> MERGE-SOURCE
778
779 #. module: base
780 #: view:ir.rule:0
781@@ -4245,6 +4487,15 @@
782 msgstr "Filter"
783
784 #. module: base
785+<<<<<<< TREE
786+=======
787+#: code:addons/base/module/wizard/base_module_import.py:67
788+#, python-format
789+msgid "Can not create the module file: %s!"
790+msgstr "Kan ikke opprette modulfilen: %s!"
791+
792+#. module: base
793+>>>>>>> MERGE-SOURCE
794 #: model:ir.actions.act_window,name:base.ir_cron_act
795 #: view:ir.cron:0
796 #: model:ir.ui.menu,name:base.menu_ir_cron_act
797@@ -4278,7 +4529,18 @@
798 #. module: base
799 #: model:ir.module.module,shortdesc:base.module_l10n_et
800 msgid "Ethiopia - Accounting"
801-msgstr "Etiopia - Regnskapsføring"
802+<<<<<<< TREE
803+msgstr "Etiopia - Regnskapsføring"
804+=======
805+msgstr "Etiopia - Regnskapsføring"
806+
807+#. module: base
808+#: model:ir.actions.act_window,name:base.ir_config_list_action
809+#: view:ir.config_parameter:0
810+#: model:ir.ui.menu,name:base.ir_config_menu
811+msgid "System Parameters"
812+msgstr "Systeminnstillinger"
813+>>>>>>> MERGE-SOURCE
814
815 #. module: base
816 #: code:addons/base/module/module.py:366
817@@ -4977,7 +5239,17 @@
818 #. module: base
819 #: sql_constraint:ir.sequence.type:0
820 msgid "`code` must be unique."
821-msgstr "'code' må være unik."
822+<<<<<<< TREE
823+msgstr "'code' må være unik."
824+=======
825+msgstr "'code' må være unik."
826+
827+#. module: base
828+#: code:addons/base/ir/workflow/workflow.py:99
829+#, python-format
830+msgid "Operation Forbidden"
831+msgstr "Handling forbudt"
832+>>>>>>> MERGE-SOURCE
833
834 #. module: base
835 #: model:ir.module.module,shortdesc:base.module_knowledge
836@@ -5328,6 +5600,18 @@
837 "Trykk på 'Fortsett' og gled deg til å ta OpenERP i bruk..."
838
839 #. module: base
840+<<<<<<< TREE
841+=======
842+#: help:ir.sequence,number_next_actual:0
843+msgid ""
844+"Next number that will be used. This number can be incremented frequently so "
845+"the displayed value might already be obsolete"
846+msgstr ""
847+"Neste nummer som vil bli brukt. Dette nummeret kan inkrementeres, så "
848+"nummeret som vises kan allerede være i bruk"
849+
850+#. module: base
851+>>>>>>> MERGE-SOURCE
852 #: model:ir.module.category,description:base.module_category_marketing
853 msgid "Helps you manage your marketing campaigns step by step."
854 msgstr ""
855@@ -5354,6 +5638,15 @@
856 msgstr "Retning"
857
858 #. module: base
859+<<<<<<< TREE
860+=======
861+#: code:addons/orm.py:4815
862+#, python-format
863+msgid "Sorting field %s not found on model %s"
864+msgstr "Sorteringsfelt %s ble ikke funnet på modellen %s"
865+
866+#. module: base
867+>>>>>>> MERGE-SOURCE
868 #: view:ir.actions.act_window:0
869 #: model:ir.actions.act_window,name:base.action_ui_view
870 #: field:ir.actions.act_window,view_ids:0
871@@ -6305,10 +6598,20 @@
872 "testet for å se om vi skal starte ACT_TO aktiviteten."
873
874 #. module: base
875+<<<<<<< TREE
876 #: model:ir.module.category,name:base.module_category_generic_modules_accounting
877 #: view:res.company:0
878 msgid "Accounting"
879 msgstr "Regnskap"
880+=======
881+#: help:ir.model.fields,relation_field:0
882+msgid ""
883+"For one2many fields, the field on the target model that implement the "
884+"opposite many2one relationship"
885+msgstr ""
886+"For en-til-mange felt, feltet på målmodellen som implementerer den motsatte "
887+"mange-til-en relasjonen"
888+>>>>>>> MERGE-SOURCE
889
890 #. module: base
891 #: model:ir.module.module,description:base.module_base_vat
892@@ -6571,6 +6874,7 @@
893 "documentation at http://doc.openerp.com.\n"
894 " "
895 msgstr ""
896+<<<<<<< TREE
897 "\n"
898 "Tilbyr en felles EDI plattform som andre applikasjoner kan bruke.\n"
899 "========================================================\n"
900@@ -6590,6 +6894,21 @@
901 #, python-format
902 msgid "Operation forbidden"
903 msgstr ""
904+=======
905+"\n"
906+"Tilbyr en felles EDI plattform som andre applikasjoner kan bruke.\n"
907+"========================================================\n"
908+"\n"
909+"OpenERP spesifiserer et generisk EDI format for utveksling av dokumenter "
910+"mellom\n"
911+"forskjellige systemer, og tilbyr mekanismer for å importere og eksportere "
912+"dem.\n"
913+"\n"
914+"Flere detaljer om OpenERPs EDI format kan du finne i OpenERPs tekniske "
915+"dokumentasjon\n"
916+"på http://doc.openerp.com.\n"
917+" "
918+>>>>>>> MERGE-SOURCE
919
920 #. module: base
921 #: view:ir.actions.server:0
922@@ -6641,6 +6960,14 @@
923 msgstr "USA Minor Outlying Islands"
924
925 #. module: base
926+<<<<<<< TREE
927+=======
928+#: view:base.language.import:0
929+msgid "e.g. English"
930+msgstr "f.eks Engelsk"
931+
932+#. module: base
933+>>>>>>> MERGE-SOURCE
934 #: help:ir.cron,numbercall:0
935 msgid ""
936 "How many times the method is called,\n"
937@@ -6725,7 +7052,18 @@
938 #. module: base
939 #: field:res.partner,is_company:0
940 msgid "Is a Company"
941-msgstr "Er et firma"
942+<<<<<<< TREE
943+msgstr "Er et firma"
944+=======
945+msgstr "Er et firma"
946+
947+#. module: base
948+#: view:res.company:0
949+#: view:res.partner:0
950+#: view:res.users:0
951+msgid "e.g. www.openerp.com"
952+msgstr "f.eks www.openerp.com"
953+>>>>>>> MERGE-SOURCE
954
955 #. module: base
956 #: selection:ir.cron,interval_type:0
957@@ -6825,7 +7163,24 @@
958 #. module: base
959 #: field:ir.values,key2:0
960 msgid "Qualifier"
961-msgstr "Kvalifiserer"
962+<<<<<<< TREE
963+msgstr "Kvalifiserer"
964+=======
965+msgstr "Kvalifiserer"
966+
967+#. module: base
968+#: model:ir.module.module,description:base.module_l10n_vn
969+msgid ""
970+"\n"
971+"This is the module to manage the accounting chart for Vietnam in OpenERP.\n"
972+"========================================================================\n"
973+"\n"
974+"This module applies to companies based in Vietnamese Accounting Standard "
975+"(VAS).\n"
976+"\n"
977+"**Credits:** General Solutions.\n"
978+msgstr ""
979+>>>>>>> MERGE-SOURCE
980
981 #. module: base
982 #: model:ir.module.module,description:base.module_l10n_be_coda
983@@ -7109,7 +7464,16 @@
984 #. module: base
985 #: model:ir.module.module,shortdesc:base.module_anonymization
986 msgid "Database Anonymization"
987-msgstr "Databaseanonymisering"
988+<<<<<<< TREE
989+msgstr "Databaseanonymisering"
990+=======
991+msgstr "Databaseanonymisering"
992+
993+#. module: base
994+#: field:res.partner,commercial_partner_id:0
995+msgid "Commercial Entity"
996+msgstr "Kommersiell enhet"
997+>>>>>>> MERGE-SOURCE
998
999 #. module: base
1000 #: selection:ir.mail_server,smtp_encryption:0
1001@@ -7167,7 +7531,16 @@
1002 #. module: base
1003 #: model:ir.model,name:base.model_ir_cron
1004 msgid "ir.cron"
1005-msgstr "ir.cron"
1006+<<<<<<< TREE
1007+msgstr "ir.cron"
1008+=======
1009+msgstr "ir.cron"
1010+
1011+#. module: base
1012+#: model:ir.ui.menu,name:base.menu_sales_followup
1013+msgid "Payment Follow-up"
1014+msgstr "Betalingsoppfølgning"
1015+>>>>>>> MERGE-SOURCE
1016
1017 #. module: base
1018 #: model:res.country,name:base.cw
1019@@ -7180,11 +7553,17 @@
1020 msgstr "Inneværende år uten århundre: %(y)s"
1021
1022 #. module: base
1023+<<<<<<< TREE
1024 #: model:ir.actions.act_window,name:base.ir_config_list_action
1025 #: view:ir.config_parameter:0
1026 #: model:ir.ui.menu,name:base.ir_config_menu
1027 msgid "System Parameters"
1028 msgstr "Systeminnstillinger"
1029+=======
1030+#: model:ir.module.module,shortdesc:base.module_l10n_es
1031+msgid "Spanish Charts of Accounts (PGCE 2008)"
1032+msgstr "Spansk kontoplan (PGCE 2008)"
1033+>>>>>>> MERGE-SOURCE
1034
1035 #. module: base
1036 #: help:ir.actions.client,tag:0
1037@@ -7246,7 +7625,21 @@
1038 #: field:res.currency.rate,currency_rate_type_id:0
1039 #: view:res.currency.rate.type:0
1040 msgid "Currency Rate Type"
1041-msgstr "Valuta vekslingstype"
1042+<<<<<<< TREE
1043+msgstr "Valuta vekslingstype"
1044+=======
1045+msgstr "Valuta vekslingstype"
1046+
1047+#. module: base
1048+#: code:addons/base/res/res_lang.py:189
1049+#, python-format
1050+msgid ""
1051+"You cannot delete the language which is Active!\n"
1052+"Please de-activate the language first."
1053+msgstr ""
1054+"Du kan ikke slette det aktive språket!\n"
1055+"Deaktiver språket først."
1056+>>>>>>> MERGE-SOURCE
1057
1058 #. module: base
1059 #: model:ir.module.module,description:base.module_l10n_fr
1060@@ -7665,6 +8058,7 @@
1061 #. module: base
1062 #: help:ir.values,company_id:0
1063 msgid "If set, action binding only applies for this company"
1064+<<<<<<< TREE
1065 msgstr "Hvis satt, gjelder handlingsbindingen kun for dette firmaet"
1066
1067 #. module: base
1068@@ -7676,6 +8070,9 @@
1069 "============================================================\n"
1070 " "
1071 msgstr ""
1072+=======
1073+msgstr "Hvis satt, gjelder handlingsbindingen kun for dette firmaet"
1074+>>>>>>> MERGE-SOURCE
1075
1076 #. module: base
1077 #: model:res.country,name:base.lc
1078@@ -7965,6 +8362,7 @@
1079 #. module: base
1080 #: field:ir.mail_server,smtp_encryption:0
1081 msgid "Connection Security"
1082+<<<<<<< TREE
1083 msgstr "Tilkoblingssikkerhet"
1084
1085 #. module: base
1086@@ -7972,6 +8370,9 @@
1087 #, python-format
1088 msgid "Please specify an action to launch !"
1089 msgstr "Vær vennlig å velg en handling å uføre !"
1090+=======
1091+msgstr "Tilkoblingssikkerhet"
1092+>>>>>>> MERGE-SOURCE
1093
1094 #. module: base
1095 #: model:ir.module.module,shortdesc:base.module_l10n_ec
1096@@ -7991,7 +8392,16 @@
1097 #. module: base
1098 #: field:change.password.user,user_login:0
1099 msgid "User Login"
1100-msgstr "Brukernavn"
1101+<<<<<<< TREE
1102+msgstr "Brukernavn"
1103+=======
1104+msgstr "Brukernavn"
1105+
1106+#. module: base
1107+#: view:ir.filters:0
1108+msgid "Filters created by myself"
1109+msgstr "Filter laget av meg"
1110+>>>>>>> MERGE-SOURCE
1111
1112 #. module: base
1113 #: model:ir.module.module,shortdesc:base.module_l10n_hn
1114@@ -8145,6 +8555,15 @@
1115 msgstr "Feil"
1116
1117 #. module: base
1118+<<<<<<< TREE
1119+=======
1120+#: code:addons/base/res/res_partner.py:566
1121+#, python-format
1122+msgid "Couldn't create contact without email address!"
1123+msgstr "Kunne ikke skape kontakt uten epostadresse!"
1124+
1125+#. module: base
1126+>>>>>>> MERGE-SOURCE
1127 #: help:res.partner,tz:0
1128 msgid ""
1129 "The partner's timezone, used to output proper date and time values inside "
1130@@ -8217,6 +8636,15 @@
1131
1132 #. module: base
1133 #: view:res.partner:0
1134+<<<<<<< TREE
1135+=======
1136+#: view:res.users:0
1137+msgid "Tags..."
1138+msgstr "Tagger..."
1139+
1140+#. module: base
1141+#: view:res.partner:0
1142+>>>>>>> MERGE-SOURCE
1143 msgid "at"
1144 msgstr "på"
1145
1146@@ -8241,6 +8669,14 @@
1147 msgstr "Filformat"
1148
1149 #. module: base
1150+<<<<<<< TREE
1151+=======
1152+#: view:ir.filters:0
1153+msgid "My filters"
1154+msgstr "Mine filter"
1155+
1156+#. module: base
1157+>>>>>>> MERGE-SOURCE
1158 #: field:res.lang,iso_code:0
1159 msgid "ISO code"
1160 msgstr "ISO kode"
1161@@ -8574,7 +9010,17 @@
1162 #. module: base
1163 #: constraint:ir.rule:0
1164 msgid "Rules can not be applied on Transient models."
1165-msgstr "Regler kan ikke bli lagt til på transiente modeller."
1166+<<<<<<< TREE
1167+msgstr "Regler kan ikke bli lagt til på transiente modeller."
1168+=======
1169+msgstr "Regler kan ikke bli lagt til på transiente modeller."
1170+
1171+#. module: base
1172+#: code:addons/base/ir/ir_mail_server.py:215
1173+#, python-format
1174+msgid "Connection Test Failed!"
1175+msgstr "Tilkoblingstest feilet!"
1176+>>>>>>> MERGE-SOURCE
1177
1178 #. module: base
1179 #: selection:base.language.install,lang:0
1180@@ -8840,9 +9286,27 @@
1181 "men den modulen er ikke installert på systemet ditt."
1182
1183 #. module: base
1184+<<<<<<< TREE
1185 #: field:workflow.transition,act_to:0
1186 msgid "Destination Activity"
1187 msgstr "Målaktivitet"
1188+=======
1189+#: model:ir.module.module,description:base.module_portal_project_long_term
1190+msgid ""
1191+"\n"
1192+"This module adds necessary security rules and access rights for project long "
1193+"term and portal.\n"
1194+"============================================================================="
1195+"================\n"
1196+" "
1197+msgstr ""
1198+"\n"
1199+"Denne modulen legger til nødvendige sikkerhetsregler og tilgangsrettigheter "
1200+"for prosjekter og portal.\n"
1201+"============================================================================="
1202+"================\n"
1203+" "
1204+>>>>>>> MERGE-SOURCE
1205
1206 #. module: base
1207 #: help:res.currency,position:0
1208@@ -8968,7 +9432,17 @@
1209 #. module: base
1210 #: model:ir.module.module,shortdesc:base.module_account_followup
1211 msgid "Payment Follow-up Management"
1212-msgstr "Betalingsoppfølging"
1213+<<<<<<< TREE
1214+msgstr "Betalingsoppfølging"
1215+=======
1216+msgstr "Betalingsoppfølging"
1217+
1218+#. module: base
1219+#: code:addons/orm.py:5334
1220+#, python-format
1221+msgid "The value for the field '%s' already exists."
1222+msgstr "Verdien for feltet '%s' eksisterer allerede."
1223+>>>>>>> MERGE-SOURCE
1224
1225 #. module: base
1226 #: field:workflow.workitem,inst_id:0
1227@@ -9220,6 +9694,14 @@
1228 msgstr ""
1229
1230 #. module: base
1231+<<<<<<< TREE
1232+=======
1233+#: model:ir.module.module,shortdesc:base.module_account_anglo_saxon
1234+msgid "Anglo-Saxon Accounting"
1235+msgstr "Anglo-Saxonsk bokføring"
1236+
1237+#. module: base
1238+>>>>>>> MERGE-SOURCE
1239 #: model:res.country,name:base.np
1240 msgid "Nepal"
1241 msgstr "Nepal"
1242@@ -9351,12 +9833,16 @@
1243 "sure to save and close all forms before switching to a different company. "
1244 "(You can click on Cancel in the User Preferences now)"
1245 msgstr ""
1246+"Husk at dokumenter som vises her kan hende ikke er relevante etter at du "
1247+"bytter til et annet firma. Hvis du har endringer som ikke er lagret, bør du "
1248+"lagre og lukke alle skjemaer før du skifter til et annet firma. (Du kan "
1249+"klikke kanseller i brukerpreferanser nå)"
1250
1251 #. module: base
1252 #: code:addons/orm.py:2818
1253 #, python-format
1254 msgid "The value \"%s\" for the field \"%s.%s\" is not in the selection"
1255-msgstr ""
1256+msgstr "Verdien \"%s\" for feltet \"%s.%s\" er ikke i utvalget"
1257
1258 #. module: base
1259 #: view:ir.actions.configuration.wizard:0
1260@@ -9366,7 +9852,7 @@
1261 #. module: base
1262 #: selection:base.language.install,lang:0
1263 msgid "Thai / ภาษาไทย"
1264-msgstr ""
1265+msgstr "Thai / ภาษาไทย"
1266
1267 #. module: base
1268 #: model:ir.module.module,description:base.module_l10n_bo
1269@@ -9392,7 +9878,7 @@
1270 #. module: base
1271 #: field:res.currency,position:0
1272 msgid "Symbol Position"
1273-msgstr ""
1274+msgstr "Symbolposisjon"
1275
1276 #. module: base
1277 #: model:ir.module.module,description:base.module_l10n_de
1278@@ -9426,11 +9912,14 @@
1279 "\n"
1280 "(Document type: %s)"
1281 msgstr ""
1282+"For denne dokumenttypen kan du bare aksessere poster du selv har laget.\n"
1283+"\n"
1284+"(Dokumenttype: %s)"
1285
1286 #. module: base
1287 #: view:base.language.export:0
1288 msgid "documentation"
1289-msgstr ""
1290+msgstr "dokumentasjon"
1291
1292 #. module: base
1293 #: help:ir.model,osv_memory:0
1294@@ -9438,17 +9927,19 @@
1295 "This field specifies whether the model is transient or not (i.e. if records "
1296 "are automatically deleted from the database or not)"
1297 msgstr ""
1298+"Dette feltet spesifiserer om modellen er transient eller ikke (dvs, om "
1299+"poster automatisk blir slettet fra databasen eller ikke)"
1300
1301 #. module: base
1302 #: code:addons/base/ir/ir_mail_server.py:445
1303 #, python-format
1304 msgid "Missing SMTP Server"
1305-msgstr ""
1306+msgstr "Mangler SMTP server"
1307
1308 #. module: base
1309 #: sql_constraint:ir.translation:0
1310 msgid "Language code of translation item must be among known languages"
1311-msgstr ""
1312+msgstr "Språkkoden for begrepet du oversetter må være et kjent språk"
1313
1314 #. module: base
1315 #: field:base.language.export,data:0
1316@@ -9459,7 +9950,7 @@
1317 #. module: base
1318 #: model:ir.actions.act_window,name:base.action_view_base_module_upgrade_install
1319 msgid "Module Upgrade Install"
1320-msgstr ""
1321+msgstr "Modul Oppgrader Installer"
1322
1323 #. module: base
1324 #: model:ir.model,name:base.model_ir_actions_configuration_wizard
1325@@ -9469,18 +9960,18 @@
1326 #. module: base
1327 #: view:res.lang:0
1328 msgid "%b - Abbreviated month name."
1329-msgstr "%b - Navn på måned (forkortet)."
1330+msgstr "%b - Kort månedsnavn."
1331
1332 #. module: base
1333 #: code:addons/base/ir/ir_model.py:729
1334 #, python-format
1335 msgid "Sorry, you are not allowed to delete this document."
1336-msgstr ""
1337+msgstr "Beklager, du har ikke tillatelse til å slette dette dokumentet."
1338
1339 #. module: base
1340 #: constraint:ir.rule:0
1341 msgid "Rules can not be applied on the Record Rules model."
1342-msgstr ""
1343+msgstr "Regler kan ikke brukes på regelmodellen for poster"
1344
1345 #. module: base
1346 #: field:res.partner,supplier:0
1347@@ -9497,7 +9988,7 @@
1348 #. module: base
1349 #: model:ir.module.module,summary:base.module_mail
1350 msgid "Discussions, Mailing Lists, News"
1351-msgstr ""
1352+msgstr "Diskusjoner, epostdistribusjonslister og nyheter"
1353
1354 #. module: base
1355 #: model:ir.module.module,description:base.module_fleet
1356@@ -9519,6 +10010,21 @@
1357 "* Show all costs associated to a vehicle or to a type of service\n"
1358 "* Analysis graph for costs\n"
1359 msgstr ""
1360+"\n"
1361+"Kjøretøy, leasing, forsikring, kostnader\n"
1362+"====================================\n"
1363+"Med denne modulen lar OpenERP deg administrere alle dine kjøretøy,\n"
1364+"kontakter som benytter disse, så vel som servicer, kjørebok, kostnader og\n"
1365+"mange andre funksjoner som er nyttig for flåtekontroll.\n"
1366+"\n"
1367+"Hovedfunksjoner\n"
1368+"------------\n"
1369+"* Legg til kjøretøy til din flåte\n"
1370+"* Håndtere kontakter for kjøretøy\n"
1371+"* Påminnelse når kontrakter når utløpsdato\n"
1372+"* Legg til servicer, kjørebok og odometer for alle kjøretøy\n"
1373+"* Vise alle kostnader assosiert med et kjøretøy eller type service\n"
1374+"* Analytisk graf for kostnader\n"
1375
1376 #. module: base
1377 #: field:multi_company.default,company_dest_id:0
1378@@ -9528,12 +10034,12 @@
1379 #. module: base
1380 #: selection:base.language.install,lang:0
1381 msgid "Spanish (EC) / Español (EC)"
1382-msgstr "Spanish (EC) / Español (EC)"
1383+msgstr "Spansk (EC) / Español (EC)"
1384
1385 #. module: base
1386 #: help:ir.ui.view,xml_id:0
1387 msgid "ID of the view defined in xml file"
1388-msgstr ""
1389+msgstr "ID til visningen definert i XML filen"
1390
1391 #. module: base
1392 #: model:ir.model,name:base.model_base_module_import
1393@@ -9548,28 +10054,28 @@
1394 #. module: base
1395 #: view:ir.attachment:0
1396 msgid "My Document(s)"
1397-msgstr ""
1398+msgstr "Mine dokumenter"
1399
1400 #. module: base
1401 #: help:ir.actions.act_window,res_model:0
1402 msgid "Model name of the object to open in the view window"
1403-msgstr ""
1404+msgstr "Modellnavn til objektet for åpning i visningsvinduet"
1405
1406 #. module: base
1407 #: field:ir.model.fields,selectable:0
1408 msgid "Selectable"
1409-msgstr "Valgbar"
1410+msgstr "Velgbar"
1411
1412 #. module: base
1413 #: code:addons/base/ir/ir_mail_server.py:222
1414 #, python-format
1415 msgid "Everything seems properly set up!"
1416-msgstr ""
1417+msgstr "Alt ser ut til å være satt opp korrekt!"
1418
1419 #. module: base
1420 #: view:res.request.link:0
1421 msgid "Request Link"
1422-msgstr "res.request.link"
1423+msgstr "Be om lenke"
1424
1425 #. module: base
1426 #: view:ir.attachment:0
1427@@ -9593,12 +10099,12 @@
1428 #: code:addons/orm.py:4347
1429 #, python-format
1430 msgid "UserError"
1431-msgstr "BrukerFeil"
1432+msgstr "Brukerfeil"
1433
1434 #. module: base
1435 #: model:ir.module.module,summary:base.module_project_issue
1436 msgid "Support, Bug Tracker, Helpdesk"
1437-msgstr ""
1438+msgstr "Support, bugtracker, kundestøtte"
1439
1440 #. module: base
1441 #: model:res.country,name:base.ae
1442@@ -9612,6 +10118,9 @@
1443 "related to a model that uses the need_action mechanism, this field is set to "
1444 "true. Otherwise, it is false."
1445 msgstr ""
1446+"Hvis menyvalgets handling er en act_window handling, og hvis denne "
1447+"handlingen er relatert til en modell som bruker need_action mekanismen, er "
1448+"dette feltet satt til sant. Hvis ikke er det usant."
1449
1450 #. module: base
1451 #: code:addons/orm.py:3961
1452@@ -9619,16 +10128,17 @@
1453 msgid ""
1454 "Unable to delete this document because it is used as a default property"
1455 msgstr ""
1456+"Kan ikke slette dette dokumentet, da det brukes som en standard egenskap"
1457
1458 #. module: base
1459 #: model:res.partner.category,name:base.res_partner_category_5
1460 msgid "Silver"
1461-msgstr ""
1462+msgstr "Sølv"
1463
1464 #. module: base
1465 #: field:res.partner.title,shortcut:0
1466 msgid "Abbreviation"
1467-msgstr ""
1468+msgstr "Forkortelse"
1469
1470 #. module: base
1471 #: model:ir.ui.menu,name:base.menu_crm_case_job_req_main
1472@@ -9649,7 +10159,7 @@
1473 #. module: base
1474 #: view:ir.values:0
1475 msgid "Action Reference"
1476-msgstr ""
1477+msgstr "Handlingsreferanse"
1478
1479 #. module: base
1480 #: model:ir.module.module,description:base.module_auth_ldap
1481@@ -9758,7 +10268,7 @@
1482 #. module: base
1483 #: model:res.country,name:base.re
1484 msgid "Reunion (French)"
1485-msgstr "Réunion (Frankrike)"
1486+msgstr "Réunion (Fransk)"
1487
1488 #. module: base
1489 #: code:addons/base/ir/ir_model.py:422
1490@@ -9766,11 +10276,12 @@
1491 msgid ""
1492 "New column name must still start with x_ , because it is a custom field!"
1493 msgstr ""
1494+"Nytt kolonnenavn må fortsatt starte med x_, fordi det er et tilpasset felt!"
1495
1496 #. module: base
1497 #: model:ir.module.module,shortdesc:base.module_mrp_repair
1498 msgid "Repairs Management"
1499-msgstr ""
1500+msgstr "Reparasjonsadministrasjon"
1501
1502 #. module: base
1503 #: model:ir.module.module,shortdesc:base.module_account_asset
1504@@ -9797,7 +10308,7 @@
1505 #. module: base
1506 #: model:res.country,name:base.sb
1507 msgid "Solomon Islands"
1508-msgstr "Salomonøyene"
1509+msgstr "Solomonøyene"
1510
1511 #. module: base
1512 #: code:addons/orm.py:4152
1513@@ -9814,16 +10325,20 @@
1514 "=============================\n"
1515 "\n"
1516 msgstr ""
1517+"\n"
1518+"OpenERP Web Gantt diagramvisning.\n"
1519+"==============================\n"
1520+"\n"
1521
1522 #. module: base
1523 #: model:ir.module.module,shortdesc:base.module_base_status
1524 msgid "State/Stage Management"
1525-msgstr ""
1526+msgstr "Status/fremgangsstyring"
1527
1528 #. module: base
1529 #: model:ir.module.category,name:base.module_category_warehouse_management
1530 msgid "Warehouse"
1531-msgstr ""
1532+msgstr "Lager"
1533
1534 #. module: base
1535 #: field:ir.exports,resource:0
1536@@ -9856,7 +10371,7 @@
1537 #. module: base
1538 #: view:ir.filters:0
1539 msgid "Filters shared with all users"
1540-msgstr ""
1541+msgstr "Filter delt med alle brukere"
1542
1543 #. module: base
1544 #: view:ir.translation:0
1545@@ -9872,7 +10387,7 @@
1546 #. module: base
1547 #: model:res.partner.title,shortcut:base.res_partner_title_prof
1548 msgid "Prof."
1549-msgstr ""
1550+msgstr "Prof."
1551
1552 #. module: base
1553 #: code:addons/base/ir/ir_mail_server.py:241
1554@@ -9882,6 +10397,9 @@
1555 "instead.If SSL is needed, an upgrade to Python 2.6 on the server-side should "
1556 "do the trick."
1557 msgstr ""
1558+"Din OpenERP server støtter ikke SMTP over SSL. Du kan bruke STARTTLS "
1559+"istedet. Hvis du trenger SSL, burde en oppgradering til Python 2.6 på "
1560+"serveren løse problemet."
1561
1562 #. module: base
1563 #: model:res.country,name:base.ua
1564@@ -9895,17 +10413,17 @@
1565 #: field:res.partner,website:0
1566 #, python-format
1567 msgid "Website"
1568-msgstr "Nettside"
1569+msgstr "Nettsted"
1570
1571 #. module: base
1572 #: selection:ir.mail_server,smtp_encryption:0
1573 msgid "None"
1574-msgstr ""
1575+msgstr "Ingen"
1576
1577 #. module: base
1578 #: model:ir.module.module,shortdesc:base.module_hr_holidays
1579 msgid "Leave Management"
1580-msgstr ""
1581+msgstr "Ferieplanlegging"
1582
1583 #. module: base
1584 #: model:res.company,overdue_msg:base.main_company
1585@@ -9945,7 +10463,7 @@
1586 #. module: base
1587 #: model:ir.ui.menu,name:base.menu_project_config_project
1588 msgid "Stages"
1589-msgstr ""
1590+msgstr "Faser"
1591
1592 #. module: base
1593 #: selection:base.language.install,lang:0
1594@@ -9999,7 +10517,7 @@
1595 #. module: base
1596 #: model:ir.module.module,shortdesc:base.module_mrp_byproduct
1597 msgid "MRP Byproducts"
1598-msgstr ""
1599+msgstr "MRP biprodukter"
1600
1601 #. module: base
1602 #: field:res.request,ref_partner_id:0
1603@@ -10009,7 +10527,7 @@
1604 #. module: base
1605 #: model:ir.module.module,shortdesc:base.module_hr_expense
1606 msgid "Expense Management"
1607-msgstr ""
1608+msgstr "Utleggsstyring"
1609
1610 #. module: base
1611 #: field:ir.attachment,create_date:0
1612@@ -10019,7 +10537,7 @@
1613 #. module: base
1614 #: help:ir.actions.server,trigger_name:0
1615 msgid "The workflow signal to trigger"
1616-msgstr ""
1617+msgstr "Arbeidsflytsignalet som skal sendes"
1618
1619 #. module: base
1620 #: selection:base.language.install,state:0
1621@@ -10047,7 +10565,7 @@
1622 #. module: base
1623 #: model:ir.module.module,shortdesc:base.module_l10n_uy
1624 msgid "Uruguay - Chart of Accounts"
1625-msgstr ""
1626+msgstr "Uruguay - Kontoplan"
1627
1628 #. module: base
1629 #: model:ir.ui.menu,name:base.menu_administration_shortcut
1630@@ -10057,7 +10575,7 @@
1631 #. module: base
1632 #: model:ir.module.module,shortdesc:base.module_l10n_si
1633 msgid "Slovenian - Accounting"
1634-msgstr ""
1635+msgstr "Slovenia - Regnskapsføring"
1636
1637 #. module: base
1638 #: model:ir.module.module,description:base.module_account_cancel
1639@@ -10075,31 +10593,31 @@
1640 #. module: base
1641 #: model:ir.module.module,shortdesc:base.module_plugin
1642 msgid "CRM Plugins"
1643-msgstr ""
1644+msgstr "CRM tillegg"
1645
1646 #. module: base
1647 #: model:ir.actions.act_window,name:base.action_model_model
1648 #: model:ir.model,name:base.model_ir_model
1649 #: model:ir.ui.menu,name:base.ir_model_model_menu
1650 msgid "Models"
1651-msgstr ""
1652+msgstr "Modeller"
1653
1654 #. module: base
1655 #: code:addons/base/module/module.py:499
1656 #, python-format
1657 msgid "The `base` module cannot be uninstalled"
1658-msgstr ""
1659+msgstr "'Base' modulen kan ikke avinstalleres"
1660
1661 #. module: base
1662 #: code:addons/base/ir/ir_cron.py:262
1663 #, python-format
1664 msgid "Record cannot be modified right now"
1665-msgstr ""
1666+msgstr "Posten kan ikke modifiseres akkurat nå"
1667
1668 #. module: base
1669 #: selection:ir.actions.todo,type:0
1670 msgid "Launch Manually"
1671-msgstr ""
1672+msgstr "Start manuelt"
1673
1674 #. module: base
1675 #: model:res.country,name:base.be
1676@@ -10115,7 +10633,7 @@
1677 #: code:addons/base/ir/ir_model.py:728
1678 #, python-format
1679 msgid "Sorry, you are not allowed to create this kind of document."
1680-msgstr ""
1681+msgstr "Beklager, du har ikke tillatelse til å skape denne typen dokument."
1682
1683 #. module: base
1684 #: field:base.language.export,lang:0
1685@@ -10142,12 +10660,12 @@
1686 #: view:res.partner:0
1687 #: field:res.users,company_ids:0
1688 msgid "Companies"
1689-msgstr "Firma"
1690+msgstr "Firmaer"
1691
1692 #. module: base
1693 #: help:res.currency,symbol:0
1694 msgid "Currency sign, to be used when printing amounts."
1695-msgstr ""
1696+msgstr "Valutasymbol, til bruk ved beløpsvisning."
1697
1698 #. module: base
1699 #: view:res.lang:0
1700@@ -10157,18 +10675,18 @@
1701 #. module: base
1702 #: field:ir.model.fields,on_delete:0
1703 msgid "On Delete"
1704-msgstr ""
1705+msgstr "Ved sletting"
1706
1707 #. module: base
1708 #: code:addons/base/ir/ir_model.py:347
1709 #, python-format
1710 msgid "Model %s does not exist!"
1711-msgstr "Model %s finnes ikke!"
1712+msgstr "Modell %s finnes ikke!"
1713
1714 #. module: base
1715 #: model:ir.module.module,shortdesc:base.module_mrp_jit
1716 msgid "Just In Time Scheduling"
1717-msgstr ""
1718+msgstr "Akkurat-i-tide planlegging"
1719
1720 #. module: base
1721 #: view:ir.actions.server:0
1722@@ -10196,7 +10714,7 @@
1723 #. module: base
1724 #: model:ir.module.module,shortdesc:base.module_l10n_us
1725 msgid "United States - Chart of accounts"
1726-msgstr ""
1727+msgstr "USA - Kontoplan"
1728
1729 #. module: base
1730 #: view:base.language.export:0
1731@@ -10218,12 +10736,12 @@
1732 #: code:addons/orm.py:1507
1733 #, python-format
1734 msgid "Unknown database identifier '%s'"
1735-msgstr ""
1736+msgstr "Ukjent databaseident '%s'"
1737
1738 #. module: base
1739 #: selection:base.language.export,format:0
1740 msgid "PO File"
1741-msgstr "PO fil"
1742+msgstr "PO-fil"
1743
1744 #. module: base
1745 #: model:ir.module.module,description:base.module_web_diagram
1746@@ -10233,6 +10751,10 @@
1747 "=========================\n"
1748 "\n"
1749 msgstr ""
1750+"\n"
1751+"OpenERP Webdiagramvisning.\n"
1752+"=========================\n"
1753+"\n"
1754
1755 #. module: base
1756 #: model:ir.module.module,description:base.module_l10n_ch
1757@@ -10309,7 +10831,7 @@
1758 #: code:addons/base/ir/ir_fields.py:316
1759 #, python-format
1760 msgid "external id"
1761-msgstr ""
1762+msgstr "ekstern id"
1763
1764 #. module: base
1765 #: view:ir.model:0
1766@@ -10319,12 +10841,12 @@
1767 #. module: base
1768 #: model:ir.module.module,shortdesc:base.module_sale_margin
1769 msgid "Margins in Sales Orders"
1770-msgstr ""
1771+msgstr "Marginer i salgsordre"
1772
1773 #. module: base
1774 #: model:ir.module.module,shortdesc:base.module_purchase
1775 msgid "Purchase Management"
1776-msgstr ""
1777+msgstr "Innkjøpstyring"
1778
1779 #. module: base
1780 #: field:ir.module.module,published_version:0
1781@@ -10356,7 +10878,7 @@
1782 #. module: base
1783 #: view:res.lang:0
1784 msgid "%I - Hour (12-hour clock) [01,12]."
1785-msgstr "%I - Time (12-times klokke) som et desimanummer [01,12]."
1786+msgstr "%I - Time (12-times klokke) som et desimalnummer [01,12]."
1787
1788 #. module: base
1789 #: view:res.config:0
1790@@ -10371,7 +10893,7 @@
1791 #. module: base
1792 #: model:ir.module.module,shortdesc:base.module_auth_oauth
1793 msgid "OAuth2 Authentication"
1794-msgstr ""
1795+msgstr "OAuth2 autentisering"
1796
1797 #. module: base
1798 #: view:workflow:0
1799@@ -10382,6 +10904,12 @@
1800 "default value. If you don't do that, your customization will be overwrited "
1801 "at the next update or upgrade to a future version of OpenERP."
1802 msgstr ""
1803+"Når du tilpasser en arbeidsflyt må du sørge for å ikke modifisere en "
1804+"eksisterende node eller tilkobling, men heller opprette nye noder eller "
1805+"tilkoblinger. Hvis du absolutt må modifisere en node eller tilkobling, kan "
1806+"du bare endre felt som er tomme eller satt til en standardverdi. Hvis du "
1807+"ikke gjør dette, vil tilpassingen din overskrives neste gang OpenERP "
1808+"oppdateres eller oppgraderes."
1809
1810 #. module: base
1811 #: report:ir.module.reference:0
1812@@ -10398,25 +10926,42 @@
1813 "This module is the base module for other multi-company modules.\n"
1814 " "
1815 msgstr ""
1816+"\n"
1817+"Denne modulen er for å styre flere firmaer.\n"
1818+"============================================\n"
1819+"\n"
1820+"Denne modulen er basismodulen for andre flerfirma-moduler.\n"
1821+" "
1822
1823 #. module: base
1824 #: sql_constraint:res.currency:0
1825 msgid "The currency code must be unique per company!"
1826-msgstr ""
1827+msgstr "Valutakode må være unik per firma!"
1828
1829 #. module: base
1830 #: code:addons/base/module/wizard/base_export_language.py:39
1831 #, python-format
1832 msgid "New Language (Empty translation template)"
1833-msgstr ""
1834-
1835-#. module: base
1836+msgstr "Nytt språk (Tom oversettelsesmal)"
1837+
1838+#. module: base
1839+<<<<<<< TREE
1840+=======
1841+#: model:ir.module.module,shortdesc:base.module_account_report_company
1842+msgid "Invoice Analysis per Company"
1843+msgstr "Fakturaanalyse per firma"
1844+
1845+#. module: base
1846+>>>>>>> MERGE-SOURCE
1847 #: help:ir.actions.server,email:0
1848 msgid ""
1849 "Expression that returns the email address to send to. Can be based on the "
1850 "same values as for the condition field.\n"
1851 "Example: object.invoice_address_id.email, or 'me@example.com'"
1852 msgstr ""
1853+"Uttrykk som returnerer epostadressen som skal sendes til. Kan være basert på "
1854+"samme verdier som utvalgsfeltet.\n"
1855+"Eksempel: object.invoice_address_id.email, eller 'me@example.com'"
1856
1857 #. module: base
1858 #: model:ir.module.module,description:base.module_project_issue_sheet
1859@@ -10440,13 +10985,13 @@
1860 #. module: base
1861 #: model:ir.module.module,shortdesc:base.module_product_expiry
1862 msgid "Products Expiry Date"
1863-msgstr "Utløpsdato"
1864+msgstr "Produkters utløpsdato"
1865
1866 #. module: base
1867 #: code:addons/base/res/res_config.py:419
1868 #, python-format
1869 msgid "Click 'Continue' to configure the next addon..."
1870-msgstr ""
1871+msgstr "Klikk 'Fortsett' for å konfigurere neste tillegg..."
1872
1873 #. module: base
1874 #: field:ir.actions.server,record_id:0
1875@@ -10466,7 +11011,7 @@
1876 #. module: base
1877 #: view:ir.attachment:0
1878 msgid "Creation"
1879-msgstr ""
1880+msgstr "Opprettet"
1881
1882 #. module: base
1883 #: help:ir.actions.server,model_id:0
1884@@ -10482,7 +11027,7 @@
1885 #. module: base
1886 #: selection:ir.property,type:0
1887 msgid "Boolean"
1888-msgstr "Bolsk"
1889+msgstr "Boolean"
1890
1891 #. module: base
1892 #: help:ir.mail_server,smtp_encryption:0
1893@@ -10494,18 +11039,37 @@
1894 "- SSL/TLS: SMTP sessions are encrypted with SSL/TLS through a dedicated port "
1895 "(default: 465)"
1896 msgstr ""
1897+"Velg tilkoblingskryptering:\n"
1898+"-Ingen: SMTP sesjoner utføres i klartekst.\n"
1899+"-TLS (STARTTLS): TLS kryptering blir forespurt når SMTP sesjonen startes "
1900+"(Anbefalt)\n"
1901+"-SSL/TLS: SMTP sesjoner er kryptert med SSL/TLS via en dedikert port "
1902+"(standard: 465)"
1903
1904 #. module: base
1905 #: view:ir.model:0
1906 msgid "Fields Description"
1907-msgstr "Bekrivelse på felter"
1908+msgstr "Beskrivelse på felt"
1909
1910 #. module: base
1911 #: model:ir.module.module,shortdesc:base.module_analytic_contract_hr_expense
1912 msgid "Contracts Management: hr_expense link"
1913+msgstr "Kontraktstyring: hr_expense lenke"
1914+
1915+#. module: base
1916+<<<<<<< TREE
1917+=======
1918+#: code:addons/base/module/module.py:670
1919+#, python-format
1920+msgid ""
1921+"The `%s` module appears to be unavailable at the moment, please try again "
1922+"later."
1923 msgstr ""
1924+"Modulen '%s' ser ikke ut til å være tilgjengelig for øyeblikket, vennligst "
1925+"prøv igjen senere."
1926
1927 #. module: base
1928+>>>>>>> MERGE-SOURCE
1929 #: view:ir.attachment:0
1930 #: view:ir.cron:0
1931 #: view:ir.filters:0
1932@@ -10523,7 +11087,7 @@
1933 #. module: base
1934 #: view:base.module.update:0
1935 msgid "Module Update Result"
1936-msgstr ""
1937+msgstr "Resultat av moduloppdatering"
1938
1939 #. module: base
1940 #: model:ir.module.module,description:base.module_analytic_contract_hr_expense
1941@@ -10538,17 +11102,17 @@
1942 #. module: base
1943 #: field:ir.attachment,store_fname:0
1944 msgid "Stored Filename"
1945-msgstr ""
1946+msgstr "Lagret filnavn"
1947
1948 #. module: base
1949 #: field:res.partner,use_parent_address:0
1950 msgid "Use Company Address"
1951-msgstr ""
1952+msgstr "Bruk firmaadresse"
1953
1954 #. module: base
1955 #: model:ir.module.module,summary:base.module_hr_holidays
1956 msgid "Holidays, Allocation and Leave Requests"
1957-msgstr ""
1958+msgstr "Ferie, avspasering og permisjon"
1959
1960 #. module: base
1961 #: model:ir.module.module,description:base.module_web_hello
1962@@ -10558,30 +11122,34 @@
1963 "===========================\n"
1964 "\n"
1965 msgstr ""
1966+"\n"
1967+"OpenERP Web eksempelmodul.\n"
1968+"==========================\n"
1969+"\n"
1970
1971 #. module: base
1972 #: selection:ir.module.module,state:0
1973 #: selection:ir.module.module.dependency,state:0
1974 msgid "To be installed"
1975-msgstr "Å installere"
1976+msgstr "Vil bli installert"
1977
1978 #. module: base
1979 #: view:ir.model:0
1980 #: model:ir.module.module,shortdesc:base.module_base
1981 #: field:res.currency,base:0
1982 msgid "Base"
1983-msgstr "Basis"
1984+msgstr "Base"
1985
1986 #. module: base
1987 #: field:ir.model.data,model:0
1988 #: field:ir.values,model:0
1989 msgid "Model Name"
1990-msgstr ""
1991+msgstr "Modellnavn"
1992
1993 #. module: base
1994 #: selection:base.language.install,lang:0
1995 msgid "Telugu / తెలుగు"
1996-msgstr ""
1997+msgstr "Telugu / తెలుగు"
1998
1999 #. module: base
2000 #: model:ir.actions.act_window,help:base.action_partner_supplier_form
2001@@ -10609,6 +11177,10 @@
2002 "=======================\n"
2003 "\n"
2004 msgstr ""
2005+"\n"
2006+"OpenERP Web testsuite.\n"
2007+"====================\n"
2008+"\n"
2009
2010 #. module: base
2011 #: view:ir.model:0
2012@@ -10659,28 +11231,29 @@
2013 #. module: base
2014 #: view:res.currency:0
2015 msgid "Display"
2016-msgstr ""
2017+msgstr "Display"
2018
2019 #. module: base
2020 #: model:res.groups,name:base.group_multi_company
2021 msgid "Multi Companies"
2022-msgstr ""
2023+msgstr "Flerfirma"
2024
2025 #. module: base
2026 #: help:res.users,menu_id:0
2027 msgid ""
2028 "If specified, the action will replace the standard menu for this user."
2029 msgstr ""
2030+"Hvis spesifisert, vil handlingen erstatte standardmenyen for denne brukeren."
2031
2032 #. module: base
2033 #: model:ir.actions.report.xml,name:base.preview_report
2034 msgid "Preview Report"
2035-msgstr ""
2036+msgstr "Forhåndsvis rapport"
2037
2038 #. module: base
2039 #: model:ir.module.module,shortdesc:base.module_purchase_analytic_plans
2040 msgid "Purchase Analytic Plans"
2041-msgstr ""
2042+msgstr "Innkjøpsanalyseplaner"
2043
2044 #. module: base
2045 #: model:ir.actions.act_window,name:base.ir_sequence_type
2046@@ -10691,7 +11264,7 @@
2047 #. module: base
2048 #: selection:base.language.install,lang:0
2049 msgid "Spanish (CO) / Español (CO)"
2050-msgstr "Spanish (CO) / Español (CO)"
2051+msgstr "Spansk (CO) / Español (CO)"
2052
2053 #. module: base
2054 #: view:base.module.configuration:0
2055@@ -10699,16 +11272,18 @@
2056 "All pending configuration wizards have been executed. You may restart "
2057 "individual wizards via the list of configuration wizards."
2058 msgstr ""
2059+"Alle ventende konfigurasjonsveivisere har blitt utført. Du kan starte "
2060+"individuelle veivisere fra listen av konfigurasjonsveivisere."
2061
2062 #. module: base
2063 #: view:ir.sequence:0
2064 msgid "Current Year with Century: %(year)s"
2065-msgstr ""
2066+msgstr "Inneværende år med århundre: %(year)s"
2067
2068 #. module: base
2069 #: field:ir.exports,export_fields:0
2070 msgid "Export ID"
2071-msgstr "Eksport ID"
2072+msgstr "EksportID"
2073
2074 #. module: base
2075 #: model:res.country,name:base.fr
2076
2077=== modified file 'openerp/addons/base/i18n/vi.po'
2078--- openerp/addons/base/i18n/vi.po 2014-05-17 06:42:08 +0000
2079+++ openerp/addons/base/i18n/vi.po 2014-05-23 11:18:54 +0000
2080@@ -5,17 +5,30 @@
2081 #
2082 msgid ""
2083 msgstr ""
2084+<<<<<<< TREE
2085 "Project-Id-Version: openobject-addons\n"
2086 "Report-Msgid-Bugs-To: support@openerp.com\n"
2087 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
2088 "PO-Revision-Date: 2012-08-20 15:37+0000\n"
2089 "Last-Translator: OpenERP Administrators <Unknown>\n"
2090+=======
2091+"Project-Id-Version: openobject-server\n"
2092+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2093+"POT-Creation-Date: 2013-06-07 19:35+0000\n"
2094+"PO-Revision-Date: 2014-05-18 08:52+0000\n"
2095+"Last-Translator: Mai Đăng Thành <Unknown>\n"
2096+>>>>>>> MERGE-SOURCE
2097 "Language-Team: Vietnamese <vi@li.org>\n"
2098 "MIME-Version: 1.0\n"
2099 "Content-Type: text/plain; charset=UTF-8\n"
2100 "Content-Transfer-Encoding: 8bit\n"
2101+<<<<<<< TREE
2102 "X-Launchpad-Export-Date: 2014-05-17 06:38+0000\n"
2103 "X-Generator: Launchpad (build 17007)\n"
2104+=======
2105+"X-Launchpad-Export-Date: 2014-05-19 06:20+0000\n"
2106+"X-Generator: Launchpad (build 17007)\n"
2107+>>>>>>> MERGE-SOURCE
2108
2109 #. module: base
2110 #: model:ir.module.module,description:base.module_account_check_writing
2111@@ -126,6 +139,17 @@
2112 " * Product Attributes\n"
2113 " "
2114 msgstr ""
2115+"\n"
2116+"Chức năng thêm nhà các sản xuất và các thuộc tính của sản phẩm\n"
2117+"====================================================================\n"
2118+"\n"
2119+"Bạn có thể thêm các thông tin sau cho sản phẩm:\n"
2120+"-----------------------------------------------\n"
2121+" * Nhà sản xuất\n"
2122+" * Tên sản phẩm (Nhà sản xuất)\n"
2123+" * Mã sản phẩm (Nhà sản xuất)\n"
2124+" * Các thuộc tính sản phẩm\n"
2125+" "
2126
2127 #. module: base
2128 #: field:ir.actions.client,params:0
2129@@ -198,6 +222,14 @@
2130 "revenue\n"
2131 "reports."
2132 msgstr ""
2133+"\n"
2134+"Tạo hóa đơn từ Chi phí, Bảng chấm công\n"
2135+"========================================================\n"
2136+"\n"
2137+"Chức năng tạo hóa đơn dựa trên chi phí (nhân lực, chi phí, ...).\n"
2138+"\n"
2139+"Bạn có thể định nghĩa bảng giá trong tài khoản phân tích, tạo báo cáo \n"
2140+"doanh thu lý thuyết."
2141
2142 #. module: base
2143 #: code:addons/base/ir/ir_sequence.py:134
2144@@ -305,6 +337,7 @@
2145 "The internal user that is in charge of communicating with this contact if "
2146 "any."
2147 msgstr ""
2148+"Người sử dụng nội bộ có trách nhiệm giao tiếp với các đối tác này nếu có."
2149
2150 #. module: base
2151 #: view:res.partner:0
2152@@ -343,6 +376,12 @@
2153 " - tree_but_open\n"
2154 "For defaults, an optional condition"
2155 msgstr ""
2156+"Những tác vụ sau được phép: \n"
2157+" - client_action_multi\n"
2158+" - client_print_multi\n"
2159+" - client_action_relate\n"
2160+" - tree_but_open\n"
2161+"Mặc định, một tùy chọn sẽ bắt buộc"
2162
2163 #. module: base
2164 #: sql_constraint:res.lang:0
2165
2166=== modified file 'openerp/addons/base/ir/ir_model.py'
2167--- openerp/addons/base/ir/ir_model.py 2014-05-06 12:16:27 +0000
2168+++ openerp/addons/base/ir/ir_model.py 2014-05-23 11:18:54 +0000
2169@@ -350,8 +350,15 @@
2170 if vals.get('relation',False) and not self.pool['ir.model'].search(cr, user, [('model','=',vals['relation'])]):
2171 raise except_orm(_('Error'), _("Model %s does not exist!") % vals['relation'])
2172
2173+<<<<<<< TREE
2174 if vals['model'] in self.pool:
2175 self.pool[vals['model']].__init__(self.pool, cr)
2176+=======
2177+ if self.pool.get(vals['model']):
2178+ if vals['model'].startswith('x_') and vals['name'] == 'x_name':
2179+ self.pool[vals['model']]._rec_name = 'x_name'
2180+ self.pool.get(vals['model']).__init__(self.pool, cr)
2181+>>>>>>> MERGE-SOURCE
2182 #Added context to _auto_init for special treatment to custom field for select_level
2183 ctx = dict(context,
2184 field_name=vals['name'],
2185
2186=== modified file 'openerp/addons/base/ir/ir_values.py'
2187--- openerp/addons/base/ir/ir_values.py 2014-02-13 11:09:37 +0000
2188+++ openerp/addons/base/ir/ir_values.py 2014-05-23 11:18:54 +0000
2189@@ -22,6 +22,7 @@
2190
2191 from openerp.osv import osv, fields
2192 from openerp.osv.orm import except_orm
2193+from openerp.tools.safe_eval import safe_eval as eval
2194
2195 EXCLUDED_FIELDS = set((
2196 'report_sxw_content', 'report_rml_content', 'report_sxw', 'report_rml',
2197@@ -121,7 +122,13 @@
2198 record = self.browse(cursor, user, id, context=context)
2199 if record.key == 'default':
2200 # default values are pickled on the fly
2201- value = pickle.dumps(value)
2202+ if isinstance(value, (str, unicode)):
2203+ try:
2204+ value = pickle.dumps(eval(value))
2205+ except Exception:
2206+ value = pickle.dumps(value)
2207+ else:
2208+ value = pickle.dumps(value)
2209 self.write(cursor, user, id, {name[:-9]: value}, context=ctx)
2210
2211 def onchange_object_id(self, cr, uid, ids, object_id, context=None):
2212
2213=== modified file 'openerp/osv/orm.py'
2214--- openerp/osv/orm.py 2014-04-16 14:34:31 +0000
2215+++ openerp/osv/orm.py 2014-05-23 11:18:54 +0000
2216@@ -3757,10 +3757,21 @@
2217 if ir_value_ids:
2218 ir_values_obj.unlink(cr, uid, ir_value_ids, context=context)
2219
2220+<<<<<<< TREE
2221 for order, obj_name, store_ids, fields in result_store:
2222 if obj_name != self._name:
2223 obj = self.pool[obj_name]
2224 cr.execute('select id from '+obj._table+' where id IN %s', (tuple(store_ids),))
2225+=======
2226+ for order, object, store_ids, fields in result_store:
2227+ if object == self._name:
2228+ effective_store_ids = list(set(store_ids) - set(ids))
2229+ else:
2230+ effective_store_ids = store_ids
2231+ if effective_store_ids:
2232+ obj = self.pool.get(object)
2233+ cr.execute('select id from '+obj._table+' where id IN %s', (tuple(effective_store_ids),))
2234+>>>>>>> MERGE-SOURCE
2235 rids = map(lambda x: x[0], cr.fetchall())
2236 if rids:
2237 obj._store_set_values(cr, uid, rids, fields, context)
2238
2239=== modified file 'openerp/tools/mail.py'
2240--- openerp/tools/mail.py 2014-04-24 13:14:05 +0000
2241+++ openerp/tools/mail.py 2014-05-23 11:18:54 +0000
2242@@ -498,6 +498,9 @@
2243 html = re.sub('<br\s*/?>', '\n', html)
2244 html = re.sub('<.*?>', ' ', html)
2245 html = html.replace(' ' * 2, ' ')
2246+ html = html.replace('&lt;', '<')
2247+ html = html.replace('&gt;', '>')
2248+ html = html.replace('&amp;', '&')
2249
2250 # strip all lines
2251 html = '\n'.join([x.strip() for x in html.splitlines()])