Moving back to trunk!

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1602 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2012-01-24 19:24:36 +00:00
commit 8d458998a1
332 changed files with 17647 additions and 9466 deletions

View file

@ -7,6 +7,9 @@
<resource name="label_url">
Url
</resource>
<resource name="label_timeout">
Timeout
</resource>
<resource name="label_user">
User
</resource>
@ -21,6 +24,9 @@
</resource>
<resource name="CANCEL">
Cancel
</resource>
<resource name="upload_menu_item">
Upload to Confluence
</resource>
<resource name="upload_success">
Successfully uploaded image to Confluence!
@ -28,5 +34,17 @@
<resource name="upload_failure">
An error occured while uploading to Confluence:
</resource>
<resource name="open_page_after_upload">
Open page after upload
</resource>
<resource name="upload_format">
Upload format
</resource>
<resource name="copy_wikimarkup">
Copy the Wikimarkup for image to the Clipboard
</resource>
<resource name="filename">
Filename
</resource>
</resources>
</language>