[Libreoffice-commits] core.git: Branch 'libreoffice-5-2-0' - sfx2/classification

Adolfo Jayme Barrientos fitojb at ubuntu.com
Mon Jul 11 15:32:14 UTC 2016


 sfx2/classification/example_sl-SI.xml |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 5179eeacb2c1a96395ce5a0ba988e3e16129fbf1
Author: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Date:   Sun Jun 26 21:32:07 2016 -0500

    tdf#100352 Make the watermarks and colored infobar work in Slovenian
    
    The elements <baf:Scale> and <baf:Identifier> must match the values
    set in sfx2/source/view/classificationhelper.cxx to work. I moved the
    translated words to their proper place.
    
    Change-Id: Id860a375654e371742ba15435d3e73506ef5ef0e
    Reviewed-on: https://gerrit.libreoffice.org/26685
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    (cherry picked from commit 30f81c01d247cdffa0de86367d5f2be80887a251)
    Reviewed-on: https://gerrit.libreoffice.org/27076
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit 463fe57dc9527602bc92b0ba74505a1934949dd5)
    Reviewed-on: https://gerrit.libreoffice.org/27082
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/classification/example_sl-SI.xml b/sfx2/classification/example_sl-SI.xml
index 822ca6d..1d19836 100644
--- a/sfx2/classification/example_sl-SI.xml
+++ b/sfx2/classification/example_sl-SI.xml
@@ -6,62 +6,62 @@
         <baf:ProgramID>urn:example:tscp:1</baf:ProgramID>
     </baf:AdministrativeData>
     <baf:Included>
-        <baf:BusinessAuthorizationCategory Identifier="urn:example:tscp:1:non-business" Name="Non-Business">
+        <baf:BusinessAuthorizationCategory Identifier="urn:example:tscp:1:non-business" Name="Neposlovno">
             <baf:LabelingRules/>
             <baf:ImpactLevel>
-                <baf:Scale>Vlada RS</baf:Scale>
+                <baf:Scale>UK-Cabinet</baf:Scale>
                 <baf:ConfidentalityValue>0</baf:ConfidentalityValue>
             </baf:ImpactLevel>
         </baf:BusinessAuthorizationCategory>
-        <baf:BusinessAuthorizationCategory Identifier="urn:example:tscp:1:general-business" Name="General Business">
+        <baf:BusinessAuthorizationCategory Identifier="urn:example:tscp:1:general-business" Name="Splošno poslovanje">
             <baf:LabelingRules>
                 <baf:VisualMarkingPart>
-                    <baf:Identifier>Dokument: glava</baf:Identifier>
+                    <baf:Identifier>Document: Header</baf:Identifier>
                     <baf:Value>Stopnja zaupnosti: splošno poslovanje</baf:Value>
                 </baf:VisualMarkingPart>
             </baf:LabelingRules>
             <baf:ImpactLevel>
-                <baf:Scale>Vlada RS</baf:Scale>
+                <baf:Scale>UK-Cabinet</baf:Scale>
                 <baf:ConfidentalityValue>1</baf:ConfidentalityValue>
             </baf:ImpactLevel>
         </baf:BusinessAuthorizationCategory>
-        <baf:BusinessAuthorizationCategory Identifier="urn:example:tscp:1:confidential" Name="Confidential">
+        <baf:BusinessAuthorizationCategory Identifier="urn:example:tscp:1:confidential" Name="Zaupno">
             <baf:LabelingRules>
                 <baf:VisualMarkingPart>
-                    <baf:Identifier>Dokument: glava</baf:Identifier>
+                    <baf:Identifier>Document: Header</baf:Identifier>
                     <baf:Value>Stopnja zaupnosti: zaupno</baf:Value>
                 </baf:VisualMarkingPart>
                 <baf:VisualMarkingPart>
-                    <baf:Identifier>Dokument: noga</baf:Identifier>
+                    <baf:Identifier>Document: Footer</baf:Identifier>
                     <baf:Value>Ta vsebina ima oznako zaupno. Ne razširjajte je zunaj brez  poslovne odobritve.</baf:Value>
                 </baf:VisualMarkingPart>
                 <baf:VisualMarkingPart>
-                    <baf:Identifier>Dokument: vodni žig</baf:Identifier>
+                    <baf:Identifier>Document: Watermark</baf:Identifier>
                     <baf:Value>Zaupno</baf:Value>
                 </baf:VisualMarkingPart>
             </baf:LabelingRules>
             <baf:ImpactLevel>
-                <baf:Scale>Vlada RS</baf:Scale>
+                <baf:Scale>UK-Cabinet</baf:Scale>
                 <baf:ConfidentalityValue>2</baf:ConfidentalityValue>
             </baf:ImpactLevel>
         </baf:BusinessAuthorizationCategory>
-        <baf:BusinessAuthorizationCategory Identifier="urn:example:tscp:1:internal-only" Name="Internal Only">
+        <baf:BusinessAuthorizationCategory Identifier="urn:example:tscp:1:internal-only" Name="Interno">
             <baf:LabelingRules>
                 <baf:VisualMarkingPart>
-                    <baf:Identifier>Dokument: glava</baf:Identifier>
+                    <baf:Identifier>Document: Header</baf:Identifier>
                     <baf:Value>Stopnja zaupnosti: interno</baf:Value>
                 </baf:VisualMarkingPart>
                 <baf:VisualMarkingPart>
-                    <baf:Identifier>Dokument: noga</baf:Identifier>
+                    <baf:Identifier>Document: Footer</baf:Identifier>
                     <baf:Value>Ta vsebina ima oznako interno. Ne razširjajte je izven podjetja.</baf:Value>
                 </baf:VisualMarkingPart>
                 <baf:VisualMarkingPart>
-                    <baf:Identifier>Dokument: vodni žig</baf:Identifier>
+                    <baf:Identifier>Document: Watermark</baf:Identifier>
                     <baf:Value>Interno</baf:Value>
                 </baf:VisualMarkingPart>
             </baf:LabelingRules>
             <baf:ImpactLevel>
-                <baf:Scale>Vlada RS</baf:Scale>
+                <baf:Scale>UK-Cabinet</baf:Scale>
                 <baf:ConfidentalityValue>3</baf:ConfidentalityValue>
             </baf:ImpactLevel>
         </baf:BusinessAuthorizationCategory>


More information about the Libreoffice-commits mailing list