Skip to content
This repository has been archived by the owner on Oct 4, 2024. It is now read-only.

Update French #5

Closed
wants to merge 14 commits into from
Closed

Update French #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e21ed0e
missed authors.txt added back
jim618 Oct 25, 2013
a8a56a0
updated branch info
jim618 Oct 25, 2013
2b6787f
updated branch info
jim618 Oct 25, 2013
32c0ae1
old style blockchain no longer required
jim618 Oct 27, 2013
caebcbc
lower case name
jim618 Oct 31, 2013
3528a7a
Merge branch 'develop'
jim618 Nov 19, 2013
a404a3b
fix for multibit.blockchain no longer required
jim618 Nov 20, 2013
ed54a81
Merge branch 'develop'
jim618 Nov 20, 2013
37d1a83
print out tx on send
jim618 Nov 24, 2013
37cf439
updated key export files
jim618 Dec 9, 2013
60bfd96
Version 0.1.0
Feb 8, 2014
66d1c49
Merge branch 'release-0.1.0'
Feb 8, 2014
126e719
Updated readme
Feb 8, 2014
e1e9832
French update
Kirvx Feb 9, 2014
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ After some processing, you will have the following artifacts in the target direc
* an installer for Linux = multidoge-x.y.z-linux.jar

To run MultiDoge from these artifacts you can follow the instructions [provided on the main MultiDoge
website](https://multidoge.org/help.html)
website](http://multidoge.org/help.html)

### MultiDoge contains cut down JREs so is a large clone

Expand Down
2 changes: 1 addition & 1 deletion authors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ Internationalisation:
---------------------
http://translate.multibit.org

Thanks to all the MultiBit localisers.
Thanks to all the MultiBit localisers.
80 changes: 40 additions & 40 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright 2013 multidoge.org
~ Copyright 2013 multibit.org
~
~ Licensed under the MIT license (the "License");
~ you may not use this file except in compliance with the License.
Expand All @@ -21,12 +21,12 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.multibit</groupId>
<artifactId>multidoge</artifactId>
<version>develop-SNAPSHOT</version>
<name>MultiDoge</name>
<description>A Java Swing client for Dogecoin</description>
<url>https://multidoge.org</url>
<!-- Use "mvn clean package" to build the code packaged into a basic multidoge.jar
<artifactId>multibit</artifactId>
<version>0.5.15</version>
<name>MultiBit</name>
<description>A Java Swing client for Bitcoin</description>
<url>https://multibit.org</url>
<!-- Use "mvn clean package" to build the code packaged into a basic multibit.jar
Use "mvn clean verify" before submitting a patch Use "mvn clean install"
to build the executable jar, installers and Mac DMG Use "mvn site:site" to
generate a complete website under target/site Use "mvn site:run" to run a
Expand All @@ -42,12 +42,12 @@

<issueManagement>
<system>GitHub</system>
<url>https://github.com/langerhans/multidoge/issues</url>
<url>https://github.com/jim618/multibit/issues</url>
</issueManagement>

<scm>
<!-- Public read-only source -->
<url>https://github.com/langerhans/multidoge</url>
<url>https://github.com/jim618/multibit</url>
</scm>

<repositories>
Expand All @@ -61,7 +61,7 @@
<snapshots/>
<url>https://oss.sonatype.org/content/groups/public</url>
</repository>
<!-- dogecoin-j repo -->
<!-- bitcoin-j repo -->
<repository>
<id>bitcoinj-release</id>
<releases />
Expand All @@ -76,7 +76,7 @@
</repositories>

<build>
<finalName>multidoge</finalName>
<finalName>multibit</finalName>
<resources>
<!-- filter properties files e.g. version.properties -->
<resource>
Expand Down Expand Up @@ -190,7 +190,7 @@
<maxMemory>256m</maxMemory>
<attach>false</attach>
<addMavenDescriptor>false</addMavenDescriptor>
<proguardInclude>src/main/proguard/multidoge-exe.pro</proguardInclude>
<proguardInclude>src/main/proguard/multibit-exe.pro</proguardInclude>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -226,20 +226,20 @@
<include>install.xml</include>
<include>readme.txt</include>
<include>Unix_shortcutSpec.xml</include>
<include>multidoge-protocol-handler.sh</include>
<include>multibit-protocol-handler.sh</include>
</includes>
</resource>
<resource>
<directory>${basedir}/src/main/resources/images</directory>
<includes>
<include>installerLeft.png</include>
<include>multidoge48.png</include>
<include>multibit48.png</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>multidoge.checkpoints</include>
<include>multibit.checkpoints</include>
</includes>
</resource>
<resource>
Expand All @@ -254,7 +254,7 @@
<resource>
<directory>target</directory>
<includes>
<include>multidoge-exe.jar</include>
<include>multibit-exe.jar</include>
</includes>
</resource>
</resources>
Expand Down Expand Up @@ -286,13 +286,13 @@
<directory>${basedir}/src/main/resources/images</directory>
<includes>
<include>installerLeft.png</include>
<include>multidoge.ico</include>
<include>multibit.ico</include>
</includes>
</resource>
<resource>
<directory>src/main/resources</directory>
<includes>
<include>multidoge.checkpoints</include>
<include>multibit.checkpoints</include>
</includes>
</resource>
<resource>
Expand All @@ -307,7 +307,7 @@
<resource>
<directory>target</directory>
<includes>
<include>multidoge.exe</include>
<include>multibit.exe</include>
</includes>
</resource>
</resources>
Expand All @@ -326,12 +326,12 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/MultiDoge.app
<outputDirectory>${basedir}/target/MultiBit.app
</outputDirectory>
<resources>
<resource>
<!-- skeleton app including JRE -->
<directory>src/app-resources/MultiDoge.app</directory>
<directory>src/app-resources/MultiBit.app</directory>
</resource>
</resources>
</configuration>
Expand All @@ -343,14 +343,14 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/MultiDoge.app/Contents/Resources/Java
<outputDirectory>${basedir}/target/MultiBit.app/Contents/Resources/Java
</outputDirectory>
<resources>
<resource>
<directory>${basedir}/target/staging.linux</directory>
<includes>
<include>multidoge-exe.jar</include>
<include>multidoge.checkpoints</include>
<include>multibit-exe.jar</include>
<include>multibit.checkpoints</include>
<include>release_notes.txt</include>
<include>configuration.md</include>
<include>COPYING</include>
Expand Down Expand Up @@ -421,39 +421,39 @@
<!-- Make the JavaApplicationStub in the Mac application bundle executable
(it loses its 'x' permission after the copy) -->
<chmod
file="${basedir}/target/MultiDoge.app/Contents/MacOS/JavaApplicationStub"
file="${basedir}/target/MultiBit.app/Contents/MacOS/JavaApplicationStub"
perm="777" />

<copy
todir="${basedir}/target/MultiDoge-mac/MultiDoge.app">
<fileset dir="${basedir}/target/MultiDoge.app"
todir="${basedir}/target/MultiBit-mac/MultiBit.app">
<fileset dir="${basedir}/target/MultiBit.app"
includes="**" />
</copy>
<copy file="${basedir}/src/main/izpack/mac/readme.txt"
todir="${basedir}/target/MultiDoge-mac" />
todir="${basedir}/target/MultiBit-mac" />

<!-- Create Applications Symbolic link -->
<!-- WARNING, do not remove this symbolic link by Java(ant) -->
<exec executable="ln" os="'Mac OS X'">
<arg
line="-s /Applications ${basedir}/target/MultiDoge-mac/Applications" />
line="-s /Applications ${basedir}/target/MultiBit-mac/Applications" />
</exec>

<!-- Make the JavaAppLauncher in the MultiBit app (it loses its
'x' permission after the copy) -->
<chmod
file="${basedir}/target/MultiDoge-mac/MultiDoge.app/Contents/MacOS/JavaApplicationStub"
file="${basedir}/target/MultiBit-mac/MultiBit.app/Contents/MacOS/JavaApplicationStub"
perm="777" />

<!-- Sign the Mac app -->
<exec executable="codesign" os="'Mac OS X'">
<arg
line="--sign 'Developer ID Application: James Burton' --force ${basedir}/target/MultiDoge-mac/Multidoge.app" />
line="--sign 'Developer ID Application: James Burton' --force ${basedir}/target/MultiBit-mac/MultiBit.app" />
</exec>
<!-- Verify it is signed ok -->
<exec executable="codesign" os="'Mac OS X'">
<arg
line="--display --verbose=4 ${basedir}/target/MultiDoge-mac/Multidoge.app" />
line="--display --verbose=4 ${basedir}/target/MultiBit-mac/MultiBit.app" />
</exec>

<!-- create a DMG file -->
Expand All @@ -463,27 +463,27 @@
<arg value="-imagekey"/>
<arg value="zlib-level=9" />
<arg value="-srcfolder" />
<arg value="${basedir}/target/MultiDoge-mac" />
<arg value="${basedir}/target/multidoge-${project.version}.dmg" />
<arg value="${basedir}/target/MultiBit-mac" />
<arg value="${basedir}/target/multibit-${project.version}.dmg" />
</exec>

<!-- IMPORTANT! -->
<!-- Remove symbolic link before deleting tmp dir -->
<exec executable="rm" os="'Mac OS X'">
<arg line="-R ${basedir}/target/MultiDoge-mac/Applications" />
<arg line="-R ${basedir}/target/MultiBit-mac/Applications" />
</exec>

<!-- get rid of temporary directory -->
<delete includeEmptyDirs="true">
<fileset dir="${basedir}/target/MultiDoge-mac" />
<fileset dir="${basedir}/target/MultiBit-mac" />
</delete>
</tasks>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
<!-- Produce a Win32 exe from the multidoge-exe.jar (no Maven plugin
<!-- Produce a Win32 exe from the multibit-exe.jar (no Maven plugin
for JSmooth so drop down to ant) -->
<execution>
<id>jsmooth-installer2exe-exe</id>
Expand Down Expand Up @@ -520,7 +520,7 @@
classpathref="jsmooth-classpathref" />
<jsmoothgen project="src/main/jsmooth/installer.jsmooth"
skeletonroot="src/main/jsmooth/skeletons" />
<move file="target/multidoge-windows.exe" tofile="target/multidoge-${project.version}-windows-setup.exe" />
<move file="target/multibit-windows.exe" tofile="target/multibit-${project.version}-windows-setup.exe" />
</tasks>
</configuration>
<goals>
Expand Down Expand Up @@ -676,7 +676,7 @@
</dependency>
<dependency>
<groupId>com.google</groupId>
<artifactId>dogecoinj</artifactId>
<artifactId>bitcoinj</artifactId>
<version>${bitcoinj.version}</version>
<scope>compile</scope>
</dependency>
Expand Down Expand Up @@ -811,7 +811,7 @@
</staging.linux.dir>

<!-- Version of BitCoinJ to use (multiple uses) -->
<bitcoinj.version>0.10.3-MB-ALICE</bitcoinj.version>
<bitcoinj.version>0.10.2-MB-ALICE</bitcoinj.version>

<!-- Version of XChange to use (multiple uses) -->
<xchange.version>1.10.0</xchange.version>
Expand Down
Loading