[Fmsystem-commits] [16143] Stable: Merge 16141:16142 from trunk

[sigurdne]

Revision: 16143
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16143
Author:   sigurdne
Date:     2017-01-04 18:37:24 +0000 (Wed, 04 Jan 2017)
Log Message:
-----------
Stable: Merge 16141:16142 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/property/inc/class.socondition_survey.inc.php
    branches/Version-2_0-branch/property/inc/class.sorequest.inc.php
    branches/Version-2_0-branch/property/setup/phpgw_no.lang

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16129
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16129
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142

Modified: 
branches/Version-2_0-branch/property/inc/class.socondition_survey.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.socondition_survey.inc.php   
2017-01-04 18:35:57 UTC (rev 16142)
+++ branches/Version-2_0-branch/property/inc/class.socondition_survey.inc.php   
2017-01-04 18:37:24 UTC (rev 16143)
@@ -574,7 +574,7 @@
                                );
                        }
 
-                       $lang_operation = lang('operation');
+                       $lang_operation = lang('O&M');//Operations and 
Maintenance
                        $lang_investment = lang('investment');
 
                        $return = array();

Modified: branches/Version-2_0-branch/property/inc/class.sorequest.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sorequest.inc.php    
2017-01-04 18:35:57 UTC (rev 16142)
+++ branches/Version-2_0-branch/property/inc/class.sorequest.inc.php    
2017-01-04 18:37:24 UTC (rev 16143)
@@ -458,7 +458,7 @@
                        $cols_group[] = 'amount_operation';
                        $uicols['input_type'][] = 'text';
                        $uicols['name'][] = 'amount_operation';
-                       $uicols['descr'][] = lang('operation');
+                       $uicols['descr'][] = lang('O&M');//Operations and 
Maintenance
                        $uicols['statustext'][] = lang('cost estimate');
                        $uicols['exchange'][] = '';
                        $uicols['align'][] = '';

Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang    2017-01-04 
18:35:57 UTC (rev 16142)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang    2017-01-04 
18:37:24 UTC (rev 16143)
@@ -1206,6 +1206,8 @@
 open JasperReport %1 in new window     property        no      Åpne 
JasperReport %1 i nytt vindu
 open view in new window        property        no      Åpne visning i nytt 
vindu
 operation      property        no      Drift
+O&M    property        no      D/V
+Operations and Maintenance     no      Drift og vedlikehold
 order  property        no      Bestilling
 order approval revoked property        no      Bestillingsgodkjenning opphevet
 order approved property        no      Bestilling godkjent
@@ -2040,7 +2042,7 @@
 request action title   property        no      Tiltaksbeskrivelse
 request condition mouseover description        property        no      Beskriv 
tilstand
 request condition description  property        no      Tilstandsbeskrivelse
-cost operation property        no      Andel driftskonstnad i kr.
+cost operation property        no      Andel kostnad D/V i kr.
 cost investment        property        no      Andel investering i kr.
 grant category property        no      Tilskuddskategori
 what   property        no      Hva