[Libreoffice-commits] .: 11 commits - configure.in i18npool/inc i18npool/source instsetoo_native/inc_ooohelppack instsetoo_native/inc_ooolangpack instsetoo_native/util l10ntools/prj l10ntools/scripts l10ntools/source scp2/source setup_native/source solenv/inc svtools/source
Andras Timar
timar at kemper.freedesktop.org
Sat Sep 17 01:18:25 PDT 2011
configure.in | 1
i18npool/inc/i18npool/lang.h | 1
i18npool/source/isolang/isolang.cxx | 1
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt | 2
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt | 67 ---
instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt | 2
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt | 67 ---
instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt | 2
instsetoo_native/util/makefile.mk | 17 -
l10ntools/prj/d.lst | 1
l10ntools/scripts/addkeyid2pot.pl | 106 ++++++
l10ntools/scripts/keyidGen.pl | 169 +++-------
l10ntools/source/helpmerge.cxx | 11
scp2/source/ooo/module_helppack.ulf | 6
scp2/source/ooo/module_langpack.ulf | 6
setup_native/source/win32/msi-encodinglist.txt | 2
solenv/inc/langlist.mk | 1
svtools/source/misc/langtab.src | 1
19 files changed, 208 insertions(+), 257 deletions(-)
New commits:
commit c7c120d3603427455120cfbc4e7ceb7a16044129
Author: Andras Timar <atimar at suse.com>
Date: Sat Sep 17 10:16:50 2011 +0200
add name and description of KeyID langpack/helppack
diff --git a/scp2/source/ooo/module_helppack.ulf b/scp2/source/ooo/module_helppack.ulf
index b9bb361..4737584 100644
--- a/scp2/source/ooo/module_helppack.ulf
+++ b/scp2/source/ooo/module_helppack.ulf
@@ -846,3 +846,9 @@ en-US = "Tigrinya"
[STR_DESC_MODULE_HELPPACK_TI]
en-US = "Installs Tigrinya help in %PRODUCTNAME %PRODUCTVERSION"
+
+[STR_NAME_MODULE_HELPPACK_QTZ]
+en-US = "KeyID"
+
+[STR_DESC_MODULE_HELPPACK_QTZ]
+en-US = "Installs English help in %PRODUCTNAME %PRODUCTVERSION with a key ID before each paragraph"
diff --git a/scp2/source/ooo/module_langpack.ulf b/scp2/source/ooo/module_langpack.ulf
index 01f2140..c26b7e9 100644
--- a/scp2/source/ooo/module_langpack.ulf
+++ b/scp2/source/ooo/module_langpack.ulf
@@ -852,3 +852,9 @@ en-US = "Luxembourgish"
[STR_DESC_MODULE_LANGPACK_LB]
en-US = "Installs the Luxembourgish user interface"
+
+[STR_NAME_MODULE_LANGPACK_QTZ]
+en-US = "KeyID"
+
+[STR_DESC_MODULE_LANGPACK_QTZ]
+en-US = "Installs the English user interface with a key ID before each UI element"
commit 27c5d661ff8b00e0f8d2f697a83d6dfe13b540c7
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 22:34:19 2011 +0200
do not build key id pseudolanguage for release builds
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 19868f8..b5291ce 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -77,7 +77,12 @@ LOCALPYFILES= \
$(BIN)$/msgbox.py
.ENDIF
-help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US
+help_exist:=$(shell @find $(L10N_MODULE)/source/ -type d -name "helpcontent2" 2>/dev/null | sed -e "s|/helpcontent2||" -e "s|^.*/||" ) en-US qtz
+
+# do not build key is pseudolanguage for release builds
+.IF "$(ENABLE_RELEASE_BUILD)"=="TRUE"
+alllangiso:=$(alllangiso:s/qtz//)
+.ENDIF
allhelplangiso:=$(foreach,i,$(alllangiso) $(foreach,j,$(help_exist) $(eq,$i,$j $i $(NULL))))
commit c907a667c2dfab0a59ad182883a44bc751a22d53
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 22:35:11 2011 +0200
build multi language dev-installer on windows
diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk
index 6880750..19868f8 100644
--- a/instsetoo_native/util/makefile.mk
+++ b/instsetoo_native/util/makefile.mk
@@ -102,12 +102,20 @@ ALLTAR : openofficeall ooohelppack sdkooall
ALLTAR : openoffice_$(defaultlangiso) ooolanguagepack $(eq,$(OS),MACOSX $(NULL) ooohelppack) sdkoo_en-US ure_en-US
.ENDIF
.ENDIF
-.ELSE
+.ELSE # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.IF "$(BUILD_TYPE)"=="$(BUILD_TYPE:s/ODK//)"
+.IF "$(GUI)"=="WNT"
+ALLTAR : openofficedevall ooodevhelppack
+.ELSE
ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack)
+.ENDIF
+.ELSE
+.IF "$(GUI)"=="WNT"
+ALLTAR : openofficeidevall ooodevhelppack sdkoodevall
.ELSE
ALLTAR : openofficedev_$(defaultlangiso) ooodevlanguagepack $(eq,$(OS),MACOSX $(NULL) ooodevhelppack) sdkoodev_en-US ure_en-US
.ENDIF
+.ENDIF
.ENDIF # "$(ENABLE_RELEASE_BUILD)"=="TRUE"
.ENDIF # "$(GUI)"!="WNT" && "$(EPM)"=="NO"
commit 5b465d87703e4843be36d7175aa3d5a969f86282
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 19:22:38 2011 +0200
cleanup: don't use German as fallback language
diff --git a/l10ntools/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 8b2eee4..ba6cda8 100644
--- a/l10ntools/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.cxx
@@ -52,7 +52,6 @@
void HelpParser::FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in ){
/*****************************************************************************/
static const ByteString ENGLISH_LANGUAGECODE( "en-US" );
- static const ByteString GERMAN_LANGUAGECODE ( "de" );
ByteString sCur;
XMLElement* pTmp = NULL;
XMLElement* pTmp2 = NULL;
@@ -75,14 +74,6 @@ void HelpParser::FillInFallbacks( LangHashMap& rElem_out, ByteString sLangIdx_in
pTmp->ChangeLanguageTag( String( sLangIdx_in , RTL_TEXTENCODING_ASCII_US) );
rElem_out[ sCur ] = pTmp;
pTmp2 = NULL;
- }
- else if( (rElem_out.find( GERMAN_LANGUAGECODE ) != rElem_out.end() ) && rElem_out[ GERMAN_LANGUAGECODE ] != NULL ){// No English
- pTmp2 = rElem_out[ GERMAN_LANGUAGECODE ];
- pTmp = new XMLElement( *pTmp2 ); // Copy
- pTmp->SetPos( pTmp2->GetPos()+1 );
- pTmp->ChangeLanguageTag( String( sLangIdx_in , RTL_TEXTENCODING_ASCII_US ) );
- rElem_out[ sCur ] = pTmp;
- pTmp2 = NULL;
}else{
fprintf(stdout,"ERROR: No Fallback found for language %s:\n",sCur.GetBuffer());
rElem_out[ sCur ]=new XMLElement(); // Use dummy element
@@ -322,7 +313,6 @@ bool ByteStringLess( const ByteString& rKey1, const ByteString& rKey2 ) {
void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDataFile& aMergeDataFile ){
std::vector<ByteString> aTmp;
- const ByteString DE ("de");
const ByteString ENUS ("en-US");
static const ByteString ALL( "ALL" );
@@ -331,7 +321,6 @@ void HelpParser::parse_languages( std::vector<ByteString>& aLanguages , MergeDat
if( Export::sLanguages.EqualsIgnoreCaseAscii( ALL ) )
{
aLanguages = aMergeDataFile.GetLanguages();
- aLanguages.push_back( DE );
aLanguages.push_back( ENUS );
if( !Export::sForcedLanguages.Equals("") )
commit a705aec5117fe9123236ebdeb0d6f271b83f8af4
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 16:20:09 2011 +0200
add KeyID option to Language dropdown box
diff --git a/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index f03b2bb..0582765 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.h
@@ -535,6 +535,7 @@ typedef unsigned short LanguageType;
#define LANGUAGE_USER_MANX 0x0663
#define LANGUAGE_USER_TEKE_EBOO 0x0664
#define LANGUAGE_USER_ARAGONESE 0x0665
+#define LANGUAGE_USER_KEYID 0x0666 /* key id pseudolanguage */
#endif /* INCLUDED_I18NPOOL_LANG_H */
diff --git a/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 5fd8cb4..94f18cc 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.cxx
@@ -482,6 +482,7 @@ static MsLangId::IsoLangEntry const aImplIsoLangEntries[] =
{ LANGUAGE_USER_PORTUGUESE_ANGOLA, "pt", "AO" },
{ LANGUAGE_USER_MANX, "gv", "GB" },
{ LANGUAGE_USER_ARAGONESE, "an", "ES" },
+ { LANGUAGE_USER_KEYID, "qtz", "" }, // key id pseudolanguage used for UI testing
{ LANGUAGE_NONE, "zxx", "" }, // added to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic information
{ LANGUAGE_DONTKNOW, "", "" } // marks end of table
};
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index f84a46e..03469d2 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -340,6 +340,7 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Teke-Ibali" ; LANGUAGE_USER_TEKE_IBALI ; > ;
< "Teke-Tyee" ; LANGUAGE_USER_TEKE_TYEE ; > ;
< "Vili" ; LANGUAGE_USER_VILI ; > ;
+ < "KeyID" ; LANGUAGE_USER_KEYID ; > ;
};
};
commit 1066677fd5e10bac78b8e4ebbabfa6bd44dc3859
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 09:52:37 2011 +0200
add a new helper script: addkeyid2pot.pl
It adds key IDs to pot entries in the form of #. type comments.
In Pootle the translator can search for strings using the key IDs.
diff --git a/l10ntools/prj/d.lst b/l10ntools/prj/d.lst
index ad2d715..bcbe252 100644
--- a/l10ntools/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -40,6 +40,7 @@ mkdir: %_DEST%\bin\help\com\sun\star\help
..\scripts\localize %_DEST%\bin\localize
..\scripts\fast_merge.pl %_DEST%\bin\fast_merge.pl
..\scripts\keyidGen.pl %_DEST%\bin\keyidGen.pl
+..\scripts\addkeyid2pot.pl %_DEST%\bin\addkeyid2pot.pl
..\scripts\po2lo %_DEST%\bin\po2lo
..\inc\export.hxx %_DEST%\inc\l10ntools\export.hxx
..\inc\l10ntools\directory.hxx %_DEST%\inc\l10ntools\directory.hxx
diff --git a/l10ntools/scripts/addkeyid2pot.pl b/l10ntools/scripts/addkeyid2pot.pl
new file mode 100644
index 0000000..bd66a3b
--- /dev/null
+++ b/l10ntools/scripts/addkeyid2pot.pl
@@ -0,0 +1,106 @@
+:
+eval 'exec perl -S $0 ${1+"$@"}'
+ if 0;
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+# Andras Timar <atimar at suse.com>
+# Portions created by the Initial Developer are Copyright (C) 2011 the
+# Initial Developer. All Rights Reserved.
+#
+# Major Contributor(s):
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+# add keyids to pot files
+#
+
+use File::Find;
+
+sub keyidgen
+{
+ my $key = shift;
+ my $crc = crc24($key);
+ my $symbols="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#_";
+ my $keyid = "";
+ while ( length($keyid) < 4 )
+ {
+ $keyid .= substr($symbols, $crc & 63, 1);
+ $crc = $crc >> 6;
+ }
+ return $keyid;
+}
+
+sub crc24
+{
+ my $CRC24_INIT = 0x00b704ce;
+ my $CRC24_POLY = 0x00864cfb;
+ my $key = shift;
+ my $key_length = length($key);
+ my $crc = $CRC24_INIT;
+ my $position = 0;
+
+ while ( $position < $key_length )
+ {
+ $crc ^= (unpack("C", substr($key, $position, 1)) << 16);
+ my $i;
+ for ($i = 0; $i < 8; $i++)
+ {
+ $crc <<= 1;
+ $crc ^= $CRC24_POLY if ($crc & 0x01000000)
+ }
+ $position++;
+ }
+ return $crc & 0x00ffffff;
+}
+
+my $potdir = $ARGV[0];
+
+if (!$potdir) {die "Usage_ $0 <directory of pot files>\n";}
+
+my @potfiles = ();
+
+File::Find::find( sub {/^.*\.pot\z/s && push @potfiles, $File::Find::name;}, $potdir );
+
+foreach $f (@potfiles)
+{
+ open OLDPOT , "< $f" || die("Cannot open source pot file: $f\n");
+ $fnew = $f . ".new";
+ @path = split ("/",$f);
+ $keypart1 = pop @path;
+ $keypart1 =~ s/.pot//;
+ $keypart1 .= "_";
+ $keypart2 = pop @path;
+ $keypart1 = $keypart2 . "_" . $keypart1;
+ open NEWPOT , "> $fnew" || die("Cannot open target pot file: $f\n");
+ while ( <OLDPOT> )
+ {
+ chomp;
+ if( /^#: (.*)$/ )
+ {
+ print NEWPOT "#. " . keyidgen($keypart1 . $1) . "\n";
+ }
+ print NEWPOT $_ . "\n";
+ }
+ close OLDPOT;
+ close NEWPOT;
+ rename $fnew,$f;
+}
+
+exit 0;
commit 81da24399ef43f235968bbc9eb49ca6158170538
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 09:55:50 2011 +0200
rewrite keyidGen.pl
it creates 4 letter key IDs (same as in pot/po files)
diff --git a/l10ntools/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl
index 53423c2..bb9eae9 100644
--- a/l10ntools/scripts/keyidGen.pl
+++ b/l10ntools/scripts/keyidGen.pl
@@ -31,15 +31,10 @@ eval 'exec perl -S $0 ${1+"$@"}'
# add keyids to sdf file
#
-use Compress::Zlib();
+my $infile = $ARGV[0];
+if ( !$infile ) {die "Usage: $0 <infile> [<outfile>]\n";}
-print "\nkeyidGen version 1.0 \n\n";
-
-my ( $infile,$outfile,$dbimport );
-get_options();
-
-print_help() if ( !defined $infile || $help );
-exit 1 if ( !defined $infile );
+my $outfile = $ARGV[1];
if ( ! defined $outfile )
{
$outfile = $infile;
@@ -47,139 +42,105 @@ if ( ! defined $outfile )
$outfile .= "_KeyID.sdf";
}
-$collisions = 0;
-%hashcodes = ();
-$count = 0;
print "writing to $outfile\n";
open INFILE,"<$infile" || die "could not open $infile $! $^E\n";
open OUTFILE,">$outfile" || die "could not open $outfile $! $^E\n";
while ( <INFILE> )
{
- $line = $_;
- chomp $line;
- $hash = 0;
- if ( $line =~ /^([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)$/ )
+ chomp;
+ if ( /^([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)\t([^\t]*)$/ )
{
- $string="$1 $2 $4 $5 $6 $7 $8";
- $hashp = makeID( $string );
-
- if ( defined ($hashcodes{ $hashp } ) )
- {
- $collisions ++ unless $hashcodes{ $hashp } eq $string;
- }
- $hashcodes{ $hashp } = $string;
- $count++;
- if ( $dbimport )
- {
- my ( $pre, $post, $old );
- $pre = "$1\t$2\t";
- $post = "\t$4\t$5\t$6\t$7\t$8\t$9\t$10\t$11\t$12\t$13\t$14\t$15\n";
- $old = $3;
- $old =~ s/;{0,1}keyid:......;{0,1}//;
- $old =~ s/^0$//;
- if ( $old ne "" ) { $old .= ";"; }
- print OUTFILE "$pre${old}keyid:$hashp$post";
- }
- else
- {
- print OUTFILE "$1\t$2\t$3\t$4\t$5\t$6\t$7\t$8\t$9\t$10\t".makekidstr($hashp,$11)."\t".makekidstr($hashp,$12)."\t$13\t".makekidstr($hashp,$14)."\t$15\n";
- }
+ my $prj = defined $1 ? $1 : '';
+ my $file = defined $2 ? $2 : '';
+ my $dummy = defined $3 ? $3 : '';
+ my $type = defined $4 ? $4 : '';
+ my $gid = defined $5 ? $5 : '';
+ my $lid = defined $6 ? $6 : '';
+ my $helpid = defined $7 ? $7 : '';
+ my $platform = defined $8 ? $8 : '';
+ my $width = defined $9 ? $9 : '';
+ my $lang = defined $10 ? $10 : '';
+ my $text = defined $11 ? $11 : '';
+ my $helptext = defined $12 ? $12 : '';
+ my $quickhelptext = defined $13 ? $13 : '';
+ my $title = defined $14 ? $14 : '';
+ my $timestamp = defined $15 ? $15 : '';
+ @path = split ( "\\\\" , $file );
+ $key = $path[-3] . "_" . $path[-2] . "_" . $path[-1] . "#" . $gid . ".";
+ if (length($lid)) {$key .= $lid . ".";}
+ if (length($type)) {$key .= $type . ".";}
+ # replace non-word characters to _ just as in po files in source keys
+ $key =~ s|[^\w#\./]|_|g;
+ # ISO 639 private use code
+ $lang = "qtz";
+ if ( $text ne "") {$text = makekeyidstr(keyidgen($key . "text"),$text);}
+ if ( $quickhelptext ne "") {$quickhelptext = makekeyidstr(keyidgen($key . "quickhelptext"),$quickhelptext);}
+ if ( $title ne "") {$title = makekeyidstr(keyidgen($key . "title"),$title);}
+ print OUTFILE "$prj\t$file\t$dummy\t$type\t$gid\t$lid\t$helpid\t$platform\t$width\t$lang\t$text\t$helptext\t$quickhelptext\t$title\t$timestamp\n";
}
}
-print "$count entries\n";
-print "$collisions collisions\n";
close INFILE;
close OUTFILE;
-sub makeID
+sub keyidgen
{
- my ( $String ) = shift;
- my ( $hash );
- # hardcoded to prevent windows installer to choke on bad directoryname :-((
- if ( $String eq "scp2 source\\ooo\\directory_ooo.ulf LngText STR_DIR_KAPITEL " )
+ my $key = shift;
+ my $crc = crc24($key);
+ my $symbols="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz#_";
+ my $keyid = "";
+ while ( length($keyid) < 4 )
{
- return "keyid1";
+ $keyid .= substr($symbols, $crc & 63, 1);
+ $crc = $crc >> 6;
}
-
- $hash = Compress::Zlib::crc32( $String, undef );
- return makenumber( $hash );
+ return $keyid;
}
-sub makenumber
+sub crc24
{
- $h = shift;
- # 1 2 3 4
- # 1234567890123456789012345678901234567890
- $symbols="0123456789abcdefghijklmnopqrstuvwxyz+-[=]";
- $order = length($symbols);
- $result = "";
- while ( length( $result ) < 6 )
+ my $CRC24_INIT = 0x00b704ce;
+ my $CRC24_POLY = 0x00864cfb;
+ my $key = shift;
+ my $key_length = length($key);
+ my $crc = $CRC24_INIT;
+ my $position = 0;
+
+ while ( $position < $key_length )
{
- $result .= substr( $symbols, ($h % $order), 1 );
- $h = int( $h / $order );
+ $crc ^= (unpack("C", substr($key, $position, 1)) << 16);
+ my $i;
+ for ($i = 0; $i < 8; $i++)
+ {
+ $crc <<= 1;
+ $crc ^= $CRC24_POLY if ($crc & 0x01000000)
+ }
+ $position++;
}
- die "makenumber failed because number is too big (this cannot be so this is a strange error)" if $h > 0;
-
- return reverse $result;
+ return $crc & 0x00ffffff;
}
-sub makekidstr
+sub makekeyidstr
{
- $kid = shift;
- $str = shift;
+ my $keyid = shift;
+ my $str = shift;
if ( $str ne "" )
{
# special handling for strings starting with font descriptions like {&Tahoma8} (win system integration)
- if ( $str =~ s/^(\{\&[^\}]+\})// )
+ if ( $str =~ s/^(\{[\&\\][^\}]+\})// )
{
- return "$1$kid‖$str";
+ return "$1$keyid‖$str";
}
else
{
- return "$kid‖$str";
+ return "$keyid‖$str";
}
}
else
{
return "";
}
-# return "default";
-}
-
-sub print_help
-{
- print "\n\n";
- print "keyidGen 0.5 for sdf files\n";
- print "--------------------------\n";
- print "Usage:\n";
- print "keyidGen <infile> [<outfile>] [-dbimport]\n";
- print " add keyids to the entries and write them to a file with\n";
- print " _KeyID added to the name\n";
- print " -dbimport Add KeyID to a new column instead of to the strings.\n";
- print " This is needed to import the IDs into tha database.\n";
- print "\n\n";
-}
-
-
-sub get_options {
- my ($arg,$has_infile);
-
- while ($arg = shift @ARGV) {
- $arg =~ /^-dbimport$/ and $dbimport = 1 and next;
- $arg =~ /^-help$/ and $help = 1 and next; #show help
-
- if ( !$has_infile )
- {
- $infile = $arg;
- $has_infile = 1;
- }
- else
- {
- $outfile = $arg;
- }
- }
}
commit 8c49b1eb73eb8f8433ed86877ffdd08c5f8119c4
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 10:40:32 2011 +0200
remove former key id language code 'kid'
diff --git a/configure.in b/configure.in
index 8a4c4da..6fd2d00 100755
--- a/configure.in
+++ b/configure.in
@@ -8933,7 +8933,6 @@ fi
# check that the list is valid
for lang in $WITH_LANG ; do
test "$lang" = "ALL" && continue;
- test "$lang" = "kid" && continue;
# need to check for the exact string, so add space before and after the list of all languages
for vl in $ALL_LANGS ; do
if test "$vl" = "$lang" ; then
commit 77962008887b1c26a972a63174a385948d5f5701
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 10:27:04 2011 +0200
add qtz (key id pseudolanguage) to langlist.mk
diff --git a/solenv/inc/langlist.mk b/solenv/inc/langlist.mk
index c0d03c7..161bc5b 100644
--- a/solenv/inc/langlist.mk
+++ b/solenv/inc/langlist.mk
@@ -100,6 +100,7 @@ pa-IN \
pl \
pt \
pt-BR \
+qtz \
ro \
ru \
rw \
commit 9683ab6c7e1aa0da504a10e37b199d2c0a5290f1
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 10:22:03 2011 +0200
remove unused BrOffice files
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt
deleted file mode 100644
index 204c608..0000000
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_broo.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-[PRODUCTCODE]
-en-US = "{7FFF1607-39C1-45D7-8D6A-DE97A3FE26A1}"
-pt = "{4BF466E8-7FF4-4422-9FCE-1F0AE3DA00EE}"
-ru = "{34A3166C-BF5E-4751-A52E-CA68C139F688}"
-el = "{614C96E4-DBB0-4EFF-A9BB-2744E75919EB}"
-nl = "{76ABABE4-11C3-4783-BA87-6E76EC58F4DB}"
-fr = "{A8D2F106-57BF-437A-85F2-6FDE96D5E923}"
-es = "{74E55CA0-5F61-4B3F-AFE9-C450C352177F}"
-fi = "{7B47880A-4C73-4052-B41E-9CFDDC09D9B2}"
-hu = "{797671B4-BC60-4171-9084-D97F87B15B99}"
-ca = "{EB478242-B1CC-402C-AAB0-B038446E1BC3}"
-it = "{ED45979C-7EE4-4D04-89C5-489DCEAD1009}"
-cs = "{8DDBA77B-86FB-4AFC-A9CE-7960585108E3}"
-sk = "{7664A926-AA39-4DB6-AE12-98B7305B708B}"
-en-GB = "{4B514E15-F8EB-457D-924E-0C4EA6C29FE5}"
-da = "{6321486D-351A-451F-9C23-FF334A4E41FA}"
-sv = "{76B88102-58E7-4F89-90B9-B21185AA45E5}"
-no = "{1E36FA46-AC57-47FB-94FE-EF7B32B9056C}"
-pl = "{A316E11D-7907-460E-8E64-DEEFCD0F929A}"
-de = "{A3BE065F-8E3B-46CA-946A-101A8E077D2B}"
-pt-BR = "{45B77400-62B3-4469-8B12-A0813B0FE13F}"
-th = "{C37B84EC-EB6B-4909-9866-D582A0E4B27D}"
-et = "{A4107B22-C84B-4783-B1AA-454A884144B7}"
-ja = "{F68C3D57-AB20-4106-B3F2-4A51E8F12D27}"
-ko = "{D6C21010-B224-4121-83BE-BCFD41E2780F}"
-zh-CN = "{D27CE6D1-50E5-4895-8CC0-5D1D25D882F9}"
-zh-TW = "{1203F697-9652-44B2-A806-3F13A53101AC}"
-tr = "{DB6EBF02-F0A5-44ED-AF5C-BF97E2C6570A}"
-hi = "{9BA2E02E-ACFA-4D4A-8F34-12E3F2BA29E5}"
-ar = "{5B8ADBF2-5377-44C7-8ADA-3A3AF516E401}"
-he = "{F893A538-DA46-4667-B580-84DFB3CD5336}"
-multiwestern = "{E954C6C0-1C6E-4BB6-B8F2-F655429E6D73}"
-multiasia = "{881B24EF-5676-481C-B1C4-49964E203329}"
-
-[UPGRADECODE]
-en-US = "{DB4A0242-FD72-41DA-87A2-5466AE05BE03}"
-pt = "{AA393994-0DBE-45A1-8393-BCA1927527F6}"
-ru = "{626BAA92-954C-4A6C-9AF3-F9C146FAEEAB}"
-el = "{B884FE02-C0B1-40A5-9A05-3D92923B10E8}"
-nl = "{83D4730E-7069-4ED8-8D2C-50E2878A84CF}"
-fr = "{2F7D3F37-6191-44BB-8C14-5A0F3D1CDC06}"
-es = "{FCBF48CD-EBE3-4B65-9A9F-C73399CE2BF4}"
-fi = "{CA1322F8-8213-401D-8501-2B70F8F944E0}"
-hu = "{A5FD8B52-2E09-45C5-A84B-67DA1DA8BD93}"
-ca = "{80DD06D1-ABEE-4E85-8C23-E1031FC024B0}"
-it = "{7CA64ED6-373D-4C92-8224-360F1451E828}"
-cs = "{C16BE41C-1534-47E2-9D6F-EE3F45EFB075}"
-sk = "{82ACA684-1BD8-4A22-AC70-5E9754047357}"
-en-GB = "{B2583886-6021-42B5-BB84-71D2C7D9B91E}"
-da = "{953E09D5-4C1E-483A-A792-DD6C9A51D4E9}"
-sv = "{B6DF5C8D-177F-47DE-A9F6-0C6E4FCDF668}"
-no = "{52CFD54B-A5AE-4296-A02C-806083B90FFF}"
-pl = "{9EB27D9C-891F-4B40-A1FA-176D72088860}"
-de = "{73531239-44BD-4EE8-81B1-7EA9A63E2BE1}"
-pt-BR = "{EB286FF5-8182-4F12-8B58-320DABC7472F}"
-th = "{3B67E9E0-7177-420E-AF69-B58A0B9D22D2}"
-et = "{6718E3FB-C936-4699-82C0-E59F45E30D99}"
-ja = "{EDD352F1-431A-4275-A658-C9A516290616}"
-ko = "{69BB5E59-48BC-4906-B700-7E76EAEB076C}"
-zh-CN = "{9D3F52D5-2464-4F4D-9F2A-281B85911F7B}"
-zh-TW = "{8D0A9A70-F424-4FE2-AC27-50F8A409C602}"
-tr = "{CF7A11FA-FE24-427F-979C-016A7E1B2E8E}"
-hi = "{0D1A91F3-4B2D-4893-A720-8795F1DA848B}"
-ar = "{20A9E4BF-6D89-4183-BE25-24C5F693B141}"
-he = "{CC37C202-D6B7-4821-9015-0A25EB4E6CD8}"
-multiwestern = "{B2269A43-2FC5-44AF-A0EE-D85CD2C6135C}"
-multiasia = "{3B4B8C3C-AC32-4644-B7C5-79836EBD6784}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt
deleted file mode 100644
index 204c608..0000000
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_broo.txt
+++ /dev/null
@@ -1,67 +0,0 @@
-[PRODUCTCODE]
-en-US = "{7FFF1607-39C1-45D7-8D6A-DE97A3FE26A1}"
-pt = "{4BF466E8-7FF4-4422-9FCE-1F0AE3DA00EE}"
-ru = "{34A3166C-BF5E-4751-A52E-CA68C139F688}"
-el = "{614C96E4-DBB0-4EFF-A9BB-2744E75919EB}"
-nl = "{76ABABE4-11C3-4783-BA87-6E76EC58F4DB}"
-fr = "{A8D2F106-57BF-437A-85F2-6FDE96D5E923}"
-es = "{74E55CA0-5F61-4B3F-AFE9-C450C352177F}"
-fi = "{7B47880A-4C73-4052-B41E-9CFDDC09D9B2}"
-hu = "{797671B4-BC60-4171-9084-D97F87B15B99}"
-ca = "{EB478242-B1CC-402C-AAB0-B038446E1BC3}"
-it = "{ED45979C-7EE4-4D04-89C5-489DCEAD1009}"
-cs = "{8DDBA77B-86FB-4AFC-A9CE-7960585108E3}"
-sk = "{7664A926-AA39-4DB6-AE12-98B7305B708B}"
-en-GB = "{4B514E15-F8EB-457D-924E-0C4EA6C29FE5}"
-da = "{6321486D-351A-451F-9C23-FF334A4E41FA}"
-sv = "{76B88102-58E7-4F89-90B9-B21185AA45E5}"
-no = "{1E36FA46-AC57-47FB-94FE-EF7B32B9056C}"
-pl = "{A316E11D-7907-460E-8E64-DEEFCD0F929A}"
-de = "{A3BE065F-8E3B-46CA-946A-101A8E077D2B}"
-pt-BR = "{45B77400-62B3-4469-8B12-A0813B0FE13F}"
-th = "{C37B84EC-EB6B-4909-9866-D582A0E4B27D}"
-et = "{A4107B22-C84B-4783-B1AA-454A884144B7}"
-ja = "{F68C3D57-AB20-4106-B3F2-4A51E8F12D27}"
-ko = "{D6C21010-B224-4121-83BE-BCFD41E2780F}"
-zh-CN = "{D27CE6D1-50E5-4895-8CC0-5D1D25D882F9}"
-zh-TW = "{1203F697-9652-44B2-A806-3F13A53101AC}"
-tr = "{DB6EBF02-F0A5-44ED-AF5C-BF97E2C6570A}"
-hi = "{9BA2E02E-ACFA-4D4A-8F34-12E3F2BA29E5}"
-ar = "{5B8ADBF2-5377-44C7-8ADA-3A3AF516E401}"
-he = "{F893A538-DA46-4667-B580-84DFB3CD5336}"
-multiwestern = "{E954C6C0-1C6E-4BB6-B8F2-F655429E6D73}"
-multiasia = "{881B24EF-5676-481C-B1C4-49964E203329}"
-
-[UPGRADECODE]
-en-US = "{DB4A0242-FD72-41DA-87A2-5466AE05BE03}"
-pt = "{AA393994-0DBE-45A1-8393-BCA1927527F6}"
-ru = "{626BAA92-954C-4A6C-9AF3-F9C146FAEEAB}"
-el = "{B884FE02-C0B1-40A5-9A05-3D92923B10E8}"
-nl = "{83D4730E-7069-4ED8-8D2C-50E2878A84CF}"
-fr = "{2F7D3F37-6191-44BB-8C14-5A0F3D1CDC06}"
-es = "{FCBF48CD-EBE3-4B65-9A9F-C73399CE2BF4}"
-fi = "{CA1322F8-8213-401D-8501-2B70F8F944E0}"
-hu = "{A5FD8B52-2E09-45C5-A84B-67DA1DA8BD93}"
-ca = "{80DD06D1-ABEE-4E85-8C23-E1031FC024B0}"
-it = "{7CA64ED6-373D-4C92-8224-360F1451E828}"
-cs = "{C16BE41C-1534-47E2-9D6F-EE3F45EFB075}"
-sk = "{82ACA684-1BD8-4A22-AC70-5E9754047357}"
-en-GB = "{B2583886-6021-42B5-BB84-71D2C7D9B91E}"
-da = "{953E09D5-4C1E-483A-A792-DD6C9A51D4E9}"
-sv = "{B6DF5C8D-177F-47DE-A9F6-0C6E4FCDF668}"
-no = "{52CFD54B-A5AE-4296-A02C-806083B90FFF}"
-pl = "{9EB27D9C-891F-4B40-A1FA-176D72088860}"
-de = "{73531239-44BD-4EE8-81B1-7EA9A63E2BE1}"
-pt-BR = "{EB286FF5-8182-4F12-8B58-320DABC7472F}"
-th = "{3B67E9E0-7177-420E-AF69-B58A0B9D22D2}"
-et = "{6718E3FB-C936-4699-82C0-E59F45E30D99}"
-ja = "{EDD352F1-431A-4275-A658-C9A516290616}"
-ko = "{69BB5E59-48BC-4906-B700-7E76EAEB076C}"
-zh-CN = "{9D3F52D5-2464-4F4D-9F2A-281B85911F7B}"
-zh-TW = "{8D0A9A70-F424-4FE2-AC27-50F8A409C602}"
-tr = "{CF7A11FA-FE24-427F-979C-016A7E1B2E8E}"
-hi = "{0D1A91F3-4B2D-4893-A720-8795F1DA848B}"
-ar = "{20A9E4BF-6D89-4183-BE25-24C5F693B141}"
-he = "{CC37C202-D6B7-4821-9015-0A25EB4E6CD8}"
-multiwestern = "{B2269A43-2FC5-44AF-A0EE-D85CD2C6135C}"
-multiasia = "{3B4B8C3C-AC32-4644-B7C5-79836EBD6784}"
commit 2dbfcccc6f87e88ac76e80624f70aa6061cf9080
Author: Andras Timar <atimar at suse.com>
Date: Fri Sep 16 10:19:48 2011 +0200
change key id pseudolanguage code from kid to qtz
kid is language code of Koshin. It is better to use a code
from the ISO 639 private range.
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
index b833e91..3b3595d 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes.txt
@@ -77,7 +77,6 @@ hu = "{63C087E6-5AC1-4C87-B663-6CEC4BD57935}"
is = "{AD579FC7-4AFF-46A6-A756-110EC862FD17}"
it = "{E9FFB21F-C41B-4A4C-87D1-885D97FE4D4A}"
ja = "{D5E8AF54-134D-4370-BEF6-62BD3049C516}"
-kid = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
ky = "{7854115C-C451-4BCB-86AC-F2257E60373C}"
ka = "{5793EE6E-74B2-4965-A790-0C33ACEF75F0}"
kk = "{BB0063B5-BFFE-4BD8-9FB8-A4778B79E2BC}"
@@ -114,6 +113,7 @@ pl = "{EF16C1BF-539B-4EEE-91E5-0D44C4B72840}"
ps = "{030AFC27-901D-4DA7-B651-E4F3F4AEE708}"
pt = "{EFBDEE97-65AB-4575-B117-976D2EE639D0}"
pt-BR = "{8EE0FF44-307B-4FDC-85F1-EA178C788FA8}"
+qtz = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
ru = "{2CCF1EF8-A263-4B77-8BDD-92D66B30531F}"
rw = "{D27E719E-A9E7-4204-92E8-1FE882264F27}"
sat = "{86E940A4-BE79-4D7C-818F-AE0B190F8AF6}"
diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
index 0564ebc..6310159 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/codes_ooodev.txt
@@ -77,7 +77,6 @@ hu = "{1F70AB81-E96B-414C-AEE1-BD69BAF954CC}"
is = "{27125E19-DCFE-402F-AB8C-82CD9F584D77}"
it = "{6AFA47B1-9285-40CF-A98C-80F9F339A9EE}"
ja = "{B7573A6E-083B-4E1D-8AFF-7003B5401971}"
-kid = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
ky = "{18590BB8-8598-4781-BEDE-4BA660D7DCA3}"
ka = "{6FBAFC4D-EBE8-4880-8644-E87698F5D169}"
kk = "{CDDF1704-0468-4F47-B191-C5D44FF301DA}"
@@ -114,6 +113,7 @@ pl = "{C3CFF998-06D1-48B0-925F-8B2CE21105F2}"
ps = "{0C9FF6FF-3539-4C64-8068-E15FA08BA03D}"
pt = "{7A5DEAF9-2687-447F-803D-594E0966A2E1}"
pt-BR = "{4C644036-3E74-44A6-AE94-55D9E7F2C541}"
+qtz = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
ru = "{C1E77DC8-0C1C-4C2D-B67D-581E91C5BEDF}"
rw = "{CF0171A7-E3C2-4120-AF79-90D426D61204}"
sat = "{53951156-6BF5-416F-8CD2-E37A724A3779}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
index b833e91..3b3595d 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes.txt
@@ -77,7 +77,6 @@ hu = "{63C087E6-5AC1-4C87-B663-6CEC4BD57935}"
is = "{AD579FC7-4AFF-46A6-A756-110EC862FD17}"
it = "{E9FFB21F-C41B-4A4C-87D1-885D97FE4D4A}"
ja = "{D5E8AF54-134D-4370-BEF6-62BD3049C516}"
-kid = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
ky = "{7854115C-C451-4BCB-86AC-F2257E60373C}"
ka = "{5793EE6E-74B2-4965-A790-0C33ACEF75F0}"
kk = "{BB0063B5-BFFE-4BD8-9FB8-A4778B79E2BC}"
@@ -114,6 +113,7 @@ pl = "{EF16C1BF-539B-4EEE-91E5-0D44C4B72840}"
ps = "{030AFC27-901D-4DA7-B651-E4F3F4AEE708}"
pt = "{EFBDEE97-65AB-4575-B117-976D2EE639D0}"
pt-BR = "{8EE0FF44-307B-4FDC-85F1-EA178C788FA8}"
+qtz = "{4A5C3C73-4392-4399-A57C-B0056289FD32}"
ru = "{2CCF1EF8-A263-4B77-8BDD-92D66B30531F}"
rw = "{D27E719E-A9E7-4204-92E8-1FE882264F27}"
sat = "{86E940A4-BE79-4D7C-818F-AE0B190F8AF6}"
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
index 0564ebc..6310159 100644
--- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
+++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/codes_ooodev.txt
@@ -77,7 +77,6 @@ hu = "{1F70AB81-E96B-414C-AEE1-BD69BAF954CC}"
is = "{27125E19-DCFE-402F-AB8C-82CD9F584D77}"
it = "{6AFA47B1-9285-40CF-A98C-80F9F339A9EE}"
ja = "{B7573A6E-083B-4E1D-8AFF-7003B5401971}"
-kid = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
ky = "{18590BB8-8598-4781-BEDE-4BA660D7DCA3}"
ka = "{6FBAFC4D-EBE8-4880-8644-E87698F5D169}"
kk = "{CDDF1704-0468-4F47-B191-C5D44FF301DA}"
@@ -114,6 +113,7 @@ pl = "{C3CFF998-06D1-48B0-925F-8B2CE21105F2}"
ps = "{0C9FF6FF-3539-4C64-8068-E15FA08BA03D}"
pt = "{7A5DEAF9-2687-447F-803D-594E0966A2E1}"
pt-BR = "{4C644036-3E74-44A6-AE94-55D9E7F2C541}"
+qtz = "{E16377E5-4C78-4016-A355-8CE512DA85B4}"
ru = "{C1E77DC8-0C1C-4C2D-B67D-581E91C5BEDF}"
rw = "{CF0171A7-E3C2-4120-AF79-90D426D61204}"
sat = "{53951156-6BF5-416F-8CD2-E37A724A3779}"
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index ff3e9f3..6e95e4c 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -56,7 +56,6 @@ ja 932 1041
jbo 0 1624
ka 0 1079 # Georgian
kab 0 1625
-kid 1252 1033 # key id pseudo language
kk 0 1087
km 0 1107 # Khmer
kn 0 1099 # Kannada
@@ -101,6 +100,7 @@ ps 0 2171
pt 1252 2070
pt-BR 1252 1046
pt-PT 1252 2070
+qtz 1252 1033 # key id pseudo language
rm 0 1047 # Raeto-Romance
ro 1250 1048 # Romanian
ru 1251 1049
More information about the Libreoffice-commits
mailing list