Продолжаем перевод

hoplik · Feb 4, 2022 · 8c60bd3 · 8c60bd3
1 parent aa006b1
commit 8c60bd3
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 15 deletions.
diff --git a/AboutBox1.Designer.cs b/AboutBox1.Designer.cs
diff --git a/AboutBox1.cs b/AboutBox1.cs
@@ -129,9 +129,14 @@ private void Button_donate_pp_Click(object sender, EventArgs e)
             Process.Start(psinfo);
         }
 
-        private void logoPictureBox_Click(object sender, EventArgs e)
+        /// <summary>
+        /// Путь к расположению программы
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void LogoPictureBox_Click(object sender, EventArgs e)
         {
-            MessageBox.Show(Application.StartupPath);
+            MessageBox.Show(LocRes.GetString("copy_clip") + Environment.NewLine + Application.StartupPath,LocRes.GetString("app_path"));
             Clipboard.Clear();
             Clipboard.SetText(Application.StartupPath);
         }

diff --git a/FirehoseFinder.csproj b/FirehoseFinder.csproj
@@ -15,7 +15,7 @@
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
     <IsWebBootstrapper>true</IsWebBootstrapper>
-    <PublishUrl>ftp://fhf.mywebcommunity.org/fhf.mywebcommunity.org/</PublishUrl>
+    <PublishUrl>C:\Users\serge\Desktop\Publishing\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Web</InstallFrom>
     <UpdateEnabled>true</UpdateEnabled>
@@ -36,8 +36,8 @@
     <WebPage>publish.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <AutorunEnabled>true</AutorunEnabled>
-    <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>22.2.3.2</ApplicationVersion>
+    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationVersion>22.2.4.1</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
     <PublishWizardCompleted>true</PublishWizardCompleted>
@@ -114,6 +114,7 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
+  <PropertyGroup />
   <PropertyGroup>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
@@ -236,8 +237,8 @@
     <Compile Include="Write_Sectors.Designer.cs">
       <DependentUpon>Write_Sectors.cs</DependentUpon>
     </Compile>
-    <Content Include="Resources\russia_flags_flag_17058.png" />
-    <Content Include="Resources\united_kingdom_flags_flag_17079.png" />
+    <None Include="Resources\russia_flags_flag_17058.png" />
+    <None Include="Resources\united_kingdom_flags_flag_17079.png" />
     <None Include="Resources\Fh_Image.bmp" />
     <EmbeddedResource Include="AboutBox1.en.resx">
       <DependentUpon>AboutBox1.cs</DependentUpon>
@@ -333,7 +334,7 @@
     <Content Include="AdbWinUsbApi.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="Resources\fh.ico" />
+    <None Include="Resources\fh.ico" />
     <Content Include="fh_loader.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -346,6 +347,16 @@
     <Resource Include="Resources\bot.txt" />
   </ItemGroup>
   <ItemGroup>
+    <PublishFile Include="en\FirehoseFinder.resources">
+      <Visible>False</Visible>
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>True</IncludeHash>
+      <FileType>Satellite</FileType>
+    </PublishFile>
     <PublishFile Include="ForFilter.xml">
       <Visible>False</Visible>
       <Group>

diff --git a/Form1.cs b/Form1.cs
@@ -1769,7 +1769,7 @@ public void BotSendMes(string send_message, string version)
             string message_not_mark = send_message.Replace("_", "\\_")
                 .Replace("*", "\\*")
                 .Replace("[", "\\[")
-                .Replace("`", "\\`")
+                .Replace("`", "\\`");/*
                 .Replace("]", "\\]")
                 .Replace("(", "\\(")
                 .Replace(")", "\\)")
@@ -1784,7 +1784,7 @@ public void BotSendMes(string send_message, string version)
                 .Replace("}", "\\}")
                 .Replace(".", "\\.")
                 .Replace("!", "\\!")
-                .Replace("\"", "\\\"");
+                .Replace("\"", "\\\"");*/
             string correct_mess = message_not_mark;
             //Ограничение на размер сообщения. Оставляем только конец.
             if (message_not_mark.Length >= 4096)
@@ -1793,8 +1793,8 @@ public void BotSendMes(string send_message, string version)
                     .Insert(0, "...");
             }
             //Устанавливаем моношрифт
-            correct_mess=correct_mess.Insert(0, "`")
-                .Insert(correct_mess.LastIndexOf('\u000A'), "`");
+            //correct_mess=correct_mess.Insert(0, "`")
+            //    .Insert(correct_mess.LastIndexOf('\u000A'), "`");
             var mybot = new TelegramBotApi.TelegramBotClient(Resources.bot);
             long chat = -1001227261414;
             try

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,6 +32,6 @@
 // Можно задать все значения или принять номера сборки и редакции по умолчанию 
 // используя "*", как показано ниже:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("22.2.3.2")]
-[assembly: AssemblyFileVersion("22.2.3.2")]
+[assembly: AssemblyVersion("22.2.4.1")]
+[assembly: AssemblyFileVersion("22.2.4.1")]
 [assembly: NeutralResourcesLanguage("ru-RU")]
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Resources.en.resx b/Properties/Resources.en.resx
@@ -121,6 +121,14 @@
     <value>About</value>
     <comment>О программе</comment>
   </data>
+  <data name="app_path" xml:space="preserve">
+    <value>Workdir application</value>
+    <comment>Путь установки программы</comment>
+  </data>
+  <data name="copy_clip" xml:space="preserve">
+    <value>Copy to clipboard</value>
+    <comment>Скопировано в буфер</comment>
+  </data>
   <data name="message_body_need_restart" xml:space="preserve">
     <value>A restart of the application is required for the change of the selected language to take effect. Click "Ok" to restart the application now or "Cancel" for the changes to take effect at the next launch.</value>
     <comment>Для вступления в силу изменения выбранного языка требуется перезапуск приложения. Нажмите "Ок" для перезагрузки приложения сейчас или "Отмена" для вступления изменений в силу при следующем запуске.</comment>

diff --git a/Properties/Resources.resx b/Properties/Resources.resx
@@ -120,10 +120,16 @@
   <data name="about" xml:space="preserve">
     <value>О программе</value>
   </data>
+  <data name="app_path" xml:space="preserve">
+    <value>Путь установки программы</value>
+  </data>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="bot" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bot.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;windows-1251</value>
   </data>
+  <data name="copy_clip" xml:space="preserve">
+    <value>Скопировано в буфер</value>
+  </data>
   <data name="fh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\fh.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>