Merge branch 'master' into darkaudacity

README.txt

@@ -313,7 +313,7 @@ and header dependencies:
 To compile on Windows using MSVC++, please follow the instructions in
 win\compile.txt in the source code. 
 
-To compile using Xcode on Mac OS X, see the instructions in mac/compile.txt.
+To compile using Xcode on Mac OS X, see the instructions in mac/Build.txt.
 
 For more information on compilation, please visit:
 

locale/el.po

@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: Audacity 1.3.3 b\n"
 "Report-Msgid-Bugs-To: audacity-translation@lists.sourceforge.net\n"
 "POT-Creation-Date: 2016-11-21 10:44+0000\n"
-"PO-Revision-Date: 2017-01-27 15:18+0300\n"
+"PO-Revision-Date: 2017-02-13 23:56+0300\n"
 "Last-Translator: Dimitris Spingos (Δημήτρης Σπίγγος) <dmtrs32@gmail.com>\n"
 "Language-Team: team@lists.gnome.gr\n"
 "Language: el\n"
@@ -2931,7 +2931,7 @@ msgstr "Γραμμή εργαλείων &μεταγραφής"
 #. i18n-hint: Clicking this menu item shows the toolbar with the big buttons on it (play record etc)
 #: src/Menus.cpp:738
 msgid "&Transport Toolbar"
-msgstr "Γραμμή εργαλείων &κίνησης"
+msgstr "Γραμμή εργαλείων &μεταφοράς"
 
 #. i18n-hint: Clicking this menu item shows the toolbar that enables Scrub or Seek playback and Scrub Ruler
 #: src/Menus.cpp:740
@@ -2947,7 +2947,7 @@ msgstr "Επαναφορά &γραμμών εργαλείων"
 #. play, record, pause etc.
 #: src/Menus.cpp:757
 msgid "T&ransport"
-msgstr "Αν&απαραγωγή"
+msgstr "&Μεταφορά"
 
 #. i18n-hint: (verb) Start or Stop audio playback
 #: src/Menus.cpp:761
@@ -4970,7 +4970,7 @@ msgstr "Εργαλεία"
 #: src/Screenshot.cpp:387 src/toolbars/ControlToolBar.cpp:100
 #: src/toolbars/ControlToolBar.cpp:284
 msgid "Transport"
-msgstr "Κίνηση"
+msgstr "Μεταφορά"
 
 #: src/Screenshot.cpp:393 src/toolbars/MixerToolBar.cpp:59
 #: src/toolbars/MixerToolBar.cpp:195
@@ -12118,7 +12118,7 @@ msgstr "Εμφάνιση"
 
 #: src/prefs/GUIPrefs.cpp:107
 msgid "&Ergonomic order of Transport Toolbar buttons"
-msgstr "&Εργονομική διάταξη των κουμπιών της γραμμής εργαλείων κίνησης"
+msgstr "&Εργονομική διάταξη των κουμπιών της γραμμής εργαλείων μεταφοράς"
 
 #: src/prefs/GUIPrefs.cpp:110
 msgid "S&how 'How to Get Help' dialog box at program start up"
@@ -13180,7 +13180,7 @@ msgstr ""
 "Πατήστε \"Φόρτωση κρυφής μνήμης θέματος\" για να φορτώσετε τις αλλαγμένες "
 "εικόνες και τα χρώματα πίσω στο Audacity.\n"
 "\n"
-"(Μόνο η γραμμή εργαλείων κίνησης και τα χρώματα στο κομμάτι ήχου "
+"(Μόνο η γραμμή εργαλείων μεταφοράς και τα χρώματα στο κομμάτι ήχου "
 "επηρεάζονται προς το παρόν, αν και\n"
 "το αρχείο εικόνας εμφανίζει επίσης άλλα εικονίδια.)"
 

locale/fr.po

@@ -72,24 +72,24 @@ msgstr ""
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:746
 msgid "&Undo\tCtrl+Z"
-msgstr ""
+msgstr "&Annuler\tCtrl+Z"
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:747
 msgid "&Redo\tCtrl+Y"
-msgstr ""
+msgstr "&Refaire\tCtrl+Y"
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:749
-msgid "Cu&t\tCtrl+X"
-msgstr ""
+msgid "&Cut\tCtrl+X"
+msgstr "&Couper\tCtrl+X"
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:750
 msgid "&Copy\tCtrl+C"
-msgstr ""
+msgstr "&Copier\tCtrl+C"
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:751
 #, fuzzy
 msgid "&Paste\tCtrl+V"
-msgstr "Co&ller"
+msgstr "&Coller"
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:752
 msgid "Cle&ar\tCtrl+L"

locale/pt_BR.po

@@ -203,7 +203,7 @@ msgstr "Aviso"
 #: lib-src/mod-nyq-bench/NyqBench.cpp:1098
 #: src/effects/nyquist/Nyquist.cpp:2163
 msgid "Save Nyquist script"
-msgstr "Salvar scrip Nyquist "
+msgstr "Salvar script Nyquist "
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:1197
 msgid "Find dialog"
@@ -223,7 +223,7 @@ msgstr ""
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:1419
 msgid "(C) 2009 by Leland Lucius"
-msgstr ""
+msgstr "(C) 2009 por Leland Lucius"
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:1420
 msgid ""
@@ -250,7 +250,7 @@ msgstr "Sem-título"
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:1645
 msgid "Nyquist Effect Workbench - "
-msgstr "Efeitos Nyquist"
+msgstr "Efeitos Nyquist - "
 
 #: lib-src/mod-nyq-bench/NyqBench.cpp:1709 src/PluginManager.cpp:492
 #: src/prefs/ModulePrefs.cpp:102
@@ -442,24 +442,24 @@ msgstr "garantia de qualidade"
 #: src/AboutDialog.cpp:126 src/AboutDialog.cpp:127
 #, fuzzy
 msgid "developer"
-msgstr "Envelope"
+msgstr "desenvolvedor"
 
 #: src/AboutDialog.cpp:56
 msgid "documentation and support, French"
-msgstr ""
+msgstr "documentação e suporte, Francês"
 
 #: src/AboutDialog.cpp:57
 msgid "system administration"
-msgstr ""
+msgstr "administração do sistema"
 
 #: src/AboutDialog.cpp:59 src/AboutDialog.cpp:78
 msgid "co-founder and developer"
-msgstr ""
+msgstr "cofundador e desenvolvedor"
 
 #: src/AboutDialog.cpp:63 src/AboutDialog.cpp:68 src/AboutDialog.cpp:82
 #: src/AboutDialog.cpp:83
 msgid "documentation and support"
-msgstr ""
+msgstr "documentação e suporte"
 
 #: src/AboutDialog.cpp:88
 msgid "accessibility advisor"
@@ -467,11 +467,11 @@ msgstr ""
 
 #: src/AboutDialog.cpp:107
 msgid "graphic artist"
-msgstr ""
+msgstr "artista gráfico"
 
 #: src/AboutDialog.cpp:114
 msgid "composer"
-msgstr ""
+msgstr "compositor"
 
 #: src/AboutDialog.cpp:117
 #, fuzzy

mac/Install.txt

@@ -1,10 +1,9 @@
-* To install or reinstall Audacity, drag the "Audacity" folder icon in the
+* To install or reinstall Audacity, drag the "Audacity.app" icon in the
    DMG window to the /Applications folder icon on the right. Alternatively,
-   drag the "Audacity" folder to any other location of your choosing. 
+   drag the "Audacity.app" icon to any other location of your choosing. 
 
-* Do not double-click the "Audacity" folder in the DMG then launch Audacity 
-   from there. Do not move the Audacity application or its support folders
-   outside the "Audacity" folder.
+* Do not double-click the "Audacity" icon in the DMG then launch Audacity 
+   from there. 
 
 * If you are a first-time user of Audacity, security settings on 
    OS X 10.7 or later may block Audacity being launched. To permanently

src/DirManager.cpp

@@ -434,6 +434,7 @@ void DirManager::CleanDir(
 
 bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const bool bCreate)
 {
+   bool copying = false;
    wxString oldPath = this->projPath;
    wxString oldName = this->projName;
    wxString oldFull = projFull;
@@ -495,7 +496,7 @@ bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const
          BlockFilePtr b = iter->second.lock();
          if (b) {
             if (b->IsLocked())
-               success = CopyToNewProjectDirectory( &*b );
+               success = CopyToNewProjectDirectory( &*b ), copying = true;
             else{
                success = MoveToNewProjectDirectory( &*b );
             }
@@ -545,7 +546,10 @@ bool DirManager::SetProject(wxString& newProjPath, wxString& newProjName, const
    // loading a project; in this latter case, the movement code does
    // nothing because SetProject is called before there are any
    // blockfiles.  Cleanup code trigger is the same
-   if (trueTotal > 0) {
+
+   // Do the cleanup of the temporary directory only if not saving-as, which we
+   // detect by having done copies rather than moves.
+   if (!copying && trueTotal > 0) {
       // Clean up after ourselves; boldly remove all files and directories
       // in the tree.  (Unlike what the earlier version of this comment said.)
       // Because this is a relocation of the project, not the case of closing