temp patch

Diglett2 · Oct 12, 2015 · b207daf · b207daf
1 parent f7ef7d3
commit b207daf
Show file tree

Hide file tree

Showing 14 changed files with 31 additions and 24 deletions.
diff --git a/Makefile.cmd b/Makefile.cmd
@@ -10,6 +10,12 @@ SET CompileMode=Release
 SET BUILDDIR=build
 SET MSBuildVer=14.0
 
+:: Compiler of choice
+:: Visual Studio 2015 or Mono 4.0
+
+SET NETCOMPILER="%ProgramFiles(x86)%\MSBuild\%MSBuildVer%\Bin\amd64\MSBuild.exe"
+:: SET NETCOMPILER="%ProgramFiles(x86)%\Mono\bin\xbuild.exe"
+
 cls
 
 echo.
@@ -54,9 +60,9 @@ mkdir "%BUILDDIR%"
 timeout /t 1 >nul
 echo.
 
-@title COMPILING IFME (VISUAL STUDIO 2015)
-echo COMPILING IFME (VISUAL STUDIO 2015)
-start "" /B /D . /WAIT "%ProgramFiles(x86)%\MSBuild\%MSBuildVer%\Bin\amd64\MSBuild.exe" /nologo /verbosity:normal ifme.sln /t:Build /p:Configuration=%CompileMode%
+@title COMPILING IFME
+echo COMPILING IFME
+call %NETCOMPILER% /nologo /verbosity:normal ifme.sln /t:Build /p:Configuration=%CompileMode%
 timeout /t 5 >nul
 echo.
 

diff --git a/changelog.txt b/changelog.txt
@@ -2,6 +2,7 @@
 
 [new] Allow user to save encoded file either same source folder or given path
 [added] Language: Italian
+[fixed] Updater stuck because wrong agrument
 
 Version 5.1 (FLUORITE DIARY)
 -----------

diff --git a/ifme/Properties/AssemblyInfo.cs b/ifme/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.2.*")]
-[assembly: AssemblyFileVersion("5.2")]
+[assembly: AssemblyVersion("5.1.*")]
+[assembly: AssemblyFileVersion("5.1.1")]
 [assembly: NeutralResourcesLanguageAttribute("en")]
diff --git a/ifme/Properties/Resources.Designer.cs b/ifme/Properties/Resources.Designer.cs
diff --git a/ifme/Properties/Resources.resx b/ifme/Properties/Resources.resx
@@ -240,7 +240,7 @@
     <value>..\Resources\world.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="CodeName" xml:space="preserve">
-    <value>Take me with your heart</value>
+    <value>Final Hope</value>
   </data>
   <data name="donate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\donate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>

diff --git a/ifme/frmSplashScreen.cs b/ifme/frmSplashScreen.cs
@@ -267,7 +267,7 @@ string DownloadString(string url)
 
 		void DownloadExtract(string url, string targetFolder)
 		{
-			string tempFile = Path.Combine(Global.Folder.DefaultTemp, "package.ifa");
+			string tempFile = Path.Combine(Global.Folder.DefaultTemp, "package.nemu");
 
             try
 			{
@@ -292,7 +292,7 @@ void Extract(string archiveFile, string targetFolder)
 			Write($"Extracting...");
 
 			if (File.Exists($"{(OS.IsLinux ? zipApp : $"{zipApp}.exe")}"))
-				TaskManager.Run($"\"{zipApp}\" x \"{archiveFile}\" -y \"-o{targetFolder}\" > {OS.Null} 2>&1");
+				TaskManager.Run($"\"{zipApp}\" x \"{archiveFile}\" -y -o\"{targetFolder}\" > {OS.Null} 2>&1");
 			else
 				Write($"File {zipApp} not found...");
 

diff --git a/ifme/lang/cs.ini b/ifme/lang/cs.ini
@@ -51,7 +51,7 @@ lblAttachDescription = Popis (&D):
 lblAttachNote = Tato záložka umožňuje přidat přílohy pro každé vybrané video\nVýše klikněte "Zapnout" čimž začnete přidávat přílohy\n(Zabudované přílohy budou ignorovány)
 tabLogs = Záznamy
 lblProfiles = &Profily:
-lblDestination = Cílové umístění (&D):
+chkDestination = Cílové umístění (&D):
 tsmiQueuePreview = Náhled (&P)
 tsmiBenchmark = &Benchmark
 tsmiQueueNew = &Nová fronta

diff --git a/ifme/lang/de-DE.ini b/ifme/lang/de-DE.ini
@@ -51,7 +51,7 @@ lblAttachDescription = &Description:
 lblAttachNote = Dieser Tab erlaubt dir einen etwas zu dem Video Hinzuzufügen\nclick "Auswählen" um das Hinzufügen zu starten\n(Bereits eingebettete Zusätze werden ignoriert)
 tabLogs = Logs
 lblProfiles = &Profile:
-lblDestination = &Ziel:
+chkDestination = &Ziel:
 tsmiQueuePreview = &Vorschau
 tsmiBenchmark = &Benchmark
 tsmiQueueNew = &Neue Warteliste

diff --git a/ifme/lang/en.ini b/ifme/lang/en.ini
@@ -51,7 +51,7 @@ lblAttachDescription = &Description:
 lblAttachNote = This tab allows you to add attachments for each video selected.\nClick "Enable" above to start adding.\n(Embedded attachments will be discarded.)
 tabLogs = Logs
 lblProfiles = &Encoding Preset:
-lblDestination = &Destination:
+chkDestination = &Destination:
 tsmiQueuePreview = &Preview
 tsmiBenchmark = &Benchmark
 tsmiQueueNew = &New queue

diff --git a/ifme/lang/fr.ini b/ifme/lang/fr.ini
@@ -51,7 +51,7 @@ lblAttachDescription = &Description:
 lblAttachNote = Cette attache vous permet d'ajouter des pieces jointes pour chaque video selectiones\nCliquez sur "Activer" pour commencer à ajouter\n(pieces jointes integre seront ignore)
 tabLogs = Logs
 lblProfiles = &Profils:
-lblDestination = &Destination:
+chkDestination = &Destination:
 tsmiQueuePreview = &Apercu
 tsmiBenchmark = &Benchmark
 tsmiQueueNew = &Nouvelle queue

diff --git a/ifme/lang/it.ini b/ifme/lang/it.ini
@@ -30,7 +30,7 @@ lblVideoTune = &Regolazione:
 grpVideoRateCtrl = &Bilanciamento Qualità
 lblVideoRateValue = &Valore:
 lblVideoRateH = Alta Qualità\nDimensioni Maggiori
-lblVideoRateL =Bassa Qualità\nDimensioni Ridotte
+lblVideoRateL = Bassa Qualità\nDimensioni Ridotte
 lblVideoCmd = &Linea di comando aggiuntiva:
 tabAudio = Audio
 chkAudioDrop = &Rimuovi Tracce
@@ -51,14 +51,14 @@ lblAttachDescription = &Descrizione:
 lblAttachNote = Questa scheda ti permette di aggiungere allegatii per ogni video selezionato..\nSelezionare "Abilita" per iniziare ad aggiungere allegati.\n(Gli allegati incorporati verranno scartati.)
 tabLogs = Logs
 lblProfiles = &Profili:
-lblDestination = &Destinazione:
+chkDestination = &Destinazione:
 tsmiQueuePreview = &Anteprima
 tsmiBenchmark = &Benchmark
 tsmiQueueNew = &Nuova Coda
 tsmiQueueOpen = &Apri Coda...
-tsmiQueueSave = &Salva Cosa...
+tsmiQueueSave = &Salva Coda...
 tsmiQueueSaveAs = Salva coda come...
-tsmiQueueSelectAll = Selezionat &tutto
+tsmiQueueSelectAll = Seleziona &tutto
 tsmiQueueSelectNone = Deseleziona tutto
 tsmiQueueSelectInvert = &Inverti selezione
 tsmiQueueAviSynth = A&viSynth
@@ -86,13 +86,13 @@ SelectNotAviSynth = Per favore seleziona dei video, non degli script AviSynth!
 SelectOneVideoAttch =Per favore seleziona un video prima di rimuovere l'allegato!
 SelectOneVideoPreview = Per favore seleziona un video per l'anteprima!
 SelectOneVideoSubtitle = Per favore seleziona un video prima di rimuovere i sottotitoli!
-VideoToAviSynth = You can create Avisynth scripts for video files in order to bypass FFmpeg decoder.\n(Unsupported files will be skipped.)
+VideoToAviSynth = Puoi creare degli script Avisynth in modo da bypassare il decodificatore FFmpeg.\n(I file non supportati verranno saltati.)
 QueueSave = Vuoi salvare questa coda? Potrai ricaricarla la prossima volta oppure aprirla tramite CLI.
 QueueSaveError = Aggiungi due o più elementi per creare una coda!
 QueueOpenChange = Vuoi salvare le modifiche a Untitled?
 Quit = Vuoi salvare le modifiche alla coda prima di uscire?
-TipUpdateTitle = Attention!
-TipUpdateMessage = A new version is available to download. Click here to update.
+TipUpdateTitle = Attenzione!
+TipUpdateMessage = È disponibile una nuova versione. Premere qui per aggiornare.
 
 [frmOption]
 title = Preferenze
@@ -140,4 +140,4 @@ colProfileFormat = Formato
 colProfilePlatform = Piattaforma
 colProfileAuthor = Autore
 Installed = Installato
-NotInstalled = Non trovato
+NotInstalled = Non trovato
diff --git a/ifme/lang/ja.ini b/ifme/lang/ja.ini
@@ -51,7 +51,7 @@ lblAttachDescription = 説明:
 lblAttachNote = ここでは1つの動画に1つのフォントを付加することができます\n設定するには「有効化」にチェックを入れてください\n(エンベデッドフォントは無視されます)
 tabLogs = ログ
 lblProfiles = プロファイル:
-lblDestination = 保存先:
+chkDestination = 保存先:
 tsmiQueuePreview = プレビュー
 tsmiBenchmark = ベンチマーク
 tsmiQueueNew = 新しいキュー

diff --git a/ifme/lang/pt-PT.ini b/ifme/lang/pt-PT.ini
@@ -51,7 +51,7 @@ lblAttachDescription = &Description:
 lblAttachNote = Esta opção permite-te adicionar legendas por cada video selecionado video\nclick "Enable" above to start adding\n(embaded attachment will ignored)
 tabLogs = Logs
 lblProfiles = &Perfiles:
-lblDestination = &Destinação:
+chkDestination = &Destinação:
 tsmiQueuePreview = &Preview
 tsmiBenchmark = &Benchmark
 tsmiQueueNew = &Novo queue

diff --git a/ifme/lang/tr.ini b/ifme/lang/tr.ini
@@ -51,7 +51,7 @@ lblAttachDescription = &Tanım:
 lblAttachNote = Bu sekme, seçili her video için ek yerleştirmenize izin verir.\nEklemeye başlamak için yukarıda "Etkinleştir"i tıklayın.\n(Gömülü ekler yok sayılacaktır!)
 tabLogs = Raporlar
 lblProfiles = &Profiller:
-lblDestination = &Hedef:
+chkDestination = &Hedef:
 tsmiQueuePreview = Önizleme
 tsmiBenchmark = Hız testi
 tsmiQueueNew = &Yeni liste oluştur