From 3b61f10cb7ca5350b6c1f6a6f2d59d867ec395c7 Mon Sep 17 00:00:00 2001 From: SIELA1915 Date: Mon, 1 Feb 2016 15:42:42 +0100 Subject: [PATCH] fixed missing ';' in guild_manager.cpp, 1. part for fix of ryzom_client.desktop.in not updating in mercurial --- .../client/src/interface_v3/guild_manager.cpp | 4 ++-- code/ryzom/client/unix/ryzom_client.desktop.in | 16 ---------------- 2 files changed, 2 insertions(+), 18 deletions(-) delete mode 100644 code/ryzom/client/unix/ryzom_client.desktop.in diff --git a/code/ryzom/client/src/interface_v3/guild_manager.cpp b/code/ryzom/client/src/interface_v3/guild_manager.cpp index 6cdba9602..525a84210 100644 --- a/code/ryzom/client/src/interface_v3/guild_manager.cpp +++ b/code/ryzom/client/src/interface_v3/guild_manager.cpp @@ -877,8 +877,8 @@ class CAHGuildSheetOpen : public IActionHandler ucstring str = toString("%03d", (sint)RT.getRyzomWeek()) + " "; str += CI18N::get("ui"+WEEKDAY::toString( (WEEKDAY::EWeekDay)RT.getRyzomDayOfWeek() )) + " - "; ucstring year = RT.getRyzomYearStr(); - str += year + " - " - str += CI18N::get("uiEon"); + str += year + " - "; + str += CI18N::get("uiEon"); pViewEnterDate->setText(str); } diff --git a/code/ryzom/client/unix/ryzom_client.desktop.in b/code/ryzom/client/unix/ryzom_client.desktop.in deleted file mode 100644 index e7bcceb14..000000000 --- a/code/ryzom/client/unix/ryzom_client.desktop.in +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Version=0.1 -Name=Khanat -Name[ru]=Ризом -Type=Application -GenericName=Game client -Comment=Khanat client -Comment[fr_FR]=Client Khanat -TryExec=${RYZOM_GAMES_PREFIX}/ryzom_client -Exec=${RYZOM_GAMES_PREFIX}/ryzom_client -Icon=${RYZOM_CLIENT_ICON} -Terminal=false -Hidden=false -Categories=Game;RolePlaying; -StartupWMClass=ryzom_client -X-AppInstall-Package=ryzom-client