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"
7 years ago · 0e62985bc0
parent b9549351c2
commit 0e62985bc0
5 changed files with 5 additions and 5 deletions
--- a/themes/qtcde.themerc
+++ b/themes/qtcde.themerc
@ -119,7 +119,7 @@ Comment[hr]=Ugrađeni netematski CDE stil
 Comment[hsb]=Integrowany CDE-stil bjez temow
 Comment[hu]=Beépített CDE stílus
 Comment[ia]=Stilo includite CDE sin themas
-Comment[id]=Gaya CDE tak bertema yang terpasang-tetap
+Comment[id]=Bawaan gaya CDE tak bertema
 Comment[is]=Innbyggður óþemaður CDE stíll
 Comment[it]=Stile integrato di CDE
 Comment[ja]=ビルトイン CDE スタイル (テーマなし)
--- a/themes/qtcleanlooks.themerc
+++ b/themes/qtcleanlooks.themerc
@ -87,7 +87,7 @@ Comment[he]=סגנון מובנה וללא ערכות־נושא הדומה ל־C
 Comment[hr]=Ugrađen netematski stil sličan Clearlooksu na GNOMEu
 Comment[hu]=A Clearlooks GNOME stílusához hasonló beépített stílus
 Comment[ia]=Stilo includite simil a Clearlookds de Gnome sin themas
-Comment[id]=Gaya tak bertema yang terpasang-tetap mirip Clearlooks dari GNOME
+Comment[id]=Bawaan gaya tak bertema mirip Clearlooks dari GNOME
 Comment[is]=Innbyggður óþemaður stíll í stíl við Clearlooks frá GNOME
 Comment[it]=Stile integrato simile al tema Clearlooks di GNOME
 Comment[ja]=GNOME の Clearlooks に似たビルトインスタイル (テーマなし)
--- a/themes/qtmotif.themerc
+++ b/themes/qtmotif.themerc
@ -113,7 +113,7 @@ Comment[hr]=Ugrađeni netematski Motif stil
 Comment[hsb]=Integrowany Motif-stil bjez temy
 Comment[hu]=Beépített Motif stílus
 Comment[ia]=Stilo includite Motif sin themas
-Comment[id]=Gaya Motif tak bertema yang terpasang-tetap
+Comment[id]=Bawaan gaya Motif tak bertema
 Comment[is]=Innbyggður óþemaður Mótíf stíll
 Comment[it]=Stile integrato Motif
 Comment[ja]=ビルトイン Motif スタイル (テーマなし)
--- a/themes/qtplastique.themerc
+++ b/themes/qtplastique.themerc
@ -91,7 +91,7 @@ Comment[he]=סגנון מובנה דומה ל־Plastik מ־KDE3
 Comment[hr]=Ugrađen netematski stil sličan Plastiku iz KDE3
 Comment[hu]=A KDE3 Plastik stílusához hasonló beépített stílus
 Comment[ia]=Stilo includite simil Plastik de KDE3 sin themas
-Comment[id]=Gaya tak bertema yang terpasang-tetap mirip dengan Plastik dari KDE3
+Comment[id]=Bawaan gaya tak bertema mirip dengan Plastik dari KDE3
 Comment[is]=Innbyggður óþemaður stíll í stíl við Plastik frá KDE3
 Comment[it]=Stile integrato simile a Plastica di KDE 3
 Comment[ja]=KDE3 の Plastik に似たビルトインスタイル (テーマなし)
--- a/themes/qtwindows.themerc
+++ b/themes/qtwindows.themerc
@ -114,7 +114,7 @@ Comment[hr]=Ugrađeni netematski Windows 9x stil
 Comment[hsb]=Integrowany WIndows 9x stil bjez temow
 Comment[hu]=Beépített Windows 9x stílus
 Comment[ia]=Stilo de Windows 9x includite sin themas
-Comment[id]=Gaya Windows 9x tak bertema yang terpasang-tetap
+Comment[id]=Bawaan gaya Windows 9x tak bertema
 Comment[is]=Innbyggður óþemaður Windows 9x stíll
 Comment[it]=Stile integrato Windows 9x
 Comment[ja]=ビルトイン Windows 9x スタイル (テーマなし)