From 2549204662bf218f2169126ff75eec35c90368a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20T=C5=AFma?= <tumic@cbox.cz>
Date: Tue, 24 Jan 2023 23:01:40 +0100
Subject: [PATCH] Use CFBundleLocalizations instead of lproj directories

---
 pkg/mac/Info.plist                         | 24 ++++++++++++++++++++++
 pkg/mac/lproj/ca.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/cs.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/da.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/de.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/en.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/eo.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/es.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/fi.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/fr.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/hu.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/it.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/ko.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/nb.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/pl.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/pt_BR.lproj/locversion.plist | 14 -------------
 pkg/mac/lproj/ru.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/sv.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/tr.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/uk.lproj/locversion.plist    | 14 -------------
 pkg/mac/lproj/zh.lproj/locversion.plist    | 14 -------------
 pkg/mac/scripts/lproj.sh                   | 21 -------------------
 22 files changed, 24 insertions(+), 301 deletions(-)
 delete mode 100644 pkg/mac/lproj/ca.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/cs.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/da.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/de.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/en.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/eo.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/es.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/fi.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/fr.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/hu.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/it.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/ko.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/nb.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/pl.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/pt_BR.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/ru.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/sv.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/tr.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/uk.lproj/locversion.plist
 delete mode 100644 pkg/mac/lproj/zh.lproj/locversion.plist
 delete mode 100755 pkg/mac/scripts/lproj.sh

diff --git a/pkg/mac/Info.plist b/pkg/mac/Info.plist
index 86537510..854da042 100644
--- a/pkg/mac/Info.plist
+++ b/pkg/mac/Info.plist
@@ -25,6 +25,30 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 
+	<key>CFBundleLocalizations</key>
+	<array>
+		<string>ca</string>
+		<string>cs</string>
+		<string>da</string>
+		<string>de</string>
+		<string>en</string>
+		<string>eo</string>
+		<string>es</string>
+		<string>fi</string>
+		<string>fr</string>
+		<string>hu</string>
+		<string>it</string>
+		<string>ko</string>
+		<string>nb</string>
+		<string>pl</string>
+		<string>pt_BR</string>
+		<string>ru</string>
+		<string>sv</string>
+		<string>tr</string>
+		<string>uk</string>
+		<string>zh_CN</string>
+	</array>
+
 	<key>CFBundleDocumentTypes</key>
 	<array>
 		<dict>
diff --git a/pkg/mac/lproj/ca.lproj/locversion.plist b/pkg/mac/lproj/ca.lproj/locversion.plist
deleted file mode 100644
index 80c9dc8b..00000000
--- a/pkg/mac/lproj/ca.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>ca</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/cs.lproj/locversion.plist b/pkg/mac/lproj/cs.lproj/locversion.plist
deleted file mode 100644
index db36b4cd..00000000
--- a/pkg/mac/lproj/cs.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>cs</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/da.lproj/locversion.plist b/pkg/mac/lproj/da.lproj/locversion.plist
deleted file mode 100644
index 172d9422..00000000
--- a/pkg/mac/lproj/da.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>da</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/de.lproj/locversion.plist b/pkg/mac/lproj/de.lproj/locversion.plist
deleted file mode 100644
index 98a1b652..00000000
--- a/pkg/mac/lproj/de.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>de</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/en.lproj/locversion.plist b/pkg/mac/lproj/en.lproj/locversion.plist
deleted file mode 100644
index 8a38d290..00000000
--- a/pkg/mac/lproj/en.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>en</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/eo.lproj/locversion.plist b/pkg/mac/lproj/eo.lproj/locversion.plist
deleted file mode 100644
index 08ab0196..00000000
--- a/pkg/mac/lproj/eo.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>eo</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/es.lproj/locversion.plist b/pkg/mac/lproj/es.lproj/locversion.plist
deleted file mode 100644
index 5498418a..00000000
--- a/pkg/mac/lproj/es.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>es</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/fi.lproj/locversion.plist b/pkg/mac/lproj/fi.lproj/locversion.plist
deleted file mode 100644
index 9094b011..00000000
--- a/pkg/mac/lproj/fi.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>fi</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/fr.lproj/locversion.plist b/pkg/mac/lproj/fr.lproj/locversion.plist
deleted file mode 100644
index 84dd7454..00000000
--- a/pkg/mac/lproj/fr.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>fr</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/hu.lproj/locversion.plist b/pkg/mac/lproj/hu.lproj/locversion.plist
deleted file mode 100644
index 95b0cc0c..00000000
--- a/pkg/mac/lproj/hu.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>hu</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/it.lproj/locversion.plist b/pkg/mac/lproj/it.lproj/locversion.plist
deleted file mode 100644
index 646af641..00000000
--- a/pkg/mac/lproj/it.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>it</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/ko.lproj/locversion.plist b/pkg/mac/lproj/ko.lproj/locversion.plist
deleted file mode 100644
index a4d776c6..00000000
--- a/pkg/mac/lproj/ko.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>ko</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/nb.lproj/locversion.plist b/pkg/mac/lproj/nb.lproj/locversion.plist
deleted file mode 100644
index 61cfa9ff..00000000
--- a/pkg/mac/lproj/nb.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>nb</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/pl.lproj/locversion.plist b/pkg/mac/lproj/pl.lproj/locversion.plist
deleted file mode 100644
index 05aad251..00000000
--- a/pkg/mac/lproj/pl.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>pl</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/pt_BR.lproj/locversion.plist b/pkg/mac/lproj/pt_BR.lproj/locversion.plist
deleted file mode 100644
index 1c16d12e..00000000
--- a/pkg/mac/lproj/pt_BR.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>pt_BR</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/ru.lproj/locversion.plist b/pkg/mac/lproj/ru.lproj/locversion.plist
deleted file mode 100644
index fc16b5df..00000000
--- a/pkg/mac/lproj/ru.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>ru</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/sv.lproj/locversion.plist b/pkg/mac/lproj/sv.lproj/locversion.plist
deleted file mode 100644
index 9a538e31..00000000
--- a/pkg/mac/lproj/sv.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>sv</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/tr.lproj/locversion.plist b/pkg/mac/lproj/tr.lproj/locversion.plist
deleted file mode 100644
index dfdb3641..00000000
--- a/pkg/mac/lproj/tr.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>tr</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/uk.lproj/locversion.plist b/pkg/mac/lproj/uk.lproj/locversion.plist
deleted file mode 100644
index cce8de5f..00000000
--- a/pkg/mac/lproj/uk.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>uk</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/lproj/zh.lproj/locversion.plist b/pkg/mac/lproj/zh.lproj/locversion.plist
deleted file mode 100644
index 9b5af6b4..00000000
--- a/pkg/mac/lproj/zh.lproj/locversion.plist
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>zh</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>
diff --git a/pkg/mac/scripts/lproj.sh b/pkg/mac/scripts/lproj.sh
deleted file mode 100755
index 1bcbf995..00000000
--- a/pkg/mac/scripts/lproj.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#/bin/bash
-
-for QM in ../../../lang/*.qm; do
-	LANG=`echo $QM | sed s/.\*gpxsee_// | cut -d. -f1`
-	DIR=../lproj/$LANG.lproj
-	mkdir -p $DIR
-	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-    <key>LprojCompatibleVersion</key>
-    <string>123</string>
-    <key>LprojLocale</key>
-    <string>$LANG</string>
-    <key>LprojRevisionLevel</key>
-    <string>1</string>
-    <key>LprojVersion</key>
-    <string>123</string>
-</dict>
-</plist>" > $DIR/locversion.plist
-done