- updated for 1.2.0-pre2

- .desktop moved to desktopdir

Changed files:
    audacity-helpfile_location.patch -> 1.3
    audacity-not_require_lame-libs-devel.patch -> 1.5
    audacity-opt.patch -> 1.3
    audacity.desktop -> 1.2

diff --git a/audacity-helpfile_location.patch b/audacity-helpfile_location.patch
index 1b493ff2ce76e9cc32d513560e0ba80c8f7eb1e7..b8016f8ebd660f7bd725c77f110ceebd9d934805 100644 (file)
--- a/audacity-helpfile_location.patch
+++ b/audacity-helpfile_location.patch
@@ -1,11 +1,12 @@
---- audacity-src-1.1.1-3/src/Help.cpp.orig     Mon Nov 11 07:58:21 2002
-+++ audacity-src-1.1.1-3/src/Help.cpp  Sat Jan 25 01:08:40 2003
-@@ -81,7 +81,7 @@
+diff -aurN audacity-src-1.2.0-pre2.orig/src/Help.cpp audacity-src-1.2.0-pre2/src/Help.cpp
+--- audacity-src-1.2.0-pre2.orig/src/Help.cpp  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/src/Help.cpp       2003-10-16 13:54:11.380095056 +0200
+@@ -48,7 +48,7 @@
        if (helpFiles.GetCount() > 0)
           defaultLoc = helpFiles[0];
        else
--         defaultLoc = INSTALL_PREFIX "/share/doc/audacity/audacity-help.htb";
-+         defaultLoc = INSTALL_PREFIX "/share/audacity/audacity-help.htb";
+-         defaultLoc = INSTALL_PREFIX "/share/doc/audacity/audacity-1.2-help.htb";
++         defaultLoc = INSTALL_PREFIX "/share/audacity/audacity-1.2-help.htb";
  
        wxString helpFilePath =
-           gPrefs->Read("/Help/HelpFilePath", defaultLoc);
+           gPrefs->Read("/Help/HelpFilePath1.2", defaultLoc);

diff --git a/audacity-not_require_lame-libs-devel.patch b/audacity-not_require_lame-libs-devel.patch
index e300f246e6ee4888b5fd76b374b87dd1a6065aab..a31d59dc8314461921d2f2f748c0e6f2e1f3eaba 100644 (file)
--- a/audacity-not_require_lame-libs-devel.patch
+++ b/audacity-not_require_lame-libs-devel.patch
@@ -1,6 +1,7 @@
---- audacity-src-1.1.3/locale/bg.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/bg.po    Fri Mar 28 01:51:37 2003
-@@ -606,19 +606,19 @@
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/bg.po audacity-src-1.2.0-pre2/locale/bg.po
+--- audacity-src-1.2.0-pre2.orig/locale/bg.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/bg.po       2003-10-16 14:38:48.096172360 +0200
+@@ -597,19 +597,19 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -23,21 +24,22 @@
 +"Æåëàåòå ëè íåçàáàâíî òúðñåíå çà libmp3lame.so.0?"
  
  #: ../src/AboutDialog.cpp:114
- msgid "Audacity is a free program being written by a team of developers using Sourceforge, an online service for open-source projects.  It is based on the wxWindows toolkit and is available for Windows, MacOS 9 and X, Linux, and other Unix-like systems."
-@@ -2051,8 +2051,8 @@
+ msgid "Audacity is a free program written by a team of volunteer developers around the world.  Coordination happens thanks to SourceForge.net, an online service that provides free tools to open-source software projects.  Audacity is available for Windows 98 and newer, Mac OS X, Linux, and other Unix-like operating systems.  Older versions of Audacity are available for Mac OS 9."
+@@ -2465,8 +2465,8 @@
  msgstr "Ñàìî lame_enc.dll|lame_enc.dll|Áèáëèîòåêè çà äèíàì. ñâúðçâàíå (*.dll)|*.dll|Âñè÷êè ôàéëîâå (*.*)|*"
  
- #: ../src/export/ExportMP3.cpp:232
--msgid "Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files (*)|*"
--msgstr "Ñàìî libmp3lame.so|libmp3lame.so|Ñïîäåëåíè îáåêòíè ôàéëîâå (*.so)|*.so|Âñè÷êè ôàéëîâå (*)|*"
-+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files (*)|*"
-+msgstr "Ñàìî libmp3lame.so.0|libmp3lame.so.0|Ñïîäåëåíè îáåêòíè ôàéëîâå (*.so)|*.so|Âñè÷êè ôàéëîâå (*)|*"
- 
- #: ../src/commands.h:214
- msgid "Open"
---- audacity-src-1.1.3/locale/ca.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/ca.po    Fri Mar 28 01:51:37 2003
-@@ -550,19 +550,19 @@
+ #: ../src/export/ExportMP3.cpp:235
+-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+-msgstr "Ñàìî libmp3lame.so|libmp3lame.so|Ïúðâè÷íè ñïîäåëåíè îáåêòíè ôàéëîâå (*.so)|*.so|Ðàçøèðåíè áèáëèîòåêè (*.so*)|*.so*|Âñè÷êè ôàéëîâå (*)|*"
++msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
++msgstr "Ñàìî libmp3lame.so.0|libmp3lame.so.0|Ïúðâè÷íè ñïîäåëåíè îáåêòíè ôàéëîâå (*.so)|*.so|Ðàçøèðåíè áèáëèîòåêè (*.so*)|*.so*|Âñè÷êè ôàéëîâå (*)|*"
+ 
+ #: ../src/Legacy.cpp:330
+ msgid "Opening Audacity Project"
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/ca.po audacity-src-1.2.0-pre2/locale/ca.po
+--- audacity-src-1.2.0-pre2.orig/locale/ca.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/ca.po       2003-10-16 14:38:48.106170840 +0200
+@@ -595,19 +595,19 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -49,8 +51,8 @@
 -"Would you like to locate libmp3lame.so now?"
 +"Would you like to locate libmp3lame.so.0 now?"
  msgstr ""
- "L'Audacity no exporta directament els fitxer de MP3 però enlloc d'això empra la \n"
- "llibreria gratuïta LAME per manejar la codificació de MP3.  Heu de \n"
+ "L'Audacity no exporta directament els fitxer d'MP3 però enlloc d'això empra la \n"
+ "llibreria gratuïta LAME per manejar la codificació d'MP3.  Heu de \n"
 -"obtenir libmp3lame.so separadament, descarregant-lo o  muntant-lo \n"
 +"obtenir libmp3lame.so.0 separadament, descarregant-lo o  muntant-lo \n"
  "des de les fonts, i llavors localitzar-lo per a l'Audacity.  Només ho \n"
@@ -60,21 +62,63 @@
 +"Desitgeu localitzar ara la llibreria libmp3lame.so.0?"
  
  #: ../src/AboutDialog.cpp:114
- msgid "Audacity is a free program being written by a team of developers using Sourceforge, an online service for open-source projects.  It is based on the wxWindows toolkit and is available for Windows, MacOS 9 and X, Linux, and other Unix-like systems."
-@@ -2005,8 +2005,8 @@
+ msgid "Audacity is a free program written by a team of volunteer developers around the world.  Coordination happens thanks to SourceForge.net, an online service that provides free tools to open-source software projects.  Audacity is available for Windows 98 and newer, Mac OS X, Linux, and other Unix-like operating systems.  Older versions of Audacity are available for Mac OS 9."
+@@ -2462,8 +2462,8 @@
  msgstr "Només lame_enc.dll|lame_enc.dll|Llibreries enllaçades dinàmicament (*.dll)|*.dll|Tots els fitxers (*.*)|*"
  
- #: ../src/export/ExportMP3.cpp:232
--msgid "Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files (*)|*"
--msgstr "Només libmp3lame.so|libmp3lame.so|Fitxers d'objectes compartits (*.so)|*.so|Tots els fitxers (*)|*"
-+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files (*)|*"
-+msgstr "Només libmp3lame.so.0|libmp3lame.so.0|Fitxers d'objectes compartits (*.so)|*.so|Tots els fitxers (*)|*"
- 
- #: ../src/commands.h:196
- msgid "Open"
---- audacity-src-1.1.3/locale/da.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/da.po    Fri Mar 28 01:51:37 2003
-@@ -569,19 +569,19 @@
+ #: ../src/export/ExportMP3.cpp:235
+-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+-msgstr "Només libmp3lame.so|libmp3lame.so|Fitxers d'objectes primaris compartits (*.so)|*.so|Llibreries exteses (*.so*)|*.so*|Tots els fitxers (*)|*"
++msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
++msgstr "Només libmp3lame.so.0|libmp3lame.so.0|Fitxers d'objectes primaris compartits (*.so)|*.so|Llibreries exteses (*.so*)|*.so*|Tots els fitxers (*)|*"
+ 
+ #: ../src/Legacy.cpp:330
+ msgid "Opening Audacity Project"
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/cs.po audacity-src-1.2.0-pre2/locale/cs.po
+--- audacity-src-1.2.0-pre2.orig/locale/cs.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/cs.po       2003-10-16 14:38:48.116169320 +0200
+@@ -586,7 +586,7 @@
+ "Would you like to locate lame_enc.dll now?"
+ msgstr ""
+ "Audacity neexportuje MP3 soubory přímo, ale používá ke kódování\n"
+-"volně šiřitelnou knihovnu LAME.  Soubor libmp3lame.so si musíte\n"
++"volně šiřitelnou knihovnu LAME.  Soubor libmp3lame.so.0 si musíte\n"
+ "opatřit zvlášť tak, že downloadujete LAME MP3 encoder a potom soubor\n"
+ " vyhledáte z dialogu Audacity. Udělat to musíte pouze jednou.\n"
+ "\n"
+@@ -597,14 +597,14 @@
+ msgid ""
+ "Audacity does not export MP3 files directly, but instead uses the \n"
+ "freely available LAME library to handle MP3 file encoding.  You must \n"
+-"obtain libmp3lame.so separately, either by downloading it or building \n"
++"obtain libmp3lame.so.0 separately, either by downloading it or building \n"
+ "it from the sources, and then locate the file for Audacity.  You only \n"
+ "need to do this once.\n"
+ "\n"
+-"Would you like to locate libmp3lame.so now?"
++"Would you like to locate libmp3lame.so.0 now?"
+ msgstr ""
+ "Audacity neexportuje PM3 soubory přímo, ale používá ke kódování\n"
+-"volně šiřitelnou knihovnu LAME.  Soubor libmp3lame.so si musíte\n"
++"volně šiřitelnou knihovnu LAME.  Soubor libmp3lame.so.0 si musíte\n"
+ "opatřit zvlášť buď tak, že ji downloadujete nebo zkompilujete\n"
+ "ze zdrojových kódů a potom ji vyhledáte z dialogu Audacity.\n"
+ "Udělat to musíte pouze jednou.\n"
+@@ -2464,8 +2464,8 @@
+ msgstr "Jen lame_enc.dll|lame_enc.dll|Dynamicky linkované knihovny (*.dll)|*.dll|Všechny soubory (*.*)|*"
+ 
+ #: ../src/export/ExportMP3.cpp:235
+-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+-msgstr "Pouze libmp3lame.so|libmp3lame.so|Soubory primárně sdílených objektů (*.so)|*.so|Rozšířené knihovny (*.so*)|*.so*|Všechny soubory (*)|*"
++msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
++msgstr "Pouze libmp3lame.so.0|libmp3lame.so.0|Soubory primárně sdílených objektů (*.so)|*.so|Rozšířené knihovny (*.so*)|*.so*|Všechny soubory (*)|*"
+ 
+ #: ../src/Legacy.cpp:330
+ msgid "Opening Audacity Project"
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/da.po audacity-src-1.2.0-pre2/locale/da.po
+--- audacity-src-1.2.0-pre2.orig/locale/da.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/da.po       2003-10-16 14:38:48.127167648 +0200
+@@ -600,19 +600,19 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -97,21 +141,22 @@
 +"Vil du prøve at finde libmp3lame.so.0 nu?"
  
  #: ../src/AboutDialog.cpp:114
- msgid "Audacity is a free program being written by a team of developers using Sourceforge, an online service for open-source projects.  It is based on the wxWindows toolkit and is available for Windows, MacOS 9 and X, Linux, and other Unix-like systems."
-@@ -2064,8 +2064,8 @@
+ msgid "Audacity is a free program written by a team of volunteer developers around the world.  Coordination happens thanks to SourceForge.net, an online service that provides free tools to open-source software projects.  Audacity is available for Windows 98 and newer, Mac OS X, Linux, and other Unix-like operating systems.  Older versions of Audacity are available for Mac OS 9."
+@@ -2499,8 +2499,8 @@
  msgstr "Kun lame_enc.dll|lame_enc.dll|Dynamisk linkede biblioteker (*.dll)|*.dll|All Files (*.*)|*"
  
- #: ../src/export/ExportMP3.cpp:232
--msgid "Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files (*)|*"
--msgstr "Kun libmp3lame.so|libmp3lame.so|Delte objektifler (*.so)|*.so|All Files (*)|*"
-+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files (*)|*"
-+msgstr "Kun libmp3lame.so.0|libmp3lame.so.0|Delte objektifler (*.so)|*.so|All Files (*)|*"
- 
- #: ../src/commands.h:196
- msgid "Open"
---- audacity-src-1.1.3/locale/de.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/de.po    Fri Mar 28 01:51:37 2003
-@@ -612,11 +612,11 @@
+ #: ../src/export/ExportMP3.cpp:235
+-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+-msgstr "Kun libmp3lame.so|libmp3lame.so|Primære delte objektfiler (*.so)|*.so|Udvidede biblioteker (*.so*)|*.so*|Alle filer (*)|*"
++msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
++msgstr "Kun libmp3lame.so.0|libmp3lame.so.0|Primære delte objektfiler (*.so)|*.so|Udvidede biblioteker (*.so*)|*.so*|Alle filer (*)|*"
+ 
+ #: ../src/Legacy.cpp:330
+ msgid "Opening Audacity Project"
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/de.po audacity-src-1.2.0-pre2/locale/de.po
+--- audacity-src-1.2.0-pre2.orig/locale/de.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/de.po       2003-10-16 14:38:48.137166128 +0200
+@@ -621,11 +621,11 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -123,22 +168,25 @@
 -"Would you like to locate libmp3lame.so now?"
 +"Would you like to locate libmp3lame.so.0 now?"
  msgstr ""
- "Audacity exportiert MP3-Dateien nicht direkt, sondern benutzt dafür\n"
- "die frei verfügbare LAME MP3-Bibliothek. Sie müssen sich lame_enc.dll separat besorgen,\n"
-@@ -2063,8 +2063,8 @@
- msgstr "Nur lame_enc.dll|lame_enc.dll|Dynamisch gelinkte Bibliotheken (*.dll)|*.dll|Alle Dateien (*.*)|*"
+ "Audacity exportiert MP3-Dateien nicht direkt, sondern benutzt\n"
+ "die frei verfügbare LAME MP3-Bibliothek. sie müssen sich die \n"
+@@ -2492,10 +2492,10 @@
  
- #: ../src/export/ExportMP3.cpp:232
--msgid "Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files (*)|*"
--msgstr "Nur libmp3lame.so|libmp3lame.so|Shared Object Dateien (*.so)|*.so|Alle Dateien (*)|*"
-+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files (*)|*"
-+msgstr "Nur libmp3lame.so.0|libmp3lame.so.0|Shared Object Dateien (*.so)|*.so|Alle Dateien (*)|*"
- 
- #: ../src/commands.h:214
- msgid "Open"
---- audacity-src-1.1.3/locale/es.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/es.po    Fri Mar 28 01:51:37 2003
-@@ -601,19 +601,19 @@
+ #: ../src/export/ExportMP3.cpp:235
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|"
++"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
+ "Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+ msgstr ""
+-"Nur libmp3lame.so|libmp3lame.so|Shared Object Dateien (*.so)|*.so| "
++"Nur libmp3lame.so.0|libmp3lame.so.0|Shared Object Dateien (*.so)|*.so| "
+ "Extended Libraries (*.so*)|*.so*|Alle Dateien (*)|*"
+ 
+ #: ../src/Legacy.cpp:330
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/es.po audacity-src-1.2.0-pre2/locale/es.po
+--- audacity-src-1.2.0-pre2.orig/locale/es.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/es.po       2003-10-16 14:38:48.147164608 +0200
+@@ -587,19 +587,19 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -161,82 +209,22 @@
 +"¿Quisieras localizar libmp3lame.so.0 ahora?"
  
  #: ../src/AboutDialog.cpp:114
- msgid "Audacity is a free program being written by a team of developers using Sourceforge, an online service for open-source projects.  It is based on the wxWindows toolkit and is available for Windows, MacOS 9 and X, Linux, and other Unix-like systems."
-@@ -2046,8 +2046,8 @@
+ msgid "Audacity is a free program written by a team of volunteer developers around the world.  Coordination happens thanks to SourceForge.net, an online service that provides free tools to open-source software projects.  Audacity is available for Windows 98 and newer, Mac OS X, Linux, and other Unix-like operating systems.  Older versions of Audacity are available for Mac OS 9."
+@@ -2448,8 +2448,8 @@
  msgstr "Sólo lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|Todos los Archivos (*.*)|*"
  
- #: ../src/export/ExportMP3.cpp:232
--msgid "Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files (*)|*"
--msgstr "Sólo libmp3lame.so|libmp3lame.so|Archivos Shared Object (*.so)|*.so|Todos los Archivos (*)|*"
-+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files (*)|*"
-+msgstr "Sólo libmp3lame.so.0|libmp3lame.so.0|Archivos Shared Object (*.so)|*.so|Todos los Archivos (*)|*"
- 
- #: ../src/commands.h:214
- msgid "Open"
---- audacity-src-1.1.3/locale/fr.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/fr.po    Fri Mar 28 01:51:37 2003
-@@ -578,11 +578,11 @@
- msgid ""
- "Audacity does not export MP3 files directly, but instead uses the \n"
- "freely available LAME library to handle MP3 file encoding.  You must \n"
--"obtain libmp3lame.so separately, either by downloading it or building \n"
-+"obtain libmp3lame.so.0 separately, either by downloading it or building \n"
- "it from the sources, and then locate the file for Audacity.  You only \n"
- "need to do this once.\n"
- "\n"
--"Would you like to locate libmp3lame.so now?"
-+"Would you like to locate libmp3lame.so.0 now?"
- msgstr "Audacity n'exporte pas directement les fichiers MP3, mais utilise à la place\n"
- "la librairie LAME gratuite pour prendre en charge l'encodage des fichiers MP3."
- 
-@@ -2023,7 +2023,7 @@
- msgstr "Dynamically Linked Libraries (*.dll)|*.dll"
- 
- #: ../src/export/ExportMP3.cpp:232
--msgid "Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files (*)|*"
-+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files (*)|*"
- msgstr ""
- 
- #: ../src/commands.h:214
---- audacity-src-1.1.3/locale/hu.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/hu.po    Fri Mar 28 01:51:37 2003
-@@ -668,20 +668,20 @@
- msgid ""
- "Audacity does not export MP3 files directly, but instead uses the \n"
- "freely available LAME library to handle MP3 file encoding.  You must \n"
--"obtain libmp3lame.so separately, either by downloading it or building \n"
-+"obtain libmp3lame.so.0 separately, either by downloading it or building \n"
- "it from the sources, and then locate the file for Audacity.  You only \n"
- "need to do this once.\n"
- "\n"
--"Would you like to locate libmp3lame.so now?"
-+"Would you like to locate libmp3lame.so.0 now?"
- msgstr ""
- "Az Audacity nem exportálja közvetlenül az MP3 fájlokat, inkább az ingyen \n"
- "használható LAME könyvtárat használja az MP3 fájlkódolás kezeléséhez.\n"
--"Ezért vagy töltse le a libmp3lame.so fájlt, vagy készítse el a "
-+"Ezért vagy töltse le a libmp3lame.so.0 fájlt, vagy készítse el a "
- "forrásfájlokból, \n"
- "majd határozza meg a helyét az Audacity számára.  Csak egyszer van erre \n"
- "szükség.\n"
- "\n"
--"Szeretné most megadni a libmp3lame.so helyét?"
-+"Szeretné most megadni a libmp3lame.so.0 helyét?"
- 
- #: ../src/AboutDialog.cpp:114
- #, fuzzy
-@@ -2132,7 +2132,7 @@
- 
- #: ../src/export/ExportMP3.cpp:232
- msgid ""
--"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
-+"Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files "
- "(*)|*"
- msgstr ""
- 
---- audacity-src-1.1.3/locale/it.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/it.po    Fri Mar 28 01:51:38 2003
-@@ -652,19 +652,19 @@
+ #: ../src/export/ExportMP3.cpp:235
+-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+-msgstr "Sólo libmp3lame.so|libmp3lame.so|Primary Shared Object (*.so)|*.so|Extended Libraries (*.so*)|*.so*|Todos los Archivos (*)|*"
++msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
++msgstr "Sólo libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object (*.so)|*.so|Extended Libraries (*.so*)|*.so*|Todos los Archivos (*)|*"
+ 
+ #: ../src/Legacy.cpp:330
+ msgid "Opening Audacity Project"
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/it.po audacity-src-1.2.0-pre2/locale/it.po
+--- audacity-src-1.2.0-pre2.orig/locale/it.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/it.po       2003-10-16 14:38:48.159162784 +0200
+@@ -624,19 +624,19 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -249,7 +237,7 @@
 +"Would you like to locate libmp3lame.so.0 now?"
  msgstr ""
  "Audacity non esporta direttamente in file MP3 ma invece usa la libreria LAME "
- "per l'encoding\n"
+ "per la codifica\n"
 -"E' necessario ottenere il libmp3lame.so separatamente scaricandolo e "
 +"E' necessario ottenere il libmp3lame.so.0 separatamente scaricandolo e "
  "compilandolo dai sorgenti  e localizzare questo file per Audacity.  Lo devi "
@@ -260,22 +248,23 @@
  
  #: ../src/AboutDialog.cpp:114
  msgid ""
-@@ -2101,10 +2101,10 @@
+@@ -2541,10 +2541,10 @@
  
  #: ../src/export/ExportMP3.cpp:232
  msgid ""
--"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
-+"Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files "
- "(*)|*"
+-"Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|"
++"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
+ "Extended Libraries (*.so*)|*.so*|All Files (*)|*"
  msgstr ""
--"Solo libmp3lame.so|libmp3lame.so|File oggetto condivisi(*.so)|*.so|Tutti i "
-+"Solo libmp3lame.so.0|libmp3lame.so.0|File oggetto condivisi(*.so)|*.so|Tutti i "
- "file (*)|*"
- 
- #: ../src/commands.h:214
---- audacity-src-1.1.3/locale/ja.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/ja.po    Fri Mar 28 01:51:38 2003
-@@ -541,11 +541,11 @@
+-"Solo libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|"
++"Solo libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
+ "Librerie estese (*.so*)|*.so*|All Files (*)|*"
+ 
+ #: ../src/import/ImportLOF.cpp:394
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/mk.po audacity-src-1.2.0-pre2/locale/mk.po
+--- audacity-src-1.2.0-pre2.orig/locale/mk.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/mk.po       2003-10-16 14:38:48.169161264 +0200
+@@ -632,19 +632,19 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -287,20 +276,35 @@
 -"Would you like to locate libmp3lame.so now?"
 +"Would you like to locate libmp3lame.so.0 now?"
  msgstr ""
+ "Audacity не експортира MP3 директно, но сепак ја користи \n"
+ "слободно достапната LAME библиотека за работа со MP3 енкодирање. Морате\n"
+-"да ја набавите libmp3lame.so посебно, симнувајќи ја или градејќи ја \n"
++"да ја набавите libmp3lame.so.0 посебно, симнувајќи ја или градејќи ја \n"
+ "од изворникот и потоа да ја лоцирате за Audacity. Само еднаш \n"
+ "треба да го направите ова.\n"
+ "\n"
+-"Сакате ли да ја лоцирате libmp3lame.so сега?"
++"Сакате ли да ја лоцирате libmp3lame.so.0 сега?"
  
  #: ../src/AboutDialog.cpp:114
-@@ -1978,7 +1978,7 @@
- msgstr ""
+ msgid ""
+@@ -2383,10 +2383,10 @@
  
  #: ../src/export/ExportMP3.cpp:232
--msgid "Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files (*)|*"
-+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files (*)|*"
+ msgid ""
+-"Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|"
++"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
+ "Extended Libraries (*.so*)|*.so*|All Files (*)|*"
  msgstr ""
- 
- #: ../src/commands.h:196
---- audacity-src-1.1.3/locale/nl.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/nl.po    Fri Mar 28 01:51:38 2003
-@@ -605,20 +605,20 @@
+-"Само libmp3lame.so|libmp3lame.so|примарно деливи објекти (*.so)|*.so|"
++"Само libmp3lame.so.0|libmp3lame.so.0|примарно деливи објекти (*.so)|*.so|"
+ "зајакнати библиотеки (*.so*)|*.so*|сите датотеки (*)|*"
+ 
+ #: ../src/import/ImportLOF.cpp:394
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/nl.po audacity-src-1.2.0-pre2/locale/nl.po
+--- audacity-src-1.2.0-pre2.orig/locale/nl.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/nl.po       2003-10-16 14:38:48.180159592 +0200
+@@ -650,20 +650,20 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -325,60 +329,23 @@
  
  #: ../src/AboutDialog.cpp:114
  msgid ""
-@@ -2125,9 +2125,9 @@
+@@ -2537,10 +2537,10 @@
  
- #: ../src/export/ExportMP3.cpp:232
+ #: ../src/export/ExportMP3.cpp:254
  msgid ""
 -"Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|"
 +"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
  "Extended Libraries (*.so*)|*.so*|All Files (*)|*"
--msgstr "Enkel libmp3lame.so|libmp3lame.so|Shared Object bestanden (*.so)|*.so|Uitgebreide bibliotheken (*.so)|*.so*|Alle Bestanden (*)|*"
-+msgstr "Enkel libmp3lame.so.0|libmp3lame.so.0|Shared Object bestanden (*.so)|*.so|Uitgebreide bibliotheken (*.so)|*.so*|Alle Bestanden (*)|*"
- 
- #: ../src/effects/AvcCompressor.cpp:645
- msgid "Original Value"
---- audacity-src-1.1.3/locale/pl.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/pl.po    Fri Mar 28 01:51:38 2003
-@@ -648,19 +648,19 @@
- msgid ""
- "Audacity does not export MP3 files directly, but instead uses the \n"
- "freely available LAME library to handle MP3 file encoding.  You must \n"
--"obtain libmp3lame.so separately, either by downloading it or building \n"
-+"obtain libmp3lame.so.0 separately, either by downloading it or building \n"
- "it from the sources, and then locate the file for Audacity.  You only \n"
- "need to do this once.\n"
- "\n"
--"Would you like to locate libmp3lame.so now?"
-+"Would you like to locate libmp3lame.so.0 now?"
- msgstr ""
- "Audacity nie eksportuje plików MP3 bezpo¶rednio. Zamiast tego u¿ywa\n"
--" dostêpnej za darmo biblioteki LAME. Musisz zdobyæ libmp3lame.so\n"
-+" dostêpnej za darmo biblioteki LAME. Musisz zdobyæ libmp3lame.so.0\n"
- "jako oddzielny pakiet, poprzez ¶ci±gniêcie go z internetu lub kompilacjê\n"
- " ze ¼róde³. Nastêpnie nale¿y okre¶liæ jego po³o¿enie dla Audacity.\n"
- "Wystarczy ¿e zrobisz to tylko raz.\n"
- "\n"
--"Czy chcia³by¶ okre¶liæ po³o¿enie libmp3lame.so teraz?"
-+"Czy chcia³by¶ okre¶liæ po³o¿enie libmp3lame.so.0 teraz?"
- 
- #: ../src/AboutDialog.cpp:114
- msgid ""
-@@ -2100,10 +2100,10 @@
- 
- #: ../src/export/ExportMP3.cpp:232
- msgid ""
--"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
-+"Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files "
- "(*)|*"
  msgstr ""
--"Tylko libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
-+"Tylko libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files "
- "(*)|*"
- 
- #: ../src/commands.h:214
---- audacity-src-1.1.3/locale/pt.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/pt.po    Fri Mar 28 01:51:38 2003
-@@ -621,18 +621,18 @@
+-"Enkel libmp3lame.so|libmp3lame.so|Shared Object bestanden (*.so)|*.so|"
++"Enkel libmp3lame.so.0|libmp3lame.so.0|Shared Object bestanden (*.so)|*.so|"
+ "Uitgebreide bibliotheken (*.so)|*.so*|Alle Bestanden (*)|*"
+ 
+ #: ../src/Legacy.cpp:330
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/pt.po audacity-src-1.2.0-pre2/locale/pt.po
+--- audacity-src-1.2.0-pre2.orig/locale/pt.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/pt.po       2003-10-16 14:38:48.191157920 +0200
+@@ -602,19 +602,19 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -390,7 +357,8 @@
 -"Would you like to locate libmp3lame.so now?"
 +"Would you like to locate libmp3lame.so.0 now?"
  msgstr ""
- "Não é feita a exportação para MP3 diretamente. O Audacity usa uma biblioteca disponível gratuitamente na Internet da LAME para isso.\n"
+ "Não é feita a exportação para MP3 diretamente. O Audacity usa um DLL\n"
+ "disponível gratuitamente na Internet da LAME para tal fim.\n"
 -"Você deve obter o arquivo \"libmp3lame.so\" separadamente, baixando-o\n"
 +"Você deve obter o arquivo \"libmp3lame.so.0\" separadamente, baixando-o\n"
  "da Internet e então localizando-o no Audacity.  Só há a  necessidade de \n"
@@ -400,21 +368,22 @@
 +"Proceder a busca por libmp3lame.so.0 no sistema agora?"
  
  #: ../src/AboutDialog.cpp:114
- msgid "Audacity is a free program being written by a team of developers using Sourceforge, an online service for open-source projects.  It is based on the wxWindows toolkit and is available for Windows, MacOS 9 and X, Linux, and other Unix-like systems."
-@@ -2069,8 +2069,8 @@
+ msgid "Audacity is a free program written by a team of volunteer developers around the world.  Coordination happens thanks to SourceForge.net, an online service that provides free tools to open-source software projects.  Audacity is available for Windows 98 and newer, Mac OS X, Linux, and other Unix-like operating systems.  Older versions of Audacity are available for Mac OS 9."
+@@ -2480,8 +2480,8 @@
  msgstr "Apenas lame_enc.dll|lame_enc.dll|DLLs do sistema (*.dll)|*.dll|Todos os arquivos (*.*)|*"
  
- #: ../src/export/ExportMP3.cpp:232
--msgid "Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files (*)|*"
--msgstr "Apenas libmp3lame.so|libmp3lame.so|Arquivos Shared Object (*.so)|*.so|Todos os arquivos (*)|*"
-+msgid "Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files (*)|*"
-+msgstr "Apenas libmp3lame.so.0|libmp3lame.so.0|Arquivos Shared Object (*.so)|*.so|Todos os arquivos (*)|*"
- 
- #: ../src/commands.h:214
- msgid "Open"
---- audacity-src-1.1.3/locale/ru.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/ru.po    Fri Mar 28 01:51:38 2003
-@@ -600,19 +600,19 @@
+ #: ../src/export/ExportMP3.cpp:235
+-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+-msgstr "Apenas libmp3lame.so|libmp3lame.so|Arquivos Primary Shared Object (*.so)|*.so|Arquivos Extended Libraries (*.so*)|*.so*|Todos os arquivos (*)|*"
++msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
++msgstr "Apenas libmp3lame.so.0|libmp3lame.so.0|Arquivos Primary Shared Object (*.so)|*.so|Arquivos Extended Libraries (*.so*)|*.so*|Todos os arquivos (*)|*"
+ 
+ #: ../src/Legacy.cpp:330
+ msgid "Opening Audacity Project"
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/ru.po audacity-src-1.2.0-pre2/locale/ru.po
+--- audacity-src-1.2.0-pre2.orig/locale/ru.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/ru.po       2003-10-16 14:38:48.202156248 +0200
+@@ -654,20 +654,20 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -426,21 +395,22 @@
 -"Would you like to locate libmp3lame.so now?"
 +"Would you like to locate libmp3lame.so.0 now?"
  msgstr ""
- "Audacity ÎÅ ÜËÓÐÏÒÔÉÒÕÅÔ ÄÁÎÎÙÅ × MP3 ÎÁÐÒÑÍÕÀ, Á ÉÓÐÏÌØÚÕÅÔ ÄÌÑ ÜÔÏÇÏ\n"
- "LAME - ÂÉÂÌÉÏÔÅËÕ ÄÌÑ ÜËÓÐÏÒÔÁ × MP3, ÄÏÓÔÕÐÎÕÀ ÏÔÄÅÌØÎÏ. äÌÑ ÜÔÏÇÏ ×ÁÍ\n"
--"ÎÅÏÂÈÏÄÉÍÏ ÏÔÄÅÌØÎÏ ÄÏÓÔÁÔØ ÂÉÂÌÉÏÔÅËÕ libmp3lame.so, ÓËÁÞÁ× Å£ × ÇÏÔÏ×ÏÍ "
-+"ÎÅÏÂÈÏÄÉÍÏ ÏÔÄÅÌØÎÏ ÄÏÓÔÁÔØ ÂÉÂÌÉÏÔÅËÕ libmp3lame.so.0, ÓËÁÞÁ× Å£ × ÇÏÔÏ×ÏÍ "
- "×ÉÄÅ, ÌÉÂÏ ÓËÏÍÉÐÉÌÉÒÏ×Á× ÉÚ ÉÓÈÏÄÎÙÈ ÔÅËÓÔÏ×, Á ÚÁÔÅÍ ÕËÁÚÁÔØ ÒÁÓÐÏÌÏÖÅÎÉÅ "
- "ÜÔÏÇÏ ÆÁÊÌÁ ÄÌÑ Audacity. üÔÏ ÎÅÏÂÈÏÄÉÍÏ ÓÄÅÌÁÔØ ÔÏÌØËÏ ÏÄÉÎ ÒÁÚ\n"
+ "Audacity ÎÅ ÜËÓÐÏÒÔÉÒÕÅÔ ÄÁÎÎÙÅ × MP3 ÎÁÐÒÑÍÕÀ, Á ÉÓÐÏÌØÚÕÅÔ\n"
+ "ÄÌÑ ÜÔÏÇÏ LAME - ÂÉÂÌÉÏÔÅËÕ ÄÌÑ ÜËÓÐÏÒÔÁ × MP3, ÄÏÓÔÕÐÎÕÀ\n"
+ "ÏÔÄÅÌØÎÏ. äÌÑ ÜÔÏÇÏ ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ ÏÔÄÅÌØÎÏ ÄÏÓÔÁÔØ ÂÉÂÌÉÏÔÅËÕ\n"
+-" libmp3lame.so, ÓËÁÞÁ× Å£ × ÇÏÔÏ×ÏÍ ×ÉÄÅ, ÌÉÂÏ ÓËÏÍÉÐÉÌÉÒÏ×Á× ÉÚ\n"
++" libmp3lame.so.0, ÓËÁÞÁ× Å£ × ÇÏÔÏ×ÏÍ ×ÉÄÅ, ÌÉÂÏ ÓËÏÍÉÐÉÌÉÒÏ×Á× ÉÚ\n"
+ " ÉÓÈÏÄÎÙÈ ËÏÄÏ×, Á ÚÁÔÅÍ ÕËÁÚÁÔØ ÍÅÓÔÏÐÏÌÏÖÅÎÉÅ ÜÔÏÇÏ ÆÁÊÌÁ ÄÌÑ\n"
+ "Audacity. üÔÏ ÎÅÏÂÈÏÄÉÍÏ ÓÄÅÌÁÔØ ÔÏÌØËÏ ÏÄÉÎ ÒÁÚ\n"
  "\n"
--"÷Ù ÈÏÔÅÌÉ ÂÙ ÓÅÊÞÁÓ ÕËÁÚÁÔØ ÒÁÓÐÏÌÏÖÅÎÉÅ libmp3lame.so?"
-+"÷Ù ÈÏÔÅÌÉ ÂÙ ÓÅÊÞÁÓ ÕËÁÚÁÔØ ÒÁÓÐÏÌÏÖÅÎÉÅ libmp3lame.so.0?"
+-"÷Ù ÈÏÔÅÌÉ ÂÙ ÓÅÊÞÁÓ ÕËÁÚÁÔØ ÍÅÓÔÏÐÏÌÏÖÅÎÉÅ libmp3lame.so?"
++"÷Ù ÈÏÔÅÌÉ ÂÙ ÓÅÊÞÁÓ ÕËÁÚÁÔØ ÍÅÓÔÏÐÏÌÏÖÅÎÉÅ libmp3lame.so.0?"
  
- #: ../src/AboutDialog.cpp:114
+ #: ../src/DirManager.cpp:191
  msgid ""
-@@ -2111,10 +2111,10 @@
+@@ -2589,10 +2589,10 @@
  
- #: ../src/export/ExportMP3.cpp:232
+ #: ../src/export/ExportMP3.cpp:255
  msgid ""
 -"Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|"
 +"Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|"
@@ -450,10 +420,11 @@
 +"ôÏÌØËÏ libmp3lame.so.0|libmp3lame.so.0| ðÅÒ×ÉÞÎÙÅ ÄÉÎÁÍÉÞÅÓËÉ ÚÁÇÒÕÖÁÅÍÙÅ "
  "ÂÉÂÌÉÏÔÅËÉ (*.so)|*.so|òÁÓÛÉÒÅÎÎÙÅ ÂÉÂÌÉÏÔÅËÉ (*.so*)|*.so*| ÷ÓÅ ÆÁÊÌÙ (*)|*"
  
- #: ../src/effects/AvcCompressor.cpp:645
---- audacity-src-1.1.3/locale/sl.po.wiget      Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/locale/sl.po    Fri Mar 28 01:51:38 2003
-@@ -653,18 +653,18 @@
+ #: ../src/Legacy.cpp:337
+diff -aurN audacity-src-1.2.0-pre2.orig/locale/sv.po audacity-src-1.2.0-pre2/locale/sv.po
+--- audacity-src-1.2.0-pre2.orig/locale/sv.po  2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/locale/sv.po       2003-10-16 14:38:48.212154728 +0200
+@@ -597,19 +597,19 @@
  msgid ""
  "Audacity does not export MP3 files directly, but instead uses the \n"
  "freely available LAME library to handle MP3 file encoding.  You must \n"
@@ -465,33 +436,33 @@
 -"Would you like to locate libmp3lame.so now?"
 +"Would you like to locate libmp3lame.so.0 now?"
  msgstr ""
- "Audacity ne izva¾a MP3 datotek neposredno, ampak uporablja \n"
- "prosto dostopno LAME knji¾nico za upravljanje MP3 kodiranja.  Morate\n"
--"nalo¾iti libmp3lame.so , in nato vnesti pot do knji¾nice za Audacity.  To je "
-+"nalo¾iti libmp3lame.so.0 , in nato vnesti pot do knji¾nice za Audacity.  To je "
- "potrebno storiti le enkrat.\n"
+ "Audacity har inte inbyggd exportfunktion för MP3-filer. Istället används\n"
+ "\"LAME library\" som sköter om konverteringen till MP3. Du måste nu \n"
+-"hitta \"libmp3lame.so, antingen genom att ladda ner filen, eller skapa \n"
++"hitta \"libmp3lame.so.0, antingen genom att ladda ner filen, eller skapa \n"
+ "den från källkoden, och sedan lokalisera filen för Audacity. Du behöver\n"
+ "bara göra detta en gång.\n"
  "\n"
--"Bi radi poiskali libmp3lame.so zdaj?"
-+"Bi radi poiskali libmp3lame.so.0 zdaj?"
+-"Vill du lokalisera libmp3lame.so nu? "
++"Vill du lokalisera libmp3lame.so.0 nu? "
  
  #: ../src/AboutDialog.cpp:114
- msgid ""
-@@ -2102,10 +2102,10 @@
- 
- #: ../src/export/ExportMP3.cpp:232
- msgid ""
--"Only libmp3lame.so|libmp3lame.so|Shared Object files (*.so)|*.so|All Files "
-+"Only libmp3lame.so.0|libmp3lame.so.0|Shared Object files (*.so)|*.so|All Files "
- "(*)|*"
- msgstr ""
--"Samo libmp3lame.so|libmp3lame.so|Deljene Razredne datoteke (*.so)|*.so|Vse "
-+"Samo libmp3lame.so.0|libmp3lame.so.0|Deljene Razredne datoteke (*.so)|*.so|Vse "
- "datoteke (*)|*"
- 
- #: ../src/commands.h:214
---- audacity-src-1.1.3/src/export/ExportMP3.cpp.wiget  Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/src/export/ExportMP3.cpp        Fri Mar 28 01:48:09 2003
-@@ -224,22 +224,22 @@
+ msgid "Audacity is a free program written by a team of volunteer developers around the world.  Coordination happens thanks to SourceForge.net, an online service that provides free tools to open-source software projects.  Audacity is available for Windows 98 and newer, Mac OS X, Linux, and other Unix-like operating systems.  Older versions of Audacity are available for Mac OS 9."
+@@ -2464,8 +2464,8 @@
+ msgstr "Only lame_enc.dll|lame_enc.dll|Dynamically Linked Libraries (*.dll)|*.dll|All Files (*.*)|*"
+ 
+ #: ../src/export/ExportMP3.cpp:235
+-msgid "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+-msgstr "Only libmp3lame.so|libmp3lame.so|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
++msgid "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
++msgstr "Only libmp3lame.so.0|libmp3lame.so.0|Primary Shared Object files (*.so)|*.so|Extended Libraries (*.so*)|*.so*|All Files (*)|*"
+ 
+ #: ../src/Legacy.cpp:330
+ msgid "Opening Audacity Project"
+diff -aurN audacity-src-1.2.0-pre2.orig/src/export/ExportMP3.cpp audacity-src-1.2.0-pre2/src/export/ExportMP3.cpp
+--- audacity-src-1.2.0-pre2.orig/src/export/ExportMP3.cpp      2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/src/export/ExportMP3.cpp   2003-10-16 14:40:38.780345808 +0200
+@@ -247,12 +247,12 @@
  
           wxString GetLibraryName()
           {
@@ -506,7 +477,8 @@
           }
           
           wxString GetLibraryMessage()
-          {
+@@ -260,10 +260,10 @@
+             /* i18n-hint: This message is used on Unix/Linux */
              return _("Audacity does not export MP3 files directly, but instead uses the \n"
                     "freely available LAME library to handle MP3 file encoding.  You must \n"
 -                   "obtain libmp3lame.so separately, either by downloading it or building \n"

diff --git a/audacity-opt.patch b/audacity-opt.patch
index 4bcf63f4554d060c58f39dd72242fc2239e4a9d6..b68d1e2d8600d7ea833b258bec30c399c9caec55 100644 (file)
--- a/audacity-opt.patch
+++ b/audacity-opt.patch
@@ -1,5 +1,6 @@
---- audacity-src-1.1.3/lib-src/allegro/Makefile.in.wiget       Thu Mar 20 05:38:08 2003
-+++ audacity-src-1.1.3/lib-src/allegro/Makefile.in     Fri Mar 28 01:56:59 2003
+diff -aurN audacity-src-1.2.0-pre2.orig/lib-src/allegro/Makefile.in audacity-src-1.2.0-pre2/lib-src/allegro/Makefile.in
+--- audacity-src-1.2.0-pre2.orig/lib-src/allegro/Makefile.in   2003-09-29 08:51:27.000000000 +0200
++++ audacity-src-1.2.0-pre2/lib-src/allegro/Makefile.in        2003-10-16 13:56:45.234705600 +0200
 @@ -3,7 +3,7 @@
  CC = @CC@
  CCC = @CXX@
@@ -9,19 +10,21 @@
  OBJ = \
        allegro.cpp.o \
        allegrord.cpp.o \
---- audacity-src-1.1.3/lib-src/libnyquist/Makefile.wiget       Thu Mar 20 05:38:11 2003
-+++ audacity-src-1.1.3/lib-src/libnyquist/Makefile     Fri Mar 28 01:58:03 2003
+diff -aurN audacity-src-1.2.0-pre2.orig/lib-src/libnyquist/Makefile.in audacity-src-1.2.0-pre2/lib-src/libnyquist/Makefile.in
+--- audacity-src-1.2.0-pre2.orig/lib-src/libnyquist/Makefile.in        2003-09-29 08:51:31.000000000 +0200
++++ audacity-src-1.2.0-pre2/lib-src/libnyquist/Makefile.in     2003-10-16 13:57:45.269578912 +0200
 @@ -6,7 +6,7 @@
  INCL = -Inyqsrc -Itran -Ixlisp -Icmt -Isys -Isnd -Ifft
  
- CC = cc
+ CC = @CC@
 -override CFLAGS += -g -DCMTSTUFF -O2 -DEXT $(INCL)
 +override CFLAGS += $(OPTFLAGS) -DCMTSTUFF -DEXT $(INCL)
  LN = $(CC)
  LFLAGS = -lm
  
---- audacity-src-1.1.3/lib-src/portaudio/pa_unix_oss/Makefile.wiget    Thu Mar 20 05:38:17 2003
-+++ audacity-src-1.1.3/lib-src/portaudio/pa_unix_oss/Makefile  Fri Mar 28 01:58:45 2003
+diff -aurN audacity-src-1.2.0-pre2.orig/lib-src/portaudio/pa_unix_oss/Makefile audacity-src-1.2.0-pre2/lib-src/portaudio/pa_unix_oss/Makefile
+--- audacity-src-1.2.0-pre2.orig/lib-src/portaudio/pa_unix_oss/Makefile        2003-09-29 08:51:36.000000000 +0200
++++ audacity-src-1.2.0-pre2/lib-src/portaudio/pa_unix_oss/Makefile     2003-10-16 13:58:31.298581440 +0200
 @@ -2,7 +2,7 @@
  
  CC = gcc
@@ -31,3 +34,26 @@
  PASRC = ../pa_common/pa_lib.c pa_unix_oss.c pa_unix.c
  PAINC = ../pa_common/portaudio.h
  PAOBJ = ../pa_common/pa_lib.o pa_unix_oss.o pa_unix.o
+diff -aurN audacity-src-1.2.0-pre2.orig/lib-src/portaudio-v19/Makefile.linux audacity-src-1.2.0-pre2/lib-src/portaudio-v19/Makefile.linux
+--- audacity-src-1.2.0-pre2.orig/lib-src/portaudio-v19/Makefile.linux  2003-09-29 08:51:37.000000000 +0200
++++ audacity-src-1.2.0-pre2/lib-src/portaudio-v19/Makefile.linux       2003-10-16 13:59:07.003153520 +0200
+@@ -17,7 +17,7 @@
+ LIBS =  -lm -lpthread
+ 
+ CDEFINES = -I../pa_common
+-CFLAGS = -g
++CFLAGS = $(OPTFLAGS)
+ LIBINST = /usr/local/lib
+ 
+ TESTS:= $(wildcard pa_tests/pa*.c pa_tests/debug*.c)
+diff -aurN audacity-src-1.2.0-pre2.orig/lib-src/soundtouch/configure.in audacity-src-1.2.0-pre2/lib-src/soundtouch/configure.in
+--- audacity-src-1.2.0-pre2.orig/lib-src/soundtouch/configure.in       2003-09-29 08:51:38.000000000 +0200
++++ audacity-src-1.2.0-pre2/lib-src/soundtouch/configure.in    2003-10-16 13:59:31.945361728 +0200
+@@ -24,6 +24,6 @@
+     AC_MSG_ERROR("Could not find ar - needed to create a library");
+ fi
+ 
+-CXXFLAGS="-O2"
++CXXFLAGS=$(OPTFLAGS)
+ 
+ AC_OUTPUT([Makefile src/Makefile])

diff --git a/audacity.desktop b/audacity.desktop
index d76b62b019d288399377dc62a41f579ad102885a..4e7656c56c3bbc3dcd2e15165ea7a451a98de313 100644 (file)
--- a/audacity.desktop
+++ b/audacity.desktop
@@ -6,4 +6,5 @@ Exec=audacity
 Icon=audacity-icon.png
 Terminal=0
 Type=Application
+Categories=Application;AudioVideo;
 # vi: encoding=utf-8