Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Spanish translations #7432

Merged
merged 35 commits into from
Jan 11, 2020
Merged

Spanish translations #7432

merged 35 commits into from
Jan 11, 2020

Conversation

bux
Copy link
Member

@bux bux commented Jan 9, 2020 •
edited by PabstMirror
Loading

When merged this pull request will:

Pabst edit:

maxpipoka and others added 29 commits January 4, 2020 05:03
@maxpipoka
Updated spanish traslation
cff15fc
@maxpipoka
Updated spanish traslation
9c0d0d8
@maxpipoka
Updated spanish traslation
5614e68
@maxpipoka
Updated spanish traslation
348a937
@maxpipoka
Updated spanish traslation
9c2b574
@maxpipoka
Spanish traslation updated
18ce48e
@maxpipoka
Spanish traslation updated
937bc21
@maxpipoka
Spanish traslation updated
fb1896a
@maxpipoka
Spanish translation updated
6f2fa5a
@maxpipoka
Spanish traslation updated
10d5aea
@maxpipoka
Spanish traslation updated
f851260
@maxpipoka
Spanish traslation updated
cadc6af
@maxpipoka
Spanish translation updated
852a957
@maxpipoka
Spanish translation updated
6ed1a73
@bux
Merge branch 'patch-7' of https://github.com/maxpipoka/ACE3 into span…
cc8e8a8 
…ish-translations-bulk-branch

# Conflicts:
#	addons/captives/stringtable.xml
@bux
Merge branch 'patch-6' of https://github.com/maxpipoka/ACE3 into span…
ee9e44f 
…ish-translations-bulk-branch
@bux
Merge branch 'patch-5' of https://github.com/maxpipoka/ACE3 into span…
15c659a 
…ish-translations-bulk-branch
@bux
Merge branch 'patch-8' of https://github.com/maxpipoka/ACE3 into span…
7165b60 
…ish-translations-bulk-branch
@bux
Merge branch 'patch-9' of https://github.com/maxpipoka/ACE3 into span…
55b983c 
…ish-translations-bulk-branch
@bux
Merge branch 'patch-11' of https://github.com/maxpipoka/ACE3 into spa…
922b9a8 
…nish-translations-bulk-branch
@bux
Merge branch 'patch-12' of https://github.com/maxpipoka/ACE3 into spa…
c1ffd29 
…nish-translations-bulk-branch
@bux
Merge patch-12
6d1c900
@bux
Merge branch 'patch-13' of https://github.com/maxpipoka/ACE3 into spa…
1975542 
…nish-translations-bulk-branch
@bux
Merge branch 'patch-14' of https://github.com/maxpipoka/ACE3 into spa…
74a2ed9 
…nish-translations-bulk-branch
@bux
Merge branch 'patch-15' of https://github.com/maxpipoka/ACE3 into spa…
9907993 
…nish-translations-bulk-branch
@bux
Merge branch 'patch-16' of https://github.com/maxpipoka/ACE3 into spa…
d384f64 
…nish-translations-bulk-branch
@bux
Merge branch 'patch-17' of https://github.com/maxpipoka/ACE3 into spa…
518589f 
…nish-translations-bulk-branch
@bux
Merge branch 'patch-18' of https://github.com/maxpipoka/ACE3 into spa…
8e9ed8a 
…nish-translations-bulk-branch
@bux
Merge branch 'patch-19' of https://github.com/maxpipoka/ACE3 into spa…
655a6bc 
…nish-translations-bulk-branch
@bux bux added the kind/translation Release Notes: **TRANSLATIONS:** label Jan 9, 2020
@bux bux added this to the 3.13.1 milestone Jan 9, 2020
@bux bux requested a review from TheMagnetar January 9, 2020 07:31
TheMagnetar
TheMagnetar requested changes Jan 11, 2020
View reviewed changes
addons/ballistics/stringtable.xml Outdated Show resolved Hide resolved
addons/ballistics/stringtable.xml Outdated Show resolved Hide resolved
addons/ballistics/stringtable.xml Outdated Show resolved Hide resolved
addons/ballistics/stringtable.xml Outdated Show resolved Hide resolved
addons/captives/stringtable.xml Outdated Show resolved Hide resolved
addons/fastroping/stringtable.xml Outdated Show resolved Hide resolved
addons/fastroping/stringtable.xml Outdated Show resolved Hide resolved
addons/fastroping/stringtable.xml Outdated Show resolved Hide resolved
addons/fastroping/stringtable.xml Outdated Show resolved Hide resolved
addons/hot/stringtable.xml Outdated Show resolved Hide resolved
TheMagnetar
TheMagnetar previously requested changes Jan 11, 2020
View reviewed changes
Copy link
Member

@TheMagnetar TheMagnetar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some wording changes.

@PabstMirror PabstMirror merged commit 245a60f into master Jan 11, 2020
@PabstMirror PabstMirror changed the title Changed: Spanish translations updated Spanish translations Jan 11, 2020
@PabstMirror PabstMirror mentioned this pull request Jan 11, 2020
Closed
@bux bux deleted the spanish-translations-bulk-branch branch January 11, 2020 17:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PabstMirror PabstMirror PabstMirror approved these changes

@TheMagnetar TheMagnetar TheMagnetar left review comments

Assignees

@TheMagnetar TheMagnetar

Labels
kind/translation Release Notes: **TRANSLATIONS:**
Projects
None yet
Milestone
3.13.1
Development

Successfully merging this pull request may close these issues.
4 participants
@bux @PabstMirror @TheMagnetar @maxpipoka