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

Talk about "application", not "AppImage" #184

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Talk about "application", not "AppImage" #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eefc2db
Update desktopfiles.en.json
probonopd Jul 3, 2019
9feef4d
Update shared.cpp
probonopd Jul 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions i18n/desktopfiles.en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"Desktop Action remove/Name": "Remove AppImage from system",
"Desktop Action update/Name": "Update AppImage"
"Desktop Action remove/Name": "Remove application from system",
"Desktop Action update/Name": "Update application"
}
6 changes: 3 additions & 3 deletions src/shared/shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ bool installDesktopFileAndIcons(const QString& pathToAppImage, bool resolveColli
{
const auto removeSectionName = "Desktop Action Remove";

g_key_file_set_string(desktopFile.get(), removeSectionName, "Name", "Remove AppImage from system");
g_key_file_set_string(desktopFile.get(), removeSectionName, "Name", "Remove application from system");
g_key_file_set_string(desktopFile.get(), removeSectionName, "Icon", helperIconName);

std::ostringstream removeExecPath;
Expand All @@ -541,7 +541,7 @@ bool installDesktopFileAndIcons(const QString& pathToAppImage, bool resolveColli
}
}

#ifdef ENABLE_UPDATE_HELPER
#ifdef ENABLE_+_HELPER
Copy link
Owner

Choose a reason for hiding this comment

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

That breaks things completely. Might have been an accidental change.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Did I change this? Must have been inadvertently. I just want "AppImage" to be replaced with "application".

// add Update action
{
appimage::update::Updater updater(pathToAppImage.toStdString());
Expand All @@ -553,7 +553,7 @@ bool installDesktopFileAndIcons(const QString& pathToAppImage, bool resolveColli

const auto updateSectionName = "Desktop Action Update";

g_key_file_set_string(desktopFile.get(), updateSectionName, "Name", "Update AppImage");
g_key_file_set_string(desktopFile.get(), updateSectionName, "Name", "Update application");
g_key_file_set_string(desktopFile.get(), updateSectionName, "Icon", helperIconName);

std::ostringstream updateExecPath;
Expand Down