mirror of
https://github.com/greenshot/greenshot
synced 2025-08-20 21:43:24 -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
|
|
@ -138,7 +138,6 @@
|
|||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>"$(SolutionDir)\tools\TortoiseSVN\SubWCRev.exe" "$(ProjectDir)\" "$(ProjectDir)\Properties\AssemblyInfo.cs.template" "$(ProjectDir)\Properties\AssemblyInfo.cs"</PreBuildEvent>
|
||||
<PostBuildEvent>mkdir "$(SolutionDir)bin\$(Configuration)\Plugins\$(ProjectName)"
|
||||
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)bin\$(Configuration)\Plugins\$(ProjectName)\*.gsp"
|
||||
copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)bin\$(Configuration)\Plugins\$(ProjectName)\"
|
||||
|
|
|
|||
|
|
@ -1,29 +1,29 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Czech" ietf="cs-CZ" version="1.1.0.2411" languagegroup="">
|
||||
<resources>
|
||||
<resource name="browse_pages">Prohlížet stránky</resource>
|
||||
<resource name="CANCEL">Zrušit</resource>
|
||||
<resource name="copy_wikimarkup">Kopírovat Wikimarkup do schránky</resource>
|
||||
<resource name="filename">Název souboru</resource>
|
||||
<resource name="include_person_spaces">Zahrnout soukromého prostoru do hledání a prohlížení</resource>
|
||||
<resource name="label_password">Heslo</resource>
|
||||
<resource name="label_timeout">Časový limit</resource>
|
||||
<resource name="label_url">Url</resource>
|
||||
<resource name="label_user">Uživatel</resource>
|
||||
<resource name="loading">Data z Confluence se načítají, čekejte prosím ...</resource>
|
||||
<resource name="login_error">Došlo k potížím během přihlášení: {0}</resource>
|
||||
<resource name="login_title">Prosím zadejte vaše přihlašovací údaje k službě Confluence</resource>
|
||||
<resource name="OK">OK</resource>
|
||||
<resource name="open_page_after_upload">Otevřít stránky pro nahrání</resource>
|
||||
<resource name="open_pages">Otevřít stránky</resource>
|
||||
<resource name="plugin_settings">Nastavení Confluence</resource>
|
||||
<resource name="search">Hledat</resource>
|
||||
<resource name="search_pages">Hledat stránky</resource>
|
||||
<resource name="search_text">Hledat text</resource>
|
||||
<resource name="upload">Nahrát</resource>
|
||||
<resource name="upload_failure">Nahrání obrázku do Confluence se nezdařilo:</resource>
|
||||
<resource name="upload_format">Nahrát formát</resource>
|
||||
<resource name="upload_menu_item">Nahrát do Confluence</resource>
|
||||
<resource name="upload_success">Úspěšné nahrání obrázku do Confluence!</resource>
|
||||
</resources>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Czech" ietf="cs-CZ" version="1.1.0.2411" languagegroup="">
|
||||
<resources>
|
||||
<resource name="browse_pages">Prohlížet stránky</resource>
|
||||
<resource name="CANCEL">Zrušit</resource>
|
||||
<resource name="copy_wikimarkup">Kopírovat Wikimarkup do schránky</resource>
|
||||
<resource name="filename">Název souboru</resource>
|
||||
<resource name="include_person_spaces">Zahrnout soukromého prostoru do hledání a prohlížení</resource>
|
||||
<resource name="label_password">Heslo</resource>
|
||||
<resource name="label_timeout">Časový limit</resource>
|
||||
<resource name="label_url">Url</resource>
|
||||
<resource name="label_user">Uživatel</resource>
|
||||
<resource name="loading">Data z Confluence se načítají, čekejte prosím ...</resource>
|
||||
<resource name="login_error">Došlo k potížím během přihlášení: {0}</resource>
|
||||
<resource name="login_title">Prosím zadejte vaše přihlašovací údaje k službě Confluence</resource>
|
||||
<resource name="OK">OK</resource>
|
||||
<resource name="open_page_after_upload">Otevřít stránky pro nahrání</resource>
|
||||
<resource name="open_pages">Otevřít stránky</resource>
|
||||
<resource name="plugin_settings">Nastavení Confluence</resource>
|
||||
<resource name="search">Hledat</resource>
|
||||
<resource name="search_pages">Hledat stránky</resource>
|
||||
<resource name="search_text">Hledat text</resource>
|
||||
<resource name="upload">Nahrát</resource>
|
||||
<resource name="upload_failure">Nahrání obrázku do Confluence se nezdařilo:</resource>
|
||||
<resource name="upload_format">Nahrát formát</resource>
|
||||
<resource name="upload_menu_item">Nahrát do Confluence</resource>
|
||||
<resource name="upload_success">Úspěšné nahrání obrázku do Confluence!</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Bahasa Indonesia" ietf="id-ID" version="1.0.0.0" languagegroup="">
|
||||
<resources>
|
||||
<resource name="browse_pages">Telusuri halaman</resource>
|
||||
<resource name="CANCEL">Batal</resource>
|
||||
<resource name="communication_wait">Mentransfer data ke Confluence, tunggu sebentar...</resource>
|
||||
<resource name="copy_wikimarkup">Kopi Wikimarkup ke papanklip</resource>
|
||||
<resource name="filename">Nama berkas</resource>
|
||||
<resource name="include_person_spaces">Sertakan personal space dalam pencarian dan penelusuran</resource>
|
||||
<resource name="label_password">Sandi</resource>
|
||||
<resource name="label_timeout">Waktu habis</resource>
|
||||
<resource name="label_url">Url</resource>
|
||||
<resource name="label_user">Pengguna</resource>
|
||||
<resource name="loading">Data Confluence sedang dimuat, tunggu sebentar...</resource>
|
||||
<resource name="login_error">Ada masalah ketika login: {0}</resource>
|
||||
<resource name="login_title">Harap masukkan login Confluence anda</resource>
|
||||
<resource name="OK">Oke</resource>
|
||||
<resource name="open_page_after_upload">Buka halaman setelah diunggah</resource>
|
||||
<resource name="open_pages">Buka halaman</resource>
|
||||
<resource name="plugin_settings">Setelan Confluence</resource>
|
||||
<resource name="search">Cari</resource>
|
||||
<resource name="search_pages">Cari halaman</resource>
|
||||
<resource name="search_text">Cari teks</resource>
|
||||
<resource name="upload">Unggah</resource>
|
||||
<resource name="upload_failure">Kesalahan terjadi ketika mengunggah ke Confluence:</resource>
|
||||
<resource name="upload_format">Format unggah</resource>
|
||||
<resource name="upload_menu_item">Unggah ke Confluence</resource>
|
||||
<resource name="upload_success">Gambar telah berhasil diunggah ke Confluence!</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="Polski" ietf="pl-PL" version="0.8.0" languagegroup="">
|
||||
<resources>
|
||||
<resource name="browse_pages">Przeglądaj strony</resource>
|
||||
<resource name="CANCEL">Anuluj</resource>
|
||||
<resource name="communication_wait">Trwa komunikacja z Confluence. Proszę czekać...</resource>
|
||||
<resource name="copy_wikimarkup">Kopiuj Wikimarkup do schowka</resource>
|
||||
<resource name="filename">Nazwa pliku</resource>
|
||||
<resource name="include_person_spaces">Dołącz własne spacje przy wyszukiwaniu i przeglądaniu</resource>
|
||||
<resource name="label_password">Hasło</resource>
|
||||
<resource name="label_timeout">Czas</resource>
|
||||
<resource name="label_url">URL</resource>
|
||||
<resource name="label_user">Użytkownik</resource>
|
||||
<resource name="loading">Informacje z Confluence są wczytywane, proszę czekać...</resource>
|
||||
<resource name="login_error">Wystąpił problem podczas logowania: {0}</resource>
|
||||
<resource name="login_title">Wprowadź swoje dane logowania</resource>
|
||||
<resource name="OK">OK</resource>
|
||||
<resource name="open_page_after_upload">Otwórz stronę po wysłaniu</resource>
|
||||
<resource name="open_pages">Otwórz strony</resource>
|
||||
<resource name="plugin_settings">Ustawienia Confluence
|
||||
</resource>
|
||||
<resource name="search">Szukaj</resource>
|
||||
<resource name="search_pages">Szukaj strony</resource>
|
||||
<resource name="search_text">Szukaj tekst</resource>
|
||||
<resource name="upload">Wyślij</resource>
|
||||
<resource name="upload_failure">Wystąpił błąd przy wysyłaniu do Confluence:</resource>
|
||||
<resource name="upload_format">Format wysyłania</resource>
|
||||
<resource name="upload_menu_item">Wyślij do Confluence</resource>
|
||||
<resource name="upload_success">Wysyłanie obrazu do Confluence powiodło się!</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -1,30 +1,30 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="正體中文" ietf="zh-TW" version="0.8.0" languagegroup="9">
|
||||
<resources>
|
||||
<resource name="browse_pages">瀏覽頁面</resource>
|
||||
<resource name="CANCEL">取消</resource>
|
||||
<resource name="communication_wait">正在與 Confluence 通訊，請稍候...</resource>
|
||||
<resource name="copy_wikimarkup">複製 Wikimarkup 到剪貼簿</resource>
|
||||
<resource name="filename">檔案名稱</resource>
|
||||
<resource name="include_person_spaces">搜尋和瀏覽包含無效的空格</resource>
|
||||
<resource name="label_password">密碼</resource>
|
||||
<resource name="label_timeout">逾時</resource>
|
||||
<resource name="label_url">URL</resource>
|
||||
<resource name="label_user">使用者</resource>
|
||||
<resource name="loading">正在載入 Confluence 資料，請稍候...</resource>
|
||||
<resource name="login_error">登入期間發生問題: {0}</resource>
|
||||
<resource name="login_title">請輸入您的 Confluence 登入資料</resource>
|
||||
<resource name="OK">確定</resource>
|
||||
<resource name="open_page_after_upload">上傳後開啟頁面</resource>
|
||||
<resource name="open_pages">開啟頁面</resource>
|
||||
<resource name="plugin_settings">Confluence 設定</resource>
|
||||
<resource name="search">搜尋</resource>
|
||||
<resource name="search_pages">搜尋頁面</resource>
|
||||
<resource name="search_text">搜尋文字</resource>
|
||||
<resource name="upload">上傳</resource>
|
||||
<resource name="upload_failure">上傳到 Confluence 時發生錯誤:</resource>
|
||||
<resource name="upload_format">上傳格式</resource>
|
||||
<resource name="upload_menu_item">上傳到 Confluence</resource>
|
||||
<resource name="upload_success">上傳圖片到 Confluence 成功!</resource>
|
||||
</resources>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<language description="正體中文" ietf="zh-TW" version="0.8.0" languagegroup="9">
|
||||
<resources>
|
||||
<resource name="browse_pages">瀏覽頁面</resource>
|
||||
<resource name="CANCEL">取消</resource>
|
||||
<resource name="communication_wait">正在與 Confluence 通訊，請稍候...</resource>
|
||||
<resource name="copy_wikimarkup">複製 Wikimarkup 到剪貼簿</resource>
|
||||
<resource name="filename">檔案名稱</resource>
|
||||
<resource name="include_person_spaces">搜尋和瀏覽包含無效的空格</resource>
|
||||
<resource name="label_password">密碼</resource>
|
||||
<resource name="label_timeout">逾時</resource>
|
||||
<resource name="label_url">URL</resource>
|
||||
<resource name="label_user">使用者</resource>
|
||||
<resource name="loading">正在載入 Confluence 資料，請稍候...</resource>
|
||||
<resource name="login_error">登入期間發生問題: {0}</resource>
|
||||
<resource name="login_title">請輸入您的 Confluence 登入資料</resource>
|
||||
<resource name="OK">確定</resource>
|
||||
<resource name="open_page_after_upload">上傳後開啟頁面</resource>
|
||||
<resource name="open_pages">開啟頁面</resource>
|
||||
<resource name="plugin_settings">Confluence 設定</resource>
|
||||
<resource name="search">搜尋</resource>
|
||||
<resource name="search_pages">搜尋頁面</resource>
|
||||
<resource name="search_text">搜尋文字</resource>
|
||||
<resource name="upload">上傳</resource>
|
||||
<resource name="upload_failure">上傳到 Confluence 時發生錯誤:</resource>
|
||||
<resource name="upload_format">上傳格式</resource>
|
||||
<resource name="upload_menu_item">上傳到 Confluence</resource>
|
||||
<resource name="upload_success">上傳圖片到 Confluence 成功!</resource>
|
||||
</resources>
|
||||
</language>
|
||||
|
|
@ -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$")]
|
||||
Loading…
Add table
Add a link
Reference in a new issue