German translation by Ralph Stenzel.

Readme tweaks.
Move non-essential i18n files into the assets directory.

git-svn-id: http://plugins.svn.wordpress.org/user-switching/trunk@524990 b8457f37-d9ea-0310-8a92-e5e31aec5664

languages/readme.txt

@@ -0,0 +1,10 @@
+== For Translators ==
+
+Note: this folder contains MO files only. If you are looking for the POT or PO files, you can download them here:
+
+http://plugins.svn.wordpress.org/user-switching/assets/
+
+If you have created your own translation, or have an update of an existing one, please send it to <[email protected]> so I can bundle it into the next release of the plugin.
+
+Thank you.
+John.

readme.txt

@@ -3,55 +3,63 @@ Contributors: johnbillion
 Donate link: http://lud.icro.us/donations/
 Tags: user, users, profiles, switching, wpmu, multisite, buddypress, become, user control, user management, user access, developer
 Requires at least: 2.7
-Tested up to: 3.3
+Tested up to: 3.4
 Stable tag: trunk
 
 Instant switching between user accounts in WordPress.
 
 == Description ==
 
-This plugin allows you to quickly swap between user accounts in WordPress at the click of a button. You'll be instantly logged out and logged in as your desired user. This is handy for test environments where you regularly log out and in between different accounts, or for adminstrators of blogs with multiple accounts who need to switch between them.
+This plugin allows you to quickly swap between user accounts in WordPress at the click of a button. You'll be instantly logged out and logged in as your desired user. This is handy for test environments where you regularly log out and in between different accounts, or for adminstrators of sites who need to switch between multiple accounts.
 
 = Features =
 
- * Switch users: Instantly switch to any user from the Users screen.
+ * Switch users: Instantly switch to any user account from the *Users* screen.
  * Switch back: Instantly switch back to your originating account.
  * Switch off: Log out of your account but retain the ability to instantly switch back in again.
- * It's completely secure (see the "Security" section below).
+ * It's completely secure (see the *Security* section below).
  * Compatible with WordPress, WordPress Multisite, BuddyPress and WordPress MU.
 
 = Security =
 
- * Only administrators can switch to another user. Lower level users cannot switch between accounts.
+ * Only users with the ability to edit other users can switch user accounts (by default this is only Administrators). Lower level users cannot switch accounts.
  * User switching is protected with the WordPress nonce security system, meaning only those who are allowed to switch users can switch.
  * Full support for administration over SSL (if applicable).
  * Passwords are not (and cannot be) revealed.
 
-*Translations Included:*
+= Translations Included =
 
  * Chinese Simplified by Tunghsiao Liu (Sparanoid)
+ * German by Ralph Stenzel
 
 == Installation ==
 
-1. Unzip the ZIP file and drop the folder straight into your 'wp-content/plugins' directory.
-2. Activate the plugin through the 'Plugins' menu.
-3. Visit the 'Users' menu and you'll see a 'Switch To' link right next to each user.
+You can install this plugin directly from your WordPress dashboard:
 
-If you're installing this as a mu-plugin then see the FAQ for slightly different instructions.
+ 1. Go to the *Plugins* menu and click *Add New*.
+ 2. Search for *User Switching*.
+ 3. Click *Install Now* next to the User Switching plugin.
+ 4. Activate the plugin.
+
+Alternatively, see the guide to [Manually Installing Plugins](http://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation).
+
+= Usage =
+
+Visit the *Users* menu in WordPress and you'll see a *Switch To* link next to each user. Clicking this will switch you into that user account. Once switched, you can switch back to your originating account via the *Switch back* link on each dashboard screen.
+
+See the FAQ for information about the *Switch Off* feature.
 
 == Frequently Asked Questions ==
 
 = What does "Switch off" mean? =
 
 Switching off logs you out of your account but retains your current user ID in a cookie so you can switch straight back (ie. log straight back in) without having to log in with your username and password. It's akin to switching to no user, and being able to switch back.
 
-While you're logged in and you have the 'edit_users' capability, you'll see a 'Switch Off' link in your profile menu in the toolbar.
-
-Once you've switched off you'll see a 'Switch back to {user}' link in the footer of your site.
+The *Switch Off* link can be found in your profile menu in the WordPress toolbar. Once you've switched off you'll see a *Switch back* link in the footer of your site.
 
 = Does this plugin work with WordPress Multisite? =
 
-Yes, and you'll also be able to switch users from the Users menu in Network Admin.
+Yes, and you'll also be able to switch users from the Users screen in Network Admin.
 
 = Does this plugin work with BuddyPress? =
 
@@ -63,15 +71,22 @@ Yes, but you should really update to Multisite.
 
 = Does this work as a mu-plugin? =
 
-Yes, but you'll need to install 'user-switching.php' into the root of your mu-plugins directory, not in the 'user-switching' subdirectory. This is a restriction of WordPress.
+Yes, but you'll need to install `user-switching.php` into the root of your `mu-plugins` directory, not in the `user-switching` subdirectory. This is a restriction of WordPress.
+
+= What capability does a user need in order to switch accounts? =
+
+A user needs the `edit_users` capability in order to switch user accounts. By default only Administrators have this capability, and with Multisite enabled only Super Admins have this capability.
 
 == Screenshots ==
 
-1. The 'Switch To' link on the Users screen
-2. The 'Switch To' link on a user's profile
+1. The *Switch To* link on the Users screen
+2. The *Switch To* link on a user's profile
 
 == Changelog ==
 
+= 0.5.1.2 =
+* German translation by Ralph Stenzel.
+
 = 0.5.1.1 =
 * Chinese Simplified translation by Sparanoid.
 
@@ -115,6 +130,9 @@ Yes, but you'll need to install 'user-switching.php' into the root of your mu-pl
 
 == Upgrade Notice ==
 
+= 0.5.1.2 =
+* German translation by Ralph Stenzel.
+
 = 0.5.1.1 =
 * Chinese Simplified translation by Sparanoid.
 

user-switching.php

@@ -2,10 +2,11 @@
 /*
 Plugin Name:  User Switching
 Description:  Instant switching between user accounts in WordPress
-Version:      0.5.1.1
+Version:      0.5.1.2
 Plugin URI:   http://lud.icro.us/wordpress-plugin-user-switching/
 Author:       John Blackbourn
 Author URI:   http://johnblackbourn.com/
+Text Domain:  user_switching
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -94,13 +95,15 @@ function remember() {
 	}
 
 	/**
-	 * Routing function which performs different actions depending on the 'action' query var. Actions are secured
+	 * Load localisation files and route actions depending on the 'action' query var. Actions are secured
 	 * with WordPress' nonce system.
 	 *
 	 * @return null
 	 */
 	function init() {
 
+		load_plugin_textdomain( 'user_switching', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
+
 		if ( !isset( $_REQUEST['action'] ) )
 			return;
 
@@ -178,7 +181,7 @@ function admin_notice() {
 				<p><?php
 					if ( isset( $_GET['user_switched'] ) )
 						printf( __( 'Switched to %1$s (%2$s).', 'user_switching' ), $user_identity, $user_login );
-					printf( __( ' <a href="%1$s">Switch back to %2$s (%3$s)</a>.', 'user_switching' ), $this->switch_back_url(), $old_user->display_name, $old_user->user_login );
+					printf( ' <a href="%s">%s</a>.', $this->switch_back_url(), sprintf( __( 'Switch back to %1$s (%2$s)', 'user_switching' ), $old_user->display_name, $old_user->user_login ) );
 				?></p>
 			</div>
 			<?php
@@ -481,8 +484,6 @@ function switch_off_user() {
 }
 }
 
-load_plugin_textdomain( 'user_switching', false, dirname( plugin_basename( __FILE__ ) ) . '/languages' );
-
 $user_switching = new user_switching;
 
 ?>