mirror of
https://invent.kde.org/multimedia/kdenlive
synced 2025-12-05 15:59:59 +01:00
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"
This commit is contained in:
@@ -50,7 +50,6 @@ Comment[tok]=ilo Kdenlive
|
||||
Comment[tr]=Kdenlive
|
||||
Comment[ug]=Kdenlive
|
||||
Comment[uk]=Kdenlive
|
||||
Comment[x-test]=xxKdenlivexx
|
||||
Comment[zh_CN]=Kdenlive
|
||||
Comment[zh_TW]=Kdenlive
|
||||
|
||||
@@ -100,7 +99,6 @@ Name[sv]=Återgivning klar
|
||||
Name[tok]=pali li pini
|
||||
Name[tr]=Sunum tamamlandı
|
||||
Name[uk]=Обробку завершено
|
||||
Name[x-test]=xxRendering finishedxx
|
||||
Name[zh_CN]=导出任务已完成
|
||||
Name[zh_TW]=已完成輸出
|
||||
Comment=Rendering is over
|
||||
@@ -148,7 +146,6 @@ Comment[sv]=Återgivningen är gjord
|
||||
Comment[tok]=pali li pini
|
||||
Comment[tr]=Sunum bitti
|
||||
Comment[uk]=Виконання обробки завершено
|
||||
Comment[x-test]=xxRendering is overxx
|
||||
Comment[zh_CN]=导出任务已完成
|
||||
Comment[zh_TW]=輸出已結束
|
||||
Action=Popup
|
||||
@@ -199,7 +196,6 @@ Name[sv]=Återgivning startad
|
||||
Name[tok]=pali li open
|
||||
Name[tr]=Sunum başladı
|
||||
Name[uk]=Обробку розпочато
|
||||
Name[x-test]=xxRendering startedxx
|
||||
Name[zh_CN]=导出任务已开始
|
||||
Name[zh_TW]=輸出已開始
|
||||
Comment=Rendering was started
|
||||
@@ -247,7 +243,6 @@ Comment[sv]=Återgivningen har startats
|
||||
Comment[tok]=pali li open
|
||||
Comment[tr]=Sunum başlatıldı
|
||||
Comment[uk]=Було розпочато обробку
|
||||
Comment[x-test]=xxRendering was startedxx
|
||||
Comment[zh_CN]=导出任务已开始
|
||||
Comment[zh_TW]=輸出已開始
|
||||
Action=Popup
|
||||
@@ -298,7 +293,6 @@ Name[sv]=Ram lagrad
|
||||
Name[tok]=sitelen li awen
|
||||
Name[tr]=Kare yakalandı
|
||||
Name[uk]=Захоплено кадр
|
||||
Name[x-test]=xxFrame capturedxx
|
||||
Name[zh_CN]=已捕获帧
|
||||
Name[zh_TW]=影格已擷取
|
||||
Comment=A frame was captured to disk
|
||||
@@ -346,7 +340,6 @@ Comment[sv]=En ram har lagrats på disk
|
||||
Comment[tok]=sitelen li awen lon ilo lipu
|
||||
Comment[tr]=Bir kare diske yakalandı
|
||||
Comment[uk]=Було захоплено кадр, програма зберегла його на диску
|
||||
Comment[x-test]=xxA frame was captured to diskxx
|
||||
Comment[zh_CN]=一帧图像已被捕获到存储设备
|
||||
Comment[zh_TW]=已擷取一個影格到磁碟中
|
||||
Sound=Oxygen-Sys-App-Message.ogg
|
||||
@@ -398,7 +391,6 @@ Name[sv]=Klar att lagra
|
||||
Name[tok]=ilo li ken sitelen
|
||||
Name[tr]=Yakalamak için hazır
|
||||
Name[uk]=Приготовано до захоплення
|
||||
Name[x-test]=xxReady to capturexx
|
||||
Name[zh_CN]=准备捕获
|
||||
Name[zh_TW]=準備擷取
|
||||
Sound=Oxygen-Sys-App-Positive.ogg
|
||||
@@ -454,7 +446,6 @@ Name[tok]=ilo Kdenlive li pali pakala
|
||||
Name[tr]=Hata
|
||||
Name[ug]=خاتالىق
|
||||
Name[uk]=Помилка
|
||||
Name[x-test]=xxErrorxx
|
||||
Name[zh_CN]=错误
|
||||
Name[zh_TW]=錯誤
|
||||
Comment=An error occurred in Kdenlive
|
||||
@@ -503,7 +494,6 @@ Comment[sv]=Ett fel uppstod i Kdenlive
|
||||
Comment[tok]=ijo ike li kama lon ilo Kdenlive
|
||||
Comment[tr]=Kdenlive içinde bir hata oluştu
|
||||
Comment[uk]=У коді Kdenlive сталася помилка
|
||||
Comment[x-test]=xxAn error occurred in Kdenlivexx
|
||||
Comment[zh_CN]=Kdenlive 发生错误
|
||||
Comment[zh_TW]=Kdenlive 中發生錯誤
|
||||
Sound=Oxygen-Sys-Warning.ogg
|
||||
@@ -539,7 +529,6 @@ Name[sv]=Spara lyckades
|
||||
Name[tok]=awen li pona
|
||||
Name[tr]=Kaydetme başarılı
|
||||
Name[uk]=Успішно збережено
|
||||
Name[x-test]=xxSaving successfulxx
|
||||
Name[zh_CN]=保存成功
|
||||
Name[zh_TW]=成功儲存
|
||||
Sound=Oxygen-Sys-App-Positive.ogg
|
||||
|
||||
@@ -50,7 +50,6 @@ Comment[tok]=ilo Kdenlive
|
||||
Comment[tr]=Kdenlive
|
||||
Comment[ug]=Kdenlive
|
||||
Comment[uk]=Kdenlive
|
||||
Comment[x-test]=xxKdenlivexx
|
||||
Comment[zh_CN]=Kdenlive
|
||||
Comment[zh_TW]=Kdenlive
|
||||
|
||||
@@ -100,7 +99,6 @@ Name[sv]=Återgivning klar
|
||||
Name[tok]=pali li pini
|
||||
Name[tr]=Sunum tamamlandı
|
||||
Name[uk]=Обробку завершено
|
||||
Name[x-test]=xxRendering finishedxx
|
||||
Name[zh_CN]=导出任务已完成
|
||||
Name[zh_TW]=已完成輸出
|
||||
Comment=Rendering is over
|
||||
@@ -148,7 +146,6 @@ Comment[sv]=Återgivningen är gjord
|
||||
Comment[tok]=pali li pini
|
||||
Comment[tr]=Sunum bitti
|
||||
Comment[uk]=Виконання обробки завершено
|
||||
Comment[x-test]=xxRendering is overxx
|
||||
Comment[zh_CN]=导出任务已完成
|
||||
Comment[zh_TW]=輸出已結束
|
||||
Action=Popup
|
||||
@@ -199,7 +196,6 @@ Name[sv]=Återgivning startad
|
||||
Name[tok]=pali li open
|
||||
Name[tr]=Sunum başladı
|
||||
Name[uk]=Обробку розпочато
|
||||
Name[x-test]=xxRendering startedxx
|
||||
Name[zh_CN]=导出任务已开始
|
||||
Name[zh_TW]=輸出已開始
|
||||
Comment=Rendering was started
|
||||
@@ -247,7 +243,6 @@ Comment[sv]=Återgivningen har startats
|
||||
Comment[tok]=pali li open
|
||||
Comment[tr]=Sunum başlatıldı
|
||||
Comment[uk]=Було розпочато обробку
|
||||
Comment[x-test]=xxRendering was startedxx
|
||||
Comment[zh_CN]=导出任务已开始
|
||||
Comment[zh_TW]=輸出已開始
|
||||
Action=Popup
|
||||
@@ -298,7 +293,6 @@ Name[sv]=Ram lagrad
|
||||
Name[tok]=sitelen li awen
|
||||
Name[tr]=Kare yakalandı
|
||||
Name[uk]=Захоплено кадр
|
||||
Name[x-test]=xxFrame capturedxx
|
||||
Name[zh_CN]=已捕获帧
|
||||
Name[zh_TW]=影格已擷取
|
||||
Comment=A frame was captured to disk
|
||||
@@ -346,7 +340,6 @@ Comment[sv]=En ram har lagrats på disk
|
||||
Comment[tok]=sitelen li awen lon ilo lipu
|
||||
Comment[tr]=Bir kare diske yakalandı
|
||||
Comment[uk]=Було захоплено кадр, програма зберегла його на диску
|
||||
Comment[x-test]=xxA frame was captured to diskxx
|
||||
Comment[zh_CN]=一帧图像已被捕获到存储设备
|
||||
Comment[zh_TW]=已擷取一個影格到磁碟中
|
||||
Sound=camera-shutter
|
||||
@@ -398,7 +391,6 @@ Name[sv]=Klar att lagra
|
||||
Name[tok]=ilo li ken sitelen
|
||||
Name[tr]=Yakalamak için hazır
|
||||
Name[uk]=Приготовано до захоплення
|
||||
Name[x-test]=xxReady to capturexx
|
||||
Name[zh_CN]=准备捕获
|
||||
Name[zh_TW]=準備擷取
|
||||
Sound=dialog-information
|
||||
@@ -454,7 +446,6 @@ Name[tok]=ilo Kdenlive li pali pakala
|
||||
Name[tr]=Hata
|
||||
Name[ug]=خاتالىق
|
||||
Name[uk]=Помилка
|
||||
Name[x-test]=xxErrorxx
|
||||
Name[zh_CN]=错误
|
||||
Name[zh_TW]=錯誤
|
||||
Comment=An error occurred in Kdenlive
|
||||
@@ -503,7 +494,6 @@ Comment[sv]=Ett fel uppstod i Kdenlive
|
||||
Comment[tok]=ijo ike li kama lon ilo Kdenlive
|
||||
Comment[tr]=Kdenlive içinde bir hata oluştu
|
||||
Comment[uk]=У коді Kdenlive сталася помилка
|
||||
Comment[x-test]=xxAn error occurred in Kdenlivexx
|
||||
Comment[zh_CN]=Kdenlive 发生错误
|
||||
Comment[zh_TW]=Kdenlive 中發生錯誤
|
||||
Sound=dialog-error
|
||||
@@ -539,7 +529,6 @@ Name[sv]=Spara lyckades
|
||||
Name[tok]=awen li pona
|
||||
Name[tr]=Kaydetme başarılı
|
||||
Name[uk]=Успішно збережено
|
||||
Name[x-test]=xxSaving successfulxx
|
||||
Name[zh_CN]=保存成功
|
||||
Name[zh_TW]=成功儲存
|
||||
Sound=outcome-success
|
||||
|
||||
@@ -33,7 +33,6 @@ Name[sv]=Kdenlive-effektmallar
|
||||
Name[tok]=lipu sitelen pi ilo Kdenlive
|
||||
Name[tr]=Kdenlive Efekt Şablonları
|
||||
Name[uk]=Шаблони ефектів Kdenlive
|
||||
Name[x-test]=xxKdenlive Effect Templatesxx
|
||||
Name[zh_CN]=Kdenlive 效果模板
|
||||
Name[zh_TW]=Kdenlive 效果範本
|
||||
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
|
||||
|
||||
@@ -38,7 +38,6 @@ Name[sv]=Kdenlive-tangentbordsinställningar
|
||||
Name[tok]=lipu ilo sitelen pi ilo Kdenlive
|
||||
Name[tr]=Kdenlive Klavye Şemaları
|
||||
Name[uk]=Схеми клавіатурних скорочень Kdenlive
|
||||
Name[x-test]=xxKdenlive Keyboard Schemesxx
|
||||
Name[zh_CN]=Kdenlive 键盘配置方案
|
||||
Name[zh_TW]=Kdenlive 鍵盤機制
|
||||
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
|
||||
|
||||
@@ -33,7 +33,6 @@ Name[sv]=Färguppslagningstabell (LUT)
|
||||
Name[tok]=lipu kule (LUT)
|
||||
Name[tr]=Renk Seçim Tablosu (LUT)
|
||||
Name[uk]=Таблиця пошуку кольорів (LUT)
|
||||
Name[x-test]=xxColor Lookup Table (LUT)xx
|
||||
Name[zh_CN]=颜色查找表 (LUT)
|
||||
Name[zh_TW]=顏色查詢表 (LUT)
|
||||
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
|
||||
|
||||
@@ -38,7 +38,6 @@ Name[sv]=Kdenlive-återgivningsprofiler
|
||||
Name[tok]=lipu sitelen pali pi ilo Kdenlive
|
||||
Name[tr]=Kdenlive Sunum Profilleri
|
||||
Name[uk]=Профілі обробки Kdenlive
|
||||
Name[x-test]=xxKdenlive Render Profilesxx
|
||||
Name[zh_CN]=Kdenlive 导出配置
|
||||
Name[zh_TW]=Kdenlive 繪製設定檔
|
||||
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
|
||||
|
||||
@@ -38,7 +38,6 @@ Name[sv]=Kdenlive-titelmallar
|
||||
Name[tok]=lipu nimi pi ilo Kdenlive
|
||||
Name[tr]=Kdenlive Başlık Şablonları
|
||||
Name[uk]=Шаблони титрів Kdenlive
|
||||
Name[x-test]=xxKdenlive Title Templatesxx
|
||||
Name[zh_CN]=Kdenlive 标题模板
|
||||
Name[zh_TW]=Kdenlive 標題範本
|
||||
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
|
||||
|
||||
@@ -38,7 +38,6 @@ Name[sv]=Kdenlive-övergångar
|
||||
Name[tok]=kama ante pi ilo Kdenlive
|
||||
Name[tr]=Kdenlive Geçiş Ekranları
|
||||
Name[uk]=Перехідні витирання Kdenlive
|
||||
Name[x-test]=xxKdenlive Transition Wipesxx
|
||||
Name[zh_CN]=Kdenlive 转场消除方案
|
||||
Name[zh_TW]=Kdenlive 過渡 Wipes
|
||||
ProvidersUrl=https://autoconfig.kde.org/ocs/providers.xml
|
||||
|
||||
@@ -49,7 +49,6 @@ Name[tok]=ilo Kdenlive
|
||||
Name[tr]=Kdenlive
|
||||
Name[ug]=Kdenlive
|
||||
Name[uk]=Kdenlive
|
||||
Name[x-test]=xxKdenlivexx
|
||||
Name[zh_CN]=Kdenlive
|
||||
Name[zh_TW]=Kdenlive
|
||||
GenericName=Video Editor
|
||||
@@ -98,7 +97,6 @@ GenericName[sv]=Videoeditor
|
||||
GenericName[tok]=ilo pi ante sitelen
|
||||
GenericName[tr]=Video Düzenleyicisi
|
||||
GenericName[uk]=Відеоредактор
|
||||
GenericName[x-test]=xxVideo Editorxx
|
||||
GenericName[zh_CN]=视频编辑工具
|
||||
GenericName[zh_TW]=影片編輯器
|
||||
Comment=Nonlinear video editor by KDE
|
||||
@@ -140,7 +138,6 @@ Comment[sv]=Icke-linjär videoeditor av KDE
|
||||
Comment[tok]=ilo pi ante sitelen tan kulupu KDE
|
||||
Comment[tr]=Doğrusal Olmayan Video Düzenleyicisi
|
||||
Comment[uk]=Нелінійний редактор відео від KDE
|
||||
Comment[x-test]=xxNonlinear video editor by KDExx
|
||||
Comment[zh_CN]=KDE 社区开发的非线性视频编辑工具
|
||||
Comment[zh_TW]=來自 KDE 的非線性影片編輯器
|
||||
Type=Application
|
||||
@@ -189,7 +186,6 @@ Keywords[sv]=redigering;video;ljud;mlt;kde;
|
||||
Keywords[tok]=ante;sitelen;kalama;mlt;kde;
|
||||
Keywords[tr]=editing;video;audio;mlt;kde;
|
||||
Keywords[uk]=editing;video;audio;mlt;kde;редагування;відео;звук;аудіо;млт;кдє;
|
||||
Keywords[x-test]=xxeditingxx;xxvideoxx;xxaudioxx;xxmltxx;xxkdexx;
|
||||
Keywords[zh_CN]=editing;video;audio;mlt;kde;编辑;剪辑;非编;视频;音频;bianji;jianji;feibian;shipin;yinpin;
|
||||
Keywords[zh_TW]=editing;video;audio;mlt;kde;影片;影像;編輯;剪輯;
|
||||
X-DBUS-ServiceName=org.kde.kdenlive
|
||||
|
||||
Reference in New Issue
Block a user