Commit dd29a6f2 authored by Script Kiddy's avatar Script Kiddy

SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
parent 2c2145ed
......@@ -57,7 +57,7 @@ Name[ug]=ئارقا ئىزلاش كۆرگۈ
Name[uk]=Переглядач зворотного трасування
Name[wa]=Naivieu d' backtraces
Name[x-test]=xxBacktrace Browserxx
Name[zh_CN]=回溯浏览器
Name[zh_CN]=回溯跟踪浏览器
Name[zh_TW]=回溯追蹤瀏覽器
Comment=Backtrace navigation tool view
Comment[ar]=منظور أداة للتّنقّل في التّتبّع الخلفيّ
......
......@@ -41,7 +41,7 @@ Name[sv]=Dokument
Name[tr]=Belgeler
Name[uk]=Документи
Name[x-test]=xxDocumentsxx
Name[zh_CN]=文
Name[zh_CN]=文
Name[zh_TW]=文件
Comment=Displays the open documents in a file tree
Comment[ar]=تعرض المستندات المفتوحة في شجرة ملفّات
......
......@@ -55,7 +55,7 @@ Name[tr]=Ara & Değiştir
Name[ug]=ئىزدەش ۋە ئالماشتۇرۇش
Name[uk]=Пошук з заміною
Name[x-test]=xxSearch & Replacexx
Name[zh_CN]=搜索和替换
Name[zh_CN]=搜索和替换 下拉菜单链接
Name[zh_TW]=搜尋並取代
Comment=Search & replace in opened documents or in files on disk
Comment[ar]=تبحث وتستبدل في الملفّات المفتوحة أو التي على القرص
......
......@@ -58,7 +58,7 @@ Name[ug]=تېكىست سۈزگۈچ
Name[uk]=Фільтр тексту
Name[vi]=Bộ lọc văn bản
Name[x-test]=xxText Filterxx
Name[zh_CN]=文本过滤
Name[zh_CN]=文本过滤
Name[zh_TW]=文字過濾器
Comment=Process text using terminal commands
Comment[ast]=Procesa testos usando comandos de la terminal
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment