"Merged" 0.8 with HEAD, so we can continue developing

git-svn-id: http://svn.code.sf.net/p/greenshot/code/trunk@1282 7dccd23d-a4a3-4e1f-8c07-b4c1b4018ab4
This commit is contained in:
RKrom 2011-07-17 12:05:59 +00:00
commit f3b0878b02
539 changed files with 86855 additions and 0 deletions

View file

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<language description="English" ietf="en-US" version="0.8.0">
<resources>
<resource name="login_error">
There was a problem during the login: {0}
</resource>
<resource name="label_url">
Url
</resource>
<resource name="label_user">
User
</resource>
<resource name="label_password">
Password
</resource>
<resource name="login_title">
Please enter your Confluence login data
</resource>
<resource name="OK">
OK
</resource>
<resource name="CANCEL">
Cancel
</resource>
<resource name="upload_success">
Successfully uploaded image to Confluence!
</resource>
<resource name="upload_failure">
An error occured while uploading to Confluence:
</resource>
</resources>
</language>