# HG changeset patch # User Bram Moolenaar # Date 1554981304 -7200 # Node ID e71261a88630b2d19e46c3d489d5c7cf692b2493 # Parent 93c7e38d74e81f582b099e9f12a960510753d679 patch 8.1.1147: desktop file translations are requiring manual updates commit https://github.com/vim/vim/commit/a60e536a290f7c14cf2b255ddb7071b39619fcd3 Author: Bram Moolenaar Date: Thu Apr 11 13:11:39 2019 +0200 patch 8.1.1147: desktop file translations are requiring manual updates Problem: Desktop file translations are requiring manual updates. Solution: Use the .po files for desktop file translations. (Christian Brabandt) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -56,12 +56,14 @@ If the maintainer does not respond, cont # Translations -Translating messages and runtime files is very much appreciated! These things can be translated: +Translating messages and runtime files is very much appreciated! These things +can be translated: * Messages in Vim, see [src/po/README.txt][1] + Also used for the desktop icons. * Menus, see [runtime/lang/README.txt][2] * Vim tutor, see [runtime/tutor/README.txt][3] * Manual pages, see [runtime/doc/\*.1][4] for examples -* Desktop icon, see [runtime/vim.desktop][5] and [runtime/gvim.desktop][6] +* Installer, see [nsis/lang/\*.nsi][5] for examples The help files can be translated and made available separately. See https://www.vim.org/translations.php for examples. @@ -70,5 +72,4 @@ See https://www.vim.org/translations.php [2]: https://github.com/vim/vim/blob/master/runtime/lang/README.txt [3]: https://github.com/vim/vim/blob/master/runtime/tutor/README.txt [4]: https://github.com/vim/vim/blob/master/runtime/doc/vim.1 -[5]: https://github.com/vim/vim/blob/master/runtime/vim.desktop -[6]: https://github.com/vim/vim/blob/master/runtime/gvim.desktop +[5]: https://github.com/vim/vim/blob/master/nsis/lang/english.nsi diff --git a/Filelist b/Filelist --- a/Filelist +++ b/Filelist @@ -937,6 +937,8 @@ LANG_SRC = \ src/po/Make_cyg.mak \ src/po/Make_ming.mak \ src/po/Make_mvc.mak \ + src/po/vim.desktop.in \ + src/po/gvim.desktop.in \ src/po/sjiscorr.c \ src/po/*.po \ diff --git a/runtime/gvim.desktop b/runtime/gvim.desktop --- a/runtime/gvim.desktop +++ b/runtime/gvim.desktop @@ -1,13 +1,20 @@ +# The gvim.desktop file is generated by src/po/Makefile, do NOT edit. +# Edit the src/po/gvim.desktop.in file instead. [Desktop Entry] -Name=gVim +# Translators: This is the Application Name used in the GVim desktop file +Name=GVim +# Translators: This is the Generic Application Name used in the Vim desktop file GenericName=Text Editor +# Translators: This is the comment used in the Vim desktop file +Comment=Edit text files +# The translations should come from the po file. Leave them here for now, they will +# be overwritten by the po file when generating the desktop.file! GenericName[da]=Teksteditor GenericName[de]=Texteditor GenericName[eo]=Tekstoredaktilo GenericName[fr]=Éditeur de texte GenericName[pl]=Edytor tekstu GenericName[is]=Ritvinnsluforrit -Comment=Edit text files Comment[af]=Redigeer tekslêers Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ Comment[ar]=حرّر ملفات نصية @@ -81,7 +88,9 @@ TryExec=gvim Exec=gvim -f %F Terminal=false Type=Application +# Translators: Search terms to find this application. Do NOT change the semicolons! The list MUST also end with a semicolon! Keywords=Text;editor; +# Translators: This is the Icon file name. Do NOT translate Icon=gvim Categories=Utility;TextEditor; StartupNotify=true diff --git a/runtime/vim.desktop b/runtime/vim.desktop --- a/runtime/vim.desktop +++ b/runtime/vim.desktop @@ -1,11 +1,18 @@ +# The vim.desktop file is generated by src/po/Makefile, do NOT edit. +# Edit the src/po/vim.desktop.in file instead. [Desktop Entry] +# Translators: This is the Application Name used in the Vim desktop file Name=Vim +# Translators: This is the Generic Application Name used in the Vim desktop file GenericName=Text Editor +# Translators: This is the comment used in the Vim desktop file +Comment=Edit text files +# The translations should come from the po file. Leave them here for now, they will +# be overwritten by the po file when generating the desktop.file. GenericName[da]=Teksteditor GenericName[de]=Texteditor GenericName[pl]=Edytor tekstu GenericName[is]=Ritvinnsluforrit -Comment=Edit text files Comment[af]=Redigeer tekslêers Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ Comment[ar]=حرّر ملفات نصية @@ -78,7 +85,9 @@ TryExec=vim Exec=vim %F Terminal=true Type=Application +# Translators: Search terms to find this application. Do NOT change the semicolons! The list MUST also end with a semicolon! Keywords=Text;editor; +# Translators: This is the Icon file name. Do NOT translate Icon=gvim Categories=Utility;TextEditor; StartupNotify=false diff --git a/src/po/Makefile b/src/po/Makefile --- a/src/po/Makefile +++ b/src/po/Makefile @@ -25,6 +25,9 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_ .SUFFIXES: .po .mo .pot .ck .PHONY: all install uninstall prefixcheck converted check clean checkclean distclean update-po $(LANGUAGES) +LINGUAS: + @echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS + .po.mo: $(MSGFMTCMD) -o $@ $< @@ -32,7 +35,7 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_ $(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $< touch $@ -all: $(MOFILES) $(MOCONVERTED) +all: $(MOFILES) $(MOCONVERTED) gvim.desktop vim.desktop check: $(CHECKFILES) @@ -157,12 +160,17 @@ distclean: clean checkclean: rm -f *.ck -$(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_py_both.h ../vim.h +$(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_py_both.h ../vim.h gvim.desktop.in vim.desktop.in cd ..; $(XGETTEXT) --default-domain=$(PACKAGE) \ --add-comments --keyword=_ --keyword=N_ --keyword=NGETTEXT:1,2 \ - *.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h vim.h + *.c if_perl.xs GvimExt/gvimext.cpp globals.h if_py_both.h vim.h \ + po/gvim.desktop.in po/vim.desktop.in mv -f ../$(PACKAGE).po $(PACKAGE).pot +%.desktop: %.desktop.in $(PACKAGE).pot LINGUAS + $(MSGFMT) --desktop -d . --template $< -o $@ + cp -f $@ ../../runtime/$@ + update-po: $(LANGUAGES) # Don't add a dependency here, we only want to update the .po files manually diff --git a/src/po/gvim.desktop.in b/src/po/gvim.desktop.in new file mode 100644 --- /dev/null +++ b/src/po/gvim.desktop.in @@ -0,0 +1,97 @@ +# The gvim.desktop file is generated by src/po/Makefile, do NOT edit. +# Edit the src/po/gvim.desktop.in file instead. +[Desktop Entry] +# Translators: This is the Application Name used in the GVim desktop file +Name=GVim +# Translators: This is the Generic Application Name used in the Vim desktop file +GenericName=Text Editor +# Translators: This is the comment used in the Vim desktop file +Comment=Edit text files +# The translations should come from the po file. Leave them here for now, they will +# be overwritten by the po file when generating the desktop.file! +GenericName[da]=Teksteditor +GenericName[de]=Texteditor +GenericName[eo]=Tekstoredaktilo +GenericName[fr]=Éditeur de texte +GenericName[pl]=Edytor tekstu +GenericName[is]=Ritvinnsluforrit +Comment[af]=Redigeer tekslêers +Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ +Comment[ar]=حرّر ملفات نصية +Comment[az]=Mətn fayllarını redaktə edin +Comment[be]=Рэдагаваньне тэкставых файлаў +Comment[bg]=Редактиране на текстови файлове +Comment[bn]=টেক্স্ট ফাইল এডিট করুন +Comment[bs]=Izmijeni tekstualne datoteke +Comment[ca]=Edita fitxers de text +Comment[cs]=Úprava textových souborů +Comment[cy]=Golygu ffeiliau testun +Comment[da]=Rediger tekstfiler +Comment[de]=Textdateien bearbeiten +Comment[el]=Επεξεργασία αρχείων κειμένου +Comment[en_CA]=Edit text files +Comment[en_GB]=Edit text files +Comment[eo]=Redakti tekstajn dosierojn +Comment[es]=Edita archivos de texto +Comment[et]=Redigeeri tekstifaile +Comment[eu]=Editatu testu-fitxategiak +Comment[fa]=ویرایش پرونده‌های متنی +Comment[fi]=Muokkaa tekstitiedostoja +Comment[fr]=Éditer des fichiers textes +Comment[ga]=Eagar comhad Téacs +Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો +Comment[he]=ערוך קבצי טקסט +Comment[hi]=पाठ फ़ाइलें संपादित करें +Comment[hr]=Uređivanje tekstualne datoteke +Comment[hu]=Szövegfájlok szerkesztése +Comment[id]=Edit file teks +Comment[is]=Vinna með textaskrár +Comment[it]=Modifica file di testo +Comment[ja]=テキストファイルを編集します +Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು +Comment[ko]=텍스트 파일을 편집합니다 +Comment[lt]=Redaguoti tekstines bylas +Comment[lv]=Rediģēt teksta failus +Comment[mk]=Уреди текстуални фајлови +Comment[ml]=വാചക രചനകള് തിരുത്തുക +Comment[mn]=Текст файл боловсруулах +Comment[mr]=गद्य फाइल संपादित करा +Comment[ms]=Edit fail teks +Comment[nb]=Rediger tekstfiler +Comment[ne]=पाठ फाइललाई संशोधन गर्नुहोस् +Comment[nl]=Tekstbestanden bewerken +Comment[nn]=Rediger tekstfiler +Comment[no]=Rediger tekstfiler +Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ +Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ +Comment[pl]=Edytuj pliki tekstowe +Comment[pt]=Editar ficheiros de texto +Comment[pt_BR]=Edite arquivos de texto +Comment[ro]=Editare fişiere text +Comment[ru]=Редактор текстовых файлов +Comment[sk]=Úprava textových súborov +Comment[sl]=Urejanje datotek z besedili +Comment[sq]=Përpuno files teksti +Comment[sr]=Измени текстуалне датотеке +Comment[sr@Latn]=Izmeni tekstualne datoteke +Comment[sv]=Redigera textfiler +Comment[ta]=உரை கோப்புகளை தொகுக்கவும் +Comment[th]=แก้ไขแฟ้มข้อความ +Comment[tk]=Metin faýllary editle +Comment[tr]=Metin dosyalarını düzenle +Comment[uk]=Редактор текстових файлів +Comment[vi]=Soạn thảo tập tin văn bản +Comment[wa]=Asspougnî des fitchîs tecses +Comment[zh_CN]=编辑文本文件 +Comment[zh_TW]=編輯文字檔 +TryExec=gvim +Exec=gvim -f %F +Terminal=false +Type=Application +# Translators: Search terms to find this application. Do NOT change the semicolons! The list MUST also end with a semicolon! +Keywords=Text;editor; +# Translators: This is the Icon file name. Do NOT translate +Icon=gvim +Categories=Utility;TextEditor; +StartupNotify=true +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; diff --git a/src/po/vim.desktop.in b/src/po/vim.desktop.in new file mode 100644 --- /dev/null +++ b/src/po/vim.desktop.in @@ -0,0 +1,94 @@ +# The vim.desktop file is generated by src/po/Makefile, do NOT edit. +# Edit the src/po/vim.desktop.in file instead. +[Desktop Entry] +# Translators: This is the Application Name used in the Vim desktop file +Name=Vim +# Translators: This is the Generic Application Name used in the Vim desktop file +GenericName=Text Editor +# Translators: This is the comment used in the Vim desktop file +Comment=Edit text files +# The translations should come from the po file. Leave them here for now, they will +# be overwritten by the po file when generating the desktop.file. +GenericName[da]=Teksteditor +GenericName[de]=Texteditor +GenericName[pl]=Edytor tekstu +GenericName[is]=Ritvinnsluforrit +Comment[af]=Redigeer tekslêers +Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ +Comment[ar]=حرّر ملفات نصية +Comment[az]=Mətn fayllarını redaktə edin +Comment[be]=Рэдагаваньне тэкставых файлаў +Comment[bg]=Редактиране на текстови файлове +Comment[bn]=টেক্স্ট ফাইল এডিট করুন +Comment[bs]=Izmijeni tekstualne datoteke +Comment[ca]=Edita fitxers de text +Comment[cs]=Úprava textových souborů +Comment[cy]=Golygu ffeiliau testun +Comment[da]=Rediger tekstfiler +Comment[de]=Textdateien bearbeiten +Comment[el]=Επεξεργασία αρχείων κειμένου +Comment[en_CA]=Edit text files +Comment[en_GB]=Edit text files +Comment[es]=Edita archivos de texto +Comment[et]=Redigeeri tekstifaile +Comment[eu]=Editatu testu-fitxategiak +Comment[fa]=ویرایش پرونده‌های متنی +Comment[fi]=Muokkaa tekstitiedostoja +Comment[fr]=Édite des fichiers texte +Comment[ga]=Eagar comhad Téacs +Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો +Comment[he]=ערוך קבצי טקסט +Comment[hi]=पाठ फ़ाइलें संपादित करें +Comment[hr]=Uređivanje tekstualne datoteke +Comment[hu]=Szövegfájlok szerkesztése +Comment[id]=Edit file teks +Comment[is]=Vinna með textaskrár +Comment[it]=Modifica file di testo +Comment[ja]=テキストファイルを編集します +Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು +Comment[ko]=텍스트 파일을 편집합니다 +Comment[lt]=Redaguoti tekstines bylas +Comment[lv]=Rediģēt teksta failus +Comment[mk]=Уреди текстуални фајлови +Comment[ml]=വാചക രചനകള് തിരുത്തുക +Comment[mn]=Текст файл боловсруулах +Comment[mr]=गद्य फाइल संपादित करा +Comment[ms]=Edit fail teks +Comment[nb]=Rediger tekstfiler +Comment[ne]=पाठ फाइललाई संशोधन गर्नुहोस् +Comment[nl]=Tekstbestanden bewerken +Comment[nn]=Rediger tekstfiler +Comment[no]=Rediger tekstfiler +Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ +Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ +Comment[pl]=Edytuj pliki tekstowe +Comment[pt]=Editar ficheiros de texto +Comment[pt_BR]=Edite arquivos de texto +Comment[ro]=Editare fişiere text +Comment[ru]=Редактор текстовых файлов +Comment[sk]=Úprava textových súborov +Comment[sl]=Urejanje datotek z besedili +Comment[sq]=Përpuno files teksti +Comment[sr]=Измени текстуалне датотеке +Comment[sr@Latn]=Izmeni tekstualne datoteke +Comment[sv]=Redigera textfiler +Comment[ta]=உரை கோப்புகளை தொகுக்கவும் +Comment[th]=แก้ไขแฟ้มข้อความ +Comment[tk]=Metin faýllary editle +Comment[tr]=Metin dosyalarını düzenle +Comment[uk]=Редактор текстових файлів +Comment[vi]=Soạn thảo tập tin văn bản +Comment[wa]=Asspougnî des fitchîs tecses +Comment[zh_CN]=编辑文本文件 +Comment[zh_TW]=編輯文字檔 +TryExec=vim +Exec=vim %F +Terminal=true +Type=Application +# Translators: Search terms to find this application. Do NOT change the semicolons! The list MUST also end with a semicolon! +Keywords=Text;editor; +# Translators: This is the Icon file name. Do NOT translate +Icon=gvim +Categories=Utility;TextEditor; +StartupNotify=false +MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1147, +/**/ 1146, /**/ 1145,