summaryrefslogtreecommitdiff
path: root/pdf-over-gui/src/main/resources
diff options
context:
space:
mode:
authortkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:02:51 +0000
committertkellner <tkellner@174cde9d-5d70-4d2a-aa98-46368bc2aaf7>2013-04-10 19:02:51 +0000
commit643e49a5a15feeed656609319841b294323e05c8 (patch)
treeae22a3547b6dd31a807f42c98724621564767f50 /pdf-over-gui/src/main/resources
parent569757d5f15de5b9ee8e65dd881e971b83326e9e (diff)
downloadpdf-over-643e49a5a15feeed656609319841b294323e05c8.tar.gz
pdf-over-643e49a5a15feeed656609319841b294323e05c8.tar.bz2
pdf-over-643e49a5a15feeed656609319841b294323e05c8.zip
+ resolved conflicts
+ simplified Error Dialog + Change emblem config git-svn-id: https://joinup.ec.europa.eu/svn/pdf-over/trunk@97 174cde9d-5d70-4d2a-aa98-46368bc2aaf7
Diffstat (limited to 'pdf-over-gui/src/main/resources')
-rw-r--r--pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties2
-rw-r--r--pdf-over-gui/src/main/resources/icons/delete_me0
2 files changed, 1 insertions, 1 deletions
diff --git a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties b/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
index 1537bc70..05665bcc 100644
--- a/pdf-over-gui/src/main/resources/at/asit/pdfover/gui/messages.properties
+++ b/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/pdf-over-gui/src/main/resources/icons/delete_me b/pdf-over-gui/src/main/resources/icons/delete_me
deleted file mode 100644
index e69de29b..00000000
--- a/pdf-over-gui/src/main/resources/icons/delete_me
+++ /dev/null