From 2adb61249ec1a084c09ec0aa9e8297126aa4871c Mon Sep 17 00:00:00 2001 From: tkellner Date: Wed, 31 Oct 2012 16:36:31 +0000 Subject: + 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 --- .../src/main/resources/at/asit/pdfover/gui/messages.properties | 2 +- trunk/pdf-over-gui/src/main/resources/icons/delete_me | 0 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 trunk/pdf-over-gui/src/main/resources/icons/delete_me (limited to 'trunk/pdf-over-gui/src/main/resources') 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 here 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 -- cgit v1.2.3