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

Kiwix Desktop should be called "Kiwix" for end-users #1302

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 10 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<img width="100" alt="Download on Flathub" src="https://flathub.org/assets/badges/flathub-badge-en.png" />
</a>

Kiwix Desktop
=============
Kiwix Linux/Windows
=====================

The Kiwix Desktop is a viewer/manager of ZIM files for GNU/Linux and
Microsoft Windows OSes.
The Kiwix Linux/Windows is a viewer/manager of ZIM files for GNU/Linux
and Microsoft Windows OSes.

[![Release](https://img.shields.io/github/v/tag/kiwix/kiwix-desktop?label=release&sort=semver)](https://download.kiwix.org/release/kiwix-desktop/)
[![Repositories](https://img.shields.io/repology/repositories/kiwix-desktop?label=repositories)](https://github.com/kiwix/kiwix-desktop/wiki/Repology)
Expand All @@ -25,7 +25,7 @@ at [kiwix-build](https://github.com/kiwix/kiwix-build).
Dependencies
------------

The Kiwix Desktop application relies on many third party software libraries.
The Kiwix application relies on many third party software libraries.
The following libraries need to be available:

* [libkiwix](https://github.com/kiwix/libkiwix/)
Expand Down Expand Up @@ -53,7 +53,7 @@ sudo apt-get install libqt5gui5 qtbase5-dev qtwebengine5-dev \
Compilation
-----------

Once all dependencies are installed, you can compile Kiwix Desktop:
Once all dependencies are installed, you can compile Kiwix:

```bash
qmake .
Expand All @@ -69,7 +69,7 @@ for example, for x86-64 native systems:
export PKG_CONFIG_PATH="<...>/BUILD_native_dyn/INSTALL/lib/x86_64-linux-gnu/pkgconfig"
```

You may want to simply open the kiwix-desktop project in QtCreator and
You may want to simply open the `kiwix-desktop` project in QtCreator and
then compile the project from there (don't forget to update
`PKG_CONFIG_PATH` if necessary).

Expand Down Expand Up @@ -114,17 +114,17 @@ documentation](https://github.com/kiwix/kiwix-build/wiki/Compile-on-Microsoft-Wi
Installation
------------

To install Kiwix Desktop on the system:
To install Kiwix on the system:
```bash
sudo make install
```

Run
---

To run Kiwix Desktop
To run Kiwix:
```bash
kiwix-desktop
kiwix
```

You might have to refresh the `ld` database before:
Expand Down
2 changes: 1 addition & 1 deletion kiwix-desktop.pro
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ CONFIG += link_pkgconfig

greaterThan(QT_MAJOR_VERSION, 4): QT += widgets

TARGET = kiwix-desktop
TARGET = kiwix
TEMPLATE = app

QMAKE_CXXFLAGS += -std=c++17
Expand Down
6 changes: 3 additions & 3 deletions resources/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"name":"English",
"error-title":"Error",
"error-downloader-window-title":"Cannot create downloader",
"error-downloader-launch-message":"Impossible to launch downloader, Kiwix-desktop will start but all download functions will not working!",
"error-downloader-launch-message":"Impossible to launch downloader, Kiwix will start but all download functions will not working!",
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please also fix the grammar in this message. It should rather read

"Impossible to launch the downloader, Kiwix will start but download functionality will not work!"

"error-launch-server-message":"An error has occured!",
"error-archive":"Cannot get the archive",
"error-opening-file": "There was an error opening the file.",
Expand Down Expand Up @@ -78,14 +78,14 @@
"reset":"Reset",
"clear":"Clear",
"browse":"Browse",
"about-kiwix-desktop-title":"Kiwix Desktop",
"about-kiwix-desktop-title":"Kiwix",
"about-kiwix-desktop-description":"Kiwix allows you to have the entirety of Wikipedia at hand wherever you go! On a boat, in the middle of nowhere, or in jail, Kiwix gives you access to all of human knowledge. You don't need Internet, everything is stored on your computer.",
"about-learn-more-about-kiwix":"Learn more about Kiwix",
"about-release-title":"Release",
"about-source-code":"This software is released under the terms of the GNU General Public License version 3. View the source code on <a href='{{GITHUB_URL}}'>Github</a>.",
"about-version":"Version: {{VERSION}}",
"about-reporting-problem-title":"Reporting problems",
"about-report-issue":"To open an issue, visit <a href='{{TRACKER_URL}}'>Kiwix-desktop issue tracker</a> and open an issue describing your problem.",
"about-report-issue":"To open an issue, visit <a href='{{TRACKER_URL}}'>Kiwix issue tracker</a> and open an issue describing your problem.",
"about-report-issue-2":"Please mention the version in the issue.",
"about-libraries-title":"Libraries",
"kiwix-server-running-message":"The Kiwix Server is running and can be accessed in the local network at:",
Expand Down
2 changes: 1 addition & 1 deletion resources/org.kiwix.desktop.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Type=Application
Name=Kiwix
Comment=View offline content
Icon=kiwix-desktop
Exec=kiwix-desktop %F
Exec=kiwix %F
Terminal=false
MimeType=application/org.kiwix.desktop.x-zim;
Keywords=zim;
Expand Down
2 changes: 1 addition & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ int main(int argc, char *argv[])
KiwixApp a(argc, argv);

QCommandLineParser parser;
parser.setApplicationDescription(QStringLiteral("The Kiwix Desktop is a viewer/manager of ZIM files for GNU/Linux and Microsoft Windows OSes."));
parser.setApplicationDescription(QStringLiteral("Kiwix is a viewer/manager of ZIM files for GNU/Linux and Microsoft Windows OSes."));
parser.addHelpOption();
parser.addPositionalArgument("zimfile", "The zim file");

Expand Down
Loading