diff options
| author | tkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459> | 2012-10-31 16:36:31 +0000 |
|---|---|---|
| committer | tkellner <tkellner@3a0b52a2-8410-0410-bc02-ff6273a87459> | 2012-10-31 16:36:31 +0000 |
| commit | 2adb61249ec1a084c09ec0aa9e8297126aa4871c (patch) | |
| tree | e065f3dccf0f1dc7897193bbd0152a4b80240ed9 /trunk/pdf-over-gui/src/main/resources | |
| parent | 071b1e4050fc46bb70747d2124656cb3a5b4f760 (diff) | |
| download | pdf-over-2adb61249ec1a084c09ec0aa9e8297126aa4871c.tar.gz pdf-over-2adb61249ec1a084c09ec0aa9e8297126aa4871c.tar.bz2 pdf-over-2adb61249ec1a084c09ec0aa9e8297126aa4871c.zip | |
+ resolved conflicts
+ simplified Error Dialog
+ Change emblem config
git-svn-id: https://svn.iaik.tugraz.at/svn/egiz/prj/current/12PDF-OVER-4.0@12683 3a0b52a2-8410-0410-bc02-ff6273a87459
Diffstat (limited to 'trunk/pdf-over-gui/src/main/resources')
| -rw-r--r-- | trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties | 2 | ||||
| -rw-r--r-- | trunk/pdf-over-gui/src/main/resources/icons/delete_me | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties index 1537bc70..05665bcc 100644 --- a/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties +++ b/trunk/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties @@ -81,7 +81,7 @@ mobileBKU.password=Password\: output.link_open_message=You can open the signed file <a>here</a> output.link_save_message=You can save the signed file output.success_message=Signature was successful -simple_config.EmblemEmpty=Drag and Drop an image here\nor use the browse button to select an emblem. +simple_config.EmblemEmpty=Drag and Drop an image here\nor use the browse button \nto select an emblem. simple_config.Emblem_Title=Emblem simple_config.ExampleNumber=+43676123456789 simple_config.MobileBKU_Title=Mobile signature diff --git a/trunk/pdf-over-gui/src/main/resources/icons/delete_me b/trunk/pdf-over-gui/src/main/resources/icons/delete_me deleted file mode 100644 index e69de29b..00000000 --- a/trunk/pdf-over-gui/src/main/resources/icons/delete_me +++ /dev/null |