diff options
author | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:12:43 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-04-22 15:12:43 +0200 |
commit | 0caa8c448706e6840b824ddc37f45dbbff31430e (patch) | |
tree | d0de10d2e91ef7794ddc4ef70ac12ac2499645e0 | |
parent | b5594ef534de86c92bd6dc25dde131df0ee1a44d (diff) | |
parent | 3f2d52647980fd05b5f23b1221430ad7cc9dde7d (diff) |
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
-rw-r--r-- | extras/source/autotext/lang/hr-HR/acor_hr-HR.dat | bin | 0 -> 6217 bytes | |||
-rw-r--r-- | extras/source/autotext/lang/it/standard.bau | bin | 44669 -> 49477 bytes | |||
-rw-r--r-- | extras/source/autotext/lang/lt-LT/acor_lt-LT.dat | bin | 0 -> 3208 bytes | |||
-rw-r--r-- | extras/source/autotext/lang/nl-BE/acor_nl-BE.dat | bin | 0 -> 18310 bytes | |||
-rw-r--r-- | extras/source/wordbook/makefile.mk | 5 | ||||
-rw-r--r-- | extras/source/wordbook/oracle.dic | 500 | ||||
-rw-r--r-- | extras/source/wordbook/standard.dic | 4 | ||||
-rw-r--r-- | extras/util/target.pmk | 1 |
8 files changed, 1 insertions, 509 deletions
diff --git a/extras/source/autotext/lang/hr-HR/acor_hr-HR.dat b/extras/source/autotext/lang/hr-HR/acor_hr-HR.dat Binary files differnew file mode 100644 index 000000000000..38a998595c7b --- /dev/null +++ b/extras/source/autotext/lang/hr-HR/acor_hr-HR.dat diff --git a/extras/source/autotext/lang/it/standard.bau b/extras/source/autotext/lang/it/standard.bau Binary files differindex 37dc3d492d36..1d1679c62508 100644 --- a/extras/source/autotext/lang/it/standard.bau +++ b/extras/source/autotext/lang/it/standard.bau diff --git a/extras/source/autotext/lang/lt-LT/acor_lt-LT.dat b/extras/source/autotext/lang/lt-LT/acor_lt-LT.dat Binary files differnew file mode 100644 index 000000000000..d638ff34c57b --- /dev/null +++ b/extras/source/autotext/lang/lt-LT/acor_lt-LT.dat diff --git a/extras/source/autotext/lang/nl-BE/acor_nl-BE.dat b/extras/source/autotext/lang/nl-BE/acor_nl-BE.dat Binary files differnew file mode 100644 index 000000000000..ecfe671f9699 --- /dev/null +++ b/extras/source/autotext/lang/nl-BE/acor_nl-BE.dat diff --git a/extras/source/wordbook/makefile.mk b/extras/source/wordbook/makefile.mk index d65e627bab3d..f5026b47e2de 100644 --- a/extras/source/wordbook/makefile.mk +++ b/extras/source/wordbook/makefile.mk @@ -42,11 +42,6 @@ ZIP1TARGET = $(WORDBOOK_ALL_TARGET) ZIP1LIST = technical.dic -ZIP2TARGET = $(WORDBOOK_USER_TARGET) - -ZIP2LIST = standard.dic - - .INCLUDE : target.mk diff --git a/extras/source/wordbook/oracle.dic b/extras/source/wordbook/oracle.dic index 5b7ab0957916..6355596d3ad4 100644 --- a/extras/source/wordbook/oracle.dic +++ b/extras/source/wordbook/oracle.dic @@ -2,401 +2,73 @@ OOoUserDict1 lang: <none> type: positive --- -Accelerator -Access -Accessibility -Account -Accounting -Accounts Acorde= -Activity -Adapter -Adapters -Add-in -Add-on -Add-On -Administration -Administrator -Admissions -Advanced -Advantage -Advisor -Agent -Agents -Agile -Analysis -Analytics -Analyzer AppConnect= -Application -Applications AppWizard= AppXaminer= AppXNavigator= AppXRay= -Architecture Argus= -Asset -Assets -Assistant -Automation -Automotive AutoVue= -Backbone -Banking -Base Base24= -Based Basel= Beehive= Berkeley -Bill -Billing -Bills -Blade BookBuilder= Brocade= -Budgeting -Budgets -Builder -Bulk -Bus -Business CADView= Calc= -Call -Campaigns -Campus -Candidate -Capital Captovation= -Capture -Care -Cartridge -Case -Cash -Center -Certified -Chain -Change ChangeCast= -Channel Cisco= Clickstream= -Client -Clinical -Cluster -Clusters Cognos= -Coherence -Collaboration -Collaborative -Collection -Collections -Commerce -Commercial -Communications -Compensation -Compliance -Component -Components -Configuration -Configurator Connect2OracleSelf= -Connection -Connector -Console -Consulting -Consumer -Contact -Content ConText= -Contract -Contracts -Control -Controls -Core COREid= -Corporate Corporation= -Costing -Credit -Crypto -Crystal -Custom -Customer -Customers -Dashboard -Dashboards -Data -Database Datacenter= -Daybreak -Delivery -Demand Demantra= -Designer -Desktop -Developer -Development -Device -Direct -Director -Directory -Discoverer -Discrete -Distribution DistributionRPM= DocLink= Docuflex= Documaker= -Document Documentum= Draw= -Dynamic E-Business= -e-Commerce -E-Delivery -E-Factoring -E-Mail -E-Records -e-Support Easy*SQL= -eAutomotive= -eBenefits= -eBill= -eBilling= -eCommunications= -eCompensation= -eConfigurator= -eConsumer= -eCustomer= -eDevelopment= -Edition -Education Edwards -eEnergy= -eEvents= -eFinance= -eHealthcare= -eInsurance= -Electro-Mechanical Ellison= -Email -eMail -eMedia= -Encyclopedia -Energy -Engine -Enterprise EnterpriseOne= -eOil= -ePay= -ePayment= -ePerformance= -eProcurement= -eProfile= -ePublic= -eRecruit= -eRetail= -eSales= -eService= -eSettlements= -Essbase= -Estate -eStatement= -eSupplier= -Ethernet -eTransportation= -eTravel= Exadata= -Exchange -Execution -Expansion -Express -ExpressModule= -Extension -Extensions -FastForward= -Field -FieldService= -FileAct= -Filenet= -Finance -Financial -Financials -FinancialsRPM= -Fire= -Flash= -FlashFire= -Floor -Flow -Foundation -Framework -Fulfillment -Funds -Fusion -Gateway -General -Gigabit GigaSwift= -Global -GoldenGate= -Goods -Government -Gradebook= -Grants -Group -Handheld -Healthcare HelpDesk= -High -Hub -Human Hummingbird= Hyperion= -i-flex -iAssets= -iClaims= -iDelivery= -Identity -iGovernment= -iLearning= -iMarketing= -iMeeting= Impress= -Incentive -Industry -InfiniBand= -Information Informix= -Infosync= -Infrastructure -Insight -Institutional -Insurance -Integration -Integrator -Intellectual -Intelligence -InterAct= -Interaction -Interactive -InterConnect= -InterDev= -Interface -interMedia= -Inventory -iPayment= -iPLS= -iProcurement= -iReceivables= -iRecruitment= -iSetup= iSQL*Plus= -iStore= -IStream= -iSupplier= -iSupport= -iWay= Java= JDeveloper= JeOS -JHeadstart= -Jinitiator= -Jolt= -JRockit= -JServer= -Kit -Kodo= -Labor Larry= -Learning -Lease -Leasing -Ledger -Legal -Lending -Library -Life -Lifecycle -Lines Linux -Livelink= -Load -Loans -LogMiner= -Loyalty -Machine -Mainframe -Maintenance -Managed -Management -management -Manager -Managers -Mantas= -Manufacturing -Marketing -Mart -Marts -Master Math= MatrixOne= -Media -Medical -MessageQ= -Messaging -Metadata -MetaSolv= Microsoft= -MicroStrategy= -Middleware -Migration -Mobile -Model -Modeling -Module -Modules -Monitor -Monitoring -Multi-Currency -Multi-Site -Multichannel -MultiChannel= MultiDB= -Multilayer -Multinational -Multiprotocol -MultiProtocol= -Multiservice -Multisite -Multithreaded NetApp= Netra= NetSolutions= -Network Nostro= Objectel= -Objects Office= -On -OnDemand= -One -Online -OnLine= -Onsite -Open= OpenBeleid= OpenDocument= OpenOffice.org= OpenText= OpenWorld= OpenZorg= -Operational -Operations -Optimization -Option Oracle= OracleBRONZE= OracleCONTACT= @@ -411,201 +83,38 @@ Oraclemetals= OraclePLATINUM= OracleSILVER= OracleSTERLING= -Order -Origination -Outage -Pack -Parkway= -Partner -PartnerNetwork= -Payable -Payables -Payment -Payments -Payroll -PayrollRPM= PeopleBooks= PeopleCode= PeopleSoft= -Peoplesoft= PeopleTools= -Performance -Personal Phaos= -Pharma -Planning -Platform -Plug-in -Plug-In -Plug-ins -Plus -Point -Policies -Policy -Port -Portal PortalRPM= -Pricing Primavera= -PrimeSourcing= -Process -ProcessConnect= -Processing -Processor -Procurement -Product -product -Production -Productivity -Professional -Profiles -Profitability -Project ProjectsRPM= -Promotions -Property -Provider -Provisioning -Public -Publisher -Purchasing -Quality -Quickclip= -Quoting -Rack -Rally -Rating -Real -Real -Real-Time -Receivables -Records -Recruiting Redwood= -Reference -Relationship -Repair -Reporting -Reports -Repository -Resource -Resources -ResourcesRPM= -Retail Reveleus= -Revenue -Risk RosettaNet= -Rules -Sale -Sales -Samples Satmetrix= -Scheduler -Scheduling -Sciences -Scorecard -Search -Sector -Secure SecureCARE= -Security -Self -SellingPoint= -Server -Service -Services -Servicing Shores= Siebel= -Sign-On SimBuilder= -Single -Site SiteMinder= SkillsVillage= -Smart SmartScript= SmartViews= -Software -Solution -Solutions Sophoi= -Sourcing -Space Spatial= SSLava= -Standard -Steward -Storage StorageTek= -Store -Strategic -Student -Studio -StyleBox= -Subledger -Succession -Suite Sun= SunHSI= SunSAI= -Superior -Supervisor -Supply -Support -SupportInsite= -SupportNews= -SupportNotes= -SureTrak= SWIFTNet= -Switch -Switching -System -Talent -Taxation -Tech -Technology Telco= -Telecom -Telemarketing -Telephony -TeleSales= -TeleService= -Testing -Theory -Time -TimesTen= -Tools -TopLink= -TopPlan= -Tracking -Trade -Trading -Transaction -Transfer -Transparent -Transportation -Treasury -Trial -TrialMinder= Tuxedo= Unbreakable= -Unified -Universal -Update -Upgrade -User -Utilities -Utility -Value -Vault -Veridata -Virtual VoIP= -VueLink= -Warehouse -Web WebCast= WebCenter= WebDB= @@ -615,12 +124,5 @@ Webmail WebServer= WebTrack= Whitehill= -Wireless -Work -Workflow -Workforce -Workgroup -Workspace -Workspaces World -Writer= +Writer=
\ No newline at end of file diff --git a/extras/source/wordbook/standard.dic b/extras/source/wordbook/standard.dic deleted file mode 100644 index 5b8b235b5dd0..000000000000 --- a/extras/source/wordbook/standard.dic +++ /dev/null @@ -1,4 +0,0 @@ -OOoUserDict1
-lang: <none>
-type: positive
----
\ No newline at end of file diff --git a/extras/util/target.pmk b/extras/util/target.pmk index 88122ebc58ee..c26bd8504df7 100644 --- a/extras/util/target.pmk +++ b/extras/util/target.pmk @@ -191,7 +191,6 @@ TEMPLATE_WIZARD_WEB_TARGET = tplwizweb WORDBOOK_ALL_TARGET = wordbook -WORDBOOK_USER_TARGET = wordbookuser FONTS_WIN_ARIOSO_BOLD = fontwinariosobold FONTS_WIN_ARIOSO_NORMAL = fontwinariosonormal |