# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: tracy.poff@gmail.com-20111004164121-41d7su5m9w08ko75 # target_branch: http://bazaar.launchpad.net/~dnax88/gweled/trunk/ # testament_sha1: 96c64acae410dfd7bc0d8d36ef25374f23cd027f # timestamp: 2011-10-04 12:41:43 -0400 # message: Game type descriptions rewritten. # base_revision_id: dnax88@gmail.com-20110702150153-3mj2akpnvf180t90 # # Begin patch === modified file 'src/main.c' --- src/main.c 2011-03-31 09:41:31 +0000 +++ src/main.c 2011-10-04 16:41:21 +0000 @@ -394,11 +394,11 @@ g_alignment_welcome = GTK_WIDGET (gtk_builder_get_object (gweled_xml, "alignmentWelcome")); set_welcome_button_label (GTK_WIDGET (gtk_builder_get_object (gweled_xml, "labelDescNormal")), - _("Get as many point as you can. The game ends if you out of moves.")); + _("Get as many points as you can. The game ends if you run out of moves.")); set_welcome_button_label (GTK_WIDGET (gtk_builder_get_object (gweled_xml, "labelDescTimed")), - _("Get as many points as you can, but you are limited on time.")); + _("Get as many points as you can. The game ends if you run out of time.")); set_welcome_button_label (GTK_WIDGET (gtk_builder_get_object (gweled_xml, "labelDescEndless")), - _("Game will never end. Your scores will not be registered.")); + _("The game never ends, but your score will not be saved.")); load_preferences(); init_pref_window(); # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWd+v8kMAAbX/gAgQACBQZ/// VoBEAL////BQA5bJqD3AcUhJRMgEyNMmIxA0mnqmhoZMIwkkJoaqfsIE1NRoA9QNB6gZAEkjQgJo MiT9UNknohspkNB+qGhgNAAANAAAAAAGijU0yHqGDKBiGjGk0yaAA/bnwQd1rstdEcq8TEa8ETCD xqVSVXqOfSjMwdfojCz9TqZ2diMWGh1/2sofsbPQ8zRvxVBUPsxZtf82lRK+QYRzEb3EkDxpHfTX m3e2pdyDomi81hJQslR84UL2Ec04xSu2/3Rb3Ka7C6R6wSIkttroI73gMibxUEHtdXoUa1JQtBcm jNOrzYKHY6gnOZUVM/bRXoJM1wsnzdUF0YJYl2bimIi+oUW27oV+R0/CbwxspKuIq+ua1rYnXjcZ SFr0VrLRCkLNWX6Muyhm9zm2sJdxooE6bIqdrMrgrsKEj4LPeMe5GL6Fs1hc4reTVyyFGsBXiaUe 3lDjHcI7tQd2TMSQyit8rx62aBzhSWGmfuFN1nUHPKExX7wyz53rO/F0sBiosX5KncKj55KWfCuH wFxthZk3bfdUZf0NohjhPQONSQtIalei1LXjdhk42YmUuMTyCpaQ2EpwoHDMRs4g5NFoGARvZ3tX cctdpNmdG9XXTIBZFhxmRjvtbdCSNu8kZUtAMrQDAVoSFj8oMpAC5+upwbhKJafK2bOhFEc9SLQg U0YdYyqug4Vc+XGuBxRwkTdOIvCxhMWEibERmm2+JkaRPYOA3mJsKX18o92ufIoUiqE3N6pp7NxJ wiUPjkd+qbXva7X0sbplnFVaZtllDV1/7rr6F1LL5mMv9Gn4pzVpQmJktb+WL/fG4+DJVTolT97y I4cplVZ4kaTzNqkA7ynvwt2MMxi4I+EiDkXh/lBLIircWk/l6pjqDIy1pFa4wqFy8A1e1puqdWEm zAGZO7NTroUyesIcRUptyRcHrODoAdNLwjh5z3CILuFDxSPL0b2G9XK1uEDhzVlJzOtLyeyY6iqc QdwkpSjyhF0OmTLxUzlmLD1VZ60Qe8FWHNqHEHsU4rv1aItN42TMoD4L0SkV5U1YrzVlkM8C8daV Afvo2NE/OlSdt2kamdVC6IYnmBMWsGze+hEvNzW4g1FVxoTDqJrYl+S1eClDQ1tcaz4zr7XuN3BW Bau82DT6Oq2WRaFQseWKoPJXGFam8E0K8eq9Bd64ZAYsdUoxqTHofrPKL6F3JFOFCQ36/yQw