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

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<language description="Deutsch" ietf="de-DE" version="0.8.0">
<language description="Deutsch" ietf="de-DE" version="0.8.0" prefix="confluence">
<resources>
<resource name="login_error">
Es gab ein Problem während dem Login: {0}
@ -10,6 +10,9 @@
<resource name="label_url">
Url
</resource>
<resource name="label_timeout">
Timeout
</resource>
<resource name="label_user">
Benutzer
</resource>
@ -22,11 +25,26 @@
<resource name="CANCEL">
Cancel
</resource>
<resource name="upload_menu_item">
In Confluence hochladen
</resource>
<resource name="upload_success">
Ein erfolg beim Hochladen zum Confluence!
</resource>
<resource name="upload_failure">
Es gab einen Fehler beim Hochladen zum Confluence:
</resource>
<resource name="open_page_after_upload">
Seite nach dem upload öffnen
</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>

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>

View file

@ -7,6 +7,9 @@
<resource name="label_url">
Url
</resource>
<resource name="label_timeout">
Timeout
</resource>
<resource name="label_user">
Gebruiker
</resource>
@ -21,6 +24,9 @@
</resource>
<resource name="CANCEL">
Afbreken
</resource>
<resource name="upload_menu_item">
Upload naar Confluence
</resource>
<resource name="upload_success">
Het uploaden naar Confluence is geslaagt!
@ -28,5 +34,17 @@
<resource name="upload_failure">
Tijdens het uploaden naar Confluence is een fout opgetreden:
</resource>
<resource name="open_page_after_upload">
Open pagina na het uploaden
</resource>
<resource name="upload_format">
Upload formaat
</resource>
<resource name="copy_wikimarkup">
Copy the Wikimarkup for image to the Clipboard
</resource>
<resource name="filename">
Filename
</resource>
</resources>
</language>