# 
# 
# rename "i18n"
#     to "res/i18n"
# 
# patch "build.sh"
#  from [f0d9d53b77878fec754ad41e92c82390df044eab]
#    to [34a577b8e06c930c6508418e3036426b7210d6f1]
# 
# patch "res/guitone.qrc"
#  from [7659620548e011928a39d80b3d1e8088a0a7cb9f]
#    to [4e2419e7607ad77efca5eb1f2562b0baebdc68ec]
# 
# patch "src/main.cpp"
#  from [d3eb6ee4777d8ffdc68b5c8167f2446c724e7224]
#    to [729ec8289dd863f04ae5f31f11661664e9d3e4a9]
# 
============================================================
--- build.sh	f0d9d53b77878fec754ad41e92c82390df044eab
+++ build.sh	34a577b8e06c930c6508418e3036426b7210d6f1
@@ -1,22 +1,6 @@
 #!/bin/sh
 qmake guitone.pro && \
  lupdate guitone.pro && \
  lrelease guitone.pro && \
  make $@
 
-if [ $? -gt 0 ]; then
-    exit 1;
-fi
-
-i18n_dir=bin/i18n
-if [ `uname` == "Darwin" ]; then
-    i18n_dir=bin/guitone.app/Contents/MacOS/i18n
-fi
-
-if [ ! -d $i18n_dir ]; then
-    mkdir -p $i18n_dir
-fi
-
-echo `basename $0`: copying language files...
-cp i18n/*.qm $i18n_dir
-    
============================================================
--- res/guitone.qrc	7659620548e011928a39d80b3d1e8088a0a7cb9f
+++ res/guitone.qrc	4e2419e7607ad77efca5eb1f2562b0baebdc68ec
@@ -1,5 +1,8 @@
 <!DOCTYPE RCC><RCC version="1.0">
     <qresource>
+	<!-- 
+		Overlays
+	-->
         <file>overlays/added_missing.png</file>
         <file>overlays/added.png</file>
         <file>overlays/dropped_added_missing.png</file>
@@ -21,5 +24,11 @@
         <file>overlays/rename_target.png</file>
         <file>overlays/unchanged.png</file>
         <file>overlays/unknown.png</file>
+
+	<!--
+		Language files
+	-->
+	<file>i18n/guitone_de.qm</file>
     </qresource>
 </RCC>
+
============================================================
--- src/main.cpp	d3eb6ee4777d8ffdc68b5c8167f2446c724e7224
+++ src/main.cpp	729ec8289dd863f04ae5f31f11661664e9d3e4a9
@@ -44,15 +44,15 @@
     QTranslator translator;
 
 // Workaround for "[Bug #7920] Translations don't work on Win"
-#ifdef Q_WS_WIN
-	locale = locale.left(2);
-	QString path = QCoreApplication::applicationDirPath() + "/../i18n";
-#else
-    QString path = QCoreApplication::applicationDirPath() + "/i18n";
-#endif
+//#ifdef Q_WS_WIN
+//	locale = locale.left(2);
+//	QString path = QCoreApplication::applicationDirPath() + "/../i18n";
+//#else
+//    QString path = QCoreApplication::applicationDirPath() + "/i18n";
+//#endif
 
 	QString transFileName("guitone_" + locale);
-	if (translator.load(transFileName, path))
+	if (translator.load(transFileName, ":/i18n"))
     {
         app.installTranslator(&translator);
     }