diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-12-31 15:47:15 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-31 15:47:15 +0000 |
| commit | 6eb194b70284d527a182756f2c7a21f3d7dc1fe8 (patch) | |
| tree | e70635e44cc4fccbbde34bed1a01fd50fcd183cf /l10n/sv/user_ldap.po | |
| parent | 218a5ea89014322592bd8c4789d8500d42029b9f (diff) | |
| parent | 329bddab481129b480ca187b694e507eff7fb125 (diff) | |
| download | nextcloud-server-6eb194b70284d527a182756f2c7a21f3d7dc1fe8.tar.gz nextcloud-server-6eb194b70284d527a182756f2c7a21f3d7dc1fe8.zip | |
Merge branch 'master' into ocs_api
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
Diffstat (limited to 'l10n/sv/user_ldap.po')
| -rw-r--r-- | l10n/sv/user_ldap.po | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po index d35d99ea4ef..76ca9c76224 100644 --- a/l10n/sv/user_ldap.po +++ b/l10n/sv/user_ldap.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2012-12-15 00:11+0100\n" -"PO-Revision-Date: 2012-12-14 23:11+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2012-12-18 00:13+0100\n" +"PO-Revision-Date: 2012-12-17 19:54+0000\n" +"Last-Translator: Magnus Höglund <magnus@linux.com>\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,13 +23,13 @@ msgid "" "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may" " experience unexpected behaviour. Please ask your system administrator to " "disable one of them." -msgstr "" +msgstr "<b>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom." #: templates/settings.php:11 msgid "" "<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will" " not work. Please ask your system administrator to install it." -msgstr "" +msgstr "<b>Varning:</b> PHP LDAP-modulen måste vara installerad, serversidan kommer inte att fungera. Be din systemadministratör att installera den." #: templates/settings.php:15 msgid "Host" |