User avatar None

New alert

seed4me-ios-app / app

Could not update the repository. 2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago
Enter the new password twice, then press Change button. Your password will be updated immediately for all VPN servers and this website.
在欄位中輸入新密碼兩次,然後按"更改"鍵。若已忘記舊密碼,可直接設定新密碼。此組新密碼將套用到全部VPN相關的設定,包含進入此網頁的登入密碼下「更改」按鈕。您的密碼將立即更新,適用於所有 VPN 伺服器和此網站
2 years ago
New contributor 2 years ago
User avatar alex.z

Translation changed

seed4me-website / clientRussian

Enter the new password twice, then press Change button. Your password will be updated immediately for all VPN servers and this website.
Введите новый пароль, затем нажмите кнопку Изменить. Ваш новый пароль вступит в силу мгновенно, пароль обновится, в том числе, и для всех VPN серверов!.
2 years ago
User avatar alex.z

Translation changed

seed4me-website / clientFrench

Enter the new password twice, then press Change button. Your password will be updated immediately for all VPN servers and this website.
Entrez votre mot de passe actuel, puis entrez le nouveau mot de passe deux fois et, puis appuyez sur le bouton Modifier. Le mot de passe sera changmodifié pour tous les serveurs VPN etainsi que pour le site Wweb.
2 years ago
User avatar alex.z

Translation changed

seed4me-website / clientRussian

Enter the new password twice, then press Change button. Your password will be updated immediately for all VPN servers and this website.
Введите старый и новый пароль, затем нажмите кнопку Изменить. Ваш новый пароль вступит в силу мгновенно, пароль обновится, в том числе, и для всех VPN серверов!
2 years ago
User avatar None

Failed rebase on repository

seed4me-android-app / app

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (Russian)
Using index info to reconstruct a base tree...
M	app/src/main/res/values-ru/strings.xml
Falling back to patching base and 3-way merge...
Auto-merging app/src/main/res/values-ru/strings.xml
CONFLICT (content): Merge conflict in app/src/main/res/values-ru/strings.xml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 Translated using Weblate (Russian)

Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".

 (1)
2 years ago

Search