From 45440063b57f792da3afef603e621befa1c1bfcd Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 22 May 2010 19:59:37 +0000 Subject: (svn r19884) -Feature: translatable desktop shortcut comments --- Makefile.bundle.in | 3 ++- Makefile.in | 1 + media/openttd.desktop.in | 2 +- media/openttd.desktop.translation.awk | 15 +++++++++++++++ src/lang/english.txt | 3 +++ src/lang/hungarian.txt | 3 +++ 6 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 media/openttd.desktop.translation.awk diff --git a/Makefile.bundle.in b/Makefile.bundle.in index 6a1f3657f..446890a52 100644 --- a/Makefile.bundle.in +++ b/Makefile.bundle.in @@ -88,7 +88,8 @@ endif $(Q)cp "$(BIN_DIR)/scripts/"* "$(BUNDLE_DIR)/scripts/" ifdef MENU_DIR $(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/" - $(Q)cat "$(ROOT_DIR)/media/openttd.desktop" | sed s/=openttd/=$(BINARY_NAME)/g > "$(ROOT_DIR)/media/openttd.desktop.install" + $(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop" + $(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install" endif ifeq ($(TTD), openttd.exe) $(Q)unix2dos "$(BUNDLE_DIR)/docs/"* "$(BUNDLE_DIR)/readme.txt" "$(BUNDLE_DIR)/COPYING" "$(BUNDLE_DIR)/changelog.txt" "$(BUNDLE_DIR)/known-bugs.txt" diff --git a/Makefile.in b/Makefile.in index c4200b833..d4bb0c02d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -43,6 +43,7 @@ OSXAPP = !!OSXAPP!! LIPO = !!LIPO!! REVISION = !!REVISION!! AWK = !!AWK!! +SORT = !!SORT!! DISTCC = !!DISTCC!! RES := $(shell if [ ! -f $(CONFIG_CACHE_PWD) ] || [ "`pwd`" != "`cat $(CONFIG_CACHE_PWD)`" ]; then echo "`pwd`" > $(CONFIG_CACHE_PWD); fi ) diff --git a/media/openttd.desktop.in b/media/openttd.desktop.in index 5c37ac498..d1cd8c70f 100644 --- a/media/openttd.desktop.in +++ b/media/openttd.desktop.in @@ -4,8 +4,8 @@ Type=Application Version=1.1 Name=!!MENU_NAME!! -Comment=A clone of Transport Tycoon Deluxe Icon=openttd Exec=!!TTD!! Terminal=false Categories=!!MENU_GROUP!! +Comment=A clone of Transport Tycoon Deluxe diff --git a/media/openttd.desktop.translation.awk b/media/openttd.desktop.translation.awk new file mode 100644 index 000000000..943cb498f --- /dev/null +++ b/media/openttd.desktop.translation.awk @@ -0,0 +1,15 @@ +# $Id$ + +# This file is part of OpenTTD. +# OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. +# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . + +# +# Awk script to automatically generate a single comment line +# for a translated desktop shortcut. If it does not exist there +# is no output. +# + +/##isocode/ { lang = $2; next } +/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; next} diff --git a/src/lang/english.txt b/src/lang/english.txt index 9d7a97cf3..4fcfffb4e 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -3680,6 +3680,9 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE :{WHITE}Can't pl STR_ERROR_CAN_T_CHANGE_SIGN_NAME :{WHITE}Can't change sign name... STR_ERROR_CAN_T_DELETE_SIGN :{WHITE}Can't delete sign... +# Translatable comment for OpenTTD's desktop shortcut +STR_DESKTOP_SHORTCUT_COMMENT :A clone of Transport Tycoon Deluxe + ##id 0x2000 # Town building names STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1 :Tall office block diff --git a/src/lang/hungarian.txt b/src/lang/hungarian.txt index eff129a09..629a478c4 100644 --- a/src/lang/hungarian.txt +++ b/src/lang/hungarian.txt @@ -3744,6 +3744,9 @@ STR_ERROR_CAN_T_PLACE_SIGN_HERE :{WHITE}Nem rakh STR_ERROR_CAN_T_CHANGE_SIGN_NAME :{WHITE}Nem változtathatod meg a feliratot... STR_ERROR_CAN_T_DELETE_SIGN :{WHITE}A felirat nem törölhető... +# Translatable comment for OpenTTD's desktop shortcut +STR_DESKTOP_SHORTCUT_COMMENT :Egy Transport Tycoon Deluxe klón + ##id 0x2000 # Town building names STR_TOWN_BUILDING_NAME_TALL_OFFICE_BLOCK_1 :Magas irodaház -- cgit v1.2.3-70-g09d2