svn commit: r1736088 - in /ofbiz/branches/release15.12: ./ specialpurpose/pos/config/xpos.properties

Author: jleroux
Date: Mon Mar 21 20:39:22 2016
New Revision: 1736088

URL: http://svn.apache.org/viewvc?rev=1736088&view=rev
Log:
"Applied fix from trunk for revision: 1736087"
------------------------------------------------------------------------
r1736087 | jleroux | 2016-03-21 21:38:47 +0100 (lun. 21 mars 2016) | 2 lignes

No functional change.
xpos.properties was wrongly committed at r1736083, this removes unwanted changes
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release15.12/   (props changed)
    ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties

Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 21 20:39:22 2016
@@ -9,4 +9,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087

Modified: ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties?rev=1736088&r1=1736087&r2=1736088&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties (original)
+++ ofbiz/branches/release15.12/specialpurpose/pos/config/xpos.properties Mon Mar 21 20:39:22 2016
@@ -1,34 +1,35 @@
 ###############################################################################
-# Licensed to the Apache Software Foundation (ASF) under one                  
-# or more contributor license agreements.  See the NOTICE file                
-# distributed with this work for additional information                        
-# regarding copyright ownership.  The ASF licenses this file                  
-# to you under the Apache License, Version 2.0 (the                            
-# "License"); you may not use this file except in compliance                
-# with the License.  You may obtain a copy of the License at                  
-#                                                                              
-# http://www.apache.org/licenses/LICENSE-2.0                                   
-#                                                                              
-# Unless required by applicable law or agreed to in writing,                  
-# software distributed under the License is distributed on an                  
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY                    
-# KIND, either express or implied.  See the License for the                    
-# specific language governing permissions and limitations                      
-# under the License.                                                          
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 ###############################################################################
-#                                                                              
-# Dynamically modified by OFBiz Framework (org.ofbiz.base.util : UtilProperties.setPropertyValue)
-# The comments have been removed, you may still find them on the OFBiz repository...
 #
-#Mon Mar 21 21:15:53 CET 2016
+# By default the screen is 1024x768 wide. If you want to use another screen size,
+# you must create a new directory under specialpurpose/pos/screens, like the 800x600.
+# You must also set the 3 related parameters (StartClass, ClientWidth, ClientHeight) accordingly.
+#
+
+StartPackage=org.ofbiz.pos
+StartClass=default/pospanel
+LogLevel=0
+StyleFile=posstyles.xml
 CenterWin=true
 ClientHeight=768
-Language=XuiLabels_fr
 ClientWidth=1024
-StartClass=default/pospanel
+Language=XuiLabels
 Title=OFBiz POS
-StyleFile=posstyles.xml
 UseWindow=false
 UseFrames=false
-LogLevel=0
-StartPackage=org.ofbiz.pos