Merge branch 'master' of https://git.iwi.me/npp/notepad-plus-plus
Conflicts: PowerEditor/bin/updater/GUP.exe PowerEditor/installer/nativeLang/bengali.xml PowerEditor/installer/nativeLang/hungarian.xml
This commit is contained in:
commit
7e61afffb8
Binary file not shown.
@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!--
|
<!--
|
||||||
::Arabic language file for Notepad++ ::
|
::Arabic language file for Notepad++ ::
|
||||||
|
|
||||||
@ -276,7 +276,7 @@
|
|||||||
<Item id="48006" name="আমদানি (আমদানি) থিম ..."/>
|
<Item id="48006" name="আমদানি (আমদানি) থিম ..."/>
|
||||||
<Item id="48018" name="সম্পাদনা করুন পপআপ"/>
|
<Item id="48018" name="সম্পাদনা করুন পপআপ"/>
|
||||||
<Item id="48009" name="শর্টকাট ম্যাপার ..."/>
|
<Item id="48009" name="শর্টকাট ম্যাপার ..."/>
|
||||||
<Item id="48011" name="পছন্দ..."/>
|
<Item id="48011" name="পছন্দ ..."/>
|
||||||
<Item id="49000" name="&চালান ..."/>
|
<Item id="49000" name="&চালান ..."/>
|
||||||
|
|
||||||
<Item id="50000" name="সম্পূর্ণ ফাংশন"/>
|
<Item id="50000" name="সম্পূর্ণ ফাংশন"/>
|
||||||
|
@ -789,6 +789,15 @@
|
|||||||
<Item id = "6258" name = "bla bla bla bla bla bla bla bla bla bla bla bla"/>
|
<Item id = "6258" name = "bla bla bla bla bla bla bla bla bla bla bla bla"/>
|
||||||
</Delimiter>
|
</Delimiter>
|
||||||
|
|
||||||
|
<Cloud title = "Sky">
|
||||||
|
<Item id = "6262" name = "Indstillinger i skyen"/>
|
||||||
|
<Item id = "6263" name = "Ingen sky"/>
|
||||||
|
<Item id = "6264" name = "Dropbox"/>
|
||||||
|
<Item id = "6265" name = "OneDrive"/>
|
||||||
|
<Item id = "6266" name = "Google Drive"/>
|
||||||
|
<!--Item id="6261" name="Please restart Notepad++ to take effect."/-->
|
||||||
|
</Cloud>
|
||||||
|
|
||||||
<Cloud title = "Sky">
|
<Cloud title = "Sky">
|
||||||
<Item id = "6262" name = "Indstillinger i skyen"/>
|
<Item id = "6262" name = "Indstillinger i skyen"/>
|
||||||
<Item id = "6263" name = "Ingen sky"/>
|
<Item id = "6263" name = "Ingen sky"/>
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user