mirror of
https://github.com/greenshot/greenshot
synced 2025-08-14 02:37:03 -07:00
Creating a branch 1.1 where I will try to make the 1.1.7 build available, this means I need to merge some changes from 2.0 to here.
This commit is contained in:
RKrom
parent
2a8e2475d8
commit
a03bc31aef
247 changed files with 6986 additions and 8233 deletions
|
|
@ -108,12 +108,18 @@ namespace ExternalCommand {
|
|||
private int CallExternalCommand(string commando, string fullPath, out string output) {
|
||||
try {
|
||||
return CallExternalCommand(commando, fullPath, null, out output);
|
||||
} catch (Win32Exception ex) {
|
||||
} catch (Win32Exception w32ex) {
|
||||
try {
|
||||
return CallExternalCommand(commando, fullPath, "runas", out output);
|
||||
} catch {
|
||||
throw ex;
|
||||
w32ex.Data.Add("commandline", config.commandlines[presetCommand]);
|
||||
w32ex.Data.Add("arguments", config.arguments[presetCommand]);
|
||||
throw w32ex;
|
||||
}
|
||||
} catch (Exception ex) {
|
||||
ex.Data.Add("commandline", config.commandlines[presetCommand]);
|
||||
ex.Data.Add("arguments", config.arguments[presetCommand]);
|
||||
throw;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -49,9 +49,6 @@
|
|||
<None Include="Languages\language_externalcommandplugin-en-US.xml" />
|
||||
<None Include="Properties\AssemblyInfo.cs.template" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>"$(SolutionDir)\tools\TortoiseSVN\SubWCRev.exe" "$(ProjectDir)\" "$(ProjectDir)\Properties\AssemblyInfo.cs.template" "$(ProjectDir)\Properties\AssemblyInfo.cs"</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\GreenshotPlugin\GreenshotPlugin.csproj">
|
||||
<Project>{5B924697-4DCD-4F98-85F1-105CB84B7341}</Project>
|
||||
|
|
|
|||
|
|
@ -1,35 +1,35 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Czech" ietf="cs-CZ" version="1.0.0">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">
|
||||
Nakonfigurovat externí příkazy
|
||||
</resource>
|
||||
<resource name="settings_title">
|
||||
Externí příkaz Nastavení
|
||||
</resource>
|
||||
<resource name="settings_detail_title">
|
||||
Konfigurace příkazu
|
||||
</resource>
|
||||
<resource name="settings_new">
|
||||
Nový
|
||||
</resource>
|
||||
<resource name="settings_delete">
|
||||
Odstranit
|
||||
</resource>
|
||||
<resource name="settings_edit">
|
||||
Úpravy
|
||||
</resource>
|
||||
<resource name="label_name">
|
||||
Jméno
|
||||
</resource>
|
||||
<resource name="label_command">
|
||||
Příkaz
|
||||
</resource>
|
||||
<resource name="label_argument">
|
||||
Argumenty
|
||||
</resource>
|
||||
<resource name="label_information">
|
||||
{0} je název vašeho snímku
|
||||
</resource>
|
||||
</resources>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Czech" ietf="cs-CZ" version="1.0.0">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">
|
||||
Nakonfigurovat externí příkazy
|
||||
</resource>
|
||||
<resource name="settings_title">
|
||||
Externí příkaz Nastavení
|
||||
</resource>
|
||||
<resource name="settings_detail_title">
|
||||
Konfigurace příkazu
|
||||
</resource>
|
||||
<resource name="settings_new">
|
||||
Nový
|
||||
</resource>
|
||||
<resource name="settings_delete">
|
||||
Odstranit
|
||||
</resource>
|
||||
<resource name="settings_edit">
|
||||
Úpravy
|
||||
</resource>
|
||||
<resource name="label_name">
|
||||
Jméno
|
||||
</resource>
|
||||
<resource name="label_command">
|
||||
Příkaz
|
||||
</resource>
|
||||
<resource name="label_argument">
|
||||
Argumenty
|
||||
</resource>
|
||||
<resource name="label_information">
|
||||
{0} je název vašeho snímku
|
||||
</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Bahasa Indonesia" ietf="id-ID" version="1.0.0.0" languagegroup="">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">Konfigurasi perintah eksternal</resource>
|
||||
<resource name="label_argument">Argumen</resource>
|
||||
<resource name="label_command">Perintah</resource>
|
||||
<resource name="label_information">{0} adalah nama berkas dari tangkapan anda</resource>
|
||||
<resource name="label_name">Nama</resource>
|
||||
<resource name="settings_delete">Hapus</resource>
|
||||
<resource name="settings_detail_title">Konfigursi perintah</resource>
|
||||
<resource name="settings_edit">Edit</resource>
|
||||
<resource name="settings_new">Baru</resource>
|
||||
<resource name="settings_title">Setelan perintah eksternal</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -1,35 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Italiano" ietf="it-IT" version="1.0.0">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">
|
||||
Configurazione comandi esterni external commands
|
||||
</resource>
|
||||
<resource name="settings_title">
|
||||
Impostazioni comandi esterni
|
||||
</resource>
|
||||
<resource name="settings_detail_title">
|
||||
Configurazione comando
|
||||
</resource>
|
||||
<resource name="settings_new">
|
||||
Nuovo
|
||||
</resource>
|
||||
<resource name="settings_delete">
|
||||
Elimina
|
||||
</resource>
|
||||
<resource name="settings_edit">
|
||||
Modifica
|
||||
</resource>
|
||||
<resource name="label_name">
|
||||
Nome
|
||||
</resource>
|
||||
<resource name="label_command">
|
||||
Comando
|
||||
</resource>
|
||||
<resource name="label_argument">
|
||||
Parametri
|
||||
</resource>
|
||||
<resource name="label_information">
|
||||
{0} è il nome file della vostra immagine
|
||||
</resource>
|
||||
</resources>
|
||||
<language description="Italiano" ietf="it-IT" version="1.1.4" languagegroup="2">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">Configurazione comandi esterni</resource>
|
||||
<resource name="label_argument">Parametri</resource>
|
||||
<resource name="label_command">Comando</resource>
|
||||
<resource name="label_information">{0} è il nome file della vostra immagine</resource>
|
||||
<resource name="label_name">Nome</resource>
|
||||
<resource name="settings_delete">Elimina</resource>
|
||||
<resource name="settings_detail_title">Configurazione comando</resource>
|
||||
<resource name="settings_edit">Modifica</resource>
|
||||
<resource name="settings_new">Nuovo</resource>
|
||||
<resource name="settings_title">Impostazioni comandi esterni</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Polski" ietf="pl-PL" version="1.1.4" languagegroup="2">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">Konfiguruj zewnętrzne komendy</resource>
|
||||
<resource name="label_argument">Parametry</resource>
|
||||
<resource name="label_command">Komenda</resource>
|
||||
<resource name="label_information">{0} oznacza nazwę pliku zrzutu ekranu</resource>
|
||||
<resource name="label_name">Nazwa</resource>
|
||||
<resource name="settings_delete">Usuń</resource>
|
||||
<resource name="settings_detail_title">Ustawienia komendy</resource>
|
||||
<resource name="settings_edit">Edytuj</resource>
|
||||
<resource name="settings_new">Nowy</resource>
|
||||
<resource name="settings_title">Ustawienia zewnętrznych komend</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -1,35 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Русский" ietf="ru-RU" version="1.0.0">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">
|
||||
Настройка внешних команд
|
||||
</resource>
|
||||
<resource name="settings_title">
|
||||
Параметры внешней команды
|
||||
</resource>
|
||||
<resource name="settings_detail_title">
|
||||
Настройка команды
|
||||
</resource>
|
||||
<resource name="settings_new">
|
||||
Новая
|
||||
</resource>
|
||||
<resource name="settings_delete">
|
||||
Удалить
|
||||
</resource>
|
||||
<resource name="settings_edit">
|
||||
Изменить
|
||||
</resource>
|
||||
<resource name="label_name">
|
||||
Имя
|
||||
</resource>
|
||||
<resource name="label_command">
|
||||
Команда
|
||||
</resource>
|
||||
<resource name="label_argument">
|
||||
Аргументы
|
||||
</resource>
|
||||
<resource name="label_information">
|
||||
{0} это имя файла вашего скриншота
|
||||
</resource>
|
||||
</resources>
|
||||
<language description="Русский" ietf="ru-RU" version="1.1.4.2622" languagegroup="5">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">Настройка внешних команд</resource>
|
||||
<resource name="label_argument">Аргументы</resource>
|
||||
<resource name="label_command">Команда</resource>
|
||||
<resource name="label_information">{0} это имя файла вашего скриншота</resource>
|
||||
<resource name="label_name">Имя</resource>
|
||||
<resource name="settings_delete">Удалить</resource>
|
||||
<resource name="settings_detail_title">Настройка команды</resource>
|
||||
<resource name="settings_edit">Изменить</resource>
|
||||
<resource name="settings_new">Новая</resource>
|
||||
<resource name="settings_title">Параметры внешней команды</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -1,15 +1,15 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="正體中文" ietf="zh-TW" version="1.0.0" languagegroup="9">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">組態外部命令</resource>
|
||||
<resource name="label_argument">引數</resource>
|
||||
<resource name="label_command">命令</resource>
|
||||
<resource name="label_information">{0} 是螢幕擷圖的檔案名稱</resource>
|
||||
<resource name="label_name">名稱</resource>
|
||||
<resource name="settings_delete">刪除</resource>
|
||||
<resource name="settings_detail_title">組態命令</resource>
|
||||
<resource name="settings_edit">編輯</resource>
|
||||
<resource name="settings_new">新增</resource>
|
||||
<resource name="settings_title">外部命令設定</resource>
|
||||
</resources>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="正體中文" ietf="zh-TW" version="1.0.0" languagegroup="9">
|
||||
<resources>
|
||||
<resource name="contextmenu_configure">組態外部命令</resource>
|
||||
<resource name="label_argument">引數</resource>
|
||||
<resource name="label_command">命令</resource>
|
||||
<resource name="label_information">{0} 是螢幕擷圖的檔案名稱</resource>
|
||||
<resource name="label_name">名稱</resource>
|
||||
<resource name="settings_delete">刪除</resource>
|
||||
<resource name="settings_detail_title">組態命令</resource>
|
||||
<resource name="settings_edit">編輯</resource>
|
||||
<resource name="settings_new">新增</resource>
|
||||
<resource name="settings_title">外部命令設定</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -50,4 +50,4 @@ using Greenshot.Plugin;
|
|||
//
|
||||
// You can specify all the values or you can use the default the Revision and
|
||||
// Build Numbers by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.1.4.$WCREV$")]
|
||||
[assembly: AssemblyVersion("1.1.6.$WCREV$")]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue