Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 6b3fa2e6 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent de3cf761
......@@ -20,7 +20,6 @@ Name[sk]=KTrip
Name[sl]=KTrip
Name[sv]=Ktripp
Name[uk]=KTrip
Name[x-test]=xxKTripxx
Name[zh_TW]=KTrip
GenericName=Public transport navigator
GenericName[ca]=Navegador del transport públic
......@@ -40,7 +39,6 @@ GenericName[sk]=Navigátor verejnej dopravy
GenericName[sl]=Navigator javnega transporta
GenericName[sv]=Kollektivtrafiknavigering
GenericName[uk]=Навігатор громадським транспортом
GenericName[x-test]=xxPublic transport navigatorxx
Exec=ktrip
Icon=ktrip
Type=Application
......@@ -62,6 +60,5 @@ Comment[sk]=Navigátor verejnej dopravy.
Comment[sl]=Navigator javnega transporta.
Comment[sv]=Kollektivtrafiknavigering
Comment[uk]=Навігатор громадським транспортом.
Comment[x-test]=xxPublic transport navigator.xx
Terminal=false
Categories=Qt;KDE;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment