From ed3f8b3f5587c6068b9d3935ecd82d9267cd4370 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 8 Feb 2017 09:25:30 +0100
Subject: [PATCH] Rename locale directory to "lang".

---
 rssguard.pro                  | 10 +++++-----
 src/definitions/definitions.h |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rssguard.pro b/rssguard.pro
index 978e1df7e..0294c7c4a 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -542,8 +542,8 @@ TEXTS = resources/text/CHANGELOG \
 
 # Make sure QM translations are generated.
 lrelease.input = TRANSLATIONS
-lrelease.output = $$OUT_PWD/l10n/${QMAKE_FILE_BASE}.qm
-lrelease.commands = $$LRELEASE_EXECUTABLE -compress ${QMAKE_FILE_IN} -qm $$OUT_PWD/l10n/${QMAKE_FILE_BASE}.qm
+lrelease.output = $$OUT_PWD/lang/${QMAKE_FILE_BASE}.qm
+lrelease.commands = $$LRELEASE_EXECUTABLE -compress ${QMAKE_FILE_IN} -qm $$OUT_PWD/lang/${QMAKE_FILE_BASE}.qm
 lrelease.CONFIG += no_link target_predeps
 
 # Create new "make lupdate" target.
@@ -661,7 +661,7 @@ win32 {
   app_plain_icon.files = resources/graphics/$${TARGET}_plain.png
   app_plain_icon.path = $$quote($$PREFIX/)
 
-  translations.files = $$OUT_PWD/l10n
+  translations.files = $$OUT_PWD/lang
   translations.path = $$quote($$PREFIX/)
 
   INSTALLS += target misc_sql qt_dlls_root qt_dlls_bearer qt_dlls_iconengines \
@@ -721,7 +721,7 @@ unix:!mac {
   desktop_file_autostart.files = resources/desktop/$${TARGET}.desktop.autostart
   desktop_file_autostart.path = $$quote($$PREFIX/share/$${TARGET}/autostart/)
 
-  translations.files = $$OUT_PWD/l10n
+  translations.files = $$OUT_PWD/lang
   translations.path = $$quote($$PREFIX/share/$$TARGET/)
 
   INSTALLS += target misc_sql misc_icons misc_feeds \
@@ -765,7 +765,7 @@ mac {
   misc_texts.files = $$TEXTS
   misc_texts.path = Contents/Resources/information
 
-  translations.files = $$OUT_PWD/l10n
+  translations.files = $$OUT_PWD/lang
   translations.path =  Contents/Resources
 
   QMAKE_BUNDLE_DATA += misc_sql misc_icons faenza misc_feeds skins \
diff --git a/src/definitions/definitions.h b/src/definitions/definitions.h
index a7cd3bdb4..eb1e01b9f 100755
--- a/src/definitions/definitions.h
+++ b/src/definitions/definitions.h
@@ -212,7 +212,7 @@
 #define APP_DESKTOP_ENTRY_FILE "rssguard.desktop"
 
 #define APP_DESKTOP_ENTRY_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/autostart")
-#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/l10n")
+#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/lang")
 #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/skins")
 #define APP_INFO_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/information")
 #define APP_THEME_PATH QApplication::applicationDirPath() + QString("/../share/rssguard/icons")
@@ -223,7 +223,7 @@
 
 #elif defined(Q_OS_OSX)
 
-#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/../Resources/l10n")
+#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/../Resources/lang")
 #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/../Resources/skins")
 #define APP_INFO_PATH QApplication::applicationDirPath() + QString("/../Resources/information")
 #define APP_THEME_PATH QApplication::applicationDirPath() + QString("/../Resources/icons")
@@ -235,7 +235,7 @@
 
 #elif defined(Q_OS_WIN)
 
-#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/l10n")
+#define APP_LANG_PATH QApplication::applicationDirPath() + QString("/lang")
 #define APP_SKIN_PATH QApplication::applicationDirPath() + QString("/skins")
 #define APP_INFO_PATH QApplication::applicationDirPath()
 #define APP_THEME_PATH QApplication::applicationDirPath() + QString("/icons")