[Fmsystem-commits] [15111] Syncromind: Merge 14936:15027 from trunk

[sigurdne]

Revision: 15111
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15111
Author:   sigurdne
Date:     2016-05-13 12:23:15 +0000 (Fri, 13 May 2016)
Log Message:
-----------
Syncromind: Merge 14936:15027 from trunk

Modified Paths:
--------------
    branches/dev-syncromind-2/property/setup/phpgw_no.lang

Modified: branches/dev-syncromind-2/property/setup/phpgw_no.lang
===================================================================
--- branches/dev-syncromind-2/property/setup/phpgw_no.lang      2016-05-13 
12:23:12 UTC (rev 15110)
+++ branches/dev-syncromind-2/property/setup/phpgw_no.lang      2016-05-13 
12:23:15 UTC (rev 15111)
@@ -2057,4 +2057,6 @@
 hjemmel        common  no      Hjemmel
 record has been edited common  no      data er editert
 external project       property        no      Eksternt prosjekt
-unspsc code    common  no      UNSPSC-kode
\ No newline at end of file
+unspsc code    common  no      UNSPSC-kode
+order received property        no      Varemottak
+receive order  property        no      Motta vare
\ No newline at end of file