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.

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

Fix pt_BR translations #1039

Merged
merged 2 commits into from
Feb 20, 2017
Merged

Fix pt_BR translations #1039

merged 2 commits into from
Feb 20, 2017

Conversation

fujisoft
Copy link
Contributor

Small update from the last fix.

Small update from the last fix.
@kornelski
Copy link
Member

kornelski commented Feb 20, 2017

Are you sure about change of to ...?

@kornelski kornelski merged commit 3b04c45 into sparkle-project:master Feb 20, 2017
@kornelski
Copy link
Member

Thanks

@vitu vitu mentioned this pull request Mar 1, 2017
kornelski added a commit that referenced this pull request Mar 8, 2017
kornelski added a commit that referenced this pull request Mar 24, 2017
* origin/master: (39 commits)
  %s is deliberate in this format string
  Unused
  Make generate_appcast available as a shared scheme
  Shush Xcode
  Link straight to docs from the readme
  ignore .html files when scanning for archives
  Missing strings translation.
  Updated swift
  Warn against abusing installUpdatesIfAvailable
  when generating the appcast, if an .html file exists of the same name as the archive, then it will be linked in as the releaseNotesLink
  Revert "Fix pt_BR translations"
  Revert "Fix pt_BR translations (#1039)"
  Fix Japanse localization
  Add more info to auth tool run failure
  Fix pt_BR translations (#1039)
  Fix pt_BR translations
  Disable the keyboard shortcut for the install button for scheduled updates to avoid accidental installs.
  added `sparkle:shortVersionString` to the enclosure, #1032
  Changelog
  percent encode the filename used in the delta url
  ...
martinwinter added a commit to atlasti/Sparkle that referenced this pull request Apr 7, 2017
* upstream/master: (23 commits)
  Escape + as well
  Escape profile URLs better
  %s is deliberate in this format string
  Unused
  Make generate_appcast available as a shared scheme
  Shush Xcode
  Link straight to docs from the readme
  ignore .html files when scanning for archives
  Missing strings translation.
  Updated swift
  Warn against abusing installUpdatesIfAvailable
  when generating the appcast, if an .html file exists of the same name as the archive, then it will be linked in as the releaseNotesLink
  Revert "Fix pt_BR translations"
  Revert "Fix pt_BR translations (sparkle-project#1039)"
  Fix Japanse localization
  Add more info to auth tool run failure
  Fix pt_BR translations (sparkle-project#1039)
  Fix pt_BR translations
  Disable the keyboard shortcut for the install button for scheduled updates to avoid accidental installs.
  added `sparkle:shortVersionString` to the enclosure, sparkle-project#1032
  ...

# Conflicts:
#	Sparkle/SUUIBasedUpdateDriver.m
martinwinter added a commit to atlasti/Sparkle that referenced this pull request Apr 7, 2017
* master: (258 commits)
  Escape + as well
  Escape profile URLs better
  %s is deliberate in this format string
  Unused
  Make generate_appcast available as a shared scheme
  Shush Xcode
  Link straight to docs from the readme
  ignore .html files when scanning for archives
  Missing strings translation.
  Updated swift
  Warn against abusing installUpdatesIfAvailable
  when generating the appcast, if an .html file exists of the same name as the archive, then it will be linked in as the releaseNotesLink
  Revert "Fix pt_BR translations"
  Revert "Fix pt_BR translations (sparkle-project#1039)"
  Fix Japanse localization
  Add more info to auth tool run failure
  Fix pt_BR translations (sparkle-project#1039)
  Fix pt_BR translations
  Disable the keyboard shortcut for the install button for scheduled updates to avoid accidental installs.
  added `sparkle:shortVersionString` to the enclosure, sparkle-project#1032
  ...

# Conflicts:
#	Sparkle/SUOperatingSystem.m
#	Sparkle/SUUpdateAlert.m
martinwinter added a commit to atlasti/Sparkle that referenced this pull request Apr 24, 2017
* master: (259 commits)
  Escape + as well
  Escape profile URLs better
  AM-3198 suppress warnings
  %s is deliberate in this format string
  Unused
  Make generate_appcast available as a shared scheme
  Shush Xcode
  Link straight to docs from the readme
  ignore .html files when scanning for archives
  Missing strings translation.
  Updated swift
  Warn against abusing installUpdatesIfAvailable
  when generating the appcast, if an .html file exists of the same name as the archive, then it will be linked in as the releaseNotesLink
  Revert "Fix pt_BR translations"
  Revert "Fix pt_BR translations (sparkle-project#1039)"
  Fix Japanse localization
  Add more info to auth tool run failure
  Fix pt_BR translations (sparkle-project#1039)
  Fix pt_BR translations
  Disable the keyboard shortcut for the install button for scheduled updates to avoid accidental installs.
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants