From 150cf6df734d2b3f332152dedbbd0359d4fa4c6b Mon Sep 17 00:00:00 2001 From: Brian Harvey Date: Sun, 9 Jan 2022 18:26:04 -0800 Subject: [PATCH] Update strings.xml Bitten by NUMBERS FROM allowing from>to. :( --- libraries/strings.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libraries/strings.xml b/libraries/strings.xml index 924c3aca..bd0aab05 100644 --- a/libraries/strings.xml +++ b/libraries/strings.xml @@ -1,5 +1 @@ -<<<<<<< Updated upstream -
pt:o texto multilinha _ ca:multilínia _
Reports the part of the first string up to the first instance of the second string inside it. If the second string isn't found, reports the entire first string.
pt:o texto de _ antes de _ ca:part del text _ anterior a _
Reports the portion of the first input string starting after the first occurrence of the second string. If the second string isn't found in the first string, reports an empty string.
pt:o texto de _ depois de _ ca:part del text _ posterior a _
Reports the character position (starting from 1) of the beginning of the first input string inside the second input string. If it's not found, reports 0.
pt:a posição de _ em _ ca:posició de _ en _
If input is TRUE, comparisons made by functions in the string library will be case-independent (so "FOO" = "foo"). This is the default. If input is FALSE, comparisons will be exact.
pt:altera comparações ignorando distinção minúsculas/maiúsculas para _ ca:ignora la diferenciació de majúscules _
Reports the portion of the first input (string) starting at the position given by the second input (counting from 1, like LETTER n OF) and ending at the position given by the third input (also counting from 1). If the third input is empty, reports the portion from the first position to the end of the string. If a position number is negative, counts from the end backward, so -1 is the last character, -2 is the next to last, etc.
pt:o texto de _ entre as posições _ e _ , inclusive ca:part del text _ des de la posició _ fins _
Reports True if the first input string contains the second input string, otherwise false. Comparison is case-independent by default; use USE CASE-INDEPENDENT COMPARISONS to change that.
pt:o texto de _ antes de _ ca:text _ conté _ ?
Reports the input text with lower case letters instead of capital letters in the input. Uses the user's locale's rules for case conversion.
pt:em minúsculas _ ca:_ a minúscules
ca:comparacions ignorant majúscules? err_reset
-======= -
pt:o texto multilinha _ ca:multilínia _
Reports the part of the first string up to the first instance of the second string inside it. If the second string isn't found, reports the entire first string.
pt:o texto de _ antes de _ ca:part del text _ anterior a _
Reports the portion of the first input string starting after the first occurrence of the second string. If the second string isn't found in the first string, reports an empty string.
pt:o texto de _ depois de _ ca:part del text _ posterior a _
Reports the character position (starting from 1) of the beginning of the first input string inside the second input string. If it's not found, reports 0.
pt:a posição de _ em _ ca:posició de _ en _
If input is TRUE, comparisons made by functions in the string library will be case-independent (so "FOO" = "foo"). This is the default. If input is FALSE, comparisons will be exact.
pt:altera comparações ignorando distinção minúsculas/maiúsculas para _ ca:ignora la diferenciació de majúscules _
Reports the portion of the first input (string) starting at the position given by the second input (counting from 1, like LETTER n OF) and ending at the position given by the third input (also counting from 1). If the third input is empty, reports the portion from the first position to the end of the string. If a position number is negative, counts from the end backward, so -1 is the last character, -2 is the next to last, etc.
pt:o texto de _ entre as posições _ e _ , inclusive ca:part del text _ des de la posició _ fins _
Reports True if the first input string contains the second input string, otherwise false. Comparison is case-independent by default; use USE CASE-INDEPENDENT COMPARISONS to change that.
pt:o texto de _ antes de _ ca:text _ conté _ ?
Reports the input text with lower case letters instead of capital letters in the input. Uses the user's locale's rules for case conversion.
pt:em minúsculas _ ca:_ a minúscules
ca:comparacions ignorant majúscules? err_reset
->>>>>>> Stashed changes +
pt:o texto multilinha _ ca:multilínia _
Reports the part of the first string up to the first instance of the second string inside it. If the second string isn't found, reports the entire first string.
pt:o texto de _ antes de _ ca:part del text _ anterior a _
Reports the portion of the first input string starting after the first occurrence of the second string. If the second string isn't found in the first string, reports an empty string.
pt:o texto de _ depois de _ ca:part del text _ posterior a _
Reports the character position (starting from 1) of the beginning of the first input string inside the second input string. If it's not found, reports 0.
pt:a posição de _ em _ ca:posició de _ en _
If input is TRUE, comparisons made by functions in the string library will be case-independent (so "FOO" = "foo"). This is the default. If input is FALSE, comparisons will be exact.
pt:altera comparações ignorando distinção minúsculas/maiúsculas para _ ca:ignora la diferenciació de majúscules _
Reports the portion of the first input (string) starting at the position given by the second input (counting from 1, like LETTER n OF) and ending at the position given by the third input (also counting from 1). If the third input is empty, reports the portion from the first position to the end of the string. If a position number is negative, counts from the end backward, so -1 is the last character, -2 is the next to last, etc.
pt:o texto de _ entre as posições _ e _ , inclusive ca:part del text _ des de la posició _ fins _
Reports True if the first input string contains the second input string, otherwise false. Comparison is case-independent by default; use USE CASE-INDEPENDENT COMPARISONS to change that.
pt:o texto de _ antes de _ ca:text _ conté _ ?
Reports the input text with lower case letters instead of capital letters in the input. Uses the user's locale's rules for case conversion.
pt:em minúsculas _ ca:_ a minúscules
ca:comparacions ignorant majúscules? err_reset
\ No newline at end of file