diff options
| author | Björn Schießle <schiessle@owncloud.com> | 2013-06-13 13:17:35 +0200 |
|---|---|---|
| committer | Björn Schießle <schiessle@owncloud.com> | 2013-06-13 13:17:35 +0200 |
| commit | 7cfb0dc406910f66eaefc8651fd655a78883f241 (patch) | |
| tree | a8cda865f793d21f8248c5035c363ee3971fdd1a /l10n/de_DE/files_trashbin.po | |
| parent | 20ddd6e1c77224d18d5be74101b80144b7187475 (diff) | |
| parent | dd8011925acbd701de10e604b377c3d7f01aeff8 (diff) | |
| download | nextcloud-server-7cfb0dc406910f66eaefc8651fd655a78883f241.tar.gz nextcloud-server-7cfb0dc406910f66eaefc8651fd655a78883f241.zip | |
Merge branch 'master' into files_encryption_check_private_key
Conflicts:
apps/files_encryption/appinfo/app.php
apps/files_encryption/lib/util.php
Diffstat (limited to 'l10n/de_DE/files_trashbin.po')
| -rw-r--r-- | l10n/de_DE/files_trashbin.po | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/l10n/de_DE/files_trashbin.po b/l10n/de_DE/files_trashbin.po index 00f2533ca89..8de7dd8684f 100644 --- a/l10n/de_DE/files_trashbin.po +++ b/l10n/de_DE/files_trashbin.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-06-11 01:56+0200\n" -"PO-Revision-Date: 2013-06-10 23:19+0000\n" +"POT-Creation-Date: 2013-06-12 02:55+0200\n" +"PO-Revision-Date: 2013-06-11 23:28+0000\n" "Last-Translator: Mirodin <blobbyjj@ymail.com>\n" "Language-Team: German (Germany) <translations@owncloud.org>\n" "MIME-Version: 1.0\n" |