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 2013-12-04 17:46:02 +01:00
commit a03bc31aef
247 changed files with 6986 additions and 8233 deletions

View file

@ -143,7 +143,7 @@ namespace GreenshotDropboxPlugin {
return true;
} catch (Exception e) {
LOG.Error(e);
MessageBox.Show(Language.GetString("dropbox", LangKey.upload_failure) + " " + e.ToString());
MessageBox.Show(Language.GetString("dropbox", LangKey.upload_failure) + " " + e.Message);
return false;
}
}

View file

@ -69,8 +69,7 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)bin\$
mkdir "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
</PostBuildEvent>
<PreBuildEvent>"$(SolutionDir)\tools\TortoiseSVN\SubWCRev.exe" "$(ProjectDir)\" "$(ProjectDir)\Properties\AssemblyInfo.cs.template" "$(ProjectDir)\Properties\AssemblyInfo.cs"
<PreBuildEvent>
if exist "$(ProjectDir)DropBoxCredentials.private.cs" (
rename "$(ProjectDir)DropBoxCredentials.cs" "DropBoxCredentials.orig.cs"
rename "$(ProjectDir)DropBoxCredentials.private.cs" "DropBoxCredentials.cs"

View file

@ -1,25 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<language description="Czech" ietf="cs-CZ" version="1.1.0.2411" languagegroup="">
<resources>
<resource name="authenticate_dropbox">Použijte prosím webové stránky dropbox k přihlášení a poskytněte programu Greenshot přístup k službě dropbox, dokončete stisknutím OK.</resource>
<resource name="buttonAuthenticate">Ověřit</resource>
<resource name="CANCEL">Zrušit</resource>
<resource name="communication_wait">Probíhá komunikace s Dropbox. Počkejte prosím...</resource>
<resource name="Configure">Konfigurovat</resource>
<resource name="delete_question">Jste si jistý, že chcete odstranit obrázek {0} z Dropbox?</resource>
<resource name="delete_title">Odstranit Dropbox {0}</resource>
<resource name="History">Historie</resource>
<resource name="label_AfterUpload">Po odeslání</resource>
<resource name="label_AfterUploadLinkToClipBoard">Odkaz do schránky</resource>
<resource name="label_AfterUploadOpenHistory">Otevřít historii</resource>
<resource name="label_AuthToken">Ověření Token</resource>
<resource name="label_upload_format">Formát obrázku</resource>
<resource name="OK">OK</resource>
<resource name="settings_title">Nastavení Dropbox</resource>
<resource name="TokenNotSet">Prosím ověřit dostupnost aplikace Dropbox. Otevřít obrazovku pro nastavení snímku.</resource>
<resource name="Upload">Odeslat</resource>
<resource name="upload_failure">Při odesílání do Dropbox došlo k chybě:</resource>
<resource name="upload_menu_item">Odeslat do Dropbox</resource>
<resource name="upload_success">Obrázek úspěšně odslán do Dropbox!</resource>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<language description="Czech" ietf="cs-CZ" version="1.1.0.2411" languagegroup="">
<resources>
<resource name="authenticate_dropbox">Použijte prosím webové stránky dropbox k přihlášení a poskytněte programu Greenshot přístup k službě dropbox, dokončete stisknutím OK.</resource>
<resource name="buttonAuthenticate">Ověřit</resource>
<resource name="CANCEL">Zrušit</resource>
<resource name="communication_wait">Probíhá komunikace s Dropbox. Počkejte prosím...</resource>
<resource name="Configure">Konfigurovat</resource>
<resource name="delete_question">Jste si jistý, že chcete odstranit obrázek {0} z Dropbox?</resource>
<resource name="delete_title">Odstranit Dropbox {0}</resource>
<resource name="History">Historie</resource>
<resource name="label_AfterUpload">Po odeslání</resource>
<resource name="label_AfterUploadLinkToClipBoard">Odkaz do schránky</resource>
<resource name="label_AfterUploadOpenHistory">Otevřít historii</resource>
<resource name="label_AuthToken">Ověření Token</resource>
<resource name="label_upload_format">Formát obrázku</resource>
<resource name="OK">OK</resource>
<resource name="settings_title">Nastavení Dropbox</resource>
<resource name="TokenNotSet">Prosím ověřit dostupnost aplikace Dropbox. Otevřít obrazovku pro nastavení snímku.</resource>
<resource name="Upload">Odeslat</resource>
<resource name="upload_failure">Při odesílání do Dropbox došlo k chybě:</resource>
<resource name="upload_menu_item">Odeslat do Dropbox</resource>
<resource name="upload_success">Obrázek úspěšně odslán do Dropbox!</resource>
</resources>
</language>

View file

@ -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="communication_wait">Menyambungkan ke Dropbox. Tunggu sebentar...</resource>
<resource name="Configure">Konfigurasi Dropbox</resource>
<resource name="label_AfterUpload">Setelah mengunggah</resource>
<resource name="label_AfterUploadLinkToClipBoard">Sambung ke papanklip</resource>
<resource name="label_AfterUploadOpenHistory">Buka riwayat</resource>
<resource name="label_upload_format">Format gambar</resource>
<resource name="settings_title">Setelan Dropbox</resource>
<resource name="upload_failure">Kesalahan terjadi ketik mengunggah ke Dropbox:</resource>
<resource name="upload_menu_item">Unggah ke Dropbox</resource>
<resource name="upload_success">Sukses mengunggah gambar ke Dropbox!</resource>
</resources>
</language>

View file

@ -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="communication_wait">Trwa komunikacja z Dropbox. Proszę czekać...</resource>
<resource name="Configure">Konfiguruj Dropbox</resource>
<resource name="label_AfterUpload">Po wysłaniu</resource>
<resource name="label_AfterUploadLinkToClipBoard">Link do schowka</resource>
<resource name="label_AfterUploadOpenHistory">Otwórz historię</resource>
<resource name="label_upload_format">Format obrazu</resource>
<resource name="settings_title">Ustawienia Dropbox</resource>
<resource name="upload_failure">Wystąpił błąd przy wysyłaniu do Dropbox:</resource>
<resource name="upload_menu_item">Wyślij do Dropbox</resource>
<resource name="upload_success">Wysyłanie obrazu do Dropbox powiodło się!</resource>
</resources>
</language>

View file

@ -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="communication_wait">正在與 Dropbox 通訊,請稍候...</resource>
<resource name="Configure">組態 Dropbox</resource>
<resource name="label_AfterUpload">上傳後</resource>
<resource name="label_AfterUploadLinkToClipBoard">連結到剪貼簿</resource>
<resource name="label_AfterUploadOpenHistory">開啟歷程記錄</resource>
<resource name="label_upload_format">圖片格式</resource>
<resource name="settings_title">Dropbox 設定</resource>
<resource name="upload_failure">上傳到 Dropbox 時發生錯誤:</resource>
<resource name="upload_menu_item">上傳到 Dropbox</resource>
<resource name="upload_success">上傳圖片到 Dropbox 成功!</resource>
</resources>
<?xml version="1.0" encoding="utf-8"?>
<language description="正體中文" ietf="zh-TW" version="1.0.0" languagegroup="9">
<resources>
<resource name="communication_wait">正在與 Dropbox 通訊,請稍候...</resource>
<resource name="Configure">組態 Dropbox</resource>
<resource name="label_AfterUpload">上傳後</resource>
<resource name="label_AfterUploadLinkToClipBoard">連結到剪貼簿</resource>
<resource name="label_AfterUploadOpenHistory">開啟歷程記錄</resource>
<resource name="label_upload_format">圖片格式</resource>
<resource name="settings_title">Dropbox 設定</resource>
<resource name="upload_failure">上傳到 Dropbox 時發生錯誤:</resource>
<resource name="upload_menu_item">上傳到 Dropbox</resource>
<resource name="upload_success">上傳圖片到 Dropbox 成功!</resource>
</resources>
</language>

View file

@ -51,4 +51,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$")]