Merge remote-tracking branch 'Kwoth/dev' into dev

This commit is contained in:
Shikhir Arora 2017-02-16 08:00:12 -05:00
commit 96499d0514
2 changed files with 49 additions and 49 deletions

View File

@ -728,6 +728,15 @@ namespace NadekoBot.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Migration done!.
/// </summary>
public static string administration_migration_done {
get {
return ResourceManager.GetString("administration_migration_done", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} moved from {1} to {2}.
/// </summary>
@ -899,6 +908,15 @@ namespace NadekoBot.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Presence Updates.
/// </summary>
public static string administration_presence_updates {
get {
return ResourceManager.GetString("administration_presence_updates", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Active Protections.
/// </summary>
@ -1152,6 +1170,25 @@ namespace NadekoBot.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to User Soft-Banned.
/// </summary>
public static string administration_sb_user {
get {
return ResourceManager.GetString("administration_sb_user", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You have been soft-banned from {0} server.
///Reason: {1}.
/// </summary>
public static string administration_sbdm {
get {
return ResourceManager.GetString("administration_sbdm", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to You already have {0} role..
/// </summary>
@ -1245,9 +1282,9 @@ namespace NadekoBot.Resources {
/// <summary>
/// Looks up a localized string similar to You now have {0} role..
/// </summary>
public static string administration_self_assign_sucess {
public static string administration_self_assign_success {
get {
return ResourceManager.GetString("administration_self_assign_sucess", resourceCulture);
return ResourceManager.GetString("administration_self_assign_success", resourceCulture);
}
}
@ -1522,6 +1559,15 @@ namespace NadekoBot.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to User Unbanned.
/// </summary>
public static string administration_user_unbanned {
get {
return ResourceManager.GetString("administration_user_unbanned", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to {0} has been **unmuted** from text and voice chat..
/// </summary>
@ -1693,34 +1739,6 @@ namespace NadekoBot.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to You have been soft-banned from {0} server.
///Reason: {1}.
/// </summary>
public static string administraton_sbdm {
get {
return ResourceManager.GetString("administraton_sbdm", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to User Unbanned.
/// </summary>
public static string administraton_user_unbanned {
get {
return ResourceManager.GetString("administraton_user_unbanned", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Migration done!.
/// </summary>
public static string adminsitration_migration_done {
get {
return ResourceManager.GetString("adminsitration_migration_done", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Error while migrating, check bot&apos;s console for more information..
/// </summary>
@ -1730,24 +1748,6 @@ namespace NadekoBot.Resources {
}
}
/// <summary>
/// Looks up a localized string similar to Presence Updates.
/// </summary>
public static string adminsitration_presence_updates {
get {
return ResourceManager.GetString("adminsitration_presence_updates", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to User Soft-Banned.
/// </summary>
public static string adminsitration_sb_user {
get {
return ResourceManager.GetString("adminsitration_sb_user", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to That base is already claimed or destroyed..
/// </summary>

View File

@ -698,7 +698,7 @@ Reason: {1}</value>
<data name="administration_self_assign_remove" xml:space="preserve">
<value>You no longer have {0} role.</value>
</data>
<data name="administration_self_assign_sucess" xml:space="preserve">
<data name="administration_self_assign_success" xml:space="preserve">
<value>You now have {0} role.</value>
</data>
<data name="administration_setrole" xml:space="preserve">