2. Changes

First, rewinding head to replay your work on top of it...
Applying: initial commit
.git/rebase-apply/patch:320: trailing whitespace.
              {% t index.monero_for %} <?php echo $os_array['name']; ?> 
.git/rebase-apply/patch:327: trailing whitespace.
            
.git/rebase-apply/patch:567: trailing whitespace.
            </p>  
.git/rebase-apply/patch:663: trailing whitespace.
Simple Wallet will ask for the name of the wallet you'd like to open. In the case where you do not yet have a wallet, or perhaps you'd like to create a new wallet, enter a name for the wallet that does not correspond to any wallet you've created before. 
.git/rebase-apply/patch:671: trailing whitespace.
You will next be prompted for a password. This is to set the password needed to access this wallet in the future. Therefore, even if someone stole the physical wallet .bin file off of your computer, they would still need this password to access the funds. Enter your password of choice, there are no password restrictions, but it's still advisable to use something that is secure. 
warning: squelched 9 whitespace errors
warning: 14 lines add whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging .gitmodules
CONFLICT (add/add): Merge conflict in .gitmodules
error: Failed to merge in the changes.
Patch failed at 0001 initial commit
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)

3 years ago

translations/monero-core_he.ts: No such file or directory 3 years ago

First, rewinding head to replay your work on top of it...
Applying: initial commit
.git/rebase-apply/patch:320: trailing whitespace.
              {% t index.monero_for %} <?php echo $os_array['name']; ?> 
.git/rebase-apply/patch:327: trailing whitespace.
            
.git/rebase-apply/patch:567: trailing whitespace.
            </p>  
.git/rebase-apply/patch:663: trailing whitespace.
Simple Wallet will ask for the name of the wallet you'd like to open. In the case where you do not yet have a wallet, or perhaps you'd like to create a new wallet, enter a name for the wallet that does not correspond to any wallet you've created before. 
.git/rebase-apply/patch:671: trailing whitespace.
You will next be prompted for a password. This is to set the password needed to access this wallet in the future. Therefore, even if someone stole the physical wallet .bin file off of your computer, they would still need this password to access the funds. Enter your password of choice, there are no password restrictions, but it's still advisable to use something that is secure. 
warning: squelched 9 whitespace errors
warning: 14 lines add whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging .gitmodules
CONFLICT (add/add): Merge conflict in .gitmodules
error: Failed to merge in the changes.
Patch failed at 0001 initial commit
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)

3 years ago

translations/monero-core_he.ts: No such file or directory 3 years ago

English Japanese 18 characters edited Current translation 3 years ago

New contributor 3 years ago

First, rewinding head to replay your work on top of it...
Applying: initial commit
.git/rebase-apply/patch:320: trailing whitespace.
              {% t index.monero_for %} <?php echo $os_array['name']; ?> 
.git/rebase-apply/patch:327: trailing whitespace.
            
.git/rebase-apply/patch:567: trailing whitespace.
            </p>  
.git/rebase-apply/patch:663: trailing whitespace.
Simple Wallet will ask for the name of the wallet you'd like to open. In the case where you do not yet have a wallet, or perhaps you'd like to create a new wallet, enter a name for the wallet that does not correspond to any wallet you've created before. 
.git/rebase-apply/patch:671: trailing whitespace.
You will next be prompted for a password. This is to set the password needed to access this wallet in the future. Therefore, even if someone stole the physical wallet .bin file off of your computer, they would still need this password to access the funds. Enter your password of choice, there are no password restrictions, but it's still advisable to use something that is secure. 
warning: squelched 9 whitespace errors
warning: 14 lines add whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging .gitmodules
CONFLICT (add/add): Merge conflict in .gitmodules
error: Failed to merge in the changes.
Patch failed at 0001 initial commit
Use 'git am --show-current-patch' to see the failed patch

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".

 (128)

3 years ago

translations/monero-core_he.ts: No such file or directory 3 years ago

English French 49 characters edited 3 years ago

English French 6 characters edited Current translation 3 years ago

English French 20 characters edited Current translation 3 years ago

English French 41 characters edited Current translation 3 years ago

English French 53 characters edited 3 years ago

English French 50 characters edited Current translation 3 years ago

English French 6 characters edited Current translation 3 years ago

English French 7 characters edited Current translation 3 years ago

English French 24 characters edited Current translation 3 years ago

English French 45 characters edited Current translation 3 years ago

English French 30 characters edited 3 years ago

Il faudrait le contexte/I would like to have the context of the sentence

3 years ago