mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +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:
parent
1fac29ecea
commit
bdfeff5b08
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=AdBlock
|
||||
Name[ar]=آدبلوك
|
||||
Name[az]=AdBlock
|
||||
Name[bg]=AdBlock
|
||||
Name[ca]=AdBlock
|
||||
|
@ -38,6 +39,7 @@ Name[x-test]=xxAdBlockxx
|
|||
Name[zh_CN]=AdBlock
|
||||
Name[zh_TW]=AdBlock
|
||||
Comment=Blocks unwanted web content
|
||||
Comment[ar]=تمنع محتوى الويب غير المرغوب به
|
||||
Comment[az]=Arzuolunmaz veb məzmunu əngəlləyir
|
||||
Comment[bg]=Блокира нежелано уеб съдържание
|
||||
Comment[ca]=Bloqueja el contingut web no desitjat
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=AutoScroll
|
||||
Name[ar]=التمرير التلقائيّ
|
||||
Name[az]=AvtoSürüşmə
|
||||
Name[bg]=Автоматично прелистване
|
||||
Name[ca]=Desplaçament automàtic
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Dictionary
|
||||
Name[ar]=قاموس
|
||||
Name[az]=Lüğət
|
||||
Name[bg]=Речник
|
||||
Name[ca]=Diccionari
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Google
|
||||
Name[ar]=غوغل
|
||||
Name[az]=Google
|
||||
Name[bg]=Google
|
||||
Name[ca]=Google
|
||||
|
@ -37,6 +38,7 @@ Name[x-test]=xxGooglexx
|
|||
Name[zh_CN]=Google
|
||||
Name[zh_TW]=Google
|
||||
Comment=Search with...
|
||||
Comment[ar]=ابحث باستخدام...
|
||||
Comment[az]=Bununla axtarmaq...
|
||||
Comment[bg]=Търсене с...
|
||||
Comment[ca]=Cerca amb...
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=TinEye
|
||||
Name[ar]=تن آي
|
||||
Name[az]=TinEye
|
||||
Name[bg]=TinEye
|
||||
Name[ca]=TinEye
|
||||
|
@ -37,6 +38,7 @@ Name[x-test]=xxTinEyexx
|
|||
Name[zh_CN]=TinEye
|
||||
Name[zh_TW]=TinEye
|
||||
Comment=Search with...
|
||||
Comment[ar]=ابحث باستخدام...
|
||||
Comment[az]=Bununla axtarmaq...
|
||||
Comment[bg]=Търсене с...
|
||||
Comment[ca]=Cerca amb...
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Translate page
|
||||
Name[ar]=ترجم الصفة
|
||||
Name[az]=Səhifənin tərcümə etmək
|
||||
Name[bg]=Превеждане на уеб страница
|
||||
Name[ca]=Tradueix la pàgina
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Validate page
|
||||
Name[ar]=تحقق الصفحة
|
||||
Name[az]=Səhifəni doğrulamaq
|
||||
Name[bg]=Валидиране на страницата
|
||||
Name[ca]=Valida la pàgina
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Yandex
|
||||
Name[ar]=ياندكس
|
||||
Name[az]=Yandex
|
||||
Name[bg]=Yandex
|
||||
Name[ca]=Yandex
|
||||
|
@ -37,6 +38,7 @@ Name[x-test]=xxYandexxx
|
|||
Name[zh_CN]=Yandex
|
||||
Name[zh_TW]=Yandex
|
||||
Comment=Search with...
|
||||
Comment[ar]=ابحث باستخدام...
|
||||
Comment[az]=Bununla axtarmaq...
|
||||
Comment[bg]=Търсене с...
|
||||
Comment[ca]=Cerca amb...
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Run Action
|
||||
Name[ar]=شغّل إجراءً
|
||||
Name[az]=Əməli Başlatmaq
|
||||
Name[bg]=Изпълнение на действие
|
||||
Name[ca]=Executa una acció
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Chrome
|
||||
Name[ar]=كروم
|
||||
Name[az]=Chrome
|
||||
Name[bg]=Chrome
|
||||
Name[ca]=Chrome
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Linux
|
||||
Name[ar]=لينكس
|
||||
Name[az]=Linux
|
||||
Name[bg]=Linux
|
||||
Name[ca]=Linux
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Mac
|
||||
Name[ar]=ماك
|
||||
Name[az]=Mac
|
||||
Name[bg]=Mac
|
||||
Name[ca]=Mac
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
[Desktop Entry]
|
||||
Name=Windows
|
||||
Name[ar]=ويندوز
|
||||
Name[az]=Windows
|
||||
Name[bg]=Windows
|
||||
Name[ca]=Windows
|
||||
|
|
Loading…
Reference in New Issue
Block a user