mirror of
https://github.com/JustArchiNET/ArchiSteamFarm.git
synced 2025-12-27 11:46:48 +00:00
Compare commits
19 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
008362084d | ||
|
|
506496969e | ||
|
|
3706e93069 | ||
|
|
9761f7ccd8 | ||
|
|
001e41124c | ||
|
|
16519e4e1c | ||
|
|
238fc77958 | ||
|
|
335d585999 | ||
|
|
beba3536bd | ||
|
|
84b21ab23a | ||
|
|
8670b1031d | ||
|
|
ca0b7ca25e | ||
|
|
b30b01b7ad | ||
|
|
aa87b428c6 | ||
|
|
965547f120 | ||
|
|
fed16a24e7 | ||
|
|
5977819129 | ||
|
|
903f809c42 | ||
|
|
27d3508e90 |
@@ -131,6 +131,15 @@ namespace ArchiSteamFarm {
|
||||
Logger.Warn($"{previousMethodName}() {message}");
|
||||
}
|
||||
|
||||
internal void LogGenericWarningException(Exception exception, [CallerMemberName] string previousMethodName = null) {
|
||||
if (exception == null) {
|
||||
LogNullError(nameof(exception));
|
||||
return;
|
||||
}
|
||||
|
||||
Logger.Warn(exception, $"{previousMethodName}()");
|
||||
}
|
||||
|
||||
[SuppressMessage("ReSharper", "ExplicitCallerInfoArgument")]
|
||||
internal void LogNullError(string nullObjectName, [CallerMemberName] string previousMethodName = null) {
|
||||
if (string.IsNullOrEmpty(nullObjectName)) {
|
||||
|
||||
@@ -188,7 +188,7 @@ namespace ArchiSteamFarm {
|
||||
secure: true
|
||||
);
|
||||
} catch (Exception e) {
|
||||
Bot.ArchiLogger.LogGenericException(e);
|
||||
Bot.ArchiLogger.LogGenericWarningException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -240,7 +240,7 @@ namespace ArchiSteamFarm {
|
||||
secure: true
|
||||
);
|
||||
} catch (Exception e) {
|
||||
Bot.ArchiLogger.LogGenericException(e);
|
||||
Bot.ArchiLogger.LogGenericWarningException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -627,7 +627,7 @@ namespace ArchiSteamFarm {
|
||||
secure: true
|
||||
);
|
||||
} catch (Exception e) {
|
||||
Bot.ArchiLogger.LogGenericException(e);
|
||||
Bot.ArchiLogger.LogGenericWarningException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -663,7 +663,7 @@ namespace ArchiSteamFarm {
|
||||
secure: true
|
||||
);
|
||||
} catch (Exception e) {
|
||||
Bot.ArchiLogger.LogGenericException(e);
|
||||
Bot.ArchiLogger.LogGenericWarningException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -830,7 +830,7 @@ namespace ArchiSteamFarm {
|
||||
secure: true
|
||||
);
|
||||
} catch (Exception e) {
|
||||
Bot.ArchiLogger.LogGenericException(e);
|
||||
Bot.ArchiLogger.LogGenericWarningException(e);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -900,7 +900,7 @@ namespace ArchiSteamFarm {
|
||||
|
||||
private static bool IsValidCdKey(string key) {
|
||||
if (!string.IsNullOrEmpty(key)) {
|
||||
return Regex.IsMatch(key, @"^[0-9A-Z]{4,7}-[0-9A-Z]{4,7}-[0-9A-Z]{4,7}(?:(?:-[0-9A-Z]{4,7})?(?:-[0-9A-Z]{4,7}))?$", RegexOptions.IgnoreCase);
|
||||
return Regex.IsMatch(key, @"^[0-9A-Z]{4,7}-[0-9A-Z]{4,7}-[0-9A-Z]{4,7}(?:(?:-[0-9A-Z]{4,7})?(?:-[0-9A-Z]{4,7}))?$", RegexOptions.CultureInvariant | RegexOptions.IgnoreCase);
|
||||
}
|
||||
|
||||
Program.ArchiLogger.LogNullError(nameof(key));
|
||||
|
||||
@@ -692,5 +692,8 @@ StackTrace:
|
||||
<data name="ErrorInvalidCurrentCulture" xml:space="preserve">
|
||||
<value>Η παρεχόμενη τιμή CurrentCulture είναι άκυρη, το ConfigGenerator θα συνεχίσει να τρέχει με την προεπιλεγμένη!</value>
|
||||
</data>
|
||||
|
||||
<data name="TranslationIncomplete" xml:space="preserve">
|
||||
<value>Το ASF θα επιχειρήσει να χρησιμοποιήσει τη γλώσσα {0}, αλλά η μετάφραση σ'αυτή τη γλώσσα έχει συμπληρωθεί μόνο κατά {1}. Ισως θα μπορούσατε να μας βοηθήσετε να βελτιώσουμε τη μετάφραση του ASF για τη γλώσσα σας;</value>
|
||||
<comment>{0} will be replaced by culture code, such as "en-US", {1} will be replaced by completeness percentage, such as "78.5%"</comment>
|
||||
</data>
|
||||
</root>
|
||||
@@ -122,7 +122,7 @@
|
||||
<comment>{0} will be replaced by trade number</comment>
|
||||
</data>
|
||||
<data name="AutoUpdateCheckInfo" xml:space="preserve">
|
||||
<value>ASF automáticamente verificará si hay nuevas versiones cada {0} horas.</value>
|
||||
<value>ASF comprobará automáticamente si hay versiones nuevas cada {0} horas.</value>
|
||||
<comment>{0} will be replaced by number of hours</comment>
|
||||
</data>
|
||||
<data name="Content" xml:space="preserve">
|
||||
@@ -151,7 +151,7 @@ Trazo de pila:
|
||||
<comment>{0} will be replaced by URL of the request</comment>
|
||||
</data>
|
||||
<data name="ErrorGlobalConfigNotLoaded" xml:space="preserve">
|
||||
<value>¡No se pudo cargar la configuración global, por favor asegúrese que {0} existe y es válido! Siga la guía de configuración en la wiki si tiene dudas.</value>
|
||||
<value>¡La configuración global no pudo ser cargada, por favor asegúrese que {0} existe y es válido! Sigue la configuración de la guía en la wiki si tienes dudas.</value>
|
||||
<comment>{0} will be replaced by file's path</comment>
|
||||
</data>
|
||||
<data name="ErrorIsInvalid" xml:space="preserve">
|
||||
@@ -190,7 +190,7 @@ Trazo de pila:
|
||||
<value>¡No se puede continuar con una actualización porque esa versión no incluye ningún recurso!</value>
|
||||
</data>
|
||||
<data name="ErrorUserInputRunningInHeadlessMode" xml:space="preserve">
|
||||
<value>Recibida una solicitud de entrada del usuario, !pero el proceso se está ejecutando en modo servidor!</value>
|
||||
<value>Recibida una solicitud de entrada del usuario, ¡pero el proceso se está ejecutando en modo servidor!</value>
|
||||
</data>
|
||||
<data name="ErrorWCFAccessDenied" xml:space="preserve">
|
||||
<value>¡Solicitud denegada porque SteamOwnerID no esta establecido!</value>
|
||||
@@ -484,7 +484,7 @@ Trazo de pila:
|
||||
<value>Convirtiendo .maFile en formato ASF...</value>
|
||||
</data>
|
||||
<data name="BotAuthenticatorImportFinished" xml:space="preserve">
|
||||
<value>¡Se ha finalizado exitosamente la importación del identificador móvil!</value>
|
||||
<value>Autenticador móvil importado exitosamente.</value>
|
||||
</data>
|
||||
<data name="BotAuthenticatorInvalidDeviceID" xml:space="preserve">
|
||||
<value>¡Su DeviceID es incorrecto o no existe!</value>
|
||||
@@ -689,5 +689,8 @@ Trazo de pila:
|
||||
<data name="ErrorInvalidCurrentCulture" xml:space="preserve">
|
||||
<value>El CurrentCulture proporcionado no es válido, ¡ASF seguirá funcionando con el predeterminado!</value>
|
||||
</data>
|
||||
|
||||
<data name="TranslationIncomplete" xml:space="preserve">
|
||||
<value>ASF intentará utilizar tu idioma {0}, pero la traducción en este idioma está completa sólo en un {1}. ¿Tal vez podrías ayudarnos a mejorar la traducción de ASF para tu idioma?</value>
|
||||
<comment>{0} will be replaced by culture code, such as "en-US", {1} will be replaced by completeness percentage, such as "78.5%"</comment>
|
||||
</data>
|
||||
</root>
|
||||
@@ -319,7 +319,10 @@ StackTrace:
|
||||
<value><{0} >, נא הזינו את משתמש ה- Steam שלכם: </value>
|
||||
<comment>{0} will be replaced by bot's name. Please note that this translation should end with space</comment>
|
||||
</data>
|
||||
|
||||
<data name="UserInputSteamParentalPIN" xml:space="preserve">
|
||||
<value><{0}> בבקשה הזן את את סיסמת הPIN (סיסמה בעלת 4 ספרות) של הגדרות ההרות של סטים: </value>
|
||||
<comment>{0} will be replaced by bot's name. Please note that this translation should end with space</comment>
|
||||
</data>
|
||||
|
||||
|
||||
<data name="UserInputWCFHost" xml:space="preserve">
|
||||
|
||||
@@ -471,7 +471,7 @@
|
||||
<value>Akun ini dalam kondisi limited, proses idling tidak akan tersedia dalam kondisi ini!</value>
|
||||
</data>
|
||||
<data name="BotAddLicenseResponse" xml:space="preserve">
|
||||
<value><{0}> ID Game: {1} | Status: {2}</value>
|
||||
<value><{0}> GameID: {1} | Status: {2}</value>
|
||||
<comment>{0} will be replaced by bot's name, {1} will be replaced by gameID (number), {2} will be replaced by status string</comment>
|
||||
</data>
|
||||
<data name="BotAddLicenseResponseWithItems" xml:space="preserve">
|
||||
|
||||
@@ -693,5 +693,8 @@ StackTrace:
|
||||
<data name="ErrorInvalidCurrentCulture" xml:space="preserve">
|
||||
<value>Vaš trenutno naveden CurrentCulture je netačan, ASF će nastaviti da radi sa uobičajenim!</value>
|
||||
</data>
|
||||
|
||||
<data name="TranslationIncomplete" xml:space="preserve">
|
||||
<value>ASF će pokušati da koristi vašu preferiranu {0} "kulturu", ali prevod u taj jezik je samo {1} gotov. Možda bi ste mogli da nam pomogne u prevodu ASF na vaš jezik?</value>
|
||||
<comment>{0} will be replaced by culture code, such as "en-US", {1} will be replaced by completeness percentage, such as "78.5%"</comment>
|
||||
</data>
|
||||
</root>
|
||||
@@ -44,7 +44,7 @@ namespace ArchiSteamFarm {
|
||||
internal const string ServiceDescription = "ASF is an application that allows you to farm steam cards using multiple steam accounts simultaneously.";
|
||||
internal const string ServiceName = "ArchiSteamFarm";
|
||||
internal const string StatisticsServer = "asf.justarchi.net";
|
||||
internal const string VersionNumber = "2.2.1.4";
|
||||
internal const string VersionNumber = "2.2.1.5";
|
||||
|
||||
internal static readonly Version Version = Assembly.GetEntryAssembly().GetName().Version;
|
||||
}
|
||||
|
||||
@@ -269,7 +269,7 @@ namespace ArchiSteamFarm {
|
||||
}
|
||||
|
||||
HtmlDocument htmlDocument = new HtmlDocument();
|
||||
htmlDocument.LoadHtml(WebUtility.HtmlDecode(content));
|
||||
htmlDocument.LoadHtml(content);
|
||||
return htmlDocument;
|
||||
}
|
||||
|
||||
@@ -358,7 +358,7 @@ namespace ArchiSteamFarm {
|
||||
}
|
||||
|
||||
HtmlDocument htmlDocument = new HtmlDocument();
|
||||
htmlDocument.LoadHtml(WebUtility.HtmlDecode(content));
|
||||
htmlDocument.LoadHtml(content);
|
||||
return htmlDocument;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user