Skip to content

Commit 29153d1

Browse files
author
subhra74
committed
updated translations and fixed linux native messaging issue
1 parent fe50900 commit 29153d1

File tree

13 files changed

+983
-325
lines changed

13 files changed

+983
-325
lines changed

app/src/main/java/xdman/XDMApp.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1402,5 +1402,4 @@ public ArrayList<VideoPopupItem> getVideoItemsList() {
14021402
public MainWindow getMainWindow() {
14031403
return mainWindow;
14041404
}
1405-
14061405
}

app/src/main/java/xdman/ui/res/ImageResource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static Icon getIcon(String icon, int width, int height) {
5656
BufferedImage image = ImageIO.read(ImageResource.class.getResource("/icons/xxhdpi/" + icon));
5757
BufferedImage scaledImage = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
5858

59-
System.out.println("------*** " + image.getWidth() + " " + width);
59+
//System.out.println("------*** " + image.getWidth() + " " + width);
6060

6161
Graphics2D g2 = scaledImage.createGraphics();
6262
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);

app/src/main/java/xdman/util/NativeMessagingHostInstaller.java

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ public class NativeMessagingHostInstaller {
2020

2121
private static final String FIREFOX_EXTENSION_IDS = String.join(",", "\"browser-mon@xdman.sourceforge.net\"");
2222

23-
private static final String CHROME_LINUX_LOCATION = "~/.config/google-chrome/NativeMessagingHosts",
24-
FIREFOX_LINUX_LOCATION = "~/.mozilla/native-messaging-hosts",
25-
CHROME_MAC_LOCATION = "~/Library/Application Support/Google/Chrome/NativeMessagingHosts",
26-
FIREFOX_MAC_LOCATION = "~/Library/Application Support/Mozilla/NativeMessagingHosts",
27-
CHROMIUM_LINUX_LOCATION = "~/.config/chromium/NativeMessagingHosts",
28-
CHROMIUM_MAC_LOCATION = "~/Library/Application Support/Chromium/NativeMessagingHosts";
23+
private static final String CHROME_LINUX_LOCATION = ".config/google-chrome/NativeMessagingHosts",
24+
FIREFOX_LINUX_LOCATION = ".mozilla/native-messaging-hosts",
25+
CHROME_MAC_LOCATION = "Library/Application Support/Google/Chrome/NativeMessagingHosts",
26+
FIREFOX_MAC_LOCATION = "Library/Application Support/Mozilla/NativeMessagingHosts",
27+
CHROMIUM_LINUX_LOCATION = ".config/chromium/NativeMessagingHosts",
28+
CHROMIUM_MAC_LOCATION = "Library/Application Support/Chromium/NativeMessagingHosts";
2929

3030
public static final synchronized void installNativeMessagingHostForChrome() {
3131
installNativeMessagingHostForChrome(XDMUtils.detectOS(), false);
@@ -51,9 +51,7 @@ private static final void installNativeMessagingHostForChrome(int os, boolean ch
5151
}
5252
}
5353
File manifestFile = new File(Config.getInstance().getDataFolder(), "xdm_chrome.native_host.json");
54-
File nativeHostFile = new File(XDMUtils.getJarFile().getParentFile(),
55-
System.getProperty("os.name").toLowerCase().contains("windows") ? "native_host.exe"
56-
: "native_host");
54+
File nativeHostFile = new File(XDMUtils.getJarFile().getParentFile(), "native_host.exe");
5755
createNativeManifest(manifestFile, nativeHostFile, BrowserType.Chrome);
5856
try {
5957
Advapi32Util.registrySetStringValue(WinReg.HKEY_CURRENT_USER,
@@ -65,18 +63,14 @@ private static final void installNativeMessagingHostForChrome(int os, boolean ch
6563
return;
6664
}
6765
} else {
68-
File manifestFolder = new File(os == XDMUtils.MAC ? (chromium ? CHROMIUM_MAC_LOCATION : CHROME_MAC_LOCATION)
69-
: (chromium ? CHROMIUM_LINUX_LOCATION : CHROME_LINUX_LOCATION));
66+
File manifestFolder = new File(System.getProperty("user.home"),
67+
os == XDMUtils.MAC ? (chromium ? CHROMIUM_MAC_LOCATION : CHROME_MAC_LOCATION)
68+
: (chromium ? CHROMIUM_LINUX_LOCATION : CHROME_LINUX_LOCATION));
7069
if (!manifestFolder.exists()) {
7170
manifestFolder.mkdirs();
7271
}
73-
File manifestFile = new File(
74-
os == XDMUtils.MAC ? (chromium ? CHROMIUM_MAC_LOCATION : CHROME_MAC_LOCATION)
75-
: (chromium ? CHROMIUM_LINUX_LOCATION : CHROME_LINUX_LOCATION),
76-
"xdm_chrome.native_host.json");
77-
File nativeHostFile = new File(XDMUtils.getJarFile().getParentFile(),
78-
System.getProperty("os.name").toLowerCase().contains("windows") ? "native_host.exe"
79-
: "native_host");
72+
File manifestFile = new File(manifestFolder, "xdm_chrome.native_host.json");
73+
File nativeHostFile = new File(XDMUtils.getJarFile().getParentFile(), "native_host");
8074
createNativeManifest(manifestFile, nativeHostFile, BrowserType.Chrome);
8175
}
8276

@@ -95,9 +89,7 @@ public static final void installNativeMessagingHostForFireFox(int os) {
9589
}
9690

9791
File manifestFile = new File(Config.getInstance().getDataFolder(), "xdmff.native_host.json");
98-
File nativeHostFile = new File(XDMUtils.getJarFile().getParentFile(),
99-
System.getProperty("os.name").toLowerCase().contains("windows") ? "native_host.exe"
100-
: "native_host");
92+
File nativeHostFile = new File(XDMUtils.getJarFile().getParentFile(), "native_host.exe");
10193
createNativeManifest(manifestFile, nativeHostFile, BrowserType.Firefox);
10294
try {
10395
Advapi32Util.registrySetStringValue(WinReg.HKEY_CURRENT_USER,
@@ -109,15 +101,13 @@ public static final void installNativeMessagingHostForFireFox(int os) {
109101
return;
110102
}
111103
} else {
112-
File manifestFolder = new File(os == XDMUtils.MAC ? FIREFOX_MAC_LOCATION : FIREFOX_LINUX_LOCATION);
104+
File manifestFolder = new File(System.getProperty("user.home"),
105+
os == XDMUtils.MAC ? FIREFOX_MAC_LOCATION : FIREFOX_LINUX_LOCATION);
113106
if (!manifestFolder.exists()) {
114107
manifestFolder.mkdirs();
115108
}
116-
File manifestFile = new File(os == XDMUtils.MAC ? FIREFOX_MAC_LOCATION : FIREFOX_LINUX_LOCATION,
117-
"xdmff.native_host.json");
118-
File nativeHostFile = new File(XDMUtils.getJarFile().getParentFile(),
119-
System.getProperty("os.name").toLowerCase().contains("windows") ? "native_host.exe"
120-
: "native_host");
109+
File manifestFile = new File(manifestFolder, "xdmff.native_host.json");
110+
File nativeHostFile = new File(XDMUtils.getJarFile().getParentFile(), "native_host");
121111
createNativeManifest(manifestFile, nativeHostFile, BrowserType.Firefox);
122112
}
123113
}

app/src/main/resources/lang/ar.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ REF_DESC1=الرجاء فتح صفحة الويب في المتصفح، حيث
215215
REF_DESC2=يرجى النقر على الزر أدناه وتحديد تنسيق الفيديو نفسه مرة أخرى
216216
REF_OPEN_PAGE=فتح محتوى على صفحة ويب
217217
REF_WAITING_FOR_LINK=...في انتظار رابط التحميل
218-
MB_OK=اوك
218+
MB_OK=موافق
219219
MB_YES=نعم
220220
MB_NO=ﻻ
221221
DEL_TITLE=حذف التاكيد
@@ -265,7 +265,7 @@ MENU_LANG=لغة
265265
MSG_LANG1=اختار اللغة
266266
MSG_LANG2=XDM يرجى ملاحظة أن التغييرات ستدخل حيز التنفيذ في المرة القادمة التي تبدأ فيها
267267
CTX_COPY=نسخ
268-
CTX_CUT=قطع
268+
CTX_CUT=قص
269269
CTX_PASTE=لصق
270270
CTX_SELECT_ALL=اختر الكل
271271
MSG_COMPONENT_TITLE=تثبيت العناصر

app/src/main/resources/lang/en.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,5 +331,4 @@ LBL_BATCH_FILEN=Last file
331331
LBL_SHOW_PROGRESS=Show progress
332332
LBL_FILE_TYPE=File type
333333
LBL_ALL_QUEUE=All queues
334-
LBL_SHOW_VIDEO_ONLY_IN_BROWSER=Disable floating 'DOWNLOAD VIDEO' popup
335-
LBL_ZOOM_LEVEL=Zoom screen (needs restart)
334+
LBL_SHOW_VIDEO_ONLY_IN_BROWSER=Disable floating 'DOWNLOAD VIDEO' popup

app/src/main/resources/lang/id.txt

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
LANGUAGE_TEXT=Indonesia (Bahasa Indonesia)
1+
LANGUAGE_TEXT=Bahasa Indonesia
22
WINDOW_TITLE=XDM 2018
33
ALL_DOWNLOADS=Semua
44
ALL_UNFINISHED=Belum Selesai
@@ -9,14 +9,14 @@ CAT_COMPRESSED=Kompresi
99
CAT_MUSIC=Musik
1010
CAT_VIDEOS=Video
1111
CAT_PROGRAMS=Program
12-
BROWSER_MONITORING=Monitor Browser
12+
BROWSER_MONITORING=Pemantau Browser
1313
MENU_FILE=Berkas
1414
MENU_DOWNLOAD=Unduhan
1515
MENU_TOOLS=Alat
1616
MENU_HELP=Bantuan
1717
MENU_ADD_URL=Tambah URL
1818
MENU_BATCH_DOWNLOAD=Unduh rangkap
19-
MENU_CLIP_ADD=Monitor clipboard
19+
MENU_CLIP_ADD=Monitor papan klip
2020
MENU_VIDEO_DWN=Unduh video
2121
MENU_DELETE_DWN=Hapus unduhan
2222
MENU_DELETE_COMPLETED=Hapus unduhan selesai
@@ -33,7 +33,7 @@ MENU_REFRESH_LINK=Segarkan link
3333
MENU_PROPERTIES=Properti
3434
MENU_FORCE_ASSEMBLE=Paksa gabungkan
3535
MENU_SPEED_LIMITER=Batasi Kecepatan
36-
MENU_MEDIA_CONVERTER=Konverter media
36+
MENU_MEDIA_CONVERTER=Konversi media
3737
MENU_BROWSER_INT=Monitor Browser
3838
MENU_CONTENTS=Konten...
3939
MENU_HOME_PAGE=Beranda
@@ -75,14 +75,14 @@ DWN_HIDE=Sembunyikan
7575
DWN_DOWNLOAD=Telah diunduh
7676
MSG_OK=OK
7777
MSG_FAILED=Unduhan gagal
78-
ERR_SESSION_FAILED=Sesi unduhan telah kadaluarsa, silahkan segarkan alamat unduhan.
78+
ERR_SESSION_FAILED=Sesi unduhan telah kedaluarsa, silahkan segarkan alamat unduhan.
7979
ERR_CONN_FAILED=Tidak dapat menghubungkan ke server, silahkan periksa koneksi internet, pengaturan proxy atau konfigurasi firewall.
8080
ERR_INVALID_RESP=XDM tidak dapat mengunduh data dari server, respon tidak valid.
8181
ERR_NO_RESUME=Server tidak mendukung proses melanjutkan, silahkan ulangi unduhan.
8282
RESUME_FAILED=Unduhan tidak dapat dilanjutkan/dimulai.
8383
ERR_INTERNAL=Internal bermasalah.
8484
ERR_ASM_FAILED=Gagal untuk menambah/mengkonversi bagian-bagian berkas, silahkan periksa apakah penyimpanan penuh atau diproteksi
85-
ERR_DISK_FAILED=Kegagalan disk.
85+
ERR_DISK_FAILED=Kegagalan penyimpanan.
8686
LBL_MENU=Menu
8787
TITLE_SETTINGS=Pengaturan
8888
SETTINGS_GENERAL=Pengaturan Dasar
@@ -93,7 +93,7 @@ DUT_ACT_RENAME=Otomatis ganti nama
9393
DUP_ACT_PROMPT=Ingatkan
9494
DUP_ACT_OPEN=Lanjutkan/Buka
9595
DUP_ACT_OVERWRITE=Timpa
96-
SETTINGS_FOLDER=Folder unduhan default
96+
SETTINGS_FOLDER=Folder unduhan baku
9797
SETTINGS_FOLDER_CHANGE=Ubah
9898
SETTINGS_MONITORING=Monitor browser
9999
SETTINGS_NETWORK=Pengaturan jaringan
@@ -156,7 +156,7 @@ MSG_Q_START=Mulai antrian pada
156156
MSG_Q_STOP=Hentikan antrian pada
157157
MSQ_Q_ONETIME=Sekali pada
158158
MSG_Q_DAILY=Harian
159-
MSG_Q_D1=Ahad
159+
MSG_Q_D1=Minggu
160160
MSG_Q_D2=Senin
161161
MSG_Q_D3=Selasa
162162
MSG_Q_D4=Rabu
@@ -167,16 +167,16 @@ MSG_Q_D7=Sabtu
167167
MSG_MAX_DOWNLOAD=Unduhan simultan maksimal
168168

169169
DESC_ADV_TITLE=Pengaturan lanjutan
170-
MSG_HALT=Shutdown komputer setelah semua unduhan selesai
171-
MSG_AWAKE=Cegah hibernate atau sleep ketika mengunduh
170+
MSG_HALT=Matikan komputer setelah semua unduhan selesai
171+
MSG_AWAKE=Cegah hibernasi atau mode siaga ketika mengunduh
172172
EXEC_CMD=Jalankan program setelah semua unduhan selesai
173-
EXE_ANTI_VIR=Scan berkas dengan antivirus setelah diunduh
174-
ANTIVIR_CMD=Antivirus executable
173+
EXE_ANTI_VIR=Pindai berkas dengan antivirus setelah diunduh
174+
ANTIVIR_CMD=Letak Program antivirus
175175
ANTIVIR_ARGS=Parameter baris perintah
176176
AUTO_START=Jalankan XDM ketika sistem dimulai
177-
MSG_SPEED_LIMIT=Batas kecepatan unduh [KB/Sec ](0 unlimited)
177+
MSG_SPEED_LIMIT=Batas kecepatan unduh [KB/dtk ](0 tanpa batas)
178178
SPEED_LIMIT_TITLE=Batas kecepatan
179-
DEF_QUEUE=Antrian default
179+
DEF_QUEUE=Antrian standar
180180
Q_LIST_DESC=Antrian
181181
Q_LIST_FILES=Berkas di antrian
182182
Q_SCHEDULE_TXT=Jadwal
@@ -210,7 +210,7 @@ PROP_DATE=Tanggal
210210
PROP_TYPE=Tipe
211211
PROP_REFERER=Rujukan
212212
PROP_COOKIE=Kuki
213-
REF_TITLE=SEGARKAN LINK
213+
REF_TITLE=SEGARKAN TAUTAN
214214
REF_DESC1=Silahkan buka halaman web di browser, dimana link unduhan ditemukan. Jika video streaming, silahkan putar video dan pilih format yang sama.
215215
REF_DESC2=Silahkan tekan tombol dibawah dan pilih format video yang sama kembali.
216216
REF_OPEN_PAGE=Buka halaman web
@@ -228,7 +228,7 @@ OPT_UPDATE_FFMPEG=Perbarui komponen
228228
LBL_COMPONENT_MISSING=XDM memerlukan komponen tambahan agar berfungsi dengan maksimal
229229
LBL_COMPONENT_DESC=Diperlukan unduhan sekitar 14MB
230230
LBL_COMPONENT_OUTDATED=Perbarui komponen XDM
231-
LBL_APP_OUTDATED=Tersedia versi terbaru XDM
231+
LBL_APP_OUTDATED=Versi terbaru XDM tersedia
232232
LBL_UPDATE_DESC=Silahkan perbarui XDM untuk meningkatkan fungsionalitas
233233
LBL_INSTALL_NOW=Pasang Sekarang
234234
LBL_CONV_FAILED=Konversi Gagal
@@ -239,15 +239,15 @@ PROMPT_PROXY=Proxy memerlukan nama pengguna dan kata sandi
239239
BTN_BROWSE=Jelajah
240240
TITLE_ABOUT=TENTANG XDM
241241
FULL_NAME=Xtreme Download Manager
242-
ABOUT_DETAILS=Versi aplikasi %s dengan runtime %s pada %s\n\nDibuat oleh: Subhra Das Gupta\n\n%s\nCopyright (C) 2018, All rights reserved.
242+
ABOUT_DETAILS=Versi aplikasi %s dengan runtime %s pada %s\n\nDibuat oleh: Subhra Das Gupta\n\n%s\nHak cipta (C) 2018, Hak cipta dilindungi.
243243
BTN_SEARCH_VIDEO=Temukan
244244
BTN_DOWNLOAD_NOW=Unduh sekarang
245245
BTN_DOWNLOAD_LATER=Unduh nanti
246246
BTN_STOP_PROCESSING=Hentikan
247247
BTN_BACK=Kembali
248248
MSG_REF_LINK_CONFIRM=KONFIRMASI
249249
MSG_REF_LINK_MSG=Link unduhan baru telah diterima
250-
MSG_REF_LINK_QUESTION=Link unduhan baru ditemukan, gunakan link ini?
250+
MSG_REF_LINK_QUESTION=Link unduhan baru ditemukan, gunakan alamat ini?
251251
TITLE_DOWN_VID=UNDUH VIDEO
252252
THEME_EDITOR=Editor Tema
253253
MSG_ADDON_TITLE=PASANG ADDON
@@ -277,7 +277,7 @@ LBL_QUEUE_OPT1=Buat antrian baru
277277
LBL_QUEUE_OPT2=Tambahkan ke antrian yang ada
278278
LBL_QUEUE_OPT3=Jangan gunakan antrian
279279
LBL_NEW_QUEUE=Nama
280-
LBL_CONVERT_TO=Konvert ke
280+
LBL_CONVERT_TO=Konversi ke
281281
LBL_OUTPUT_FOLDER=Folder keluaran
282282
LBL_LOADING=Memuat %s
283283
LBL_FILE_CONVERT_PRG=Sedang mengkonversi %s
@@ -299,35 +299,35 @@ LBL_SELECT_ALL=Pilih semua
299299
LBL_NOT_A_VIDEO=Unduhan bukan video atau tidak dapat dipratinjau. Apakah anda ingin melihat bagian-bagian berkas yang diunduh?
300300
LBL_TRANSLATED_BY=Subhra Das Gupta
301301
LBL_BATCH_EMPTY_CLIPBOARD=Clipboard kosong
302-
LBL_REPORT_PROBLEM=Laporkan bug
303-
LBL_LIKE_ON_FB=Like on Facebook
302+
LBL_REPORT_PROBLEM=Laporkan kutu
303+
LBL_LIKE_ON_FB=Sukai di Facebook
304304
LBL_SUPPORT_PAGE=Halaman dukungan
305305
LBL_OPTIMIZE_NETWORK=Optimalisasi jaringan
306306
LBL_NET_OPT_MSG=Pilih tipe jaringan anda
307307
LBL_NET_OPT_DEF=Default sistem
308-
LBL_NET_OPT_64=Kecepatan rendah: Dial Up modem / ISDN / Bluetooth / Mobile Edge / IrDA
309-
LBL_NET_OPT_128=Kecepatan sedang: ADSL / DSL / Mobile 3G / Wi-Fi / Bluetooth 3.0 / lainnya
310-
LBL_NET_OPT_256=kecepatan tinggi: Koneksi langsung (Ethernet/Cable) / Wi-Fi / Mobile 4G / lainnya
308+
LBL_NET_OPT_64=Kecepatan rendah: modem Dial Up / ISDN / Bluetooth / Jaringan Edge / Inframerah
309+
LBL_NET_OPT_128=Kecepatan sedang: ADSL / DSL / Jaringan 3G / Wi-Fi / Bluetooth 3.0 / lainnya
310+
LBL_NET_OPT_256=kecepatan tinggi: Koneksi langsung (Ethernet/Kabel) / Wi-Fi / Jaringan 4G / lainnya
311311
LBL_TRANSLATE=Terjemahkan XDM
312312
LBL_TWITTER_PAGE=XDM on Twitter
313-
LBL_GET_TIMESTAMP=Dapatkan timestamp dari server
313+
LBL_GET_TIMESTAMP=Dapatkan waktu dari server
314314
LBL_TRANSPARENCY=Jangan gunakan transparansi
315-
LBL_FORCE_FOLDER=Download all files to a single folder
316-
LBL_SHOW_TRAY=Show tray icon (needs restart)
317-
MENU_CLIP_ADD_MENU=Add from clipboard
318-
LBL_BATCH_DESC=Download a group of sequential files using asterisk wild card (example http://xdman.sourceforge.net/images/edge*.png)
319-
LBL_BATCH_ASTERISK=Replace asterisk with
320-
LBL_BATCH_LETTER=Letters
321-
LBL_BATCH_NUM=Numbers
322-
LBL_BATCH_FROM=From
323-
LBL_BATCH_TO=To
315+
LBL_FORCE_FOLDER=Unduh semua berkas kedalam satu folder
316+
LBL_SHOW_TRAY=Tampilkan di ikon baki (needs restart)
317+
MENU_CLIP_ADD_MENU=Tambah dari papan klip
318+
LBL_BATCH_DESC=Unduh berkas secara spesifik menggunakan tanda asterisk (contoh http://xdman.sourceforge.net/images/edge*.png)
319+
LBL_BATCH_ASTERISK=Ganti simbol asterisk dengan
320+
LBL_BATCH_LETTER=Huruf
321+
LBL_BATCH_NUM=Angka
322+
LBL_BATCH_FROM=Dari
323+
LBL_BATCH_TO=Ke
324324
LBL_BATCH_WILDCARD_SIZE=Wildcard size
325-
LBL_BATCH_CHK_AUTH=Use authorization
326-
LBL_BATCH_LOGIN_DET=Login
327-
LBL_BATCH_FILE1=First file
328-
LBL_BATCH_FILE2=Second file
329-
LBL_BATCH_FILEN=Last file
330-
LBL_SHOW_PROGRESS=Show progress
331-
LBL_FILE_TYPE=File type
332-
LBL_ALL_QUEUE=All queues
333-
LBL_SHOW_VIDEO_ONLY_IN_BROWSER=Disable floating 'DOWNLOAD VIDEO' popup
325+
LBL_BATCH_CHK_AUTH=Menggunakan otorisasi
326+
LBL_BATCH_LOGIN_DET=Log masuk
327+
LBL_BATCH_FILE1=Berkas pertama
328+
LBL_BATCH_FILE2=Berkas kedua
329+
LBL_BATCH_FILEN=Berkas terakhir
330+
LBL_SHOW_PROGRESS=Lihat proses
331+
LBL_FILE_TYPE=Tipe berkas
332+
LBL_ALL_QUEUE=Semua antrian
333+
LBL_SHOW_VIDEO_ONLY_IN_BROWSER=Nonaktifkan pesan 'UNDUH VIDEO'

app/src/main/resources/lang/map

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ zh-tw=Chinese Traditional (繁體中文)
2121
ml=Malayalam
2222
tw=Traditional Chinese - Taiwan (繁體中文(台灣))
2323
np=Nepali
24-
hu=Hungarian
24+
hu=Hungarian
25+
uk_UA=Ukrainian(Українська)

0 commit comments

Comments
 (0)